diff --git a/app/javascript/flavours/glitch/features/compose/components/navigation_bar.jsx b/app/javascript/flavours/glitch/features/compose/components/navigation_bar.jsx
index fed84359faec5c..ef9d01bd20de9d 100644
--- a/app/javascript/flavours/glitch/features/compose/components/navigation_bar.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/navigation_bar.jsx
@@ -1,54 +1,36 @@
-import PropTypes from 'prop-types';
-
-import { FormattedMessage } from 'react-intl';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-
-import { Permalink } from 'flavours/glitch/components/permalink';
-import { profileLink } from 'flavours/glitch/utils/backend_links';
-
-import { Avatar } from '../../../components/avatar';
-
-import ActionBar from './action_bar';
-
-export default class NavigationBar extends ImmutablePureComponent {
-
- static propTypes = {
- account: ImmutablePropTypes.record.isRequired,
- onLogout: PropTypes.func.isRequired,
- onClose: PropTypes.func,
- };
-
- render () {
- const username = this.props.account.get('acct');
- return (
-
-
- {username}
-
-
-
-
-
-
- @{username}
-
-
-
- { profileLink !== undefined && (
-
- )}
-
-
-
-
- );
- }
-
-}
+import { useCallback } from 'react';
+
+import { useIntl, defineMessages } from 'react-intl';
+
+import { useSelector, useDispatch } from 'react-redux';
+
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import { cancelReplyCompose } from 'flavours/glitch/actions/compose';
+import Account from 'flavours/glitch/components/account';
+import { IconButton } from 'flavours/glitch/components/icon_button';
+import { me } from 'flavours/glitch/initial_state';
+
+import { ActionBar } from './action_bar';
+
+
+const messages = defineMessages({
+ cancel: { id: 'reply_indicator.cancel', defaultMessage: 'Cancel' },
+});
+
+export const NavigationBar = () => {
+ const dispatch = useDispatch();
+ const intl = useIntl();
+ const account = useSelector(state => state.getIn(['accounts', me]));
+ const isReplying = useSelector(state => !!state.getIn(['compose', 'in_reply_to']));
+
+ const handleCancelClick = useCallback(() => {
+ dispatch(cancelReplyCompose());
+ }, [dispatch]);
+
+ return (
+
+ );
+};
diff --git a/app/javascript/flavours/glitch/features/compose/components/options.jsx b/app/javascript/flavours/glitch/features/compose/components/options.jsx
deleted file mode 100644
index 314b6e638fab7b..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/components/options.jsx
+++ /dev/null
@@ -1,328 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { defineMessages, injectIntl } from 'react-intl';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { connect } from 'react-redux';
-
-import Toggle from 'react-toggle';
-
-import AttachFileIcon from '@/material-icons/400-24px/attach_file.svg?react';
-import BrushIcon from '@/material-icons/400-24px/brush.svg?react';
-import CodeIcon from '@/material-icons/400-24px/code.svg?react';
-import DescriptionIcon from '@/material-icons/400-24px/description.svg?react';
-import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
-import MarkdownIcon from '@/material-icons/400-24px/markdown.svg?react';
-import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
-import UploadFileIcon from '@/material-icons/400-24px/upload_file.svg?react';
-import { IconButton } from 'flavours/glitch/components/icon_button';
-import { pollLimits } from 'flavours/glitch/initial_state';
-
-
-import DropdownContainer from '../containers/dropdown_container';
-import LanguageDropdown from '../containers/language_dropdown_container';
-import PrivacyDropdownContainer from '../containers/privacy_dropdown_container';
-
-import TextIconButton from './text_icon_button';
-
-const messages = defineMessages({
- advanced_options_icon_title: {
- defaultMessage: 'Advanced options',
- id: 'advanced_options.icon_title',
- },
- attach: {
- defaultMessage: 'Attach...',
- id: 'compose.attach',
- },
- content_type: {
- defaultMessage: 'Content type',
- id: 'content-type.change',
- },
- doodle: {
- defaultMessage: 'Draw something',
- id: 'compose.attach.doodle',
- },
- html: {
- defaultMessage: 'HTML',
- id: 'compose.content-type.html',
- },
- local_only_long: {
- defaultMessage: 'Do not post to other instances',
- id: 'advanced_options.local-only.long',
- },
- local_only_short: {
- defaultMessage: 'Local-only',
- id: 'advanced_options.local-only.short',
- },
- markdown: {
- defaultMessage: 'Markdown',
- id: 'compose.content-type.markdown',
- },
- plain: {
- defaultMessage: 'Plain text',
- id: 'compose.content-type.plain',
- },
- spoiler: {
- defaultMessage: 'Hide text behind warning',
- id: 'compose_form.spoiler',
- },
- threaded_mode_long: {
- defaultMessage: 'Automatically opens a reply on posting',
- id: 'advanced_options.threaded_mode.long',
- },
- threaded_mode_short: {
- defaultMessage: 'Threaded mode',
- id: 'advanced_options.threaded_mode.short',
- },
- upload: {
- defaultMessage: 'Upload a file',
- id: 'compose.attach.upload',
- },
- add_poll: {
- defaultMessage: 'Add a poll',
- id: 'poll_button.add_poll',
- },
- remove_poll: {
- defaultMessage: 'Remove poll',
- id: 'poll_button.remove_poll',
- },
-});
-
-const mapStateToProps = (state, { name }) => ({
- checked: state.getIn(['compose', 'advanced_options', name]),
-});
-
-class ToggleOptionImpl extends ImmutablePureComponent {
-
- static propTypes = {
- name: PropTypes.string.isRequired,
- checked: PropTypes.bool,
- onChangeAdvancedOption: PropTypes.func.isRequired,
- };
-
- handleChange = () => {
- this.props.onChangeAdvancedOption(this.props.name);
- };
-
- render() {
- const { meta, text, checked } = this.props;
-
- return (
- <>
-
-
-
- {text}
- {meta}
-
-
- );
- }
-
-}
-
-const ToggleOption = connect(mapStateToProps)(ToggleOptionImpl);
-
-class ComposerOptions extends ImmutablePureComponent {
-
- static propTypes = {
- acceptContentTypes: PropTypes.string,
- advancedOptions: ImmutablePropTypes.map,
- disabled: PropTypes.bool,
- allowMedia: PropTypes.bool,
- allowPoll: PropTypes.bool,
- hasPoll: PropTypes.bool,
- intl: PropTypes.object.isRequired,
- onChangeAdvancedOption: PropTypes.func.isRequired,
- onChangeContentType: PropTypes.func.isRequired,
- onTogglePoll: PropTypes.func.isRequired,
- onDoodleOpen: PropTypes.func.isRequired,
- onToggleSpoiler: PropTypes.func,
- onUpload: PropTypes.func.isRequired,
- contentType: PropTypes.string,
- resetFileKey: PropTypes.number,
- spoiler: PropTypes.bool,
- showContentTypeChoice: PropTypes.bool,
- isEditing: PropTypes.bool,
- };
-
- handleChangeFiles = ({ target: { files } }) => {
- const { onUpload } = this.props;
- if (files.length) {
- onUpload(files);
- }
- };
-
- handleClickAttach = (name) => {
- const { fileElement } = this;
- const { onDoodleOpen } = this.props;
-
- switch (name) {
- case 'upload':
- if (fileElement) {
- fileElement.click();
- }
- return;
- case 'doodle':
- onDoodleOpen();
- return;
- }
- };
-
- handleRefFileElement = (fileElement) => {
- this.fileElement = fileElement;
- };
-
- renderToggleItemContents = (item) => {
- const { onChangeAdvancedOption } = this.props;
- const { name, meta, text } = item;
-
- return
;
- };
-
- render () {
- const {
- acceptContentTypes,
- advancedOptions,
- contentType,
- disabled,
- allowMedia,
- allowPoll,
- hasPoll,
- onChangeAdvancedOption,
- onChangeContentType,
- onTogglePoll,
- onToggleSpoiler,
- resetFileKey,
- spoiler,
- showContentTypeChoice,
- isEditing,
- intl: { formatMessage },
- } = this.props;
-
- const contentTypeItems = {
- plain: {
- icon: 'file-text',
- iconComponent: DescriptionIcon,
- name: 'text/plain',
- text: formatMessage(messages.plain),
- },
- html: {
- icon: 'code',
- iconComponent: CodeIcon,
- name: 'text/html',
- text: formatMessage(messages.html),
- },
- markdown: {
- icon: 'arrow-circle-down',
- iconComponent: MarkdownIcon,
- name: 'text/markdown',
- text: formatMessage(messages.markdown),
- },
- };
-
- // The result.
- return (
-
-
-
- {!!pollLimits && (
-
- )}
-
- {showContentTypeChoice && (
-
- )}
- {onToggleSpoiler && (
-
- )}
-
-
-
- );
- }
-
-}
-
-export default injectIntl(ComposerOptions);
diff --git a/app/javascript/flavours/glitch/features/compose/components/poll_button.jsx b/app/javascript/flavours/glitch/features/compose/components/poll_button.jsx
new file mode 100644
index 00000000000000..cbaa25cb3c25ee
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/compose/components/poll_button.jsx
@@ -0,0 +1,55 @@
+import PropTypes from 'prop-types';
+import { PureComponent } from 'react';
+
+import { defineMessages, injectIntl } from 'react-intl';
+
+import BarChart4BarsIcon from '@/material-icons/400-20px/bar_chart_4_bars.svg?react';
+
+import { IconButton } from '../../../components/icon_button';
+
+const messages = defineMessages({
+ add_poll: { id: 'poll_button.add_poll', defaultMessage: 'Add a poll' },
+ remove_poll: { id: 'poll_button.remove_poll', defaultMessage: 'Remove poll' },
+});
+
+const iconStyle = {
+ height: null,
+ lineHeight: '27px',
+};
+
+class PollButton extends PureComponent {
+
+ static propTypes = {
+ disabled: PropTypes.bool,
+ active: PropTypes.bool,
+ onClick: PropTypes.func.isRequired,
+ intl: PropTypes.object.isRequired,
+ };
+
+ handleClick = () => {
+ this.props.onClick();
+ };
+
+ render () {
+ const { intl, active, disabled } = this.props;
+
+ return (
+
+
+
+ );
+ }
+
+}
+
+export default injectIntl(PollButton);
diff --git a/app/javascript/flavours/glitch/features/compose/components/poll_form.jsx b/app/javascript/flavours/glitch/features/compose/components/poll_form.jsx
index 053b02673de03a..361522d7b48d57 100644
--- a/app/javascript/flavours/glitch/features/compose/components/poll_form.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/poll_form.jsx
@@ -1,179 +1,162 @@
import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
+import { useCallback } from 'react';
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, useIntl } 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 AddIcon from '@/material-icons/400-24px/add.svg?react';
-import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import {
+ changePollSettings,
+ changePollOption,
+ clearComposeSuggestions,
+ fetchComposeSuggestions,
+ selectComposeSuggestion,
+} from 'flavours/glitch/actions/compose';
import AutosuggestInput from 'flavours/glitch/components/autosuggest_input';
-import { Icon } from 'flavours/glitch/components/icon';
-import { IconButton } from 'flavours/glitch/components/icon_button';
import { pollLimits } from 'flavours/glitch/initial_state';
const messages = defineMessages({
- option_placeholder: { id: 'compose_form.poll.option_placeholder', defaultMessage: 'Choice {number}' },
- add_option: { id: 'compose_form.poll.add_option', defaultMessage: 'Add a choice' },
- remove_option: { id: 'compose_form.poll.remove_option', defaultMessage: 'Remove this choice' },
- poll_duration: { id: 'compose_form.poll.duration', defaultMessage: 'Poll duration' },
- single_choice: { id: 'compose_form.poll.single_choice', defaultMessage: 'Allow one choice' },
- multiple_choices: { id: 'compose_form.poll.multiple_choices', defaultMessage: 'Allow multiple choices' },
+ option_placeholder: { id: 'compose_form.poll.option_placeholder', defaultMessage: 'Option {number}' },
+ duration: { id: 'compose_form.poll.duration', defaultMessage: 'Poll length' },
+ type: { id: 'compose_form.poll.type', defaultMessage: 'Style' },
+ switchToMultiple: { id: 'compose_form.poll.switch_to_multiple', defaultMessage: 'Change poll to allow multiple choices' },
+ switchToSingle: { id: 'compose_form.poll.switch_to_single', defaultMessage: 'Change poll to allow for a single choice' },
minutes: { id: 'intervals.full.minutes', defaultMessage: '{number, plural, one {# minute} other {# minutes}}' },
hours: { id: 'intervals.full.hours', defaultMessage: '{number, plural, one {# hour} other {# hours}}' },
days: { id: 'intervals.full.days', defaultMessage: '{number, plural, one {# day} other {# days}}' },
+ singleChoice: { id: 'compose_form.poll.single', defaultMessage: 'Pick one' },
+ multipleChoice: { id: 'compose_form.poll.multiple', defaultMessage: 'Multiple choice' },
});
-class OptionIntl extends PureComponent {
-
- static propTypes = {
- title: PropTypes.string.isRequired,
- lang: PropTypes.string,
- index: PropTypes.number.isRequired,
- isPollMultiple: PropTypes.bool,
- autoFocus: PropTypes.bool,
- onChange: PropTypes.func.isRequired,
- onRemove: PropTypes.func.isRequired,
- suggestions: ImmutablePropTypes.list,
- onClearSuggestions: PropTypes.func.isRequired,
- onFetchSuggestions: PropTypes.func.isRequired,
- onSuggestionSelected: PropTypes.func.isRequired,
- intl: PropTypes.object.isRequired,
- };
-
- handleOptionTitleChange = e => {
- this.props.onChange(this.props.index, e.target.value);
- };
-
- handleOptionRemove = () => {
- this.props.onRemove(this.props.index);
- };
-
- onSuggestionsClearRequested = () => {
- this.props.onClearSuggestions();
- };
-
- onSuggestionsFetchRequested = (token) => {
- this.props.onFetchSuggestions(token);
- };
-
- onSuggestionSelected = (tokenStart, token, value) => {
- this.props.onSuggestionSelected(tokenStart, token, value, ['poll', 'options', this.props.index]);
- };
-
- render () {
- const { isPollMultiple, title, lang, index, autoFocus, intl } = this.props;
-
- return (
-
-
-
-
-
-
-
- );
+const Select = ({ label, options, value, onChange }) => {
+ return (
+
+ );
+};
+
+Select.propTypes = {
+ label: PropTypes.node,
+ value: PropTypes.any,
+ onChange: PropTypes.func,
+ options: PropTypes.arrayOf(PropTypes.shape({
+ label: PropTypes.node,
+ value: PropTypes.any,
+ })),
+};
+
+const Option = ({ multipleChoice, index, title, autoFocus }) => {
+ const intl = useIntl();
+ const dispatch = useDispatch();
+ const suggestions = useSelector(state => state.getIn(['compose', 'suggestions']));
+ const lang = useSelector(state => state.getIn(['compose', 'language']));
+ const maxOptions = useSelector(state => state.getIn(['server', 'server', 'configuration', 'polls', 'max_options']));
+
+ const handleChange = useCallback(({ target: { value } }) => {
+ dispatch(changePollOption(index, value, maxOptions));
+ }, [dispatch, index, maxOptions]);
+
+ const handleSuggestionsFetchRequested = useCallback(token => {
+ dispatch(fetchComposeSuggestions(token));
+ }, [dispatch]);
+
+ const handleSuggestionsClearRequested = useCallback(() => {
+ dispatch(clearComposeSuggestions());
+ }, [dispatch]);
+
+ const handleSuggestionSelected = useCallback((tokenStart, token, value) => {
+ dispatch(selectComposeSuggestion(tokenStart, token, value, ['poll', 'options', index]));
+ }, [dispatch, index]);
+
+ return (
+
+ );
+};
+
+Option.propTypes = {
+ title: PropTypes.string.isRequired,
+ index: PropTypes.number.isRequired,
+ multipleChoice: PropTypes.bool,
+ autoFocus: PropTypes.bool,
+};
+
+export const PollForm = () => {
+ const intl = useIntl();
+ const dispatch = useDispatch();
+ const poll = useSelector(state => state.getIn(['compose', 'poll']));
+ const options = poll?.get('options');
+ const expiresIn = poll?.get('expires_in');
+ const isMultiple = poll?.get('multiple');
+
+ const handleDurationChange = useCallback(({ target: { value } }) => {
+ dispatch(changePollSettings(value, isMultiple));
+ }, [dispatch, isMultiple]);
+
+ const handleTypeChange = useCallback(({ target: { value } }) => {
+ dispatch(changePollSettings(expiresIn, value === 'true'));
+ }, [dispatch, expiresIn]);
+
+ if (poll === null) {
+ return null;
}
-}
-
-const Option = injectIntl(OptionIntl);
-
-class PollForm extends ImmutablePureComponent {
-
- static propTypes = {
- options: ImmutablePropTypes.list,
- lang: PropTypes.string,
- expiresIn: PropTypes.number,
- isMultiple: PropTypes.bool,
- onChangeOption: PropTypes.func.isRequired,
- onAddOption: PropTypes.func.isRequired,
- onRemoveOption: PropTypes.func.isRequired,
- onChangeSettings: PropTypes.func.isRequired,
- suggestions: ImmutablePropTypes.list,
- onClearSuggestions: PropTypes.func.isRequired,
- onFetchSuggestions: PropTypes.func.isRequired,
- onSuggestionSelected: PropTypes.func.isRequired,
- intl: PropTypes.object.isRequired,
- };
-
- handleAddOption = () => {
- this.props.onAddOption('');
- };
-
- handleSelectDuration = e => {
- this.props.onChangeSettings(e.target.value, this.props.isMultiple);
- };
-
- handleSelectMultiple = e => {
- this.props.onChangeSettings(this.props.expiresIn, e.target.value === 'true');
- };
-
- render () {
- const { options, lang, expiresIn, isMultiple, onChangeOption, onRemoveOption, intl, ...other } = this.props;
-
- if (!options) {
- return null;
- }
-
- const autoFocusIndex = options.indexOf('');
-
- return (
-
-
- {options.map((title, i) => )}
- {options.size < pollLimits.max_options && (
-
- )}
-
-
-
- {/* eslint-disable-next-line jsx-a11y/no-onchange */}
-
-
- {/* eslint-disable-next-line jsx-a11y/no-onchange */}
-
-
+ return (
+
+ {options.map((title, i) => (
+
+ ))}
+
+
- );
- }
-
-}
-
-export default injectIntl(PollForm);
+
+ );
+};
diff --git a/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx b/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx
index 7980c1007e817b..c99f18545ba605 100644
--- a/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx
@@ -3,23 +3,29 @@ import { PureComponent } from 'react';
import { injectIntl, defineMessages } from 'react-intl';
+import classNames from 'classnames';
+
+import Overlay from 'react-overlays/Overlay';
+
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
import LockIcon from '@/material-icons/400-24px/lock.svg?react';
-import LockOpenIcon from '@/material-icons/400-24px/lock_open.svg?react';
-import MailIcon from '@/material-icons/400-24px/mail.svg?react';
import PublicIcon from '@/material-icons/400-24px/public.svg?react';
+import QuietTimeIcon from '@/material-icons/400-24px/quiet_time.svg?react';
+import { Icon } from 'flavours/glitch/components/icon';
-import Dropdown from './dropdown';
+import { PrivacyDropdownMenu } from './privacy_dropdown_menu';
const messages = defineMessages({
public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
- public_long: { id: 'privacy.public.long', defaultMessage: 'Visible for all' },
- unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
- unlisted_long: { id: 'privacy.unlisted.long', defaultMessage: 'Visible for all, but opted-out of discovery features' },
- private_short: { id: 'privacy.private.short', defaultMessage: 'Followers only' },
- private_long: { id: 'privacy.private.long', defaultMessage: 'Visible for followers only' },
- direct_short: { id: 'privacy.direct.short', defaultMessage: 'Mentioned people only' },
- direct_long: { id: 'privacy.direct.long', defaultMessage: 'Visible for mentioned users only' },
- change_privacy: { id: 'privacy.change', defaultMessage: 'Adjust status privacy' },
+ public_long: { id: 'privacy.public.long', defaultMessage: 'Anyone on and off Mastodon' },
+ unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Quiet public' },
+ unlisted_long: { id: 'privacy.unlisted.long', defaultMessage: 'Fewer algorithmic fanfares' },
+ private_short: { id: 'privacy.private.short', defaultMessage: 'Followers' },
+ private_long: { id: 'privacy.private.long', defaultMessage: 'Only your followers' },
+ direct_short: { id: 'privacy.direct.short', defaultMessage: 'Specific people' },
+ direct_long: { id: 'privacy.direct.long', defaultMessage: 'Everyone mentioned in the post' },
+ change_privacy: { id: 'privacy.change', defaultMessage: 'Change post privacy' },
+ unlisted_extra: { id: 'privacy.unlisted.additional', defaultMessage: 'This behaves exactly like public, except the post will not appear in live feeds or hashtags, explore, or Mastodon search, even if you are opted-in account-wide.' },
});
class PrivacyDropdown extends PureComponent {
@@ -36,62 +42,118 @@ class PrivacyDropdown extends PureComponent {
intl: PropTypes.object.isRequired,
};
- render () {
- const { value, onChange, onModalOpen, onModalClose, disabled, noDirect, container, isUserTouching, intl: { formatMessage } } = this.props;
-
- // We predefine our privacy items so that we can easily pick the
- // dropdown icon later.
- const privacyItems = {
- direct: {
- icon: 'envelope',
- iconComponent: MailIcon,
- meta: formatMessage(messages.direct_long),
- name: 'direct',
- text: formatMessage(messages.direct_short),
- },
- private: {
- icon: 'lock',
- iconComponent: LockIcon,
- meta: formatMessage(messages.private_long),
- name: 'private',
- text: formatMessage(messages.private_short),
- },
- public: {
- icon: 'globe',
- iconComponent: PublicIcon,
- meta: formatMessage(messages.public_long),
- name: 'public',
- text: formatMessage(messages.public_short),
- },
- unlisted: {
- icon: 'unlock',
- iconComponent: LockOpenIcon,
- meta: formatMessage(messages.unlisted_long),
- name: 'unlisted',
- text: formatMessage(messages.unlisted_short),
- },
- };
-
- const items = [privacyItems.public, privacyItems.unlisted, privacyItems.private];
-
- if (!noDirect) {
- items.push(privacyItems.direct);
+ state = {
+ open: false,
+ placement: 'bottom',
+ };
+
+ handleToggle = () => {
+ if (this.state.open && this.activeElement) {
+ this.activeElement.focus({ preventScroll: true });
+ }
+
+ this.setState({ open: !this.state.open });
+ };
+
+ handleKeyDown = e => {
+ switch(e.key) {
+ case 'Escape':
+ this.handleClose();
+ break;
+ }
+ };
+
+ handleMouseDown = () => {
+ if (!this.state.open) {
+ this.activeElement = document.activeElement;
+ }
+ };
+
+ handleButtonKeyDown = (e) => {
+ switch(e.key) {
+ case ' ':
+ case 'Enter':
+ this.handleMouseDown();
+ break;
+ }
+ };
+
+ handleClose = () => {
+ if (this.state.open && this.activeElement) {
+ this.activeElement.focus({ preventScroll: true });
}
+ this.setState({ open: false });
+ };
+
+ handleChange = value => {
+ this.props.onChange(value);
+ };
+
+ UNSAFE_componentWillMount () {
+ const { intl: { formatMessage } } = this.props;
+
+ this.options = [
+ { icon: 'globe', iconComponent: PublicIcon, value: 'public', text: formatMessage(messages.public_short), meta: formatMessage(messages.public_long) },
+ { icon: 'unlock', iconComponent: QuietTimeIcon, value: 'unlisted', text: formatMessage(messages.unlisted_short), meta: formatMessage(messages.unlisted_long), extra: formatMessage(messages.unlisted_extra) },
+ { icon: 'lock', iconComponent: LockIcon, value: 'private', text: formatMessage(messages.private_short), meta: formatMessage(messages.private_long) },
+ ];
+
+ if (!this.props.noDirect) {
+ this.options.push(
+ { icon: 'at', iconComponent: AlternateEmailIcon, value: 'direct', text: formatMessage(messages.direct_short), meta: formatMessage(messages.direct_long) },
+ );
+ }
+ }
+
+ setTargetRef = c => {
+ this.target = c;
+ };
+
+ findTarget = () => {
+ return this.target;
+ };
+
+ handleOverlayEnter = (state) => {
+ this.setState({ placement: state.placement });
+ };
+
+ render () {
+ const { value, container, disabled, intl } = this.props;
+ const { open, placement } = this.state;
+
+ const valueOption = this.options.find(item => item.value === value);
return (
-
+
+
+
+
+ {({ props, placement }) => (
+
+ )}
+
+
);
}
diff --git a/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown_menu.jsx b/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown_menu.jsx
new file mode 100644
index 00000000000000..03a0b76d23914d
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown_menu.jsx
@@ -0,0 +1,128 @@
+import PropTypes from 'prop-types';
+import { useCallback, useEffect, useRef, useState } from 'react';
+
+import classNames from 'classnames';
+
+import { supportsPassiveEvents } from 'detect-passive-events';
+
+import InfoIcon from '@/material-icons/400-24px/info.svg?react';
+import { Icon } from 'flavours/glitch/components/icon';
+
+const listenerOptions = supportsPassiveEvents ? { passive: true, capture: true } : true;
+
+export const PrivacyDropdownMenu = ({ style, items, value, onClose, onChange }) => {
+ const nodeRef = useRef(null);
+ const focusedItemRef = useRef(null);
+ const [currentValue, setCurrentValue] = useState(value);
+
+ const handleDocumentClick = useCallback((e) => {
+ if (nodeRef.current && !nodeRef.current.contains(e.target)) {
+ onClose();
+ e.stopPropagation();
+ }
+ }, [nodeRef, onClose]);
+
+ const handleClick = useCallback((e) => {
+ const value = e.currentTarget.getAttribute('data-index');
+
+ e.preventDefault();
+
+ onClose();
+ onChange(value);
+ }, [onClose, onChange]);
+
+ const handleKeyDown = useCallback((e) => {
+ const value = e.currentTarget.getAttribute('data-index');
+ const index = items.findIndex(item => (item.value === value));
+
+ let element = null;
+
+ switch (e.key) {
+ case 'Escape':
+ onClose();
+ break;
+ case ' ':
+ case 'Enter':
+ handleClick(e);
+ break;
+ case 'ArrowDown':
+ element = nodeRef.current.childNodes[index + 1] || nodeRef.current.firstChild;
+ break;
+ case 'ArrowUp':
+ element = nodeRef.current.childNodes[index - 1] || nodeRef.current.lastChild;
+ break;
+ case 'Tab':
+ if (e.shiftKey) {
+ element = nodeRef.current.childNodes[index + 1] || nodeRef.current.firstChild;
+ } else {
+ element = nodeRef.current.childNodes[index - 1] || nodeRef.current.lastChild;
+ }
+ break;
+ case 'Home':
+ element = nodeRef.current.firstChild;
+ break;
+ case 'End':
+ element = nodeRef.current.lastChild;
+ break;
+ }
+
+ if (element) {
+ element.focus();
+ setCurrentValue(element.getAttribute('data-index'));
+ e.preventDefault();
+ e.stopPropagation();
+ }
+ }, [nodeRef, items, onClose, handleClick, setCurrentValue]);
+
+ useEffect(() => {
+ document.addEventListener('click', handleDocumentClick, { capture: true });
+ document.addEventListener('touchend', handleDocumentClick, listenerOptions);
+ focusedItemRef.current?.focus({ preventScroll: true });
+
+ return () => {
+ document.removeEventListener('click', handleDocumentClick, { capture: true });
+ document.removeEventListener('touchend', handleDocumentClick, listenerOptions);
+ };
+ }, [handleDocumentClick]);
+
+ return (
+
+ );
+};
+
+PrivacyDropdownMenu.propTypes = {
+ style: PropTypes.object,
+ items: PropTypes.array.isRequired,
+ value: PropTypes.string.isRequired,
+ onClose: PropTypes.func.isRequired,
+ onChange: PropTypes.func.isRequired,
+};
diff --git a/app/javascript/flavours/glitch/features/compose/components/publisher.jsx b/app/javascript/flavours/glitch/features/compose/components/publisher.jsx
deleted file mode 100644
index ff825ca0c925d0..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/components/publisher.jsx
+++ /dev/null
@@ -1,114 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { defineMessages, injectIntl } from 'react-intl';
-
-import ImmutablePureComponent from 'react-immutable-pure-component';
-
-import LockIcon from '@/material-icons/400-24px/lock.svg?react';
-import LockOpenIcon from '@/material-icons/400-24px/lock_open.svg?react';
-import MailIcon from '@/material-icons/400-24px/mail.svg?react';
-import PublicIcon from '@/material-icons/400-24px/public.svg?react';
-import { Button } from 'flavours/glitch/components/button';
-import { Icon } from 'flavours/glitch/components/icon';
-
-
-const messages = defineMessages({
- publish: {
- defaultMessage: 'Publish',
- id: 'compose_form.publish',
- },
- publishLoud: {
- defaultMessage: '{publish}!',
- id: 'compose_form.publish_loud',
- },
- saveChanges: { id: 'compose_form.save_changes', defaultMessage: 'Save changes' },
- public: { id: 'privacy.public.short', defaultMessage: 'Public' },
- unlisted: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
- private: { id: 'privacy.private.short', defaultMessage: 'Followers only' },
- direct: { id: 'privacy.direct.short', defaultMessage: 'Mentioned people only' },
-});
-
-class Publisher extends ImmutablePureComponent {
-
- static propTypes = {
- disabled: PropTypes.bool,
- intl: PropTypes.object.isRequired,
- onSecondarySubmit: PropTypes.func,
- privacy: PropTypes.oneOf(['direct', 'private', 'unlisted', 'public']),
- sideArm: PropTypes.oneOf(['none', 'direct', 'private', 'unlisted', 'public']),
- isEditing: PropTypes.bool,
- };
-
- render () {
- const { disabled, intl, onSecondarySubmit, privacy, sideArm, isEditing } = this.props;
-
- const privacyIcons = {
- direct: {
- id: 'envelope',
- icon: MailIcon,
- },
- private: {
- id: 'lock',
- icon: LockIcon,
- },
- public: {
- id: 'globe',
- icon: PublicIcon,
- },
- unlisted: {
- id: 'unlock',
- icon: LockOpenIcon,
- },
- };
-
- let publishText;
- if (isEditing) {
- publishText = intl.formatMessage(messages.saveChanges);
- } else if (privacy === 'private' || privacy === 'direct') {
- const icon = privacyIcons[privacy];
- publishText = (
-
- {intl.formatMessage(messages.publish)}
-
- );
- } else {
- publishText = privacy !== 'unlisted' ? intl.formatMessage(messages.publishLoud, { publish: intl.formatMessage(messages.publish) }) : intl.formatMessage(messages.publish);
- }
-
- const privacyNames = {
- public: messages.public,
- unlisted: messages.unlisted,
- private: messages.private,
- direct: messages.direct,
- };
-
- return (
-
- {sideArm && !isEditing && sideArm !== 'none' && (
-
- }
- title={`${intl.formatMessage(messages.publish)}: ${intl.formatMessage(privacyNames[sideArm])}`}
- />
-
- )}
-
-
-
-
- );
- }
-
-}
-
-export default injectIntl(Publisher);
diff --git a/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx b/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx
index 8af8cd441a02ea..b24f7ced9933b1 100644
--- a/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx
@@ -1,75 +1,47 @@
-import PropTypes from 'prop-types';
+import { FormattedMessage } from 'react-intl';
-import { defineMessages, injectIntl } from 'react-intl';
+import { useSelector } from 'react-redux';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import BarChart4BarsIcon from '@/material-icons/400-24px/bar_chart_4_bars.svg?react';
+import PhotoLibraryIcon from '@/material-icons/400-24px/photo_library.svg?react';
+import { Avatar } from 'flavours/glitch/components/avatar';
+import { DisplayName } from 'flavours/glitch/components/display_name';
+import { Icon } from 'flavours/glitch/components/icon';
+import { Permalink } from 'flavours/glitch/components/permalink';
+export const ReplyIndicator = () => {
+ const inReplyToId = useSelector(state => state.getIn(['compose', 'in_reply_to']));
+ const status = useSelector(state => state.getIn(['statuses', inReplyToId]));
+ const account = useSelector(state => state.getIn(['accounts', status?.get('account')]));
-import CloseIcon from '@/material-icons/400-24px/close.svg?react';
-import AttachmentList from 'flavours/glitch/components/attachment_list';
-import { WithOptionalRouterPropTypes, withOptionalRouter } from 'flavours/glitch/utils/react_router';
-
-import { Avatar } from '../../../components/avatar';
-import { DisplayName } from '../../../components/display_name';
-import { IconButton } from '../../../components/icon_button';
-
-const messages = defineMessages({
- cancel: { id: 'reply_indicator.cancel', defaultMessage: 'Cancel' },
-});
-
-class ReplyIndicator extends ImmutablePureComponent {
-
- static propTypes = {
- status: ImmutablePropTypes.map,
- onCancel: PropTypes.func.isRequired,
- intl: PropTypes.object.isRequired,
- ...WithOptionalRouterPropTypes,
- };
-
- handleClick = () => {
- this.props.onCancel();
- };
-
- handleAccountClick = (e) => {
- if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
- e.preventDefault();
- this.props.history?.push(`/@${this.props.status.getIn(['account', 'acct'])}`);
- }
- };
-
- render () {
- const { status, intl } = this.props;
+ if (!status) {
+ return null;
+ }
- if (!status) {
- return null;
- }
+ const content = { __html: status.get('contentHtml') };
- const content = { __html: status.get('contentHtml') };
+ return (
+
+
- return (
-
-
+
+
+
+
- {status.get('media_attachments').size > 0 && (
-
+ {(status.get('poll') || status.get('media_attachments').size > 0) && (
+
+ {status.get('poll') && <>}
+ {status.get('media_attachments').size > 0 && <>}
+
)}
- );
- }
-
-}
-
-export default withOptionalRouter(injectIntl(ReplyIndicator));
+
+ );
+};
diff --git a/app/javascript/flavours/glitch/features/compose/components/search.jsx b/app/javascript/flavours/glitch/features/compose/components/search.jsx
index fa995663f0633d..f5a51334af8795 100644
--- a/app/javascript/flavours/glitch/features/compose/components/search.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/search.jsx
@@ -8,11 +8,11 @@ import { withRouter } from 'react-router-dom';
import ImmutablePropTypes from 'react-immutable-proptypes';
-
import CancelIcon from '@/material-icons/400-24px/cancel-fill.svg?react';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import SearchIcon from '@/material-icons/400-24px/search.svg?react';
import { Icon } from 'flavours/glitch/components/icon';
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
import { domain, searchEnabled } from 'flavours/glitch/initial_state';
import { HASHTAG_REGEX } from 'flavours/glitch/utils/hashtags';
import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
@@ -34,12 +34,8 @@ const labelForRecentSearch = search => {
};
class Search extends PureComponent {
-
- static contextTypes = {
- identity: PropTypes.object.isRequired,
- };
-
static propTypes = {
+ identity: identityContextPropShape,
value: PropTypes.string.isRequired,
recent: ImmutablePropTypes.orderedSet,
submitted: PropTypes.bool,
@@ -186,9 +182,9 @@ class Search extends PureComponent {
};
handleURLClick = () => {
- const { onOpenURL, history } = this.props;
+ const { value, onOpenURL, history } = this.props;
- onOpenURL(history);
+ onOpenURL(value, history);
this._unfocus();
};
@@ -277,7 +273,7 @@ class Search extends PureComponent {
}
_calculateOptions (value) {
- const { signedIn } = this.context.identity;
+ const { signedIn } = this.props.identity;
const trimmedValue = value.trim();
const options = [];
@@ -319,7 +315,7 @@ class Search extends PureComponent {
render () {
const { intl, value, submitted, recent } = this.props;
const { expanded, options, selectedOption } = this.state;
- const { signedIn } = this.context.identity;
+ const { signedIn } = this.props.identity;
const hasValue = value.length > 0 || submitted;
@@ -331,7 +327,7 @@ class Search extends PureComponent {
type='text'
placeholder={intl.formatMessage(signedIn ? messages.placeholderSignedIn : messages.placeholder)}
aria-label={intl.formatMessage(signedIn ? messages.placeholderSignedIn : messages.placeholder)}
- value={value || ''}
+ value={value}
onChange={this.handleChange}
onKeyDown={this.handleKeyDown}
onFocus={this.handleFocus}
@@ -339,8 +335,8 @@ class Search extends PureComponent {
/>
-
-
+
+
@@ -403,4 +399,4 @@ class Search extends PureComponent {
}
-export default withRouter(injectIntl(Search));
+export default withRouter(withIdentity(injectIntl(Search)));
diff --git a/app/javascript/flavours/glitch/features/compose/components/search_results.jsx b/app/javascript/flavours/glitch/features/compose/components/search_results.jsx
index 0eb2239f802830..350fc41c51568a 100644
--- a/app/javascript/flavours/glitch/features/compose/components/search_results.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/search_results.jsx
@@ -1,18 +1,16 @@
-import PropTypes from 'prop-types';
+import { useCallback } from 'react';
import { FormattedMessage } from 'react-intl';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-
import FindInPageIcon from '@/material-icons/400-24px/find_in_page.svg?react';
import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
-import SearchIcon from '@/material-icons/400-24px/search.svg?react';
import TagIcon from '@/material-icons/400-24px/tag.svg?react';
+import { expandSearch } from 'flavours/glitch/actions/search';
import { Icon } from 'flavours/glitch/components/icon';
import { LoadMore } from 'flavours/glitch/components/load_more';
+import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
import { SearchSection } from 'flavours/glitch/features/explore/components/search_section';
-
+import { useAppDispatch, useAppSelector } from 'flavours/glitch/store';
import { ImmutableHashtag as Hashtag } from '../../../components/hashtag';
import AccountContainer from '../../../containers/account_container';
@@ -28,67 +26,68 @@ const withoutLastResult = list => {
}
};
-class SearchResults extends ImmutablePureComponent {
-
- static propTypes = {
- results: ImmutablePropTypes.map.isRequired,
- expandSearch: PropTypes.func.isRequired,
- searchTerm: PropTypes.string,
- };
-
- handleLoadMoreAccounts = () => this.props.expandSearch('accounts');
-
- handleLoadMoreStatuses = () => this.props.expandSearch('statuses');
-
- handleLoadMoreHashtags = () => this.props.expandSearch('hashtags');
-
- render () {
- const { results } = this.props;
-
- let accounts, statuses, hashtags;
-
- if (results.get('accounts') && results.get('accounts').size > 0) {
- accounts = (
-
}>
- {withoutLastResult(results.get('accounts')).map(accountId => )}
- {(results.get('accounts').size > INITIAL_PAGE_LIMIT && results.get('accounts').size % INITIAL_PAGE_LIMIT === 1) && }
-
- );
- }
-
- if (results.get('hashtags') && results.get('hashtags').size > 0) {
- hashtags = (
-
}>
- {withoutLastResult(results.get('hashtags')).map(hashtag => )}
- {(results.get('hashtags').size > INITIAL_PAGE_LIMIT && results.get('hashtags').size % INITIAL_PAGE_LIMIT === 1) && }
-
- );
- }
-
- if (results.get('statuses') && results.get('statuses').size > 0) {
- statuses = (
-
}>
- {withoutLastResult(results.get('statuses')).map(statusId => )}
- {(results.get('statuses').size > INITIAL_PAGE_LIMIT && results.get('statuses').size % INITIAL_PAGE_LIMIT === 1) && }
-
- );
- }
-
-
- return (
-
-
-
- {accounts}
- {hashtags}
- {statuses}
-
+export const SearchResults = () => {
+ const results = useAppSelector((state) => state.getIn(['search', 'results']));
+ const isLoading = useAppSelector((state) => state.getIn(['search', 'isLoading']));
+
+ const dispatch = useAppDispatch();
+
+ const handleLoadMoreAccounts = useCallback(() => {
+ dispatch(expandSearch('accounts'));
+ }, [dispatch]);
+
+ const handleLoadMoreStatuses = useCallback(() => {
+ dispatch(expandSearch('statuses'));
+ }, [dispatch]);
+
+ const handleLoadMoreHashtags = useCallback(() => {
+ dispatch(expandSearch('hashtags'));
+ }, [dispatch]);
+
+ let accounts, statuses, hashtags;
+
+ if (results.get('accounts') && results.get('accounts').size > 0) {
+ accounts = (
+
}>
+ {withoutLastResult(results.get('accounts')).map(accountId => )}
+ {(results.get('accounts').size > INITIAL_PAGE_LIMIT && results.get('accounts').size % INITIAL_PAGE_LIMIT === 1) && }
+
);
}
-}
+ if (results.get('hashtags') && results.get('hashtags').size > 0) {
+ hashtags = (
+
}>
+ {withoutLastResult(results.get('hashtags')).map(hashtag => )}
+ {(results.get('hashtags').size > INITIAL_PAGE_LIMIT && results.get('hashtags').size % INITIAL_PAGE_LIMIT === 1) && }
+
+ );
+ }
-export default SearchResults;
+ if (results.get('statuses') && results.get('statuses').size > 0) {
+ statuses = (
+
}>
+ {withoutLastResult(results.get('statuses')).map(statusId => )}
+ {(results.get('statuses').size > INITIAL_PAGE_LIMIT && results.get('statuses').size % INITIAL_PAGE_LIMIT === 1) && }
+
+ );
+ }
+
+ return (
+
+ {!accounts && !hashtags && !statuses && (
+ isLoading ? (
+
+ ) : (
+
+
+
+ )
+ )}
+ {accounts}
+ {hashtags}
+ {statuses}
+
+ );
+
+};
diff --git a/app/javascript/flavours/glitch/features/compose/components/secondary_privacy_button.jsx b/app/javascript/flavours/glitch/features/compose/components/secondary_privacy_button.jsx
new file mode 100644
index 00000000000000..c78d7b8617e6bb
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/compose/components/secondary_privacy_button.jsx
@@ -0,0 +1,45 @@
+import PropTypes from 'prop-types';
+
+import { useIntl, defineMessages } from 'react-intl';
+
+import LockIcon from '@/material-icons/400-24px/lock.svg?react';
+import MailIcon from '@/material-icons/400-24px/mail.svg?react';
+import PublicIcon from '@/material-icons/400-24px/public.svg?react';
+import QuietTimeIcon from '@/material-icons/400-24px/quiet_time.svg?react';
+import { Button } from 'flavours/glitch/components/button';
+import { Icon } from 'flavours/glitch/components/icon';
+
+const messages = defineMessages({
+ public: { id: 'privacy.public.short', defaultMessage: 'Public' },
+ unlisted: { id: 'privacy.unlisted.short', defaultMessage: 'Quiet public' },
+ private: { id: 'privacy.private.short', defaultMessage: 'Followers' },
+ direct: { id: 'privacy.direct.short', defaultMessage: 'Specific people' },
+});
+
+export const SecondaryPrivacyButton = ({ disabled, privacy, isEditing, onClick }) => {
+ const intl = useIntl();
+
+ if (isEditing || !privacy || privacy === 'none') {
+ return null;
+ }
+
+ const privacyProps = {
+ direct: { icon: 'envelope', iconComponent: MailIcon, title: messages.direct },
+ private: { icon: 'lock', iconComponent: LockIcon, title: messages.private },
+ public: { icon: 'globe', iconComponent: PublicIcon, title: messages.public },
+ unlisted: { icon: 'unlock', iconComponent: QuietTimeIcon, title: messages.unlisted },
+ };
+
+ return (
+
+ );
+};
+
+SecondaryPrivacyButton.propTypes = {
+ disabled: PropTypes.bool,
+ privacy: PropTypes.string,
+ isEditing: PropTypes.bool,
+ onClick: PropTypes.func.isRequired,
+};
diff --git a/app/javascript/flavours/glitch/features/compose/components/sensitive_button.jsx b/app/javascript/flavours/glitch/features/compose/components/sensitive_button.jsx
new file mode 100644
index 00000000000000..deb401bfb744e4
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/compose/components/sensitive_button.jsx
@@ -0,0 +1,58 @@
+import { useCallback } from 'react';
+
+import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
+
+import classNames from 'classnames';
+
+import { changeComposeSensitivity } from 'flavours/glitch/actions/compose';
+import { useAppSelector, useAppDispatch } from 'flavours/glitch/store';
+
+const messages = defineMessages({
+ marked: {
+ id: 'compose_form.sensitive.marked',
+ defaultMessage: '{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}',
+ },
+ unmarked: {
+ id: 'compose_form.sensitive.unmarked',
+ defaultMessage: '{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}',
+ },
+});
+
+export const SensitiveButton = () => {
+ const intl = useIntl();
+
+ const spoilersAlwaysOn = useAppSelector((state) => state.getIn(['local_settings', 'always_show_spoilers_field']));
+ const spoilerText = useAppSelector((state) => state.getIn(['compose', 'spoiler_text']));
+ const sensitive = useAppSelector((state) => state.getIn(['compose', 'sensitive']));
+ const spoiler = useAppSelector((state) => state.getIn(['compose', 'spoiler']));
+ const mediaCount = useAppSelector((state) => state.getIn(['compose', 'media_attachments']).size);
+ const disabled = spoilersAlwaysOn ? (spoilerText && spoilerText.length > 0) : spoiler;
+
+ const active = sensitive || (spoilersAlwaysOn && spoilerText && spoilerText.length > 0);
+
+ const dispatch = useAppDispatch();
+
+ const handleClick = useCallback(() => {
+ dispatch(changeComposeSensitivity());
+ }, [dispatch]);
+
+ return (
+
+
+
+ );
+};
diff --git a/app/javascript/flavours/glitch/features/compose/components/textarea_icons.jsx b/app/javascript/flavours/glitch/features/compose/components/textarea_icons.jsx
deleted file mode 100644
index 74706833d91905..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/components/textarea_icons.jsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { defineMessages, injectIntl } from 'react-intl';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-
-import ForumIcon from '@/material-icons/400-24px/forum.svg?react';
-import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
-import { Icon } from 'flavours/glitch/components/icon';
-
-
-const messages = defineMessages({
- localOnly: {
- defaultMessage: 'This post is local-only',
- id: 'advanced_options.local-only.tooltip',
- },
- threadedMode: {
- defaultMessage: 'Threaded mode enabled',
- id: 'advanced_options.threaded_mode.tooltip',
- },
-});
-
-// We use an array of tuples here instead of an object because it
-// preserves order.
-const iconMap = [
- ['do_not_federate', 'home', HomeIcon, messages.localOnly],
- ['threaded_mode', 'comments', ForumIcon, messages.threadedMode],
-];
-
-class TextareaIcons extends ImmutablePureComponent {
-
- static propTypes = {
- advancedOptions: ImmutablePropTypes.map,
- intl: PropTypes.object.isRequired,
- };
-
- render () {
- const { advancedOptions, intl } = this.props;
- return (
-
- {advancedOptions && iconMap.map(
- ([key, icon, iconComponent, message]) => advancedOptions.get(key) && (
-
-
-
- ),
- )}
-
- );
- }
-
-}
-
-export default injectIntl(TextareaIcons);
diff --git a/app/javascript/flavours/glitch/features/compose/components/thread_mode_button.jsx b/app/javascript/flavours/glitch/features/compose/components/thread_mode_button.jsx
new file mode 100644
index 00000000000000..59d569a999dd09
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/compose/components/thread_mode_button.jsx
@@ -0,0 +1,41 @@
+import { useCallback } from 'react';
+
+import { useIntl, defineMessages } from 'react-intl';
+
+import QuickreplyIcon from '@/material-icons/400-20px/quickreply.svg?react';
+import { changeComposeAdvancedOption } from 'flavours/glitch/actions/compose';
+import { IconButton } from 'flavours/glitch/components/icon_button';
+import { useAppSelector, useAppDispatch } from 'flavours/glitch/store';
+
+const messages = defineMessages({
+ enable_threaded_mode: { id: 'compose.enable_threaded_mode', defaultMessage: 'Enable threaded mode' },
+ disable_threaded_mode: { id: 'compose.disable_threaded_mode', defaultMessage: 'Disable threaded mode' },
+});
+
+export const ThreadModeButton = () => {
+ const intl = useIntl();
+
+ const isEditing = useAppSelector((state) => state.getIn(['compose', 'id']) !== null);
+ const active = useAppSelector((state) => state.getIn(['compose', 'advanced_options', 'threaded_mode']));
+
+ const dispatch = useAppDispatch();
+
+ const handleClick = useCallback(() => {
+ dispatch(changeComposeAdvancedOption('threaded_mode', !active));
+ }, [active, dispatch]);
+
+ const title = intl.formatMessage(active ? messages.disable_threaded_mode : messages.enable_threaded_mode);
+
+ return (
+
+ );
+};
diff --git a/app/javascript/flavours/glitch/features/compose/components/upload.jsx b/app/javascript/flavours/glitch/features/compose/components/upload.jsx
index c317fc4fc13568..790d76264d2bdd 100644
--- a/app/javascript/flavours/glitch/features/compose/components/upload.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/upload.jsx
@@ -1,70 +1,81 @@
import PropTypes from 'prop-types';
+import { useCallback } from 'react';
import { FormattedMessage } from 'react-intl';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import classNames from 'classnames';
+
+import { useDispatch, useSelector } from 'react-redux';
import spring from 'react-motion/lib/spring';
-import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import CloseIcon from '@/material-icons/400-20px/close.svg?react';
import EditIcon from '@/material-icons/400-24px/edit.svg?react';
-import InfoIcon from '@/material-icons/400-24px/info.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';
+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']));
-import Motion from '../../ui/util/optional_motion';
-
-export default class Upload extends ImmutablePureComponent {
-
- static propTypes = {
- media: ImmutablePropTypes.map.isRequired,
- onUndo: PropTypes.func.isRequired,
- onOpenFocalPoint: PropTypes.func.isRequired,
- };
-
- handleUndoClick = e => {
- e.stopPropagation();
- this.props.onUndo(this.props.media.get('id'));
- };
-
- handleFocalPointClick = e => {
- e.stopPropagation();
- this.props.onOpenFocalPoint(this.props.media.get('id'));
- };
-
- render () {
- const { media } = 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;
-
- return (
-
-
- {({ scale }) => (
-
-
-
-
-
-
- {(media.get('description') || '').length === 0 && (
-
-
-
- )}
-
-
- );
+ const handleUndoClick = useCallback(() => {
+ dispatch(undoUploadCompose(id));
+ }, [dispatch, id]);
+
+ const handleFocalPointClick = useCallback(() => {
+ dispatch(initMediaEditModal(id));
+ }, [dispatch, id]);
+
+ const handleDragStart = useCallback(() => {
+ onDragStart(id);
+ }, [onDragStart, id]);
+
+ const handleDragEnter = useCallback(() => {
+ onDragEnter(id);
+ }, [onDragEnter, id]);
+
+ 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_button.jsx b/app/javascript/flavours/glitch/features/compose/components/upload_button.jsx
new file mode 100644
index 00000000000000..ed2cbb04f27223
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/compose/components/upload_button.jsx
@@ -0,0 +1,109 @@
+import PropTypes from 'prop-types';
+
+import { defineMessages, injectIntl } from 'react-intl';
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { connect } from 'react-redux';
+
+import PhotoLibraryIcon from '@/material-icons/400-20px/photo_library.svg?react';
+import BrushIcon from '@/material-icons/400-24px/brush.svg?react';
+import UploadFileIcon from '@/material-icons/400-24px/upload_file.svg?react';
+
+import { DropdownIconButton } from './dropdown_icon_button';
+
+const messages = defineMessages({
+ upload: { id: 'upload_button.label', defaultMessage: 'Add images, a video or an audio file' },
+ doodle: { id: 'compose.attach.doodle', defaultMessage: 'Draw something' },
+});
+
+const makeMapStateToProps = () => {
+ const mapStateToProps = state => ({
+ acceptContentTypes: state.getIn(['media_attachments', 'accept_content_types']),
+ });
+
+ return mapStateToProps;
+};
+
+class UploadButton extends ImmutablePureComponent {
+
+ static propTypes = {
+ disabled: PropTypes.bool,
+ onSelectFile: PropTypes.func.isRequired,
+ onDoodleOpen: PropTypes.func.isRequired,
+ style: PropTypes.object,
+ resetFileKey: PropTypes.number,
+ acceptContentTypes: ImmutablePropTypes.listOf(PropTypes.string).isRequired,
+ intl: PropTypes.object.isRequired,
+ };
+
+ handleChange = (e) => {
+ if (e.target.files.length > 0) {
+ this.props.onSelectFile(e.target.files);
+ }
+ };
+
+ handleSelect = (value) => {
+ if (value === 'upload') {
+ this.fileElement.click();
+ } else {
+ this.props.onDoodleOpen();
+ }
+ };
+
+ setRef = (c) => {
+ this.fileElement = c;
+ };
+
+ render () {
+ const { intl, resetFileKey, disabled, acceptContentTypes } = this.props;
+
+ const message = intl.formatMessage(messages.upload);
+
+ const options = [
+ {
+ icon: 'cloud-upload',
+ iconComponent: UploadFileIcon,
+ value: 'upload',
+ text: intl.formatMessage(messages.upload),
+ },
+ {
+ icon: 'paint-brush',
+ iconComponent: BrushIcon,
+ value: 'doodle',
+ text: intl.formatMessage(messages.doodle),
+ },
+ ];
+
+ return (
+
+
+
+
+ );
+ }
+
+}
+
+export default connect(makeMapStateToProps)(injectIntl(UploadButton));
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 cf2e53ad905f0d..2b26735f5e1cc5 100644
--- a/app/javascript/flavours/glitch/features/compose/components/upload_form.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/upload_form.jsx
@@ -1,32 +1,56 @@
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import { useRef, useCallback } from 'react';
-import SensitiveButtonContainer from '../containers/sensitive_button_container';
-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 'flavours/glitch/actions/compose';
- static propTypes = {
- mediaIds: ImmutablePropTypes.list.isRequired,
- };
+import { SensitiveButton } from './sensitive_button';
+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();
-
+ 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 => (
-
+
))}
+ )}
- {!mediaIds.isEmpty() &&
}
-
- );
- }
-
-}
+ {!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 f4408b5460084c..f72f2c4603ebac 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,48 +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;
- }
+export const UploadProgress = ({ active, progress, isProcessing }) => {
+ if (!active) {
+ return null;
+ }
- let message;
+ let message;
- if (isProcessing) {
- message =
;
- } else {
- message =
;
- }
+ if (isProcessing) {
+ message =
;
+ } else {
+ message =
;
+ }
- return (
-
-
-
-
+ return (
+
+
-
- {message}
+
+ {message}
-
-
- {({ width }) =>
-
- }
-
-
+
+
+ {({ width }) =>
+
+ }
+
- );
- }
-
-}
+
+ );
+};
+
+UploadProgress.propTypes = {
+ active: PropTypes.bool,
+ progress: PropTypes.number,
+ isProcessing: PropTypes.bool,
+};
diff --git a/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js b/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js
index d6757c39be2ff7..f519f06a19ea84 100644
--- a/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js
+++ b/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js
@@ -11,8 +11,6 @@ import {
fetchComposeSuggestions,
selectComposeSuggestion,
changeComposeSpoilerText,
- changeComposeSpoilerness,
- changeComposeVisibility,
insertEmojiCompose,
uploadCompose,
startLaTeXCompose,
@@ -59,11 +57,13 @@ const mapStateToProps = state => ({
text: state.getIn(['compose', 'text']),
suggestions: state.getIn(['compose', 'suggestions']),
spoiler: state.getIn(['local_settings', 'always_show_spoilers_field']) || state.getIn(['compose', 'spoiler']),
+ spoilerAlwaysOn: state.getIn(['local_settings', 'always_show_spoilers_field']),
spoilerText: state.getIn(['compose', 'spoiler_text']),
privacy: state.getIn(['compose', 'privacy']),
focusDate: state.getIn(['compose', 'focusDate']),
caretPosition: state.getIn(['compose', 'caretPosition']),
preselectDate: state.getIn(['compose', 'preselectDate']),
+ preselectOnReply: state.getIn(['local_settings', 'preselect_on_reply']),
isSubmitting: state.getIn(['compose', 'is_submitting']),
isEditing: state.getIn(['compose', 'id']) !== null,
isChangingUpload: state.getIn(['compose', 'is_changing_upload']),
@@ -71,14 +71,10 @@ const mapStateToProps = state => ({
anyMedia: state.getIn(['compose', 'media_attachments']).size > 0,
isInReply: state.getIn(['compose', 'in_reply_to']) !== null,
lang: state.getIn(['compose', 'language']),
- advancedOptions: state.getIn(['compose', 'advanced_options']),
- media: state.getIn(['compose', 'media_attachments']),
sideArm: sideArmPrivacy(state),
- sensitive: state.getIn(['compose', 'sensitive']),
- showSearch: state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']),
- spoilersAlwaysOn: state.getIn(['local_settings', 'always_show_spoilers_field']),
+ media: state.getIn(['compose', 'media_attachments']),
mediaDescriptionConfirmation: state.getIn(['local_settings', 'confirm_missing_media_description']),
- preselectOnReply: state.getIn(['local_settings', 'preselect_on_reply']),
+ maxChars: state.getIn(['server', 'server', 'configuration', 'statuses', 'max_characters'], 500),
});
const mapDispatchToProps = (dispatch, { intl }) => ({
@@ -87,8 +83,8 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
dispatch(changeCompose(text));
},
- onSubmit (router) {
- dispatch(submitCompose(router));
+ onSubmit (router, overridePrivacy = null) {
+ dispatch(submitCompose(router, overridePrivacy));
},
onClearSuggestions () {
@@ -103,41 +99,30 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
dispatch(selectComposeSuggestion(position, token, suggestion, path));
},
- onChangeSpoilerText (text) {
- dispatch(changeComposeSpoilerText(text));
+ onChangeSpoilerText (checked) {
+ dispatch(changeComposeSpoilerText(checked));
},
onPaste (files) {
dispatch(uploadCompose(files));
},
- onPickEmoji (position, emoji) {
- dispatch(insertEmojiCompose(position, emoji));
+ onPickEmoji (position, data, needsSpace) {
+ dispatch(insertEmojiCompose(position, data, needsSpace));
},
onLaTeXStart (position, data) {
dispatch(startLaTeXCompose(position, data));
},
- onChangeSpoilerness() {
- dispatch(changeComposeSpoilerness());
- },
-
- onChangeVisibility(value) {
- dispatch(changeComposeVisibility(value));
- },
-
- onMediaDescriptionConfirm(routerHistory, mediaId, overriddenVisibility = null) {
+ onMediaDescriptionConfirm (routerHistory, mediaId, overridePrivacy = null) {
dispatch(openModal({
modalType: 'CONFIRM',
modalProps: {
message: intl.formatMessage(messages.missingDescriptionMessage),
confirm: intl.formatMessage(messages.missingDescriptionConfirm),
onConfirm: () => {
- if (overriddenVisibility) {
- dispatch(changeComposeVisibility(overriddenVisibility));
- }
- dispatch(submitCompose(routerHistory));
+ dispatch(submitCompose(routerHistory, overridePrivacy));
},
secondary: intl.formatMessage(messages.missingDescriptionEdit),
onSecondary: () => dispatch(openModal({
diff --git a/app/javascript/flavours/glitch/features/compose/containers/dropdown_container.js b/app/javascript/flavours/glitch/features/compose/containers/dropdown_container.js
deleted file mode 100644
index aa156b8e563df3..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/containers/dropdown_container.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { connect } from 'react-redux';
-
-import { openModal, closeModal } from 'flavours/glitch/actions/modal';
-import { isUserTouching } from 'flavours/glitch/is_mobile';
-
-import Dropdown from '../components/dropdown';
-
-const mapDispatchToProps = dispatch => ({
- isUserTouching,
- onModalOpen: props => dispatch(openModal({ modalType: 'ACTIONS', modalProps: props })),
- onModalClose: () => dispatch(closeModal({ modalType: undefined, ignoreFocus: false })),
-});
-
-export default connect(null, mapDispatchToProps)(Dropdown);
diff --git a/app/javascript/flavours/glitch/features/compose/containers/header_container.js b/app/javascript/flavours/glitch/features/compose/containers/header_container.js
deleted file mode 100644
index 5b78c8b9cd0cd2..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/containers/header_container.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import { defineMessages, injectIntl } from 'react-intl';
-
-import { connect } from 'react-redux';
-
-import { openModal } from 'flavours/glitch/actions/modal';
-import { logOut } from 'flavours/glitch/utils/log_out';
-
-import Header from '../components/header';
-
-const messages = defineMessages({
- logoutMessage: { id: 'confirmations.logout.message', defaultMessage: 'Are you sure you want to log out?' },
- logoutConfirm: { id: 'confirmations.logout.confirm', defaultMessage: 'Log out' },
-});
-
-const mapStateToProps = state => {
- return {
- columns: state.getIn(['settings', 'columns']),
- unreadNotifications: state.getIn(['notifications', 'unread']),
- showNotificationsBadge: state.getIn(['local_settings', 'notifications', 'tab_badge']),
- };
-};
-
-const mapDispatchToProps = (dispatch, { intl }) => ({
- onSettingsClick (e) {
- e.preventDefault();
- e.stopPropagation();
- dispatch(openModal({ modalType: 'SETTINGS', modalProps: {} }));
- },
- onLogout () {
- dispatch(openModal({
- modalType: 'CONFIRM',
- modalProps: {
- message: intl.formatMessage(messages.logoutMessage),
- confirm: intl.formatMessage(messages.logoutConfirm),
- closeWhenConfirm: false,
- onConfirm: () => logOut(),
- },
- }));
- },
-});
-
-export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(Header));
diff --git a/app/javascript/flavours/glitch/features/compose/containers/navigation_container.js b/app/javascript/flavours/glitch/features/compose/containers/navigation_container.js
deleted file mode 100644
index 459fffd9107463..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/containers/navigation_container.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import { defineMessages, injectIntl } from 'react-intl';
-
-import { connect } from 'react-redux';
-
-import { openModal } from 'flavours/glitch/actions/modal';
-import { logOut } from 'flavours/glitch/utils/log_out';
-
-import { me } from '../../../initial_state';
-import NavigationBar from '../components/navigation_bar';
-
-const messages = defineMessages({
- logoutMessage: { id: 'confirmations.logout.message', defaultMessage: 'Are you sure you want to log out?' },
- logoutConfirm: { id: 'confirmations.logout.confirm', defaultMessage: 'Log out' },
-});
-
-const mapStateToProps = state => {
- return {
- account: state.getIn(['accounts', me]),
- };
-};
-
-const mapDispatchToProps = (dispatch, { intl }) => ({
- onLogout () {
- dispatch(openModal({
- modalType: 'CONFIRM',
- modalProps: {
- message: intl.formatMessage(messages.logoutMessage),
- confirm: intl.formatMessage(messages.logoutConfirm),
- closeWhenConfirm: false,
- onConfirm: () => logOut(),
- },
- }));
- },
-});
-
-export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(NavigationBar));
diff --git a/app/javascript/flavours/glitch/features/compose/containers/options_container.js b/app/javascript/flavours/glitch/features/compose/containers/options_container.js
deleted file mode 100644
index c44d3ce3050c90..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/containers/options_container.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import { connect } from 'react-redux';
-
-import {
- changeComposeAdvancedOption,
- changeComposeContentType,
- addPoll,
- removePoll,
-} from 'flavours/glitch/actions/compose';
-import { openModal } from 'flavours/glitch/actions/modal';
-
-import Options from '../components/options';
-
-function mapStateToProps (state) {
- const poll = state.getIn(['compose', 'poll']);
- const media = state.getIn(['compose', 'media_attachments']);
- const pending_media = state.getIn(['compose', 'pending_media_attachments']);
- return {
- acceptContentTypes: state.getIn(['media_attachments', 'accept_content_types']).toArray().join(','),
- resetFileKey: state.getIn(['compose', 'resetFileKey']),
- hasPoll: !!poll,
- allowMedia: !poll && (media ? media.size + pending_media < 4 && !media.some(item => ['video', 'audio'].includes(item.get('type'))) : pending_media < 4),
- allowPoll: !(media && !!media.size),
- showContentTypeChoice: state.getIn(['local_settings', 'show_content_type_choice']),
- contentType: state.getIn(['compose', 'content_type']),
- };
-}
-
-const mapDispatchToProps = (dispatch) => ({
-
- onChangeAdvancedOption(option, value) {
- dispatch(changeComposeAdvancedOption(option, value));
- },
-
- onChangeContentType(value) {
- dispatch(changeComposeContentType(value));
- },
-
- onTogglePoll() {
- dispatch((_, getState) => {
- if (getState().getIn(['compose', 'poll'])) {
- dispatch(removePoll());
- } else {
- dispatch(addPoll());
- }
- });
- },
-
- onDoodleOpen() {
- dispatch(openModal({
- modalType: 'DOODLE',
- modalProps: { noEsc: true, noClose: true },
- }));
- },
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(Options);
diff --git a/app/javascript/flavours/glitch/features/compose/containers/poll_button_container.js b/app/javascript/flavours/glitch/features/compose/containers/poll_button_container.js
new file mode 100644
index 00000000000000..9de388f64aab78
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/compose/containers/poll_button_container.js
@@ -0,0 +1,25 @@
+import { connect } from 'react-redux';
+
+import { addPoll, removePoll } from '../../../actions/compose';
+import PollButton from '../components/poll_button';
+
+const mapStateToProps = state => ({
+ disabled: state.getIn(['compose', 'is_uploading']) || (state.getIn(['compose', 'media_attachments']).size > 0),
+ active: state.getIn(['compose', 'poll']) !== null,
+});
+
+const mapDispatchToProps = dispatch => ({
+
+ onClick () {
+ dispatch((_, getState) => {
+ if (getState().getIn(['compose', 'poll'])) {
+ dispatch(removePoll());
+ } else {
+ dispatch(addPoll());
+ }
+ });
+ },
+
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(PollButton);
diff --git a/app/javascript/flavours/glitch/features/compose/containers/poll_form_container.js b/app/javascript/flavours/glitch/features/compose/containers/poll_form_container.js
deleted file mode 100644
index 177ffcea6acb4b..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/containers/poll_form_container.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import { connect } from 'react-redux';
-
-import {
- addPollOption,
- removePollOption,
- changePollOption,
- changePollSettings,
- clearComposeSuggestions,
- fetchComposeSuggestions,
- selectComposeSuggestion,
-} from '../../../actions/compose';
-import PollForm from '../components/poll_form';
-
-const mapStateToProps = state => ({
- suggestions: state.getIn(['compose', 'suggestions']),
- options: state.getIn(['compose', 'poll', 'options']),
- lang: state.getIn(['compose', 'language']),
- expiresIn: state.getIn(['compose', 'poll', 'expires_in']),
- isMultiple: state.getIn(['compose', 'poll', 'multiple']),
-});
-
-const mapDispatchToProps = dispatch => ({
- onAddOption(title) {
- dispatch(addPollOption(title));
- },
-
- onRemoveOption(index) {
- dispatch(removePollOption(index));
- },
-
- onChangeOption(index, title) {
- dispatch(changePollOption(index, title));
- },
-
- onChangeSettings(expiresIn, isMultiple) {
- dispatch(changePollSettings(expiresIn, isMultiple));
- },
-
- onClearSuggestions () {
- dispatch(clearComposeSuggestions());
- },
-
- onFetchSuggestions (token) {
- dispatch(fetchComposeSuggestions(token));
- },
-
- onSuggestionSelected (position, token, accountId, path) {
- dispatch(selectComposeSuggestion(position, token, accountId, path));
- },
-
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(PollForm);
diff --git a/app/javascript/flavours/glitch/features/compose/containers/reply_indicator_container.js b/app/javascript/flavours/glitch/features/compose/containers/reply_indicator_container.js
deleted file mode 100644
index 1147e448afef33..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/containers/reply_indicator_container.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import { connect } from 'react-redux';
-
-import { cancelReplyCompose } from '../../../actions/compose';
-import { makeGetStatus } from '../../../selectors';
-import ReplyIndicator from '../components/reply_indicator';
-
-const makeMapStateToProps = () => {
- const getStatus = makeGetStatus();
-
- const mapStateToProps = state => {
- let statusId = state.getIn(['compose', 'id'], null);
- let editing = true;
-
- if (statusId === null) {
- statusId = state.getIn(['compose', 'in_reply_to']);
- editing = false;
- }
-
- return {
- status: getStatus(state, { id: statusId }),
- editing,
- };
- };
-
- return mapStateToProps;
-};
-
-const mapDispatchToProps = dispatch => ({
-
- onCancel () {
- dispatch(cancelReplyCompose());
- },
-
-});
-
-export default connect(makeMapStateToProps, mapDispatchToProps)(ReplyIndicator);
diff --git a/app/javascript/flavours/glitch/features/compose/containers/search_container.js b/app/javascript/flavours/glitch/features/compose/containers/search_container.js
index 93b8645ac62f8b..d2da52c8c0c6e7 100644
--- a/app/javascript/flavours/glitch/features/compose/containers/search_container.js
+++ b/app/javascript/flavours/glitch/features/compose/containers/search_container.js
@@ -42,8 +42,8 @@ const mapDispatchToProps = dispatch => ({
dispatch(showSearch());
},
- onOpenURL (routerHistory) {
- dispatch(openURL(routerHistory));
+ onOpenURL (q, routerHistory) {
+ dispatch(openURL(q, routerHistory));
},
onClickSearchResult (q, type) {
diff --git a/app/javascript/flavours/glitch/features/compose/containers/search_results_container.js b/app/javascript/flavours/glitch/features/compose/containers/search_results_container.js
deleted file mode 100644
index 7287a022b4be25..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/containers/search_results_container.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { connect } from 'react-redux';
-
-import { expandSearch } from 'flavours/glitch/actions/search';
-import { fetchSuggestions, dismissSuggestion } from 'flavours/glitch/actions/suggestions';
-
-import SearchResults from '../components/search_results';
-
-const mapStateToProps = state => ({
- results: state.getIn(['search', 'results']),
- suggestions: state.getIn(['suggestions', 'items']),
- searchTerm: state.getIn(['search', 'searchTerm']),
-});
-
-const mapDispatchToProps = dispatch => ({
- fetchSuggestions: () => dispatch(fetchSuggestions()),
- expandSearch: type => dispatch(expandSearch(type)),
- dismissSuggestion: account => dispatch(dismissSuggestion(account.get('id'))),
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(SearchResults);
diff --git a/app/javascript/flavours/glitch/features/compose/containers/sensitive_button_container.jsx b/app/javascript/flavours/glitch/features/compose/containers/sensitive_button_container.jsx
deleted file mode 100644
index 5a57332dd9336b..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/containers/sensitive_button_container.jsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
-
-import { injectIntl, defineMessages, FormattedMessage } from 'react-intl';
-
-import classNames from 'classnames';
-
-import { connect } from 'react-redux';
-
-import { changeComposeSensitivity } from 'flavours/glitch/actions/compose';
-
-const messages = defineMessages({
- marked: {
- id: 'compose_form.sensitive.marked',
- defaultMessage: '{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}',
- },
- unmarked: {
- id: 'compose_form.sensitive.unmarked',
- defaultMessage: '{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}',
- },
-});
-
-const mapStateToProps = state => {
- const spoilersAlwaysOn = state.getIn(['local_settings', 'always_show_spoilers_field']);
- const spoilerText = state.getIn(['compose', 'spoiler_text']);
- return {
- active: state.getIn(['compose', 'sensitive']) || (spoilersAlwaysOn && spoilerText && spoilerText.length > 0),
- disabled: state.getIn(['compose', 'spoiler']),
- mediaCount: state.getIn(['compose', 'media_attachments']).size,
- };
-};
-
-const mapDispatchToProps = dispatch => ({
-
- onClick () {
- dispatch(changeComposeSensitivity());
- },
-
-});
-
-class SensitiveButton extends PureComponent {
-
- static propTypes = {
- active: PropTypes.bool,
- disabled: PropTypes.bool,
- mediaCount: PropTypes.number,
- onClick: PropTypes.func.isRequired,
- intl: PropTypes.object.isRequired,
- };
-
- render () {
- const { active, disabled, mediaCount, onClick, intl } = this.props;
-
- return (
-
-
-
- );
- }
-
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(SensitiveButton));
diff --git a/app/javascript/flavours/glitch/features/compose/containers/spoiler_button_container.js b/app/javascript/flavours/glitch/features/compose/containers/spoiler_button_container.js
new file mode 100644
index 00000000000000..fc87ef37252069
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/compose/containers/spoiler_button_container.js
@@ -0,0 +1,32 @@
+import { injectIntl, defineMessages } from 'react-intl';
+
+import { connect } from 'react-redux';
+
+import WarningIcon from '@/material-icons/400-20px/warning.svg?react';
+import { IconButton } from 'flavours/glitch/components/icon_button';
+
+import { changeComposeSpoilerness } from '../../../actions/compose';
+
+const messages = defineMessages({
+ marked: { id: 'compose_form.spoiler.marked', defaultMessage: 'Text is hidden behind warning' },
+ unmarked: { id: 'compose_form.spoiler.unmarked', defaultMessage: 'Text is not hidden' },
+});
+
+const mapStateToProps = (state, { intl }) => ({
+ iconComponent: WarningIcon,
+ title: intl.formatMessage(state.getIn(['compose', 'spoiler']) ? messages.marked : messages.unmarked),
+ active: state.getIn(['compose', 'spoiler']),
+ ariaControls: 'cw-spoiler-input',
+ size: 18,
+ inverted: true,
+});
+
+const mapDispatchToProps = dispatch => ({
+
+ onClick () {
+ dispatch(changeComposeSpoilerness());
+ },
+
+});
+
+export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(IconButton));
diff --git a/app/javascript/flavours/glitch/features/compose/containers/upload_button_container.js b/app/javascript/flavours/glitch/features/compose/containers/upload_button_container.js
new file mode 100644
index 00000000000000..2e835464b85119
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/compose/containers/upload_button_container.js
@@ -0,0 +1,36 @@
+import { connect } from 'react-redux';
+
+import { uploadCompose } from '../../../actions/compose';
+import { openModal } from '../../../actions/modal';
+import UploadButton from '../components/upload_button';
+
+const mapStateToProps = state => {
+ const isPoll = state.getIn(['compose', 'poll']) !== null;
+ const isUploading = state.getIn(['compose', 'is_uploading']);
+ const readyAttachmentsSize = state.getIn(['compose', 'media_attachments']).size ?? 0;
+ const pendingAttachmentsSize = state.getIn(['compose', 'pending_media_attachments']).size ?? 0;
+ const attachmentsSize = readyAttachmentsSize + pendingAttachmentsSize;
+ const isOverLimit = attachmentsSize > 3;
+ const hasVideoOrAudio = state.getIn(['compose', 'media_attachments']).some(m => ['video', 'audio'].includes(m.get('type')));
+
+ return {
+ disabled: isPoll || isUploading || isOverLimit || hasVideoOrAudio,
+ resetFileKey: state.getIn(['compose', 'resetFileKey']),
+ };
+};
+
+const mapDispatchToProps = dispatch => ({
+
+ onSelectFile(files) {
+ dispatch(uploadCompose(files));
+ },
+
+ onDoodleOpen() {
+ dispatch(openModal({
+ modalType: 'DOODLE',
+ modalProps: { noEsc: true, noClose: true },
+ }));
+ },
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(UploadButton);
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 77bb90db87b91a..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/containers/upload_container.js
+++ /dev/null
@@ -1,26 +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),
-});
-
-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 336525cf5399d6..00000000000000
--- 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 ffff321c3fcdf1..00000000000000
--- 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/compose/containers/warning_container.jsx b/app/javascript/flavours/glitch/features/compose/containers/warning_container.jsx
index f339ccdfbfaf1f..c3efe80e8cf575 100644
--- a/app/javascript/flavours/glitch/features/compose/containers/warning_container.jsx
+++ b/app/javascript/flavours/glitch/features/compose/containers/warning_container.jsx
@@ -5,7 +5,6 @@ import { FormattedMessage } from 'react-intl';
import { connect } from 'react-redux';
import { me } from 'flavours/glitch/initial_state';
-import { profileLink, privacyPolicyLink } from 'flavours/glitch/utils/backend_links';
import { HASHTAG_PATTERN_REGEX } from 'flavours/glitch/utils/hashtags';
import Warning from '../components/warning';
@@ -18,7 +17,7 @@ const mapStateToProps = state => ({
const WarningWrapper = ({ needsLockWarning, hashtagWarning, directMessageWarning }) => {
if (needsLockWarning) {
- return
}} />} />;
+ return }} />} />;
}
if (hashtagWarning) {
@@ -28,7 +27,7 @@ const WarningWrapper = ({ needsLockWarning, hashtagWarning, directMessageWarning
if (directMessageWarning) {
const message = (
- {!!privacyPolicyLink && }
+
);
diff --git a/app/javascript/flavours/glitch/features/compose/index.jsx b/app/javascript/flavours/glitch/features/compose/index.jsx
index 86d5f31485e476..b59fafe0481676 100644
--- a/app/javascript/flavours/glitch/features/compose/index.jsx
+++ b/app/javascript/flavours/glitch/features/compose/index.jsx
@@ -3,100 +3,187 @@ import { PureComponent } from 'react';
import { injectIntl, defineMessages } from 'react-intl';
-import classNames from 'classnames';
import { Helmet } from 'react-helmet';
+import { Link } from 'react-router-dom';
+import ImmutablePropTypes from 'react-immutable-proptypes';
import { connect } from 'react-redux';
import spring from 'react-motion/lib/spring';
-import { mountCompose, unmountCompose, cycleElefriendCompose } from 'flavours/glitch/actions/compose';
+import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
+import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
+import LogoutIcon from '@/material-icons/400-24px/logout.svg?react';
+import ManufacturingIcon from '@/material-icons/400-24px/manufacturing-fill.svg?react';
+import MenuIcon from '@/material-icons/400-24px/menu.svg?react';
+import NotificationsIcon from '@/material-icons/400-24px/notifications-fill.svg?react';
+import PublicIcon from '@/material-icons/400-24px/public.svg?react';
+import { openModal } from 'flavours/glitch/actions/modal';
import Column from 'flavours/glitch/components/column';
-
+import { Icon } from 'flavours/glitch/components/icon';
+import glitchedElephant1 from 'flavours/glitch/images/mbstobon-ui-0.png';
+import glitchedElephant2 from 'flavours/glitch/images/mbstobon-ui-1.png';
+import glitchedElephant3 from 'flavours/glitch/images/mbstobon-ui-2.png';
+import { logOut } from 'flavours/glitch/utils/log_out';
+
+import elephantUIPlane from '../../../../images/elephant_ui_plane.svg';
+import { changeComposing, mountCompose, unmountCompose } from '../../actions/compose';
import { mascot } from '../../initial_state';
+import { isMobile } from '../../is_mobile';
import Motion from '../ui/util/optional_motion';
+import { SearchResults } from './components/search_results';
import ComposeFormContainer from './containers/compose_form_container';
-import HeaderContainer from './containers/header_container';
-import NavigationContainer from './containers/navigation_container';
import SearchContainer from './containers/search_container';
-import SearchResultsContainer from './containers/search_results_container';
const messages = defineMessages({
+ start: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
+ home_timeline: { id: 'tabs_bar.home', defaultMessage: 'Home' },
+ notifications: { id: 'tabs_bar.notifications', defaultMessage: 'Notifications' },
+ public: { id: 'navigation_bar.public_timeline', defaultMessage: 'Federated timeline' },
+ community: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
+ settings: { id: 'navigation_bar.app_settings', defaultMessage: 'App settings' },
+ logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },
compose: { id: 'navigation_bar.compose', defaultMessage: 'Compose new post' },
+ logoutMessage: { id: 'confirmations.logout.message', defaultMessage: 'Are you sure you want to log out?' },
+ logoutConfirm: { id: 'confirmations.logout.confirm', defaultMessage: 'Log out' },
});
const mapStateToProps = (state, ownProps) => ({
- elefriend: state.getIn(['compose', 'elefriend']),
+ columns: state.getIn(['settings', 'columns']),
showSearch: ownProps.multiColumn ? state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']) : false,
+ unreadNotifications: state.getIn(['notifications', 'unread']),
+ showNotificationsBadge: state.getIn(['local_settings', 'notifications', 'tab_badge']),
});
-const mapDispatchToProps = (dispatch) => ({
- onClickElefriend () {
- dispatch(cycleElefriendCompose());
- },
-
- onMount () {
- dispatch(mountCompose());
- },
-
- onUnmount () {
- dispatch(unmountCompose());
- },
-});
+// ~4% chance you'll end up with an unexpected friend
+// glitch-soc/mastodon repo created_at date: 2017-04-20T21:55:28Z
+const glitchProbability = 1 - 0.0420215528;
+const totalElefriends = 3;
class Compose extends PureComponent {
static propTypes = {
+ dispatch: PropTypes.func.isRequired,
+ columns: ImmutablePropTypes.list.isRequired,
multiColumn: PropTypes.bool,
showSearch: PropTypes.bool,
- elefriend: PropTypes.number,
- onClickElefriend: PropTypes.func,
- onMount: PropTypes.func,
- onUnmount: PropTypes.func,
+ unreadNotifications: PropTypes.number,
+ showNotificationsBadge: PropTypes.bool,
intl: PropTypes.object.isRequired,
};
+ state = {
+ elefriend: Math.random() < glitchProbability ? Math.floor(Math.random() * totalElefriends) : totalElefriends,
+ };
+
componentDidMount () {
- this.props.onMount();
+ const { dispatch } = this.props;
+ dispatch(mountCompose());
}
componentWillUnmount () {
- this.props.onUnmount();
+ const { dispatch } = this.props;
+ dispatch(unmountCompose());
}
+ handleLogoutClick = e => {
+ const { dispatch, intl } = this.props;
+
+ e.preventDefault();
+ e.stopPropagation();
+
+ dispatch(openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: intl.formatMessage(messages.logoutMessage),
+ confirm: intl.formatMessage(messages.logoutConfirm),
+ closeWhenConfirm: false,
+ onConfirm: () => logOut(),
+ },
+ }));
+
+ return false;
+ };
+
+ handleSettingsClick = e => {
+ const { dispatch } = this.props;
+
+ e.preventDefault();
+ e.stopPropagation();
+
+ dispatch(openModal({ modalType: 'SETTINGS', modalProps: {} }));
+ };
+
+ onFocus = () => {
+ this.props.dispatch(changeComposing(true));
+ };
+
+ onBlur = () => {
+ this.props.dispatch(changeComposing(false));
+ };
+
+ cycleElefriend = () => {
+ this.setState((state) => ({ elefriend: (state.elefriend + 1) % totalElefriends }));
+ };
+
render () {
- const {
- elefriend,
- intl,
- multiColumn,
- onClickElefriend,
- showSearch,
- } = this.props;
- const computedClass = classNames('drawer', `mbstobon-${elefriend}`);
+ const { multiColumn, showSearch, showNotificationsBadge, unreadNotifications, intl } = this.props;
+
+ const elefriend = [glitchedElephant1, glitchedElephant2, glitchedElephant3, elephantUIPlane][this.state.elefriend];
if (multiColumn) {
- return (
-
-
+ const { columns } = this.props;
- {multiColumn &&
}
+ return (
+
+
+
+ {multiColumn &&
}
-
-
-
-
+
+
-
- {mascot ?
:
}
+ {/* eslint-disable-next-line jsx-a11y/no-static-element-interactions -- this is not a feature but a visual easter egg */}
+
+
-
+
)}
@@ -106,8 +193,7 @@ class Compose extends PureComponent {
}
return (
-
-
+
@@ -119,4 +205,4 @@ class Compose extends PureComponent {
}
-export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(Compose));
+export default connect(mapStateToProps)(injectIntl(Compose));
diff --git a/app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.jsx b/app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.jsx
index 9c8e23ce73058e..45de7010b641e8 100644
--- a/app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.jsx
+++ b/app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.jsx
@@ -26,18 +26,20 @@ class ColumnSettings extends PureComponent {
const { settings, onChange, intl } = this.props;
return (
-
-
-
-
- } />
-
-
-
-
-
-
-
+
);
}
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 60927f81c36be4..ed4736d7e67cf2 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/directory/index.jsx b/app/javascript/flavours/glitch/features/directory/index.jsx
index 0d8742b2559082..293b89272aa10a 100644
--- a/app/javascript/flavours/glitch/features/directory/index.jsx
+++ b/app/javascript/flavours/glitch/features/directory/index.jsx
@@ -9,7 +9,6 @@ import { List as ImmutableList } from 'immutable';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { connect } from 'react-redux';
-
import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
import { addColumn, removeColumn, moveColumn, changeColumnParams } from 'flavours/glitch/actions/columns';
import { fetchDirectory, expandDirectory } from 'flavours/glitch/actions/directory';
diff --git a/app/javascript/flavours/glitch/features/emoji/emoji.js b/app/javascript/flavours/glitch/features/emoji/emoji.js
index 6fed8a3190d5b4..9761c940599adb 100644
--- a/app/javascript/flavours/glitch/features/emoji/emoji.js
+++ b/app/javascript/flavours/glitch/features/emoji/emoji.js
@@ -17,8 +17,13 @@ const emojiFilenames = (emojis) => {
const darkEmoji = emojiFilenames(['🎱', '🐜', '⚫', '🖤', '⬛', '◼️', '◾', '◼️', '✒️', '▪️', '💣', '🎳', '📷', '📸', '♣️', '🕶️', '✴️', '🔌', '💂♀️', '📽️', '🍳', '🦍', '💂', '🔪', '🕳️', '🕹️', '🕋', '🖊️', '🖋️', '💂♂️', '🎤', '🎓', '🎥', '🎼', '♠️', '🎩', '🦃', '📼', '📹', '🎮', '🐃', '🏴', '🐞', '🕺', '📱', '📲', '🚲', '🪮', '🐦⬛']);
const lightEmoji = emojiFilenames(['👽', '⚾', '🐔', '☁️', '💨', '🕊️', '👀', '🍥', '👻', '🐐', '❕', '❔', '⛸️', '🌩️', '🔊', '🔇', '📃', '🌧️', '🐏', '🍚', '🍙', '🐓', '🐑', '💀', '☠️', '🌨️', '🔉', '🔈', '💬', '💭', '🏐', '🏳️', '⚪', '⬜', '◽', '◻️', '▫️', '🪽', '🪿']);
-const emojiFilename = (filename) => {
- const borderedEmoji = (document.body && document.body.classList.contains('skin-mastodon-light')) ? lightEmoji : darkEmoji;
+/**
+ * @param {string} filename
+ * @param {"light" | "dark" } colorScheme
+ * @returns {string}
+ */
+const emojiFilename = (filename, colorScheme) => {
+ const borderedEmoji = colorScheme === "light" ? lightEmoji : darkEmoji;
return borderedEmoji.includes(filename) ? (filename + '_border') : filename;
};
@@ -92,12 +97,30 @@ const emojifyTextNode = (node, customEmojis) => {
const { filename, shortCode } = unicodeMapping[unicode_emoji];
const title = shortCode ? `:${shortCode}:` : '';
- replacement = document.createElement('img');
- replacement.setAttribute('draggable', 'false');
- replacement.setAttribute('class', 'emojione');
- replacement.setAttribute('alt', unicode_emoji);
- replacement.setAttribute('title', title);
- replacement.setAttribute('src', `${assetHost}/emoji/${emojiFilename(filename)}.svg`);
+ replacement = document.createElement('picture');
+
+ const isSystemTheme = !!document.body?.classList.contains('theme-system');
+
+ if(isSystemTheme) {
+ let source = document.createElement('source');
+ source.setAttribute('media', '(prefers-color-scheme: dark)');
+ source.setAttribute('srcset', `${assetHost}/emoji/${emojiFilename(filename, "dark")}.svg`);
+ replacement.appendChild(source);
+ }
+
+ let img = document.createElement('img');
+ img.setAttribute('draggable', 'false');
+ img.setAttribute('class', 'emojione');
+ img.setAttribute('alt', unicode_emoji);
+ img.setAttribute('title', title);
+
+ let theme = "light";
+
+ if(!isSystemTheme && !document.body?.classList.contains('skin-mastodon-light'))
+ theme = "dark";
+
+ img.setAttribute('src', `${assetHost}/emoji/${emojiFilename(filename, theme)}.svg`);
+ replacement.appendChild(img);
}
// Add the processed-up-to-now string and the emoji replacement
diff --git a/app/javascript/flavours/glitch/features/emoji/emoji_compressed.js b/app/javascript/flavours/glitch/features/emoji/emoji_compressed.js
index 792137b76f4da8..59978a391b0d75 100644
--- a/app/javascript/flavours/glitch/features/emoji/emoji_compressed.js
+++ b/app/javascript/flavours/glitch/features/emoji/emoji_compressed.js
@@ -36,7 +36,7 @@ Object.keys(emojiIndex.emojis).forEach(key => {
let emoji = emojiIndex.emojis[key];
// Emojis with skin tone modifiers are stored like this
- if (Object.prototype.hasOwnProperty.call(emoji, '1')) {
+ if (Object.hasOwn(emoji, '1')) {
emoji = emoji['1'];
}
@@ -88,7 +88,7 @@ Object.keys(emojiIndex.emojis).forEach(key => {
let emoji = emojiIndex.emojis[key];
// Emojis with skin tone modifiers are stored like this
- if (Object.prototype.hasOwnProperty.call(emoji, '1')) {
+ if (Object.hasOwn(emoji, '1')) {
emoji = emoji['1'];
}
diff --git a/app/javascript/flavours/glitch/features/emoji/emoji_mart_data_light.ts b/app/javascript/flavours/glitch/features/emoji/emoji_mart_data_light.ts
index ffca1f8b0630a3..806a3f8927466b 100644
--- a/app/javascript/flavours/glitch/features/emoji/emoji_mart_data_light.ts
+++ b/app/javascript/flavours/glitch/features/emoji/emoji_mart_data_light.ts
@@ -29,7 +29,10 @@ const emojis: Emojis = {};
// decompress
Object.keys(shortCodesToEmojiData).forEach((shortCode) => {
- const [_filenameData, searchData] = shortCodesToEmojiData[shortCode];
+ const emojiData = shortCodesToEmojiData[shortCode];
+ if (!emojiData) return;
+
+ const [_filenameData, searchData] = emojiData;
const [native, short_names, search, unified] = searchData;
emojis[shortCode] = {
diff --git a/app/javascript/flavours/glitch/features/emoji/emoji_unicode_mapping_light.ts b/app/javascript/flavours/glitch/features/emoji/emoji_unicode_mapping_light.ts
index 191419496fb2a9..d116c6c62c87d0 100644
--- a/app/javascript/flavours/glitch/features/emoji/emoji_unicode_mapping_light.ts
+++ b/app/javascript/flavours/glitch/features/emoji/emoji_unicode_mapping_light.ts
@@ -46,7 +46,10 @@ function processEmojiMapData(
Object.keys(shortCodesToEmojiData).forEach(
(shortCode: ShortCodesToEmojiDataKey) => {
if (shortCode === undefined) return;
- const [filenameData, _searchData] = shortCodesToEmojiData[shortCode];
+
+ const emojiData = shortCodesToEmojiData[shortCode];
+ if (!emojiData) return;
+ const [filenameData, _searchData] = emojiData;
filenameData.forEach((emojiMapData) => {
processEmojiMapData(emojiMapData, shortCode);
});
diff --git a/app/javascript/flavours/glitch/features/emoji/emoji_utils.js b/app/javascript/flavours/glitch/features/emoji/emoji_utils.js
index 83bcc9d82f9f14..c13d25056706a4 100644
--- a/app/javascript/flavours/glitch/features/emoji/emoji_utils.js
+++ b/app/javascript/flavours/glitch/features/emoji/emoji_utils.js
@@ -135,19 +135,19 @@ function getData(emoji, skin, set) {
}
}
- if (Object.prototype.hasOwnProperty.call(data.short_names, emoji)) {
+ if (Object.hasOwn(data.short_names, emoji)) {
emoji = data.short_names[emoji];
}
- if (Object.prototype.hasOwnProperty.call(data.emojis, emoji)) {
+ if (Object.hasOwn(data.emojis, emoji)) {
emojiData = data.emojis[emoji];
}
} else if (emoji.id) {
- if (Object.prototype.hasOwnProperty.call(data.short_names, emoji.id)) {
+ if (Object.hasOwn(data.short_names, emoji.id)) {
emoji.id = data.short_names[emoji.id];
}
- if (Object.prototype.hasOwnProperty.call(data.emojis, emoji.id)) {
+ if (Object.hasOwn(data.emojis, emoji.id)) {
emojiData = data.emojis[emoji.id];
skin = skin || emoji.skin;
}
@@ -216,7 +216,7 @@ function deepMerge(a, b) {
let originalValue = a[key],
value = originalValue;
- if (Object.prototype.hasOwnProperty.call(b, key)) {
+ if (Object.hasOwn(b, key)) {
value = b[key];
}
diff --git a/app/javascript/flavours/glitch/features/explore/components/card.jsx b/app/javascript/flavours/glitch/features/explore/components/card.jsx
new file mode 100644
index 00000000000000..85faa92e577020
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/explore/components/card.jsx
@@ -0,0 +1,88 @@
+import PropTypes from 'prop-types';
+import { useCallback } from 'react';
+
+import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import { useDispatch, useSelector } from 'react-redux';
+
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import { followAccount, unfollowAccount } from 'flavours/glitch/actions/accounts';
+import { dismissSuggestion } from 'flavours/glitch/actions/suggestions';
+import { Avatar } from 'flavours/glitch/components/avatar';
+import { Button } from 'flavours/glitch/components/button';
+import { DisplayName } from 'flavours/glitch/components/display_name';
+import { IconButton } from 'flavours/glitch/components/icon_button';
+import { domain } from 'flavours/glitch/initial_state';
+
+const messages = defineMessages({
+ follow: { id: 'account.follow', defaultMessage: 'Follow' },
+ unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
+ dismiss: { id: 'follow_suggestions.dismiss', defaultMessage: "Don't show again" },
+});
+
+export const Card = ({ id, source }) => {
+ const intl = useIntl();
+ const account = useSelector(state => state.getIn(['accounts', id]));
+ const relationship = useSelector(state => state.getIn(['relationships', id]));
+ const dispatch = useDispatch();
+ const following = relationship?.get('following') ?? relationship?.get('requested');
+
+ const handleFollow = useCallback(() => {
+ if (following) {
+ dispatch(unfollowAccount(id));
+ } else {
+ dispatch(followAccount(id));
+ }
+ }, [id, following, dispatch]);
+
+ const handleDismiss = useCallback(() => {
+ dispatch(dismissSuggestion(id));
+ }, [id, dispatch]);
+
+ let label;
+
+ switch (source) {
+ case 'friends_of_friends':
+ label = ;
+ break;
+ case 'similar_to_recently_followed':
+ label = ;
+ break;
+ case 'featured':
+ label = ;
+ break;
+ case 'most_followed':
+ label = ;
+ break;
+ case 'most_interactions':
+ label = ;
+ break;
+ }
+
+ return (
+
+ );
+};
+
+Card.propTypes = {
+ id: PropTypes.string.isRequired,
+ source: PropTypes.oneOf(['friends_of_friends', 'similar_to_recently_followed', 'featured', 'most_followed', 'most_interactions']),
+};
diff --git a/app/javascript/flavours/glitch/features/explore/index.jsx b/app/javascript/flavours/glitch/features/explore/index.jsx
index 9a18ccb72cabaf..8137e75ea4265a 100644
--- a/app/javascript/flavours/glitch/features/explore/index.jsx
+++ b/app/javascript/flavours/glitch/features/explore/index.jsx
@@ -8,12 +8,12 @@ import { NavLink, Switch, Route } from 'react-router-dom';
import { connect } from 'react-redux';
-
+import ExploreIcon from '@/material-icons/400-24px/explore.svg?react';
import SearchIcon from '@/material-icons/400-24px/search.svg?react';
-import TagIcon from '@/material-icons/400-24px/tag.svg?react';
import Column from 'flavours/glitch/components/column';
import ColumnHeader from 'flavours/glitch/components/column_header';
import Search from 'flavours/glitch/features/compose/containers/search_container';
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
import { trendsEnabled } from 'flavours/glitch/initial_state';
import Links from './links';
@@ -33,12 +33,8 @@ const mapStateToProps = state => ({
});
class Explore extends PureComponent {
-
- static contextTypes = {
- identity: PropTypes.object,
- };
-
static propTypes = {
+ identity: identityContextPropShape,
intl: PropTypes.object.isRequired,
multiColumn: PropTypes.bool,
isSearching: PropTypes.bool,
@@ -54,13 +50,13 @@ class Explore extends PureComponent {
render() {
const { intl, multiColumn, isSearching } = this.props;
- const { signedIn } = this.context.identity;
+ const { signedIn } = this.props.identity;
return (
({
suggestions: state.getIn(['suggestions', 'items']),
isLoading: state.getIn(['suggestions', 'isLoading']),
@@ -59,7 +60,11 @@ class Suggestions extends PureComponent {
return (
{isLoading ?
: suggestions.map(suggestion => (
-
+
))}
-
+
diff --git a/app/javascript/flavours/glitch/features/firehose/index.jsx b/app/javascript/flavours/glitch/features/firehose/index.jsx
index 29219974a933de..2a6d790d52aeeb 100644
--- a/app/javascript/flavours/glitch/features/firehose/index.jsx
+++ b/app/javascript/flavours/glitch/features/firehose/index.jsx
@@ -6,7 +6,7 @@ import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
import { Helmet } from 'react-helmet';
import { NavLink } from 'react-router-dom';
-
+import { useIdentity } from '@/flavours/glitch/identity_context';
import PublicIcon from '@/material-icons/400-24px/public.svg?react';
import { addColumn } from 'flavours/glitch/actions/columns';
import { changeSetting } from 'flavours/glitch/actions/settings';
@@ -14,7 +14,7 @@ import { connectPublicStream, connectCommunityStream } from 'flavours/glitch/act
import { expandPublicTimeline, expandCommunityTimeline } from 'flavours/glitch/actions/timelines';
import { DismissableBanner } from 'flavours/glitch/components/dismissable_banner';
import SettingText from 'flavours/glitch/components/setting_text';
-import initialState, { domain } from 'flavours/glitch/initial_state';
+import { domain } from 'flavours/glitch/initial_state';
import { useAppDispatch, useAppSelector } from 'flavours/glitch/store';
import Column from '../../components/column';
@@ -27,15 +27,6 @@ const messages = defineMessages({
filter_regex: { id: 'home.column_settings.filter_regex', defaultMessage: 'Filter out by regular expressions' },
});
-// TODO: use a proper React context later on
-const useIdentity = () => ({
- signedIn: !!initialState.meta.me,
- accountId: initialState.meta.me,
- disabledAccountId: initialState.meta.disabled_account_id,
- accessToken: initialState.meta.access_token,
- permissions: initialState.role ? initialState.role.permissions : 0,
-});
-
const ColumnSettings = () => {
const intl = useIntl();
const dispatch = useAppDispatch();
@@ -46,28 +37,37 @@ const ColumnSettings = () => {
);
return (
-
-
- }
- />
- }
- />
-
-
-
+
+
+
+ }
+ />
+
+ }
+ />
+
+
+
+
);
};
diff --git a/app/javascript/flavours/glitch/features/follow_requests/index.jsx b/app/javascript/flavours/glitch/features/follow_requests/index.jsx
index 7d651f2ca69c24..a8f40a31d0d007 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 (
-
+
{
hasMore: !!state.getIn(['user_lists', 'followers', accountId, 'next']),
isLoading: state.getIn(['user_lists', 'followers', accountId, 'isLoading'], true),
suspended: state.getIn(['accounts', accountId, 'suspended'], false),
+ hideCollections: state.getIn(['accounts', accountId, 'hide_collections'], false),
hidden: getAccountHidden(state, accountId),
};
};
@@ -117,7 +118,7 @@ class Followers extends ImmutablePureComponent {
};
render () {
- const { accountId, accountIds, hasMore, isAccount, multiColumn, isLoading, suspended, hidden, remote, remoteUrl } = this.props;
+ const { accountId, accountIds, hasMore, isAccount, multiColumn, isLoading, suspended, hidden, remote, remoteUrl, hideCollections } = this.props;
if (!isAccount) {
return (
@@ -141,6 +142,8 @@ class Followers extends ImmutablePureComponent {
emptyMessage = ;
} else if (hidden) {
emptyMessage = ;
+ } else if (hideCollections && accountIds.isEmpty()) {
+ emptyMessage = ;
} else if (remote && accountIds.isEmpty()) {
emptyMessage = ;
} else {
diff --git a/app/javascript/flavours/glitch/features/following/index.jsx b/app/javascript/flavours/glitch/features/following/index.jsx
index 69936343028ad0..0d18e76ec4e653 100644
--- a/app/javascript/flavours/glitch/features/following/index.jsx
+++ b/app/javascript/flavours/glitch/features/following/index.jsx
@@ -45,6 +45,7 @@ const mapStateToProps = (state, { params: { acct, id } }) => {
hasMore: !!state.getIn(['user_lists', 'following', accountId, 'next']),
isLoading: state.getIn(['user_lists', 'following', accountId, 'isLoading'], true),
suspended: state.getIn(['accounts', accountId, 'suspended'], false),
+ hideCollections: state.getIn(['accounts', accountId, 'hide_collections'], false),
hidden: getAccountHidden(state, accountId),
};
};
@@ -117,7 +118,7 @@ class Following extends ImmutablePureComponent {
};
render () {
- const { accountId, accountIds, hasMore, isAccount, multiColumn, isLoading, suspended, hidden, remote, remoteUrl } = this.props;
+ const { accountId, accountIds, hasMore, isAccount, multiColumn, isLoading, suspended, hidden, remote, remoteUrl, hideCollections } = this.props;
if (!isAccount) {
return (
@@ -141,6 +142,8 @@ class Following extends ImmutablePureComponent {
emptyMessage = ;
} else if (hidden) {
emptyMessage = ;
+ } else if (hideCollections && accountIds.isEmpty()) {
+ emptyMessage = ;
} else if (remote && accountIds.isEmpty()) {
emptyMessage = ;
} else {
diff --git a/app/javascript/flavours/glitch/features/getting_started/components/announcements.jsx b/app/javascript/flavours/glitch/features/getting_started/components/announcements.jsx
index 27470d99388569..0ff0a863b3b261 100644
--- a/app/javascript/flavours/glitch/features/getting_started/components/announcements.jsx
+++ b/app/javascript/flavours/glitch/features/getting_started/components/announcements.jsx
@@ -343,7 +343,7 @@ class Announcement extends ImmutablePureComponent {
- {hasTimeRange && · - }
+ {hasTimeRange && · - }
diff --git a/app/javascript/flavours/glitch/features/getting_started/index.jsx b/app/javascript/flavours/glitch/features/getting_started/index.jsx
index 866904eafbd85f..2d13d3d58493c0 100644
--- a/app/javascript/flavours/glitch/features/getting_started/index.jsx
+++ b/app/javascript/flavours/glitch/features/getting_started/index.jsx
@@ -11,6 +11,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import BookmarksIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
+import ExploreIcon from '@/material-icons/400-24px/explore.svg?react';
import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
@@ -22,17 +23,17 @@ import NotificationsIcon from '@/material-icons/400-24px/notifications.svg?react
import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
import PublicIcon from '@/material-icons/400-24px/public.svg?react';
import SettingsIcon from '@/material-icons/400-24px/settings-fill.svg?react';
-import TagIcon from '@/material-icons/400-24px/tag.svg?react';
import { fetchFollowRequests } from 'flavours/glitch/actions/accounts';
import { fetchLists } from 'flavours/glitch/actions/lists';
import { openModal } from 'flavours/glitch/actions/modal';
import Column from 'flavours/glitch/features/ui/components/column';
import LinkFooter from 'flavours/glitch/features/ui/components/link_footer';
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
import { preferencesLink } from 'flavours/glitch/utils/backend_links';
import { me, showTrends } from '../../initial_state';
-import NavigationBar from '../compose/components/navigation_bar';
+import { NavigationBar } from '../compose/components/navigation_bar';
import ColumnLink from '../ui/components/column_link';
import ColumnSubheading from '../ui/components/column_subheading';
@@ -99,14 +100,10 @@ const badgeDisplay = (number, limit) => {
};
class GettingStarted extends ImmutablePureComponent {
-
- static contextTypes = {
- identity: PropTypes.object,
- };
-
static propTypes = {
+ identity: identityContextPropShape,
intl: PropTypes.object.isRequired,
- myAccount: ImmutablePropTypes.map,
+ myAccount: ImmutablePropTypes.record,
columns: ImmutablePropTypes.list,
multiColumn: PropTypes.bool,
fetchFollowRequests: PropTypes.func.isRequired,
@@ -123,7 +120,7 @@ class GettingStarted extends ImmutablePureComponent {
componentDidMount () {
const { fetchFollowRequests } = this.props;
- const { signedIn } = this.context.identity;
+ const { signedIn } = this.props.identity;
if (!signedIn) {
return;
@@ -134,7 +131,7 @@ class GettingStarted extends ImmutablePureComponent {
render () {
const { intl, myAccount, columns, multiColumn, unreadFollowRequests, unreadNotifications, lists, openSettings } = this.props;
- const { signedIn } = this.context.identity;
+ const { signedIn } = this.props.identity;
const navItems = [];
let listItems = [];
@@ -158,7 +155,7 @@ class GettingStarted extends ImmutablePureComponent {
}
if (showTrends) {
- navItems.push(
);
+ navItems.push(
);
}
if (signedIn) {
@@ -219,4 +216,4 @@ class GettingStarted extends ImmutablePureComponent {
}
-export default connect(makeMapStateToProps, mapDispatchToProps)(injectIntl(GettingStarted));
+export default withIdentity(connect(makeMapStateToProps, mapDispatchToProps)(injectIntl(GettingStarted)));
diff --git a/app/javascript/flavours/glitch/features/getting_started_misc/index.jsx b/app/javascript/flavours/glitch/features/getting_started_misc/index.jsx
index 7c4979bd6310e8..4a0dbb4a1c9934 100644
--- a/app/javascript/flavours/glitch/features/getting_started_misc/index.jsx
+++ b/app/javascript/flavours/glitch/features/getting_started_misc/index.jsx
@@ -16,7 +16,7 @@ import { openModal } from 'flavours/glitch/actions/modal';
import Column from 'flavours/glitch/features/ui/components/column';
import ColumnLink from 'flavours/glitch/features/ui/components/column_link';
import ColumnSubheading from 'flavours/glitch/features/ui/components/column_subheading';
-
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
const messages = defineMessages({
heading: { id: 'column.heading', defaultMessage: 'Misc' },
@@ -32,11 +32,8 @@ const messages = defineMessages({
class GettingStartedMisc extends ImmutablePureComponent {
- static contextTypes = {
- identity: PropTypes.object,
- };
-
static propTypes = {
+ identity: identityContextPropShape,
intl: PropTypes.object.isRequired,
dispatch: PropTypes.func.isRequired,
};
@@ -49,7 +46,7 @@ class GettingStartedMisc extends ImmutablePureComponent {
render () {
const { intl } = this.props;
- const { signedIn } = this.context.identity;
+ const { signedIn } = this.props.identity;
return (
@@ -69,4 +66,4 @@ class GettingStartedMisc extends ImmutablePureComponent {
}
-export default connect()(injectIntl(GettingStartedMisc));
+export default connect()(withIdentity(injectIntl(GettingStartedMisc)));
diff --git a/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.jsx b/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.jsx
index 4488c5b2a0e26e..94ee7bb1191e6c 100644
--- a/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.jsx
+++ b/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.jsx
@@ -109,28 +109,28 @@ class ColumnSettings extends PureComponent {
const { settings, onChange } = this.props;
return (
-
-
-
-
-
-
-
-
+
- {this.state.open && (
-
- {this.modeSelect('any')}
- {this.modeSelect('all')}
- {this.modeSelect('none')}
-
- )}
-
-
- } />
-
+ {this.state.open && (
+
+ {this.modeSelect('any')}
+ {this.modeSelect('all')}
+ {this.modeSelect('none')}
+
+ )}
+
);
}
diff --git a/app/javascript/flavours/glitch/features/hashtag_timeline/containers/column_settings_container.js b/app/javascript/flavours/glitch/features/hashtag_timeline/containers/column_settings_container.js
index be95004cc7bfaf..680b44519b5c58 100644
--- a/app/javascript/flavours/glitch/features/hashtag_timeline/containers/column_settings_container.js
+++ b/app/javascript/flavours/glitch/features/hashtag_timeline/containers/column_settings_container.js
@@ -15,7 +15,7 @@ const mapStateToProps = (state, { columnId }) => {
return {
settings: columns.get(index).get('params'),
onLoad (value) {
- return api(() => state).get('/api/v2/search', { params: { q: value, type: 'hashtags' } }).then(response => {
+ return api().get('/api/v2/search', { params: { q: value, type: 'hashtags' } }).then(response => {
return (response.data.hashtags || []).map((tag) => {
return { value: tag.name, label: `#${tag.name}` };
});
diff --git a/app/javascript/flavours/glitch/features/hashtag_timeline/index.jsx b/app/javascript/flavours/glitch/features/hashtag_timeline/index.jsx
index c2a757430716d2..c33c458c278e24 100644
--- a/app/javascript/flavours/glitch/features/hashtag_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/hashtag_timeline/index.jsx
@@ -17,6 +17,7 @@ import { fetchHashtag, followHashtag, unfollowHashtag } from 'flavours/glitch/ac
import { expandHashtagTimeline, clearTimeline } from 'flavours/glitch/actions/timelines';
import Column from 'flavours/glitch/components/column';
import ColumnHeader from 'flavours/glitch/components/column_header';
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
import StatusListContainer from '../ui/containers/status_list_container';
@@ -29,14 +30,10 @@ const mapStateToProps = (state, props) => ({
});
class HashtagTimeline extends PureComponent {
-
disconnects = [];
- static contextTypes = {
- identity: PropTypes.object,
- };
-
static propTypes = {
+ identity: identityContextPropShape,
params: PropTypes.object.isRequired,
columnId: PropTypes.string,
dispatch: PropTypes.func.isRequired,
@@ -94,7 +91,7 @@ class HashtagTimeline extends PureComponent {
};
_subscribe (dispatch, id, tags = {}, local) {
- const { signedIn } = this.context.identity;
+ const { signedIn } = this.props.identity;
if (!signedIn) {
return;
@@ -168,7 +165,7 @@ class HashtagTimeline extends PureComponent {
handleFollow = () => {
const { dispatch, params, tag } = this.props;
const { id } = params;
- const { signedIn } = this.context.identity;
+ const { signedIn } = this.props.identity;
if (!signedIn) {
return;
@@ -185,7 +182,7 @@ class HashtagTimeline extends PureComponent {
const { hasUnread, columnId, multiColumn, tag } = this.props;
const { id, local } = this.props.params;
const pinned = !!columnId;
- const { signedIn } = this.context.identity;
+ const { signedIn } = this.props.identity;
return (
@@ -225,4 +222,4 @@ class HashtagTimeline extends PureComponent {
}
-export default connect(mapStateToProps)(HashtagTimeline);
+export default connect(mapStateToProps)(withIdentity(HashtagTimeline));
diff --git a/app/javascript/flavours/glitch/features/home_timeline/components/column_settings.tsx b/app/javascript/flavours/glitch/features/home_timeline/components/column_settings.tsx
index 5438ba6f754614..5b8fe5ccc8ecb7 100644
--- a/app/javascript/flavours/glitch/features/home_timeline/components/column_settings.tsx
+++ b/app/javascript/flavours/glitch/features/home_timeline/components/column_settings.tsx
@@ -35,75 +35,68 @@ export const ColumnSettings: React.FC = () => {
);
return (
-
-
-
-
+
+
+
+
+ }
+ />
-
-
- }
- />
-
+
+ }
+ />
-
-
- }
- />
-
+
+ }
+ />
+
-
-
- }
- />
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
);
};
diff --git a/app/javascript/flavours/glitch/features/home_timeline/components/explore_prompt.tsx b/app/javascript/flavours/glitch/features/home_timeline/components/explore_prompt.tsx
deleted file mode 100644
index 73ef8a5fe1cc6e..00000000000000
--- a/app/javascript/flavours/glitch/features/home_timeline/components/explore_prompt.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { FormattedMessage } from 'react-intl';
-
-import { Link } from 'react-router-dom';
-
-import background from '@/images/friends-cropped.png';
-import { DismissableBanner } from 'flavours/glitch/components/dismissable_banner';
-
-export const ExplorePrompt = () => (
-
- 
-
-
-
-
-
-
-
-
-
-
-);
diff --git a/app/javascript/flavours/glitch/features/home_timeline/components/inline_follow_suggestions.jsx b/app/javascript/flavours/glitch/features/home_timeline/components/inline_follow_suggestions.jsx
new file mode 100644
index 00000000000000..97b64a09b18e46
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/home_timeline/components/inline_follow_suggestions.jsx
@@ -0,0 +1,218 @@
+import PropTypes from 'prop-types';
+import { useEffect, useCallback, useRef, useState } from 'react';
+
+import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { useDispatch, useSelector } from 'react-redux';
+
+import ChevronLeftIcon from '@/material-icons/400-24px/chevron_left.svg?react';
+import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import InfoIcon from '@/material-icons/400-24px/info.svg?react';
+import { followAccount, unfollowAccount } from 'flavours/glitch/actions/accounts';
+import { changeSetting } from 'flavours/glitch/actions/settings';
+import { fetchSuggestions, dismissSuggestion } from 'flavours/glitch/actions/suggestions';
+import { Avatar } from 'flavours/glitch/components/avatar';
+import { Button } from 'flavours/glitch/components/button';
+import { DisplayName } from 'flavours/glitch/components/display_name';
+import { Icon } from 'flavours/glitch/components/icon';
+import { IconButton } from 'flavours/glitch/components/icon_button';
+import { VerifiedBadge } from 'flavours/glitch/components/verified_badge';
+import { domain } from 'flavours/glitch/initial_state';
+
+const messages = defineMessages({
+ follow: { id: 'account.follow', defaultMessage: 'Follow' },
+ unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
+ previous: { id: 'lightbox.previous', defaultMessage: 'Previous' },
+ next: { id: 'lightbox.next', defaultMessage: 'Next' },
+ dismiss: { id: 'follow_suggestions.dismiss', defaultMessage: "Don't show again" },
+ friendsOfFriendsHint: { id: 'follow_suggestions.hints.friends_of_friends', defaultMessage: 'This profile is popular among the people you follow.' },
+ similarToRecentlyFollowedHint: { id: 'follow_suggestions.hints.similar_to_recently_followed', defaultMessage: 'This profile is similar to the profiles you have most recently followed.' },
+ featuredHint: { id: 'follow_suggestions.hints.featured', defaultMessage: 'This profile has been hand-picked by the {domain} team.' },
+ mostFollowedHint: { id: 'follow_suggestions.hints.most_followed', defaultMessage: 'This profile is one of the most followed on {domain}.'},
+ mostInteractionsHint: { id: 'follow_suggestions.hints.most_interactions', defaultMessage: 'This profile has been recently getting a lot of attention on {domain}.' },
+});
+
+const Source = ({ id }) => {
+ const intl = useIntl();
+
+ let label, hint;
+
+ switch (id) {
+ case 'friends_of_friends':
+ hint = intl.formatMessage(messages.friendsOfFriendsHint);
+ label =
;
+ break;
+ case 'similar_to_recently_followed':
+ hint = intl.formatMessage(messages.similarToRecentlyFollowedHint);
+ label =
;
+ break;
+ case 'featured':
+ hint = intl.formatMessage(messages.featuredHint, { domain });
+ label =
;
+ break;
+ case 'most_followed':
+ hint = intl.formatMessage(messages.mostFollowedHint, { domain });
+ label =
;
+ break;
+ case 'most_interactions':
+ hint = intl.formatMessage(messages.mostInteractionsHint, { domain });
+ label =
;
+ break;
+ }
+
+ return (
+
+
+ {label}
+
+ );
+};
+
+Source.propTypes = {
+ id: PropTypes.oneOf(['friends_of_friends', 'similar_to_recently_followed', 'featured', 'most_followed', 'most_interactions']),
+};
+
+const Card = ({ id, sources }) => {
+ const intl = useIntl();
+ const account = useSelector(state => state.getIn(['accounts', id]));
+ const relationship = useSelector(state => state.getIn(['relationships', id]));
+ const firstVerifiedField = account.get('fields').find(item => !!item.get('verified_at'));
+ const dispatch = useDispatch();
+ const following = relationship?.get('following') ?? relationship?.get('requested');
+
+ const handleFollow = useCallback(() => {
+ if (following) {
+ dispatch(unfollowAccount(id));
+ } else {
+ dispatch(followAccount(id));
+ }
+ }, [id, following, dispatch]);
+
+ const handleDismiss = useCallback(() => {
+ dispatch(dismissSuggestion(id));
+ }, [id, dispatch]);
+
+ return (
+
+
+
+
+
+
+
+ {firstVerifiedField ? : }
+
+
+
+
+ );
+};
+
+Card.propTypes = {
+ id: PropTypes.string.isRequired,
+ sources: ImmutablePropTypes.list,
+};
+
+const DISMISSIBLE_ID = 'home/follow-suggestions';
+
+export const InlineFollowSuggestions = ({ hidden }) => {
+ const intl = useIntl();
+ const dispatch = useDispatch();
+ const suggestions = useSelector(state => state.getIn(['suggestions', 'items']));
+ const isLoading = useSelector(state => state.getIn(['suggestions', 'isLoading']));
+ const dismissed = useSelector(state => state.getIn(['settings', 'dismissed_banners', DISMISSIBLE_ID]));
+ const bodyRef = useRef();
+ const [canScrollLeft, setCanScrollLeft] = useState(false);
+ const [canScrollRight, setCanScrollRight] = useState(true);
+
+ useEffect(() => {
+ dispatch(fetchSuggestions());
+ }, [dispatch]);
+
+ useEffect(() => {
+ if (!bodyRef.current) {
+ return;
+ }
+
+ setCanScrollLeft(bodyRef.current.scrollLeft > 0);
+ setCanScrollRight((bodyRef.current.scrollLeft + bodyRef.current.clientWidth) < bodyRef.current.scrollWidth);
+ }, [setCanScrollRight, setCanScrollLeft, bodyRef, suggestions]);
+
+ const handleLeftNav = useCallback(() => {
+ bodyRef.current.scrollLeft -= 200;
+ }, [bodyRef]);
+
+ const handleRightNav = useCallback(() => {
+ bodyRef.current.scrollLeft += 200;
+ }, [bodyRef]);
+
+ const handleScroll = useCallback(() => {
+ if (!bodyRef.current) {
+ return;
+ }
+
+ setCanScrollLeft(bodyRef.current.scrollLeft > 0);
+ setCanScrollRight((bodyRef.current.scrollLeft + bodyRef.current.clientWidth) < bodyRef.current.scrollWidth);
+ }, [setCanScrollRight, setCanScrollLeft, bodyRef]);
+
+ const handleDismiss = useCallback(() => {
+ dispatch(changeSetting(['dismissed_banners', DISMISSIBLE_ID], true));
+ }, [dispatch]);
+
+ if (dismissed || (!isLoading && suggestions.isEmpty())) {
+ return null;
+ }
+
+ if (hidden) {
+ return (
+
+ );
+ }
+
+ return (
+
+
+
+
+
+ {suggestions.map(suggestion => (
+
+ ))}
+
+
+ {canScrollLeft && (
+
+ )}
+
+ {canScrollRight && (
+
+ )}
+
+
+ );
+};
+
+InlineFollowSuggestions.propTypes = {
+ hidden: PropTypes.bool,
+};
diff --git a/app/javascript/flavours/glitch/features/home_timeline/index.jsx b/app/javascript/flavours/glitch/features/home_timeline/index.jsx
index 093d8a7602ff15..3220f777e13d05 100644
--- a/app/javascript/flavours/glitch/features/home_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/home_timeline/index.jsx
@@ -6,18 +6,16 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import classNames from 'classnames';
import { Helmet } from 'react-helmet';
-import { createSelector } from '@reduxjs/toolkit';
-import { List as ImmutableList } from 'immutable';
import { connect } from 'react-redux';
-
import CampaignIcon from '@/material-icons/400-24px/campaign.svg?react';
import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
import { fetchAnnouncements, toggleShowAnnouncements } from 'flavours/glitch/actions/announcements';
import { IconWithBadge } from 'flavours/glitch/components/icon_with_badge';
import { NotSignedInIndicator } from 'flavours/glitch/components/not_signed_in_indicator';
import AnnouncementsContainer from 'flavours/glitch/features/getting_started/containers/announcements_container';
-import { me, criticalUpdatesPending } from 'flavours/glitch/initial_state';
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
+import { criticalUpdatesPending } from 'flavours/glitch/initial_state';
import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
import { expandHomeTimeline } from '../../actions/timelines';
@@ -27,7 +25,6 @@ import StatusListContainer from '../ui/containers/status_list_container';
import { ColumnSettings } from './components/column_settings';
import { CriticalUpdateBanner } from './components/critical_update_banner';
-import { ExplorePrompt } from './components/explore_prompt';
const messages = defineMessages({
title: { id: 'column.home', defaultMessage: 'Home' },
@@ -35,61 +32,18 @@ const messages = defineMessages({
hide_announcements: { id: 'home.hide_announcements', defaultMessage: 'Hide announcements' },
});
-const getHomeFeedSpeed = createSelector([
- state => state.getIn(['timelines', 'home', 'items'], ImmutableList()),
- state => state.getIn(['timelines', 'home', 'pendingItems'], ImmutableList()),
- state => state.get('statuses'),
-], (statusIds, pendingStatusIds, statusMap) => {
- const recentStatusIds = pendingStatusIds.concat(statusIds);
- const statuses = recentStatusIds.filter(id => id !== null).map(id => statusMap.get(id)).filter(status => status?.get('account') !== me).take(20);
-
- if (statuses.isEmpty()) {
- return {
- gap: 0,
- newest: new Date(0),
- };
- }
-
- const datetimes = statuses.map(status => status.get('created_at', 0));
- const oldest = new Date(datetimes.min());
- const newest = new Date(datetimes.max());
- const averageGap = (newest - oldest) / (1000 * (statuses.size + 1)); // Average gap between posts on first page in seconds
-
- return {
- gap: averageGap,
- newest,
- };
-});
-
-const homeTooSlow = createSelector([
- state => state.getIn(['timelines', 'home', 'isLoading']),
- state => state.getIn(['timelines', 'home', 'isPartial']),
- getHomeFeedSpeed,
-], (isLoading, isPartial, speed) =>
- !isLoading && !isPartial // Only if the home feed has finished loading
- && (
- (speed.gap > (30 * 60) // If the average gap between posts is more than 30 minutes
- || (Date.now() - speed.newest) > (1000 * 3600)) // If the most recent post is from over an hour ago
- )
-);
-
const mapStateToProps = state => ({
hasUnread: state.getIn(['timelines', 'home', 'unread']) > 0,
isPartial: state.getIn(['timelines', 'home', 'isPartial']),
hasAnnouncements: !state.getIn(['announcements', 'items']).isEmpty(),
unreadAnnouncements: state.getIn(['announcements', 'items']).count(item => !item.get('read')),
showAnnouncements: state.getIn(['announcements', 'show']),
- tooSlow: homeTooSlow(state),
regex: state.getIn(['settings', 'home', 'regex', 'body']),
});
class HomeTimeline extends PureComponent {
-
- static contextTypes = {
- identity: PropTypes.object,
- };
-
static propTypes = {
+ identity: identityContextPropShape,
dispatch: PropTypes.func.isRequired,
intl: PropTypes.object.isRequired,
hasUnread: PropTypes.bool,
@@ -99,7 +53,6 @@ class HomeTimeline extends PureComponent {
hasAnnouncements: PropTypes.bool,
unreadAnnouncements: PropTypes.number,
showAnnouncements: PropTypes.bool,
- tooSlow: PropTypes.bool,
regex: PropTypes.string,
};
@@ -170,9 +123,9 @@ class HomeTimeline extends PureComponent {
};
render () {
- const { intl, hasUnread, columnId, multiColumn, tooSlow, hasAnnouncements, unreadAnnouncements, showAnnouncements } = this.props;
+ const { intl, hasUnread, columnId, multiColumn, hasAnnouncements, unreadAnnouncements, showAnnouncements } = this.props;
const pinned = !!columnId;
- const { signedIn } = this.context.identity;
+ const { signedIn } = this.props.identity;
const banners = [];
let announcementsButton;
@@ -194,10 +147,6 @@ class HomeTimeline extends PureComponent {
banners.push(
);
}
- if (tooSlow) {
- banners.push(
);
- }
-
return (
- | s |
+ s, / |
|
diff --git a/app/javascript/flavours/glitch/features/list_adder/components/list.jsx b/app/javascript/flavours/glitch/features/list_adder/components/list.jsx
index adbb16fcd61920..e91c8e35bdf11f 100644
--- a/app/javascript/flavours/glitch/features/list_adder/components/list.jsx
+++ b/app/javascript/flavours/glitch/features/list_adder/components/list.jsx
@@ -11,7 +11,6 @@ import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
import { Icon } from 'flavours/glitch/components/icon';
-
import { removeFromListAdder, addToListAdder } from '../../../actions/lists';
import { IconButton } from '../../../components/icon_button';
diff --git a/app/javascript/flavours/glitch/features/list_editor/components/search.jsx b/app/javascript/flavours/glitch/features/list_editor/components/search.jsx
index 6e9cd448355a12..23e4b427dcfdf7 100644
--- a/app/javascript/flavours/glitch/features/list_editor/components/search.jsx
+++ b/app/javascript/flavours/glitch/features/list_editor/components/search.jsx
@@ -11,7 +11,6 @@ import CancelIcon from '@/material-icons/400-24px/cancel.svg?react';
import SearchIcon from '@/material-icons/400-24px/search.svg?react';
import { Icon } from 'flavours/glitch/components/icon';
-
import { fetchListSuggestions, clearListSuggestions, changeListSuggestions } from '../../../actions/lists';
const messages = defineMessages({
diff --git a/app/javascript/flavours/glitch/features/list_timeline/index.jsx b/app/javascript/flavours/glitch/features/list_timeline/index.jsx
index a844dcd7fb96b1..52879cd482d2d6 100644
--- a/app/javascript/flavours/glitch/features/list_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/list_timeline/index.jsx
@@ -194,37 +194,38 @@ class ListTimeline extends PureComponent {
pinned={pinned}
multiColumn={multiColumn}
>
-
-
-
-
-
-
-
-
-
-
-
- { replies_policy !== undefined && (
-
- | s |
+ s, / |
|
diff --git a/app/javascript/mastodon/features/list_timeline/index.jsx b/app/javascript/mastodon/features/list_timeline/index.jsx
index 24bf122facb347..f640e503c270e4 100644
--- a/app/javascript/mastodon/features/list_timeline/index.jsx
+++ b/app/javascript/mastodon/features/list_timeline/index.jsx
@@ -193,35 +193,38 @@ class ListTimeline extends PureComponent {
pinned={pinned}
multiColumn={multiColumn}
>
-
-
-
-
-
-
-
-
-
-
-
- { replies_policy !== undefined && (
-
-
-
-
-
- { ['none', 'list', 'followed'].map(policy => (
-
- ))}
+
- )}
+
+
+ {replies_policy !== undefined && (
+
+
+
+
+ { ['none', 'list', 'followed'].map(policy => (
+
+ ))}
+
+
+ )}
+
+
{alertsEnabled && browserSupport && browserPermission === 'denied' && (
-
-
-
+
)}
+
+
{alertsEnabled && browserSupport && browserPermission === 'default' && (
-
+
+
)}
-
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
+
+
@@ -95,10 +133,10 @@ export default class ColumnSettings extends PureComponent {
-
+
-
-
+
+
@@ -106,10 +144,10 @@ export default class ColumnSettings extends PureComponent {
-
+
-
-
+
+
@@ -117,10 +155,10 @@ export default class ColumnSettings extends PureComponent {
-
+
-
-
+
+
@@ -128,10 +166,10 @@ export default class ColumnSettings extends PureComponent {
-
+
-
-
+
+
@@ -139,10 +177,10 @@ export default class ColumnSettings extends PureComponent {
-
+
-
-
+
+
@@ -150,10 +188,10 @@ export default class ColumnSettings extends PureComponent {
-
+
-
-
+
+
@@ -161,10 +199,10 @@ export default class ColumnSettings extends PureComponent {
-
+
-
-
+
+
@@ -172,11 +210,11 @@ export default class ColumnSettings extends PureComponent {
-
+
- {((this.context.identity.permissions & PERMISSION_MANAGE_USERS) === PERMISSION_MANAGE_USERS) && (
-
-
+ {((this.props.identity.permissions & PERMISSION_MANAGE_USERS) === PERMISSION_MANAGE_USERS) && (
+
+
@@ -184,12 +222,12 @@ export default class ColumnSettings extends PureComponent {
-
+
)}
- {((this.context.identity.permissions & PERMISSION_MANAGE_REPORTS) === PERMISSION_MANAGE_REPORTS) && (
-
-
+ {((this.props.identity.permissions & PERMISSION_MANAGE_REPORTS) === PERMISSION_MANAGE_REPORTS) && (
+
+
@@ -197,10 +235,12 @@ export default class ColumnSettings extends PureComponent {
-
+
)}
);
}
}
+
+export default withIdentity(ColumnSettings);
diff --git a/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx
new file mode 100644
index 00000000000000..56da7ba62629c4
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx
@@ -0,0 +1,49 @@
+import { useEffect } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import { useDispatch, useSelector } from 'react-redux';
+
+import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
+import { fetchNotificationPolicy } from 'mastodon/actions/notifications';
+import { Icon } from 'mastodon/components/icon';
+import { toCappedNumber } from 'mastodon/utils/numbers';
+
+export const FilteredNotificationsBanner = () => {
+ const dispatch = useDispatch();
+ const policy = useSelector(state => state.get('notificationPolicy'));
+
+ useEffect(() => {
+ dispatch(fetchNotificationPolicy());
+
+ const interval = setInterval(() => {
+ dispatch(fetchNotificationPolicy());
+ }, 120000);
+
+ return () => {
+ clearInterval(interval);
+ };
+ }, [dispatch]);
+
+ if (policy === null || policy.getIn(['summary', 'pending_notifications_count']) === 0) {
+ return null;
+ }
+
+ return (
+
+
+
+
+
+
+
+
+
+
{toCappedNumber(policy.getIn(['summary', 'pending_notifications_count']))}
+
+
+
+ );
+};
diff --git a/app/javascript/mastodon/features/notifications/components/moderation_warning.tsx b/app/javascript/mastodon/features/notifications/components/moderation_warning.tsx
new file mode 100644
index 00000000000000..2c1683e218e6ab
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications/components/moderation_warning.tsx
@@ -0,0 +1,78 @@
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import GavelIcon from '@/material-icons/400-24px/gavel.svg?react';
+import { Icon } from 'mastodon/components/icon';
+
+// This needs to be kept in sync with app/models/account_warning.rb
+const messages = defineMessages({
+ none: {
+ id: 'notification.moderation_warning.action_none',
+ defaultMessage: 'Your account has received a moderation warning.',
+ },
+ disable: {
+ id: 'notification.moderation_warning.action_disable',
+ defaultMessage: 'Your account has been disabled.',
+ },
+ mark_statuses_as_sensitive: {
+ id: 'notification.moderation_warning.action_mark_statuses_as_sensitive',
+ defaultMessage: 'Some of your posts have been marked as sensitive.',
+ },
+ delete_statuses: {
+ id: 'notification.moderation_warning.action_delete_statuses',
+ defaultMessage: 'Some of your posts have been removed.',
+ },
+ sensitive: {
+ id: 'notification.moderation_warning.action_sensitive',
+ defaultMessage: 'Your posts will be marked as sensitive from now on.',
+ },
+ silence: {
+ id: 'notification.moderation_warning.action_silence',
+ defaultMessage: 'Your account has been limited.',
+ },
+ suspend: {
+ id: 'notification.moderation_warning.action_suspend',
+ defaultMessage: 'Your account has been suspended.',
+ },
+});
+
+interface Props {
+ action:
+ | 'none'
+ | 'disable'
+ | 'mark_statuses_as_sensitive'
+ | 'delete_statuses'
+ | 'sensitive'
+ | 'silence'
+ | 'suspend';
+ id: string;
+ hidden: boolean;
+}
+
+export const ModerationWarning: React.FC
= ({ action, id, hidden }) => {
+ const intl = useIntl();
+
+ if (hidden) {
+ return null;
+ }
+
+ return (
+
+
+
+
+
{intl.formatMessage(messages[action])}
+
+
+
+
+
+
+
+ );
+ }
+
+ renderModerationWarning (notification) {
+ const { intl, unread, hidden } = this.props;
+ const warning = notification.get('moderation_warning');
+
+ if (!warning) {
+ return null;
+ }
+
+ return (
+
+
+
+
+
+ );
+ }
+
renderAdminSignUp (notification, account, link) {
const { intl, unread } = this.props;
@@ -429,6 +477,10 @@ class Notification extends ImmutablePureComponent {
return this.renderUpdate(notification, link);
case 'poll':
return this.renderPoll(notification, account);
+ case 'severed_relationships':
+ return this.renderRelationshipsSevered(notification);
+ case 'moderation_warning':
+ return this.renderModerationWarning(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
new file mode 100644
index 00000000000000..3a77ef4e2e14ad
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications/components/notification_request.jsx
@@ -0,0 +1,65 @@
+import PropTypes from 'prop-types';
+import { useCallback } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+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 { acceptNotificationRequest, dismissNotificationRequest } from 'mastodon/actions/notifications';
+import { Avatar } from 'mastodon/components/avatar';
+import { IconButton } from 'mastodon/components/icon_button';
+import { makeGetAccount } from 'mastodon/selectors';
+import { toCappedNumber } from 'mastodon/utils/numbers';
+
+const getAccount = makeGetAccount();
+
+const messages = defineMessages({
+ accept: { id: 'notification_requests.accept', defaultMessage: 'Accept' },
+ dismiss: { id: 'notification_requests.dismiss', defaultMessage: 'Dismiss' },
+});
+
+export const NotificationRequest = ({ id, accountId, notificationsCount }) => {
+ const dispatch = useDispatch();
+ const account = useSelector(state => getAccount(state, accountId));
+ const intl = useIntl();
+
+ const handleDismiss = useCallback(() => {
+ dispatch(dismissNotificationRequest(id));
+ }, [dispatch, id]);
+
+ const handleAccept = useCallback(() => {
+ dispatch(acceptNotificationRequest(id));
+ }, [dispatch, id]);
+
+ return (
+
+
+
+
+
+
+
+ {toCappedNumber(notificationsCount)}
+
+
+
@{account?.get('acct')}
+
+
+
+
+
+
+
+
- }} />
+ }} />
+
{intl.formatMessage(messages[type], { from: {domain}, target: {target}, followingCount, followersCount })}
+
+
-
-
-
-
+ {account ? (
+
+
+
+
+
+
+
+
+
+
+
0 && account.get('note').length > 0)} icon='address-book-o' iconComponent={AccountCircleIcon} label={} description={} />
+ = 1} icon='user-plus' iconComponent={PersonAddIcon} label={} description={} />
+ = 1} icon='pencil-square-o' iconComponent={EditNoteIcon} label={} description={ }} />} />
+ } description={} />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
0 && account.get('note').length > 0)} icon='address-book-o' iconComponent={AccountCircleIcon} label={} description={} />
- = 1} icon='user-plus' iconComponent={PersonAddIcon} label={} description={} />
- = 1} icon='pencil-square-o' iconComponent={EditNoteIcon} label={} description={ }} />} />
- } description={} />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ ) :
}
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
index 8dfbf54cb649d6..ba0642da288d55 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
+++ b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
@@ -14,11 +14,11 @@ import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
import StarIcon from '@/material-icons/400-24px/star.svg?react';
-import { initBoostModal } from 'mastodon/actions/boosts';
import { replyCompose } from 'mastodon/actions/compose';
import { reblog, favourite, unreblog, unfavourite } from 'mastodon/actions/interactions';
import { openModal } from 'mastodon/actions/modal';
import { IconButton } from 'mastodon/components/icon_button';
+import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
import { me, boostModal } from 'mastodon/initial_state';
import { makeGetStatus } from 'mastodon/selectors';
import { WithRouterPropTypes } from 'mastodon/utils/react_router';
@@ -48,12 +48,8 @@ const makeMapStateToProps = () => {
};
class Footer extends ImmutablePureComponent {
-
- static contextTypes = {
- identity: PropTypes.object,
- };
-
static propTypes = {
+ identity: identityContextPropShape,
statusId: PropTypes.string.isRequired,
status: ImmutablePropTypes.map.isRequired,
intl: PropTypes.object.isRequired,
@@ -76,7 +72,7 @@ class Footer extends ImmutablePureComponent {
handleReplyClick = () => {
const { dispatch, askReplyConfirmation, status, intl } = this.props;
- const { signedIn } = this.context.identity;
+ const { signedIn } = this.props.identity;
if (signedIn) {
if (askReplyConfirmation) {
@@ -105,7 +101,7 @@ class Footer extends ImmutablePureComponent {
handleFavouriteClick = () => {
const { dispatch, status } = this.props;
- const { signedIn } = this.context.identity;
+ const { signedIn } = this.props.identity;
if (signedIn) {
if (status.get('favourited')) {
@@ -127,20 +123,20 @@ class Footer extends ImmutablePureComponent {
_performReblog = (status, privacy) => {
const { dispatch } = this.props;
- dispatch(reblog(status, privacy));
+ dispatch(reblog({ statusId: status.get('id'), visibility: privacy }));
};
handleReblogClick = e => {
const { dispatch, status } = this.props;
- const { signedIn } = this.context.identity;
+ const { signedIn } = this.props.identity;
if (signedIn) {
if (status.get('reblogged')) {
- dispatch(unreblog(status));
+ dispatch(unreblog({ statusId: status.get('id') }));
} else if ((e && e.shiftKey) || !boostModal) {
this._performReblog(status);
} else {
- dispatch(initBoostModal({ status, onReblog: this._performReblog }));
+ dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this._performReblog } }));
}
} else {
dispatch(openModal({
@@ -210,4 +206,4 @@ class Footer extends ImmutablePureComponent {
}
-export default withRouter(connect(makeMapStateToProps)(injectIntl(Footer)));
+export default connect(makeMapStateToProps)(withIdentity(withRouter(injectIntl(Footer))));
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/header.jsx b/app/javascript/mastodon/features/picture_in_picture/components/header.jsx
deleted file mode 100644
index 31073d7387c9bc..00000000000000
--- a/app/javascript/mastodon/features/picture_in_picture/components/header.jsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { defineMessages, injectIntl } from 'react-intl';
-
-import { Link } from 'react-router-dom';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { connect } from 'react-redux';
-
-import CloseIcon from '@/material-icons/400-24px/close.svg?react';
-import { Avatar } from 'mastodon/components/avatar';
-import { DisplayName } from 'mastodon/components/display_name';
-import { IconButton } from 'mastodon/components/icon_button';
-
-const messages = defineMessages({
- close: { id: 'lightbox.close', defaultMessage: 'Close' },
-});
-
-const mapStateToProps = (state, { accountId }) => ({
- account: state.getIn(['accounts', accountId]),
-});
-
-class Header extends ImmutablePureComponent {
-
- static propTypes = {
- accountId: PropTypes.string.isRequired,
- statusId: PropTypes.string.isRequired,
- account: ImmutablePropTypes.record.isRequired,
- onClose: PropTypes.func.isRequired,
- intl: PropTypes.object.isRequired,
- };
-
- render () {
- const { account, statusId, onClose, intl } = this.props;
-
- return (
-
- );
- }
-
-}
-
-export default connect(mapStateToProps)(injectIntl(Header));
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/header.tsx b/app/javascript/mastodon/features/picture_in_picture/components/header.tsx
new file mode 100644
index 00000000000000..0f897dc44123a5
--- /dev/null
+++ b/app/javascript/mastodon/features/picture_in_picture/components/header.tsx
@@ -0,0 +1,46 @@
+import { defineMessages, useIntl } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import { Avatar } from 'mastodon/components/avatar';
+import { DisplayName } from 'mastodon/components/display_name';
+import { IconButton } from 'mastodon/components/icon_button';
+import { useAppSelector } from 'mastodon/store';
+
+const messages = defineMessages({
+ close: { id: 'lightbox.close', defaultMessage: 'Close' },
+});
+
+interface Props {
+ accountId: string;
+ statusId: string;
+ onClose: () => void;
+}
+
+export const Header: React.FC = ({ accountId, statusId, onClose }) => {
+ const account = useAppSelector((state) => state.accounts.get(accountId));
+
+ const intl = useIntl();
+
+ if (!account) return null;
+
+ return (
+
+ );
+};
diff --git a/app/javascript/mastodon/features/picture_in_picture/index.jsx b/app/javascript/mastodon/features/picture_in_picture/index.jsx
deleted file mode 100644
index f087cd1b1d1531..00000000000000
--- a/app/javascript/mastodon/features/picture_in_picture/index.jsx
+++ /dev/null
@@ -1,89 +0,0 @@
-import PropTypes from 'prop-types';
-import { Component } from 'react';
-
-import { connect } from 'react-redux';
-
-import { removePictureInPicture } from 'mastodon/actions/picture_in_picture';
-import Audio from 'mastodon/features/audio';
-import Video from 'mastodon/features/video';
-
-import Footer from './components/footer';
-import Header from './components/header';
-
-const mapStateToProps = state => ({
- ...state.get('picture_in_picture'),
-});
-
-class PictureInPicture extends Component {
-
- static propTypes = {
- statusId: PropTypes.string,
- accountId: PropTypes.string,
- type: PropTypes.string,
- src: PropTypes.string,
- muted: PropTypes.bool,
- volume: PropTypes.number,
- currentTime: PropTypes.number,
- poster: PropTypes.string,
- backgroundColor: PropTypes.string,
- foregroundColor: PropTypes.string,
- accentColor: PropTypes.string,
- dispatch: PropTypes.func.isRequired,
- };
-
- handleClose = () => {
- const { dispatch } = this.props;
- dispatch(removePictureInPicture());
- };
-
- render () {
- const { type, src, currentTime, accountId, statusId } = this.props;
-
- if (!currentTime) {
- return null;
- }
-
- let player;
-
- if (type === 'video') {
- player = (
-
- );
- } else if (type === 'audio') {
- player = (
-
- );
- }
-
- return (
-
-
-
- {player}
-
-
-
- );
- }
-
-}
-
-export default connect(mapStateToProps)(PictureInPicture);
diff --git a/app/javascript/mastodon/features/picture_in_picture/index.tsx b/app/javascript/mastodon/features/picture_in_picture/index.tsx
new file mode 100644
index 00000000000000..51b72f97254646
--- /dev/null
+++ b/app/javascript/mastodon/features/picture_in_picture/index.tsx
@@ -0,0 +1,79 @@
+import { useCallback } from 'react';
+
+import { removePictureInPicture } from 'mastodon/actions/picture_in_picture';
+import Audio from 'mastodon/features/audio';
+import Video from 'mastodon/features/video';
+import { useAppDispatch, useAppSelector } from 'mastodon/store/typed_functions';
+
+import Footer from './components/footer';
+import { Header } from './components/header';
+
+export const PictureInPicture: React.FC = () => {
+ const dispatch = useAppDispatch();
+
+ const handleClose = useCallback(() => {
+ dispatch(removePictureInPicture());
+ }, [dispatch]);
+
+ const pipState = useAppSelector((s) => s.picture_in_picture);
+
+ if (pipState.type === null) {
+ return null;
+ }
+
+ const {
+ type,
+ src,
+ currentTime,
+ accountId,
+ statusId,
+ volume,
+ muted,
+ poster,
+ backgroundColor,
+ foregroundColor,
+ accentColor,
+ } = pipState;
+
+ let player;
+
+ switch (type) {
+ case 'video':
+ player = (
+
+ );
+ break;
+ case 'audio':
+ player = (
+
+ );
+ }
+
+ return (
+
+
+
+ {player}
+
+
+
+ );
+};
diff --git a/app/javascript/mastodon/features/public_timeline/components/column_settings.jsx b/app/javascript/mastodon/features/public_timeline/components/column_settings.jsx
index 1ceec1ba66ad3b..c865f1bb025866 100644
--- a/app/javascript/mastodon/features/public_timeline/components/column_settings.jsx
+++ b/app/javascript/mastodon/features/public_timeline/components/column_settings.jsx
@@ -20,11 +20,13 @@ class ColumnSettings extends PureComponent {
const { settings, onChange } = this.props;
return (
-
-
- } />
- } />
-
+
);
}
diff --git a/app/javascript/mastodon/features/public_timeline/index.jsx b/app/javascript/mastodon/features/public_timeline/index.jsx
index 3601dfeae80a12..91351901f532a1 100644
--- a/app/javascript/mastodon/features/public_timeline/index.jsx
+++ b/app/javascript/mastodon/features/public_timeline/index.jsx
@@ -9,6 +9,7 @@ import { connect } from 'react-redux';
import PublicIcon from '@/material-icons/400-24px/public.svg?react';
import { DismissableBanner } from 'mastodon/components/dismissable_banner';
+import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
import { domain } from 'mastodon/initial_state';
import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
@@ -40,16 +41,12 @@ const mapStateToProps = (state, { columnId }) => {
};
class PublicTimeline extends PureComponent {
-
- static contextTypes = {
- identity: PropTypes.object,
- };
-
static defaultProps = {
onlyMedia: false,
};
static propTypes = {
+ identity: identityContextPropShape,
dispatch: PropTypes.func.isRequired,
intl: PropTypes.object.isRequired,
columnId: PropTypes.string,
@@ -80,7 +77,7 @@ class PublicTimeline extends PureComponent {
componentDidMount () {
const { dispatch, onlyMedia, onlyRemote } = this.props;
- const { signedIn } = this.context.identity;
+ const { signedIn } = this.props.identity;
dispatch(expandPublicTimeline({ onlyMedia, onlyRemote }));
@@ -90,7 +87,7 @@ class PublicTimeline extends PureComponent {
}
componentDidUpdate (prevProps) {
- const { signedIn } = this.context.identity;
+ const { signedIn } = this.props.identity;
if (prevProps.onlyMedia !== this.props.onlyMedia || prevProps.onlyRemote !== this.props.onlyRemote) {
const { dispatch, onlyMedia, onlyRemote } = this.props;
@@ -164,4 +161,4 @@ class PublicTimeline extends PureComponent {
}
-export default connect(mapStateToProps)(injectIntl(PublicTimeline));
+export default connect(mapStateToProps)(withIdentity(injectIntl(PublicTimeline)));
diff --git a/app/javascript/mastodon/features/standalone/compose/index.jsx b/app/javascript/mastodon/features/standalone/compose/index.jsx
index c36e843f5ada65..241d9aadfd88fc 100644
--- a/app/javascript/mastodon/features/standalone/compose/index.jsx
+++ b/app/javascript/mastodon/features/standalone/compose/index.jsx
@@ -1,21 +1,15 @@
-import { PureComponent } from 'react';
-
-import ComposeFormContainer from '../../compose/containers/compose_form_container';
-import LoadingBarContainer from '../../ui/containers/loading_bar_container';
-import ModalContainer from '../../ui/containers/modal_container';
-import NotificationsContainer from '../../ui/containers/notifications_container';
-
-export default class Compose extends PureComponent {
-
- render () {
- return (
-
-
-
-
-
-
- );
- }
-
-}
+import ComposeFormContainer from 'mastodon/features/compose/containers/compose_form_container';
+import LoadingBarContainer from 'mastodon/features/ui/containers/loading_bar_container';
+import ModalContainer from 'mastodon/features/ui/containers/modal_container';
+import NotificationsContainer from 'mastodon/features/ui/containers/notifications_container';
+
+const Compose = () => (
+ <>
+
+
+
+
+
+);
+
+export default Compose;
diff --git a/app/javascript/mastodon/features/status/components/action_bar.jsx b/app/javascript/mastodon/features/status/components/action_bar.jsx
index c243a49129eb4e..d6105399873cf1 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.jsx
+++ b/app/javascript/mastodon/features/status/components/action_bar.jsx
@@ -21,6 +21,7 @@ import RepeatActiveIcon from '@/svg-icons/repeat_active.svg?react';
import RepeatDisabledIcon from '@/svg-icons/repeat_disabled.svg?react';
import RepeatPrivateIcon from '@/svg-icons/repeat_private.svg?react';
import RepeatPrivateActiveIcon from '@/svg-icons/repeat_private_active.svg?react';
+import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';
import { WithRouterPropTypes } from 'mastodon/utils/react_router';
@@ -67,14 +68,10 @@ const mapStateToProps = (state, { status }) => ({
});
class ActionBar extends PureComponent {
-
- static contextTypes = {
- identity: PropTypes.object,
- };
-
static propTypes = {
+ identity: identityContextPropShape,
status: ImmutablePropTypes.map.isRequired,
- relationship: ImmutablePropTypes.map,
+ relationship: ImmutablePropTypes.record,
onReply: PropTypes.func.isRequired,
onReblog: PropTypes.func.isRequired,
onFavourite: PropTypes.func.isRequired,
@@ -159,7 +156,7 @@ class ActionBar extends PureComponent {
const { status, onBlockDomain } = this.props;
const account = status.get('account');
- onBlockDomain(account.get('acct').split('@')[1]);
+ onBlockDomain(account);
};
handleUnblockDomain = () => {
@@ -198,7 +195,7 @@ class ActionBar extends PureComponent {
render () {
const { status, relationship, intl } = this.props;
- const { signedIn, permissions } = this.context.identity;
+ const { signedIn, permissions } = this.props.identity;
const publicStatus = ['public', 'unlisted'].includes(status.get('visibility'));
const pinnableStatus = ['public', 'unlisted', 'private'].includes(status.get('visibility'));
@@ -326,4 +323,4 @@ class ActionBar extends PureComponent {
}
-export default withRouter(connect(mapStateToProps)(injectIntl(ActionBar)));
+export default withRouter(connect(mapStateToProps)(withIdentity(injectIntl(ActionBar))));
diff --git a/app/javascript/mastodon/features/status/components/card.jsx b/app/javascript/mastodon/features/status/components/card.jsx
index f37b558c4cd50e..c2f5703b3c4469 100644
--- a/app/javascript/mastodon/features/status/components/card.jsx
+++ b/app/javascript/mastodon/features/status/components/card.jsx
@@ -6,6 +6,8 @@ import { PureComponent } from 'react';
import { FormattedMessage } from 'react-intl';
import classNames from 'classnames';
+import { Link } from 'react-router-dom';
+
import Immutable from 'immutable';
import ImmutablePropTypes from 'react-immutable-proptypes';
@@ -13,6 +15,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import DescriptionIcon from '@/material-icons/400-24px/description-fill.svg?react';
import OpenInNewIcon from '@/material-icons/400-24px/open_in_new.svg?react';
import PlayArrowIcon from '@/material-icons/400-24px/play_arrow-fill.svg?react';
+import { Avatar } from 'mastodon/components/avatar';
import { Blurhash } from 'mastodon/components/blurhash';
import { Icon } from 'mastodon/components/icon';
import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
@@ -56,6 +59,20 @@ const addAutoPlay = html => {
return html;
};
+const MoreFromAuthor = ({ author }) => (
+
+
+
+
{author.get('display_name')} }} />
+
+);
+
+MoreFromAuthor.propTypes = {
+ author: ImmutablePropTypes.map,
+};
+
export default class Card extends PureComponent {
static propTypes = {
@@ -92,6 +109,10 @@ export default class Card extends PureComponent {
this.setState({ embedded: true });
};
+ handleExternalLinkClick = (e) => {
+ e.stopPropagation();
+ };
+
setRef = c => {
this.node = c;
};
@@ -132,6 +153,7 @@ export default class Card extends PureComponent {
const interactive = card.get('type') === 'video';
const language = card.get('language') || '';
const largeImage = (card.get('image')?.length > 0 && card.get('width') > card.get('height')) || interactive;
+ const showAuthor = !!card.get('author_account');
const description = (
@@ -142,7 +164,7 @@ export default class Card extends PureComponent {
{card.get('title')}
- {card.get('author_name').length > 0 ? {card.get('author_name')} }} /> : {card.get('description')}}
+ {!showAuthor && (card.get('author_name').length > 0 ? {card.get('author_name')} }} /> : {card.get('description')})}
);
@@ -201,7 +223,7 @@ export default class Card extends PureComponent {
) : spoilerButton}
@@ -231,10 +253,14 @@ export default class Card extends PureComponent {
}
return (
-
- {embed}
- {description}
-
+ <>
+
+ {embed}
+ {description}
+
+
+ {showAuthor &&
}
+
);
}
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.jsx b/app/javascript/mastodon/features/status/components/detailed_status.jsx
index 437e9e86bff294..8843619bc93737 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.jsx
+++ b/app/javascript/mastodon/features/status/components/detailed_status.jsx
@@ -9,8 +9,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
-import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
-import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
import { AnimatedNumber } from 'mastodon/components/animated_number';
import EditedTimestamp from 'mastodon/components/edited_timestamp';
import { getHashtagBarForStatus } from 'mastodon/components/hashtag_bar';
@@ -143,10 +141,7 @@ class DetailedStatus extends ImmutablePureComponent {
let media = '';
let applicationLink = '';
let reblogLink = '';
- const reblogIcon = 'retweet';
- const reblogIconComponent = RepeatIcon;
let favouriteLink = '';
- let edited = '';
if (this.props.measureHeight) {
outerStyle.height = `${this.state.height}px`;
@@ -218,68 +213,53 @@ class DetailedStatus extends ImmutablePureComponent {
}
if (status.get('application')) {
- applicationLink = <> ·
{status.getIn(['application', 'name'])};
+ applicationLink = <>·
{status.getIn(['application', 'name'])};
}
- const visibilityLink = <> ·
;
+ const visibilityLink = <>·
;
if (['private', 'direct'].includes(status.get('visibility'))) {
reblogLink = '';
} else if (this.props.history) {
reblogLink = (
- <>
- {' · '}
-
-
-
-
-
-
-
+
+
+
+
+
+
);
} else {
reblogLink = (
- <>
- {' · '}
-
-
-
-
-
-
-
+
+
+
+
+
+
);
}
if (this.props.history) {
favouriteLink = (
-
+
);
} else {
favouriteLink = (
-
+
);
}
- if (status.get('edited_at')) {
- edited = (
- <>
- {' · '}
-
-
- );
- }
-
const {statusContentProps, hashtagBar} = getHashtagBarForStatus(status);
const expanded = !status.get('hidden') || status.get('spoiler_text').length === 0;
@@ -310,9 +290,23 @@ class DetailedStatus extends ImmutablePureComponent {
{expanded && hashtagBar}
-
-
- {edited}{visibilityLink}{applicationLink}{reblogLink} · {favouriteLink}
+
+
+
+
+
+ {visibilityLink}
+
+ {applicationLink}
+
+
+ {status.get('edited_at') &&
}
+
+
+ {reblogLink}
+ {reblogLink && <>·}
+ {favouriteLink}
+
+
+
-class BlockModal extends PureComponent {
-
- static propTypes = {
- account: PropTypes.object.isRequired,
- onClose: PropTypes.func.isRequired,
- onBlockAndReport: PropTypes.func.isRequired,
- onConfirm: PropTypes.func.isRequired,
- intl: PropTypes.object.isRequired,
- };
-
- handleClick = () => {
- this.props.onClose();
- this.props.onConfirm(this.props.account);
- };
-
- handleSecondary = () => {
- this.props.onClose();
- this.props.onBlockAndReport(this.props.account);
- };
-
- handleCancel = () => {
- this.props.onClose();
- };
-
- render () {
- const { account } = this.props;
-
- return (
-
-
-
- @{account.get('acct')} }}
- />
-
+
+
-
-
+ );
+};
-}
+BlockModal.propTypes = {
+ accountId: PropTypes.string.isRequired,
+ acct: PropTypes.string.isRequired,
+};
-export default connect(makeMapStateToProps, mapDispatchToProps)(injectIntl(BlockModal));
+export default BlockModal;
diff --git a/app/javascript/mastodon/features/ui/components/boost_modal.jsx b/app/javascript/mastodon/features/ui/components/boost_modal.jsx
deleted file mode 100644
index 3b3e1e3f97d4de..00000000000000
--- a/app/javascript/mastodon/features/ui/components/boost_modal.jsx
+++ /dev/null
@@ -1,125 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-
-import classNames from 'classnames';
-import { withRouter } from 'react-router-dom';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { connect } from 'react-redux';
-
-import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
-import { changeBoostPrivacy } from 'mastodon/actions/boosts';
-import AttachmentList from 'mastodon/components/attachment_list';
-import { Icon } from 'mastodon/components/icon';
-import { VisibilityIcon } from 'mastodon/components/visibility_icon';
-import PrivacyDropdown from 'mastodon/features/compose/components/privacy_dropdown';
-import { WithRouterPropTypes } from 'mastodon/utils/react_router';
-
-import { Avatar } from '../../../components/avatar';
-import { Button } from '../../../components/button';
-import { DisplayName } from '../../../components/display_name';
-import { RelativeTimestamp } from '../../../components/relative_timestamp';
-import StatusContent from '../../../components/status_content';
-
-const messages = defineMessages({
- cancel_reblog: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
- reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
-});
-
-const mapStateToProps = state => {
- return {
- privacy: state.getIn(['boosts', 'new', 'privacy']),
- };
-};
-
-const mapDispatchToProps = dispatch => {
- return {
- onChangeBoostPrivacy(value) {
- dispatch(changeBoostPrivacy(value));
- },
- };
-};
-
-class BoostModal extends ImmutablePureComponent {
- static propTypes = {
- status: ImmutablePropTypes.map.isRequired,
- onReblog: PropTypes.func.isRequired,
- onClose: PropTypes.func.isRequired,
- onChangeBoostPrivacy: PropTypes.func.isRequired,
- privacy: PropTypes.string.isRequired,
- intl: PropTypes.object.isRequired,
- ...WithRouterPropTypes,
- };
-
- handleReblog = () => {
- this.props.onReblog(this.props.status, this.props.privacy);
- this.props.onClose();
- };
-
- handleAccountClick = (e) => {
- if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
- e.preventDefault();
- this.props.onClose();
- this.props.history.push(`/@${this.props.status.getIn(['account', 'acct'])}`);
- }
- };
-
- _findContainer = () => {
- return document.getElementsByClassName('modal-root__container')[0];
- };
-
- render () {
- const { status, privacy, intl } = this.props;
- const buttonText = status.get('reblogged') ? messages.cancel_reblog : messages.reblog;
-
- return (
-
-
-
-
-
-
-
- {status.get('media_attachments').size > 0 && (
-
- )}
-
-
-
-
-
Shift + }} />
- {status.get('visibility') !== 'private' && !status.get('reblogged') && (
-
- )}
-
-
-
- );
- }
-
-}
-
-export default withRouter(connect(mapStateToProps, mapDispatchToProps)(injectIntl(BoostModal)));
diff --git a/app/javascript/mastodon/features/ui/components/boost_modal.tsx b/app/javascript/mastodon/features/ui/components/boost_modal.tsx
new file mode 100644
index 00000000000000..40b0c81833001a
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/boost_modal.tsx
@@ -0,0 +1,162 @@
+import type { MouseEventHandler } from 'react';
+import { useCallback, useState } from 'react';
+
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import classNames from 'classnames';
+import { useHistory } from 'react-router';
+
+import type Immutable from 'immutable';
+
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
+import AttachmentList from 'mastodon/components/attachment_list';
+import { Icon } from 'mastodon/components/icon';
+import { VisibilityIcon } from 'mastodon/components/visibility_icon';
+import PrivacyDropdown from 'mastodon/features/compose/components/privacy_dropdown';
+import type { Account } from 'mastodon/models/account';
+import type { Status, StatusVisibility } from 'mastodon/models/status';
+import { useAppSelector } from 'mastodon/store';
+
+import { Avatar } from '../../../components/avatar';
+import { Button } from '../../../components/button';
+import { DisplayName } from '../../../components/display_name';
+import { RelativeTimestamp } from '../../../components/relative_timestamp';
+import StatusContent from '../../../components/status_content';
+
+const messages = defineMessages({
+ cancel_reblog: {
+ id: 'status.cancel_reblog_private',
+ defaultMessage: 'Unboost',
+ },
+ reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
+});
+
+export const BoostModal: React.FC<{
+ status: Status;
+ onClose: () => void;
+ onReblog: (status: Status, privacy: StatusVisibility) => void;
+}> = ({ status, onReblog, onClose }) => {
+ const intl = useIntl();
+ const history = useHistory();
+
+ const default_privacy = useAppSelector(
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+ (state) => state.compose.get('default_privacy') as StatusVisibility,
+ );
+
+ const account = status.get('account') as Account;
+ const statusVisibility = status.get('visibility') as StatusVisibility;
+
+ const [privacy, setPrivacy] = useState
(
+ statusVisibility === 'private' ? 'private' : default_privacy,
+ );
+
+ const onPrivacyChange = useCallback((value: StatusVisibility) => {
+ setPrivacy(value);
+ }, []);
+
+ const handleReblog = useCallback(() => {
+ onReblog(status, privacy);
+ onClose();
+ }, [onClose, onReblog, status, privacy]);
+
+ const handleAccountClick = useCallback(
+ (e) => {
+ if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
+ e.preventDefault();
+ onClose();
+ history.push(`/@${account.acct}`);
+ }
+ },
+ [history, onClose, account],
+ );
+
+ const buttonText = status.get('reblogged')
+ ? messages.cancel_reblog
+ : messages.reblog;
+
+ const findContainer = useCallback(
+ () => document.getElementsByClassName('modal-root__container')[0],
+ [],
+ );
+
+ return (
+
+
+
+
+
+ {/* @ts-expect-error Expected until StatusContent is typed */}
+
+
+ {(status.get('media_attachments') as Immutable.List
).size >
+ 0 && (
+
+ )}
+
+
+
+
+
+
+ Shift +
+
+ ),
+ }}
+ />
+
+ {statusVisibility !== 'private' && !status.get('reblogged') && (
+
+ )}
+
+
+
@@ -56,10 +52,7 @@ class ComposePanel extends PureComponent {
)}
{signedIn && (
- <>
-
-
-
+
)}
@@ -69,4 +62,4 @@ class ComposePanel extends PureComponent {
}
-export default connect()(ComposePanel);
+export default connect()(withIdentity(ComposePanel));
diff --git a/app/javascript/mastodon/features/ui/components/domain_block_modal.jsx b/app/javascript/mastodon/features/ui/components/domain_block_modal.jsx
new file mode 100644
index 00000000000000..e69db6348959a1
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/domain_block_modal.jsx
@@ -0,0 +1,106 @@
+import PropTypes from 'prop-types';
+import { useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { useDispatch } from 'react-redux';
+
+import CampaignIcon from '@/material-icons/400-24px/campaign.svg?react';
+import DomainDisabledIcon from '@/material-icons/400-24px/domain_disabled.svg?react';
+import HistoryIcon from '@/material-icons/400-24px/history.svg?react';
+import PersonRemoveIcon from '@/material-icons/400-24px/person_remove.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
+import { blockAccount } from 'mastodon/actions/accounts';
+import { blockDomain } from 'mastodon/actions/domain_blocks';
+import { closeModal } from 'mastodon/actions/modal';
+import { Button } from 'mastodon/components/button';
+import { Icon } from 'mastodon/components/icon';
+
+export const DomainBlockModal = ({ domain, accountId, acct }) => {
+ const dispatch = useDispatch();
+
+ const handleClick = useCallback(() => {
+ dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+ dispatch(blockDomain(domain));
+ }, [dispatch, domain]);
+
+ const handleSecondaryClick = useCallback(() => {
+ dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+ dispatch(blockAccount(accountId));
+ }, [dispatch, accountId]);
+
+ const handleCancel = useCallback(() => {
+ dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+ }, [dispatch]);
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+};
+
+DomainBlockModal.propTypes = {
+ domain: PropTypes.string.isRequired,
+ accountId: PropTypes.string.isRequired,
+ acct: PropTypes.string.isRequired,
+};
+
+export default DomainBlockModal;
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 25ad1e2e9ff05c..7adfc208e7251a 100644
--- a/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
@@ -21,8 +21,8 @@ import { Button } from 'mastodon/components/button';
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 { CharacterCounter } from 'mastodon/features/compose/components/character_counter';
+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/features/ui/components/follow_requests_column_link.jsx b/app/javascript/mastodon/features/ui/components/follow_requests_column_link.jsx
deleted file mode 100644
index 4aa009263150cd..00000000000000
--- a/app/javascript/mastodon/features/ui/components/follow_requests_column_link.jsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import PropTypes from 'prop-types';
-import { Component } from 'react';
-
-import { injectIntl, defineMessages } from 'react-intl';
-
-import { List as ImmutableList } from 'immutable';
-import { connect } from 'react-redux';
-
-import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
-import { fetchFollowRequests } from 'mastodon/actions/accounts';
-import { IconWithBadge } from 'mastodon/components/icon_with_badge';
-import ColumnLink from 'mastodon/features/ui/components/column_link';
-
-const messages = defineMessages({
- text: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
-});
-
-const mapStateToProps = state => ({
- count: state.getIn(['user_lists', 'follow_requests', 'items'], ImmutableList()).size,
-});
-
-class FollowRequestsColumnLink extends Component {
-
- static propTypes = {
- dispatch: PropTypes.func.isRequired,
- count: PropTypes.number.isRequired,
- intl: PropTypes.object.isRequired,
- };
-
- componentDidMount () {
- const { dispatch } = this.props;
-
- dispatch(fetchFollowRequests());
- }
-
- render () {
- const { count, intl } = this.props;
-
- if (count === 0) {
- return null;
- }
-
- return (
-
}
- text={intl.formatMessage(messages.text)}
- />
- );
- }
-
-}
-
-export default injectIntl(connect(mapStateToProps)(FollowRequestsColumnLink));
diff --git a/app/javascript/mastodon/features/ui/components/header.jsx b/app/javascript/mastodon/features/ui/components/header.jsx
index 2f8636b12a0e99..19c76c722b1238 100644
--- a/app/javascript/mastodon/features/ui/components/header.jsx
+++ b/app/javascript/mastodon/features/ui/components/header.jsx
@@ -13,6 +13,7 @@ import { fetchServer } from 'mastodon/actions/server';
import { Avatar } from 'mastodon/components/avatar';
import { Icon } from 'mastodon/components/icon';
import { WordmarkLogo, SymbolLogo } from 'mastodon/components/logo';
+import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
import { registrationsOpen, me, sso_redirect } from 'mastodon/initial_state';
const Account = connect(state => ({
@@ -41,12 +42,8 @@ const mapDispatchToProps = (dispatch) => ({
});
class Header extends PureComponent {
-
- static contextTypes = {
- identity: PropTypes.object,
- };
-
static propTypes = {
+ identity: identityContextPropShape,
openClosedRegistrationsModal: PropTypes.func,
location: PropTypes.object,
signupUrl: PropTypes.string.isRequired,
@@ -60,7 +57,7 @@ class Header extends PureComponent {
}
render () {
- const { signedIn } = this.context.identity;
+ const { signedIn } = this.props.identity;
const { location, openClosedRegistrationsModal, signupUrl, intl } = this.props;
let content;
@@ -121,4 +118,4 @@ class Header extends PureComponent {
}
-export default injectIntl(withRouter(connect(mapStateToProps, mapDispatchToProps)(Header)));
+export default injectIntl(withRouter(withIdentity(connect(mapStateToProps, mapDispatchToProps)(Header))));
diff --git a/app/javascript/mastodon/features/ui/components/link_footer.jsx b/app/javascript/mastodon/features/ui/components/link_footer.jsx
index 6b1555243b7668..08af6fa4442658 100644
--- a/app/javascript/mastodon/features/ui/components/link_footer.jsx
+++ b/app/javascript/mastodon/features/ui/components/link_footer.jsx
@@ -8,6 +8,7 @@ import { Link } from 'react-router-dom';
import { connect } from 'react-redux';
import { openModal } from 'mastodon/actions/modal';
+import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
import { domain, version, source_url, statusPageUrl, profile_directory as profileDirectory } from 'mastodon/initial_state';
import { PERMISSION_INVITE_USERS } from 'mastodon/permissions';
import { logOut } from 'mastodon/utils/log_out';
@@ -32,12 +33,8 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
});
class LinkFooter extends PureComponent {
-
- static contextTypes = {
- identity: PropTypes.object,
- };
-
static propTypes = {
+ identity: identityContextPropShape,
multiColumn: PropTypes.bool,
onLogout: PropTypes.func.isRequired,
intl: PropTypes.object.isRequired,
@@ -53,7 +50,7 @@ class LinkFooter extends PureComponent {
};
render () {
- const { signedIn, permissions } = this.context.identity;
+ const { signedIn, permissions } = this.props.identity;
const { multiColumn } = this.props;
const canInvite = signedIn && ((permissions & PERMISSION_INVITE_USERS) === PERMISSION_INVITE_USERS);
@@ -108,4 +105,4 @@ class LinkFooter extends PureComponent {
}
-export default injectIntl(connect(null, mapDispatchToProps)(LinkFooter));
+export default injectIntl(withIdentity(connect(null, mapDispatchToProps)(LinkFooter)));
diff --git a/app/javascript/mastodon/features/ui/components/list_panel.jsx b/app/javascript/mastodon/features/ui/components/list_panel.jsx
index fec21f14ca15c8..03c8fce9e878b3 100644
--- a/app/javascript/mastodon/features/ui/components/list_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/list_panel.jsx
@@ -1,10 +1,9 @@
-import PropTypes from 'prop-types';
+import { useEffect } from 'react';
import { createSelector } from '@reduxjs/toolkit';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { connect } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
+import ListAltActiveIcon from '@/material-icons/400-24px/list_alt-fill.svg?react';
import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
import { fetchLists } from 'mastodon/actions/lists';
@@ -18,40 +17,25 @@ const getOrderedLists = createSelector([state => state.get('lists')], lists => {
return lists.toList().filter(item => !!item).sort((a, b) => a.get('title').localeCompare(b.get('title'))).take(4);
});
-const mapStateToProps = state => ({
- lists: getOrderedLists(state),
-});
-
-class ListPanel extends ImmutablePureComponent {
+export const ListPanel = () => {
+ const dispatch = useDispatch();
+ const lists = useSelector(state => getOrderedLists(state));
- static propTypes = {
- dispatch: PropTypes.func.isRequired,
- lists: ImmutablePropTypes.list,
- };
-
- componentDidMount () {
- const { dispatch } = this.props;
+ useEffect(() => {
dispatch(fetchLists());
- }
-
- render () {
- const { lists } = this.props;
-
- if (!lists || lists.isEmpty()) {
- return null;
- }
-
- return (
-
-
+ }, [dispatch]);
- {lists.map(list => (
-
- ))}
-
- );
+ if (!lists || lists.isEmpty()) {
+ return null;
}
-}
+ return (
+
+
-export default connect(mapStateToProps)(ListPanel);
+ {lists.map(list => (
+
+ ))}
+
+ );
+};
diff --git a/app/javascript/mastodon/features/ui/components/modal_root.jsx b/app/javascript/mastodon/features/ui/components/modal_root.jsx
index 46f0dc706f48df..404b53c7429ae6 100644
--- a/app/javascript/mastodon/features/ui/components/modal_root.jsx
+++ b/app/javascript/mastodon/features/ui/components/modal_root.jsx
@@ -7,6 +7,7 @@ import Base from 'mastodon/components/modal_root';
import {
MuteModal,
BlockModal,
+ DomainBlockModal,
ReportModal,
EmbedModal,
ListEditor,
@@ -23,7 +24,7 @@ import BundleContainer from '../containers/bundle_container';
import ActionsModal from './actions_modal';
import AudioModal from './audio_modal';
-import BoostModal from './boost_modal';
+import { BoostModal } from './boost_modal';
import BundleModalError from './bundle_modal_error';
import ConfirmationModal from './confirmation_modal';
import FocalPointModal from './focal_point_modal';
@@ -41,6 +42,7 @@ export const MODAL_COMPONENTS = {
'CONFIRM': () => Promise.resolve({ default: ConfirmationModal }),
'MUTE': MuteModal,
'BLOCK': BlockModal,
+ 'DOMAIN_BLOCK': DomainBlockModal,
'REPORT': ReportModal,
'ACTIONS': () => Promise.resolve({ default: ActionsModal }),
'EMBED': EmbedModal,
diff --git a/app/javascript/mastodon/features/ui/components/mute_modal.jsx b/app/javascript/mastodon/features/ui/components/mute_modal.jsx
index 2d95cabef84db1..df466cfac6aa75 100644
--- a/app/javascript/mastodon/features/ui/components/mute_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/mute_modal.jsx
@@ -1,139 +1,154 @@
import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
+import { useCallback, useState } from 'react';
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
+import classNames from 'classnames';
-import Toggle from 'react-toggle';
+import { useDispatch } from 'react-redux';
-import { muteAccount } from '../../../actions/accounts';
-import { closeModal } from '../../../actions/modal';
-import { toggleHideNotifications, changeMuteDuration } from '../../../actions/mutes';
-import { Button } from '../../../components/button';
+
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import CampaignIcon from '@/material-icons/400-24px/campaign.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
+import VolumeOffIcon from '@/material-icons/400-24px/volume_off.svg?react';
+import { muteAccount } from 'mastodon/actions/accounts';
+import { closeModal } from 'mastodon/actions/modal';
+import { Button } from 'mastodon/components/button';
+import { CheckBox } from 'mastodon/components/check_box';
+import { Icon } from 'mastodon/components/icon';
+import { RadioButton } from 'mastodon/components/radio_button';
const messages = defineMessages({
minutes: { id: 'intervals.full.minutes', defaultMessage: '{number, plural, one {# minute} other {# minutes}}' },
hours: { id: 'intervals.full.hours', defaultMessage: '{number, plural, one {# hour} other {# hours}}' },
days: { id: 'intervals.full.days', defaultMessage: '{number, plural, one {# day} other {# days}}' },
- indefinite: { id: 'mute_modal.indefinite', defaultMessage: 'Indefinite' },
+ indefinite: { id: 'mute_modal.indefinite', defaultMessage: 'Until I unmute them' },
+ hideFromNotifications: { id: 'mute_modal.hide_from_notifications', defaultMessage: 'Hide from notifications' },
});
-const mapStateToProps = state => {
- return {
- account: state.getIn(['mutes', 'new', 'account']),
- notifications: state.getIn(['mutes', 'new', 'notifications']),
- muteDuration: state.getIn(['mutes', 'new', 'duration']),
- };
+const RadioButtonLabel = ({ name, value, currentValue, onChange, label }) => (
+
+);
+
+RadioButtonLabel.propTypes = {
+ name: PropTypes.string,
+ value: PropTypes.oneOf([PropTypes.string, PropTypes.number, PropTypes.bool]),
+ currentValue: PropTypes.oneOf([PropTypes.string, PropTypes.number, PropTypes.bool]),
+ checked: PropTypes.bool,
+ onChange: PropTypes.func,
+ label: PropTypes.node,
};
-const mapDispatchToProps = dispatch => {
- return {
- onConfirm(account, notifications, muteDuration) {
- dispatch(muteAccount(account.get('id'), notifications, muteDuration));
- },
-
- onClose() {
- dispatch(closeModal({
- modalType: undefined,
- ignoreFocus: false,
- }));
- },
-
- onToggleNotifications() {
- dispatch(toggleHideNotifications());
- },
-
- onChangeMuteDuration(e) {
- dispatch(changeMuteDuration(e.target.value));
- },
- };
-};
+export const MuteModal = ({ accountId, acct }) => {
+ const intl = useIntl();
+ const dispatch = useDispatch();
+ const [notifications, setNotifications] = useState(true);
+ const [muteDuration, setMuteDuration] = useState('0');
+ const [expanded, setExpanded] = useState(false);
+
+ const handleClick = useCallback(() => {
+ dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+ dispatch(muteAccount(accountId, notifications, muteDuration));
+ }, [dispatch, accountId, notifications, muteDuration]);
+
+ const handleCancel = useCallback(() => {
+ dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+ }, [dispatch]);
+
+ const handleToggleNotifications = useCallback(({ target }) => {
+ setNotifications(target.checked);
+ }, [setNotifications]);
+
+ const handleChangeMuteDuration = useCallback(({ target }) => {
+ setMuteDuration(target.value);
+ }, [setMuteDuration]);
+
+ const handleToggleSettings = useCallback(() => {
+ setExpanded(!expanded);
+ }, [expanded, setExpanded]);
+
+ return (
+
+
+
-class MuteModal extends PureComponent {
-
- static propTypes = {
- account: PropTypes.object.isRequired,
- notifications: PropTypes.bool.isRequired,
- onClose: PropTypes.func.isRequired,
- onConfirm: PropTypes.func.isRequired,
- onToggleNotifications: PropTypes.func.isRequired,
- intl: PropTypes.object.isRequired,
- muteDuration: PropTypes.number.isRequired,
- onChangeMuteDuration: PropTypes.func.isRequired,
- };
-
- handleClick = () => {
- this.props.onClose();
- this.props.onConfirm(this.props.account, this.props.notifications, this.props.muteDuration);
- };
-
- handleCancel = () => {
- this.props.onClose();
- };
-
- toggleNotifications = () => {
- this.props.onToggleNotifications();
- };
-
- changeMuteDuration = (e) => {
- this.props.onChangeMuteDuration(e);
- };
-
- render () {
- const { account, notifications, muteDuration, intl } = this.props;
-
- return (
-
-
-
- @{account.get('acct')} }}
- />
-
-
-
-
-
-
-
+
+
+
-
:
-
- {/* eslint-disable-next-line jsx-a11y/no-onchange */}
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- );
- }
+
+ );
+};
-}
+MuteModal.propTypes = {
+ accountId: PropTypes.string.isRequired,
+ acct: PropTypes.string.isRequired,
+};
-export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(MuteModal));
+export default MuteModal;
diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
index d3f46c6d466317..ff90eef359fb6d 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
@@ -1,30 +1,43 @@
import PropTypes from 'prop-types';
-import { Component } from 'react';
+import { Component, useEffect } from 'react';
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages, injectIntl, useIntl } from 'react-intl';
import { Link } from 'react-router-dom';
+import { useSelector, useDispatch } from 'react-redux';
+
+
import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
-import BookmarksIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
-import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
+import BookmarksActiveIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
+import BookmarksIcon from '@/material-icons/400-24px/bookmarks.svg?react';
+import ExploreActiveIcon from '@/material-icons/400-24px/explore-fill.svg?react';
+import ExploreIcon from '@/material-icons/400-24px/explore.svg?react';
+import HomeActiveIcon from '@/material-icons/400-24px/home-fill.svg?react';
+import HomeIcon from '@/material-icons/400-24px/home.svg?react';
+import ListAltActiveIcon from '@/material-icons/400-24px/list_alt-fill.svg?react';
import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
+import NotificationsActiveIcon from '@/material-icons/400-24px/notifications-fill.svg?react';
+import NotificationsIcon from '@/material-icons/400-24px/notifications.svg?react';
+import PersonAddActiveIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
+import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
import PublicIcon from '@/material-icons/400-24px/public.svg?react';
import SearchIcon from '@/material-icons/400-24px/search.svg?react';
-import SettingsIcon from '@/material-icons/400-24px/settings-fill.svg?react';
-import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
-import TagIcon from '@/material-icons/400-24px/tag.svg?react';
+import SettingsIcon from '@/material-icons/400-24px/settings.svg?react';
+import StarActiveIcon from '@/material-icons/400-24px/star-fill.svg?react';
+import StarIcon from '@/material-icons/400-24px/star.svg?react';
+import { fetchFollowRequests } from 'mastodon/actions/accounts';
+import { IconWithBadge } from 'mastodon/components/icon_with_badge';
import { WordmarkLogo } from 'mastodon/components/logo';
import { NavigationPortal } from 'mastodon/components/navigation_portal';
+import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
import { timelinePreview, trendsEnabled } from 'mastodon/initial_state';
import { transientSingleColumn } from 'mastodon/is_mobile';
import ColumnLink from './column_link';
import DisabledAccountBanner from './disabled_account_banner';
-import FollowRequestsColumnLink from './follow_requests_column_link';
-import ListPanel from './list_panel';
-import NotificationsCounterIcon from './notifications_counter_icon';
+import { ListPanel } from './list_panel';
import SignInBanner from './sign_in_banner';
const messages = defineMessages({
@@ -42,15 +55,51 @@ const messages = defineMessages({
search: { id: 'navigation_bar.search', defaultMessage: 'Search' },
advancedInterface: { id: 'navigation_bar.advanced_interface', defaultMessage: 'Open in advanced web interface' },
openedInClassicInterface: { id: 'navigation_bar.opened_in_classic_interface', defaultMessage: 'Posts, accounts, and other specific pages are opened by default in the classic web interface.' },
+ followRequests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
});
-class NavigationPanel extends Component {
+const NotificationsLink = () => {
+ const count = useSelector(state => state.getIn(['notifications', 'unread']));
+ const intl = useIntl();
+
+ return (
+
}
+ activeIcon={
}
+ text={intl.formatMessage(messages.notifications)}
+ />
+ );
+};
+
+const FollowRequestsLink = () => {
+ const count = useSelector(state => state.getIn(['user_lists', 'follow_requests', 'items'])?.size ?? 0);
+ const intl = useIntl();
+ const dispatch = useDispatch();
+
+ useEffect(() => {
+ dispatch(fetchFollowRequests());
+ }, [dispatch]);
+
+ if (count === 0) {
+ return null;
+ }
- static contextTypes = {
- identity: PropTypes.object.isRequired,
- };
+ return (
+
}
+ activeIcon={
}
+ text={intl.formatMessage(messages.followRequests)}
+ />
+ );
+};
+class NavigationPanel extends Component {
static propTypes = {
+ identity: identityContextPropShape,
intl: PropTypes.object.isRequired,
};
@@ -60,7 +109,7 @@ class NavigationPanel extends Component {
render () {
const { intl } = this.props;
- const { signedIn, disabledAccountId } = this.context.identity;
+ const { signedIn, disabledAccountId } = this.props.identity;
let banner = undefined;
@@ -77,7 +126,6 @@ class NavigationPanel extends Component {
- {!banner &&
}
{banner &&
@@ -88,14 +136,14 @@ class NavigationPanel extends Component {
{signedIn && (
<>
-
-
} text={intl.formatMessage(messages.notifications)} />
-
+
+
+
)}
{trendsEnabled ? (
-
+
) : (
)}
@@ -114,9 +162,9 @@ class NavigationPanel extends Component {
{signedIn && (
<>
-
-
-
+
+
+
@@ -138,4 +186,4 @@ class NavigationPanel extends Component {
}
-export default injectIntl(NavigationPanel);
+export default injectIntl(withIdentity(NavigationPanel));
diff --git a/app/javascript/mastodon/features/ui/components/notifications_counter_icon.js b/app/javascript/mastodon/features/ui/components/notifications_counter_icon.js
deleted file mode 100644
index 7d59d616d83003..00000000000000
--- a/app/javascript/mastodon/features/ui/components/notifications_counter_icon.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { connect } from 'react-redux';
-
-import NotificationsIcon from '@/material-icons/400-24px/notifications-fill.svg?react';
-import { IconWithBadge } from 'mastodon/components/icon_with_badge';
-
-
-const mapStateToProps = state => ({
- count: state.getIn(['notifications', 'unread']),
- id: 'bell',
- icon: NotificationsIcon,
-});
-
-export default connect(mapStateToProps)(IconWithBadge);
diff --git a/app/javascript/mastodon/features/ui/containers/status_list_container.js b/app/javascript/mastodon/features/ui/containers/status_list_container.js
index 3e7ae2add02d42..5ffa4353f13171 100644
--- a/app/javascript/mastodon/features/ui/containers/status_list_container.js
+++ b/app/javascript/mastodon/features/ui/containers/status_list_container.js
@@ -14,7 +14,7 @@ const makeGetStatusIds = (pending = false) => createSelector([
(state) => state.get('statuses'),
], (columnSettings, statusIds, statuses) => {
return statusIds.filter(id => {
- if (id === null) return true;
+ if (id === null || id === 'inline-follow-suggestions') return true;
const statusForId = statuses.get(id);
let showStatus = true;
diff --git a/app/javascript/mastodon/features/ui/index.jsx b/app/javascript/mastodon/features/ui/index.jsx
index d3fee272f0d186..7742f64860de2e 100644
--- a/app/javascript/mastodon/features/ui/index.jsx
+++ b/app/javascript/mastodon/features/ui/index.jsx
@@ -14,7 +14,8 @@ import { HotKeys } from 'react-hotkeys';
import { focusApp, unfocusApp, changeLayout } from 'mastodon/actions/app';
import { synchronouslySubmitMarkers, submitMarkers, fetchMarkers } from 'mastodon/actions/markers';
import { INTRODUCTION_VERSION } from 'mastodon/actions/onboarding';
-import PictureInPicture from 'mastodon/features/picture_in_picture';
+import { PictureInPicture } from 'mastodon/features/picture_in_picture';
+import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
import { layoutFromWindow } from 'mastodon/is_mobile';
import { WithRouterPropTypes } from 'mastodon/utils/react_router';
@@ -48,6 +49,8 @@ import {
DirectTimeline,
HashtagTimeline,
Notifications,
+ NotificationRequests,
+ NotificationRequest,
FollowRequests,
FavouritedStatuses,
BookmarkedStatuses,
@@ -80,7 +83,6 @@ const mapStateToProps = state => ({
hasComposingText: state.getIn(['compose', 'text']).trim().length !== 0,
hasMediaAttachments: state.getIn(['compose', 'media_attachments']).size > 0,
canUploadMore: !state.getIn(['compose', 'media_attachments']).some(x => ['audio', 'video'].includes(x.get('type'))) && state.getIn(['compose', 'media_attachments']).size < 4,
- dropdownMenuIsOpen: state.dropdownMenu.openId !== null,
firstLaunch: state.getIn(['settings', 'introductionVersion'], 0) < INTRODUCTION_VERSION,
username: state.getIn(['accounts', me, 'username']),
});
@@ -88,7 +90,7 @@ const mapStateToProps = state => ({
const keyMap = {
help: '?',
new: 'n',
- search: 's',
+ search: ['s', '/'],
forceNew: 'option+n',
toggleComposeSpoilers: 'option+x',
focusColumn: ['1', '2', '3', '4', '5', '6', '7', '8', '9'],
@@ -119,12 +121,8 @@ const keyMap = {
};
class SwitchingColumnsArea extends PureComponent {
-
- static contextTypes = {
- identity: PropTypes.object,
- };
-
static propTypes = {
+ identity: identityContextPropShape,
children: PropTypes.node,
location: PropTypes.object,
singleColumn: PropTypes.bool,
@@ -159,7 +157,7 @@ class SwitchingColumnsArea extends PureComponent {
render () {
const { children, singleColumn } = this.props;
- const { signedIn } = this.context.identity;
+ const { signedIn } = this.props.identity;
const pathName = this.props.location.pathname;
let redirect;
@@ -204,7 +202,9 @@ class SwitchingColumnsArea extends PureComponent {
-
+
+
+
@@ -249,12 +249,8 @@ class SwitchingColumnsArea extends PureComponent {
}
class UI extends PureComponent {
-
- static contextTypes = {
- identity: PropTypes.object.isRequired,
- };
-
static propTypes = {
+ identity: identityContextPropShape,
dispatch: PropTypes.func.isRequired,
children: PropTypes.node,
isComposing: PropTypes.bool,
@@ -262,7 +258,6 @@ class UI extends PureComponent {
hasMediaAttachments: PropTypes.bool,
canUploadMore: PropTypes.bool,
intl: PropTypes.object.isRequired,
- dropdownMenuIsOpen: PropTypes.bool,
layout: PropTypes.string.isRequired,
firstLaunch: PropTypes.bool,
username: PropTypes.string,
@@ -307,7 +302,7 @@ class UI extends PureComponent {
this.dragTargets.push(e.target);
}
- if (e.dataTransfer && Array.from(e.dataTransfer.types).includes('Files') && this.props.canUploadMore && this.context.identity.signedIn) {
+ if (e.dataTransfer && Array.from(e.dataTransfer.types).includes('Files') && this.props.canUploadMore && this.props.identity.signedIn) {
this.setState({ draggingOver: true });
}
};
@@ -335,7 +330,7 @@ class UI extends PureComponent {
this.setState({ draggingOver: false });
this.dragTargets = [];
- if (e.dataTransfer && e.dataTransfer.files.length >= 1 && this.props.canUploadMore && this.context.identity.signedIn) {
+ if (e.dataTransfer && e.dataTransfer.files.length >= 1 && this.props.canUploadMore && this.props.identity.signedIn) {
this.props.dispatch(uploadCompose(e.dataTransfer.files));
}
};
@@ -387,7 +382,7 @@ class UI extends PureComponent {
};
componentDidMount () {
- const { signedIn } = this.context.identity;
+ const { signedIn } = this.props.identity;
window.addEventListener('focus', this.handleWindowFocus, false);
window.addEventListener('blur', this.handleWindowBlur, false);
@@ -438,7 +433,7 @@ class UI extends PureComponent {
handleHotkeyNew = e => {
e.preventDefault();
- const element = this.node.querySelector('.compose-form__autosuggest-wrapper textarea');
+ const element = this.node.querySelector('.autosuggest-textarea__textarea');
if (element) {
element.focus();
@@ -555,7 +550,7 @@ class UI extends PureComponent {
render () {
const { draggingOver } = this.state;
- const { children, isComposing, location, dropdownMenuIsOpen, layout } = this.props;
+ const { children, isComposing, location, layout } = this.props;
const handlers = {
help: this.handleHotkeyToggleHelp,
@@ -581,10 +576,10 @@ class UI extends PureComponent {
return (
-
+
-
+
{children}
@@ -600,4 +595,4 @@ class UI extends PureComponent {
}
-export default connect(mapStateToProps)(injectIntl(withRouter(UI)));
+export default connect(mapStateToProps)(injectIntl(withRouter(withIdentity(UI))));
diff --git a/app/javascript/mastodon/features/ui/util/async-components.js b/app/javascript/mastodon/features/ui/util/async-components.js
index 7b968204be3797..e1f5bfdaf60f66 100644
--- a/app/javascript/mastodon/features/ui/util/async-components.js
+++ b/app/javascript/mastodon/features/ui/util/async-components.js
@@ -118,6 +118,10 @@ export function BlockModal () {
return import(/* webpackChunkName: "modals/block_modal" */'../components/block_modal');
}
+export function DomainBlockModal () {
+ return import(/* webpackChunkName: "modals/domain_block_modal" */'../components/domain_block_modal');
+}
+
export function ReportModal () {
return import(/* webpackChunkName: "modals/report_modal" */'../components/report_modal');
}
@@ -189,3 +193,11 @@ export function About () {
export function PrivacyPolicy () {
return import(/*webpackChunkName: "features/privacy_policy" */'../../privacy_policy');
}
+
+export function NotificationRequests () {
+ return import(/*webpackChunkName: "features/notifications/requests" */'../../notifications/requests');
+}
+
+export function NotificationRequest () {
+ return import(/*webpackChunkName: "features/notifications/request" */'../../notifications/request');
+}
diff --git a/app/javascript/mastodon/features/ui/util/sensitive_media_context.tsx b/app/javascript/mastodon/features/ui/util/sensitive_media_context.tsx
new file mode 100644
index 00000000000000..408154c31bf122
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/util/sensitive_media_context.tsx
@@ -0,0 +1,28 @@
+import { createContext, useContext, useMemo } from 'react';
+
+export const SensitiveMediaContext = createContext<{
+ hideMediaByDefault: boolean;
+}>({
+ hideMediaByDefault: false,
+});
+
+export function useSensitiveMediaContext() {
+ return useContext(SensitiveMediaContext);
+}
+
+type ContextValue = React.ContextType;
+
+export const SensitiveMediaContextProvider: React.FC<
+ React.PropsWithChildren<{ hideMediaByDefault: boolean }>
+> = ({ hideMediaByDefault, children }) => {
+ const contextValue = useMemo(
+ () => ({ hideMediaByDefault }),
+ [hideMediaByDefault],
+ );
+
+ return (
+
+ {children}
+
+ );
+};
diff --git a/app/javascript/mastodon/identity_context.tsx b/app/javascript/mastodon/identity_context.tsx
new file mode 100644
index 00000000000000..7f28ab77a34a7d
--- /dev/null
+++ b/app/javascript/mastodon/identity_context.tsx
@@ -0,0 +1,70 @@
+import PropTypes from 'prop-types';
+import { createContext, useContext } from 'react';
+
+import hoistStatics from 'hoist-non-react-statics';
+
+import type { InitialState } from 'mastodon/initial_state';
+
+export interface IdentityContextType {
+ signedIn: boolean;
+ accountId: string | undefined;
+ disabledAccountId: string | undefined;
+ permissions: number;
+}
+
+export const identityContextPropShape = PropTypes.shape({
+ signedIn: PropTypes.bool.isRequired,
+ accountId: PropTypes.string,
+ disabledAccountId: PropTypes.string,
+}).isRequired;
+
+export const createIdentityContext = (state: InitialState) => ({
+ signedIn: !!state.meta.me,
+ accountId: state.meta.me,
+ disabledAccountId: state.meta.disabled_account_id,
+ permissions: state.role?.permissions ?? 0,
+});
+
+export const IdentityContext = createContext({
+ signedIn: false,
+ permissions: 0,
+ accountId: undefined,
+ disabledAccountId: undefined,
+});
+
+export const useIdentity = () => useContext(IdentityContext);
+
+export interface IdentityProps {
+ ref?: unknown;
+ wrappedComponentRef?: unknown;
+}
+
+/* Injects an `identity` props into the wrapped component to be able to use the new context in class components */
+export function withIdentity<
+ ComponentType extends React.ComponentType,
+>(Component: ComponentType) {
+ const displayName = `withIdentity(${Component.displayName ?? Component.name})`;
+ const C = (props: React.ComponentProps) => {
+ const { wrappedComponentRef, ...remainingProps } = props;
+
+ return (
+
+ {(context) => {
+ return (
+ // @ts-expect-error - Dynamic covariant generic components are tough to type.
+
+ );
+ }}
+
+ );
+ };
+
+ C.displayName = displayName;
+ C.WrappedComponent = Component;
+
+ return hoistStatics(C, Component);
+}
diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js
index b02469f993348b..9ec3df0df87814 100644
--- a/app/javascript/mastodon/initial_state.js
+++ b/app/javascript/mastodon/initial_state.js
@@ -38,20 +38,28 @@
* @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
* @property {string} sso_redirect
*/
+/**
+ * @typedef Role
+ * @property {string} id
+ * @property {string} name
+ * @property {string} permissions
+ * @property {string} color
+ * @property {boolean} highlighted
+ */
+
/**
* @typedef InitialState
* @property {Record} accounts
* @property {InitialStateLanguage[]} languages
* @property {boolean=} critical_updates_pending
* @property {InitialStateMeta} meta
- * @property {number} max_toot_chars
+ * @property {Role?} role
*/
const element = document.getElementById('initial-state');
@@ -100,7 +108,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');
@@ -110,7 +117,11 @@ export const criticalUpdatesPending = initialState?.critical_updates_pending;
export const statusPageUrl = getMeta('status_page_url');
export const sso_redirect = getMeta('sso_redirect');
-// Glitch-soc-specific settings
-export const maxChars = (initialState && initialState.max_toot_chars) || 500;
+/**
+ * @returns {string | undefined}
+ */
+export function getAccessToken() {
+ return getMeta('access_token');
+}
export default initialState;
diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json
index d1873d6dce1e5d..e4f7f12b0edcfb 100644
--- a/app/javascript/mastodon/locales/af.json
+++ b/app/javascript/mastodon/locales/af.json
@@ -33,6 +33,7 @@
"account.follows.empty": "Die gebruiker volg nog niemand.",
"account.go_to_profile": "Gaan na profiel",
"account.hide_reblogs": "Versteek plasings wat deur @{name} aangestuur is",
+ "account.in_memoriam": "Ter nagedagtenis.",
"account.joined_short": "Aangesluit",
"account.link_verified_on": "Eienaarskap van hierdie skakel is nagegaan op {date}",
"account.locked_info": "Die rekening se privaatheidstatus is gesluit. Die eienaar hersien handmatig wie hom/haar kan volg.",
@@ -66,12 +67,12 @@
"alert.unexpected.message": "Iets het skeefgeloop.",
"alert.unexpected.title": "Oeps!",
"announcement.announcement": "Aankondiging",
- "autosuggest_hashtag.per_week": "{count} per week",
"boost_modal.combo": "Druk {combo} om dit volgende keer oor te slaan",
"bundle_column_error.error.title": "Ag nee!",
"bundle_column_error.network.title": "Netwerkfout",
"bundle_column_error.retry": "Probeer weer",
"bundle_column_error.return": "Keer terug na die tuisblad",
+ "bundle_column_error.routing.title": "404",
"bundle_modal_error.close": "Sluit",
"bundle_modal_error.message": "Die laai van die komponent het iewers skeefgeloop.",
"bundle_modal_error.retry": "Probeer weer",
@@ -111,23 +112,14 @@
"compose_form.lock_disclaimer": "Jou rekening is nie {locked} nie. Enigiemand kan jou volg en sien wat jy vir jou volgers plaas.",
"compose_form.lock_disclaimer.lock": "gesluit",
"compose_form.placeholder": "Wat wil jy deel?",
- "compose_form.poll.add_option": "Voeg ’n keuse by",
"compose_form.poll.duration": "Duur van peiling",
- "compose_form.poll.option_placeholder": "Keuse {number}",
- "compose_form.poll.remove_option": "Verwyder hierdie keuse",
"compose_form.poll.switch_to_multiple": "Verander peiling om meer as een keuse toe te laat",
"compose_form.poll.switch_to_single": "Verander die peiling om slegs een keuse toe te laat",
- "compose_form.publish": "Publiseer",
"compose_form.publish_form": "Publiseer",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Stoor veranderinge",
"compose_form.spoiler.marked": "Verwyder inhoudswaarskuwing",
"compose_form.spoiler.unmarked": "Voeg inhoudswaarskuwing by",
- "compose_form.spoiler_placeholder": "Skryf jou waarskuwing hier",
"confirmation_modal.cancel": "Kanselleer",
- "confirmations.block.block_and_report": "Blokkeer en rapporteer",
"confirmations.block.confirm": "Blokkeer",
- "confirmations.block.message": "Is jy seker jy wil {name} blokkeer?",
"confirmations.cancel_follow_request.confirm": "Herroep versoek",
"confirmations.cancel_follow_request.message": "Is jy seker jy wil jou versoek om {name} te volg, terugtrek?",
"confirmations.delete.confirm": "Wis uit",
@@ -135,7 +127,6 @@
"confirmations.delete_list.confirm": "Wis uit",
"confirmations.delete_list.message": "Is jy seker jy wil hierdie lys permanent verwyder?",
"confirmations.discard_edit_media.confirm": "Gooi weg",
- "confirmations.domain_block.confirm": "Blokkeer die hele domein",
"confirmations.logout.confirm": "Teken Uit",
"confirmations.logout.message": "Is jy seker jy wil uitteken?",
"confirmations.reply.confirm": "Antwoord",
@@ -157,6 +148,8 @@
"emoji_button.food": "Eet- en drinkgoed",
"emoji_button.nature": "Natuur",
"emoji_button.not_found": "Geen passende emoji gevind nie",
+ "emoji_button.objects": "Voorwerpe",
+ "emoji_button.people": "Mense",
"emoji_button.search": "Soek...",
"emoji_button.search_results": "Soekresultate",
"empty_column.account_timeline": "Geen plasings hier nie!",
@@ -169,7 +162,12 @@
"empty_column.lists": "Jy het nog geen lyste nie. Wanneer jy een skep, sal dit hier vertoon.",
"empty_column.notifications": "Jy het nog geen kennisgewings nie. Interaksie van ander mense met jou, sal hier vertoon.",
"explore.search_results": "Soekresultate",
+ "explore.suggested_follows": "Mense",
+ "explore.trending_links": "Nuus",
+ "filter_modal.added.settings_link": "instellings bladsy",
"filter_modal.select_filter.search": "Soek of skep",
+ "firehose.local": "Hierdie bediener",
+ "firehose.remote": "Ander bedieners",
"footer.about": "Oor",
"footer.directory": "Profielgids",
"footer.get_app": "Kry die app",
@@ -178,14 +176,21 @@
"footer.privacy_policy": "Privaatheidsbeleid",
"footer.source_code": "Wys bronkode",
"getting_started.heading": "Kom aan die gang",
+ "hashtag.column_header.tag_mode.all": "en {additional}",
+ "hashtag.column_header.tag_mode.any": "of {additional}",
+ "hashtag.column_header.tag_mode.none": "sonder {additional}",
"hashtag.column_settings.select.placeholder": "Voer hutsetikette in…",
"hashtag.column_settings.tag_toggle": "Voeg meer etikette by hierdie kolom",
"hashtag.follow": "Volg hutsetiket",
"home.column_settings.show_reblogs": "Wys aangestuurde plasings",
"interaction_modal.description.reblog": "Met 'n rekening op Mastodon kan jy hierdie plasing aanstuur om dit met jou volgers te deel.",
"interaction_modal.description.reply": "Met 'n rekening op Mastodon kan jy op hierdie plasing reageer.",
+ "interaction_modal.title.follow": "Volg {name}",
"interaction_modal.title.reblog": "Stuur {name} se plasing aan",
"interaction_modal.title.reply": "Reageer op {name} se plasing",
+ "intervals.full.days": "{number, plural, one {# dag} other {# dae}}",
+ "intervals.full.hours": "{number, plural, one {# uur} other {# uur}}",
+ "intervals.full.minutes": "{number, plural, one {# minuut} other {# minute}}",
"keyboard_shortcuts.back": "Navigeer terug",
"keyboard_shortcuts.blocked": "Vertoon lys van geblokkeerde gebruikers",
"keyboard_shortcuts.boost": "Stuur aan",
@@ -217,8 +222,11 @@
"keyboard_shortcuts.toot": "Begin ’n nuwe plasing",
"keyboard_shortcuts.unfocus": "Fokus uit van teksveld/soekveld",
"keyboard_shortcuts.up": "Beweeg opwaarts in die lys",
+ "lightbox.next": "Volgende",
+ "lightbox.previous": "Vorige",
"limited_account_hint.action": "Vertoon profiel in elk geval",
"limited_account_hint.title": "Hierdie profiel is deur moderators van {domain} versteek.",
+ "link_preview.author": "Deur {name}",
"lists.account.add": "Voeg by lys",
"lists.account.remove": "Verwyder vanaf lys",
"lists.delete": "Verwyder lys",
@@ -234,7 +242,6 @@
"navigation_bar.community_timeline": "Plaaslike tydlyn",
"navigation_bar.compose": "Skep nuwe plasing",
"navigation_bar.domain_blocks": "Geblokkeerde domeine",
- "navigation_bar.edit_profile": "Redigeer profiel",
"navigation_bar.lists": "Lyste",
"navigation_bar.logout": "Teken uit",
"navigation_bar.personal": "Persoonlik",
@@ -246,6 +253,7 @@
"notification.reblog": "{name} het jou plasing aangestuur",
"notifications.column_settings.push": "Stootkennisgewings",
"notifications.column_settings.reblog": "Aangestuurde plasings:",
+ "notifications.column_settings.sound": "Speel klank",
"notifications.column_settings.status": "Nuwe plasings:",
"notifications.column_settings.unread_notifications.highlight": "Lig ongelese kennisgewings uit",
"notifications.filter.boosts": "Aangestuurde plasings",
@@ -267,14 +275,7 @@
"onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
"onboarding.steps.share_profile.title": "Share your profile",
"privacy.change": "Verander privaatheid van plasing",
- "privacy.direct.long": "Slegs sigbaar vir genoemde gebruikers",
- "privacy.direct.short": "Slegs genoemde persone",
- "privacy.private.long": "Slegs sigbaar vir volgelinge",
- "privacy.private.short": "Slegs volgelinge",
- "privacy.public.long": "Sigbaar vir almal",
"privacy.public.short": "Publiek",
- "privacy.unlisted.long": "Sigbaar vir almal, maar onttrek uit verkennings-kenmerke",
- "privacy.unlisted.short": "Ongelys",
"privacy_policy.last_updated": "Laaste bywerking op {date}",
"privacy_policy.title": "Privaatheidsbeleid",
"regeneration_indicator.sublabel": "Jou tuis-voer word voorberei!",
@@ -316,5 +317,8 @@
"upload_form.audio_description": "Describe for people with hearing loss",
"upload_form.description": "Describe for the visually impaired",
"upload_form.video_description": "Describe for people with hearing loss or visual impairment",
- "upload_progress.label": "Uploading…"
+ "upload_progress.label": "Uploading…",
+ "video.fullscreen": "Volskerm",
+ "video.mute": "Klank afskakel",
+ "video.unmute": "Klank aanskakel"
}
diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index 23899b10072d4d..3f1fd376ff46ec 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -75,7 +75,6 @@
"announcement.announcement": "Anuncio",
"attachments_list.unprocessed": "(sin procesar)",
"audio.hide": "Amagar audio",
- "autosuggest_hashtag.per_week": "{count} per semana",
"boost_modal.combo": "Puetz fer clic en {combo} pa blincar este aviso la proxima vegada",
"bundle_column_error.copy_stacktrace": "Copiar informe d'error",
"bundle_column_error.error.body": "La pachina solicitada no podió estar renderizada. Podría deber-se a una error en o nuestro codigo u a un problema de compatibilidat con o navegador.",
@@ -126,26 +125,14 @@
"compose_form.lock_disclaimer": "La tuya cuenta no ye {locked}. Totz pueden seguir-te pa veyer las tuyas publicacions nomás pa seguidores.",
"compose_form.lock_disclaimer.lock": "blocau",
"compose_form.placeholder": "En qué yes pensando?",
- "compose_form.poll.add_option": "Anyadir una opción",
"compose_form.poll.duration": "Duración d'a enqüesta",
- "compose_form.poll.option_placeholder": "Elección {number}",
- "compose_form.poll.remove_option": "Eliminar esta opción",
"compose_form.poll.switch_to_multiple": "Modificar enqüesta pa permitir multiples opcions",
"compose_form.poll.switch_to_single": "Modificar enqüesta pa permitir una sola opción",
- "compose_form.publish": "Publicar",
"compose_form.publish_form": "Publicar",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Alzar cambios",
- "compose_form.sensitive.hide": "{count, plural, one {Marcar material como sensible} other {Marcar material como sensible}}",
- "compose_form.sensitive.marked": "{count, plural, one {Material marcau como sensible} other {Material marcau como sensible}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Material no marcau como sensible} other {Material no marcau como sensible}}",
"compose_form.spoiler.marked": "Texto amagau dimpués de l'alvertencia",
"compose_form.spoiler.unmarked": "Texto no amagau",
- "compose_form.spoiler_placeholder": "Alvertencia de conteniu",
"confirmation_modal.cancel": "Cancelar",
- "confirmations.block.block_and_report": "Blocar y Denunciar",
"confirmations.block.confirm": "Blocar",
- "confirmations.block.message": "Yes seguro que quiers blocar a {name}?",
"confirmations.cancel_follow_request.confirm": "Retirar solicitut",
"confirmations.cancel_follow_request.message": "Yes seguro que deseyas retirar la tuya solicitut pa seguir a {name}?",
"confirmations.delete.confirm": "Eliminar",
@@ -154,13 +141,10 @@
"confirmations.delete_list.message": "Seguro que quiers borrar esta lista permanentment?",
"confirmations.discard_edit_media.confirm": "Descartar",
"confirmations.discard_edit_media.message": "Tiens cambios sin alzar en a descripción u vista previa d'o fichero audiovisual, descartar-los de totz modos?",
- "confirmations.domain_block.confirm": "Amagar dominio entero",
"confirmations.domain_block.message": "Yes seguro que quiers blocar lo dominio {domain} entero? En cheneral ye prou, y preferible, fer uns quantos bloqueyos y silenciaus concretos. Los tuyos seguidros d'ixe dominio serán eliminaus.",
"confirmations.logout.confirm": "Zarrar sesión",
"confirmations.logout.message": "Yes seguro de querer zarrar la sesión?",
"confirmations.mute.confirm": "Silenciar",
- "confirmations.mute.explanation": "Esto amagará las publicacions d'ells y en as qualas los has mencionau, pero les permitirá veyer los tuyos mensaches y seguir-te.",
- "confirmations.mute.message": "Yes seguro que quiers silenciar a {name}?",
"confirmations.redraft.confirm": "Borrar y tornar ta borrador",
"confirmations.reply.confirm": "Responder",
"confirmations.reply.message": "Responder sobrescribirá lo mensache que yes escribindo. Yes seguro que deseyas continar?",
@@ -264,7 +248,6 @@
"hashtag.column_settings.tag_toggle": "Include additional tags in this column",
"hashtag.follow": "Seguir etiqueta",
"hashtag.unfollow": "Deixar de seguir etiqueta",
- "home.column_settings.basic": "Basico",
"home.column_settings.show_reblogs": "Amostrar retutz",
"home.column_settings.show_replies": "Amostrar respuestas",
"home.hide_announcements": "Amagar anuncios",
@@ -335,9 +318,6 @@
"load_pending": "{count, plural, one {# nuevo elemento} other {# nuevos elementos}}",
"media_gallery.toggle_visible": "{number, plural, one {Amaga la imachen} other {Amaga las imáchens}}",
"moved_to_account_banner.text": "La tuya cuenta {disabledAccount} ye actualment deshabilitada perque t'has mudau a {movedToAccount}.",
- "mute_modal.duration": "Duración",
- "mute_modal.hide_notifications": "Amagar notificacions d'este usuario?",
- "mute_modal.indefinite": "Indefinida",
"navigation_bar.about": "Sobre",
"navigation_bar.blocks": "Usuarios blocaus",
"navigation_bar.bookmarks": "Marcadors",
@@ -345,7 +325,6 @@
"navigation_bar.compose": "Escribir nueva publicación",
"navigation_bar.discover": "Descubrir",
"navigation_bar.domain_blocks": "Dominios amagaus",
- "navigation_bar.edit_profile": "Editar perfil",
"navigation_bar.explore": "Explorar",
"navigation_bar.filters": "Parolas silenciadas",
"navigation_bar.follow_requests": "Solicitutz pa seguir-te",
@@ -375,9 +354,6 @@
"notifications.column_settings.admin.report": "Nuevos informes:",
"notifications.column_settings.admin.sign_up": "Nuevos rechistros:",
"notifications.column_settings.alert": "Notificacions d'escritorio",
- "notifications.column_settings.filter_bar.advanced": "Amostrar totas las categorías",
- "notifications.column_settings.filter_bar.category": "Barra de filtrau rapido",
- "notifications.column_settings.filter_bar.show_bar": "Amostrar barra de filtros",
"notifications.column_settings.follow": "Nuevos seguidores:",
"notifications.column_settings.follow_request": "Nuevas solicitutz de seguimiento:",
"notifications.column_settings.mention": "Mencions:",
@@ -429,14 +405,7 @@
"poll_button.add_poll": "Anyadir una enqüesta",
"poll_button.remove_poll": "Eliminar enqüesta",
"privacy.change": "Achustar privacidat",
- "privacy.direct.long": "Nomás amostrar a los usuarios mencionaus",
- "privacy.direct.short": "Nomás contas mencionadas",
- "privacy.private.long": "Nomás amostrar a seguidores",
- "privacy.private.short": "Solo seguidores",
- "privacy.public.long": "Visible pa totz",
"privacy.public.short": "Publico",
- "privacy.unlisted.long": "Visible pa totz, pero excluyiu d'as funcions d'escubrimiento",
- "privacy.unlisted.short": "No listau",
"privacy_policy.last_updated": "Ultima vegada actualizau {date}",
"privacy_policy.title": "Politica de Privacidat",
"refresh": "Actualizar",
@@ -523,7 +492,6 @@
"status.delete": "Borrar",
"status.detailed_status": "Vista de conversación detallada",
"status.edit": "Editar",
- "status.edited": "Editau {date}",
"status.edited_x_times": "Editau {count, plural, one {{count} vez} other {{count} veces}}",
"status.embed": "Incrustado",
"status.filter": "Filtrar esta publicación",
@@ -590,10 +558,8 @@
"upload_error.poll": "Puyada de fichers no permitida con enqüestas.",
"upload_form.audio_description": "Describir pa personas con problemas auditivos",
"upload_form.description": "Describir pa los usuarios con dificultat visual",
- "upload_form.description_missing": "Garra descripción anyadida",
"upload_form.edit": "Editar",
"upload_form.thumbnail": "Cambiar miniatura",
- "upload_form.undo": "Borrar",
"upload_form.video_description": "Describir pa personas con problemas auditivos u visuals",
"upload_modal.analyzing_picture": "Analisando imachen…",
"upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index c0d07cc6484a8f..68e32dd2aab6e7 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -5,7 +5,7 @@
"about.domain_blocks.no_reason_available": "السبب غير متوفر",
"about.domain_blocks.preamble": "يسمح لك ماستدون عموماً بعرض المحتوى من المستخدمين من أي خادم آخر في الفدرالية والتفاعل معهم. وهذه هي الاستثناءات التي وضعت على هذا الخادم بالذات.",
"about.domain_blocks.silenced.explanation": "عموماً، لن ترى ملفات التعريف والمحتوى من هذا الخادم، إلا إذا كنت تبحث عنه بشكل صريح أو تختار أن تتابعه.",
- "about.domain_blocks.silenced.title": "تم كتمه",
+ "about.domain_blocks.silenced.title": "محدود",
"about.domain_blocks.suspended.explanation": "لن يتم معالجة أي بيانات من هذا الخادم أو تخزينها أو تبادلها، مما يجعل أي تفاعل أو اتصال مع المستخدمين من هذا الخادم مستحيلا.",
"about.domain_blocks.suspended.title": "مُعلّق",
"about.not_available": "لم يتم توفير هذه المعلومات على هذا الخادم.",
@@ -21,6 +21,7 @@
"account.blocked": "محظور",
"account.browse_more_on_origin_server": "تصفح المزيد في الملف الشخصي الأصلي",
"account.cancel_follow_request": "إلغاء طلب المتابعة",
+ "account.copy": "نسخ الرابط إلى الحساب",
"account.direct": "إشارة خاصة لـ @{name}",
"account.disable_notifications": "توقف عن إشعاري عندما ينشر @{name}",
"account.domain_blocked": "اسم النِّطاق محظور",
@@ -31,6 +32,7 @@
"account.featured_tags.last_status_never": "لا توجد رسائل",
"account.featured_tags.title": "وسوم {name} المميَّزة",
"account.follow": "متابعة",
+ "account.follow_back": "رد المتابعة",
"account.followers": "مُتابِعون",
"account.followers.empty": "لا أحدَ يُتابع هذا المُستخدم إلى حد الآن.",
"account.followers_counter": "{count, plural, zero{لا مُتابع} one {مُتابعٌ واحِد} two {مُتابعانِ اِثنان} few {{counter} مُتابِعين} many {{counter} مُتابِعًا} other {{counter} مُتابع}}",
@@ -51,6 +53,7 @@
"account.mute_notifications_short": "كتم الإشعارات",
"account.mute_short": "اكتم",
"account.muted": "مَكتوم",
+ "account.mutual": "متبادل",
"account.no_bio": "لم يتم تقديم وصف.",
"account.open_original_page": "افتح الصفحة الأصلية",
"account.posts": "منشورات",
@@ -86,7 +89,14 @@
"announcement.announcement": "إعلان",
"attachments_list.unprocessed": "(غير معالَج)",
"audio.hide": "إخفاء المقطع الصوتي",
- "autosuggest_hashtag.per_week": "{count} في الأسبوع",
+ "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": "لا يمكن تقديم الصفحة المطلوبة. قد يكون بسبب خطأ في التعليمات البرمجية، أو مشكلة توافق المتصفح.",
@@ -143,26 +153,22 @@
"compose_form.lock_disclaimer": "حسابُك غير {locked}. يُمكن لأي شخص مُتابعتك لرؤية (منشورات المتابعين فقط).",
"compose_form.lock_disclaimer.lock": "مُقفَل",
"compose_form.placeholder": "فِيمَ تُفكِّر؟",
- "compose_form.poll.add_option": "إضافة خيار",
"compose_form.poll.duration": "مُدَّة اِستطلاع الرأي",
+ "compose_form.poll.multiple": "متعدد الخيارات",
"compose_form.poll.option_placeholder": "الخيار {number}",
- "compose_form.poll.remove_option": "إزالة هذا الخيار",
+ "compose_form.poll.single": "اختر واحدا",
"compose_form.poll.switch_to_multiple": "تغيِير الاستطلاع للسماح باِخيارات مُتعدِّدة",
"compose_form.poll.switch_to_single": "تغيِير الاستطلاع للسماح باِخيار واحد فقط",
+ "compose_form.poll.type": "الأسلوب",
"compose_form.publish": "نشر",
"compose_form.publish_form": "منشور جديد",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "احفظ التعديلات",
- "compose_form.sensitive.hide": "{count, plural, one {الإشارة إلى الوَسط كمُحتوى حسّاس} two{الإشارة إلى الوسطان كمُحتويان حسّاسان} other {الإشارة إلى الوسائط كمُحتويات حسّاسة}}",
- "compose_form.sensitive.marked": "{count, plural, one {تمَّ الإشارة إلى الوسط كمُحتوى حسّاس} two{تمَّ الإشارة إلى الوسطان كمُحتويان حسّاسان} other {تمَّ الإشارة إلى الوسائط كمُحتويات حسّاسة}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {لم تَتِمّ الإشارة إلى الوسط كمُحتوى حسّاس} two{لم تَتِمّ الإشارة إلى الوسطان كمُحتويان حسّاسان} other {لم تَتِمّ الإشارة إلى الوسائط كمُحتويات حسّاسة}}",
+ "compose_form.reply": "ردّ",
+ "compose_form.save_changes": "تحديث",
"compose_form.spoiler.marked": "إزالة تحذير المحتوى",
"compose_form.spoiler.unmarked": "إضافة تحذير للمحتوى",
- "compose_form.spoiler_placeholder": "اُكتُب تحذيركَ هُنا",
+ "compose_form.spoiler_placeholder": "تحذير المحتوى (اختياري)",
"confirmation_modal.cancel": "إلغاء",
- "confirmations.block.block_and_report": "حظره والإبلاغ عنه",
"confirmations.block.confirm": "حظر",
- "confirmations.block.message": "هل أنتَ مُتأكدٌ أنكَ تُريدُ حَظرَ {name}؟",
"confirmations.cancel_follow_request.confirm": "إلغاء الطلب",
"confirmations.cancel_follow_request.message": "متأكد من أنك تريد إلغاء طلب متابعتك لـ {name}؟",
"confirmations.delete.confirm": "حذف",
@@ -171,15 +177,13 @@
"confirmations.delete_list.message": "هل أنتَ مُتأكدٌ أنكَ تُريدُ حَذفَ هذِهِ القائمة بشكلٍ دائم؟",
"confirmations.discard_edit_media.confirm": "تجاهل",
"confirmations.discard_edit_media.message": "لديك تغييرات غير محفوظة لوصف الوسائط أو معاينتها، أتريد تجاهلها على أي حال؟",
- "confirmations.domain_block.confirm": "حظر اِسم النِّطاق بشكلٍ كامل",
+ "confirmations.domain_block.confirm": "حظر الخادم",
"confirmations.domain_block.message": "متأكد من أنك تود حظر اسم النطاق {domain} بالكامل ؟ في غالب الأحيان يُستَحسَن كتم أو حظر بعض الحسابات بدلا من حظر نطاق بالكامل.\nلن تتمكن مِن رؤية محتوى هذا النطاق لا على خيوطك العمومية و لا في إشعاراتك. سوف يتم كذلك إزالة كافة متابعيك المنتمين إلى هذا النطاق.",
"confirmations.edit.confirm": "تعديل",
"confirmations.edit.message": "التعديل في الحين سوف يُعيد كتابة الرسالة التي أنت بصدد تحريرها. متأكد من أنك تريد المواصلة؟",
"confirmations.logout.confirm": "خروج",
"confirmations.logout.message": "متأكد من أنك تريد الخروج؟",
"confirmations.mute.confirm": "أكتم",
- "confirmations.mute.explanation": "هذا سيخفي المنشورات عنهم وتلك المشار فيها إليهم، لكنه سيسمح لهم برؤية منشوراتك ومتابعتك.",
- "confirmations.mute.message": "هل أنت متأكد أنك تريد كتم {name} ؟",
"confirmations.redraft.confirm": "إزالة وإعادة الصياغة",
"confirmations.redraft.message": "هل أنت متأكد من أنك تريد حذف هذا المنشور و إعادة صياغته؟ سوف تفقد جميع الإعجابات و الترقيات أما الردود المتصلة به فستُصبِح يتيمة.",
"confirmations.reply.confirm": "رد",
@@ -190,6 +194,7 @@
"conversation.mark_as_read": "اعتبرها كمقروءة",
"conversation.open": "اعرض المحادثة",
"conversation.with": "مع {names}",
+ "copy_icon_button.copied": "نُسِخ إلى الحافظة",
"copypaste.copied": "تم نسخه",
"copypaste.copy_to_clipboard": "نسخ إلى الحافظة",
"directory.federated": "مِن الفديفرس المعروف",
@@ -204,6 +209,23 @@
"dismissable_banner.explore_statuses": "هذه هي المنشورات الرائجة على الشبكات الاجتماعيّة اليوم. تظهر المنشورات المعاد نشرها والحائزة على مفضّلات أكثر في مرتبة عليا.",
"dismissable_banner.explore_tags": "هذه هي الوسوم تكتسب جذب الاهتمام حاليًا على الويب الاجتماعي. الوسوم التي يستخدمها مختلف الناس تحتل مرتبة عليا.",
"dismissable_banner.public_timeline": "هذه هي أحدث المنشورات العامة من الناس على الشبكة الاجتماعية التي يتبعها الناس على {domain}.",
+ "domain_block_modal.block": "حظر الخادم",
+ "domain_block_modal.block_account_instead": "أحجب @{name} بدلاً من ذلك",
+ "domain_block_modal.they_can_interact_with_old_posts": "يمكن للأشخاص من هذا الخادم التفاعل مع منشوراتك القديمة.",
+ "domain_block_modal.they_cant_follow": "لا أحد من هذا الخادم يمكنه متابعتك.",
+ "domain_block_modal.they_wont_know": "لن يَعرف أنه قد تم حظره.",
+ "domain_block_modal.title": "أتريد حظر النطاق؟",
+ "domain_block_modal.you_will_lose_followers": "سيتم إزالة جميع متابعيك من هذا الخادم.",
+ "domain_block_modal.you_wont_see_posts": "لن ترى منشورات أو إشعارات من المستخدمين على هذا الخادم.",
+ "domain_pill.activitypub_lets_connect": "يتيح لك التواصل والتفاعل مع الناس ليس فقط على ماستدون، ولكن عبر تطبيقات اجتماعية مختلفة أيضا.",
+ "domain_pill.activitypub_like_language": "إنّ ActivityPub مثل لغة ماستدون التي يتحدث بها مع شبكات اجتماعية أخرى.",
+ "domain_pill.server": "الخادِم",
+ "domain_pill.their_handle": "مُعرفه:",
+ "domain_pill.their_server": "بيتهم الرقمي، حيث تُستضاف كافة منشوراتهم.",
+ "domain_pill.their_username": "مُعرّفُهم الفريد على الخادم. من الممكن العثور على مستخدمين بنفس اسم المستخدم على خوادم مختلفة.",
+ "domain_pill.username": "اسم المستخدم",
+ "domain_pill.whats_in_a_handle": "ما المقصود بالمُعرِّف؟",
+ "domain_pill.your_handle": "عنوانك الكامل:",
"embed.instructions": "يمكنكم إدماج هذا المنشور على موقعكم الإلكتروني عن طريق نسخ الشفرة أدناه.",
"embed.preview": "إليك ما سيبدو عليه:",
"emoji_button.activity": "الأنشطة",
@@ -221,6 +243,7 @@
"emoji_button.search_results": "نتائج البحث",
"emoji_button.symbols": "رموز",
"emoji_button.travel": "الأماكن والسفر",
+ "empty_column.account_hides_collections": "اختار هذا المستخدم عدم إتاحة هذه المعلومات للعامة",
"empty_column.account_suspended": "حساب معلق",
"empty_column.account_timeline": "لا توجد منشورات هنا!",
"empty_column.account_unavailable": "الملف التعريفي غير متوفر",
@@ -269,12 +292,26 @@
"filter_modal.select_filter.subtitle": "استخدم فئة موجودة أو قم بإنشاء فئة جديدة",
"filter_modal.select_filter.title": "تصفية هذا المنشور",
"filter_modal.title.status": "تصفية منشور",
+ "filtered_notifications_banner.title": "الإشعارات المصفاة",
"firehose.all": "الكل",
"firehose.local": "هذا الخادم",
"firehose.remote": "خوادم أخرى",
"follow_request.authorize": "ترخيص",
"follow_request.reject": "رفض",
"follow_requests.unlocked_explanation": "حتى وإن كان حسابك غير مقفل، يعتقد فريق {domain} أنك قد ترغب في مراجعة طلبات المتابعة من هذه الحسابات يدوياً.",
+ "follow_suggestions.curated_suggestion": "اختيار الموظفين",
+ "follow_suggestions.dismiss": "لا تُظهرها مجدّدًا",
+ "follow_suggestions.hints.featured": "تم اختيار هذا الملف الشخصي يدوياً من قبل فريق {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "هذا الملف الشخصي مشهور بين الأشخاص الذين تتابعهم.",
+ "follow_suggestions.hints.most_followed": "هذا الملف الشخصي هو واحد من الأكثر متابعة على {domain}.",
+ "follow_suggestions.hints.most_interactions": "هذا الملف الشخصي قد حصل مؤخرا على الكثير من الاهتمام على {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "هذا الملف الشخصي مشابه للملفات الشخصية التي تابعتها مؤخرا.",
+ "follow_suggestions.personalized_suggestion": "توصية مخصصة",
+ "follow_suggestions.popular_suggestion": "توصية رائجة",
+ "follow_suggestions.popular_suggestion_longer": "رائج على {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "مشابهة لمواصفات الملفات الشخصية التي تابعتَها حديثًا",
+ "follow_suggestions.view_all": "عرض الكل",
+ "follow_suggestions.who_to_follow": "حسابات للمُتابَعة",
"followed_tags": "الوسوم المتابَعة",
"footer.about": "عن",
"footer.directory": "دليل الصفحات التعريفية",
@@ -301,13 +338,8 @@
"hashtag.follow": "اتبع الوسم",
"hashtag.unfollow": "ألغِ متابعة الوسم",
"hashtags.and_other": "…و {count, plural, zero {} one {# واحد آخر} two {# اثنان آخران} few {# آخرون} many {# آخَرًا}other {# آخرون}}",
- "home.actions.go_to_explore": "اطّلع على ما هو رائج حاليا",
- "home.actions.go_to_suggestions": "ابحث عن أشخاص لِمُتابعتهم",
- "home.column_settings.basic": "الأساسية",
"home.column_settings.show_reblogs": "اعرض المعاد نشرها",
"home.column_settings.show_replies": "اعرض الردود",
- "home.explore_prompt.body": "سوف يحتوي خيط أخبارك الرئيسي على مزيج من المنشورات مِنها التي تحتوي على وسوم اخترتَ متابعتها، وأشخاص اخترتَ متابعتهم والمنشورات التي أعادوا نشرها. ومع ذلك، إن لا زال خيط أخبارك يبدو هادئا جدا، ماذا لو:",
- "home.explore_prompt.title": "هذه هي صفحتك الرئيسة في ماستدون.",
"home.hide_announcements": "إخفاء الإعلانات",
"home.pending_critical_update.body": "يرجى تحديث خادم ماستدون في أقرب وقت ممكن!",
"home.pending_critical_update.link": "اطّلع على التحديثات",
@@ -330,8 +362,8 @@
"interaction_modal.title.reply": "الرد على منشور {name}",
"intervals.full.days": "{number, plural, one {# يوم} other {# أيام}}",
"intervals.full.hours": "{number, plural, one {# ساعة} other {# ساعات}}",
- "intervals.full.minutes": "{number, plural, one {# دقيقة} other {# دقائق}}",
- "keyboard_shortcuts.back": "للعودة",
+ "intervals.full.minutes": "{number, plural, one {دقيقة واحدة}two {دقيقتان} other {# دقائق}}",
+ "keyboard_shortcuts.back": "للرجوع",
"keyboard_shortcuts.blocked": "لفتح قائمة المستخدمين المحظورين",
"keyboard_shortcuts.boost": "لإعادة النشر",
"keyboard_shortcuts.column": "للتركيز على منشور على أحد الأعمدة",
@@ -388,11 +420,18 @@
"lists.search": "إبحث في قائمة الحسابات التي تُتابِعها",
"lists.subheading": "قوائمك",
"load_pending": "{count, plural, one {# عنصر جديد} other {# عناصر جديدة}}",
+ "loading_indicator.label": "جاري التحميل…",
"media_gallery.toggle_visible": "{number, plural, zero {} one {اخف الصورة} two {اخف الصورتين} few {اخف الصور} many {اخف الصور} other {اخف الصور}}",
"moved_to_account_banner.text": "حسابك {disabledAccount} معطل حاليًا لأنك انتقلت إلى {movedToAccount}.",
- "mute_modal.duration": "المدة",
- "mute_modal.hide_notifications": "هل تود إخفاء الإخطارات القادمة من هذا المستخدم ؟",
- "mute_modal.indefinite": "إلى أجل غير مسمى",
+ "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": "الحسابات المحجوبة",
@@ -402,7 +441,6 @@
"navigation_bar.direct": "الإشارات الخاصة",
"navigation_bar.discover": "اكتشف",
"navigation_bar.domain_blocks": "النطاقات المحظورة",
- "navigation_bar.edit_profile": "عدّل الملف التعريفي",
"navigation_bar.explore": "استكشف",
"navigation_bar.favourites": "المفضلة",
"navigation_bar.filters": "الكلمات المكتومة",
@@ -426,20 +464,34 @@
"notification.follow": "يتابعك {name}",
"notification.follow_request": "لقد طلب {name} متابعتك",
"notification.mention": "{name} ذكرك",
+ "notification.moderation-warning.learn_more": "اعرف المزيد",
+ "notification.moderation_warning.action_disable": "تم تعطيل حسابك.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "بعض من منشوراتك تم تصنيفها على أنها حساسة.",
+ "notification.moderation_warning.action_none": "لقد تلقى حسابك تحذيرا بالإشراف.",
+ "notification.moderation_warning.action_sensitive": "سيتم وضع علامة على منشوراتك على أنها حساسة من الآن فصاعدا.",
+ "notification.moderation_warning.action_suspend": "لقد تم تعليق حسابك.",
"notification.own_poll": "انتهى استطلاعك للرأي",
"notification.poll": "لقد انتهى استطلاع رأي شاركتَ فيه",
"notification.reblog": "قام {name} بمشاركة منشورك",
+ "notification.relationships_severance_event": "فقدت الاتصالات مع {name}",
+ "notification.relationships_severance_event.account_suspension": "قام مشرف من {from} بتعليق {target}، مما يعني أنك لم يعد بإمكانك تلقي التحديثات منهم أو التفاعل معهم.",
+ "notification.relationships_severance_event.domain_block": "قام مشرف من {from} بحظر {target}، بما في ذلك {followersCount} من متابعينك و {followingCount, plural, one {# حساب} other {# حسابات}} تتابعها.",
+ "notification.relationships_severance_event.learn_more": "اعرف المزيد",
+ "notification.relationships_severance_event.user_domain_block": "لقد قمت بحظر {target}، مما أدى إلى إزالة {followersCount} من متابعينك و {followingCount, plural, one {# حساب} other {# حسابات}} تتابعها.",
"notification.status": "{name} نشر للتو",
"notification.update": "عدّلَ {name} منشورًا",
+ "notification_requests.accept": "موافقة",
+ "notification_requests.dismiss": "تخطي",
+ "notification_requests.notifications_from": "إشعارات من {name}",
+ "notification_requests.title": "الإشعارات المصفاة",
"notifications.clear": "مسح الإشعارات",
"notifications.clear_confirmation": "متأكد من أنك تود مسح جميع الإشعارات الخاصة بك و المتلقاة إلى حد الآن ؟",
"notifications.column_settings.admin.report": "التبليغات الجديدة:",
"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.filter_bar.show_bar": "إظهار شريط التصفية",
+ "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": "الإشارات:",
@@ -465,6 +517,15 @@
"notifications.permission_denied": "تنبيهات سطح المكتب غير متوفرة بسبب رفض أذونات المتصفح مسبقاً",
"notifications.permission_denied_alert": "لا يمكن تفعيل إشعارات سطح المكتب، لأن إذن المتصفح قد تم رفضه سابقاً",
"notifications.permission_required": "إشعارات سطح المكتب غير متوفرة لأنه لم يتم منح الإذن المطلوب.",
+ "notifications.policy.filter_new_accounts.hint": "تم إنشاؤها منذ {days, plural, zero {}one {يوم واحد} two {يومان} few {# أيام} many {# أيام} other {# أيام}}",
+ "notifications.policy.filter_new_accounts_title": "حسابات جديدة",
+ "notifications.policy.filter_not_followers_hint": "بما في ذلك الأشخاص الذين يتابعونك أقل من {days, plural, zero {}one {يوم واحد} two {يومان} few {# أيام} many {# أيام} other {# أيام}}",
+ "notifications.policy.filter_not_followers_title": "أشخاص لا يتابعونك",
+ "notifications.policy.filter_not_following_hint": "حتى توافق عليهم يدويا",
+ "notifications.policy.filter_not_following_title": "أشخاص لا تتابعهم",
+ "notifications.policy.filter_private_mentions_hint": "تمت تصفيته إلا إذا أن يكون ردًا على ذكرك أو إذا كنت تتابع الحساب",
+ "notifications.policy.filter_private_mentions_title": "إشارات خاصة غير مرغوب فيها",
+ "notifications.policy.title": "تصفية الإشعارات من…",
"notifications_permission_banner.enable": "تفعيل إشعارات سطح المكتب",
"notifications_permission_banner.how_to_control": "لتلقي الإشعارات عندما لا يكون ماستدون مفتوح، قم بتفعيل إشعارات سطح المكتب، يمكنك التحكم بدقة في أنواع التفاعلات التي تولد إشعارات سطح المكتب من خلال زر الـ{icon} أعلاه بمجرد تفعيلها.",
"notifications_permission_banner.title": "لا تفوت شيئاً أبداً",
@@ -476,6 +537,17 @@
"onboarding.follows.empty": "نأسف، لا يمكن عرض نتائج في الوقت الحالي. جرب البحث أو انتقل لصفحة الاستكشاف لإيجاد أشخاص للمتابعة، أو حاول مرة أخرى.",
"onboarding.follows.lead": "مقتطفات خيطك الرئيس هي الطريقة الأساسية لتجربة ماستدون. كلما زاد عدد الأشخاص الذين تتبعهم، كلما زاد خيط أخبارك نشاطا وإثارة للاهتمام. بداية، إليك بعض الاقتراحات:",
"onboarding.follows.title": "أضفِ طابعا شخصيا على موجزات خيطك الرئيس",
+ "onboarding.profile.discoverable": "اجعل ملفي الشخصي قابلاً للاكتشاف",
+ "onboarding.profile.discoverable_hint": "عندما تختار تفعيل إمكانية الاكتشاف على ماستدون، قد تظهر منشوراتك في نتائج البحث والمواضيع الرائجة، وقد يتم اقتراح ملفك الشخصي لأشخاص ذوي اهتمامات مماثلة معك.",
+ "onboarding.profile.display_name": "الاسم العلني",
+ "onboarding.profile.display_name_hint": "اسمك الكامل أو اسمك المرح…",
+ "onboarding.profile.lead": "يمكنك دائمًا إكمال ذلك لاحقًا في الإعدادات، حيث يتوفر المزيد من خيارات التخصيص.",
+ "onboarding.profile.note": "نبذة عنك",
+ "onboarding.profile.note_hint": "يمكنك @ذِكر أشخاص آخرين أو استعمال #الوسوم…",
+ "onboarding.profile.save_and_continue": "حفظ و إستمرار",
+ "onboarding.profile.title": "إعداد الملف الشخصي",
+ "onboarding.profile.upload_avatar": "تحميل صورة الملف الشخصي",
+ "onboarding.profile.upload_header": "تحميل رأسية الملف الشخصي",
"onboarding.share.lead": "اسمح للأشخاص بمعرفة إمكانية الوصول إليك على ماستدون!",
"onboarding.share.message": "أنا {username} في #Mastodon! تعال لمتابعتي على {url}",
"onboarding.share.next_steps": "الخطوات المحتملة التالية:",
@@ -509,16 +581,18 @@
"poll_button.add_poll": "إضافة استطلاع للرأي",
"poll_button.remove_poll": "إزالة استطلاع الرأي",
"privacy.change": "اضبط خصوصية المنشور",
- "privacy.direct.long": "مرئي للمستخدمين المذكورين فقط",
- "privacy.direct.short": "الأشخاص المشار إليهم فقط",
- "privacy.private.long": "أنشر لمتابعيك فقط",
- "privacy.private.short": "للمتابِعين فقط",
- "privacy.public.long": "مرئي للكل",
+ "privacy.direct.long": "كل من ذُكر في المنشور",
+ "privacy.direct.short": "أشخاص محددون",
+ "privacy.private.long": "متابعيك فقط",
+ "privacy.private.short": "للمتابِعين",
+ "privacy.public.long": "أي شخص على أو خارج ماستدون",
"privacy.public.short": "للعامة",
- "privacy.unlisted.long": "مرئي للجميع، ولكن مِن دون ميزات الاكتشاف",
- "privacy.unlisted.short": "غير مدرج",
+ "privacy.unlisted.additional": "هذا يتصرف بالضبط مثل النشر للعامة، باستثناء أن المنشور لن يظهر في الموجزات الحية أو في الوسوم أو في الإستكشاف، أو في نتائج بحث ماستدون، حتى وإن قمت بتفعيله على مستوى الحساب.",
+ "privacy.unlisted.long": "خوارزميات أقل",
+ "privacy.unlisted.short": "للعامة دون صخب",
"privacy_policy.last_updated": "آخر تحديث {date}",
"privacy_policy.title": "سياسة الخصوصية",
+ "recommended": "موصى به",
"refresh": "أنعِش",
"regeneration_indicator.label": "جارٍ التحميل…",
"regeneration_indicator.sublabel": "جارٍ تجهيز موجزات خيطك الرئيس!",
@@ -533,7 +607,9 @@
"relative_time.minutes": "{number}د",
"relative_time.seconds": "{number}ثا",
"relative_time.today": "اليوم",
+ "reply_indicator.attachments": "{count, plural, zero {}one {# مرفق} two {# المرفقات} few {# مرفقات} many {# مرفقات} other {# مرفقًا}}",
"reply_indicator.cancel": "إلغاء",
+ "reply_indicator.poll": "استطلاع رأي",
"report.block": "حظر",
"report.block_explanation": "لن ترى منشوراته ولن يمكنه متابعتك أو رؤية منشوراتك، سيكون بديهيا له أنه مكتوم.",
"report.categories.legal": "إشعارات قانونية",
@@ -589,6 +665,7 @@
"search.quick_action.status_search": "المنشورات المطابقة لـ {x}",
"search.search_or_paste": "ابحث أو أدخل رابطا تشعبيا URL",
"search_popout.full_text_search_disabled_message": "غير متوفر على {domain}.",
+ "search_popout.full_text_search_logged_out_message": "متاح فقط عند تسجيل الدخول.",
"search_popout.language_code": "رمز لغة ISO",
"search_popout.options": "خيارات البحث",
"search_popout.quick_actions": "الإجراءات السريعة",
@@ -625,10 +702,11 @@
"status.direct": "إشارة خاصة لـ @{name}",
"status.direct_indicator": "إشارة خاصة",
"status.edit": "تعديل",
- "status.edited": "عُدّل في {date}",
+ "status.edited": "آخر تعديل يوم {date}",
"status.edited_x_times": "عُدّل {count, plural, zero {} one {مرةً واحدة} two {مرّتان} few {{count} مرات} many {{count} مرة} other {{count} مرة}}",
"status.embed": "إدماج",
"status.favourite": "فضّل",
+ "status.favourites": "{count, plural, zero {}one {مفضلة واحدة} two {مفضلتان} few {# مفضلات} many {# مفضلات} other {# مفضلات}}",
"status.filter": "تصفية هذه الرسالة",
"status.filtered": "مُصفّى",
"status.hide": "إخفاء المنشور",
@@ -649,6 +727,7 @@
"status.reblog": "إعادة النشر",
"status.reblog_private": "إعادة النشر إلى الجمهور الأصلي",
"status.reblogged_by": "شارَكَه {name}",
+ "status.reblogs": "{count, plural, one {تعزيز واحد} two {تعزيزتان} few {# تعزيزات} many {# تعزيزات} other {# تعزيزات}}",
"status.reblogs.empty": "لم يقم أي أحد بمشاركة هذا المنشور بعد. عندما يقوم أحدهم بذلك سوف يظهر هنا.",
"status.redraft": "إزالة وإعادة الصياغة",
"status.remove_bookmark": "احذفه مِن الفواصل المرجعية",
@@ -696,10 +775,8 @@
"upload_error.poll": "لا يمكن إدراج ملفات في استطلاعات الرأي.",
"upload_form.audio_description": "وصف للأشخاص ذي قِصر السمع",
"upload_form.description": "وصف للمعاقين بصريا",
- "upload_form.description_missing": "لم يُضف وصف",
"upload_form.edit": "تعديل",
"upload_form.thumbnail": "غيّر الصورة المصغرة",
- "upload_form.undo": "حذف",
"upload_form.video_description": "وصف للمعاقين بصريا أو لِذي قِصر السمع",
"upload_modal.analyzing_picture": "جارٍ فحص الصورة…",
"upload_modal.apply": "طبّق",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 1467f8891eb2c3..b5015c75d893c1 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -66,7 +66,6 @@
"alert.unexpected.title": "¡Meca!",
"announcement.announcement": "Anunciu",
"attachments_list.unprocessed": "(ensin procesar)",
- "autosuggest_hashtag.per_week": "{count} per selmana",
"bundle_column_error.error.body": "La páxina solicitada nun se pudo renderizar. Ye posible que seya pola mor d'un fallu nel códigu o por un problema de compatibilidá del restolador.",
"bundle_column_error.error.title": "¡Oh, non!",
"bundle_column_error.network.body": "Hebo un error al tentar de cargar esta páxina. Esto pudo ser pola mor d'un problema temporal cola conexón a internet o con esti sirvidor.",
@@ -109,24 +108,17 @@
"compose_form.lock_disclaimer": "La to cuenta nun ye {locked}. Cualesquier perfil pue siguite pa ver los artículos que son namás pa siguidores.",
"compose_form.lock_disclaimer.lock": "privada",
"compose_form.placeholder": "¿En qué pienses?",
- "compose_form.poll.add_option": "Amestar una opción",
"compose_form.poll.option_placeholder": "Opción {number}",
- "compose_form.poll.remove_option": "Quitar esta opción",
- "compose_form.publish": "Espublizar",
+ "compose_form.poll.type": "Estilu",
"compose_form.publish_form": "Artículu nuevu",
- "compose_form.publish_loud": "¡{publish}!",
- "compose_form.save_changes": "Guardar los cambeos",
"confirmation_modal.cancel": "Encaboxar",
- "confirmations.block.block_and_report": "Bloquiar ya informar",
"confirmations.block.confirm": "Bloquiar",
- "confirmations.block.message": "¿De xuru que quies bloquiar a {name}?",
"confirmations.cancel_follow_request.confirm": "Retirala",
"confirmations.cancel_follow_request.message": "¿De xuru que quies retirar la solicitú pa siguir a {name}?",
"confirmations.delete.confirm": "Desaniciar",
"confirmations.delete.message": "¿De xuru que quies desaniciar esti artículu?",
"confirmations.delete_list.confirm": "Desaniciar",
"confirmations.discard_edit_media.confirm": "Escartar",
- "confirmations.domain_block.confirm": "Bloquiar tol dominiu",
"confirmations.edit.message": "La edición va sobrescribir el mensaxe que tas escribiendo. ¿De xuru que quies siguir?",
"confirmations.logout.confirm": "Zarrar la sesión",
"confirmations.logout.message": "¿De xuru que quies zarrar la sesión?",
@@ -204,6 +196,11 @@
"follow_request.authorize": "Autorizar",
"follow_request.reject": "Refugar",
"follow_requests.unlocked_explanation": "Magar que la to cuenta nun seya privada, el personal del dominiu «{domain}» pensó qu'a lo meyor quies revisar manualmente les solicitúes de siguimientu d'estes cuentes.",
+ "follow_suggestions.dismiss": "Nun volver amosar",
+ "follow_suggestions.personalized_suggestion": "Suxerencia personalizada",
+ "follow_suggestions.popular_suggestion": "Suxerencia popular",
+ "follow_suggestions.view_all": "Ver too",
+ "follow_suggestions.who_to_follow": "A quién siguir",
"footer.about": "Tocante a",
"footer.directory": "Direutoriu de perfiles",
"footer.get_app": "Consiguir l'aplicación",
@@ -221,7 +218,6 @@
"hashtag.counter_by_accounts": "{count, plural, one {{counter} participante} other {{counter} participantes}}",
"hashtag.follow": "Siguir a la etiqueta",
"hashtag.unfollow": "Dexar de siguir a la etiqueta",
- "home.column_settings.basic": "Configuración básica",
"home.column_settings.show_reblogs": "Amosar los artículos compartíos",
"home.column_settings.show_replies": "Amosar les rempuestes",
"home.pending_critical_update.body": "¡Anueva'l sirvidor de Mastodon namás que puedas!",
@@ -278,15 +274,12 @@
"lists.subheading": "Les tos llistes",
"load_pending": "{count, plural, one {# elementu nuevu} other {# elementos nuevos}}",
"media_gallery.toggle_visible": "{number, plural, one {Anubrir la imaxe} other {Anubrir les imáxenes}}",
- "mute_modal.duration": "Duración",
- "mute_modal.hide_notifications": "¿Quies anubrir los avisos d'esti perfil?",
"navigation_bar.about": "Tocante a",
"navigation_bar.blocks": "Perfiles bloquiaos",
"navigation_bar.bookmarks": "Marcadores",
"navigation_bar.community_timeline": "Llinia de tiempu llocal",
"navigation_bar.direct": "Menciones privaes",
"navigation_bar.domain_blocks": "Dominios bloquiaos",
- "navigation_bar.edit_profile": "Editar el perfil",
"navigation_bar.explore": "Esploración",
"navigation_bar.filters": "Pallabres desactivaes",
"navigation_bar.follow_requests": "Solicitúes de siguimientu",
@@ -312,9 +305,6 @@
"notifications.clear": "Borrar los avisos",
"notifications.column_settings.admin.report": "Informes nuevos:",
"notifications.column_settings.admin.sign_up": "Rexistros nuevos:",
- "notifications.column_settings.filter_bar.advanced": "Amosar toles categoríes",
- "notifications.column_settings.filter_bar.category": "Barra de peñera rápida",
- "notifications.column_settings.filter_bar.show_bar": "Amosar la barra de peñera",
"notifications.column_settings.follow": "Siguidores nuevos:",
"notifications.column_settings.follow_request": "Solicitúes de siguimientu nueves:",
"notifications.column_settings.mention": "Menciones:",
@@ -346,12 +336,7 @@
"poll_button.add_poll": "Amestar una encuesta",
"poll_button.remove_poll": "Quitar la encuesta",
"privacy.change": "Configurar la privacidá del artículu",
- "privacy.direct.long": "Artículu visible namás pa los perfiles mentaos",
- "privacy.private.long": "Artículu visible namás pa los perfiles siguidores",
- "privacy.private.short": "Namás pa siguidores",
- "privacy.public.long": "Tol mundu pue ver l'artículu",
"privacy.public.short": "Artículu públicu",
- "privacy.unlisted.long": "Artículu visible pa tol mundu mas escluyíu de les funciones de descubrimientu",
"privacy_policy.last_updated": "Data del últimu anovamientu: {date}",
"privacy_policy.title": "Política de privacidá",
"refresh": "Anovar",
@@ -368,6 +353,7 @@
"relative_time.seconds": "{number} s",
"relative_time.today": "güei",
"reply_indicator.cancel": "Encaboxar",
+ "reply_indicator.poll": "Encuesta",
"report.block": "Bloquiar",
"report.categories.spam": "Spam",
"report.categories.violation": "El conteníu incumple una o más normes del sirvidor",
@@ -438,7 +424,6 @@
"status.delete": "Desaniciar",
"status.direct": "Mentar a @{name} per privao",
"status.direct_indicator": "Mención privada",
- "status.edited": "Editóse'l {date}",
"status.edited_x_times": "Editóse {count, plural, one {{count} vegada} other {{count} vegaes}}",
"status.embed": "Empotrar",
"status.filter": "Peñerar esti artículu",
@@ -492,9 +477,7 @@
"upload_button.label": "Amestar ficheros multimedia",
"upload_error.poll": "La xuba de ficheros nun ta permitida coles encuestes.",
"upload_form.audio_description": "Describi'l conteníu pa persones sordes ya/o ciegues",
- "upload_form.description_missing": "Nun s'amestó la descripción",
"upload_form.edit": "Editar",
- "upload_form.undo": "Desaniciar",
"upload_modal.analyzing_picture": "Analizando la semeya…",
"upload_modal.apply": "Aplicar",
"upload_modal.applying": "Aplicando…",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 773af40343c6a9..61e96e4b585b91 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -89,7 +89,14 @@
"announcement.announcement": "Аб'ява",
"attachments_list.unprocessed": "(неапрацаваны)",
"audio.hide": "Схаваць аўдыя",
- "autosuggest_hashtag.per_week": "{count} за тыдзень",
+ "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": "Запытаная старонка не можа быць адлюстраваная. Гэта магло стацца праз хібу ў нашым кодзе, або праз памылку сумяшчальнасці з браўзерам.",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "Ваш уліковы запіс не {locked}. Усе могуць падпісацца на вас, каб бачыць допісы толькі для падпісчыкаў.",
"compose_form.lock_disclaimer.lock": "закрыты",
"compose_form.placeholder": "Што здарылася?",
- "compose_form.poll.add_option": "Дадаць варыянт",
"compose_form.poll.duration": "Працягласць апытання",
+ "compose_form.poll.multiple": "Множны выбар",
"compose_form.poll.option_placeholder": "Варыянт {number}",
- "compose_form.poll.remove_option": "Выдаліць гэты варыянт",
+ "compose_form.poll.single": "Адзін варыянт",
"compose_form.poll.switch_to_multiple": "Змяніце апытанне, каб дазволіць некалькі варыянтаў адказу",
"compose_form.poll.switch_to_single": "Змяніце апытанне, каб дазволіць адзіны варыянт адказу",
- "compose_form.publish": "Апублікаваць",
- "compose_form.publish_form": "Апублікаваць",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Захаваць змены",
- "compose_form.sensitive.hide": "{count, plural, one {Пазначыць кантэнт як далікатны} other {Пазначыць кантэнт як далікатны}}",
- "compose_form.sensitive.marked": "{count, plural, one {Кантэнт пазначаны як далікатны} other {Кантэнт пазначаны як далікатны}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Кантэнт не пазначаны як далікатны} other {Кантэнт не пазначаны як далікатны}}",
+ "compose_form.poll.type": "Стыль",
+ "compose_form.publish": "Даслаць",
+ "compose_form.publish_form": "Новы допіс",
+ "compose_form.reply": "Адказаць",
+ "compose_form.save_changes": "Абнавіць",
"compose_form.spoiler.marked": "Выдаліць папярэджанне аб змесціве",
"compose_form.spoiler.unmarked": "Дадаць папярэджанне аб змесціве",
- "compose_form.spoiler_placeholder": "Напішыце сваё папярэджанне тут",
+ "compose_form.spoiler_placeholder": "Папярэджанне аб змесціве (неабавязкова)",
"confirmation_modal.cancel": "Скасаваць",
- "confirmations.block.block_and_report": "Заблакіраваць і паскардзіцца",
"confirmations.block.confirm": "Заблакіраваць",
- "confirmations.block.message": "Вы ўпэўненыя што хочаце заблакіраваць {name}?",
"confirmations.cancel_follow_request.confirm": "Скасаваць запыт",
"confirmations.cancel_follow_request.message": "Сапраўды хочаце скасаваць свой запыт на падпіску на {name}?",
"confirmations.delete.confirm": "Выдаліць",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "Вы ўпэўненыя, што хочаце беззваротна выдаліць гэты чарнавік?",
"confirmations.discard_edit_media.confirm": "Адмяніць",
"confirmations.discard_edit_media.message": "У вас ёсць незахаваныя змены ў апісанні або прэв'ю, усе роўна скасаваць іх?",
- "confirmations.domain_block.confirm": "Заблакіраваць дамен цалкам",
+ "confirmations.domain_block.confirm": "Заблакіраваць сервер",
"confirmations.domain_block.message": "Вы абсалютна дакладна ўпэўнены, што хочаце заблакіраваць {domain} зусім? У большасці выпадкаў, дастаткова некалькіх мэтавых блакіровак ці ігнараванняў. Вы перастанеце бачыць змесціва з гэтага дамену ва ўсіх стужках і апавяшчэннях. Вашы падпіскі з гэтага дамену будуць выдаленыя.",
"confirmations.edit.confirm": "Рэдагаваць",
"confirmations.edit.message": "Калі вы зменіце зараз, гэта ператрэ паведамленне, якое вы пішаце. Вы ўпэўнены, што хочаце працягнуць?",
"confirmations.logout.confirm": "Выйсці",
"confirmations.logout.message": "Вы ўпэўненыя, што хочаце выйсці?",
"confirmations.mute.confirm": "Ігнараваць",
- "confirmations.mute.explanation": "Гэта схавае допісы ад гэтага карыстальніка і пра яго, але ўсё яшчэ дазволіць яму чытаць вашыя допісы і быць падпісаным на вас.",
- "confirmations.mute.message": "Вы ўпэўненыя, што хочаце ігнараваць {name}?",
"confirmations.redraft.confirm": "Выдаліць і перапісаць",
"confirmations.redraft.message": "Вы ўпэўнены, што хочаце выдаліць допіс і перапісаць яго? Упадабанні і пашырэнні згубяцца, а адказы да арыгінальнага допісу асірацеюць.",
"confirmations.reply.confirm": "Адказаць",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "Допісы з гэтага і іншых сервераў дэцэнтралізаванай сеткі, якія набіраюць папулярнасць прама зараз.",
"dismissable_banner.explore_tags": "Гэтыя хэштэгі зараз набіраюць папулярнасць сярод людзей на гэтым і іншых серверах дэцэнтралізаванай сеткі",
"dismissable_banner.public_timeline": "Гэта апошнія публічныя допісы людзей з усей сеткі, за якімі сочаць карыстальнікі {domain}.",
+ "domain_block_modal.block": "Заблакіраваць сервер",
+ "domain_block_modal.block_account_instead": "Заблакіраваць @{name} замест гэтага",
+ "domain_block_modal.they_can_interact_with_old_posts": "Людзі з гэтага сервера змогуць узаемадзейнічаць з вашымі старымі допісамі.",
+ "domain_block_modal.they_cant_follow": "Ніхто з гэтага сервера не зможа падпісацца на вас.",
+ "domain_block_modal.they_wont_know": "Карыстальнік не будзе ведаць пра блакіроўку.",
+ "domain_block_modal.title": "Заблакіраваць дамен?",
+ "domain_block_modal.you_will_lose_followers": "Усе падпісчыкі з гэтага сервера будуць выдаленыя.",
+ "domain_block_modal.you_wont_see_posts": "Вы не ўбачыце допісаў і апавяшчэнняў ад карыстальнікаў з гэтага сервера.",
+ "domain_pill.activitypub_lets_connect": "Ён дазваляе вам узаемадзейнічаць не толькі з карыстальнікамі Mastodon, але і розных іншых сацыяльных платформ.",
+ "domain_pill.activitypub_like_language": "ActivityPub — гэта мова, на якой Mastodon размаўляе з іншымі сацыяльнымі сеткамі.",
+ "domain_pill.server": "Сервер",
+ "domain_pill.their_handle": "Ідэнтыфікатар карыстальніка:",
+ "domain_pill.their_server": "Лічбавы дом, дзе захоўваюцца ўсе допісы.",
+ "domain_pill.their_username": "Унікальны ідэнтыфікатар карыстальніка на серверы. Можна знайсці карыстальнікаў з аднолькавым іменем карыстальніка на розных серверах.",
+ "domain_pill.username": "Імя карыстальніка",
+ "domain_pill.whats_in_a_handle": "Што такое ідэнтыфікатар карыстальніка?",
+ "domain_pill.who_they_are": "Паколькі ідэнтыфікатары кажуць аб тым, хто гэты чалавек і якім серверам ён карыстаецца, вы можаце ўзаемадзейнічаць з карыстальнікамі .",
+ "domain_pill.who_you_are": "Паколькі ваш ідэнтыфікатар кажа аб тым, хто вы і дзе знаходзіцеся, людзі могуць узаемадзейнічаць з вамі ў сацыяльнай сетцы .",
+ "domain_pill.your_handle": "Ваш ідэнтыфікатар:",
+ "domain_pill.your_server": "Ваш лічбавы дом, дзе захоўваюцца ўсе вашыя допісы. Не падабаецца гэты сервер? Змяніце сервер у любы час з захаваннем сваіх падпісчыкаў.",
+ "domain_pill.your_username": "Ваш унікальны ідэнтыфікатар на гэтым серверы. Можна знайсці карыстальнікаў з аднолькавым іменем карыстальніка на розных серверах.",
"embed.instructions": "Убудуйце гэты пост на свой сайт, скапіраваўшы прыведзены ніжэй код",
"embed.preview": "Вось як гэта будзе выглядаць:",
"emoji_button.activity": "Актыўнасць",
@@ -244,6 +266,7 @@
"empty_column.list": "У гэтым спісе пакуль што нічога няма. Калі члены лісту апублікуюць новыя запісы, яны з'явяцца тут.",
"empty_column.lists": "Як толькі вы створыце новы спіс ён будзе захоўвацца тут, але пакуль што тут пуста.",
"empty_column.mutes": "Вы яшчэ нікога не ігнаруеце.",
+ "empty_column.notification_requests": "Чысціня! Тут нічога няма. Калі вы будзеце атрымліваць новыя апавяшчэння, яны будуць з'яўляцца тут у адпаведнасці з вашымі наладамі.",
"empty_column.notifications": "У вас няма ніякіх апавяшчэнняў. Калі іншыя людзі ўзаемадзейнічаюць з вамі, вы ўбачыце гэта тут.",
"empty_column.public": "Тут нічога няма! Апублікуйце што-небудзь, або падпішыцеся на карыстальнікаў з другіх сервераў",
"error.unexpected_crash.explanation": "Гэта старонка не можа быць адлюстравана карэктна з-за памылкі ў нашым кодзе, або праблемы з сумяшчальнасцю браўзера.",
@@ -274,12 +297,26 @@
"filter_modal.select_filter.subtitle": "Скарыстайцеся існуючай катэгорыяй або стварыце новую",
"filter_modal.select_filter.title": "Фільтраваць гэты допіс",
"filter_modal.title.status": "Фільтраваць допіс",
+ "filtered_notifications_banner.mentions": "{count, plural, one {згадванне} few {згадванні} many {згадванняў} other {згадвання}}",
+ "filtered_notifications_banner.pending_requests": "Апавяшчэнні ад {count, plural, =0 {# людзей якіх} one {# чалавека якіх} few {# чалавек якіх} many {# людзей якіх} other {# чалавека якіх}} вы магчыма ведаеце",
+ "filtered_notifications_banner.title": "Адфільтраваныя апавяшчэнні",
"firehose.all": "Усе",
"firehose.local": "Гэты сервер",
"firehose.remote": "Іншыя серверы",
"follow_request.authorize": "Аўтарызацыя",
"follow_request.reject": "Адхіліць",
"follow_requests.unlocked_explanation": "Ваш акаўнт не схаваны, аднак прадстаўнікі {domain} палічылі, што вы можаце захацець праглядзець запыты на падпіску з гэтых профіляў уручную.",
+ "follow_suggestions.curated_suggestion": "Выбар адміністрацыі",
+ "follow_suggestions.dismiss": "Не паказваць зноў",
+ "follow_suggestions.hints.featured": "Гэты профіль быў выбраны ўручную камандай {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "Гэты профіль папулярны сярод людзей, на якіх вы падпісаліся.",
+ "follow_suggestions.hints.most_followed": "Гэты профіль - адзін з профіляў з самай вялікай колькасцю падпісак на {domain}.",
+ "follow_suggestions.hints.most_interactions": "У апошні час гэты профіль прыцягвае шмат увагі на {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Гэты профіль падобны на профілі, на якія вы нядаўна падпісаліся.",
+ "follow_suggestions.personalized_suggestion": "Персаналізаваная прапанова",
+ "follow_suggestions.popular_suggestion": "Папулярная прапанова",
+ "follow_suggestions.view_all": "Праглядзець усё",
+ "follow_suggestions.who_to_follow": "На каго падпісацца",
"followed_tags": "Падпіскі",
"footer.about": "Пра нас",
"footer.directory": "Дырэкторыя профіляў",
@@ -306,13 +343,8 @@
"hashtag.follow": "Падпісацца на хэштэг",
"hashtag.unfollow": "Адпісацца ад хэштэга",
"hashtags.and_other": "…і яшчэ {count, plural, other {#}}",
- "home.actions.go_to_explore": "Паглядзіце, што ў трэндзе",
- "home.actions.go_to_suggestions": "Знайсці людзей, каб падпісацца",
- "home.column_settings.basic": "Асноўныя",
"home.column_settings.show_reblogs": "Паказаць пашырэнні",
"home.column_settings.show_replies": "Паказваць адказы",
- "home.explore_prompt.body": "Ваша галоўная стужка змяшчае сумесь допісаў з хэштэгамі, за якімі вы вырашылі сачыць, допісаў ад людзей, за якімі вы вырашылі сачыць, і допісаў, якія яны пашыраюць. Зараз усё выглядае даволі ціха, так што як наконт:",
- "home.explore_prompt.title": "Гэта ваша апорная кропка ў Mastodon.",
"home.hide_announcements": "Схаваць аб'явы",
"home.pending_critical_update.body": "Калі ласка, абнавіце свой сервер Mastodon як мага хутчэй!",
"home.pending_critical_update.link": "Прагледзець абнаўленні",
@@ -396,9 +428,15 @@
"loading_indicator.label": "Загрузка…",
"media_gallery.toggle_visible": "{number, plural, one {Схаваць відарыс} other {Схаваць відарысы}}",
"moved_to_account_banner.text": "Ваш уліковы запіс {disabledAccount} зараз адключаны таму што вы перанесены на {movedToAccount}.",
- "mute_modal.duration": "Працягласць",
- "mute_modal.hide_notifications": "Схаваць апавяшчэнні ад гэтага карыстальніка?",
- "mute_modal.indefinite": "Бестэрмінова",
+ "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": "Заблакаваныя карыстальнікі",
@@ -408,7 +446,6 @@
"navigation_bar.direct": "Асабістыя згадванні",
"navigation_bar.discover": "Даведайцесь",
"navigation_bar.domain_blocks": "Заблакіраваныя дамены",
- "navigation_bar.edit_profile": "Рэдагаваць профіль",
"navigation_bar.explore": "Агляд",
"navigation_bar.favourites": "Упадабанае",
"navigation_bar.filters": "Ігнараваныя словы",
@@ -432,20 +469,25 @@
"notification.follow": "{name} падпісаўся на вас",
"notification.follow_request": "{name} адправіў запыт на падпіску",
"notification.mention": "{name} згадаў вас",
+ "notification.moderation-warning.learn_more": "Даведацца больш",
"notification.own_poll": "Ваша апытанне скончылася",
"notification.poll": "Апытанне, дзе вы прынялі ўдзел, скончылася",
"notification.reblog": "{name} пашырыў ваш допіс",
+ "notification.relationships_severance_event.learn_more": "Даведацца больш",
"notification.status": "Новы допіс ад {name}",
"notification.update": "Допіс {name} адрэдагаваны",
+ "notification_requests.accept": "Прыняць",
+ "notification_requests.dismiss": "Адхіліць",
+ "notification_requests.notifications_from": "Апавяшчэнні ад {name}",
+ "notification_requests.title": "Адфільтраваныя апавяшчэнні",
"notifications.clear": "Ачысціць апавяшчэнні",
"notifications.clear_confirmation": "Вы ўпэўнены, што жадаеце назаўсёды сцерці ўсё паведамленні?",
"notifications.column_settings.admin.report": "Новыя скаргі:",
"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.advanced": "Паказаць усе катэгорыі",
"notifications.column_settings.filter_bar.category": "Панэль хуткай фільтрацыі",
- "notifications.column_settings.filter_bar.show_bar": "Паказваць панэль фільтрацыі",
"notifications.column_settings.follow": "Новыя падпісчыкі:",
"notifications.column_settings.follow_request": "Новыя запыты на падпіску:",
"notifications.column_settings.mention": "Згадванні:",
@@ -471,6 +513,15 @@
"notifications.permission_denied": "Апавяшчэнні на працоўным стале недаступныя з-за папярэдне адхіленага запыта праў браўзера",
"notifications.permission_denied_alert": "Апавяшчэнні на працоўным стале не могуць быць уключаныя, з-за таго што запыт браўзера быў адхілены",
"notifications.permission_required": "Апавяшчэнні на працоўным стале недаступныя, з-за таго што неабходны дазвол не быў дадзены.",
+ "notifications.policy.filter_new_accounts.hint": "Створаныя на працягу {days, plural, one {апошняга # дня} few {апошніх # дзён} many {апошніх # дзён} other {апошняй # дня}}",
+ "notifications.policy.filter_new_accounts_title": "Новыя ўліковыя запісы",
+ "notifications.policy.filter_not_followers_hint": "Уключаючы людзей, якія падпісаны на вас менш, чым {days, plural, one {# дзень} few {# дні} many {# дзён} other {# дня}}",
+ "notifications.policy.filter_not_followers_title": "Людзі, якія не падпісаны на вас",
+ "notifications.policy.filter_not_following_hint": "Пакуль вы не пацвердзіце іх уручную",
+ "notifications.policy.filter_not_following_title": "Людзі, на якіх вы не падпісаны",
+ "notifications.policy.filter_private_mentions_hint": "Фільтруецца за выключэннем адказу на вашае згадванне ці калі вы падпісаны на адпраўніка",
+ "notifications.policy.filter_private_mentions_title": "Непажаданыя асаблівыя згадванні",
+ "notifications.policy.title": "Адфільтроўваць апавяшчэнні ад…",
"notifications_permission_banner.enable": "Уключыць апавяшчэнні на працоўным стале",
"notifications_permission_banner.how_to_control": "Каб атрымліваць апавяшчэнні, калі Mastodon не адкрыты, уключыце апавяшчэнні працоўнага стала. Вы зможаце дакладна кантраляваць, якія падзеі будуць ствараць апавяшчэнні з дапамогай {icon} кнопкі, як толькі яны будуць уключаны.",
"notifications_permission_banner.title": "Не прапусціце нічога",
@@ -526,14 +577,15 @@
"poll_button.add_poll": "Дадаць апытанне",
"poll_button.remove_poll": "Выдаліць апытанне",
"privacy.change": "Змяніць прыватнасць допісу",
- "privacy.direct.long": "Паказаць толькі згаданым карыстальнікам",
- "privacy.direct.short": "Толькі згаданыя людзі",
- "privacy.private.long": "Паказаць толькі падпісчыкам",
- "privacy.private.short": "Толькі для падпісчыкаў",
- "privacy.public.long": "Бачны для ўсіх",
+ "privacy.direct.long": "Усе згаданыя ў допісе",
+ "privacy.direct.short": "Канкрэтныя людзі",
+ "privacy.private.long": "Толькі вашыя падпісчыкі",
+ "privacy.private.short": "Падпісчыкі",
+ "privacy.public.long": "Усе, хто ёсць і каго няма ў Mastodon",
"privacy.public.short": "Публічны",
- "privacy.unlisted.long": "Бачна для ўсіх, але не праз магчымасці агляду",
- "privacy.unlisted.short": "Не ў стужках",
+ "privacy.unlisted.additional": "Паводзіць сябе гэтак жа, як і публічны, за выключэннем таго, што пост не будзе адлюстроўвацца ў жывой стужцы, хэштэгах, аглядзе або ў пошуку Mastodon, нават калі вы ўключылі бачнасць у пошуку ў наладах.",
+ "privacy.unlisted.long": "Менш фанфар ад алгарытмаў",
+ "privacy.unlisted.short": "Ціхі публічны",
"privacy_policy.last_updated": "Адноўлена {date}",
"privacy_policy.title": "Палітыка канфідэнцыйнасці",
"recommended": "Рэкамендуем",
@@ -551,7 +603,9 @@
"relative_time.minutes": "{number} хв",
"relative_time.seconds": "{number} с",
"relative_time.today": "сёння",
+ "reply_indicator.attachments": "{count, plural, one {# далучэнне} few {# далучэнні} many {# далучэнняў} other {# далучэння}}",
"reply_indicator.cancel": "Скасаваць",
+ "reply_indicator.poll": "Апытанне",
"report.block": "Заблакіраваць",
"report.block_explanation": "Вы перастанеце бачыць допісы гэтага карыстальніка. Ён не зможа сачыць за вамі і бачыць вашы допісы. Ён зможа зразумець, што яго заблакіравалі.",
"report.categories.legal": "Права",
@@ -644,10 +698,11 @@
"status.direct": "Згадаць асабіста @{name}",
"status.direct_indicator": "Асабістае згадванне",
"status.edit": "Рэдагаваць",
- "status.edited": "Адрэдагавана {date}",
+ "status.edited": "Апошняе рэдагаванне {date}",
"status.edited_x_times": "Рэдагавана {count, plural, one {{count} раз} few {{count} разы} many {{count} разоў} other {{count} разу}}",
"status.embed": "Убудаваць",
"status.favourite": "Упадабанае",
+ "status.favourites": "{count, plural, one {# упадабанае} few {# упадабаныя} many {# упадабаных} other {# упадабанага}}",
"status.filter": "Фільтраваць гэты допіс",
"status.filtered": "Адфільтравана",
"status.hide": "Схаваць допіс",
@@ -668,6 +723,7 @@
"status.reblog": "Пашырыць",
"status.reblog_private": "Пашырыць з першапачатковай бачнасцю",
"status.reblogged_by": "{name} пашырыў(-ла)",
+ "status.reblogs": "{count, plural, one {# пашырэнне} few {# пашырэнні} many {# пашырэнняў} other {# пашырэння}}",
"status.reblogs.empty": "Гэты допіс яшчэ ніхто не пашырыў. Калі гэта адбудзецца, гэтых людзей будзе бачна тут.",
"status.redraft": "Выдаліць і паправіць",
"status.remove_bookmark": "Выдаліць закладку",
@@ -683,7 +739,7 @@
"status.show_more": "Паказаць болей",
"status.show_more_all": "Разгарнуць усё",
"status.show_original": "Паказаць арыгінал",
- "status.title.with_attachments": "{user} апублікаваў {attachmentCount, plural, one {укладанне} other {{attachmentCount} укладанні}}",
+ "status.title.with_attachments": "{user} апублікаваў {attachmentCount, plural, one {далучэнне} few {{attachmentCount} далучэнні} many {{attachmentCount} далучэнняў} other {{attachmentCount} далучэння}}",
"status.translate": "Перакласці",
"status.translated_from_with": "Перакладзена з {lang} з дапамогай {provider}",
"status.uncached_media_warning": "Перадпрагляд недаступны",
@@ -715,10 +771,8 @@
"upload_error.poll": "Немагчыма прымацаваць файл да апытання.",
"upload_form.audio_description": "Апісанне для людзей з парушэннямі слыху",
"upload_form.description": "Апісаць для людзей са слабым зрокам",
- "upload_form.description_missing": "Апісанне адсутнічае",
"upload_form.edit": "Рэдагаваць",
"upload_form.thumbnail": "Змяніць мініяцюру",
- "upload_form.undo": "Выдаліць",
"upload_form.video_description": "Апісанне для людзей з парушэннямі зроку і слыху",
"upload_modal.analyzing_picture": "Аналіз выявы…",
"upload_modal.apply": "Ужыць",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 7ee3c868ae1f16..95d60b71ebfae7 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -3,12 +3,12 @@
"about.contact": "За контакти:",
"about.disclaimer": "Mastodon е безплатен софтуер с отворен изходен код и търговска марка на Mastodon gGmbH.",
"about.domain_blocks.no_reason_available": "Няма налична причина",
- "about.domain_blocks.preamble": "Mastodon обикновено позволява да разглеждате съдържание и да взаимодействате с други потребители от всякакви сървъри във Федивърс. Има изключения, направени конкретно за този сървър.",
+ "about.domain_blocks.preamble": "Mastodon обикновено позволява да разглеждате съдържание и да взаимодействате с други потребители от всякакви сървъри във Федивселената. Има изключения, направени конкретно за този сървър.",
"about.domain_blocks.silenced.explanation": "Обикновено няма да виждате профили и съдържание, освен ако изрично не го потърсите или се включете в него, следвайки го.",
"about.domain_blocks.silenced.title": "Ограничено",
"about.domain_blocks.suspended.explanation": "Никакви данни от този сървър няма да се обработват, съхраняват или обменят, правещи невъзможно всяко взаимодействие или комуникация с потребители от тези сървъри.",
"about.domain_blocks.suspended.title": "Спряно",
- "about.not_available": "Тази информация не е била направена налична на този сървър.",
+ "about.not_available": "Тази информация не е публична на този сървър.",
"about.powered_by": "Децентрализирана социална мрежа, захранвана от {mastodon}",
"about.rules": "Правила на сървъра",
"account.account_note_header": "Бележка",
@@ -89,7 +89,14 @@
"announcement.announcement": "Оповестяване",
"attachments_list.unprocessed": "(необработено)",
"audio.hide": "Скриване на звука",
- "autosuggest_hashtag.per_week": "{count} на седмица",
+ "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": "Заявената страница не може да се изобрази. Това може да е заради грешка в кода ни или проблем със съвместимостта на браузъра.",
@@ -111,7 +118,7 @@
"column.about": "Относно",
"column.blocks": "Блокирани потребители",
"column.bookmarks": "Отметки",
- "column.community": "Локална часова ос",
+ "column.community": "Локален инфопоток",
"column.direct": "Частни споменавания",
"column.directory": "Разглеждане на профили",
"column.domain_blocks": "Блокирани домейни",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "Вашият акаунт не е в положение {locked}. Всеки може да ви последва, за да разглежда публикациите ви само за последователи.",
"compose_form.lock_disclaimer.lock": "заключено",
"compose_form.placeholder": "Какво мислите?",
- "compose_form.poll.add_option": "Добавяне на избор",
"compose_form.poll.duration": "Времетраене на анкетата",
+ "compose_form.poll.multiple": "Множествен избор",
"compose_form.poll.option_placeholder": "Избор {number}",
- "compose_form.poll.remove_option": "Премахване на този избор",
+ "compose_form.poll.single": "Подберете нещо",
"compose_form.poll.switch_to_multiple": "Промяна на анкетата, за да се позволят множество възможни избора",
"compose_form.poll.switch_to_single": "Промяна на анкетата, за да се позволи един възможен избор",
- "compose_form.publish": "Публикуване",
+ "compose_form.poll.type": "Стил",
+ "compose_form.publish": "Публикация",
"compose_form.publish_form": "Публикуване",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Запазване на промените",
- "compose_form.sensitive.hide": "{count, plural, one {Маркиране на мултимедията като деликатна} other {Маркиране на мултимедиите като деликатни}}",
- "compose_form.sensitive.marked": "{count, plural, one {мултимедия е означена като деликатна} other {мултимедии са означени като деликатни}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Мултимедията не е маркирана като деликатна} other {Мултимедиите не са маркирани като деликатни}}",
+ "compose_form.reply": "Отговор",
+ "compose_form.save_changes": "Обновяване",
"compose_form.spoiler.marked": "Отстраняване на предупреждение за съдържание",
"compose_form.spoiler.unmarked": "Добавяне на предупреждение за съдържание",
- "compose_form.spoiler_placeholder": "Тук напишете предупреждението си",
+ "compose_form.spoiler_placeholder": "Предупреждение за съдържание (по избор)",
"confirmation_modal.cancel": "Отказ",
- "confirmations.block.block_and_report": "Блокиране и докладване",
"confirmations.block.confirm": "Блокиране",
- "confirmations.block.message": "Наистина ли искате да блокирате {name}?",
"confirmations.cancel_follow_request.confirm": "Оттегляне на заявката",
"confirmations.cancel_follow_request.message": "Наистина ли искате да оттеглите заявката си за последване на {name}?",
"confirmations.delete.confirm": "Изтриване",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "Наистина ли искате да изтриете завинаги списъка?",
"confirmations.discard_edit_media.confirm": "Отхвърляне",
"confirmations.discard_edit_media.message": "Не сте запазили промени на описанието или огледа на мултимедията, отхвърляте ли ги?",
- "confirmations.domain_block.confirm": "Блокиране на целия домейн",
+ "confirmations.domain_block.confirm": "Блокиране на сървър",
"confirmations.domain_block.message": "Наистина ли искате да блокирате целия {domain}? В повечето случаи няколко блокирания или заглушавания са достатъчно и за предпочитане. Няма да виждате съдържание от домейна из публични часови оси или известията си. Вашите последователи от този домейн ще се премахнат.",
"confirmations.edit.confirm": "Редактиране",
"confirmations.edit.message": "Редактирането сега ще замени съобщението, което в момента съставяте. Сигурни ли сте, че искате да продължите?",
"confirmations.logout.confirm": "Излизане",
"confirmations.logout.message": "Наистина ли искате да излезете?",
"confirmations.mute.confirm": "Заглушаване",
- "confirmations.mute.explanation": "Това ще скрие публикациите от тях и публикации, които ги споменават, но все още ще им позволява да виждат публикациите ви и да ви следват.",
- "confirmations.mute.message": "Наистина ли искате да заглушите {name}?",
"confirmations.redraft.confirm": "Изтриване и преработване",
"confirmations.redraft.message": "Наистина ли искате да изтриете тази публикация и да я направите чернова? Означаванията като любими и подсилванията ще се изгубят, а и отговорите към първоначалната публикация ще осиротеят.",
"confirmations.reply.confirm": "Отговор",
@@ -204,10 +205,31 @@
"disabled_account_banner.text": "Вашият акаунт {disabledAccount} сега е изключен.",
"dismissable_banner.community_timeline": "Ето най-скорошните публични публикации от хора, чиито акаунти са разположени в {domain}.",
"dismissable_banner.dismiss": "Отхвърляне",
- "dismissable_banner.explore_links": "Тези новини се разказват от хората в този и други сървъри на децентрализираната мрежа точно сега.",
+ "dismissable_banner.explore_links": "Това са най-споделяните новини в социалната мрежа днес. По-нови истории, споделени от повече хора се показват по-напред.",
"dismissable_banner.explore_statuses": "Има публикации през социалната мрежа, които днес набират популярност. По-новите публикации с повече подсилвания и любими са класирани по-високо.",
"dismissable_banner.explore_tags": "Тези хаштагове сега набират популярност сред хората в този и други сървъри на децентрализирата мрежа.",
"dismissable_banner.public_timeline": "Ето най-новите обществени публикации от хора в социална мрежа, която хората в {domain} следват.",
+ "domain_block_modal.block": "Блокиране на сървър",
+ "domain_block_modal.block_account_instead": "Вместо това блокиране на @{name}",
+ "domain_block_modal.they_can_interact_with_old_posts": "Хората от този сървър могат да взаимодействат с ваши стари публикации.",
+ "domain_block_modal.they_cant_follow": "Никого от този сървър не може да ви последва.",
+ "domain_block_modal.they_wont_know": "Няма да узнаят, че са били блокирани.",
+ "domain_block_modal.title": "Блокирате ли домейн?",
+ "domain_block_modal.you_will_lose_followers": "Всичките ви последователи от този сървър ще се премахнат.",
+ "domain_block_modal.you_wont_see_posts": "Няма да виждате публикации или известия от потребителите на този сървър.",
+ "domain_pill.activitypub_lets_connect": "Позволява ви да се свързвате и взаимодействате с хора не само в Mastodon, но и през различни социални приложения.",
+ "domain_pill.activitypub_like_language": "ActivityPub е като език на Mastodon, говорещ с други социални мрежи.",
+ "domain_pill.server": "Сървър",
+ "domain_pill.their_handle": "Тяхната ръчка:",
+ "domain_pill.their_server": "Цифровият им дом, където живеят всичките им публикации.",
+ "domain_pill.their_username": "Неповторимият им идентификатор на сървъра им. Възможно е да се намерят потребители със същото потребителско име на други сървъри.",
+ "domain_pill.username": "Потребителско име",
+ "domain_pill.whats_in_a_handle": "Какво е в ръчката?",
+ "domain_pill.who_they_are": "Откак ръчките казват кой кой е и къде е, то може да взаимодействате с хора през социаното уебпространство на .",
+ "domain_pill.who_you_are": "Тъй като вашата ръчка казва кои сте и къде сте, то може да взаимодействате с хора през социаното уебпространство на .",
+ "domain_pill.your_handle": "Вашата ръчка:",
+ "domain_pill.your_server": "Цифровият ви дом, където живеят всичките ви публикации. Не харесвате ли този? Прехвърляте се на сървъри по всяко време и докарвате последователите си също.",
+ "domain_pill.your_username": "Неповторимият ви идентификатор на този сървър. Възможно е да се намерят потребители със същото потребителско име на други сървъри.",
"embed.instructions": "Вградете публикацията в уебсайта си, копирайки кода долу.",
"embed.preview": "Ето как ще изглежда:",
"emoji_button.activity": "Дейност",
@@ -225,16 +247,16 @@
"emoji_button.search_results": "Резултати от търсене",
"emoji_button.symbols": "Символи",
"emoji_button.travel": "Пътуване и места",
- "empty_column.account_hides_collections": "Този потребител е избрал да не прави това сведение достъпно",
+ "empty_column.account_hides_collections": "Този потребител е избрал да не дава тази информация",
"empty_column.account_suspended": "Спрян акаунт",
"empty_column.account_timeline": "Тук няма публикации!",
"empty_column.account_unavailable": "Профилът не е наличен",
"empty_column.blocks": "Още не сте блокирали никакви потребители.",
"empty_column.bookmarked_statuses": "Още не сте отметнали публикации. Отметвайки някоя, то тя ще се покаже тук.",
- "empty_column.community": "Местната часова ос е празна. Напишете нещо обществено, за да завъртите нещата!",
+ "empty_column.community": "Локалният инфопоток е празен. Публикувайте нещо, за да започнете!",
"empty_column.direct": "Още нямате никакви частни споменавания. Тук ще се показват, изпращайки или получавайки едно.",
"empty_column.domain_blocks": "Още няма блокирани домейни.",
- "empty_column.explore_statuses": "Няма нищо налагащо се в момента. Проверете пак по-късно!",
+ "empty_column.explore_statuses": "Няма тенденции в момента. Проверете пак по-късно!",
"empty_column.favourited_statuses": "Още нямате никакви любими публикации. Правейки любима, то тя ще се покаже тук.",
"empty_column.favourites": "Още никого не е слагал публикацията в любими. Когато някой го направи, този човек ще се покаже тук.",
"empty_column.follow_requests": "Още нямате заявки за последване. Получавайки такава, то тя ще се покаже тук.",
@@ -244,6 +266,7 @@
"empty_column.list": "Все още списъкът е празен. Членуващите на списъка, публикуващи нови публикации, ще се появят тук.",
"empty_column.lists": "Все още нямате списъци. Когато създадете такъв, той ще се покаже тук.",
"empty_column.mutes": "Още не сте заглушавали потребители.",
+ "empty_column.notification_requests": "Всичко е чисто! Тук няма нищо. Получавайки нови известия, те ще се появят тук според настройките ви.",
"empty_column.notifications": "Все още нямате известия. Взаимодействайте с другите, за да започнете разговора.",
"empty_column.public": "Тук няма нищо! Публикувайте нещо или последвайте потребители от други сървъри, за да го напълните",
"error.unexpected_crash.explanation": "Поради грешка в нашия код или проблем със съвместимостта на браузъра, тази страница не може да се покаже правилно.",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "Изберете съществуваща категория или създайте нова",
"filter_modal.select_filter.title": "Филтриране на публ.",
"filter_modal.title.status": "Филтриране на публ.",
+ "filtered_notifications_banner.mentions": "{count, plural, one {споменаване} other {споменавания}}",
+ "filtered_notifications_banner.pending_requests": "Известията от {count, plural, =0 {никого, когото може да познавате} one {едно лице, което може да познавате} other {# души, които може да познавате}}",
+ "filtered_notifications_banner.title": "Филтрирани известия",
"firehose.all": "Всичко",
"firehose.local": "Този сървър",
"firehose.remote": "Други сървъри",
"follow_request.authorize": "Упълномощаване",
"follow_request.reject": "Отхвърляне",
"follow_requests.unlocked_explanation": "Въпреки че акаунтът ви не е заключен, служителите на {domain} помислиха, че може да искате да преглеждате ръчно заявките за последване на тези профили.",
+ "follow_suggestions.curated_suggestion": "Избор на персонал",
+ "follow_suggestions.dismiss": "Без ново показване",
+ "follow_suggestions.featured_longer": "Ръчно избрано от отбора на {domain}",
+ "follow_suggestions.friends_of_friends_longer": "Популярно измежду хората, които следвате",
+ "follow_suggestions.hints.featured": "Този профил е ръчно подбран от отбора на {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "Този профил е популярен измежду хората, които следвате.",
+ "follow_suggestions.hints.most_followed": "Този профил е един от най-следваните при {domain}.",
+ "follow_suggestions.hints.most_interactions": "Този профил наскоро получи много внимание при {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Този профил е подобен на профилите, които сте последвали наскоро.",
+ "follow_suggestions.personalized_suggestion": "Персонализирано предложение",
+ "follow_suggestions.popular_suggestion": "Популярно предложение",
+ "follow_suggestions.popular_suggestion_longer": "Популярно из {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Подобни на профилите, които наскоро сте последвали",
+ "follow_suggestions.view_all": "Преглед на всички",
+ "follow_suggestions.who_to_follow": "Кого да се следва",
"followed_tags": "Последвани хаштагове",
"footer.about": "Относно",
"footer.directory": "Директория на профилите",
@@ -306,13 +347,8 @@
"hashtag.follow": "Следване на хаштаг",
"hashtag.unfollow": "Спиране на следване на хаштаг",
"hashtags.and_other": "…и {count, plural, other {# още}}",
- "home.actions.go_to_explore": "Вижте какво изгрява",
- "home.actions.go_to_suggestions": "Намиране на хора за следване",
- "home.column_settings.basic": "Основно",
"home.column_settings.show_reblogs": "Показване на подсилванията",
"home.column_settings.show_replies": "Показване на отговорите",
- "home.explore_prompt.body": "Вашият начален инфоканал ще е смес на публикации от хаштаговете, които сте избрали да следвате, избраните хора да следвате, а и публикациите, които са подсилили. Ако изглежда твърде тихо в момента, то може да искате да:",
- "home.explore_prompt.title": "Това е началната ви база с Mastodon.",
"home.hide_announcements": "Скриване на оповестяванията",
"home.pending_critical_update.body": "Обновете сървъра си в Mastodon възможно най-скоро!",
"home.pending_critical_update.link": "Преглед на обновяванията",
@@ -349,10 +385,10 @@
"keyboard_shortcuts.favourites": "Отваряне на списъка с любими",
"keyboard_shortcuts.federated": "Отваряне на федерирания инфопоток",
"keyboard_shortcuts.heading": "Клавишни съчетания",
- "keyboard_shortcuts.home": "Отваряне на началната часова ос",
+ "keyboard_shortcuts.home": "Отваряне на личния инфопоток",
"keyboard_shortcuts.hotkey": "Бърз клавиш",
"keyboard_shortcuts.legend": "Показване на тази легенда",
- "keyboard_shortcuts.local": "Отваряне на местна часова ос",
+ "keyboard_shortcuts.local": "Отваряне на локалния инфопоток",
"keyboard_shortcuts.mention": "Споменаване на автора",
"keyboard_shortcuts.muted": "Отваряне на списъка със заглушени потребители",
"keyboard_shortcuts.my_profile": "Отваряне на профила ви",
@@ -396,20 +432,25 @@
"loading_indicator.label": "Зареждане…",
"media_gallery.toggle_visible": "Скриване на {number, plural, one {изображение} other {изображения}}",
"moved_to_account_banner.text": "Вашият акаунт {disabledAccount} сега е изключен, защото се преместихте в {movedToAccount}.",
- "mute_modal.duration": "Времетраене",
- "mute_modal.hide_notifications": "Скриване на известия от този потребител?",
- "mute_modal.indefinite": "Неопределено",
+ "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": "Блокирани потребители",
"navigation_bar.bookmarks": "Отметки",
- "navigation_bar.community_timeline": "Локална часова ос",
+ "navigation_bar.community_timeline": "Локален инфопоток",
"navigation_bar.compose": "Съставяне на нова публикация",
"navigation_bar.direct": "Частни споменавания",
"navigation_bar.discover": "Откриване",
"navigation_bar.domain_blocks": "Блокирани домейни",
- "navigation_bar.edit_profile": "Редактиране на профила",
- "navigation_bar.explore": "Изследване",
+ "navigation_bar.explore": "Разглеждане",
"navigation_bar.favourites": "Любими",
"navigation_bar.filters": "Заглушени думи",
"navigation_bar.follow_requests": "Заявки за последване",
@@ -432,11 +473,29 @@
"notification.follow": "{name} ви последва",
"notification.follow_request": "{name} поиска да ви последва",
"notification.mention": "{name} ви спомена",
+ "notification.moderation-warning.learn_more": "Научете повече",
+ "notification.moderation_warning": "Получихте предупреждение за модериране",
+ "notification.moderation_warning.action_delete_statuses": "Някои от публикациите ви са премахнати.",
+ "notification.moderation_warning.action_disable": "Вашият акаунт е изключен.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Някои от публикациите ви са означени като деликатни.",
+ "notification.moderation_warning.action_none": "Акаунтът ви получи предупреждение за модериране.",
+ "notification.moderation_warning.action_sensitive": "Публикациите ви ще се означават като деликатни от сега нататък.",
+ "notification.moderation_warning.action_silence": "Вашият акаунт е ограничен.",
+ "notification.moderation_warning.action_suspend": "Вашият акаунт е спрян.",
"notification.own_poll": "Анкетата ви приключи",
"notification.poll": "Анкета, в която гласувахте, приключи",
"notification.reblog": "{name} подсили ваша публикация",
+ "notification.relationships_severance_event": "Изгуби се връзката с {name}",
+ "notification.relationships_severance_event.account_suspension": "Администратор от {from} спря {target}, което значи че повече не може да получавате новости от тях или да взаимодействате с тях.",
+ "notification.relationships_severance_event.domain_block": "Администратор от {from} блокира {target}, вкючващо {followersCount} от последователите ви и {followingCount, plural, one {# акаунт, който} other {# акаунта, които}} следвате.",
+ "notification.relationships_severance_event.learn_more": "Научете повече",
+ "notification.relationships_severance_event.user_domain_block": "Блокирахте {target}, премахвайки {followersCount} от последователите си и {followingCount, plural, one {# акаунт, който} other {# акаунта, които}} следвате.",
"notification.status": "{name} току-що публикува",
"notification.update": "{name} промени публикация",
+ "notification_requests.accept": "Приемам",
+ "notification_requests.dismiss": "Отхвърлям",
+ "notification_requests.notifications_from": "Известия от {name}",
+ "notification_requests.title": "Филтрирани известия",
"notifications.clear": "Изчистване на известията",
"notifications.clear_confirmation": "Наистина ли искате да изчистите завинаги всичките си известия?",
"notifications.column_settings.admin.report": "Нови доклади:",
@@ -445,7 +504,6 @@
"notifications.column_settings.favourite": "Любими:",
"notifications.column_settings.filter_bar.advanced": "Показване на всички категории",
"notifications.column_settings.filter_bar.category": "Лента за бърз филтър",
- "notifications.column_settings.filter_bar.show_bar": "Показване на лентата с филтри",
"notifications.column_settings.follow": "Нови последователи:",
"notifications.column_settings.follow_request": "Нови заявки за последване:",
"notifications.column_settings.mention": "Споменавания:",
@@ -471,15 +529,24 @@
"notifications.permission_denied": "Известията на работния плот не са налични поради предварително отказана заявка за разрешение в браузъра",
"notifications.permission_denied_alert": "Известията на работния плот не могат да се включат, тъй като разрешението на браузъра е отказвано преди",
"notifications.permission_required": "Известията на работния плот ги няма, щото няма дадено нужното позволение.",
+ "notifications.policy.filter_new_accounts.hint": "Сътворено през {days, plural, one {последния ден} other {последните # дена}}",
+ "notifications.policy.filter_new_accounts_title": "Нови акаунти",
+ "notifications.policy.filter_not_followers_hint": "Включително хора, които са ви последвали по-малко от {days, plural, one {ден} other {# дни}}",
+ "notifications.policy.filter_not_followers_title": "Хора, които не ви следват",
+ "notifications.policy.filter_not_following_hint": "Докато не ги одобрите ръчно",
+ "notifications.policy.filter_not_following_title": "Хора, които не следвате",
+ "notifications.policy.filter_private_mentions_hint": "Филтрирано, освен ако е отговор към ваше собствено споменаване или ако следвате подателя",
+ "notifications.policy.filter_private_mentions_title": "Непоискани частни споменавания",
+ "notifications.policy.title": "Да се филтрират известия от…",
"notifications_permission_banner.enable": "Включване на известията на работния плот",
"notifications_permission_banner.how_to_control": "За да получавате известия, когато Mastodon не е отворен, включете известията на работния плот. Може да управлявате точно кои видове взаимодействия пораждат известия на работния плот чрез бутона {icon} по-горе, след като бъдат включени.",
- "notifications_permission_banner.title": "Никога не пропускате нещо",
+ "notifications_permission_banner.title": "Никога не пропускайте нищо",
"onboarding.action.back": "Върнете ме обратно",
"onboarding.actions.back": "Върнете ме обратно",
- "onboarding.actions.go_to_explore": "Вижте какво изгрява",
- "onboarding.actions.go_to_home": "Към началния ви инфоканал",
+ "onboarding.actions.go_to_explore": "Виж тенденции",
+ "onboarding.actions.go_to_home": "Към началния ми инфоканал",
"onboarding.compose.template": "Здравейте, #Mastodon!",
- "onboarding.follows.empty": "За съжаление, в момента не могат да се показват резултати. Може да опитате да употребявате търсене или да прегледате страницата за изследване, за да намерите страница за последване, или да опитате пак по-късно.",
+ "onboarding.follows.empty": "За съжаление, в момента не могат да бъдат показани резултати. Може да опитате да търсите или да разгледате, за да намерите кого да последвате, или опитайте отново по-късно.",
"onboarding.follows.lead": "Може да бъдете куратор на началния си инфоканал. Последвайки повече хора, по-деен и по-интересен ще става. Тези профили може да са добра начална точка, от която винаги по-късно да спрете да следвате!",
"onboarding.follows.title": "Популярно в Mastodon",
"onboarding.profile.discoverable": "Правене на моя профил откриваем",
@@ -501,7 +568,7 @@
"onboarding.start.skip": "Желаете ли да прескочите?",
"onboarding.start.title": "Успяхте!",
"onboarding.steps.follow_people.body": "Може да бъдете куратор на инфоканала си. Хайде да го запълним с интересни хора.",
- "onboarding.steps.follow_people.title": "Последвайте {count, plural, one {един човек} other {# души}}",
+ "onboarding.steps.follow_people.title": "Персонализиране на началния ви инфоканал",
"onboarding.steps.publish_status.body": "Поздравете целия свят.",
"onboarding.steps.publish_status.title": "Направете първата си публикация",
"onboarding.steps.setup_profile.body": "Други са по-вероятно да взаимодействат с вас с попълнения профил.",
@@ -526,14 +593,15 @@
"poll_button.add_poll": "Анкетиране",
"poll_button.remove_poll": "Премахване на анкета",
"privacy.change": "Промяна на поверителността на публикация",
- "privacy.direct.long": "Видимо само за споменатите потребители",
- "privacy.direct.short": "Само споменатите хора",
- "privacy.private.long": "Видимо само за последователите",
- "privacy.private.short": "Само последователи",
- "privacy.public.long": "Видимо за всички",
+ "privacy.direct.long": "Споменатите в публикацията",
+ "privacy.direct.short": "Определени хора",
+ "privacy.private.long": "Само последователите ви",
+ "privacy.private.short": "Последователи",
+ "privacy.public.long": "Всеки във и извън Mastodon",
"privacy.public.short": "Публично",
- "privacy.unlisted.long": "Видимо за всички, но не чрез възможността за откриване",
- "privacy.unlisted.short": "Несписъчно",
+ "privacy.unlisted.additional": "Това действие е точно като публичното, с изключение на това, че публикацията няма да се появява в каналите на живо, хаштаговете, разглеждането или търсенето в Mastodon, дори ако сте избрали да се публично видими на ниво акаунт.",
+ "privacy.unlisted.long": "По-малко алгоритмични фанфари",
+ "privacy.unlisted.short": "Тиха публика",
"privacy_policy.last_updated": "Последно осъвременяване на {date}",
"privacy_policy.title": "Политика за поверителност",
"recommended": "Препоръчано",
@@ -551,7 +619,9 @@
"relative_time.minutes": "{number}м.",
"relative_time.seconds": "{number}с.",
"relative_time.today": "днес",
+ "reply_indicator.attachments": "{count, plural, one {# прикаване} other {# прикачвания}}",
"reply_indicator.cancel": "Отказ",
+ "reply_indicator.poll": "Анкета",
"report.block": "Блокиране",
"report.block_explanation": "Няма да им виждате публикациите. Те няма да могат да виждат публикациите ви или да ви последват. Те ще могат да казват, че са били блокирани.",
"report.categories.legal": "Правни въпроси",
@@ -605,7 +675,7 @@
"search.quick_action.go_to_hashtag": "Към хаштаг {x}",
"search.quick_action.open_url": "Отваряне на URL адреса в Mastodon",
"search.quick_action.status_search": "Съвпадение на публикации {x}",
- "search.search_or_paste": "Търсене или поставяне на URL адрес",
+ "search.search_or_paste": "Търсене/поставяне на URL",
"search_popout.full_text_search_disabled_message": "Не е достъпно на {domain}.",
"search_popout.full_text_search_logged_out_message": "Достъпно само при влизане в системата.",
"search_popout.language_code": "Код на езика по ISO",
@@ -644,10 +714,11 @@
"status.direct": "Частно споменаване на @{name}",
"status.direct_indicator": "Частно споменаване",
"status.edit": "Редактиране",
- "status.edited": "Редактирано на {date}",
+ "status.edited": "Последно редактирано на {date}",
"status.edited_x_times": "Редактирано {count, plural,one {{count} път} other {{count} пъти}}",
"status.embed": "Вграждане",
"status.favourite": "Любимо",
+ "status.favourites": "{count, plural, one {любимо} other {любими}}",
"status.filter": "Филтриране на публ.",
"status.filtered": "Филтрирано",
"status.hide": "Скриване на публ.",
@@ -668,6 +739,7 @@
"status.reblog": "Подсилване",
"status.reblog_private": "Подсилване с оригиналната видимост",
"status.reblogged_by": "{name} подсили",
+ "status.reblogs": "{count, plural, one {подсилване} other {подсилвания}}",
"status.reblogs.empty": "Още никого не е подсилвал публикацията. Подсилващият ще се покаже тук.",
"status.redraft": "Изтриване и преначертаване",
"status.remove_bookmark": "Премахване на отметката",
@@ -715,10 +787,8 @@
"upload_error.poll": "Качването на файлове не е позволено с анкети.",
"upload_form.audio_description": "Опишете за хора, които са глухи или трудно чуват",
"upload_form.description": "Опишете за хора, които са слепи или имат слабо зрение",
- "upload_form.description_missing": "Няма добавен опис",
"upload_form.edit": "Редактиране",
"upload_form.thumbnail": "Промяна на миниобраза",
- "upload_form.undo": "Изтриване",
"upload_form.video_description": "Опишете за хора, които са глухи или трудно чуват, слепи или имат слабо зрение",
"upload_modal.analyzing_picture": "Снимков анализ…",
"upload_modal.apply": "Прилагане",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index fe3d2a627c3f23..797b93e24359f7 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -85,7 +85,6 @@
"announcement.announcement": "ঘোষণা",
"attachments_list.unprocessed": "(প্রক্রিয়া করা যায়নি)",
"audio.hide": "অডিও লুকান",
- "autosuggest_hashtag.per_week": "প্রতি সপ্তাহে {count}",
"boost_modal.combo": "পরেরবার আপনি {combo} টিপলে এটি আর আসবে না",
"bundle_column_error.copy_stacktrace": "এরর রিপোর্ট কপি করুন",
"bundle_column_error.error.body": "অনুরোধ করা পৃষ্ঠাটি রেন্ডার করা যায়নি। এটি আমাদের কোডে একটি বাগ বা ব্রাউজার সামঞ্জস্যের সমস্যার কারণে হতে পারে।",
@@ -142,26 +141,14 @@
"compose_form.lock_disclaimer": "আপনার নিবন্ধনে তালা দেওয়া নেই, যে কেও আপনাকে অনুসরণ করতে পারবে এবং অনুশারকদের জন্য লেখা দেখতে পারবে।",
"compose_form.lock_disclaimer.lock": "তালা দেওয়া",
"compose_form.placeholder": "আপনি কি ভাবছেন ?",
- "compose_form.poll.add_option": "আরেকটি বিকল্প যোগ করুন",
"compose_form.poll.duration": "ভোটগ্রহনের সময়",
- "compose_form.poll.option_placeholder": "বিকল্প {number}",
- "compose_form.poll.remove_option": "এই বিকল্পটি মুছে ফেলুন",
"compose_form.poll.switch_to_multiple": "একাধিক পছন্দ অনুমতি দেওয়ার জন্য পোল পরিবর্তন করুন",
"compose_form.poll.switch_to_single": "একটি একক পছন্দের অনুমতি দেওয়ার জন্য পোল পরিবর্তন করুন",
- "compose_form.publish": "প্রকাশ করুন",
"compose_form.publish_form": "প্রকাশ করুন",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "পরিবর্তনগুলো প্রকাশ করুন",
- "compose_form.sensitive.hide": "এই ছবি বা ভিডিওটি সংবেদনশীল হিসেবে চিহ্নিত করতে",
- "compose_form.sensitive.marked": "এই ছবি বা ভিডিওটি সংবেদনশীল হিসেবে চিহ্নিত করা হয়েছে",
- "compose_form.sensitive.unmarked": "এই ছবি বা ভিডিওটি সংবেদনশীল হিসেবে চিহ্নিত করা হয়নি",
"compose_form.spoiler.marked": "সতর্কতার পিছনে লেখানটি লুকানো আছে",
"compose_form.spoiler.unmarked": "লেখাটি লুকানো নেই",
- "compose_form.spoiler_placeholder": "আপনার লেখা দেখার সাবধানবাণী লিখুন",
"confirmation_modal.cancel": "বাতিল করুন",
- "confirmations.block.block_and_report": "ব্লক করুন এবং রিপোর্ট করুন",
"confirmations.block.confirm": "ব্লক করুন",
- "confirmations.block.message": "আপনি কি নিশ্চিত {name} কে ব্লক করতে চান?",
"confirmations.cancel_follow_request.confirm": "অনুরোধ বাতিল করুন",
"confirmations.cancel_follow_request.message": "আপনি কি নিশ্চিত যে আপনি {name} কে অনুসরণ করার অনুরোধ প্রত্যাহার করতে চান?",
"confirmations.delete.confirm": "মুছে ফেলুন",
@@ -170,15 +157,12 @@
"confirmations.delete_list.message": "আপনি কি নিশ্চিত যে আপনি এই তালিকাটি স্থায়িভাবে মুছে ফেলতে চান ?",
"confirmations.discard_edit_media.confirm": "বাতিল করো",
"confirmations.discard_edit_media.message": "মিডিয়া Description বা Preview তে আপনার আপনার অসংরক্ষিত পরিবর্তন আছে, সেগুলো বাতিল করবেন?",
- "confirmations.domain_block.confirm": "এই ডোমেন থেকে সব লুকান",
"confirmations.domain_block.message": "আপনি কি সত্যিই সত্যই নিশ্চিত যে আপনি পুরো {domain}'টি ব্লক করতে চান? বেশিরভাগ ক্ষেত্রে কয়েকটি লক্ষ্যযুক্ত ব্লক বা নীরবতা যথেষ্ট এবং পছন্দসই। আপনি কোনও পাবলিক টাইমলাইন বা আপনার বিজ্ঞপ্তিগুলিতে সেই ডোমেন থেকে সামগ্রী দেখতে পাবেন না। সেই ডোমেন থেকে আপনার অনুসরণকারীদের সরানো হবে।",
"confirmations.edit.confirm": "সম্পাদন",
"confirmations.edit.message": "এখন সম্পাদনা করলে আপনি যে মেসেজ লিখছেন তা overwrite করবে, চালিয়ে যেতে চান?",
"confirmations.logout.confirm": "প্রস্থান",
"confirmations.logout.message": "আপনি লগ আউট করতে চান?",
"confirmations.mute.confirm": "সরিয়ে ফেলুন",
- "confirmations.mute.explanation": "এটি তাদের কাছ থেকে পোস্ট এবং তাদেরকে মেনশন করা পোস্টগুলি হাইড করবে, তবুও তাদেরকে এটি আপনার পোস্ট গুলো দেখতে দিবে ও তারা আপনাকে অনুসরন করতে পারবে।.",
- "confirmations.mute.message": "আপনি কি নিশ্চিত {name} সরিয়ে ফেলতে চান ?",
"confirmations.redraft.confirm": "মুছে ফেলুন এবং আবার সম্পাদন করুন",
"confirmations.reply.confirm": "মতামত",
"confirmations.reply.message": "এখন মতামত লিখতে গেলে আপনার এখন যেটা লিখছেন সেটা মুছে যাবে। আপনি নি নিশ্চিত এটা করতে চান ?",
@@ -259,7 +243,6 @@
"hashtag.column_settings.tag_mode.any": "এর ভেতরে যেকোনোটা",
"hashtag.column_settings.tag_mode.none": "এগুলোর একটাও না",
"hashtag.column_settings.tag_toggle": "আরো ট্যাগ এই কলামে যুক্ত করতে",
- "home.column_settings.basic": "সাধারণ",
"home.column_settings.show_reblogs": "সমর্থনগুলো দেখান",
"home.column_settings.show_replies": "মতামত দেখান",
"home.hide_announcements": "ঘোষণা লুকান",
@@ -314,9 +297,6 @@
"lists.subheading": "আপনার তালিকা",
"load_pending": "{count, plural, one {# নতুন জিনিস} other {# নতুন জিনিস}}",
"media_gallery.toggle_visible": "দৃশ্যতার অবস্থা বদলান",
- "mute_modal.duration": "সময়কাল",
- "mute_modal.hide_notifications": "এই ব্যবহারকারীর প্রজ্ঞাপন বন্ধ করবেন ?",
- "mute_modal.indefinite": "অনির্দিষ্ট",
"navigation_bar.about": "পরিচিতি",
"navigation_bar.blocks": "বন্ধ করা ব্যবহারকারী",
"navigation_bar.bookmarks": "বুকমার্ক",
@@ -324,7 +304,6 @@
"navigation_bar.compose": "নতুন টুট লিখুন",
"navigation_bar.discover": "ঘুরে দেখুন",
"navigation_bar.domain_blocks": "লুকানো ডোমেনগুলি",
- "navigation_bar.edit_profile": "নিজের পাতা সম্পাদনা করতে",
"navigation_bar.explore": "পরিব্রাজন",
"navigation_bar.favourites": "পছন্দসমূহ",
"navigation_bar.filters": "বন্ধ করা শব্দ",
@@ -350,8 +329,6 @@
"notifications.clear_confirmation": "আপনি কি নির্চিত প্রজ্ঞাপনগুলো মুছে ফেলতে চান ?",
"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": "প্রজ্ঞাপনগুলো:",
@@ -395,12 +372,7 @@
"poll_button.add_poll": "একটা নির্বাচন যোগ করতে",
"poll_button.remove_poll": "নির্বাচন বাদ দিতে",
"privacy.change": "লেখার গোপনীয়তা অবস্থা ঠিক করতে",
- "privacy.direct.long": "শুধুমাত্র উল্লেখিত ব্যবহারকারীদের কাছে লিখতে",
- "privacy.direct.short": "Direct",
- "privacy.private.long": "শুধুমাত্র আপনার অনুসরণকারীদের লিখতে",
- "privacy.private.short": "Followers-only",
"privacy.public.short": "সর্বজনীন প্রকাশ্য",
- "privacy.unlisted.short": "প্রকাশ্য নয়",
"refresh": "সতেজ করা",
"regeneration_indicator.label": "আসছে…",
"regeneration_indicator.sublabel": "আপনার বাড়ির-সময়রেখা প্রস্তূত করা হচ্ছে!",
@@ -506,7 +478,6 @@
"upload_form.description": "যারা দেখতে পায়না তাদের জন্য এটা বর্ণনা করতে",
"upload_form.edit": "সম্পাদন",
"upload_form.thumbnail": "থাম্বনেল পরিবর্তন করুন",
- "upload_form.undo": "মুছে ফেলতে",
"upload_form.video_description": "শ্রবণশক্তি হ্রাস বা চাক্ষুষ প্রতিবন্ধী ব্যক্তিদের জন্য বর্ণনা করুন",
"upload_modal.analyzing_picture": "চিত্র বিশ্লেষণ করা হচ্ছে…",
"upload_modal.apply": "প্রয়োগ করুন",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index ad6e55c5e1ed7f..9ec26c8c123877 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -29,7 +29,7 @@
"account.enable_notifications": "Ma c'hemenn pa vez embannet traoù gant @{name}",
"account.endorse": "Lakaat war-wel war ar profil",
"account.featured_tags.last_status_at": "Toud diwezhañ : {date}",
- "account.featured_tags.last_status_never": "Toud ebet",
+ "account.featured_tags.last_status_never": "Embannadur ebet",
"account.featured_tags.title": "Hashtagoù pennañ {name}",
"account.follow": "Heuliañ",
"account.follow_back": "Heuliañ d'ho tro",
@@ -62,7 +62,7 @@
"account.requested_follow": "Gant {name} eo bet goulennet ho heuliañ",
"account.share": "Skignañ profil @{name}",
"account.show_reblogs": "Diskouez skignadennoù @{name}",
- "account.statuses_counter": "{count, plural, one {{counter} Toud} two {{counter} Doud} other {{counter} a Doudoù}}",
+ "account.statuses_counter": "{count, plural, one {{counter} C'hannad} two {{counter} Gannad} other {{counter} a Gannadoù}}",
"account.unblock": "Diverzañ @{name}",
"account.unblock_domain": "Diverzañ an domani {domain}",
"account.unblock_short": "Distankañ",
@@ -87,7 +87,8 @@
"announcement.announcement": "Kemennad",
"attachments_list.unprocessed": "(ket meret)",
"audio.hide": "Kuzhat ar c'hleved",
- "autosuggest_hashtag.per_week": "{count} bep sizhun",
+ "block_modal.show_less": "Diskouez nebeutoc'h",
+ "block_modal.show_more": "Diskouez muioc'h",
"boost_modal.combo": "Ar wezh kentañ e c'halliot gwaskañ war {combo} evit tremen hebiou",
"bundle_column_error.copy_stacktrace": "Eilañ an danevell fazi",
"bundle_column_error.error.body": "N'haller ket skrammañ ar bajenn goulennet. Gallout a ra bezañ abalamour d'ur beug er c'hod pe d'ur gudenn keverlec'hded gant ar merdeer.",
@@ -114,14 +115,15 @@
"column.directory": "Mont a-dreuz ar profiloù",
"column.domain_blocks": "Domani berzet",
"column.favourites": "Muiañ-karet",
+ "column.firehose": "Redoù war-eeun",
"column.follow_requests": "Rekedoù heuliañ",
"column.home": "Degemer",
"column.lists": "Listennoù",
"column.mutes": "Implijer·ion·ezed kuzhet",
"column.notifications": "Kemennoù",
- "column.pins": "Toudoù spilhennet",
+ "column.pins": "Embannadurioù spilhennet",
"column.public": "Red-amzer kevredet",
- "column_back_button.label": "Distro",
+ "column_back_button.label": "Distreiñ",
"column_header.hide_settings": "Kuzhat an arventennoù",
"column_header.moveLeft_settings": "Dilec'hiañ ar bannad a-gleiz",
"column_header.moveRight_settings": "Dilec'hiañ ar bannad a-zehou",
@@ -143,26 +145,21 @@
"compose_form.lock_disclaimer": "N'eo ket {locked} ho kont. An holl a c'hal ho heuliañ evit gwelet ho toudoù prevez.",
"compose_form.lock_disclaimer.lock": "prennet",
"compose_form.placeholder": "Petra emaoc'h o soñjal e-barzh ?",
- "compose_form.poll.add_option": "Ouzhpenniñ un dibab",
"compose_form.poll.duration": "Pad ar sontadeg",
- "compose_form.poll.option_placeholder": "Dibab {number}",
- "compose_form.poll.remove_option": "Lemel an dibab-mañ",
+ "compose_form.poll.multiple": "Meur a choaz",
+ "compose_form.poll.option_placeholder": "Choaz {number}",
+ "compose_form.poll.single": "Dibabit unan",
"compose_form.poll.switch_to_multiple": "Kemmañ ar sontadeg evit aotren meur a zibab",
"compose_form.poll.switch_to_single": "Kemmañ ar sontadeg evit aotren un dibab hepken",
+ "compose_form.poll.type": "Neuz",
"compose_form.publish": "Embann",
"compose_form.publish_form": "Embann",
- "compose_form.publish_loud": "{publish} !",
- "compose_form.save_changes": "Enrollañ ar cheñchamantoù",
- "compose_form.sensitive.hide": "Merkañ ar media evel kizidik",
- "compose_form.sensitive.marked": "Merket eo ar media evel kizidik",
- "compose_form.sensitive.unmarked": "N'eo ket merket ar media evel kizidik",
+ "compose_form.reply": "Respont",
+ "compose_form.save_changes": "Hizivadur",
"compose_form.spoiler.marked": "Kuzhet eo an destenn a-dreñv ur c'hemenn",
"compose_form.spoiler.unmarked": "N'eo ket kuzhet an destenn",
- "compose_form.spoiler_placeholder": "Skrivit ho kemenn diwall amañ",
"confirmation_modal.cancel": "Nullañ",
- "confirmations.block.block_and_report": "Berzañ ha Disklêriañ",
"confirmations.block.confirm": "Stankañ",
- "confirmations.block.message": "Ha sur oc'h e fell deoc'h stankañ {name} ?",
"confirmations.cancel_follow_request.confirm": "Nullañ ar reked",
"confirmations.cancel_follow_request.message": "Ha sur oc'h e fell deoc'h nullañ ho reked evit heuliañ {name} ?",
"confirmations.delete.confirm": "Dilemel",
@@ -171,14 +168,11 @@
"confirmations.delete_list.message": "Ha sur eo hoc'h eus c'hoant da zilemel ar roll-mañ da vat ?",
"confirmations.discard_edit_media.confirm": "Nac'hañ",
"confirmations.discard_edit_media.message": "Bez ez eus kemmoù n'int ket enrollet e deskrivadur ar media pe ar rakwel, nullañ anezho evelato?",
- "confirmations.domain_block.confirm": "Berzañ an domani a-bezh",
"confirmations.domain_block.message": "Ha sur oc'h e fell deoc'h berzañ an {domain} a-bezh? Peurvuiañ eo trawalc'h berzañ pe mudañ un nebeud implijer·ezed·ien. Ne welot danvez ebet o tont eus an domani-mañ. Dilamet e vo ar c'houmanantoù war an domani-mañ.",
"confirmations.edit.confirm": "Kemmañ",
"confirmations.logout.confirm": "Digevreañ",
"confirmations.logout.message": "Ha sur oc'h e fell deoc'h digevreañ ?",
"confirmations.mute.confirm": "Kuzhat",
- "confirmations.mute.explanation": "Kement-se a guzho an toudoù skrivet gantañ·i hag ar re a veneg anezhañ·i, met ne viro ket outañ·i a welet ho toudoù nag a heuliañ ac'hanoc'h.",
- "confirmations.mute.message": "Ha sur oc'h e fell deoc'h kuzhaat {name} ?",
"confirmations.redraft.confirm": "Diverkañ ha skrivañ en-dro",
"confirmations.reply.confirm": "Respont",
"confirmations.reply.message": "Respont bremañ a zilamo ar gemennadenn emaoc'h o skrivañ. Sur e oc'h e fell deoc'h kenderc'hel ganti?",
@@ -201,13 +195,15 @@
"dismissable_banner.dismiss": "Diverkañ",
"dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
"dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+ "domain_pill.server": "Dafariad",
+ "domain_pill.username": "Anv-implijer",
"embed.instructions": "Enframmit an toud-mañ en ho lec'hienn en ur eilañ ar c'hod amañ-dindan.",
"embed.preview": "Setu penaos e teuio war wel :",
"emoji_button.activity": "Obererezh",
"emoji_button.clear": "Diverkañ",
- "emoji_button.custom": "Kempennet",
+ "emoji_button.custom": "Personelaet",
"emoji_button.flags": "Bannieloù",
- "emoji_button.food": "Boued hag Evaj",
+ "emoji_button.food": "Boued & Evajoù",
"emoji_button.label": "Enlakaat un emoji",
"emoji_button.nature": "Natur",
"emoji_button.not_found": "Emoji ebet !! (╯°□°）╯︵ ┻━┻",
@@ -217,12 +213,12 @@
"emoji_button.search": "O klask...",
"emoji_button.search_results": "Disoc'hoù an enklask",
"emoji_button.symbols": "Arouezioù",
- "emoji_button.travel": "Lec'hioù ha Beajoù",
+ "emoji_button.travel": "Beajiñ & Lec'hioù",
"empty_column.account_suspended": "Kont ehanet",
"empty_column.account_timeline": "Toud ebet amañ !",
"empty_column.account_unavailable": "Profil dihegerz",
"empty_column.blocks": "N'eus ket bet berzet implijer·ez ganeoc'h c'hoazh.",
- "empty_column.bookmarked_statuses": "N'ho peus toud ebet enrollet en ho sinedoù c'hoazh. Pa vo ouzhpennet unan e teuio war wel amañ.",
+ "empty_column.bookmarked_statuses": "N'ho peus embannadur ebet enrollet en ho sinedoù c'hoazh. Pa vo ouzhpennet unan e teuio war wel amañ.",
"empty_column.community": "Goulo eo ar red-amzer lec'hel. Skrivit'ta un dra evit lakaat tan dezhi !",
"empty_column.domain_blocks": "N'eus domani kuzh ebet c'hoazh.",
"empty_column.explore_statuses": "N'eus tuadur ebet evit c'hoazh. Distroit diwezhatoc'h !",
@@ -260,12 +256,16 @@
"filter_modal.select_filter.subtitle": "Implijout ur rummad a zo anezhañ pe krouiñ unan nevez",
"filter_modal.select_filter.title": "Silañ an toud-mañ",
"filter_modal.title.status": "Silañ un toud",
+ "filtered_notifications_banner.mentions": "{count, plural, one {meneg} two {veneg} few {meneg} other {a venegoù}}",
"firehose.all": "Pep tra",
"firehose.local": "Ar servijer-mañ",
"firehose.remote": "Servijerioù all",
"follow_request.authorize": "Aotren",
"follow_request.reject": "Nac'hañ",
"follow_requests.unlocked_explanation": "Daoust ma n'eo ket ho kont prennet, skipailh {domain} a soñj e fellfe deoc'h gwiriekaat pedadennoù heuliañ deus ar c'hontoù-se diwar-zorn.",
+ "follow_suggestions.friends_of_friends_longer": "Diouzh ar c'hiz e-touez an dud heuliet ganeoc'h",
+ "follow_suggestions.popular_suggestion_longer": "Diouzh ar c'hiz war {domain}",
+ "follow_suggestions.view_all": "Gwelet pep tra",
"followed_tags": "Hashtagoù o heuliañ",
"footer.about": "Diwar-benn",
"footer.directory": "Kavlec'h ar profiloù",
@@ -273,7 +273,7 @@
"footer.invite": "Pediñ tud",
"footer.keyboard_shortcuts": "Berradennoù klavier",
"footer.privacy_policy": "Reolennoù prevezded",
- "footer.source_code": "Gwelet kod mammenn",
+ "footer.source_code": "Gwelet ar c'hod mammenn",
"footer.status": "Statud",
"generic.saved": "Enrollet",
"getting_started.heading": "Loc'hañ",
@@ -291,12 +291,8 @@
"hashtag.follow": "Heuliañ ar ger-klik",
"hashtag.unfollow": "Paouez heuliañ an hashtag",
"hashtags.and_other": "…{count, plural, one {hag # all} other {ha # all}}",
- "home.actions.go_to_explore": "Gwelet petra zo diouzh ar c'hiz",
- "home.actions.go_to_suggestions": "Kavout tud da heuliañ",
- "home.column_settings.basic": "Diazez",
"home.column_settings.show_reblogs": "Diskouez ar skignadennoù",
"home.column_settings.show_replies": "Diskouez ar respontoù",
- "home.explore_prompt.title": "Homañ eo ho pajenn degemer e-barzh Mastodon.",
"home.hide_announcements": "Kuzhat ar c'hemennoù",
"home.pending_critical_update.body": "Hizivait ho servijer Mastodon kerkent ha ma c'hallit mar plij!",
"home.pending_critical_update.link": "Gwelet an hizivadennoù",
@@ -304,7 +300,7 @@
"interaction_modal.description.follow": "Gant ur gont Mastodon e c'hellit heuliañ {name} evit resev an toudoù a embann war ho red degemer.",
"interaction_modal.description.reblog": "Gant ur gont Mastodon e c'hellit skignañ an toud-mañ evit rannañ anezhañ gant ho heulierien·ezed.",
"interaction_modal.description.reply": "Gant ur gont Mastodon e c'hellit respont d'an toud-mañ.",
- "interaction_modal.no_account_yet": "N'eo ket war vMastodon?",
+ "interaction_modal.no_account_yet": "N'emañ ket war vMastodon?",
"interaction_modal.on_another_server": "War ur servijer all",
"interaction_modal.on_this_server": "War ar servijer-mañ",
"interaction_modal.title.favourite": "Ouzhpennañ embannadur {name} d'ar re vuiañ-karet",
@@ -372,9 +368,6 @@
"load_pending": "{count, plural, one {# dra nevez} other {# dra nevez}}",
"loading_indicator.label": "O kargañ…",
"media_gallery.toggle_visible": "{number, plural, one {Kuzhat ar skeudenn} other {Kuzhat ar skeudenn}}",
- "mute_modal.duration": "Padelezh",
- "mute_modal.hide_notifications": "Kuzhat kemenadennoù eus an implijer-se ?",
- "mute_modal.indefinite": "Amstrizh",
"navigation_bar.about": "Diwar-benn",
"navigation_bar.blocks": "Implijer·ezed·ien berzet",
"navigation_bar.bookmarks": "Sinedoù",
@@ -383,7 +376,6 @@
"navigation_bar.direct": "Menegoù prevez",
"navigation_bar.discover": "Dizoleiñ",
"navigation_bar.domain_blocks": "Domanioù kuzhet",
- "navigation_bar.edit_profile": "Kemmañ ar profil",
"navigation_bar.explore": "Furchal",
"navigation_bar.favourites": "Muiañ-karet",
"navigation_bar.filters": "Gerioù kuzhet",
@@ -405,6 +397,7 @@
"notification.follow": "heuliañ a ra {name} ac'hanoc'h",
"notification.follow_request": "Gant {name} eo bet goulennet ho heuliañ",
"notification.mention": "Gant {name} oc'h bet meneget",
+ "notification.moderation-warning.learn_more": "Gouzout hiroc'h",
"notification.own_poll": "Echu eo ho sontadeg",
"notification.poll": "Ur sontadeg ho deus mouezhet warnañ a zo echuet",
"notification.reblog": "Gant {name} eo bet skignet ho toud",
@@ -416,9 +409,6 @@
"notifications.column_settings.admin.sign_up": "Enskrivadurioù nevez :",
"notifications.column_settings.alert": "Kemennoù war ar burev",
"notifications.column_settings.favourite": "Muiañ-karet:",
- "notifications.column_settings.filter_bar.advanced": "Skrammañ an-holl rummadoù",
- "notifications.column_settings.filter_bar.category": "Barrenn siloù prim",
- "notifications.column_settings.filter_bar.show_bar": "Diskouezh barrenn siloù",
"notifications.column_settings.follow": "Heulierien nevez:",
"notifications.column_settings.follow_request": "Pedadoù heuliañ nevez :",
"notifications.column_settings.mention": "Menegoù:",
@@ -444,13 +434,14 @@
"notifications.permission_denied": "Kemennoù war ar burev n'int ket hegerz rak pedadenn aotren ar merdeer a zo bet nullet araok",
"notifications.permission_denied_alert": "Kemennoù wa ar burev na c'hellont ket bezañ lezelet, rak aotre ar merdeer a zo bet nac'het a-raok",
"notifications.permission_required": "Kemennoù war ar burev n'int ket hegerz abalamour d'an aotre rekis n'eo ket bet roet.",
+ "notifications.policy.filter_new_accounts_title": "Kontoù nevez",
"notifications_permission_banner.enable": "Lezel kemennoù war ar burev",
"notifications_permission_banner.how_to_control": "Evit reseviñ kemennoù pa ne vez ket digoret Mastodon, lezelit kemennoù war ar burev. Gallout a rit kontrollañ peseurt eskemmoù a c'henel kemennoù war ar burev gant ar {icon} nozelenn a-us kentre ma'z int lezelet.",
"notifications_permission_banner.title": "Na vankit netra morse",
"onboarding.action.back": "Distreiñ",
"onboarding.actions.back": "Distreiñ",
"onboarding.actions.go_to_explore": "See what's trending",
- "onboarding.actions.go_to_home": "Go to your home feed",
+ "onboarding.actions.go_to_home": "Mont d'ho red degemer",
"onboarding.compose.template": "Salud #Mastodon!",
"onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
"onboarding.follows.title": "Popular on Mastodon",
@@ -473,7 +464,7 @@
"onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
"onboarding.steps.setup_profile.title": "Customize your profile",
"onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
- "onboarding.steps.share_profile.title": "Share your profile",
+ "onboarding.steps.share_profile.title": "Rannit ho kont Mastodon",
"password_confirmation.mismatching": "Disheñvel eo an daou c'her-termen-se",
"picture_in_picture.restore": "Adlakaat",
"poll.closed": "Serret",
@@ -486,15 +477,10 @@
"poll.votes": "{votes, plural,one {#votadenn} other {# votadenn}}",
"poll_button.add_poll": "Ouzhpennañ ur sontadeg",
"poll_button.remove_poll": "Dilemel ar sontadeg",
- "privacy.change": "Cheñch prevezded an toud",
- "privacy.direct.long": "Embann evit an implijer·ezed·ien meneget hepken",
- "privacy.direct.short": "Tud meneget hepken",
- "privacy.private.long": "Embann evit ar re a heuilh ac'hanon hepken",
- "privacy.private.short": "Tud koumanantet hepken",
- "privacy.public.long": "Gwelus d'an holl",
+ "privacy.change": "Cheñch prevezded an embannadur",
+ "privacy.direct.short": "Tud resis",
+ "privacy.private.short": "Heulierien",
"privacy.public.short": "Publik",
- "privacy.unlisted.long": "Gwelus gant an holl, met hep arc'hweladur dizoleiñ",
- "privacy.unlisted.short": "Anlistennet",
"privacy_policy.last_updated": "Hizivadenn ziwezhañ {date}",
"privacy_policy.title": "Reolennoù Prevezded",
"recommended": "Erbedet",
@@ -513,6 +499,7 @@
"relative_time.seconds": "{number}eil",
"relative_time.today": "hiziv",
"reply_indicator.cancel": "Nullañ",
+ "reply_indicator.poll": "Sontadeg",
"report.block": "Stankañ",
"report.block_explanation": "Ne vo ket gwelet toudoù ar gont-se ken. Ne welo ket ho toudoù ha ne c'hello ket ho heuliañ ken. Gouzout a raio eo bet stanket ganeoc'h.",
"report.categories.legal": "Lezennel",
@@ -597,7 +584,7 @@
"status.direct": "Menegiñ @{name} ent-prevez",
"status.direct_indicator": "Meneg prevez",
"status.edit": "Kemmañ",
- "status.edited": "Aozet {date}",
+ "status.edited": "Kemmet da ziwezhañ d'an {date}",
"status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
"status.embed": "Enframmañ",
"status.favourite": "Muiañ-karet",
@@ -667,10 +654,8 @@
"upload_error.poll": "Pellgargañ restroù n'eo ket aotreet gant sontadegoù.",
"upload_form.audio_description": "Diskrivañ evit tud a zo kollet o c'hlev",
"upload_form.description": "Diskrivañ evit tud a zo kollet o gweled",
- "upload_form.description_missing": "Deskrivadur diank",
"upload_form.edit": "Kemmañ",
"upload_form.thumbnail": "Kemmañ ar velvenn",
- "upload_form.undo": "Dilemel",
"upload_form.video_description": "Diskrivañ evit tud a zo kollet o gweled pe o c'hlev",
"upload_modal.analyzing_picture": "O tielfennañ ar skeudenn…",
"upload_modal.apply": "Arloañ",
diff --git a/app/javascript/mastodon/locales/bs.json b/app/javascript/mastodon/locales/bs.json
index 9b6b49c3d666f0..d06054ee586b07 100644
--- a/app/javascript/mastodon/locales/bs.json
+++ b/app/javascript/mastodon/locales/bs.json
@@ -11,7 +11,6 @@
"compose_form.spoiler.marked": "Text is hidden behind warning",
"compose_form.spoiler.unmarked": "Text is not hidden",
"confirmations.delete.message": "Are you sure you want to delete this status?",
- "confirmations.domain_block.confirm": "Hide entire domain",
"dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
"dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
"embed.instructions": "Embed this status on your website by copying the code below.",
@@ -66,8 +65,6 @@
"onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
"onboarding.steps.share_profile.title": "Share your profile",
"privacy.change": "Adjust status privacy",
- "privacy.direct.short": "Direct",
- "privacy.private.short": "Followers-only",
"report.placeholder": "Type or paste additional comments",
"report.submit": "Submit report",
"report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index c763a32ba846dc..68429b093ce280 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -89,7 +89,14 @@
"announcement.announcement": "Anunci",
"attachments_list.unprocessed": "(sense processar)",
"audio.hide": "Amaga l'àudio",
- "autosuggest_hashtag.per_week": "{count} per setmana",
+ "block_modal.remote_users_caveat": "Li demanarem al servidor {domain} que respecti la vostra decisió, tot i que no podem garantir-ho, ja que alguns servidors gestionen de forma diferent els blocatges. És possible que els usuaris no autenticats puguin veure les publicacions públiques.",
+ "block_modal.show_less": "Mostra'n menys",
+ "block_modal.show_more": "Mostra'n més",
+ "block_modal.they_cant_mention": "No us poden esmentar, ni seguir.",
+ "block_modal.they_cant_see_posts": "No poden veure les vostres publicacions, ni vosaltres les seves.",
+ "block_modal.they_will_know": "Poden veure que els heu blocat.",
+ "block_modal.title": "Bloquem l'usuari?",
+ "block_modal.you_wont_see_mentions": "No veureu publicacions que l'esmentin.",
"boost_modal.combo": "Pots prémer {combo} per a evitar-ho el pròxim cop",
"bundle_column_error.copy_stacktrace": "Copia l'informe d'error",
"bundle_column_error.error.body": "No s'ha pogut renderitzar la pàgina sol·licitada. Podria ser per un error en el nostre codi o per un problema de compatibilitat del navegador.",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "El teu compte no està {locked}. Tothom pot seguir-te i veure els tuts de només per a seguidors.",
"compose_form.lock_disclaimer.lock": "blocat",
"compose_form.placeholder": "Què tens al cap?",
- "compose_form.poll.add_option": "Afegeix una opció",
"compose_form.poll.duration": "Durada de l'enquesta",
+ "compose_form.poll.multiple": "Opcions múltiples",
"compose_form.poll.option_placeholder": "Opció {number}",
- "compose_form.poll.remove_option": "Elimina aquesta opció",
+ "compose_form.poll.single": "Trieu-ne una",
"compose_form.poll.switch_to_multiple": "Canvia l’enquesta per a permetre múltiples opcions",
"compose_form.poll.switch_to_single": "Canvia l’enquesta per a permetre una única opció",
- "compose_form.publish": "Tut",
+ "compose_form.poll.type": "Estil",
+ "compose_form.publish": "Publica",
"compose_form.publish_form": "Nou tut",
- "compose_form.publish_loud": "Tut!",
- "compose_form.save_changes": "Desa els canvis",
- "compose_form.sensitive.hide": "{count, plural, one {Marca mèdia com a sensible} other {Marca mèdia com a sensible}}",
- "compose_form.sensitive.marked": "{count, plural, one {Contingut marcat com a sensible} other {Contingut marcat com a sensible}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Contingut no marcat com a sensible} other {Contingut no marcat com a sensible}}",
+ "compose_form.reply": "Respon",
+ "compose_form.save_changes": "Actualitza",
"compose_form.spoiler.marked": "Elimina l'avís de contingut",
"compose_form.spoiler.unmarked": "Afegeix avís de contingut",
- "compose_form.spoiler_placeholder": "Escriu l'avís aquí",
+ "compose_form.spoiler_placeholder": "Avís de contingut (opcional)",
"confirmation_modal.cancel": "Cancel·la",
- "confirmations.block.block_and_report": "Bloca i denuncia",
"confirmations.block.confirm": "Bloca",
- "confirmations.block.message": "Segur que vols blocar a {name}?",
"confirmations.cancel_follow_request.confirm": "Retirar la sol·licitud",
"confirmations.cancel_follow_request.message": "Segur que vols retirar la sol·licitud de seguiment de {name}?",
"confirmations.delete.confirm": "Elimina",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "Segur que vols suprimir permanentment aquesta llista?",
"confirmations.discard_edit_media.confirm": "Descarta",
"confirmations.discard_edit_media.message": "Tens canvis no desats en la descripció del contingut o en la previsualització, els vols descartar?",
- "confirmations.domain_block.confirm": "Bloca el domini sencer",
+ "confirmations.domain_block.confirm": "Bloca el servidor",
"confirmations.domain_block.message": "Segur que vols blocar {domain} del tot? En la majoria dels casos, només amb blocar o silenciar uns pocs comptes n'hi ha prou i és millor. No veuràs el contingut d’aquest domini en cap de les línies de temps ni en les notificacions. S'eliminaran els teus seguidors d’aquest domini.",
"confirmations.edit.confirm": "Edita",
"confirmations.edit.message": "Editant ara sobreescriuràs el missatge que estàs editant. Segur que vols continuar?",
"confirmations.logout.confirm": "Tanca la sessió",
"confirmations.logout.message": "Segur que vols tancar la sessió?",
"confirmations.mute.confirm": "Silencia",
- "confirmations.mute.explanation": "Això amagarà els tuts d'ells i els d'els que els mencionin, però encara els permetrà veure els teus tuts i seguir-te.",
- "confirmations.mute.message": "Segur que vols silenciar {name}?",
"confirmations.redraft.confirm": "Esborra i reescriu",
"confirmations.redraft.message": "Segur que vols eliminar aquest tut i tornar a escriure'l? Es perdran tots els impulsos i els favorits, i les respostes al tut original quedaran aïllades.",
"confirmations.reply.confirm": "Respon",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "Aquests son els tuts de la xarxa descentralitzada que guanyen atenció ara mateix. Els tuts més nous amb més impulsos i favorits tenen millor rànquing.",
"dismissable_banner.explore_tags": "Aquestes etiquetes estan guanyant ara mateix l'atenció dels usuaris d'aquest i altres servidors de la xarxa descentralitzada.",
"dismissable_banner.public_timeline": "Aquests son els tuts públics més recents de les persones a la web social que les persones de {domain} segueixen.",
+ "domain_block_modal.block": "Bloca el servidor",
+ "domain_block_modal.block_account_instead": "En lloc d'això, bloca @{name}",
+ "domain_block_modal.they_can_interact_with_old_posts": "Els usuaris d'aquest servidor poden interactuar amb les vostres publicacions antigues.",
+ "domain_block_modal.they_cant_follow": "Ningú d'aquest servidor us pot seguir.",
+ "domain_block_modal.they_wont_know": "No sabran que són blocats.",
+ "domain_block_modal.title": "Bloquem el domini?",
+ "domain_block_modal.you_will_lose_followers": "S'eliminaran tots els vostres seguidors d'aquest servidor.",
+ "domain_block_modal.you_wont_see_posts": "No veureu ni les publicacions ni les notificacions dels usuaris d'aquest servidor.",
+ "domain_pill.activitypub_lets_connect": "Us permet connectar i interactuar amb persones a Mastodon i també a d'altres apps socials.",
+ "domain_pill.activitypub_like_language": "ActivityPub és el llenguatge que Mastodon parla amb altres xarxes socials.",
+ "domain_pill.server": "Servidor",
+ "domain_pill.their_handle": "El seu identificador:",
+ "domain_pill.their_server": "La seva llar digital, on són totes les seves publicacions.",
+ "domain_pill.their_username": "El seu identificador únic al servidor. És possible que hi hagi usuaris amb el mateix nom d'usuari a diferents servidors.",
+ "domain_pill.username": "Nom d'usuari",
+ "domain_pill.whats_in_a_handle": "Què constitueix un identificador?",
+ "domain_pill.who_they_are": "Com que un identificador expressa qui i on s'és, podeu interactuar amb persones d'arreu de les .",
+ "domain_pill.who_you_are": "Com que un identificador expressa qui i on sou, les persones d'arreu de les poden interactuar amb vosaltres.",
+ "domain_pill.your_handle": "El vostre identificador:",
+ "domain_pill.your_server": "La vostra llar digital, on són totes les vostres publicacions. No us agrada aquesta? Canvieu de servidor quan vulgueu i emporteu-vos els vostres seguidors.",
+ "domain_pill.your_username": "El vostre identificador únic en aquest servidor. Hi pot haver usuaris amb el mateix nom a diferents servidors.",
"embed.instructions": "Incrusta aquest tut a la teva pàgina web copiant el codi següent.",
"embed.preview": "Aquest aspecte tindrà:",
"emoji_button.activity": "Activitat",
@@ -244,6 +266,7 @@
"empty_column.list": "Encara no hi ha res en aquesta llista. Quan els membres facin nous tuts, apareixeran aquí.",
"empty_column.lists": "Encara no tens cap llista. Quan en facis una, apareixerà aquí.",
"empty_column.mutes": "Encara no has silenciat cap usuari.",
+ "empty_column.notification_requests": "Tot net, ja no hi ha res aquí! Quan rebeu notificacions noves, segons la vostra configuració, apareixeran aquí.",
"empty_column.notifications": "Encara no tens notificacions. Quan altre gent interactuï amb tu, les veuràs aquí.",
"empty_column.public": "Aquí no hi ha res! Escriu públicament alguna cosa o segueix manualment usuaris d'altres servidors per omplir-ho",
"error.unexpected_crash.explanation": "A causa d'un error en el nostre codi o d'un problema de compatibilitat amb el navegador, aquesta pàgina no s'ha pogut mostrar correctament.",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "Usa una categoria existent o crea'n una de nova",
"filter_modal.select_filter.title": "Filtra aquest tut",
"filter_modal.title.status": "Filtra un tut",
+ "filtered_notifications_banner.mentions": "{count, plural, one {menció} other {mencions}}",
+ "filtered_notifications_banner.pending_requests": "Notificacions {count, plural, =0 {de ningú} one {d'una persona} other {de # persones}} que potser coneixes",
+ "filtered_notifications_banner.title": "Notificacions filtrades",
"firehose.all": "Tots",
"firehose.local": "Aquest servidor",
"firehose.remote": "Altres servidors",
"follow_request.authorize": "Autoritza",
"follow_request.reject": "Rebutja",
"follow_requests.unlocked_explanation": "Tot i que el teu compte no està blocat, el personal de {domain} ha pensat que és possible que vulguis revisar manualment les sol·licituds de seguiment d’aquests comptes.",
+ "follow_suggestions.curated_suggestion": "Tria de l'equip",
+ "follow_suggestions.dismiss": "No ho tornis a mostrar",
+ "follow_suggestions.featured_longer": "Triat personalment per l'equip de {domain}",
+ "follow_suggestions.friends_of_friends_longer": "Popular entre la gent que segueixes",
+ "follow_suggestions.hints.featured": "L'equip de {domain} ha seleccionat aquest perfil.",
+ "follow_suggestions.hints.friends_of_friends": "Aquest perfil és popular entre la gent que seguiu.",
+ "follow_suggestions.hints.most_followed": "Aquest perfil és un dels més seguits a {domain}.",
+ "follow_suggestions.hints.most_interactions": "Aquest perfil ha estat rebent un munt d'atenció recentment a {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Aquest perfil és similar a d'altres que heu seguit recentment.",
+ "follow_suggestions.personalized_suggestion": "Suggeriment personalitzat",
+ "follow_suggestions.popular_suggestion": "Suggeriment popular",
+ "follow_suggestions.popular_suggestion_longer": "Popular a {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Semblant a perfils que seguiu de fa poc",
+ "follow_suggestions.view_all": "Mostra-ho tot",
+ "follow_suggestions.who_to_follow": "A qui seguir",
"followed_tags": "Etiquetes seguides",
"footer.about": "Quant a",
"footer.directory": "Directori de perfils",
@@ -306,13 +347,8 @@
"hashtag.follow": "Segueix l'etiqueta",
"hashtag.unfollow": "Deixa de seguir l'etiqueta",
"hashtags.and_other": "…i {count, plural, other {# més}}",
- "home.actions.go_to_explore": "Mira què és tendència",
- "home.actions.go_to_suggestions": "Troba persones a seguir",
- "home.column_settings.basic": "Bàsic",
"home.column_settings.show_reblogs": "Mostra els impulsos",
"home.column_settings.show_replies": "Mostra les respostes",
- "home.explore_prompt.body": "La teva línia de temps Inici tindrà una barreja dels tuts de les etiquetes que has triat seguir, de les persones que has triat seguir i dels tuts que s'impulsen. Ara mateix es veu força tranquil·la, què et sembla si:",
- "home.explore_prompt.title": "Aquesta és la teva base inicial a Mastodon.",
"home.hide_announcements": "Amaga els anuncis",
"home.pending_critical_update.body": "Si us plau actualitza el teu servidor Mastodon tant aviat com sigui possible!",
"home.pending_critical_update.link": "Veure actualitzacions",
@@ -378,6 +414,7 @@
"limited_account_hint.action": "Mostra el perfil de totes maneres",
"limited_account_hint.title": "Aquest perfil l'han amagat els moderadors de {domain}.",
"link_preview.author": "Per {name}",
+ "link_preview.more_from_author": "Més de {name}",
"lists.account.add": "Afegeix a la llista",
"lists.account.remove": "Elimina de la llista",
"lists.delete": "Elimina la llista",
@@ -396,9 +433,15 @@
"loading_indicator.label": "Es carrega…",
"media_gallery.toggle_visible": "{number, plural, one {Amaga la imatge} other {Amaga les imatges}}",
"moved_to_account_banner.text": "El teu compte {disabledAccount} està desactivat perquè l'has mogut a {movedToAccount}.",
- "mute_modal.duration": "Durada",
- "mute_modal.hide_notifications": "Amagar les notificacions d'aquest usuari?",
- "mute_modal.indefinite": "Indefinit",
+ "mute_modal.hide_from_notifications": "Amaga de les notificacions",
+ "mute_modal.hide_options": "Amaga les opcions",
+ "mute_modal.indefinite": "Fins que els deixi de silenciar",
+ "mute_modal.show_options": "Mostra les opcions",
+ "mute_modal.they_can_mention_and_follow": "Us poden esmentar i seguir, però no els veureu.",
+ "mute_modal.they_wont_know": "No sabran que són silenciats.",
+ "mute_modal.title": "Silenciem l'usuari?",
+ "mute_modal.you_wont_see_mentions": "No veureu publicacions que els esmentin.",
+ "mute_modal.you_wont_see_posts": "Encara poden veure les vostres publicacions, però no veureu les seves.",
"navigation_bar.about": "Quant a",
"navigation_bar.advanced_interface": "Obre en la interfície web avançada",
"navigation_bar.blocks": "Usuaris blocats",
@@ -408,7 +451,6 @@
"navigation_bar.direct": "Mencions privades",
"navigation_bar.discover": "Descobreix",
"navigation_bar.domain_blocks": "Dominis blocats",
- "navigation_bar.edit_profile": "Edita el perfil",
"navigation_bar.explore": "Explora",
"navigation_bar.favourites": "Favorits",
"navigation_bar.filters": "Paraules silenciades",
@@ -432,11 +474,29 @@
"notification.follow": "{name} et segueix",
"notification.follow_request": "{name} ha sol·licitat de seguir-te",
"notification.mention": "{name} t'ha esmentat",
+ "notification.moderation-warning.learn_more": "Per a saber-ne més",
+ "notification.moderation_warning": "Heu rebut un avís de moderació",
+ "notification.moderation_warning.action_delete_statuses": "S'han eliminat algunes de les vostres publicacions.",
+ "notification.moderation_warning.action_disable": "S'ha desactivat el vostre compte.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "S'ha marcat com a sensibles algunes de les vostres publicacions.",
+ "notification.moderation_warning.action_none": "El vostre compte ha rebut un avís de moderació.",
+ "notification.moderation_warning.action_sensitive": "A partir d'ara les vostres publicacions es marcaran com sensibles.",
+ "notification.moderation_warning.action_silence": "S'ha limitat el vostre compte.",
+ "notification.moderation_warning.action_suspend": "S'ha suspès el vostre compte.",
"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.relationships_severance_event": "S'han perdut les connexions amb {name}",
+ "notification.relationships_severance_event.account_suspension": "Un administrador de {from} ha suspès {target}; això vol dir que ja no en podreu rebre actualitzacions o interactuar-hi.",
+ "notification.relationships_severance_event.domain_block": "Un administrador de {from} ha blocat {target}, incloent-hi {followersCount} dels vostres seguidors i {followingCount, plural, one {# compte} other {# comptes}} que seguiu.",
+ "notification.relationships_severance_event.learn_more": "Per a saber-ne més",
+ "notification.relationships_severance_event.user_domain_block": "Heu blocat {target}, eliminant {followersCount} dels vostres seguidors i {followingCount, plural, one {# compte} other {# comptes}} que seguiu.",
"notification.status": "{name} acaba de publicar",
"notification.update": "{name} ha editat un tut",
+ "notification_requests.accept": "Accepta",
+ "notification_requests.dismiss": "Ignora",
+ "notification_requests.notifications_from": "Notificacions de {name}",
+ "notification_requests.title": "Notificacions filtrades",
"notifications.clear": "Esborra les notificacions",
"notifications.clear_confirmation": "Segur que vols esborrar permanentment totes les teves notificacions?",
"notifications.column_settings.admin.report": "Nous informes:",
@@ -445,7 +505,6 @@
"notifications.column_settings.favourite": "Favorits:",
"notifications.column_settings.filter_bar.advanced": "Mostra totes les categories",
"notifications.column_settings.filter_bar.category": "Barra ràpida de filtres",
- "notifications.column_settings.filter_bar.show_bar": "Mostra la barra de filtres",
"notifications.column_settings.follow": "Nous seguidors:",
"notifications.column_settings.follow_request": "Noves sol·licituds de seguiment:",
"notifications.column_settings.mention": "Mencions:",
@@ -471,6 +530,15 @@
"notifications.permission_denied": "Les notificacions d’escriptori no estan disponibles perquè prèviament s’ha denegat el permís al navegador",
"notifications.permission_denied_alert": "No es poden activar les notificacions de l'escriptori perquè abans s'ha denegat el permís del navegador",
"notifications.permission_required": "Les notificacions d'escriptori no estan disponibles perquè el permís requerit no ha estat concedit.",
+ "notifications.policy.filter_new_accounts.hint": "Creat {days, plural, one {ahir} other {durant els # dies passats}}",
+ "notifications.policy.filter_new_accounts_title": "Comptes nous",
+ "notifications.policy.filter_not_followers_hint": "Incloent les persones que us segueixen fa menys {days, plural, one {d'un dia} other {de # dies}}",
+ "notifications.policy.filter_not_followers_title": "Persones que no us segueixen",
+ "notifications.policy.filter_not_following_hint": "Fins que no ho aproveu de forma manual",
+ "notifications.policy.filter_not_following_title": "Persones que no seguiu",
+ "notifications.policy.filter_private_mentions_hint": "Filtrat si no és que és en resposta a una menció vostra o si seguiu el remitent",
+ "notifications.policy.filter_private_mentions_title": "Mencions privades no sol·licitades",
+ "notifications.policy.title": "Filtra les notificacions de…",
"notifications_permission_banner.enable": "Activa les notificacions d’escriptori",
"notifications_permission_banner.how_to_control": "Per a rebre notificacions quan Mastodon no és obert cal activar les notificacions d’escriptori. Pots controlar amb precisió quins tipus d’interaccions generen notificacions d’escriptori després d’activar el botó {icon} de dalt.",
"notifications_permission_banner.title": "No et perdis mai res",
@@ -526,14 +594,15 @@
"poll_button.add_poll": "Afegeix una enquesta",
"poll_button.remove_poll": "Elimina l'enquesta",
"privacy.change": "Canvia la privacitat del tut",
- "privacy.direct.long": "Visible només per als usuaris esmentats",
- "privacy.direct.short": "Només gent mencionada",
- "privacy.private.long": "Visible només per als seguidors",
- "privacy.private.short": "Només seguidors",
- "privacy.public.long": "Visible per a tothom",
+ "privacy.direct.long": "Tothom mencionat a la publicació",
+ "privacy.direct.short": "Persones concretes",
+ "privacy.private.long": "Només els vostres seguidors",
+ "privacy.private.short": "Seguidors",
+ "privacy.public.long": "Tothom dins o fora Mastodon",
"privacy.public.short": "Públic",
- "privacy.unlisted.long": "Visible per a tothom però exclosa de les funcions de descobriment",
- "privacy.unlisted.short": "No llistada",
+ "privacy.unlisted.additional": "Es comporta igual que públic, excepte que la publicació no apareixerà als canals en directe o etiquetes, l'explora o a la cerca de Mastodon, fins i tot si ho heu activat a nivell de compte.",
+ "privacy.unlisted.long": "Menys fanfàrries algorísmiques",
+ "privacy.unlisted.short": "Públic silenciós",
"privacy_policy.last_updated": "Darrera actualització {date}",
"privacy_policy.title": "Política de Privacitat",
"recommended": "Recomanat",
@@ -551,7 +620,9 @@
"relative_time.minutes": "{number}min",
"relative_time.seconds": "{number}s",
"relative_time.today": "avui",
+ "reply_indicator.attachments": "{count, plural, one {# adjunt} other {# adjunts}}",
"reply_indicator.cancel": "Cancel·la",
+ "reply_indicator.poll": "Enquesta",
"report.block": "Bloca",
"report.block_explanation": "No veuràs els seus tuts. Ells no podran veure els teus tuts ni et podran seguir. Podran saber que estan blocats.",
"report.categories.legal": "Legal",
@@ -644,10 +715,11 @@
"status.direct": "Menciona privadament @{name}",
"status.direct_indicator": "Menció privada",
"status.edit": "Edita",
- "status.edited": "Editat {date}",
+ "status.edited": "Darrera edició {date}",
"status.edited_x_times": "Editat {count, plural, one {{count} vegada} other {{count} vegades}}",
"status.embed": "Incrusta",
"status.favourite": "Favorit",
+ "status.favourites": "{count, plural, one {favorit} other {favorits}}",
"status.filter": "Filtra aquest tut",
"status.filtered": "Filtrada",
"status.hide": "Amaga el tut",
@@ -668,6 +740,7 @@
"status.reblog": "Impulsa",
"status.reblog_private": "Impulsa amb la visibilitat original",
"status.reblogged_by": "impulsat per {name}",
+ "status.reblogs": "{count, plural, one {impuls} other {impulsos}}",
"status.reblogs.empty": "Encara no ha impulsat ningú aquest tut. Quan algú ho faci, apareixerà aquí.",
"status.redraft": "Esborra i reescriu",
"status.remove_bookmark": "Elimina el marcador",
@@ -715,10 +788,8 @@
"upload_error.poll": "No es permet carregar fitxers a les enquestes.",
"upload_form.audio_description": "Descriu-ho per a persones amb problemes d'audició",
"upload_form.description": "Descriu-ho per a persones amb problemes de visió",
- "upload_form.description_missing": "No s'hi ha afegit cap descripció",
"upload_form.edit": "Edita",
"upload_form.thumbnail": "Canvia la miniatura",
- "upload_form.undo": "Elimina",
"upload_form.video_description": "Descriu-ho per a persones amb problemes de visió o audició",
"upload_modal.analyzing_picture": "S'analitza la imatge…",
"upload_modal.apply": "Aplica",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index f1cafd1ac474e3..c3c365b3a11c6f 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -17,9 +17,11 @@
"account.badges.group": "گرووپ",
"account.block": "بلۆکی @{name}",
"account.block_domain": "بلۆکی هەموو شتێک لە {domain}",
+ "account.block_short": "بلۆک",
"account.blocked": "بلۆککرا",
"account.browse_more_on_origin_server": "گەڕانی فرەتر لە سەر پرۆفایلی سەرەکی",
"account.cancel_follow_request": "داواکاری فۆڵۆو بکشێنەوە",
+ "account.copy": "ڕوونووسی بەستەر بۆ توت",
"account.direct": "بە شێوەیەکی تایبەت باسی @{name} بکە",
"account.disable_notifications": "ئاگانامە مەنێرە بۆم کاتێک @{name} پۆست دەکرێت",
"account.domain_blocked": "دۆمەین قەپاتکرا",
@@ -30,6 +32,7 @@
"account.featured_tags.last_status_never": "هیچ پۆستێک نییە",
"account.featured_tags.title": "هاشتاگە تایبەتەکانی {name}",
"account.follow": "بەدواداچوون",
+ "account.follow_back": "فۆڵۆو بکەنەوە",
"account.followers": "شوێنکەوتووان",
"account.followers.empty": "کەسێک شوێن ئەم بەکارهێنەرە نەکەوتووە",
"account.followers_counter": "{count, plural, one {{counter} شوێنکەوتوو} other {{counter} شوێنکەوتوو}}",
@@ -38,6 +41,7 @@
"account.follows.empty": "ئەم بەکارهێنەرە تا ئێستا شوێن کەس نەکەوتووە.",
"account.go_to_profile": "بڕۆ بۆ پڕۆفایلی",
"account.hide_reblogs": "داشاردنی بووستەکان لە @{name}",
+ "account.in_memoriam": "لە یادەوەریدا.",
"account.joined_short": "بەشداری کردووە",
"account.languages": "گۆڕینی زمانە بەشداربووەکان",
"account.link_verified_on": "خاوەنداریەتی ئەم لینکە لە {date} چێک کراوە",
@@ -46,7 +50,11 @@
"account.mention": "ئاماژە @{name}",
"account.moved_to": "{name} ئاماژەی بەوە کردووە کە ئەکاونتە نوێیەکەیان ئێستا:",
"account.mute": "بێدەنگکردن @{name}",
+ "account.mute_notifications_short": "پاڵ بە ئاگادارکردنەوەکانەوە بنێ",
+ "account.mute_short": "بێدەنگ",
"account.muted": "بێ دەنگ",
+ "account.mutual": "دوولایەنە",
+ "account.no_bio": "هیچ وەسفێک نەخراوەتەڕوو.",
"account.open_original_page": "لاپەڕەی ئەسڵی بکەرەوە",
"account.posts": "نووسراوەکان",
"account.posts_with_replies": "توتس و وەڵامەکان",
@@ -62,6 +70,7 @@
"account.unendorse": "تایبەتمەندی لەسەر پرۆفایلەکە نیە",
"account.unfollow": "بەدوادانەچو",
"account.unmute": "بێدەنگکردنی @{name}",
+ "account.unmute_notifications_short": "ئاگادارکردنەوەکان بێدەنگ بکەرەوە",
"account.unmute_short": "بێدەنگی مەکە",
"account_note.placeholder": "کرتەبکە بۆ زیادکردنی تێبینی",
"admin.dashboard.daily_retention": "ڕێژەی مانەوەی بەکارهێنەر بەپێی ڕۆژ دوای ناو تۆمارکردن",
@@ -69,6 +78,10 @@
"admin.dashboard.retention.average": "ڕێژە",
"admin.dashboard.retention.cohort": "چوونەژوورەوەی مانگانە",
"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": "ڕێژەی سنووردار",
"alert.unexpected.message": "هەڵەیەکی چاوەڕوان نەکراو ڕوویدا.",
@@ -76,7 +89,6 @@
"announcement.announcement": "بانگەواز",
"attachments_list.unprocessed": "(unprocessed)",
"audio.hide": "شاردنەوەی دەنگ",
- "autosuggest_hashtag.per_week": "{count} هەرهەفتە",
"boost_modal.combo": "دەتوانیت دەست بنێی بە سەر {combo} بۆ بازدان لە جاری داهاتوو",
"bundle_column_error.copy_stacktrace": "ڕاپۆرتی هەڵەی کۆپی بکە",
"bundle_column_error.error.body": "لاپەڕەی داواکراو نەتوانرا ڕەندەر بکرێت. دەکرێت بەهۆی هەڵەیەکی کۆدەکەمانەوە بێت، یان کێشەی گونجانی وێبگەڕ.",
@@ -102,6 +114,8 @@
"column.direct": "ئاماژەی تایبەت",
"column.directory": "گەڕان لە پرۆفایلەکان",
"column.domain_blocks": "دۆمەینە داخراوەکان",
+ "column.favourites": "دڵخوازەکان",
+ "column.firehose": "فیدی ڕاستەوخۆ",
"column.follow_requests": "بەدواداچوی داواکاریەکان بکە",
"column.home": "سەرەتا",
"column.lists": "پێرست",
@@ -122,32 +136,31 @@
"community.column_settings.remote_only": "تەنها بۆ دوور",
"compose.language.change": "گۆڕینی زمان",
"compose.language.search": "گەڕان بە زمانەکان...",
+ "compose.published.body": "پۆست بڵاوکراوەتەوە.",
+ "compose.published.open": "بیکەوە",
+ "compose.saved.body": "پۆستەکە سەیڤ کراوە.",
"compose_form.direct_message_warning_learn_more": "زیاتر فێربه",
"compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
"compose_form.hashtag_warning": "ئەم بڵاوکراوەیە لە ژێر هیچ هاشتاگێکدا دا نانرێت وەک ئەوەیە، کە گشتی نەبێت. تەنها بڵاوکراوە گشتیەکان دەتوانرێ بە هاشتاگ گەڕانی بۆ بکرێت.",
"compose_form.lock_disclaimer": "هەژمێرەکەی لە حاڵەتی {locked}. هەر کەسێک دەتوانێت شوێنت بکەوێت بۆ پیشاندانی بابەتەکانی تەنها دوایخۆی.",
"compose_form.lock_disclaimer.lock": "قفڵ دراوە",
"compose_form.placeholder": "چی لە مێشکتدایە?",
- "compose_form.poll.add_option": "زیادکردنی هەڵبژاردەیەک",
"compose_form.poll.duration": "ماوەی ڕاپرسی",
- "compose_form.poll.option_placeholder": "هەڵبژاردن {number}",
- "compose_form.poll.remove_option": "لابردنی ئەم هەڵبژاردەیە",
+ "compose_form.poll.multiple": "فرە هەڵبژاردە",
+ "compose_form.poll.option_placeholder": "بژاردەی {number}",
+ "compose_form.poll.single": "یەکێك هەلبژێرە",
"compose_form.poll.switch_to_multiple": "ڕاپرسی بگۆڕە بۆ ڕێگەدان بە چەند هەڵبژاردنێک",
"compose_form.poll.switch_to_single": "گۆڕینی ڕاپرسی بۆ ڕێگەدان بە تاکە هەڵبژاردنێک",
- "compose_form.publish": "بڵاوی بکەوە",
+ "compose_form.poll.type": "ستایڵ",
+ "compose_form.publish": "پۆست",
"compose_form.publish_form": "بڵاوی بکەوە",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "پاشکەوتی گۆڕانکاریەکان",
- "compose_form.sensitive.hide": "نیشانکردنی میدیا وەک هەستیار",
- "compose_form.sensitive.marked": "وادەی کۆتایی",
- "compose_form.sensitive.unmarked": "میدیا وەک هەستیار نیشان نەکراوە",
+ "compose_form.reply": "وەڵام",
+ "compose_form.save_changes": "نوێکردنەوە",
"compose_form.spoiler.marked": "دەق لە پشت ئاگاداریدا شاراوەتەوە",
"compose_form.spoiler.unmarked": "دەق شاراوە نییە",
- "compose_form.spoiler_placeholder": "ئاگاداریەکەت لێرە بنووسە",
+ "compose_form.spoiler_placeholder": "ئاگادارکردنەوەی ناوەڕۆک (ئیختیاری)",
"confirmation_modal.cancel": "هەڵوەشاندنەوه",
- "confirmations.block.block_and_report": "بلۆک & گوزارشت",
"confirmations.block.confirm": "بلۆک",
- "confirmations.block.message": "ئایا دڵنیایت لەوەی دەتەوێت {name} بلۆک بکەیت?",
"confirmations.cancel_follow_request.confirm": "داواکاری کشانەوە",
"confirmations.cancel_follow_request.message": "ئایا دڵنیای کە دەتەوێت داواکارییەکەت بۆ شوێنکەوتنی {ناو} بکشێنیتەوە؟",
"confirmations.delete.confirm": "سڕینەوە",
@@ -156,16 +169,14 @@
"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": "دەستکاری کردنی ئێستا: دەبێتە هۆی نووسینەوەی ئەو پەیامەی، کە ئێستا داتدەڕشت. ئایا دڵنیای، کە دەتەوێت بەردەوام بیت؟",
"confirmations.logout.confirm": "چوونە دەرەوە",
"confirmations.logout.message": "ئایا دڵنیایت لەوەی دەتەوێت بچیتە دەرەوە?",
"confirmations.mute.confirm": "بێدەنگ",
- "confirmations.mute.explanation": "ئەمەش دەبێتە هۆی شاردنەوەی پۆستەکان یان ئەو بابەتانەی کە ئاماژەیان پێ دەکات ، بەڵام هێشتا ڕێگەیان پێ دەدات کە پۆستەکانتان ببینن و شوێنتان بکەون.",
- "confirmations.mute.message": "ئایا دڵنیایت لەوەی دەتەوێت بیلێیت {name}?",
"confirmations.redraft.confirm": "سڕینەوە & دووبارە ڕەشکردنەوە",
+ "confirmations.redraft.message": "دڵنیای دەتەوێت ئەم پۆستە بسڕیتەوە و دووبارە دایبڕێژیتەوە؟ فەڤۆریت و بووستەکان لەدەست دەچن، وەڵامەکانی پۆستە ئەسڵیەکەش هەتیو دەبن.",
"confirmations.reply.confirm": "وەڵام",
"confirmations.reply.message": "وەڵامدانەوە ئێستا ئەو نامەیە ی کە تۆ ئێستا دایڕشتووە، دەنووسێتەوە. ئایا دڵنیایت کە دەتەوێت بەردەوام بیت?",
"confirmations.unfollow.confirm": "بەدوادانەچو",
@@ -174,7 +185,9 @@
"conversation.mark_as_read": "نیشانەکردن وەک خوێندراوە",
"conversation.open": "نیشاندان گفتوگۆ",
"conversation.with": "لەگەڵ{names}",
+ "copy_icon_button.copied": "کۆپی کراوە بۆ کلیپبۆرد",
"copypaste.copied": "کۆپی کراوە",
+ "copypaste.copy_to_clipboard": "کۆپی کراوە بۆ کلیپبۆرد",
"directory.federated": "لە ڕاژەکانی ناسراو",
"directory.local": "تەنها لە {domain}",
"directory.new_arrivals": "تازە گەیشتنەکان",
@@ -184,6 +197,7 @@
"dismissable_banner.community_timeline": "ئەمانە دوایین پۆستی گشتی ئەو کەسانەن کە ئەکاونتەکانیان لەلایەن {domain}ەوە هۆست کراوە.",
"dismissable_banner.dismiss": "بەلاوە نان",
"dismissable_banner.explore_links": "ئەم هەواڵانە لە ئێستادا لەلایەن کەسانێکەوە لەسەر ئەم سێرڤەرە و سێرڤەرەکانی تری تۆڕی لامەرکەزی باس دەکرێن.",
+ "dismissable_banner.explore_statuses": "ئەمانە پۆستەکانن لە سەرانسەری وێبی کۆمەڵایەتی کە ئەمڕۆ کێشکردنیان بەدەستهێناوە. پۆستە نوێیەکان کە بووست و فەڤریتی زیاتریان هەیە ڕیزبەندی بەرزتریان هەیە.",
"dismissable_banner.explore_tags": "ئەم هاشتاگانە لە ئێستادا لە نێو خەڵکی سەر ئەم سێرڤەرە و سێرڤەرەکانی تری تۆڕی لامەرکەزیدا جێگەی خۆیان دەگرن.",
"embed.instructions": "ئەم توتە بنچین بکە لەسەر وێب سایتەکەت بە کۆپیکردنی کۆدەکەی خوارەوە.",
"embed.preview": "ئەمە ئەو شتەیە کە لە شێوەی خۆی دەچێت:",
@@ -227,6 +241,7 @@
"errors.unexpected_crash.copy_stacktrace": "کۆپیکردنی ستێکتراسی بۆ کلیپ بۆرد",
"errors.unexpected_crash.report_issue": "کێشەی گوزارشت",
"explore.search_results": "ئەنجامەکانی گەڕان",
+ "explore.suggested_follows": "خەڵک",
"explore.title": "گەڕان",
"explore.trending_links": "هەواڵەکان",
"explore.trending_statuses": "بڵاوکراوەکان",
@@ -247,9 +262,16 @@
"filter_modal.select_filter.subtitle": "بەکارهێنانی پۆلێنی بەردەست یان دروستکردنی پۆلێنێکی نوێ",
"filter_modal.select_filter.title": "ئەم بڵاوکراوەیە بپاڵێوە",
"filter_modal.title.status": "بڵاوکراوەیەک بپاڵێوە",
+ "firehose.all": "هەموو",
+ "firehose.local": "لەسەر ئەم ڕاژەیە",
+ "firehose.remote": "ڕاژەکانی دی",
"follow_request.authorize": "دهسهڵاتپێدراو",
"follow_request.reject": "ڕەتکردنەوە",
"follow_requests.unlocked_explanation": "هەرچەندە هەژمارەکەت داخراو نییە، ستافی {domain} وا بیریان کردەوە کە لەوانەیە بتانەوێت پێداچوونەوە بە داواکاریەکانی ئەم هەژمارەدا بکەن بە دەستی.",
+ "follow_suggestions.curated_suggestion": "ستاف هەڵبژاردنی",
+ "follow_suggestions.dismiss": "دوبارە پشانی مەدە",
+ "follow_suggestions.view_all": "بینینی هەموو",
+ "follow_suggestions.who_to_follow": "دواکەوتنی کێ",
"followed_tags": "هاشتاگە شوێنکەوتووەکان",
"footer.about": "دەربارە",
"footer.directory": "ڕابەری پەڕەی ناساندن",
@@ -270,9 +292,9 @@
"hashtag.column_settings.tag_mode.any": "هەر کام لەمانە",
"hashtag.column_settings.tag_mode.none": "هیچ کام لەمانە",
"hashtag.column_settings.tag_toggle": "تاگی زیادە ی ئەم ستوونە لەخۆ بنووسە",
+ "hashtag.counter_by_accounts": "{count, plural, one {{counter} participant} other {{counter} participants}}",
"hashtag.follow": "شوێنکەوتنی هاشتاگ",
"hashtag.unfollow": "شوێن نەکەوتنی هاشتاگ",
- "home.column_settings.basic": "بنەڕەتی",
"home.column_settings.show_reblogs": "پیشاندانی بەهێزکردن",
"home.column_settings.show_replies": "وەڵامدانەوەکان پیشان بدە",
"home.hide_announcements": "شاردنەوەی راگەیەنراوەکان",
@@ -343,9 +365,6 @@
"load_pending": "{count, plural, one {# بەڕگەی نوێ} other {# بەڕگەی نوێ}}",
"media_gallery.toggle_visible": "شاردنەوەی {number, plural, one {image} other {images}}",
"moved_to_account_banner.text": "ئەکاونتەکەت {disabledAccount} لە ئێستادا لەکارخراوە چونکە تۆ چوویتە {movedToAccount}.",
- "mute_modal.duration": "ماوە",
- "mute_modal.hide_notifications": "شاردنەوەی ئاگانامەکان لەم بەکارهێنەرە؟ ",
- "mute_modal.indefinite": "نادیار",
"navigation_bar.about": "دەربارە",
"navigation_bar.blocks": "بەکارهێنەرە بلۆککراوەکان",
"navigation_bar.bookmarks": "نیشانکراوەکان",
@@ -354,7 +373,6 @@
"navigation_bar.direct": "ئاماژەی تایبەت",
"navigation_bar.discover": "دۆزینەوە",
"navigation_bar.domain_blocks": "دۆمەینە بلۆک کراوەکان",
- "navigation_bar.edit_profile": "دەستکاری پرۆفایل بکە",
"navigation_bar.explore": "گەڕان",
"navigation_bar.filters": "وشە کپەکان",
"navigation_bar.follow_requests": "بەدواداچوی داواکاریەکان بکە",
@@ -385,9 +403,6 @@
"notifications.column_settings.admin.report": "ڕاپۆرتە نوێیەکان:",
"notifications.column_settings.admin.sign_up": "چوونەژوورەوەی نوێ:",
"notifications.column_settings.alert": "ئاگانامەکانی پیشانگەرر ڕومێزی",
- "notifications.column_settings.filter_bar.advanced": "هەموو پۆلەکان پیشان بدە",
- "notifications.column_settings.filter_bar.category": "شریتی پاڵێوەری خێرا",
- "notifications.column_settings.filter_bar.show_bar": "نیشاندانی شریتی پاڵافتن",
"notifications.column_settings.follow": "شوێنکەوتوانی نوێ:",
"notifications.column_settings.follow_request": "شوینکەوتنی داواکاری نوێ:",
"notifications.column_settings.mention": "ئاماژەکان:",
@@ -439,14 +454,7 @@
"poll_button.add_poll": "ڕاپرسییەک زیاد بکە",
"poll_button.remove_poll": "دهنگدان بسڕهوه",
"privacy.change": "ڕێکخستنی تایبەتمەندی توت",
- "privacy.direct.long": "تەنیا بۆ بەکارهێنەرانی ناوبراو",
- "privacy.direct.short": "تەنها کەسانی باس کراو",
- "privacy.private.long": "بینراو تەنها بۆ شوێنکەوتوان",
- "privacy.private.short": "تەنیا شوێنکەوتووان",
- "privacy.public.long": "بۆ هەمووان دیارە",
"privacy.public.short": "گشتی",
- "privacy.unlisted.long": "بۆ هەمووان دیارە، بەڵام لە تایبەتمەندییەکانی دۆزینەوە دەرچووە",
- "privacy.unlisted.short": "لە لیست نەکراو",
"privacy_policy.last_updated": "دوایین نوێکردنەوە {date}",
"privacy_policy.title": "سیاسەتی تایبەتێتی",
"refresh": "نوێکردنەوە",
@@ -543,7 +551,6 @@
"status.direct": "بە شێوەیەکی تایبەت باسی @{name} بکە",
"status.direct_indicator": "ئاماژەی تایبەت",
"status.edit": "دەستکاری",
- "status.edited": "بەشداری {date}",
"status.edited_x_times": "دەستکاریکراوە {count, plural, one {{count} کات} other {{count} کات}}",
"status.embed": "نیشتەجێ بکە",
"status.filter": "ئەم پۆستە فلتەر بکە",
@@ -610,10 +617,8 @@
"upload_error.poll": "فایل و ڕاپرسی پێکەوە ڕێپێنەدراون.",
"upload_form.audio_description": "پەیامەکەت بۆ نابیستەکان",
"upload_form.description": "پەیامەکەت بۆ نابیناکان",
- "upload_form.description_missing": "هیچ وەسفێک زیاد نەکراوە",
"upload_form.edit": "دەستکاری",
"upload_form.thumbnail": "گۆڕانی وینۆچکە",
- "upload_form.undo": "بیسڕەوە",
"upload_form.video_description": "پەیامەکەت بۆ نابیست و نابیناکان",
"upload_modal.analyzing_picture": "وێنەکە شی دەکرێتەوە…",
"upload_modal.apply": "بیسەپێنە",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index 9f90c3d211dffa..be4cce2692aaa6 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -45,7 +45,6 @@
"alert.unexpected.title": "Uups!",
"announcement.announcement": "Annunziu",
"attachments_list.unprocessed": "(micca trattata)",
- "autosuggest_hashtag.per_week": "{count} per settimana",
"boost_modal.combo": "Pudete appughjà nant'à {combo} per saltà quessa a prussima volta",
"bundle_column_error.retry": "Pruvà torna",
"bundle_modal_error.close": "Chjudà",
@@ -80,36 +79,23 @@
"compose_form.lock_disclaimer": "U vostru contu ùn hè micca {locked}. Tuttu u mondu pò seguitavi è vede i vostri statuti privati.",
"compose_form.lock_disclaimer.lock": "privatu",
"compose_form.placeholder": "À chè pensate?",
- "compose_form.poll.add_option": "Aghjunghje scelta",
"compose_form.poll.duration": "Durata di u scandagliu",
- "compose_form.poll.option_placeholder": "Scelta {number}",
- "compose_form.poll.remove_option": "Toglie sta scelta",
"compose_form.poll.switch_to_multiple": "Cambià u scandagliu per accittà parechje scelte",
"compose_form.poll.switch_to_single": "Cambià u scandagliu per ùn accittà ch'una scelta",
"compose_form.publish_form": "Publish",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.sensitive.hide": "{count, plural, one {Indicà u media cum'è sensibile} other {Indicà i media cum'è sensibili}}",
- "compose_form.sensitive.marked": "{count, plural, one {Media indicatu cum'è sensibile} other {Media indicati cum'è sensibili}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Media micca indicatu cum'è sensibile} other {Media micca indicati cum'è sensibili}}",
"compose_form.spoiler.marked": "Testu piattatu daret'à un'avertimentu",
"compose_form.spoiler.unmarked": "Testu micca piattatu",
- "compose_form.spoiler_placeholder": "Scrive u vostr'avertimentu quì",
"confirmation_modal.cancel": "Annullà",
- "confirmations.block.block_and_report": "Bluccà è signalà",
"confirmations.block.confirm": "Bluccà",
- "confirmations.block.message": "Site sicuru·a che vulete bluccà @{name}?",
"confirmations.delete.confirm": "Toglie",
"confirmations.delete.message": "Site sicuru·a che vulete sguassà stu statutu?",
"confirmations.delete_list.confirm": "Toglie",
"confirmations.delete_list.message": "Site sicuru·a che vulete toglie sta lista?",
"confirmations.discard_edit_media.confirm": "Scartà",
- "confirmations.domain_block.confirm": "Piattà tuttu u duminiu",
"confirmations.domain_block.message": "Site veramente sicuru·a che vulete piattà tuttu à {domain}? Saria forse abbastanza di bluccà ò piattà alcuni conti da quallà. Ùn viderete più nunda da quallà indè e linee pubbliche o e nutificazione. I vostri abbunati da stu duminiu saranu tolti.",
"confirmations.logout.confirm": "Scunnettassi",
"confirmations.logout.message": "Site sicuru·a che vulete scunnettà vi?",
"confirmations.mute.confirm": "Piattà",
- "confirmations.mute.explanation": "Quessu hà da piattà i statuti da sta persona è i posti chì a mintuvanu, ma ellu·a puderà sempre vede i vostri statuti è siguità vi.",
- "confirmations.mute.message": "Site sicuru·a che vulete piattà @{name}?",
"confirmations.redraft.confirm": "Sguassà è riscrive",
"confirmations.reply.confirm": "Risponde",
"confirmations.reply.message": "Risponde avà sguasserà u missaghju chì scrivite. Site sicuru·a chì vulete cuntinuà?",
@@ -176,7 +162,6 @@
"hashtag.column_settings.tag_mode.any": "Unu di quessi",
"hashtag.column_settings.tag_mode.none": "Nisunu di quessi",
"hashtag.column_settings.tag_toggle": "Inchjude tag addiziunali per sta colonna",
- "home.column_settings.basic": "Bàsichi",
"home.column_settings.show_reblogs": "Vede e spartere",
"home.column_settings.show_replies": "Vede e risposte",
"home.hide_announcements": "Piattà annunzii",
@@ -236,16 +221,12 @@
"lists.subheading": "E vo liste",
"load_pending": "{count, plural, one {# entrata nova} other {# entrate nove}}",
"media_gallery.toggle_visible": "Piattà {number, plural, one {ritrattu} other {ritratti}}",
- "mute_modal.duration": "Durata",
- "mute_modal.hide_notifications": "Piattà nutificazione da st'utilizatore?",
- "mute_modal.indefinite": "Indifinita",
"navigation_bar.blocks": "Utilizatori bluccati",
"navigation_bar.bookmarks": "Segnalibri",
"navigation_bar.community_timeline": "Linea pubblica lucale",
"navigation_bar.compose": "Scrive un novu statutu",
"navigation_bar.discover": "Scopre",
"navigation_bar.domain_blocks": "Duminii piattati",
- "navigation_bar.edit_profile": "Mudificà u prufile",
"navigation_bar.filters": "Parolle silenzate",
"navigation_bar.follow_requests": "Dumande d'abbunamentu",
"navigation_bar.follows_and_followers": "Abbunati è abbunamenti",
@@ -268,8 +249,6 @@
"notifications.clear": "Purgà e nutificazione",
"notifications.clear_confirmation": "Site sicuru·a che vulete toglie tutte ste nutificazione?",
"notifications.column_settings.alert": "Nutificazione nant'à l'urdinatore",
- "notifications.column_settings.filter_bar.advanced": "Affissà tutte e categurie",
- "notifications.column_settings.filter_bar.category": "Barra di ricerca pronta",
"notifications.column_settings.follow": "Abbunati novi:",
"notifications.column_settings.follow_request": "Nove dumande d'abbunamentu:",
"notifications.column_settings.mention": "Minzione:",
@@ -318,12 +297,7 @@
"poll_button.add_poll": "Aghjunghje",
"poll_button.remove_poll": "Toglie u scandagliu",
"privacy.change": "Mudificà a cunfidenzialità di u statutu",
- "privacy.direct.long": "Mandà solu à quelli chì so mintuvati",
- "privacy.direct.short": "Direct",
- "privacy.private.long": "Mustrà solu à l'abbunati",
- "privacy.private.short": "Followers-only",
"privacy.public.short": "Pubblicu",
- "privacy.unlisted.short": "Micca listatu",
"refresh": "Attualizà",
"regeneration_indicator.label": "Caricamentu…",
"regeneration_indicator.sublabel": "Priparazione di a vostra pagina d'accolta!",
@@ -409,7 +383,6 @@
"upload_form.description": "Discrizzione per i malvistosi",
"upload_form.edit": "Mudificà",
"upload_form.thumbnail": "Cambià vignetta",
- "upload_form.undo": "Sguassà",
"upload_form.video_description": "Discrizzione per i ciochi o cechi",
"upload_modal.analyzing_picture": "Analisi di u ritrattu…",
"upload_modal.apply": "Affettà",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index e18cabcec1f194..f2a1f023a3191b 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -32,6 +32,7 @@
"account.featured_tags.last_status_never": "Žádné příspěvky",
"account.featured_tags.title": "Hlavní hashtagy uživatele {name}",
"account.follow": "Sledovat",
+ "account.follow_back": "Také sledovat",
"account.followers": "Sledující",
"account.followers.empty": "Tohoto uživatele zatím nikdo nesleduje.",
"account.followers_counter": "{count, plural, one {{counter} Sledující} few {{counter} Sledující} many {{counter} Sledujících} other {{counter} Sledujících}}",
@@ -52,6 +53,7 @@
"account.mute_notifications_short": "Ztlumit upozornění",
"account.mute_short": "Ztlumit",
"account.muted": "Skrytý",
+ "account.mutual": "Vzájemné",
"account.no_bio": "Nebyl poskytnut žádný popis.",
"account.open_original_page": "Otevřít původní stránku",
"account.posts": "Příspěvky",
@@ -87,7 +89,14 @@
"announcement.announcement": "Oznámení",
"attachments_list.unprocessed": "(nezpracováno)",
"audio.hide": "Skrýt zvuk",
- "autosuggest_hashtag.per_week": "{count} za týden",
+ "block_modal.remote_users_caveat": "Požádáme server {domain}, aby respektoval vaše rozhodnutí. Úplné dodržování nastavení však není zaručeno, protože některé servery mohou řešit blokování různě. Veřejné příspěvky mohou být stále viditelné pro nepřihlášené uživatele.",
+ "block_modal.show_less": "Zobrazit méně",
+ "block_modal.show_more": "Zobrazit více",
+ "block_modal.they_cant_mention": "Nemůže vás zmiňovat ani sledovat.",
+ "block_modal.they_cant_see_posts": "Nemůže vidět vaše příspěvky a vy neuvidíte jeho.",
+ "block_modal.they_will_know": "Může vidět, že je zablokovaný.",
+ "block_modal.title": "Zablokovat uživatele?",
+ "block_modal.you_wont_see_mentions": "Neuvidíte příspěvky, které ho zmiňují.",
"boost_modal.combo": "Příště můžete pro přeskočení stisknout {combo}",
"bundle_column_error.copy_stacktrace": "Zkopírovat zprávu o chybě",
"bundle_column_error.error.body": "Požadovanou stránku nelze vykreslit. Může to být způsobeno chybou v našem kódu nebo problémem s kompatibilitou prohlížeče.",
@@ -144,26 +153,22 @@
"compose_form.lock_disclaimer": "Váš účet není {locked}. Kdokoliv vás může sledovat a vidět vaše příspěvky učené pouze pro sledující.",
"compose_form.lock_disclaimer.lock": "zamčený",
"compose_form.placeholder": "Co se vám honí hlavou?",
- "compose_form.poll.add_option": "Přidat volbu",
"compose_form.poll.duration": "Doba trvání ankety",
+ "compose_form.poll.multiple": "Výběr z více možností",
"compose_form.poll.option_placeholder": "Volba {number}",
- "compose_form.poll.remove_option": "Odebrat tuto volbu",
+ "compose_form.poll.single": "Vyber jednu",
"compose_form.poll.switch_to_multiple": "Povolit u ankety výběr více voleb",
"compose_form.poll.switch_to_single": "Povolit u ankety výběr pouze jedné volby",
- "compose_form.publish": "Zveřejnit",
+ "compose_form.poll.type": "Styl",
+ "compose_form.publish": "Odeslat",
"compose_form.publish_form": "Zveřejnit",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Uložit změny",
- "compose_form.sensitive.hide": "{count, plural, one {Označit média za citlivá} few {Označit média za citlivá} many {Označit média za citlivá} other {Označit média za citlivá}}",
- "compose_form.sensitive.marked": "{count, plural, one {Média jsou označena za citlivá} few {Média jsou označena za citlivá} many {Média jsou označena za citlivá} other {Média jsou označena za citlivá}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Média nejsou označena za citlivá} few {Média nejsou označena za citlivá} many {Média nejsou označena za citlivá} other {Média nejsou označena za citlivá}}",
+ "compose_form.reply": "Odpovědět",
+ "compose_form.save_changes": "Aktualizovat",
"compose_form.spoiler.marked": "Odebrat varování o obsahu",
"compose_form.spoiler.unmarked": "Přidat varování o obsahu",
- "compose_form.spoiler_placeholder": "Sem napište vaše varování",
+ "compose_form.spoiler_placeholder": "Upozornění na obsah (nepovinné)",
"confirmation_modal.cancel": "Zrušit",
- "confirmations.block.block_and_report": "Blokovat a nahlásit",
"confirmations.block.confirm": "Blokovat",
- "confirmations.block.message": "Opravdu chcete blokovat {name}?",
"confirmations.cancel_follow_request.confirm": "Zrušit žádost",
"confirmations.cancel_follow_request.message": "Opravdu chcete zrušit svou žádost o sledování {name}?",
"confirmations.delete.confirm": "Smazat",
@@ -172,15 +177,13 @@
"confirmations.delete_list.message": "Opravdu chcete tento seznam navždy smazat?",
"confirmations.discard_edit_media.confirm": "Zahodit",
"confirmations.discard_edit_media.message": "Máte neuložené změny popisku médií nebo náhledu, chcete je přesto zahodit?",
- "confirmations.domain_block.confirm": "Blokovat celou doménu",
+ "confirmations.domain_block.confirm": "Blokovat server",
"confirmations.domain_block.message": "Opravdu chcete blokovat celou doménu {domain}? Ve většině případů stačí blokovat nebo skrýt pár konkrétních uživatelů, což také doporučujeme. Z této domény neuvidíte obsah v žádné veřejné časové ose ani v oznámeních. Vaši sledující z této domény budou odstraněni.",
"confirmations.edit.confirm": "Upravit",
"confirmations.edit.message": "Editovat teď znamená přepsání zprávy, kterou právě tvoříte. Opravdu chcete pokračovat?",
"confirmations.logout.confirm": "Odhlásit se",
"confirmations.logout.message": "Opravdu se chcete odhlásit?",
"confirmations.mute.confirm": "Skrýt",
- "confirmations.mute.explanation": "Tohle skryje uživatelovy příspěvky a příspěvky, které ho zmiňují, ale uživatel stále uvidí vaše příspěvky a může vás sledovat.",
- "confirmations.mute.message": "Opravdu chcete skrýt uživatele {name}?",
"confirmations.redraft.confirm": "Smazat a přepsat",
"confirmations.redraft.message": "Jste si jistí, že chcete odstranit tento příspěvek a vytvořit z něj koncept? Oblíbené a boosty budou ztraceny a odpovědi na původní příspěvek ztratí kontext.",
"confirmations.reply.confirm": "Odpovědět",
@@ -206,6 +209,27 @@
"dismissable_banner.explore_statuses": "Toto jsou příspěvky ze sociálních sítí, které dnes získávají na popularitě. Novější příspěvky s větším počtem boostů a oblíbení jsou hodnoceny výše.",
"dismissable_banner.explore_tags": "Tyto hashtagy právě teď získávají na popularitě mezi lidmi na tomto a dalších serverech decentralizované sítě.",
"dismissable_banner.public_timeline": "Toto jsou nejnovější veřejné příspěvky od lidí na sociální síti, které sledují lidé na {domain}.",
+ "domain_block_modal.block": "Blokovat server",
+ "domain_block_modal.block_account_instead": "Raději blokovat @{name}",
+ "domain_block_modal.they_can_interact_with_old_posts": "Lidé z tohoto serveru mohou interagovat s vašimi starými příspěvky.",
+ "domain_block_modal.they_cant_follow": "Nikdo z tohoto serveru vás nemůže sledovat.",
+ "domain_block_modal.they_wont_know": "Nebude vědět, že je zablokován.",
+ "domain_block_modal.title": "Blokovat doménu?",
+ "domain_block_modal.you_will_lose_followers": "Všichni vaši sledující z tohoto serveru budou odstraněni.",
+ "domain_block_modal.you_wont_see_posts": "Neuvidíte příspěvky ani upozornění od uživatelů z tohoto serveru.",
+ "domain_pill.activitypub_lets_connect": "Umožňuje vám spojit se a komunikovat s lidmi nejen na Mastodonu, ale i s dalšími sociálními aplikacemi.",
+ "domain_pill.activitypub_like_language": "ActivityPub je jako jazyk, kterým Mastodon mluví s jinými sociálními sítěmi.",
+ "domain_pill.server": "Server",
+ "domain_pill.their_handle": "Handle:",
+ "domain_pill.their_server": "Digitální domov, kde žijí všechny příspěvky.",
+ "domain_pill.their_username": "Jedinečný identikátor na serveru. Je možné najít uživatele se stejným uživatelským jménem na různých serverech.",
+ "domain_pill.username": "Uživatelské jméno",
+ "domain_pill.whats_in_a_handle": "Co obsahuje handle?",
+ "domain_pill.who_they_are": "Protože handle říkají kdo je kdo a také kde, je možné interagovat s lidmi napříč sociálními weby .",
+ "domain_pill.who_you_are": "Protože handle říká kdo jsi a kde jsi, mohou s tebou lidé komunikovat napříč sociálními weby .",
+ "domain_pill.your_handle": "Tvůj handle:",
+ "domain_pill.your_server": "Tvůj digitální domov, kde žijí všechny tvé příspěvky. Nelíbí se ti? Kdykoliv se přesuň na jiný server a vezmi si sebou i své sledující.",
+ "domain_pill.your_username": "Tvůj jedinečný identifikátor na tomto serveru. Je možné najít uživatele se stejným uživatelským jménem na jiných serverech.",
"embed.instructions": "Pro přidání příspěvku na vaši webovou stránku zkopírujte níže uvedený kód.",
"embed.preview": "Takhle to bude vypadat:",
"emoji_button.activity": "Aktivita",
@@ -238,10 +262,11 @@
"empty_column.follow_requests": "Zatím nemáte žádné žádosti o sledování. Až nějakou obdržíte, zobrazí se zde.",
"empty_column.followed_tags": "Zatím jste nesledovali žádné hashtagy. Až to uděláte, objeví se zde.",
"empty_column.hashtag": "Pod tímto hashtagem zde zatím nic není.",
- "empty_column.home": "Vaše domovská časová osa je prázdná! Naplňte ji sledováním dalších lidí. {suggestions}",
+ "empty_column.home": "Vaše domovská časová osa je prázdná! Naplňte ji sledováním dalších lidí.",
"empty_column.list": "V tomto seznamu zatím nic není. Až nějaký člen z tohoto seznamu zveřejní nový příspěvek, objeví se zde.",
"empty_column.lists": "Zatím nemáte žádné seznamy. Až nějaký vytvoříte, zobrazí se zde.",
"empty_column.mutes": "Zatím jste neskryli žádného uživatele.",
+ "empty_column.notification_requests": "Vyčištěno! Nic tu není. Jakmile obdržíš nové notifikace, objeví se zde podle tvého nastavení.",
"empty_column.notifications": "Zatím nemáte žádná oznámení. Až s vámi někdo bude interagovat, uvidíte to zde.",
"empty_column.public": "Tady nic není! Napište něco veřejně, nebo začněte ručně sledovat uživatele z jiných serverů, aby tu něco přibylo",
"error.unexpected_crash.explanation": "Kvůli chybě v našem kódu nebo problému s kompatibilitou prohlížeče nemohla být tato stránka správně zobrazena.",
@@ -272,12 +297,30 @@
"filter_modal.select_filter.subtitle": "Použít existující kategorii nebo vytvořit novou kategorii",
"filter_modal.select_filter.title": "Filtrovat tento příspěvek",
"filter_modal.title.status": "Filtrovat příspěvek",
+ "filtered_notifications_banner.mentions": "{count, plural, one {zmínka} few {zmínky} many {zmínek} other {zmínek}}",
+ "filtered_notifications_banner.pending_requests": "Oznámení od {count, plural, =0 {nikoho} one {jednoho člověka, kterého znáte} few {# lidí, které znáte} many {# lidí, které znáte} other {# lidí, které znáte}}",
+ "filtered_notifications_banner.title": "Filtrovaná oznámení",
"firehose.all": "Vše",
"firehose.local": "Tento server",
"firehose.remote": "Ostatní servery",
"follow_request.authorize": "Autorizovat",
"follow_request.reject": "Zamítnout",
- "follow_requests.unlocked_explanation": "Přestože váš účet není zamčený, administrátor {domain} usoudil, že byste mohli chtít tyto žádosti o sledování zkontrolovat ručně.",
+ "follow_requests.unlocked_explanation": "Přestože váš účet není uzamčen, personál {domain} usoudil, že byste mohli chtít tyto požadavky na sledování zkontrolovat ručně.",
+ "follow_suggestions.curated_suggestion": "Výběr personálů",
+ "follow_suggestions.dismiss": "Znovu nezobrazovat",
+ "follow_suggestions.featured_longer": "Ručně vybráno týmem {domain}",
+ "follow_suggestions.friends_of_friends_longer": "Populární mezi lidmi, které sledujete",
+ "follow_suggestions.hints.featured": "Tento profil byl ručně vybrán týmem {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "Tento profil je populární mezi lidmi, které sledujete.",
+ "follow_suggestions.hints.most_followed": "Tento profil je jedním z nejvíce sledovaných na {domain}.",
+ "follow_suggestions.hints.most_interactions": "Tento profil nedávno dostalo velkou pozornost na {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Tento profil je podobný profilům, které jste nedávno sledovali.",
+ "follow_suggestions.personalized_suggestion": "Přizpůsobený návrh",
+ "follow_suggestions.popular_suggestion": "Populární návrh",
+ "follow_suggestions.popular_suggestion_longer": "Populární na {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Podobné profilům, které jste nedávno sledovali",
+ "follow_suggestions.view_all": "Zobrazit vše",
+ "follow_suggestions.who_to_follow": "Koho sledovat",
"followed_tags": "Sledované hashtagy",
"footer.about": "O aplikaci",
"footer.directory": "Adresář profilů",
@@ -298,15 +341,14 @@
"hashtag.column_settings.tag_mode.any": "Jakýkoliv z těchto",
"hashtag.column_settings.tag_mode.none": "Žádný z těchto",
"hashtag.column_settings.tag_toggle": "Zahrnout v tomto sloupci další štítky",
+ "hashtag.counter_by_accounts": "{count, plural, one {{counter} účastník} few {{counter} účastníci} other {{counter} účastníků}}",
+ "hashtag.counter_by_uses": "{count, plural, one {{counter} příspěvek} few {{counter} příspěvky} other {{counter} příspěvků}}",
+ "hashtag.counter_by_uses_today": "Dnes {count, plural, one {{counter} příspěvek} few {{counter} příspěvky} other {{counter} příspěvků}}",
"hashtag.follow": "Sledovat hashtag",
"hashtag.unfollow": "Přestat sledovat hashtag",
- "home.actions.go_to_explore": "Podívejte se, co frčí",
- "home.actions.go_to_suggestions": "Najít lidi ke sledování",
- "home.column_settings.basic": "Základní",
+ "hashtags.and_other": "…a {count, plural, one {# další} few {# další} other {# dalších}}",
"home.column_settings.show_reblogs": "Zobrazit boosty",
"home.column_settings.show_replies": "Zobrazit odpovědi",
- "home.explore_prompt.body": "Váš domovský kanál bude obsahovat směs příspěvků z hashtagů, které jste se rozhodli sledovat, lidí, které jste se rozhodli sledovat, a příspěvků, které boostují. Pokud vám to připadá příliš klidné, možná budete chtít:",
- "home.explore_prompt.title": "Toto je vaše domovská základna uvnitř Mastodonu.",
"home.hide_announcements": "Skrýt oznámení",
"home.pending_critical_update.body": "Aktualizujte, prosím, svůj Mastodon server co nejdříve!",
"home.pending_critical_update.link": "Zobrazit aktualizace",
@@ -387,11 +429,18 @@
"lists.search": "Hledejte mezi lidmi, které sledujete",
"lists.subheading": "Vaše seznamy",
"load_pending": "{count, plural, one {# nová položka} few {# nové položky} many {# nových položek} other {# nových položek}}",
+ "loading_indicator.label": "Načítání…",
"media_gallery.toggle_visible": "{number, plural, one {Skrýt obrázek} few {Skrýt obrázky} many {Skrýt obrázky} other {Skrýt obrázky}}",
"moved_to_account_banner.text": "Váš účet {disabledAccount} je momentálně deaktivován, protože jste se přesunul/a na {movedToAccount}.",
- "mute_modal.duration": "Trvání",
- "mute_modal.hide_notifications": "Skrýt oznámení od tohoto uživatele?",
- "mute_modal.indefinite": "Neomezeně",
+ "mute_modal.hide_from_notifications": "Skrýt z notifikací",
+ "mute_modal.hide_options": "Skrýt možnosti",
+ "mute_modal.indefinite": "Dokud je neodkryju",
+ "mute_modal.show_options": "Zobrazit možnosti",
+ "mute_modal.they_can_mention_and_follow": "Mohou vás zmínit a sledovat, ale neuvidíte je.",
+ "mute_modal.they_wont_know": "Nebudou vědět, že byli skryti.",
+ "mute_modal.title": "Ztlumit uživatele?",
+ "mute_modal.you_wont_see_mentions": "Neuvidíte příspěvky, které je zmiňují.",
+ "mute_modal.you_wont_see_posts": "Stále budou moci vidět vaše příspěvky, ale vy jejich neuvidíte.",
"navigation_bar.about": "O aplikaci",
"navigation_bar.advanced_interface": "Otevřít pokročilé webové rozhraní",
"navigation_bar.blocks": "Blokovaní uživatelé",
@@ -401,7 +450,6 @@
"navigation_bar.direct": "Soukromé zmínky",
"navigation_bar.discover": "Objevit",
"navigation_bar.domain_blocks": "Blokované domény",
- "navigation_bar.edit_profile": "Upravit profil",
"navigation_bar.explore": "Prozkoumat",
"navigation_bar.favourites": "Oblíbené",
"navigation_bar.filters": "Skrytá slova",
@@ -425,11 +473,29 @@
"notification.follow": "Uživatel {name} vás začal sledovat",
"notification.follow_request": "Uživatel {name} požádal o povolení vás sledovat",
"notification.mention": "Uživatel {name} vás zmínil",
+ "notification.moderation-warning.learn_more": "Zjistit více",
+ "notification.moderation_warning": "Obdrželi jste moderační varování",
+ "notification.moderation_warning.action_delete_statuses": "Některé z vašich příspěvků byly odstraněny.",
+ "notification.moderation_warning.action_disable": "Váš účet je zablokován.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Některé z vašich příspěvků byly označeny jako citlivé.",
+ "notification.moderation_warning.action_none": "Váš účet obdržel moderační varování.",
+ "notification.moderation_warning.action_sensitive": "Vaše příspěvky budou od nynějška označeny jako citlivé.",
+ "notification.moderation_warning.action_silence": "Váš účet byl omezen.",
+ "notification.moderation_warning.action_suspend": "Váš účet byl pozastaven.",
"notification.own_poll": "Vaše anketa skončila",
"notification.poll": "Anketa, ve které jste hlasovali, skončila",
"notification.reblog": "Uživatel {name} boostnul váš příspěvek",
+ "notification.relationships_severance_event": "Kontakt ztracen s {name}",
+ "notification.relationships_severance_event.account_suspension": "Administrátor z {from} pozastavil {target}, což znamená, že již od nich nemůžete přijímat aktualizace nebo s nimi interagovat.",
+ "notification.relationships_severance_event.domain_block": "Administrátor z {from} pozastavil {target}, včetně {followersCount} z vašich sledujících a {followingCount, plural, one {# účet, který sledujete} few {# účty, které sledujete} many {# účtů, které sledujete} other {# účtů, které sledujete}}.",
+ "notification.relationships_severance_event.learn_more": "Zjistit více",
+ "notification.relationships_severance_event.user_domain_block": "Zablokovali jste {target}, čímž jste odebrali {followersCount} z vašich sledujících a {followingCount, plural, one {# účet, který sledujete} few {# účty, které sledujete} many {# účtů, které sledujete} other {# účtů, které sledujete}}.",
"notification.status": "Uživatel {name} právě přidal příspěvek",
"notification.update": "Uživatel {name} upravil příspěvek",
+ "notification_requests.accept": "Přijmout",
+ "notification_requests.dismiss": "Zamítnout",
+ "notification_requests.notifications_from": "Oznámení od {name}",
+ "notification_requests.title": "Vyfiltrovaná oznámení",
"notifications.clear": "Vyčistit oznámení",
"notifications.clear_confirmation": "Opravdu chcete trvale smazat všechna vaše oznámení?",
"notifications.column_settings.admin.report": "Nová hlášení:",
@@ -438,7 +504,6 @@
"notifications.column_settings.favourite": "Oblíbené:",
"notifications.column_settings.filter_bar.advanced": "Zobrazit všechny kategorie",
"notifications.column_settings.filter_bar.category": "Panel rychlého filtrování",
- "notifications.column_settings.filter_bar.show_bar": "Zobrazit panel filtrů",
"notifications.column_settings.follow": "Noví sledující:",
"notifications.column_settings.follow_request": "Nové žádosti o sledování:",
"notifications.column_settings.mention": "Zmínky:",
@@ -464,6 +529,15 @@
"notifications.permission_denied": "Oznámení na ploše nejsou k dispozici, protože byla zamítnuta žádost o oprávnění je zobrazovat",
"notifications.permission_denied_alert": "Oznámení na ploše není možné zapnout, protože oprávnění bylo v minulosti zamítnuto",
"notifications.permission_required": "Oznámení na ploše nejsou k dispozici, protože nebylo uděleno potřebné oprávnění.",
+ "notifications.policy.filter_new_accounts.hint": "Vytvořeno během {days, plural, one {včerejška} few {posledních # dnů} many {posledních # dní} other {posledních # dní}}",
+ "notifications.policy.filter_new_accounts_title": "Nové účty",
+ "notifications.policy.filter_not_followers_hint": "Včetně lidí, kteří vás sledovali méně než {days, plural, one {jeden den} few {# dny} many {# dní} other {# dní}}",
+ "notifications.policy.filter_not_followers_title": "Lidé, kteří vás nesledují",
+ "notifications.policy.filter_not_following_hint": "Dokud je ručně neschválíte",
+ "notifications.policy.filter_not_following_title": "Lidé, které nesledujete",
+ "notifications.policy.filter_private_mentions_hint": "Vyfiltrováno, pokud to není odpověď na vaši zmínku nebo pokud sledujete odesílatele",
+ "notifications.policy.filter_private_mentions_title": "Nevyžádané soukromé zmínky",
+ "notifications.policy.title": "Vyfiltrovat oznámení od…",
"notifications_permission_banner.enable": "Povolit oznámení na ploše",
"notifications_permission_banner.how_to_control": "Chcete-li dostávat oznámení, i když nemáte Mastodon otevřený, povolte oznámení na ploše. Můžete si zvolit, o kterých druzích interakcí chcete být oznámením na ploše informování pod tlačítkem {icon} výše.",
"notifications_permission_banner.title": "Nenechte si nic uniknout",
@@ -473,8 +547,19 @@
"onboarding.actions.go_to_home": "Přejít na svůj domovský feed",
"onboarding.compose.template": "Ahoj #Mastodon!",
"onboarding.follows.empty": "Bohužel, žádné výsledky nelze momentálně zobrazit. Můžete zkusit vyhledat nebo procházet stránku s průzkumem a najít lidi, kteří budou sledovat, nebo to zkuste znovu později.",
- "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
- "onboarding.follows.title": "Populární na Mastodonu",
+ "onboarding.follows.lead": "Domovský kanál je hlavní metodou zažívání Mastodonu. Čím více lidí sledujete, tím aktivnější a zajímavější bude. Pro začnutí, zde máte několik návrhů:",
+ "onboarding.follows.title": "Přispůsobit vlastní domovský kanál",
+ "onboarding.profile.discoverable": "Udělat svůj profil vyhledatelným",
+ "onboarding.profile.discoverable_hint": "Když se rozhodnete být vyhledatelný na Mastodonu, vaše příspěvky se mohou objevit ve výsledcích vyhledávání a v populárních, a váš profil může být navrhován lidem s podobnými zájmy.",
+ "onboarding.profile.display_name": "Zobrazované jméno",
+ "onboarding.profile.display_name_hint": "Vaše celé jméno nebo přezdívka…",
+ "onboarding.profile.lead": "Toto můžete vždy dokončit později v nastavení, kde je k dispozici ještě více možností přizpůsobení.",
+ "onboarding.profile.note": "O vás",
+ "onboarding.profile.note_hint": "Můžete @zmínit jiné osoby nebo #hashtagy…",
+ "onboarding.profile.save_and_continue": "Uložit a pokračovat",
+ "onboarding.profile.title": "Nastavení profilu",
+ "onboarding.profile.upload_avatar": "Nahrát profilový obrázek",
+ "onboarding.profile.upload_header": "Nahrát hlavičku profilu",
"onboarding.share.lead": "Dejte lidem vědět, jak vás mohou najít na Mastodonu!",
"onboarding.share.message": "Jsem {username} na #Mastodonu! Pojď mě sledovat na {url}",
"onboarding.share.next_steps": "Možné další kroky:",
@@ -482,13 +567,13 @@
"onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
"onboarding.start.skip": "Want to skip right ahead?",
"onboarding.start.title": "Dokázali jste to!",
- "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
- "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
- "onboarding.steps.publish_status.body": "Řekněte světu Ahoj.",
+ "onboarding.steps.follow_people.body": "Mastodon je o sledování zajimavých lidí.",
+ "onboarding.steps.follow_people.title": "Přispůsobit vlastní domovský kanál",
+ "onboarding.steps.publish_status.body": "Řekněte světu ahoj s pomocí textem, fotografiemi, videami nebo anketami {emoji}",
"onboarding.steps.publish_status.title": "Vytvořte svůj první příspěvek",
"onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
"onboarding.steps.setup_profile.title": "Přizpůsobit svůj profil",
- "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
+ "onboarding.steps.share_profile.body": "Dejte blízkým lidem vědět, jak vás mohou najít na Mastodonu",
"onboarding.steps.share_profile.title": "Sdílejte svůj profil",
"onboarding.tips.2fa": "Víte, že? Svůj účet můžete zabezpečit nastavením dvoufaktorového ověřování v nastavení účtu. Funguje s jakoukoli TOTP aplikací podle vašeho výběru, telefonní číslo není nutné!",
"onboarding.tips.accounts_from_other_servers": "Víte, že? Protože je Mastodon decentralizovaný, některé profily, na které narazíte, budou hostovány na jiných serverech, než je ten váš. A přesto s nimi můžete bezproblémově komunikovat! Jejich server se nachází v druhé polovině uživatelského jména!",
@@ -508,16 +593,18 @@
"poll_button.add_poll": "Přidat anketu",
"poll_button.remove_poll": "Odebrat anketu",
"privacy.change": "Změnit soukromí příspěvku",
- "privacy.direct.long": "Viditelný pouze pro zmíněné uživatele",
- "privacy.direct.short": "Pouze zmínění lidé",
- "privacy.private.long": "Viditelný pouze pro sledující",
- "privacy.private.short": "Pouze sledující",
- "privacy.public.long": "Viditelný pro všechny",
+ "privacy.direct.long": "Všichni zmínění v příspěvku",
+ "privacy.direct.short": "Vybraní lidé",
+ "privacy.private.long": "Jen vaši sledující",
+ "privacy.private.short": "Sledující",
+ "privacy.public.long": "Kdokoliv na Mastodonu i mimo něj",
"privacy.public.short": "Veřejné",
- "privacy.unlisted.long": "Viditelný pro všechny, ale vyňat z funkcí objevování",
- "privacy.unlisted.short": "Neveřejný",
+ "privacy.unlisted.additional": "Chová se stejně jako veřejný, až na to, že se příspěvek neobjeví v živých kanálech nebo hashtazích, v objevování nebo vyhledávání na Mastodonu, a to i když je účet nastaven tak, aby se zde všude tyto příspěvky zobrazovaly.",
+ "privacy.unlisted.long": "Méně algoritmických fanfár",
+ "privacy.unlisted.short": "Ztišené veřejné",
"privacy_policy.last_updated": "Naposledy aktualizováno {date}",
"privacy_policy.title": "Zásady ochrany osobních údajů",
+ "recommended": "Doporučeno",
"refresh": "Obnovit",
"regeneration_indicator.label": "Načítání…",
"regeneration_indicator.sublabel": "Váš domovský kanál se připravuje!",
@@ -532,7 +619,9 @@
"relative_time.minutes": "{number} m",
"relative_time.seconds": "{number} s",
"relative_time.today": "dnes",
+ "reply_indicator.attachments": "{count, plural, one {{counter} příloha} few {{counter} přílohy} other {{counter} přilohů}}",
"reply_indicator.cancel": "Zrušit",
+ "reply_indicator.poll": "Anketa",
"report.block": "Blokovat",
"report.block_explanation": "Neuvidíte příspěvky tohoto uživatele. On neuvidí vaše příspěvky, ani vás nebude moci sledovat. Pozná, že je blokován.",
"report.categories.legal": "Právní ustanovení",
@@ -588,6 +677,7 @@
"search.quick_action.status_search": "Příspěvky odpovídající {x}",
"search.search_or_paste": "Hledat nebo vložit URL",
"search_popout.full_text_search_disabled_message": "Nedostupné na {domain}.",
+ "search_popout.full_text_search_logged_out_message": "Dostupné pouze po přihlášení.",
"search_popout.language_code": "Kód jazyka podle ISO",
"search_popout.options": "Možnosti hledání",
"search_popout.quick_actions": "Rychlé akce",
@@ -624,10 +714,11 @@
"status.direct": "Soukromě zmínit @{name}",
"status.direct_indicator": "Soukromá zmínka",
"status.edit": "Upravit",
- "status.edited": "Upraveno {date}",
+ "status.edited": "Naposledy upraveno {date}",
"status.edited_x_times": "Upraveno {count, plural, one {{count}krát} few {{count}krát} many {{count}krát} other {{count}krát}}",
"status.embed": "Vložit na web",
"status.favourite": "Oblíbit",
+ "status.favourites": "{count, plural, one {oblíbený} few {oblíbené} many {oblíbených} other {oblíbených}}",
"status.filter": "Filtrovat tento příspěvek",
"status.filtered": "Filtrováno",
"status.hide": "Skrýt příspěvek",
@@ -648,6 +739,7 @@
"status.reblog": "Boostnout",
"status.reblog_private": "Boostnout s původní viditelností",
"status.reblogged_by": "Uživatel {name} boostnul",
+ "status.reblogs": "{count, plural, one {boost} few {boosty} many {boostů} other {boostů}}",
"status.reblogs.empty": "Tento příspěvek ještě nikdo neboostnul. Pokud to někdo udělá, zobrazí se zde.",
"status.redraft": "Smazat a přepsat",
"status.remove_bookmark": "Odstranit ze záložek",
@@ -695,10 +787,8 @@
"upload_error.poll": "Nahrávání souborů není povoleno s anketami.",
"upload_form.audio_description": "Popis pro sluchově postižené",
"upload_form.description": "Popis pro zrakově postižené",
- "upload_form.description_missing": "Nebyl přidán popis",
"upload_form.edit": "Upravit",
"upload_form.thumbnail": "Změnit miniaturu",
- "upload_form.undo": "Smazat",
"upload_form.video_description": "Popis pro sluchově či zrakově postižené",
"upload_modal.analyzing_picture": "Analyzuji obrázek…",
"upload_modal.apply": "Použít",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 04b39904e48136..2c597699591674 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -89,7 +89,14 @@
"announcement.announcement": "Cyhoeddiad",
"attachments_list.unprocessed": "(heb eu prosesu)",
"audio.hide": "Cuddio sain",
- "autosuggest_hashtag.per_week": "{count} yr wythnos",
+ "block_modal.remote_users_caveat": "Byddwn yn gofyn i'r gweinydd {domain} barchu eich penderfyniad. Fodd bynnag, nid yw cydymffurfiad wedi'i warantu gan y gall rhai gweinyddwyr drin rhwystro mewn ffyrdd gwahanol. Mae'n bosibl y bydd postiadau cyhoeddus yn dal i fod yn weladwy i ddefnyddwyr nad ydynt wedi mewngofnodi.",
+ "block_modal.show_less": "Dangos llai",
+ "block_modal.show_more": "Dangos mwy",
+ "block_modal.they_cant_mention": "Nid ydynt yn gallu eich crybwyll na'ch dilyn.",
+ "block_modal.they_cant_see_posts": "Nid ydynt yn gallu gweld eich postiadau ac ni fyddwch yn gweld eu rhai hwy.",
+ "block_modal.they_will_know": "Gallant weld eu bod wedi'u rhwystro.",
+ "block_modal.title": "Rhwystro defnyddiwr?",
+ "block_modal.you_wont_see_mentions": "Ni welwch bostiadau sy'n sôn amdanynt.",
"boost_modal.combo": "Mae modd pwyso {combo} er mwyn hepgor hyn tro nesa",
"bundle_column_error.copy_stacktrace": "Copïo'r adroddiad gwall",
"bundle_column_error.error.body": "Nid oedd modd cynhyrchu'r dudalen honno. Gall fod oherwydd gwall yn ein cod neu fater cydnawsedd porwr.",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "Nid yw eich cyfri wedi'i {locked}. Gall unrhyw un eich dilyn i weld eich postiadau dilynwyr-yn-unig.",
"compose_form.lock_disclaimer.lock": "wedi ei gloi",
"compose_form.placeholder": "Beth sydd ar eich meddwl?",
- "compose_form.poll.add_option": "Ychwanegu dewis",
"compose_form.poll.duration": "Cyfnod pleidlais",
+ "compose_form.poll.multiple": "Dewis lluosog",
"compose_form.poll.option_placeholder": "Dewis {number}",
- "compose_form.poll.remove_option": "Tynnu'r dewis",
+ "compose_form.poll.single": "Ddewis un",
"compose_form.poll.switch_to_multiple": "Newid pleidlais i adael mwy nag un dewis",
"compose_form.poll.switch_to_single": "Newid pleidlais i gyfyngu i un dewis",
- "compose_form.publish": "Cyhoeddi",
+ "compose_form.poll.type": "Arddull",
+ "compose_form.publish": "Postiad",
"compose_form.publish_form": "Cyhoeddi",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Cadw newidiadau",
- "compose_form.sensitive.hide": "Marcio cyfryngau fel eu bod yn sensitif",
- "compose_form.sensitive.marked": "Cyfryngau wedi'u marcio'n sensitif",
- "compose_form.sensitive.unmarked": "Nid yw'r cyfryngau wedi'u marcio'n sensitif",
+ "compose_form.reply": "Ateb",
+ "compose_form.save_changes": "Diweddariad",
"compose_form.spoiler.marked": "Dileu rhybudd cynnwys",
"compose_form.spoiler.unmarked": "Ychwanegu rhybudd cynnwys",
- "compose_form.spoiler_placeholder": "Ysgrifenwch eich rhybudd yma",
+ "compose_form.spoiler_placeholder": "Rhybudd cynnwys (dewisol)",
"confirmation_modal.cancel": "Diddymu",
- "confirmations.block.block_and_report": "Rhwystro ac Adrodd",
"confirmations.block.confirm": "Blocio",
- "confirmations.block.message": "Ydych chi'n siŵr eich bod eisiau blocio {name}?",
"confirmations.cancel_follow_request.confirm": "Tynnu'r cais yn ôl",
"confirmations.cancel_follow_request.message": "Ydych chi'n siŵr eich bod am dynnu'ch cais i ddilyn {name} yn ôl?",
"confirmations.delete.confirm": "Dileu",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "Ydych chi'n siŵr eich bod eisiau dileu'r rhestr hwn am byth?",
"confirmations.discard_edit_media.confirm": "Dileu",
"confirmations.discard_edit_media.message": "Mae gennych newidiadau heb eu cadw i'r disgrifiad cyfryngau neu'r rhagolwg - eu dileu beth bynnag?",
- "confirmations.domain_block.confirm": "Blocio parth cyfan",
+ "confirmations.domain_block.confirm": "Rhwystro gweinydd",
"confirmations.domain_block.message": "Ydych chi wir, wir eisiau blocio'r holl {domain}? Fel arfer, mae blocio neu dewi pobl penodol yn broses mwy effeithiol. Fyddwch chi ddim yn gweld cynnwys o'r parth hwnnw mewn ffrydiau cyhoeddus neu yn eich hysbysiadau. Bydd eich dilynwyr o'r parth hwnnw yn cael eu ddileu.",
"confirmations.edit.confirm": "Golygu",
"confirmations.edit.message": "Bydd golygu nawr yn trosysgrifennu'r neges rydych yn ei ysgrifennu ar hyn o bryd. Ydych chi'n siŵr eich bod eisiau gwneud hyn?",
"confirmations.logout.confirm": "Allgofnodi",
"confirmations.logout.message": "Ydych chi'n siŵr eich bod am allgofnodi?",
"confirmations.mute.confirm": "Tewi",
- "confirmations.mute.explanation": "Bydd hyn yn cuddio postiadau oddi wrthyn nhw a phostiadau sydd yn sôn amdanyn nhw, ond bydd hyn dal yn gadael iddyn nhw gweld eich postiadau a'ch dilyn.",
- "confirmations.mute.message": "Ydych chi wir eisiau tewi {name}?",
"confirmations.redraft.confirm": "Dileu ac ailddrafftio",
"confirmations.redraft.message": "Ydych chi'n siŵr eich bod am ddileu'r postiad hwn a'i ailddrafftio? Bydd ffefrynnau a hybiau'n cael eu colli, a bydd atebion i'r post gwreiddiol yn mynd yn amddifad.",
"confirmations.reply.confirm": "Ateb",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "Mae'r rhain yn bostiadau o bob rhan o'r we gymdeithasol sydd ar gynnydd heddiw. Mae postiadau mwy diweddar sydd â mwy o hybiau a ffefrynu'n cael eu graddio'n uwch.",
"dismissable_banner.explore_tags": "Mae'r rhain yn hashnodau sydd ar gynnydd ar y we gymdeithasol heddiw. Mae hashnodau sy'n cael eu defnyddio gan fwy o unigolion gwahanol yn cael eu graddio'n uwch.",
"dismissable_banner.public_timeline": "Dyma'r postiadau cyhoeddus diweddaraf gan bobl ar y we gymdeithasol y mae pobl ar {domain} yn eu dilyn.",
+ "domain_block_modal.block": "Rhwystro gweinydd",
+ "domain_block_modal.block_account_instead": "Rhwystro @{name} yn lle hynny",
+ "domain_block_modal.they_can_interact_with_old_posts": "Gall pobl o'r gweinydd hwn ryngweithio â'ch hen bostiadau.",
+ "domain_block_modal.they_cant_follow": "Ni all neb o'r gweinydd hwn eich dilyn.",
+ "domain_block_modal.they_wont_know": "Fyddan nhw ddim yn gwybod eu bod wedi cael eu rhwystro.",
+ "domain_block_modal.title": "Rhwystro parth?",
+ "domain_block_modal.you_will_lose_followers": "Bydd eich holl ddilynwyr o'r gweinydd hwn yn cael eu tynnu.",
+ "domain_block_modal.you_wont_see_posts": "Fyddwch chi ddim yn gweld postiadau na hysbysiadau gan ddefnyddwyr ar y gweinydd hwn.",
+ "domain_pill.activitypub_lets_connect": "Mae'n caniatáu ichi gysylltu a rhyngweithio â phobl nid yn unig ar Mastodon, ond ar draws gwahanol apiau cymdeithasol hefyd.",
+ "domain_pill.activitypub_like_language": "Mae ActivityPub fel yr iaith y mae Mastodon yn ei siarad â rhwydweithiau cymdeithasol eraill.",
+ "domain_pill.server": "Gweinydd",
+ "domain_pill.their_handle": "Eu handlen:",
+ "domain_pill.their_server": "Eu cartref digidol, lle mae eu holl negeseuon yn byw.",
+ "domain_pill.their_username": "Eu dynodwr unigryw ar eu gweinydd. Mae'n bosibl dod o hyd i ddefnyddwyr gyda'r un enw defnyddiwr ar wahanol weinyddion.",
+ "domain_pill.username": "Enw Defnyddiwr",
+ "domain_pill.whats_in_a_handle": "Beth sydd mewn handlen?",
+ "domain_pill.who_they_are": "Gan fod handlen yn dweud pwy yw rhywun a ble maen nhw, gallwch chi ryngweithio â phobl ar draws gwe gymdeithasol .",
+ "domain_pill.who_you_are": "Oherwydd bod eich handlen yn dweud pwy ydych chi a ble rydych chi, gall pobl ryngweithio â chi ar draws gwe gymdeithasol .",
+ "domain_pill.your_handle": "Eich handlen:",
+ "domain_pill.your_server": "Eich cartref digidol, lle mae'ch holl bostiadau'n byw. Ddim yn hoffi'r un hon? Trosglwyddwch weinyddion ar unrhyw adeg a dewch â'ch dilynwyr hefyd.",
+ "domain_pill.your_username": "Eich dynodwr unigryw ar y gweinydd hwn. Mae'n bosibl dod o hyd i ddefnyddwyr gyda'r un enw defnyddiwr ar wahanol weinyddion.",
"embed.instructions": "Gosodwch y post hwn ar eich gwefan drwy gopïo'r côd isod.",
"embed.preview": "Dyma sut olwg fydd arno:",
"emoji_button.activity": "Gweithgarwch",
@@ -244,6 +266,7 @@
"empty_column.list": "Does dim yn y rhestr yma eto. Pan fydd aelodau'r rhestr yn cyhoeddi postiad newydd, mi fydd yn ymddangos yma.",
"empty_column.lists": "Nid oes gennych unrhyw restrau eto. Pan fyddwch yn creu un, mi fydd yn ymddangos yma.",
"empty_column.mutes": "Nid ydych wedi tewi unrhyw ddefnyddwyr eto.",
+ "empty_column.notification_requests": "Dim i boeni amdano! Does dim byd yma. Pan fyddwch yn derbyn hysbysiadau newydd, byddan nhw'n ymddangos yma yn ôl eich gosodiadau.",
"empty_column.notifications": "Nid oes gennych unrhyw hysbysiadau eto. Rhyngweithiwch ag eraill i ddechrau'r sgwrs.",
"empty_column.public": "Does dim byd yma! Ysgrifennwch rywbeth cyhoeddus, neu dilynwch ddefnyddwyr o weinyddion eraill i'w lanw",
"error.unexpected_crash.explanation": "Oherwydd gwall yn ein cod neu oherwydd problem cysondeb porwr, nid oedd y dudalen hon gallu cael ei dangos yn gywir.",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "Defnyddiwch gategori sy'n bodoli eisoes neu crëu un newydd",
"filter_modal.select_filter.title": "Hidlo'r postiad hwn",
"filter_modal.title.status": "Hidlo postiad",
+ "filtered_notifications_banner.mentions": "{count, plural, one {crybwylliad} other {crybwylliad}}",
+ "filtered_notifications_banner.pending_requests": "Hysbysiadau gan {count, plural, =0 {neb} one {un person} other {# person}} efallai y gwyddoch amdanyn nhw",
+ "filtered_notifications_banner.title": "Hysbysiadau wedi'u hidlo",
"firehose.all": "Popeth",
"firehose.local": "Gweinydd hwn",
"firehose.remote": "Gweinyddion eraill",
"follow_request.authorize": "Awdurdodi",
"follow_request.reject": "Gwrthod",
"follow_requests.unlocked_explanation": "Er nid yw eich cyfrif wedi'i gloi, roedd y staff {domain} yn meddwl efallai hoffech adolygu ceisiadau dilyn o'r cyfrifau rhain wrth law.",
+ "follow_suggestions.curated_suggestion": "Dewis staff",
+ "follow_suggestions.dismiss": "Peidio â dangos hwn eto",
+ "follow_suggestions.featured_longer": "Wedi'i ddewis â llaw gan dîm {domain}",
+ "follow_suggestions.friends_of_friends_longer": "Yn boblogaidd ymhlith y bobl rydych chi'n eu dilyn",
+ "follow_suggestions.hints.featured": "Mae'r proffil hwn wedi'i ddewis yn arbennig gan dîm {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "Mae'r proffil hwn yn boblogaidd ymhlith y bobl rydych chi'n eu dilyn.",
+ "follow_suggestions.hints.most_followed": "Mae'r proffil hwn yn un o'r rhai sy'n cael ei ddilyn fwyaf ar {domain}.",
+ "follow_suggestions.hints.most_interactions": "Mae'r proffil hwn wedi bod yn cael llawer o sylw yn ddiweddar ar {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Mae'r proffil hwn yn debyg i'r proffiliau rydych chi wedi'u dilyn yn fwyaf diweddar.",
+ "follow_suggestions.personalized_suggestion": "Awgrym personol",
+ "follow_suggestions.popular_suggestion": "Awgrym poblogaidd",
+ "follow_suggestions.popular_suggestion_longer": "Yn boblogaidd ar {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Yn debyg i broffiliau y gwnaethoch chi eu dilyn yn ddiweddar",
+ "follow_suggestions.view_all": "Gweld y cyfan",
+ "follow_suggestions.who_to_follow": "Pwy i ddilyn",
"followed_tags": "Hashnodau rydych yn eu dilyn",
"footer.about": "Ynghylch",
"footer.directory": "Cyfeiriadur proffiliau",
@@ -306,13 +347,8 @@
"hashtag.follow": "Dilyn hashnod",
"hashtag.unfollow": "Dad-ddilyn hashnod",
"hashtags.and_other": "…a {count, plural, other {# more}}",
- "home.actions.go_to_explore": "Gweld beth yw'r tuedd",
- "home.actions.go_to_suggestions": "Ffeindio pobl i'w dilyn",
- "home.column_settings.basic": "Syml",
"home.column_settings.show_reblogs": "Dangos hybiau",
"home.column_settings.show_replies": "Dangos atebion",
- "home.explore_prompt.body": "Bydd eich llif cartref yn cynnwys cymysgedd o bostiadau o'r hashnodau rydych chi wedi dewis eu dilyn, y bobl rydych chi wedi dewis eu dilyn, a'r postiadau maen nhw'n rhoi hwb iddyn nhw. Os yw hynny'n teimlo'n rhy dawel, efallai y byddwch eisiau:",
- "home.explore_prompt.title": "Dyma'ch cartref o fewn Mastodon.",
"home.hide_announcements": "Cuddio cyhoeddiadau",
"home.pending_critical_update.body": "Diweddarwch eich gweinydd Mastodon cyn gynted â phosibl!",
"home.pending_critical_update.link": "Gweld y diweddariadau",
@@ -396,9 +432,15 @@
"loading_indicator.label": "Yn llwytho…",
"media_gallery.toggle_visible": "{number, plural, one {Cuddio delwedd} other {Cuddio delwedd}}",
"moved_to_account_banner.text": "Ar hyn y bryd, mae eich cyfrif {disabledAccount} wedi ei analluogi am i chi symud i {movedToAccount}.",
- "mute_modal.duration": "Hyd",
- "mute_modal.hide_notifications": "Cuddio hysbysiadau gan y defnyddiwr hwn?",
- "mute_modal.indefinite": "Parhaus",
+ "mute_modal.hide_from_notifications": "Cuddio rhag hysbysiadau",
+ "mute_modal.hide_options": "Cuddio'r dewis",
+ "mute_modal.indefinite": "Nes i mi eu dad-dewi",
+ "mute_modal.show_options": "Dangos y dewis",
+ "mute_modal.they_can_mention_and_follow": "Gallan nhw eich crybwyll a'ch dilyn, ond fyddwch chi ddim yn eu gweld.",
+ "mute_modal.they_wont_know": "Fyddan nhw ddim yn gwybod eu bod wedi cael eu tawelu.",
+ "mute_modal.title": "Tewi defnyddiwr?",
+ "mute_modal.you_wont_see_mentions": "Welwch chi ddim postiadau sy'n sôn amdanyn nhw.",
+ "mute_modal.you_wont_see_posts": "Gallan nhw weld eich postiadau o hyd, ond fyddwch chi ddim yn gweld eu rhai hwy.",
"navigation_bar.about": "Ynghylch",
"navigation_bar.advanced_interface": "Agor mewn rhyngwyneb gwe uwch",
"navigation_bar.blocks": "Defnyddwyr wedi eu blocio",
@@ -408,7 +450,6 @@
"navigation_bar.direct": "Crybwylliadau preifat",
"navigation_bar.discover": "Darganfod",
"navigation_bar.domain_blocks": "Parthau wedi'u blocio",
- "navigation_bar.edit_profile": "Golygu proffil",
"navigation_bar.explore": "Darganfod",
"navigation_bar.favourites": "Ffefrynnau",
"navigation_bar.filters": "Geiriau wedi'u tewi",
@@ -432,11 +473,29 @@
"notification.follow": "Dilynodd {name} chi",
"notification.follow_request": "Mae {name} wedi gwneud cais i'ch dilyn",
"notification.mention": "Crybwyllodd {name} amdanoch chi",
+ "notification.moderation-warning.learn_more": "Dysgu mwy",
+ "notification.moderation_warning": "Rydych wedi derbyn rhybudd gan gymedrolwr",
+ "notification.moderation_warning.action_delete_statuses": "Mae rhai o'ch postiadau wedi'u dileu.",
+ "notification.moderation_warning.action_disable": "Mae eich cyfrif wedi'i analluogi.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Mae rhai o'ch postiadau wedi'u marcio'n sensitif.",
+ "notification.moderation_warning.action_none": "Mae eich cyfrif wedi derbyn rhybudd cymedroli.",
+ "notification.moderation_warning.action_sensitive": "Bydd eich postiadau'n cael eu marcio'n sensitif o hyn ymlaen.",
+ "notification.moderation_warning.action_silence": "Mae eich cyfrif wedi'i gyfyngu.",
+ "notification.moderation_warning.action_suspend": "Mae eich cyfrif wedi'i hatal.",
"notification.own_poll": "Mae eich pleidlais wedi dod i ben",
"notification.poll": "Mae pleidlais rydych wedi pleidleisio ynddi wedi dod i ben",
"notification.reblog": "Hybodd {name} eich post",
+ "notification.relationships_severance_event": "Wedi colli cysylltiad â {name}",
+ "notification.relationships_severance_event.account_suspension": "Mae gweinyddwr o {from} wedi atal {target}, sy'n golygu na allwch dderbyn diweddariadau ganddynt mwyach na rhyngweithio â nhw.",
+ "notification.relationships_severance_event.domain_block": "Mae gweinyddwr o {from} wedi rhwystro {target}, gan gynnwys {followersCount} o'ch dilynwyr a {followingCount, plural, one {# cyfrif} other {# cyfrif}} arall rydych chi'n ei ddilyn.",
+ "notification.relationships_severance_event.learn_more": "Dysgu mwy",
+ "notification.relationships_severance_event.user_domain_block": "Rydych wedi rhwystro {target}, gan ddileu {followersCount} o'ch dilynwyr a {followingCount, plural, one {# cyfrif} other {#cyfrifon}} arall rydych yn ei ddilyn.",
"notification.status": "{name} newydd ei bostio",
"notification.update": "Golygodd {name} bostiad",
+ "notification_requests.accept": "Derbyn",
+ "notification_requests.dismiss": "Cau",
+ "notification_requests.notifications_from": "Hysbysiadau gan {name}",
+ "notification_requests.title": "Hysbysiadau wedi'u hidlo",
"notifications.clear": "Clirio hysbysiadau",
"notifications.clear_confirmation": "Ydych chi'n siŵr eich bod am glirio'ch holl hysbysiadau am byth?",
"notifications.column_settings.admin.report": "Adroddiadau newydd:",
@@ -445,7 +504,6 @@
"notifications.column_settings.favourite": "Ffefrynnau:",
"notifications.column_settings.filter_bar.advanced": "Dangos pob categori",
"notifications.column_settings.filter_bar.category": "Bar hidlo cyflym",
- "notifications.column_settings.filter_bar.show_bar": "Dangos y bar hidlo",
"notifications.column_settings.follow": "Dilynwyr newydd:",
"notifications.column_settings.follow_request": "Ceisiadau dilyn newydd:",
"notifications.column_settings.mention": "Crybwylliadau:",
@@ -471,6 +529,15 @@
"notifications.permission_denied": "Nid oes hysbysiadau bwrdd gwaith ar gael oherwydd cais am ganiatâd porwr a wrthodwyd yn flaenorol",
"notifications.permission_denied_alert": "Nid oes modd galluogi hysbysiadau bwrdd gwaith, gan fod caniatâd porwr wedi'i wrthod o'r blaen",
"notifications.permission_required": "Nid oes hysbysiadau bwrdd gwaith ar gael oherwydd na roddwyd y caniatâd gofynnol.",
+ "notifications.policy.filter_new_accounts.hint": "Crëwyd o fewn {days, lluosog, un {yr un diwrnod} arall {y # diwrnod}} diwethaf",
+ "notifications.policy.filter_new_accounts_title": "Cyfrifon newydd",
+ "notifications.policy.filter_not_followers_hint": "Gan gynnwys pobl sydd wedi bod yn eich dilyn am llai {days, plural, un {nag un diwrnod} arall {na # diwrnod}}",
+ "notifications.policy.filter_not_followers_title": "Pobl sydd ddim yn eich dilyn",
+ "notifications.policy.filter_not_following_hint": "Hyd nes i chi eu cymeradwyo â llaw",
+ "notifications.policy.filter_not_following_title": "Pobl nad ydych yn eu dilyn",
+ "notifications.policy.filter_private_mentions_hint": "Wedi'i hidlo oni bai ei fod mewn ymateb i'ch crybwylliad eich hun neu os ydych yn dilyn yr anfonwr",
+ "notifications.policy.filter_private_mentions_title": "Crybwylliadau preifat digymell",
+ "notifications.policy.title": "Hidlo hysbysiadau gan…",
"notifications_permission_banner.enable": "Galluogi hysbysiadau bwrdd gwaith",
"notifications_permission_banner.how_to_control": "I dderbyn hysbysiadau pan nad yw Mastodon ar agor, galluogwch hysbysiadau bwrdd gwaith. Gallwch reoli'n union pa fathau o ryngweithiadau sy'n cynhyrchu hysbysiadau bwrdd gwaith trwy'r botwm {icon} uchod unwaith y byddan nhw wedi'u galluogi.",
"notifications_permission_banner.title": "Peidiwch â cholli dim",
@@ -526,14 +593,15 @@
"poll_button.add_poll": "Ychwanegu pleidlais",
"poll_button.remove_poll": "Tynnu pleidlais",
"privacy.change": "Addasu preifatrwdd y post",
- "privacy.direct.long": "Dim ond yn weladwy i ddefnyddwyr a grybwyllwyd",
- "privacy.direct.short": "Dim ond pobl sy wedi'u crybwyll",
- "privacy.private.long": "Dim ond pobl sy'n ddilynwyr",
- "privacy.private.short": "Dilynwyr yn unig",
- "privacy.public.long": "Gweladwy i bawb",
+ "privacy.direct.long": "Pawb sydd â son amdanyn nhw yn y postiad",
+ "privacy.direct.short": "Pobl benodol",
+ "privacy.private.long": "Eich dilynwyr yn unig",
+ "privacy.private.short": "Dilynwyr",
+ "privacy.public.long": "Unrhyw ar ac oddi ar Mastodon",
"privacy.public.short": "Cyhoeddus",
- "privacy.unlisted.long": "Gweladwy i bawb, ond wedi optio allan o nodweddion darganfod",
- "privacy.unlisted.short": "Heb ei restru",
+ "privacy.unlisted.additional": "Mae hwn yn ymddwyn yn union fel y cyhoeddus, ac eithrio na fydd y postiad yn ymddangos mewn ffrydiau byw neu hashnodau, archwilio, neu chwiliad Mastodon, hyd yn oed os ydych wedi eich cynnwys ar draws y cyfrif.",
+ "privacy.unlisted.long": "Llai o ddathliadau algorithmig",
+ "privacy.unlisted.short": "Tewi'r cyhoeddus",
"privacy_policy.last_updated": "Diweddarwyd ddiwethaf ar {date}",
"privacy_policy.title": "Polisi Preifatrwydd",
"recommended": "Argymhellwyd",
@@ -551,7 +619,9 @@
"relative_time.minutes": "{number} munud",
"relative_time.seconds": "{number} eiliad",
"relative_time.today": "heddiw",
+ "reply_indicator.attachments": "{count, plural, one {# attachment} arall {# attachments}}",
"reply_indicator.cancel": "Canslo",
+ "reply_indicator.poll": "Arolwg",
"report.block": "Blocio",
"report.block_explanation": "Ni welwch chi eu postiadau. Ni allan nhw weld eich postiadau na'ch dilyn. Byddan nhw'n gallu gweld eu bod nhw wedi'u rhwystro.",
"report.categories.legal": "Cyfreithiol",
@@ -644,10 +714,11 @@
"status.direct": "Crybwyll yn breifat @{name}",
"status.direct_indicator": "Crybwyll preifat",
"status.edit": "Golygu",
- "status.edited": "Golygwyd {date}",
+ "status.edited": "Golygwyd ddiwethaf {date}",
"status.edited_x_times": "Golygwyd {count, plural, one {count} two {count} other {{count} gwaith}}",
"status.embed": "Mewnblannu",
"status.favourite": "Hoffi",
+ "status.favourites": "{count, plural, one {ffefryn} other {ffefryn}}",
"status.filter": "Hidlo'r postiad hwn",
"status.filtered": "Wedi'i hidlo",
"status.hide": "Cuddio'r postiad",
@@ -668,6 +739,7 @@
"status.reblog": "Hybu",
"status.reblog_private": "Hybu i'r gynulleidfa wreiddiol",
"status.reblogged_by": "Hybodd {name}",
+ "status.reblogs": "{count, plural, one {hwb} other {hwb}}",
"status.reblogs.empty": "Does neb wedi hybio'r post yma eto. Pan y bydd rhywun yn gwneud, byddent yn ymddangos yma.",
"status.redraft": "Dileu ac ailddrafftio",
"status.remove_bookmark": "Tynnu nod tudalen",
@@ -715,10 +787,8 @@
"upload_error.poll": "Nid oes modd llwytho ffeiliau â phleidleisiau.",
"upload_form.audio_description": "Disgrifio ar gyfer pobl sydd â cholled clyw",
"upload_form.description": "Disgrifio i'r rheini a nam ar ei golwg",
- "upload_form.description_missing": "Dim disgrifiad wedi'i ychwanegu",
"upload_form.edit": "Golygu",
"upload_form.thumbnail": "Newid llun bach",
- "upload_form.undo": "Dileu",
"upload_form.video_description": "Disgrifio ar gyfer pobl sydd â cholled clyw neu amhariad golwg",
"upload_modal.analyzing_picture": "Yn dadansoddi llun…",
"upload_modal.apply": "Gosod",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 3bc830ad27f2fe..a23d537331651a 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -89,7 +89,14 @@
"announcement.announcement": "Bekendtgørelse",
"attachments_list.unprocessed": "(ubehandlet)",
"audio.hide": "Skjul lyd",
- "autosuggest_hashtag.per_week": "{count} pr. uge",
+ "block_modal.remote_users_caveat": "Serveren {domain} vil blive bedt om at respektere din beslutning. Overholdelse er dog ikke garanteret, da nogle servere kan håndtere blokke forskelligt. Offentlige indlæg kan stadig være synlige for ikke-indloggede brugere.",
+ "block_modal.show_less": "Vis mindre",
+ "block_modal.show_more": "Vis flere",
+ "block_modal.they_cant_mention": "Vedkommende kan ikke nævne eller følge dig.",
+ "block_modal.they_cant_see_posts": "Vedkommende kan ikke se dine indlæg, og du vil ikke se vedkommendes.",
+ "block_modal.they_will_know": "Vedkommende kan se den aktive blokering.",
+ "block_modal.title": "Blokér bruger?",
+ "block_modal.you_wont_see_mentions": "Du vil ikke se indlæg, som nævner vedkommende.",
"boost_modal.combo": "Du kan trykke {combo} for at springe dette over næste gang",
"bundle_column_error.copy_stacktrace": "Kopiér fejlrapport",
"bundle_column_error.error.body": "Den anmodede side kunne ikke gengives. Dette kan skyldes flere typer fejl.",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "Din konto er ikke {locked}. Enhver kan følge dig og se indlæg kun beregnet for følgere.",
"compose_form.lock_disclaimer.lock": "låst",
"compose_form.placeholder": "Hvad tænker du på?",
- "compose_form.poll.add_option": "Tilføj valgmulighed",
"compose_form.poll.duration": "Afstemningens varighed",
+ "compose_form.poll.multiple": "Multivalg",
"compose_form.poll.option_placeholder": "Valgmulighed {number}",
- "compose_form.poll.remove_option": "Fjern denne valgmulighed",
+ "compose_form.poll.single": "Vælg én",
"compose_form.poll.switch_to_multiple": "Ændr afstemning til flervalgstype",
"compose_form.poll.switch_to_single": "Ændr afstemning til enkeltvalgstype",
- "compose_form.publish": "Publicér",
+ "compose_form.poll.type": "Stil",
+ "compose_form.publish": "Indsend",
"compose_form.publish_form": "Publicér",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Gem ændringer",
- "compose_form.sensitive.hide": "{count, plural, one {Markér medie som følsomt} other {Markér medier som følsomme}}",
- "compose_form.sensitive.marked": "{count, plural, one {Medie er markeret som sensitivt} other {Medier er markerede som sensitive}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Medie er ikke market som sensitivt} other {Medier er ikke markerede som sensitive}}",
+ "compose_form.reply": "Svar",
+ "compose_form.save_changes": "Opdatér",
"compose_form.spoiler.marked": "Fjern indholdsadvarsel",
"compose_form.spoiler.unmarked": "Tilføj indholdsadvarsel",
- "compose_form.spoiler_placeholder": "Skriv din advarsel hér",
+ "compose_form.spoiler_placeholder": "Indholdsadvarsel (valgfri)",
"confirmation_modal.cancel": "Afbryd",
- "confirmations.block.block_and_report": "Blokér og Anmeld",
"confirmations.block.confirm": "Blokér",
- "confirmations.block.message": "Er du sikker på, at du vil blokere {name}?",
"confirmations.cancel_follow_request.confirm": "Annullér anmodning",
"confirmations.cancel_follow_request.message": "Er du sikker på, at anmodningen om at følge {name} skal annulleres?",
"confirmations.delete.confirm": "Slet",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "Er du sikker på, at du vil slette denne liste permanent?",
"confirmations.discard_edit_media.confirm": "Kassér",
"confirmations.discard_edit_media.message": "Der er ugemte ændringer i mediebeskrivelsen eller forhåndsvisningen, kassér dem alligevel?",
- "confirmations.domain_block.confirm": "Blokér hele domænet",
+ "confirmations.domain_block.confirm": "Blokér server",
"confirmations.domain_block.message": "Er du fuldstændig sikker på, at du vil blokere hele {domain}-domænet? Oftest vil nogle få målrettede blokeringer eller skjulninger være tilstrækkelige og at foretrække. Du vil ikke se indhold fra dette domæne i nogle offentlige tidslinjer eller i dine notifikationer, og dine følgere herfra fjernes ligeledes.",
"confirmations.edit.confirm": "Redigér",
"confirmations.edit.message": "Redigeres nu, overskrive den besked, der forfattes pt. Fortsæt alligevel?",
"confirmations.logout.confirm": "Log ud",
"confirmations.logout.message": "Er du sikker på, at du vil logge ud?",
"confirmations.mute.confirm": "Skjul (mute)",
- "confirmations.mute.explanation": "Dette skjuler indlæg fra (og om) dem, men lader dem fortsat se dine indlæg og følge dig.",
- "confirmations.mute.message": "Er du sikker på, at du vil skjule {name}?",
"confirmations.redraft.confirm": "Slet og omformulér",
"confirmations.redraft.message": "Sikker på, at dette indlæg skal slettes og omskrives? Favoritter og boosts går tabt, og svar til det oprindelige indlæg mister tilknytningen.",
"confirmations.reply.confirm": "Svar",
@@ -208,6 +209,25 @@
"dismissable_banner.explore_statuses": "Disse indlæg fra diverse sociale netværk vinder fodfæste i dag. Nyere indlæg med flere boosts og favoritter rangeres højere.",
"dismissable_banner.explore_tags": "Disse hashtages vinder lige nu fodfæste blandt folk på denne og andre servere i det decentraliserede netværk.",
"dismissable_banner.public_timeline": "Dette er de seneste offentlige indlæg fra folk på det sociale netværk, som folk på {domain} følger.",
+ "domain_block_modal.block": "Blokér server",
+ "domain_block_modal.block_account_instead": "Blokér i stedet @{name}",
+ "domain_block_modal.they_can_interact_with_old_posts": "Folk fra denne server kan interagere med de gamle indlæg.",
+ "domain_block_modal.they_cant_follow": "Ingen fra denne server kan følge dig.",
+ "domain_block_modal.they_wont_know": "Vedkommende ser ikke den aktive blokering.",
+ "domain_block_modal.title": "Blokér domæne?",
+ "domain_block_modal.you_will_lose_followers": "Alle følgerne fra denne server fjernes.",
+ "domain_block_modal.you_wont_see_posts": "Indlæg eller notifikationer fra brugere på denne server vises ikke.",
+ "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": "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 .",
+ "domain_pill.who_you_are": "Da et handle fortæller, hvem man er, og hvor man er, kan man interagere med folk på tværs af det sociale net af .",
+ "domain_pill.your_handle": "Dit handle:",
+ "domain_pill.your_server": "Dit digitale hjem, hvor alle dine indlæg lever. Synes ikke om denne? Overfør til enhver tid servere samt tilhængere også.",
+ "domain_pill.your_username": "Din entydige identifikator på denne server. Det er muligt at finde brugere med samme brugernavn på forskellige servere.",
"embed.instructions": "Indlejr dette indlæg på dit websted ved at kopiere nedenstående kode.",
"embed.preview": "Sådan kommer det til at se ud:",
"emoji_button.activity": "Aktivitet",
@@ -244,6 +264,7 @@
"empty_column.list": "Der er ikke noget på denne liste endnu. Når medlemmer af listen udgiver nye indlæg vil de fremgå hér.",
"empty_column.lists": "Du har endnu ingen lister. Når du opretter én, vil den fremgå hér.",
"empty_column.mutes": "Du har endnu ikke skjult (muted) nogle brugere.",
+ "empty_column.notification_requests": "Alt er klar! Der er intet her. Når der modtages nye notifikationer, fremgår de her jf. dine indstillinger.",
"empty_column.notifications": "Du har endnu ingen notifikationer. Når andre interagerer med dig, vil det fremgå hér.",
"empty_column.public": "Der er intet hér! Skriv noget offentligt eller følg manuelt brugere fra andre servere for at se indhold",
"error.unexpected_crash.explanation": "Grundet en fejl i vores kode, eller en browser-kompatibilitetsfejl, kunne siden ikke vises korrekt.",
@@ -274,12 +295,30 @@
"filter_modal.select_filter.subtitle": "Vælg en eksisterende kategori eller opret en ny",
"filter_modal.select_filter.title": "Filtrér dette indlæg",
"filter_modal.title.status": "Filtrér et indlæg",
+ "filtered_notifications_banner.mentions": "{count, plural, one {omtale} other {omtaler}}",
+ "filtered_notifications_banner.pending_requests": "Notifikationer fra {count, plural, =0 {ingen} one {én person} other {# personer}} du måske kender",
+ "filtered_notifications_banner.title": "Filtrerede notifikationer",
"firehose.all": "Alle",
"firehose.local": "Denne server",
"firehose.remote": "Andre servere",
"follow_request.authorize": "Godkend",
"follow_request.reject": "Afvis",
"follow_requests.unlocked_explanation": "Selvom din konto ikke er låst, synes {domain}-personalet, du måske bør gennemgå disse anmodninger manuelt.",
+ "follow_suggestions.curated_suggestion": "Personaleudvalgt",
+ "follow_suggestions.dismiss": "Vis ikke igen",
+ "follow_suggestions.featured_longer": "Håndplukket af {domain}-teamet",
+ "follow_suggestions.friends_of_friends_longer": "Populært blandt personer, som følges",
+ "follow_suggestions.hints.featured": "Denne profil er håndplukket af {domain}-teamet.",
+ "follow_suggestions.hints.friends_of_friends": "Denne profil er populær blandt de personer, som følges.",
+ "follow_suggestions.hints.most_followed": "Denne profil er en af de mest fulgte på {domain}.",
+ "follow_suggestions.hints.most_interactions": "Denne profil har for nylig fået stor opmærksomhed på {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Denne profil svarer til de profiler, som senest er blevet fulgt.",
+ "follow_suggestions.personalized_suggestion": "Personligt forslag",
+ "follow_suggestions.popular_suggestion": "Populært forslag",
+ "follow_suggestions.popular_suggestion_longer": "Populært på {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Svarende til profiler, som for nylig er fulgt",
+ "follow_suggestions.view_all": "Vis alle",
+ "follow_suggestions.who_to_follow": "Hvem, som skal følges",
"followed_tags": "Hashtag, som følges",
"footer.about": "Om",
"footer.directory": "Profiloversigt",
@@ -306,13 +345,8 @@
"hashtag.follow": "Følg hashtag",
"hashtag.unfollow": "Stop med at følge hashtag",
"hashtags.and_other": "…og {count, plural, one {}other {# flere}}",
- "home.actions.go_to_explore": "Se, hvad som trender",
- "home.actions.go_to_suggestions": "Find nogle personer at følge",
- "home.column_settings.basic": "Grundlæggende",
"home.column_settings.show_reblogs": "Vis boosts",
"home.column_settings.show_replies": "Vis svar",
- "home.explore_prompt.body": "Dit hjemmefeed vil have en blanding af indlæg fra de hashtags, du har valgt at følge, de personer, du har valgt at følge, og de indlæg, de booster. Hvis her virker for stille, kan du prøve:",
- "home.explore_prompt.title": "Dette er din hjemmebase i Mastodon.",
"home.hide_announcements": "Skjul bekendtgørelser",
"home.pending_critical_update.body": "Opdater din Mastodon-server snarest muligt!",
"home.pending_critical_update.link": "Se opdateringer",
@@ -396,9 +430,15 @@
"loading_indicator.label": "Indlæser…",
"media_gallery.toggle_visible": "{number, plural, one {Skjul billede} other {Skjul billeder}}",
"moved_to_account_banner.text": "Din konto {disabledAccount} er pt. deaktiveret, da du flyttede til {movedToAccount}.",
- "mute_modal.duration": "Varighed",
- "mute_modal.hide_notifications": "Skjul notifikationer fra denne bruger?",
- "mute_modal.indefinite": "Tidsubegrænset",
+ "mute_modal.hide_from_notifications": "Skjul fra notifikationer",
+ "mute_modal.hide_options": "Skjul valgmuligheder",
+ "mute_modal.indefinite": "Indtil jeg fjerner tavsgørelsen",
+ "mute_modal.show_options": "Vis valgmuligheder",
+ "mute_modal.they_can_mention_and_follow": "Vedkommende kan nævne og følge dig, men vil ikke blive vist.",
+ "mute_modal.they_wont_know": "Vedkommende ser ikke den aktive tavsgørelse.",
+ "mute_modal.title": "Tavsgør bruger?",
+ "mute_modal.you_wont_see_mentions": "Indlæg, som nævner vedkommende, vises ikke.",
+ "mute_modal.you_wont_see_posts": "Vedkommende kan stadig se dine indlæg, med vedkommendes vise ikke.",
"navigation_bar.about": "Om",
"navigation_bar.advanced_interface": "Åbn i avanceret webgrænseflade",
"navigation_bar.blocks": "Blokerede brugere",
@@ -408,7 +448,6 @@
"navigation_bar.direct": "Private omtaler",
"navigation_bar.discover": "Opdag",
"navigation_bar.domain_blocks": "Blokerede domæner",
- "navigation_bar.edit_profile": "Redigér profil",
"navigation_bar.explore": "Udforsk",
"navigation_bar.favourites": "Favoritter",
"navigation_bar.filters": "Skjulte ord (mutede)",
@@ -432,11 +471,29 @@
"notification.follow": "{name} begyndte at følge dig",
"notification.follow_request": "{name} har anmodet om at følge dig",
"notification.mention": "{name} nævnte dig",
+ "notification.moderation-warning.learn_more": "Læs mere",
+ "notification.moderation_warning": "Du er tildelt en moderationsadvarsel",
+ "notification.moderation_warning.action_delete_statuses": "Nogle af dine indlæg er blevet fjernet.",
+ "notification.moderation_warning.action_disable": "Din konto er blevet deaktiveret.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Nogle af dine indlæg er blevet markeret som sensitive.",
+ "notification.moderation_warning.action_none": "Din konto er tildelt en moderationsadvarsel.",
+ "notification.moderation_warning.action_sensitive": "Dine indlæg markeres fra nu af som sensitive.",
+ "notification.moderation_warning.action_silence": "Din konto er blevet begrænset.",
+ "notification.moderation_warning.action_suspend": "Din konto er suspenderet.",
"notification.own_poll": "Din afstemning er afsluttet",
"notification.poll": "En afstemning, hvori du stemte, er slut",
"notification.reblog": "{name} boostede dit indlæg",
+ "notification.relationships_severance_event": "Mistede forbindelser med {name}",
+ "notification.relationships_severance_event.account_suspension": "En admin fra {from} har suspenderet {target}, hvofor opdateringer herfra eller interaktion hermed ikke længer er mulig.",
+ "notification.relationships_severance_event.domain_block": "En admin fra {from} har blokeret {target}, herunder {followersCount} tilhængere og {followingCount, plural, one {# konto, der} other {# konti, som}} følges.",
+ "notification.relationships_severance_event.learn_more": "Læs mere",
+ "notification.relationships_severance_event.user_domain_block": "{target} er blevet blokeret, og {followersCount} tilhængere samt {followingCount, plural, one {# konto, der} other {# konti, som}} følges, er hermed fjernet.",
"notification.status": "{name} har netop postet",
"notification.update": "{name} redigerede et indlæg",
+ "notification_requests.accept": "Acceptér",
+ "notification_requests.dismiss": "Afvis",
+ "notification_requests.notifications_from": "Notifikationer fra {name}",
+ "notification_requests.title": "Filtrerede notifikationer",
"notifications.clear": "Ryd notifikationer",
"notifications.clear_confirmation": "Er du sikker på, at du vil rydde alle dine notifikationer permanent?",
"notifications.column_settings.admin.report": "Nye anmeldelser:",
@@ -444,8 +501,7 @@
"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": "Hurtigfilterbjælke",
- "notifications.column_settings.filter_bar.show_bar": "Vis filterbjælke",
+ "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:",
@@ -471,6 +527,15 @@
"notifications.permission_denied": "Computernotifikationer er utilgængelige grundet tidligere afvist browsertilladelsesanmodning",
"notifications.permission_denied_alert": "Computernotifikationer kan ikke aktiveres, da browsertilladelse tidligere blev nægtet",
"notifications.permission_required": "Computernotifikationer er utilgængelige, da den krævede tilladelse ikke er tildelt.",
+ "notifications.policy.filter_new_accounts.hint": "Oprettet indenfor {days, plural, one {den seneste dag} other {de seneste # dage}}",
+ "notifications.policy.filter_new_accounts_title": "Ny konti",
+ "notifications.policy.filter_not_followers_hint": "Inklusiv personer, som har fulgt dig {days, plural, one {mindre end én dag} other {færre end # dage}}",
+ "notifications.policy.filter_not_followers_title": "Folk, som ikke følger dig",
+ "notifications.policy.filter_not_following_hint": "Indtil de manuelt godkendes",
+ "notifications.policy.filter_not_following_title": "Folk, du ikke følger",
+ "notifications.policy.filter_private_mentions_hint": "Filtreret, medmindre det er i svar på egen omtale, eller hvis afsenderen følges",
+ "notifications.policy.filter_private_mentions_title": "Uopfordrede private omtaler",
+ "notifications.policy.title": "Bortfiltrér notifikationer fra…",
"notifications_permission_banner.enable": "Aktivér computernotifikationer",
"notifications_permission_banner.how_to_control": "Aktivér computernotifikationer for at få besked, når Mastodon ikke er åben. Når de er aktiveret, kan man via knappen {icon} ovenfor præcist styre, hvilke typer af interaktioner, som genererer computernotifikationer.",
"notifications_permission_banner.title": "Gå aldrig glip af noget",
@@ -526,14 +591,15 @@
"poll_button.add_poll": "Tilføj en afstemning",
"poll_button.remove_poll": "Fjern afstemning",
"privacy.change": "Tilpas indlægsfortrolighed",
- "privacy.direct.long": "Kun synlig for nævnte brugere",
- "privacy.direct.short": "Kun omtalte personer",
- "privacy.private.long": "Kun synlig for følgere",
- "privacy.private.short": "Kun følgere",
- "privacy.public.long": "Synlig for alle",
+ "privacy.direct.long": "Alle nævnt i indlægget",
+ "privacy.direct.short": "Bestemte personer",
+ "privacy.private.long": "Kun dine følgere",
+ "privacy.private.short": "Følgere",
+ "privacy.public.long": "Alle på og udenfor Mastodon",
"privacy.public.short": "Offentlig",
- "privacy.unlisted.long": "Synlig for alle, men med fravalgt visning i opdagelsesfunktioner",
- "privacy.unlisted.short": "Diskret",
+ "privacy.unlisted.additional": "Dette er præcis som offentlig adfærd, dog vises indlægget ikke i live feeds/hashtags, udforsk eller Mastodon-søgning, selv hvis valget gælder hele kontoen.",
+ "privacy.unlisted.long": "Færre algoritmiske fanfarer",
+ "privacy.unlisted.short": "Tavsgøre offentligt",
"privacy_policy.last_updated": "Senest opdateret {date}",
"privacy_policy.title": "Privatlivspolitik",
"recommended": "Anbefalet",
@@ -551,7 +617,9 @@
"relative_time.minutes": "{number}m",
"relative_time.seconds": "{number}s",
"relative_time.today": "i dag",
+ "reply_indicator.attachments": "{count, plural, one {# vedhæftning} other {# vedhæftninger}}",
"reply_indicator.cancel": "Afbryd",
+ "reply_indicator.poll": "Afstemning",
"report.block": "Blokér",
"report.block_explanation": "Du vil ikke se vedkommendes indlæg. Vedkommende vil ikke kunne se dine indlæg eller følge dig. Vedkommende vil kunne se, at de er blokeret.",
"report.categories.legal": "Juridisk",
@@ -644,10 +712,11 @@
"status.direct": "Privat omtale @{name}",
"status.direct_indicator": "Privat omtale",
"status.edit": "Redigér",
- "status.edited": "Redigeret {date}",
+ "status.edited": "Senest redigeret {date}",
"status.edited_x_times": "Redigeret {count, plural, one {{count} gang} other {{count} gange}}",
"status.embed": "Indlejr",
"status.favourite": "Favorit",
+ "status.favourites": "{count, plural, one {# favorit} other {# favoritter}}",
"status.filter": "Filtrér dette indlæg",
"status.filtered": "Filtreret",
"status.hide": "Skjul indlæg",
@@ -668,6 +737,7 @@
"status.reblog": "Fremhæv",
"status.reblog_private": "Boost med oprindelig synlighed",
"status.reblogged_by": "{name} fremhævede",
+ "status.reblogs": "{count, plural, one {# boost} other {# boosts}}",
"status.reblogs.empty": "Ingen har endnu fremhævet dette indlæg. Når nogen gør, vil det fremgå hér.",
"status.redraft": "Slet og omformulér",
"status.remove_bookmark": "Fjern bogmærke",
@@ -715,10 +785,8 @@
"upload_error.poll": "Filupload ikke tilladt for afstemninger.",
"upload_form.audio_description": "Beskrivelse til hørehæmmede",
"upload_form.description": "Beskrivelse til svagtseende",
- "upload_form.description_missing": "Ingen beskrivelse tilføjet",
"upload_form.edit": "Redigér",
"upload_form.thumbnail": "Skift miniature",
- "upload_form.undo": "Slet",
"upload_form.video_description": "Beskrivelse for hørehæmmede eller synshandicappede personer",
"upload_modal.analyzing_picture": "Analyserer billede…",
"upload_modal.apply": "Anvend",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 462352750c35c2..577664107946a5 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -85,11 +85,18 @@
"alert.rate_limited.message": "Bitte versuche es nach {retry_time, time, medium} erneut.",
"alert.rate_limited.title": "Anfragelimit überschritten",
"alert.unexpected.message": "Ein unerwarteter Fehler ist aufgetreten.",
- "alert.unexpected.title": "Ups!",
+ "alert.unexpected.title": "Oha!",
"announcement.announcement": "Ankündigung",
"attachments_list.unprocessed": "(ausstehend)",
"audio.hide": "Audio ausblenden",
- "autosuggest_hashtag.per_week": "{count} pro Woche",
+ "block_modal.remote_users_caveat": "Wir werden den Server {domain} bitten, deine Entscheidung zu respektieren. Allerdings kann nicht garantiert werden, dass sie eingehalten wird, weil einige Server Blockierungen unterschiedlich handhaben können. Öffentliche Beiträge können für nicht angemeldete Nutzer*innen weiterhin sichtbar sein.",
+ "block_modal.show_less": "Weniger anzeigen",
+ "block_modal.show_more": "Mehr anzeigen",
+ "block_modal.they_cant_mention": "Das Profil wird dich nicht erwähnen oder dir folgen können.",
+ "block_modal.they_cant_see_posts": "Deine Beiträge können nicht mehr angesehen werden und du wirst deren Beiträge nicht mehr sehen.",
+ "block_modal.they_will_know": "Es wird erkennbar sein, dass dieses Profil blockiert wurde.",
+ "block_modal.title": "Profil blockieren?",
+ "block_modal.you_wont_see_mentions": "Du wirst keine Beiträge sehen, die dieses Profil erwähnen.",
"boost_modal.combo": "Mit {combo} wird dieses Fenster beim nächsten Mal nicht mehr angezeigt",
"bundle_column_error.copy_stacktrace": "Fehlerbericht kopieren",
"bundle_column_error.error.body": "Die angeforderte Seite konnte nicht dargestellt werden. Dies könnte auf einen Fehler in unserem Code oder auf ein Browser-Kompatibilitätsproblem zurückzuführen sein.",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "Dein Profil ist nicht {locked}. Andere können dir folgen und deine Beiträge sehen, die nur für Follower bestimmt sind.",
"compose_form.lock_disclaimer.lock": "geschützt",
"compose_form.placeholder": "Was gibt’s Neues?",
- "compose_form.poll.add_option": "Auswahl",
"compose_form.poll.duration": "Umfragedauer",
- "compose_form.poll.option_placeholder": "{number}. Auswahl",
- "compose_form.poll.remove_option": "Auswahlfeld entfernen",
+ "compose_form.poll.multiple": "Multiple-Choice",
+ "compose_form.poll.option_placeholder": "Option {number}",
+ "compose_form.poll.single": "Einfachauswahl",
"compose_form.poll.switch_to_multiple": "Mehrfachauswahl erlauben",
- "compose_form.poll.switch_to_single": "Nur Einzelauswahl erlauben",
+ "compose_form.poll.switch_to_single": "Nur Einfachauswahl erlauben",
+ "compose_form.poll.type": "Art",
"compose_form.publish": "Veröffentlichen",
"compose_form.publish_form": "Neuer Beitrag",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Änderungen speichern",
- "compose_form.sensitive.hide": "{count, plural, one {Mit einer Inhaltswarnung versehen} other {Mit einer Inhaltswarnung versehen}}",
- "compose_form.sensitive.marked": "{count, plural, one {Medien-Datei ist mit einer Inhaltswarnung versehen} other {Medien-Dateien sind mit einer Inhaltswarnung versehen}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Medien-Datei ist nicht mit einer Inhaltswarnung versehen} other {Medien-Dateien sind nicht mit einer Inhaltswarnung versehen}}",
+ "compose_form.reply": "Antworten",
+ "compose_form.save_changes": "Aktualisieren",
"compose_form.spoiler.marked": "Inhaltswarnung entfernen",
"compose_form.spoiler.unmarked": "Inhaltswarnung hinzufügen",
- "compose_form.spoiler_placeholder": "Inhaltswarnung",
+ "compose_form.spoiler_placeholder": "Inhaltswarnung (optional)",
"confirmation_modal.cancel": "Abbrechen",
- "confirmations.block.block_and_report": "Blockieren und melden",
"confirmations.block.confirm": "Blockieren",
- "confirmations.block.message": "Möchtest du {name} wirklich blockieren?",
"confirmations.cancel_follow_request.confirm": "Anfrage zurückziehen",
"confirmations.cancel_follow_request.message": "Möchtest du deine Anfrage, {name} zu folgen, wirklich zurückziehen?",
"confirmations.delete.confirm": "Löschen",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "Möchtest du diese Liste für immer löschen?",
"confirmations.discard_edit_media.confirm": "Verwerfen",
"confirmations.discard_edit_media.message": "Du hast Änderungen an der Medienbeschreibung oder -vorschau vorgenommen, die noch nicht gespeichert sind. Trotzdem verwerfen?",
- "confirmations.domain_block.confirm": "Domain blockieren",
+ "confirmations.domain_block.confirm": "Server blockieren",
"confirmations.domain_block.message": "Möchtest du die gesamte Domain {domain} wirklich blockieren? In den meisten Fällen reichen ein paar gezielte Blockierungen oder Stummschaltungen aus. Du wirst den Inhalt von dieser Domain nicht in irgendwelchen öffentlichen Timelines oder den Benachrichtigungen finden. Auch deine Follower von dieser Domain werden entfernt.",
"confirmations.edit.confirm": "Bearbeiten",
"confirmations.edit.message": "Das Bearbeiten überschreibt die Nachricht, die du gerade verfasst. Möchtest du wirklich fortfahren?",
"confirmations.logout.confirm": "Abmelden",
"confirmations.logout.message": "Möchtest du dich wirklich abmelden?",
"confirmations.mute.confirm": "Stummschalten",
- "confirmations.mute.explanation": "Dies wird Beiträge von dieser Person und Beiträge, die diese Person erwähnen, ausblenden, aber es wird der Person trotzdem erlauben, deine Beiträge zu sehen und dir zu folgen.",
- "confirmations.mute.message": "Möchtest du {name} wirklich stummschalten?",
"confirmations.redraft.confirm": "Löschen und neu erstellen",
"confirmations.redraft.message": "Möchtest du diesen Beitrag wirklich löschen und neu verfassen? Favoriten und geteilte Beiträge gehen verloren, und Antworten auf den ursprünglichen Beitrag verlieren den Zusammenhang.",
"confirmations.reply.confirm": "Antworten",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "Diese Beiträge stammen aus dem gesamten sozialen Netzwerk und gewinnen derzeit an Reichweite. Neuere Beiträge, die häufiger geteilt und favorisiert wurden, werden höher eingestuft.",
"dismissable_banner.explore_tags": "Das sind Hashtags, die derzeit an Reichweite gewinnen. Hashtags, die von vielen verschiedenen Profilen verwendet werden, werden höher eingestuft.",
"dismissable_banner.public_timeline": "Das sind die neuesten öffentlichen Beiträge von Profilen im sozialen Netzwerk, denen Leute auf {domain} folgen.",
+ "domain_block_modal.block": "Server blockieren",
+ "domain_block_modal.block_account_instead": "Stattdessen @{name} blockieren",
+ "domain_block_modal.they_can_interact_with_old_posts": "Profile von diesem Server werden mit deinen älteren Beiträgen interagieren können.",
+ "domain_block_modal.they_cant_follow": "Niemand von diesem Server wird dir folgen können.",
+ "domain_block_modal.they_wont_know": "Es wird nicht erkennbar sein, dass diese Domain blockiert wurde.",
+ "domain_block_modal.title": "Domain blockieren?",
+ "domain_block_modal.you_will_lose_followers": "Alle Follower von diesem Server werden entfernt.",
+ "domain_block_modal.you_wont_see_posts": "Du wirst keine Beiträge oder Benachrichtigungen von Profilen auf diesem Server sehen.",
+ "domain_pill.activitypub_lets_connect": "Somit kannst du dich nicht nur auf Mastodon mit Leuten verbinden und mit ihnen interagieren, sondern über alle sozialen Apps hinweg.",
+ "domain_pill.activitypub_like_language": "ActivityPub ist sozusagen die Sprache, die Mastodon mit anderen sozialen Netzwerken spricht.",
+ "domain_pill.server": "Server",
+ "domain_pill.their_handle": "Deren Adresse:",
+ "domain_pill.their_server": "Deren digitales Zuhause. Hier „leben“ alle Beiträge von diesem Profil.",
+ "domain_pill.their_username": "Deren eindeutigen Identität auf dem betreffenden Server. Es ist möglich, Profile mit dem gleichen Profilnamen auf verschiedenen Servern zu finden.",
+ "domain_pill.username": "Profilname",
+ "domain_pill.whats_in_a_handle": "Was ist Teil der Adresse?",
+ "domain_pill.who_they_are": "Adressen teilen mit, wer jemand ist und wo sich jemand aufhält. Daher kannst du mit Leuten im gesamten Social Web interagieren, wenn es eine durch ist.",
+ "domain_pill.who_you_are": "Deine Adresse teilt mit, wer du bist und wo du dich aufhältst. Daher können andere Leute im gesamten Social Web mit dir interagieren, wenn es eine durch ist.",
+ "domain_pill.your_handle": "Deine Adresse:",
+ "domain_pill.your_server": "Dein digitales Zuhause. Hier „leben“ alle Beiträge von dir. Dir gefällt es hier nicht? Du kannst jederzeit den Server wechseln und ebenso deine Follower übertragen.",
+ "domain_pill.your_username": "Deine eindeutige Identität auf diesem Server. Es ist möglich, Profile mit dem gleichen Profilnamen auf verschiedenen Servern zu finden.",
"embed.instructions": "Du kannst diesen Beitrag außerhalb des Fediverse (z. B. auf deiner Website) einbetten, indem du diesen iFrame-Code einfügst.",
"embed.preview": "Vorschau:",
"emoji_button.activity": "Aktivitäten",
@@ -244,6 +266,7 @@
"empty_column.list": "Diese Liste ist derzeit leer. Wenn Konten auf dieser Liste neue Beiträge veröffentlichen, werden sie hier erscheinen.",
"empty_column.lists": "Du hast noch keine Listen. Sobald du eine anlegst, wird sie hier erscheinen.",
"empty_column.mutes": "Du hast keine Profile stummgeschaltet.",
+ "empty_column.notification_requests": "Alles klar! Hier gibt es nichts. Wenn Sie neue Mitteilungen erhalten, werden diese entsprechend Ihren Einstellungen hier angezeigt.",
"empty_column.notifications": "Du hast noch keine Benachrichtigungen. Sobald andere Personen mit dir interagieren, wirst du hier darüber informiert.",
"empty_column.public": "Hier ist nichts zu sehen! Schreibe etwas öffentlich oder folge Profilen von anderen Servern, um die Timeline aufzufüllen",
"error.unexpected_crash.explanation": "Wegen eines Fehlers in unserem Code oder aufgrund einer Browser-Inkompatibilität kann diese Seite nicht korrekt angezeigt werden.",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "Einem vorhandenen Filter hinzufügen oder einen neuen erstellen",
"filter_modal.select_filter.title": "Diesen Beitrag filtern",
"filter_modal.title.status": "Beitrag per Filter ausblenden",
+ "filtered_notifications_banner.mentions": "{count, plural, one {Erwähnung} other {Erwähnungen}}",
+ "filtered_notifications_banner.pending_requests": "Benachrichtigungen von {count, plural, =0 {keinem Profil, das du möglicherweise kennst} one {einem Profil, das du möglicherweise kennst} other {# Profilen, die du möglicherweise kennst}}",
+ "filtered_notifications_banner.title": "Gefilterte Benachrichtigungen",
"firehose.all": "Alles",
"firehose.local": "Dieser Server",
"firehose.remote": "Andere Server",
"follow_request.authorize": "Genehmigen",
"follow_request.reject": "Ablehnen",
"follow_requests.unlocked_explanation": "Auch wenn dein Konto öffentlich bzw. nicht geschützt ist, haben die Moderator*innen von {domain} gedacht, dass du diesen Follower lieber manuell bestätigen solltest.",
+ "follow_suggestions.curated_suggestion": "Vom Server-Team empfohlen",
+ "follow_suggestions.dismiss": "Nicht mehr anzeigen",
+ "follow_suggestions.featured_longer": "Vom {domain}-Team ausgewählt",
+ "follow_suggestions.friends_of_friends_longer": "Beliebt bei Leuten, denen du folgst",
+ "follow_suggestions.hints.featured": "Dieses Profil wurde vom {domain}-Team ausgewählt.",
+ "follow_suggestions.hints.friends_of_friends": "Dieses Profil ist bei deinen Followern beliebt.",
+ "follow_suggestions.hints.most_followed": "Dieses Profil ist eines der am meisten gefolgten auf {domain}.",
+ "follow_suggestions.hints.most_interactions": "Dieses Profil erhielt auf {domain} in letzter Zeit viel Aufmerksamkeit.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Dieses Profil ähnelt den Profilen, denen du in letzter Zeit gefolgt hast.",
+ "follow_suggestions.personalized_suggestion": "Persönliche Empfehlung",
+ "follow_suggestions.popular_suggestion": "Beliebte Empfehlung",
+ "follow_suggestions.popular_suggestion_longer": "Beliebt auf {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Ähnlich zu Profilen, denen du seit kurzem folgst",
+ "follow_suggestions.view_all": "Alle anzeigen",
+ "follow_suggestions.who_to_follow": "Empfohlene Profile",
"followed_tags": "Gefolgte Hashtags",
"footer.about": "Über",
"footer.directory": "Profilverzeichnis",
@@ -290,7 +331,7 @@
"footer.source_code": "Quellcode anzeigen",
"footer.status": "Status",
"generic.saved": "Gespeichert",
- "getting_started.heading": "Auf geht’s!",
+ "getting_started.heading": "Auf gehts!",
"hashtag.column_header.tag_mode.all": "und {additional}",
"hashtag.column_header.tag_mode.any": "oder {additional}",
"hashtag.column_header.tag_mode.none": "ohne {additional}",
@@ -306,13 +347,8 @@
"hashtag.follow": "Hashtag folgen",
"hashtag.unfollow": "Hashtag entfolgen",
"hashtags.and_other": "… und {count, plural, one{# weiterer} other {# weitere}}",
- "home.actions.go_to_explore": "Trends ansehen",
- "home.actions.go_to_suggestions": "Profile zum Folgen finden",
- "home.column_settings.basic": "Allgemein",
"home.column_settings.show_reblogs": "Geteilte Beiträge anzeigen",
"home.column_settings.show_replies": "Antworten anzeigen",
- "home.explore_prompt.body": "Deine Startseite wird eine Mischung aus Beiträgen mit Hashtags und den Profilen, denen du folgst sowie den Beiträgen, die sie teilen, enthalten. Sollte es sich zu still anfühlen:",
- "home.explore_prompt.title": "Das ist dein Zuhause bei Mastodon.",
"home.hide_announcements": "Ankündigungen ausblenden",
"home.pending_critical_update.body": "Bitte aktualisiere deinen Mastodon-Server so schnell wie möglich!",
"home.pending_critical_update.link": "Updates ansehen",
@@ -364,7 +400,7 @@
"keyboard_shortcuts.requests": "Liste der Follower-Anfragen aufrufen",
"keyboard_shortcuts.search": "Suchleiste fokussieren",
"keyboard_shortcuts.spoilers": "Feld für Inhaltswarnung anzeigen/ausblenden",
- "keyboard_shortcuts.start": "„Auf geht’s!“ öffnen",
+ "keyboard_shortcuts.start": "„Auf gehts!“ öffnen",
"keyboard_shortcuts.toggle_hidden": "Beitragstext hinter der Inhaltswarnung anzeigen/ausblenden",
"keyboard_shortcuts.toggle_sensitivity": "Medien anzeigen/ausblenden",
"keyboard_shortcuts.toot": "Neuen Beitrag erstellen",
@@ -396,9 +432,15 @@
"loading_indicator.label": "Wird geladen …",
"media_gallery.toggle_visible": "{number, plural, one {Medium ausblenden} other {Medien ausblenden}}",
"moved_to_account_banner.text": "Dein Konto {disabledAccount} ist derzeit deaktiviert, weil du zu {movedToAccount} umgezogen bist.",
- "mute_modal.duration": "Dauer",
- "mute_modal.hide_notifications": "Benachrichtigungen dieses Profils ausblenden?",
- "mute_modal.indefinite": "Unbegrenzt",
+ "mute_modal.hide_from_notifications": "Benachrichtigungen ausblenden",
+ "mute_modal.hide_options": "Einstellungen ausblenden",
+ "mute_modal.indefinite": "Bis ich die Stummschaltung aufhebe",
+ "mute_modal.show_options": "Einstellungen anzeigen",
+ "mute_modal.they_can_mention_and_follow": "Das Profil wird dich weiterhin erwähnen und dir folgen können, aber du wirst davon nichts sehen.",
+ "mute_modal.they_wont_know": "Es wird nicht erkennbar sein, dass dieses Profil stummgeschaltet wurde.",
+ "mute_modal.title": "Profil stummschalten?",
+ "mute_modal.you_wont_see_mentions": "Du wirst keine Beiträge sehen, die dieses Profil erwähnen.",
+ "mute_modal.you_wont_see_posts": "Deine Beiträge können weiterhin angesehen werden, aber du wirst deren Beiträge nicht mehr sehen.",
"navigation_bar.about": "Über",
"navigation_bar.advanced_interface": "Im erweiterten Webinterface öffnen",
"navigation_bar.blocks": "Blockierte Profile",
@@ -408,7 +450,6 @@
"navigation_bar.direct": "Private Erwähnungen",
"navigation_bar.discover": "Entdecken",
"navigation_bar.domain_blocks": "Blockierte Domains",
- "navigation_bar.edit_profile": "Profil bearbeiten",
"navigation_bar.explore": "Entdecken",
"navigation_bar.favourites": "Favoriten",
"navigation_bar.filters": "Stummgeschaltete Wörter",
@@ -432,11 +473,29 @@
"notification.follow": "{name} folgt dir",
"notification.follow_request": "{name} möchte dir folgen",
"notification.mention": "{name} erwähnte dich",
+ "notification.moderation-warning.learn_more": "Mehr erfahren",
+ "notification.moderation_warning": "Du wurdest von den Moderator*innen verwarnt",
+ "notification.moderation_warning.action_delete_statuses": "Einige deiner Beiträge sind entfernt worden.",
+ "notification.moderation_warning.action_disable": "Dein Konto wurde deaktiviert.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Einige deiner Beiträge wurden mit einer Inhaltswarnung versehen.",
+ "notification.moderation_warning.action_none": "Dein Konto ist von den Moderator*innen verwarnt worden.",
+ "notification.moderation_warning.action_sensitive": "Deine zukünftigen Beiträge werden mit einer Inhaltswarnung versehen.",
+ "notification.moderation_warning.action_silence": "Dein Konto wurde eingeschränkt.",
+ "notification.moderation_warning.action_suspend": "Dein Konto wurde gesperrt.",
"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.relationships_severance_event": "Verbindungen mit {name} verloren",
+ "notification.relationships_severance_event.account_suspension": "Ein Admin von {from} hat {target} gesperrt. Du wirst von diesem Profil keine Updates mehr erhalten und auch nicht mit ihm interagieren können.",
+ "notification.relationships_severance_event.domain_block": "Ein Admin von {from} hat {target} blockiert – darunter {followersCount} deiner Follower und {followingCount, plural, one {# Konto, dem} other {# Konten, denen}} du folgst.",
+ "notification.relationships_severance_event.learn_more": "Mehr erfahren",
+ "notification.relationships_severance_event.user_domain_block": "Du hast {target} blockiert – {followersCount} deiner Follower und {followingCount, plural, one {# Konto, dem} other {# Konten, denen}} du folgst, wurden entfernt.",
"notification.status": "{name} hat gerade etwas gepostet",
"notification.update": "{name} bearbeitete einen Beitrag",
+ "notification_requests.accept": "Akzeptieren",
+ "notification_requests.dismiss": "Ablehnen",
+ "notification_requests.notifications_from": "Benachrichtigungen von {name}",
+ "notification_requests.title": "Gefilterte Benachrichtigungen",
"notifications.clear": "Benachrichtigungen löschen",
"notifications.clear_confirmation": "Möchtest du wirklich alle Benachrichtigungen für immer löschen?",
"notifications.column_settings.admin.report": "Neue Meldungen:",
@@ -444,8 +503,7 @@
"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.filter_bar.show_bar": "Filterleiste 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:",
@@ -471,6 +529,15 @@
"notifications.permission_denied": "Desktop-Benachrichtigungen können aufgrund einer zuvor verweigerten Berechtigung nicht aktiviert werden",
"notifications.permission_denied_alert": "Desktop-Benachrichtigungen können nicht aktiviert werden, da die Browser-Berechtigung zuvor verweigert wurde",
"notifications.permission_required": "Desktop-Benachrichtigungen sind nicht verfügbar, da die erforderliche Berechtigung nicht erteilt wurde.",
+ "notifications.policy.filter_new_accounts.hint": "Innerhalb {days, plural, one {des letzten Tages} other {der letzten # Tagen}} erstellt",
+ "notifications.policy.filter_new_accounts_title": "Neuen Konten",
+ "notifications.policy.filter_not_followers_hint": "Einschließlich Profilen, die dir seit weniger als {days, plural, one {einem Tag} other {# Tagen}} folgen",
+ "notifications.policy.filter_not_followers_title": "Profilen, die mir nicht folgen",
+ "notifications.policy.filter_not_following_hint": "Solange du sie nicht manuell akzeptierst",
+ "notifications.policy.filter_not_following_title": "Profilen, denen ich nicht folge",
+ "notifications.policy.filter_private_mentions_hint": "Solange sie keine Antwort auf deine Erwähnung ist oder du dem Profil nicht folgst",
+ "notifications.policy.filter_private_mentions_title": "Unerwünschten privaten Erwähnungen",
+ "notifications.policy.title": "Benachrichtigungen herausfiltern von …",
"notifications_permission_banner.enable": "Aktiviere Desktop-Benachrichtigungen",
"notifications_permission_banner.how_to_control": "Um Benachrichtigungen zu erhalten, wenn Mastodon nicht geöffnet ist, aktiviere die Desktop-Benachrichtigungen. Du kannst genau bestimmen, welche Arten von Interaktionen Desktop-Benachrichtigungen über die {icon} -Taste erzeugen, sobald diese aktiviert sind.",
"notifications_permission_banner.title": "Nichts verpassen",
@@ -482,11 +549,11 @@
"onboarding.follows.empty": "Bedauerlicherweise können aktuell keine Ergebnisse angezeigt werden. Du kannst die Suche verwenden oder den Reiter „Entdecken“ auswählen, um neue Leute zum Folgen zu finden – oder du versuchst es später erneut.",
"onboarding.follows.lead": "Deine Startseite ist der primäre Anlaufpunkt, um Mastodon zu erleben. Je mehr Profilen du folgst, umso aktiver und interessanter wird sie. Damit du direkt loslegen kannst, gibt es hier ein paar Vorschläge:",
"onboarding.follows.title": "Personalisiere deine Startseite",
- "onboarding.profile.discoverable": "Mein Profil auffindbar machen",
+ "onboarding.profile.discoverable": "Mein Profil darf entdeckt werden",
"onboarding.profile.discoverable_hint": "Wenn du entdeckt werden möchtest, dann können deine Beiträge in Suchergebnissen und Trends erscheinen. Dein Profil kann ebenfalls anderen mit ähnlichen Interessen vorgeschlagen werden.",
"onboarding.profile.display_name": "Anzeigename",
"onboarding.profile.display_name_hint": "Dein richtiger Name oder dein Fantasiename …",
- "onboarding.profile.lead": "Du kannst das später in den Einstellungen vervollständigen, wo noch mehr Anpassungsmöglichkeiten zur Verfügung stehen.",
+ "onboarding.profile.lead": "Du kannst dein Profil später in den Einstellungen vervollständigen. Dort stehen weitere Anpassungsmöglichkeiten zur Verfügung.",
"onboarding.profile.note": "Über mich",
"onboarding.profile.note_hint": "Du kannst andere @Profile erwähnen oder #Hashtags verwenden …",
"onboarding.profile.save_and_continue": "Speichern und fortfahren",
@@ -502,16 +569,16 @@
"onboarding.start.title": "Du hast es geschafft!",
"onboarding.steps.follow_people.body": "Interessanten Profilen zu folgen ist das, was Mastodon ausmacht.",
"onboarding.steps.follow_people.title": "Personalisiere deine Startseite",
- "onboarding.steps.publish_status.body": "Begrüße die Welt mit Text, Fotos, Videos oder Umfragen {emoji}",
+ "onboarding.steps.publish_status.body": "Begrüße die Welt mit Text, Fotos, Videos oder Umfragen. {emoji}",
"onboarding.steps.publish_status.title": "Erstelle deinen ersten Beitrag",
"onboarding.steps.setup_profile.body": "Mit einem vollständigen Profil interagieren andere eher mit dir.",
"onboarding.steps.setup_profile.title": "Personalisiere dein Profil",
- "onboarding.steps.share_profile.body": "Lass deine Freund*innen wissen, wie sie dich auf Mastodon finden können",
+ "onboarding.steps.share_profile.body": "Lass deine Freund*innen wissen, wie sie dich auf Mastodon finden können.",
"onboarding.steps.share_profile.title": "Teile dein Mastodon-Profil",
"onboarding.tips.2fa": "Wusstest du schon? Du kannst die Sicherheit deines Kontos erhöhen, indem du die Zwei-Faktor-Authentisierung in deinen Kontoeinstellungen aktivierst. Dafür ist keine Telefonnummer notwendig und es funktioniert jede beliebige TOTP-App!",
"onboarding.tips.accounts_from_other_servers": "Wusstest du schon? Da Mastodon dezentralisiert ist, werden einige Profile, denen du begegnest, auf anderen Servern als deinem bereitgestellt. Und trotzdem kannst du uneingeschränkt mit ihnen interagieren! Der Servername befindet sich in der zweiten Hälfte ihres Profilnamens!",
"onboarding.tips.migration": "Wusstest du schon? Wenn du das Gefühl hast, dass {domain} in Zukunft nicht die richtige Serverwahl für dich ist, kannst du auf einen anderen Mastodon-Server umziehen, ohne deine Follower zu verlieren. Du kannst sogar deinen eigenen Server betreiben!",
- "onboarding.tips.verification": "Wusstest du schon? Du kannst dein Konto verifizieren, indem du auf deiner Website auf dein Mastodon-Profil verlinkst und den Link deiner Website zu deinem Profil hinzufügst. Keine Gebühren oder Dokumente erforderlich!",
+ "onboarding.tips.verification": "Wusstest du schon? Du kannst dein Konto verifizieren, indem du auf deiner Website auf dein Mastodon-Profil verlinkst und den Link deiner Website zu deinem Profil hinzufügst. Völlig kostenlos und ohne Dokumente einsenden zu müssen!",
"password_confirmation.exceeds_maxlength": "Passwortbestätigung überschreitet die maximal erlaubte Zeichenanzahl",
"password_confirmation.mismatching": "Passwortbestätigung stimmt nicht überein",
"picture_in_picture.restore": "Zurücksetzen",
@@ -526,14 +593,15 @@
"poll_button.add_poll": "Umfrage erstellen",
"poll_button.remove_poll": "Umfrage entfernen",
"privacy.change": "Sichtbarkeit anpassen",
- "privacy.direct.long": "Nur für die erwähnten Profile sichtbar",
- "privacy.direct.short": "Nur erwähnte Profile",
- "privacy.private.long": "Nur für deine Follower sichtbar",
- "privacy.private.short": "Nur Follower",
- "privacy.public.long": "Für alle sichtbar",
+ "privacy.direct.long": "Alle in diesem Beitrag erwähnten Profile",
+ "privacy.direct.short": "Bestimmte Profile",
+ "privacy.private.long": "Nur deine Follower",
+ "privacy.private.short": "Follower",
+ "privacy.public.long": "Alle in und außerhalb von Mastodon",
"privacy.public.short": "Öffentlich",
- "privacy.unlisted.long": "Für alle sichtbar, aber nicht über die Suche zu finden",
- "privacy.unlisted.short": "Nicht gelistet",
+ "privacy.unlisted.additional": "Das Verhalten ist wie bei „Öffentlich“, jedoch erscheint dieser Beitrag nicht in „Live-Feeds“, „Erkunden“, Hashtags oder über die Mastodon-Suchfunktion – selbst wenn du das in den Einstellungen aktiviert hast.",
+ "privacy.unlisted.long": "Weniger im Algorithmus berücksichtigt",
+ "privacy.unlisted.short": "Öffentlich (eingeschränkt)",
"privacy_policy.last_updated": "Stand: {date}",
"privacy_policy.title": "Datenschutzerklärung",
"recommended": "Empfohlen",
@@ -551,7 +619,9 @@
"relative_time.minutes": "{number} Min.",
"relative_time.seconds": "{number} Sek.",
"relative_time.today": "heute",
+ "reply_indicator.attachments": "{count, plural, one {# Anhang} other {# Anhänge}}",
"reply_indicator.cancel": "Abbrechen",
+ "reply_indicator.poll": "Umfrage",
"report.block": "Blockieren",
"report.block_explanation": "Du wirst keine Beiträge mehr von diesem Konto sehen. Das blockierte Konto wird deine Beiträge nicht mehr sehen oder dir folgen können. Die Person könnte mitbekommen, dass du sie blockiert hast.",
"report.categories.legal": "Rechtlich",
@@ -644,10 +714,11 @@
"status.direct": "@{name} privat erwähnen",
"status.direct_indicator": "Private Erwähnung",
"status.edit": "Beitrag bearbeiten",
- "status.edited": "Bearbeitet {date}",
+ "status.edited": "Zuletzt am {date} bearbeitet",
"status.edited_x_times": "{count, plural, one {{count}-mal} other {{count}-mal}} bearbeitet",
"status.embed": "Beitrag per iFrame einbetten",
"status.favourite": "Favorisieren",
+ "status.favourites": "{count, plural, one {Mal favorisiert} other {Mal favorisiert}}",
"status.filter": "Beitrag filtern",
"status.filtered": "Gefiltert",
"status.hide": "Beitrag ausblenden",
@@ -668,6 +739,7 @@
"status.reblog": "Teilen",
"status.reblog_private": "Mit der ursprünglichen Zielgruppe teilen",
"status.reblogged_by": "{name} teilte",
+ "status.reblogs": "{count, plural, one {Mal geteilt} other {Mal geteilt}}",
"status.reblogs.empty": "Diesen Beitrag hat bisher noch niemand geteilt. Sobald es jemand tut, wird das Profil hier erscheinen.",
"status.redraft": "Löschen und neu erstellen",
"status.remove_bookmark": "Lesezeichen entfernen",
@@ -715,10 +787,8 @@
"upload_error.poll": "Medien-Anhänge sind zusammen mit Umfragen nicht erlaubt.",
"upload_form.audio_description": "Beschreibe für Menschen mit Hörbehinderung",
"upload_form.description": "Beschreibe für Menschen mit Sehbehinderung",
- "upload_form.description_missing": "Keine Beschreibung hinzugefügt",
"upload_form.edit": "Bearbeiten",
"upload_form.thumbnail": "Vorschaubild ändern",
- "upload_form.undo": "Löschen",
"upload_form.video_description": "Beschreibe für Menschen mit einer Hör- oder Sehbehinderung",
"upload_modal.analyzing_picture": "Bild wird analysiert …",
"upload_modal.apply": "Übernehmen",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 53e55fa950ad00..937bb5d027c3e5 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -85,7 +85,6 @@
"announcement.announcement": "Ανακοίνωση",
"attachments_list.unprocessed": "(μη επεξεργασμένο)",
"audio.hide": "Απόκρυψη αρχείου ήχου",
- "autosuggest_hashtag.per_week": "{count} ανά εβδομάδα",
"boost_modal.combo": "Μπορείς να πατήσεις {combo} για να το προσπεράσεις την επόμενη φορά",
"bundle_column_error.copy_stacktrace": "Αντιγραφή αναφοράς σφάλματος",
"bundle_column_error.error.body": "Δεν ήταν δυνατή η απόδοση της σελίδας που ζήτησες. Μπορεί να οφείλεται σε σφάλμα στον κώδικά μας ή σε πρόβλημα συμβατότητας του προγράμματος περιήγησης.",
@@ -111,6 +110,7 @@
"column.direct": "Ιδιωτικές αναφορές",
"column.directory": "Περιήγηση στα προφίλ",
"column.domain_blocks": "Αποκλεισμένοι τομείς",
+ "column.favourites": "Αγαπημένα",
"column.follow_requests": "Αιτήματα ακολούθησης",
"column.home": "Αρχική",
"column.lists": "Λίστες",
@@ -131,32 +131,30 @@
"community.column_settings.remote_only": "Απομακρυσμένα μόνο",
"compose.language.change": "Αλλαγή γλώσσας",
"compose.language.search": "Αναζήτηση γλωσσών...",
+ "compose.published.body": "Η ανάρτηση δημοσιεύτηκε.",
+ "compose.published.open": "Άνοιγμα",
+ "compose.saved.body": "Η ανάρτηση αποθηκεύτηκε.",
"compose_form.direct_message_warning_learn_more": "Μάθε περισσότερα",
"compose_form.encryption_warning": "Οι δημοσιεύσεις στο Mastodon δεν είναι κρυπτογραφημένες από άκρο σε άκρο. Μη μοιράζεσαι ευαίσθητες πληροφορίες μέσω του Mastodon.",
"compose_form.hashtag_warning": "Αυτή η δημοσίευση δεν θα εμφανίζεται κάτω από οποιαδήποτε ετικέτα καθώς δεν είναι δημόσια. Μόνο οι δημόσιες δημοσιεύσεις μπορούν να αναζητηθούν με ετικέτα.",
"compose_form.lock_disclaimer": "Ο λογαριασμός σου δεν είναι {locked}. Οποιοσδήποτε μπορεί να σε ακολουθήσει για να δει τις δημοσιεύσεις σου προς τους ακολούθους σου.",
"compose_form.lock_disclaimer.lock": "κλειδωμένο",
"compose_form.placeholder": "Τι σκέφτεσαι;",
- "compose_form.poll.add_option": "Προσθήκη επιλογής",
"compose_form.poll.duration": "Διάρκεια δημοσκόπησης",
+ "compose_form.poll.multiple": "Πολλαπλή επιλογή",
"compose_form.poll.option_placeholder": "Επιλογή {number}",
- "compose_form.poll.remove_option": "Αφαίρεση επιλογής",
"compose_form.poll.switch_to_multiple": "Ενημέρωση δημοσκόπησης με πολλαπλές επιλογές",
"compose_form.poll.switch_to_single": "Ενημέρωση δημοσκόπησης με μοναδική επιλογή",
- "compose_form.publish": "Δημοσίευση",
+ "compose_form.poll.type": "Στυλ",
+ "compose_form.publish": "Ανάρτηση",
"compose_form.publish_form": "Δημοσίευση",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Αποθήκευση αλλαγών",
- "compose_form.sensitive.hide": "{count, plural, one {Επισήμανση πολυμέσου ως ευαίσθητο} other {Επισήμανση πολυμέσων ως ευαίσθητα}}",
- "compose_form.sensitive.marked": "{count, plural, one {Το πολυμέσο έχει σημειωθεί ως ευαίσθητο} other {Τα πολυμέσα έχουν σημειωθεί ως ευαίσθητα}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Το πολυμέσο δεν έχει σημειωθεί ως ευαίσθητο} other {Τα πολυμέσα δεν έχουν σημειωθεί ως ευαίσθητα}}",
+ "compose_form.reply": "Απάντηση",
+ "compose_form.save_changes": "Ενημέρωση",
"compose_form.spoiler.marked": "Αφαίρεση προειδοποίηση περιεχομένου",
"compose_form.spoiler.unmarked": "Προσθήκη προειδοποίησης περιεχομένου",
- "compose_form.spoiler_placeholder": "Γράψε την προειδοποίησή σου εδώ",
+ "compose_form.spoiler_placeholder": "Προειδοποίηση περιεχομένου (προαιρετική)",
"confirmation_modal.cancel": "Άκυρο",
- "confirmations.block.block_and_report": "Αποκλεισμός & Αναφορά",
"confirmations.block.confirm": "Αποκλεισμός",
- "confirmations.block.message": "Σίγουρα θες να αποκλείσεις {name};",
"confirmations.cancel_follow_request.confirm": "Απόσυρση αιτήματος",
"confirmations.cancel_follow_request.message": "Είσαι σίγουρος/η ότι θέλεις να αποσύρεις το αίτημά σου να ακολουθείς τον/την {name};",
"confirmations.delete.confirm": "Διαγραφή",
@@ -165,15 +163,12 @@
"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": "Αν το επεξεργαστείς τώρα θα αντικατασταθεί το μήνυμα που συνθέτεις. Είσαι σίγουρος ότι θέλεις να συνεχίσεις;",
"confirmations.logout.confirm": "Αποσύνδεση",
"confirmations.logout.message": "Σίγουρα θέλεις να αποσυνδεθείς;",
"confirmations.mute.confirm": "Αποσιώπηση",
- "confirmations.mute.explanation": "Αυτό θα κρύψει τις δημοσιεύσεις τους και τις δημοσιεύσεις που τους αναφέρουν, αλλά θα συνεχίσουν να μπορούν να βλέπουν τις δημοσιεύσεις σου και να σε ακολουθούν.",
- "confirmations.mute.message": "Σίγουρα θες να αποσιωπήσεις {name};",
"confirmations.redraft.confirm": "Διαγραφή & ξαναγράψιμο",
"confirmations.redraft.message": "Σίγουρα θέλεις να σβήσεις αυτή την ανάρτηση και να την ξαναγράψεις; Οι προτιμήσεις και προωθήσεις θα χαθούν και οι απαντήσεις στην αρχική ανάρτηση θα μείνουν ορφανές.",
"confirmations.reply.confirm": "Απάντησε",
@@ -184,6 +179,7 @@
"conversation.mark_as_read": "Σήμανση ως αναγνωσμένο",
"conversation.open": "Προβολή συνομιλίας",
"conversation.with": "Με {names}",
+ "copy_icon_button.copied": "Αντιγράφηκε στο πρόχειρο",
"copypaste.copied": "Αντιγράφηκε",
"copypaste.copy_to_clipboard": "Αντιγραφή στο πρόχειρο",
"directory.federated": "Από το γνωστό fediverse",
@@ -288,12 +284,8 @@
"hashtag.column_settings.tag_toggle": "Προσθήκη επιπλέον ταμπελών για την κολώνα",
"hashtag.follow": "Παρακολούθηση ετικέτας",
"hashtag.unfollow": "Διακοπή παρακολούθησης ετικέτας",
- "home.actions.go_to_suggestions": "Βρείτε άτομα για να ακολουθήσετε",
- "home.column_settings.basic": "Βασικές ρυθμίσεις",
"home.column_settings.show_reblogs": "Εμφάνιση προωθήσεων",
"home.column_settings.show_replies": "Εμφάνιση απαντήσεων",
- "home.explore_prompt.body": "Your home feed will have a mix of posts from the hashtags you've chosen to follow, the people you've chosen to follow, and the posts they boost. If that feels too quiet, you may want to:\nΗ τροφοδοσία της αρχικής σελίδας σας είναι ένα μίγμα από αναρτήσεις με τις ετικέτες και τα άτομα που επιλέξατε να ακολουθείτε, και τις αναρτήσεις που προωθούν. Εάν αυτό σας φαίνεται πολύ ήσυχο, μπορεί να θέλετε:",
- "home.explore_prompt.title": "Αυτό είναι το σπίτι σας στο Mastodon.",
"home.hide_announcements": "Απόκρυψη ανακοινώσεων",
"home.pending_critical_update.link": "Δείτε ενημερώσεις",
"home.pending_critical_update.title": "Κρίσιμη ενημέρωση ασφαλείας διαθέσιμη!",
@@ -369,9 +361,6 @@
"loading_indicator.label": "Φόρτωση…",
"media_gallery.toggle_visible": "{number, plural, one {Απόκρυψη εικόνας} other {Απόκρυψη εικόνων}}",
"moved_to_account_banner.text": "Ο λογαριασμός σου {disabledAccount} είναι προσωρινά απενεργοποιημένος επειδή μεταφέρθηκες στον {movedToAccount}.",
- "mute_modal.duration": "Διάρκεια",
- "mute_modal.hide_notifications": "Απόκρυψη ειδοποιήσεων αυτού του χρήστη;",
- "mute_modal.indefinite": "Επ᾽ αόριστον",
"navigation_bar.about": "Σχετικά με",
"navigation_bar.blocks": "Αποκλεισμένοι χρήστες",
"navigation_bar.bookmarks": "Σελιδοδείκτες",
@@ -380,7 +369,6 @@
"navigation_bar.direct": "Ιδιωτικές επισημάνσεις",
"navigation_bar.discover": "Ανακάλυψη",
"navigation_bar.domain_blocks": "Αποκλεισμένοι τομείς",
- "navigation_bar.edit_profile": "Επεξεργασία προφίλ",
"navigation_bar.explore": "Εξερεύνηση",
"navigation_bar.filters": "Αποσιωπημένες λέξεις",
"navigation_bar.follow_requests": "Αιτήματα ακολούθησης",
@@ -414,9 +402,6 @@
"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.filter_bar.show_bar": "Εμφάνιση μπάρας φίλτρου",
"notifications.column_settings.follow": "Νέοι ακόλουθοι:",
"notifications.column_settings.follow_request": "Νέο αίτημα ακολούθησης:",
"notifications.column_settings.mention": "Επισημάνσεις:",
@@ -450,6 +435,12 @@
"onboarding.actions.go_to_home": "Πηγαίνετε στην αρχική σας ροή",
"onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
"onboarding.follows.title": "Δημοφιλή στο Mastodon",
+ "onboarding.profile.note": "Βιογραφικό",
+ "onboarding.profile.note_hint": "Μπορείτε να @αναφέρετε άλλα άτομα ή #hashtags…",
+ "onboarding.profile.save_and_continue": "Αποθήκευση και συνέχεια",
+ "onboarding.profile.title": "Ρύθμιση προφίλ",
+ "onboarding.profile.upload_avatar": "Μεταφόρτωση εικόνας προφίλ",
+ "onboarding.profile.upload_header": "Μεταφόρτωση κεφαλίδας προφίλ",
"onboarding.share.lead": "Let people know how they can find you on Mastodon!\nΕνημερώστε άλλα άτομα πώς μπορούν να σας βρουν στο Mastodon!",
"onboarding.share.next_steps": "Πιθανά επόμενα βήματα:",
"onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
@@ -458,6 +449,7 @@
"onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
"onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
"onboarding.steps.publish_status.body": "Say hello to the world.",
+ "onboarding.steps.publish_status.title": "Κάντε την πρώτη σας δημοσίευση",
"onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
"onboarding.steps.setup_profile.title": "Customize your profile",
"onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
@@ -467,6 +459,7 @@
"picture_in_picture.restore": "Βάλε το πίσω",
"poll.closed": "Κλειστή",
"poll.refresh": "Ανανέωση",
+ "poll.reveal": "Δείτε τα αποτελέσματα",
"poll.total_people": "{count, plural, one {# άτομο} other {# άτομα}}",
"poll.total_votes": "{count, plural, one {# ψήφος} other {# ψήφοι}}",
"poll.vote": "Ψήφισε",
@@ -475,16 +468,14 @@
"poll_button.add_poll": "Προσθήκη δημοσκόπησης",
"poll_button.remove_poll": "Αφαίρεση δημοσκόπησης",
"privacy.change": "Προσαρμογή ιδιωτικότητας ανάρτησης",
- "privacy.direct.long": "Δημοσίευση μόνο σε όσους επισημαίνονται",
- "privacy.direct.short": "Αναφερόμενα άτομα μόνο",
- "privacy.private.long": "Ορατό μόνο για τους ακολούθους",
- "privacy.private.short": "Μόνο ακόλουθοι",
- "privacy.public.long": "Ορατό σε όλους",
+ "privacy.direct.long": "Όλοι όσοι αναφέρθηκαν στη δημοσίευση",
+ "privacy.direct.short": "Συγκεκριμένα άτομα",
+ "privacy.private.long": "Μόνο οι ακόλουθοί σας",
+ "privacy.private.short": "Ακόλουθοι",
"privacy.public.short": "Δημόσιο",
- "privacy.unlisted.long": "Ορατό για όλους, εκτός αυτών που δεν συμμετέχουν σε δυνατότητες ανακάλυψης",
- "privacy.unlisted.short": "Μη καταχωρημένα",
"privacy_policy.last_updated": "Τελευταία ενημέρωση {date}",
"privacy_policy.title": "Πολιτική Απορρήτου",
+ "recommended": "Προτεινόμενα",
"refresh": "Ανανέωση",
"regeneration_indicator.label": "Φορτώνει…",
"regeneration_indicator.sublabel": "Η αρχική σου ροή ετοιμάζεται!",
@@ -500,8 +491,10 @@
"relative_time.seconds": "{number}δ",
"relative_time.today": "σήμερα",
"reply_indicator.cancel": "Άκυρο",
+ "reply_indicator.poll": "Δημοσκόπηση",
"report.block": "Αποκλεισμός",
"report.block_explanation": "Δεν θα βλέπεις τις αναρτήσεις του. Δεν θα μπορεί να δει τις αναρτήσεις σου ή να σε ακολουθήσει. Θα μπορεί να δει ότι έχει αποκλειστεί.",
+ "report.categories.legal": "Νομικό περιεχόμενο",
"report.categories.other": "Άλλες",
"report.categories.spam": "Ανεπιθύμητα",
"report.categories.violation": "Το περιεχόμενο παραβιάζει έναν ή περισσότερους κανόνες διακομιστή",
@@ -519,6 +512,8 @@
"report.placeholder": "Επιπλέον σχόλια",
"report.reasons.dislike": "Δεν μου αρέσει",
"report.reasons.dislike_description": "Δεν είναι κάτι που θα ήθελες να δεις",
+ "report.reasons.legal": "Είναι παράνομο",
+ "report.reasons.legal_description": "Πιστεύετε ότι παραβιάζει το νόμο της χώρας σας ή της χώρας του διακομιστή",
"report.reasons.other": "Είναι κάτι άλλο",
"report.reasons.other_description": "Το ζήτημα δεν ταιριάζει σε άλλες κατηγορίες",
"report.reasons.spam": "Είναι σπαμ",
@@ -552,10 +547,12 @@
"search.search_or_paste": "Αναζήτηση ή εισαγωγή URL",
"search_popout.quick_actions": "Γρήγορες ενέργειες",
"search_popout.recent": "Πρόσφατες αναζητήσεις",
+ "search_popout.user": "χρήστης",
"search_results.accounts": "Προφίλ",
"search_results.all": "Όλα",
"search_results.hashtags": "Ετικέτες",
"search_results.nothing_found": "Δεν βρέθηκε τίποτα με αυτούς τους όρους αναζήτησης",
+ "search_results.see_all": "Δες τα όλα",
"search_results.statuses": "Αναρτήσεις",
"search_results.title": "Αναζήτηση για {q}",
"server_banner.about_active_users": "Άτομα που χρησιμοποιούν αυτόν τον διακομιστή κατά τις τελευταίες 30 ημέρες (Μηνιαία Ενεργοί Χρήστες)",
@@ -566,6 +563,8 @@
"server_banner.server_stats": "Στατιστικά διακομιστή:",
"sign_in_banner.create_account": "Δημιουργία λογαριασμού",
"sign_in_banner.sign_in": "Σύνδεση",
+ "sign_in_banner.sso_redirect": "Συνδεθείτε ή Εγγραφείτε",
+ "sign_in_banner.text": "Συνδεθείτε για να ακολουθήσετε προφίλ ή ετικέτες, αγαπήστε, μοιραστείτε και απαντήστε σε δημοσιεύσεις. Μπορείτε επίσης να αλληλεπιδράσετε από τον λογαριασμό σας σε διαφορετικό διακομιστή.",
"status.admin_account": "Άνοιγμα διεπαφής συντονισμού για τον/την @{name}",
"status.admin_domain": "Άνοιγμα λειτουργίας διαμεσολάβησης για {domain}",
"status.admin_status": "Άνοιγμα αυτής της ανάρτησης σε διεπαφή συντονισμού",
@@ -579,9 +578,9 @@
"status.direct": "Ιδιωτική επισήμανση @{name}",
"status.direct_indicator": "Ιδιωτική επισήμανση",
"status.edit": "Επεξεργασία",
- "status.edited": "Επεξεργάστηκε στις {date}",
"status.edited_x_times": "Επεξεργάστηκε {count, plural, one {{count} φορά} other {{count} φορές}}",
"status.embed": "Ενσωμάτωσε",
+ "status.favourite": "Αγαπημένα",
"status.filter": "Φιλτράρισμα αυτής της ανάρτησης",
"status.filtered": "Φιλτραρισμένα",
"status.hide": "Απόκρυψη ανάρτησης",
@@ -646,10 +645,8 @@
"upload_error.poll": "Στις δημοσκοπήσεις δεν επιτρέπεται η μεταφόρτωση αρχείου.",
"upload_form.audio_description": "Περιγραφή για άτομα με προβλήματα ακοής",
"upload_form.description": "Περιγραφή για άτομα με προβλήματα όρασης",
- "upload_form.description_missing": "Δεν προστέθηκε περιγραφή",
"upload_form.edit": "Επεξεργασία",
"upload_form.thumbnail": "Αλλαγή μικρογραφίας",
- "upload_form.undo": "Διαγραφή",
"upload_form.video_description": "Περιγραφή για άτομα με προβλήματα ακοής ή όρασης",
"upload_modal.analyzing_picture": "Ανάλυση εικόνας…",
"upload_modal.apply": "Εφαρμογή",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 37e5efa5baddf6..e70348e0b2beff 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -32,6 +32,7 @@
"account.featured_tags.last_status_never": "No posts",
"account.featured_tags.title": "{name}'s featured hashtags",
"account.follow": "Follow",
+ "account.follow_back": "Follow back",
"account.followers": "Followers",
"account.followers.empty": "No one follows this user yet.",
"account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
@@ -52,6 +53,7 @@
"account.mute_notifications_short": "Mute notifications",
"account.mute_short": "Mute",
"account.muted": "Muted",
+ "account.mutual": "Mutual",
"account.no_bio": "No description provided.",
"account.open_original_page": "Open original page",
"account.posts": "Posts",
@@ -87,7 +89,14 @@
"announcement.announcement": "Announcement",
"attachments_list.unprocessed": "(unprocessed)",
"audio.hide": "Hide audio",
- "autosuggest_hashtag.per_week": "{count} per week",
+ "block_modal.remote_users_caveat": "We will ask the server {domain} to respect your decision. However, compliance is not guaranteed since some servers may handle blocks differently. Public posts may still be visible to non-logged-in users.",
+ "block_modal.show_less": "Show less",
+ "block_modal.show_more": "Show more",
+ "block_modal.they_cant_mention": "They can't mention or follow you.",
+ "block_modal.they_cant_see_posts": "They can't see your posts and you won't see theirs.",
+ "block_modal.they_will_know": "They can see that they're blocked.",
+ "block_modal.title": "Block user?",
+ "block_modal.you_wont_see_mentions": "You won't see posts that mention them.",
"boost_modal.combo": "You can press {combo} to skip this next time",
"bundle_column_error.copy_stacktrace": "Copy error report",
"bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
@@ -144,26 +153,22 @@
"compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
"compose_form.lock_disclaimer.lock": "locked",
"compose_form.placeholder": "What's on your mind?",
- "compose_form.poll.add_option": "Add a choice",
"compose_form.poll.duration": "Poll duration",
- "compose_form.poll.option_placeholder": "Choice {number}",
- "compose_form.poll.remove_option": "Remove this choice",
+ "compose_form.poll.multiple": "Multiple choice",
+ "compose_form.poll.option_placeholder": "Option {number}",
+ "compose_form.poll.single": "Pick one",
"compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
"compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
- "compose_form.publish": "Publish",
+ "compose_form.poll.type": "Style",
+ "compose_form.publish": "Post",
"compose_form.publish_form": "New post",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Save changes",
- "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
- "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
+ "compose_form.reply": "Reply",
+ "compose_form.save_changes": "Update",
"compose_form.spoiler.marked": "Remove content warning",
"compose_form.spoiler.unmarked": "Add content warning",
- "compose_form.spoiler_placeholder": "Write your warning here",
+ "compose_form.spoiler_placeholder": "Content warning (optional)",
"confirmation_modal.cancel": "Cancel",
- "confirmations.block.block_and_report": "Block & Report",
"confirmations.block.confirm": "Block",
- "confirmations.block.message": "Are you sure you want to block {name}?",
"confirmations.cancel_follow_request.confirm": "Withdraw request",
"confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
"confirmations.delete.confirm": "Delete",
@@ -172,15 +177,13 @@
"confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
"confirmations.discard_edit_media.confirm": "Discard",
"confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
- "confirmations.domain_block.confirm": "Block entire domain",
+ "confirmations.domain_block.confirm": "Block server",
"confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
"confirmations.edit.confirm": "Edit",
"confirmations.edit.message": "Editing now will overwrite the message you are currently composing. Are you sure you want to proceed?",
"confirmations.logout.confirm": "Log out",
"confirmations.logout.message": "Are you sure you want to log out?",
"confirmations.mute.confirm": "Mute",
- "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
- "confirmations.mute.message": "Are you sure you want to mute {name}?",
"confirmations.redraft.confirm": "Delete & redraft",
"confirmations.redraft.message": "Are you sure you want to delete this post and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
"confirmations.reply.confirm": "Reply",
@@ -206,6 +209,27 @@
"dismissable_banner.explore_statuses": "These are posts from across the social web that are gaining traction today. Newer posts with more boosts and favourites are ranked higher.",
"dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralised network right now.",
"dismissable_banner.public_timeline": "These are the most recent public posts from people on the social web that people on {domain} follow.",
+ "domain_block_modal.block": "Block server",
+ "domain_block_modal.block_account_instead": "Block @{name} instead",
+ "domain_block_modal.they_can_interact_with_old_posts": "People from this server can interact with your old posts.",
+ "domain_block_modal.they_cant_follow": "Nobody from this server can follow you.",
+ "domain_block_modal.they_wont_know": "They won't know they've been blocked.",
+ "domain_block_modal.title": "Block domain?",
+ "domain_block_modal.you_will_lose_followers": "All your followers from this server will be removed.",
+ "domain_block_modal.you_wont_see_posts": "You won't see posts or notifications from users on this server.",
+ "domain_pill.activitypub_lets_connect": "It lets you connect and interact with people not just on Mastodon, but across different social apps too.",
+ "domain_pill.activitypub_like_language": "ActivityPub is like the language Mastodon speaks with other social networks.",
+ "domain_pill.server": "Server",
+ "domain_pill.their_handle": "Their handle:",
+ "domain_pill.their_server": "Their digital home, where all of their posts live.",
+ "domain_pill.their_username": "Their unique identifier on their server. It’s possible to find users with the same username on different servers.",
+ "domain_pill.username": "Username",
+ "domain_pill.whats_in_a_handle": "What's in a handle?",
+ "domain_pill.who_they_are": "Since handles say who someone is and where they are, you can interact with people across the social web of .",
+ "domain_pill.who_you_are": "Because your handle says who you are and where you are, people can interact with you across the social web of .",
+ "domain_pill.your_handle": "Your handle:",
+ "domain_pill.your_server": "Your digital home, where all of your posts live. Don’t like this one? Transfer servers at any time and bring your followers, too.",
+ "domain_pill.your_username": "Your unique identifier on this server. It’s possible to find users with the same username on different servers.",
"embed.instructions": "Embed this post on your website by copying the code below.",
"embed.preview": "Here is what it will look like:",
"emoji_button.activity": "Activity",
@@ -242,6 +266,7 @@
"empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
"empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
"empty_column.mutes": "You haven't muted any users yet.",
+ "empty_column.notification_requests": "All clear! There is nothing here. When you receive new notifications, they will appear here according to your settings.",
"empty_column.notifications": "You don't have any notifications yet. When other people interact with you, you will see it here.",
"empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
"error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
@@ -272,12 +297,30 @@
"filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
"filter_modal.select_filter.title": "Filter this post",
"filter_modal.title.status": "Filter a post",
+ "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentions}}",
+ "filtered_notifications_banner.pending_requests": "Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know",
+ "filtered_notifications_banner.title": "Filtered notifications",
"firehose.all": "All",
"firehose.local": "This server",
"firehose.remote": "Other servers",
"follow_request.authorize": "Authorise",
"follow_request.reject": "Reject",
"follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+ "follow_suggestions.curated_suggestion": "Staff pick",
+ "follow_suggestions.dismiss": "Don't show again",
+ "follow_suggestions.featured_longer": "Hand-picked by the {domain} team",
+ "follow_suggestions.friends_of_friends_longer": "Popular among people you follow",
+ "follow_suggestions.hints.featured": "This profile has been hand-picked by the {domain} team.",
+ "follow_suggestions.hints.friends_of_friends": "This profile is popular among the people you follow.",
+ "follow_suggestions.hints.most_followed": "This profile is one of the most followed on {domain}.",
+ "follow_suggestions.hints.most_interactions": "This profile has been recently getting a lot of attention on {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "This profile is similar to the profiles you have most recently followed.",
+ "follow_suggestions.personalized_suggestion": "Personalised suggestion",
+ "follow_suggestions.popular_suggestion": "Popular suggestion",
+ "follow_suggestions.popular_suggestion_longer": "Popular on {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Similar to profiles you recently followed",
+ "follow_suggestions.view_all": "View all",
+ "follow_suggestions.who_to_follow": "Who to follow",
"followed_tags": "Followed hashtags",
"footer.about": "About",
"footer.directory": "Profiles directory",
@@ -303,14 +346,9 @@
"hashtag.counter_by_uses_today": "{count, plural, one {{counter} post} other {{counter} posts}} today",
"hashtag.follow": "Follow hashtag",
"hashtag.unfollow": "Unfollow hashtag",
- "hashtags.and_other": "…and {count, plural, one {}other {# more}}",
- "home.actions.go_to_explore": "See what's trending",
- "home.actions.go_to_suggestions": "Find people to follow",
- "home.column_settings.basic": "Basic",
+ "hashtags.and_other": "…and {count, plural, one {one more} other {# more}}",
"home.column_settings.show_reblogs": "Show boosts",
"home.column_settings.show_replies": "Show replies",
- "home.explore_prompt.body": "Your home feed will have a mix of posts from the hashtags you've chosen to follow, the people you've chosen to follow, and the posts they boost. If that feels too quiet, you may want to:",
- "home.explore_prompt.title": "This is your home base within Mastodon.",
"home.hide_announcements": "Hide announcements",
"home.pending_critical_update.body": "Please update your Mastodon server as soon as possible!",
"home.pending_critical_update.link": "See updates",
@@ -394,9 +432,15 @@
"loading_indicator.label": "Loading…",
"media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
"moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
- "mute_modal.duration": "Duration",
- "mute_modal.hide_notifications": "Hide notifications from this user?",
- "mute_modal.indefinite": "Indefinite",
+ "mute_modal.hide_from_notifications": "Hide from notifications",
+ "mute_modal.hide_options": "Hide options",
+ "mute_modal.indefinite": "Until I unmute them",
+ "mute_modal.show_options": "Show options",
+ "mute_modal.they_can_mention_and_follow": "They can mention and follow you, but you won't see them.",
+ "mute_modal.they_wont_know": "They won't know they've been muted.",
+ "mute_modal.title": "Mute user?",
+ "mute_modal.you_wont_see_mentions": "You won't see posts that mention them.",
+ "mute_modal.you_wont_see_posts": "They can still see your posts, but you won't see theirs.",
"navigation_bar.about": "About",
"navigation_bar.advanced_interface": "Open in advanced web interface",
"navigation_bar.blocks": "Blocked users",
@@ -406,7 +450,6 @@
"navigation_bar.direct": "Private mentions",
"navigation_bar.discover": "Discover",
"navigation_bar.domain_blocks": "Blocked domains",
- "navigation_bar.edit_profile": "Edit profile",
"navigation_bar.explore": "Explore",
"navigation_bar.favourites": "Favourites",
"navigation_bar.filters": "Muted words",
@@ -430,11 +473,29 @@
"notification.follow": "{name} followed you",
"notification.follow_request": "{name} has requested to follow you",
"notification.mention": "{name} mentioned you",
+ "notification.moderation-warning.learn_more": "Learn more",
+ "notification.moderation_warning": "You have received a moderation warning",
+ "notification.moderation_warning.action_delete_statuses": "Some of your posts have been removed.",
+ "notification.moderation_warning.action_disable": "Your account has been disabled.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Some of your posts have been marked as sensitive.",
+ "notification.moderation_warning.action_none": "Your account has received a moderation warning.",
+ "notification.moderation_warning.action_sensitive": "Your posts will be marked as sensitive from now on.",
+ "notification.moderation_warning.action_silence": "Your account has been limited.",
+ "notification.moderation_warning.action_suspend": "Your account has been suspended.",
"notification.own_poll": "Your poll has ended",
"notification.poll": "A poll you have voted in has ended",
"notification.reblog": "{name} boosted your status",
+ "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",
+ "notification_requests.dismiss": "Dismiss",
+ "notification_requests.notifications_from": "Notifications from {name}",
+ "notification_requests.title": "Filtered notifications",
"notifications.clear": "Clear notifications",
"notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
"notifications.column_settings.admin.report": "New reports:",
@@ -443,7 +504,6 @@
"notifications.column_settings.favourite": "Favourites:",
"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.column_settings.follow": "New followers:",
"notifications.column_settings.follow_request": "New follow requests:",
"notifications.column_settings.mention": "Mentions:",
@@ -469,6 +529,15 @@
"notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
"notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
"notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+ "notifications.policy.filter_new_accounts.hint": "Created within the past {days, plural, one {one day} other {# days}}",
+ "notifications.policy.filter_new_accounts_title": "New accounts",
+ "notifications.policy.filter_not_followers_hint": "Including people who have been following you fewer than {days, plural, one {one day} other {# days}}",
+ "notifications.policy.filter_not_followers_title": "People not following you",
+ "notifications.policy.filter_not_following_hint": "Until you manually approve them",
+ "notifications.policy.filter_not_following_title": "People you don't follow",
+ "notifications.policy.filter_private_mentions_hint": "Filtered unless it's in reply to your own mention or if you follow the sender",
+ "notifications.policy.filter_private_mentions_title": "Unsolicited private mentions",
+ "notifications.policy.title": "Filter out notifications from…",
"notifications_permission_banner.enable": "Enable desktop notifications",
"notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
"notifications_permission_banner.title": "Never miss a thing",
@@ -524,14 +593,15 @@
"poll_button.add_poll": "Add a poll",
"poll_button.remove_poll": "Remove poll",
"privacy.change": "Change post privacy",
- "privacy.direct.long": "Visible for mentioned users only",
- "privacy.direct.short": "Mentioned people only",
- "privacy.private.long": "Visible for followers only",
- "privacy.private.short": "Followers-only",
- "privacy.public.long": "Visible for all",
+ "privacy.direct.long": "Everyone mentioned in the post",
+ "privacy.direct.short": "Specific people",
+ "privacy.private.long": "Only your followers",
+ "privacy.private.short": "Followers",
+ "privacy.public.long": "Anyone on and off Mastodon",
"privacy.public.short": "Public",
- "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
- "privacy.unlisted.short": "Unlisted",
+ "privacy.unlisted.additional": "This behaves exactly like public, except the post will not appear in live feeds or hashtags, explore, or Mastodon search, even if you are opted-in account-wide.",
+ "privacy.unlisted.long": "Fewer algorithmic fanfares",
+ "privacy.unlisted.short": "Quiet public",
"privacy_policy.last_updated": "Last updated {date}",
"privacy_policy.title": "Privacy Policy",
"recommended": "Recommended",
@@ -549,7 +619,9 @@
"relative_time.minutes": "{number}m",
"relative_time.seconds": "{number}s",
"relative_time.today": "today",
+ "reply_indicator.attachments": "{count, plural, one {# attachment} other {# attachments}}",
"reply_indicator.cancel": "Cancel",
+ "reply_indicator.poll": "Poll",
"report.block": "Block",
"report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
"report.categories.legal": "Legal",
@@ -642,10 +714,11 @@
"status.direct": "Privately mention @{name}",
"status.direct_indicator": "Private mention",
"status.edit": "Edit",
- "status.edited": "Edited {date}",
+ "status.edited": "Last edited {date}",
"status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
"status.embed": "Embed",
"status.favourite": "Favourite",
+ "status.favourites": "{count, plural, one {favorite} other {favorites}}",
"status.filter": "Filter this post",
"status.filtered": "Filtered",
"status.hide": "Hide post",
@@ -666,6 +739,7 @@
"status.reblog": "Boost",
"status.reblog_private": "Boost with original visibility",
"status.reblogged_by": "{name} boosted",
+ "status.reblogs": "{count, plural, one {boost} other {boosts}}",
"status.reblogs.empty": "No one has boosted this post yet. When someone does, they will show up here.",
"status.redraft": "Delete & re-draft",
"status.remove_bookmark": "Remove bookmark",
@@ -713,10 +787,8 @@
"upload_error.poll": "File upload not allowed with polls.",
"upload_form.audio_description": "Describe for people who are deaf or hard of hearing",
"upload_form.description": "Describe for people who are blind or have low vision",
- "upload_form.description_missing": "No description added",
"upload_form.edit": "Edit",
"upload_form.thumbnail": "Change thumbnail",
- "upload_form.undo": "Delete",
"upload_form.video_description": "Describe for people who are deaf, hard of hearing, blind or have low vision",
"upload_modal.analyzing_picture": "Analysing picture…",
"upload_modal.apply": "Apply",
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index be7209d04ad083..63298d59e3aa5e 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -89,7 +89,14 @@
"announcement.announcement": "Announcement",
"attachments_list.unprocessed": "(unprocessed)",
"audio.hide": "Hide audio",
- "autosuggest_hashtag.per_week": "{count} per week",
+ "block_modal.remote_users_caveat": "We will ask the server {domain} to respect your decision. However, compliance is not guaranteed since some servers may handle blocks differently. Public posts may still be visible to non-logged-in users.",
+ "block_modal.show_less": "Show less",
+ "block_modal.show_more": "Show more",
+ "block_modal.they_cant_mention": "They can't mention or follow you.",
+ "block_modal.they_cant_see_posts": "They can't see your posts and you won't see theirs.",
+ "block_modal.they_will_know": "They can see that they're blocked.",
+ "block_modal.title": "Block user?",
+ "block_modal.you_wont_see_mentions": "You won't see posts that mention them.",
"boost_modal.combo": "You can press {combo} to skip this next time",
"bundle_column_error.copy_stacktrace": "Copy error report",
"bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
"compose_form.lock_disclaimer.lock": "locked",
"compose_form.placeholder": "What's on your mind?",
- "compose_form.poll.add_option": "Add a choice",
"compose_form.poll.duration": "Poll duration",
- "compose_form.poll.option_placeholder": "Choice {number}",
- "compose_form.poll.remove_option": "Remove this choice",
+ "compose_form.poll.multiple": "Multiple choice",
+ "compose_form.poll.option_placeholder": "Option {number}",
+ "compose_form.poll.single": "Pick one",
"compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
"compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
- "compose_form.publish": "Publish",
+ "compose_form.poll.type": "Style",
+ "compose_form.publish": "Post",
"compose_form.publish_form": "New post",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Save changes",
- "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
- "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
+ "compose_form.reply": "Reply",
+ "compose_form.save_changes": "Update",
"compose_form.spoiler.marked": "Remove content warning",
"compose_form.spoiler.unmarked": "Add content warning",
- "compose_form.spoiler_placeholder": "Write your warning here",
+ "compose_form.spoiler_placeholder": "Content warning (optional)",
"confirmation_modal.cancel": "Cancel",
- "confirmations.block.block_and_report": "Block & Report",
"confirmations.block.confirm": "Block",
- "confirmations.block.message": "Are you sure you want to block {name}?",
"confirmations.cancel_follow_request.confirm": "Withdraw request",
"confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
"confirmations.delete.confirm": "Delete",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
"confirmations.discard_edit_media.confirm": "Discard",
"confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
- "confirmations.domain_block.confirm": "Block entire domain",
+ "confirmations.domain_block.confirm": "Block server",
"confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
"confirmations.edit.confirm": "Edit",
"confirmations.edit.message": "Editing now will overwrite the message you are currently composing. Are you sure you want to proceed?",
"confirmations.logout.confirm": "Log out",
"confirmations.logout.message": "Are you sure you want to log out?",
"confirmations.mute.confirm": "Mute",
- "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
- "confirmations.mute.message": "Are you sure you want to mute {name}?",
"confirmations.redraft.confirm": "Delete & redraft",
"confirmations.redraft.message": "Are you sure you want to delete this post and re-draft it? Favorites and boosts will be lost, and replies to the original post will be orphaned.",
"confirmations.reply.confirm": "Reply",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "These are posts from across the social web that are gaining traction today. Newer posts with more boosts and favorites are ranked higher.",
"dismissable_banner.explore_tags": "These are hashtags that are gaining traction on the social web today. Hashtags that are used by more different people are ranked higher.",
"dismissable_banner.public_timeline": "These are the most recent public posts from people on the social web that people on {domain} follow.",
+ "domain_block_modal.block": "Block server",
+ "domain_block_modal.block_account_instead": "Block @{name} instead",
+ "domain_block_modal.they_can_interact_with_old_posts": "People from this server can interact with your old posts.",
+ "domain_block_modal.they_cant_follow": "Nobody from this server can follow you.",
+ "domain_block_modal.they_wont_know": "They won't know they've been blocked.",
+ "domain_block_modal.title": "Block domain?",
+ "domain_block_modal.you_will_lose_followers": "All your followers from this server will be removed.",
+ "domain_block_modal.you_wont_see_posts": "You won't see posts or notifications from users on this server.",
+ "domain_pill.activitypub_lets_connect": "It lets you connect and interact with people not just on Mastodon, but across different social apps too.",
+ "domain_pill.activitypub_like_language": "ActivityPub is like the language Mastodon speaks with other social networks.",
+ "domain_pill.server": "Server",
+ "domain_pill.their_handle": "Their handle:",
+ "domain_pill.their_server": "Their digital home, where all of their posts live.",
+ "domain_pill.their_username": "Their unique identifier on their server. It’s possible to find users with the same username on different servers.",
+ "domain_pill.username": "Username",
+ "domain_pill.whats_in_a_handle": "What's in a handle?",
+ "domain_pill.who_they_are": "Since handles say who someone is and where they are, you can interact with people across the social web of .",
+ "domain_pill.who_you_are": "Because your handle says who you are and where you are, people can interact with you across the social web of .",
+ "domain_pill.your_handle": "Your handle:",
+ "domain_pill.your_server": "Your digital home, where all of your posts live. Don’t like this one? Transfer servers at any time and bring your followers, too.",
+ "domain_pill.your_username": "Your unique identifier on this server. It’s possible to find users with the same username on different servers.",
"embed.instructions": "Embed this post on your website by copying the code below.",
"embed.preview": "Here is what it will look like:",
"emoji_button.activity": "Activity",
@@ -244,6 +266,7 @@
"empty_column.list": "There is nothing in this list yet. When members of this list publish new posts, they will appear here.",
"empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
"empty_column.mutes": "You haven't muted any users yet.",
+ "empty_column.notification_requests": "All clear! There is nothing here. When you receive new notifications, they will appear here according to your settings.",
"empty_column.notifications": "You don't have any notifications yet. When other people interact with you, you will see it here.",
"empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
"error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
"filter_modal.select_filter.title": "Filter this post",
"filter_modal.title.status": "Filter a post",
+ "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentions}}",
+ "filtered_notifications_banner.pending_requests": "Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know",
+ "filtered_notifications_banner.title": "Filtered notifications",
"firehose.all": "All",
"firehose.local": "This server",
"firehose.remote": "Other servers",
"follow_request.authorize": "Authorize",
"follow_request.reject": "Reject",
"follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+ "follow_suggestions.curated_suggestion": "Staff pick",
+ "follow_suggestions.dismiss": "Don't show again",
+ "follow_suggestions.featured_longer": "Hand-picked by the {domain} team",
+ "follow_suggestions.friends_of_friends_longer": "Popular among people you follow",
+ "follow_suggestions.hints.featured": "This profile has been hand-picked by the {domain} team.",
+ "follow_suggestions.hints.friends_of_friends": "This profile is popular among the people you follow.",
+ "follow_suggestions.hints.most_followed": "This profile is one of the most followed on {domain}.",
+ "follow_suggestions.hints.most_interactions": "This profile has been recently getting a lot of attention on {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "This profile is similar to the profiles you have most recently followed.",
+ "follow_suggestions.personalized_suggestion": "Personalized suggestion",
+ "follow_suggestions.popular_suggestion": "Popular suggestion",
+ "follow_suggestions.popular_suggestion_longer": "Popular on {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Similar to profiles you recently followed",
+ "follow_suggestions.view_all": "View all",
+ "follow_suggestions.who_to_follow": "Who to follow",
"followed_tags": "Followed hashtags",
"footer.about": "About",
"footer.directory": "Profiles directory",
@@ -306,13 +347,8 @@
"hashtag.follow": "Follow hashtag",
"hashtag.unfollow": "Unfollow hashtag",
"hashtags.and_other": "…and {count, plural, other {# more}}",
- "home.actions.go_to_explore": "See what's trending",
- "home.actions.go_to_suggestions": "Find people to follow",
- "home.column_settings.basic": "Basic",
"home.column_settings.show_reblogs": "Show boosts",
"home.column_settings.show_replies": "Show replies",
- "home.explore_prompt.body": "Your home feed will have a mix of posts from the hashtags you've chosen to follow, the people you've chosen to follow, and the posts they boost. If that feels too quiet, you may want to:",
- "home.explore_prompt.title": "This is your home base within Mastodon.",
"home.hide_announcements": "Hide announcements",
"home.pending_critical_update.body": "Please update your Mastodon server as soon as possible!",
"home.pending_critical_update.link": "See updates",
@@ -378,6 +414,7 @@
"limited_account_hint.action": "Show profile anyway",
"limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
"link_preview.author": "By {name}",
+ "link_preview.more_from_author": "More from {name}",
"lists.account.add": "Add to list",
"lists.account.remove": "Remove from list",
"lists.delete": "Delete list",
@@ -396,9 +433,15 @@
"loading_indicator.label": "Loading…",
"media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
"moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
- "mute_modal.duration": "Duration",
- "mute_modal.hide_notifications": "Hide notifications from this user?",
- "mute_modal.indefinite": "Indefinite",
+ "mute_modal.hide_from_notifications": "Hide from notifications",
+ "mute_modal.hide_options": "Hide options",
+ "mute_modal.indefinite": "Until I unmute them",
+ "mute_modal.show_options": "Show options",
+ "mute_modal.they_can_mention_and_follow": "They can mention and follow you, but you won't see them.",
+ "mute_modal.they_wont_know": "They won't know they've been muted.",
+ "mute_modal.title": "Mute user?",
+ "mute_modal.you_wont_see_mentions": "You won't see posts that mention them.",
+ "mute_modal.you_wont_see_posts": "They can still see your posts, but you won't see theirs.",
"navigation_bar.about": "About",
"navigation_bar.advanced_interface": "Open in advanced web interface",
"navigation_bar.blocks": "Blocked users",
@@ -408,7 +451,6 @@
"navigation_bar.direct": "Private mentions",
"navigation_bar.discover": "Discover",
"navigation_bar.domain_blocks": "Blocked domains",
- "navigation_bar.edit_profile": "Edit profile",
"navigation_bar.explore": "Explore",
"navigation_bar.favourites": "Favorites",
"navigation_bar.filters": "Muted words",
@@ -432,11 +474,29 @@
"notification.follow": "{name} followed you",
"notification.follow_request": "{name} has requested to follow you",
"notification.mention": "{name} mentioned you",
+ "notification.moderation-warning.learn_more": "Learn more",
+ "notification.moderation_warning": "You have received a moderation warning",
+ "notification.moderation_warning.action_delete_statuses": "Some of your posts have been removed.",
+ "notification.moderation_warning.action_disable": "Your account has been disabled.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Some of your posts have been marked as sensitive.",
+ "notification.moderation_warning.action_none": "Your account has received a moderation warning.",
+ "notification.moderation_warning.action_sensitive": "Your posts will be marked as sensitive from now on.",
+ "notification.moderation_warning.action_silence": "Your account has been limited.",
+ "notification.moderation_warning.action_suspend": "Your account has been suspended.",
"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",
+ "notification_requests.dismiss": "Dismiss",
+ "notification_requests.notifications_from": "Notifications from {name}",
+ "notification_requests.title": "Filtered notifications",
"notifications.clear": "Clear notifications",
"notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
"notifications.column_settings.admin.report": "New reports:",
@@ -445,7 +505,6 @@
"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.filter_bar.show_bar": "Show filter bar",
"notifications.column_settings.follow": "New followers:",
"notifications.column_settings.follow_request": "New follow requests:",
"notifications.column_settings.mention": "Mentions:",
@@ -471,6 +530,15 @@
"notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
"notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
"notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+ "notifications.policy.filter_new_accounts.hint": "Created within the past {days, plural, one {one day} other {# days}}",
+ "notifications.policy.filter_new_accounts_title": "New accounts",
+ "notifications.policy.filter_not_followers_hint": "Including people who have been following you fewer than {days, plural, one {one day} other {# days}}",
+ "notifications.policy.filter_not_followers_title": "People not following you",
+ "notifications.policy.filter_not_following_hint": "Until you manually approve them",
+ "notifications.policy.filter_not_following_title": "People you don't follow",
+ "notifications.policy.filter_private_mentions_hint": "Filtered unless it's in reply to your own mention or if you follow the sender",
+ "notifications.policy.filter_private_mentions_title": "Unsolicited private mentions",
+ "notifications.policy.title": "Filter out notifications from…",
"notifications_permission_banner.enable": "Enable desktop notifications",
"notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
"notifications_permission_banner.title": "Never miss a thing",
@@ -526,14 +594,15 @@
"poll_button.add_poll": "Add a poll",
"poll_button.remove_poll": "Remove poll",
"privacy.change": "Change post privacy",
- "privacy.direct.long": "Visible for mentioned users only",
- "privacy.direct.short": "Mentioned people only",
- "privacy.private.long": "Visible for followers only",
- "privacy.private.short": "Followers only",
- "privacy.public.long": "Visible for all",
+ "privacy.direct.long": "Everyone mentioned in the post",
+ "privacy.direct.short": "Specific people",
+ "privacy.private.long": "Only your followers",
+ "privacy.private.short": "Followers",
+ "privacy.public.long": "Anyone on and off Mastodon",
"privacy.public.short": "Public",
- "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
- "privacy.unlisted.short": "Unlisted",
+ "privacy.unlisted.additional": "This behaves exactly like public, except the post will not appear in live feeds or hashtags, explore, or Mastodon search, even if you are opted-in account-wide.",
+ "privacy.unlisted.long": "Fewer algorithmic fanfares",
+ "privacy.unlisted.short": "Quiet public",
"privacy_policy.last_updated": "Last updated {date}",
"privacy_policy.title": "Privacy Policy",
"recommended": "Recommended",
@@ -551,7 +620,9 @@
"relative_time.minutes": "{number}m",
"relative_time.seconds": "{number}s",
"relative_time.today": "today",
+ "reply_indicator.attachments": "{count, plural, one {# attachment} other {# attachments}}",
"reply_indicator.cancel": "Cancel",
+ "reply_indicator.poll": "Poll",
"report.block": "Block",
"report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
"report.categories.legal": "Legal",
@@ -644,10 +715,11 @@
"status.direct": "Privately mention @{name}",
"status.direct_indicator": "Private mention",
"status.edit": "Edit",
- "status.edited": "Edited {date}",
+ "status.edited": "Last edited {date}",
"status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
"status.embed": "Embed",
"status.favourite": "Favorite",
+ "status.favourites": "{count, plural, one {favorite} other {favorites}}",
"status.filter": "Filter this post",
"status.filtered": "Filtered",
"status.hide": "Hide post",
@@ -668,6 +740,7 @@
"status.reblog": "Boost",
"status.reblog_private": "Boost with original visibility",
"status.reblogged_by": "{name} boosted",
+ "status.reblogs": "{count, plural, one {boost} other {boosts}}",
"status.reblogs.empty": "No one has boosted this post yet. When someone does, they will show up here.",
"status.redraft": "Delete & re-draft",
"status.remove_bookmark": "Remove bookmark",
@@ -715,10 +788,8 @@
"upload_error.poll": "File upload not allowed with polls.",
"upload_form.audio_description": "Describe for people who are deaf or hard of hearing",
"upload_form.description": "Describe for people who are blind or have low vision",
- "upload_form.description_missing": "No description added",
"upload_form.edit": "Edit",
"upload_form.thumbnail": "Change thumbnail",
- "upload_form.undo": "Delete",
"upload_form.video_description": "Describe for people who are deaf, hard of hearing, blind or have low vision",
"upload_modal.analyzing_picture": "Analyzing picture…",
"upload_modal.apply": "Apply",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 643329ba993215..6e7885f485bc90 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -89,7 +89,6 @@
"announcement.announcement": "Anoncoj",
"attachments_list.unprocessed": "(neprilaborita)",
"audio.hide": "Kaŝi aŭdion",
- "autosuggest_hashtag.per_week": "po {count} por semajno",
"boost_modal.combo": "Vi povas premi {combo} por preterpasi sekvafoje",
"bundle_column_error.copy_stacktrace": "Kopii la eraran raporton",
"bundle_column_error.error.body": "La petita paĝo ne povas redonitis. Eble estas eraro.",
@@ -116,7 +115,7 @@
"column.directory": "Foliumi la profilojn",
"column.domain_blocks": "Blokitaj domajnoj",
"column.favourites": "Stelumoj",
- "column.firehose": "Vivantaj fluoj",
+ "column.firehose": "Rektaj fluoj",
"column.follow_requests": "Petoj de sekvado",
"column.home": "Hejmo",
"column.lists": "Listoj",
@@ -146,26 +145,14 @@
"compose_form.lock_disclaimer": "Via konto ne estas {locked}. Iu ajn povas sekvi vin por vidi viajn afiŝojn nur al la sekvantoj.",
"compose_form.lock_disclaimer.lock": "ŝlosita",
"compose_form.placeholder": "Kion vi pensas?",
- "compose_form.poll.add_option": "Aldoni elekteblon",
"compose_form.poll.duration": "Daŭro de la balotenketo",
- "compose_form.poll.option_placeholder": "Elekteblo {number}",
- "compose_form.poll.remove_option": "Forigi ĉi tiu elekteblon",
"compose_form.poll.switch_to_multiple": "Ŝanĝi la balotenketon por permesi multajn elektojn",
"compose_form.poll.switch_to_single": "Ŝanĝi la balotenketon por permesi unu solan elekton",
- "compose_form.publish": "Afiŝi",
"compose_form.publish_form": "Afiŝi",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Konservi ŝanĝojn",
- "compose_form.sensitive.hide": "{count, plural, one {Marki la plurmedio kiel tikla} other {Marki la plurmedioj kiel tiklaj}}",
- "compose_form.sensitive.marked": "{count, plural, one {La plurmedio estas markita kiel tikla} other {La plurmedioj estas markitaj kiel tiklaj}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {La plurmedio ne estas markita kiel tikla} other {La plurmedioj ne estas markitaj kiel tiklaj}}",
"compose_form.spoiler.marked": "Forigi la averton de enhavo",
"compose_form.spoiler.unmarked": "Aldoni averton de enhavo",
- "compose_form.spoiler_placeholder": "Skribu vian averton ĉi tie",
"confirmation_modal.cancel": "Nuligi",
- "confirmations.block.block_and_report": "Bloki kaj raporti",
"confirmations.block.confirm": "Bloki",
- "confirmations.block.message": "Ĉu vi certas, ke vi volas bloki {name}?",
"confirmations.cancel_follow_request.confirm": "Eksigi peton",
"confirmations.cancel_follow_request.message": "Ĉu vi certas ke vi volas eksigi vian peton por sekvi {name}?",
"confirmations.delete.confirm": "Forigi",
@@ -174,15 +161,12 @@
"confirmations.delete_list.message": "Ĉu vi certas, ke vi volas porĉiame forigi ĉi tiun liston?",
"confirmations.discard_edit_media.confirm": "Forĵeti",
"confirmations.discard_edit_media.message": "Vi havas nekonservitajn ŝanĝojn de la priskribo aŭ la antaŭmontro de la plurmedio, ĉu vi forĵetu ilin malgraŭe?",
- "confirmations.domain_block.confirm": "Bloki la tutan domajnon",
"confirmations.domain_block.message": "Ĉu vi vere, vere certas, ke vi volas tute bloki {domain}? Plej ofte, trafa blokado kaj silentigado sufiĉas kaj preferindas. Vi ne vidos enhavon de tiu domajno en publika templinio aŭ en viaj sciigoj. Viaj sekvantoj de tiu domajno estos forigitaj.",
"confirmations.edit.confirm": "Redakti",
"confirmations.edit.message": "Redakti nun anstataŭigos la skribatan afiŝon. Ĉu vi certas, ke vi volas daŭrigi?",
"confirmations.logout.confirm": "Adiaŭi",
"confirmations.logout.message": "Ĉu vi certas ke vi volas adiaŭi?",
"confirmations.mute.confirm": "Silentigi",
- "confirmations.mute.explanation": "Tio kaŝos la mesaĝojn de la uzanto kaj la mesaĝojn kiuj mencias rin, sed ri ankoraŭ rajtos vidi viajn mesaĝojn kaj sekvi vin.",
- "confirmations.mute.message": "Ĉu vi certas, ke vi volas silentigi {name}?",
"confirmations.redraft.confirm": "Forigi kaj reskribi",
"confirmations.redraft.message": "Ĉu vi certas ke vi volas forigi tiun afiŝon kaj reskribi ĝin? Ĉiuj diskonigoj kaj stelumoj estos perditaj, kaj respondoj al la originala mesaĝo estos senparentaj.",
"confirmations.reply.confirm": "Respondi",
@@ -306,13 +290,8 @@
"hashtag.follow": "Sekvi la kradvorton",
"hashtag.unfollow": "Ne plu sekvi la kradvorton",
"hashtags.and_other": "…kaj {count, plural,other {# pli}}",
- "home.actions.go_to_explore": "Vidi kio populariĝas",
- "home.actions.go_to_suggestions": "Trovi homojn por sekvi",
- "home.column_settings.basic": "Bazaj agordoj",
"home.column_settings.show_reblogs": "Montri diskonigojn",
"home.column_settings.show_replies": "Montri respondojn",
- "home.explore_prompt.body": "Via hejmafiŝaro havos miksitajn afiŝojn de kradvortoj kiujn vi elektis sekvi, personoj kiujn vi elektis sekvi, kaj afiŝoj kiujn ili suprenigis.",
- "home.explore_prompt.title": "Ĉi tio estas via hejma paĝo en Mastodon.",
"home.hide_announcements": "Kaŝi la anoncojn",
"home.pending_critical_update.body": "Ĝisdatigu vian servilon de Mastodon kiel eble plej baldau!",
"home.pending_critical_update.link": "Vidi ĝisdatigojn",
@@ -396,9 +375,6 @@
"loading_indicator.label": "Ŝargado…",
"media_gallery.toggle_visible": "{number, plural, one {Kaŝi la bildon} other {Kaŝi la bildojn}}",
"moved_to_account_banner.text": "Via konto {disabledAccount} estas malvalidigita ĉar vi movis ĝin al {movedToAccount}.",
- "mute_modal.duration": "Daŭro",
- "mute_modal.hide_notifications": "Ĉu vi volas kaŝi la sciigojn de ĉi tiu uzanto?",
- "mute_modal.indefinite": "Nedifinita",
"navigation_bar.about": "Pri",
"navigation_bar.advanced_interface": "Malfermi altnivelan retpaĝan interfacon",
"navigation_bar.blocks": "Blokitaj uzantoj",
@@ -408,7 +384,6 @@
"navigation_bar.direct": "Privataj mencioj",
"navigation_bar.discover": "Esplori",
"navigation_bar.domain_blocks": "Blokitaj domajnoj",
- "navigation_bar.edit_profile": "Redakti profilon",
"navigation_bar.explore": "Esplori",
"navigation_bar.favourites": "Stelumoj",
"navigation_bar.filters": "Silentigitaj vortoj",
@@ -443,9 +418,6 @@
"notifications.column_settings.admin.sign_up": "Novaj registriĝoj:",
"notifications.column_settings.alert": "Sciigoj de la retumilo",
"notifications.column_settings.favourite": "Stelumoj:",
- "notifications.column_settings.filter_bar.advanced": "Montri ĉiujn kategoriojn",
- "notifications.column_settings.filter_bar.category": "Rapida filtra breto",
- "notifications.column_settings.filter_bar.show_bar": "Montri la breton de filtrilo",
"notifications.column_settings.follow": "Novaj sekvantoj:",
"notifications.column_settings.follow_request": "Novaj petoj de sekvado:",
"notifications.column_settings.mention": "Mencioj:",
@@ -526,14 +498,7 @@
"poll_button.add_poll": "Aldoni balotenketon",
"poll_button.remove_poll": "Forigi balotenketon",
"privacy.change": "Agordi mesaĝan privatecon",
- "privacy.direct.long": "Videbla nur al menciitaj uzantoj",
- "privacy.direct.short": "Nur menciitaj personoj",
- "privacy.private.long": "Videbla nur al viaj sekvantoj",
- "privacy.private.short": "Nur abonantoj",
- "privacy.public.long": "Videbla por ĉiuj",
"privacy.public.short": "Publika",
- "privacy.unlisted.long": "Videbla por ĉiuj, sed ekskluzive el la funkcio de esploro",
- "privacy.unlisted.short": "Nelistigita",
"privacy_policy.last_updated": "Laste ĝisdatigita en {date}",
"privacy_policy.title": "Politiko de privateco",
"recommended": "Rekomendita",
@@ -644,7 +609,6 @@
"status.direct": "Private mencii @{name}",
"status.direct_indicator": "Privata mencio",
"status.edit": "Redakti",
- "status.edited": "Redaktita {date}",
"status.edited_x_times": "Redactita {count, plural, one {{count} fojon} other {{count} fojojn}}",
"status.embed": "Enkorpigi",
"status.favourite": "Ŝatata",
@@ -715,10 +679,8 @@
"upload_error.poll": "Alŝuto de dosiero ne permesita kun balotenketo.",
"upload_form.audio_description": "Priskribi por homoj kiuj malfacile aŭdi",
"upload_form.description": "Priskribi por personoj, kiuj estas blindaj aŭ havas vidmalsufiĉon",
- "upload_form.description_missing": "Neniu priskribo aldonita",
"upload_form.edit": "Redakti",
"upload_form.thumbnail": "Ŝanĝi etigita bildo",
- "upload_form.undo": "Forigi",
"upload_form.video_description": "Priskribi por homoj kiuj malfacile aŭdi aŭ vidi",
"upload_modal.analyzing_picture": "Bilda analizado…",
"upload_modal.apply": "Apliki",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 7c2e4f0d49894d..4c30bfa25f1e7e 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -89,7 +89,14 @@
"announcement.announcement": "Anuncio",
"attachments_list.unprocessed": "[sin procesar]",
"audio.hide": "Ocultar audio",
- "autosuggest_hashtag.per_week": "{count} por semana",
+ "block_modal.remote_users_caveat": "Le pediremos al servidor {domain} que respete tu decisión. Sin embargo, el cumplimiento no está garantizado, ya que algunos servidores pueden manejar los bloqueos de forma diferente. Los mensajes públicos todavía podrían estar visibles para los usuarios no conectados.",
+ "block_modal.show_less": "Mostrar menos",
+ "block_modal.show_more": "Mostrar más",
+ "block_modal.they_cant_mention": "No pueden mencionarte ni seguirte.",
+ "block_modal.they_cant_see_posts": "No pueden ver tus mensajes y vos no verás los suyos.",
+ "block_modal.they_will_know": "Pueden ver que están bloqueados.",
+ "block_modal.title": "¿Bloquear usuario?",
+ "block_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
"boost_modal.combo": "Podés hacer clic en {combo} para saltar esto la próxima vez",
"bundle_column_error.copy_stacktrace": "Copiar informe de error",
"bundle_column_error.error.body": "La página solicitada no pudo ser cargada. Podría deberse a un error de programación en nuestro código o a un problema de compatibilidad con el navegador web.",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "Tu cuenta no es {locked}. Todos pueden seguirte para ver tus mensajes marcados como \"Sólo para seguidores\".",
"compose_form.lock_disclaimer.lock": "privada",
"compose_form.placeholder": "¿Qué onda?",
- "compose_form.poll.add_option": "Agregá una opción",
"compose_form.poll.duration": "Duración de la encuesta",
+ "compose_form.poll.multiple": "Múltiples opciones",
"compose_form.poll.option_placeholder": "Opción {number}",
- "compose_form.poll.remove_option": "Quitar esta opción",
+ "compose_form.poll.single": "Elegí una",
"compose_form.poll.switch_to_multiple": "Cambiar encuesta para permitir opciones múltiples",
"compose_form.poll.switch_to_single": "Cambiar encuesta para permitir una sola opción",
- "compose_form.publish": "Publicar",
+ "compose_form.poll.type": "Estilo",
+ "compose_form.publish": "Enviar",
"compose_form.publish_form": "Nuevo mensaje",
- "compose_form.publish_loud": "¡{publish}!",
- "compose_form.save_changes": "Guardar cambios",
- "compose_form.sensitive.hide": "Marcar medio como sensible",
- "compose_form.sensitive.marked": "{count, plural, one {El medio está marcado como sensible} other {Los medios están marcados como sensibles}}",
- "compose_form.sensitive.unmarked": "El medio no está marcado como sensible",
+ "compose_form.reply": "Responder",
+ "compose_form.save_changes": "Actualizar",
"compose_form.spoiler.marked": "Quitar advertencia de contenido",
"compose_form.spoiler.unmarked": "Agregar advertencia de contenido",
- "compose_form.spoiler_placeholder": "Escribí tu advertencia acá",
+ "compose_form.spoiler_placeholder": "Advertencia de contenido (opcional)",
"confirmation_modal.cancel": "Cancelar",
- "confirmations.block.block_and_report": "Bloquear y denunciar",
"confirmations.block.confirm": "Bloquear",
- "confirmations.block.message": "¿Estás seguro que querés bloquear a {name}?",
"confirmations.cancel_follow_request.confirm": "Retirar solicitud",
"confirmations.cancel_follow_request.message": "¿Estás seguro que querés retirar tu solicitud para seguir a {name}?",
"confirmations.delete.confirm": "Eliminar",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "¿Estás seguro que querés eliminar permanentemente esta lista?",
"confirmations.discard_edit_media.confirm": "Descartar",
"confirmations.discard_edit_media.message": "Tenés cambios sin guardar en la descripción de medios o en la vista previa, ¿querés descartarlos de todos modos?",
- "confirmations.domain_block.confirm": "Bloquear dominio entero",
+ "confirmations.domain_block.confirm": "Bloquear servidor",
"confirmations.domain_block.message": "¿Estás completamente seguro que querés bloquear el {domain} entero? En la mayoría de los casos, unos cuantos bloqueos y silenciados puntuales son suficientes y preferibles. No vas a ver contenido de ese dominio en ninguna de tus líneas temporales o en tus notificaciones. Tus seguidores de ese dominio serán quitados.",
"confirmations.edit.confirm": "Editar",
"confirmations.edit.message": "Editar ahora sobreescribirá el mensaje que estás redactando actualmente. ¿Estás seguro que querés seguir?",
"confirmations.logout.confirm": "Cerrar sesión",
"confirmations.logout.message": "¿Estás seguro que querés cerrar la sesión?",
"confirmations.mute.confirm": "Silenciar",
- "confirmations.mute.explanation": "Se ocultarán los mensajes de esta cuenta y los mensajes de otras cuentas que mencionen a ésta, pero todavía esta cuenta podrá ver tus mensajes o seguirte.",
- "confirmations.mute.message": "¿Estás seguro que querés silenciar a {name}?",
"confirmations.redraft.confirm": "Eliminar mensaje original y editarlo",
"confirmations.redraft.message": "¿Estás seguro que querés eliminar este mensaje y volver a editarlo? Se perderán las veces marcadas como favorito y sus adhesiones, y las respuestas al mensaje original quedarán huérfanas.",
"confirmations.reply.confirm": "Responder",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "Estos son los mensajes que están ganando popularidad en la web social, hoy mismo. Los mensajes más recientes con más adhesiones y marcados como favoritos obtienen más exposición.",
"dismissable_banner.explore_tags": "Estas son etiquetas que están ganando popularidad en la web social, hoy mismo. Las etiquetas que son usadas por diferentes cuentas obtienen más exposición.",
"dismissable_banner.public_timeline": "Estos son los mensajes públicos más recientes de cuentas en la web social que las personas en {domain} siguen.",
+ "domain_block_modal.block": "Bloquear servidor",
+ "domain_block_modal.block_account_instead": "Bloquear @{name} en su lugar",
+ "domain_block_modal.they_can_interact_with_old_posts": "Las cuentas de este servidor pueden interactuar con tus mensajes antiguos.",
+ "domain_block_modal.they_cant_follow": "Nadie de este servidor puede seguirte.",
+ "domain_block_modal.they_wont_know": "No sabrán que fueron bloqueados.",
+ "domain_block_modal.title": "¿Bloquear dominio?",
+ "domain_block_modal.you_will_lose_followers": "Se eliminarán todos tus seguidores de este servidor.",
+ "domain_block_modal.you_wont_see_posts": "No verás mensajes ni notificaciones de usuarios en este servidor.",
+ "domain_pill.activitypub_lets_connect": "Te permite conectar e interactuar con cuentas no solo en Mastodon, sino también a través de diferentes aplicaciones sociales.",
+ "domain_pill.activitypub_like_language": "ActivityPub es como el idioma que Mastodon habla con otras redes sociales.",
+ "domain_pill.server": "Servidor",
+ "domain_pill.their_handle": "Su alias:",
+ "domain_pill.their_server": "Su hogar digital, donde residen todoas sus mensajes.",
+ "domain_pill.their_username": "Su identificador único en su servidor. Es posible encontrar cuentas con el mismo nombre de usuario en diferentes servidores.",
+ "domain_pill.username": "Nombre de usuario",
+ "domain_pill.whats_in_a_handle": "¿En qué consiste el alias?",
+ "domain_pill.who_they_are": "Los alias indican quiénes son y dónde se encuentran, y gracias a ellos podés interactuar con otras cuentas a través de las redes sociales compatibles con .",
+ "domain_pill.who_you_are": "Los alias dicen quién sos y dónde estás, y gracias a ellos podés interactuar con otras cuentas a través de las redes sociales compatibles con .",
+ "domain_pill.your_handle": "Tu alias:",
+ "domain_pill.your_server": "Tu hogar digital, donde residen todos tus mensajes. ¿No te gusta este sitio? Mudate a otro servidor en cualquier momento y llevate a tus seguidores.",
+ "domain_pill.your_username": "Tu identificador único en este servidor. Es posible encontrar cuentas con el mismo nombre de usuario en diferentes servidores.",
"embed.instructions": "Insertá este mensaje a tu sitio web copiando el código de abajo.",
"embed.preview": "Así es cómo se verá:",
"emoji_button.activity": "Actividad",
@@ -219,7 +241,7 @@
"emoji_button.nature": "Naturaleza",
"emoji_button.not_found": "No se encontraron emojis coincidentes",
"emoji_button.objects": "Objetos",
- "emoji_button.people": "Gente",
+ "emoji_button.people": "Cuentas",
"emoji_button.recent": "Usados frecuentemente",
"emoji_button.search": "Buscar...",
"emoji_button.search_results": "Resultados de búsqueda",
@@ -244,6 +266,7 @@
"empty_column.list": "Todavía no hay nada en esta lista. Cuando miembros de esta lista envíen nuevos mensaje, se mostrarán acá.",
"empty_column.lists": "Todavía no tenés ninguna lista. Cuando creés una, se mostrará acá.",
"empty_column.mutes": "Todavía no silenciaste a ningún usuario.",
+ "empty_column.notification_requests": "¡Todo limpio! No hay nada acá. Cuando recibás nuevas notificaciones, aparecerán acá, acorde a tu configuración.",
"empty_column.notifications": "Todavía no tenés ninguna notificación. Cuando otras cuentas interactúen con vos, vas a ver la notificación acá.",
"empty_column.public": "¡Naranja! Escribí algo públicamente, o seguí usuarios manualmente de otros servidores para ir llenando esta línea temporal",
"error.unexpected_crash.explanation": "Debido a un error en nuestro código o a un problema de compatibilidad con el navegador web, esta página no se pudo mostrar correctamente.",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
"filter_modal.select_filter.title": "Filtrar este mensaje",
"filter_modal.title.status": "Filtrar un mensaje",
- "firehose.all": "Todas",
+ "filtered_notifications_banner.mentions": "{count, plural, one {mención} other {menciones}}",
+ "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
+ "filtered_notifications_banner.title": "Notificaciones filtradas",
+ "firehose.all": "Todos",
"firehose.local": "Este servidor",
"firehose.remote": "Otros servidores",
"follow_request.authorize": "Autorizar",
"follow_request.reject": "Rechazar",
"follow_requests.unlocked_explanation": "A pesar de que tu cuenta no es privada, el equipo de {domain} pensó que podrías querer revisar manualmente las solicitudes de seguimiento de estas cuentas.",
+ "follow_suggestions.curated_suggestion": "Selección del equipo",
+ "follow_suggestions.dismiss": "No mostrar de nuevo",
+ "follow_suggestions.featured_longer": "Seleccionada a mano por el equipo de {domain}",
+ "follow_suggestions.friends_of_friends_longer": "Populares entre las cuentas que seguís",
+ "follow_suggestions.hints.featured": "Este perfil fue seleccionado a mano por el equipo de {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "Este perfil es popular entre las cuentas que seguís.",
+ "follow_suggestions.hints.most_followed": "Este perfil es uno de los más seguidos en {domain}.",
+ "follow_suggestions.hints.most_interactions": "Este perfil ha estado recibiendo recientemente mucha atención en {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Este perfil es similar a los que comenzaste a seguir.",
+ "follow_suggestions.personalized_suggestion": "Sugerencia personalizada",
+ "follow_suggestions.popular_suggestion": "Sugerencia popular",
+ "follow_suggestions.popular_suggestion_longer": "Popular en {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Similares a perfiles que comenzaste a seguir recientemente",
+ "follow_suggestions.view_all": "Ver todo",
+ "follow_suggestions.who_to_follow": "A quién seguir",
"followed_tags": "Etiquetas seguidas",
"footer.about": "Información",
"footer.directory": "Directorio de perfiles",
@@ -306,13 +347,8 @@
"hashtag.follow": "Seguir etiqueta",
"hashtag.unfollow": "Dejar de seguir etiqueta",
"hashtags.and_other": "…y {count, plural, other {# más}}",
- "home.actions.go_to_explore": "Ver qué está en tendencia",
- "home.actions.go_to_suggestions": "Encontrar cuentas para seguir",
- "home.column_settings.basic": "Básico",
"home.column_settings.show_reblogs": "Mostrar adhesiones",
"home.column_settings.show_replies": "Mostrar respuestas",
- "home.explore_prompt.body": "Tu línea temporal principal tendrá una mezcla de mensajes de etiquetas que hayás decidido seguir, cuentas que hayás seguido y mensajes a los que éstas adhieran. Si está muy tranquilo por acá, quizás quieras:",
- "home.explore_prompt.title": "Este es tu inicio en Mastodon.",
"home.hide_announcements": "Ocultar anuncios",
"home.pending_critical_update.body": "Por favor, ¡actualizá tu servidor de Mastodon lo antes posible!",
"home.pending_critical_update.link": "Ver actualizaciones",
@@ -378,6 +414,7 @@
"limited_account_hint.action": "Mostrar perfil de todos modos",
"limited_account_hint.title": "Este perfil fue ocultado por los moderadores de {domain}.",
"link_preview.author": "Por {name}",
+ "link_preview.more_from_author": "Más de {name}",
"lists.account.add": "Agregar a lista",
"lists.account.remove": "Quitar de lista",
"lists.delete": "Eliminar lista",
@@ -396,9 +433,15 @@
"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.duration": "Duración",
- "mute_modal.hide_notifications": "¿Querés ocultar las notificaciones de este usuario?",
- "mute_modal.indefinite": "Indefinida",
+ "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",
+ "mute_modal.they_can_mention_and_follow": "Pueden mencionarte y seguirte, pero no verás nada de ellos.",
+ "mute_modal.they_wont_know": "No sabrán que fueron silenciados.",
+ "mute_modal.title": "¿Silenciar usuario?",
+ "mute_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
+ "mute_modal.you_wont_see_posts": "Todavía pueden ver tus mensajes, pero vos no verás los suyos.",
"navigation_bar.about": "Información",
"navigation_bar.advanced_interface": "Abrir en interface web avanzada",
"navigation_bar.blocks": "Usuarios bloqueados",
@@ -408,7 +451,6 @@
"navigation_bar.direct": "Menciones privadas",
"navigation_bar.discover": "Descubrir",
"navigation_bar.domain_blocks": "Dominios bloqueados",
- "navigation_bar.edit_profile": "Editar perfil",
"navigation_bar.explore": "Explorá",
"navigation_bar.favourites": "Favoritos",
"navigation_bar.filters": "Palabras silenciadas",
@@ -432,11 +474,29 @@
"notification.follow": "{name} te empezó a seguir",
"notification.follow_request": "{name} solicitó seguirte",
"notification.mention": "{name} te mencionó",
+ "notification.moderation-warning.learn_more": "Aprendé más",
+ "notification.moderation_warning": "Recibiste una advertencia de moderación",
+ "notification.moderation_warning.action_delete_statuses": "Se eliminaron algunos de tus mensajes.",
+ "notification.moderation_warning.action_disable": "Se deshabilitó tu cuenta.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Se marcaron como sensibles a algunos de tus mensajes.",
+ "notification.moderation_warning.action_none": "Tu cuenta recibió una advertencia de moderación.",
+ "notification.moderation_warning.action_sensitive": "A partir de ahora, tus mensajes serán marcados como sensibles.",
+ "notification.moderation_warning.action_silence": "Tu cuenta fue limitada.",
+ "notification.moderation_warning.action_suspend": "Tu cuenta fue suspendida.",
"notification.own_poll": "Tu encuesta finalizó",
"notification.poll": "Finalizó una encuesta en la que votaste",
"notification.reblog": "{name} adhirió a tu mensaje",
+ "notification.relationships_severance_event": "Conexiones perdidas con {name}",
+ "notification.relationships_severance_event.account_suspension": "Un administrador de {from} suspendió a {target}, lo que significa que ya no podés recibir actualizaciones de esa cuenta o interactuar con la misma.",
+ "notification.relationships_severance_event.domain_block": "Un administrador de {from} bloqueó a {target}, incluyendo {followersCount} de tus seguidores y {followingCount, plural, one {# cuenta} other {# cuentas}} que seguís.",
+ "notification.relationships_severance_event.learn_more": "Aprendé más",
+ "notification.relationships_severance_event.user_domain_block": "Bloqueaste a {target}, eliminando {followersCount} de tus seguidores y {followingCount, plural, one {# cuenta} other {# cuentas}} que seguís.",
"notification.status": "{name} acaba de enviar un mensaje",
"notification.update": "{name} editó un mensaje",
+ "notification_requests.accept": "Aceptar",
+ "notification_requests.dismiss": "Descartar",
+ "notification_requests.notifications_from": "Notificaciones de {name}",
+ "notification_requests.title": "Notificaciones filtradas",
"notifications.clear": "Limpiar notificaciones",
"notifications.clear_confirmation": "¿Estás seguro que querés limpiar todas tus notificaciones permanentemente?",
"notifications.column_settings.admin.report": "Nuevas denuncias:",
@@ -445,7 +505,6 @@
"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.filter_bar.show_bar": "Mostrar barra de filtros",
"notifications.column_settings.follow": "Nuevos seguidores:",
"notifications.column_settings.follow_request": "Nuevas solicitudes de seguimiento:",
"notifications.column_settings.mention": "Menciones:",
@@ -471,6 +530,15 @@
"notifications.permission_denied": "Las notificaciones de escritorio no están disponibles, debido a una solicitud de permiso del navegador web previamente denegada",
"notifications.permission_denied_alert": "No se pueden habilitar las notificaciones de escritorio, ya que el permiso del navegador fue denegado antes",
"notifications.permission_required": "Las notificaciones de escritorio no están disponibles porque no se concedió el permiso requerido.",
+ "notifications.policy.filter_new_accounts.hint": "Creada hace {days, plural, one {un día} other {# días}}",
+ "notifications.policy.filter_new_accounts_title": "Nuevas cuentas",
+ "notifications.policy.filter_not_followers_hint": "Incluyendo cuentas que te han estado siguiendo menos de {days, plural, one {un día} other {# días}}",
+ "notifications.policy.filter_not_followers_title": "Cuentas que no te siguen",
+ "notifications.policy.filter_not_following_hint": "Hasta que las aprobés manualmente",
+ "notifications.policy.filter_not_following_title": "Cuentas que no seguís",
+ "notifications.policy.filter_private_mentions_hint": "Filtradas, a menos que sea en respuesta a tu propia mención o si seguís al remitente",
+ "notifications.policy.filter_private_mentions_title": "Menciones privadas no solicitadas",
+ "notifications.policy.title": "Filtrar notificaciones de…",
"notifications_permission_banner.enable": "Habilitar notificaciones de escritorio",
"notifications_permission_banner.how_to_control": "Para recibir notificaciones cuando Mastodon no está abierto, habilitá las notificaciones de escritorio. Podés controlar con precisión qué tipos de interacciones generan notificaciones de escritorio a través del botón {icon} de arriba, una vez que estén habilitadas.",
"notifications_permission_banner.title": "No te pierdas nada",
@@ -526,14 +594,15 @@
"poll_button.add_poll": "Agregar encuesta",
"poll_button.remove_poll": "Quitar encuesta",
"privacy.change": "Configurar privacidad del mensaje",
- "privacy.direct.long": "Visible sólo para los usuarios mencionados",
- "privacy.direct.short": "Sólo cuentas mencionadas",
- "privacy.private.long": "Visible sólo para los seguidores",
- "privacy.private.short": "Sólo para seguidores",
- "privacy.public.long": "Visible para todos",
+ "privacy.direct.long": "Todas las cuentas mencionadas en el mensaje",
+ "privacy.direct.short": "Cuentas específicas",
+ "privacy.private.long": "Solo tus seguidores",
+ "privacy.private.short": "Seguidores",
+ "privacy.public.long": "Cualquier persona dentro y fuera de Mastodon",
"privacy.public.short": "Público",
- "privacy.unlisted.long": "Visible para todos, pero excluido de las características de descubrimiento",
- "privacy.unlisted.short": "No listado",
+ "privacy.unlisted.additional": "Esto se comporta exactamente igual que con la configuración de privacidad de mensaje \"Público\", excepto que el mensaje no aparecerá en los líneas temporales en vivo, ni en las etiquetas, ni en la línea temporal \"Explorá\", ni en la búsqueda de Mastodon; incluso si optaste por hacer tu cuenta visible.",
+ "privacy.unlisted.long": "Menos fanfarrias algorítmicas",
+ "privacy.unlisted.short": "Público silencioso",
"privacy_policy.last_updated": "Última actualización: {date}",
"privacy_policy.title": "Política de privacidad",
"recommended": "Opción recomendada",
@@ -551,7 +620,9 @@
"relative_time.minutes": "{number}m",
"relative_time.seconds": "{number}s",
"relative_time.today": "hoy",
+ "reply_indicator.attachments": "{count, plural,one {# adjunto} other {# adjuntos}}",
"reply_indicator.cancel": "Cancelar",
+ "reply_indicator.poll": "Encuesta",
"report.block": "Bloquear",
"report.block_explanation": "No verás sus mensajes. No podrán ver tus mensajes ni seguirte. Se van a dar cuentra de que están bloqueados.",
"report.categories.legal": "Legales",
@@ -644,15 +715,16 @@
"status.direct": "Mención privada a @{name}",
"status.direct_indicator": "Mención privada",
"status.edit": "Editar",
- "status.edited": "Editado {date}",
+ "status.edited": "Última edición: {date}",
"status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",
"status.embed": "Insertar",
"status.favourite": "Marcar como favorito",
+ "status.favourites": "{count, plural, one {# voto} other {# votos}}",
"status.filter": "Filtrar este mensaje",
"status.filtered": "Filtrado",
"status.hide": "Ocultar mensaje",
- "status.history.created": "Creado por {name} el {date}",
- "status.history.edited": "Editado por {name} el {date}",
+ "status.history.created": "Creado por {name}, {date}",
+ "status.history.edited": "Editado por {name}, {date}",
"status.load_more": "Cargar más",
"status.media.open": "Clic para abrir",
"status.media.show": "Clic para mostrar",
@@ -668,6 +740,7 @@
"status.reblog": "Adherir",
"status.reblog_private": "Adherir a la audiencia original",
"status.reblogged_by": "{name} adhirió",
+ "status.reblogs": "{count, plural, one {adhesión} other {adhesiones}}",
"status.reblogs.empty": "Todavía nadie adhirió a este mensaje. Cuando alguien lo haga, se mostrará acá.",
"status.redraft": "Eliminar mensaje original y editarlo",
"status.remove_bookmark": "Quitar marcador",
@@ -715,10 +788,8 @@
"upload_error.poll": "No se permite la subida de archivos en encuestas.",
"upload_form.audio_description": "Agregá una descripción para personas con dificultades auditivas",
"upload_form.description": "Agregá una descripción para personas con dificultades visuales",
- "upload_form.description_missing": "No se agregó descripción",
"upload_form.edit": "Editar",
"upload_form.thumbnail": "Cambiar miniatura",
- "upload_form.undo": "Eliminar",
"upload_form.video_description": "Agregá una descripción para personas con dificultades auditivas o visuales",
"upload_modal.analyzing_picture": "Analizando imagen…",
"upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index fab5f6ec96e2bf..1a99d1d4b45e0a 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -89,7 +89,14 @@
"announcement.announcement": "Anuncio",
"attachments_list.unprocessed": "(sin procesar)",
"audio.hide": "Ocultar audio",
- "autosuggest_hashtag.per_week": "{count} por semana",
+ "block_modal.remote_users_caveat": "Le pediremos al servidor {domain} que respete tu decisión. Sin embargo, el cumplimiento no está garantizado ya que algunos servidores pueden manejar bloques de forma diferente. Las publicaciones públicas pueden ser todavía visibles para los usuarios no conectados.",
+ "block_modal.show_less": "Mostrar menos",
+ "block_modal.show_more": "Mostrar más",
+ "block_modal.they_cant_mention": "No pueden mencionarte ni seguirte.",
+ "block_modal.they_cant_see_posts": "No pueden ver tus publicaciones y tú no verás las de ellos.",
+ "block_modal.they_will_know": "Pueden ver que están bloqueados.",
+ "block_modal.title": "¿Bloquear usuario?",
+ "block_modal.you_wont_see_mentions": "No verás publicaciones que los mencionen.",
"boost_modal.combo": "Puedes hacer clic en {combo} para saltar este aviso la próxima vez",
"bundle_column_error.copy_stacktrace": "Copiar informe de error",
"bundle_column_error.error.body": "La página solicitada no pudo ser renderizada. Podría deberse a un error en nuestro código o a un problema de compatibilidad con el navegador.",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "Tu cuenta no está bloqueada. Todos pueden seguirte para ver tus toots solo para seguidores.",
"compose_form.lock_disclaimer.lock": "bloqueado",
"compose_form.placeholder": "¿En qué estás pensando?",
- "compose_form.poll.add_option": "Añadir una opción",
"compose_form.poll.duration": "Duración de la encuesta",
- "compose_form.poll.option_placeholder": "Elección {number}",
- "compose_form.poll.remove_option": "Eliminar esta opción",
+ "compose_form.poll.multiple": "Selección múltiple",
+ "compose_form.poll.option_placeholder": "Opción {number}",
+ "compose_form.poll.single": "Seleccione uno",
"compose_form.poll.switch_to_multiple": "Modificar encuesta para permitir múltiples opciones",
"compose_form.poll.switch_to_single": "Modificar encuesta para permitir una única opción",
- "compose_form.publish": "Publicar",
+ "compose_form.poll.type": "Estilo",
+ "compose_form.publish": "Publicación",
"compose_form.publish_form": "Publicar",
- "compose_form.publish_loud": "¡{publish}!",
- "compose_form.save_changes": "Guardar cambios",
- "compose_form.sensitive.hide": "Marcar multimedia como sensible",
- "compose_form.sensitive.marked": "Material marcado como sensible",
- "compose_form.sensitive.unmarked": "Material no marcado como sensible",
+ "compose_form.reply": "Respuesta",
+ "compose_form.save_changes": "Actualización",
"compose_form.spoiler.marked": "Texto oculto tras la advertencia",
"compose_form.spoiler.unmarked": "Texto no oculto",
- "compose_form.spoiler_placeholder": "Advertencia de contenido",
+ "compose_form.spoiler_placeholder": "Advertencia de contenido (opcional)",
"confirmation_modal.cancel": "Cancelar",
- "confirmations.block.block_and_report": "Bloquear y Denunciar",
"confirmations.block.confirm": "Bloquear",
- "confirmations.block.message": "¿Estás seguro de querer bloquear a {name}?",
"confirmations.cancel_follow_request.confirm": "Retirar solicitud",
"confirmations.cancel_follow_request.message": "¿Estás seguro de que deseas retirar tu solicitud para seguir a {name}?",
"confirmations.delete.confirm": "Eliminar",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "¿Seguro que quieres borrar esta lista permanentemente?",
"confirmations.discard_edit_media.confirm": "Descartar",
"confirmations.discard_edit_media.message": "Tienes cambios sin guardar en la descripción o vista previa del archivo, ¿deseas descartarlos de cualquier manera?",
- "confirmations.domain_block.confirm": "Ocultar dominio entero",
+ "confirmations.domain_block.confirm": "Bloquear servidor",
"confirmations.domain_block.message": "¿Seguro de que quieres bloquear al dominio {domain} entero? En general unos cuantos bloqueos y silenciados concretos es suficiente y preferible.",
"confirmations.edit.confirm": "Editar",
"confirmations.edit.message": "Editar sobrescribirá el mensaje que estás escribiendo. ¿Estás seguro de que deseas continuar?",
"confirmations.logout.confirm": "Cerrar sesión",
"confirmations.logout.message": "¿Estás seguro de querer cerrar la sesión?",
"confirmations.mute.confirm": "Silenciar",
- "confirmations.mute.explanation": "Esto esconderá las publicaciones de ellos y en las que los has mencionado, pero les permitirá ver tus mensajes y seguirte.",
- "confirmations.mute.message": "¿Estás seguro de que quieres silenciar a {name}?",
"confirmations.redraft.confirm": "Borrar y volver a borrador",
"confirmations.redraft.message": "¿Estás seguro que quieres borrar esta publicación y editarla? Los favoritos e impulsos se perderán, y las respuestas a la publicación original quedarán separadas.",
"confirmations.reply.confirm": "Responder",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "Estas son las publicaciones que están en tendencia en la red ahora. Las publicaciones recientes con más impulsos y favoritos se muestran más arriba.",
"dismissable_banner.explore_tags": "Se trata de hashtags que están ganando adeptos en las redes sociales hoy en día. Los hashtags que son utilizados por más personas diferentes se clasifican mejor.",
"dismissable_banner.public_timeline": "Estos son los toots públicos más recientes de personas en la web social a las que sigue la gente en {domain}.",
+ "domain_block_modal.block": "Bloquear servidor",
+ "domain_block_modal.block_account_instead": "Bloquear @{name} en su lugar",
+ "domain_block_modal.they_can_interact_with_old_posts": "Las personas de este servidor pueden interactuar con tus publicaciones antiguas.",
+ "domain_block_modal.they_cant_follow": "Nadie de este servidor puede seguirte.",
+ "domain_block_modal.they_wont_know": "No sabrán que han sido bloqueados.",
+ "domain_block_modal.title": "¿Bloquear dominio?",
+ "domain_block_modal.you_will_lose_followers": "Todos tus seguidores de este servidor serán eliminados.",
+ "domain_block_modal.you_wont_see_posts": "No verás publicaciones ni notificaciones de usuarios en este servidor.",
+ "domain_pill.activitypub_lets_connect": "Te permite conectar e interactuar con personas no sólo en Mastodon, sino también a través de diferentes aplicaciones sociales.",
+ "domain_pill.activitypub_like_language": "ActivityPub es como el idioma que Mastodon habla con otras redes sociales.",
+ "domain_pill.server": "Servidor",
+ "domain_pill.their_handle": "Su alias:",
+ "domain_pill.their_server": "Su hogar digital, donde residen todas sus publicaciones.",
+ "domain_pill.their_username": "Su identificador único en su servidor. Es posible encontrar usuarios con el mismo nombre de usuario en diferentes servidores.",
+ "domain_pill.username": "Nombre de usuario",
+ "domain_pill.whats_in_a_handle": "¿En qué consiste el alias?",
+ "domain_pill.who_they_are": "Los alias indican quiénes son y dónde se encuentran, puedes interactuar con personas a través de las redes sociales de .",
+ "domain_pill.who_you_are": "Los alias indican quién eres y dónde te encuentras, las personas pueden interactuar contigo a través de las redes sociales de .",
+ "domain_pill.your_handle": "Tu alias:",
+ "domain_pill.your_server": "Tu hogar digital, donde residen todas tus publicaciones. ¿No te gusta este sitio? Muévete a otro servidor en cualquier momento y llévate a tus seguidores.",
+ "domain_pill.your_username": "Tu identificador único en este servidor. Es posible encontrar usuarios con el mismo nombre de usuario en diferentes servidores.",
"embed.instructions": "Añade este toot a tu sitio web con el siguiente código.",
"embed.preview": "Así es como se verá:",
"emoji_button.activity": "Actividad",
@@ -244,6 +266,7 @@
"empty_column.list": "No hay nada en esta lista aún. Cuando miembros de esta lista publiquen nuevos estatus, estos aparecerán qui.",
"empty_column.lists": "No tienes ninguna lista. cuando crees una, se mostrará aquí.",
"empty_column.mutes": "Aún no has silenciado a ningún usuario.",
+ "empty_column.notification_requests": "¡Todo limpio! No hay nada aquí. Cuando recibas nuevas notificaciones, aparecerán aquí conforme a tu configuración.",
"empty_column.notifications": "No tienes ninguna notificación aún. Interactúa con otros para empezar una conversación.",
"empty_column.public": "¡No hay nada aquí! Escribe algo públicamente, o sigue usuarios de otras instancias manualmente para llenarlo",
"error.unexpected_crash.explanation": "Debido a un error en nuestro código o a un problema de compatibilidad con el navegador, esta página no se ha podido mostrar correctamente.",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
"filter_modal.select_filter.title": "Filtrar esta publicación",
"filter_modal.title.status": "Filtrar una publicación",
+ "filtered_notifications_banner.mentions": "{count, plural, one {mención} other {menciones}}",
+ "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
+ "filtered_notifications_banner.title": "Notificaciones filtradas",
"firehose.all": "Todas",
"firehose.local": "Este servidor",
"firehose.remote": "Otros servidores",
"follow_request.authorize": "Autorizar",
"follow_request.reject": "Rechazar",
"follow_requests.unlocked_explanation": "A pesar de que tu cuenta no es privada, el personal de {domain} ha pensado que quizás deberías revisar manualmente las solicitudes de seguimiento de estas cuentas.",
+ "follow_suggestions.curated_suggestion": "Recomendaciones del equipo",
+ "follow_suggestions.dismiss": "No mostrar de nuevo",
+ "follow_suggestions.featured_longer": "Escogidos por el equipo de {domain}",
+ "follow_suggestions.friends_of_friends_longer": "Populares entre las personas a las que sigues",
+ "follow_suggestions.hints.featured": "Este perfil ha sido seleccionado a mano por el equipo de {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "Este perfil es popular entre las personas que sigues.",
+ "follow_suggestions.hints.most_followed": "Este perfil es uno de los más seguidos en {domain}.",
+ "follow_suggestions.hints.most_interactions": "Este perfil ha estado recibiendo mucha atención en {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Este perfil es similar a los perfiles que has seguido recientemente.",
+ "follow_suggestions.personalized_suggestion": "Sugerencia personalizada",
+ "follow_suggestions.popular_suggestion": "Sugerencia popular",
+ "follow_suggestions.popular_suggestion_longer": "Populares en {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Similares a los perfiles que has seguido recientemente",
+ "follow_suggestions.view_all": "Ver todo",
+ "follow_suggestions.who_to_follow": "Recomendamos seguir",
"followed_tags": "Hashtags seguidos",
"footer.about": "Acerca de",
"footer.directory": "Directorio de perfiles",
@@ -306,13 +347,8 @@
"hashtag.follow": "Seguir etiqueta",
"hashtag.unfollow": "Dejar de seguir etiqueta",
"hashtags.and_other": "…y {count, plural, other {# más}}",
- "home.actions.go_to_explore": "Ver tendencias",
- "home.actions.go_to_suggestions": "Encuentra gente a la que seguir",
- "home.column_settings.basic": "Básico",
"home.column_settings.show_reblogs": "Mostrar retoots",
"home.column_settings.show_replies": "Mostrar respuestas",
- "home.explore_prompt.body": "Tu cronología de inicio tendrá una mezcla de publicaciones de los hashtags que has escogido seguir, las personas que has decidido seguir y las publicaciones que impulsen. Si crees que está demasiado tranquila, quizás quieras:",
- "home.explore_prompt.title": "Este es tu punto de partida en Mastodon.",
"home.hide_announcements": "Ocultar anuncios",
"home.pending_critical_update.body": "¡Por favor actualiza tu servidor Mastodon lo antes posible!",
"home.pending_critical_update.link": "Ver actualizaciones",
@@ -396,9 +432,15 @@
"loading_indicator.label": "Cargando…",
"media_gallery.toggle_visible": "Cambiar visibilidad",
"moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te has mudado a {movedToAccount}.",
- "mute_modal.duration": "Duración",
- "mute_modal.hide_notifications": "Ocultar notificaciones de este usuario?",
- "mute_modal.indefinite": "Indefinida",
+ "mute_modal.hide_from_notifications": "Ocultar de las notificaciones",
+ "mute_modal.hide_options": "Ocultar opciones",
+ "mute_modal.indefinite": "Hasta que deje de silenciarlos",
+ "mute_modal.show_options": "Mostrar opciones",
+ "mute_modal.they_can_mention_and_follow": "Pueden mencionarte y seguirte, pero no verás nada de ellos.",
+ "mute_modal.they_wont_know": "No sabrán que han sido silenciados.",
+ "mute_modal.title": "¿Silenciar usuario?",
+ "mute_modal.you_wont_see_mentions": "No verás publicaciones que los mencionen.",
+ "mute_modal.you_wont_see_posts": "Todavía pueden ver tus publicaciones, pero tú no verás las de ellos.",
"navigation_bar.about": "Acerca de",
"navigation_bar.advanced_interface": "Abrir en interfaz web avanzada",
"navigation_bar.blocks": "Usuarios bloqueados",
@@ -408,7 +450,6 @@
"navigation_bar.direct": "Menciones privadas",
"navigation_bar.discover": "Descubrir",
"navigation_bar.domain_blocks": "Dominios ocultos",
- "navigation_bar.edit_profile": "Editar perfil",
"navigation_bar.explore": "Explorar",
"navigation_bar.favourites": "Favoritos",
"navigation_bar.filters": "Palabras silenciadas",
@@ -432,11 +473,29 @@
"notification.follow": "{name} te empezó a seguir",
"notification.follow_request": "{name} ha solicitado seguirte",
"notification.mention": "{name} te ha mencionado",
+ "notification.moderation-warning.learn_more": "Saber más",
+ "notification.moderation_warning": "Has recibido una advertencia de moderación",
+ "notification.moderation_warning.action_delete_statuses": "Se han eliminado algunas de tus publicaciones.",
+ "notification.moderation_warning.action_disable": "Tu cuenta ha sido desactivada.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Se han marcado como sensibles algunas de tus publicaciones.",
+ "notification.moderation_warning.action_none": "Tu cuenta ha recibido un aviso de moderación.",
+ "notification.moderation_warning.action_sensitive": "De ahora en adelante, todas tus publicaciones se marcarán como sensibles.",
+ "notification.moderation_warning.action_silence": "Tu cuenta ha sido limitada.",
+ "notification.moderation_warning.action_suspend": "Tu cuenta ha sido suspendida.",
"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.relationships_severance_event": "Conexiones perdidas con {name}",
+ "notification.relationships_severance_event.account_suspension": "Un administrador de {from} ha suspendido {target}, lo que significa que ya no puedes recibir actualizaciones de sus cuentas o interactuar con ellas.",
+ "notification.relationships_severance_event.domain_block": "Un administrador de {from} ha bloqueado {target}, incluyendo {followersCount} de tus seguidores y {followingCount, plural, one {# cuenta} other {# cuentas}} que sigues.",
+ "notification.relationships_severance_event.learn_more": "Más información",
+ "notification.relationships_severance_event.user_domain_block": "Has bloqueado {target}, eliminando {followersCount} de tus seguidores y {followingCount, plural, one {# cuenta} other {# cuentas}} que sigues.",
"notification.status": "{name} acaba de publicar",
"notification.update": "{name} editó una publicación",
+ "notification_requests.accept": "Aceptar",
+ "notification_requests.dismiss": "Descartar",
+ "notification_requests.notifications_from": "Notificaciones de {name}",
+ "notification_requests.title": "Notificaciones filtradas",
"notifications.clear": "Limpiar notificaciones",
"notifications.clear_confirmation": "¿Seguro de querer borrar permanentemente todas tus notificaciones?",
"notifications.column_settings.admin.report": "Nuevas denuncias:",
@@ -445,7 +504,6 @@
"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.filter_bar.show_bar": "Mostrar barra de filtros",
"notifications.column_settings.follow": "Nuevos seguidores:",
"notifications.column_settings.follow_request": "Nuevas solicitudes de seguimiento:",
"notifications.column_settings.mention": "Menciones:",
@@ -471,6 +529,15 @@
"notifications.permission_denied": "No se pueden habilitar las notificaciones de escritorio ya que se denegó el permiso.",
"notifications.permission_denied_alert": "No se pueden habilitar las notificaciones de escritorio, ya que el permiso del navegador fue denegado anteriormente",
"notifications.permission_required": "Las notificaciones de escritorio no están disponibles porque no se ha concedido el permiso requerido.",
+ "notifications.policy.filter_new_accounts.hint": "Creadas durante {days, plural, one {el último día} other {los últimos # días}}",
+ "notifications.policy.filter_new_accounts_title": "Cuentas nuevas",
+ "notifications.policy.filter_not_followers_hint": "Incluyendo personas que te han estado siguiendo desde hace menos de {days, plural, one {un día} other {# días}}",
+ "notifications.policy.filter_not_followers_title": "Personas que no te siguen",
+ "notifications.policy.filter_not_following_hint": "Hasta que las apruebes manualmente",
+ "notifications.policy.filter_not_following_title": "Personas que no sigues",
+ "notifications.policy.filter_private_mentions_hint": "Filtrada, a menos que sea en respuesta a tu propia mención, o si sigues al remitente",
+ "notifications.policy.filter_private_mentions_title": "Menciones privadas no solicitadas",
+ "notifications.policy.title": "Filtrar notificaciones de…",
"notifications_permission_banner.enable": "Habilitar notificaciones de escritorio",
"notifications_permission_banner.how_to_control": "Para recibir notificaciones cuando Mastodon no esté abierto, habilite las notificaciones de escritorio. Puedes controlar con precisión qué tipos de interacciones generan notificaciones de escritorio a través del botón {icon} de arriba una vez que estén habilitadas.",
"notifications_permission_banner.title": "Nunca te pierdas nada",
@@ -526,14 +593,15 @@
"poll_button.add_poll": "Añadir una encuesta",
"poll_button.remove_poll": "Eliminar encuesta",
"privacy.change": "Ajustar privacidad",
- "privacy.direct.long": "Sólo mostrar a los usuarios mencionados",
- "privacy.direct.short": "Solo personas mencionadas",
- "privacy.private.long": "Sólo mostrar a seguidores",
- "privacy.private.short": "Solo seguidores",
- "privacy.public.long": "Visible para todos",
+ "privacy.direct.long": "Todos los mencionados en la publicación",
+ "privacy.direct.short": "Personas específicas",
+ "privacy.private.long": "Sólo tus seguidores",
+ "privacy.private.short": "Seguidores",
+ "privacy.public.long": "Cualquiera dentro y fuera de Mastodon",
"privacy.public.short": "Público",
- "privacy.unlisted.long": "Visible para todos, pero excluido de las funciones de descubrimiento",
- "privacy.unlisted.short": "No listado",
+ "privacy.unlisted.additional": "Esto se comporta exactamente igual que el público, excepto que el post no aparecerá en las cronologías en directo o en los hashtags, la exploración o busquedas en Mastodon, incluso si está optado por activar la cuenta de usuario.",
+ "privacy.unlisted.long": "Menos fanfares algorítmicos",
+ "privacy.unlisted.short": "Público silencioso",
"privacy_policy.last_updated": "Actualizado por última vez {date}",
"privacy_policy.title": "Política de Privacidad",
"recommended": "Recomendado",
@@ -551,7 +619,9 @@
"relative_time.minutes": "{number} m",
"relative_time.seconds": "{number} s",
"relative_time.today": "hoy",
+ "reply_indicator.attachments": "{count, plural, one {# adjunto} other {# adjuntos}}",
"reply_indicator.cancel": "Cancelar",
+ "reply_indicator.poll": "Encuesta",
"report.block": "Bloquear",
"report.block_explanation": "No veras sus publicaciones. No podrán ver tus publicaciones ni seguirte. Podrán saber que están bloqueados.",
"report.categories.legal": "Legal",
@@ -644,10 +714,11 @@
"status.direct": "Mención privada @{name}",
"status.direct_indicator": "Mención privada",
"status.edit": "Editar",
- "status.edited": "Editado {date}",
+ "status.edited": "Última edición {date}",
"status.edited_x_times": "Editado {count, plural, one {{count} time} other {{count} veces}}",
"status.embed": "Incrustado",
"status.favourite": "Favorito",
+ "status.favourites": "{count, plural, one {favorito} other {favoritos}}",
"status.filter": "Filtrar esta publicación",
"status.filtered": "Filtrado",
"status.hide": "Ocultar toot",
@@ -668,6 +739,7 @@
"status.reblog": "Retootear",
"status.reblog_private": "Implusar a la audiencia original",
"status.reblogged_by": "Retooteado por {name}",
+ "status.reblogs": "{count, plural, one {impulso} other {impulsos}}",
"status.reblogs.empty": "Nadie retooteó este toot todavía. Cuando alguien lo haga, aparecerá aquí.",
"status.redraft": "Borrar y volver a borrador",
"status.remove_bookmark": "Eliminar marcador",
@@ -715,10 +787,8 @@
"upload_error.poll": "Subida de archivos no permitida con encuestas.",
"upload_form.audio_description": "Describir para personas con problemas auditivos",
"upload_form.description": "Describir para los usuarios con dificultad visual",
- "upload_form.description_missing": "Sin descripción añadida",
"upload_form.edit": "Editar",
"upload_form.thumbnail": "Cambiar miniatura",
- "upload_form.undo": "Borrar",
"upload_form.video_description": "Describir para personas con problemas auditivos o visuales",
"upload_modal.analyzing_picture": "Analizando imagen…",
"upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 0d6149f5f51a2c..1782a3a1fee792 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -89,7 +89,14 @@
"announcement.announcement": "Anuncio",
"attachments_list.unprocessed": "(sin procesar)",
"audio.hide": "Ocultar audio",
- "autosuggest_hashtag.per_week": "{count} por semana",
+ "block_modal.remote_users_caveat": "Le pediremos al servidor {domain} que respete tu decisión. Sin embargo, el cumplimiento no está garantizado, ya que algunos servidores pueden manejar bloqueos de forma distinta. Los mensajes públicos pueden ser todavía visibles para los usuarios que no hayan iniciado sesión.",
+ "block_modal.show_less": "Mostrar menos",
+ "block_modal.show_more": "Mostrar más",
+ "block_modal.they_cant_mention": "No pueden mencionarte ni seguirte.",
+ "block_modal.they_cant_see_posts": "No pueden ver tus publicaciones y tú no verás las suyas.",
+ "block_modal.they_will_know": "Pueden ver que están bloqueados.",
+ "block_modal.title": "¿Bloquear usuario?",
+ "block_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
"boost_modal.combo": "Puedes hacer clic en {combo} para saltar este aviso la próxima vez",
"bundle_column_error.copy_stacktrace": "Copiar informe de error",
"bundle_column_error.error.body": "La página solicitada no pudo ser renderizada. Podría deberse a un error en nuestro código o a un problema de compatibilidad con el navegador.",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "Tu cuenta no está {locked}. Todos pueden seguirte para ver tus publicaciones solo para seguidores.",
"compose_form.lock_disclaimer.lock": "bloqueado",
"compose_form.placeholder": "¿En qué estás pensando?",
- "compose_form.poll.add_option": "Añadir una opción",
"compose_form.poll.duration": "Duración de la encuesta",
- "compose_form.poll.option_placeholder": "Elección {number}",
- "compose_form.poll.remove_option": "Eliminar esta opción",
+ "compose_form.poll.multiple": "Selección múltiple",
+ "compose_form.poll.option_placeholder": "Opción {number}",
+ "compose_form.poll.single": "Elige uno",
"compose_form.poll.switch_to_multiple": "Modificar encuesta para permitir múltiples opciones",
"compose_form.poll.switch_to_single": "Modificar encuesta para permitir una única opción",
+ "compose_form.poll.type": "Estilo",
"compose_form.publish": "Publicar",
"compose_form.publish_form": "Publicar",
- "compose_form.publish_loud": "¡{publish}!",
- "compose_form.save_changes": "Guardar cambios",
- "compose_form.sensitive.hide": "{count, plural, one {Marcar material como sensible} other {Marcar material como sensible}}",
- "compose_form.sensitive.marked": "{count, plural, one {Material marcado como sensible} other {Material marcado como sensible}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Material no marcado como sensible} other {Material no marcado como sensible}}",
+ "compose_form.reply": "Responder",
+ "compose_form.save_changes": "Actualizar",
"compose_form.spoiler.marked": "Quitar advertencia de contenido",
"compose_form.spoiler.unmarked": "Añadir advertencia de contenido",
- "compose_form.spoiler_placeholder": "Escribe aquí tu advertencia",
+ "compose_form.spoiler_placeholder": "Advertencia de contenido (opcional)",
"confirmation_modal.cancel": "Cancelar",
- "confirmations.block.block_and_report": "Bloquear y Reportar",
"confirmations.block.confirm": "Bloquear",
- "confirmations.block.message": "¿Estás seguro de que quieres bloquear a {name}?",
"confirmations.cancel_follow_request.confirm": "Retirar solicitud",
"confirmations.cancel_follow_request.message": "¿Estás seguro de que deseas retirar tu solicitud para seguir a {name}?",
"confirmations.delete.confirm": "Eliminar",
@@ -174,21 +177,19 @@
"confirmations.delete_list.message": "¿Seguro que quieres borrar esta lista permanentemente?",
"confirmations.discard_edit_media.confirm": "Descartar",
"confirmations.discard_edit_media.message": "Tienes cambios sin guardar en la descripción o vista previa del archivo audiovisual, ¿descartarlos de todos modos?",
- "confirmations.domain_block.confirm": "Bloquear dominio entero",
- "confirmations.domain_block.message": "¿Seguro de que quieres bloquear al dominio {domain} entero? En general unos cuantos bloqueos y silenciados concretos es suficiente y preferible.",
+ "confirmations.domain_block.confirm": "Bloquear servidor",
+ "confirmations.domain_block.message": "¿Seguro que quieres bloquear todo el dominio {domain}? En general, unos cuantos bloqueos y silenciados concretos es suficiente y preferible. No verás contenido del dominio en ninguna cronología pública ni en tus notificaciones. Se eliminarán tus seguidores procedentes de ese dominio.",
"confirmations.edit.confirm": "Editar",
- "confirmations.edit.message": "Editar ahora reemplazará el mensaje que está escribiendo. ¿Está seguro que quiere proceder?",
+ "confirmations.edit.message": "Editar ahora reemplazará el mensaje que estás escribiendo. ¿Seguro que quieres proceder?",
"confirmations.logout.confirm": "Cerrar sesión",
- "confirmations.logout.message": "¿Estás seguro de querer cerrar la sesión?",
+ "confirmations.logout.message": "¿Seguro que quieres cerrar la sesión?",
"confirmations.mute.confirm": "Silenciar",
- "confirmations.mute.explanation": "Esto esconderá las publicaciones de ellos y en las que los has mencionado, pero les permitirá ver tus mensajes y seguirte.",
- "confirmations.mute.message": "¿Estás seguro de que quieres silenciar a {name}?",
"confirmations.redraft.confirm": "Borrar y volver a borrador",
"confirmations.redraft.message": "¿Estás seguro de querer borrar esta publicación y reescribirla? Los favoritos e impulsos se perderán, y las respuestas a la publicación original quedarán sin contexto.",
"confirmations.reply.confirm": "Responder",
"confirmations.reply.message": "Responder sobrescribirá el mensaje que estás escribiendo. ¿Seguro que deseas continuar?",
"confirmations.unfollow.confirm": "Dejar de seguir",
- "confirmations.unfollow.message": "¿Estás seguro de que quieres dejar de seguir a {name}?",
+ "confirmations.unfollow.message": "¿Seguro que quieres dejar de seguir a {name}?",
"conversation.delete": "Borrar conversación",
"conversation.mark_as_read": "Marcar como leído",
"conversation.open": "Ver conversación",
@@ -197,7 +198,7 @@
"copypaste.copied": "Copiado",
"copypaste.copy_to_clipboard": "Copiar al portapapeles",
"directory.federated": "Desde el fediverso conocido",
- "directory.local": "Sólo de {domain}",
+ "directory.local": "Solo de {domain}",
"directory.new_arrivals": "Recién llegados",
"directory.recently_active": "Recientemente activo",
"disabled_account_banner.account_settings": "Ajustes de la cuenta",
@@ -208,16 +209,37 @@
"dismissable_banner.explore_statuses": "Estas son las publicaciones que están ganando popularidad en la web social hoy. Las publicaciones recientes con más impulsos y favoritos obtienen más exposición.",
"dismissable_banner.explore_tags": "Estas son las etiquetas que están ganando popularidad hoy en la red. Etiquetas que se usan por personas diferentes se puntúan más alto.",
"dismissable_banner.public_timeline": "Estas son las publicaciones más recientes de personas en el Fediverso que siguen las personas de {domain}.",
+ "domain_block_modal.block": "Bloquear servidor",
+ "domain_block_modal.block_account_instead": "Bloquear @{name} en su lugar",
+ "domain_block_modal.they_can_interact_with_old_posts": "Las personas de este servidor pueden interactuar con tus publicaciones antiguas.",
+ "domain_block_modal.they_cant_follow": "Nadie de este servidor puede seguirte.",
+ "domain_block_modal.they_wont_know": "No sabrán que han sido bloqueados.",
+ "domain_block_modal.title": "¿Bloquear dominio?",
+ "domain_block_modal.you_will_lose_followers": "Se eliminarán todos tus seguidores de este servidor.",
+ "domain_block_modal.you_wont_see_posts": "No verás mensajes ni notificaciones de usuarios en este servidor.",
+ "domain_pill.activitypub_lets_connect": "Te permite conectar e interactuar con personas no sólo en Mastodon, sino también a través de diferentes aplicaciones sociales.",
+ "domain_pill.activitypub_like_language": "ActivityPub es como el idioma que Mastodon habla con otras redes sociales.",
+ "domain_pill.server": "Servidor",
+ "domain_pill.their_handle": "Su alias:",
+ "domain_pill.their_server": "Su hogar digital, donde residen todas sus publicaciones.",
+ "domain_pill.their_username": "Su identificador único en su servidor. Es posible encontrar usuarios con el mismo nombre de usuario en diferentes servidores.",
+ "domain_pill.username": "Nombre de usuario",
+ "domain_pill.whats_in_a_handle": "¿En qué consiste el alias?",
+ "domain_pill.who_they_are": "Los alias indican quiénes son y dónde se encuentran, y gracias a ellos puedes interactuar con personas a través de las redes sociales compatibles con .",
+ "domain_pill.who_you_are": "Los alias indican quién eres y dónde te encuentras, y gracias a ellos puedes interactuar con personas a través de las redes sociales compatibles con .",
+ "domain_pill.your_handle": "Tu alias:",
+ "domain_pill.your_server": "Tu hogar digital, donde residen todas tus publicaciones. ¿No te gusta este sitio? Muévete a otro servidor en cualquier momento y llévate a tus seguidores.",
+ "domain_pill.your_username": "Tu identificador único en este servidor. Es posible encontrar usuarios con el mismo nombre de usuario en diferentes servidores.",
"embed.instructions": "Añade esta publicación a tu sitio web con el siguiente código.",
"embed.preview": "Así es como se verá:",
"emoji_button.activity": "Actividad",
"emoji_button.clear": "Limpiar",
"emoji_button.custom": "Personalizado",
- "emoji_button.flags": "Marcas",
+ "emoji_button.flags": "Banderas",
"emoji_button.food": "Comida y bebida",
"emoji_button.label": "Insertar emoji",
"emoji_button.nature": "Naturaleza",
- "emoji_button.not_found": "No hay emojis!! ¯\\_(ツ)_/¯",
+ "emoji_button.not_found": "No se encontró ningún emoji coincidente",
"emoji_button.objects": "Objetos",
"emoji_button.people": "Personas",
"emoji_button.recent": "Usados frecuentemente",
@@ -233,18 +255,19 @@
"empty_column.bookmarked_statuses": "Aún no tienes ninguna publicación guardada como marcador. Cuando guardes una, se mostrará aquí.",
"empty_column.community": "La línea de tiempo local está vacía. ¡Escribe algo para empezar la fiesta!",
"empty_column.direct": "Aún no tienes menciones privadas. Cuando envíes o recibas una, aparecerán aquí.",
- "empty_column.domain_blocks": "Todavía no hay dominios ocultos.",
- "empty_column.explore_statuses": "Nada está en tendencia en este momento. ¡Revisa más tarde!",
+ "empty_column.domain_blocks": "Todavía no hay dominios bloqueados.",
+ "empty_column.explore_statuses": "No hay nada en tendencia en este momento. ¡Revisa más tarde!",
"empty_column.favourited_statuses": "Todavía no tienes publicaciones favoritas. Cuando marques una publicación como favorita, se mostrarán aquí.",
"empty_column.favourites": "Todavía nadie marcó esta publicación como favorita. Cuando alguien lo haga, se mostrarán aquí.",
"empty_column.follow_requests": "No tienes ninguna petición de seguidor. Cuando recibas una, se mostrará aquí.",
"empty_column.followed_tags": "No has seguido ninguna etiqueta todavía. Cuando lo hagas, se mostrarán aquí.",
"empty_column.hashtag": "No hay nada en este hashtag aún.",
"empty_column.home": "¡Tu línea temporal está vacía! Sigue a más personas para rellenarla.",
- "empty_column.list": "No hay nada en esta lista aún. Cuando miembros de esta lista publiquen nuevos estatus, estos aparecerán qui.",
- "empty_column.lists": "No tienes ninguna lista. cuando crees una, se mostrará aquí.",
+ "empty_column.list": "Aún no hay nada en esta lista. Cuando los miembros de esta lista publiquen nuevos estados, estos aparecerán aquí.",
+ "empty_column.lists": "No tienes ninguna lista. Cuando crees una, se mostrará aquí.",
"empty_column.mutes": "Aún no has silenciado a ningún usuario.",
- "empty_column.notifications": "No tienes ninguna notificación aún. Interactúa con otros para empezar una conversación.",
+ "empty_column.notification_requests": "¡Todo limpio! No hay nada aquí. Cuando recibas nuevas notificaciones, aparecerán aquí conforme a tu configuración.",
+ "empty_column.notifications": "Aún no tienes ninguna notificación. Cuando otras personas interactúen contigo, aparecerán aquí.",
"empty_column.public": "¡No hay nada aquí! Escribe algo públicamente, o sigue usuarios de otras instancias manualmente para llenarlo",
"error.unexpected_crash.explanation": "Debido a un error en nuestro código o a un problema de compatibilidad con el navegador, esta página no se ha podido mostrar correctamente.",
"error.unexpected_crash.explanation_addons": "No se pudo mostrar correctamente esta página. Este error probablemente fue causado por un complemento del navegador web o por herramientas de traducción automática.",
@@ -260,7 +283,7 @@
"explore.trending_tags": "Etiquetas",
"filter_modal.added.context_mismatch_explanation": "Esta categoría de filtro no se aplica al contexto en el que ha accedido a esta publlicación. Si quieres que la publicación sea filtrada también en este contexto, tendrás que editar el filtro.",
"filter_modal.added.context_mismatch_title": "¡El contexto no coincide!",
- "filter_modal.added.expired_explanation": "Esta categoría de filtro ha caducado, necesitará cambiar la fecha de caducidad para que se aplique.",
+ "filter_modal.added.expired_explanation": "Esta categoría de filtro ha caducado, tendrás que cambiar la fecha de caducidad para que se aplique.",
"filter_modal.added.expired_title": "¡Filtro caducado!",
"filter_modal.added.review_and_configure": "Para revisar y configurar esta categoría de filtros, vaya a {settings_link}.",
"filter_modal.added.review_and_configure_title": "Ajustes de filtro",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
"filter_modal.select_filter.title": "Filtrar esta publicación",
"filter_modal.title.status": "Filtrar una publicación",
+ "filtered_notifications_banner.mentions": "{count, plural, one {mención} other {menciones}}",
+ "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
+ "filtered_notifications_banner.title": "Notificaciones filtradas",
"firehose.all": "Todas",
"firehose.local": "Este servidor",
"firehose.remote": "Otros servidores",
"follow_request.authorize": "Autorizar",
"follow_request.reject": "Rechazar",
"follow_requests.unlocked_explanation": "A pesar de que tu cuenta no es privada, el personal de {domain} ha pensado que quizás deberías revisar manualmente las solicitudes de seguimiento de estas cuentas.",
+ "follow_suggestions.curated_suggestion": "Recomendaciones del equipo",
+ "follow_suggestions.dismiss": "No mostrar de nuevo",
+ "follow_suggestions.featured_longer": "Escogidos por el equipo de {domain}",
+ "follow_suggestions.friends_of_friends_longer": "Populares entre las personas a las que sigues",
+ "follow_suggestions.hints.featured": "Este perfil ha sido elegido a mano por el equipo de {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "Este perfil es popular entre las personas que sigues.",
+ "follow_suggestions.hints.most_followed": "Este perfil es uno de los más seguidos en {domain}.",
+ "follow_suggestions.hints.most_interactions": "Este perfil ha estado recibiendo recientemente mucha atención en {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Este perfil es similar a los perfiles que has seguido recientemente.",
+ "follow_suggestions.personalized_suggestion": "Sugerencia personalizada",
+ "follow_suggestions.popular_suggestion": "Sugerencia popular",
+ "follow_suggestions.popular_suggestion_longer": "Populares en {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Similares a los perfiles que has seguido recientemente",
+ "follow_suggestions.view_all": "Ver todo",
+ "follow_suggestions.who_to_follow": "A quién seguir",
"followed_tags": "Etiquetas seguidas",
"footer.about": "Acerca de",
"footer.directory": "Directorio de perfiles",
@@ -306,13 +347,8 @@
"hashtag.follow": "Seguir etiqueta",
"hashtag.unfollow": "Dejar de seguir etiqueta",
"hashtags.and_other": "…y {count, plural, other {# más}}",
- "home.actions.go_to_explore": "Ver tendencias",
- "home.actions.go_to_suggestions": "Encuentra personas a las que seguir",
- "home.column_settings.basic": "Básico",
"home.column_settings.show_reblogs": "Mostrar impulsos",
"home.column_settings.show_replies": "Mostrar respuestas",
- "home.explore_prompt.body": "Tu cronología de inicio tendrá una mezcla de publicaciones de las etiquetas que has escogido seguir, las personas que has decidido seguir y las publicaciones que impulsen. Si crees que está demasiado tranquila, quizás quieras:",
- "home.explore_prompt.title": "Este es tu punto de partida en Mastodon.",
"home.hide_announcements": "Ocultar anuncios",
"home.pending_critical_update.body": "Por favor, ¡actualiza tu servidor Mastodon lo antes posible!",
"home.pending_critical_update.link": "Ver actualizaciones",
@@ -396,9 +432,15 @@
"loading_indicator.label": "Cargando…",
"media_gallery.toggle_visible": "Cambiar visibilidad",
"moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te has mudado a {movedToAccount}.",
- "mute_modal.duration": "Duración",
- "mute_modal.hide_notifications": "¿Ocultar notificaciones de este usuario?",
- "mute_modal.indefinite": "Indefinida",
+ "mute_modal.hide_from_notifications": "Ocultar de las notificaciones",
+ "mute_modal.hide_options": "Ocultar opciones",
+ "mute_modal.indefinite": "Hasta que deje de silenciarlos",
+ "mute_modal.show_options": "Mostrar opciones",
+ "mute_modal.they_can_mention_and_follow": "Pueden mencionarte y seguirte, pero no verás nada de ellos.",
+ "mute_modal.they_wont_know": "No sabrán que han sido silenciados.",
+ "mute_modal.title": "¿Silenciar usuario?",
+ "mute_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
+ "mute_modal.you_wont_see_posts": "Todavía pueden ver tus publicaciones, pero tú no verás las suyas.",
"navigation_bar.about": "Acerca de",
"navigation_bar.advanced_interface": "Abrir en la interfaz web avanzada",
"navigation_bar.blocks": "Usuarios bloqueados",
@@ -408,7 +450,6 @@
"navigation_bar.direct": "Menciones privadas",
"navigation_bar.discover": "Descubrir",
"navigation_bar.domain_blocks": "Dominios ocultos",
- "navigation_bar.edit_profile": "Editar perfil",
"navigation_bar.explore": "Explorar",
"navigation_bar.favourites": "Favoritos",
"navigation_bar.filters": "Palabras silenciadas",
@@ -432,11 +473,29 @@
"notification.follow": "{name} te empezó a seguir",
"notification.follow_request": "{name} ha solicitado seguirte",
"notification.mention": "{name} te ha mencionado",
+ "notification.moderation-warning.learn_more": "Saber más",
+ "notification.moderation_warning": "Has recibido una advertencia de moderación",
+ "notification.moderation_warning.action_delete_statuses": "Se han eliminado algunas de tus publicaciones.",
+ "notification.moderation_warning.action_disable": "Tu cuenta ha sido desactivada.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Se han marcado como sensibles algunas de tus publicaciones.",
+ "notification.moderation_warning.action_none": "Tu cuenta ha recibido un aviso de moderación.",
+ "notification.moderation_warning.action_sensitive": "De ahora en adelante, todas tus publicaciones se marcarán como sensibles.",
+ "notification.moderation_warning.action_silence": "Tu cuenta ha sido limitada.",
+ "notification.moderation_warning.action_suspend": "Tu cuenta ha sido suspendida.",
"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.relationships_severance_event": "Conexiones perdidas con {name}",
+ "notification.relationships_severance_event.account_suspension": "Un administrador de {from} ha suspendido {target}, lo que significa que ya no puedes recibir actualizaciones de sus cuentas o interactuar con ellas.",
+ "notification.relationships_severance_event.domain_block": "Un administrador de {from} ha bloqueado {target}, incluyendo {followersCount} de tus seguidores y {followingCount, plural, one {# cuenta} other {# cuentas}} que sigues.",
+ "notification.relationships_severance_event.learn_more": "Más información",
+ "notification.relationships_severance_event.user_domain_block": "Has bloqueado {target}, eliminando {followersCount} de tus seguidores y {followingCount, plural, one {# cuenta} other {# cuentas}} que sigues.",
"notification.status": "{name} acaba de publicar",
"notification.update": "{name} editó una publicación",
+ "notification_requests.accept": "Aceptar",
+ "notification_requests.dismiss": "Descartar",
+ "notification_requests.notifications_from": "Notificaciones de {name}",
+ "notification_requests.title": "Notificaciones filtradas",
"notifications.clear": "Limpiar notificaciones",
"notifications.clear_confirmation": "¿Seguro que quieres limpiar permanentemente todas tus notificaciones?",
"notifications.column_settings.admin.report": "Nuevos informes:",
@@ -445,7 +504,6 @@
"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.filter_bar.show_bar": "Mostrar barra de filtros",
"notifications.column_settings.follow": "Nuevos seguidores:",
"notifications.column_settings.follow_request": "Nuevas solicitudes de seguimiento:",
"notifications.column_settings.mention": "Menciones:",
@@ -471,6 +529,15 @@
"notifications.permission_denied": "No se pueden habilitar las notificaciones de escritorio ya que se denegó el permiso.",
"notifications.permission_denied_alert": "No se pueden habilitar las notificaciones de escritorio, ya que el permiso del navegador fue denegado anteriormente",
"notifications.permission_required": "Las notificaciones de escritorio no están disponibles porque no se ha concedido el permiso requerido.",
+ "notifications.policy.filter_new_accounts.hint": "Creadas durante {days, plural, one {el último día} other {los últimos # días}}",
+ "notifications.policy.filter_new_accounts_title": "Cuentas nuevas",
+ "notifications.policy.filter_not_followers_hint": "Incluyendo personas que te han estado siguiendo desde hace menos de {days, plural, one {un día} other {# días}}",
+ "notifications.policy.filter_not_followers_title": "Personas que no te siguen",
+ "notifications.policy.filter_not_following_hint": "Hasta que las apruebes manualmente",
+ "notifications.policy.filter_not_following_title": "Personas que no sigues",
+ "notifications.policy.filter_private_mentions_hint": "Filtradas a menos que sea en respuesta a tu propia mención, o si sigues al remitente",
+ "notifications.policy.filter_private_mentions_title": "Menciones privadas no solicitadas",
+ "notifications.policy.title": "Filtrar notificaciones de…",
"notifications_permission_banner.enable": "Habilitar notificaciones de escritorio",
"notifications_permission_banner.how_to_control": "Para recibir notificaciones cuando Mastodon no esté abierto, habilite las notificaciones de escritorio. Puedes controlar con precisión qué tipos de interacciones generan notificaciones de escritorio a través del botón {icon} de arriba una vez que estén habilitadas.",
"notifications_permission_banner.title": "Nunca te pierdas nada",
@@ -526,14 +593,15 @@
"poll_button.add_poll": "Añadir una encuesta",
"poll_button.remove_poll": "Eliminar encuesta",
"privacy.change": "Ajustar privacidad",
- "privacy.direct.long": "Visible solo para usuarios mencionados",
- "privacy.direct.short": "Sólo cuentas mencionadas",
- "privacy.private.long": "Sólo mostrar a seguidores",
- "privacy.private.short": "Solo seguidores",
- "privacy.public.long": "Visible para todos",
- "privacy.public.short": "Público",
- "privacy.unlisted.long": "Visible para todos, pero excluido de las funciones de descubrimiento",
- "privacy.unlisted.short": "No listado",
+ "privacy.direct.long": "Visible únicamente por los mencionados en la publicación",
+ "privacy.direct.short": "Personas específicas",
+ "privacy.private.long": "Visible únicamente por tus seguidores",
+ "privacy.private.short": "Seguidores",
+ "privacy.public.long": "Visible por todo el mundo, dentro y fuera de Mastodon",
+ "privacy.public.short": "Pública",
+ "privacy.unlisted.additional": "Se comporta exactamente igual que la visibilidad pública, excepto que la publicación no aparecerá en las cronologías públicas o en las etiquetas, la sección de Explorar o la búsqueda de Mastodon, incluso si has habilitado la opción de búsqueda en tu perfil.",
+ "privacy.unlisted.long": "Sin algoritmos de descubrimiento",
+ "privacy.unlisted.short": "Pública silenciosa",
"privacy_policy.last_updated": "Actualizado por última vez {date}",
"privacy_policy.title": "Política de Privacidad",
"recommended": "Recomendado",
@@ -551,7 +619,9 @@
"relative_time.minutes": "{number} m",
"relative_time.seconds": "{number} s",
"relative_time.today": "hoy",
+ "reply_indicator.attachments": "{count, plural, one {# adjunto} other {# adjuntos}}",
"reply_indicator.cancel": "Cancelar",
+ "reply_indicator.poll": "Encuesta",
"report.block": "Bloquear",
"report.block_explanation": "No verás sus publicaciones. No podrán ver tus publicaciones ni seguirte. Podrán saber que están bloqueados.",
"report.categories.legal": "Legal",
@@ -585,7 +655,7 @@
"report.statuses.subtitle": "Selecciona todos los que correspondan",
"report.statuses.title": "¿Hay alguna publicación que respalde este informe?",
"report.submit": "Enviar",
- "report.target": "Reportando",
+ "report.target": "Reportando {target}",
"report.thanks.take_action": "Aquí están tus opciones para controlar lo que ves en Mastodon:",
"report.thanks.take_action_actionable": "Mientras revisamos esto, puedes tomar medidas contra @{name}:",
"report.thanks.title": "¿No quieres esto?",
@@ -644,10 +714,11 @@
"status.direct": "Mención privada @{name}",
"status.direct_indicator": "Mención privada",
"status.edit": "Editar",
- "status.edited": "Editado {date}",
+ "status.edited": "Última edición {date}",
"status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",
"status.embed": "Incrustado",
"status.favourite": "Favorito",
+ "status.favourites": "{count, plural, one {favorito} other {favoritos}}",
"status.filter": "Filtrar esta publicación",
"status.filtered": "Filtrado",
"status.hide": "Ocultar publicación",
@@ -668,6 +739,7 @@
"status.reblog": "Impulsar",
"status.reblog_private": "Impulsar a la audiencia original",
"status.reblogged_by": "Impulsado por {name}",
+ "status.reblogs": "{count, plural, one {impulso} other {impulsos}}",
"status.reblogs.empty": "Nadie ha impulsado esta publicación todavía. Cuando alguien lo haga, aparecerá aquí.",
"status.redraft": "Borrar y volver a borrador",
"status.remove_bookmark": "Eliminar marcador",
@@ -715,10 +787,8 @@
"upload_error.poll": "No se permite la subida de archivos con encuestas.",
"upload_form.audio_description": "Describir para personas con problemas auditivos",
"upload_form.description": "Describir para personas con discapacidad visual",
- "upload_form.description_missing": "No se ha añadido ninguna descripción",
"upload_form.edit": "Editar",
"upload_form.thumbnail": "Cambiar miniatura",
- "upload_form.undo": "Eliminar",
"upload_form.video_description": "Describir para personas con problemas auditivos o visuales",
"upload_modal.analyzing_picture": "Analizando imagen…",
"upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 26657d402e6dc3..b2759d66c64861 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -21,7 +21,7 @@
"account.blocked": "Blokeeritud",
"account.browse_more_on_origin_server": "Vaata rohkem algsel profiilil",
"account.cancel_follow_request": "Võta jälgimistaotlus tagasi",
- "account.copy": "Kopeeri link profiili",
+ "account.copy": "Kopeeri profiili link",
"account.direct": "Maini privaatselt @{name}",
"account.disable_notifications": "Peata teavitused @{name} postitustest",
"account.domain_blocked": "Domeen peidetud",
@@ -89,7 +89,14 @@
"announcement.announcement": "Teadaanne",
"attachments_list.unprocessed": "(töötlemata)",
"audio.hide": "Peida audio",
- "autosuggest_hashtag.per_week": "{count} nädalas",
+ "block_modal.remote_users_caveat": "Serverile {domain} edastatakse palve otsust järgida. Ometi pole see tagatud, kuna mõned serverid võivad blokeeringuid käsitleda omal moel. Avalikud postitused võivad tuvastamata kasutajatele endiselt näha olla.",
+ "block_modal.show_less": "Kuva vähem",
+ "block_modal.show_more": "Kuva rohkem",
+ "block_modal.they_cant_mention": "Ta ei saa mainida sind ega jälgida.",
+ "block_modal.they_cant_see_posts": "Ta ei näe sinu postitusi ja sa ei näe tema omi.",
+ "block_modal.they_will_know": "Ta näeb, et ta on blokeeritud.",
+ "block_modal.title": "Blokeeri kasutaja?",
+ "block_modal.you_wont_see_mentions": "Sa ei näe postitusi, mis mainivad teda.",
"boost_modal.combo": "Vajutades {combo}, saab selle edaspidi vahele jätta",
"bundle_column_error.copy_stacktrace": "Kopeeri veateade",
"bundle_column_error.error.body": "Soovitud lehte ei õnnestunud esitada. See võib olla meie koodiviga või probleem brauseri ühilduvusega.",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "Su konto ei ole {locked}. Igaüks saab sind jälgida, et näha su ainult-jälgijatele postitusi.",
"compose_form.lock_disclaimer.lock": "lukus",
"compose_form.placeholder": "Millest mõtled?",
- "compose_form.poll.add_option": "Lisa valik",
"compose_form.poll.duration": "Küsitluse kestus",
+ "compose_form.poll.multiple": "Valikvastustega",
"compose_form.poll.option_placeholder": "Valik {number}",
- "compose_form.poll.remove_option": "Eemalda see valik",
+ "compose_form.poll.single": "Vali üks",
"compose_form.poll.switch_to_multiple": "Muuda küsitlust mitmikvaliku lubamiseks",
"compose_form.poll.switch_to_single": "Muuda küsitlust ainult ühe valiku lubamiseks",
+ "compose_form.poll.type": "Stiil",
"compose_form.publish": "Postita",
"compose_form.publish_form": "Postita",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Salvesta muudatused",
- "compose_form.sensitive.hide": "{count, plural, one {Märgi meedia tundlikuks} other {Märgi meediad tundlikuks}}",
- "compose_form.sensitive.marked": "{count, plural, one {Meedia on märgitud tundlikuks} other {Meediad on märgitud tundlikuks}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Meedia ei ole tundlikuks märgitud} other {Meediad ei ole märgitud tundlikuks}}",
+ "compose_form.reply": "Vasta",
+ "compose_form.save_changes": "Uuenda",
"compose_form.spoiler.marked": "Tekst on hoiatuse taha peidetud",
"compose_form.spoiler.unmarked": "Märgi sisu tundlikuks",
- "compose_form.spoiler_placeholder": "Kirjuta hoiatus siia",
+ "compose_form.spoiler_placeholder": "Sisuhoiatus (valikuline)",
"confirmation_modal.cancel": "Katkesta",
- "confirmations.block.block_and_report": "Blokeeri ja teata",
"confirmations.block.confirm": "Blokeeri",
- "confirmations.block.message": "Oled kindel, et soovid blokeerida {name}?",
"confirmations.cancel_follow_request.confirm": "Tühista taotlus",
"confirmations.cancel_follow_request.message": "Oled kindel, et soovid kasutaja {name} jälgimistaotluse tagasi võtta?",
"confirmations.delete.confirm": "Kustuta",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "Oled kindel, et soovid selle loetelu pöördumatult kustutada?",
"confirmations.discard_edit_media.confirm": "Hülga",
"confirmations.discard_edit_media.message": "Sul on salvestamata muudatusi meediakirjelduses või eelvaates, kas hülgad need?",
- "confirmations.domain_block.confirm": "Peida terve domeen",
+ "confirmations.domain_block.confirm": "Blokeeri server",
"confirmations.domain_block.message": "Oled ikka päris-päris kindel, et soovid blokeerida terve {domain}? Enamikel juhtudel piisab mõnest sihitud blokist või vaigistusest, mis on eelistatavam. Sa ei näe selle domeeni sisu ühelgi avalikul ajajoonel või enda teadetes. Su jälgijad sellest domeenist eemaldatakse.",
"confirmations.edit.confirm": "Muuda",
"confirmations.edit.message": "Muutes praegu kirjutatakse hetkel loodav sõnum üle. Kas oled kindel, et soovid jätkata?",
"confirmations.logout.confirm": "Välju",
"confirmations.logout.message": "Kas oled kindel, et soovid välja logida?",
"confirmations.mute.confirm": "Vaigista",
- "confirmations.mute.explanation": "See peidab tema postitused ning postitused, milles teda mainitakse, kuid lubab tal ikkagi sinu postitusi näha ning sind jälgida.",
- "confirmations.mute.message": "Oled kindel, et soovid {name} vaigistada?",
"confirmations.redraft.confirm": "Kustuta & taasalusta",
"confirmations.redraft.message": "Kindel, et soovid postituse kustutada ja võtta uue aluseks? Lemmikuks märkimised ja jagamised lähevad kaotsi ning vastused jäävad ilma algse postituseta.",
"confirmations.reply.confirm": "Vasta",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "Need postitused üle sotsiaalse võrgu koguvad praegu tähelepanu. Uued postitused, millel on rohkem jagamisi ja lemmikuks märkimisi, on kõrgemal kohal.",
"dismissable_banner.explore_tags": "Need sildid siit ja teistes serveritest detsentraliseeritud võrgus koguvad tähelepanu just praegu selles serveris.",
"dismissable_banner.public_timeline": "Need on kõige uuemad avalikud postitused inimestelt sotsiaalvõrgustikus, mida {domain} inimesed jälgivad.",
+ "domain_block_modal.block": "Blokeeri server",
+ "domain_block_modal.block_account_instead": "Selle asemel blokeeri @{name}",
+ "domain_block_modal.they_can_interact_with_old_posts": "Inimesed sellest serverist saavad interakteeruda sinu vanade postitustega.",
+ "domain_block_modal.they_cant_follow": "Sellest serverist ei saa keegi sind jälgida.",
+ "domain_block_modal.they_wont_know": "Nad ei tea, et nad on blokeeritud.",
+ "domain_block_modal.title": "Blokeerida domeen?",
+ "domain_block_modal.you_will_lose_followers": "Kõik sinu sellest serverist pärit jälgijad eemaldatakse.",
+ "domain_block_modal.you_wont_see_posts": "Sa ei näe selle serveri kasutajate postitusi ega teavitusi.",
+ "domain_pill.activitypub_lets_connect": "See võimaldab sul ühenduda inimestega ja nendega suhelda mitte ainult Mastodonis, vaid ka teistes suhtlusrakendustes.",
+ "domain_pill.activitypub_like_language": "ActivityPub on nagu keel, mida Mastodon räägib teiste suhtlusvõrgustikega.",
+ "domain_pill.server": "Server",
+ "domain_pill.their_handle": "Tema tunnus:",
+ "domain_pill.their_server": "Tema digitaalne kodu, kus kõik tema postitused on.",
+ "domain_pill.their_username": "Tema unikaalne tunnus tema serveris. On võimalik, et mingites teistes serverites on sama kasutajanimega kasutajaid.",
+ "domain_pill.username": "Kasutajanimi",
+ "domain_pill.whats_in_a_handle": "Mis on tunnuses?",
+ "domain_pill.who_they_are": "Kuna tunnus ütleb, kes keegi on ja kus, saad suhelda inimestega üle .",
+ "domain_pill.who_you_are": "Kuna tunnus ütleb, kes sa oled ja kus, saavad inimesed sinuga suhelda üle .",
+ "domain_pill.your_handle": "Sinu tunnus:",
+ "domain_pill.your_server": "Sinu digitaalne kodu, kus on kõik sinu postitused. Sulle ei meeldi see? Vaheta mistahes ajal serverit ja võta jälgijad ka.",
+ "domain_pill.your_username": "Sinu unikaalne identifikaator siin serveris. On võimalik, et leiad teistes serverites samasuguse kasutajanimega kasutajaid.",
"embed.instructions": "Lisa see postitus oma veebilehele, kopeerides alloleva koodi.",
"embed.preview": "Nii näeb see välja:",
"emoji_button.activity": "Tegevus",
@@ -244,6 +266,7 @@
"empty_column.list": "Siin loetelus pole veel midagi. Kui loetelu liikmed teevad uusi postitusi, näed neid siin.",
"empty_column.lists": "Pole veel ühtegi nimekirja. Kui lood mõne, näed neid siin.",
"empty_column.mutes": "Sa pole veel ühtegi kasutajat vaigistanud.",
+ "empty_column.notification_requests": "Kõik tühi! Siin pole mitte midagi. Kui saad uusi teavitusi, ilmuvad need siin vastavalt sinu seadistustele.",
"empty_column.notifications": "Ei ole veel teateid. Kui keegi suhtleb sinuga, näed seda siin.",
"empty_column.public": "Siin pole midagi! Kirjuta midagi avalikku või jälgi ise kasutajaid täitmaks seda ruumi",
"error.unexpected_crash.explanation": "Meie poolse probleemi või veebilehitseja ühilduvusprobleemi tõttu ei suutnud me seda lehekülge korrektselt näidata.",
@@ -274,12 +297,25 @@
"filter_modal.select_filter.subtitle": "Kasuta olemasolevat kategooriat või loo uus",
"filter_modal.select_filter.title": "Filtreeri seda postitust",
"filter_modal.title.status": "Postituse filtreerimine",
+ "filtered_notifications_banner.pending_requests": "Teateid {count, plural, =0 {mitte üheltki} one {ühelt} other {#}} inimeselt, keda võid teada",
+ "filtered_notifications_banner.title": "Filtreeritud teavitused",
"firehose.all": "Kõik",
"firehose.local": "See server",
"firehose.remote": "Teised serverid",
"follow_request.authorize": "Autoriseeri",
"follow_request.reject": "Hülga",
"follow_requests.unlocked_explanation": "Kuigi su konto pole lukustatud, soovitab {domain} personal siiski nende kontode jälgimistaotlused käsitsi üle vaadata.",
+ "follow_suggestions.curated_suggestion": "Teiste valitud",
+ "follow_suggestions.dismiss": "Ära enam näita",
+ "follow_suggestions.hints.featured": "Selle kasutajaprofiili on soovitanud {domain} kasutajad.",
+ "follow_suggestions.hints.friends_of_friends": "See kasutajaprofiil on jälgitavate seas populaarne.",
+ "follow_suggestions.hints.most_followed": "See on {domain} enim jälgitud kasutajaprofiil.",
+ "follow_suggestions.hints.most_interactions": "See on {domain} viimasel ajal enim tähelepanu saanud kasutajaprofiil.",
+ "follow_suggestions.hints.similar_to_recently_followed": "See kasutajaprofiil sarnaneb neile, mida oled hiljuti jälgima asunud.",
+ "follow_suggestions.personalized_suggestion": "Isikupärastatud soovitus",
+ "follow_suggestions.popular_suggestion": "Popuplaarne soovitus",
+ "follow_suggestions.view_all": "Vaata kõiki",
+ "follow_suggestions.who_to_follow": "Keda jälgida",
"followed_tags": "Jälgitavad märksõnad",
"footer.about": "Teave",
"footer.directory": "Profiilikataloog",
@@ -306,13 +342,8 @@
"hashtag.follow": "Jälgi silti",
"hashtag.unfollow": "Lõpeta sildi jälgimine",
"hashtags.and_other": "…ja {count, plural, one {}other {# veel}}",
- "home.actions.go_to_explore": "Vaata, mis on populaarne",
- "home.actions.go_to_suggestions": "Leia inimesi, keda jälgida",
- "home.column_settings.basic": "Peamine",
"home.column_settings.show_reblogs": "Näita jagamisi",
"home.column_settings.show_replies": "Näita vastuseid",
- "home.explore_prompt.body": "Sinu koduvoos on koos jälgimiseks valitud siltidega postitused, sinu jälgitavate inimeste postitused ja postitused, mida nad jagavad. Kui see tundub liiga vaikne, võid sa soovida:",
- "home.explore_prompt.title": "See on sinu kodubaas Mastodonis.",
"home.hide_announcements": "Peida teadaanded",
"home.pending_critical_update.body": "Palun uuenda oma Mastodoni server nii ruttu kui võimalik!",
"home.pending_critical_update.link": "Vaata uuendusi",
@@ -396,9 +427,15 @@
"loading_indicator.label": "Laadimine…",
"media_gallery.toggle_visible": "{number, plural, one {Varja pilt} other {Varja pildid}}",
"moved_to_account_banner.text": "Kontot {disabledAccount} ei ole praegu võimalik kasutada, sest kolisid kontole {movedToAccount}.",
- "mute_modal.duration": "Kestus",
- "mute_modal.hide_notifications": "Kas peita teated sellelt kasutajalt?",
- "mute_modal.indefinite": "Lõpmatu",
+ "mute_modal.hide_from_notifications": "Peida teavituste hulgast",
+ "mute_modal.hide_options": "Peida valikud",
+ "mute_modal.indefinite": "Kuni eemaldan neilt vaigistuse",
+ "mute_modal.show_options": "Kuva valikud",
+ "mute_modal.they_can_mention_and_follow": "Ta saab sind mainida ja sind jälgida, kuid sa ei näe teda.",
+ "mute_modal.they_wont_know": "Ta ei tea, et ta on vaigistatud.",
+ "mute_modal.title": "Vaigistada kasutaja?",
+ "mute_modal.you_wont_see_mentions": "Sa ei näe postitusi, mis teda mainivad.",
+ "mute_modal.you_wont_see_posts": "Ta näeb jätkuvalt sinu postitusi, kuid sa ei näe tema omi.",
"navigation_bar.about": "Teave",
"navigation_bar.advanced_interface": "Ava kohandatud veebiliides",
"navigation_bar.blocks": "Blokeeritud kasutajad",
@@ -408,7 +445,6 @@
"navigation_bar.direct": "Privaatsed mainimised",
"navigation_bar.discover": "Avasta",
"navigation_bar.domain_blocks": "Peidetud domeenid",
- "navigation_bar.edit_profile": "Muuda profiili",
"navigation_bar.explore": "Avasta",
"navigation_bar.favourites": "Lemmikud",
"navigation_bar.filters": "Vaigistatud sõnad",
@@ -435,17 +471,25 @@
"notification.own_poll": "Su küsitlus on lõppenud",
"notification.poll": "Küsitlus, milles osalesid, on lõppenud",
"notification.reblog": "{name} jagas edasi postitust",
+ "notification.relationships_severance_event": "Kadunud ühendus kasutajaga {name}",
+ "notification.relationships_severance_event.account_suspension": "{from} admin on kustutanud {target}, mis tähendab, et sa ei saa enam neilt uuendusi või suhelda nendega.",
+ "notification.relationships_severance_event.domain_block": "{from} admin on blokeerinud {target}, sealhulgas {followersCount} sinu jälgijat ja {followingCount, plural, one {# konto} other {# kontot}}, mida jälgid.",
+ "notification.relationships_severance_event.learn_more": "Saa rohkem teada",
+ "notification.relationships_severance_event.user_domain_block": "Blokeerisid {target}, eemaldades oma jälgijate hulgast {followersCount} ja jälgitavate hulgast {followingCount, plural, one {# konto} other {# kontot}}.",
"notification.status": "{name} just postitas",
"notification.update": "{name} muutis postitust",
+ "notification_requests.accept": "Nõus",
+ "notification_requests.dismiss": "Hülga",
+ "notification_requests.notifications_from": "Teavitus kasutajalt {name}",
+ "notification_requests.title": "Filtreeritud teavitused",
"notifications.clear": "Puhasta teated",
"notifications.clear_confirmation": "Oled kindel, et soovid püsivalt kõik oma teated eemaldada?",
"notifications.column_settings.admin.report": "Uued teavitused:",
"notifications.column_settings.admin.sign_up": "Uued kasutajad:",
"notifications.column_settings.alert": "Töölauateated",
"notifications.column_settings.favourite": "Lemmikud:",
- "notifications.column_settings.filter_bar.advanced": "Kuva kõik kategooriad",
+ "notifications.column_settings.filter_bar.advanced": "Näita kõiki kategooriaid",
"notifications.column_settings.filter_bar.category": "Kiirfiltri riba",
- "notifications.column_settings.filter_bar.show_bar": "Näita filtririba",
"notifications.column_settings.follow": "Uued jälgijad:",
"notifications.column_settings.follow_request": "Uued jälgimistaotlused:",
"notifications.column_settings.mention": "Mainimised:",
@@ -471,6 +515,15 @@
"notifications.permission_denied": "Töölauamärguanded pole saadaval, kuna eelnevalt keelduti lehitsejale teavituste luba andmast",
"notifications.permission_denied_alert": "Töölaua märguandeid ei saa lubada, kuna brauseri luba on varem keeldutud",
"notifications.permission_required": "Töölaua märguanded ei ole saadaval, kuna vajalik luba pole antud.",
+ "notifications.policy.filter_new_accounts.hint": "Loodud viimase {days, plural, one {ühe päeva} other {# päeva}} jooksul",
+ "notifications.policy.filter_new_accounts_title": "Uued kontod",
+ "notifications.policy.filter_not_followers_hint": "Kaasates kasutajad, kes on sind jälginud vähem kui {days, plural, one {ühe päeva} other {# päeva}}",
+ "notifications.policy.filter_not_followers_title": "Sind mittejälgivad kasutajad",
+ "notifications.policy.filter_not_following_hint": "Kuni sa nad käsitsi kinnitad",
+ "notifications.policy.filter_not_following_title": "Inimesed, keda sa ei jälgi",
+ "notifications.policy.filter_private_mentions_hint": "Filtreeritud, kui see pole vastus sinupoolt mainimisele või kui jälgid saatjat",
+ "notifications.policy.filter_private_mentions_title": "Soovimatud privaatsed mainimised",
+ "notifications.policy.title": "Filtreeri välja teavitused kohast…",
"notifications_permission_banner.enable": "Luba töölaua märguanded",
"notifications_permission_banner.how_to_control": "Et saada teateid, ajal mil Mastodon pole avatud, luba töölauamärguanded. Saad täpselt määrata, mis tüüpi tegevused tekitavad märguandeid, kasutates peale teadaannete sisse lülitamist üleval olevat nuppu {icon}.",
"notifications_permission_banner.title": "Ära jää millestki ilma",
@@ -481,7 +534,7 @@
"onboarding.compose.template": "Tere, #Mastodon!",
"onboarding.follows.empty": "Kahjuks ei saa hetkel tulemusi näidata. Proovi kasutada otsingut või lehitse uurimise lehte, et leida inimesi, keda jälgida, või proovi hiljem uuesti.",
"onboarding.follows.lead": "Haldad ise oma koduvoogu. Mida rohkemaid inimesi jälgid, seda aktiivsem ja huvitavam see on. Need profiilid võiksid olla head alustamiskohad — saad nende jälgimise alati lõpetada!",
- "onboarding.follows.title": "Populaarne Mastodonis",
+ "onboarding.follows.title": "Isikupärasta oma koduvoogu",
"onboarding.profile.discoverable": "Muuda mu profiil avastatavaks",
"onboarding.profile.discoverable_hint": "Kui nõustud enda avastamisega Mastodonis, võivad sinu postitused ilmuda otsingutulemustes ja trendides ning sinu profiili võidakse soovitada sinuga sarnaste huvidega inimestele.",
"onboarding.profile.display_name": "Näidatav nimi",
@@ -501,11 +554,11 @@
"onboarding.start.skip": "Soovid kohe edasi hüpata?",
"onboarding.start.title": "Said valmis!",
"onboarding.steps.follow_people.body": "Haldad oma koduvoogu. Täida see huvitavate inimestega.",
- "onboarding.steps.follow_people.title": "Jälgi {count, plural, one {üht inimest} other {# inimest}}",
+ "onboarding.steps.follow_people.title": "Isikupärasta oma koduvoogu",
"onboarding.steps.publish_status.body": "Ütle maailmale tere.",
"onboarding.steps.publish_status.title": "Tee oma esimene postitus",
"onboarding.steps.setup_profile.body": "Täidetud profiili korral suhtlevad teised sinuga tõenäolisemalt.",
- "onboarding.steps.setup_profile.title": "Kohanda oma profiili",
+ "onboarding.steps.setup_profile.title": "Isikupärasta oma profiili",
"onboarding.steps.share_profile.body": "Anna sõpradele teada, kuidas sind Mastodonist leida!",
"onboarding.steps.share_profile.title": "Jaga oma profiili",
"onboarding.tips.2fa": "Kas sa teadsid? Saad oma kontot muuta turvalisemaks valides konto seadetes kaheastmelise autoriseerimise. See töötab mistahes sinu valitud TOTP-äpiga, telefoninumbrit pole vaja!",
@@ -526,14 +579,15 @@
"poll_button.add_poll": "Lisa küsitlus",
"poll_button.remove_poll": "Eemalda küsitlus",
"privacy.change": "Muuda postituse nähtavust",
- "privacy.direct.long": "Postita ainult mainitud kasutajatele",
- "privacy.direct.short": "Mainitud inimesed ainult",
- "privacy.private.long": "Postita ainult jälgijatele",
- "privacy.private.short": "Jälgijad ainult",
- "privacy.public.long": "Kõigile nähtav",
+ "privacy.direct.long": "Kõik postituses mainitud",
+ "privacy.direct.short": "Määratud kasutajad",
+ "privacy.private.long": "Ainult jälgijad",
+ "privacy.private.short": "Jälgijad",
+ "privacy.public.long": "Nii kasutajad kui mittekasutajad",
"privacy.public.short": "Avalik",
- "privacy.unlisted.long": "Kõigile nähtav, aga ei ilmu avastamise vaadetes",
- "privacy.unlisted.short": "Määramata",
+ "privacy.unlisted.additional": "See on olemuselt küll avalik, aga postitus ei ilmu voogudes ega märksõnades, lehitsedes ega Mastodoni otsingus, isegi kui konto on seadistustes avalik.",
+ "privacy.unlisted.long": "Vähem algoritmilisi teavitusi",
+ "privacy.unlisted.short": "Vaikselt avalik",
"privacy_policy.last_updated": "Viimati uuendatud {date}",
"privacy_policy.title": "Isikuandmete kaitse",
"recommended": "Soovitatud",
@@ -551,7 +605,9 @@
"relative_time.minutes": "{number}m",
"relative_time.seconds": "{number}s",
"relative_time.today": "täna",
+ "reply_indicator.attachments": "{count, plural, one {# lisa} other {# lisa}}",
"reply_indicator.cancel": "Tühista",
+ "reply_indicator.poll": "Küsitlus",
"report.block": "Blokeeri",
"report.block_explanation": "Sa ei näe tema postitusi. Tema ei saa näha sinu postitusi ega sind jälgida. Talle on näha, et ta on blokeeritud.",
"report.categories.legal": "Juriidiline",
@@ -644,10 +700,11 @@
"status.direct": "Maini privaatselt @{name}",
"status.direct_indicator": "Privaatne mainimine",
"status.edit": "Muuda",
- "status.edited": "{date} muudetud",
+ "status.edited": "Viimati muudetud {date}",
"status.edited_x_times": "Muudetud {count, plural, one{{count} kord} other {{count} korda}}",
"status.embed": "Manustamine",
"status.favourite": "Lemmik",
+ "status.favourites": "{count, plural, one {lemmik} other {lemmikud}}",
"status.filter": "Filtreeri seda postitust",
"status.filtered": "Filtreeritud",
"status.hide": "Peida postitus",
@@ -668,6 +725,7 @@
"status.reblog": "Jaga",
"status.reblog_private": "Jaga algse nähtavusega",
"status.reblogged_by": "{name} jagas",
+ "status.reblogs": "{count, plural, one {jagamine} other {jagamist}}",
"status.reblogs.empty": "Keegi pole seda postitust veel jaganud. Kui keegi seda teeb, näeb seda siin.",
"status.redraft": "Kustuta & alga uuesti",
"status.remove_bookmark": "Eemalda järjehoidja",
@@ -715,10 +773,8 @@
"upload_error.poll": "Küsitlustes pole faili üleslaadimine lubatud.",
"upload_form.audio_description": "Kirjelda kuulmispuudega inimeste jaoks",
"upload_form.description": "Kirjelda vaegnägijatele",
- "upload_form.description_missing": "Kirjeldus puudub",
"upload_form.edit": "Muuda",
"upload_form.thumbnail": "Muuda pisipilti",
- "upload_form.undo": "Kustuta",
"upload_form.video_description": "Kirjelda kuulmis- või nägemispuudega inimeste jaoks",
"upload_modal.analyzing_picture": "Analüüsime pilti…",
"upload_modal.apply": "Rakenda",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index c75f697e4c2ac7..9fae0748780aad 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -25,7 +25,7 @@
"account.direct": "Aipatu pribatuki @{name}",
"account.disable_notifications": "Utzi jakinarazteari @{name} erabiltzaileak argitaratzean",
"account.domain_blocked": "Ezkutatutako domeinua",
- "account.edit_profile": "Aldatu profila",
+ "account.edit_profile": "Editatu profila",
"account.enable_notifications": "Jakinarazi @{name} erabiltzaileak argitaratzean",
"account.endorse": "Nabarmendu profilean",
"account.featured_tags.last_status_at": "Azken bidalketa {date} datan",
@@ -89,7 +89,14 @@
"announcement.announcement": "Iragarpena",
"attachments_list.unprocessed": "(prozesatu gabe)",
"audio.hide": "Ezkutatu audioa",
- "autosuggest_hashtag.per_week": "{count} asteko",
+ "block_modal.remote_users_caveat": "{domain} zerbitzariari zure erabakia errespeta dezan eskatuko diogu. Halere, araua beteko den ezin da bermatu, zerbitzari batzuk modu desberdinean kudeatzen baitituzte blokeoak. Baliteke argitalpen publikoak saioa hasi ez duten erabiltzaileentzat ikusgai egotea.",
+ "block_modal.show_less": "Erakutsi gutxiago",
+ "block_modal.show_more": "Erakutsi gehiago",
+ "block_modal.they_cant_mention": "Ezin zaitu aipatu ezta jarraitu ere.",
+ "block_modal.they_cant_see_posts": "Ezin ditu zure bidalketak ikusi eta zuk ez dituzu bereak ikusiko.",
+ "block_modal.they_will_know": "Ezin du ikusi blokeatuta duzunik.",
+ "block_modal.title": "Erabiltzailea blokeatu nahi duzu?",
+ "block_modal.you_wont_see_mentions": "Ez duzu ikusiko bera aipatzen duen argitalpenik.",
"boost_modal.combo": "{combo} sakatu dezakezu hurrengoan hau saltatzeko",
"bundle_column_error.copy_stacktrace": "Kopiatu errore-txostena",
"bundle_column_error.error.body": "Eskatutako orria ezin izan da bistaratu. Kodeko errore bategatik izan daiteke edo nabigatzailearen bateragarritasun arazo bategatik.",
@@ -133,7 +140,7 @@
"column_header.unpin": "Desfinkatu",
"column_subheading.settings": "Ezarpenak",
"community.column_settings.local_only": "Lokala soilik",
- "community.column_settings.media_only": "Multimedia besterik ez",
+ "community.column_settings.media_only": "Edukiak soilik",
"community.column_settings.remote_only": "Urrunekoa soilik",
"compose.language.change": "Aldatu hizkuntza",
"compose.language.search": "Bilatu hizkuntzak...",
@@ -141,31 +148,27 @@
"compose.published.open": "Ireki",
"compose.saved.body": "Argitalpena gorde da.",
"compose_form.direct_message_warning_learn_more": "Ikasi gehiago",
- "compose_form.encryption_warning": "Mastodoneko bidalketak ez daude muturretik muturrera enkriptatuta. Ez partekatu informazio sentikorrik Mastodonen.",
+ "compose_form.encryption_warning": "Mastodon-go bidalketak ez daude muturretik muturrera enkriptatuta. Ez partekatu informazio sentikorrik Mastodonen.",
"compose_form.hashtag_warning": "Tut hau ez da inolako traolatan zerrendatuko, ez baita publikoa. Tut publikoak soilik traolen bitartez bila daitezke.",
"compose_form.lock_disclaimer": "Zure kontua ez dago {locked}. Edonork jarraitu zaitzake zure jarraitzaileentzako soilik diren bidalketak ikusteko.",
"compose_form.lock_disclaimer.lock": "giltzapetuta",
"compose_form.placeholder": "Zer duzu buruan?",
- "compose_form.poll.add_option": "Gehitu aukera bat",
"compose_form.poll.duration": "Inkestaren iraupena",
+ "compose_form.poll.multiple": "Aukera aniza",
"compose_form.poll.option_placeholder": "{number}. aukera",
- "compose_form.poll.remove_option": "Kendu aukera hau",
+ "compose_form.poll.single": "Hautatu bat",
"compose_form.poll.switch_to_multiple": "Aldatu inkesta hainbat aukera onartzeko",
"compose_form.poll.switch_to_single": "Aldatu inkesta aukera bakarra onartzeko",
+ "compose_form.poll.type": "Estiloa",
"compose_form.publish": "Argitaratu",
"compose_form.publish_form": "Argitaratu",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Gorde aldaketak",
- "compose_form.sensitive.hide": "Markatu multimedia hunkigarri gisa",
- "compose_form.sensitive.marked": "Multimedia edukia hunkigarri gisa markatu da",
- "compose_form.sensitive.unmarked": "Multimedia edukia ez da hunkigarri gisa markatu",
+ "compose_form.reply": "Erantzun",
+ "compose_form.save_changes": "Eguneratu",
"compose_form.spoiler.marked": "Testua abisu batek ezkutatzen du",
"compose_form.spoiler.unmarked": "Testua ez dago ezkutatuta",
- "compose_form.spoiler_placeholder": "Idatzi zure abisua hemen",
+ "compose_form.spoiler_placeholder": "Edukiaren abisua (aukerakoa)",
"confirmation_modal.cancel": "Utzi",
- "confirmations.block.block_and_report": "Blokeatu eta salatu",
"confirmations.block.confirm": "Blokeatu",
- "confirmations.block.message": "Ziur {name} blokeatu nahi duzula?",
"confirmations.cancel_follow_request.confirm": "Baztertu eskaera",
"confirmations.cancel_follow_request.message": "Ziur {name} jarraitzeko eskaera bertan behera utzi nahi duzula?",
"confirmations.delete.confirm": "Ezabatu",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "Ziur behin betiko ezabatu nahi duzula zerrenda hau?",
"confirmations.discard_edit_media.confirm": "Baztertu",
"confirmations.discard_edit_media.message": "Multimediaren deskribapen edo aurrebistan gorde gabeko aldaketak daude, baztertu nahi dituzu?",
- "confirmations.domain_block.confirm": "Ezkutatu domeinu osoa",
+ "confirmations.domain_block.confirm": "Blokeatu zerbitzaria",
"confirmations.domain_block.message": "Ziur, erabat ziur, {domain} domeinu osoa blokeatu nahi duzula? Gehienetan gutxi batzuk blokeatu edo mututzearekin nahikoa da. Ez duzu domeinu horretako edukirik ikusiko denbora lerroetan edo jakinarazpenetan. Domeinu horretako zure jarraitzaileak kenduko dira ere.",
"confirmations.edit.confirm": "Editatu",
"confirmations.edit.message": "Orain editatzen baduzu, une honetan idazten ari zaren mezua gainidatziko da. Ziur jarraitu nahi duzula?",
"confirmations.logout.confirm": "Amaitu saioa",
"confirmations.logout.message": "Ziur saioa amaitu nahi duzula?",
"confirmations.mute.confirm": "Mututu",
- "confirmations.mute.explanation": "Honek horko bidalketak eta aipamena egiten dietenak ezkutatuko ditu, baina beraiek zure bidalketak ikusi ahal izango dituzte eta zuri jarraitu.",
- "confirmations.mute.message": "Ziur {name} mututu nahi duzula?",
"confirmations.redraft.confirm": "Ezabatu eta berridatzi",
"confirmations.redraft.message": "Ziur argitalpen hau ezabatu eta zirriborroa berriro egitea nahi duzula? Gogokoak eta bultzadak galduko dira, eta jatorrizko argitalpenaren erantzunak zurtz geratuko dira.",
"confirmations.reply.confirm": "Erantzun",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "Hauek dira gaur egun lekua hartzen ari diren sare sozial osoaren argitalpenak. Bultzada eta gogoko gehien dituzten argitalpen berrienek sailkapen altuagoa dute.",
"dismissable_banner.explore_tags": "Traola hauek daude bogan orain zerbitzari honetan eta sare deszentralizatuko besteetan.",
"dismissable_banner.public_timeline": "Hauek dira {domain}-(e)ko jendeak web sozialean jarraitzen dituen jendearen azkeneko argitalpen publikoak.",
+ "domain_block_modal.block": "Blokeatu zerbitzaria",
+ "domain_block_modal.block_account_instead": "Blokeatu @{name} bestela",
+ "domain_block_modal.they_can_interact_with_old_posts": "Zerbitzari honetako jendea zure argitalpen zaharrekin elkarreragin dezake.",
+ "domain_block_modal.they_cant_follow": "Zerbitzari honetako inork ezin zaitu jarraitu.",
+ "domain_block_modal.they_wont_know": "Ez dute jakingo blokeatuak izan direnik.",
+ "domain_block_modal.title": "Domeinua blokeatu nahi duzu?",
+ "domain_block_modal.you_will_lose_followers": "Zerbitzari honetako jarraitzaile guztiak kenduko dira.",
+ "domain_block_modal.you_wont_see_posts": "Ez dituzu zerbitzari honetako erabiltzaileen argitalpenik edota jakinarazpenik ikusiko.",
+ "domain_pill.activitypub_lets_connect": "Mastodon-en ez ezik, beste sare sozialen aplikazioetako jendearekin konektatzea eta harremanetan jartzea uzten dizu.",
+ "domain_pill.activitypub_like_language": "ActivityPub, Mastodon-ek beste sare sozialekin hitz egiteko erabiltzen duen hizkuntza bezalakoxea da.",
+ "domain_pill.server": "Zerbitzaria",
+ "domain_pill.their_handle": "Bere helbidea:",
+ "domain_pill.their_server": "Bere etxe digitala, non bere argitalpenak dauden.",
+ "domain_pill.their_username": "Zerbitzarian duen identifikatzaile bakarra. Baliteke erabiltzaile-izen bera duten erabiltzaileak zerbitzari desberdinetan aurkitzea.",
+ "domain_pill.username": "Erabiltzaile-izena",
+ "domain_pill.whats_in_a_handle": "Zer dago helbide batean?",
+ "domain_pill.who_they_are": "Helbideek norbait nor den eta non dagoen adierazten dute, sare sozialeko jendearekin jar zaitezke harremanetan.",
+ "domain_pill.who_you_are": "Zure helbideak nor zaren eta non zauden adierazten duenez, jendea sare sozialen bitartez jar daiteke zurekin harremanetan.",
+ "domain_pill.your_handle": "Zure helbidea:",
+ "domain_pill.your_server": "Zure etxe digitala, non zure bidalketak dauden. Ez al zaizu gustatzen? Transferitu zerbitzariak edonoiz eta ekarri zure jarraitzaileak ere.",
+ "domain_pill.your_username": "Zerbitzarian duzun identifikatzaile bakarra. Baliteke erabiltzaile-izen bera duten erabiltzaileak zerbitzari desberdinetan aurkitzea.",
"embed.instructions": "Txertatu bidalketa hau zure webgunean beheko kodea kopiatuz.",
"embed.preview": "Hau da izango duen itxura:",
"emoji_button.activity": "Jarduera",
@@ -244,6 +266,7 @@
"empty_column.list": "Ez dago ezer zerrenda honetan. Zerrenda honetako kideek bidalketa berriak argitaratzean, hemen agertuko dira.",
"empty_column.lists": "Ez duzu zerrendarik oraindik. Baten bat sortzen duzunean hemen agertuko da.",
"empty_column.mutes": "Ez duzu erabiltzailerik mututu oraindik.",
+ "empty_column.notification_requests": "Garbi-garbi! Ezertxo ere ez hemen. Jakinarazpenak jasotzen dituzunean, hemen agertuko dira zure ezarpenen arabera.",
"empty_column.notifications": "Ez duzu jakinarazpenik oraindik. Jarri besteekin harremanetan elkarrizketa abiatzeko.",
"empty_column.public": "Ez dago ezer hemen! Idatzi zerbait publikoki edo jarraitu eskuz beste zerbitzari batzuetako erabiltzaileei hau betetzen joateko",
"error.unexpected_crash.explanation": "Gure kodean arazoren bat dela eta, edo nabigatzailearekin bateragarritasun arazoren bat dela eta, orri hau ezin izan da ongi bistaratu.",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "Hautatu lehendik dagoen kategoria bat edo sortu berria",
"filter_modal.select_filter.title": "Iragazi bidalketa hau",
"filter_modal.title.status": "Iragazi bidalketa bat",
+ "filtered_notifications_banner.mentions": "{count, plural, one {aipamen} other {aipamen}}",
+ "filtered_notifications_banner.pending_requests": "Ezagutu {count, plural, =0 {dezakezun inoren} one {dezakezun pertsona baten} other {ditzakezun # pertsonen}} jakinarazpenak",
+ "filtered_notifications_banner.title": "Iragazitako jakinarazpenak",
"firehose.all": "Guztiak",
"firehose.local": "Zerbitzari hau",
"firehose.remote": "Beste zerbitzariak",
"follow_request.authorize": "Baimendu",
"follow_request.reject": "Ukatu",
"follow_requests.unlocked_explanation": "Zure kontua blokeatuta ez badago ere, {domain} domeinuko arduradunek uste dute kontu hauetako jarraipen eskaerak agian eskuz begiratu nahiko dituzula.",
+ "follow_suggestions.curated_suggestion": "Domeinuaren iradokizuna",
+ "follow_suggestions.dismiss": "Ez erakutsi berriro",
+ "follow_suggestions.featured_longer": "{domain} domeinuko taldeak hautaturikoak",
+ "follow_suggestions.friends_of_friends_longer": "Jarraitzen duzun jendearen artean ezagunak direnak",
+ "follow_suggestions.hints.featured": "Profil hau {domain} domeinuko taldeak eskuz aukeratu du.",
+ "follow_suggestions.hints.friends_of_friends": "Profil hau ezaguna da jarraitzen duzun jendearen artean.",
+ "follow_suggestions.hints.most_followed": "Profil hau {domain} domeinuan gehien jarraitzen den profiletako bat da.",
+ "follow_suggestions.hints.most_interactions": "Profil hau arreta handia jasotzen ari da berriki {domain} domeinuan.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Profil hau duela gutxi jarraitu dituzun profil askoren antzekoa da.",
+ "follow_suggestions.personalized_suggestion": "Iradokizun pertsonalizatua",
+ "follow_suggestions.popular_suggestion": "Iradokizun ezaguna",
+ "follow_suggestions.popular_suggestion_longer": "{domain} domeinuan ezagunak direnak",
+ "follow_suggestions.similar_to_recently_followed_longer": "Berriki jarraitu dituzun profilen antzekoa",
+ "follow_suggestions.view_all": "Ikusi denak",
+ "follow_suggestions.who_to_follow": "Zein jarraitu",
"followed_tags": "Jarraitutako traolak",
"footer.about": "Honi buruz",
"footer.directory": "Profil-direktorioa",
@@ -306,15 +347,10 @@
"hashtag.follow": "Jarraitu traolari",
"hashtag.unfollow": "Utzi traola jarraitzeari",
"hashtags.and_other": "…eta {count, plural, one {}other {# gehiago}}",
- "home.actions.go_to_explore": "Ikusi zer dagoen pil-pilean",
- "home.actions.go_to_suggestions": "Aurkitu jendea jarraitzeko",
- "home.column_settings.basic": "Oinarrizkoa",
"home.column_settings.show_reblogs": "Erakutsi bultzadak",
"home.column_settings.show_replies": "Erakutsi erantzunak",
- "home.explore_prompt.body": "Zure hasierako jarioak jarraitzeko aukeratu dituzun traolen, jarraitzeko aukeratu duzun jendearen eta beraiek bultzatutako argitalpenen nahasketa bat edukiko du. Nahiko isila dirudi oraintxe, beraz, zergatik ez:",
- "home.explore_prompt.title": "Hau zure hasiera da Mastodonen.",
"home.hide_announcements": "Ezkutatu iragarpenak",
- "home.pending_critical_update.body": "Eguneratu zure Mastodoneko zerbitzaria leheinbailehen!",
+ "home.pending_critical_update.body": "Eguneratu zure Mastodon-go zerbitzaria leheinbailehen!",
"home.pending_critical_update.link": "Ikusi eguneraketak",
"home.pending_critical_update.title": "Segurtasun eguneraketa kritikoa eskuragarri!",
"home.show_announcements": "Erakutsi iragarpenak",
@@ -357,7 +393,7 @@
"keyboard_shortcuts.muted": "mutututako erabiltzaileen zerrenda irekitzeko",
"keyboard_shortcuts.my_profile": "zure profila irekitzeko",
"keyboard_shortcuts.notifications": "jakinarazpenen zutabea irekitzeko",
- "keyboard_shortcuts.open_media": "media zabaltzeko",
+ "keyboard_shortcuts.open_media": "Ireki edukia",
"keyboard_shortcuts.pinned": "Ireki finkatutako bidalketen zerrenda",
"keyboard_shortcuts.profile": "egilearen profila irekitzeko",
"keyboard_shortcuts.reply": "Erantzun bidalketari",
@@ -377,7 +413,7 @@
"lightbox.previous": "Aurrekoa",
"limited_account_hint.action": "Erakutsi profila hala ere",
"limited_account_hint.title": "Profil hau ezkutatu egin dute {domain} zerbitzariko moderatzaileek.",
- "link_preview.author": "{name}(r)en eskutik",
+ "link_preview.author": "Egilea: {name}",
"lists.account.add": "Gehitu zerrendara",
"lists.account.remove": "Kendu zerrendatik",
"lists.delete": "Ezabatu zerrenda",
@@ -396,9 +432,15 @@
"loading_indicator.label": "Kargatzen…",
"media_gallery.toggle_visible": "Txandakatu ikusgaitasuna",
"moved_to_account_banner.text": "Zure {disabledAccount} kontua desgaituta dago une honetan, {movedToAccount} kontura aldatu zinelako.",
- "mute_modal.duration": "Iraupena",
- "mute_modal.hide_notifications": "Ezkutatu erabiltzaile honen jakinarazpenak?",
- "mute_modal.indefinite": "Zehaztu gabe",
+ "mute_modal.hide_from_notifications": "Ezkutatu jakinarazpenetatik",
+ "mute_modal.hide_options": "Ezkutatu aukerak",
+ "mute_modal.indefinite": "Desmututua izan arte",
+ "mute_modal.show_options": "Erakutsi aukerak",
+ "mute_modal.they_can_mention_and_follow": "Aipa eta jarrai zaitzakete, baina ez dituzu ikusiko.",
+ "mute_modal.they_wont_know": "Ez dute jakingo mututuak izan direnik.",
+ "mute_modal.title": "Erabiltzailea mututu nahi duzu?",
+ "mute_modal.you_wont_see_mentions": "Ez duzu ikusiko bera aipatzen duen argitalpenik.",
+ "mute_modal.you_wont_see_posts": "Zure argitalpenak ikus ditzake, baina ez dituzu bereak ikusiko.",
"navigation_bar.about": "Honi buruz",
"navigation_bar.advanced_interface": "Ireki web interfaze aurreratuan",
"navigation_bar.blocks": "Blokeatutako erabiltzaileak",
@@ -408,7 +450,6 @@
"navigation_bar.direct": "Aipamen pribatuak",
"navigation_bar.discover": "Aurkitu",
"navigation_bar.domain_blocks": "Ezkutatutako domeinuak",
- "navigation_bar.edit_profile": "Aldatu profila",
"navigation_bar.explore": "Arakatu",
"navigation_bar.favourites": "Gogokoak",
"navigation_bar.filters": "Mutututako hitzak",
@@ -432,20 +473,35 @@
"notification.follow": "{name}(e)k jarraitzen dizu",
"notification.follow_request": "{name}(e)k zu jarraitzeko eskaera egin du",
"notification.mention": "{name}(e)k aipatu zaitu",
+ "notification.moderation-warning.learn_more": "Informazio gehiago",
+ "notification.moderation_warning": "Moderazio-abisu bat jaso duzu",
+ "notification.moderation_warning.action_delete_statuses": "Argitalpen batzuk kendu dira.",
+ "notification.moderation_warning.action_disable": "Zure kontua desaktibatua izan da.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Argitalpen batzuk hunkigarri gisa ezarri dira.",
+ "notification.moderation_warning.action_none": "Kontuak moderazio-abisu bat jaso du.",
+ "notification.moderation_warning.action_sensitive": "Argitalpenak hunkigarri gisa markatuko dira hemendik aurrera.",
+ "notification.moderation_warning.action_silence": "Kontua murriztu egin da.",
+ "notification.moderation_warning.action_suspend": "Kontua itxi da.",
"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.relationships_severance_event": "{name} erabiltzailearekin galdutako konexioak",
+ "notification.relationships_severance_event.account_suspension": "{from} zerbitzariko administratzaile batek {target} bertan behera utzi du, hau da, ezin izango dituzu jaso hango eguneratzerik edo hangoekin elkarreragin.",
+ "notification.relationships_severance_event.learn_more": "Informazio gehiago",
"notification.status": "{name} erabiltzaileak bidalketa egin berri du",
"notification.update": "{name} erabiltzaileak bidalketa bat editatu du",
+ "notification_requests.accept": "Onartu",
+ "notification_requests.dismiss": "Baztertu",
+ "notification_requests.notifications_from": "{name} erabiltzailearen jakinarazpenak",
+ "notification_requests.title": "Iragazitako jakinarazpenak",
"notifications.clear": "Garbitu jakinarazpenak",
"notifications.clear_confirmation": "Ziur zure jakinarazpen guztiak behin betirako garbitu nahi dituzula?",
"notifications.column_settings.admin.report": "Txosten berriak:",
"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": "Erakutsi kategoria guztiak",
- "notifications.column_settings.filter_bar.category": "Iragazki azkarraren barra",
- "notifications.column_settings.filter_bar.show_bar": "Erakutsi iragazki-barra",
+ "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:",
@@ -471,6 +527,15 @@
"notifications.permission_denied": "Mahaigaineko jakinarazpenak ez daude erabilgarri, nabigatzaileari baimen eskaera ukatu zitzaiolako",
"notifications.permission_denied_alert": "Mahaigaineko jakinarazpenak ezin dira gaitu, nabigatzaileari baimena ukatu zitzaiolako",
"notifications.permission_required": "Mahaigaineko jakinarazpenak ez daude erabilgarri, horretarako behar den baimena ez delako eman.",
+ "notifications.policy.filter_new_accounts.hint": "Azken {days, plural, one {egunean} other {# egunetan}} sortua",
+ "notifications.policy.filter_new_accounts_title": "Kontu berriak",
+ "notifications.policy.filter_not_followers_hint": "{days, plural, one {Egun batez} other {# egunez}} baino gutxiago jarraitu zaituen jendea barne",
+ "notifications.policy.filter_not_followers_title": "Jarraitzen ez zaituen jendea",
+ "notifications.policy.filter_not_following_hint": "Eskuz onartzen dituzun arte",
+ "notifications.policy.filter_not_following_title": "Jarraitzen ez duzun jendea",
+ "notifications.policy.filter_private_mentions_hint": "Iragazita, baldin eta zure aipamenaren erantzuna bada edo bidaltzailea jarraitzen baduzu",
+ "notifications.policy.filter_private_mentions_title": "Eskatu gabeko aipamen pribatuak",
+ "notifications.policy.title": "Ez iragazi hemengo jakinarazpenak…",
"notifications_permission_banner.enable": "Gaitu mahaigaineko jakinarazpenak",
"notifications_permission_banner.how_to_control": "Mastodon irekita ez dagoenean jakinarazpenak jasotzeko, gaitu mahaigaineko jakinarazpenak. Mahaigaineko jakinarazpenak ze elkarrekintzak eragingo dituzten zehazki kontrolatu dezakezu goiko {icon} botoia erabiliz, gaituta daudenean.",
"notifications_permission_banner.title": "Ez galdu ezer inoiz",
@@ -497,7 +562,7 @@
"onboarding.share.message": "{username} naiz #Mastodon-en! Jarrai nazazu hemen: {url}",
"onboarding.share.next_steps": "Hurrengo urrats posibleak:",
"onboarding.share.title": "Partekatu zure profila",
- "onboarding.start.lead": "Zure Mastodoneko kontu berria prest dago. Jakin nola atera diezaioekun etekin handiena hemen:",
+ "onboarding.start.lead": "Mastodon-en parte zara orain, bakarra eta deszentralizatua den sare sozialaren plataforma, non zuk, eta ez algoritmo batek, zeure esperientzia pertsonaliza dezakezun. Igaro ezazu muga soziala:",
"onboarding.start.skip": "Urrats guztiak saltatu nahi dituzu?",
"onboarding.start.title": "Lortu duzu!",
"onboarding.steps.follow_people.body": "Zure jarioa zuk pertsonalizatzen duzu. Bete dezagun jende interesgarriaz.",
@@ -511,7 +576,7 @@
"onboarding.tips.2fa": "Bazenekien? Zure kontua babes dezakezu, bi faktoreko autentifikazioa zure kontuko ezarpenetan ezarriaz. Edozein TOTP aplikaziorekin dabil, ez da telefono-zenbakirik behar!",
"onboarding.tips.accounts_from_other_servers": "Badakizu? Mastodon deszentralizatua denez, beste zerbitzarietako profilak topatuko dituzu. Eta, hala ere, arazorik gabe jardun dezakezu haiekin! Haien zerbitzaria erabiltzaile-izenaren bigarren erdian dago!",
"onboarding.tips.migration": "Bazenekien? Uste baduzu {domain} ez dela aukera on bat zuretzako etorkizunari begira, beste Mastodon zerbitzari batera alda zaitezke, zure jarraitzaileak galdu gabe. Zure zerbitzaria propioa ere ostata dezakezu!",
- "onboarding.tips.verification": "Bazenekien? Zure kontua egiazta dezakezu zure webgunean zure Mastodoneko profilaren esteka jarriz, eta profilean webgunea gehituz. Ordainketa edo dokumenturik gabe!",
+ "onboarding.tips.verification": "Bazenekien? Zure kontua egiazta dezakezu zure webgunean zure Mastodon-go profilaren esteka jarriz, eta profilean webgunea gehituz. Ordainketa edo dokumenturik gabe!",
"password_confirmation.exceeds_maxlength": "Pasahitzaren berrespenak pasahitzaren gehienezko luzera gainditzen du",
"password_confirmation.mismatching": "Pasahitzaren berrespena ez dator bat",
"picture_in_picture.restore": "Leheneratu",
@@ -526,14 +591,15 @@
"poll_button.add_poll": "Gehitu inkesta bat",
"poll_button.remove_poll": "Kendu inkesta",
"privacy.change": "Aldatu bidalketaren pribatutasuna",
- "privacy.direct.long": "Bidali aipatutako erabiltzaileei besterik ez",
- "privacy.direct.short": "Aipatutako jendea soilik",
- "privacy.private.long": "Bidali jarraitzaileei besterik ez",
- "privacy.private.short": "Jarraitzaileak soilik",
- "privacy.public.long": "Guztientzat ikusgai",
+ "privacy.direct.long": "Argitalpen honetan aipatutako denak",
+ "privacy.direct.short": "Jende jakina",
+ "privacy.private.long": "Soilik jarraitzaileak",
+ "privacy.private.short": "Jarraitzaileak",
+ "privacy.public.long": "Mastodonen dagoen edo ez dagoen edonor",
"privacy.public.short": "Publikoa",
- "privacy.unlisted.long": "Guztientzat ikusgai, baina ez aurkitzeko ezaugarrietan",
- "privacy.unlisted.short": "Zerrendatu gabea",
+ "privacy.unlisted.additional": "Aukera honek publiko modua bezala funtzionatzen du, baina argitalpena ez da agertuko zuzeneko jarioetan edo traoletan, \"Arakatu\" atalean edo Mastodonen bilaketan, nahiz eta kontua zabaltzeko onartu duzun.",
+ "privacy.unlisted.long": "Tontakeria algoritmiko gutxiago",
+ "privacy.unlisted.short": "Deiadar urrikoa",
"privacy_policy.last_updated": "Azkenengo eguneraketa {date}",
"privacy_policy.title": "Pribatutasun politika",
"recommended": "Gomendatua",
@@ -551,7 +617,9 @@
"relative_time.minutes": "{number}m",
"relative_time.seconds": "{number}s",
"relative_time.today": "gaur",
+ "reply_indicator.attachments": "{count, plural, one {# eranskin} other {# eranskin}}",
"reply_indicator.cancel": "Utzi",
+ "reply_indicator.poll": "Inkesta",
"report.block": "Blokeatu",
"report.block_explanation": "Ez dituzu bere bidalketak ikusiko. Ezingo dituzte zure bidalketak ikusi eta ez jarraitu. Blokeatu dituzula jakin dezakete.",
"report.categories.legal": "Juridikoa",
@@ -644,10 +712,11 @@
"status.direct": "Aipatu pribatuki @{name}",
"status.direct_indicator": "Aipamen pribatua",
"status.edit": "Editatu",
- "status.edited": "Editatua {date}",
+ "status.edited": "Azken edizioa: {date}",
"status.edited_x_times": "{count, plural, one {behin} other {{count} aldiz}} editatua",
"status.embed": "Txertatu",
"status.favourite": "Gogokoa",
+ "status.favourites": "{count, plural, one {gogoko} other {gogoko}}",
"status.filter": "Iragazi bidalketa hau",
"status.filtered": "Iragazita",
"status.hide": "Tuta ezkutatu",
@@ -668,6 +737,7 @@
"status.reblog": "Bultzada",
"status.reblog_private": "Bultzada jatorrizko hartzaileei",
"status.reblogged_by": "{name}(r)en bultzada",
+ "status.reblogs": "{count, plural, one {bultzada} other {bultzada}}",
"status.reblogs.empty": "Inork ez dio bultzada eman bidalketa honi oraindik. Inork egiten badu, hemen agertuko da.",
"status.redraft": "Ezabatu eta berridatzi",
"status.remove_bookmark": "Kendu laster-marka",
@@ -715,10 +785,8 @@
"upload_error.poll": "Ez da inkestetan fitxategiak igotzea onartzen.",
"upload_form.audio_description": "Deskribatu entzumen galera duten pertsonentzat",
"upload_form.description": "Deskribatu ikusmen arazoak dituztenentzat",
- "upload_form.description_missing": "Ez da deskribapenik gehitu",
"upload_form.edit": "Editatu",
"upload_form.thumbnail": "Aldatu koadro txikia",
- "upload_form.undo": "Ezabatu",
"upload_form.video_description": "Deskribatu entzumen galera edo ikusmen urritasuna duten pertsonentzat",
"upload_modal.analyzing_picture": "Irudia aztertzen…",
"upload_modal.apply": "Aplikatu",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 9f3201ca786709..6d6b7d612caea0 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -89,7 +89,6 @@
"announcement.announcement": "اعلامیه",
"attachments_list.unprocessed": "(پردازش نشده)",
"audio.hide": "نهفتن صدا",
- "autosuggest_hashtag.per_week": "{count} در هفته",
"boost_modal.combo": "دکمهٔ {combo} را بزنید تا دیگر این را نبینید",
"bundle_column_error.copy_stacktrace": "رونوشت از گزارش خطا",
"bundle_column_error.error.body": "صفحهٔ درخواستی نتوانست پرداخت شود. ممکن است به خاطر اشکالی در کدمان یا مشکل سازگاری مرورگر باشد.",
@@ -111,7 +110,7 @@
"column.about": "درباره",
"column.blocks": "کاربران مسدود شده",
"column.bookmarks": "نشانکها",
- "column.community": "خط زمانی محلّی",
+ "column.community": "خط زمانی محلی",
"column.direct": "اشارههای خصوصی",
"column.directory": "مرور نمایهها",
"column.domain_blocks": "دامنههای مسدود شده",
@@ -132,7 +131,7 @@
"column_header.show_settings": "نمایش تنظیمات",
"column_header.unpin": "برداشتن سنجاق",
"column_subheading.settings": "تنظیمات",
- "community.column_settings.local_only": "فقط محلّی",
+ "community.column_settings.local_only": "فقط محلی",
"community.column_settings.media_only": "فقط رسانه",
"community.column_settings.remote_only": "تنها دوردست",
"compose.language.change": "تغییر زبان",
@@ -146,26 +145,22 @@
"compose_form.lock_disclaimer": "حسابتان {locked} نیست. هر کسی میتواند پیگیرتان شده و فرستههای ویژهٔ پیگیرانتان را ببیند.",
"compose_form.lock_disclaimer.lock": "قفلشده",
"compose_form.placeholder": "تازه چه خبر؟",
- "compose_form.poll.add_option": "افزودن گزینه",
"compose_form.poll.duration": "مدت نظرسنجی",
+ "compose_form.poll.multiple": "چند گزینهای",
"compose_form.poll.option_placeholder": "گزینهٔ {number}",
- "compose_form.poll.remove_option": "برداشتن این گزینه",
+ "compose_form.poll.single": "گزینش یکی",
"compose_form.poll.switch_to_multiple": "تغییر نظرسنجی برای اجازه به چندین گزینه",
"compose_form.poll.switch_to_single": "تبدیل به نظرسنجی تکگزینهای",
- "compose_form.publish": "انتشار",
+ "compose_form.poll.type": "سبک",
+ "compose_form.publish": "فرستادن",
"compose_form.publish_form": "انتشار",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "ذخیرهٔ تغییرات",
- "compose_form.sensitive.hide": "{count, plural, one {علامتگذاری رسانه به عنوان حساس} other {علامتگذاری رسانهها به عنوان حساس}}",
- "compose_form.sensitive.marked": "{count, plural, one {رسانه به عنوان حساس علامتگذاری شد} other {رسانهها به عنوان حساس علامتگذاری شدند}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {رسانه به عنوان حساس علامتگذاری نشد} other {رسانهها به عنوان حساس علامتگذاری نشدند}}",
+ "compose_form.reply": "پاسخ",
+ "compose_form.save_changes": "بهروز رسانی",
"compose_form.spoiler.marked": "برداشتن هشدار محتوا",
"compose_form.spoiler.unmarked": "افزودن هشدار محتوا",
- "compose_form.spoiler_placeholder": "هشدارتان را اینجا بنویسید",
+ "compose_form.spoiler_placeholder": "هشدار محتوا (اختیاری)",
"confirmation_modal.cancel": "لغو",
- "confirmations.block.block_and_report": "انسداد و گزارش",
"confirmations.block.confirm": "انسداد",
- "confirmations.block.message": "مطمئنید که میخواهید {name} را مسدود کنید؟",
"confirmations.cancel_follow_request.confirm": "رد کردن درخواست",
"confirmations.cancel_follow_request.message": "مطمئنید که می خواهید درخواست پیگیری {name} را لغو کنید؟",
"confirmations.delete.confirm": "حذف",
@@ -174,15 +169,12 @@
"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": "در صورت ویرایش، پیامی که در حال نوشتنش بودید از بین خواهد رفت. میخواهید ادامه دهید؟",
"confirmations.logout.confirm": "خروج از حساب",
"confirmations.logout.message": "مطمئنید میخواهید خارج شوید؟",
"confirmations.mute.confirm": "خموش",
- "confirmations.mute.explanation": "این کار فرستههای آنها و فرستههایی را که از آنها نام برده پنهان میکند، ولی آنها همچنان اجازه دارند فرستههای شما را ببینند و شما را پیگیری کنند.",
- "confirmations.mute.message": "مطمئنید میخواهید {name} را بخموشانید؟",
"confirmations.redraft.confirm": "حذف و بازنویسی",
"confirmations.redraft.message": "مطمئنید که میخواهید این فرسته را حذف کنید و از نو بنویسید؟ با این کار تقویتها و پسندهایش از دست رفته و پاسخها به آن بیمرجع میشود.",
"confirmations.reply.confirm": "پاسخ",
@@ -231,7 +223,7 @@
"empty_column.account_unavailable": "نمایهٔ موجود نیست",
"empty_column.blocks": "هنوز کسی را مسدود نکردهاید.",
"empty_column.bookmarked_statuses": "هنوز هیچ فرستهٔ نشانهگذاری شدهای ندارید. هنگامی که فرستهای را نشانهگذاری کنید، اینجا نشان داده خواهد شد.",
- "empty_column.community": "خط زمانی محلّی خالی است. چیزی بنویسید تا چرخش بچرخد!",
+ "empty_column.community": "خط زمانی محلی خالیست. چیزی نوشته تا چرخش بچرخد!",
"empty_column.direct": "هنوز هیچ اشاره خصوصیای ندارید. هنگامی که چنین پیامی بگیرید یا بفرستید اینجا نشان داده خواهد شد.",
"empty_column.domain_blocks": "هنوز هیچ دامنهای مسدود نشده است.",
"empty_column.explore_statuses": "الآن چیزی پرطرفدار نیست. بعداً دوباره بررسی کنید!",
@@ -280,6 +272,17 @@
"follow_request.authorize": "اجازه دهید",
"follow_request.reject": "رد کنید",
"follow_requests.unlocked_explanation": "با این که حسابتان قفل نیست، کارکنان {domain} فکر کردند که ممکن است بخواهید درخواستها از این حسابها را به صورت دستی بازبینی کنید.",
+ "follow_suggestions.curated_suggestion": "گزینش سردبیر",
+ "follow_suggestions.dismiss": "دیگر نشان داده نشود",
+ "follow_suggestions.hints.featured": "این نمایه به دست گروه {domain} دستچین شده.",
+ "follow_suggestions.hints.friends_of_friends": "این نمایه بین کسانی که پی میگیرید محبوب است.",
+ "follow_suggestions.hints.most_followed": "این نمایه روی {domain} بسیار پیگرفته شده.",
+ "follow_suggestions.hints.most_interactions": "این نمایه اخیراُ روی {domain} توجّه زیادی گرفته.",
+ "follow_suggestions.hints.similar_to_recently_followed": "این نمایه شبیه نمایههاییست که اخیراً پیگرفتهاید.",
+ "follow_suggestions.personalized_suggestion": "پیشنهاد شخصی",
+ "follow_suggestions.popular_suggestion": "پیشنهاد محبوب",
+ "follow_suggestions.view_all": "دیدن همه",
+ "follow_suggestions.who_to_follow": "افرادی برای پیگیری",
"followed_tags": "برچسبهای پیگرفته",
"footer.about": "درباره",
"footer.directory": "فهرست نمایهها",
@@ -306,13 +309,8 @@
"hashtag.follow": "پیگرفتن برچسب",
"hashtag.unfollow": "پینگرفتن برچسب",
"hashtags.and_other": "…و {count, plural, other {# بیشتر}}",
- "home.actions.go_to_explore": "ببینید چه داغ است",
- "home.actions.go_to_suggestions": "یافتن افراد برای پیگیری",
- "home.column_settings.basic": "پایهای",
"home.column_settings.show_reblogs": "نمایش تقویتها",
"home.column_settings.show_replies": "نمایش پاسخها",
- "home.explore_prompt.body": "خوراک خانگیتان ترکیبی از فرستهها از برچسبهایی که برای پیگیری گزیدهاید، افرادی که پی میگیرید و فرستههایی که تقویت میکنند را خواهد داشت. اگر خیلی خلوت به نظر میرسد، شاید بخواهید:",
- "home.explore_prompt.title": "این پایگاه خانگیتان در ماستودون است.",
"home.hide_announcements": "نهفتن اعلامیهها",
"home.pending_critical_update.body": "لطفاً کارساز ماستودونتان را در نخستین فرصت بهروز کنید!",
"home.pending_critical_update.link": "دیدن بهروز رسانیها",
@@ -322,8 +320,8 @@
"interaction_modal.description.follow": "با حسابی روی ماستودون میتوانید {name} را برای دریافت فرستههایش در خوراک خانگیتان دنبال کنید.",
"interaction_modal.description.reblog": "با حسابی روی ماستودون میتوانید این فرسته را با پیگیران خودتان همرسانی کنید.",
"interaction_modal.description.reply": "با حسابی روی ماستودون میتوانید به این فرسته پاسخ دهید.",
- "interaction_modal.login.action": "من رو ببر خونه",
- "interaction_modal.login.prompt": "دامنه سرور شخصی شما، به عنوان مثال. mastodon.social",
+ "interaction_modal.login.action": "رفتن به خانه",
+ "interaction_modal.login.prompt": "دامنهٔ کارساز شخصیتان چون mastodon.social",
"interaction_modal.no_account_yet": "در ماستودون نیست؟",
"interaction_modal.on_another_server": "روی کارسازی دیگر",
"interaction_modal.on_this_server": "روی این کارساز",
@@ -352,7 +350,7 @@
"keyboard_shortcuts.home": "گشودن خط زمانی خانگی",
"keyboard_shortcuts.hotkey": "میانبر",
"keyboard_shortcuts.legend": "نمایش این نشانه",
- "keyboard_shortcuts.local": "گشودن خط زمانی محلّی",
+ "keyboard_shortcuts.local": "گشودن خط زمانی محلی",
"keyboard_shortcuts.mention": "اشاره به نویسنده",
"keyboard_shortcuts.muted": "گشودن فهرست کاربران خموش",
"keyboard_shortcuts.my_profile": "گشودن نمایهتان",
@@ -396,19 +394,15 @@
"loading_indicator.label": "در حال بارگذاری…",
"media_gallery.toggle_visible": "{number, plural, one {نهفتن تصویر} other {نهفتن تصاویر}}",
"moved_to_account_banner.text": "حسابتان {disabledAccount} اکنون از کار افتاده؛ چرا که به {movedToAccount} منتقل شدید.",
- "mute_modal.duration": "مدت زمان",
- "mute_modal.hide_notifications": "نهفتن آگاهیها از این کاربر؟",
- "mute_modal.indefinite": "نامعلوم",
"navigation_bar.about": "درباره",
"navigation_bar.advanced_interface": "بازکردن در رابط کاربری وب پیشرفته",
"navigation_bar.blocks": "کاربران مسدود شده",
"navigation_bar.bookmarks": "نشانکها",
- "navigation_bar.community_timeline": "خط زمانی محلّی",
+ "navigation_bar.community_timeline": "خط زمانی محلی",
"navigation_bar.compose": "نوشتن فرستهٔ تازه",
"navigation_bar.direct": "اشارههای خصوصی",
"navigation_bar.discover": "گشت و گذار",
"navigation_bar.domain_blocks": "دامنههای مسدود شده",
- "navigation_bar.edit_profile": "ویرایش نمایه",
"navigation_bar.explore": "کاوش",
"navigation_bar.favourites": "برگزیدهها",
"navigation_bar.filters": "واژههای خموش",
@@ -443,9 +437,6 @@
"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.filter_bar.show_bar": "نمایش نوار پالایه",
"notifications.column_settings.follow": "پیگیرندگان جدید:",
"notifications.column_settings.follow_request": "درخواستهای جدید پیگیری:",
"notifications.column_settings.mention": "اشارهها:",
@@ -471,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": "هرگز چیزی را از دست ندهید",
@@ -483,8 +476,10 @@
"onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
"onboarding.follows.title": "Popular on Mastodon",
"onboarding.profile.discoverable": "نمایه خود را قابل نمایش کنید",
+ "onboarding.profile.discoverable_hint": "خواستهاید روی ماستودون کشف شوید. ممکن است فرستههایتان در نتیحهٔ جستوجوها و فرستههای داغ ظاهر شده و نمایهتان به افرادی با علایق مشابهتان پیشنهاد شود.",
"onboarding.profile.display_name": "نام نمایشی",
"onboarding.profile.display_name_hint": "نام کامل یا نام باحالتان…",
+ "onboarding.profile.lead": "همواره میتوانید این مورد را در تنظیمات که گزینهّای شخصی سازی بیشتری نیز دارد کامل کنید.",
"onboarding.profile.note": "درباره شما",
"onboarding.profile.note_hint": "میتوانید افراد دیگر را @نامبردن یا #برچسب بزنید…",
"onboarding.profile.save_and_continue": "ذخیره کن و ادامه بده",
@@ -524,14 +519,15 @@
"poll_button.add_poll": "افزودن نظرسنجی",
"poll_button.remove_poll": "برداشتن نظرسنجی",
"privacy.change": "تغییر محرمانگی فرسته",
- "privacy.direct.long": "نمایان فقط برای کاربران اشاره شده",
- "privacy.direct.short": "فقط افراد اشاره شده",
- "privacy.private.long": "نمایان فقط برای پیگیرندگان",
- "privacy.private.short": "فقط پیگیرندگان",
- "privacy.public.long": "نمایان برای همه",
+ "privacy.direct.long": "هرکسی که در فرسته نام برده شده",
+ "privacy.direct.short": "افراد مشخّص",
+ "privacy.private.long": "تنها پیگیرندگانتان",
+ "privacy.private.short": "پیگیرندگان",
+ "privacy.public.long": "هرکسی در و بیرون از ماستودون",
"privacy.public.short": "عمومی",
- "privacy.unlisted.long": "نمایان برای همه، ولی خارج از قابلیتهای کشف",
- "privacy.unlisted.short": "فهرست نشده",
+ "privacy.unlisted.additional": "درست مثل عمومی رفتار میکند؛ جز این که فرسته در برچسبها یا خوراکهای زنده، کشف یا جستوجوی ماستودون ظاهر نخواهد شد. حتا اگر کلیّت نمایهتان اجازه داده باشد.",
+ "privacy.unlisted.long": "سروصدای الگوریتمی کمتر",
+ "privacy.unlisted.short": "عمومی ساکت",
"privacy_policy.last_updated": "آخرین بهروز رسانی در {date}",
"privacy_policy.title": "سیاست محرمانگی",
"recommended": "پیشنهادشده",
@@ -549,7 +545,9 @@
"relative_time.minutes": "{number} دقیقه",
"relative_time.seconds": "{number} ثانیه",
"relative_time.today": "امروز",
+ "reply_indicator.attachments": "{count, plural, one {# پیوست} other {# پیوست}}",
"reply_indicator.cancel": "لغو",
+ "reply_indicator.poll": "نظرسنجی",
"report.block": "انسداد",
"report.block_explanation": "شما فرستههایشان را نخواهید دید. آنها نمیتوانند فرستههایتان را ببینند یا شما را پیبگیرند. آنها میتوانند بگویند که مسدود شدهاند.",
"report.categories.legal": "حقوقی",
@@ -642,7 +640,6 @@
"status.direct": "اشارهٔ خصوصی به @{name}",
"status.direct_indicator": "اشارهٔ خصوصی",
"status.edit": "ویرایش",
- "status.edited": "ویرایش شده در {date}",
"status.edited_x_times": "{count, plural, one {{count} مرتبه} other {{count} مرتبه}} ویرایش شد",
"status.embed": "جاسازی",
"status.favourite": "برگزیده",
@@ -713,10 +710,8 @@
"upload_error.poll": "بارگذاری پرونده در نظرسنجیها مجاز نیست.",
"upload_form.audio_description": "برای ناشنوایان توصیفش کنید",
"upload_form.description": "برای کمبینایان توصیفش کنید",
- "upload_form.description_missing": "شرحی افزوده نشده",
"upload_form.edit": "ویرایش",
"upload_form.thumbnail": "تغییر بندانگشتی",
- "upload_form.undo": "حذف",
"upload_form.video_description": "برای کمبینایان یا ناشنوایان توصیفش کنید",
"upload_modal.analyzing_picture": "در حال پردازش تصویر…",
"upload_modal.apply": "اعمال",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 00df0e537a3fcf..6c2162e52c37ca 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -2,8 +2,8 @@
"about.blocks": "Moderoidut palvelimet",
"about.contact": "Ota yhteys:",
"about.disclaimer": "Mastodon on vapaa avoimen lähdekoodin ohjelmisto ja Mastodon gGmbH:n tavaramerkki.",
- "about.domain_blocks.no_reason_available": "Syytä ei ole ilmoitettu",
- "about.domain_blocks.preamble": "Mastodonin avulla voidaan yleensä tarkastella minkä tahansa fediversumiin kuuluvan palvelimen sisältöä ja vuorovaikuttaa eri palvelinten käyttäjien kanssa. Nämä ovat tälle palvelimelle määritetyt poikkeukset.",
+ "about.domain_blocks.no_reason_available": "Syy ei ole tiedossa",
+ "about.domain_blocks.preamble": "Mastodonin avulla voidaan yleensä tarkastella minkä tahansa fediversumiin kuuluvan palvelimen sisältöä, ja olla yhteyksissä eri palvelinten käyttäjien kanssa. Nämä poikkeukset koskevat yksin tätä palvelinta.",
"about.domain_blocks.silenced.explanation": "Et yleensä näe tämän palvelimen profiileja ja sisältöä, jollet erityisesti etsi juuri sitä tai liity siihen seuraamalla.",
"about.domain_blocks.silenced.title": "Rajoitettu",
"about.domain_blocks.suspended.explanation": "Mitään tämän palvelimen tietoja ei käsitellä, tallenneta tai vaihdeta, mikä tekee vuorovaikutuksesta ja viestinnästä sen käyttäjien kanssa mahdotonta.",
@@ -19,7 +19,7 @@
"account.block_domain": "Estä verkkotunnus {domain}",
"account.block_short": "Estä",
"account.blocked": "Estetty",
- "account.browse_more_on_origin_server": "Selaile lisää alkuperäisellä palvelimella",
+ "account.browse_more_on_origin_server": "Selaile kattavampaa alkuperäprofiilia",
"account.cancel_follow_request": "Peruuta seurantapyyntö",
"account.copy": "Kopioi linkki profiiliin",
"account.direct": "Mainitse @{name} yksityisesti",
@@ -27,7 +27,7 @@
"account.domain_blocked": "Verkkotunnus estetty",
"account.edit_profile": "Muokkaa profiilia",
"account.enable_notifications": "Ilmoita minulle, kun @{name} julkaisee",
- "account.endorse": "Pidä esillä profiilissa",
+ "account.endorse": "Suosittele profiilissasi",
"account.featured_tags.last_status_at": "Viimeisin julkaisu {date}",
"account.featured_tags.last_status_never": "Ei julkaisuja",
"account.featured_tags.title": "Käyttäjän {name} esillä pidettävät aihetunnisteet",
@@ -39,7 +39,7 @@
"account.following": "Seuratut",
"account.following_counter": "{count, plural, one {{counter} seurattu} other {{counter} seurattua}}",
"account.follows.empty": "Tämä käyttäjä ei vielä seuraa ketään.",
- "account.go_to_profile": "Avaa profiili",
+ "account.go_to_profile": "Mene profiiliin",
"account.hide_reblogs": "Piilota käyttäjän @{name} tehostukset",
"account.in_memoriam": "Muistoissamme.",
"account.joined_short": "Liittynyt",
@@ -64,10 +64,10 @@
"account.share": "Jaa käyttäjän @{name} profiili",
"account.show_reblogs": "Näytä käyttäjän @{name} tehostukset",
"account.statuses_counter": "{count, plural, one {{counter} julkaisu} other {{counter} julkaisua}}",
- "account.unblock": "Poista käyttäjän @{name} esto",
- "account.unblock_domain": "Poista verkkotunnuksen {domain} esto",
+ "account.unblock": "Kumoa käyttäjän @{name} esto",
+ "account.unblock_domain": "Kumoa verkkotunnuksen {domain} esto",
"account.unblock_short": "Poista esto",
- "account.unendorse": "Älä pidä esillä profiilissa",
+ "account.unendorse": "Kumoa suosittelu profiilissasi",
"account.unfollow": "Lopeta seuraaminen",
"account.unmute": "Poista käyttäjän @{name} mykistys",
"account.unmute_notifications_short": "Poista ilmoitusten mykistys",
@@ -75,7 +75,7 @@
"account_note.placeholder": "Lisää muistiinpano napsauttamalla",
"admin.dashboard.daily_retention": "Käyttäjien pysyvyys rekisteröitymisen jälkeen päivittäin",
"admin.dashboard.monthly_retention": "Käyttäjien pysyvyys rekisteröitymisen jälkeen kuukausittain",
- "admin.dashboard.retention.average": "Keskimäärin",
+ "admin.dashboard.retention.average": "Keskiarvo",
"admin.dashboard.retention.cohort": "Rekisteröitymis-kk.",
"admin.dashboard.retention.cohort_size": "Uusia käyttäjiä",
"admin.impact_report.instance_accounts": "Tilien profiilit, jotka tämä poistaisi",
@@ -86,10 +86,17 @@
"alert.rate_limited.title": "Pyyntömäärää rajoitettu",
"alert.unexpected.message": "Tapahtui odottamaton virhe.",
"alert.unexpected.title": "Hups!",
- "announcement.announcement": "Ilmoitus",
+ "announcement.announcement": "Tiedote",
"attachments_list.unprocessed": "(käsittelemätön)",
"audio.hide": "Piilota ääni",
- "autosuggest_hashtag.per_week": "{count} viikossa",
+ "block_modal.remote_users_caveat": "Pyydämme palvelinta {domain} kunnioittamaan päätöstäsi. Myötämielisyyttä ei kuitenkaan taata, koska jotkin palvelimet voivat käsitellä estoja eri tavalla. Julkiset julkaisut voivat silti näkyä kirjautumattomille käyttäjille.",
+ "block_modal.show_less": "Näytä vähemmän",
+ "block_modal.show_more": "Näytä enemmän",
+ "block_modal.they_cant_mention": "Hän ei voi enää mainita eikä seurata sinua.",
+ "block_modal.they_cant_see_posts": "Hän ei voi enää nähdä julkaisujasi, etkä sinä voi nähdä hänen.",
+ "block_modal.they_will_know": "Hän voi nähdä, että hänet on estetty.",
+ "block_modal.title": "Estetäänkö käyttäjä?",
+ "block_modal.you_wont_see_mentions": "Et enää näe hänen julkaisujaan etkä voi seurata häntä.",
"boost_modal.combo": "Ensi kerralla voit ohittaa tämän painamalla {combo}",
"bundle_column_error.copy_stacktrace": "Kopioi virheraportti",
"bundle_column_error.error.body": "Pyydettyä sivua ei voitu hahmontaa. Se voi johtua virheestä koodissamme tai selaimen yhteensopivuudessa.",
@@ -146,49 +153,43 @@
"compose_form.lock_disclaimer": "Tilisi ei ole {locked}. Kuka tahansa voi seurata tiliäsi ja nähdä vain seuraajille rajaamasi julkaisut.",
"compose_form.lock_disclaimer.lock": "lukittu",
"compose_form.placeholder": "Mitä mietit?",
- "compose_form.poll.add_option": "Lisää valinta",
"compose_form.poll.duration": "Äänestyksen kesto",
- "compose_form.poll.option_placeholder": "Valinta {number}",
- "compose_form.poll.remove_option": "Poista tämä valinta",
- "compose_form.poll.switch_to_multiple": "Muuta äänestys monivalinnaksi",
- "compose_form.poll.switch_to_single": "Muuta äänestys sallimaan vain yksi valinta",
+ "compose_form.poll.multiple": "Monivalinta",
+ "compose_form.poll.option_placeholder": "Vaihtoehto {number}",
+ "compose_form.poll.single": "Valitse yksi",
+ "compose_form.poll.switch_to_multiple": "Muuta kysely monivalinnaksi",
+ "compose_form.poll.switch_to_single": "Muuta kysely sallimaan vain yksi valinta",
+ "compose_form.poll.type": "Tyyli",
"compose_form.publish": "Julkaise",
"compose_form.publish_form": "Uusi julkaisu",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Tallenna muutokset",
- "compose_form.sensitive.hide": "{count, plural, one {Merkitse media arkaluonteiseksi} other {Merkitse mediat arkaluonteisiksi}}",
- "compose_form.sensitive.marked": "{count, plural, one {Media on merkitty arkaluonteiseksi} other {Mediat on merkitty arkaluonteisiksi}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Mediaa ei ole merkitty arkaluonteiseksi} other {Medioita ei ole merkitty arkaluonteisiksi}}",
+ "compose_form.reply": "Vastaa",
+ "compose_form.save_changes": "Päivitä",
"compose_form.spoiler.marked": "Poista sisältövaroitus",
"compose_form.spoiler.unmarked": "Lisää sisältövaroitus",
- "compose_form.spoiler_placeholder": "Kirjoita varoituksesi tähän",
+ "compose_form.spoiler_placeholder": "Sisältövaroitus (valinnainen)",
"confirmation_modal.cancel": "Peruuta",
- "confirmations.block.block_and_report": "Estä ja raportoi",
"confirmations.block.confirm": "Estä",
- "confirmations.block.message": "Haluatko varmasti estää käyttäjän {name}?",
"confirmations.cancel_follow_request.confirm": "Peruuta pyyntö",
- "confirmations.cancel_follow_request.message": "Haluatko varmasti peruuttaa pyyntösi seurata profiilia {name}?",
+ "confirmations.cancel_follow_request.message": "Haluatko varmasti perua pyyntösi seurata käyttäjätiliä {name}?",
"confirmations.delete.confirm": "Poista",
"confirmations.delete.message": "Haluatko varmasti poistaa tämän julkaisun?",
"confirmations.delete_list.confirm": "Poista",
"confirmations.delete_list.message": "Haluatko varmasti poistaa tämän listan pysyvästi?",
"confirmations.discard_edit_media.confirm": "Hylkää",
- "confirmations.discard_edit_media.message": "Sinulla on tallentamattomia muutoksia median kuvaukseen tai esikatseluun, hylätäänkö ne silti?",
- "confirmations.domain_block.confirm": "Estä koko verkkotunnus",
+ "confirmations.discard_edit_media.message": "Sinulla on tallentamattomia muutoksia median kuvaukseen tai esikatseluun. Hylätäänkö ne silti?",
+ "confirmations.domain_block.confirm": "Estä palvelin",
"confirmations.domain_block.message": "Haluatko aivan varmasti estää koko verkkotunnuksen {domain}? Useimmiten muutama kohdistettu esto tai mykistys on riittävä ja suositeltava toimi. Et näe sisältöä tästä verkkotunnuksesta millään julkisilla aikajanoilla tai ilmoituksissa. Tähän verkkotunnukseen kuuluvat seuraajasi poistetaan.",
"confirmations.edit.confirm": "Muokkaa",
"confirmations.edit.message": "Jos muokkaat viestiä nyt, se korvaa parhaillaan työstämäsi viestin. Haluatko varmasti jatkaa?",
"confirmations.logout.confirm": "Kirjaudu ulos",
"confirmations.logout.message": "Haluatko varmasti kirjautua ulos?",
"confirmations.mute.confirm": "Mykistä",
- "confirmations.mute.explanation": "Tämä toiminto piilottaa heidän julkaisunsa sinulta – mukaan lukien ne, joissa heidät mainitaan – sallien heidän yhä nähdä julkaisusi ja seurata sinua.",
- "confirmations.mute.message": "Haluatko varmasti mykistää käyttäjän {name}?",
- "confirmations.redraft.confirm": "Poista & palauta muokattavaksi",
+ "confirmations.redraft.confirm": "Poista ja palauta muokattavaksi",
"confirmations.redraft.message": "Haluatko varmasti poistaa julkaisun ja tehdä siitä luonnoksen? Suosikit ja tehostukset menetetään, ja alkuperäisen julkaisun vastaukset jäävät orvoiksi.",
"confirmations.reply.confirm": "Vastaa",
"confirmations.reply.message": "Jos vastaat nyt, vastaus korvaa parhaillaan työstämäsi viestin. Haluatko varmasti jatkaa?",
"confirmations.unfollow.confirm": "Lopeta seuraaminen",
- "confirmations.unfollow.message": "Haluatko varmasti lakata seuraamasta profiilia {name}?",
+ "confirmations.unfollow.message": "Haluatko varmasti lopettaa profiilin {name} seuraamisen?",
"conversation.delete": "Poista keskustelu",
"conversation.mark_as_read": "Merkitse luetuksi",
"conversation.open": "Näytä keskustelu",
@@ -202,12 +203,33 @@
"directory.recently_active": "Hiljattain aktiiviset",
"disabled_account_banner.account_settings": "Tilin asetukset",
"disabled_account_banner.text": "Tilisi {disabledAccount} on tällä hetkellä poissa käytöstä.",
- "dismissable_banner.community_timeline": "Nämä ovat viimeisimpiä julkaisuja käyttäjiltä, joiden tili sijaitsee palvelimella {domain}.",
+ "dismissable_banner.community_timeline": "Nämä ovat tuoreimpia julkaisuja käyttäjiltä, joiden tili on palvelimella {domain}.",
"dismissable_banner.dismiss": "Hylkää",
- "dismissable_banner.explore_links": "Näitä uutisia jaetaan tänään sosiaalisessa verkossa eniten. Uusimmat ja eri käyttäjien eniten lähettämät uutiset nousevat listauksessa korkeimmalle.",
- "dismissable_banner.explore_statuses": "Nämä sosiaalisen verkon julkaisut keräävät tänään eniten huomiota. Uusimmat, tehostetuimmat ja suosikiksi lisätyimmät nousevat listauksessa korkeimmalle.",
- "dismissable_banner.explore_tags": "Nämä sosiaalisen verkon aihetunnisteet keräävät tänään eniten huomiota. Useimman käyttäjän käyttämät aihetunnisteet nousevat listauksessa korkeimmalle.",
+ "dismissable_banner.explore_links": "Näitä uutisia jaetaan tänään sosiaalisessa verkossa eniten. Uusimmat ja eri käyttäjien eniten lähettämät uutiset nousevat listauksessa korkeammalle.",
+ "dismissable_banner.explore_statuses": "Nämä sosiaalisen verkon julkaisut keräävät tänään eniten huomiota. Uusimmat, tehostetuimmat ja suosikeiksi lisätyimmät julkaisut nousevat listauksessa korkeammalle.",
+ "dismissable_banner.explore_tags": "Nämä sosiaalisen verkon aihetunnisteet keräävät tänään eniten huomiota. Useimman käyttäjän käyttämät aihetunnisteet nousevat listauksessa korkeammalle.",
"dismissable_banner.public_timeline": "Nämä ovat viimeisimpiä julkaisuja sosiaalisen verkon käyttäjiltä, joita seurataan palvelimella {domain}.",
+ "domain_block_modal.block": "Estä palvelin",
+ "domain_block_modal.block_account_instead": "Estä sen sijaan @{name}",
+ "domain_block_modal.they_can_interact_with_old_posts": "Ihmiset tältä palvelimelta eivät voi olla vuorovaikutuksessa vanhojen julkaisujesi kanssa.",
+ "domain_block_modal.they_cant_follow": "Kukaan tältä palvelimelta ei voi seurata sinua.",
+ "domain_block_modal.they_wont_know": "Hän ei saa tietää, että hänet on estetty.",
+ "domain_block_modal.title": "Estetäänkö verkkotunnus?",
+ "domain_block_modal.you_will_lose_followers": "Kaikki seuraajasi tältä palvelimelta poistetaan.",
+ "domain_block_modal.you_wont_see_posts": "Et enää näe julkaisuja etkä ilmoituksia tämän palvelimen käyttäjiltä.",
+ "domain_pill.activitypub_lets_connect": "Sen avulla voit muodostaa yhteyden ja olla vuorovaikutuksessa ihmisten kanssa, ei vain Mastodonissa vaan myös muissa sosiaalisissa sovelluksissa.",
+ "domain_pill.activitypub_like_language": "ActivityPub on kuin kieli, jota Mastodon puhuu muiden sosiaalisten verkostojen kanssa.",
+ "domain_pill.server": "Palvelin",
+ "domain_pill.their_handle": "Hänen käyttäjänimensä:",
+ "domain_pill.their_server": "Hänen digitaalinen kotinsa, jossa kaikki hänen julkaisunsa sijaitsevat.",
+ "domain_pill.their_username": "Hänen yksilöllinen tunnisteensa omalla palvelimellaan. Eri palvelimilta on mahdollista löytää käyttäjiä, joilla on sama käyttäjänimi.",
+ "domain_pill.username": "Käyttäjänimi",
+ "domain_pill.whats_in_a_handle": "Mitä käyttäjänimessä on?",
+ "domain_pill.who_they_are": "Koska käyttäjätunnukset kertovat, kuka ja missä joku on, voit olla vuorovaikutuksessa ihmisten kanssa läpi sosiaalisen verkon, joka koostuu .",
+ "domain_pill.who_you_are": "Koska käyttäjätunnuksesi kertoo, kuka ja missä olet, ihmiset voivat olla vaikutuksessa kanssasi läpi sosiaalisen verkon, joka koostuu .",
+ "domain_pill.your_handle": "Käyttäjänimesi:",
+ "domain_pill.your_server": "Digitaalinen kotisi, jossa kaikki julkaisusi sijaitsevat. Etkö pidä tästä? Siirry palvelimelta toiselle milloin tahansa ja tuo myös seuraajasi mukanasi.",
+ "domain_pill.your_username": "Yksilöllinen tunnisteesi tällä palvelimella. Eri palvelimilta on mahdollista löytää käyttäjiä, joilla on sama käyttäjänimi.",
"embed.instructions": "Upota julkaisu verkkosivullesi kopioimalla alla oleva koodi.",
"embed.preview": "Tältä se näyttää:",
"emoji_button.activity": "Aktiviteetit",
@@ -217,18 +239,18 @@
"emoji_button.food": "Ruoka ja juoma",
"emoji_button.label": "Lisää emoji",
"emoji_button.nature": "Luonto",
- "emoji_button.not_found": "Vastaavia emojeja ei löytynyt",
+ "emoji_button.not_found": "Vastaavia emojeita ei löytynyt",
"emoji_button.objects": "Esineet",
"emoji_button.people": "Ihmiset",
"emoji_button.recent": "Usein käytetyt",
- "emoji_button.search": "Hae...",
+ "emoji_button.search": "Etsi...",
"emoji_button.search_results": "Hakutulokset",
"emoji_button.symbols": "Symbolit",
"emoji_button.travel": "Matkailu ja paikat",
- "empty_column.account_hides_collections": "Käyttäjä on päättänyt olla julkaisematta näitä tietoja",
+ "empty_column.account_hides_collections": "Käyttäjä on päättänyt pitää nämä tiedot yksityisinä",
"empty_column.account_suspended": "Tili jäädytetty",
"empty_column.account_timeline": "Ei viestejä täällä.",
- "empty_column.account_unavailable": "Profiilia ei löydy",
+ "empty_column.account_unavailable": "Profiilia ei ole saatavilla",
"empty_column.blocks": "Et ole vielä estänyt käyttäjiä.",
"empty_column.bookmarked_statuses": "Et ole vielä lisännyt julkaisuja kirjanmerkkeihisi. Kun lisäät yhden, se näkyy tässä.",
"empty_column.community": "Paikallinen aikajana on tyhjä. Kirjoita jotain julkista, niin homma lähtee käyntiin!",
@@ -239,17 +261,18 @@
"empty_column.favourites": "Kukaan ei ole vielä lisännyt tätä julkaisua suosikkeihinsa. Kun joku tekee niin, tulee hän tähän näkyviin.",
"empty_column.follow_requests": "Et ole vielä vastaanottanut seuraamispyyntöjä. Saamasi pyynnöt näkyvät täällä.",
"empty_column.followed_tags": "Et seuraa vielä yhtäkään aihetunnistetta. Kun alat seurata, ne tulevat tähän näkyviin.",
- "empty_column.hashtag": "Tällä aihetunnisteella ei ole vielä mitään.",
+ "empty_column.hashtag": "Tällä aihetunnisteella ei löydy vielä sisältöä.",
"empty_column.home": "Kotiaikajanasi on tyhjä! Seuraa useampia henkilöjä, niin näet enemmän sisältöä.",
"empty_column.list": "Tällä listalla ei ole vielä mitään. Kun tämän listan jäsenet lähettävät uusia julkaisuja, ne näkyvät tässä.",
"empty_column.lists": "Sinulla ei ole vielä yhtään listaa. Kun luot sellaisen, näkyy se tässä.",
"empty_column.mutes": "Et ole mykistänyt vielä yhtään käyttäjää.",
+ "empty_column.notification_requests": "Kaikki kunnossa! Täällä ei ole mitään. Kun saat uusia ilmoituksia, ne näkyvät täällä asetustesi mukaisesti.",
"empty_column.notifications": "Sinulla ei ole vielä ilmoituksia. Kun keskustelet muille, näet sen täällä.",
"empty_column.public": "Täällä ei ole mitään! Kirjoita jotain julkisesti. Voit myös seurata muiden palvelimien käyttäjiä",
- "error.unexpected_crash.explanation": "Sivua ei voi näyttää oikein, johtuen bugista tai ongelmasta selaimen yhteensopivuudessa.",
+ "error.unexpected_crash.explanation": "Sivua ei voida näyttää oikein ohjelmointivirheen tai selaimen yhteensopivuusvajeen vuoksi.",
"error.unexpected_crash.explanation_addons": "Sivua ei voitu näyttää oikein. Tämä virhe johtuu todennäköisesti selaimen lisäosasta tai automaattisista käännöstyökaluista.",
"error.unexpected_crash.next_steps": "Kokeile päivittää sivu. Jos se ei auta, voi Mastodonin käyttö ehkä onnistua eri selaimella tai natiivisovelluksella.",
- "error.unexpected_crash.next_steps_addons": "Yritä poistaa ne käytöstä ja päivittää sivu. Jos se ei auta, voit silti käyttää Mastodonia eri selaimen tai sovelluksen kautta.",
+ "error.unexpected_crash.next_steps_addons": "Yritä poistaa ne käytöstä, ja virkistä sitten sivunlataus. Mikäli ongelma jatkuu, voit mahdollisesti käyttää Mastodonia eri selaimella tai natiivilla sovelluksella.",
"errors.unexpected_crash.copy_stacktrace": "Kopioi pinon jäljitys leikepöydälle",
"errors.unexpected_crash.report_issue": "Ilmoita ongelmasta",
"explore.search_results": "Hakutulokset",
@@ -258,13 +281,13 @@
"explore.trending_links": "Uutiset",
"explore.trending_statuses": "Julkaisut",
"explore.trending_tags": "Aihetunnisteet",
- "filter_modal.added.context_mismatch_explanation": "Tämä suodatinluokka ei koske kontekstia, jossa olet tarkastellut tätä julkaisua. Jos haluat, että julkaisu suodatetaan myös tässä kontekstissa, sinun pitää muokata suodatinta.",
- "filter_modal.added.context_mismatch_title": "Konteksti ei täsmää!",
- "filter_modal.added.expired_explanation": "Tämä suodatinluokka on vanhentunut, joten sinun on muutettava viimeistä voimassaolopäivää, jotta suodatin on voimassa.",
+ "filter_modal.added.context_mismatch_explanation": "Tämä suodatinluokka ei koske asiayhteyttä, jossa olet tarkastellut tätä julkaisua. Jos haluat julkaisun suodatettavan myös tässä asiayhteydessä, muokkaa suodatinta.",
+ "filter_modal.added.context_mismatch_title": "Asiayhteys ei täsmää!",
+ "filter_modal.added.expired_explanation": "Tämä suodatinluokka on vanhentunut, joten sinun on muutettava viimeistä voimassaolopäivää, jotta suodatusta käytettäisiin.",
"filter_modal.added.expired_title": "Vanhentunut suodatin!",
- "filter_modal.added.review_and_configure": "Voit tarkastella tätä suodatinluokkaa ja määrittää sen tarkemmin kohdassa {settings_link}.",
+ "filter_modal.added.review_and_configure": "Voit tarkastella tätä suodatinluokkaa ja määrittää sen tarkemmin {settings_link}.",
"filter_modal.added.review_and_configure_title": "Suodattimen asetukset",
- "filter_modal.added.settings_link": "asetukset-sivulle",
+ "filter_modal.added.settings_link": "asetussivulla",
"filter_modal.added.short_explanation": "Tämä julkaisu on lisätty seuraavaan suodatinluokkaan: {title}.",
"filter_modal.added.title": "Suodatin lisätty!",
"filter_modal.select_filter.context_mismatch": "ei sovellu tähän kontekstiin",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "Käytä olemassa olevaa luokkaa tai luo uusi",
"filter_modal.select_filter.title": "Suodata tämä julkaisu",
"filter_modal.title.status": "Suodata julkaisu",
+ "filtered_notifications_banner.mentions": "{count, plural, one {maininta} other {mainintaa}}",
+ "filtered_notifications_banner.pending_requests": "Ilmoituksia {count, plural, =0 {ei ole} one {1 henkilöltä} other {# henkilöltä}}, jonka saatat tuntea",
+ "filtered_notifications_banner.title": "Suodatetut ilmoitukset",
"firehose.all": "Kaikki",
"firehose.local": "Tämä palvelin",
"firehose.remote": "Muut palvelimet",
"follow_request.authorize": "Valtuuta",
"follow_request.reject": "Hylkää",
"follow_requests.unlocked_explanation": "Vaikkei tiliäsi ole lukittu, palvelimen {domain} ylläpito on arvioinut, että saatat olla halukas tarkistamaan nämä seuraamispyynnöt erikseen.",
+ "follow_suggestions.curated_suggestion": "Ehdotus ylläpidolta",
+ "follow_suggestions.dismiss": "Älä näytä uudelleen",
+ "follow_suggestions.featured_longer": "Valinnut käsin palvelimen {domain} tiimi",
+ "follow_suggestions.friends_of_friends_longer": "Suosittu seuraamiesi ihmisten keskuudessa",
+ "follow_suggestions.hints.featured": "Tämän profiilin on valinnut palvelimen {domain} tiimi.",
+ "follow_suggestions.hints.friends_of_friends": "Seuraamasi käyttäjät suosivat tätä profiilia.",
+ "follow_suggestions.hints.most_followed": "Tämä profiili on palvelimen {domain} seuratuimpia.",
+ "follow_suggestions.hints.most_interactions": "Tämä profiili on viime aikoina saanut paljon huomiota palvelimella {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Tämä profiili on samankaltainen kuin profiilit, joita olet viimeksi seurannut.",
+ "follow_suggestions.personalized_suggestion": "Mukautettu ehdotus",
+ "follow_suggestions.popular_suggestion": "Suosittu ehdotus",
+ "follow_suggestions.popular_suggestion_longer": "Suosittu palvelimella {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Samankaltainen kuin äskettäin seuraamasi profiilit",
+ "follow_suggestions.view_all": "Näytä kaikki",
+ "follow_suggestions.who_to_follow": "Ehdotuksia seurattavaksi",
"followed_tags": "Seuratut aihetunnisteet",
"footer.about": "Tietoja",
"footer.directory": "Profiilihakemisto",
@@ -306,15 +347,10 @@
"hashtag.follow": "Seuraa aihetunnistetta",
"hashtag.unfollow": "Lopeta aihetunnisteen seuraaminen",
"hashtags.and_other": "…ja {count, plural, other {# lisää}}",
- "home.actions.go_to_explore": "Katso, mikä on suosittua",
- "home.actions.go_to_suggestions": "Löydä seurattavia käyttäjiä",
- "home.column_settings.basic": "Perusasetukset",
"home.column_settings.show_reblogs": "Näytä tehostukset",
"home.column_settings.show_replies": "Näytä vastaukset",
- "home.explore_prompt.body": "Kotisyötteesi on sekoitus seuraamiasi aihetunnisteita ja käyttäjiä sekä heidän tehostamiaan julkaisuja. Jos se tuntuu liian hiljaiselta, saatat haluta:",
- "home.explore_prompt.title": "Tämä on tukikohtasi Mastodonissa.",
"home.hide_announcements": "Piilota tiedotteet",
- "home.pending_critical_update.body": "Päivitäthän Mastodon-palvelimen mahdollisimman pian!",
+ "home.pending_critical_update.body": "Päivitäthän Mastodon-palvelinohjelmistosi mahdollisimman pian!",
"home.pending_critical_update.link": "Tutustu päivityssisältöihin",
"home.pending_critical_update.title": "Kriittinen tietoturvapäivitys saatavilla!",
"home.show_announcements": "Näytä tiedotteet",
@@ -353,7 +389,7 @@
"keyboard_shortcuts.hotkey": "Pikanäppäin",
"keyboard_shortcuts.legend": "Näytä tämä ohje",
"keyboard_shortcuts.local": "Avaa paikallinen aikajana",
- "keyboard_shortcuts.mention": "Mainitse kirjoittaja",
+ "keyboard_shortcuts.mention": "Mainitse julkaisija",
"keyboard_shortcuts.muted": "Avaa mykistettyjen käyttäjien luettelo",
"keyboard_shortcuts.my_profile": "Avaa profiilisi",
"keyboard_shortcuts.notifications": "Avaa ilmoitussarake",
@@ -371,13 +407,14 @@
"keyboard_shortcuts.unfocus": "Poistu teksti-/hakukentästä",
"keyboard_shortcuts.up": "Siirry listassa ylöspäin",
"lightbox.close": "Sulje",
- "lightbox.compress": "Pakkaa kuvan näkymälaatikko",
- "lightbox.expand": "Laajenna kuvan näkymälaatikko",
+ "lightbox.compress": "Tiivis kuvankatselunäkymä",
+ "lightbox.expand": "Laajennettu kuvankatselunäkymä",
"lightbox.next": "Seuraava",
"lightbox.previous": "Edellinen",
"limited_account_hint.action": "Näytä profiili joka tapauksessa",
- "limited_account_hint.title": "Palvelun {domain} valvojat ovat piilottaneet tämän profiilin.",
+ "limited_account_hint.title": "Palvelimen {domain} valvojat ovat piilottaneet tämän käyttäjätilin.",
"link_preview.author": "Julkaissut {name}",
+ "link_preview.more_from_author": "Lisää käyttäjältä {name}",
"lists.account.add": "Lisää listalle",
"lists.account.remove": "Poista listalta",
"lists.delete": "Poista lista",
@@ -390,25 +427,30 @@
"lists.replies_policy.list": "Listan jäsenille",
"lists.replies_policy.none": "Ei kellekään",
"lists.replies_policy.title": "Näytä vastaukset:",
- "lists.search": "Etsi seuraamistasi henkilöistä",
+ "lists.search": "Etsi seuraamiesi henkilöiden keskuudesta",
"lists.subheading": "Omat listasi",
"load_pending": "{count, plural, one {# uusi kohde} other {# uutta kohdetta}}",
"loading_indicator.label": "Ladataan…",
"media_gallery.toggle_visible": "{number, plural, one {Piilota kuva} other {Piilota kuvat}}",
"moved_to_account_banner.text": "Tilisi {disabledAccount} on tällä hetkellä poissa käytöstä, koska teit siirron tiliin {movedToAccount}.",
- "mute_modal.duration": "Kesto",
- "mute_modal.hide_notifications": "Piilota tältä käyttäjältä tulevat ilmoitukset?",
- "mute_modal.indefinite": "Ikuisesti",
+ "mute_modal.hide_from_notifications": "Piilota ilmoituksista",
+ "mute_modal.hide_options": "Piilota valinnat",
+ "mute_modal.indefinite": "Kunnes poistan mykistyksen häneltä",
+ "mute_modal.show_options": "Näytä valinnat",
+ "mute_modal.they_can_mention_and_follow": "Hän voi mainita sinut ja seurata sinua, mutta sinä et näe häntä.",
+ "mute_modal.they_wont_know": "Hän ei saa tietää, että hänet on mykistetty.",
+ "mute_modal.title": "Mykistetäänkö käyttäjä?",
+ "mute_modal.you_wont_see_mentions": "Et enää näe julkaisuja, joissa hänet mainitaan.",
+ "mute_modal.you_wont_see_posts": "Hän voi yhä nähdä julkaisusi, mutta sinä et näe hänen.",
"navigation_bar.about": "Tietoja",
"navigation_bar.advanced_interface": "Avaa edistyneessä selainkäyttöliittymässä",
"navigation_bar.blocks": "Estetyt käyttäjät",
"navigation_bar.bookmarks": "Kirjanmerkit",
"navigation_bar.community_timeline": "Paikallinen aikajana",
- "navigation_bar.compose": "Kirjoita uusi julkaisu",
+ "navigation_bar.compose": "Luo uusi julkaisu",
"navigation_bar.direct": "Yksityiset maininnat",
"navigation_bar.discover": "Löydä uutta",
"navigation_bar.domain_blocks": "Estetyt verkkotunnukset",
- "navigation_bar.edit_profile": "Muokkaa profiilia",
"navigation_bar.explore": "Selaa",
"navigation_bar.favourites": "Suosikit",
"navigation_bar.filters": "Mykistetyt sanat",
@@ -430,13 +472,31 @@
"notification.admin.sign_up": "{name} rekisteröityi",
"notification.favourite": "{name} lisäsi julkaisusi suosikkeihinsa",
"notification.follow": "{name} seurasi sinua",
- "notification.follow_request": "{name} haluaa seurata sinua",
+ "notification.follow_request": "{name} on pyytänyt lupaa saada seurata sinua",
"notification.mention": "{name} mainitsi sinut",
+ "notification.moderation-warning.learn_more": "Lue lisää",
+ "notification.moderation_warning": "Olet saanut moderointivaroituksen",
+ "notification.moderation_warning.action_delete_statuses": "Jotkin julkaisusi on poistettu.",
+ "notification.moderation_warning.action_disable": "Tilisi on poistettu käytöstä.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Jotkin julkaisusi on merkitty arkaluonteisiksi.",
+ "notification.moderation_warning.action_none": "Tilisi on saanut moderointivaroituksen.",
+ "notification.moderation_warning.action_sensitive": "Tästä lähtien julkaisusi merkitään arkaluonteisiksi.",
+ "notification.moderation_warning.action_silence": "Tiliäsi on rajoitettu.",
+ "notification.moderation_warning.action_suspend": "Tilisi on jäädytetty.",
"notification.own_poll": "Äänestyksesi on päättynyt",
- "notification.poll": "Äänestys, johon osallistuit, on päättynyt",
+ "notification.poll": "Kysely, johon osallistuit, on päättynyt",
"notification.reblog": "{name} tehosti julkaisuasi",
+ "notification.relationships_severance_event": "Menetettiin yhteydet palvelimeen {name}",
+ "notification.relationships_severance_event.account_suspension": "Palvelimen {from} ylläpitäjä on jäädyttänyt palvelimen {target} vuorovaikutuksen. Enää et voi siis vastaanottaa päivityksiä heiltä tai olla yhteyksissä heidän kanssaan.",
+ "notification.relationships_severance_event.domain_block": "Palvelimen {from} ylläpitäjä on estänyt palvelimen {target} vuorovaikutuksen – mukaan lukien {followersCount} seuraajistasi ja {followingCount, plural, one {# seuratuistasi} other {# seuratuistasi}}.",
+ "notification.relationships_severance_event.learn_more": "Lue lisää",
+ "notification.relationships_severance_event.user_domain_block": "Olet estänyt palvelimen {target}, mikä poisti {followersCount} seuraajistasi ja {followingCount, plural, one {# seuratuistasi} other {# seuratuistasi}}.",
"notification.status": "{name} julkaisi juuri",
"notification.update": "{name} muokkasi julkaisua",
+ "notification_requests.accept": "Hyväksy",
+ "notification_requests.dismiss": "Hylkää",
+ "notification_requests.notifications_from": "Ilmoitukset käyttäjältä {name}",
+ "notification_requests.title": "Suodatetut ilmoitukset",
"notifications.clear": "Tyhjennä ilmoitukset",
"notifications.clear_confirmation": "Haluatko varmasti poistaa kaikki ilmoitukset pysyvästi?",
"notifications.column_settings.admin.report": "Uudet ilmoitukset:",
@@ -445,7 +505,6 @@
"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.filter_bar.show_bar": "Näytä suodatinpalkki",
"notifications.column_settings.follow": "Uudet seuraajat:",
"notifications.column_settings.follow_request": "Uudet seuraamispyynnöt:",
"notifications.column_settings.mention": "Maininnat:",
@@ -471,6 +530,15 @@
"notifications.permission_denied": "Työpöytäilmoitukset eivät ole käytettävissä, koska selaimen käyttöoikeuspyyntö on aiemmin evätty",
"notifications.permission_denied_alert": "Työpöytäilmoituksia ei voi ottaa käyttöön, koska selaimen käyttöoikeus on aiemmin estetty",
"notifications.permission_required": "Työpöytäilmoitukset eivät ole käytettävissä, koska siihen tarvittavaa lupaa ei ole myönnetty.",
+ "notifications.policy.filter_new_accounts.hint": "Luotu {days, plural, one {viime päivänä} other {viimeisenä # päivänä}}",
+ "notifications.policy.filter_new_accounts_title": "Uudet tilit",
+ "notifications.policy.filter_not_followers_hint": "Mukaan lukien ne, jotka ovat seuranneet sinua vähemmän kuin {days, plural, one {päivän} other {# päivää}}",
+ "notifications.policy.filter_not_followers_title": "Henkilöt, jotka eivät seuraa sinua",
+ "notifications.policy.filter_not_following_hint": "Kunnes hyväksyt ne manuaalisesti",
+ "notifications.policy.filter_not_following_title": "Henkilöt, joita et seuraa",
+ "notifications.policy.filter_private_mentions_hint": "Suodatetaan, ellei se vastaa omaan mainintaasi tai ellet seuraa lähettäjää",
+ "notifications.policy.filter_private_mentions_title": "Ei-toivotut yksityismaininnat",
+ "notifications.policy.title": "Suodata ilmoitukset pois kohteesta…",
"notifications_permission_banner.enable": "Ota työpöytäilmoitukset käyttöön",
"notifications_permission_banner.how_to_control": "Saadaksesi ilmoituksia, kun Mastodon ei ole auki, ota työpöytäilmoitukset käyttöön. Voit hallita tarkasti, mistä saat työpöytäilmoituksia kun ilmoitukset on otettu käyttöön yllä olevan {icon}-painikkeen kautta.",
"notifications_permission_banner.title": "Älä anna minkään mennä ohi",
@@ -480,7 +548,7 @@
"onboarding.actions.go_to_home": "Siirry kotisyötteeseeni",
"onboarding.compose.template": "Tervehdys #Mastodon!",
"onboarding.follows.empty": "Valitettavasti tuloksia ei voida näyttää juuri nyt. Voit kokeilla hakua tai selata tutustumissivua löytääksesi seurattavaa tai yrittää myöhemmin uudelleen.",
- "onboarding.follows.lead": "Kokoat oman kotisyötteesi itse. Mitä enemmän ihmisiä seuraat, sitä aktiivisempi ja kiinnostavampi syöte on. Nämä profiilit voivat olla alkuun hyvä lähtökohta — voit aina lopettaa niiden seuraamisen myöhemmin!",
+ "onboarding.follows.lead": "Kokoat oman kotisyötteesi itse. Mitä enemmän ihmisiä seuraat, sitä aktiivisempi ja kiinnostavampi syöte on. Nämä profiilit voivat olla alkuun hyvä lähtökohta – voit milloin tahansa myös lopettaa niiden seuraamisen:",
"onboarding.follows.title": "Mukauta kotisyötettäsi",
"onboarding.profile.discoverable": "Aseta profiilini löydettäväksi",
"onboarding.profile.discoverable_hint": "Kun olet määrittänyt itsesi löydettäväksi Mastodonista, julkaisusi voivat näkyä hakutuloksissa ja suosituissa kohteissa. Lisäksi profiiliasi voidaan ehdottaa käyttäjille, jotka ovat kiinnostuneita kanssasi samoista aiheista.",
@@ -501,14 +569,14 @@
"onboarding.start.skip": "Haluatko hypätä suoraan eteenpäin ilman alkuunpääsyohjeistuksia?",
"onboarding.start.title": "Olet tehnyt sen!",
"onboarding.steps.follow_people.body": "Mastodon perustuu sinua kiinnostavien henkilöjen julkaisujen seuraamiseen.",
- "onboarding.steps.follow_people.title": "Mukauta kotisyötteesi",
+ "onboarding.steps.follow_people.title": "Mukauta kotisyötettäsi",
"onboarding.steps.publish_status.body": "Tervehdi maailmaa sanoin, kuvin tai äänestyksin {emoji}",
"onboarding.steps.publish_status.title": "Laadi ensimmäinen julkaisusi",
"onboarding.steps.setup_profile.body": "Täydentämällä profiilisi tietoja tehostat vuorovaikutteisuutta.",
"onboarding.steps.setup_profile.title": "Mukauta profiiliasi",
"onboarding.steps.share_profile.body": "Kerro kavereillesi, kuinka sinut löytää Mastodonista",
"onboarding.steps.share_profile.title": "Jaa Mastodon-profiilisi",
- "onboarding.tips.2fa": "Tiesitkö? Voit suojata tilisi ottamalla kaksivaiheisen todennuksen käyttöön tilisi asetuksista. Se toimii millä tahansa TOTP-sovelluksella, eikä sen käyttö edellytä puhelinnumeroa!",
+ "onboarding.tips.2fa": "Tiesitkö? Voit suojata tilisi ottamalla kaksivaiheisen todennuksen käyttöön tilisi asetuksista. Se toimii millä tahansa TOTP-sovelluksella, eikä sen käyttö edellytä puhelinnumeron antoa!",
"onboarding.tips.accounts_from_other_servers": "Tiesitkö? Koska Mastodon on hajautettu, osa kohtaamistasi profiileista sijaitsee muilla kuin sinun palvelimellasi. Voit silti viestiä saumattomasti heidän kanssaan! Heidän palvelimensa mainitaan käyttäjänimen jälkiosassa!",
"onboarding.tips.migration": "Tiesitkö? Jos koet, ettei {domain} ole jatkossa itsellesi hyvä palvelinvalinta, voit siirtyä toiselle Mastodon-palvelimelle menettämättä seuraajiasi. Voit jopa isännöidä omaa palvelintasi!",
"onboarding.tips.verification": "Tiesitkö? Voit vahvistaa tilisi lisäämällä omalle verkkosivustollesi linkin Mastodon-profiiliisi ja lisäämällä sitten verkkosivustosi osoitteen Mastodon-profiilisi lisäkenttään. Tämä ei maksa mitään, eikä sinun tarvitse lähetellä asiakirjoja!",
@@ -523,17 +591,18 @@
"poll.vote": "Äänestä",
"poll.voted": "Äänestit tätä vastausta",
"poll.votes": "{votes, plural, one {# ääni} other {# ääntä}}",
- "poll_button.add_poll": "Lisää äänestys",
- "poll_button.remove_poll": "Poista äänestys",
+ "poll_button.add_poll": "Lisää kysely",
+ "poll_button.remove_poll": "Poista kysely",
"privacy.change": "Muuta julkaisun näkyvyyttä",
- "privacy.direct.long": "Näkyy vain mainituille käyttäjille",
- "privacy.direct.short": "Vain mainitut käyttäjät",
- "privacy.private.long": "Näkyy vain seuraajille",
- "privacy.private.short": "Vain seuraajat",
- "privacy.public.long": "Näkyy kaikille",
+ "privacy.direct.long": "Kaikki tässä julkaisussa mainitut",
+ "privacy.direct.short": "Tietyt henkilöt",
+ "privacy.private.long": "Vain seuraajasi",
+ "privacy.private.short": "Seuraajat",
+ "privacy.public.long": "Kuka tahansa Mastodonissa ja sen ulkopuolella",
"privacy.public.short": "Julkinen",
- "privacy.unlisted.long": "Näkyy kaikille mutta jää pois löytämisominaisuuksista",
- "privacy.unlisted.short": "Listaamaton",
+ "privacy.unlisted.additional": "Tämä on muutoin kuin julkinen julkaisu, mutta sitä ei näytetä livesyöte-, aihetunniste- tai selailunäkymissä eikä Mastodon-hakutuloksissakaan, vaikka ne olisivat käyttäjätililläsi yleisesti sallittuina.",
+ "privacy.unlisted.long": "Vähemmän algoritmiperusteista sisältöä",
+ "privacy.unlisted.short": "Vaivihkaisesti julkinen",
"privacy_policy.last_updated": "Viimeksi päivitetty {date}",
"privacy_policy.title": "Tietosuojakäytäntö",
"recommended": "Suositeltu",
@@ -551,19 +620,21 @@
"relative_time.minutes": "{number} min",
"relative_time.seconds": "{number} s",
"relative_time.today": "tänään",
+ "reply_indicator.attachments": "{count, plural, one {# liite} other {# liitettä}}",
"reply_indicator.cancel": "Peruuta",
+ "reply_indicator.poll": "Kysely",
"report.block": "Estä",
"report.block_explanation": "Et näe hänen viestejään, eikä hän voi nähdä viestejäsi tai seurata sinua. Hän näkee, että olet estänyt hänet.",
- "report.categories.legal": "Lakiasiat",
+ "report.categories.legal": "Juridiset tiedot",
"report.categories.other": "Muu",
"report.categories.spam": "Roskaposti",
- "report.categories.violation": "Sisältö rikkoo yhtä tai useampaa palvelimen sääntöä",
+ "report.categories.violation": "Sisältö rikkoo yhtä tai useampaa palvelimen säännöistä",
"report.category.subtitle": "Valitse sopivin",
"report.category.title": "Kerro meille, miksi tämä {type} pitää raportoida",
- "report.category.title_account": "profiili",
- "report.category.title_status": "julkaisu",
+ "report.category.title_account": "profiilissa",
+ "report.category.title_status": "julkaisussa",
"report.close": "Valmis",
- "report.comment.title": "Olisiko jotain muuta, mitä meidän pitäisi tietää?",
+ "report.comment.title": "Onko vielä jotain muuta, mitä meidän pitäisi tietää?",
"report.forward": "Välitä kohteeseen {target}",
"report.forward_hint": "Tämä tili on toisella palvelimella. Haluatko lähettää nimettömän raportin myös sinne?",
"report.mute": "Mykistä",
@@ -571,18 +642,18 @@
"report.next": "Seuraava",
"report.placeholder": "Lisäkommentit",
"report.reasons.dislike": "En pidä siitä",
- "report.reasons.dislike_description": "Et halua nähdä sitä",
+ "report.reasons.dislike_description": "Sisältö on sen tyyppistä, ettet halua nähdä sitä",
"report.reasons.legal": "Se on laitonta",
"report.reasons.legal_description": "Katsot sisällön rikkovan maasi tai palvelimen kotimaan lakeja",
"report.reasons.other": "Jotain muuta",
- "report.reasons.other_description": "Ongelma ei sovi muihin kategorioihin",
+ "report.reasons.other_description": "Muut raportointisyyt eivät kuvaa ongelmaa",
"report.reasons.spam": "Se on roskapostia",
- "report.reasons.spam_description": "Haitalliset linkit, väärennetyt sitoutumiset tai toistuvat vastaukset",
+ "report.reasons.spam_description": "Haitalliset linkit, henkilöväärennökset tai itseään toistavat vastaukset",
"report.reasons.violation": "Se rikkoo palvelimen sääntöjä",
- "report.reasons.violation_description": "Tiedät, että se rikkoo tiettyjä sääntöjä",
+ "report.reasons.violation_description": "Tiedät sisällön rikkovan tiettyjä sääntöjä",
"report.rules.subtitle": "Valitse kaikki sopivat",
"report.rules.title": "Mitä sääntöjä rikotaan?",
- "report.statuses.subtitle": "Valitse kaikki sopivat",
+ "report.statuses.subtitle": "Valitse kaikki soveltuvat julkaisut",
"report.statuses.title": "Onko julkaisuja, jotka tukevat tätä raporttia?",
"report.submit": "Lähetä",
"report.target": "Raportoidaan {target}",
@@ -596,14 +667,14 @@
"report_notification.categories.legal": "Laillinen",
"report_notification.categories.other": "Muu",
"report_notification.categories.spam": "Roskaposti",
- "report_notification.categories.violation": "Sääntöjen rikkominen",
+ "report_notification.categories.violation": "Sääntörikkomus",
"report_notification.open": "Avaa raportti",
"search.no_recent_searches": "Ei viimeaikaisia hakuja",
"search.placeholder": "Hae",
"search.quick_action.account_search": "Profiilit haulla {x}",
"search.quick_action.go_to_account": "Siirry profiiliin {x}",
"search.quick_action.go_to_hashtag": "Siirry aihetunnisteeseen {x}",
- "search.quick_action.open_url": "Avaa URL-osoite Mastodonissa",
+ "search.quick_action.open_url": "Avaa verkko-osoite Mastodonissa",
"search.quick_action.status_search": "Julkaisut haulla {x}",
"search.search_or_paste": "Hae tai liitä URL-osoite",
"search_popout.full_text_search_disabled_message": "Ei saatavilla palvelimella {domain}.",
@@ -612,16 +683,16 @@
"search_popout.options": "Hakuvalinnat",
"search_popout.quick_actions": "Pikatoiminnot",
"search_popout.recent": "Viimeaikaiset haut",
- "search_popout.specific_date": "tarkka päiväys",
+ "search_popout.specific_date": "tietty päivämäärä",
"search_popout.user": "käyttäjä",
"search_results.accounts": "Profiilit",
"search_results.all": "Kaikki",
"search_results.hashtags": "Aihetunnisteet",
- "search_results.nothing_found": "Näille hakusanoille ei löytynyt mitään",
+ "search_results.nothing_found": "Hakusi ei tuottanut tuloksia",
"search_results.see_all": "Näytä kaikki",
"search_results.statuses": "Julkaisut",
"search_results.title": "Hae {q}",
- "server_banner.about_active_users": "Palvelinta käyttäneet ihmiset viimeisen 30 päivän aikana (kuukauden aktiiviset käyttäjät)",
+ "server_banner.about_active_users": "Palvelimen käyttäjät viimeisten 30 päivän ajalta (kuukauden aktiiviset käyttäjät)",
"server_banner.active_users": "aktiivista käyttäjää",
"server_banner.administered_by": "Ylläpitäjä:",
"server_banner.introduction": "{domain} kuuluu hajautettuun sosiaaliseen verkostoon, jonka voimanlähde on {mastodon}.",
@@ -644,21 +715,22 @@
"status.direct": "Mainitse @{name} yksityisesti",
"status.direct_indicator": "Yksityinen maininta",
"status.edit": "Muokkaa",
- "status.edited": "Muokattu {date}",
+ "status.edited": "Viimeksi muokattu {date}",
"status.edited_x_times": "Muokattu {count, plural, one {{count} kerran} other {{count} kertaa}}",
"status.embed": "Upota",
"status.favourite": "Suosikki",
+ "status.favourites": "{count, plural, one {suosikki} other {suosikkia}}",
"status.filter": "Suodata tämä julkaisu",
"status.filtered": "Suodatettu",
"status.hide": "Piilota julkaisu",
- "status.history.created": "{name} luotu {date}",
+ "status.history.created": "{name} loi {date}",
"status.history.edited": "{name} muokkasi {date}",
"status.load_more": "Lataa lisää",
"status.media.open": "Avaa napsauttamalla",
"status.media.show": "Napsauta näyttääksesi",
"status.media_hidden": "Media piilotettu",
"status.mention": "Mainitse @{name}",
- "status.more": "Lisää",
+ "status.more": "Enemmän",
"status.mute": "Mykistä @{name}",
"status.mute_conversation": "Mykistä keskustelu",
"status.open": "Laajenna julkaisu",
@@ -668,6 +740,7 @@
"status.reblog": "Tehosta",
"status.reblog_private": "Tehosta alkuperäiselle yleisölle",
"status.reblogged_by": "{name} tehosti",
+ "status.reblogs": "{count, plural, one {tehostus} other {tehostusta}}",
"status.reblogs.empty": "Kukaan ei ole vielä tehostanut tätä julkaisua. Kun joku tekee niin, tulee hän tähän näkyviin.",
"status.redraft": "Poista ja palauta muokattavaksi",
"status.remove_bookmark": "Poista kirjanmerkki",
@@ -680,14 +753,14 @@
"status.show_filter_reason": "Näytä joka tapauksessa",
"status.show_less": "Näytä vähemmän",
"status.show_less_all": "Näytä kaikista vähemmän",
- "status.show_more": "Näytä lisää",
+ "status.show_more": "Näytä enemmän",
"status.show_more_all": "Näytä kaikista enemmän",
"status.show_original": "Näytä alkuperäinen",
"status.title.with_attachments": "{user} liitti {attachmentCount, plural, one {{attachmentCount} tiedoston} other {{attachmentCount} tiedostoa}}",
"status.translate": "Käännä",
- "status.translated_from_with": "Käännetty kielestä {lang} käyttäen {provider}",
+ "status.translated_from_with": "Käännetty kielestä {lang} käyttäen palvelua {provider}",
"status.uncached_media_warning": "Esikatselu ei ole käytettävissä",
- "status.unmute_conversation": "Poista keskustelun mykistys",
+ "status.unmute_conversation": "Kumoa keskustelun mykistys",
"status.unpin": "Irrota profiilista",
"subscribed_languages.lead": "Vain valituilla kielillä kirjoitetut julkaisut näkyvät koti- ja lista-aikajanoillasi muutoksen jälkeen. Älä valitse mitään, jos haluat nähdä julkaisuja kaikilla kielillä.",
"subscribed_languages.save": "Tallenna muutokset",
@@ -697,9 +770,9 @@
"time_remaining.days": "{number, plural, one {# päivä} other {# päivää}} jäljellä",
"time_remaining.hours": "{number, plural, one {# tunti} other {# tuntia}} jäljellä",
"time_remaining.minutes": "{number, plural, one {# minuutti} other {# minuuttia}} jäljellä",
- "time_remaining.moments": "Hetki jäljellä",
+ "time_remaining.moments": "Hetkiä jäljellä",
"time_remaining.seconds": "{number, plural, one {# sekunti} other {# sekuntia}} jäljellä",
- "timeline_hint.remote_resource_not_displayed": "{resource} muilta palvelimilta ei näytetä.",
+ "timeline_hint.remote_resource_not_displayed": "Muiden palvelinten {resource}-tietoa ei näytetä täällä.",
"timeline_hint.resources.followers": "Seuraajat",
"timeline_hint.resources.follows": "seurattua",
"timeline_hint.resources.statuses": "Vanhemmat julkaisut",
@@ -712,25 +785,23 @@
"upload_area.title": "Lataa raahaamalla ja pudottamalla tähän",
"upload_button.label": "Lisää kuvia, video tai äänitiedosto",
"upload_error.limit": "Tiedostolatauksien rajoitus ylitetty.",
- "upload_error.poll": "Tiedoston lataaminen ei ole sallittua äänestyksissä.",
+ "upload_error.poll": "Tiedostojen lisääminen ei ole sallittua kyselyjen ohessa.",
"upload_form.audio_description": "Kuvaile sisältöä kuuroille ja kuulorajoitteisille",
"upload_form.description": "Kuvaile sisältöä sokeille ja näkörajoitteisille",
- "upload_form.description_missing": "Kuvausta ei ole lisätty",
"upload_form.edit": "Muokkaa",
- "upload_form.thumbnail": "Vaihda pikkukuva",
- "upload_form.undo": "Poista",
+ "upload_form.thumbnail": "Vaihda pienoiskuva",
"upload_form.video_description": "Kuvaile sisältöä kuuroille, kuulorajoitteisille, sokeille tai näkörajoitteisille",
"upload_modal.analyzing_picture": "Analysoidaan kuvaa…",
"upload_modal.apply": "Käytä",
- "upload_modal.applying": "Asetetaan…",
+ "upload_modal.applying": "Otetaan käyttöön…",
"upload_modal.choose_image": "Valitse kuva",
"upload_modal.description_placeholder": "Nopea ruskea kettu hyppää laiskan koiran yli",
"upload_modal.detect_text": "Tunnista teksti kuvasta",
"upload_modal.edit_media": "Muokkaa mediaa",
- "upload_modal.hint": "Klikkaa tai vedä ympyrä esikatselussa valitaksesi keskipiste, joka näkyy aina pienoiskuvissa.",
+ "upload_modal.hint": "Napsauta tai vedä ympyrä esikatselussa valitaksesi keskipiste, joka näkyy aina pienoiskuvissa.",
"upload_modal.preparing_ocr": "Valmistellaan tekstintunnistusta…",
"upload_modal.preview_label": "Esikatselu ({ratio})",
- "upload_progress.label": "Ladataan...",
+ "upload_progress.label": "Tallennetaan...",
"upload_progress.processing": "Käsitellään…",
"username.taken": "Käyttäjänimi on jo varattu. Kokeile toista",
"video.close": "Sulje video",
@@ -740,7 +811,7 @@
"video.fullscreen": "Koko näyttö",
"video.hide": "Piilota video",
"video.mute": "Mykistä ääni",
- "video.pause": "Keskeytä",
+ "video.pause": "Tauko",
"video.play": "Toista",
"video.unmute": "Palauta ääni"
}
diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json
index ec27c8f60e2468..1f9b0496b9d427 100644
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@@ -27,6 +27,7 @@
"account.featured_tags.last_status_never": "Walang mga post",
"account.featured_tags.title": "Nakatampok na hashtag ni {name}",
"account.follow": "Sundan",
+ "account.follow_back": "Sundan pabalik",
"account.followers": "Mga tagasunod",
"account.followers.empty": "Wala pang sumusunod sa tagagamit na ito.",
"account.following": "Sinusundan",
@@ -41,6 +42,17 @@
"account.media": "Medya",
"account.mention": "Banggitin si @{name}",
"account.moved_to": "Ipinahihiwatig ni {name} na ang kanilang bagong account ngayon ay:",
+ "account.open_original_page": "Buksan ang pinagmulang pahina",
+ "account.report": "I-ulat si/ang @{name}",
+ "account.requested_follow": "Hinihiling ni {name} na sundan ka",
+ "account.show_reblogs": "Ipakita ang mga pagpapalakas mula sa/kay {name}",
+ "account.unendorse": "Huwag itampok sa profile",
+ "admin.dashboard.retention.cohort_size": "Mga bagong tagagamit",
+ "alert.rate_limited.message": "Mangyaring subukan muli pagkatapos ng {retry_time, time, medium}.",
+ "audio.hide": "Itago ang tunog",
+ "block_modal.show_less": "Magpakita ng mas kaunti",
+ "block_modal.show_more": "Magpakita ng higit pa",
+ "block_modal.title": "Harangan ang tagagamit?",
"bundle_column_error.error.title": "Naku!",
"bundle_column_error.network.body": "Nagkaroon ng kamalian habang sinusubukang i-karga ang pahinang ito. Maaaring dahil ito sa pansamantalang problema ng iyong koneksyon sa internet o ang server na ito.",
"bundle_column_error.network.title": "Kamaliang network",
@@ -91,6 +103,24 @@
"compose_form.direct_message_warning_learn_more": "Matuto pa",
"compose_form.encryption_warning": "Ang mga post sa Mastodon ay hindi naka-encrypt nang dulo-dulo. Huwag magbahagi ng anumang sensitibong impormasyon sa Mastodon.",
"compose_form.hashtag_warning": "Hindi maililista ang post na ito sa anumang hashtag dahil hindi ito nakapubliko. Mga nakapublikong post lamang ang mahahanap ayon sa hashtag.",
+ "compose_form.placeholder": "Anong nangyari?",
+ "compose_form.poll.duration": "Tagal ng botohan",
+ "compose_form.poll.multiple": "Maraming pagpipilian",
+ "compose_form.poll.single": "Piliin ang isa",
+ "compose_form.reply": "Tumugon",
+ "compose_form.spoiler.marked": "Tanggalin ang babala sa nilalaman",
+ "compose_form.spoiler.unmarked": "Idagdag ang babala sa nilalaman",
+ "confirmation_modal.cancel": "Pagpaliban",
+ "confirmations.block.confirm": "Harangan",
+ "confirmations.cancel_follow_request.confirm": "Bawiin ang kahilingan",
+ "confirmations.cancel_follow_request.message": "Sigurdo ka bang gusto mong bawiin ang kahilingang sundan si/ang {name}?",
+ "confirmations.delete.message": "Sigurado ka bang gusto mong burahin ang post na ito?",
+ "confirmations.delete_list.confirm": "Tanggalin",
+ "confirmations.delete_list.message": "Sigurado ka bang gusto mong burahin ang listahang ito?",
+ "confirmations.discard_edit_media.confirm": "Ipagpaliban",
+ "confirmations.edit.confirm": "Baguhin",
+ "confirmations.reply.confirm": "Tumugon",
+ "conversation.mark_as_read": "Markahan bilang nabasa na",
"copy_icon_button.copied": "Sinipi sa clipboard",
"copypaste.copied": "Sinipi",
"copypaste.copy_to_clipboard": "I-sipi sa clipboard",
@@ -106,6 +136,10 @@
"dismissable_banner.explore_statuses": "Ito ang mga sumisikat na mga post sa iba't ibang bahagi ng social web ngayon. Ang mga mas bagong post na mas marami ang mga pagpapalakas at paborito ay tinataasan ng antas.",
"dismissable_banner.explore_tags": "Ito ang mga sumisikat na mga hashtag sa iba't ibang bahagi ng social web ngayon. Ang mga hashtag ginagamit ng mas maraming mga iba't ibang tao ay tinataasan ng antas.",
"dismissable_banner.public_timeline": "Ito ang mga pinakamakailang nakapublikong post mula sa mga taong nasa social web na sinusundan ng mga tao sa {domain}.",
+ "domain_block_modal.block": "Harangan ang serbiro",
+ "domain_block_modal.title": "Harangan ang domain?",
+ "domain_block_modal.you_will_lose_followers": "Mabubura ang iyong mga tagasunod mula sa serbirong ito.",
+ "domain_pill.server": "Serbiro",
"embed.instructions": "I-embed ang post na ito sa iyong pook-sapot sa pamamagitan ng pagsipi ng kodigo sa ilalim.",
"embed.preview": "Ito ang magiging itsura:",
"emoji_button.activity": "Aktibidad",
@@ -140,5 +174,173 @@
"empty_column.hashtag": "Wala pang laman ang hashtag na ito.",
"empty_column.home": "Walang laman ang timeline ng tahanan mo! Sumunod sa marami pang tao para mapunan ito.",
"empty_column.list": "Wala pang laman ang listahang ito. Kapag naglathala ng mga bagong post ang mga miyembro ng listahang ito, makikita iyon dito.",
- "empty_column.lists": "Wala ka pang mga listahan. Kapag gumawa ka ng isa, makikita yun dito."
+ "empty_column.lists": "Wala ka pang mga listahan. Kapag gumawa ka ng isa, makikita yun dito.",
+ "explore.search_results": "Mga resulta ng paghahanap",
+ "explore.suggested_follows": "Mga tao",
+ "explore.title": "Tuklasin",
+ "explore.trending_links": "Mga balita",
+ "filter_modal.select_filter.search": "Hanapin o gumawa",
+ "firehose.all": "Lahat",
+ "firehose.local": "Itong serbiro",
+ "firehose.remote": "Ibang mga serbiro",
+ "follow_request.authorize": "Tanggapin",
+ "follow_request.reject": "Tanggihan",
+ "follow_suggestions.dismiss": "Huwag nang ipakita muli",
+ "follow_suggestions.view_all": "Tingnan lahat",
+ "follow_suggestions.who_to_follow": "Sinong maaaring sundan",
+ "footer.about": "Tungkol dito",
+ "footer.get_app": "Kunin ang app",
+ "footer.status": "Katayuan",
+ "generic.saved": "Nakaimbak",
+ "hashtag.column_header.tag_mode.all": "at {additional}",
+ "hashtag.column_header.tag_mode.any": "o {additional}",
+ "hashtag.column_settings.tag_mode.all": "Lahat ng nandito",
+ "hashtag.column_settings.tag_mode.any": "Ilan dito",
+ "hashtag.column_settings.tag_mode.none": "Wala dito",
+ "hashtags.and_other": "…at {count, plural, one {# iba pa} other {# na iba pa}}",
+ "home.column_settings.show_replies": "Ipakita ang mga tugon",
+ "home.pending_critical_update.body": "Mangyaring i-update ang iyong serbiro ng Mastodon sa lalong madaling panahon!",
+ "interaction_modal.login.action": "Iuwi mo ako",
+ "interaction_modal.no_account_yet": "Wala sa Mastodon?",
+ "interaction_modal.on_another_server": "Sa ibang serbiro",
+ "interaction_modal.on_this_server": "Sa serbirong ito",
+ "interaction_modal.title.follow": "Sundan si {name}",
+ "intervals.full.days": "{number, plural, one {# araw} other {# na araw}}",
+ "intervals.full.hours": "{number, plural, one {# oras} other {# na oras}}",
+ "intervals.full.minutes": "{number, plural, one {# minuto} other {# na minuto}}",
+ "keyboard_shortcuts.blocked": "Buksan ang talaan ng mga nakaharang na mga tagagamit",
+ "keyboard_shortcuts.description": "Paglalarawan",
+ "keyboard_shortcuts.down": "Ilipat pababa sa talaan",
+ "keyboard_shortcuts.mention": "Banggitin ang may-akda",
+ "keyboard_shortcuts.requests": "Buksan ang talaan ng mga kahilingan sa pagsunod",
+ "keyboard_shortcuts.up": "Ilipat pataas sa talaan",
+ "lightbox.close": "Isara",
+ "lightbox.next": "Susunod",
+ "lightbox.previous": "Nakaraan",
+ "link_preview.author": "Ni/ng {name}",
+ "lists.account.add": "Idagdag sa talaan",
+ "lists.account.remove": "Tanggalin mula sa talaan",
+ "lists.new.create": "Idagdag sa talaan",
+ "lists.new.title_placeholder": "Bagong pangalan ng talaan",
+ "lists.replies_policy.title": "Ipakita ang mga tugon sa:",
+ "lists.subheading": "Iyong mga talaan",
+ "loading_indicator.label": "Kumakarga…",
+ "mute_modal.hide_from_notifications": "Itago mula sa mga abiso",
+ "navigation_bar.about": "Tungkol dito",
+ "navigation_bar.blocks": "Nakaharang na mga tagagamit",
+ "navigation_bar.direct": "Mga palihim na banggit",
+ "navigation_bar.discover": "Tuklasin",
+ "navigation_bar.explore": "Tuklasin",
+ "navigation_bar.favourites": "Mga paborito",
+ "navigation_bar.follow_requests": "Mga hiling sa pagsunod",
+ "navigation_bar.follows_and_followers": "Mga sinusundan at tagasunod",
+ "navigation_bar.lists": "Mga listahan",
+ "navigation_bar.public_timeline": "Pinagsamang timeline",
+ "navigation_bar.search": "Maghanap",
+ "notification.admin.report": "Iniulat ni {name} si {target}",
+ "notification.follow": "Sinundan ka ni {name}",
+ "notification.follow_request": "Hinihiling ni {name} na sundan ka",
+ "notification.mention": "Binanggit ka ni {name}",
+ "notification.moderation_warning": "Mayroong kang natanggap na babala sa pagtitimpi",
+ "notification.relationships_severance_event.learn_more": "Matuto nang higit pa",
+ "notification_requests.accept": "Tanggapin",
+ "notification_requests.notifications_from": "Mga abiso mula kay/sa {name}",
+ "notifications.clear": "Burahin mga abiso",
+ "notifications.column_settings.admin.report": "Mga bagong ulat:",
+ "notifications.column_settings.alert": "Mga abiso sa Desktop",
+ "notifications.column_settings.favourite": "Mga paborito:",
+ "notifications.column_settings.follow": "Mga bagong tagasunod:",
+ "notifications.column_settings.poll": "Resulta ng botohan:",
+ "notifications.column_settings.unread_notifications.category": "Hindi Nabasang mga Abiso",
+ "notifications.column_settings.update": "Mga pagbago:",
+ "notifications.filter.all": "Lahat",
+ "notifications.filter.favourites": "Mga paborito",
+ "notifications.filter.polls": "Resulta ng botohan",
+ "notifications.mark_as_read": "Markahan lahat ng abiso bilang nabasa na",
+ "notifications.policy.filter_not_followers_title": "Mga taong hindi ka susundan",
+ "notifications.policy.filter_not_following_title": "Mga taong hindi mo sinusundan",
+ "onboarding.action.back": "Ibalik mo ako",
+ "onboarding.actions.back": "Ibalik mo ako",
+ "onboarding.profile.note_hint": "Maaari mong @bangitin ang ibang mga tao o mga #hashtag…",
+ "onboarding.profile.save_and_continue": "Iimbak at magpatuloy",
+ "onboarding.share.next_steps": "Mga posibleng susunod na hakbang:",
+ "picture_in_picture.restore": "Ilagay ito pabalik",
+ "poll.closed": "Sarado",
+ "poll.reveal": "Ipakita ang mga resulta",
+ "poll.voted": "Binoto mo para sa sagot na ito",
+ "poll_button.remove_poll": "Tanggalin ang boto",
+ "privacy.direct.long": "Lahat ng mga binanggit sa post",
+ "privacy.private.long": "Mga tagasunod mo lamang",
+ "privacy.private.short": "Mga tagasunod",
+ "privacy.public.long": "Sinumang nasa loob at labas ng Mastodon",
+ "regeneration_indicator.label": "Kumakarga…",
+ "relative_time.days": "{number}a",
+ "relative_time.full.days": "{number, plural, one {# araw} other {# na araw}} ang nakalipas",
+ "relative_time.full.hours": "{number, plural, one {# oras} other {# na oras}} ang nakalipas",
+ "relative_time.full.just_now": "ngayon lang",
+ "relative_time.full.minutes": "{number, plural, one {# minuto} other {# na minuto}} ang nakalipas",
+ "relative_time.full.seconds": "{number, plural, one {# segundo} other {# na segundo}} ang nakalipas",
+ "relative_time.hours": "{number}o",
+ "relative_time.just_now": "ngayon",
+ "relative_time.minutes": "{number}m",
+ "relative_time.seconds": "{number}s",
+ "reply_indicator.cancel": "Ipagpaliban",
+ "report.block": "Harangan",
+ "report.categories.other": "Iba pa",
+ "report.category.title": "Sabihin mo sa amin kung anong nangyari sa {type} na ito",
+ "report.close": "Tapos na",
+ "report.next": "Sunod",
+ "report.reasons.violation": "Lumalabag ito sa mga panuntunan ng serbiro",
+ "report.reasons.violation_description": "Alam mo na lumalabag ito sa mga partikular na panuntunan",
+ "report.rules.title": "Aling mga patakaran ang nilabag?",
+ "report.submit": "Isumite",
+ "report.target": "Iniulat si/ang {target}",
+ "report.thanks.take_action_actionable": "Habang sinusuri namin ito, maaari kang gumawa ng aksyon laban kay/sa {name}:",
+ "report.thanks.title": "Ayaw mo bang makita ito?",
+ "report.thanks.title_actionable": "Salamat sa pag-uulat, titingnan namin ito.",
+ "report_notification.categories.other": "Iba pa",
+ "report_notification.categories.violation": "Paglabag sa patakaran",
+ "report_notification.open": "Buksan ang ulat",
+ "search.quick_action.open_url": "Buksan ang URL sa Mastodon",
+ "search.search_or_paste": "Maghanap o ilagay ang URL",
+ "search_popout.full_text_search_disabled_message": "Hindi magagamit sa {domain}.",
+ "search_popout.full_text_search_logged_out_message": "Magagamit lamang kapag naka-log in.",
+ "search_popout.recent": "Kamakailang mga paghahanap",
+ "search_results.all": "Lahat",
+ "search_results.see_all": "Ipakita lahat",
+ "server_banner.learn_more": "Matuto nang higit pa",
+ "server_banner.server_stats": "Katayuan ng serbiro:",
+ "status.block": "Harangan si @{name}",
+ "status.delete": "Tanggalin",
+ "status.direct": "Palihim na banggitin si/ang @{name}",
+ "status.direct_indicator": "Palihim na banggit",
+ "status.edit": "Baguhin",
+ "status.edited_x_times": "Binago {count, plural, one {{count} beses} other {{count} na beses}}",
+ "status.history.created": "Nilikha ni/ng {name} {date}",
+ "status.history.edited": "Binago ni/ng {name} {date}",
+ "status.media.open": "Pindutin upang buksan",
+ "status.media.show": "Pindutin upang ipakita",
+ "status.mention": "Banggitin ang/si @{name}",
+ "status.more": "Higit pa",
+ "status.read_more": "Basahin ang higit pa",
+ "status.reblogs.empty": "Wala pang nagpalakas ng post na ito. Kung may sinumang nagpalakas, makikita sila rito.",
+ "status.reply": "Tumugon",
+ "status.report": "I-ulat si/ang @{name}",
+ "status.sensitive_warning": "Sensitibong nilalaman",
+ "status.share": "Ibahagi",
+ "status.show_less": "Magpakita ng mas kaunti",
+ "status.show_less_all": "Magpakita ng mas kaunti para sa lahat",
+ "status.show_more": "Magpakita ng higit pa",
+ "status.show_more_all": "Magpakita ng higit pa para sa lahat",
+ "status.translate": "Isalin",
+ "status.translated_from_with": "Isalin mula sa {lang} gamit ang {provider}",
+ "status.uncached_media_warning": "Hindi makuha ang paunang tigin",
+ "tabs_bar.notifications": "Mga abiso",
+ "time_remaining.days": "{number, plural, one {# araw} other {# na araw}} ang natitira",
+ "time_remaining.hours": "{number, plural, one {# oras} other {# na oras}} ang natitira",
+ "time_remaining.minutes": "{number, plural, one {# minuto} other {# na minuto}} ang natitira",
+ "time_remaining.seconds": "{number, plural, one {# segundo} other {# na segundo}} ang natitira",
+ "timeline_hint.remote_resource_not_displayed": "Hindi ipinapakita ang {resource} mula sa ibang mga serbiro.",
+ "timeline_hint.resources.followers": "Mga tagasunod",
+ "timeline_hint.resources.follows": "Mga sinusundan"
}
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 94d13e8d910a1e..f22a829c0cf5d9 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -7,7 +7,7 @@
"about.domain_blocks.silenced.explanation": "Yvirhøvur, so sært tú ikki vangar og innihald frá hesum ambætaranum, uttan so at tú skilliga leitar hesi upp ella velur tey við at fylgja teimum.",
"about.domain_blocks.silenced.title": "Avmarkað",
"about.domain_blocks.suspended.explanation": "Ongar dátur frá hesum ambætara verða viðgjørd, goymd ella deild, tað ger, at samskifti við aðrar ambætarar er iki møguligt.",
- "about.domain_blocks.suspended.title": "Koyrdur frá",
+ "about.domain_blocks.suspended.title": "Gjørt óvirkið",
"about.not_available": "Hetta er ikki tøkt á føroyska servaranum enn.",
"about.powered_by": "Miðfirra almennur miðil koyrandi á {mastodon}",
"about.rules": "Ambætarareglur",
@@ -89,7 +89,14 @@
"announcement.announcement": "Kunngerð",
"attachments_list.unprocessed": "(óviðgjørt)",
"audio.hide": "Fjal ljóð",
- "autosuggest_hashtag.per_week": "{count} um vikuna",
+ "block_modal.remote_users_caveat": "Vit biðja ambætaran {domain} virða tína avgerð. Kortini er eingin vissa um samsvar, av tí at fleiri ambætarar handfara blokkar ymiskt. Almennir postar kunnu framvegis vera sjónligir fyri brúkarar, sum ikki eru innritaðir.",
+ "block_modal.show_less": "Vís minni",
+ "block_modal.show_more": "Vís meiri",
+ "block_modal.they_cant_mention": "Tey kunnu hvørki nevna teg ella fylgja tær.",
+ "block_modal.they_cant_see_posts": "Tey síggja ikki tínar postar og tú sært ikki teirra.",
+ "block_modal.they_will_know": "Tey síggja, at tey eru bannað.",
+ "block_modal.title": "Banna brúkara?",
+ "block_modal.you_wont_see_mentions": "Tú sært ikki postar, sum nevna tey.",
"boost_modal.combo": "Tú kanst trýsta á {combo} fyri at loypa uppum hetta næstu ferð",
"bundle_column_error.copy_stacktrace": "Avrita feilfráboðan",
"bundle_column_error.error.body": "Umbidna síðan kann ikki vísast. Tað kann vera orsakað av einum feili í koduni hjá okkum ella tað kann vera orsakað av kaganum, sum tú brúkar.",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "Kontoin hjá tær er ikki {locked}. Øll kunnu fylgja tær og lesa tað, tú bert letur fyljgarar lesa.",
"compose_form.lock_disclaimer.lock": "læst",
"compose_form.placeholder": "Hvat hevur tú í huga?",
- "compose_form.poll.add_option": "Legg valmøguleika afturat",
"compose_form.poll.duration": "Atkvøðugreiðslutíð",
+ "compose_form.poll.multiple": "Fleiri valmøguleikar",
"compose_form.poll.option_placeholder": "Valmøguleiki {number}",
- "compose_form.poll.remove_option": "Strika valmøguleikan",
+ "compose_form.poll.single": "Vel ein",
"compose_form.poll.switch_to_multiple": "Broyt atkvøðugreiðslu til at loyva fleiri svarum",
"compose_form.poll.switch_to_single": "Broyt atkvøðugreiðslu til einstakt svar",
- "compose_form.publish": "Legg út",
+ "compose_form.poll.type": "Stílur",
+ "compose_form.publish": "Posta",
"compose_form.publish_form": "Legg út",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Goym broytingar",
- "compose_form.sensitive.hide": "{count, plural, one {Frámerk tilfar sum viðkvæmt} other {Frámerk tilfar sum viðkvæmt}}",
- "compose_form.sensitive.marked": "{count, plural, one {Tilfarið er frámerkt sum viðkvæmt} other {Tilfarið er frámerkt sum viðkvæmt}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Tilfarið er ikki merkt sum viðkvæmt} other {Tilfarið er ikki merkt sum viðkvæmt}}",
+ "compose_form.reply": "Svara",
+ "compose_form.save_changes": "Dagfør",
"compose_form.spoiler.marked": "Ávaring um at strika innihald",
"compose_form.spoiler.unmarked": "Skriva ávaring um innihald",
- "compose_form.spoiler_placeholder": "Skriva tína ávaring her",
+ "compose_form.spoiler_placeholder": "Innihaldsávaring (valfrí)",
"confirmation_modal.cancel": "Strika",
- "confirmations.block.block_and_report": "Banna og melda",
"confirmations.block.confirm": "Banna",
- "confirmations.block.message": "Ert tú vís/ur í, at tú vilt banna {name}?",
"confirmations.cancel_follow_request.confirm": "Tak umbønina aftur",
"confirmations.cancel_follow_request.message": "Er tað tilætlað, at tú tekur umbønina at fylgja {name} aftur?",
"confirmations.delete.confirm": "Strika",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "Ert tú vís/ur í, at tú vilt strika hetta uppslagið?",
"confirmations.discard_edit_media.confirm": "Vraka",
"confirmations.discard_edit_media.message": "Tú hevur broytingar í miðlalýsingini ella undansýningini, sum ikki eru goymdar. Vilt tú kortini vraka?",
- "confirmations.domain_block.confirm": "Banna heilum økisnavni",
+ "confirmations.domain_block.confirm": "Banna ambætara",
"confirmations.domain_block.message": "Ert tú púra, púra vís/ur í, at tú vilt banna øllum {domain}? Í flestu førum er nóg mikið og betri, bert at banna ella doyva onkrum ávísum. Tú fert eingi evni at síggja frá økisnavninum á nakrari almennari tíðarrás ella í tínum fráboðanum. Tínir fylgjarar undir økisnavninum verða eisini strikaðir.",
"confirmations.edit.confirm": "Rætta",
"confirmations.edit.message": "Rættingar, sum verða gjørdar nú, skriva yvir boðini, sum tú ert í holt við. Ert tú vís/ur í, at tú vilt halda fram?",
"confirmations.logout.confirm": "Rita út",
"confirmations.logout.message": "Ert tú vís/ur í, at tú vilt útrita teg?",
"confirmations.mute.confirm": "Doyv",
- "confirmations.mute.explanation": "Henda atgerð fjalir teirra postar og postar, ið nevna tey; men tey kunnu framvegis síggja tínar postar og fylgja tær.",
- "confirmations.mute.message": "Ert tú vís/ur í, at tú vilt doyva {name}?",
"confirmations.redraft.confirm": "Sletta og skriva umaftur",
"confirmations.redraft.message": "Vilt tú veruliga strika hendan postin og í staðin gera hann til eina nýggja kladdu? Yndisfrámerki og framhevjanir blíva burtur, og svar til upprunapostin missa tilknýtið.",
"confirmations.reply.confirm": "Svara",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "Hesi uppsløg, frá hesum og øðrum ambætarum á miðspjadda netverkinum, hava framgongd á hesum ambætara júst nú. Nýggjari postar, sum fleiri hava framhevja og dáma, verða raðfestir hægri.",
"dismissable_banner.explore_tags": "Hesi frámerki vinna í løtuni fótafesti millum fólk á hesum og øðrum ambætarum í desentrala netverkinum beint nú.",
"dismissable_banner.public_timeline": "Hetta eru teir nýggjast postarnir frá fólki á sosialu vevinum, sum fólk á {domain} fylgja.",
+ "domain_block_modal.block": "Banna ambætara",
+ "domain_block_modal.block_account_instead": "Banna @{name} ístaðin",
+ "domain_block_modal.they_can_interact_with_old_posts": "Fólk frá hesum ambætara kunnu svara tínum gomlu postum.",
+ "domain_block_modal.they_cant_follow": "Eingin frá hesum ambætara kann fylgja tær.",
+ "domain_block_modal.they_wont_know": "Tey vita ikki, at tey eru bannað.",
+ "domain_block_modal.title": "Banna økisnavni?",
+ "domain_block_modal.you_will_lose_followers": "Allir tínir fylgjarar á hesum ambætara hvørva.",
+ "domain_block_modal.you_wont_see_posts": "Tú sært ongar postar ella boð frá brúkarum á hesum ambætara.",
+ "domain_pill.activitypub_lets_connect": "Tað letur teg fáa samband og samvirka við fólki ikki bara á Mastodon, men á øðrum sosialum appum eisini.",
+ "domain_pill.activitypub_like_language": "ActivityPub er málið, sum Mastodon tosar við onnur sosial netverk.",
+ "domain_pill.server": "Ambætari",
+ "domain_pill.their_handle": "Teirra hald:",
+ "domain_pill.their_server": "Teirra talgilda heim, har allir teirra postar liva.",
+ "domain_pill.their_username": "Teirra eyðmerki á teirra ambætara. Tað er møguligt at finna brúkarar við tí sama brúkaranavninum á ymiskum ambætarum.",
+ "domain_pill.username": "Brúkaranavn",
+ "domain_pill.whats_in_a_handle": "Hvat er í einum haldi?",
+ "domain_pill.who_they_are": "Eftirsum at hald siga, hvør onkur er og hvar tey eru, so kanst tú samvirka við fólk á øllum .",
+ "domain_pill.who_you_are": "Av tí at tíni hald siga, hvør tú er og hvar tú eru, so kunnu onnur samvirka við teg á øllum .",
+ "domain_pill.your_handle": "Títt hald:",
+ "domain_pill.your_server": "Títt talgilda heim, har allir tínir postar liva. Dámar tað ikki hendan? Flyt til ein annan ambætara tá tú hevur hug til tess og tak fylgjarar tínar við eisini.",
+ "domain_pill.your_username": "Títt eyðmerki á hesum ambætaranum. Tað er møguligt at finna brúkarar við tí sama brúkaranavninum á ymiskum ambætarum.",
"embed.instructions": "Fell hendan postin inní á tínum vevstaði við at taka avrit av koduni niðanfyri.",
"embed.preview": "Soleiðis fer tað at síggja út:",
"emoji_button.activity": "Virksemi",
@@ -244,6 +266,7 @@
"empty_column.list": "Einki er í hesum listanum enn. Tá limir í hesum listanum posta nýggjar postar, so síggjast teir her.",
"empty_column.lists": "Tú hevur ongar goymdar listar enn. Tá tú gert ein lista, so sært tú hann her.",
"empty_column.mutes": "Tú hevur enn ikki doyvt nakran brúkara.",
+ "empty_column.notification_requests": "Alt er klárt! Her er einki. Tá tú fært nýggjar fráboðanir, síggjast tær her sambært tínum stillingum.",
"empty_column.notifications": "Tú hevur ongar fráboðanir enn. Tá onnur samskifta við teg, so sær tú fráboðaninar her.",
"empty_column.public": "Einki er her! Skriva okkurt alment ella fylg brúkarum frá øðrum ambætarum fyri at fylla tilfar í",
"error.unexpected_crash.explanation": "Orsakað av einum feili í okkara kotu ella orsakað av at kagin hjá tær ikki er sambæriligur við skipanina, so bar ikki til at vísa hesa síðuna rætt.",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "Brúka ein verandi bólk ella skapa ein nýggjan",
"filter_modal.select_filter.title": "Filtrera hendan postin",
"filter_modal.title.status": "Filtrera ein post",
+ "filtered_notifications_banner.mentions": "{count, plural, one {umrøða} other {umrøður}}",
+ "filtered_notifications_banner.pending_requests": "Fráboðanir frá {count, plural, =0 {ongum} one {einum persóni} other {# persónum}}, sum tú kanska kennir",
+ "filtered_notifications_banner.title": "Sáldaðar fráboðanir",
"firehose.all": "Allar",
"firehose.local": "Hesin ambætarin",
"firehose.remote": "Aðrir ambætarar",
"follow_request.authorize": "Veit myndugleika",
"follow_request.reject": "Nokta",
"follow_requests.unlocked_explanation": "Sjálvt um konta tín ikki er læst, so hugsa {domain} starvsfólkini, at tú kanska hevur hug at kanna umbønir um at fylgja frá hesum kontum við hond.",
+ "follow_suggestions.curated_suggestion": "Val hjá ábyrgdarfólki",
+ "follow_suggestions.dismiss": "Lat vera við at vísa",
+ "follow_suggestions.featured_longer": "Vald burturúr av {domain} toyminum",
+ "follow_suggestions.friends_of_friends_longer": "Vælumtókt millum fólk, sum tú fylgir",
+ "follow_suggestions.hints.featured": "Hesin vangin er úrvaldur av toyminum handan {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "Hesin vangin er vælumtóktur millum tey, tú fylgir.",
+ "follow_suggestions.hints.most_followed": "Hesin vangin er ein av teimum, sum er mest fylgdur á {domain}.",
+ "follow_suggestions.hints.most_interactions": "Nýliga hava nógv lagt merki til hendan vangan á {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Hesin vangin líkist teimum, sum tú nýliga hevur fylgt.",
+ "follow_suggestions.personalized_suggestion": "Persónligt uppskot",
+ "follow_suggestions.popular_suggestion": "Vælumtókt uppskot",
+ "follow_suggestions.popular_suggestion_longer": "Vælumtókt á {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Líkist vangum, sum tú nýliga hevur fylgt",
+ "follow_suggestions.view_all": "Vís øll",
+ "follow_suggestions.who_to_follow": "Hvørji tú átti at fylgt",
"followed_tags": "Fylgd frámerki",
"footer.about": "Um",
"footer.directory": "Vangaskrá",
@@ -306,13 +347,8 @@
"hashtag.follow": "Fylg frámerki",
"hashtag.unfollow": "Gevst at fylgja frámerki",
"hashtags.and_other": "…og {count, plural, other {# afturat}}",
- "home.actions.go_to_explore": "Sí rákið",
- "home.actions.go_to_suggestions": "Finn fólk at fylgja",
- "home.column_settings.basic": "Grundleggjandi",
"home.column_settings.show_reblogs": "Vís lyft",
"home.column_settings.show_replies": "Vís svar",
- "home.explore_prompt.body": "Heimarásin fer at hava eitt bland av postum frá frámerkjunum, sum tú hevur valt at fylgja, brúkarunum, tú hevur valt at fylgja, og postunum, sum tey stimbra. Um tað kennist ov friðarligt, so kanst tú:",
- "home.explore_prompt.title": "Hetta er tín heimastøð í Mastodon.",
"home.hide_announcements": "Fjal kunngerðir",
"home.pending_critical_update.body": "Vinarliga dagfør Mastodon ambætaran hjá tær so skjótt sum møguligt!",
"home.pending_critical_update.link": "Sí dagføringar",
@@ -396,9 +432,15 @@
"loading_indicator.label": "Innlesur…",
"media_gallery.toggle_visible": "{number, plural, one {Fjal mynd} other {Fjal myndir}}",
"moved_to_account_banner.text": "Konta tín {disabledAccount} er í løtuni óvirkin, tí tú flutti til {movedToAccount}.",
- "mute_modal.duration": "Tíðarbil",
- "mute_modal.hide_notifications": "Fjal fráboðanir frá hesum brúkaranum?",
- "mute_modal.indefinite": "Óásett tíðarskeið",
+ "mute_modal.hide_from_notifications": "Fjal boð",
+ "mute_modal.hide_options": "Fjal valmøguleikar",
+ "mute_modal.indefinite": "Inntil eg tendri tey aftur",
+ "mute_modal.show_options": "Vís valmøguleikar",
+ "mute_modal.they_can_mention_and_follow": "Tey kunnu bæði nevna og fylgja tær, men tú sært ikki tey.",
+ "mute_modal.they_wont_know": "Tey vita ikki, at tey eru sløkt.",
+ "mute_modal.title": "Sløkk brúkara?",
+ "mute_modal.you_wont_see_mentions": "Tú sært ikki postar, sum nevna tey.",
+ "mute_modal.you_wont_see_posts": "Tey síggja framvegis tínar postar, men tú sært ikki teirra.",
"navigation_bar.about": "Um",
"navigation_bar.advanced_interface": "Lat upp í framkomnum vevmarkamóti",
"navigation_bar.blocks": "Bannaðir brúkarar",
@@ -408,7 +450,6 @@
"navigation_bar.direct": "Privatar umrøður",
"navigation_bar.discover": "Uppdaga",
"navigation_bar.domain_blocks": "Bannað økisnøvn",
- "navigation_bar.edit_profile": "Broyt vanga",
"navigation_bar.explore": "Rannsaka",
"navigation_bar.favourites": "Dámdir postar",
"navigation_bar.filters": "Doyvd orð",
@@ -432,11 +473,29 @@
"notification.follow": "{name} fylgdi tær",
"notification.follow_request": "{name} biður um at fylgja tær",
"notification.mention": "{name} nevndi teg",
+ "notification.moderation-warning.learn_more": "Lær meira",
+ "notification.moderation_warning": "Tú hevur móttikið eina umsjónarávaring",
+ "notification.moderation_warning.action_delete_statuses": "Onkrir av tínum postum eru strikaðir.",
+ "notification.moderation_warning.action_disable": "Konta tín er gjørd óvirkin.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Nakrir av postum tínum eru merktir sum viðkvæmir.",
+ "notification.moderation_warning.action_none": "Konta tín hevur móttikið eina umsjónarávaring.",
+ "notification.moderation_warning.action_sensitive": "Postar tínir verða merktir sum viðkvæmir frá nú av.",
+ "notification.moderation_warning.action_silence": "Konta tín er avmarkað.",
+ "notification.moderation_warning.action_suspend": "Konta tín er ógildað.",
"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.relationships_severance_event": "Mist sambond við {name}",
+ "notification.relationships_severance_event.account_suspension": "Ein umsitari frá {from} hevur gjørt {target} óvirkna, sum merkir, at tú ikki kanst móttaka dagføringar ella virka saman við teimum longur.",
+ "notification.relationships_severance_event.domain_block": "Ein umsitari frá {from} hevur blokerað {target}, íroknað {followersCount} av tínum fylgjarum og {followingCount, plural, one {# kontu} other {# kontur}}, sum tú fylgir.",
+ "notification.relationships_severance_event.learn_more": "Lær meira",
+ "notification.relationships_severance_event.user_domain_block": "Tú hevur blokerað {target}, strikað {followersCount} av tínum fylgjarum og {followingCount, plural, one {# kontu} other {# kontur}}, sum tú fylgir.",
"notification.status": "{name} hevur júst postað",
"notification.update": "{name} rættaði ein post",
+ "notification_requests.accept": "Góðtak",
+ "notification_requests.dismiss": "Avvís",
+ "notification_requests.notifications_from": "Fráboðanir frá {name}",
+ "notification_requests.title": "Sáldaðar fráboðanir",
"notifications.clear": "Rudda fráboðanir",
"notifications.clear_confirmation": "Ert tú vís/ur í, at tú vilt strika allar tínar fráboðanir?",
"notifications.column_settings.admin.report": "Nýggjar fráboðanir:",
@@ -445,7 +504,6 @@
"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.filter_bar.show_bar": "Vís filturbjálka",
"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:",
@@ -471,6 +529,15 @@
"notifications.permission_denied": "Skriviborðsfráboðanir eru ikki tøkar tí at ein kaga-umbøn áður bleiv noktað",
"notifications.permission_denied_alert": "Tað ber ikki til at sláa skriviborðsfráboðanir til, tí at kagarættindi áður eru noktaði",
"notifications.permission_required": "Skriviborðsfráboðanir eru ikki tøkar, tí at neyðugu rættindini eru ikki latin.",
+ "notifications.policy.filter_new_accounts.hint": "Stovnaðar {days, plural, one {seinasta dagin} other {seinastu # dagarnar}}",
+ "notifications.policy.filter_new_accounts_title": "Nýggjar kontur",
+ "notifications.policy.filter_not_followers_hint": "Íroknað fólk, sum hava fylgt tær styttri enn {days, plural, one {ein dag} other {# dagar}}",
+ "notifications.policy.filter_not_followers_title": "Fólk, sum ikki fylgja tær",
+ "notifications.policy.filter_not_following_hint": "Til tú góðkennir tey manuelt",
+ "notifications.policy.filter_not_following_title": "Fólk, sum tú ikki fylgir",
+ "notifications.policy.filter_private_mentions_hint": "Sáldaði, uttan so at tað er í svari til tínar egnu nevningar ella um tú fylgir sendaranum",
+ "notifications.policy.filter_private_mentions_title": "Óbidnar privatar umrøður",
+ "notifications.policy.title": "Sálda burtur fráboðanir frá…",
"notifications_permission_banner.enable": "Ger skriviborðsfráboðanir virknar",
"notifications_permission_banner.how_to_control": "Ger skriviborðsfráboðanir virknar fyri at móttaka fráboðanir, tá Mastodon ikki er opið. Tá tær eru gjørdar virknar, kanst tú stýra, hvørji sløg av samvirkni geva skriviborðsfráboðanir. Hetta umvegis {icon} knøttin omanfyri.",
"notifications_permission_banner.title": "Miss einki",
@@ -526,14 +593,15 @@
"poll_button.add_poll": "Legg atkvøðugreiðslu afturat",
"poll_button.remove_poll": "Strika atkvøðugreiðslu",
"privacy.change": "Broyt privatverju av posti",
- "privacy.direct.long": "Bert sjónligt hjá nevndum brúkarum",
- "privacy.direct.short": "Bert nevnd fólk",
- "privacy.private.long": "Bert sjónligt hjá fylgjarum",
- "privacy.private.short": "Einans fylgjarar",
- "privacy.public.long": "Sjónligt hjá øllum",
+ "privacy.direct.long": "Øll, sum eru nevnd í postinum",
+ "privacy.direct.short": "Ávís fólk",
+ "privacy.private.long": "Einans tey, ið fylgja tær",
+ "privacy.private.short": "Fylgjarar",
+ "privacy.public.long": "Øll í og uttanfyri Mastodon",
"privacy.public.short": "Alment",
- "privacy.unlisted.long": "Sjónligur fyri øll, men ikki gjøgnum uppdagingarhentleikarnar",
- "privacy.unlisted.short": "Ikki listað",
+ "privacy.unlisted.additional": "Hetta er júst sum almenn, tó verður posturin ikki vístur í samtíðarrásum ella frámerkjum, rannsakan ella Mastodon leitingum, sjálvt um valið er galdandi fyri alla kontuna.",
+ "privacy.unlisted.long": "Færri algoritmiskar fanfarur",
+ "privacy.unlisted.short": "Stillur almenningur",
"privacy_policy.last_updated": "Seinast dagført {date}",
"privacy_policy.title": "Privatlívspolitikkur",
"recommended": "Viðmælt",
@@ -551,7 +619,9 @@
"relative_time.minutes": "{number}m",
"relative_time.seconds": "{number}s",
"relative_time.today": "í dag",
+ "reply_indicator.attachments": "{count, plural, one {# viðfesti} other {# viðfesti}}",
"reply_indicator.cancel": "Ógilda",
+ "reply_indicator.poll": "Atkvøðugreiðsla",
"report.block": "Blokera",
"report.block_explanation": "Tú fer ikki at síggja postarnar hjá teimum. Tey kunnu ikki síggja tínar postar ella fylgja tær. Tey síggja, at tey eru blokeraði.",
"report.categories.legal": "Løgfrøðisligt",
@@ -644,10 +714,11 @@
"status.direct": "Umrøð @{name} privat",
"status.direct_indicator": "Privat umrøða",
"status.edit": "Rætta",
- "status.edited": "Rættað {date}",
+ "status.edited": "Seinast broytt {date}",
"status.edited_x_times": "Rættað {count, plural, one {{count} ferð} other {{count} ferð}}",
"status.embed": "Legg inní",
"status.favourite": "Dámdur postur",
+ "status.favourites": "{count, plural, one {yndispostur} other {yndispostar}}",
"status.filter": "Filtrera hendan postin",
"status.filtered": "Filtrerað",
"status.hide": "Fjal post",
@@ -668,6 +739,7 @@
"status.reblog": "Stimbra",
"status.reblog_private": "Stimbra við upprunasýni",
"status.reblogged_by": "{name} stimbrað",
+ "status.reblogs": "{count, plural, one {stimbran} other {stimbranir}}",
"status.reblogs.empty": "Eingin hevur stimbrað hendan postin enn. Tá onkur stimbrar postin, verður hann sjónligur her.",
"status.redraft": "Strika & ger nýggja kladdu",
"status.remove_bookmark": "Gloym",
@@ -715,10 +787,8 @@
"upload_error.poll": "Ikki loyvt at leggja fílur upp í spurnarkanningum.",
"upload_form.audio_description": "Lýs fyri teimum, sum eru deyv ella hava ringa hoyrn",
"upload_form.description": "Lýs fyri teimum, sum eru blind ella eru sjónveik",
- "upload_form.description_missing": "Lýsing vantar",
"upload_form.edit": "Rætta",
"upload_form.thumbnail": "Broyt smámynd",
- "upload_form.undo": "Strika",
"upload_form.video_description": "Lýs fyri teimum, sum eru deyv, hava ringa hoyrn, eru blind ella eru sjónveik",
"upload_modal.analyzing_picture": "Greini mynd…",
"upload_modal.apply": "Ger virkið",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index f2d99412d2cbee..9e29852904107c 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -89,7 +89,14 @@
"announcement.announcement": "Annonce",
"attachments_list.unprocessed": "(non traité)",
"audio.hide": "Masquer l'audio",
- "autosuggest_hashtag.per_week": "{count} par semaine",
+ "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.",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "Votre compte n’est pas {locked}. Tout le monde peut vous suivre et voir vos publications privés.",
"compose_form.lock_disclaimer.lock": "verrouillé",
"compose_form.placeholder": "À quoi pensez-vous?",
- "compose_form.poll.add_option": "Ajouter un choix",
"compose_form.poll.duration": "Durée du sondage",
- "compose_form.poll.option_placeholder": "Choix {number}",
- "compose_form.poll.remove_option": "Supprimer ce choix",
+ "compose_form.poll.multiple": "Choix multiple",
+ "compose_form.poll.option_placeholder": "Option {number}",
+ "compose_form.poll.single": "Choisissez-en un",
"compose_form.poll.switch_to_multiple": "Changer le sondage pour autoriser plusieurs choix",
"compose_form.poll.switch_to_single": "Changer le sondage pour n'autoriser qu'un seul choix",
+ "compose_form.poll.type": "Style",
"compose_form.publish": "Publier",
"compose_form.publish_form": "Publier",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Enregistrer les modifications",
- "compose_form.sensitive.hide": "{count, plural, one {Marquer média comme sensible} other {Marquer médias comme sensibles}}",
- "compose_form.sensitive.marked": "{count, plural, one {Le média est marqué comme sensible} other {Les médias sont marqués comme sensibles}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Le média n’est pas marqué comme sensible} other {Les médias ne sont pas marqués comme sensibles}}",
+ "compose_form.reply": "Répondre",
+ "compose_form.save_changes": "Mis à jour",
"compose_form.spoiler.marked": "Enlever l'avertissement de contenu",
"compose_form.spoiler.unmarked": "Ajouter un avertissement de contenu",
- "compose_form.spoiler_placeholder": "Écrivez votre avertissement ici",
+ "compose_form.spoiler_placeholder": "Avertissement de contenu (optionnel)",
"confirmation_modal.cancel": "Annuler",
- "confirmations.block.block_and_report": "Bloquer et signaler",
"confirmations.block.confirm": "Bloquer",
- "confirmations.block.message": "Voulez-vous vraiment bloquer {name}?",
"confirmations.cancel_follow_request.confirm": "Retirer cette demande",
"confirmations.cancel_follow_request.message": "Êtes-vous sûr de vouloir retirer votre demande pour suivre {name}?",
"confirmations.delete.confirm": "Supprimer",
@@ -174,15 +177,13 @@
"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 ce domaine entier",
+ "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 ?",
"confirmations.logout.confirm": "Se déconnecter",
"confirmations.logout.message": "Voulez-vous vraiment vous déconnecter?",
"confirmations.mute.confirm": "Masquer",
- "confirmations.mute.explanation": "Cela masquera ses publications et celle le/la mentionnant, mais cela lui permettra toujours de voir vos messages et de vous suivre.",
- "confirmations.mute.message": "Voulez-vous vraiment masquer {name}?",
"confirmations.redraft.confirm": "Supprimer et réécrire",
"confirmations.redraft.message": "Êtes-vous sûr·e de vouloir effacer cette publication pour la réécrire? Ses ses mises en favori et boosts seront perdus et ses réponses seront orphelines.",
"confirmations.reply.confirm": "Répondre",
@@ -208,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 utilisateur·rice·s 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 rencontrer des utilisateur·rice·s 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é",
@@ -244,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.",
@@ -274,12 +297,25 @@
"filter_modal.select_filter.subtitle": "Utilisez une catégorie existante ou en créer une nouvelle",
"filter_modal.select_filter.title": "Filtrer cette publication",
"filter_modal.title.status": "Filtrer une publication",
+ "filtered_notifications_banner.pending_requests": "Notifications {count, plural, =0 {de personne} one {d’une personne} other {de # personnes}} que vous pouvez connaitre",
+ "filtered_notifications_banner.title": "Notifications filtrées",
"firehose.all": "Tout",
"firehose.local": "Ce serveur",
"firehose.remote": "Autres serveurs",
"follow_request.authorize": "Autoriser",
"follow_request.reject": "Rejeter",
"follow_requests.unlocked_explanation": "Même si votre compte n’est pas privé, l’équipe de {domain} a pensé que vous pourriez vouloir peut-être consulter manuellement les demandes d'abonnement de ces comptes.",
+ "follow_suggestions.curated_suggestion": "Choix du staff",
+ "follow_suggestions.dismiss": "Ne plus afficher",
+ "follow_suggestions.hints.featured": "Ce profil a été sélectionné par l'équipe de {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "Ce profil est populaire parmi les personnes que vous suivez.",
+ "follow_suggestions.hints.most_followed": "Ce profil est l'un des plus suivis sur {domain}.",
+ "follow_suggestions.hints.most_interactions": "Ce profil a récemment fait l'objet d'une grande attention sur {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Ce profil est similaire aux profils que vous avez suivis le plus récemment.",
+ "follow_suggestions.personalized_suggestion": "Suggestion personnalisée",
+ "follow_suggestions.popular_suggestion": "Suggestion populaire",
+ "follow_suggestions.view_all": "Tout afficher",
+ "follow_suggestions.who_to_follow": "Qui suivre",
"followed_tags": "Hashtags suivis",
"footer.about": "À propos",
"footer.directory": "Annuaire des profils",
@@ -306,13 +342,8 @@
"hashtag.follow": "Suivre ce hashtag",
"hashtag.unfollow": "Ne plus suivre ce hashtag",
"hashtags.and_other": "…et {count, plural, other {# de plus}}",
- "home.actions.go_to_explore": "Voir les tendances",
- "home.actions.go_to_suggestions": "Trouver des personnes à suivre",
- "home.column_settings.basic": "Basique",
"home.column_settings.show_reblogs": "Afficher boosts",
"home.column_settings.show_replies": "Afficher réponses",
- "home.explore_prompt.body": "Votre fil d'actualité aura un mélange de messages depuis les hashtags que vous avez choisi de suivre, les personnes que vous avez choisi de suivre, et les messages qu'elles boostent. Si ça vous semble trop calme à votre goût, n’hésitez pas à :",
- "home.explore_prompt.title": "C'est votre page d'accueil dans Mastodon.",
"home.hide_announcements": "Masquer les annonces",
"home.pending_critical_update.body": "Veuillez mettre à jour votre serveur Mastodon dès que possible !",
"home.pending_critical_update.link": "Voir les mises à jour",
@@ -396,9 +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.duration": "Durée",
- "mute_modal.hide_notifications": "Masquer les notifications de ce compte?",
- "mute_modal.indefinite": "Indéfinie",
+ "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",
@@ -408,7 +445,6 @@
"navigation_bar.direct": "Mention privée",
"navigation_bar.discover": "Découvrir",
"navigation_bar.domain_blocks": "Domaines bloqués",
- "navigation_bar.edit_profile": "Modifier le profil",
"navigation_bar.explore": "Explorer",
"navigation_bar.favourites": "Favoris",
"navigation_bar.filters": "Mots masqués",
@@ -435,8 +471,17 @@
"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.relationships_severance_event": "Connexions perdues avec {name}",
+ "notification.relationships_severance_event.account_suspension": "Un·e administrateur·rice de {from} a suspendu {target}, ce qui signifie que vous ne pourrez plus recevoir de mises à jour ou interagir avec lui.",
+ "notification.relationships_severance_event.domain_block": "Un·e administrateur·rice de {from} en a bloqué {target}, comprenant {followersCount} de vos abonné·e·s et {followingCount, plural, one {# compte} other {# comptes}} vous suivez.",
+ "notification.relationships_severance_event.learn_more": "En savoir plus",
+ "notification.relationships_severance_event.user_domain_block": "Vous avez bloqué {target}, en supprimant {followersCount} de vos abonnés et {followingCount, plural, one {# compte} other {# comptes}} que vous suivez.",
"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:",
@@ -444,8 +489,7 @@
"notifications.column_settings.alert": "Notifications navigateur",
"notifications.column_settings.favourite": "Favoris:",
"notifications.column_settings.filter_bar.advanced": "Afficher toutes les catégories",
- "notifications.column_settings.filter_bar.category": "Barre de filtrage rapide",
- "notifications.column_settings.filter_bar.show_bar": "Afficher la barre de filtre",
+ "notifications.column_settings.filter_bar.category": "Barre de filtre rapide",
"notifications.column_settings.follow": "Nouveaux⋅elles abonné⋅e⋅s:",
"notifications.column_settings.follow_request": "Nouvelles demandes d’abonnement:",
"notifications.column_settings.mention": "Mentions:",
@@ -471,6 +515,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",
@@ -526,14 +579,15 @@
"poll_button.add_poll": "Ajouter un sondage",
"poll_button.remove_poll": "Supprimer le sondage",
"privacy.change": "Changer la confidentialité des messages",
- "privacy.direct.long": "Visible uniquement par les comptes mentionnés",
- "privacy.direct.short": "Personnes mentionnées uniquement",
- "privacy.private.long": "Visible uniquement pour vos abonné·e·s",
- "privacy.private.short": "Abonné·e·s seulement",
- "privacy.public.long": "Visible pour tous",
+ "privacy.direct.long": "Toutes les personnes mentionnées dans le post",
+ "privacy.direct.short": "Personnes spécifiques",
+ "privacy.private.long": "Seulement vos abonnés",
+ "privacy.private.short": "Abonnés",
+ "privacy.public.long": "Tout le monde sur et en dehors de Mastodon",
"privacy.public.short": "Public",
- "privacy.unlisted.long": "Visible pour tous, mais sans fonctionnalités de découverte",
- "privacy.unlisted.short": "Non listé",
+ "privacy.unlisted.additional": "Cette option se comporte exactement comme l'option publique, sauf que le message n'apparaîtra pas dans les flux en direct, les hashtags, l'exploration ou la recherche Mastodon, même si vous avez opté pour l'option publique pour l'ensemble de votre compte.",
+ "privacy.unlisted.long": "Moins de fanfares algorithmiques",
+ "privacy.unlisted.short": "Public calme",
"privacy_policy.last_updated": "Dernière mise à jour {date}",
"privacy_policy.title": "Politique de confidentialité",
"recommended": "Recommandé",
@@ -551,7 +605,9 @@
"relative_time.minutes": "{number} min",
"relative_time.seconds": "{number} s",
"relative_time.today": "aujourd’hui",
+ "reply_indicator.attachments": "{count, plural, one {# pièce jointe} other {# pièces jointes}}",
"reply_indicator.cancel": "Annuler",
+ "reply_indicator.poll": "Sondage",
"report.block": "Bloquer",
"report.block_explanation": "Vous ne verrez plus les publications de ce compte. Il ne pourra ni vous suivre ni voir vos publications. Il pourra savoir qu'il a été bloqué.",
"report.categories.legal": "Légal",
@@ -644,10 +700,11 @@
"status.direct": "Mention privée @{name}",
"status.direct_indicator": "Mention privée",
"status.edit": "Modifier",
- "status.edited": "Modifiée le {date}",
+ "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",
@@ -668,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",
@@ -715,10 +773,8 @@
"upload_error.poll": "L’envoi de fichiers n’est pas autorisé avec les sondages.",
"upload_form.audio_description": "Décrire pour les personnes ayant des difficultés d’audition",
"upload_form.description": "Décrire pour les malvoyants",
- "upload_form.description_missing": "Description manquante",
"upload_form.edit": "Modifier",
"upload_form.thumbnail": "Changer la vignette",
- "upload_form.undo": "Supprimer",
"upload_form.video_description": "Décrire pour les personnes ayant des problèmes de vue ou d'audition",
"upload_modal.analyzing_picture": "Analyse de l’image en cours…",
"upload_modal.apply": "Appliquer",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 774702f98cbb86..1a5803623f0037 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -89,7 +89,14 @@
"announcement.announcement": "Annonce",
"attachments_list.unprocessed": "(non traité)",
"audio.hide": "Masquer l'audio",
- "autosuggest_hashtag.per_week": "{count} par semaine",
+ "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.",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "Votre compte n’est pas {locked}. Tout le monde peut vous suivre pour voir vos messages réservés à vos abonné⋅e⋅s.",
"compose_form.lock_disclaimer.lock": "verrouillé",
"compose_form.placeholder": "Qu’avez-vous en tête ?",
- "compose_form.poll.add_option": "Ajouter un choix",
"compose_form.poll.duration": "Durée du sondage",
- "compose_form.poll.option_placeholder": "Choix {number}",
- "compose_form.poll.remove_option": "Supprimer ce choix",
+ "compose_form.poll.multiple": "Choix multiple",
+ "compose_form.poll.option_placeholder": "Option {number}",
+ "compose_form.poll.single": "Choisissez-en un",
"compose_form.poll.switch_to_multiple": "Changer le sondage pour autoriser plusieurs choix",
"compose_form.poll.switch_to_single": "Modifier le sondage pour autoriser qu'un seul choix",
+ "compose_form.poll.type": "Style",
"compose_form.publish": "Publier",
"compose_form.publish_form": "Nouvelle publication",
- "compose_form.publish_loud": "{publish} !",
- "compose_form.save_changes": "Enregistrer les modifications",
- "compose_form.sensitive.hide": "{count, plural, one {Marquer le média comme sensible} other {Marquer les médias comme sensibles}}",
- "compose_form.sensitive.marked": "{count, plural, one {Le média est marqué comme sensible} other {Les médias sont marqués comme sensibles}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Le média n’est pas marqué comme sensible} other {Les médias ne sont pas marqués comme sensibles}}",
+ "compose_form.reply": "Répondre",
+ "compose_form.save_changes": "Mis à jour",
"compose_form.spoiler.marked": "Enlever l’avertissement de contenu",
"compose_form.spoiler.unmarked": "Ajouter un avertissement de contenu",
- "compose_form.spoiler_placeholder": "Écrivez votre avertissement ici",
+ "compose_form.spoiler_placeholder": "Avertissement de contenu (optionnel)",
"confirmation_modal.cancel": "Annuler",
- "confirmations.block.block_and_report": "Bloquer et signaler",
"confirmations.block.confirm": "Bloquer",
- "confirmations.block.message": "Voulez-vous vraiment bloquer {name} ?",
"confirmations.cancel_follow_request.confirm": "Retirer la demande",
"confirmations.cancel_follow_request.message": "Êtes-vous sûr de vouloir retirer votre demande pour suivre {name} ?",
"confirmations.delete.confirm": "Supprimer",
@@ -174,15 +177,13 @@
"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 tout le domaine",
+ "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 ?",
"confirmations.logout.confirm": "Se déconnecter",
"confirmations.logout.message": "Voulez-vous vraiment vous déconnecter ?",
"confirmations.mute.confirm": "Masquer",
- "confirmations.mute.explanation": "Cela masquera ses messages et les messages le ou la mentionnant, mais cela lui permettra quand même de voir vos messages et de vous suivre.",
- "confirmations.mute.message": "Voulez-vous vraiment masquer {name} ?",
"confirmations.redraft.confirm": "Supprimer et ré-écrire",
"confirmations.redraft.message": "Êtes-vous sûr·e de vouloir effacer cette publication pour la réécrire ? Ses partages ainsi que ses mises en favori seront perdus et ses réponses seront orphelines.",
"confirmations.reply.confirm": "Répondre",
@@ -208,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 utilisateur·rice·s 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 rencontrer des utilisateur·rice·s 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",
@@ -244,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.",
@@ -274,12 +297,25 @@
"filter_modal.select_filter.subtitle": "Utilisez une catégorie existante ou en créer une nouvelle",
"filter_modal.select_filter.title": "Filtrer ce message",
"filter_modal.title.status": "Filtrer un message",
+ "filtered_notifications_banner.pending_requests": "Notifications {count, plural, =0 {de personne} one {d’une personne} other {de # personnes}} que vous pouvez connaitre",
+ "filtered_notifications_banner.title": "Notifications filtrées",
"firehose.all": "Tout",
"firehose.local": "Ce serveur",
"firehose.remote": "Autres serveurs",
"follow_request.authorize": "Accepter",
"follow_request.reject": "Rejeter",
"follow_requests.unlocked_explanation": "Même si votre compte n’est pas privé, l’équipe de {domain} a pensé que vous pourriez vouloir consulter manuellement les demandes de suivi de ces comptes.",
+ "follow_suggestions.curated_suggestion": "Choix du staff",
+ "follow_suggestions.dismiss": "Ne plus afficher",
+ "follow_suggestions.hints.featured": "Ce profil a été sélectionné par l'équipe de {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "Ce profil est populaire parmi les personnes que vous suivez.",
+ "follow_suggestions.hints.most_followed": "Ce profil est l'un des plus suivis sur {domain}.",
+ "follow_suggestions.hints.most_interactions": "Ce profil a récemment fait l'objet d'une grande attention sur {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Ce profil est similaire aux profils que vous avez suivis le plus récemment.",
+ "follow_suggestions.personalized_suggestion": "Suggestion personnalisée",
+ "follow_suggestions.popular_suggestion": "Suggestion populaire",
+ "follow_suggestions.view_all": "Tout afficher",
+ "follow_suggestions.who_to_follow": "Qui suivre",
"followed_tags": "Hashtags suivis",
"footer.about": "À propos",
"footer.directory": "Annuaire des profils",
@@ -306,13 +342,8 @@
"hashtag.follow": "Suivre le hashtag",
"hashtag.unfollow": "Ne plus suivre le hashtag",
"hashtags.and_other": "…et {count, plural, other {# de plus}}",
- "home.actions.go_to_explore": "Voir les tendances",
- "home.actions.go_to_suggestions": "Trouver des personnes à suivre",
- "home.column_settings.basic": "Basique",
"home.column_settings.show_reblogs": "Afficher les partages",
"home.column_settings.show_replies": "Afficher les réponses",
- "home.explore_prompt.body": "Votre fil d'actualité aura un mélange de messages depuis les hashtags que vous avez choisi de suivre, les personnes que vous avez choisi de suivre, et les messages qu'elles boostent. Si ça vous semble trop calme à votre goût, n’hésitez pas à :",
- "home.explore_prompt.title": "C'est votre page d'accueil dans Mastodon.",
"home.hide_announcements": "Masquer les annonces",
"home.pending_critical_update.body": "Veuillez mettre à jour votre serveur Mastodon dès que possible !",
"home.pending_critical_update.link": "Voir les mises à jour",
@@ -396,9 +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.duration": "Durée",
- "mute_modal.hide_notifications": "Masquer les notifications de cette personne ?",
- "mute_modal.indefinite": "Indéfinie",
+ "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",
@@ -408,7 +445,6 @@
"navigation_bar.direct": "Mention privée",
"navigation_bar.discover": "Découvrir",
"navigation_bar.domain_blocks": "Domaines bloqués",
- "navigation_bar.edit_profile": "Modifier le profil",
"navigation_bar.explore": "Explorer",
"navigation_bar.favourites": "Favoris",
"navigation_bar.filters": "Mots masqués",
@@ -435,8 +471,17 @@
"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.relationships_severance_event": "Connexions perdues avec {name}",
+ "notification.relationships_severance_event.account_suspension": "Un·e administrateur·rice de {from} a suspendu {target}, ce qui signifie que vous ne pourrez plus recevoir de mises à jour ou interagir avec lui.",
+ "notification.relationships_severance_event.domain_block": "Un·e administrateur·rice de {from} en a bloqué {target}, comprenant {followersCount} de vos abonné·e·s et {followingCount, plural, one {# compte} other {# comptes}} vous suivez.",
+ "notification.relationships_severance_event.learn_more": "En savoir plus",
+ "notification.relationships_severance_event.user_domain_block": "Vous avez bloqué {target}, en supprimant {followersCount} de vos abonnés et {followingCount, plural, one {# compte} other {# comptes}} que vous suivez.",
"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 :",
@@ -444,8 +489,7 @@
"notifications.column_settings.alert": "Notifications du navigateur",
"notifications.column_settings.favourite": "Favoris :",
"notifications.column_settings.filter_bar.advanced": "Afficher toutes les catégories",
- "notifications.column_settings.filter_bar.category": "Barre de filtrage rapide",
- "notifications.column_settings.filter_bar.show_bar": "Afficher la barre de filtre",
+ "notifications.column_settings.filter_bar.category": "Barre de filtre rapide",
"notifications.column_settings.follow": "Nouveaux·elles abonné·e·s :",
"notifications.column_settings.follow_request": "Nouvelles demandes d’abonnement :",
"notifications.column_settings.mention": "Mentions :",
@@ -471,6 +515,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",
@@ -480,7 +533,7 @@
"onboarding.actions.go_to_home": "Allers vers mon flux principal",
"onboarding.compose.template": "Bonjour #Mastodon !",
"onboarding.follows.empty": "Malheureusement, aucun résultat ne peut être affiché pour le moment. Vous pouvez essayer d'utiliser la recherche ou parcourir la page de découverte pour trouver des personnes à suivre, ou réessayez plus tard.",
- "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
+ "onboarding.follows.lead": "Votre flux principal est le principal moyen de découvrir Mastodon. Plus vous suivez de personnes, plus il sera actif et intéressant. Pour commencer, voici quelques suggestions :",
"onboarding.follows.title": "Personnaliser votre flux principal",
"onboarding.profile.discoverable": "Rendre mon profil découvrable",
"onboarding.profile.discoverable_hint": "Lorsque vous acceptez d'être découvert sur Mastodon, vos messages peuvent apparaître dans les résultats de recherche et les tendances, et votre profil peut être suggéré à des personnes ayant des intérêts similaires aux vôtres.",
@@ -497,10 +550,10 @@
"onboarding.share.message": "Je suis {username} sur #Mastodon ! Suivez-moi sur {url}",
"onboarding.share.next_steps": "Étapes suivantes possibles :",
"onboarding.share.title": "Partager votre profil",
- "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
+ "onboarding.start.lead": "Vous faites désormais partie de Mastodon, une plateforme de médias sociaux unique et décentralisée où c'est vous, et non un algorithme, qui créez votre propre expérience. Nous allons vous aider à vous lancer dans cette nouvelle frontière sociale :",
"onboarding.start.skip": "Vous n’avez donc pas besoin d’aide pour commencer ?",
"onboarding.start.title": "Vous avez réussi !",
- "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
+ "onboarding.steps.follow_people.body": "Suivre des personnes intéressantes, c'est la raison d'être de Mastodon.",
"onboarding.steps.follow_people.title": "Personnaliser votre flux principal",
"onboarding.steps.publish_status.body": "Dites bonjour au monde avec du texte, des photos, des vidéos ou des sondages {emoji}",
"onboarding.steps.publish_status.title": "Rédigez votre premier message",
@@ -526,14 +579,15 @@
"poll_button.add_poll": "Ajouter un sondage",
"poll_button.remove_poll": "Supprimer le sondage",
"privacy.change": "Ajuster la confidentialité du message",
- "privacy.direct.long": "Visible uniquement par les comptes mentionnés",
- "privacy.direct.short": "Personnes mentionnées uniquement",
- "privacy.private.long": "Visible uniquement par vos abonnés",
- "privacy.private.short": "Abonnés uniquement",
- "privacy.public.long": "Visible pour tous",
+ "privacy.direct.long": "Toutes les personnes mentionnées dans le post",
+ "privacy.direct.short": "Personnes spécifiques",
+ "privacy.private.long": "Seulement vos abonnés",
+ "privacy.private.short": "Abonnés",
+ "privacy.public.long": "Tout le monde sur et en dehors de Mastodon",
"privacy.public.short": "Public",
- "privacy.unlisted.long": "Visible pour tous, mais sans fonctionnalités de découverte",
- "privacy.unlisted.short": "Non listé",
+ "privacy.unlisted.additional": "Cette option se comporte exactement comme l'option publique, sauf que le message n'apparaîtra pas dans les flux en direct, les hashtags, l'exploration ou la recherche Mastodon, même si vous avez opté pour l'option publique pour l'ensemble de votre compte.",
+ "privacy.unlisted.long": "Moins de fanfares algorithmiques",
+ "privacy.unlisted.short": "Public calme",
"privacy_policy.last_updated": "Dernière mise à jour {date}",
"privacy_policy.title": "Politique de confidentialité",
"recommended": "Recommandé",
@@ -551,7 +605,9 @@
"relative_time.minutes": "{number} min",
"relative_time.seconds": "{number} s",
"relative_time.today": "aujourd’hui",
+ "reply_indicator.attachments": "{count, plural, one {# pièce jointe} other {# pièces jointes}}",
"reply_indicator.cancel": "Annuler",
+ "reply_indicator.poll": "Sondage",
"report.block": "Bloquer",
"report.block_explanation": "Vous ne verrez plus les messages de ce profil, et il ne pourra ni vous suivre ni voir vos messages. Il pourra savoir qu'il a été bloqué.",
"report.categories.legal": "Légal",
@@ -644,10 +700,11 @@
"status.direct": "Mention privée @{name}",
"status.direct_indicator": "Mention privée",
"status.edit": "Modifier",
- "status.edited": "Modifié le {date}",
+ "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",
@@ -668,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",
@@ -715,10 +773,8 @@
"upload_error.poll": "L’envoi de fichiers n’est pas autorisé avec les sondages.",
"upload_form.audio_description": "Décrire pour les personnes ayant des difficultés d’audition",
"upload_form.description": "Décrire pour les malvoyant·e·s",
- "upload_form.description_missing": "Description manquante",
"upload_form.edit": "Modifier",
"upload_form.thumbnail": "Changer la vignette",
- "upload_form.undo": "Supprimer",
"upload_form.video_description": "Décrire pour les personnes ayant des problèmes de vue ou d'audition",
"upload_modal.analyzing_picture": "Analyse de l’image en cours…",
"upload_modal.apply": "Appliquer",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index ea42ef91c0962b..a22f4767a65ae8 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -13,7 +13,7 @@
"about.rules": "Serverrigels",
"account.account_note_header": "Opmerking",
"account.add_or_remove_from_list": "Tafoegje oan of fuortsmite út listen",
- "account.badges.bot": "Bot",
+ "account.badges.bot": "Automatisearre",
"account.badges.group": "Groep",
"account.block": "@{name} blokkearje",
"account.block_domain": "Domein {domain} blokkearje",
@@ -89,7 +89,11 @@
"announcement.announcement": "Oankundiging",
"attachments_list.unprocessed": "(net ferwurke)",
"audio.hide": "Audio ferstopje",
- "autosuggest_hashtag.per_week": "{count} yn ’e wike",
+ "block_modal.show_less": "Minder toane",
+ "block_modal.show_more": "Mear toane",
+ "block_modal.they_cant_mention": "Sy kinne jo net fermelde of folgje.",
+ "block_modal.title": "Brûker blokkearje?",
+ "block_modal.you_wont_see_mentions": "Jo sjogge gjin berjochten mear dy’t dizze account fermelde.",
"boost_modal.combo": "Jo kinne op {combo} drukke om dit de folgjende kear oer te slaan",
"bundle_column_error.copy_stacktrace": "Flaterrapport kopiearje",
"bundle_column_error.error.body": "De opfrege side koe net werjûn wurde. It kin wêze troch in flater yn ús koade, of in probleem mei browserkompatibiliteit.",
@@ -146,26 +150,22 @@
"compose_form.lock_disclaimer": "Jo account is net {locked}. Elkenien kin jo folgje en kin de berjochten sjen dy’t jo allinnich oan jo folgers rjochte hawwe.",
"compose_form.lock_disclaimer.lock": "beskoattele",
"compose_form.placeholder": "Wat wolle jo kwyt?",
- "compose_form.poll.add_option": "Kar tafoegje",
"compose_form.poll.duration": "Doer fan de enkête",
- "compose_form.poll.option_placeholder": "Kar {number}",
- "compose_form.poll.remove_option": "Dizze kar fuortsmite",
+ "compose_form.poll.multiple": "Mearkar",
+ "compose_form.poll.option_placeholder": "Opsje {number}",
+ "compose_form.poll.single": "Kies ien",
"compose_form.poll.switch_to_multiple": "Enkête wizigje om meardere karren ta te stean",
"compose_form.poll.switch_to_single": "Enkête wizigje om in inkelde kar ta te stean",
- "compose_form.publish": "Publisearje",
+ "compose_form.poll.type": "Styl",
+ "compose_form.publish": "Toot",
"compose_form.publish_form": "Publisearje",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Wizigingen bewarje",
- "compose_form.sensitive.hide": "{count, plural, one {Media as gefoelich markearje} other {Media as gefoelich markearje}}",
- "compose_form.sensitive.marked": "{count, plural, one {Media as gefoelich markearre} other {Media as gefoelich markearre}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Media is net as gefoelich markearre} other {Media is net as gefoelich markearre}}",
+ "compose_form.reply": "Reagearje",
+ "compose_form.save_changes": "Bywurkje",
"compose_form.spoiler.marked": "Ynhâldswarskôging fuortsmite",
"compose_form.spoiler.unmarked": "Ynhâldswarskôging tafoegje",
- "compose_form.spoiler_placeholder": "Warskôgingstekst",
+ "compose_form.spoiler_placeholder": "Ynhâldswarskôging (opsjoneel)",
"confirmation_modal.cancel": "Annulearje",
- "confirmations.block.block_and_report": "Blokkearje en rapportearje",
"confirmations.block.confirm": "Blokkearje",
- "confirmations.block.message": "Binne jo wis dat jo {name} blokkearje wolle?",
"confirmations.cancel_follow_request.confirm": "Fersyk annulearje",
"confirmations.cancel_follow_request.message": "Binne jo wis dat jo jo fersyk om {name} te folgjen annulearje wolle?",
"confirmations.delete.confirm": "Fuortsmite",
@@ -174,15 +174,13 @@
"confirmations.delete_list.message": "Binne jo wis dat jo dizze list foar permanint fuortsmite wolle?",
"confirmations.discard_edit_media.confirm": "Fuortsmite",
"confirmations.discard_edit_media.message": "Jo hawwe net-bewarre wizigingen yn de mediabeskriuwing of foarfertoaning, wolle jo dizze dochs fuortsmite?",
- "confirmations.domain_block.confirm": "Alles fan dit domein blokkearje",
+ "confirmations.domain_block.confirm": "Server blokkearje",
"confirmations.domain_block.message": "Binne jo echt wis dat jo alles fan {domain} negearje wolle? Yn de measte gefallen is it blokkearjen of negearjen fan in pear spesifike persoanen genôch en better. Jo sille gjin berjochten fan dizze server op iepenbiere tiidlinen sjen of yn jo meldingen. Jo folgers fan dizze server wurde fuortsmiten.",
"confirmations.edit.confirm": "Bewurkje",
"confirmations.edit.message": "Troch no te bewurkjen sil it berjocht dat jo no oan it skriuwen binne oerskreaun wurde. Wolle jo trochgean?",
"confirmations.logout.confirm": "Ofmelde",
"confirmations.logout.message": "Binne jo wis dat jo ôfmelde wolle?",
"confirmations.mute.confirm": "Negearje",
- "confirmations.mute.explanation": "Dit sil berjochten fan harren en berjochten dêr’t se yn fermeld wurde ûnsichtber meitsje, mar se sille jo berjochten noch hieltyd sjen kinne en jo folgje kinne.",
- "confirmations.mute.message": "Binne jo wis dat jo {name} negearje wolle?",
"confirmations.redraft.confirm": "Fuortsmite en opnij opstelle",
"confirmations.redraft.message": "Binne jo wis dat jo dit berjocht fuortsmite en opnij opstelle wolle? Favoriten en boosts geane dan ferlern en reaksjes op it oarspronklike berjocht reitsje jo kwyt.",
"confirmations.reply.confirm": "Reagearje",
@@ -208,6 +206,20 @@
"dismissable_banner.explore_statuses": "Dizze berjochten winne oan populariteit op dizze en oare servers binnen it desintrale netwurk. Nijere berjochten mei mear boosts en favoriten stean heger.",
"dismissable_banner.explore_tags": "Dizze hashtags winne oan populariteit op dizze en oare servers binnen it desintrale netwurk.",
"dismissable_banner.public_timeline": "Dit binne de meast resinte iepenbiere berjochten fan accounts op it sosjale web dy’t troch minsken op {domain} folge wurde.",
+ "domain_block_modal.block": "Server blokkearje",
+ "domain_block_modal.block_account_instead": "Yn stee hjirfan {name} blokkearje",
+ "domain_block_modal.they_can_interact_with_old_posts": "Minsken op dizze server kinne ynteraksje hawwe mei jo âlde berjochten.",
+ "domain_block_modal.they_cant_follow": "Net ien op dizze server kin jo folgje.",
+ "domain_block_modal.they_wont_know": "Se krije net te witten dat se blokkearre wurde.",
+ "domain_block_modal.title": "Domein blokkearje?",
+ "domain_block_modal.you_will_lose_followers": "Al jo folgers fan dizze server wurde ûntfolge.",
+ "domain_block_modal.you_wont_see_posts": "Jo sjogge gjin berjochten of meldingen mear fan brûkers op dizze server.",
+ "domain_pill.server": "Server",
+ "domain_pill.their_handle": "Harren fediverse-adres:",
+ "domain_pill.their_server": "Harren digitale thús, wer’t al harren berjochten binne.",
+ "domain_pill.username": "Brûkersnamme",
+ "domain_pill.whats_in_a_handle": "Wat is in fediverse-adres?",
+ "domain_pill.your_handle": "Jo fediverse-adres:",
"embed.instructions": "Embed this status on your website by copying the code below.",
"embed.preview": "Sa komt it der út te sjen:",
"emoji_button.activity": "Aktiviteiten",
@@ -274,12 +286,24 @@
"filter_modal.select_filter.subtitle": "In besteande kategory brûke of in nije oanmeitsje",
"filter_modal.select_filter.title": "Dit berjocht filterje",
"filter_modal.title.status": "In berjocht filterje",
+ "filtered_notifications_banner.title": "Filtere meldingen",
"firehose.all": "Alles",
"firehose.local": "Dizze server",
"firehose.remote": "Oare servers",
"follow_request.authorize": "Goedkarre",
"follow_request.reject": "Wegerje",
"follow_requests.unlocked_explanation": "Ek al is jo account net besletten, de meiwurkers fan {domain} tinke dat jo miskien de folgjende folchfersiken hânmjittich kontrolearje.",
+ "follow_suggestions.curated_suggestion": "Spesjaal selektearre",
+ "follow_suggestions.dismiss": "Net mear werjaan",
+ "follow_suggestions.hints.featured": "Dit profyl is hânmjittich troch it {domain}-team selektearre.",
+ "follow_suggestions.hints.friends_of_friends": "Dit profyl is populêr ûnder de minsken dy’t jo folgje.",
+ "follow_suggestions.hints.most_followed": "Dit profyl is ien fan de meast folge op {domain}.",
+ "follow_suggestions.hints.most_interactions": "Dit profyl hat de lêste tiid in protte oandacht krigen op {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Dit profyl is hast lyk oan de profilen dy’t jo koartlyn folge hawwe.",
+ "follow_suggestions.personalized_suggestion": "Personalisearre suggestje",
+ "follow_suggestions.popular_suggestion": "Populêre suggestje",
+ "follow_suggestions.view_all": "Alles werjaan",
+ "follow_suggestions.who_to_follow": "Wa te folgjen",
"followed_tags": "Folge hashtags",
"footer.about": "Oer",
"footer.directory": "Profylmap",
@@ -306,13 +330,8 @@
"hashtag.follow": "Hashtag folgje",
"hashtag.unfollow": "Hashtag ûntfolgje",
"hashtags.and_other": "…en {count, plural, one {}other {# mear}}",
- "home.actions.go_to_explore": "De aktuele trends besjen",
- "home.actions.go_to_suggestions": "Sykje minsken om te folgjen",
- "home.column_settings.basic": "Algemien",
"home.column_settings.show_reblogs": "Boosts toane",
"home.column_settings.show_replies": "Reaksjes toane",
- "home.explore_prompt.body": "Jo starttiidline befettet in miks fan berjochten mei hashtags dy’t jo keazen hawwe om te folgjen, fan minsken dy’t jo keazen hawwe om te folgjen en berjochten dy’t se booste. As jo dit te rêstich fine, kinne jo:",
- "home.explore_prompt.title": "Dit is jo thúsbasis op Mastodon.",
"home.hide_announcements": "Meidielingen ferstopje",
"home.pending_critical_update.body": "Fernij sa gau as mooglik jo Mastodon-server!",
"home.pending_critical_update.link": "Fernijingen besjen",
@@ -396,9 +415,9 @@
"loading_indicator.label": "Lade…",
"media_gallery.toggle_visible": "{number, plural, one {ôfbylding ferstopje} other {ôfbyldingen ferstopje}}",
"moved_to_account_banner.text": "Omdat jo nei {movedToAccount} ferhuze binne is jo account {disabledAccount} op dit stuit útskeakele.",
- "mute_modal.duration": "Doer",
- "mute_modal.hide_notifications": "Meldingen fan dizze brûker ferstopje?",
- "mute_modal.indefinite": "Foar ûnbepaalde tiid",
+ "mute_modal.hide_options": "Opsjes ferstopje",
+ "mute_modal.indefinite": "Oant ik se net mear negearje",
+ "mute_modal.show_options": "Opsjes toane",
"navigation_bar.about": "Oer",
"navigation_bar.advanced_interface": "Yn avansearre webomjouwing iepenje",
"navigation_bar.blocks": "Blokkearre brûkers",
@@ -408,7 +427,6 @@
"navigation_bar.direct": "Priveefermeldingen",
"navigation_bar.discover": "Untdekke",
"navigation_bar.domain_blocks": "Blokkearre domeinen",
- "navigation_bar.edit_profile": "Profyl bewurkje",
"navigation_bar.explore": "Ferkenne",
"navigation_bar.favourites": "Favoriten",
"navigation_bar.filters": "Negearre wurden",
@@ -435,8 +453,13 @@
"notification.own_poll": "Jo poll is beëinige",
"notification.poll": "In enkête dêr’t jo yn stimd hawwe is beëinige",
"notification.reblog": "{name} hat jo berjocht boost",
+ "notification.relationships_severance_event.learn_more": "Mear ynfo",
"notification.status": "{name} hat in berjocht pleatst",
"notification.update": "{name} hat in berjocht bewurke",
+ "notification_requests.accept": "Akseptearje",
+ "notification_requests.dismiss": "Ofwize",
+ "notification_requests.notifications_from": "Meldingen fan {name}",
+ "notification_requests.title": "Filtere meldingen",
"notifications.clear": "Meldingen wiskje",
"notifications.clear_confirmation": "Binne jo wis dat jo al jo meldingen permanint fuortsmite wolle?",
"notifications.column_settings.admin.report": "Nije rapportaazjes:",
@@ -444,8 +467,6 @@
"notifications.column_settings.alert": "Desktopmeldingen",
"notifications.column_settings.favourite": "Favoriten:",
"notifications.column_settings.filter_bar.advanced": "Alle kategoryen toane",
- "notifications.column_settings.filter_bar.category": "Flugge filterbalke",
- "notifications.column_settings.filter_bar.show_bar": "Filterbalke toane",
"notifications.column_settings.follow": "Nije folgers:",
"notifications.column_settings.follow_request": "Nij folchfersyk:",
"notifications.column_settings.mention": "Fermeldingen:",
@@ -526,13 +547,14 @@
"poll_button.add_poll": "Poll tafoegje",
"poll_button.remove_poll": "Enkête fuortsmite",
"privacy.change": "Sichtberheid fan berjocht oanpasse",
- "privacy.direct.long": "Allinnich sichtber foar fermelde brûkers",
- "privacy.direct.short": "Allinnich fermelde minsken",
- "privacy.private.long": "Allinnich sichtber foar folgers",
- "privacy.private.short": "Allinnich folgers",
- "privacy.public.long": "Sichtber foar elkenien",
+ "privacy.direct.long": "Elkenien dy’ yn it berjocht fermeld wurdt",
+ "privacy.direct.short": "Bepaalde minsken",
+ "privacy.private.long": "Allinnich jo folgers",
+ "privacy.private.short": "Folgers",
+ "privacy.public.long": "Elkenien op Mastodon en dêrbûten",
"privacy.public.short": "Iepenbier",
- "privacy.unlisted.long": "Foar elkenien sichtber, mar net ûnder trends, hashtags en op iepenbiere tiidlinen",
+ "privacy.unlisted.additional": "Dit is fergelykber mei iepenbier, útsein dat it berjocht net ferskynt op iepenbiere tiidlijnen of hashtags, ûnder ferkenne of Mastodon sykje, sels as jo jo account dêrfoar ynsteld hawwe.",
+ "privacy.unlisted.long": "Minder algoritmyske fanfare",
"privacy.unlisted.short": "Minder iepenbier",
"privacy_policy.last_updated": "Lêst bywurke op {date}",
"privacy_policy.title": "Privacybelied",
@@ -551,7 +573,9 @@
"relative_time.minutes": "{number}m",
"relative_time.seconds": "{number}s",
"relative_time.today": "hjoed",
+ "reply_indicator.attachments": "{count, plural, one {# bylage} other {# bylagen}}",
"reply_indicator.cancel": "Annulearje",
+ "reply_indicator.poll": "Peiling",
"report.block": "Blokkearje",
"report.block_explanation": "Jo sille harren berjochten net sjen kinne. Se sille jo berjochten net sjen kinne en jo net folgje kinne. Se sille wol sjen kinne dat se blokkearre binne.",
"report.categories.legal": "Juridysk",
@@ -644,7 +668,6 @@
"status.direct": "Privee fermelde @{name}",
"status.direct_indicator": "Priveefermelding",
"status.edit": "Bewurkje",
- "status.edited": "Bewurke op {date}",
"status.edited_x_times": "{count, plural, one {{count} kear} other {{count} kearen}} bewurke",
"status.embed": "Ynslute",
"status.favourite": "Favoryt",
@@ -715,10 +738,8 @@
"upload_error.poll": "It opladen fan bestannen is yn enkêten net tastien.",
"upload_form.audio_description": "Describe for people with hearing loss",
"upload_form.description": "Describe for the visually impaired",
- "upload_form.description_missing": "Gjin omskriuwing tafoege",
"upload_form.edit": "Bewurkje",
"upload_form.thumbnail": "Miniatuerôfbylding wizigje",
- "upload_form.undo": "Fuortsmite",
"upload_form.video_description": "Describe for people with hearing loss or visual impairment",
"upload_modal.analyzing_picture": "Ofbylding analysearje…",
"upload_modal.apply": "Tapasse",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index f0f9c55549664a..c71effe06df49d 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -76,7 +76,6 @@
"announcement.announcement": "Fógra",
"attachments_list.unprocessed": "(neamhphróiseáilte)",
"audio.hide": "Cuir fuaim i bhfolach",
- "autosuggest_hashtag.per_week": "{count} sa seachtain",
"boost_modal.combo": "Is féidir leat {combo} a bhrú chun é seo a scipeáil an chéad uair eile",
"bundle_column_error.copy_stacktrace": "Cóipeáil tuairisc earráide",
"bundle_column_error.error.body": "Ní féidir an leathanach a iarradh a sholáthar. Seans gurb amhlaidh mar gheall ar fhabht sa chód, nó mar gheall ar mhíréireacht leis an mbrabhsálaí.",
@@ -127,23 +126,14 @@
"compose_form.lock_disclaimer": "Níl an cuntas seo {locked}. Féadfaidh duine ar bith tú a leanúint agus na postálacha atá dírithe agat ar do lucht leanúna amháin a fheiceáil.",
"compose_form.lock_disclaimer.lock": "faoi ghlas",
"compose_form.placeholder": "Cad atá ag tarlú?",
- "compose_form.poll.add_option": "Cuir rogha isteach",
"compose_form.poll.duration": "Achar suirbhéanna",
- "compose_form.poll.option_placeholder": "Rogha {number}",
- "compose_form.poll.remove_option": "Bain an rogha seo",
"compose_form.poll.switch_to_multiple": "Athraigh suirbhé chun cead a thabhairt do ilrogha",
"compose_form.poll.switch_to_single": "Athraigh suirbhé chun cead a thabhairt do rogha amháin",
- "compose_form.publish": "Foilsigh",
"compose_form.publish_form": "Foilsigh\n",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Sábháil",
"compose_form.spoiler.marked": "Bain rabhadh ábhair",
"compose_form.spoiler.unmarked": "Cuir rabhadh ábhair",
- "compose_form.spoiler_placeholder": "Scríobh do rabhadh anseo",
"confirmation_modal.cancel": "Cealaigh",
- "confirmations.block.block_and_report": "Bac ⁊ Tuairiscigh",
"confirmations.block.confirm": "Bac",
- "confirmations.block.message": "An bhfuil tú cinnte gur mhaith leat {name} a bhac?",
"confirmations.cancel_follow_request.confirm": "Éirigh as iarratas",
"confirmations.cancel_follow_request.message": "An bhfuil tú cinnte gur mhaith leat éirigh as an iarratas leanta {name}?",
"confirmations.delete.confirm": "Scrios",
@@ -152,13 +142,10 @@
"confirmations.delete_list.message": "An bhfuil tú cinnte gur mhaith leat an liosta seo a scriosadh go buan?",
"confirmations.discard_edit_media.confirm": "Faigh réidh de",
"confirmations.discard_edit_media.message": "Tá athruithe neamhshlánaithe don tuarascáil gné nó réamhamharc agat, faigh réidh dóibh ar aon nós?",
- "confirmations.domain_block.confirm": "Bac fearann go hiomlán",
"confirmations.domain_block.message": "An bhfuil tú iontach cinnte gur mhaith leat bac an t-ainm fearainn {domain} in iomlán? I bhformhór na gcásanna, is leor agus is fearr cúpla baic a cur i bhfeidhm nó cúpla úsáideoirí a balbhú. Ní fheicfidh tú ábhair ón t-ainm fearainn sin in amlíne ar bith, nó i d'fhógraí. Scaoilfear do leantóirí ón ainm fearainn sin.",
"confirmations.logout.confirm": "Logáil amach",
"confirmations.logout.message": "An bhfuil tú cinnte gur mhaith leat logáil amach?",
"confirmations.mute.confirm": "Balbhaigh",
- "confirmations.mute.explanation": "Cuiridh seo teachtaireachtaí uathu agus fúthu i bhfolach, ach beidh siad in ann fós do theachtaireachtaí a fheiceáil agus tú a leanúint.",
- "confirmations.mute.message": "An bhfuil tú cinnte gur mhaith leat {name} a bhalbhú?",
"confirmations.redraft.confirm": "Scrios ⁊ athdhréachtaigh",
"confirmations.reply.confirm": "Freagair",
"confirmations.reply.message": "Scriosfaidh freagra láithreach an teachtaireacht atá a chumadh anois agat. An bhfuil tú cinnte gur mhaith leat leanúint leat?",
@@ -234,6 +221,11 @@
"follow_request.authorize": "Ceadaigh",
"follow_request.reject": "Diúltaigh",
"follow_requests.unlocked_explanation": "Cé nach bhfuil do chuntas faoi ghlas, cheap foireann {domain} gur mhaith leat súil siar ar iarratais leanúnaí as na cuntais seo.",
+ "follow_suggestions.dismiss": "Ná taispeáin arís",
+ "follow_suggestions.personalized_suggestion": "Nod pearsantaithe",
+ "follow_suggestions.popular_suggestion": "Nod coiteann",
+ "follow_suggestions.view_all": "Féach uile",
+ "follow_suggestions.who_to_follow": "Cé le leanúint",
"footer.about": "Maidir le",
"footer.directory": "Eolaire próifílí",
"footer.get_app": "Faigh an aip",
@@ -252,7 +244,6 @@
"hashtag.column_settings.tag_toggle": "Include additional tags in this column",
"hashtag.follow": "Lean haischlib",
"hashtag.unfollow": "Ná lean haischlib",
- "home.column_settings.basic": "Bunúsach",
"home.column_settings.show_reblogs": "Taispeáin moltaí",
"home.column_settings.show_replies": "Taispeán freagraí",
"home.hide_announcements": "Cuir fógraí i bhfolach",
@@ -315,9 +306,6 @@
"lists.replies_policy.title": "Taispeáin freagraí:",
"lists.search": "Cuardaigh i measc daoine atá á leanúint agat",
"lists.subheading": "Do liostaí",
- "mute_modal.duration": "Tréimhse",
- "mute_modal.hide_notifications": "Cuir póstalacha ón t-úsáideoir seo i bhfolach?",
- "mute_modal.indefinite": "Gan téarma",
"navigation_bar.about": "Maidir le",
"navigation_bar.blocks": "Cuntais bhactha",
"navigation_bar.bookmarks": "Leabharmharcanna",
@@ -325,7 +313,6 @@
"navigation_bar.compose": "Cum postáil nua",
"navigation_bar.discover": "Faigh amach",
"navigation_bar.domain_blocks": "Fearainn bhactha",
- "navigation_bar.edit_profile": "Cuir an phróifíl in eagar",
"navigation_bar.explore": "Féach thart",
"navigation_bar.filters": "Focail bhalbhaithe",
"navigation_bar.follow_requests": "Iarratais leanúnaí",
@@ -353,9 +340,6 @@
"notifications.clear": "Glan fógraí",
"notifications.column_settings.admin.report": "Tuairiscí nua:",
"notifications.column_settings.alert": "Fógraí deisce",
- "notifications.column_settings.filter_bar.advanced": "Taispeáin na catagóirí go léir",
- "notifications.column_settings.filter_bar.category": "Barra scagaire tapa",
- "notifications.column_settings.filter_bar.show_bar": "Taispeáin barra scagaire",
"notifications.column_settings.follow": "Leantóirí nua:",
"notifications.column_settings.follow_request": "Iarratais leanúnaí nua:",
"notifications.column_settings.mention": "Tráchtanna:",
@@ -401,12 +385,7 @@
"poll_button.add_poll": "Cruthaigh suirbhé",
"poll_button.remove_poll": "Bain suirbhé",
"privacy.change": "Adjust status privacy",
- "privacy.direct.short": "Direct",
- "privacy.private.long": "Sofheicthe do Leantóirí amháin",
- "privacy.private.short": "Leantóirí amháin",
- "privacy.public.long": "Infheicthe do chách",
"privacy.public.short": "Poiblí",
- "privacy.unlisted.short": "Neamhliostaithe",
"privacy_policy.title": "Polasaí príobháideachais",
"refresh": "Athnuaigh",
"regeneration_indicator.label": "Ag lódáil…",
@@ -471,7 +450,6 @@
"status.copy": "Copy link to status",
"status.delete": "Scrios",
"status.edit": "Cuir in eagar",
- "status.edited": "Curtha in eagar in {date}",
"status.edited_x_times": "Curtha in eagar {count, plural, one {{count} uair amháin} two {{count} uair} few {{count} uair} many {{count} uair} other {{count} uair}}",
"status.embed": "Leabaigh",
"status.filter": "Déan scagadh ar an bpostáil seo",
@@ -529,7 +507,6 @@
"upload_form.audio_description": "Describe for people with hearing loss",
"upload_form.description": "Describe for the visually impaired",
"upload_form.edit": "Cuir in eagar",
- "upload_form.undo": "Scrios",
"upload_form.video_description": "Describe for people with hearing loss or visual impairment",
"upload_modal.analyzing_picture": "Ag anailísiú íomhá…",
"upload_modal.apply": "Cuir i bhFeidhm",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 11d83d6ceb14e8..9e79793de1080a 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -12,7 +12,7 @@
"about.powered_by": "Lìonra sòisealta sgaoilte le cumhachd {mastodon}",
"about.rules": "Riaghailtean an fhrithealaiche",
"account.account_note_header": "Nòta",
- "account.add_or_remove_from_list": "Cuir ris no thoir air falbh o na liostaichean",
+ "account.add_or_remove_from_list": "Cuir ris no thoir air falbh o liostaichean",
"account.badges.bot": "Fèin-obrachail",
"account.badges.group": "Buidheann",
"account.block": "Bac @{name}",
@@ -21,6 +21,7 @@
"account.blocked": "’Ga bhacadh",
"account.browse_more_on_origin_server": "Rùraich barrachd dheth air a’ phròifil thùsail",
"account.cancel_follow_request": "Sguir dhen leantainn",
+ "account.copy": "Dèan lethbhreac dhen cheangal dhan phròifil",
"account.direct": "Thoir iomradh air @{name} gu prìobhaideach",
"account.disable_notifications": "Na cuir brath thugam tuilleadh nuair a chuireas @{name} post ris",
"account.domain_blocked": "Chaidh an àrainn a bhacadh",
@@ -31,6 +32,7 @@
"account.featured_tags.last_status_never": "Gun phost",
"account.featured_tags.title": "Na tagaichean hais brosnaichte aig {name}",
"account.follow": "Lean",
+ "account.follow_back": "Lean air ais",
"account.followers": "Luchd-leantainn",
"account.followers.empty": "Chan eil neach sam bith a’ leantainn air a’ chleachdaiche seo fhathast.",
"account.followers_counter": "{count, plural, one {{counter} neach-leantainn} two {{counter} neach-leantainn} few {{counter} luchd-leantainn} other {{counter} luchd-leantainn}}",
@@ -51,6 +53,7 @@
"account.mute_notifications_short": "Mùch na brathan",
"account.mute_short": "Mùch",
"account.muted": "’Ga mhùchadh",
+ "account.mutual": "Co-dhàimh",
"account.no_bio": "Cha deach tuairisgeul a sholar.",
"account.open_original_page": "Fosgail an duilleag thùsail",
"account.posts": "Postaichean",
@@ -86,7 +89,14 @@
"announcement.announcement": "Brath-fios",
"attachments_list.unprocessed": "(gun phròiseasadh)",
"audio.hide": "Falaich an fhuaim",
- "autosuggest_hashtag.per_week": "{count} san t-seachdain",
+ "block_modal.remote_users_caveat": "Iarraidh sinn air an fhrithealaiche {domain} gun gèill iad ri do cho-dhùnadh. Gidheadh, chan eil barantas gun gèill iad on a làimhsicheas cuid a fhrithealaichean bacaidhean air dòigh eadar-dhealaichte. Dh’fhaoidte gum faic daoine gun chlàradh a-steach na postaichean poblach agad fhathast.",
+ "block_modal.show_less": "Seall nas lugha dheth",
+ "block_modal.show_more": "Seall barrachd dheth",
+ "block_modal.they_cant_mention": "Chan urrainn dhaibh iomradh a thoirt ort no do leantainn.",
+ "block_modal.they_cant_see_posts": "Chan fhaic iad na postaichean agad ’s chan fhaic thu na postaichean aca-san.",
+ "block_modal.they_will_know": "Chì iad gun deach am bacadh.",
+ "block_modal.title": "A bheil thu airson an cleachdaiche a bhacadh?",
+ "block_modal.you_wont_see_mentions": "Chan fhaic thu na postaichean a bheir iomradh orra.",
"boost_modal.combo": "Brùth air {combo} nam b’ fheàrr leat leum a ghearradh thar seo an ath-thuras",
"bundle_column_error.copy_stacktrace": "Dèan lethbhreac de aithris na mearachd",
"bundle_column_error.error.body": "Cha b’ urrainn dhuinn an duilleag a dh’iarr thu a reandaradh. Dh’fhaoidte gu bheil buga sa chòd againn no duilgheadas co-chòrdalachd leis a’ bhrabhsair.",
@@ -143,26 +153,22 @@
"compose_form.lock_disclaimer": "Chan eil an cunntas agad {locked}. ’S urrainn do dhuine sam bith ’gad leantainn is na postaichean agad a tha ag amas air an luchd-leantainn agad a-mhàin a shealltainn.",
"compose_form.lock_disclaimer.lock": "glaiste",
"compose_form.placeholder": "Dè tha air d’ aire?",
- "compose_form.poll.add_option": "Cuir roghainn ris",
- "compose_form.poll.duration": "Faide a’ chunntais-bheachd",
+ "compose_form.poll.duration": "Faide a’ chunntais",
+ "compose_form.poll.multiple": "Iomadh-roghainn",
"compose_form.poll.option_placeholder": "Roghainn {number}",
- "compose_form.poll.remove_option": "Thoir an roghainn seo air falbh",
+ "compose_form.poll.single": "Aonan",
"compose_form.poll.switch_to_multiple": "Atharraich an cunntas-bheachd ach an gabh iomadh roghainn a thaghadh",
"compose_form.poll.switch_to_single": "Atharraich an cunntas-bheachd gus nach gabh ach aon roghainn a thaghadh",
- "compose_form.publish": "Foillsich",
+ "compose_form.poll.type": "Stoidhle",
+ "compose_form.publish": "Postaich",
"compose_form.publish_form": "Post ùr",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Sàbhail na h-atharraichean",
- "compose_form.sensitive.hide": "{count, plural, one {Cuir comharra gu bheil am meadhan frionasach} two {Cuir comharra gu bheil na meadhanan frionasach} few {Cuir comharra gu bheil na meadhanan frionasach} other {Cuir comharra gu bheil na meadhanan frionasach}}",
- "compose_form.sensitive.marked": "{count, plural, one {Tha comharra ris a’ mheadhan gu bheil e frionasach} two {Tha comharra ris na meadhanan gu bheil iad frionasach} few {Tha comharra ris na meadhanan gu bheil iad frionasach} other {Tha comharra ris na meadhanan gu bheil iad frionasach}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Chan eil comharra ris a’ mheadhan gun robh e frionasach} two {Chan eil comharra ris na meadhanan gun robh iad frionasach} few {Chan eil comharra ris na meadhanan gun robh iad frionasach} other {Chan eil comharra ris na meadhanan gun robh iad frionasach}}",
+ "compose_form.reply": "Freagair",
+ "compose_form.save_changes": "Ùraich",
"compose_form.spoiler.marked": "Thoir air falbh an rabhadh susbainte",
"compose_form.spoiler.unmarked": "Cuir rabhadh susbainte ris",
- "compose_form.spoiler_placeholder": "Sgrìobh an rabhadh agad an-seo",
+ "compose_form.spoiler_placeholder": "Rabhadh susbainte (roghainneil)",
"confirmation_modal.cancel": "Sguir dheth",
- "confirmations.block.block_and_report": "Bac ⁊ dèan gearan",
"confirmations.block.confirm": "Bac",
- "confirmations.block.message": "A bheil thu cinnteach gu bheil thu airson {name} a bhacadh?",
"confirmations.cancel_follow_request.confirm": "Cuir d’ iarrtas dhan dàrna taobh",
"confirmations.cancel_follow_request.message": "A bheil thu cinnteach gu bheil thu airson d’ iarrtas airson {name} a leantainn a chur dhan dàrna taobh?",
"confirmations.delete.confirm": "Sguab às",
@@ -171,15 +177,13 @@
"confirmations.delete_list.message": "A bheil thu cinnteach gu bheil thu airson an liosta seo a sguabadh às gu buan?",
"confirmations.discard_edit_media.confirm": "Tilg air falbh",
"confirmations.discard_edit_media.message": "Tha atharraichean gun sàbhaladh agad ann an tuairisgeul no ro-shealladh a’ mheadhain, a bheil thu airson an tilgeil air falbh co-dhiù?",
- "confirmations.domain_block.confirm": "Bac an àrainn uile gu lèir",
+ "confirmations.domain_block.confirm": "Bac am frithealaiche",
"confirmations.domain_block.message": "A bheil thu cinnteach dha-rìribh gu bheil thu airson an àrainn {domain} a bhacadh uile gu lèir? Mar as trice, foghnaidh gun dèan thu bacadh no mùchadh no dhà gu sònraichte agus bhiodh sin na b’ fheàrr. Chan fhaic thu susbaint on àrainn ud air loidhne-ama phoblach sam bith no am measg nam brathan agad. Thèid an luchd-leantainn agad on àrainn ud a thoirt air falbh.",
"confirmations.edit.confirm": "Deasaich",
"confirmations.edit.message": "Ma nì thu deasachadh an-dràsta, thèid seo a sgrìobhadh thairis air an teachdaireachd a tha thu a’ sgrìobhadh an-dràsta. A bheil thu cinnteach gu bheil thu airson leantainn air adhart?",
"confirmations.logout.confirm": "Clàraich a-mach",
"confirmations.logout.message": "A bheil thu cinnteach gu bheil thu airson clàradh a-mach?",
"confirmations.mute.confirm": "Mùch",
- "confirmations.mute.explanation": "Cuiridh seo na postaichean uapa ’s na postaichean a bheir iomradh orra am falach ach chì iad-san na postaichean agad fhathast is faodaidh iad ’gad leantainn.",
- "confirmations.mute.message": "A bheil thu cinnteach gu bheil thu airson {name} a mhùchadh?",
"confirmations.redraft.confirm": "Sguab às ⁊ dèan dreachd ùr",
"confirmations.redraft.message": "A bheil thu cinnteach gu bheil thu airson am post seo a sguabadh às agus dreachd ùr a thòiseachadh? Caillidh tu gach annsachd is brosnachadh air agus thèid freagairtean dhan phost thùsail ’nan dìlleachdanan.",
"confirmations.reply.confirm": "Freagair",
@@ -190,6 +194,7 @@
"conversation.mark_as_read": "Cuir comharra gun deach a leughadh",
"conversation.open": "Seall an còmhradh",
"conversation.with": "Còmhla ri {names}",
+ "copy_icon_button.copied": "Chaidh lethbhreac dheth a chur air an stòr-bhòrd",
"copypaste.copied": "Chaidh lethbhreac dheth a dhèanamh",
"copypaste.copy_to_clipboard": "Cuir lethbhreac dheth air an stòr-bhòrd",
"directory.federated": "On cho-shaoghal aithnichte",
@@ -204,6 +209,27 @@
"dismissable_banner.explore_statuses": "Tha fèill air na postaichean seo a’ fàs thar an lìona shòisealta an-diugh. Gheibh postaichean nas ùire le barrachd brosnaichean is annsachdan rangachadh nas àirde.",
"dismissable_banner.explore_tags": "Tha fèill air na tagaichean hais seo a’ fàs air an fhrithealaiche seo is frithealaichean eile dhen lìonra sgaoilte an-diugh. Gheibh tagaichean hais a tha ’gan cleachdadh le daoine eadar-dhealaichte rangachadh nas àirde.",
"dismissable_banner.public_timeline": "Seo na postaichean poblach as ùire o dhaoine air an lìonra sòisealta tha ’gan leantainn le daoine air {domain}.",
+ "domain_block_modal.block": "Bac am frithealaiche",
+ "domain_block_modal.block_account_instead": "Bac @{name} ’na àite",
+ "domain_block_modal.they_can_interact_with_old_posts": "’S urrainn do dhaoine a th’ air an fhrithealaiche seo eadar-ghabhail leis na seann-phostaichean agad.",
+ "domain_block_modal.they_cant_follow": "Chan urrainn do neach sam bith a th’ air an fhrithealaiche seo do leantainn.",
+ "domain_block_modal.they_wont_know": "Cha bhi fios aca gun deach am bacadh.",
+ "domain_block_modal.title": "A bheil thu airson an àrainn a bhacadh?",
+ "domain_block_modal.you_will_lose_followers": "Thèid a h-uile neach-leantainn agad a th’ air an fhrithealaiche seo a thoirt air falbh.",
+ "domain_block_modal.you_wont_see_posts": "Chan fhaic thu postaichean no brathan o chleachdaichean a th’ air an fhrithealaiche seo.",
+ "domain_pill.activitypub_lets_connect": "Leigidh e leat ceangal a dhèanamh ri daoine chan ann air Mastodon a-mhàin ach air feadh aplacaidean sòisealta eile cuideachd agus conaltradh leotha.",
+ "domain_pill.activitypub_like_language": "Tha ActivityPub coltach ri cànan a bhruidhneas Mastodon ri lìonraidhean sòisealta eile.",
+ "domain_pill.server": "Frithealaiche",
+ "domain_pill.their_handle": "An t-aithnichear aca:",
+ "domain_pill.their_server": "An dachaigh dhigiteach far a bheil na postaichean uile aca a’ fuireach.",
+ "domain_pill.their_username": "Seo an t-aithnichear àraidh aca air an fhrithealaiche aca. Dh’fhaoidte gu bheil luchd-cleachdaidh air a bheil an t-aon ainm air frithealaichean eile.",
+ "domain_pill.username": "Ainm-cleachdaiche",
+ "domain_pill.whats_in_a_handle": "Dè th’ ann an aithnichear?",
+ "domain_pill.who_they_are": "On a dh’innseas aithnichearan cò cuideigin agus càit a bheil iad, ’s urrainn dhut conaltradh le daoine thar an lìonraidh shòisealta de .",
+ "domain_pill.who_you_are": "On a dh’innseas d’ aithnichear cò thusa agus càit a bheil thu, ’s urrainn do dhaoine conaltradh leat thar an lìonraidh shòisealta de .",
+ "domain_pill.your_handle": "An t-aithnichear agad:",
+ "domain_pill.your_server": "Do dhachaigh dhigiteach far a bheil na postaichean uile agad a’ fuireach. Nach toigh leat an tè seo? Dèan imrich gu frithealaiche eile uair sam bith is thoir an luchd-leantainn agad leat cuideachd.",
+ "domain_pill.your_username": "Seo an t-aithnichear àraidh agad air an fhrithealaiche seo. Dh’fhaoidte gu bheil luchd-cleachdaidh air a bheil an t-aon ainm air frithealaichean eile.",
"embed.instructions": "Leabaich am post seo san làrach-lìn agad is tu a’ dèanamh lethbhreac dhen chòd gu h-ìosal.",
"embed.preview": "Seo an coltas a bhios air:",
"emoji_button.activity": "Gnìomhachd",
@@ -221,6 +247,7 @@
"emoji_button.search_results": "Toraidhean an luirg",
"emoji_button.symbols": "Samhlaidhean",
"emoji_button.travel": "Siubhal ⁊ àitichean",
+ "empty_column.account_hides_collections": "Chuir an cleachdaiche seo roimhe nach eil am fiosrachadh seo ri fhaighinn",
"empty_column.account_suspended": "Chaidh an cunntas a chur à rèim",
"empty_column.account_timeline": "Chan eil post an-seo!",
"empty_column.account_unavailable": "Chan eil a’ phròifil ri làimh",
@@ -239,6 +266,7 @@
"empty_column.list": "Chan eil dad air an liosta seo fhathast. Nuair a phostaicheas buill a tha air an liosta seo postaichean ùra, nochdaidh iad an-seo.",
"empty_column.lists": "Chan eil liosta agad fhathast. Nuair chruthaicheas tu tè, nochdaidh i an-seo.",
"empty_column.mutes": "Cha do mhùch thu cleachdaiche sam bith fhathast.",
+ "empty_column.notification_requests": "Glan! Chan eil dad an-seo. Nuair a gheibh thu brathan ùra, nochdaidh iad an-seo a-rèir nan roghainnean agad.",
"empty_column.notifications": "Cha d’ fhuair thu brath sam bith fhathast. Nuair a nì càch conaltradh leat, chì thu an-seo e.",
"empty_column.public": "Chan eil dad an-seo! Sgrìobh rudeigin gu poblach no lean càch o fhrithealaichean eile a làimh airson seo a lìonadh",
"error.unexpected_crash.explanation": "Air sàilleibh buga sa chòd againn no duilgheadas co-chòrdalachd leis a’ bhrabhsair, chan urrainn dhuinn an duilleag seo a shealltainn mar bu chòir.",
@@ -269,12 +297,28 @@
"filter_modal.select_filter.subtitle": "Cleachd roinn-seòrsa a tha ann no cruthaich tè ùr",
"filter_modal.select_filter.title": "Criathraich am post seo",
"filter_modal.title.status": "Criathraich post",
+ "filtered_notifications_banner.mentions": "{count, plural, one {iomradh} two {iomradh} few {iomraidhean} other {iomradh}}",
+ "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Chan eil brath ann o dhaoine} one {Tha brathan ann o # neach} two {Tha brathan ann o # neach} few {Tha brathan ann o # daoine} other {Tha brathan ann o # duine}} air a bheil thu eòlach ’s dòcha",
+ "filtered_notifications_banner.title": "Brathan criathraichte",
"firehose.all": "Na h-uile",
"firehose.local": "Am frithealaiche seo",
"firehose.remote": "Frithealaichean eile",
"follow_request.authorize": "Ùghdarraich",
"follow_request.reject": "Diùlt",
"follow_requests.unlocked_explanation": "Ged nach eil an cunntas agad glaiste, tha sgioba {domain} dhen bheachd gum b’ fheàirrde thu lèirmheas a dhèanamh air na h-iarrtasan leantainn o na cunntasan seo a làimh.",
+ "follow_suggestions.curated_suggestion": "Roghainn an sgioba",
+ "follow_suggestions.dismiss": "Na seall seo a-rithist",
+ "follow_suggestions.friends_of_friends_longer": "Fèill mhòr am measg nan daoine a leanas tu",
+ "follow_suggestions.hints.featured": "Chaidh a’ phròifil seo a thaghadh le sgioba {domain} a làimh.",
+ "follow_suggestions.hints.friends_of_friends": "Tha fèill mhòr air a’ phròifil seo am measg nan daoine a leanas tu.",
+ "follow_suggestions.hints.most_followed": "Tha a’ phròifil seo am measg an fheadhainn a leanar as trice air {domain}.",
+ "follow_suggestions.hints.most_interactions": "Chaidh mòran aire a thoirt air a’ phròifil seo air {domain} o chionn goirid.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Tha a’ phròifil seo coltach ris na pròifilean air an lean thu o chionn goirid.",
+ "follow_suggestions.personalized_suggestion": "Moladh pearsanaichte",
+ "follow_suggestions.popular_suggestion": "Moladh air a bheil fèill mhòr",
+ "follow_suggestions.popular_suggestion_longer": "Fèill mhòr air {domain}",
+ "follow_suggestions.view_all": "Seall na h-uile",
+ "follow_suggestions.who_to_follow": "Molaidhean leantainn",
"followed_tags": "Tagaichean hais ’gan leantainn",
"footer.about": "Mu dhèidhinn",
"footer.directory": "Eòlaire nam pròifil",
@@ -301,13 +345,8 @@
"hashtag.follow": "Lean an taga hais",
"hashtag.unfollow": "Na lean an taga hais tuilleadh",
"hashtags.and_other": "…agus {count, plural, one {# eile} two {# eile} few {# eile} other {# eile}}",
- "home.actions.go_to_explore": "Faic na tha a’ treandadh",
- "home.actions.go_to_suggestions": "Lorg daoine gus an leantainn",
- "home.column_settings.basic": "Bunasach",
"home.column_settings.show_reblogs": "Seall na brosnachaidhean",
"home.column_settings.show_replies": "Seall na freagairtean",
- "home.explore_prompt.body": "Bidh measgachadh de phostaichean o na tagaichean hais a leanas tu, na daoine a leanas tu is na postaichean a bhrosnaicheas iad air do dhachaigh. Ma tha cùisean ro shàmhach dhut, seo nas urrainn dhut a dhèanamh:",
- "home.explore_prompt.title": "Seo do dhachaigh am broinn Mastodon.",
"home.hide_announcements": "Falaich na brathan-fios",
"home.pending_critical_update.body": "Ùraich am frithealaiche Mastodon agad cho luath ’s a ghabhas!",
"home.pending_critical_update.link": "Faic na h-ùrachaidhean",
@@ -388,11 +427,18 @@
"lists.search": "Lorg am measg nan daoine a leanas tu",
"lists.subheading": "Na liostaichean agad",
"load_pending": "{count, plural, one {# nì ùr} two {# nì ùr} few {# nithean ùra} other {# nì ùr}}",
+ "loading_indicator.label": "’Ga luchdadh…",
"media_gallery.toggle_visible": "{number, plural, 1 {Falaich an dealbh} one {Falaich na dealbhan} two {Falaich na dealbhan} few {Falaich na dealbhan} other {Falaich na dealbhan}}",
"moved_to_account_banner.text": "Tha an cunntas {disabledAccount} agad à comas on a rinn thu imrich gu {movedToAccount}.",
- "mute_modal.duration": "Faide",
- "mute_modal.hide_notifications": "A bheil thu airson na brathan fhalach on chleachdaiche seo?",
- "mute_modal.indefinite": "Gun chrìoch",
+ "mute_modal.hide_from_notifications": "Falaich o na brathan",
+ "mute_modal.hide_options": "Roghainnean falaich",
+ "mute_modal.indefinite": "Gus an dì-mhùch mi iad",
+ "mute_modal.show_options": "Seall na roghainnean",
+ "mute_modal.they_can_mention_and_follow": "’S urrainn dhaibh iomradh a thoirt ort agus do leantainn ach chan fhaic thu iad-san.",
+ "mute_modal.they_wont_know": "Cha bhi fios aca gun deach am mùchadh.",
+ "mute_modal.title": "A bheil thu airson an cleachdaiche a mhùchadh?",
+ "mute_modal.you_wont_see_mentions": "Chan fhaic thu na postaichean a bheir iomradh orra.",
+ "mute_modal.you_wont_see_posts": "Chì iad na postaichean agad fhathast ach chan fhaic thu na postaichean aca-san.",
"navigation_bar.about": "Mu dhèidhinn",
"navigation_bar.advanced_interface": "Fosgail san eadar-aghaidh-lìn adhartach",
"navigation_bar.blocks": "Cleachdaichean bacte",
@@ -402,7 +448,6 @@
"navigation_bar.direct": "Iomraidhean prìobhaideach",
"navigation_bar.discover": "Rùraich",
"navigation_bar.domain_blocks": "Àrainnean bacte",
- "navigation_bar.edit_profile": "Deasaich a’ phròifil",
"navigation_bar.explore": "Rùraich",
"navigation_bar.favourites": "Annsachdan",
"navigation_bar.filters": "Faclan mùchte",
@@ -426,11 +471,21 @@
"notification.follow": "Tha {name} ’gad leantainn a-nis",
"notification.follow_request": "Dh’iarr {name} ’gad leantainn",
"notification.mention": "Thug {name} iomradh ort",
+ "notification.moderation-warning.learn_more": "Barrachd fiosrachaidh",
"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.relationships_severance_event": "Chaill thu dàimhean le {name}",
+ "notification.relationships_severance_event.account_suspension": "Chuir rianaire aig {from} {target} à rèim agus is ciall dha sin nach fhaigh thu naidheachdan uapa ’s nach urrainn dhut conaltradh leotha.",
+ "notification.relationships_severance_event.domain_block": "Bhac rianaire aig {from} {target}, a’ gabhail a-staigh {followersCount} dhen luchd-leantainn agad agus {followingCount, plural, one {# chunntas} two {# chunntas} few {# cunntasan} other {# cunntas}} a tha thu fhèin a’ leantainn.",
+ "notification.relationships_severance_event.learn_more": "Barrachd fiosrachaidh",
+ "notification.relationships_severance_event.user_domain_block": "Bhac thu {target} agus thug sin air falbh {followersCount} dhen luchd-leantainn agad agus {followingCount, plural, one {# chunntas} two {# chunntas} few {# cunntasan} other {# cunntas}} a tha thu fhèin a’ leantainn.",
"notification.status": "Phostaich {name} rud",
"notification.update": "Dheasaich {name} post",
+ "notification_requests.accept": "Gabh ris",
+ "notification_requests.dismiss": "Leig seachad",
+ "notification_requests.notifications_from": "Brathan o {name}",
+ "notification_requests.title": "Brathan criathraichte",
"notifications.clear": "Falamhaich na brathan",
"notifications.clear_confirmation": "A bheil thu cinnteach gu bheil thu airson na brathan uile agad fhalamhachadh gu buan?",
"notifications.column_settings.admin.report": "Gearanan ùra:",
@@ -439,7 +494,6 @@
"notifications.column_settings.favourite": "Annsachdan:",
"notifications.column_settings.filter_bar.advanced": "Seall a h-uile roinn-seòrsa",
"notifications.column_settings.filter_bar.category": "Bàr-criathraidh luath",
- "notifications.column_settings.filter_bar.show_bar": "Seall am bàr-criathraidh",
"notifications.column_settings.follow": "Luchd-leantainn ùr:",
"notifications.column_settings.follow_request": "Iarrtasan leantainn ùra:",
"notifications.column_settings.mention": "Iomraidhean:",
@@ -465,6 +519,15 @@
"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": "A 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 {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 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",
"notifications_permission_banner.how_to_control": "Airson brathan fhaighinn nuair nach eil Mastodon fosgailte, cuir na brathan deasga an comas. Tha an smachd agad fhèin air dè na seòrsaichean de chonaltradh a ghineas brathan deasga leis a’ phutan {icon} gu h-àrd nuair a bhios iad air an cur an comas.",
"notifications_permission_banner.title": "Na caill dad gu bràth tuilleadh",
@@ -476,6 +539,17 @@
"onboarding.follows.empty": "Gu mì-fhortanach, chan urrainn dhuinn toradh a shealltainn an-dràsta. Feuch gleus an luirg no duilleag an rùrachaidh airson daoine ri leantainn a lorg no feuch ris a-rithist an ceann tamaill.",
"onboarding.follows.lead": "’S e do prìomh-doras do Mhastodon a th’ ann san dachaigh. Mar as motha an t-uiread de dhaoine a leanas tu ’s ann nas beòthaile inntinniche a bhios i. Seo moladh no dhà dhut airson tòiseachadh:",
"onboarding.follows.title": "Cuir dreach pearsanta air do dhachaigh",
+ "onboarding.profile.discoverable": "Bu mhath leam gun gabh a’ phròifil agam a rùrachadh",
+ "onboarding.profile.discoverable_hint": "Ma chuir thu romhad gun gabh a’ phròifil agad a rùrachadh air Mastodon, faodaidh na postaichean agad nochdadh ann an toraidhean luirg agus treandaichean agus dh’fhaoidte gun dèid a’ phròifil agad a mholadh dhan fheadhainn aig a bheil ùidhean coltach ri d’ ùidhean-sa.",
+ "onboarding.profile.display_name": "Ainm-taisbeanaidh",
+ "onboarding.profile.display_name_hint": "D’ ainm slàn no spòrsail…",
+ "onboarding.profile.lead": "’S urrainn dhut seo a choileanadh uair sam bith eile sna roghainnean far am bi roghainnean gnàthachaidh eile ri làimh dhut cuideachd.",
+ "onboarding.profile.note": "Cunntas-beatha",
+ "onboarding.profile.note_hint": "’S urrainn dhut @iomradh a thoirt air càch no air #tagaicheanHais…",
+ "onboarding.profile.save_and_continue": "Sàbhail ’s lean air adhart",
+ "onboarding.profile.title": "Suidheachadh na pròifile",
+ "onboarding.profile.upload_avatar": "Luchdaich suas dealbh na pròifil",
+ "onboarding.profile.upload_header": "Luchdaich suas bann-cinn na pròifil",
"onboarding.share.lead": "Innis do dhaoine mar a gheibh iad grèim ort air Mastodon!",
"onboarding.share.message": "Is mise {username} air #Mastodon! Thig ’gam leantainn air {url}",
"onboarding.share.next_steps": "Ceuman eile as urrainn dhut gabhail:",
@@ -509,16 +583,18 @@
"poll_button.add_poll": "Cuir cunntas-bheachd ris",
"poll_button.remove_poll": "Thoir air falbh an cunntas-bheachd",
"privacy.change": "Cuir gleus air prìobhaideachd a’ phuist",
- "privacy.direct.long": "Chan fhaic ach na cleachdaichean le iomradh orra seo",
- "privacy.direct.short": "An fheadhainn le iomradh orra a-mhàin",
- "privacy.private.long": "Chan fhaic ach na daoine a tha ’gad leantainn seo",
- "privacy.private.short": "Luchd-leantainn a-mhàin",
- "privacy.public.long": "Chì a h-uile duine e",
+ "privacy.direct.long": "A h-uile duine air a bheil iomradh sa phost",
+ "privacy.direct.short": "Daoine àraidh",
+ "privacy.private.long": "An luchd-leantainn agad a-mhàin",
+ "privacy.private.short": "Luchd-leantainn",
+ "privacy.public.long": "Duine sam bith taobh a-staigh no a-muigh Mhastodon",
"privacy.public.short": "Poblach",
- "privacy.unlisted.long": "Chì a h-uile duine e ach cha nochd e ann an gleusan rùrachaidh",
- "privacy.unlisted.short": "Falaichte o liostaichean",
+ "privacy.unlisted.additional": "Tha seo coltach ris an fhaicsinneachd phoblach ach cha nochd am post air loidhnichean-ama an t-saoghail phoblaich, nan tagaichean hais no an rùrachaidh no ann an toraidhean luirg Mhastodon fiù ’s ma thug thu ro-aonta airson sin seachad.",
+ "privacy.unlisted.long": "Ìre bheag an algairim",
+ "privacy.unlisted.short": "Poblach ach sàmhach",
"privacy_policy.last_updated": "An t-ùrachadh mu dheireadh {date}",
"privacy_policy.title": "Poileasaidh prìobhaideachd",
+ "recommended": "Molta",
"refresh": "Ath-nuadhaich",
"regeneration_indicator.label": "’Ga luchdadh…",
"regeneration_indicator.sublabel": "Tha do dhachaigh ’ga ullachadh!",
@@ -533,7 +609,9 @@
"relative_time.minutes": "{number}m",
"relative_time.seconds": "{number}d",
"relative_time.today": "an-diugh",
+ "reply_indicator.attachments": "{count, plural, one {# cheanglachan} two {# cheanglachan} few {# ceanglachain} other {# ceanglachan}}",
"reply_indicator.cancel": "Sguir dheth",
+ "reply_indicator.poll": "Cunntas-bheachd",
"report.block": "Bac",
"report.block_explanation": "Chan fhaic thu na postaichean aca. Chan fhaic iad na postaichean agad is chan urrainn dhaibh do leantainn. Bheir iad an aire gun deach am bacadh.",
"report.categories.legal": "Laghail",
@@ -589,6 +667,7 @@
"search.quick_action.status_search": "Postaichean a fhreagras ri {x}",
"search.search_or_paste": "Dèan lorg no cuir a-steach URL",
"search_popout.full_text_search_disabled_message": "Chan eil seo ri fhaighinn air {domain}.",
+ "search_popout.full_text_search_logged_out_message": "Chan eil seo ri fhaighinn ach nuair a bhios tu air do chlàradh a-steach.",
"search_popout.language_code": "Còd cànain ISO",
"search_popout.options": "Roghainnean luirg",
"search_popout.quick_actions": "Grad-ghnìomhan",
@@ -625,10 +704,11 @@
"status.direct": "Thoir iomradh air @{name} gu prìobhaideach",
"status.direct_indicator": "Iomradh prìobhaideach",
"status.edit": "Deasaich",
- "status.edited": "Air a dheasachadh {date}",
- "status.edited_x_times": "Chaidh a dheasachadh {count, plural, one {{counter} turas} two {{counter} thuras} few {{counter} tursan} other {{counter} turas}}",
+ "status.edited": "An deasachadh mu dheireadh {date}",
+ "status.edited_x_times": "Chaidh a dheasachadh {count, plural, one {{count} turas} two {{count} thuras} few {{count} tursan} other {{count} turas}}",
"status.embed": "Leabaich",
"status.favourite": "Cuir ris na h-annsachdan",
+ "status.favourites": "{count, plural, one {annsachd} two {annsachd} few {annsachdan} other {annsachd}}",
"status.filter": "Criathraich am post seo",
"status.filtered": "Criathraichte",
"status.hide": "Falaich am post",
@@ -649,6 +729,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.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",
@@ -696,10 +777,8 @@
"upload_error.poll": "Chan fhaod thu faidhle a luchdadh suas an cois cunntais-bheachd.",
"upload_form.audio_description": "Mìnich e dhan fheadhainn le èisteachd bheag",
"upload_form.description": "Mìnich e dhan fheadhainn le cion-lèirsinne",
- "upload_form.description_missing": "Cha deach tuairisgeul a chur ris",
"upload_form.edit": "Deasaich",
"upload_form.thumbnail": "Atharraich an dealbhag",
- "upload_form.undo": "Sguab às",
"upload_form.video_description": "Mìnich e dhan fheadhainn le èisteachd bheag no cion-lèirsinne",
"upload_modal.analyzing_picture": "A’ sgrùdadh an deilbh…",
"upload_modal.apply": "Cuir an sàs",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index e857b6955421b2..0847b8bf0dd3ac 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -2,7 +2,7 @@
"about.blocks": "Servidores suxeitos a moderación",
"about.contact": "Contacto:",
"about.disclaimer": "Mastodon é software libre, de código aberto, e unha marca comercial de Mastodon gGmbH.",
- "about.domain_blocks.no_reason_available": "Motivo non indicado. ",
+ "about.domain_blocks.no_reason_available": "Motivo non indicado",
"about.domain_blocks.preamble": "Mastodon de xeito xeral permíteche ver contidos doutros servidores do fediverso e interactuar coas súas usuarias. Estas son as excepcións que se estabeleceron neste servidor en particular.",
"about.domain_blocks.silenced.explanation": "Por defecto non verás perfís e contido desde este servidor, a menos que mires de xeito explícito ou optes por seguir ese contido ou usuaria.",
"about.domain_blocks.silenced.title": "Limitado",
@@ -89,7 +89,14 @@
"announcement.announcement": "Anuncio",
"attachments_list.unprocessed": "(sen procesar)",
"audio.hide": "Agochar audio",
- "autosuggest_hashtag.per_week": "{count} por semana",
+ "block_modal.remote_users_caveat": "Ímoslle pedir ao servidor {domain} que respecte a túa decisión. Emporiso, non hai garantía de que atenda a petición xa que os servidores xestionan os bloqueos de formas diferentes. As publicacións públicas poderían aínda ser visibles para usuarias que non iniciaron sesión.",
+ "block_modal.show_less": "Mostrar menos",
+ "block_modal.show_more": "Mostrar máis",
+ "block_modal.they_cant_mention": "Non te poden seguir nin mencionar.",
+ "block_modal.they_cant_see_posts": "Non pode ver as túas publicacións nin ti as de ela.",
+ "block_modal.they_will_know": "Pode ver que a bloqueaches.",
+ "block_modal.title": "Bloquear usuaria?",
+ "block_modal.you_wont_see_mentions": "Non verás publicacións que a mencionen.",
"boost_modal.combo": "Preme {combo} para ignorar isto na seguinte vez",
"bundle_column_error.copy_stacktrace": "Copiar informe do erro",
"bundle_column_error.error.body": "Non se puido mostrar a páxina solicitada. Podería deberse a un problema no código, ou incompatiblidade co navegador.",
@@ -108,7 +115,7 @@
"closed_registrations_modal.find_another_server": "Atopa outro servidor",
"closed_registrations_modal.preamble": "Mastodon é descentralizado, así que non importa onde crees a conta, poderás seguir e interactuar con calquera conta deste servidor. Incluso podes ter o teu servidor!",
"closed_registrations_modal.title": "Crear conta en Mastodon",
- "column.about": "Acerca de",
+ "column.about": "Sobre",
"column.blocks": "Usuarias bloqueadas",
"column.bookmarks": "Marcadores",
"column.community": "Cronoloxía local",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "A túa conta non está {locked}. Todas poden seguirte para ollar os teus toots só para seguidoras.",
"compose_form.lock_disclaimer.lock": "bloqueada",
"compose_form.placeholder": "Que contas?",
- "compose_form.poll.add_option": "Engadir unha opción",
"compose_form.poll.duration": "Duración da enquisa",
+ "compose_form.poll.multiple": "Escolla múltiple",
"compose_form.poll.option_placeholder": "Opción {number}",
- "compose_form.poll.remove_option": "Eliminar esta opción",
+ "compose_form.poll.single": "Elixe unha",
"compose_form.poll.switch_to_multiple": "Mudar a enquisa para permitir múltiples escollas",
"compose_form.poll.switch_to_single": "Mudar a enquisa para permitir unha soa opción",
+ "compose_form.poll.type": "Estilo",
"compose_form.publish": "Publicar",
"compose_form.publish_form": "Publicar",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Gardar cambios",
- "compose_form.sensitive.hide": "{count, plural, one {Marca multimedia como sensible} other {Marca multimedia como sensibles}}",
- "compose_form.sensitive.marked": "{count, plural, one {Multimedia marcado como sensible} other {Multimedia marcados como sensibles}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Multimedia non marcado como sensible} other {Multimedia non marcado como sensible}}",
+ "compose_form.reply": "Responder",
+ "compose_form.save_changes": "Actualizar",
"compose_form.spoiler.marked": "Retirar o aviso sobre o contido",
"compose_form.spoiler.unmarked": "Engadir aviso sobre o contido",
- "compose_form.spoiler_placeholder": "Escribe o teu aviso aquí",
+ "compose_form.spoiler_placeholder": "Aviso sobre o contido (optativo)",
"confirmation_modal.cancel": "Cancelar",
- "confirmations.block.block_and_report": "Bloquear e denunciar",
"confirmations.block.confirm": "Bloquear",
- "confirmations.block.message": "Tes a certeza de querer bloquear a {name}?",
"confirmations.cancel_follow_request.confirm": "Retirar solicitude",
"confirmations.cancel_follow_request.message": "Tes a certeza de querer retirar a solicitude para seguir a {name}?",
"confirmations.delete.confirm": "Eliminar",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "Tes a certeza de querer eliminar de xeito permanente esta listaxe?",
"confirmations.discard_edit_media.confirm": "Descartar",
"confirmations.discard_edit_media.message": "Tes cambios sen gardar para a vista previa ou descrición do multimedia, descartamos os cambios?",
- "confirmations.domain_block.confirm": "Agochar dominio enteiro",
+ "confirmations.domain_block.confirm": "Bloquear servidor",
"confirmations.domain_block.message": "Tes a certeza de querer bloquear todo de {domain}? Na meirande parte dos casos uns bloqueos ou silenciados específicos son suficientes. Non verás máis o contido deste dominio en ningunha cronoloxía pública ou nas túas notificacións. As túas seguidoras deste dominio serán eliminadas.",
"confirmations.edit.confirm": "Editar",
"confirmations.edit.message": "Ao editar sobrescribirás a mensaxe que estás a compor. Tes a certeza de que queres continuar?",
"confirmations.logout.confirm": "Pechar sesión",
"confirmations.logout.message": "Desexas pechar a sesión?",
"confirmations.mute.confirm": "Acalar",
- "confirmations.mute.explanation": "Isto agochará as súas publicacións ou as que a mencionen, mais poderá ler as túas publicacións e ser seguidora túa.",
- "confirmations.mute.message": "Tes a certeza de querer acalar a {name}?",
"confirmations.redraft.confirm": "Eliminar e reescribir",
"confirmations.redraft.message": "Tes a certeza de querer eliminar esta publicación e reescribila? Perderás as promocións e favorecementos, e as respostas á publicación orixinal ficarán orfas.",
"confirmations.reply.confirm": "Responder",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "Estas son as publicacións da web social que hoxe están gañando popularidade. As publicacións con máis promocións e favorecemento teñen puntuación máis alta.",
"dismissable_banner.explore_tags": "Estes cancelos están gañando popularidade entre as persoas deste servidor e noutros servidores da rede descentralizada.",
"dismissable_banner.public_timeline": "Estas son as publicacións públicas máis recentes das persoas que as usuarias de {domain} están a seguir.",
+ "domain_block_modal.block": "Bloquear servidor",
+ "domain_block_modal.block_account_instead": "Prefiro bloquear a @{name}",
+ "domain_block_modal.they_can_interact_with_old_posts": "As persoas deste servidor poden interactuar coas túas publicacións antigas.",
+ "domain_block_modal.they_cant_follow": "Ninguén deste servidor pode seguirte.",
+ "domain_block_modal.they_wont_know": "Non saberá que a bloqueaches.",
+ "domain_block_modal.title": "Bloquear dominio?",
+ "domain_block_modal.you_will_lose_followers": "Vanse eliminar todas as túas seguidoras deste servidor.",
+ "domain_block_modal.you_wont_see_posts": "Non verás publicacións ou notificación das usuarias neste servidor.",
+ "domain_pill.activitypub_lets_connect": "Permíteche conectar e interactuar con persoas non só de Mastodon, se non tamén con outras apps sociais.",
+ "domain_pill.activitypub_like_language": "ActivityPub é algo así como o idioma que Mastodon fala con outras redes sociais.",
+ "domain_pill.server": "Servidor",
+ "domain_pill.their_handle": "O seu alcume:",
+ "domain_pill.their_server": "O seu fogar dixital, onde están as súas publicacións.",
+ "domain_pill.their_username": "O seu identificador único no seu servidor. É posible atopar usuarias co mesmo nome de usuaria en diferentes servidores.",
+ "domain_pill.username": "Nome de usuaria",
+ "domain_pill.whats_in_a_handle": "Que é o alcume?",
+ "domain_pill.who_they_are": "O alcume dinos quen é esa persoa e onde está, para que poidas interactuar con ela en toda a web social de .",
+ "domain_pill.who_you_are": "Como o teu alcume informa de quen es e onde estás, as persoas poden interactuar contigo desde toda a web social de .",
+ "domain_pill.your_handle": "O teu alcume:",
+ "domain_pill.your_server": "O teu fogar dixital, onde están as túas publicacións. Non é do teu agrado? Podes cambiar de servidor cando queiras levando as túas seguidoras contigo.",
+ "domain_pill.your_username": "O teu identificador único neste servidor. É posible que atopes usuarias co mesmo nome de usuaria en outros servidores.",
"embed.instructions": "Engade esta publicación ó teu sitio web copiando o seguinte código.",
"embed.preview": "Así será mostrado:",
"emoji_button.activity": "Actividade",
@@ -244,6 +266,7 @@
"empty_column.list": "Aínda non hai nada nesta listaxe. Cando as usuarias incluídas na listaxe publiquen mensaxes, amosaranse aquí.",
"empty_column.lists": "Aínda non tes listaxes. Cando crees unha, amosarase aquí.",
"empty_column.mutes": "Aínda non silenciaches a ningúnha usuaria.",
+ "empty_column.notification_requests": "Todo ben! Nada por aquí. Cando recibas novas notificación aparecerán aquí seguindo o criterio dos teus axustes.",
"empty_column.notifications": "Aínda non tes notificacións. Aparecerán cando outras persoas interactúen contigo.",
"empty_column.public": "Nada por aquí! Escribe algo de xeito público, ou segue de xeito manual usuarias doutros servidores para ir enchéndoo",
"error.unexpected_crash.explanation": "Debido a un erro no noso código ou a unha compatilidade co teu navegador, esta páxina non pode ser amosada correctamente.",
@@ -274,14 +297,32 @@
"filter_modal.select_filter.subtitle": "Usar unha categoría existente ou crear unha nova",
"filter_modal.select_filter.title": "Filtrar esta publicación",
"filter_modal.title.status": "Filtrar unha publicación",
+ "filtered_notifications_banner.mentions": "{count, plural, one {mención} other {mencións}}",
+ "filtered_notifications_banner.pending_requests": "Notificacións de {count, plural, =0 {ninguén} one {unha persoa} other {# persoas}} que poderías coñecer",
+ "filtered_notifications_banner.title": "Notificacións filtradas",
"firehose.all": "Todo",
"firehose.local": "Este servidor",
"firehose.remote": "Outros servidores",
"follow_request.authorize": "Autorizar",
"follow_request.reject": "Rexeitar",
"follow_requests.unlocked_explanation": "Malia que a túa conta non é privada, a administración de {domain} pensou que quizabes terías que revisar de xeito manual as solicitudes de seguiminto.",
+ "follow_suggestions.curated_suggestion": "Suxestións do Servidor",
+ "follow_suggestions.dismiss": "Non mostrar máis",
+ "follow_suggestions.featured_longer": "Elección persoal do equipo de {domain}",
+ "follow_suggestions.friends_of_friends_longer": "Popular entre as persoas que sigues",
+ "follow_suggestions.hints.featured": "Este perfil foi escollido pola administración de {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "Este perfil é popular entre as persoas que segues.",
+ "follow_suggestions.hints.most_followed": "Este perfil é un dos máis seguidos en {domain}.",
+ "follow_suggestions.hints.most_interactions": "Este perfil tivo moitas interaccións últimamente en {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Este perfil ten semellanzas cos perfís que ti seguiches últimamente.",
+ "follow_suggestions.personalized_suggestion": "Suxestión personalizada",
+ "follow_suggestions.popular_suggestion": "Suxestión popular",
+ "follow_suggestions.popular_suggestion_longer": "Popular en {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Perfís semellantes aos que seguiches recentemente",
+ "follow_suggestions.view_all": "Ver todas",
+ "follow_suggestions.who_to_follow": "A quen seguir",
"followed_tags": "Cancelos seguidos",
- "footer.about": "Acerca de",
+ "footer.about": "Sobre",
"footer.directory": "Directorio de perfís",
"footer.get_app": "Descarga a app",
"footer.invite": "Convidar persoas",
@@ -306,13 +347,8 @@
"hashtag.follow": "Seguir cancelo",
"hashtag.unfollow": "Deixar de seguir cancelo",
"hashtags.and_other": "…e {count, plural, one {}other {# máis}}",
- "home.actions.go_to_explore": "Mira do que se está a falar",
- "home.actions.go_to_suggestions": "Atopa persoas ás que seguir",
- "home.column_settings.basic": "Básico",
"home.column_settings.show_reblogs": "Amosar compartidos",
"home.column_settings.show_replies": "Amosar respostas",
- "home.explore_prompt.body": "A túa cronoloxía de inicio vai ter unha mistura de publicacións procedentes dos cancelos que segues, das persoas que elexiches seguir e das publicacións que elas promoven. Se non tes moito que ler, podes probar a:",
- "home.explore_prompt.title": "Iste é o teu fogar en Mastodon.",
"home.hide_announcements": "Agochar anuncios",
"home.pending_critical_update.body": "Por favor actualiza o antes posible o teu servidor Mastodon!",
"home.pending_critical_update.link": "Mira as actualizacións",
@@ -378,6 +414,7 @@
"limited_account_hint.action": "Mostrar perfil igualmente",
"limited_account_hint.title": "Este perfil foi agochado pola moderación de {domain}.",
"link_preview.author": "Por {name}",
+ "link_preview.more_from_author": "Máis de {name}",
"lists.account.add": "Engadir á listaxe",
"lists.account.remove": "Eliminar da listaxe",
"lists.delete": "Eliminar listaxe",
@@ -396,10 +433,16 @@
"loading_indicator.label": "Estase a cargar…",
"media_gallery.toggle_visible": "Agochar {number, plural, one {imaxe} other {imaxes}}",
"moved_to_account_banner.text": "A túa conta {disabledAccount} está actualmente desactivada porque movéchela a {movedToAccount}.",
- "mute_modal.duration": "Duración",
- "mute_modal.hide_notifications": "Agochar notificacións desta persoa?",
- "mute_modal.indefinite": "Indefinida",
- "navigation_bar.about": "Acerca de",
+ "mute_modal.hide_from_notifications": "Ocultar nas notificacións",
+ "mute_modal.hide_options": "Opcións ao ocultar",
+ "mute_modal.indefinite": "Ata que as reactive",
+ "mute_modal.show_options": "Mostrar opcións",
+ "mute_modal.they_can_mention_and_follow": "Pódete mencionar e seguirte, pero non o verás.",
+ "mute_modal.they_wont_know": "Non saberá que a acalaches.",
+ "mute_modal.title": "Acalar usuaria?",
+ "mute_modal.you_wont_see_mentions": "Non verás as publicacións que a mencionen.",
+ "mute_modal.you_wont_see_posts": "Seguirá podendo ler as túas publicacións, pero non verás as súas.",
+ "navigation_bar.about": "Sobre",
"navigation_bar.advanced_interface": "Abrir coa interface web avanzada",
"navigation_bar.blocks": "Usuarias bloqueadas",
"navigation_bar.bookmarks": "Marcadores",
@@ -408,7 +451,6 @@
"navigation_bar.direct": "Mencións privadas",
"navigation_bar.discover": "Descubrir",
"navigation_bar.domain_blocks": "Dominios agochados",
- "navigation_bar.edit_profile": "Editar perfil",
"navigation_bar.explore": "Descubrir",
"navigation_bar.favourites": "Favoritas",
"navigation_bar.filters": "Palabras silenciadas",
@@ -432,20 +474,37 @@
"notification.follow": "{name} comezou a seguirte",
"notification.follow_request": "{name} solicitou seguirte",
"notification.mention": "{name} mencionoute",
+ "notification.moderation-warning.learn_more": "Saber máis",
+ "notification.moderation_warning": "Recibiches unha advertencia da moderación",
+ "notification.moderation_warning.action_delete_statuses": "Algunha das túas publicacións foron eliminadas.",
+ "notification.moderation_warning.action_disable": "A túa conta foi desactivada.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Algunha das túas publicacións foron marcadas como sensibles.",
+ "notification.moderation_warning.action_none": "A túa conta recibeu unha advertencia da moderación.",
+ "notification.moderation_warning.action_sensitive": "De agora en diante as túas publicacións van ser marcadas como sensibles.",
+ "notification.moderation_warning.action_silence": "A túa conta foi limitada.",
+ "notification.moderation_warning.action_suspend": "A túa conta foi suspendida.",
"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.relationships_severance_event": "Perdeuse a conexión con {name}",
+ "notification.relationships_severance_event.account_suspension": "A administración de {from} suspendeu a {target}, o que significa que xa non vas recibir actualizacións de esa conta ou interactuar con ela.",
+ "notification.relationships_severance_event.domain_block": "A administración de {from} bloqueou a {target}, que inclúe a {followersCount} das túas seguidoras e a {followingCount, plural, one {# conta} other {# contas}} que sigues.",
+ "notification.relationships_severance_event.learn_more": "Saber máis",
+ "notification.relationships_severance_event.user_domain_block": "Bloqueaches a {target}, eliminando a {followersCount} das túas seguidoras e a {followingCount, plural, one {# conta} other {# contas}} que sigues.",
"notification.status": "{name} publicou",
"notification.update": "{name} editou unha publicación",
+ "notification_requests.accept": "Aceptar",
+ "notification_requests.dismiss": "Desbotar",
+ "notification_requests.notifications_from": "Notificacións de {name}",
+ "notification_requests.title": "Notificacións filtradas",
"notifications.clear": "Limpar notificacións",
"notifications.clear_confirmation": "Tes a certeza de querer limpar de xeito permanente todas as túas notificacións?",
"notifications.column_settings.admin.report": "Novas denuncias:",
"notifications.column_settings.admin.sign_up": "Novas usuarias:",
"notifications.column_settings.alert": "Notificacións de escritorio",
"notifications.column_settings.favourite": "Favoritas:",
- "notifications.column_settings.filter_bar.advanced": "Amosar todas as categorías",
+ "notifications.column_settings.filter_bar.advanced": "Mostrar todas as categorías",
"notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
- "notifications.column_settings.filter_bar.show_bar": "Amosar barra de filtros",
"notifications.column_settings.follow": "Novas seguidoras:",
"notifications.column_settings.follow_request": "Novas peticións de seguimento:",
"notifications.column_settings.mention": "Mencións:",
@@ -471,6 +530,15 @@
"notifications.permission_denied": "Non se activaron as notificacións de escritorio porque se denegou o permiso",
"notifications.permission_denied_alert": "Non se poden activar as notificacións de escritorio, xa que o permiso para o navegador foi denegado previamente",
"notifications.permission_required": "As notificacións de escritorio non están dispoñibles porque non se concedeu o permiso necesario.",
+ "notifications.policy.filter_new_accounts.hint": "Creadas desde {days, plural, one {onte} other {fai # días}}",
+ "notifications.policy.filter_new_accounts_title": "Novas contas",
+ "notifications.policy.filter_not_followers_hint": "Inclúe a persoas que te seguen desde fai menos de {days, plural, one {1 día} other {# días}}",
+ "notifications.policy.filter_not_followers_title": "Persoas que non te seguen",
+ "notifications.policy.filter_not_following_hint": "Ata que as autorices",
+ "notifications.policy.filter_not_following_title": "Persoas que ti non segues",
+ "notifications.policy.filter_private_mentions_hint": "Filtradas a non ser que sexa unha resposta á túa propia mención ou se ti segues á remitente",
+ "notifications.policy.filter_private_mentions_title": "Mencións privadas non solicitadas",
+ "notifications.policy.title": "Desbotar notificacións de…",
"notifications_permission_banner.enable": "Activar notificacións de escritorio",
"notifications_permission_banner.how_to_control": "Activa as notificacións de escritorio para recibir notificacións mentras Mastodon non está aberto. Podes controlar de xeito preciso o tipo de interaccións que crean as notificacións de escritorio a través da {icon} superior unha vez están activadas.",
"notifications_permission_banner.title": "Non perder nada",
@@ -526,14 +594,15 @@
"poll_button.add_poll": "Engadir unha enquisa",
"poll_button.remove_poll": "Eliminar enquisa",
"privacy.change": "Axustar privacidade",
- "privacy.direct.long": "Só para as usuarias mencionadas",
- "privacy.direct.short": "Só persoas mencionadas",
- "privacy.private.long": "Só para persoas que te seguen",
- "privacy.private.short": "Só para seguidoras",
- "privacy.public.long": "Visible por todas",
+ "privacy.direct.long": "Todas as mencionadas na publicación",
+ "privacy.direct.short": "Persoas concretas",
+ "privacy.private.long": "Só para seguidoras",
+ "privacy.private.short": "Seguidoras",
+ "privacy.public.long": "Para todas dentro e fóra de Mastodon",
"privacy.public.short": "Público",
- "privacy.unlisted.long": "Visible por todas, pero excluída da sección descubrir",
- "privacy.unlisted.short": "Sen listar",
+ "privacy.unlisted.additional": "Do mesmo xeito que público, menos que a publicación non aparecerá nas cronoloxías en directo ou nos cancelos, en descubrir ou nas buscas de Mastodon, incluso se estivese establecido nas opcións xerais da conta.",
+ "privacy.unlisted.long": "Menor implicación dos algoritmos",
+ "privacy.unlisted.short": "Público limitado",
"privacy_policy.last_updated": "Actualizado por última vez no {date}",
"privacy_policy.title": "Política de Privacidade",
"recommended": "Aconsellable",
@@ -551,7 +620,9 @@
"relative_time.minutes": "{number}m",
"relative_time.seconds": "{number}s",
"relative_time.today": "hoxe",
+ "reply_indicator.attachments": "{count, plural, one {# adxunto} other {# adxuntos}}",
"reply_indicator.cancel": "Desbotar",
+ "reply_indicator.poll": "Enquisa",
"report.block": "Bloquear",
"report.block_explanation": "Non vas ver as súas publicacións. Nin verá as túas publicacións nin poderá seguirte. Poderá comprobar que as bloqueaches.",
"report.categories.legal": "Legal",
@@ -644,10 +715,11 @@
"status.direct": "Mencionar de xeito privado a @{name}",
"status.direct_indicator": "Mención privada",
"status.edit": "Editar",
- "status.edited": "Editado {date}",
+ "status.edited": "Última edición {date}",
"status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",
"status.embed": "Incrustar",
"status.favourite": "Favorecer",
+ "status.favourites": "{count, plural, one {favorecemento} other {favorecementos}}",
"status.filter": "Filtrar esta publicación",
"status.filtered": "Filtrado",
"status.hide": "Agochar publicación",
@@ -668,6 +740,7 @@
"status.reblog": "Promover",
"status.reblog_private": "Compartir coa audiencia orixinal",
"status.reblogged_by": "{name} promoveu",
+ "status.reblogs": "{count, plural, one {promoción} other {promocións}}",
"status.reblogs.empty": "Aínda ninguén promoveu esta publicación. Cando alguén o faga, amosarase aquí.",
"status.redraft": "Eliminar e reescribir",
"status.remove_bookmark": "Eliminar marcador",
@@ -715,10 +788,8 @@
"upload_error.poll": "Non se poden subir ficheiros nas enquisas.",
"upload_form.audio_description": "Describir para persoas con problemas auditivos",
"upload_form.description": "Describir para persoas cegas ou con problemas visuais",
- "upload_form.description_missing": "Sen descrición",
"upload_form.edit": "Editar",
"upload_form.thumbnail": "Cambiar a miniatura",
- "upload_form.undo": "Eliminar",
"upload_form.video_description": "Describe para persoas con problemas visuais ou auditivos",
"upload_modal.analyzing_picture": "Estase a analizar a imaxe…",
"upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 67584572733f22..600de395979b44 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -89,7 +89,14 @@
"announcement.announcement": "הכרזה",
"attachments_list.unprocessed": "(לא מעובד)",
"audio.hide": "השתק",
- "autosuggest_hashtag.per_week": "{count} לשבוע",
+ "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": "הדף המבוקש אינו זמין. זה עשוי להיות באג בקוד או בעייה בתאימות הדפדפן.",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "חשבונך אינו {locked}. כל אחד יוכל לעקוב אחריך כדי לקרוא את הודעותיך המיועדות לעוקבים בלבד.",
"compose_form.lock_disclaimer.lock": "נעול",
"compose_form.placeholder": "על מה את.ה חושב.ת?",
- "compose_form.poll.add_option": "הוסיפו בחירה",
"compose_form.poll.duration": "משך הסקר",
- "compose_form.poll.option_placeholder": "אפשרות מספר {number}",
- "compose_form.poll.remove_option": "הסר בחירה זו",
+ "compose_form.poll.multiple": "בחירה מרובה",
+ "compose_form.poll.option_placeholder": "אפשרות {number}",
+ "compose_form.poll.single": "נא לבחור",
"compose_form.poll.switch_to_multiple": "אפשרו בחירה מרובה בסקר",
"compose_form.poll.switch_to_single": "אפשרו בחירה בודדת בסקר",
- "compose_form.publish": "פרסום",
+ "compose_form.poll.type": "סוג משאל",
+ "compose_form.publish": "הודעה",
"compose_form.publish_form": "לפרסם",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "שמירת שינויים",
- "compose_form.sensitive.hide": "{count, plural, one {סימון מידע כרגיש} other {סימון מידע כרגיש}}",
- "compose_form.sensitive.marked": "{count, plural, one {מידע מסומן כרגיש} other {מידע מסומן כרגיש}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {מידע לא מסומן כרגיש} other {מידע לא מסומן כרגיש}}",
+ "compose_form.reply": "תגובה",
+ "compose_form.save_changes": "עדכון",
"compose_form.spoiler.marked": "הסר אזהרת תוכן",
"compose_form.spoiler.unmarked": "הוסף אזהרת תוכן",
- "compose_form.spoiler_placeholder": "כתוב את האזהרה שלך כאן",
+ "compose_form.spoiler_placeholder": "אזהרת תוכן (לא חובה)",
"confirmation_modal.cancel": "ביטול",
- "confirmations.block.block_and_report": "לחסום ולדווח",
"confirmations.block.confirm": "לחסום",
- "confirmations.block.message": "האם את/ה בטוח/ה שברצונך למחוק את \"{name}\"?",
"confirmations.cancel_follow_request.confirm": "ויתור על בקשה",
"confirmations.cancel_follow_request.message": "לבטל את בקשת המעקב אחרי {name}?",
"confirmations.delete.confirm": "למחוק",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "האם אתם בטוחים שאתם רוצים למחוק את הרשימה לצמיתות?",
"confirmations.discard_edit_media.confirm": "השלך",
"confirmations.discard_edit_media.message": "יש לך שינויים לא שמורים לתיאור המדיה. להשליך אותם בכל זאת?",
- "confirmations.domain_block.confirm": "חסמו לגמרי את שם המתחם (דומיין)",
+ "confirmations.domain_block.confirm": "חסימת שרת",
"confirmations.domain_block.message": "בטוחה שברצונך באמת לחסום את קהילת {domain}? ברב המקרים השתקה וחסימה של מספר משתמשים עשוייה להספיק. לא תראי תוכל מכלל שם המתחם בפידים הציבוריים או בהתראות שלך. העוקבים שלך מהקהילה הזאת יוסרו",
"confirmations.edit.confirm": "עריכה",
"confirmations.edit.message": "עריכה תדרוס את ההודעה שכבר התחלת לכתוב. האם להמשיך?",
"confirmations.logout.confirm": "התנתקות",
"confirmations.logout.message": "האם אתם בטוחים שאתם רוצים להתנתק?",
"confirmations.mute.confirm": "להשתיק",
- "confirmations.mute.explanation": "זה יסתיר הודעות שלהם והודעות שמאזכרות אותם, אבל עדיין יתיר להם לראות הודעות שלך ולעקוב אחריך.",
- "confirmations.mute.message": "בטוח/ה שברצונך להשתיק את {name}?",
"confirmations.redraft.confirm": "מחיקה ועריכה מחדש",
"confirmations.redraft.message": "למחוק ולהתחיל טיוטה חדשה? חיבובים והדהודים יאבדו, ותגובות להודעה המקורית ישארו יתומות.",
"confirmations.reply.confirm": "תגובה",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "אלו הודעות משרת זה ואחרים ברשת המבוזרת שצוברות חשיפה היום. הודעות חדשות יותר עם יותר הדהודים וחיבובים מדורגות גבוה יותר.",
"dismissable_banner.explore_tags": "התגיות האלו, משרת זה ואחרים ברשת המבוזרת, צוברות חשיפה כעת.",
"dismissable_banner.public_timeline": "אלו ההודעות האחרונות שהתקבלו מהמשתמשים שנעקבים על ידי משתמשים מ־{domain}.",
+ "domain_block_modal.block": "חסימת שרת",
+ "domain_block_modal.block_account_instead": "לחסום את @{name} במקום שרת שלם",
+ "domain_block_modal.they_can_interact_with_old_posts": "משתמשים משרת זה יכולים להתייחס להודעותיך הישנות.",
+ "domain_block_modal.they_cant_follow": "משתמש משרת זה לא יכול לעקוב אחריך.",
+ "domain_block_modal.they_wont_know": "הם לא ידעו כי נחסמו.",
+ "domain_block_modal.title": "לחסום שרת?",
+ "domain_block_modal.you_will_lose_followers": "כל עוקביך משרת זה יוסרו.",
+ "domain_block_modal.you_wont_see_posts": "לא תוכלו לראות הודעות ממשתמשים על שרת זה.",
+ "domain_pill.activitypub_lets_connect": "מאפשר לך להתחבר ולהתרועע עם אחרים לא רק במסטודון, אלא גם ביישומים חברתיים שונים אחרים.",
+ "domain_pill.activitypub_like_language": "אקטיביטיפאב היא למעשה השפה בה מסטודון מדבר עם רשתות חברתיות אחרות.",
+ "domain_pill.server": "שרת",
+ "domain_pill.their_handle": "הכינוי שלהם:",
+ "domain_pill.their_server": "הבית המקוון שלהם, היכן שהודעותיהם שוכנות.",
+ "domain_pill.their_username": "המזהה הייחודי של השרת שלהם. ניתן למצוא משתמשים עם שם משתמש זהה על שרתים שונים.",
+ "domain_pill.username": "שם משתמש/ת",
+ "domain_pill.whats_in_a_handle": "מה כולל כינוי?",
+ "domain_pill.who_they_are": "מאחר וכינויים מספרים על מישהו ומה מיקומו, ניתן להיות בקשר עם אנשים לרוחבה של הרשת החברתית של .",
+ "domain_pill.who_you_are": "מאחר והכינוי שלך מספר על מי את.ה ומה מקומך בעולם, משתמשים מכל העולם יוכלו להיות בקשר עמך לרוחבה של הרשת החברתית של .",
+ "domain_pill.your_handle": "הכינוי שלך:",
+ "domain_pill.your_server": "הבית המקוון שלך, היכן ששוכנות כל הודעותיך. לא מוצא חן בעיניך? ניתן לעבור שרתים בכל עת וגם לשמור על העוקבים.",
+ "domain_pill.your_username": "המזהה הייחודי שלך על שרת זה. ניתן למצוא משתמשים עם שם משתמש זהה על שרתים שונים.",
"embed.instructions": "ניתן להטמיע את ההודעה הזו באתרך ע\"י העתקת הקוד שלהלן.",
"embed.preview": "דוגמא כיצד זה יראה:",
"emoji_button.activity": "פעילות",
@@ -226,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": "עדיין לא חסמתם משתמשים אחרים.",
@@ -244,6 +266,7 @@
"empty_column.list": "אין עדיין פריטים ברשימה. כאשר חברים ברשימה הזאת יפרסמו הודעות חדשות, הן יופיעו פה.",
"empty_column.lists": "אין לך שום רשימות עדיין. לכשיהיו, הן תופענה כאן.",
"empty_column.mutes": "עוד לא השתקת שום משתמש.",
+ "empty_column.notification_requests": "בום! אין פה כלום. כשיווצרו עוד התראות, הן יופיעו כאן על בסיס ההעדפות שלך.",
"empty_column.notifications": "אין התראות עדיין. יאללה, הגיע הזמן להתחיל להתערבב.",
"empty_column.public": "אין פה כלום! כדי למלא את הטור הזה אפשר לכתוב משהו, או להתחיל לעקוב אחרי אנשים מקהילות אחרות",
"error.unexpected_crash.explanation": "עקב תקלה בקוד שלנו או בעיית תאימות דפדפן, לא ניתן להציג דף זה כראוי.",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "שימוש בקטגורייה קיימת או יצירת אחת חדשה",
"filter_modal.select_filter.title": "סינון ההודעה הזו",
"filter_modal.title.status": "סנן הודעה",
+ "filtered_notifications_banner.mentions": "{count, plural, one {איזכור} other {איזכורים} two {איזכוריים}}",
+ "filtered_notifications_banner.pending_requests": "{count, plural,=0 {אין התראות ממשתמשים ה}one {התראה אחת ממישהו/מישהי ה}two {יש התראותיים ממשתמשים }other {יש # התראות ממשתמשים }}מוכרים לך",
+ "filtered_notifications_banner.title": "התראות מסוננות",
"firehose.all": "הכל",
"firehose.local": "שרת זה",
"firehose.remote": "שרתים אחרים",
"follow_request.authorize": "הרשאה",
"follow_request.reject": "דחיה",
"follow_requests.unlocked_explanation": "למרות שחשבונך אינו נעול, צוות {domain} חושב שאולי כדאי לוודא את בקשות המעקב האלה ידנית.",
+ "follow_suggestions.curated_suggestion": "בחירת הצוות",
+ "follow_suggestions.dismiss": "לא להציג שוב",
+ "follow_suggestions.featured_longer": "נבחר ידנית על ידי הצוות של {domain}",
+ "follow_suggestions.friends_of_friends_longer": "פופולרי בין הנעקבים שלך",
+ "follow_suggestions.hints.featured": "החשבון הזה נבחר אישית על ידי צוות {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "חשבון זה פופולרי בין הנעקבים שלך.",
+ "follow_suggestions.hints.most_followed": "חשבון זה הוא מבין הנעקבים ביותר בשרת {domain}.",
+ "follow_suggestions.hints.most_interactions": "חשבון זה קיבל לאחרונה הרבה תשומת לב על שרת {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "חשבון זה דומה לחשבונות אחרים שאחריהם התחלת לעקוב לאחרונה.",
+ "follow_suggestions.personalized_suggestion": "הצעות מותאמות אישית",
+ "follow_suggestions.popular_suggestion": "הצעה פופולרית",
+ "follow_suggestions.popular_suggestion_longer": "פופולרי בקהילת {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "דומה למשתמשות.ים שעקבת אחריהן.ם לאחרונה",
+ "follow_suggestions.view_all": "צפיה בכל",
+ "follow_suggestions.who_to_follow": "אחרי מי לעקוב",
"followed_tags": "התגיות שהחשבון שלך עוקב אחריהן",
"footer.about": "אודות",
"footer.directory": "ספריית פרופילים",
@@ -306,13 +347,8 @@
"hashtag.follow": "לעקוב אחרי תגית",
"hashtag.unfollow": "להפסיק לעקוב אחרי תגית",
"hashtags.and_other": "…{count, plural,other {ועוד #}}",
- "home.actions.go_to_explore": "הצגת מגמות",
- "home.actions.go_to_suggestions": "למצוא א.נשים לעקוב אחריהן.ם",
- "home.column_settings.basic": "למתחילים",
"home.column_settings.show_reblogs": "הצגת הדהודים",
"home.column_settings.show_replies": "הצגת תגובות",
- "home.explore_prompt.body": "פיד הבית שלך יכיל תערובת של הודעות מהתגיות והאנשים שבחרת למעקב, וההודעות שהנעקבים בוחרים להדהד. אם זה נראה שקט מדי כרגע אז מה לגבי:",
- "home.explore_prompt.title": "זהו בסיס הבית שלך בתוך מסטודון.",
"home.hide_announcements": "הסתר הכרזות",
"home.pending_critical_update.body": "יש לעדכן את תוכנת מסטודון בהקדם האפשרי!",
"home.pending_critical_update.link": "צפיה בעדכונים",
@@ -396,9 +432,15 @@
"loading_indicator.label": "בטעינה…",
"media_gallery.toggle_visible": "{number, plural, one {להסתיר תמונה} two {להסתיר תמונותיים} many {להסתיר תמונות} other {להסתיר תמונות}}",
"moved_to_account_banner.text": "חשבונך {disabledAccount} אינו פעיל כרגע עקב מעבר ל{movedToAccount}.",
- "mute_modal.duration": "משך הזמן",
- "mute_modal.hide_notifications": "להסתיר התראות מחשבון זה?",
- "mute_modal.indefinite": "ללא תאריך סיום",
+ "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": "משתמשים חסומים",
@@ -408,7 +450,6 @@
"navigation_bar.direct": "הודעות פרטיות",
"navigation_bar.discover": "גלה",
"navigation_bar.domain_blocks": "קהילות (שמות מתחם) חסומות",
- "navigation_bar.edit_profile": "עריכת פרופיל",
"navigation_bar.explore": "סיור",
"navigation_bar.favourites": "חיבובים",
"navigation_bar.filters": "מילים מושתקות",
@@ -432,20 +473,37 @@
"notification.follow": "{name} במעקב אחרייך",
"notification.follow_request": "{name} ביקשו לעקוב אחריך",
"notification.mention": "אוזכרת על ידי {name}",
+ "notification.moderation-warning.learn_more": "למידע נוסף",
+ "notification.moderation_warning": "קיבלת אזהרה מצוות ניהול התוכן",
+ "notification.moderation_warning.action_delete_statuses": "חלק מהודעותיך הוסרו.",
+ "notification.moderation_warning.action_disable": "חשבונך הושבת.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "חלק מהודעותיך סומנו כרגישות.",
+ "notification.moderation_warning.action_none": "חשבונך קיבל אזהרה מצוות ניהול התוכן.",
+ "notification.moderation_warning.action_sensitive": "הודעותיך יסומנו כרגישות מעתה ואילך.",
+ "notification.moderation_warning.action_silence": "חשבונך הוגבל.",
+ "notification.moderation_warning.action_suspend": "חשבונך הושעה.",
"notification.own_poll": "הסקר שלך הסתיים",
"notification.poll": "סקר שהצבעת בו הסתיים",
"notification.reblog": "הודעתך הודהדה על ידי {name}",
+ "notification.relationships_severance_event": "אבד הקשר עם {name}",
+ "notification.relationships_severance_event.account_suspension": "מנהל.ת משרת {from} השע(ת)ה את {target}, ולפיכך לא תעודכנו יותר על ידם ולא תוכלו להיות איתם בקשר.",
+ "notification.relationships_severance_event.domain_block": "מנהל.ת מאתר {from} חסמו את {target} ובכלל זה {followersCount} מעוקביך וגם {followingCount, plural, one {חשבון אחד} two {שני חשבונות} many {# חשבונות} other {# חשבונות}} מבין נעקביך.",
+ "notification.relationships_severance_event.learn_more": "למידע נוסף",
+ "notification.relationships_severance_event.user_domain_block": "חסמת את {target} ובכלל זה {followersCount} מעוקביך וגם {followingCount, plural, one {חשבון אחד} two {שני חשבונות} many {# חשבונות} other {# חשבונות}} מבין נעקביך.",
"notification.status": "{name} הרגע פרסמו",
"notification.update": "{name} ערכו הודעה",
+ "notification_requests.accept": "לקבל",
+ "notification_requests.dismiss": "לבטל",
+ "notification_requests.notifications_from": "התראות מ־ {name}",
+ "notification_requests.title": "התראות מסוננות",
"notifications.clear": "הסרת התראות",
"notifications.clear_confirmation": "להסיר את כל ההתראות לצמיתות ? ",
"notifications.column_settings.admin.report": "דו\"חות חדשים",
"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.advanced": "להציג את כל הקטגוריות",
"notifications.column_settings.filter_bar.category": "שורת סינון מהיר",
- "notifications.column_settings.filter_bar.show_bar": "הצג שורת סינון",
"notifications.column_settings.follow": "עוקבים חדשים:",
"notifications.column_settings.follow_request": "בקשות מעקב חדשות:",
"notifications.column_settings.mention": "פניות:",
@@ -471,6 +529,15 @@
"notifications.permission_denied": "לא ניתן להציג התראות מסך כיוון כיוון שהרשאות דפדפן נשללו בעבר",
"notifications.permission_denied_alert": "לא ניתן לאפשר נוטיפיקציות מסך שכן הדפדפן סורב הרשאה בעבר",
"notifications.permission_required": "לא ניתן לאפשר נוטיפיקציות מסך כיוון שהרשאה דרושה לא ניתנה.",
+ "notifications.policy.filter_new_accounts.hint": "נוצר {days, plural,one {ביום האחרון} two {ביומיים האחרונים} other {ב־# הימים האחרונים}}",
+ "notifications.policy.filter_new_accounts_title": "חשבונות חדשים",
+ "notifications.policy.filter_not_followers_hint": "כולל משתמשים שעקבו אחריך פחות מ{days, plural,one {יום} two {יומיים} other {־# ימים}}",
+ "notifications.policy.filter_not_followers_title": "משתמשים שלא עוקבות.ים אחריך",
+ "notifications.policy.filter_not_following_hint": "עד שיאושרו ידנית על ידיך",
+ "notifications.policy.filter_not_following_title": "משתמשים שאינך עוקב(ת) אחריהםן",
+ "notifications.policy.filter_private_mentions_hint": "מסונן אלא אם זו תשובה למינשון שלך או אם אתם עוקבים אחרי העונה",
+ "notifications.policy.filter_private_mentions_title": "מינשונים בפרטי שלא הוזמנו",
+ "notifications.policy.title": "להסתיר התראות מ…",
"notifications_permission_banner.enable": "לאפשר נוטיפיקציות מסך",
"notifications_permission_banner.how_to_control": "כדי לקבל התראות גם כאשר מסטודון סגור יש לאפשר התראות מסך. ניתן לשלוט בדיוק איזה סוג של אינטראקציות יביא להתראות מסך דרך כפתור ה- {icon} מרגע שהן מאופשרות.",
"notifications_permission_banner.title": "לעולם אל תחמיץ דבר",
@@ -526,14 +593,15 @@
"poll_button.add_poll": "הוספת סקר",
"poll_button.remove_poll": "הסרת סקר",
"privacy.change": "שינוי פרטיות ההודעה",
- "privacy.direct.long": "רק למשתמשים מאוזכרים (mentioned)",
- "privacy.direct.short": "למאוזכרים בלבד",
- "privacy.private.long": "הצג לעוקבים בלבד",
- "privacy.private.short": "לעוקבים בלבד",
- "privacy.public.long": "גלוי לכל",
+ "privacy.direct.long": "כל המוזכרים בהודעה",
+ "privacy.direct.short": "א.נשים מסוימים",
+ "privacy.private.long": "לעוקביך בלבד",
+ "privacy.private.short": "עוקבים",
+ "privacy.public.long": "כל הגולשים, מחוברים למסטודון או לא",
"privacy.public.short": "פומבי",
- "privacy.unlisted.long": "גלוי לכל, אבל מוסתר מאמצעי תגלית",
- "privacy.unlisted.short": "לא רשום (לא לפיד הכללי)",
+ "privacy.unlisted.additional": "ההתנהגות דומה להודעה ציבורית, מלבד שההודעה לא תופיע בפיד החי המקומי או בתגיות, תגליות או חיפוש מסטודון, אפילו אם ביקשת שהחשבון כולו יהיה פומבי.",
+ "privacy.unlisted.long": "פחות חשיפה לאלגוריתמים",
+ "privacy.unlisted.short": "ציבורי שקט",
"privacy_policy.last_updated": "עודכן לאחרונה {date}",
"privacy_policy.title": "מדיניות פרטיות",
"recommended": "מומלץ",
@@ -551,7 +619,9 @@
"relative_time.minutes": "{number} דקות",
"relative_time.seconds": "{number} שניות",
"relative_time.today": "היום",
+ "reply_indicator.attachments": "{count, plural,one {# קובץ מצורף}other {# קבצים מצורפים}}",
"reply_indicator.cancel": "ביטול",
+ "reply_indicator.poll": "משאל",
"report.block": "לחסום",
"report.block_explanation": "לא ניתן יהיה לראות את ההודעות שלהן. הן לא יוכלו לראות את ההודעות שלך או לעקוב אחריך. הם יוכלו לדעת שהם חסומים.",
"report.categories.legal": "חוקי",
@@ -644,10 +714,11 @@
"status.direct": "הודעה פרטית אל @{name}",
"status.direct_indicator": "הודעה פרטית",
"status.edit": "עריכה",
- "status.edited": "נערך ב{date}",
+ "status.edited": "נערך לאחרונה {date}",
"status.edited_x_times": "נערך {count, plural, one {פעם {count}} other {{count} פעמים}}",
"status.embed": "הטמעה",
"status.favourite": "חיבוב",
+ "status.favourites": "{count, plural, one {חיבוב אחד} two {זוג חיבובים} other {# חיבובים}}",
"status.filter": "סנן הודעה זו",
"status.filtered": "סונן",
"status.hide": "הסתרת חיצרוץ",
@@ -668,6 +739,7 @@
"status.reblog": "הדהוד",
"status.reblog_private": "להדהד ברמת הנראות המקורית",
"status.reblogged_by": "{name} הידהד/ה:",
+ "status.reblogs": "{count, plural, one {הדהוד אחד} two {שני הדהודים} other {# הדהודים}}",
"status.reblogs.empty": "עוד לא הידהדו את ההודעה הזו. כאשר זה יקרה, ההדהודים יופיעו כאן.",
"status.redraft": "מחיקה ועריכה מחדש",
"status.remove_bookmark": "הסרת סימניה",
@@ -715,10 +787,8 @@
"upload_error.poll": "לא ניתן להעלות קובץ עם סקר.",
"upload_form.audio_description": "תאר/י עבור לקויי שמיעה",
"upload_form.description": "תיאור לכבדי ראיה",
- "upload_form.description_missing": "לא הוסף תיאור",
"upload_form.edit": "עריכה",
"upload_form.thumbnail": "שנה/י תמונה ממוזערת",
- "upload_form.undo": "ביטול",
"upload_form.video_description": "תאר/י עבור לקויי שמיעה ולקויי ראייה",
"upload_modal.analyzing_picture": "מנתח תמונה…",
"upload_modal.apply": "החל",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index 412159bef9b7b7..5dc99dd76e40b1 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -21,6 +21,7 @@
"account.blocked": "ब्लॉक",
"account.browse_more_on_origin_server": "मूल प्रोफ़ाइल पर अधिक ब्राउज़ करें",
"account.cancel_follow_request": "फॉलो रिक्वेस्ट वापस लें",
+ "account.copy": "प्रोफाइल पर लिंक कॉपी करें",
"account.direct": "निजि तरीके से उल्लेख करे @{name}",
"account.disable_notifications": "@{name} पोस्ट के लिए मुझे सूचित मत करो",
"account.domain_blocked": "छिपा हुआ डोमेन",
@@ -31,6 +32,7 @@
"account.featured_tags.last_status_never": "कोई पोस्ट नहीं है",
"account.featured_tags.title": "{name} के चुनिंदा हैशटैग",
"account.follow": "फॉलो करें",
+ "account.follow_back": "फॉलो करें",
"account.followers": "फॉलोवर",
"account.followers.empty": "कोई भी इस यूज़र् को फ़ॉलो नहीं करता है",
"account.followers_counter": "{count, plural, one {{counter} अनुगामी} other {{counter} समर्थक}}",
@@ -51,6 +53,7 @@
"account.mute_notifications_short": "सूचनाओ को शांत करे",
"account.mute_short": "शांत करे",
"account.muted": "म्यूट है",
+ "account.mutual": "आपसी",
"account.no_bio": "कोई विवरण नहि दिया गया हे",
"account.open_original_page": "ओरिजिनल पोस्ट खोलें",
"account.posts": "टूट्स",
@@ -75,6 +78,8 @@
"admin.dashboard.retention.average": "औसत",
"admin.dashboard.retention.cohort": "साईन-अप महिना",
"admin.dashboard.retention.cohort_size": "नये उपयोगकर्ता",
+ "admin.impact_report.instance_accounts": "ये अकाउंट प्रोफाइल मिटा देगा",
+ "admin.impact_report.instance_followers": "हमारे यूजर्स इन फॉलोअर्स को खो देंगे",
"admin.impact_report.title": "प्रभावकां सारांश",
"alert.rate_limited.message": "कृप्या {retry_time, time, medium} के बाद दुबारा कोशिश करें",
"alert.rate_limited.title": "सीमित दर",
@@ -83,7 +88,13 @@
"announcement.announcement": "घोषणा",
"attachments_list.unprocessed": "(असंसाधित)",
"audio.hide": "हाईड ऑडियो",
- "autosuggest_hashtag.per_week": "{count} हर सप्ताह",
+ "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": "अनुरोधित पेज प्रस्तुत नहीं किया जा सका। यह हमारे कोड में बग या ब्राउज़र संगतता समस्या के कारण हो सकता है।",
@@ -131,33 +142,31 @@
"community.column_settings.remote_only": "केवल सुदूर",
"compose.language.change": "भाषा बदलें",
"compose.language.search": "भाषाएँ खोजें...",
+ "compose.published.body": "पोस्ट प्रकाशित हुआ।",
"compose.published.open": "खोलें",
+ "compose.saved.body": "पोस्ट सुरक्षित किया गया।",
"compose_form.direct_message_warning_learn_more": "और जानें",
"compose_form.encryption_warning": "मास्टोडॉन पर पोस्ट एन्ड-टू-एन्ड एन्क्रिप्टेड नहीं है। कोई भी व्यक्तिगत जानकारी मास्टोडॉन पर मत भेजें।",
"compose_form.hashtag_warning": "ये पोस्ट किसी भी हैशटैग में लिस्ट नहीं किया जाएगा क्योंकि ये पब्लिक नहीं है। सिर्फ पब्लिक पोस्ट ही हैशटैग से खोजे जा सकते हैं।",
"compose_form.lock_disclaimer": "आपका खाता {locked} नहीं है। आपको केवल फॉलोवर्स को दिखाई दिए जाने वाले पोस्ट देखने के लिए कोई भी फॉलो कर सकता है।",
"compose_form.lock_disclaimer.lock": "लॉक्ड",
"compose_form.placeholder": "What is on your mind?",
- "compose_form.poll.add_option": "विकल्प जोड़े",
"compose_form.poll.duration": "चुनाव की अवधि",
- "compose_form.poll.option_placeholder": "कुल विकल्प {number}",
- "compose_form.poll.remove_option": "इस विकल्प को हटाएँ",
+ "compose_form.poll.multiple": "बहुविकल्पी",
+ "compose_form.poll.option_placeholder": "विकल्प {number}",
+ "compose_form.poll.single": "कोई एक चुनें",
"compose_form.poll.switch_to_multiple": "कई विकल्पों की अनुमति देने के लिए पोल बदलें",
"compose_form.poll.switch_to_single": "एक ही विकल्प के लिए अनुमति देने के लिए पोल बदलें",
- "compose_form.publish": "पब्लिश",
+ "compose_form.poll.type": "स्टाइल",
+ "compose_form.publish": "पोस्ट करें",
"compose_form.publish_form": "पब्लिश",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "परिवर्तनों को सहेजें",
- "compose_form.sensitive.hide": "मीडिया को संवेदनशील के रूप में चिह्नित करें",
- "compose_form.sensitive.marked": "मीडिया संवेदनशील के रूप में चिह्नित है",
- "compose_form.sensitive.unmarked": "मीडिया संवेदनशील के रूप में चिह्नित नहीं है",
+ "compose_form.reply": "जवाब दें",
+ "compose_form.save_changes": "अपडेट करें",
"compose_form.spoiler.marked": "चेतावनी के पीछे टेक्स्ट छिपा है",
"compose_form.spoiler.unmarked": "टेक्स्ट छिपा नहीं है",
- "compose_form.spoiler_placeholder": "अपनी चेतावनी यहाँ लिखें",
+ "compose_form.spoiler_placeholder": "सामग्री चेतावनी (वैकल्पिक)",
"confirmation_modal.cancel": "रद्द करें",
- "confirmations.block.block_and_report": "ब्लॉक एवं रिपोर्ट",
"confirmations.block.confirm": "ब्लॉक",
- "confirmations.block.message": "क्या आप वाकई {name} को ब्लॉक करना चाहते हैं?",
"confirmations.cancel_follow_request.confirm": "रिक्वेस्ट वापस लें",
"confirmations.cancel_follow_request.message": "क्या आप सुनिश्चित है की आप {name} का फॉलो रिक्वेस्ट वापिस लेना चाहते हैं?",
"confirmations.delete.confirm": "मिटाए",
@@ -166,15 +175,13 @@
"confirmations.delete_list.message": "क्या आप वाकई इस लिस्ट को हमेशा के लिये मिटाना चाहते हैं?",
"confirmations.discard_edit_media.confirm": "डिस्कार्ड",
"confirmations.discard_edit_media.message": "लिस्ट में जोड़ें",
- "confirmations.domain_block.confirm": "संपूर्ण डोमेन छिपाएं",
+ "confirmations.domain_block.confirm": "सर्वर ब्लॉक करें",
"confirmations.domain_block.message": "क्या आप वास्तव में, वास्तव में आप पूरे {domain} को ब्लॉक करना चाहते हैं? ज्यादातर मामलों में कुछ लक्षित ब्लॉक या म्यूट पर्याप्त और बेहतर हैं। आप किसी भी सार्वजनिक समय-सीमा या अपनी सूचनाओं में उस डोमेन की सामग्री नहीं देखेंगे। उस डोमेन से आपके फॉलोवर्स को हटा दिया जाएगा।",
"confirmations.edit.confirm": "संशोधित करें",
"confirmations.edit.message": "अभी संपादन किया तो वो संदेश मिट जायेगा जिसे आप लिख रहे थे। क्या आप जारी रखना चाहते हैं?",
"confirmations.logout.confirm": "लॉग आउट करें",
"confirmations.logout.message": "आप सुनिश्चित हैं कि लॉगआउट करना चाहते हैं?",
"confirmations.mute.confirm": "शांत",
- "confirmations.mute.explanation": "यह उनसे और पोस्टों का उल्लेख करते हुए उनसे छिपाएगा, लेकिन यह अभी भी उन्हें आपकी पोस्ट देखने और आपको फॉलो करने की अनुमति देगा।",
- "confirmations.mute.message": "क्या आप वाकई {name} को शांत करना चाहते हैं?",
"confirmations.redraft.confirm": "मिटायें और पुनःप्रारूपण करें",
"confirmations.redraft.message": "क्या आप वाकई इस स्टेटस को हटाना चाहते हैं और इसे फिर से ड्राफ्ट करना चाहते हैं? पसंदीदा और बूस्ट खो जाएंगे, और मूल पोस्ट के उत्तर अनाथ हो जाएंगे।",
"confirmations.reply.confirm": "उत्तर दें",
@@ -185,6 +192,7 @@
"conversation.mark_as_read": "पढ़ा गया के रूप में चिह्नित करें",
"conversation.open": "वार्तालाप देखें",
"conversation.with": "{names} के साथ",
+ "copy_icon_button.copied": "क्लिपबोर्ड पर कॉपी किया गया",
"copypaste.copied": "कॉपी किआ जा चूका है",
"copypaste.copy_to_clipboard": "क्लिपबोर्ड पर कॉपी करें",
"directory.federated": "ज्ञात फेडीवर्स से",
@@ -197,6 +205,10 @@
"dismissable_banner.dismiss": "डिसमिस",
"dismissable_banner.explore_links": "इन समाचारों के बारे में लोगों द्वारा इस पर और डेसेंट्रलीसेड नेटवर्क के अन्य सर्वरों पर अभी बात की जा रही है।",
"dismissable_banner.explore_tags": "ये हैशटैग अभी इस पर और डेसेंट्रलीसेड नेटवर्क के अन्य सर्वरों पर लोगों के बीच कर्षण प्राप्त कर रहे हैं।",
+ "domain_block_modal.block": "सर्वर ब्लॉक करें",
+ "domain_block_modal.title": "डोमेन ब्लॉक करें",
+ "domain_pill.server": "सर्वर",
+ "domain_pill.username": "यूज़रनेम",
"embed.instructions": "अपने वेबसाइट पर, निचे दिए कोड को कॉपी करके, इस स्टेटस को एम्बेड करें",
"embed.preview": "यह ऐसा दिखेगा :",
"emoji_button.activity": "गतिविधि",
@@ -266,6 +278,7 @@
"follow_request.authorize": "अधिकार दें",
"follow_request.reject": "अस्वीकार करें",
"follow_requests.unlocked_explanation": "हालाँकि आपका खाता लॉक नहीं है, फिर भी {domain} डोमेन स्टाफ ने सोचा कि आप इन खातों के मैन्युअल अनुरोधों की समीक्षा करना चाहते हैं।",
+ "follow_suggestions.dismiss": "दोबारा न दिखाएं",
"followed_tags": "फॉलो किए गए हैशटैग्स",
"footer.about": "अबाउट",
"footer.directory": "प्रोफाइल्स डायरेक्टरी",
@@ -288,9 +301,6 @@
"hashtag.column_settings.tag_toggle": "Include additional tags in this column",
"hashtag.follow": "हैशटैग को फॉलो करें",
"hashtag.unfollow": "हैशटैग को उनफ़ोल्लोव करें",
- "home.actions.go_to_explore": "देखिए क्या पक रहा है",
- "home.actions.go_to_suggestions": "अनुसरने के लिए लोगो को ढूंढे",
- "home.column_settings.basic": "बुनियादी",
"home.column_settings.show_reblogs": "बूस्ट दिखाए",
"home.column_settings.show_replies": "जवाबों को दिखाए",
"home.hide_announcements": "घोषणाएँ छिपाएँ",
@@ -359,9 +369,6 @@
"lists.replies_policy.none": "कोई नहीं",
"lists.replies_policy.title": "इसके जवाब दिखाएं:",
"lists.subheading": "आपकी सूचियाँ",
- "mute_modal.duration": "अवधि",
- "mute_modal.hide_notifications": "इस सभ्य की ओरसे आनेवाली सूचनाए शांत करे",
- "mute_modal.indefinite": "अनिश्चितकालीन",
"navigation_bar.about": "विवरण",
"navigation_bar.blocks": "ब्लॉक्ड यूज़र्स",
"navigation_bar.bookmarks": "पुस्तकचिह्न:",
@@ -370,7 +377,6 @@
"navigation_bar.direct": "निजी संदेश",
"navigation_bar.discover": "खोजें",
"navigation_bar.domain_blocks": "Hidden domains",
- "navigation_bar.edit_profile": "प्रोफ़ाइल संपादित करें",
"navigation_bar.explore": "अन्वेषण करें",
"navigation_bar.favourites": "पसंदीदा",
"navigation_bar.filters": "वारित शब्द",
@@ -390,8 +396,6 @@
"notifications.clear": "सूचनाएं हटाए",
"notifications.column_settings.admin.report": "नई रिपोर्ट:",
"notifications.column_settings.favourite": "पसंदीदा:",
- "notifications.column_settings.filter_bar.advanced": "सभी श्रेणियाँ दिखाएं",
- "notifications.column_settings.filter_bar.category": "फ़िल्टर बार",
"notifications.column_settings.follow": "नए फ़ॉलोअर्स",
"notifications.column_settings.mention": "उल्लेख:",
"notifications.column_settings.poll": "चुनाव परिणाम",
@@ -440,13 +444,7 @@
"poll.vote": "वोट",
"poll.voted": "आपने इसी उत्तर का चुनाव किया है।",
"privacy.change": "Adjust status privacy",
- "privacy.direct.long": "Post to mentioned users only",
- "privacy.direct.short": "Direct",
- "privacy.private.long": "Post to followers only",
- "privacy.private.short": "Followers-only",
- "privacy.public.long": "सब को दिखाई देगा",
"privacy.public.short": "सार्वजनिक",
- "privacy.unlisted.short": "अनलिस्टेड",
"recommended": "अनुशंसित",
"refresh": "रीफ्रेश करें",
"regeneration_indicator.label": "लोड हो रहा है...",
@@ -503,6 +501,7 @@
"status.delete": "हटाएं",
"status.detailed_status": "विस्तृत वार्ता दृश्य",
"status.direct": "निजी संदेश @{name} से",
+ "status.edited": "पिछला संशोधन {date}",
"status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
"status.media.open": "खोलने के लिए क्लिक करें",
"status.media.show": "दिखाने के लिए क्लिक करें",
@@ -531,7 +530,6 @@
"upload_form.audio_description": "Describe for people with hearing loss",
"upload_form.description": "Describe for the visually impaired",
"upload_form.edit": "संशोधन करें",
- "upload_form.undo": "मिटाए",
"upload_form.video_description": "Describe for people with hearing loss or visual impairment",
"upload_modal.apply": "लागू करें",
"upload_modal.edit_media": "मीडिया में संशोधन करें",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index c535f1affc6bf4..ec8d62dbba5c2c 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -88,7 +88,6 @@
"announcement.announcement": "Najava",
"attachments_list.unprocessed": "(neobrađeno)",
"audio.hide": "Sakrij audio",
- "autosuggest_hashtag.per_week": "{count} tjedno",
"boost_modal.combo": "Možete pritisnuti {combo} kako biste preskočili ovo sljedeći put",
"bundle_column_error.copy_stacktrace": "Kopiraj izvješće o pogrešci",
"bundle_column_error.error.body": "Zaraženu stranicu nije moguće prikazati. To bi moglo biti zbog pogreške u našem kodu ili problema s kompatibilnošću preglednika.",
@@ -140,26 +139,14 @@
"compose_form.lock_disclaimer": "Vaš račun nije {locked}. Svatko Vas može pratiti kako bi vidjeli objave namijenjene Vašim pratiteljima.",
"compose_form.lock_disclaimer.lock": "zaključan",
"compose_form.placeholder": "Što ti je na umu?",
- "compose_form.poll.add_option": "Dodaj opciju",
"compose_form.poll.duration": "Trajanje ankete",
- "compose_form.poll.option_placeholder": "Opcija {number}",
- "compose_form.poll.remove_option": "Ukloni ovu opciju",
"compose_form.poll.switch_to_multiple": "Omogući višestruki odabir opcija ankete",
"compose_form.poll.switch_to_single": "Omogući odabir samo jedne opcije ankete",
- "compose_form.publish": "Objavi",
"compose_form.publish_form": "Objavi",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Spremi promjene",
- "compose_form.sensitive.hide": "Označi medijski sadržaj kao osjetljiv",
- "compose_form.sensitive.marked": "Medijski sadržaj označen je kao osjetljiv",
- "compose_form.sensitive.unmarked": "Medijski sadržaj nije označen kao osjetljiv",
"compose_form.spoiler.marked": "Tekst je skriven iza upozorenja",
"compose_form.spoiler.unmarked": "Tekst nije skriven",
- "compose_form.spoiler_placeholder": "Ovdje upišite upozorenje",
"confirmation_modal.cancel": "Otkaži",
- "confirmations.block.block_and_report": "Blokiraj i prijavi",
"confirmations.block.confirm": "Blokiraj",
- "confirmations.block.message": "Sigurno želite blokirati {name}?",
"confirmations.cancel_follow_request.confirm": "Povuci zahtjev",
"confirmations.delete.confirm": "Obriši",
"confirmations.delete.message": "Stvarno želite obrisati ovaj toot?",
@@ -167,14 +154,11 @@
"confirmations.delete_list.message": "Jeste li sigurni da želite trajno obrisati ovu listu?",
"confirmations.discard_edit_media.confirm": "Odbaciti",
"confirmations.discard_edit_media.message": "Postoje nespremljene promjene u opisu medija ili u pretpregledu, svejedno ih odbaciti?",
- "confirmations.domain_block.confirm": "Blokiraj cijelu domenu",
"confirmations.domain_block.message": "Jeste li zaista, zaista sigurni da želite blokirati cijelu domenu {domain}? U većini slučajeva dovoljno je i preferirano nekoliko ciljanih blokiranja ili utišavanja. Nećete vidjeti sadržaj s te domene ni u kojim javnim vremenskim crtama ili Vašim obavijestima. Vaši pratitelji s te domene bit će uklonjeni.",
"confirmations.edit.confirm": "Uredi",
"confirmations.logout.confirm": "Odjavi se",
"confirmations.logout.message": "Jeste li sigurni da se želite odjaviti?",
"confirmations.mute.confirm": "Utišaj",
- "confirmations.mute.explanation": "Ovo će sakriti njihove objave i objave koje ih spominju, ali i dalje će im dopuštati da vide Vaše objave i da Vas prate.",
- "confirmations.mute.message": "Jeste li sigurni da želite utišati {name}?",
"confirmations.redraft.confirm": "Izbriši i ponovno uredi",
"confirmations.reply.confirm": "Odgovori",
"confirmations.reply.message": "Odgovaranje sada će prepisati poruku koju upravo pišete. Jeste li sigurni da želite nastaviti?",
@@ -272,8 +256,6 @@
"hashtag.column_settings.tag_toggle": "Uključi dodatne oznake za ovaj stupac",
"hashtag.follow": "Prati hashtag",
"hashtag.unfollow": "Prestani pratiti hashtag",
- "home.actions.go_to_explore": "Vidi trendove",
- "home.column_settings.basic": "Osnovno",
"home.column_settings.show_reblogs": "Pokaži boostove",
"home.column_settings.show_replies": "Pokaži odgovore",
"home.hide_announcements": "Sakrij najave",
@@ -336,8 +318,6 @@
"lists.search": "Traži među praćenim ljudima",
"lists.subheading": "Vaše liste",
"media_gallery.toggle_visible": "Sakrij {number, plural, one {sliku} other {slike}}",
- "mute_modal.duration": "Trajanje",
- "mute_modal.hide_notifications": "Sakrij obavijesti ovog korisnika?",
"navigation_bar.about": "O aplikaciji",
"navigation_bar.advanced_interface": "Otvori u naprednom web sučelju",
"navigation_bar.blocks": "Blokirani korisnici",
@@ -346,7 +326,6 @@
"navigation_bar.direct": "Privatna spominjanja",
"navigation_bar.discover": "Istraživanje",
"navigation_bar.domain_blocks": "Blokirane domene",
- "navigation_bar.edit_profile": "Uredi profil",
"navigation_bar.explore": "Istraži",
"navigation_bar.favourites": "Favoriti",
"navigation_bar.filters": "Utišane riječi",
@@ -371,8 +350,6 @@
"notifications.clear": "Očisti obavijesti",
"notifications.clear_confirmation": "Želite li zaista trajno očistiti sve Vaše obavijesti?",
"notifications.column_settings.alert": "Obavijesti radne površine",
- "notifications.column_settings.filter_bar.advanced": "Prikaži sve kategorije",
- "notifications.column_settings.filter_bar.category": "Brza traka filtera",
"notifications.column_settings.follow": "Novi pratitelji:",
"notifications.column_settings.follow_request": "Novi zahtjevi za praćenje:",
"notifications.column_settings.mention": "Spominjanja:",
@@ -415,13 +392,7 @@
"poll_button.add_poll": "Dodaj anketu",
"poll_button.remove_poll": "Ukloni anketu",
"privacy.change": "Podesi privatnost toota",
- "privacy.direct.long": "Vidljivo samo spomenutim korisnicima",
- "privacy.direct.short": "Direct",
- "privacy.private.long": "Vidljivo samo pratiteljima",
- "privacy.private.short": "Followers-only",
- "privacy.public.long": "Vidljivo svima",
"privacy.public.short": "Javno",
- "privacy.unlisted.short": "Neprikazano",
"privacy_policy.last_updated": "Zadnje ažurirannje {date}",
"privacy_policy.title": "Pravila o zaštiti privatnosti",
"recommended": "Preporučeno",
@@ -497,7 +468,6 @@
"status.copy": "Copy link to status",
"status.delete": "Obriši",
"status.edit": "Uredi",
- "status.edited": "Uređeno {date}",
"status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
"status.embed": "Umetni",
"status.filter": "Filtriraj ovu objavu",
@@ -561,10 +531,8 @@
"upload_error.poll": "Prijenos datoteka nije dopušten kod anketa.",
"upload_form.audio_description": "Opišite za ljude sa slabim sluhom",
"upload_form.description": "Opišite za ljude sa slabim vidom",
- "upload_form.description_missing": "Bez opisa",
"upload_form.edit": "Uredi",
"upload_form.thumbnail": "Promijeni pretpregled",
- "upload_form.undo": "Obriši",
"upload_form.video_description": "Opišite za ljude sa slabim sluhom ili vidom",
"upload_modal.analyzing_picture": "Analiza slike…",
"upload_modal.apply": "Primijeni",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 0d50e36feb5b0d..ba7fd6ddc2d802 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -16,7 +16,7 @@
"account.badges.bot": "Automatizált",
"account.badges.group": "Csoport",
"account.block": "@{name} letiltása",
- "account.block_domain": "Domain blokkolása: {domain}",
+ "account.block_domain": "Domain letiltása: {domain}",
"account.block_short": "Letiltás",
"account.blocked": "Letiltva",
"account.browse_more_on_origin_server": "További böngészés az eredeti profilon",
@@ -89,7 +89,14 @@
"announcement.announcement": "Közlemény",
"attachments_list.unprocessed": "(feldolgozatlan)",
"audio.hide": "Hang elrejtése",
- "autosuggest_hashtag.per_week": "{count} hetente",
+ "block_modal.remote_users_caveat": "Arra kérjük a {domain} kiszolgálót, hogy tartsa tiszteletben a döntésedet. Ugyanakkor az együttműködés nem garantált, mivel néhány kiszolgáló másképp kezelheti a letiltásokat. A nyilvános bejegyzések a be nem jelentkezett felhasználók számára továbbra is látszódhatnak.",
+ "block_modal.show_less": "Kevesebb mutatása",
+ "block_modal.show_more": "Több mutatása",
+ "block_modal.they_cant_mention": "Nem említhet meg és nem követhet téged.",
+ "block_modal.they_cant_see_posts": "Nem láthatja a bejegyzéseidet, és te sem fogod látni az övéit.",
+ "block_modal.they_will_know": "Láthatja, hogy le van tiltva.",
+ "block_modal.title": "Letiltsuk a felhasználót?",
+ "block_modal.you_wont_see_mentions": "Nem látsz majd őt említő bejegyzéseket.",
"boost_modal.combo": "Hogy átugord ezt következő alkalommal, használd {combo}",
"bundle_column_error.copy_stacktrace": "Hibajelentés másolása",
"bundle_column_error.error.body": "A kért lap nem jeleníthető meg. Ez lehet, hogy kódhiba, vagy böngészőkompatibitási hiba.",
@@ -114,10 +121,10 @@
"column.community": "Helyi idővonal",
"column.direct": "Személyes említések",
"column.directory": "Profilok böngészése",
- "column.domain_blocks": "Letiltott tartománynevek",
+ "column.domain_blocks": "Letiltott domainek",
"column.favourites": "Kedvencek",
"column.firehose": "Hírfolyamok",
- "column.follow_requests": "Követési kérelmek",
+ "column.follow_requests": "Követési kérések",
"column.home": "Kezdőlap",
"column.lists": "Listák",
"column.mutes": "Némított felhasználók",
@@ -126,8 +133,8 @@
"column.public": "Föderációs idővonal",
"column_back_button.label": "Vissza",
"column_header.hide_settings": "Beállítások elrejtése",
- "column_header.moveLeft_settings": "Oszlop elmozdítása balra",
- "column_header.moveRight_settings": "Oszlop elmozdítása jobbra",
+ "column_header.moveLeft_settings": "Oszlop áthelyezése balra",
+ "column_header.moveRight_settings": "Oszlop áthelyezése jobbra",
"column_header.pin": "Kitűzés",
"column_header.show_settings": "Beállítások megjelenítése",
"column_header.unpin": "Kitűzés eltávolítása",
@@ -136,7 +143,7 @@
"community.column_settings.media_only": "Csak média",
"community.column_settings.remote_only": "Csak távoli",
"compose.language.change": "Nyelv megváltoztatása",
- "compose.language.search": "Nyelv keresése...",
+ "compose.language.search": "Nyelvek keresése…",
"compose.published.body": "A bejegyzés publikálásra került.",
"compose.published.open": "Megnyitás",
"compose.saved.body": "A bejegyzés mentve.",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "A fiókod nincs {locked}. Bárki követni tud, hogy megtekintse a kizárólag követőknek szánt bejegyzéseket.",
"compose_form.lock_disclaimer.lock": "zárolva",
"compose_form.placeholder": "Mi jár a fejedben?",
- "compose_form.poll.add_option": "Lehetőség hozzáadása",
"compose_form.poll.duration": "Szavazás időtartama",
- "compose_form.poll.option_placeholder": "{number}. lehetőség",
- "compose_form.poll.remove_option": "Lehetőség eltávolítása",
+ "compose_form.poll.multiple": "Több lehetőség",
+ "compose_form.poll.option_placeholder": "Válasz {number}",
+ "compose_form.poll.single": "Egyetlen válasz",
"compose_form.poll.switch_to_multiple": "Szavazás megváltoztatása több választásosra",
"compose_form.poll.switch_to_single": "Szavazás megváltoztatása egyetlen választásosra",
- "compose_form.publish": "Közzététel",
+ "compose_form.poll.type": "Stílus",
+ "compose_form.publish": "Bejegyzés",
"compose_form.publish_form": "Új bejegyzés",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Módosítások mentése",
- "compose_form.sensitive.hide": "{count, plural, one {Média kényesnek jelölése} other {Média kényesnek jelölése}}",
- "compose_form.sensitive.marked": "{count, plural, one {A médiát kényesnek jelölték} other {A médiát kényesnek jelölték}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {A médiát nem jelölték kényesnek} other {A médiát nem jelölték kényesnek}}",
+ "compose_form.reply": "Válasz",
+ "compose_form.save_changes": "Frissítés",
"compose_form.spoiler.marked": "Tartalmi figyelmeztetés eltávolítása",
"compose_form.spoiler.unmarked": "Tartalmi figyelmeztetés hozzáadása",
- "compose_form.spoiler_placeholder": "Írd ide a figyelmeztetést",
+ "compose_form.spoiler_placeholder": "Tartalmi figyelmeztetés (opcionális)",
"confirmation_modal.cancel": "Mégsem",
- "confirmations.block.block_and_report": "Letiltás és jelentés",
"confirmations.block.confirm": "Letiltás",
- "confirmations.block.message": "Biztos, hogy letiltod: {name}?",
"confirmations.cancel_follow_request.confirm": "Kérés visszavonása",
"confirmations.cancel_follow_request.message": "Biztos, hogy visszavonod a(z) {name} felhasználóra vonatkozó követési kérésedet?",
"confirmations.delete.confirm": "Törlés",
@@ -173,16 +176,14 @@
"confirmations.delete_list.confirm": "Törlés",
"confirmations.delete_list.message": "Biztos, hogy véglegesen törölni szeretnéd ezt a listát?",
"confirmations.discard_edit_media.confirm": "Elvetés",
- "confirmations.discard_edit_media.message": "Elmentetlen változtatásaid vannak a média leírásában vagy előnézetében. Eldobjuk őket?",
- "confirmations.domain_block.confirm": "Teljes tartomány tiltása",
+ "confirmations.discard_edit_media.message": "Mentetlen változtatásaid vannak a média leírásában vagy előnézetében, mindenképp elveted?",
+ "confirmations.domain_block.confirm": "Kiszolgáló letiltása",
"confirmations.domain_block.message": "Biztos, hogy le szeretnéd tiltani a teljes {domain} domaint? A legtöbb esetben néhány célzott tiltás vagy némítás elegendő, és kívánatosabb megoldás. Semmilyen tartalmat nem fogsz látni ebből a domainből se az idővonalakon, se az értesítésekben. Az ebben a domainben lévő követőidet is eltávolítjuk.",
"confirmations.edit.confirm": "Szerkesztés",
"confirmations.edit.message": "Ha most szerkeszted, ez felülírja a most szerkesztés alatt álló üzenetet. Mégis ezt szeretnéd?",
"confirmations.logout.confirm": "Kijelentkezés",
"confirmations.logout.message": "Biztos, hogy kijelentkezel?",
"confirmations.mute.confirm": "Némítás",
- "confirmations.mute.explanation": "Ez elrejti a tőlük érkező bejegyzéseket, valamint az őket megemlítőket, de ők továbbra is láthatják a te bejegyzéseid, és követhetnek is téged.",
- "confirmations.mute.message": "Biztos, hogy némítod: {name}?",
"confirmations.redraft.confirm": "Törlés és újraírás",
"confirmations.redraft.message": "Biztos, hogy ezt a bejegyzést szeretnéd törölni és újraírni? Minden megtolást és kedvencnek jelölést elvesztesz, az eredetire adott válaszok pedig elárvulnak.",
"confirmations.reply.confirm": "Válasz",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "Ezek jelenleg népszerűvé váló bejegyzések a háló különböző szegleteiből. Az újabb vagy több megtolással rendelkező bejegyzéseket, illetve a kedvencnek jelöléssel rendelkezőeket rangsoroljuk előrébb.",
"dismissable_banner.explore_tags": "Jelenleg ezek a hashtagek hódítanak teret a közösségi weben. Azokat a hashtageket, amelyeket több különböző ember használ, magasabbra rangsorolják.",
"dismissable_banner.public_timeline": "Ezek a legfrissebb nyilvános bejegyzések a közösségi weben, amelyeket {domain} domain felhasználói követnek.",
+ "domain_block_modal.block": "Kiszolgáló letiltása",
+ "domain_block_modal.block_account_instead": "Helyette @{name} letiltása",
+ "domain_block_modal.they_can_interact_with_old_posts": "Az ezen a kiszolgálón lévő emberek interaktálhatnak a régi bejegyzéseiddel.",
+ "domain_block_modal.they_cant_follow": "Erről a kiszolgálóról senki sem követhet.",
+ "domain_block_modal.they_wont_know": "Nem fogja tudni, hogy letiltották.",
+ "domain_block_modal.title": "Letiltsuk a domaint?",
+ "domain_block_modal.you_will_lose_followers": "Az ezen a kiszolgálón lévő összes követődet törölni fogjuk.",
+ "domain_block_modal.you_wont_see_posts": "Nem látsz majd bejegyzéseket vagy értesítéseket ennek a kiszolgálónak a felhasználóitól.",
+ "domain_pill.activitypub_lets_connect": "Lehetővé teszi, hogy kapcsolatba lépj nem csak a Mastodonon, hanem a más közösségi alkalmazásokon lévő emberekkel is.",
+ "domain_pill.activitypub_like_language": "Az ActivityPub olyan mint egy nyelv, amelyet a Mastodon a más közösségi hálózatokkal való kommunikációra használ.",
+ "domain_pill.server": "Kiszolgáló",
+ "domain_pill.their_handle": "A fiókneve:",
+ "domain_pill.their_server": "A digitális otthona, ahol a bejegyzései találhatók.",
+ "domain_pill.their_username": "Az egyedi azonosítója a kiszolgálóján. Lehet, hogy ugyanazon felhasználónév különböző kiszolgálókon is megtalálható.",
+ "domain_pill.username": "Felhasználónév",
+ "domain_pill.whats_in_a_handle": "Mi is egy fióknév?",
+ "domain_pill.who_they_are": "Mivel a fióknevek mondják meg, hogy valaki kicsoda és hol található, így ezek használatával léphetsz kapcsolatba az közösségi hálózatán lévő emberekkel.",
+ "domain_pill.who_you_are": "Mivel a fiókneved mondja meg, hogy ki vagy és hol, így ezek használatával léphetnek kapcsolatba veled az közösségi hálózatán lévő emberek.",
+ "domain_pill.your_handle": "Saját fióknév:",
+ "domain_pill.your_server": "A digitális otthonod, ahol a bejegyzéseid találhatók. Nem tetszik a mostani? Válts kiszolgálót bármikor, és vidd magaddal a követőidet is.",
+ "domain_pill.your_username": "Az egyedi azonosítód ezen a kiszolgálón. Lehet, hogy ugyanazon felhasználónév különböző kiszolgálókon is megtalálható.",
"embed.instructions": "Ágyazd be ezt a bejegyzést a weboldaladba az alábbi kód kimásolásával.",
"embed.preview": "Így fog kinézni:",
"emoji_button.activity": "Tevékenység",
@@ -233,7 +255,7 @@
"empty_column.bookmarked_statuses": "Még nincs egyetlen könyvjelzőzött bejegyzésed sem. Ha könyvjelzőzöl egyet, itt fog megjelenni.",
"empty_column.community": "A helyi idővonal üres. Tégy közzé valamit nyilvánosan, hogy elindítsd az eseményeket!",
"empty_column.direct": "Még nincs egy személyes említésed sem. Küldéskor vagy fogadáskor itt fognak megjelenni.",
- "empty_column.domain_blocks": "Még nem lett letiltva egyetlen tartomány sem.",
+ "empty_column.domain_blocks": "Még nem lett letiltva egyetlen domain sem.",
"empty_column.explore_statuses": "Jelenleg semmi sem felkapott. Nézz vissza később!",
"empty_column.favourited_statuses": "Még nincs egyetlen kedvenc bejegyzésed sem. Ha kedvencnek jelölsz egyet, itt fog megjelenni.",
"empty_column.favourites": "Még senki sem jelölte ezt a bejegyzést kedvencnek. Ha valaki mégis megteszi, itt fogjuk mutatni.",
@@ -244,6 +266,7 @@
"empty_column.list": "A lista jelenleg üres. Ha a listatagok bejegyzést tesznek közzé, itt fog megjelenni.",
"empty_column.lists": "Még nincs egyetlen listád sem. Ha létrehozol egyet, itt fog megjelenni.",
"empty_column.mutes": "Még egy felhasználót sem némítottál le.",
+ "empty_column.notification_requests": "Minden tiszta! Itt nincs semmi. Ha új értesítéseket kapsz, azok itt jelennek meg a beállításoknak megfelelően.",
"empty_column.notifications": "Jelenleg még nincsenek értesítéseid. Ha mások kapcsolatba lépnek veled, ezek itt lesznek láthatóak.",
"empty_column.public": "Jelenleg itt nincs semmi! Írj valamit nyilvánosan vagy kövess más kiszolgálón levő felhasználókat, hogy megtöltsd.",
"error.unexpected_crash.explanation": "Egy kód- vagy böngészőkompatibilitási hiba miatt ez az oldal nem jeleníthető meg helyesen.",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "Válassz egy meglévő kategóriát, vagy hozz létre egy újat",
"filter_modal.select_filter.title": "E bejegyzés szűrése",
"filter_modal.title.status": "Egy bejegyzés szűrése",
+ "filtered_notifications_banner.mentions": "{count, plural, one {említés} other {említés}}",
+ "filtered_notifications_banner.pending_requests": "Értesítések {count, plural, =0 {nincsenek} one {egy valósztínűleg ismerős személytől} other {# valószínűleg ismerős személytől}}",
+ "filtered_notifications_banner.title": "Szűrt értesítések",
"firehose.all": "Összes",
"firehose.local": "Ez a kiszolgáló",
"firehose.remote": "Egyéb kiszolgálók",
"follow_request.authorize": "Hitelesítés",
"follow_request.reject": "Elutasítás",
"follow_requests.unlocked_explanation": "Bár a fiókod nincs zárolva, a(z) {domain} csapata úgy gondolta, hogy talán kézzel szeretnéd ellenőrizni ezen fiókok követési kéréseit.",
+ "follow_suggestions.curated_suggestion": "A stáb választása",
+ "follow_suggestions.dismiss": "Ne jelenjen meg újra",
+ "follow_suggestions.featured_longer": "A {domain} csapata által kézzel kiválasztott",
+ "follow_suggestions.friends_of_friends_longer": "Népszerű az általad követett emberek körében",
+ "follow_suggestions.hints.featured": "Ezt a profilt a(z) {domain} csapata választotta ki.",
+ "follow_suggestions.hints.friends_of_friends": "Ez a profil népszerű az általad követett emberek körében.",
+ "follow_suggestions.hints.most_followed": "Ez a profil a leginkább követett a(z) {domain} oldalon.",
+ "follow_suggestions.hints.most_interactions": "Ez a profil mostanában sok figyelmet kap a(z) {domain} oldalon.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Ez a profil hasonló azokhoz a profilokhoz, melyeket nemrég kezdtél el követni.",
+ "follow_suggestions.personalized_suggestion": "Személyre szabott javaslat",
+ "follow_suggestions.popular_suggestion": "Népszerű javaslat",
+ "follow_suggestions.popular_suggestion_longer": "Népszerű itt: {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Hasonló azokhoz a profilokhoz, melyeket nemrég követtél be",
+ "follow_suggestions.view_all": "Összes megtekintése",
+ "follow_suggestions.who_to_follow": "Kit érdemes követni",
"followed_tags": "Követett hashtagek",
"footer.about": "Névjegy",
"footer.directory": "Profiltár",
@@ -306,20 +347,15 @@
"hashtag.follow": "Hashtag követése",
"hashtag.unfollow": "Hashtag követésének megszüntetése",
"hashtags.and_other": "…és {count, plural, other {# további}}",
- "home.actions.go_to_explore": "Felkapottak megtekintése",
- "home.actions.go_to_suggestions": "Követhetők keresése",
- "home.column_settings.basic": "Általános",
"home.column_settings.show_reblogs": "Megtolások megjelenítése",
"home.column_settings.show_replies": "Válaszok megjelenítése",
- "home.explore_prompt.body": "A saját hírfolyam a követésre kiválasztott hashtagek, a követésre kiválasztott személyek és az általuk népszerűsített bejegyzések keverékét tartalmazza. Ha csendesnek tűnik, akkor megpróbálhatod ezeket:",
- "home.explore_prompt.title": "Ez a kezdőpontod a Mastodonon belül.",
"home.hide_announcements": "Közlemények elrejtése",
"home.pending_critical_update.body": "A lehető leghamarabb frissítsd a Mastodon kiszolgálódat!",
"home.pending_critical_update.link": "Frissítések megtekintése",
"home.pending_critical_update.title": "Kritikus biztonsági frissítés érhető el!",
"home.show_announcements": "Közlemények megjelenítése",
"interaction_modal.description.favourite": "Egy Mastodon fiókkal kedvencnek jelölheted ezt a bejegyzést, tudatva a szerzővel, hogy értékeled és elteszed későbbre.",
- "interaction_modal.description.follow": "Egy Mastodon fiókkal bekövetheted {name} fiókot, hogy lásd a bejegyzéseit a saját hírfolyamodban.",
+ "interaction_modal.description.follow": "Egy Mastodon-fiókkal követheted {name} fiókját, hogy lásd a bejegyzéseit a kezdőlapodon.",
"interaction_modal.description.reblog": "Egy Mastodon fiókkal megtolhatod ezt a bejegyzést, hogy megoszd a saját követőiddel.",
"interaction_modal.description.reply": "Egy Mastodon fiókkal válaszolhatsz erre a bejegyzésre.",
"interaction_modal.login.action": "Vigyen haza",
@@ -396,9 +432,15 @@
"loading_indicator.label": "Betöltés…",
"media_gallery.toggle_visible": "{number, plural, one {Kép elrejtése} other {Képek elrejtése}}",
"moved_to_account_banner.text": "A(z) {disabledAccount} fiókod jelenleg le van tiltva, mert átköltöztél ide: {movedToAccount}.",
- "mute_modal.duration": "Időtartam",
- "mute_modal.hide_notifications": "Rejtsük el a felhasználótól származó értesítéseket?",
- "mute_modal.indefinite": "Határozatlan",
+ "mute_modal.hide_from_notifications": "Elrejtés az értesítések közül",
+ "mute_modal.hide_options": "Beállítások elrejtése",
+ "mute_modal.indefinite": "Amíg nem oldom fel a némítást",
+ "mute_modal.show_options": "Beállítások megjelenítése",
+ "mute_modal.they_can_mention_and_follow": "Megemlíthet vagy követhet téged, de te nem fogod ezeket látni.",
+ "mute_modal.they_wont_know": "Nem fogja tudni, hogy lenémítottad.",
+ "mute_modal.title": "Elnémítsuk a felhasználót?",
+ "mute_modal.you_wont_see_mentions": "Nem látsz majd őt említő bejegyzéseket.",
+ "mute_modal.you_wont_see_posts": "Továbbra is látni fogja a bejegyzéseidet, de te nem fogod látni az övéit.",
"navigation_bar.about": "Névjegy",
"navigation_bar.advanced_interface": "Megnyitás a speciális webes felületben",
"navigation_bar.blocks": "Letiltott felhasználók",
@@ -407,8 +449,7 @@
"navigation_bar.compose": "Új bejegyzés írása",
"navigation_bar.direct": "Személyes említések",
"navigation_bar.discover": "Felfedezés",
- "navigation_bar.domain_blocks": "Letiltott tartományok",
- "navigation_bar.edit_profile": "Profil szerkesztése",
+ "navigation_bar.domain_blocks": "Letiltott domainek",
"navigation_bar.explore": "Felfedezés",
"navigation_bar.favourites": "Kedvencek",
"navigation_bar.filters": "Némított szavak",
@@ -432,11 +473,29 @@
"notification.follow": "{name} követ téged",
"notification.follow_request": "{name} követni szeretne téged",
"notification.mention": "{name} megemlített",
+ "notification.moderation-warning.learn_more": "További információ",
+ "notification.moderation_warning": "Moderációs figyelmeztetést kaptál",
+ "notification.moderation_warning.action_delete_statuses": "Néhány bejegyzésedet eltávolították.",
+ "notification.moderation_warning.action_disable": "A fiókod le van tiltva.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Néhány bejegyzésedet kényesnek jelölték.",
+ "notification.moderation_warning.action_none": "A fiókod moderációs figyelmeztetést kapott.",
+ "notification.moderation_warning.action_sensitive": "A bejegyzéseid mostantól érzékenynek lesznek jelölve.",
+ "notification.moderation_warning.action_silence": "A fiókod korlátozásra került.",
+ "notification.moderation_warning.action_suspend": "A fiókod felfüggesztésre került.",
"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.relationships_severance_event": "Elvesztek a kapcsolatok vele: {name}",
+ "notification.relationships_severance_event.account_suspension": "Egy admin a(z) {from} kiszolgálóról felfüggesztette {target} fiókját, ami azt jelenti, hogy mostantól nem fogsz róla értesítést kapni, és nem fogsz tudni vele kapcsolatba lépni.",
+ "notification.relationships_severance_event.domain_block": "Egy admin a(z) {from} kiszolgálón letiltotta {target} domaint, beleértve {followersCount} követőt és {followingCount, plural, one {#} other {#}} követett fiókot.",
+ "notification.relationships_severance_event.learn_more": "További információk",
+ "notification.relationships_severance_event.user_domain_block": "Letiltottad a(z) {target} domaint, ezzel eltávolítva {followersCount} követőt és {followingCount, plural, one {#} other {#}} követett fiókot.",
"notification.status": "{name} bejegyzést tett közzé",
"notification.update": "{name} szerkesztett egy bejegyzést",
+ "notification_requests.accept": "Elfogadás",
+ "notification_requests.dismiss": "Elvetés",
+ "notification_requests.notifications_from": "{name} értesítései",
+ "notification_requests.title": "Szűrt értesítések",
"notifications.clear": "Értesítések törlése",
"notifications.clear_confirmation": "Biztos, hogy véglegesen törölni akarod az összes értesítésed?",
"notifications.column_settings.admin.report": "Új jelentések:",
@@ -445,9 +504,8 @@
"notifications.column_settings.favourite": "Kedvencek:",
"notifications.column_settings.filter_bar.advanced": "Minden kategória megjelenítése",
"notifications.column_settings.filter_bar.category": "Gyorsszűrő sáv",
- "notifications.column_settings.filter_bar.show_bar": "Szűrősáv megjelenítése",
"notifications.column_settings.follow": "Új követők:",
- "notifications.column_settings.follow_request": "Új követési kérelmek:",
+ "notifications.column_settings.follow_request": "Új követési kérések:",
"notifications.column_settings.mention": "Megemlítések:",
"notifications.column_settings.poll": "Szavazási eredmények:",
"notifications.column_settings.push": "Leküldéses értesítések",
@@ -471,6 +529,15 @@
"notifications.permission_denied": "Az asztali értesítések nem érhetők el a korábban elutasított böngészőengedély-kérelem miatt",
"notifications.permission_denied_alert": "Az asztali értesítések nem engedélyezhetők a korábban elutasított böngésző engedély miatt",
"notifications.permission_required": "Az asztali értesítések nem érhetőek el, mivel a szükséges engedély nem lett megadva.",
+ "notifications.policy.filter_new_accounts.hint": "Az elmúlt {days, plural, one {napban} other {# napban}} létrehozva",
+ "notifications.policy.filter_new_accounts_title": "Új fiókok",
+ "notifications.policy.filter_not_followers_hint": "Beleértve azokat, akik kevesebb mint {days, plural, one {egy napja} other {# napja}} követnek",
+ "notifications.policy.filter_not_followers_title": "Olyan emberek, akik nem követnek",
+ "notifications.policy.filter_not_following_hint": "Amíg kézileg jóvá nem hagyod őket",
+ "notifications.policy.filter_not_following_title": "Nem követett emberek",
+ "notifications.policy.filter_private_mentions_hint": "Kiszűrve, hacsak nem a saját említésedre válaszol, vagy ha nem követed a feladót",
+ "notifications.policy.filter_private_mentions_title": "Kéretlen személyes említések",
+ "notifications.policy.title": "Feladó értesítéseinek kiszűrése…",
"notifications_permission_banner.enable": "Asztali értesítések engedélyezése",
"notifications_permission_banner.how_to_control": "Ahhoz, hogy értesítéseket kapj akkor, amikor a Mastodon nincs megnyitva, engedélyezd az asztali értesítéseket. Pontosan be tudod állítani, hogy milyen interakciókról értesülj a fenti {icon} gombon keresztül, ha egyszer már engedélyezted őket.",
"notifications_permission_banner.title": "Soha ne mulassz el semmit",
@@ -498,14 +565,14 @@
"onboarding.share.next_steps": "Lehetséges következő lépések:",
"onboarding.share.title": "Profil megosztása",
"onboarding.start.lead": "Az új Mastodon-fiók használatra kész. Így hozhatod ki belőle a legtöbbet:",
- "onboarding.start.skip": "Szeretnél előreugrani?",
+ "onboarding.start.skip": "Nincs szükséged segítségre a kezdéshez?",
"onboarding.start.title": "Ez sikerült!",
"onboarding.steps.follow_people.body": "A Mastodon az érdekes emberek követéséről szól.",
- "onboarding.steps.follow_people.title": "{count, plural, one {egy ember} other {# ember}} követése",
- "onboarding.steps.publish_status.body": "Üdvözöljük a világot.",
+ "onboarding.steps.follow_people.title": "Szabd személyre a kezdőlapodat",
+ "onboarding.steps.publish_status.body": "Köszöntsd a világot szöveggel, fotókkal, videókkal vagy szavazásokkal {emoji}",
"onboarding.steps.publish_status.title": "Az első bejegyzés létrehozása",
- "onboarding.steps.setup_profile.body": "Mások nagyobb valószínűséggel lépnek kapcsolatba veled egy kitöltött profil esetén.",
- "onboarding.steps.setup_profile.title": "Profilod testreszabása",
+ "onboarding.steps.setup_profile.body": "Növeld az interakciók számát a profilod részletesebb kitöltésével.",
+ "onboarding.steps.setup_profile.title": "Szabd személyre a profilodat",
"onboarding.steps.share_profile.body": "Tudasd az ismerőseiddel, hogyan találhatnak meg a Mastodonon",
"onboarding.steps.share_profile.title": "Oszd meg a Mastodon profilodat",
"onboarding.tips.2fa": "Tudtad? A fiókod biztonságossá teheted, ha a fiók beállításaiban beállítod a kétlépcsős hitelesítést. Bármilyen választott TOTP alkalmazással működik, nincs szükség telefonszámra!",
@@ -526,14 +593,15 @@
"poll_button.add_poll": "Új szavazás",
"poll_button.remove_poll": "Szavazás eltávolítása",
"privacy.change": "Bejegyzés láthatóságának módosítása",
- "privacy.direct.long": "Csak a megemlített felhasználóknak látható",
- "privacy.direct.short": "Csak megemlítetteknek",
- "privacy.private.long": "Csak követőknek látható",
- "privacy.private.short": "Csak követők",
- "privacy.public.long": "Mindenki számára látható",
+ "privacy.direct.long": "Mindenki, akit a bejegyzés említ",
+ "privacy.direct.short": "Megadott személyek",
+ "privacy.private.long": "Csak a követőid",
+ "privacy.private.short": "Követők",
+ "privacy.public.long": "Bárki a Mastodonon és azon kívül",
"privacy.public.short": "Nyilvános",
- "privacy.unlisted.long": "Mindenki számára látható, de kimarad a felfedezős funkciókból",
- "privacy.unlisted.short": "Listázatlan",
+ "privacy.unlisted.additional": "Ez pontosan úgy viselkedik, mint a nyilvános, kivéve, hogy a bejegyzés nem jelenik meg élő hírfolyamokban, hashtagekben, felfedezésben vagy a Mastodonos keresésben, még akkor sem, ha ezt az egész fiókra engedélyezted.",
+ "privacy.unlisted.long": "Kevesebb algoritmikus fanfár",
+ "privacy.unlisted.short": "Csendes nyilvános",
"privacy_policy.last_updated": "Utoljára frissítve: {date}",
"privacy_policy.title": "Adatvédelmi szabályzat",
"recommended": "Ajánlott",
@@ -551,7 +619,9 @@
"relative_time.minutes": "{number}p",
"relative_time.seconds": "{number}mp",
"relative_time.today": "ma",
+ "reply_indicator.attachments": "{count, plural, one {# melléklet} other {# melléklet}}",
"reply_indicator.cancel": "Mégsem",
+ "reply_indicator.poll": "Szavazás",
"report.block": "Letiltás",
"report.block_explanation": "Nem fogod látni a bejegyzéseit. Nem fogja tudni megnézni a bejegyzéseidet és nem fog tudni követni sem. Azt is meg fogja tudni mondani, hogy letiltottad.",
"report.categories.legal": "Jogi információk",
@@ -644,10 +714,11 @@
"status.direct": "@{name} személyes említése",
"status.direct_indicator": "Személyes említés",
"status.edit": "Szerkesztés",
- "status.edited": "Szerkesztve: {date}",
+ "status.edited": "Utoljára szerkesztve {date}",
"status.edited_x_times": "{count, plural, one {{count} alkalommal} other {{count} alkalommal}} szerkesztve",
"status.embed": "Beágyazás",
"status.favourite": "Kedvenc",
+ "status.favourites": "{count, plural, one {kedvenc} other {kedvenc}}",
"status.filter": "E bejegyzés szűrése",
"status.filtered": "Megszűrt",
"status.hide": "Bejegyzés elrejtése",
@@ -668,6 +739,7 @@
"status.reblog": "Megtolás",
"status.reblog_private": "Megtolás az eredeti közönségnek",
"status.reblogged_by": "{name} megtolta",
+ "status.reblogs": "{count, plural, one {megtolás} other {megtolás}}",
"status.reblogs.empty": "Senki sem tolta még meg ezt a bejegyzést. Ha valaki megteszi, itt fog megjelenni.",
"status.redraft": "Törlés és újraírás",
"status.remove_bookmark": "Könyvjelző eltávolítása",
@@ -715,10 +787,8 @@
"upload_error.poll": "Szavazásnál nem lehet fájlt feltölteni.",
"upload_form.audio_description": "Leírás siket vagy hallássérült emberek számára",
"upload_form.description": "Leírás vak vagy gyengénlátó emberek számára",
- "upload_form.description_missing": "Nincs leírás megadva",
"upload_form.edit": "Szerkesztés",
"upload_form.thumbnail": "Bélyegkép megváltoztatása",
- "upload_form.undo": "Törlés",
"upload_form.video_description": "Leírás siket, hallássérült, vak vagy gyengénlátó emberek számára",
"upload_modal.analyzing_picture": "Kép elemzése…",
"upload_modal.apply": "Alkalmaz",
@@ -730,9 +800,9 @@
"upload_modal.hint": "Kattints vagy húzd a kört az előnézetben arra a fókuszpontra, mely minden bélyegképen látható kell, hogy legyen.",
"upload_modal.preparing_ocr": "OCR előkészítése…",
"upload_modal.preview_label": "Előnézet ({ratio})",
- "upload_progress.label": "Feltöltés...",
+ "upload_progress.label": "Feltöltés…",
"upload_progress.processing": "Feldolgozás…",
- "username.taken": "Ez a felhasználónév foglalt. Válassz másikat",
+ "username.taken": "Ez a felhasználónév foglalt. Válassz másikat.",
"video.close": "Videó bezárása",
"video.download": "Fájl letöltése",
"video.exit_fullscreen": "Kilépés teljes képernyőből",
@@ -742,5 +812,5 @@
"video.mute": "Hang némítása",
"video.pause": "Szünet",
"video.play": "Lejátszás",
- "video.unmute": "Hang némításának vége"
+ "video.unmute": "Hang némításának feloldása"
}
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index 835105218d5218..7310104bf932f4 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -70,7 +70,6 @@
"alert.unexpected.title": "Վա՜յ",
"announcement.announcement": "Յայտարարութիւններ",
"audio.hide": "Թաքցնել աուդիոն",
- "autosuggest_hashtag.per_week": "շաբաթը՝ {count}",
"boost_modal.combo": "Կարող ես սեղմել {combo}՝ սա յաջորդ անգամ բաց թողնելու համար",
"bundle_column_error.error.title": "Օ՜, ոչ։",
"bundle_column_error.network.title": "Ցանցի սխալ",
@@ -117,40 +116,25 @@
"compose_form.lock_disclaimer": "Քո հաշիւը {locked} չէ։ Իւրաքանչիւրութիւն ոք կարող է հետեւել քեզ եւ տեսնել միայն հետեւողների համար նախատեսուած գրառումները։",
"compose_form.lock_disclaimer.lock": "փակ",
"compose_form.placeholder": "Ի՞նչ կայ մտքիդ",
- "compose_form.poll.add_option": "Աւելացնել տարբերակ",
"compose_form.poll.duration": "Հարցման տեւողութիւնը",
- "compose_form.poll.option_placeholder": "Տարբերակ {number}",
- "compose_form.poll.remove_option": "Հեռացնել այս տարբերակը",
"compose_form.poll.switch_to_multiple": "Հարցումը դարձնել բազմակի ընտրութեամբ",
"compose_form.poll.switch_to_single": "Հարցումը դարձնել եզակի ընտրութեամբ",
- "compose_form.publish": "Հրապարակել",
"compose_form.publish_form": "Հրապարակել",
- "compose_form.publish_loud": "Հրապարակե՜լ",
- "compose_form.save_changes": "Պահպանել փոփոխութիւնները",
- "compose_form.sensitive.hide": "Նշել մեդիան որպէս դիւրազգաց",
- "compose_form.sensitive.marked": "Մեդիան նշուած է որպէս դիւրազգաց",
- "compose_form.sensitive.unmarked": "Մեդիան նշուած չէ որպէս դիւրազգաց",
"compose_form.spoiler.marked": "Տեքստը թաքցուած է զգուշացման ետեւում",
"compose_form.spoiler.unmarked": "Տեքստը թաքցուած չէ",
- "compose_form.spoiler_placeholder": "Գրիր նախազգուշացումդ այստեղ",
"confirmation_modal.cancel": "Չեղարկել",
- "confirmations.block.block_and_report": "Արգելափակել եւ բողոքել",
"confirmations.block.confirm": "Արգելափակել",
- "confirmations.block.message": "Վստա՞հ ես, որ ուզում ես արգելափակել {name}֊ին։",
"confirmations.cancel_follow_request.confirm": "Կասեցնել հայցը",
"confirmations.delete.confirm": "Ջնջել",
"confirmations.delete.message": "Վստա՞հ ես, որ ուզում ես ջնջել այս գրառումը։",
"confirmations.delete_list.confirm": "Ջնջել",
"confirmations.delete_list.message": "Վստա՞հ ես, որ ուզում ես մշտապէս ջնջել այս ցանկը։",
"confirmations.discard_edit_media.confirm": "Չեղարկել",
- "confirmations.domain_block.confirm": "Թաքցնել ամբողջ տիրույթը",
"confirmations.domain_block.message": "Հաստատ֊հաստա՞տ վստահ ես, որ ուզում ես արգելափակել ամբողջ {domain} տիրոյթը։ Սովորաբար մի երկու թիրախաւորուած արգելափակում կամ լռեցում բաւական է ու նախընտրելի։",
"confirmations.edit.confirm": "Խմբագրել",
"confirmations.logout.confirm": "Ելք",
"confirmations.logout.message": "Համոզո՞ւած ես, որ ուզում ես դուրս գալ",
"confirmations.mute.confirm": "Լռեցնել",
- "confirmations.mute.explanation": "Սա թաքցնելու ա իրենց գրառումներն, ինչպէս նաեւ իրենց նշող գրառումներն, բայց իրենք միեւնոյն է կը կարողանան հետեւել ձեզ եւ տեսնել ձեր գրառումները։",
- "confirmations.mute.message": "Վստա՞հ ես, որ ուզում ես {name}֊ին լռեցնել։",
"confirmations.redraft.confirm": "Ջնջել եւ խմբագրել նորից",
"confirmations.reply.confirm": "Պատասխանել",
"confirmations.reply.message": "Այս պահին պատասխանելը կը չեղարկի ձեր՝ այս պահին անաւարտ հաղորդագրութիւնը։ Համոզուա՞ծ էք։",
@@ -246,7 +230,6 @@
"hashtag.column_settings.tag_toggle": "Ներառել լրացուցիչ պիտակները այս սիւնակում ",
"hashtag.follow": "Հետեւել պիտակին",
"hashtag.unfollow": "Չհետեւել պիտակին",
- "home.column_settings.basic": "Հիմնական",
"home.column_settings.show_reblogs": "Ցուցադրել տարածածները",
"home.column_settings.show_replies": "Ցուցադրել պատասխանները",
"home.hide_announcements": "Թաքցնել յայտարարութիւնները",
@@ -314,9 +297,6 @@
"lists.subheading": "Քո ցանկերը",
"load_pending": "{count, plural, one {# նոր նիւթ} other {# նոր նիւթ}}",
"media_gallery.toggle_visible": "Ցուցադրել/թաքցնել",
- "mute_modal.duration": "Տեւողութիւն",
- "mute_modal.hide_notifications": "Թաքցնե՞լ ծանուցումներն այս օգտատիրոջից։",
- "mute_modal.indefinite": "Անժամկէտ",
"navigation_bar.about": "Մասին",
"navigation_bar.blocks": "Արգելափակուած օգտատէրեր",
"navigation_bar.bookmarks": "Էջանիշեր",
@@ -325,7 +305,6 @@
"navigation_bar.direct": "Մասնաւոր յիշատակումներ",
"navigation_bar.discover": "Բացայայտել",
"navigation_bar.domain_blocks": "Թաքցուած տիրոյթներ",
- "navigation_bar.edit_profile": "Խմբագրել հաշիւը",
"navigation_bar.explore": "Բացայայտել",
"navigation_bar.favourites": "Հաւանածներ",
"navigation_bar.filters": "Լռեցուած բառեր",
@@ -357,9 +336,6 @@
"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.filter_bar.show_bar": "Ցոյց տալ զտման պանելը",
"notifications.column_settings.follow": "Նոր հետեւողներ՝",
"notifications.column_settings.follow_request": "Նոր հետեւելու հայցեր:",
"notifications.column_settings.mention": "Նշումներ՝",
@@ -414,13 +390,7 @@
"poll_button.add_poll": "Աւելացնել հարցում",
"poll_button.remove_poll": "Հեռացնել հարցումը",
"privacy.change": "Կարգաւորել գրառման գաղտնիութիւնը",
- "privacy.direct.long": "Կը տեսնեն միայն նշուած օգտատէրերը",
- "privacy.direct.short": "Direct",
- "privacy.private.long": "Կը տեսնեն միայն հետեւորդները",
- "privacy.private.short": "Միայն հետեւողները",
- "privacy.public.long": "Տեսանելի բոլորին",
"privacy.public.short": "Հրապարակային",
- "privacy.unlisted.short": "Ծածուկ",
"privacy_policy.last_updated": "Վերջին անգամ թարմացուել է՝ {date}",
"privacy_policy.title": "Գաղտնիութեան քաղաքականութիւն",
"refresh": "Թարմացնել",
@@ -489,7 +459,6 @@
"status.direct": "Մասնաւոր յիշատակում @{name}",
"status.direct_indicator": "Մասնաւոր յիշատակում",
"status.edit": "Խմբագրել",
- "status.edited": "Խմբագրուել է՝ {date}",
"status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
"status.embed": "Ներդնել",
"status.favourite": "Հավանել",
@@ -556,7 +525,6 @@
"upload_form.description": "Նկարագիր՝ տեսողական խնդիրներ ունեցողների համար",
"upload_form.edit": "Խմբագրել",
"upload_form.thumbnail": "Փոխել պատկերակը",
- "upload_form.undo": "Յետարկել",
"upload_form.video_description": "Նկարագրիր տեսանիւթը լսողական կամ տեսողական խնդիրներով անձանց համար",
"upload_modal.analyzing_picture": "Լուսանկարի վերլուծում…",
"upload_modal.apply": "Կիրառել",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index a660eb77ff592b..47c64e3f0dde88 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -2,116 +2,194 @@
"about.blocks": "Servitores moderate",
"about.contact": "Contacto:",
"about.disclaimer": "Mastodon es software libere, de codice aperte, e un marca de Mastodon gGmbH.",
+ "about.domain_blocks.no_reason_available": "Ration non disponibile",
+ "about.domain_blocks.preamble": "Mastodon generalmente permitte vider le contento de, e interager con, usatores de qualcunque altere servitor in le fediverso. Istes es le exceptiones que ha essite facite sur iste servitor particular.",
+ "about.domain_blocks.silenced.explanation": "Generalmente, tu non videra le profilos e le contento de iste servitor, excepte si tu expressemente cerca le contento o seque le profilos.",
+ "about.domain_blocks.silenced.title": "Limitate",
+ "about.domain_blocks.suspended.explanation": "Nulle datos de iste servitor essera processate, immagazinate o excambiate, rendente omne interaction o communication con usatores de iste servitor impossibile.",
+ "about.domain_blocks.suspended.title": "Suspendite",
+ "about.not_available": "Iste information non ha essite rendite disponibile sur iste servitor.",
+ "about.powered_by": "Rete social decentralisate, actionate per {mastodon}",
"about.rules": "Regulas del servitor",
"account.account_note_header": "Nota",
- "account.add_or_remove_from_list": "Adder o remover ab listas",
+ "account.add_or_remove_from_list": "Adder a, o remover de listas",
+ "account.badges.bot": "Automatisate",
"account.badges.group": "Gruppo",
"account.block": "Blocar @{name}",
+ "account.block_domain": "Blocar dominio {domain}",
"account.block_short": "Blocar",
"account.blocked": "Blocate",
- "account.browse_more_on_origin_server": "Navigar plus sur le profilo original",
+ "account.browse_more_on_origin_server": "Percurrer plus sur le profilo original",
+ "account.cancel_follow_request": "Cancellar sequimento",
"account.copy": "Copiar ligamine a profilo",
+ "account.direct": "Mentionar privatemente @{name}",
+ "account.disable_notifications": "Non plus notificar me quando @{name} publica",
"account.domain_blocked": "Dominio blocate",
"account.edit_profile": "Modificar profilo",
- "account.enable_notifications": "Notifica me quando @{name} publica",
+ "account.enable_notifications": "Notificar me quando @{name} publica",
"account.endorse": "Evidentiar sur le profilo",
- "account.featured_tags.last_status_at": "Ultime message in {date}",
- "account.featured_tags.last_status_never": "Necun messages",
+ "account.featured_tags.last_status_at": "Ultime message publicate le {date}",
+ "account.featured_tags.last_status_never": "Necun message",
"account.featured_tags.title": "Hashtags eminente de {name}",
"account.follow": "Sequer",
- "account.follow_back": "Sequer etiam",
+ "account.follow_back": "Sequer in retorno",
"account.followers": "Sequitores",
- "account.followers.empty": "Iste usator ancora non ha sequitores.",
+ "account.followers.empty": "Necuno seque ancora iste usator.",
"account.followers_counter": "{count, plural, one {{counter} sequitor} other {{counter} sequitores}}",
"account.following": "Sequente",
+ "account.following_counter": "{count, plural, one {{counter} sequite} other {{counter} sequites}}",
+ "account.follows.empty": "Iste usator non seque ancora alcuno.",
"account.go_to_profile": "Vader al profilo",
- "account.hide_reblogs": "Celar boosts de @{name}",
+ "account.hide_reblogs": "Celar impulsos de @{name}",
+ "account.in_memoriam": "In memoriam.",
+ "account.joined_short": "Inscribite",
"account.languages": "Cambiar le linguas subscribite",
- "account.link_verified_on": "Le proprietate de iste ligamine esseva verificate le {date}",
- "account.locked_info": "Le stato de confidentialitate de iste conto es definite a blocate. Le proprietario revisa manualmente qui pote sequer lo.",
+ "account.link_verified_on": "Le proprietate de iste ligamine ha essite verificate le {date}",
+ "account.locked_info": "Le stato de confidentialitate de iste conto es definite como serrate. Le proprietario determina manualmente qui pote sequer le.",
+ "account.media": "Multimedia",
"account.mention": "Mentionar @{name}",
- "account.moved_to": "{name} indicava que lor nove conto ora es:",
+ "account.moved_to": "{name} ha indicate que su nove conto ora es:",
"account.mute": "Silentiar @{name}",
"account.mute_notifications_short": "Silentiar le notificationes",
"account.mute_short": "Silentiar",
"account.muted": "Silentiate",
+ "account.mutual": "Mutue",
"account.no_bio": "Nulle description fornite.",
"account.open_original_page": "Aperir le pagina original",
"account.posts": "Messages",
"account.posts_with_replies": "Messages e responsas",
+ "account.report": "Signalar @{name}",
+ "account.requested": "Attendente le approbation. Clicca pro cancellar le requesta de sequer",
+ "account.requested_follow": "{name} ha requestate de sequer te",
"account.share": "Compartir profilo de @{name}",
- "account.show_reblogs": "Monstrar responsas de @{name}",
+ "account.show_reblogs": "Monstrar impulsos de @{name}",
+ "account.statuses_counter": "{count, plural, one {{counter} message} other {{counter} messages}}",
"account.unblock": "Disblocar @{name}",
"account.unblock_domain": "Disblocar dominio {domain}",
"account.unblock_short": "Disblocar",
"account.unendorse": "Non evidentiar sur le profilo",
+ "account.unfollow": "Non plus sequer",
"account.unmute": "Non plus silentiar @{name}",
"account.unmute_notifications_short": "Non plus silentiar le notificationes",
"account.unmute_short": "Non plus silentiar",
"account_note.placeholder": "Clicca pro adder un nota",
+ "admin.dashboard.daily_retention": "Retention de usatores per die post inscription",
+ "admin.dashboard.monthly_retention": "Retention de usatores per mense post inscription",
+ "admin.dashboard.retention.average": "Media",
+ "admin.dashboard.retention.cohort": "Mense de inscription",
"admin.dashboard.retention.cohort_size": "Nove usatores",
- "admin.impact_report.instance_followers": "Sequitores que nostre usatores poterea perder",
- "admin.impact_report.instance_follows": "Sequitores que lor usatores poterea perder",
- "alert.rate_limited.message": "Retenta depost {retry_time, time, medium}.",
- "alert.unexpected.message": "Ocurreva un error inexpectate.",
+ "admin.impact_report.instance_accounts": "Numero de contos que isto delerea",
+ "admin.impact_report.instance_followers": "Sequitores que nostre usatores perderea",
+ "admin.impact_report.instance_follows": "Sequitores que lor usatores perderea",
+ "admin.impact_report.title": "Summario de impacto",
+ "alert.rate_limited.message": "Per favor retenta post {retry_time, time, medium}.",
+ "alert.rate_limited.title": "Excesso de requestas",
+ "alert.unexpected.message": "Un error inexpectate ha occurrite.",
+ "alert.unexpected.title": "Ups!",
"announcement.announcement": "Annuncio",
+ "attachments_list.unprocessed": "(non processate)",
"audio.hide": "Celar audio",
- "autosuggest_hashtag.per_week": "{count} per septimana",
+ "block_modal.remote_users_caveat": "Nos demandera al servitor {domain} de respectar tu decision. Nonobstante, le conformitate non es garantite perque alcun servitores pote tractar le blocadas de maniera differente. Le messages public pote esser totevia visibile pro le usatores non authenticate.",
+ "block_modal.show_less": "Monstrar minus",
+ "block_modal.show_more": "Monstrar plus",
+ "block_modal.they_cant_mention": "Le persona non pote mentionar te o sequer te.",
+ "block_modal.they_cant_see_posts": "Iste persona non potera vider tu messages e tu non videra le sues.",
+ "block_modal.they_will_know": "Le persona pote saper de esser blocate.",
+ "block_modal.title": "Blocar usator?",
+ "block_modal.you_wont_see_mentions": "Tu non videra le messages que mentiona iste persona.",
+ "boost_modal.combo": "Tu pote premer {combo} pro saltar isto le proxime vice",
+ "bundle_column_error.copy_stacktrace": "Copiar reporto de error",
+ "bundle_column_error.error.body": "Le pagina requestate non pote esser visualisate. Pote esser a causa de un defecto in nostre codice o de un problema de compatibilitate del navigator.",
+ "bundle_column_error.error.title": "Oh, no!",
+ "bundle_column_error.network.body": "Un error ha occurrite durante le cargamento de iste pagina. Isto pote esser a causa de un problema temporari con tu connexion a internet o con iste servitor.",
"bundle_column_error.network.title": "Error de rete",
"bundle_column_error.retry": "Tentar novemente",
"bundle_column_error.return": "Retornar al initio",
+ "bundle_column_error.routing.body": "Le pagina requestate non pote esser trovate. Es tu secur que le URL in le barra de adresse es correcte?",
+ "bundle_column_error.routing.title": "404",
"bundle_modal_error.close": "Clauder",
+ "bundle_modal_error.message": "Un error ha occurrite durante le cargamento de iste componente.",
"bundle_modal_error.retry": "Tentar novemente",
- "closed_registrations_modal.find_another_server": "Trovar altere servitor",
- "column.about": "A proposito de",
+ "closed_registrations.other_server_instructions": "Perque Mastodon es decentralisate, tu pote crear un conto sur un altere servitor e totevia interager con iste servitor.",
+ "closed_registrations_modal.description": "Crear un conto in {domain} actualmente non es possibile, ma considera que non es necessari haber un conto specificamente sur {domain} pro usar Mastodon.",
+ "closed_registrations_modal.find_another_server": "Cercar un altere servitor",
+ "closed_registrations_modal.preamble": "Mastodon es decentralisate, dunque, non importa ubi tu crea tu conto, tu pote sequer e communicar con omne persona sur iste servitor. Tu pote mesmo hospitar tu proprie servitor!",
+ "closed_registrations_modal.title": "Crear un conto sur Mastodon",
+ "column.about": "A proposito",
"column.blocks": "Usatores blocate",
"column.bookmarks": "Marcapaginas",
"column.community": "Chronologia local",
"column.direct": "Mentiones private",
"column.directory": "Navigar profilos",
"column.domain_blocks": "Dominios blocate",
- "column.favourites": "Favoritos",
- "column.firehose": "Fluxos in directe",
+ "column.favourites": "Favorites",
+ "column.firehose": "Fluxos in directo",
+ "column.follow_requests": "Requestas de sequimento",
"column.home": "Initio",
"column.lists": "Listas",
"column.mutes": "Usatores silentiate",
"column.notifications": "Notificationes",
+ "column.pins": "Messages fixate",
"column.public": "Chronologia federate",
+ "column_back_button.label": "Retro",
"column_header.hide_settings": "Celar le parametros",
"column_header.moveLeft_settings": "Mover columna al sinistra",
"column_header.moveRight_settings": "Mover columna al dextra",
+ "column_header.pin": "Fixar",
"column_header.show_settings": "Monstrar le parametros",
+ "column_header.unpin": "Disfixar",
"column_subheading.settings": "Parametros",
+ "community.column_settings.local_only": "Solmente local",
+ "community.column_settings.media_only": "Solmente multimedia",
+ "community.column_settings.remote_only": "A distantia solmente",
"compose.language.change": "Cambiar le lingua",
"compose.language.search": "Cercar linguas...",
"compose.published.body": "Message publicate.",
"compose.published.open": "Aperir",
"compose.saved.body": "Message salvate.",
"compose_form.direct_message_warning_learn_more": "Apprender plus",
+ "compose_form.encryption_warning": "Le messages sur Mastodon non es cryptate de puncta a puncta. Non condivide alcun information sensibile usante Mastodon.",
+ "compose_form.hashtag_warning": "Iste message non essera listate sub alcun hashtag perque illo non es public. Solmente le messages public pote esser cercate per hashtag.",
"compose_form.lock_disclaimer": "Tu conto non es {locked}. Quicunque pote sequer te pro vider tu messages solo pro sequitores.",
- "compose_form.lock_disclaimer.lock": "blocate",
- "compose_form.poll.add_option": "Adder un option",
- "compose_form.poll.remove_option": "Remover iste option",
+ "compose_form.lock_disclaimer.lock": "serrate",
+ "compose_form.placeholder": "Que ha tu in mente?",
+ "compose_form.poll.duration": "Durata del sondage",
+ "compose_form.poll.multiple": "Selection multiple",
+ "compose_form.poll.option_placeholder": "Option {number}",
+ "compose_form.poll.single": "Seliger un",
+ "compose_form.poll.switch_to_multiple": "Cambiar le sondage pro permitter selectiones multiple",
+ "compose_form.poll.switch_to_single": "Cambiar le sondage pro permitter selection singule",
+ "compose_form.poll.type": "Stilo",
"compose_form.publish": "Publicar",
"compose_form.publish_form": "Nove message",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Salvar le cambiamentos",
+ "compose_form.reply": "Responder",
+ "compose_form.save_changes": "Actualisar",
"compose_form.spoiler.marked": "Remover advertimento de contento",
"compose_form.spoiler.unmarked": "Adder advertimento de contento",
- "compose_form.spoiler_placeholder": "Scribe tu advertimento hic",
+ "compose_form.spoiler_placeholder": "Advertimento de contento (optional)",
"confirmation_modal.cancel": "Cancellar",
"confirmations.block.confirm": "Blocar",
+ "confirmations.cancel_follow_request.confirm": "Retirar requesta",
+ "confirmations.cancel_follow_request.message": "Es tu secur que tu vole retirar tu requesta de sequer {name}?",
"confirmations.delete.confirm": "Deler",
"confirmations.delete.message": "Es tu secur que tu vole deler iste message?",
"confirmations.delete_list.confirm": "Deler",
"confirmations.delete_list.message": "Es tu secur que tu vole deler permanentemente iste lista?",
- "confirmations.domain_block.confirm": "Blocar le dominio complete",
+ "confirmations.discard_edit_media.confirm": "Abandonar",
+ "confirmations.discard_edit_media.message": "Tu ha cambiamentos non salvate in le description o previsualisation del objecto multimedial. Abandonar los?",
+ "confirmations.domain_block.confirm": "Blocar le servitor",
+ "confirmations.domain_block.message": "Es tu realmente, absolutemente secur de voler blocar tote le dominio {domain}? In le major parte del casos es preferibile blocar o silentiar alcun personas specific. Si tu bloca tote le dominio, tu non videra alcun contento de ille dominio in alcun chronologia public o in tu notificationes, e tu sequitores de ille dominio essera removite.",
"confirmations.edit.confirm": "Modificar",
- "confirmations.logout.confirm": "Clauder le session",
+ "confirmations.edit.message": "Si tu modifica isto ora, le message in curso de composition essera perdite. Es tu secur de voler continuar?",
+ "confirmations.logout.confirm": "Clauder session",
"confirmations.logout.message": "Es tu secur que tu vole clauder le session?",
"confirmations.mute.confirm": "Silentiar",
- "confirmations.mute.message": "Es tu secur que tu vole silentiar {name}?",
+ "confirmations.redraft.confirm": "Deler e rescriber",
+ "confirmations.redraft.message": "Es tu secur de voler deler iste message e rescriber lo? Le favorites e le impulsos essera perdite, e le responsas al message original essera orphanate.",
"confirmations.reply.confirm": "Responder",
+ "confirmations.reply.message": "Si tu responde ora, le message in curso de composition essera perdite. Es tu secur de voler continuar?",
+ "confirmations.unfollow.confirm": "Non plus sequer",
+ "confirmations.unfollow.message": "Es tu secur que tu vole cessar de sequer {name}?",
"conversation.delete": "Deler conversation",
"conversation.mark_as_read": "Marcar como legite",
"conversation.open": "Vider conversation",
@@ -121,40 +199,133 @@
"copypaste.copy_to_clipboard": "Copiar al area de transferentia",
"directory.federated": "Ab le fediverso cognoscite",
"directory.local": "Solmente ab {domain}",
+ "directory.new_arrivals": "Nove arrivatas",
"directory.recently_active": "Recentemente active",
"disabled_account_banner.account_settings": "Parametros de conto",
"disabled_account_banner.text": "Tu conto {disabledAccount} es actualmente disactivate.",
- "dismissable_banner.dismiss": "Dimitter",
+ "dismissable_banner.community_timeline": "Ecce le messages public le plus recente del personas con contos sur {domain}.",
+ "dismissable_banner.dismiss": "Clauder",
+ "dismissable_banner.explore_links": "Istes es le articulos de novas que se condivide le plus sur le rete social hodie. Le articulos de novas le plus recente, publicate per plus personas differente, se classifica plus in alto.",
+ "dismissable_banner.explore_statuses": "Ecce le messages de tote le rete social que gania popularitate hodie. Le messages plus nove con plus impulsos e favorites se classifica plus in alto.",
+ "dismissable_banner.explore_tags": "Ecce le hashtags que gania popularitate sur le rete social hodie. Le hashtags usate per plus personas differente se classifica plus in alto.",
+ "dismissable_banner.public_timeline": "Istes es le messages public le plus recente del personas sur le rete social que le gente sur {domain} seque.",
+ "domain_block_modal.block": "Blocar le servitor",
+ "domain_block_modal.block_account_instead": "Blocar @{name} in su loco",
+ "domain_block_modal.they_can_interact_with_old_posts": "Le personas de iste servitor pote interager con tu messages ancian.",
+ "domain_block_modal.they_cant_follow": "Necuno de iste servitor pote sequer te.",
+ "domain_block_modal.they_wont_know": "Ille non sapera que ille ha essite blocate.",
+ "domain_block_modal.title": "Blocar dominio?",
+ "domain_block_modal.you_will_lose_followers": "Omne sequitores ab iste servitor essera removite.",
+ "domain_block_modal.you_wont_see_posts": "Tu non videra messages e notificationes ab usatores sur iste servitor.",
+ "domain_pill.activitypub_lets_connect": "Illo te permitte connecter e interager con personas non solmente sur Mastodon, ma tamben sur altere applicationes social.",
+ "domain_pill.activitypub_like_language": "ActivityPub es como le linguage commun que Mastodon parla con altere retes social.",
+ "domain_pill.server": "Servitor",
+ "domain_pill.their_handle": "Su pseudonymo:",
+ "domain_pill.their_server": "Su casa digital, ubi vive tote su messages.",
+ "domain_pill.their_username": "Su identificator unic sur su servitor. Es possibile trovar usatores con le mesme nomine de usator sur servitores differente.",
+ "domain_pill.username": "Nomine de usator",
+ "domain_pill.whats_in_a_handle": "Que significa un pseudonymo?",
+ "domain_pill.who_they_are": "Un pseudonymo indica qui un persona es e ubi se trova, de maniera que tu pote interager con personas sur tote le rete social de .",
+ "domain_pill.who_you_are": "Perque tu pseudonymo indica qui tu es e ubi tu te trova, le gente pote interager con te desde tote le rete social de .",
+ "domain_pill.your_handle": "Tu pseudonymo:",
+ "domain_pill.your_server": "Tu casa digital, ubi vive tote tu messages. Non te place? Cambia de servitor a omne momento e porta tu sequitores con te.",
+ "domain_pill.your_username": "Tu identificator unic sur iste servitor. Es possibile trovar usatores con le mesme nomine de usator sur servitores differente.",
+ "embed.instructions": "Incorpora iste message sur tu sito web con le codice sequente.",
+ "embed.preview": "Ecce como illlo parera:",
"emoji_button.activity": "Activitate",
"emoji_button.clear": "Rader",
"emoji_button.custom": "Personalisate",
+ "emoji_button.flags": "Bandieras",
+ "emoji_button.food": "Alimentos e bibitas",
+ "emoji_button.label": "Inserer emoji",
+ "emoji_button.nature": "Natura",
+ "emoji_button.not_found": "Necun emoji correspondente trovate",
+ "emoji_button.objects": "Objectos",
+ "emoji_button.people": "Personas",
"emoji_button.recent": "Frequentemente usate",
"emoji_button.search": "Cercar...",
"emoji_button.search_results": "Resultatos de recerca",
+ "emoji_button.symbols": "Symbolos",
+ "emoji_button.travel": "Viages e locos",
+ "empty_column.account_hides_collections": "Le usator non ha rendite iste information disponibile",
"empty_column.account_suspended": "Conto suspendite",
"empty_column.account_timeline": "Nulle messages hic!",
"empty_column.account_unavailable": "Profilo non disponibile",
"empty_column.blocks": "Tu non ha blocate alcun usator ancora.",
+ "empty_column.bookmarked_statuses": "Tu non ha ancora messages in marcapaginas. Quando tu adde un message al marcapaginas, illo apparera hic.",
+ "empty_column.community": "Le chronologia local es vacue. Scribe qualcosa public pro poner le cosas in marcha!",
+ "empty_column.direct": "Tu non ha ancora mentiones private. Quando tu invia o recipe un mention, illo apparera hic.",
+ "empty_column.domain_blocks": "Il non ha dominios blocate ancora.",
+ "empty_column.explore_statuses": "Il non ha tendentias in iste momento. Reveni plus tarde!",
+ "empty_column.favourited_statuses": "Tu non ha alcun message favorite ancora. Quando tu marca un message como favorite, illo apparera hic.",
+ "empty_column.favourites": "Necuno ha ancora marcate iste message como favorite. Quando alcuno lo face, ille apparera hic.",
+ "empty_column.follow_requests": "Tu non ha ancora requestas de sequimento. Quando tu recipe un, illo apparera hic.",
+ "empty_column.followed_tags": "Tu non ha ancora sequite alcun hashtags. Quando tu lo face, illos apparera hic.",
+ "empty_column.hashtag": "Il non ha ancora alcun cosa in iste hashtag.",
+ "empty_column.home": "Tu chronologia de initio es vacue! Seque plus personas pro plenar lo.",
+ "empty_column.list": "Iste lista es ancora vacue. Quando le membros de iste lista publica nove messages, illos apparera hic.",
+ "empty_column.lists": "Tu non ha ancora listas. Quando tu crea un, illo apparera hic.",
+ "empty_column.mutes": "Tu non ha ancora silentiate alcun usator.",
+ "empty_column.notification_requests": "Iste lista es toto vacue! Quando tu recipe notificationes, illos apparera hic como configurate in tu parametros.",
+ "empty_column.notifications": "Tu non ha ancora notificationes. Quando altere personas interage con te, tu lo videra hic.",
+ "empty_column.public": "Il ha nihil hic! Scribe qualcosa public, o manualmente seque usatores de altere servitores, pro plenar lo",
+ "error.unexpected_crash.explanation": "A causa de un defecto in nostre codice o de un problema de compatibilitate del navigator, iste pagina non pote esser visualisate correctemente.",
+ "error.unexpected_crash.explanation_addons": "Iste pagina non pote esser visualisate correctemente. Iste error es probabilemente causate per un additivo al navigator o per un utensile de traduction automatic.",
+ "error.unexpected_crash.next_steps": "Tenta refrescar le pagina. Si isto non remedia le problema, es possibile que tu pote totevia usar Mastodon per medio de un altere navigator o application native.",
+ "error.unexpected_crash.next_steps_addons": "Tenta disactivar istes e refrescar le pagina. Si isto non remedia le problema, es possibile que tu pote totevia usar Mastodon per medio de un altere navigator o application native.",
+ "errors.unexpected_crash.copy_stacktrace": "Copiar le traciamento del pila al area de transferentia",
"errors.unexpected_crash.report_issue": "Signalar un defecto",
"explore.search_results": "Resultatos de recerca",
+ "explore.suggested_follows": "Personas",
"explore.title": "Explorar",
"explore.trending_links": "Novas",
"explore.trending_statuses": "Messages",
"explore.trending_tags": "Hashtags",
+ "filter_modal.added.context_mismatch_explanation": "Iste categoria de filtros non se applica al contexto in le qual tu ha accedite a iste message. Pro filtrar le message in iste contexto tamben, modifica le filtro.",
+ "filter_modal.added.context_mismatch_title": "Contexto incoherente!",
+ "filter_modal.added.expired_explanation": "Iste categoria de filtros ha expirate. Tu debe modificar le data de expiration pro applicar lo.",
+ "filter_modal.added.expired_title": "Filtro expirate!",
+ "filter_modal.added.review_and_configure": "Pro revider e configurar ulteriormente iste categoria de filtros, visita le {settings_link}.",
"filter_modal.added.review_and_configure_title": "Parametros de filtro",
"filter_modal.added.settings_link": "pagina de parametros",
- "filter_modal.added.short_explanation": "Iste message esseva addite al sequente categoria de filtros: {title}.",
+ "filter_modal.added.short_explanation": "Iste message ha essite addite al sequente categoria de filtros: {title}.",
"filter_modal.added.title": "Filtro addite!",
+ "filter_modal.select_filter.context_mismatch": "non se applica a iste contexto",
+ "filter_modal.select_filter.expired": "expirate",
"filter_modal.select_filter.prompt_new": "Nove categoria: {name}",
"filter_modal.select_filter.search": "Cercar o crear",
+ "filter_modal.select_filter.subtitle": "Usa un categoria existente o crea un nove",
"filter_modal.select_filter.title": "Filtrar iste message",
"filter_modal.title.status": "Filtrar un message",
+ "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentiones}}",
+ "filtered_notifications_banner.pending_requests": "Notificationes ab {count, plural, =0 {nemo} one {un persona} other {# personas}} tu poterea cognoscer",
+ "filtered_notifications_banner.title": "Notificationes filtrate",
"firehose.all": "Toto",
"firehose.local": "Iste servitor",
"firehose.remote": "Altere servitores",
- "footer.about": "A proposito de",
+ "follow_request.authorize": "Autorisar",
+ "follow_request.reject": "Rejectar",
+ "follow_requests.unlocked_explanation": "Benque tu conto non es serrate, le personal de {domain} pensa que es un bon idea que tu revide manualmente le sequente requestas de iste contos.",
+ "follow_suggestions.curated_suggestion": "Selection del equipa",
+ "follow_suggestions.dismiss": "Non monstrar de novo",
+ "follow_suggestions.featured_longer": "Seligite con cura per le equipa de {domain}",
+ "follow_suggestions.friends_of_friends_longer": "Popular inter le gente que tu seque",
+ "follow_suggestions.hints.featured": "Iste profilo ha essite seligite manualmente per le equipa de {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "Iste profilo es popular inter le gente que tu seque.",
+ "follow_suggestions.hints.most_followed": "Iste profilo es un del plus sequites sur {domain}.",
+ "follow_suggestions.hints.most_interactions": "Iste profilo ha recentemente recipite multe attention sur {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Iste profilo es similar al profilos que tu ha recentemente sequite.",
+ "follow_suggestions.personalized_suggestion": "Suggestion personalisate",
+ "follow_suggestions.popular_suggestion": "Suggestion personalisate",
+ "follow_suggestions.popular_suggestion_longer": "Popular sur {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Similar al profilos que tu ha sequite recentemente",
+ "follow_suggestions.view_all": "Vider toto",
+ "follow_suggestions.who_to_follow": "Qui sequer",
+ "followed_tags": "Hashtags sequite",
+ "footer.about": "A proposito",
"footer.directory": "Directorio de profilos",
- "footer.get_app": "Obtene le application",
+ "footer.get_app": "Obtener le application",
+ "footer.invite": "Invitar personas",
"footer.keyboard_shortcuts": "Accessos directe de claviero",
"footer.privacy_policy": "Politica de confidentialitate",
"footer.source_code": "Vider le codice fonte",
@@ -163,155 +334,479 @@
"getting_started.heading": "Prime passos",
"hashtag.column_header.tag_mode.all": "e {additional}",
"hashtag.column_header.tag_mode.any": "o {additional}",
+ "hashtag.column_header.tag_mode.none": "sin {additional}",
"hashtag.column_settings.select.no_options_message": "Nulle suggestiones trovate",
"hashtag.column_settings.select.placeholder": "Insere hashtags…",
+ "hashtag.column_settings.tag_mode.all": "Tote istes",
+ "hashtag.column_settings.tag_mode.any": "Un o plus de istes",
+ "hashtag.column_settings.tag_mode.none": "Necun de istes",
+ "hashtag.column_settings.tag_toggle": "Includer etiquettas additional pro iste columna",
+ "hashtag.counter_by_accounts": "{count, plural, one {{counter} participante} other {{counter} participantes}}",
+ "hashtag.counter_by_uses": "{count, plural, one {{counter} message} other {{counter} messages}}",
+ "hashtag.counter_by_uses_today": "{count, plural, one {{counter} message} other {{counter} messages}} hodie",
"hashtag.follow": "Sequer hashtag",
- "home.column_settings.show_reblogs": "Monstrar boosts",
+ "hashtag.unfollow": "Non sequer plus le hashtag",
+ "hashtags.and_other": "…e {count, plural, one {}other {# plus}}",
+ "home.column_settings.show_reblogs": "Monstrar impulsos",
"home.column_settings.show_replies": "Monstrar responsas",
"home.hide_announcements": "Celar annuncios",
"home.pending_critical_update.body": "Actualisa tu servitor de Mastodon le plus tosto possibile!",
"home.pending_critical_update.link": "Vider actualisationes",
+ "home.pending_critical_update.title": "Actualisation de securitate critic disponibile!",
"home.show_announcements": "Monstrar annuncios",
+ "interaction_modal.description.favourite": "Con un conto sur Mastodon, tu pote marcar iste message como favorite pro informar le autor que tu lo apprecia e salveguarda pro plus tarde.",
+ "interaction_modal.description.follow": "Con un conto sur Mastodon, tu pote sequer {name} e reciper su messages in tu fluxo de initio.",
+ "interaction_modal.description.reblog": "Con un conto sur Mastodon, tu pote impulsar iste message pro condivider lo con tu proprie sequitores.",
+ "interaction_modal.description.reply": "Con un conto sur Mastodon, tu pote responder a iste message.",
+ "interaction_modal.login.action": "Porta me a casa",
+ "interaction_modal.login.prompt": "Dominio de tu servitor, p.ex. mastodon.social",
"interaction_modal.no_account_yet": "Non sur Mstodon?",
- "interaction_modal.on_another_server": "In un servitor differente",
- "interaction_modal.on_this_server": "In iste servitor",
+ "interaction_modal.on_another_server": "Sur un altere servitor",
+ "interaction_modal.on_this_server": "Sur iste servitor",
+ "interaction_modal.sign_in": "Tu non es in session sur iste servitor. Sur qual servitor se trova tu conto?",
+ "interaction_modal.sign_in_hint": "Consilio: Se tracta del sito web ubi tu te ha inscribite. Si tu non te lo rememora, cerca le e-mail de benvenita in tu cassa de entrata. Tu pote etiam inserer tu pseudonymo complete! (p.ex. @Mastodon@mastodon.social)",
+ "interaction_modal.title.favourite": "Marcar le message de {name} como favorite",
"interaction_modal.title.follow": "Sequer {name}",
- "interaction_modal.title.reblog": "Facer boost al message de {name}",
+ "interaction_modal.title.reblog": "Impulsar le message de {name}",
"interaction_modal.title.reply": "Responder al message de {name}",
+ "intervals.full.days": "{number, plural, one {# die} other {# dies}}",
+ "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
+ "intervals.full.minutes": "{number, plural, one {# minuta} other {# minutas}}",
+ "keyboard_shortcuts.back": "Navigar retro",
"keyboard_shortcuts.blocked": "Aperir lista de usatores blocate",
- "keyboard_shortcuts.boost": "Facer boost al message",
+ "keyboard_shortcuts.boost": "Impulsar le message",
+ "keyboard_shortcuts.column": "Focalisar al columna",
+ "keyboard_shortcuts.compose": "Focalisar al area de composition de texto",
"keyboard_shortcuts.description": "Description",
+ "keyboard_shortcuts.direct": "aperir le columna de mentiones private",
+ "keyboard_shortcuts.down": "Displaciar a basso in le lista",
"keyboard_shortcuts.enter": "Aperir message",
+ "keyboard_shortcuts.favourite": "Message favorite",
"keyboard_shortcuts.favourites": "Aperir lista de favoritos",
"keyboard_shortcuts.federated": "Aperir le chronologia federate",
"keyboard_shortcuts.heading": "Accessos directe de claviero",
"keyboard_shortcuts.home": "Aperir le chronologia de initio",
+ "keyboard_shortcuts.hotkey": "Clave accelerator",
+ "keyboard_shortcuts.legend": "Monstrar iste legenda",
"keyboard_shortcuts.local": "Aperir le chronologia local",
+ "keyboard_shortcuts.mention": "Mentionar le author",
"keyboard_shortcuts.muted": "Aperir lista de usatores silentiate",
"keyboard_shortcuts.my_profile": "Aperir tu profilo",
"keyboard_shortcuts.notifications": "Aperir columna de notificationes",
+ "keyboard_shortcuts.open_media": "Aperir multimedia",
+ "keyboard_shortcuts.pinned": "Aperir le lista de messages fixate",
+ "keyboard_shortcuts.profile": "Aperir le profilo del autor",
"keyboard_shortcuts.reply": "Responder al message",
+ "keyboard_shortcuts.requests": "Aperir le lista de requestas de sequimento",
+ "keyboard_shortcuts.search": "Focalisar barra de recerca",
"keyboard_shortcuts.spoilers": "Monstrar/celar le campo CW",
+ "keyboard_shortcuts.start": "Aperir columna “comenciar”",
+ "keyboard_shortcuts.toggle_hidden": "Monstrar/celar texto detra advertimento de contento",
+ "keyboard_shortcuts.toggle_sensitivity": "Monstrar/celar multimedia",
"keyboard_shortcuts.toot": "Initiar un nove message",
+ "keyboard_shortcuts.unfocus": "Disfocalisar le area de composition de texto/de recerca",
+ "keyboard_shortcuts.up": "Displaciar in alto in le lista",
"lightbox.close": "Clauder",
+ "lightbox.compress": "Comprimer le quadro de visualisation de imagine",
+ "lightbox.expand": "Expander le quadro de visualisation de imagine",
"lightbox.next": "Sequente",
"lightbox.previous": "Precedente",
+ "limited_account_hint.action": "Monstrar profilo in omne caso",
+ "limited_account_hint.title": "Iste profilo ha essite celate per le moderatores de {domain}.",
"link_preview.author": "Per {name}",
"lists.account.add": "Adder al lista",
- "lists.account.remove": "Remover ab le lista",
+ "lists.account.remove": "Remover del lista",
"lists.delete": "Deler lista",
"lists.edit": "Modificar lista",
"lists.edit.submit": "Cambiar titulo",
- "lists.exclusive": "Celar iste messages ab le initio",
+ "lists.exclusive": "Celar iste messages sur le pagina de initio",
"lists.new.create": "Adder lista",
"lists.new.title_placeholder": "Nove titulo del lista",
+ "lists.replies_policy.followed": "Qualcunque usator sequite",
+ "lists.replies_policy.list": "Membros del lista",
+ "lists.replies_policy.none": "Nemo",
"lists.replies_policy.title": "Monstrar responsas a:",
+ "lists.search": "Cercar inter le gente que tu seque",
"lists.subheading": "Tu listas",
- "mute_modal.duration": "Duration",
- "mute_modal.hide_notifications": "Celar notificationes de iste usator?",
- "navigation_bar.about": "A proposito de",
- "navigation_bar.advanced_interface": "Aperir in un interfacie web avantiate",
+ "load_pending": "{count, plural, one {# nove entrata} other {# nove entratas}}",
+ "loading_indicator.label": "Cargante…",
+ "media_gallery.toggle_visible": "{number, plural, one {Celar imagine} other {Celar imagines}}",
+ "moved_to_account_banner.text": "Tu conto {disabledAccount} es actualmente disactivate perque tu ha cambiate de conto a {movedToAccount}.",
+ "mute_modal.hide_from_notifications": "Celar in notificationes",
+ "mute_modal.hide_options": "Celar optiones",
+ "mute_modal.indefinite": "Usque io dissilentia iste persona",
+ "mute_modal.show_options": "Monstrar optiones",
+ "mute_modal.they_can_mention_and_follow": "Ille pote mentionar te e sequer te, ma tu non potera vider le.",
+ "mute_modal.they_wont_know": "Ille non sapera que ille ha essite silentiate.",
+ "mute_modal.title": "Silentiar le usator?",
+ "mute_modal.you_wont_see_mentions": "Tu non videra le messages que mentiona iste persona.",
+ "mute_modal.you_wont_see_posts": "Iste persona pote totevia vider tu messages, ma tu non videra le sues.",
+ "navigation_bar.about": "A proposito",
+ "navigation_bar.advanced_interface": "Aperir in le interfacie web avantiate",
"navigation_bar.blocks": "Usatores blocate",
"navigation_bar.bookmarks": "Marcapaginas",
"navigation_bar.community_timeline": "Chronologia local",
+ "navigation_bar.compose": "Componer un nove message",
"navigation_bar.direct": "Mentiones private",
"navigation_bar.discover": "Discoperir",
"navigation_bar.domain_blocks": "Dominios blocate",
- "navigation_bar.edit_profile": "Modificar profilo",
- "navigation_bar.favourites": "Favoritos",
+ "navigation_bar.explore": "Explorar",
+ "navigation_bar.favourites": "Favorites",
"navigation_bar.filters": "Parolas silentiate",
+ "navigation_bar.follow_requests": "Requestas de sequimento",
+ "navigation_bar.followed_tags": "Hashtags sequite",
+ "navigation_bar.follows_and_followers": "Sequites e sequitores",
"navigation_bar.lists": "Listas",
- "navigation_bar.logout": "Clauder le session",
+ "navigation_bar.logout": "Clauder session",
"navigation_bar.mutes": "Usatores silentiate",
+ "navigation_bar.opened_in_classic_interface": "Messages, contos e altere paginas specific es aperite per predefinition in le interfacie web classic.",
+ "navigation_bar.personal": "Personal",
+ "navigation_bar.pins": "Messages fixate",
"navigation_bar.preferences": "Preferentias",
"navigation_bar.public_timeline": "Chronologia federate",
"navigation_bar.search": "Cercar",
"navigation_bar.security": "Securitate",
- "notification.update": "{name} modificava un message",
+ "not_signed_in_indicator.not_signed_in": "Es necessari aperir session pro acceder a iste ressource.",
+ "notification.admin.report": "{name} ha signalate {target}",
+ "notification.admin.sign_up": "{name} se ha inscribite",
+ "notification.favourite": "{name} ha marcate tu message como favorite",
+ "notification.follow": "{name} te ha sequite",
+ "notification.follow_request": "{name} ha requestate de sequer te",
+ "notification.mention": "{name} te ha mentionate",
+ "notification.moderation-warning.learn_more": "Apprender plus",
+ "notification.moderation_warning": "Tu ha recepite un aviso de moderation",
+ "notification.moderation_warning.action_delete_statuses": "Alcunes de tu messages ha essite removite.",
+ "notification.moderation_warning.action_disable": "Tu conto ha essite disactivate.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Alcunes de tu messages ha essite marcate como sensibile.",
+ "notification.moderation_warning.action_none": "Tu conto ha recipite un advertimento de moderation.",
+ "notification.moderation_warning.action_sensitive": "Tu messages essera marcate como sensibile a partir de ora.",
+ "notification.moderation_warning.action_silence": "Tu conto ha essite limitate.",
+ "notification.moderation_warning.action_suspend": "Tu conto ha essite suspendite.",
+ "notification.own_poll": "Tu sondage ha finite",
+ "notification.poll": "Un sondage in le qual tu ha votate ha finite",
+ "notification.reblog": "{name} ha impulsate tu message",
+ "notification.relationships_severance_event": "Connexiones perdite con {name}",
+ "notification.relationships_severance_event.account_suspension": "Un administrator de {from} ha suspendiute {target}. Isto significa que tu non pote plus reciper actualisationes de iste persona o interager con ille.",
+ "notification.relationships_severance_event.domain_block": "Un administrator de {from} ha blocate {target}, includente {followersCount} de tu sequitores e {followingCount, plural, one {# conto} other {# contos}} que tu seque.",
+ "notification.relationships_severance_event.learn_more": "Apprender plus",
+ "notification.relationships_severance_event.user_domain_block": "Tu ha blocate {target}, assi removente {followersCount} de tu sequitores e {followingCount, plural, one {# conto} other {# contos}} que tu seque.",
+ "notification.status": "{name} ha justo ora publicate",
+ "notification.update": "{name} ha modificate un message",
+ "notification_requests.accept": "Acceptar",
+ "notification_requests.dismiss": "Dimitter",
+ "notification_requests.notifications_from": "Notificationes de {name}",
+ "notification_requests.title": "Notificationes filtrate",
"notifications.clear": "Rader notificationes",
+ "notifications.clear_confirmation": "Es tu secur que tu vole rader permanentemente tote tu notificationes?",
+ "notifications.column_settings.admin.report": "Nove signalationes:",
+ "notifications.column_settings.admin.sign_up": "Nove inscriptiones:",
"notifications.column_settings.alert": "Notificationes de scriptorio",
+ "notifications.column_settings.favourite": "Favorites:",
"notifications.column_settings.filter_bar.advanced": "Monstrar tote le categorias",
+ "notifications.column_settings.filter_bar.category": "Barra de filtro rapide",
"notifications.column_settings.follow": "Nove sequitores:",
+ "notifications.column_settings.follow_request": "Nove requestas de sequimento:",
"notifications.column_settings.mention": "Mentiones:",
+ "notifications.column_settings.poll": "Resultatos del sondage:",
"notifications.column_settings.push": "Notificationes push",
+ "notifications.column_settings.reblog": "Impulsos:",
+ "notifications.column_settings.show": "Monstrar in columna",
"notifications.column_settings.sound": "Reproducer sono",
"notifications.column_settings.status": "Nove messages:",
+ "notifications.column_settings.unread_notifications.category": "Notificationes non legite",
+ "notifications.column_settings.unread_notifications.highlight": "Marcar le notificationes non legite",
+ "notifications.column_settings.update": "Modificationes:",
"notifications.filter.all": "Toto",
- "notifications.filter.favourites": "Favoritos",
+ "notifications.filter.boosts": "Impulsos",
+ "notifications.filter.favourites": "Favorites",
+ "notifications.filter.follows": "Sequites",
"notifications.filter.mentions": "Mentiones",
+ "notifications.filter.polls": "Resultatos del sondage",
+ "notifications.filter.statuses": "Actualisationes de personas que tu seque",
"notifications.grant_permission": "Conceder permission.",
"notifications.group": "{count} notificationes",
+ "notifications.mark_as_read": "Marcar cata notification como legite",
+ "notifications.permission_denied": "Le notificationes de scriptorio es indisponibile a causa de un requesta anteriormente refusate de permissiones del navigator",
+ "notifications.permission_denied_alert": "Le notificationes de scriptorio non pote esser activate perque le permission del navigator ha essite refusate anteriormente",
+ "notifications.permission_required": "Le notificationes de scriptorio es indisponibile perque le permission necessari non ha essite concedite.",
+ "notifications.policy.filter_new_accounts.hint": "Create in le ultime {days, plural, one {die} other {# dies}}",
+ "notifications.policy.filter_new_accounts_title": "Nove contos",
+ "notifications.policy.filter_not_followers_hint": "Includente le personas que te ha sequite durante minus de {days, plural, one {un die} other {# dies}}",
+ "notifications.policy.filter_not_followers_title": "Personas qui non te seque",
+ "notifications.policy.filter_not_following_hint": "Usque tu les approba manualmente",
+ "notifications.policy.filter_not_following_title": "Personas que tu non seque",
+ "notifications.policy.filter_private_mentions_hint": "Filtrate, excepte si es in responsa a tu proprie mention o si tu seque le expeditor",
+ "notifications.policy.filter_private_mentions_title": "Mentiones private indesirate",
+ "notifications.policy.title": "Filtrar notificationes de…",
+ "notifications_permission_banner.enable": "Activar notificationes de scriptorio",
+ "notifications_permission_banner.how_to_control": "Pro reciper notificationes quando Mastodon non es aperte, activa le notificationes de scriptorio. Post lor activation, es possibile controlar precisemente qual typos de interaction genera notificationes de scriptorio per medio del button {icon} hic supra.",
+ "notifications_permission_banner.title": "Non mancar jammais a un cosa",
+ "onboarding.action.back": "Porta me retro",
+ "onboarding.actions.back": "Porta me retro",
+ "onboarding.actions.go_to_explore": "Porta me al tendentias",
+ "onboarding.actions.go_to_home": "Porta me a mi fluxo de initio",
"onboarding.compose.template": "Salute #Mastodon!",
+ "onboarding.follows.empty": "Regrettabilemente, non es possibile monstrar resultatos al momento. Tu pote tentar usar le recerca o percurrer le pagina de exploration pro cercar personas a sequer, o tentar lo de novo plus tarde.",
+ "onboarding.follows.lead": "Le fluxo de initio es le maniera principal de discoperir Mastodon. Quanto plus personas tu seque, tanto plus active e interessante illo essera. Pro comenciar, ecce alcun suggestiones:",
+ "onboarding.follows.title": "Personalisar tu fluxo de initio",
+ "onboarding.profile.discoverable": "Render mi profilo discoperibile",
+ "onboarding.profile.discoverable_hint": "Quando tu opta pro devenir discoperibile sur Mastodon, tu messages pote apparer in resultatos de recerca e in tendentias, e tu profilo pote esser suggerite al personas con interesses simile al tues.",
+ "onboarding.profile.display_name": "Nomine a monstrar",
+ "onboarding.profile.display_name_hint": "Tu nomine complete o tu supernomine…",
+ "onboarding.profile.lead": "Tu pote sempre completar isto plus tarde in le parametros, ubi se trova mesmo plus optiones de personalisation.",
+ "onboarding.profile.note": "Bio",
+ "onboarding.profile.note_hint": "Tu pote @mentionar altere personas o #hashtags…",
"onboarding.profile.save_and_continue": "Salvar e continuar",
+ "onboarding.profile.title": "Configuration del profilo",
+ "onboarding.profile.upload_avatar": "Incargar imagine de profilo",
+ "onboarding.profile.upload_header": "Actualisar capite de profilo",
+ "onboarding.share.lead": "Face saper al gente como illes pote trovar te sur Mastodon!",
+ "onboarding.share.message": "Io es {username} sur Mastodon! Veni sequer me a {url}",
"onboarding.share.next_steps": "Sequente passos possibile:",
"onboarding.share.title": "Compartir tu profilo",
- "onboarding.steps.follow_people.title": "Personalisa tu fluxo de initio",
+ "onboarding.start.lead": "Tu face ora parte de Mastodon, un platteforma de medios social unic e decentralisate ubi es tu, e non un algorithmo, qui crea tu proprie experientia. Nos va adjutar te a lancear te in iste nove frontiera social:",
+ "onboarding.start.skip": "Non require adjuta a comenciar?",
+ "onboarding.start.title": "Tu ha arrivate!",
+ "onboarding.steps.follow_people.body": "Sequer personas interessante es le ration de esser de Mastodon.",
+ "onboarding.steps.follow_people.title": "Personalisar tu fluxo de initio",
+ "onboarding.steps.publish_status.body": "Saluta le mundo con texto, photos, videos o sondages {emoji}",
"onboarding.steps.publish_status.title": "Face tu prime message",
+ "onboarding.steps.setup_profile.body": "Impulsa tu interactiones con un profilo comprehensive.",
"onboarding.steps.setup_profile.title": "Personalisa tu profilo",
+ "onboarding.steps.share_profile.body": "Face saper a tu amicos como trovar te sur Mastodon",
"onboarding.steps.share_profile.title": "Compartir tu profilo de Mastodon",
+ "onboarding.tips.2fa": "Lo sapeva tu? Tu pote securisar tu conto configurante le authentication bifactorial in le parametros de tu conto. Isto functiona con le application TOTP de tu preferentia, sin necessitate de un numero de telephono!",
+ "onboarding.tips.accounts_from_other_servers": "Lo sapeva tu? Perque Mastodon es decentralisate, le profilos que tu incontra pote esser hospitate sur servitores altere que le tue. Nonobstante, tu pote interager con illos sin problema! Lor servitor se trova in le secunde medietate de lor nomine de usator!",
+ "onboarding.tips.migration": "Lo sapeva tu? Si tu pensa que {domain} non es un bon servitor pro te in le futuro, tu pote cambiar a un altere servitor Mastodon sin perder tu sequitores. Tu pote mesmo hospitar tu proprie servitor!",
+ "onboarding.tips.verification": "Lo sapeva tu? Pro verificar tu conto, insere un ligamine a tu profilo Mastodon sur tu proprie sito web e adde le sito web a tu profilo. Nulle moneta o documentos necessari!",
+ "password_confirmation.exceeds_maxlength": "Le confirmation del contrasigno excede le longitude maxime del contrasigno",
+ "password_confirmation.mismatching": "Le confirmation del contrasigno non corresponde",
+ "picture_in_picture.restore": "Restaurar",
"poll.closed": "Claudite",
+ "poll.refresh": "Refrescar",
"poll.reveal": "Vider le resultatos",
- "privacy.change": "Cambiar privacitate del message",
- "privacy.private.long": "Visibile solmente pro sequitores",
- "privacy.public.long": "Visibile pro totos",
+ "poll.total_people": "{count, plural, one {# persona} other {# personas}}",
+ "poll.total_votes": "{count, plural, one {# voto} other {# votos}}",
+ "poll.vote": "Votar",
+ "poll.voted": "Tu ha votate pro iste responsa",
+ "poll.votes": "{votes, plural, one {# voto} other {# votos}}",
+ "poll_button.add_poll": "Adder un inquesta",
+ "poll_button.remove_poll": "Remover un inquesta",
+ "privacy.change": "Cambiar le confidentialitate del message",
+ "privacy.direct.long": "Tote le personas mentionate in le message",
+ "privacy.direct.short": "Personas specific",
+ "privacy.private.long": "Solmente tu sequitores",
+ "privacy.private.short": "Sequitores",
+ "privacy.public.long": "Quicunque, sur Mastodon o non",
"privacy.public.short": "Public",
+ "privacy.unlisted.additional": "Isto es exactemente como public, excepte que le message non apparera in fluxos in directo, in hashtags, in Explorar, o in le recerca de Mastodon, mesmo si tu ha optate pro render tote le conto discoperibile.",
+ "privacy.unlisted.long": "Minus fanfares algorithmic",
+ "privacy.unlisted.short": "Public, non listate",
"privacy_policy.last_updated": "Ultime actualisation {date}",
"privacy_policy.title": "Politica de confidentialitate",
+ "recommended": "Recommendate",
+ "refresh": "Refrescar",
+ "regeneration_indicator.label": "Cargamento…",
+ "regeneration_indicator.sublabel": "Tu fluxo de initio es in preparation!",
+ "relative_time.days": "{number}d",
+ "relative_time.full.days": "{number, plural, one {# die} other {# dies}} retro",
+ "relative_time.full.hours": "{number, plural, one {# hora} other {# horas}} retro",
+ "relative_time.full.just_now": "justo ora",
+ "relative_time.full.minutes": "{number, plural, one {# minuta} other {# minutas}} retro",
+ "relative_time.full.seconds": "{number, plural, one {# secunda} other {# secundas}} retro",
+ "relative_time.hours": "{number}h",
"relative_time.just_now": "ora",
+ "relative_time.minutes": "{number}m",
+ "relative_time.seconds": "{number}s",
"relative_time.today": "hodie",
+ "reply_indicator.attachments": "{count, plural, one {# annexo} other {# annexos}}",
"reply_indicator.cancel": "Cancellar",
+ "reply_indicator.poll": "Inquesta",
"report.block": "Blocar",
+ "report.block_explanation": "Tu non videra le messages de iste persona. Ille non potera vider tu messages o sequer te. Ille potera saper de esser blocate.",
+ "report.categories.legal": "Juridic",
"report.categories.other": "Alteres",
+ "report.categories.spam": "Spam",
+ "report.categories.violation": "Le contento viola un o plus regulas del servitor",
+ "report.category.subtitle": "Elige le option plus adequate",
+ "report.category.title": "Describe le problema con iste {type}",
"report.category.title_account": "profilo",
"report.category.title_status": "message",
- "report.close": "Preste",
+ "report.close": "Facite",
+ "report.comment.title": "Ha il altere cosas que nos deberea saper?",
+ "report.forward": "Reinviar a {target}",
+ "report.forward_hint": "Le conto es de un altere servitor. Inviar un copia anonymisate del signalation a illo tamben?",
"report.mute": "Silentiar",
+ "report.mute_explanation": "Tu non videra le messages de iste persona. Ille pote totevia sequer te e vider tu messages e non sapera de esser silentiate.",
"report.next": "Sequente",
"report.placeholder": "Commentos additional",
"report.reasons.dislike": "Non me place",
+ "report.reasons.dislike_description": "Non es qualcosa que tu vole vider",
+ "report.reasons.legal": "Es illegal",
+ "report.reasons.legal_description": "Tu crede que viola le lege de tu pais o del pais del servitor",
+ "report.reasons.other": "Es altere cosa",
+ "report.reasons.other_description": "Le problema non entra in altere categorias",
+ "report.reasons.spam": "Es spam",
+ "report.reasons.spam_description": "Ligamines malevolente, interaction false, o responsas repetitive",
+ "report.reasons.violation": "Viola le regulas del servitor",
+ "report.reasons.violation_description": "Tu sape que viola regulas specific",
+ "report.rules.subtitle": "Selige tote le responsas appropriate",
+ "report.rules.title": "Qual regulas es violate?",
+ "report.statuses.subtitle": "Selige tote le responsas appropriate",
+ "report.statuses.title": "Existe alcun messages que appoia iste reporto?",
+ "report.submit": "Submitter",
+ "report.target": "Signalamento de {target}",
+ "report.thanks.take_action": "Ecce tu optiones pro controlar lo que tu vide sur Mastodon:",
+ "report.thanks.take_action_actionable": "Durante que nos revide isto, tu pote prender mesuras contra @{name}:",
+ "report.thanks.title": "Non vole vider isto?",
+ "report.thanks.title_actionable": "Gratias pro signalar, nos investigara isto.",
+ "report.unfollow": "Cessar de sequer @{name}",
+ "report.unfollow_explanation": "Tu seque iste conto. Pro non plus vider su messages in tu fluxo de initio, cessa de sequer lo.",
+ "report_notification.attached_statuses": "{count, plural, one {{count} message} other {{count} messages}} annexate",
+ "report_notification.categories.legal": "Juridic",
"report_notification.categories.other": "Alteres",
+ "report_notification.categories.spam": "Spam",
+ "report_notification.categories.violation": "Violation del regulas",
+ "report_notification.open": "Aperir reporto",
+ "search.no_recent_searches": "Nulle recercas recente",
+ "search.placeholder": "Cercar",
+ "search.quick_action.account_search": "Profilos correspondente a {x}",
"search.quick_action.go_to_account": "Vader al profilo {x}",
"search.quick_action.go_to_hashtag": "Vader al hashtag {x}",
"search.quick_action.open_url": "Aperir URL in Mastodon",
+ "search.quick_action.status_search": "Messages correspondente a {x}",
+ "search.search_or_paste": "Cerca o colla un URL",
"search_popout.full_text_search_disabled_message": "Non disponibile sur {domain}.",
+ "search_popout.full_text_search_logged_out_message": "Solmente disponibile al initiar le session.",
"search_popout.language_code": "Codice de lingua ISO",
"search_popout.options": "Optiones de recerca",
"search_popout.quick_actions": "Actiones rapide",
"search_popout.recent": "Recercas recente",
+ "search_popout.specific_date": "data specific",
"search_popout.user": "usator",
"search_results.accounts": "Profilos",
+ "search_results.all": "Toto",
"search_results.hashtags": "Hashtags",
+ "search_results.nothing_found": "Nihil trovate pro iste terminos de recerca",
"search_results.see_all": "Vider toto",
"search_results.statuses": "Messages",
+ "search_results.title": "Cercar {q}",
+ "server_banner.about_active_users": "Personas que ha usate iste servitor in le ultime 30 dies (usatores active per mense)",
+ "server_banner.active_users": "usatores active",
+ "server_banner.administered_by": "Administrate per:",
+ "server_banner.introduction": "{domain} face parte del rete social decentralisate actionate per {mastodon}.",
"server_banner.learn_more": "Apprender plus",
+ "server_banner.server_stats": "Statos del servitor:",
"sign_in_banner.create_account": "Crear un conto",
- "sign_in_banner.sign_in": "Initiar le session",
+ "sign_in_banner.sign_in": "Aperir session",
+ "sign_in_banner.sso_redirect": "Aperir session o crear conto",
+ "sign_in_banner.text": "Aperi session pro sequer profilos o hashtags, marcar messages como favorite, e condivider e responder a messages. Tu pote etiam interager desde tu conto sur un altere servitor.",
+ "status.admin_account": "Aperir le interfacie de moderation pro @{name}",
+ "status.admin_domain": "Aperir le interfacie de moderation pro {domain}",
+ "status.admin_status": "Aperir iste message in le interfacie de moderation",
"status.block": "Blocar @{name}",
+ "status.bookmark": "Adder al marcapaginas",
+ "status.cancel_reblog_private": "Disfacer impulso",
+ "status.cannot_reblog": "Iste message non pote esser impulsate",
"status.copy": "Copiar ligamine a message",
"status.delete": "Deler",
+ "status.detailed_status": "Vista detaliate del conversation",
+ "status.direct": "Mentionar privatemente @{name}",
"status.direct_indicator": "Mention private",
"status.edit": "Modificar",
+ "status.edited": "Ultime modification le {date}",
+ "status.edited_x_times": "Modificate {count, plural, one {{count} vice} other {{count} vices}}",
+ "status.embed": "Incastrar",
+ "status.favourite": "Adder al favorites",
+ "status.favourites": "{count, plural, one {favorite} other {favorites}}",
"status.filter": "Filtrar iste message",
+ "status.filtered": "Filtrate",
"status.hide": "Celar le message",
"status.history.created": "create per {name} le {date}",
"status.history.edited": "modificate per {name} le {date}",
+ "status.load_more": "Cargar plus",
"status.media.open": "Clicca pro aperir",
"status.media.show": "Clicca pro monstrar",
+ "status.media_hidden": "Medios celate",
+ "status.mention": "Mentionar @{name}",
"status.more": "Plus",
+ "status.mute": "Silentiar @{name}",
"status.mute_conversation": "Silentiar conversation",
+ "status.open": "Expander iste message",
+ "status.pin": "Fixar sur profilo",
+ "status.pinned": "Message fixate",
"status.read_more": "Leger plus",
+ "status.reblog": "Impulsar",
+ "status.reblog_private": "Impulsar con visibilitate original",
+ "status.reblogged_by": "Impulsate per {name}",
+ "status.reblogs": "{count, plural, one {impulso} other {impulsos}}",
+ "status.reblogs.empty": "Necuno ha ancora impulsate iste message. Quando alcuno lo face, le impulsos apparera hic.",
+ "status.redraft": "Deler e reconciper",
+ "status.remove_bookmark": "Remover marcapagina",
+ "status.replied_to": "Respondite a {name}",
+ "status.reply": "Responder",
+ "status.replyAll": "Responder al discussion",
+ "status.report": "Signalar @{name}",
+ "status.sensitive_warning": "Contento sensibile",
"status.share": "Compartir",
+ "status.show_filter_reason": "Monstrar in omne caso",
+ "status.show_less": "Monstrar minus",
+ "status.show_less_all": "Monstrar minus pro totes",
+ "status.show_more": "Monstrar plus",
+ "status.show_more_all": "Monstrar plus pro totes",
+ "status.show_original": "Monstrar original",
+ "status.title.with_attachments": "{user} ha publicate {attachmentCount, plural, one {un annexo} other {{attachmentCount} annexos}}",
"status.translate": "Traducer",
"status.translated_from_with": "Traducite ab {lang} usante {provider}",
+ "status.uncached_media_warning": "Previsualisation non disponibile",
+ "status.unmute_conversation": "Non plus silentiar conversation",
+ "status.unpin": "Disfixar del profilo",
+ "subscribed_languages.lead": "Solmente le messages in le linguas seligite apparera in tu chronologias de initio e de listas post le cambiamento. Selige necun pro reciper messages in tote le linguas.",
+ "subscribed_languages.save": "Salveguardar le cambiamentos",
+ "subscribed_languages.target": "Cambiar le linguas subscribite pro {target}",
"tabs_bar.home": "Initio",
"tabs_bar.notifications": "Notificationes",
+ "time_remaining.days": "{number, plural, one {# die} other {# dies}} restante",
+ "time_remaining.hours": "{number, plural, one {# hora} other {# horas}} restante",
+ "time_remaining.minutes": "{number, plural, one {# minuta} other {# minutas}} restante",
+ "time_remaining.moments": "Qualque momentos restante",
+ "time_remaining.seconds": "{number, plural, one {# secunda} other {# secundas}} restante",
+ "timeline_hint.remote_resource_not_displayed": "Le {resource} de altere servitores non appare hic.",
+ "timeline_hint.resources.followers": "Sequitores",
+ "timeline_hint.resources.follows": "Sequites",
"timeline_hint.resources.statuses": "Messages ancian",
+ "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} in le passate {days, plural, one {die} other {{days} dies}}",
"trends.trending_now": "Ora in tendentias",
- "upload_form.undo": "Deler",
+ "ui.beforeunload": "Tu esbosso essera predite si tu exi de Mastodon.",
+ "units.short.billion": "{count}B",
+ "units.short.million": "{count}M",
+ "units.short.thousand": "{count}K",
+ "upload_area.title": "Traher e deponer pro incargar",
+ "upload_button.label": "Adde imagines, un video o un file de audio",
+ "upload_error.limit": "Limite de incargamento de files excedite.",
+ "upload_error.poll": "Incargamento de files non permittite con sondages.",
+ "upload_form.audio_description": "Describe lo pro le gente con difficultates auditive",
+ "upload_form.description": "Describe lo pro le gente con difficultates visual",
+ "upload_form.edit": "Modificar",
+ "upload_form.thumbnail": "Cambiar le miniatura",
+ "upload_form.video_description": "Describe lo pro le gente con difficultates auditive o visual",
+ "upload_modal.analyzing_picture": "Analysa imagine…",
+ "upload_modal.apply": "Applicar",
+ "upload_modal.applying": "Applicante…",
"upload_modal.choose_image": "Seliger un imagine",
- "upload_modal.detect_text": "Deteger texto ab un pictura",
+ "upload_modal.description_placeholder": "Cinque expertos del zoo jam bibeva whisky frigide",
+ "upload_modal.detect_text": "Deteger texto de un imagine",
+ "upload_modal.edit_media": "Modificar le medio",
+ "upload_modal.hint": "Clicca o trahe le circulo sur le previsualisation pro eliger le puncto focal que essera sempre visibile sur tote le miniaturas.",
+ "upload_modal.preparing_ocr": "Preparation del OCR…",
+ "upload_modal.preview_label": "Previsualisation ({ratio})",
+ "upload_progress.label": "Incargante...",
+ "upload_progress.processing": "Processante…",
+ "username.taken": "Iste nomine de usator es ja in uso. Proba con un altere",
"video.close": "Clauder le video",
"video.download": "Discargar le file",
+ "video.exit_fullscreen": "Sortir del schermo plen",
+ "video.expand": "Expander video",
"video.fullscreen": "Schermo plen",
"video.hide": "Celar video",
"video.mute": "Silentiar le sono",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 5af20a97f7bc8c..33161f888251d9 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -21,6 +21,7 @@
"account.blocked": "Terblokir",
"account.browse_more_on_origin_server": "Lihat lebih lanjut di profil asli",
"account.cancel_follow_request": "Batalkan permintaan ikut",
+ "account.copy": "Salin tautan ke profil",
"account.direct": "Sebut secara pribadi @{name}",
"account.disable_notifications": "Berhenti memberitahu saya ketika @{name} memposting",
"account.domain_blocked": "Domain diblokir",
@@ -31,6 +32,7 @@
"account.featured_tags.last_status_never": "Tidak ada kiriman",
"account.featured_tags.title": "Tagar {name} yang difiturkan",
"account.follow": "Ikuti",
+ "account.follow_back": "Ikuti balik",
"account.followers": "Pengikut",
"account.followers.empty": "Pengguna ini belum ada pengikut.",
"account.followers_counter": "{count, plural, other {{counter} Pengikut}}",
@@ -51,6 +53,7 @@
"account.mute_notifications_short": "Senyapkan Notifikasi",
"account.mute_short": "Senyapkan",
"account.muted": "Dibisukan",
+ "account.mutual": "Saling ikuti",
"account.no_bio": "Tidak ada deskripsi yang diberikan.",
"account.open_original_page": "Buka halaman asli",
"account.posts": "Kiriman",
@@ -75,6 +78,10 @@
"admin.dashboard.retention.average": "Rata-rata",
"admin.dashboard.retention.cohort": "Bulan pendaftaran",
"admin.dashboard.retention.cohort_size": "Pengguna baru",
+ "admin.impact_report.instance_accounts": "Akun profil yang akan terhapus",
+ "admin.impact_report.instance_followers": "Pengikut yang akan kehilangan oleh pengguna kita",
+ "admin.impact_report.instance_follows": "Pengikut yang akan kehilangan oleh pengguna lain",
+ "admin.impact_report.title": "Ringkasan dampak",
"alert.rate_limited.message": "Mohon ulangi setelah {retry_time, time, medium}.",
"alert.rate_limited.title": "Jumlah akses dibatasi",
"alert.unexpected.message": "Terjadi kesalahan yang tidak terduga.",
@@ -82,7 +89,14 @@
"announcement.announcement": "Pengumuman",
"attachments_list.unprocessed": "(tidak diproses)",
"audio.hide": "Sembunyikan audio",
- "autosuggest_hashtag.per_week": "{count} per minggu",
+ "block_modal.remote_users_caveat": "Kami akan meminta {domain} server untuk menghargai keputusan Anda. Namun, kepatuhan tak dapat dipastikan karena beberapa server dapat menangani blokir secara beragam. Postingan publik masih dapat terlihat oleh pengguna tanpa masuk.",
+ "block_modal.show_less": "Tampilkan lebih sedikit",
+ "block_modal.show_more": "Tampilkan lebih banyak",
+ "block_modal.they_cant_mention": "Mereka tidak dapat menyebut atau mengikuti Anda.",
+ "block_modal.they_cant_see_posts": "Mereka tidak dapat melihat postingan Anda dan Anda tidak dapat melihat postingan mereka.",
+ "block_modal.they_will_know": "Mereka dapat melihat bahwa mereka diblokir.",
+ "block_modal.title": "Blokir pengguna?",
+ "block_modal.you_wont_see_mentions": "Anda tidak akan melihat kiriman yang menyebutkan mereka.",
"boost_modal.combo": "Anda dapat menekan {combo} untuk melewati ini",
"bundle_column_error.copy_stacktrace": "Salin laporan kesalahan",
"bundle_column_error.error.body": "Laman yang diminta tidak dapat ditampilkan. Mungkin karena sebuah kutu dalam kode kami, atau masalah kompatibilitas peramban.",
@@ -105,8 +119,11 @@
"column.blocks": "Pengguna yang diblokir",
"column.bookmarks": "Markah",
"column.community": "Linimasa Lokal",
+ "column.direct": "Sebut secara pribadi",
"column.directory": "Jelajahi profil",
"column.domain_blocks": "Domain tersembunyi",
+ "column.favourites": "Favorit",
+ "column.firehose": "Feed yang sedang berlangsung",
"column.follow_requests": "Permintaan mengikuti",
"column.home": "Beranda",
"column.lists": "List",
@@ -127,33 +144,31 @@
"community.column_settings.remote_only": "Hanya jarak jauh",
"compose.language.change": "Ganti bahasa",
"compose.language.search": "Telusuri bahasa...",
+ "compose.published.body": "Postingan diterbitkan.",
"compose.published.open": "Buka",
+ "compose.saved.body": "Postingan tersimpan.",
"compose_form.direct_message_warning_learn_more": "Pelajari lebih lanjut",
"compose_form.encryption_warning": "Kiriman di Mastodon tidak dienkripsi secara end-to-end. Jangan bagikan informasi sensitif melalui Mastodon.",
"compose_form.hashtag_warning": "Kiriman ini tidak akan didaftarkan di bawah tagar apapun selama tidak diatur ke publik. Hanya kiriman publik yang dapat dicari dengan tagar.",
"compose_form.lock_disclaimer": "Akun Anda tidak {locked}. Semua orang dapat mengikuti Anda untuk melihat kiriman khusus untuk pengikut Anda.",
"compose_form.lock_disclaimer.lock": "terkunci",
"compose_form.placeholder": "Apa yang ada di pikiran Anda?",
- "compose_form.poll.add_option": "Tambahkan pilihan",
"compose_form.poll.duration": "Durasi japat",
- "compose_form.poll.option_placeholder": "Pilihan {number}",
- "compose_form.poll.remove_option": "Hapus opsi ini",
+ "compose_form.poll.multiple": "Pilihan ganda",
+ "compose_form.poll.option_placeholder": "Opsi {number}",
+ "compose_form.poll.single": "Pilih Satu",
"compose_form.poll.switch_to_multiple": "Ubah japat menjadi pilihan ganda",
"compose_form.poll.switch_to_single": "Ubah japat menjadi pilihan tunggal",
- "compose_form.publish": "Terbitkan",
+ "compose_form.poll.type": "Gaya",
+ "compose_form.publish": "Postingan",
"compose_form.publish_form": "Terbitkan",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Simpan perubahan",
- "compose_form.sensitive.hide": "{count, plural, other {Tandai media sebagai sensitif}}",
- "compose_form.sensitive.marked": "{count, plural, other {Media ini ditandai sebagai sensitif}}",
- "compose_form.sensitive.unmarked": "{count, plural, other {Media ini tidak ditandai sebagai sensitif}}",
+ "compose_form.reply": "Balas",
+ "compose_form.save_changes": "Perbarui",
"compose_form.spoiler.marked": "Hapus peringatan tentang isi konten",
"compose_form.spoiler.unmarked": "Tambahkan peringatan tentang isi konten",
- "compose_form.spoiler_placeholder": "Peringatan konten",
+ "compose_form.spoiler_placeholder": "Peringatan konten (opsional)",
"confirmation_modal.cancel": "Batal",
- "confirmations.block.block_and_report": "Blokir & Laporkan",
"confirmations.block.confirm": "Blokir",
- "confirmations.block.message": "Apa Anda yakin ingin memblokir {name}?",
"confirmations.cancel_follow_request.confirm": "Batalkan permintaan",
"confirmations.cancel_follow_request.message": "Apakah Anda yakin ingin membatalkan permintaan Anda untuk mengikuti {name}?",
"confirmations.delete.confirm": "Hapus",
@@ -162,15 +177,15 @@
"confirmations.delete_list.message": "Apakah Anda yakin untuk menghapus daftar ini secara permanen?",
"confirmations.discard_edit_media.confirm": "Buang",
"confirmations.discard_edit_media.message": "Anda belum menyimpan perubahan deskripsi atau pratinjau media, buang saja?",
- "confirmations.domain_block.confirm": "Sembunyikan keseluruhan domain",
+ "confirmations.domain_block.confirm": "Blokir server",
"confirmations.domain_block.message": "Apakah Anda benar-benar yakin untuk memblokir keseluruhan {domain}? Dalam kasus tertentu beberapa pemblokiran atau penyembunyian lebih baik.",
"confirmations.edit.confirm": "Ubah",
+ "confirmations.edit.message": "Mengubah akan menimpa pesan yang sedang anda tulis. Apakah anda yakin ingin melanjutkan?",
"confirmations.logout.confirm": "Keluar",
"confirmations.logout.message": "Apakah Anda yakin ingin keluar?",
"confirmations.mute.confirm": "Bisukan",
- "confirmations.mute.explanation": "Ini akan menyembunyikan pos dari mereka dan pos yang menyebut mereka, tapi ini tetap mengizinkan mereka melihat posmu dan mengikutimu.",
- "confirmations.mute.message": "Apa Anda yakin ingin membisukan {name}?",
"confirmations.redraft.confirm": "Hapus dan susun ulang",
+ "confirmations.redraft.message": "Apakah anda yakin ingin menghapus postingan ini dan menyusun ulang postingan ini? Favorit dan peningkatan akan hilang, dan balasan ke postingan asli tidak akan terhubung ke postingan manapun.",
"confirmations.reply.confirm": "Balas",
"confirmations.reply.message": "Membalas sekarang akan menimpa pesan yang sedang Anda buat. Anda yakin ingin melanjutkan?",
"confirmations.unfollow.confirm": "Berhenti mengikuti",
@@ -179,6 +194,7 @@
"conversation.mark_as_read": "Tandai sudah dibaca",
"conversation.open": "Lihat percakapan",
"conversation.with": "Dengan {names}",
+ "copy_icon_button.copied": "Disalin ke clipboard",
"copypaste.copied": "Disalin",
"copypaste.copy_to_clipboard": "Salin ke clipboard",
"directory.federated": "Dari fediverse yang dikenal",
@@ -190,7 +206,27 @@
"dismissable_banner.community_timeline": "Ini adalah kiriman publik terkini dari orang yang akunnya berada di {domain}.",
"dismissable_banner.dismiss": "Abaikan",
"dismissable_banner.explore_links": "Cerita berita ini sekarang sedang dibicarakan oleh orang di server ini dan lainnya dalam jaringan terdesentralisasi.",
+ "dismissable_banner.explore_statuses": "Ini adalah postingan dari seluruh web sosial yang mendapatkan daya tarik saat ini. Postingan baru dengan lebih banyak peningkatan dan favorit memiliki peringkat lebih tinggi.",
"dismissable_banner.explore_tags": "Tagar ini sekarang sedang tren di antara orang di server ini dan lainnya dalam jaringan terdesentralisasi.",
+ "dismissable_banner.public_timeline": "Ini adalah postingan publik dari orang-orang di web sosial yang diikuti oleh {domain}.",
+ "domain_block_modal.block": "Blokir server",
+ "domain_block_modal.block_account_instead": "Blokir @{name} saja",
+ "domain_block_modal.they_can_interact_with_old_posts": "Orang-orang dari server ini dapat berinteraksi dengan kiriman lama anda.",
+ "domain_block_modal.they_cant_follow": "Tidak ada seorangpun dari server ini yang dapat mengikuti anda.",
+ "domain_block_modal.they_wont_know": "Mereka tidak akan tahu bahwa mereka diblokir.",
+ "domain_block_modal.title": "Blokir domain?",
+ "domain_block_modal.you_will_lose_followers": "Semua pengikut anda dari server ini akan dihapus.",
+ "domain_block_modal.you_wont_see_posts": "Anda tidak akan melihat postingan atau notifikasi dari pengguna di server ini.",
+ "domain_pill.activitypub_lets_connect": "Ini memungkinkan anda terhubung dan berinteraksi dengan orang-orang tidak hanya di Mastodon, tetapi juga di berbagai aplikasi sosial.",
+ "domain_pill.activitypub_like_language": "ActivityPub seperti bahasa yang digunakan Mastodon dengan jejaring sosial lainnya.",
+ "domain_pill.server": "Server",
+ "domain_pill.their_handle": "Nama penggunanya:",
+ "domain_pill.their_server": "Rumah digital mereka, di mana semua postingan mereka tersedia.",
+ "domain_pill.their_username": "Pengenal unik mereka di server tersebut. Itu memungkinkan dapat mencari pengguna dengan nama yang sama di server lain.",
+ "domain_pill.username": "Nama pengguna",
+ "domain_pill.whats_in_a_handle": "Apa itu nama pengguna?",
+ "domain_pill.who_they_are": "Karena nama pengguna menunjukkan siapa seseorang dan di mana server mereka berada, anda dapat berinteraksi dengan orang-orang di seluruh web sosial .",
+ "domain_pill.your_handle": "Nama pengguna anda:",
"embed.instructions": "Sematkan kiriman ini di situs web Anda dengan menyalin kode di bawah ini.",
"embed.preview": "Tampilan akan seperti ini nantinya:",
"emoji_button.activity": "Aktivitas",
@@ -259,6 +295,10 @@
"follow_request.authorize": "Izinkan",
"follow_request.reject": "Tolak",
"follow_requests.unlocked_explanation": "Meskipun akun Anda tidak dikunci, staf {domain} menyarankan Anda untuk meninjau permintaan mengikuti dari akun-akun ini secara manual.",
+ "follow_suggestions.curated_suggestion": "Pilihan staf",
+ "follow_suggestions.dismiss": "Jangan tampilkan lagi",
+ "follow_suggestions.hints.featured": "Profil ini telah dipilih sendiri oleh tim {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "Profil ini populer di kalangan orang yang anda ikuti.",
"followed_tags": "Tagar yang diikuti",
"footer.about": "Tentang",
"footer.directory": "Direktori profil",
@@ -281,9 +321,6 @@
"hashtag.column_settings.tag_toggle": "Include additional tags in this column",
"hashtag.follow": "Ikuti tagar",
"hashtag.unfollow": "Batalkan pengikutan tagar",
- "home.actions.go_to_explore": "Lihat apa yang lagi tranding",
- "home.actions.go_to_suggestions": "Temukan Orang untuk Diikuti",
- "home.column_settings.basic": "Dasar",
"home.column_settings.show_reblogs": "Tampilkan boost",
"home.column_settings.show_replies": "Tampilkan balasan",
"home.hide_announcements": "Sembunyikan pengumuman",
@@ -354,9 +391,6 @@
"load_pending": "{count, plural, other {# item baru}}",
"media_gallery.toggle_visible": "Tampil/Sembunyikan",
"moved_to_account_banner.text": "Akun {disabledAccount} Anda kini dinonaktifkan karena Anda pindah ke {movedToAccount}.",
- "mute_modal.duration": "Durasi",
- "mute_modal.hide_notifications": "Sembunyikan notifikasi dari pengguna ini?",
- "mute_modal.indefinite": "Tak terbatas",
"navigation_bar.about": "Tentang",
"navigation_bar.blocks": "Pengguna diblokir",
"navigation_bar.bookmarks": "Markah",
@@ -364,7 +398,6 @@
"navigation_bar.compose": "Tulis toot baru",
"navigation_bar.discover": "Temukan",
"navigation_bar.domain_blocks": "Domain tersembunyi",
- "navigation_bar.edit_profile": "Ubah profil",
"navigation_bar.explore": "Jelajahi",
"navigation_bar.filters": "Kata yang dibisukan",
"navigation_bar.follow_requests": "Permintaan mengikuti",
@@ -395,9 +428,6 @@
"notifications.column_settings.admin.report": "Laporan baru:",
"notifications.column_settings.admin.sign_up": "Pendaftaran baru:",
"notifications.column_settings.alert": "Notifikasi desktop",
- "notifications.column_settings.filter_bar.advanced": "Tampilkan semua kategori",
- "notifications.column_settings.filter_bar.category": "Bilah penyaring cepat",
- "notifications.column_settings.filter_bar.show_bar": "Tampilkan bilah filter",
"notifications.column_settings.follow": "Pengikut baru:",
"notifications.column_settings.follow_request": "Permintaan mengikuti baru:",
"notifications.column_settings.mention": "Balasan:",
@@ -454,14 +484,7 @@
"poll_button.add_poll": "Tambah japat",
"poll_button.remove_poll": "Hapus japat",
"privacy.change": "Ubah privasi kiriman",
- "privacy.direct.long": "Kirim hanya ke pengguna yang disebut",
- "privacy.direct.short": "Orang yang disebutkan saja",
- "privacy.private.long": "Kirim kiriman hanya kepada pengikut",
- "privacy.private.short": "Pengikut saja",
- "privacy.public.long": "Terlihat oleh semua",
"privacy.public.short": "Publik",
- "privacy.unlisted.long": "Terlihat oleh semua, tapi jangan tampilkan di fitur jelajah",
- "privacy.unlisted.short": "Tak Terdaftar",
"privacy_policy.last_updated": "Terakhir diperbarui {date}",
"privacy_policy.title": "Kebijakan Privasi",
"refresh": "Segarkan",
@@ -548,7 +571,6 @@
"status.delete": "Hapus",
"status.detailed_status": "Tampilan detail percakapan",
"status.edit": "Edit",
- "status.edited": "Diedit {date}",
"status.edited_x_times": "Diedit {count, plural, other {{count} kali}}",
"status.embed": "Tanam",
"status.filter": "Saring kiriman ini",
@@ -615,10 +637,8 @@
"upload_error.poll": "Unggah berkas tak diizinkan di japat ini.",
"upload_form.audio_description": "Penjelasan untuk orang dengan gangguan pendengaran",
"upload_form.description": "Deskripsikan untuk mereka yang tidak bisa melihat dengan jelas",
- "upload_form.description_missing": "Tidak ada deskripsi yang ditambahkan",
"upload_form.edit": "Sunting",
"upload_form.thumbnail": "Ubah gambar kecil",
- "upload_form.undo": "Undo",
"upload_form.video_description": "Penjelasan untuk orang dengan gangguan pendengaran atau penglihatan",
"upload_modal.analyzing_picture": "Analisis gambar…",
"upload_modal.apply": "Terapkan",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index 8579fc89c65604..1921509478c105 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -89,7 +89,14 @@
"announcement.announcement": "Proclamation",
"attachments_list.unprocessed": "(íntractat)",
"audio.hide": "Celar audio",
- "autosuggest_hashtag.per_week": "{count} per semane",
+ "block_modal.remote_users_caveat": "Noi va petir que li servitor {domain} mey respecter tui decision. Támen, obedientie ne es garantit pro que chascun servitor gere bloccas diferentmen. Possibilmen public postas va restar visibil a usatores de inloggat.",
+ "block_modal.show_less": "Monstrar minu",
+ "block_modal.show_more": "Monstrar plu",
+ "block_modal.they_cant_mention": "Ne posse mentionar ni sequer te.",
+ "block_modal.they_cant_see_posts": "Ne posse vider tui postas e inversi.",
+ "block_modal.they_will_know": "Va esser conscient que tu ha bloccat.",
+ "block_modal.title": "Bloccar usator?",
+ "block_modal.you_wont_see_mentions": "Tu ne va vider postas mentionant li usator.",
"boost_modal.combo": "Li proxim vez tu posse pressar {combo} por passar to-ci",
"bundle_column_error.copy_stacktrace": "Copiar erra-raporte",
"bundle_column_error.error.body": "Li demandat págine ne posset esser rendit. Fórsan it es un problema in nor code, o un problema de compatibilitá con li navigator.",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "Tui conto ne es {locked}. Quicunc posse sequer te por vider tui postas solmen por sequitores.",
"compose_form.lock_disclaimer.lock": "cludet",
"compose_form.placeholder": "Quo es in tui spiritu?",
- "compose_form.poll.add_option": "Adjunter un option",
"compose_form.poll.duration": "Duration del balotation",
+ "compose_form.poll.multiple": "Selection multiplic",
"compose_form.poll.option_placeholder": "Option {number}",
- "compose_form.poll.remove_option": "Remover ti-ci option",
+ "compose_form.poll.single": "Selecter un",
"compose_form.poll.switch_to_multiple": "Changea li balotation por permisser multiplic selectiones",
"compose_form.poll.switch_to_single": "Changea li balotation por permisser un singul selection",
- "compose_form.publish": "Publicar",
+ "compose_form.poll.type": "Stil",
+ "compose_form.publish": "Postar",
"compose_form.publish_form": "Nov posta",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Conservar changes",
- "compose_form.sensitive.hide": "{count, plural, one {Marcar medie quam sensitiv} other {Marcar medie quam sensitiv}}",
- "compose_form.sensitive.marked": "{count, plural, one {Medie es marcat quam sensitiv} other {Medie es marcat quam sensitiv}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Medie ne es marcat quam sensitiv} other {Medie ne es marcat quam sensitiv}}",
+ "compose_form.reply": "Responder",
+ "compose_form.save_changes": "Actualisar",
"compose_form.spoiler.marked": "Remover avise pri li contenete",
"compose_form.spoiler.unmarked": "Adjunter avise pri li contenete",
- "compose_form.spoiler_placeholder": "Scri tui avise ci",
+ "compose_form.spoiler_placeholder": "Advertiment de contenete (optional)",
"confirmation_modal.cancel": "Anullar",
- "confirmations.block.block_and_report": "Bloccar & Raportar",
"confirmations.block.confirm": "Bloccar",
- "confirmations.block.message": "Esque tu vermen vole bloccar {name}?",
"confirmations.cancel_follow_request.confirm": "Retraer petition",
"confirmations.cancel_follow_request.message": "Esque tu vermen vole retraer tui petition sequer {name}?",
"confirmations.delete.confirm": "Deleter",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "Esque tu vermen vole permanentmen deleter ti-ci liste?",
"confirmations.discard_edit_media.confirm": "Forjettar",
"confirmations.discard_edit_media.message": "Tu have ínconservat changes al descrition de medie o al previse, forjettar les sin egarda?",
- "confirmations.domain_block.confirm": "Bloccar li tot dominia",
+ "confirmations.domain_block.confirm": "Bloccar servitor",
"confirmations.domain_block.message": "Esque tu es certissim que tu vole bloccar li tot {domain}? In mult casus, bloccar o silentiar quelc specific contos es suficent e preferibil. Tu ne va vider contenete de ti dominia in quelcunc public témpor-linea o in tui notificationes. Tui sequitores de ti dominia va esser removet.",
"confirmations.edit.confirm": "Redacter",
"confirmations.edit.message": "Redacter nu va remplazzar li missage quel tu actualmen composi. Esque tu vermen vole proceder?",
"confirmations.logout.confirm": "Exear",
"confirmations.logout.message": "Esque tu vermen vole exear?",
"confirmations.mute.confirm": "Silentiar",
- "confirmations.mute.explanation": "To-ci va celar postas de ilu e postas mentionant ilu, ma it ancor va permisser ilu vider tui postas e sequer te.",
- "confirmations.mute.message": "Esque tu vermen vole silentiar {name}?",
"confirmations.redraft.confirm": "Deleter & redacter",
"confirmations.redraft.message": "Esque tu vermen vole deleter ti-ci posta e redacter it? Favorites e boosts va esser perdit, e responses al posta original va esser orfanat.",
"confirmations.reply.confirm": "Responder",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "Tis-ci es postas del social retage queles es popular hodie. Nov postas con plu mult boosts e favorites es monstrat plu alt.",
"dismissable_banner.explore_tags": "Tis-ci es hashtags queles es popular che li social retage hodie. Hashtags usat de plu mult persones diferent es monstrat plu alt.",
"dismissable_banner.public_timeline": "Tis-ci es li max recent public postas de persones che li social retage quem gente che {domain} seque.",
+ "domain_block_modal.block": "Bloccar servitor",
+ "domain_block_modal.block_account_instead": "Altrimen, bloccar @{name}",
+ "domain_block_modal.they_can_interact_with_old_posts": "Persones de ti servitor posse interacter con tui old postas.",
+ "domain_block_modal.they_cant_follow": "Nequi de ti-ci servitor posse sequer te.",
+ "domain_block_modal.they_wont_know": "Ne va esser conscient pri li bloccada.",
+ "domain_block_modal.title": "Bloccar dominia?",
+ "domain_block_modal.you_will_lose_followers": "Omni tui sequitores de ti-ci servitor va esser efaciat.",
+ "domain_block_modal.you_wont_see_posts": "Tu ne va vider postas ni notificationes de usatores sur ti-ci servitor.",
+ "domain_pill.activitypub_lets_connect": "It possibilisa tui conexiones e interactiones con persones ne solmen sur Mastodon, ma anc tra diferent social aplis.",
+ "domain_pill.activitypub_like_language": "ActivityPub es li lingue usat de Mastodon por parlar con altri social retages.",
+ "domain_pill.server": "Servitor",
+ "domain_pill.their_handle": "Identificator:",
+ "domain_pill.their_server": "Su digital hem e omni su postas.",
+ "domain_pill.their_username": "Su unic identificator sur su servitor. It es possibil que altri servitores va haver usatores con li sam nómine.",
+ "domain_pill.username": "Usator-nómine",
+ "domain_pill.whats_in_a_handle": "Ex quo consiste un identificator?",
+ "domain_pill.who_they_are": "Pro que identificatores informa qui e u un person is, tu posse interacter con persones tra li rete social de .",
+ "domain_pill.who_you_are": "Pro que tui identificator informa qui e u tu es, persones posse interacter con te tra li rete social de .",
+ "domain_pill.your_handle": "Tui identificator:",
+ "domain_pill.your_server": "Tui digital hem, u trova se omni tui postas. Si it ne plese te, tu posse transferer ad un altri servitor quandecunc e tui sequitores con te.",
+ "domain_pill.your_username": "Tui unic identificator sur ti-ci servitor. It es possibil que altri servitores va haver usatores con li sam nómine.",
"embed.instructions": "Inbedar ti-ci posta per copiar li code in infra.",
"embed.preview": "Vi qualmen it va aspecter:",
"emoji_button.activity": "Activitá",
@@ -244,6 +266,7 @@
"empty_column.list": "Ancor ne hay quocunc in ti-ci liste. Quande membres de ti-ci liste publica nov postas, ili va aparir ci.",
"empty_column.lists": "Tu ancor have null listes. Quande tu crea un, it va aparir ci.",
"empty_column.mutes": "Tu ancor ha silentiat null usatores.",
+ "empty_column.notification_requests": "Omnicos clar! Hay necos ci. Nov notificationes va venir ci quande tu recive les secun tui parametres.",
"empty_column.notifications": "Tu have null notificationes. Quande altri persones interacte con te, tu va vider it ci.",
"empty_column.public": "Hay nullcos ci! Scri alquo publicmen, o manualmen seque usatores de altri servitores por plenar to-ci",
"error.unexpected_crash.explanation": "Pro un error in nor code o un problema de compatibilitá in li navigator, ti-ci págine ne posset esser monstrat correctmen.",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "Usar un existent categorie o crear nov",
"filter_modal.select_filter.title": "Filtrar ti-ci posta",
"filter_modal.title.status": "Filtrar un posta",
+ "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentiones}}",
+ "filtered_notifications_banner.pending_requests": "Notificationes de {count, plural, =0 {nequi} one {un person} other {# persones}} quel tu possibilmen conosse",
+ "filtered_notifications_banner.title": "Filtrat notificationes",
"firehose.all": "Omno",
"firehose.local": "Ti-ci servitor",
"firehose.remote": "Altri servitores",
"follow_request.authorize": "Autorisar",
"follow_request.reject": "Rejecter",
"follow_requests.unlocked_explanation": "Benque tu conto ne es cludet, li administratores de {domain} pensat que tu fórsan vell voler tractar seque-petitiones de tis-ci contos manualmen.",
+ "follow_suggestions.curated_suggestion": "Selection del employates",
+ "follow_suggestions.dismiss": "Ne monstrar plu",
+ "follow_suggestions.featured_longer": "Selectet manualmen del equip de {domain}",
+ "follow_suggestions.friends_of_friends_longer": "Populari ínter li persones queles tu seque",
+ "follow_suggestions.hints.featured": "Ti-ci profil ha esset selectet directmen del equip de {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "Ti-ci profil es populari ínter tis qui tu seque.",
+ "follow_suggestions.hints.most_followed": "Ti-ci profil es un del max sequet sur {domain}.",
+ "follow_suggestions.hints.most_interactions": "Ti-ci profil ha recivet mult atention recentmen sur {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Ti-ci profil es simil al profiles queles tu ha recentmen sequet.",
+ "follow_suggestions.personalized_suggestion": "Personalisat suggestion",
+ "follow_suggestions.popular_suggestion": "Populari suggestion",
+ "follow_suggestions.popular_suggestion_longer": "Populari sur {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Simil a profiles queles tu sequet recentmen",
+ "follow_suggestions.view_all": "Vider omnicos",
+ "follow_suggestions.who_to_follow": "Persones a sequer",
"followed_tags": "Sequet hashtags",
"footer.about": "Information",
"footer.directory": "Profilarium",
@@ -306,13 +347,8 @@
"hashtag.follow": "Sequer hashtag",
"hashtag.unfollow": "Dessequer hashtag",
"hashtags.and_other": "…e {count, plural, other {# in plu}}",
- "home.actions.go_to_explore": "Vider lu populari",
- "home.actions.go_to_suggestions": "Trovar gente por sequer",
- "home.column_settings.basic": "Basic",
"home.column_settings.show_reblogs": "Monstrar boosts",
"home.column_settings.show_replies": "Monstrar responses",
- "home.explore_prompt.body": "Tui hemal témpor-linea have un mixtura del hashtags queles tu selectet sequer, li gente quem tu selectet sequer, e li postas queles ili boosta. Si to sembla tro quiet, tu fórsan vole:",
- "home.explore_prompt.title": "To-ci es tui hemal págine in Mastodon.",
"home.hide_announcements": "Celar proclamationes",
"home.pending_critical_update.body": "Ples actualisar tui Mastodon-servitor tam rapid quam es possibil!",
"home.pending_critical_update.link": "Vider actualisationes",
@@ -396,9 +432,15 @@
"loading_indicator.label": "Cargant…",
"media_gallery.toggle_visible": "{number, plural, one {Celar image} other {Celar images}}",
"moved_to_account_banner.text": "Tui conto {disabledAccount} es actualmen desactivisat pro que tu movet te a {movedToAccount}.",
- "mute_modal.duration": "Duration",
- "mute_modal.hide_notifications": "Celar notificationes de ti-ci usator?",
- "mute_modal.indefinite": "Índefinit",
+ "mute_modal.hide_from_notifications": "Celar de notificationes",
+ "mute_modal.hide_options": "Celar optiones",
+ "mute_modal.indefinite": "Til quande yo dessilentia li usator",
+ "mute_modal.show_options": "Monstrar optiones",
+ "mute_modal.they_can_mention_and_follow": "Posse mentionar e sequer te, ma va esser ínvisibil a te.",
+ "mute_modal.they_wont_know": "Ne va esser conscient pri li silentation.",
+ "mute_modal.title": "Silentiar usator?",
+ "mute_modal.you_wont_see_mentions": "Tu ne va vider postas mentionant li usator.",
+ "mute_modal.you_wont_see_posts": "Ne posse vider tui postas e inversi.",
"navigation_bar.about": "Information",
"navigation_bar.advanced_interface": "Aperter in li web-interfacie avansat",
"navigation_bar.blocks": "Bloccat usatores",
@@ -408,7 +450,6 @@
"navigation_bar.direct": "Privat mentiones",
"navigation_bar.discover": "Decovrir",
"navigation_bar.domain_blocks": "Bloccat dominias",
- "navigation_bar.edit_profile": "Redacter profil",
"navigation_bar.explore": "Explorar",
"navigation_bar.favourites": "Favorites",
"navigation_bar.filters": "Silentiat paroles",
@@ -432,11 +473,29 @@
"notification.follow": "{name} sequet te",
"notification.follow_request": "{name} ha petit sequer te",
"notification.mention": "{name} mentionat te",
+ "notification.moderation-warning.learn_more": "Aprender plu",
+ "notification.moderation_warning": "Tu ha recivet un moderatori advertiment",
+ "notification.moderation_warning.action_delete_statuses": "Alcun de tui postas ha esset efaciat.",
+ "notification.moderation_warning.action_disable": "Tui conto ha esset desactivisat.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Alcun de tui postas ha esset marcat quam sensitiv.",
+ "notification.moderation_warning.action_none": "Tui conto ha recivet un moderatori advertiment.",
+ "notification.moderation_warning.action_sensitive": "Desde nu tui postas va esser marcat quam sensitiv.",
+ "notification.moderation_warning.action_silence": "Tui conto ha esset limitat.",
+ "notification.moderation_warning.action_suspend": "Tui conto ha esset suspendet.",
"notification.own_poll": "Tui balotation ha finit",
"notification.poll": "Un balotation in quel tu votat ha finit",
"notification.reblog": "{name} boostat tui posta",
+ "notification.relationships_severance_event": "Perdit conexiones con {name}",
+ "notification.relationships_severance_event.account_suspension": "Un admin de {from} ha suspendet {target}, dunc con ti person tu ne plu posse reciver actualisationes ni far interactiones.",
+ "notification.relationships_severance_event.domain_block": "Un admin de {from} ha bloccat {target}, includente {followersCount} de tui sequitores e {followingCount, plural, one {# conto} other {# contos}} sequet de te.",
+ "notification.relationships_severance_event.learn_more": "Aprender plu",
+ "notification.relationships_severance_event.user_domain_block": "Tu ha bloccat {target}, efaciante {followersCount} de tui sequitores e {followingCount, plural, one {# conto} other {# contos}} sequet de te.",
"notification.status": "{name} just postat",
"notification.update": "{name} modificat un posta",
+ "notification_requests.accept": "Acceptar",
+ "notification_requests.dismiss": "Demisser",
+ "notification_requests.notifications_from": "Notificationes de {name}",
+ "notification_requests.title": "Filtrat notificationes",
"notifications.clear": "Aclarar notificationes",
"notifications.clear_confirmation": "Vole tu vermen permanentmen aclarar omni tui notificationes?",
"notifications.column_settings.admin.report": "Nov raportas:",
@@ -445,7 +504,6 @@
"notifications.column_settings.favourite": "Favorites:",
"notifications.column_settings.filter_bar.advanced": "Monstrar omni categories",
"notifications.column_settings.filter_bar.category": "Rapid filtre-barre",
- "notifications.column_settings.filter_bar.show_bar": "Monstrar filtre-barre",
"notifications.column_settings.follow": "Nov sequitores:",
"notifications.column_settings.follow_request": "Nov petitiones de sequer:",
"notifications.column_settings.mention": "Mentiones:",
@@ -471,6 +529,15 @@
"notifications.permission_denied": "Notificationes sur li computator es índisponibil pro que on ha previamen rejectet un petition por navigator-permissiones",
"notifications.permission_denied_alert": "Notificationes sur li computator ne posse esser activisat, pro que navigator-permission ha esset previamen rejectet",
"notifications.permission_required": "Notificationes sur li computator es índisponibil pro que li besonat permission ne ha esset dat.",
+ "notifications.policy.filter_new_accounts.hint": "Creat durant li passat {days, plural, one {un die} other {# dies}}",
+ "notifications.policy.filter_new_accounts_title": "Nov contos",
+ "notifications.policy.filter_not_followers_hint": "Includente tis qui ha sequet te minu quam {days, plural, one {un die} other {# dies}}",
+ "notifications.policy.filter_not_followers_title": "Persones qui ne seque te",
+ "notifications.policy.filter_not_following_hint": "Til quande tu manualmen aproba",
+ "notifications.policy.filter_not_following_title": "Persones queles tu ne seque",
+ "notifications.policy.filter_private_mentions_hint": "Filtrat except si it es un response a tui propri mention o si tu seque li missor",
+ "notifications.policy.filter_private_mentions_title": "Ínsolicitat privat mentiones",
+ "notifications.policy.title": "Filtrar notificationes de…",
"notifications_permission_banner.enable": "Activisar notificationes sur li computator",
"notifications_permission_banner.how_to_control": "Por reciver notificationes quande Mastodon ne es apert, activisa notificationes sur li computator. Tu posse decider precisimen quel species de interactiones genera notificationes per li buton {icon} in-supra quande ili es activisat.",
"notifications_permission_banner.title": "Nequande preterlassa quocunc",
@@ -526,14 +593,15 @@
"poll_button.add_poll": "Adjunter un balotation",
"poll_button.remove_poll": "Remover balotation",
"privacy.change": "Changear li privatie del posta",
- "privacy.direct.long": "Visibil solmen a mentionat usatores",
- "privacy.direct.short": "Solmen persones mentionat",
- "privacy.private.long": "Visibil solmen por sequitores",
- "privacy.private.short": "Solmen sequitores",
- "privacy.public.long": "Visibil a omnes",
+ "privacy.direct.long": "Omnes mentionat in li posta",
+ "privacy.direct.short": "Specific persones",
+ "privacy.private.long": "Solmen tui sequitores",
+ "privacy.private.short": "Sequitores",
+ "privacy.public.long": "Quicunc in e ex Mastodon",
"privacy.public.short": "Public",
- "privacy.unlisted.long": "Visibil por omnes, ma excludet de functiones de decovrition",
- "privacy.unlisted.short": "Delistat",
+ "privacy.unlisted.additional": "It acte just quam public, except que li posta ne va aparir in tendentie o hashtags, explorar, o sercha de Mastodon, mem si tu ha optet por les sur tui tot conto.",
+ "privacy.unlisted.long": "Minu fanfare algoritmic",
+ "privacy.unlisted.short": "Quiet public",
"privacy_policy.last_updated": "Ultimmen actualisat ye {date}",
"privacy_policy.title": "Politica pri Privatie",
"recommended": "Recomandat",
@@ -551,7 +619,9 @@
"relative_time.minutes": "{number}m",
"relative_time.seconds": "{number}s",
"relative_time.today": "hodie",
+ "reply_indicator.attachments": "{count, plural, one {# atachament} other {# atachamentes}}",
"reply_indicator.cancel": "Anullar",
+ "reply_indicator.poll": "Balotar",
"report.block": "Bloccar",
"report.block_explanation": "Tu ne va vider su postas. Li usator ni va posser vider tui postas, ni sequer te, ni va posser saver pri li statu de esser bloccat.",
"report.categories.legal": "Legal",
@@ -644,10 +714,11 @@
"status.direct": "Privatmen mentionar @{name}",
"status.direct_indicator": "Privat mention",
"status.edit": "Modificar",
- "status.edited": "Modificat ye {date}",
+ "status.edited": "Ultimmen actualisat ye {date}",
"status.edited_x_times": "Modificat {count, plural, one {{count} vez} other {{count} vezes}}",
"status.embed": "Inbedar",
"status.favourite": "Favoritisar",
+ "status.favourites": "{count, plural, one {favorit} other {favorites}}",
"status.filter": "Filtrar ti-ci posta",
"status.filtered": "Filtrat",
"status.hide": "Celar posta",
@@ -668,6 +739,7 @@
"status.reblog": "Boostar",
"status.reblog_private": "Boostar con li original visibilitá",
"status.reblogged_by": "{name} boostat",
+ "status.reblogs": "{count, plural, one {boost} other {boosts}}",
"status.reblogs.empty": "Ancor nequi ha boostat ti-ci posta. Quande alqui fa it, ilu va aparir ci.",
"status.redraft": "Deleter & redacter",
"status.remove_bookmark": "Remover marcator",
@@ -715,10 +787,8 @@
"upload_error.poll": "On ne es permisset cargar medie con balotationes.",
"upload_form.audio_description": "Descrir por persones qui es surd o ne audi bon",
"upload_form.description": "Descrir por persones qui es ciec o have mal vision",
- "upload_form.description_missing": "Null descrition adjuntet",
"upload_form.edit": "Redacter",
"upload_form.thumbnail": "Changear previsual image",
- "upload_form.undo": "Deleter",
"upload_form.video_description": "Descrir por persones qui es surd, ciec, ne audi bon, o have mal vision",
"upload_modal.analyzing_picture": "Analisant image…",
"upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/ig.json b/app/javascript/mastodon/locales/ig.json
index f163567f176035..90253743fca0fb 100644
--- a/app/javascript/mastodon/locales/ig.json
+++ b/app/javascript/mastodon/locales/ig.json
@@ -20,6 +20,7 @@
"column.bookmarks": "Ebenrụtụakā",
"column.home": "Be",
"column.lists": "Ndepụta",
+ "column.notifications": "Nziọkwà",
"column.pins": "Pinned post",
"column_header.pin": "Gbado na profaịlụ gị",
"column_subheading.settings": "Mwube",
@@ -37,23 +38,33 @@
"confirmations.delete.confirm": "Hichapụ",
"confirmations.delete.message": "Are you sure you want to delete this status?",
"confirmations.delete_list.confirm": "Hichapụ",
- "confirmations.domain_block.confirm": "Hide entire domain",
"confirmations.edit.confirm": "Dezie",
"confirmations.mute.confirm": "Mee ogbi",
"confirmations.reply.confirm": "Zaa",
"confirmations.unfollow.confirm": "Kwụsị iso",
"conversation.delete": "Hichapụ nkata",
+ "disabled_account_banner.account_settings": "Mwube akaụntụ",
"dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
"dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+ "domain_pill.username": "Ahaojiaru",
"embed.instructions": "Embed this status on your website by copying the code below.",
+ "emoji_button.activity": "Mmemme",
+ "emoji_button.label": "Tibanye emoji",
"emoji_button.search": "Chọọ...",
+ "emoji_button.symbols": "Ọdịmara",
"empty_column.account_timeline": "No posts found",
"empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
"empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
"errors.unexpected_crash.report_issue": "Kpesa nsogbu",
+ "explore.trending_links": "Akụkọ",
+ "firehose.all": "Ha niine",
+ "follow_request.authorize": "Nye ikike",
"footer.privacy_policy": "Iwu nzuzu",
"getting_started.heading": "Mbido",
"hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+ "home.column_settings.show_replies": "Gosi nzaghachị",
+ "home.hide_announcements": "Zoo ọkwa",
+ "home.show_announcements": "Gosi ọkwa",
"keyboard_shortcuts.back": "to navigate back",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "to boost",
@@ -107,8 +118,6 @@
"onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
"onboarding.steps.share_profile.title": "Share your profile",
"privacy.change": "Adjust status privacy",
- "privacy.direct.short": "Direct",
- "privacy.private.short": "Followers-only",
"relative_time.full.just_now": "kịta",
"relative_time.just_now": "kịta",
"relative_time.today": "taa",
@@ -142,7 +151,6 @@
"trends.trending_now": "Na-ewu ewu kịta",
"upload_form.audio_description": "Describe for people with hearing loss",
"upload_form.description": "Describe for the visually impaired",
- "upload_form.undo": "Hichapụ",
"upload_form.video_description": "Describe for people with hearing loss or visual impairment",
"upload_modal.choose_image": "Họrọ onyonyo",
"upload_progress.label": "Uploading…"
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 233b7684573582..3382fa1aecca7b 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -86,7 +86,6 @@
"announcement.announcement": "Anunco",
"attachments_list.unprocessed": "(neprocedita)",
"audio.hide": "Celez audio",
- "autosuggest_hashtag.per_week": "{count} dum singla semano",
"boost_modal.combo": "Vu povas pulsar {combo} por omisar co venontafoye",
"bundle_column_error.copy_stacktrace": "Kopierorraporto",
"bundle_column_error.error.body": "La demandita pagino ne povas strukturigesar. Forsan ol esas eroro en kodexo hike o vidilkoncilieblesproblemo.",
@@ -143,26 +142,14 @@
"compose_form.lock_disclaimer": "Vua konto ne esas {locked}. Irgu povas sequar vu por vidar vua sequanto-nura posti.",
"compose_form.lock_disclaimer.lock": "klefagesas",
"compose_form.placeholder": "Quo esas en tua spirito?",
- "compose_form.poll.add_option": "Insertez selekto",
"compose_form.poll.duration": "Votpostoduro",
- "compose_form.poll.option_placeholder": "Selektato {number}",
- "compose_form.poll.remove_option": "Efacez ca selektajo",
"compose_form.poll.switch_to_multiple": "Chanjez votposto por permisar multiselektaji",
"compose_form.poll.switch_to_single": "Chanjez votposto por permisar una selektajo",
- "compose_form.publish": "Publikigez",
"compose_form.publish_form": "Publish",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Sparez chanji",
- "compose_form.sensitive.hide": "{count, plural,one {Markizez medii quale privata} other {Markizez medii quale privata}}",
- "compose_form.sensitive.marked": "{count, plural,one {Medii markizesis quale privata} other {Medii markizesis quale privata}}",
- "compose_form.sensitive.unmarked": "{count, plural,one {Medii ne markizesis quale privata} other {Medii ne markizesis quale privata}}",
"compose_form.spoiler.marked": "Text is hidden behind warning",
"compose_form.spoiler.unmarked": "Text is not hidden",
- "compose_form.spoiler_placeholder": "Averto di kontenajo",
"confirmation_modal.cancel": "Anulez",
- "confirmations.block.block_and_report": "Restriktez e Raportizez",
"confirmations.block.confirm": "Restriktez",
- "confirmations.block.message": "Ka vu certe volas restrikar {name}?",
"confirmations.cancel_follow_request.confirm": "Desendez demando",
"confirmations.cancel_follow_request.message": "Ka vu certe volas desendar vua demando di sequar {name}?",
"confirmations.delete.confirm": "Efacez",
@@ -171,15 +158,12 @@
"confirmations.delete_list.message": "Ka vu certe volas netempale efacar ca listo?",
"confirmations.discard_edit_media.confirm": "Efacez",
"confirmations.discard_edit_media.message": "Vu havas nesparita chanji di mediodeskript o prevido, vu volas jus efacar?",
- "confirmations.domain_block.confirm": "Hide entire domain",
"confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
"confirmations.edit.confirm": "Modifikez",
"confirmations.edit.message": "Modifikar nun remplasos la mesajo quon vu nune skribas. Ka vu certe volas procedar?",
"confirmations.logout.confirm": "Ekirez",
"confirmations.logout.message": "Ka tu certe volas ekirar?",
"confirmations.mute.confirm": "Silencigez",
- "confirmations.mute.explanation": "Co celigos posti de oli e posti quo mencionas oli, ma ol ankore permisas oli vidar vua posti e sequar vu.",
- "confirmations.mute.message": "Ka vu certe volas silencigar {name}?",
"confirmations.redraft.confirm": "Efacez e riskisez",
"confirmations.redraft.message": "Ka vu certe volas efacar ca posto e riskisigar ol? Favoriziti e repeti esos perdita, e respondi al posto originala esos orfanigita.",
"confirmations.reply.confirm": "Respondez",
@@ -303,13 +287,8 @@
"hashtag.follow": "Sequez hashtago",
"hashtag.unfollow": "Desequez hashtago",
"hashtags.and_other": "…e {count, plural, one {# plusa}other {# plusa}}",
- "home.actions.go_to_explore": "Videz quo es populara nun",
- "home.actions.go_to_suggestions": "Trovez personi por sequar",
- "home.column_settings.basic": "Simpla",
"home.column_settings.show_reblogs": "Montrar repeti",
"home.column_settings.show_replies": "Montrar respondi",
- "home.explore_prompt.body": "Vua hemala fluo havos mixuro de la hashtagi quin vu selektis sequar, la personi quin vu selektis sequar, e la posti quin ili repetis. Se to semblas tro tacanta, vu darfas volar:",
- "home.explore_prompt.title": "Co es vua hemo en Mastodon.",
"home.hide_announcements": "Celez anunci",
"home.pending_critical_update.body": "Voluntez aktualigar vua Mastodon-servilo tam balde kam es posibla!",
"home.pending_critical_update.link": "Vidar aktualigaji",
@@ -393,9 +372,6 @@
"loading_indicator.label": "Kargante…",
"media_gallery.toggle_visible": "Chanjar videbleso",
"moved_to_account_banner.text": "Vua konto {disabledAccount} es nune desaktiva pro ke vu movis a {movedToAccount}.",
- "mute_modal.duration": "Durado",
- "mute_modal.hide_notifications": "Celez avizi de ca uzanto?",
- "mute_modal.indefinite": "Nedefinitiva",
"navigation_bar.about": "Pri co",
"navigation_bar.advanced_interface": "Apertez per retintervizajo",
"navigation_bar.blocks": "Blokusita uzeri",
@@ -405,7 +381,6 @@
"navigation_bar.direct": "Privata mencioni",
"navigation_bar.discover": "Deskovrez",
"navigation_bar.domain_blocks": "Hidden domains",
- "navigation_bar.edit_profile": "Modifikar profilo",
"navigation_bar.explore": "Explorez",
"navigation_bar.favourites": "Favoriziti",
"navigation_bar.filters": "Silencigita vorti",
@@ -440,9 +415,6 @@
"notifications.column_settings.admin.sign_up": "Nova registranti:",
"notifications.column_settings.alert": "Desktopavizi",
"notifications.column_settings.favourite": "Favoriziti:",
- "notifications.column_settings.filter_bar.advanced": "Montrez omna kategorii",
- "notifications.column_settings.filter_bar.category": "Rapidfiltrobaro",
- "notifications.column_settings.filter_bar.show_bar": "Montrez filtrobaro",
"notifications.column_settings.follow": "Nova sequanti:",
"notifications.column_settings.follow_request": "Nova sequodemandi:",
"notifications.column_settings.mention": "Mencioni:",
@@ -519,14 +491,7 @@
"poll_button.add_poll": "Insertez votposto",
"poll_button.remove_poll": "Efacez votposto",
"privacy.change": "Aranjar privateso di mesaji",
- "privacy.direct.long": "Sendar nur a mencionata uzeri",
- "privacy.direct.short": "Mencionita personi nur",
- "privacy.private.long": "Sendar nur a sequanti",
- "privacy.private.short": "Sequanti nur",
- "privacy.public.long": "Videbla da omnu",
"privacy.public.short": "Publike",
- "privacy.unlisted.long": "Videbla da omnu ma voluntala ne inkluzas deskovrotraiti",
- "privacy.unlisted.short": "Ne enlistigota",
"privacy_policy.last_updated": "Antea novajo ye {date}",
"privacy_policy.title": "Privatesguidilo",
"recommended": "Rekomendata",
@@ -637,7 +602,6 @@
"status.direct": "Private mencionez @{name}",
"status.direct_indicator": "Privata menciono",
"status.edit": "Modifikez",
- "status.edited": "Modifikesis ye {date}",
"status.edited_x_times": "Modifikesis {count, plural, one {{count} foyo} other {{count} foyi}}",
"status.embed": "Eninsertez",
"status.favourite": "Favorizar",
@@ -708,10 +672,8 @@
"upload_error.poll": "Failadchargo ne permisesas kun votposti.",
"upload_form.audio_description": "Deskriptez por personi kun audnekapableso",
"upload_form.description": "Deskriptez por personi kun vidnekapableso",
- "upload_form.description_missing": "Deskriptajo ne insertesis",
"upload_form.edit": "Modifikez",
"upload_form.thumbnail": "Chanjez imajeto",
- "upload_form.undo": "Desfacar",
"upload_form.video_description": "Deskriptez por personi kun audnekapableso o vidnekapableso",
"upload_modal.analyzing_picture": "Analizas imajo…",
"upload_modal.apply": "Aplikez",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index fb839503e97e5c..f5bf7c328165d5 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -89,7 +89,14 @@
"announcement.announcement": "Auglýsing",
"attachments_list.unprocessed": "(óunnið)",
"audio.hide": "Fela hljóð",
- "autosuggest_hashtag.per_week": "{count} á viku",
+ "block_modal.remote_users_caveat": "Við munum biðja {domain} netþjóninn um að virða ákvörðun þína. Hitt er svo annað mál hvort hann fari eftir þessu, ekki er hægt að tryggja eftirfylgni því sumir netþjónar meðhöndla útilokanir á sinn hátt. Opinberar færslur gætu verið sýnilegar notendum sem ekki eru skráðir inn.",
+ "block_modal.show_less": "Sýna minna",
+ "block_modal.show_more": "Sýna meira",
+ "block_modal.they_cant_mention": "Viðkomandi geta ekki minnst á þig eða fylgst með þér.",
+ "block_modal.they_cant_see_posts": "Viðkomandi geta ekki séð færslurnar þínar og þú ekki þeirra.",
+ "block_modal.they_will_know": "Viðkomandi geta séð að þeir eru útilokaðir.",
+ "block_modal.title": "Útiloka notanda?",
+ "block_modal.you_wont_see_mentions": "Þú munt ekki sjá færslur sem minnast á viðkomandi aðila.",
"boost_modal.combo": "Þú getur ýtt á {combo} til að sleppa þessu næst",
"bundle_column_error.copy_stacktrace": "Afrita villuskýrslu",
"bundle_column_error.error.body": "Umbeðna síðau var ekki hægt að myndgera. Það gæti verið vegna villu í kóðanum okkar eða vandamáls með samhæfni vafra.",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "Aðgangurinn þinn er ekki {locked}. Hver sem er getur fylgst með þér til að sjá þær færslur sem einungis eru til fylgjenda þinna.",
"compose_form.lock_disclaimer.lock": "læstur",
"compose_form.placeholder": "Hvað liggur þér á hjarta?",
- "compose_form.poll.add_option": "Bæta við valkosti",
"compose_form.poll.duration": "Tímalengd könnunar",
+ "compose_form.poll.multiple": "Margir valkostir",
"compose_form.poll.option_placeholder": "Valkostur {number}",
- "compose_form.poll.remove_option": "Fjarlægja þennan valkost",
+ "compose_form.poll.single": "Veldu eitt",
"compose_form.poll.switch_to_multiple": "Breyta könnun svo hægt sé að hafa marga valkosti",
"compose_form.poll.switch_to_single": "Breyta könnun svo hægt sé að hafa einn stakan valkost",
+ "compose_form.poll.type": "Stíll",
"compose_form.publish": "Birta",
"compose_form.publish_form": "Birta",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Vista breytingar",
- "compose_form.sensitive.hide": "{count, plural, one {Merkja mynd sem viðkvæma} other {Merkja myndir sem viðkvæmar}}",
- "compose_form.sensitive.marked": "{count, plural, one {Mynd er merkt sem viðkvæm} other {Myndir eru merktar sem viðkvæmar}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Mynd er ekki merkt sem viðkvæm} other {Myndir eru ekki merktar sem viðkvæmar}}",
+ "compose_form.reply": "Svara",
+ "compose_form.save_changes": "Uppfæra",
"compose_form.spoiler.marked": "Fjarlægja aðvörun vegna efnis",
"compose_form.spoiler.unmarked": "Bæta við aðvörun vegna efnis",
- "compose_form.spoiler_placeholder": "Skrifaðu aðvörunina þína hér",
+ "compose_form.spoiler_placeholder": "Aðvörun vegna efnis (valkvætt)",
"confirmation_modal.cancel": "Hætta við",
- "confirmations.block.block_and_report": "Útiloka og kæra",
"confirmations.block.confirm": "Útiloka",
- "confirmations.block.message": "Ertu viss um að þú viljir loka á {name}?",
"confirmations.cancel_follow_request.confirm": "Taka beiðni til baka",
"confirmations.cancel_follow_request.message": "Ertu viss um að þú viljir taka til baka beiðnina um að fylgjast með {name}?",
"confirmations.delete.confirm": "Eyða",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "Ertu viss um að þú viljir eyða þessum lista endanlega?",
"confirmations.discard_edit_media.confirm": "Henda",
"confirmations.discard_edit_media.message": "Þú ert með óvistaðar breytingar á lýsingu myndefnis eða forskoðunar, henda þeim samt?",
- "confirmations.domain_block.confirm": "Útiloka allt lénið",
+ "confirmations.domain_block.confirm": "Útiloka netþjón",
"confirmations.domain_block.message": "Ertu alveg algjörlega viss um að þú viljir loka á allt {domain}? Í flestum tilfellum er vænlegra að nota færri en markvissari útilokanir eða að þagga niður tiltekna aðila. Þú munt ekki sjá efni frá þessu léni í neinum opinberum tímalínum eða í tilkynningunum þínum. Fylgjendur þínir frá þessu léni verða fjarlægðir.",
"confirmations.edit.confirm": "Breyta",
"confirmations.edit.message": "Ef þú breytir núna verður skrifað yfir skilaboðin sem þú ert að semja núna. Ertu viss um að þú viljir halda áfram?",
"confirmations.logout.confirm": "Skrá út",
"confirmations.logout.message": "Ertu viss um að þú viljir skrá þig út?",
"confirmations.mute.confirm": "Þagga",
- "confirmations.mute.explanation": "Þetta mun fela færslur frá þeim og þær færslur þar sem minnst er á þau, en það mun samt sem áður gera þeim kleift að sjá færslurnar þínar og að fylgjast með þér.",
- "confirmations.mute.message": "Ertu viss um að þú viljir þagga niður í {name}?",
"confirmations.redraft.confirm": "Eyða og endurvinna drög",
"confirmations.redraft.message": "Ertu viss um að þú viljir eyða þessari færslu og enduvinna drögin? Eftirlæti og endurbirtingar munu glatast og svör við upprunalegu færslunni munu verða munaðarlaus.",
"confirmations.reply.confirm": "Svara",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "Þessar færslur frá þessum og öðrum netþjónum á dreifhýsta netkerfinu eru að fá aukna athygli í þessu töluðum orðum.",
"dismissable_banner.explore_tags": "Þetta eru myllumerki sem í augnablikinu eru að fá aukna athygli hjá fólki á þessum og öðrum netþjónum á dreifhýsta netkerfinu.",
"dismissable_banner.public_timeline": "Þetta eru nýjustu opinberu færslurnar frá fólki á samfélagsnetinu sem fólk á {domain} fylgjast með.",
+ "domain_block_modal.block": "Útiloka netþjón",
+ "domain_block_modal.block_account_instead": "Útiloka {name} í staðinn",
+ "domain_block_modal.they_can_interact_with_old_posts": "Fólk frá þessum netþjóni getur sýslað með eldri færslur þínar.",
+ "domain_block_modal.they_cant_follow": "Enginn frá þessum netþjóni getur fylgst með þér.",
+ "domain_block_modal.they_wont_know": "Viðkomandi mun ekki vita að hann hafi verið útilokaður.",
+ "domain_block_modal.title": "Útiloka lén?",
+ "domain_block_modal.you_will_lose_followers": "Allir fylgjendur þínir af þessum netþjóni verða fjarlægðir.",
+ "domain_block_modal.you_wont_see_posts": "Þú munt ekki sjá neinar færslur eða tilkynningar frá notendum á þessum netþjóni.",
+ "domain_pill.activitypub_lets_connect": "Það gerir þér kleift að tengjast og eiga í samskiptum við fólk, ekki bara á Mastodon, heldur einnig á mörgum öðrum mismunandi samfélagsmiðlum.",
+ "domain_pill.activitypub_like_language": "ActivityPub er eins og tungumál sem Mastodon notar til að tala við önnur samfélagsnet.",
+ "domain_pill.server": "Netþjónn",
+ "domain_pill.their_handle": "Kennislóðin þeirra:",
+ "domain_pill.their_server": "Stafrænt heimili viðkomandi, þar sem allar færslur hans eru hýstar.",
+ "domain_pill.their_username": "Sértækt auðkenni viðkomandi á netþjóni hans. Það er mögulegt að finna notendur með sama notandanafn á mismunandi netþjónum.",
+ "domain_pill.username": "Notandanafn",
+ "domain_pill.whats_in_a_handle": "Hvað er í kennislóð (handle)?",
+ "domain_pill.who_they_are": "Vegna þess að kennislóðir segja hver einhver sé og hvar hann sé að finna, getur þú átt í samskiptum við fólk í gegnum samfélagsvef sem knúinn er af .",
+ "domain_pill.who_you_are": "Vegna þess að kennislóðin þín segir hver þú sért og hvar þig sé að finna, getur fólk átt í samskiptum við þig í gegnum samfélagsvef sem knúinn er af .",
+ "domain_pill.your_handle": "Kennislóðin þín:",
+ "domain_pill.your_server": "Stafrænt heimili þitt, þar sem allar færslur þínar eru hýstar. Kanntu ekki við þennan netþjón? Þú getur flutt þig á milli netþjóna hvenær sem er og tekið með þér alla fylgjendurna þína.",
+ "domain_pill.your_username": "Sértækt auðkenni þitt á þessum netþjóni. Það er mögulegt að finna notendur með sama notandanafn á mismunandi netþjónum.",
"embed.instructions": "Felldu þessa færslu inn í vefsvæðið þitt með því að afrita kóðann hér fyrir neðan.",
"embed.preview": "Svona mun þetta líta út:",
"emoji_button.activity": "Virkni",
@@ -244,6 +266,7 @@
"empty_column.list": "Það er ennþá ekki neitt á þessum lista. Þegar meðlimir á listanum senda inn nýjar færslur, munu þær birtast hér.",
"empty_column.lists": "Þú ert ennþá ekki með neina lista. Þegar þú býrð til einhvern lista, munu hann birtast hér.",
"empty_column.mutes": "Þú hefur ekki þaggað niður í neinum notendum ennþá.",
+ "empty_column.notification_requests": "Allt hreint! Það er ekkert hér. Þegar þú færð nýjar tilkynningar, munu þær birtast hér í samræmi við stillingarnar þínar.",
"empty_column.notifications": "Þú ert ekki ennþá með neinar tilkynningar. Vertu í samskiptum við aðra til að umræður fari af stað.",
"empty_column.public": "Það er ekkert hér! Skrifaðu eitthvað opinberlega, eða fylgstu með notendum á öðrum netþjónum til að fylla upp í þetta",
"error.unexpected_crash.explanation": "Vegna villu í kóðanum okkar eða samhæfnivandamála í vafra er ekki hægt að birta þessa síðu svo vel sé.",
@@ -274,19 +297,37 @@
"filter_modal.select_filter.subtitle": "Notaðu fyrirliggjandi flokk eða útbúðu nýjan",
"filter_modal.select_filter.title": "Sía þessa færslu",
"filter_modal.title.status": "Sía færslu",
+ "filtered_notifications_banner.mentions": "{count, plural, one {tilvísun} other {tilvísanir}}",
+ "filtered_notifications_banner.pending_requests": "Tilkynningar frá {count, plural, =0 {engum} one {einum aðila} other {# aðilum}} sem þú gætir þekkt",
+ "filtered_notifications_banner.title": "Síaðar tilkynningar",
"firehose.all": "Allt",
"firehose.local": "þessum netþjóni",
"firehose.remote": "öðrum netþjónum",
"follow_request.authorize": "Heimila",
"follow_request.reject": "Hafna",
"follow_requests.unlocked_explanation": "Jafnvel þótt aðgangurinn þinn sé ekki læstur, hafa umsjónarmenn {domain} ímyndað sér að þú gætir viljað yfirfara handvirkt fylgjendabeiðnir frá þessum notendum.",
+ "follow_suggestions.curated_suggestion": "Úrval starfsfólks",
+ "follow_suggestions.dismiss": "Ekki birta þetta aftur",
+ "follow_suggestions.featured_longer": "Handvalið af {domain}-teyminu",
+ "follow_suggestions.friends_of_friends_longer": "Vinsælt hjá fólki sem þú fylgist með",
+ "follow_suggestions.hints.featured": "Þetta notandasnið hefur verið handvalið af {domain}-teyminu.",
+ "follow_suggestions.hints.friends_of_friends": "Þetta notandasnið er vinsælt hjá fólki sem þú fylgist með.",
+ "follow_suggestions.hints.most_followed": "Þetta notandasnið er eitt af þeim sem mest er fylgst með á {domain}.",
+ "follow_suggestions.hints.most_interactions": "Þetta notandasnið hefur vakið mikla athygli að undanförnu á {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Þetta notandasnið er líkt þeim sniðum sem þú hefur valið að fylgjast með að undanförnu.",
+ "follow_suggestions.personalized_suggestion": "Persónuaðlöguð tillaga",
+ "follow_suggestions.popular_suggestion": "Vinsæl tillaga",
+ "follow_suggestions.popular_suggestion_longer": "Vinsælt á {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Svipar til notenda sem þú hefur nýlega farið að fylgjast með",
+ "follow_suggestions.view_all": "Skoða allt",
+ "follow_suggestions.who_to_follow": "Hverjum á að fylgjast með",
"followed_tags": "Myllumerki sem fylgst er með",
"footer.about": "Nánari upplýsingar",
"footer.directory": "Notandasniðamappa",
"footer.get_app": "Ná í forritið",
"footer.invite": "Bjóða fólki",
"footer.keyboard_shortcuts": "Flýtileiðir á lyklaborði",
- "footer.privacy_policy": "Persónuverndarstefna",
+ "footer.privacy_policy": "Meðferð persónuupplýsinga",
"footer.source_code": "Skoða frumkóða",
"footer.status": "Staða",
"generic.saved": "Vistað",
@@ -306,13 +347,8 @@
"hashtag.follow": "Fylgjast með myllumerki",
"hashtag.unfollow": "Hætta að fylgjast með myllumerki",
"hashtags.and_other": "…og {count, plural, other {# til viðbótar}}",
- "home.actions.go_to_explore": "Sjá hvað er í umræðunni",
- "home.actions.go_to_suggestions": "Finna fólk til að fylgjast með",
- "home.column_settings.basic": "Einfalt",
"home.column_settings.show_reblogs": "Sýna endurbirtingar",
"home.column_settings.show_replies": "Birta svör",
- "home.explore_prompt.body": "Heimastreymið þitt verður með blöndu af færslum úr myllumerkjunum sem þú hefur valið að fylgja, færslum frá fólki sem þú hefur valið að fylgja og færslum sem þau endurbirta. Ef þér finnst þetta allt of kyrrlátt, gætirðu viljað:",
- "home.explore_prompt.title": "Þetta er bækistöð þín innan samfélagsins.",
"home.hide_announcements": "Fela auglýsingar",
"home.pending_critical_update.body": "Uppfærðu Mastodon-þjóninn þinn eins fljótt og mögulegt er!",
"home.pending_critical_update.link": "Skoða uppfærslur",
@@ -396,9 +432,15 @@
"loading_indicator.label": "Hleð inn…",
"media_gallery.toggle_visible": "Víxla sýnileika",
"moved_to_account_banner.text": "Aðgangurinn þinn {disabledAccount} er óvirkur í augnablikinu vegna þess að þú fluttir þig yfir á {movedToAccount}.",
- "mute_modal.duration": "Lengd",
- "mute_modal.hide_notifications": "Fela tilkynningar frá þessum notanda?",
- "mute_modal.indefinite": "Óendanlegt",
+ "mute_modal.hide_from_notifications": "Fela úr tilkynningum",
+ "mute_modal.hide_options": "Fela valkosti",
+ "mute_modal.indefinite": "Þar til ég hætti að þagga niður í viðkomandi",
+ "mute_modal.show_options": "Birta valkosti",
+ "mute_modal.they_can_mention_and_follow": "Viðkomandi geta minnst á þig og fylgst með þér, en þú munt ekki sjá þá.",
+ "mute_modal.they_wont_know": "Viðkomandi aðilar munu ekki vita að þaggað hefur verið niður í þeim.",
+ "mute_modal.title": "Þagga niður í notanda?",
+ "mute_modal.you_wont_see_mentions": "Þú munt ekki sjá færslur sem minnast á viðkomandi aðila.",
+ "mute_modal.you_wont_see_posts": "Viðkomandi geta áfram séð færslurnar þínar en þú munt ekki sjá færslurnar þeirra.",
"navigation_bar.about": "Um hugbúnaðinn",
"navigation_bar.advanced_interface": "Opna í ítarlegu vefviðmóti",
"navigation_bar.blocks": "Útilokaðir notendur",
@@ -408,7 +450,6 @@
"navigation_bar.direct": "Einkaspjall",
"navigation_bar.discover": "Uppgötva",
"navigation_bar.domain_blocks": "Útilokuð lén",
- "navigation_bar.edit_profile": "Breyta notandasniði",
"navigation_bar.explore": "Kanna",
"navigation_bar.favourites": "Eftirlæti",
"navigation_bar.filters": "Þögguð orð",
@@ -432,11 +473,29 @@
"notification.follow": "{name} fylgist með þér",
"notification.follow_request": "{name} hefur beðið um að fylgjast með þér",
"notification.mention": "{name} minntist á þig",
+ "notification.moderation-warning.learn_more": "Kanna nánar",
+ "notification.moderation_warning": "Þú hefur fengið aðvörun frá umsjónarmanni",
+ "notification.moderation_warning.action_delete_statuses": "Sumar færslurnar þínar hafa verið fjarlægðar.",
+ "notification.moderation_warning.action_disable": "Aðgangurinn þinn hefur verið gerður óvirkur.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Sumar færslurnar þínar hafa verið merktar sem viðkvæmt efni.",
+ "notification.moderation_warning.action_none": "Aðgangurinn þinn hefur fengið aðvörun frá umsjónarmanni.",
+ "notification.moderation_warning.action_sensitive": "Færslur þínar á verða héðan í frá merktar sem viðkvæmar.",
+ "notification.moderation_warning.action_silence": "Notandaaðgangurinn þinn hefur verið takmarkaður.",
+ "notification.moderation_warning.action_suspend": "Notandaaðgangurinn þinn hefur verið settur í frysti.",
"notification.own_poll": "Könnuninni þinni er lokið",
"notification.poll": "Könnun sem þú tókst þátt í er lokið",
"notification.reblog": "{name} endurbirti færsluna þína",
+ "notification.relationships_severance_event": "Missti tengingar við {name}",
+ "notification.relationships_severance_event.account_suspension": "Stjórnandi á {from} hefur fryst {target}, sem þýðir að þú færð ekki lengur skilaboð frá viðkomandi né átt í samskiptum við viðkomandi.",
+ "notification.relationships_severance_event.domain_block": "Stjórnandi á {from} hefur lokað á {target} og þar með {followersCount} fylgjendur þína auk {followingCount, plural, one {# aðgangs} other {# aðganga}} sem þú fylgist með.",
+ "notification.relationships_severance_event.learn_more": "Kanna nánar",
+ "notification.relationships_severance_event.user_domain_block": "Þú hefur lokað á {target} og þar með fjarlægt {followersCount} fylgjendur þína auk {followingCount, plural, one {# aðgangs} other {# aðganga}} sem þú fylgist með.",
"notification.status": "{name} sendi inn rétt í þessu",
"notification.update": "{name} breytti færslu",
+ "notification_requests.accept": "Samþykkja",
+ "notification_requests.dismiss": "Afgreiða",
+ "notification_requests.notifications_from": "Tilkynningar frá {name}",
+ "notification_requests.title": "Síaðar tilkynningar",
"notifications.clear": "Hreinsa tilkynningar",
"notifications.clear_confirmation": "Ertu viss um að þú viljir endanlega eyða öllum tilkynningunum þínum?",
"notifications.column_settings.admin.report": "Nýjar kærur:",
@@ -445,7 +504,6 @@
"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.filter_bar.show_bar": "Birta síustikuna",
"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:",
@@ -471,6 +529,15 @@
"notifications.permission_denied": "Tilkynningar á skjáborði eru ekki aðgengilegar megna áður hafnaðra beiðna fyrir vafra",
"notifications.permission_denied_alert": "Ekki var hægt að virkja tilkynningar á skjáborði, þar sem heimildum fyrir vafra var áður hafnað",
"notifications.permission_required": "Tilkynningar á skjáborði eru ekki aðgengilegar þar sem nauðsynlegar heimildir hafa ekki verið veittar.",
+ "notifications.policy.filter_new_accounts.hint": "Útbúið {days, plural, one {síðasta daginn} other {síðustu # daga}}",
+ "notifications.policy.filter_new_accounts_title": "Nýir notendur",
+ "notifications.policy.filter_not_followers_hint": "Þar með talið fólk sem hefur fylgst með þér í minna en {days, plural, one {einn dag} other {# daga}}",
+ "notifications.policy.filter_not_followers_title": "Fólk sem fylgist ekki með þér",
+ "notifications.policy.filter_not_following_hint": "Þar til þú samþykkir viðkomandi handvirkt",
+ "notifications.policy.filter_not_following_title": "Fólk sem þú fylgist ekki með",
+ "notifications.policy.filter_private_mentions_hint": "Síað nema það sé í svari við einhverju þar sem þú minntist á viðkomandi eða ef þú fylgist með sendandanum",
+ "notifications.policy.filter_private_mentions_title": "Óumbeðið einkaspjall",
+ "notifications.policy.title": "Sía út tilkynningar frá…",
"notifications_permission_banner.enable": "Virkja tilkynningar á skjáborði",
"notifications_permission_banner.how_to_control": "Til að taka á móti tilkynningum þegar Mastodon er ekki opið, skaltu virkja tilkynningar á skjáborði. Þegar þær eru orðnar virkar geturðu stýrt nákvæmlega hverskonar atvik framleiða tilkynningar með því að nota {icon}-hnappinn hér fyrir ofan.",
"notifications_permission_banner.title": "Aldrei missa af neinu",
@@ -526,14 +593,15 @@
"poll_button.add_poll": "Bæta við könnun",
"poll_button.remove_poll": "Fjarlægja könnun",
"privacy.change": "Aðlaga gagnaleynd færslu",
- "privacy.direct.long": "Senda einungis á notendur sem minnst er á",
- "privacy.direct.short": "Aðeins fólk sem minnst er á",
- "privacy.private.long": "Senda einungis á fylgjendur",
- "privacy.private.short": "Einungis fylgjendur",
- "privacy.public.long": "Sýnilegt fyrir alla",
+ "privacy.direct.long": "Allir sem minnst er á í færslunni",
+ "privacy.direct.short": "Tilteknir aðilar",
+ "privacy.private.long": "Einungis þeir sem fylgjast með þér",
+ "privacy.private.short": "Fylgjendur",
+ "privacy.public.long": "Hver sem er, á og utan Mastodon",
"privacy.public.short": "Opinbert",
- "privacy.unlisted.long": "Sýnilegt öllum, en ekki tekið með í uppgötvunareiginleikum",
- "privacy.unlisted.short": "Óskráð",
+ "privacy.unlisted.additional": "Þetta hegðar sér eins og opinber færsla, fyrir utan að færslan birtist ekki í beinum streymum eða myllumerkjum, né heldur í Mastodon-leitum jafnvel þótt þú hafir valið að falla undir slíkt í notandasniðinu þínu.",
+ "privacy.unlisted.long": "Minni stælar í reikniritum",
+ "privacy.unlisted.short": "Hljóðlátt opinbert",
"privacy_policy.last_updated": "Síðast uppfært {date}",
"privacy_policy.title": "Persónuverndarstefna",
"recommended": "Mælt með",
@@ -551,7 +619,9 @@
"relative_time.minutes": "{number}mín",
"relative_time.seconds": "{number}sek",
"relative_time.today": "í dag",
+ "reply_indicator.attachments": "{count, plural, one {# viðhengi} other {# viðhengi}}",
"reply_indicator.cancel": "Hætta við",
+ "reply_indicator.poll": "Könnun",
"report.block": "Útiloka",
"report.block_explanation": "Þú munt ekki sjá færslurnar þeirra. Þeir munu ekki geta séð færslurnar þínar eða fylgst með þér. Þeir munu ekki geta séð að lokað sé á þá.",
"report.categories.legal": "Lagalegt",
@@ -644,10 +714,11 @@
"status.direct": "Einkaspjall við @{name}",
"status.direct_indicator": "Einkaspjall",
"status.edit": "Breyta",
- "status.edited": "Breytt {date}",
+ "status.edited": "Síðast breytt {date}",
"status.edited_x_times": "Breytt {count, plural, one {{count} sinni} other {{count} sinnum}}",
"status.embed": "Ívefja",
"status.favourite": "Eftirlæti",
+ "status.favourites": "{count, plural, one {eftirlæti} other {eftirlæti}}",
"status.filter": "Sía þessa færslu",
"status.filtered": "Síað",
"status.hide": "Fela færslu",
@@ -668,10 +739,11 @@
"status.reblog": "Endurbirting",
"status.reblog_private": "Endurbirta til upphaflegra lesenda",
"status.reblogged_by": "{name} endurbirti",
+ "status.reblogs": "{count, plural, one {endurbirting} other {endurbirtingar}}",
"status.reblogs.empty": "Enginn hefur ennþá endurbirt þessa færslu. Þegar einhver gerir það, mun það birtast hér.",
"status.redraft": "Eyða og endurvinna drög",
"status.remove_bookmark": "Fjarlægja bókamerki",
- "status.replied_to": "Svaraði {name}",
+ "status.replied_to": "Svaraði til {name}",
"status.reply": "Svara",
"status.replyAll": "Svara þræði",
"status.report": "Kæra @{name}",
@@ -715,10 +787,8 @@
"upload_error.poll": "Innsending skráa er ekki leyfð í könnunum.",
"upload_form.audio_description": "Lýstu þessu fyrir heyrnarskerta",
"upload_form.description": "Lýstu þessu fyrir sjónskerta",
- "upload_form.description_missing": "Engri lýsingu bætt við",
"upload_form.edit": "Breyta",
"upload_form.thumbnail": "Skipta um smámynd",
- "upload_form.undo": "Eyða",
"upload_form.video_description": "Lýstu þessu fyrir fólk sem heyrir illa eða er með skerta sjón",
"upload_modal.analyzing_picture": "Greini mynd…",
"upload_modal.apply": "Virkja",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 4fb4d88cbc8964..f66497e0a759c6 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -83,13 +83,20 @@
"admin.impact_report.instance_follows": "I seguaci che i loro utenti perderebbero",
"admin.impact_report.title": "Riepilogo dell'impatto",
"alert.rate_limited.message": "Sei pregato di riprovare dopo le {retry_time, time, medium}.",
- "alert.rate_limited.title": "Tasso limitato",
+ "alert.rate_limited.title": "Limitazione per eccesso di richieste",
"alert.unexpected.message": "Si è verificato un errore imprevisto.",
"alert.unexpected.title": "Oops!",
"announcement.announcement": "Annuncio",
"attachments_list.unprocessed": "(non elaborato)",
"audio.hide": "Nascondi audio",
- "autosuggest_hashtag.per_week": "{count} a settimana",
+ "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.",
@@ -146,43 +153,37 @@
"compose_form.lock_disclaimer": "Il tuo profilo non è {locked}. Chiunque può seguirti per visualizzare i tuoi post per soli seguaci.",
"compose_form.lock_disclaimer.lock": "bloccato",
"compose_form.placeholder": "Cos'hai in mente?",
- "compose_form.poll.add_option": "Aggiungi una scelta",
"compose_form.poll.duration": "Durata del sondaggio",
- "compose_form.poll.option_placeholder": "Scelta {number}",
- "compose_form.poll.remove_option": "Rimuovi questa scelta",
+ "compose_form.poll.multiple": "Scelta multipla",
+ "compose_form.poll.option_placeholder": "Opzione {number}",
+ "compose_form.poll.single": "Scegli uno",
"compose_form.poll.switch_to_multiple": "Modifica il sondaggio per consentire scelte multiple",
"compose_form.poll.switch_to_single": "Modifica il sondaggio per consentire una singola scelta",
+ "compose_form.poll.type": "Stile",
"compose_form.publish": "Pubblica",
"compose_form.publish_form": "Nuovo post",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Salva le modifiche",
- "compose_form.sensitive.hide": "{count, plural, one {Segna media come sensibile} other {Segna media come sensibili}}",
- "compose_form.sensitive.marked": "{count, plural, one {Il media è contrassegnato come sensibile} other {I media sono contrassegnati come sensibili}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Il media non è contrassegnato come sensibile} other {I media non sono contrassegnati come sensibili}}",
+ "compose_form.reply": "Rispondi",
+ "compose_form.save_changes": "Aggiorna",
"compose_form.spoiler.marked": "Rimuovi l'avviso del contenuto",
"compose_form.spoiler.unmarked": "Aggiungi l'avviso del contenuto",
- "compose_form.spoiler_placeholder": "Scrivi qui il tuo avviso",
+ "compose_form.spoiler_placeholder": "Contenuto sensibile (facoltativo)",
"confirmation_modal.cancel": "Annulla",
- "confirmations.block.block_and_report": "Blocca & Segnala",
"confirmations.block.confirm": "Blocca",
- "confirmations.block.message": "Sei sicuro di voler bloccare {name}?",
"confirmations.cancel_follow_request.confirm": "Annulla la richiesta",
"confirmations.cancel_follow_request.message": "Sei sicuro di voler annullare la tua richiesta per seguire {name}?",
"confirmations.delete.confirm": "Elimina",
"confirmations.delete.message": "Sei sicuro di voler eliminare questo post?",
"confirmations.delete_list.confirm": "Elimina",
- "confirmations.delete_list.message": "Sei sicuro di voler eliminare permanentemente questa lista?",
+ "confirmations.delete_list.message": "Sei sicuro/a di voler eliminare permanentemente questo elenco?",
"confirmations.discard_edit_media.confirm": "Scarta",
"confirmations.discard_edit_media.message": "Hai delle modifiche non salvate alla descrizione o anteprima del media, scartarle comunque?",
- "confirmations.domain_block.confirm": "Blocca l'intero dominio",
+ "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?",
"confirmations.logout.confirm": "Disconnettiti",
"confirmations.logout.message": "Sei sicuro di volerti disconnettere?",
"confirmations.mute.confirm": "Silenzia",
- "confirmations.mute.explanation": "Questo nasconderà i post da loro e i post che li menzionano, ma consentirà comunque loro di visualizzare i tuoi post e di seguirti.",
- "confirmations.mute.message": "Sei sicuro di voler silenziare {name}?",
"confirmations.redraft.confirm": "Elimina e riscrivi",
"confirmations.redraft.message": "Sei sicuro di voler eliminare questo post e riscriverlo? I preferiti e i boost andranno persi e le risposte al post originale non saranno più collegate.",
"confirmations.reply.confirm": "Rispondi",
@@ -208,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à",
@@ -241,9 +263,10 @@
"empty_column.followed_tags": "Non hai ancora seguito alcun hashtag. Quando lo farai, appariranno qui.",
"empty_column.hashtag": "Non c'è ancora nulla in questo hashtag.",
"empty_column.home": "La cronologia della tua home è vuota! Segui altre persone per riempirla. {suggestions}",
- "empty_column.list": "Non c'è ancora nulla in questa lista. Quando i membri di questa lista pubblicheranno dei nuovi post, appariranno qui.",
- "empty_column.lists": "Non hai ancora alcuna lista. Quando ne creerai una, apparirà qui.",
+ "empty_column.list": "Non c'è ancora nulla in questo elenco. Quando i membri di questo elenco pubblicheranno nuovi post, appariranno qui.",
+ "empty_column.lists": "Non hai ancora nessun elenco. Quando ne creerai uno, apparirà qui.",
"empty_column.mutes": "Non hai ancora silenziato alcun utente.",
+ "empty_column.notification_requests": "Tutto chiaro! Non c'è niente qui. Quando ricevi nuove notifiche, verranno visualizzate qui in base alle tue impostazioni.",
"empty_column.notifications": "Non hai ancora nessuna notifica. Quando altre persone interagiranno con te, le vedrai qui.",
"empty_column.public": "Non c'è nulla qui! Scrivi qualcosa pubblicamente o segui manualmente gli utenti dagli altri server per riempire questo spazio",
"error.unexpected_crash.explanation": "A causa di un bug nel nostro codice o di un problema di compatibilità del browser, non è stato possibile visualizzare correttamente questa pagina.",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "Usa una categoria esistente o creane una nuova",
"filter_modal.select_filter.title": "Filtra questo post",
"filter_modal.title.status": "Filtra un post",
+ "filtered_notifications_banner.mentions": "{count, plural, one {menzione} other {menzioni}}",
+ "filtered_notifications_banner.pending_requests": "Notifiche da {count, plural, =0 {nessuno} one {una persona} other {# persone}} che potresti conoscere",
+ "filtered_notifications_banner.title": "Notifiche filtrate",
"firehose.all": "Tutto",
"firehose.local": "Questo server",
"firehose.remote": "Altri server",
"follow_request.authorize": "Autorizza",
"follow_request.reject": "Rifiuta",
"follow_requests.unlocked_explanation": "Anche se il tuo profilo non è privato, lo staff di {domain} ha pensato che potresti voler revisionare manualmente le richieste di seguirti da questi profili.",
+ "follow_suggestions.curated_suggestion": "Scelta personale",
+ "follow_suggestions.dismiss": "Non visualizzare più",
+ "follow_suggestions.featured_longer": "Selezionato personalmente dal team di {domain}",
+ "follow_suggestions.friends_of_friends_longer": "Popolare tra le persone che segui",
+ "follow_suggestions.hints.featured": "Questo profilo è stato selezionato personalmente dal team di {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "Questo profilo è popolare tra le persone che segui.",
+ "follow_suggestions.hints.most_followed": "Questo profilo è uno dei più seguiti su {domain}.",
+ "follow_suggestions.hints.most_interactions": "Recentemente, questo profilo ha ricevuto molta attenzione su {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Questo profilo è simile ai profili che hai seguito più recentemente.",
+ "follow_suggestions.personalized_suggestion": "Suggerimenti personalizzati",
+ "follow_suggestions.popular_suggestion": "Suggerimento frequente",
+ "follow_suggestions.popular_suggestion_longer": "Popolare su {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Simile ai profili che hai seguito di recente",
+ "follow_suggestions.view_all": "Vedi tutto",
+ "follow_suggestions.who_to_follow": "Chi seguire",
"followed_tags": "Hashtag seguiti",
"footer.about": "Info",
"footer.directory": "Cartella dei profili",
@@ -306,13 +347,8 @@
"hashtag.follow": "Segui l'hashtag",
"hashtag.unfollow": "Smetti di seguire l'hashtag",
"hashtags.and_other": "…e {count, plural, other {# in più}}",
- "home.actions.go_to_explore": "Scopri cosa sia di tendenza",
- "home.actions.go_to_suggestions": "Trova persone da seguire",
- "home.column_settings.basic": "Base",
"home.column_settings.show_reblogs": "Mostra reblog",
"home.column_settings.show_replies": "Mostra risposte",
- "home.explore_prompt.body": "La tua home feed conterrà un mix di post degli hashtag che hai scelto di seguire, delle persone che hai scelto di seguire e dei post che condividono. Sembra abbastanza tranquillo in questo momento, quindi che ne dici di:",
- "home.explore_prompt.title": "Questa è la tua base all'interno di Mastodon.",
"home.hide_announcements": "Nascondi annunci",
"home.pending_critical_update.body": "Ti preghiamo di aggiornare il tuo server di Mastodon, il prima possibile!",
"home.pending_critical_update.link": "Visualizza aggiornamenti",
@@ -322,7 +358,7 @@
"interaction_modal.description.follow": "Con un profilo di Mastodon, puoi seguire {name} per ricevere i suoi post nel feed della tua home.",
"interaction_modal.description.reblog": "Con un profilo di Mastodon, puoi rebloggare questo post per condividerlo con i tuoi seguaci.",
"interaction_modal.description.reply": "Con un profilo di Mastodon, puoi rispondere a questo post.",
- "interaction_modal.login.action": "Torna all’inizio",
+ "interaction_modal.login.action": "Portami alla pagina iniziale",
"interaction_modal.login.prompt": "Dominio del tuo server principale, ad esempio mastodon.social",
"interaction_modal.no_account_yet": "Non su Mastodon?",
"interaction_modal.on_another_server": "Su un altro server",
@@ -378,27 +414,34 @@
"limited_account_hint.action": "Mostra comunque il profilo",
"limited_account_hint.title": "Questo profilo è stato nascosto dai moderatori di {domain}.",
"link_preview.author": "Di {name}",
- "lists.account.add": "Aggiungi alla lista",
- "lists.account.remove": "Togli dalla lista",
- "lists.delete": "Elimina lista",
- "lists.edit": "Modifica lista",
+ "link_preview.more_from_author": "Altro da {name}",
+ "lists.account.add": "Aggiungi all'elenco",
+ "lists.account.remove": "Rimuovi dall'elenco",
+ "lists.delete": "Elimina elenco",
+ "lists.edit": "Modifica elenco",
"lists.edit.submit": "Cambia il titolo",
"lists.exclusive": "Nascondi questi post dalla home",
"lists.new.create": "Aggiungi lista",
- "lists.new.title_placeholder": "Titolo della nuova lista",
+ "lists.new.title_placeholder": "Titolo del nuovo elenco",
"lists.replies_policy.followed": "Qualsiasi utente seguito",
- "lists.replies_policy.list": "Membri della lista",
+ "lists.replies_policy.list": "Membri dell'elenco",
"lists.replies_policy.none": "Nessuno",
"lists.replies_policy.title": "Mostra risposte a:",
"lists.search": "Cerca tra le persone che segui",
- "lists.subheading": "Le tue liste",
+ "lists.subheading": "I tuoi elenchi",
"load_pending": "{count, plural, one {# nuovo oggetto} other {# nuovi oggetti}}",
"loading_indicator.label": "Caricamento…",
"media_gallery.toggle_visible": "{number, plural, one {Nascondi immagine} other {Nascondi immagini}}",
"moved_to_account_banner.text": "Il tuo profilo {disabledAccount} è correntemente disabilitato perché ti sei spostato a {movedToAccount}.",
- "mute_modal.duration": "Durata",
- "mute_modal.hide_notifications": "Nascondere le notifiche da questo utente?",
- "mute_modal.indefinite": "Per sempre",
+ "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",
@@ -408,7 +451,6 @@
"navigation_bar.direct": "Menzioni private",
"navigation_bar.discover": "Scopri",
"navigation_bar.domain_blocks": "Domini bloccati",
- "navigation_bar.edit_profile": "Modifica il profilo",
"navigation_bar.explore": "Esplora",
"navigation_bar.favourites": "Preferiti",
"navigation_bar.filters": "Parole silenziate",
@@ -432,11 +474,29 @@
"notification.follow": "{name} ha iniziato a seguirti",
"notification.follow_request": "{name} ha richiesto di seguirti",
"notification.mention": "{name} ti ha menzionato",
+ "notification.moderation-warning.learn_more": "Scopri di più",
+ "notification.moderation_warning": "Hai ricevuto un avviso di moderazione",
+ "notification.moderation_warning.action_delete_statuses": "Alcuni dei tuoi post sono stati rimossi.",
+ "notification.moderation_warning.action_disable": "Il tuo account è stato disattivato.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Alcuni dei tuoi post sono stati contrassegnati come sensibili.",
+ "notification.moderation_warning.action_none": "Il tuo account ha ricevuto un avviso di moderazione.",
+ "notification.moderation_warning.action_sensitive": "I tuoi post d'ora in poi saranno contrassegnati come sensibili.",
+ "notification.moderation_warning.action_silence": "Il tuo account è stato limitato.",
+ "notification.moderation_warning.action_suspend": "Il tuo account è stato sospeso.",
"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.relationships_severance_event": "Connessioni perse con {name}",
+ "notification.relationships_severance_event.account_suspension": "Un amministratore da {from} ha sospeso {target}, il che significa che non puoi più ricevere aggiornamenti da loro o interagire con loro.",
+ "notification.relationships_severance_event.domain_block": "Un amministratore da {from} ha bloccato {target}, inclusi {followersCount} dei tuoi seguaci e {followingCount, plural, one {# account} other {# account}} che segui.",
+ "notification.relationships_severance_event.learn_more": "Scopri di più",
+ "notification.relationships_severance_event.user_domain_block": "Tu hai bloccato {target}, rimuovendo {followersCount} dei tuoi seguaci e {followingCount, plural, one {# account} other {# account}} che segui.",
"notification.status": "{name} ha appena pubblicato un post",
"notification.update": "{name} ha modificato un post",
+ "notification_requests.accept": "Accetta",
+ "notification_requests.dismiss": "Ignora",
+ "notification_requests.notifications_from": "Notifiche da {name}",
+ "notification_requests.title": "Notifiche filtrate",
"notifications.clear": "Cancella le notifiche",
"notifications.clear_confirmation": "Sei sicuro di voler cancellare permanentemente tutte le tue notifiche?",
"notifications.column_settings.admin.report": "Nuove segnalazioni:",
@@ -444,8 +504,7 @@
"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 rapida del filtro",
- "notifications.column_settings.filter_bar.show_bar": "Mostra la barra del filtro",
+ "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:",
@@ -471,6 +530,15 @@
"notifications.permission_denied": "Notifiche desktop non disponibili a causa della precedentemente negata richiesta di autorizzazioni del browser",
"notifications.permission_denied_alert": "Impossibile abilitare le notifiche desktop, poiché l'autorizzazione del browser è stata precedentemente negata",
"notifications.permission_required": "Notifiche destkop non disponibili poiché l'autorizzazione richiesta non è stata concessa.",
+ "notifications.policy.filter_new_accounts.hint": "Creato {days, plural, one {un giorno} other {# giorni}} fa",
+ "notifications.policy.filter_new_accounts_title": "Nuovi account",
+ "notifications.policy.filter_not_followers_hint": "Incluse le persone che ti seguono da meno di {days, plural, one {un giorno} other {# giorni}}",
+ "notifications.policy.filter_not_followers_title": "Persone che non ti seguono",
+ "notifications.policy.filter_not_following_hint": "Fino a quando non le approvi manualmente",
+ "notifications.policy.filter_not_following_title": "Persone che non segui",
+ "notifications.policy.filter_private_mentions_hint": "Filtrate, a meno che non sia in risposta alla tua menzione o se segui il mittente",
+ "notifications.policy.filter_private_mentions_title": "Menzioni private indesiderate",
+ "notifications.policy.title": "Filtra le notifiche da…",
"notifications_permission_banner.enable": "Abilita le notifiche desktop",
"notifications_permission_banner.how_to_control": "Per ricevere le notifiche quando Mastodon non è aperto, abilita le notifiche desktop. Puoi controllare precisamente quali tipi di interazioni generano le notifiche destkop, tramite il pulsante {icon} sopra, una volta abilitate.",
"notifications_permission_banner.title": "Non perderti mai nulla",
@@ -526,14 +594,15 @@
"poll_button.add_poll": "Aggiungi un sondaggio",
"poll_button.remove_poll": "Rimuovi il sondaggio",
"privacy.change": "Modifica privacy del post",
- "privacy.direct.long": "Visibile solo per gli utenti menzionati",
- "privacy.direct.short": "Solo persone menzionate",
- "privacy.private.long": "Visibile solo ai seguaci",
- "privacy.private.short": "Solo seguaci",
- "privacy.public.long": "Visibile a tutti",
+ "privacy.direct.long": "Tutti quelli menzioniati nel post",
+ "privacy.direct.short": "Persone specifiche",
+ "privacy.private.long": "Solo i tuoi follower",
+ "privacy.private.short": "Follower",
+ "privacy.public.long": "Chiunque dentro e fuori Mastodon",
"privacy.public.short": "Pubblico",
- "privacy.unlisted.long": "Visibile a tutti, ma escluso dalle funzioni di scoperta",
- "privacy.unlisted.short": "Non elencato",
+ "privacy.unlisted.additional": "Si comporta esattamente come pubblico, tranne per il fatto che il post non verrà visualizzato nei feed live o negli hashtag, nell'esplorazione o nella ricerca Mastodon, anche se hai attivato l'attivazione a livello di account.",
+ "privacy.unlisted.long": "Meno fanfare algoritmiche",
+ "privacy.unlisted.short": "Pubblico silenzioso",
"privacy_policy.last_updated": "Ultimo aggiornamento {date}",
"privacy_policy.title": "Politica sulla Privacy",
"recommended": "Consigliato",
@@ -551,7 +620,9 @@
"relative_time.minutes": "{number}m",
"relative_time.seconds": "{number}s",
"relative_time.today": "oggi",
+ "reply_indicator.attachments": "{count, plural, one {# allegato} other {# allegati}}",
"reply_indicator.cancel": "Annulla",
+ "reply_indicator.poll": "Sondaggio",
"report.block": "Blocca",
"report.block_explanation": "Non visualizzerai i suoi post. Non potrà vedere i tuoi post o seguirti. Potrà sapere di esser stato bloccato.",
"report.categories.legal": "Informazioni legali",
@@ -644,10 +715,11 @@
"status.direct": "Menziona privatamente @{name}",
"status.direct_indicator": "Menzione privata",
"status.edit": "Modifica",
- "status.edited": "Modificato il {date}",
+ "status.edited": "Ultima modifica {date}",
"status.edited_x_times": "Modificato {count, plural, one {{count} volta} other {{count} volte}}",
"status.embed": "Incorpora",
"status.favourite": "Preferito",
+ "status.favourites": "{count, plural, one {preferito} other {preferiti}}",
"status.filter": "Filtra questo post",
"status.filtered": "Filtrato",
"status.hide": "Nascondi il post",
@@ -668,6 +740,7 @@
"status.reblog": "Reblog",
"status.reblog_private": "Reblog con visibilità originale",
"status.reblogged_by": "Rebloggato da {name}",
+ "status.reblogs": "{count, plural, one {boost} other {boost}}",
"status.reblogs.empty": "Ancora nessuno ha rebloggato questo post. Quando qualcuno lo farà, apparirà qui.",
"status.redraft": "Elimina e riscrivi",
"status.remove_bookmark": "Rimuovi segnalibro",
@@ -715,10 +788,8 @@
"upload_error.poll": "Caricamento del file non consentito con i sondaggi.",
"upload_form.audio_description": "Descrizione per persone con deficit uditivi",
"upload_form.description": "Descrizione per ipovedenti",
- "upload_form.description_missing": "Nessuna descrizione aggiunta",
"upload_form.edit": "Modifica",
"upload_form.thumbnail": "Cambia la miniatura",
- "upload_form.undo": "Elimina",
"upload_form.video_description": "Descrizione per persone con deficit uditivi o ipovedenti",
"upload_modal.analyzing_picture": "Analizzando l'immagine…",
"upload_modal.apply": "Applica",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index e7aafe852ab3d5..eea06fff590708 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -89,7 +89,14 @@
"announcement.announcement": "お知らせ",
"attachments_list.unprocessed": "(未処理)",
"audio.hide": "音声を閉じる",
- "autosuggest_hashtag.per_week": "{count} 回 / 週",
+ "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": "要求されたページをレンダリングできませんでした。コードのバグ、またはブラウザの互換性の問題が原因である可能性があります。",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "あなたのアカウントは{locked}になっていません。誰でもあなたをフォローすることができ、フォロワー限定の投稿を見ることができます。",
"compose_form.lock_disclaimer.lock": "承認制",
"compose_form.placeholder": "今なにしてる？",
- "compose_form.poll.add_option": "追加",
"compose_form.poll.duration": "アンケート期間",
- "compose_form.poll.option_placeholder": "項目 {number}",
- "compose_form.poll.remove_option": "この項目を削除",
+ "compose_form.poll.multiple": "複数選択",
+ "compose_form.poll.option_placeholder": "項目{number}",
+ "compose_form.poll.single": "単一選択",
"compose_form.poll.switch_to_multiple": "複数選択に変更",
"compose_form.poll.switch_to_single": "単一選択に変更",
+ "compose_form.poll.type": "スタイル",
"compose_form.publish": "投稿",
"compose_form.publish_form": "投稿",
- "compose_form.publish_loud": "{publish}！",
- "compose_form.save_changes": "変更を保存",
- "compose_form.sensitive.hide": "メディアを閲覧注意にする",
- "compose_form.sensitive.marked": "メディアに閲覧注意が設定されています",
- "compose_form.sensitive.unmarked": "メディアに閲覧注意が設定されていません",
+ "compose_form.reply": "返信",
+ "compose_form.save_changes": "更新",
"compose_form.spoiler.marked": "本文は警告の後ろに隠されます",
"compose_form.spoiler.unmarked": "本文は隠されていません",
- "compose_form.spoiler_placeholder": "ここに警告を書いてください",
+ "compose_form.spoiler_placeholder": "閲覧注意 (オプション)",
"confirmation_modal.cancel": "キャンセル",
- "confirmations.block.block_and_report": "ブロックし通報",
"confirmations.block.confirm": "ブロック",
- "confirmations.block.message": "本当に{name}さんをブロックしますか？",
"confirmations.cancel_follow_request.confirm": "フォローリクエストを取り消す",
"confirmations.cancel_follow_request.message": "{name}に対するフォローリクエストを取り消しますか?",
"confirmations.delete.confirm": "削除",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "本当にこのリストを完全に削除しますか？",
"confirmations.discard_edit_media.confirm": "破棄",
"confirmations.discard_edit_media.message": "メディアの説明またはプレビューに保存されていない変更があります。それでも破棄しますか？",
- "confirmations.domain_block.confirm": "ドメイン全体をブロック",
+ "confirmations.domain_block.confirm": "サーバーをブロック",
"confirmations.domain_block.message": "本当に{domain}全体を非表示にしますか？ 多くの場合は個別にブロックやミュートするだけで充分であり、また好ましいです。公開タイムラインにそのドメインのコンテンツが表示されなくなり、通知も届かなくなります。そのドメインのフォロワーはアンフォローされます。",
"confirmations.edit.confirm": "編集",
"confirmations.edit.message": "今編集すると現在作成中のメッセージが上書きされます。本当に実行しますか？",
"confirmations.logout.confirm": "ログアウト",
"confirmations.logout.message": "本当にログアウトしますか？",
"confirmations.mute.confirm": "ミュート",
- "confirmations.mute.explanation": "これにより相手の投稿と返信は見えなくなりますが、相手はあなたをフォローし続け投稿を見ることができます。",
- "confirmations.mute.message": "本当に{name}さんをミュートしますか？",
"confirmations.redraft.confirm": "削除して下書きに戻す",
"confirmations.redraft.message": "投稿を削除して下書きに戻します。この投稿へのお気に入り登録やブーストは失われ、返信は孤立することになります。よろしいですか？",
"confirmations.reply.confirm": "返信",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "ネットワーク上で注目を集めている投稿です。ブーストやお気に入り登録の多い新しい投稿が上位に表示されます。",
"dismissable_banner.explore_tags": "ネットワーク上でトレンドになっているハッシュタグです。たくさんのユーザーに使われたタグほど上位に表示されます。",
"dismissable_banner.public_timeline": "{domain}のユーザーがリモートフォローしているアカウントからの公開投稿のタイムラインです。",
+ "domain_block_modal.block": "サーバーをブロック",
+ "domain_block_modal.block_account_instead": "@{name} さんのみをブロック",
+ "domain_block_modal.they_can_interact_with_old_posts": "あなたの今までの投稿は、引き続きこのサーバーのユーザーが閲覧できます。",
+ "domain_block_modal.they_cant_follow": "このサーバーのユーザーはあなたをフォローできなくなります。",
+ "domain_block_modal.they_wont_know": "ドメインブロックは相手からはわかりません。",
+ "domain_block_modal.title": "ドメインをブロックしますか？",
+ "domain_block_modal.you_will_lose_followers": "このサーバーのフォロワーはすべてフォロー解除されます。",
+ "domain_block_modal.you_wont_see_posts": "このサーバーのユーザーからの投稿や通知が閲覧できなくなります。",
+ "domain_pill.activitypub_lets_connect": "Mastodonからほかのソーシャルアプリのユーザーへ、そのまた別のアプリのユーザーへと、それぞれが互いにつながり関わり合うことをこのActivityPubの仕組みが実現しています。",
+ "domain_pill.activitypub_like_language": "ActivityPubとは、Mastodonがほかのサーバーと会話をするときにしゃべる「言葉」のようなものです。",
+ "domain_pill.server": "サーバー",
+ "domain_pill.their_handle": "このユーザーのユーザーID:",
+ "domain_pill.their_server": "ユーザーの仮想の住所です。そのユーザーIDによるすべての投稿を保持しています。",
+ "domain_pill.their_username": "ユーザーを識別する名前です。ユーザー名はひとつのサーバー内においては唯一無二の名前ですが、ほかのサーバーには同名のユーザーがいることもあります。",
+ "domain_pill.username": "ユーザー名",
+ "domain_pill.whats_in_a_handle": "ユーザーIDについて",
+ "domain_pill.who_they_are": "そのユーザーが「誰であるか」「どこに住んでいるか」はユーザーIDから知ることができます。これによりの集まりからなるネットワークを介してそれぞれのユーザーと関わり合うことができます。",
+ "domain_pill.who_you_are": "ほかのユーザーはあなたが「誰であるか」「どこに住んでいるか」をユーザーIDから認識でき、これによりの集まりからなるネットワークを介してあなたと関わり合うことができます。",
+ "domain_pill.your_handle": "あなたのユーザーID:",
+ "domain_pill.your_server": "あなたの仮想の住所です。投稿した内容はすべてここに保持されます。もし今いるサーバーが気に入っていない場合は、フォロワーを引き継いで別のサーバーに引っ越すこともできます。",
+ "domain_pill.your_username": "あなたを識別する名前です。ユーザー名はひとつのサーバー内においては唯一無二の名前ですが、ほかのサーバーには同名のユーザーがいることもあります。",
"embed.instructions": "下記のコードをコピーしてウェブサイトに埋め込みます。",
"embed.preview": "表示例:",
"emoji_button.activity": "活動",
@@ -244,6 +266,7 @@
"empty_column.list": "このリストにはまだなにもありません。このリストのメンバーが新しい投稿をするとここに表示されます。",
"empty_column.lists": "まだリストがありません。リストを作るとここに表示されます。",
"empty_column.mutes": "まだ誰もミュートしていません。",
+ "empty_column.notification_requests": "ここに表示するものはありません。新しい通知を受け取ったとき、フィルタリング設定で通知がブロックされたアカウントがある場合はここに表示されます。",
"empty_column.notifications": "まだ通知がありません。他の人とふれ合って会話を始めましょう。",
"empty_column.public": "ここにはまだ何もありません！ 公開で何かを投稿したり、他のサーバーのユーザーをフォローしたりしていっぱいにしましょう",
"error.unexpected_crash.explanation": "不具合かブラウザの互換性問題のため、このページを正しく表示できませんでした。",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "既存のカテゴリーを使用するか新規作成します",
"filter_modal.select_filter.title": "この投稿をフィルターする",
"filter_modal.title.status": "投稿をフィルターする",
+ "filtered_notifications_banner.mentions": "{count, plural, one {メンション} other {メンション}}",
+ "filtered_notifications_banner.pending_requests": "{count, plural, =0 {通知がブロックされているアカウントはありません} other {#アカウントからの通知がブロックされています}}",
+ "filtered_notifications_banner.title": "保留中の通知",
"firehose.all": "すべて",
"firehose.local": "このサーバー",
"firehose.remote": "ほかのサーバー",
"follow_request.authorize": "許可",
"follow_request.reject": "拒否",
"follow_requests.unlocked_explanation": "あなたのアカウントは承認制ではありませんが、{domain}のスタッフはこれらのアカウントからのフォローリクエストの確認が必要であると判断しました。",
+ "follow_suggestions.curated_suggestion": "サーバースタッフ公認",
+ "follow_suggestions.dismiss": "今後表示しない",
+ "follow_suggestions.featured_longer": "{domain} スタッフ公認",
+ "follow_suggestions.friends_of_friends_longer": "フォロー中のユーザーに人気",
+ "follow_suggestions.hints.featured": "{domain} の運営スタッフが選んだアカウントです。",
+ "follow_suggestions.hints.friends_of_friends": "フォロー中のユーザーのあいだで人気のアカウントです。",
+ "follow_suggestions.hints.most_followed": "{domain} でもっともフォローされているアカウントのひとつです。",
+ "follow_suggestions.hints.most_interactions": "{domain} でいま大きな注目を集めています。",
+ "follow_suggestions.hints.similar_to_recently_followed": "最近フォローしたユーザーに似ているアカウントです。",
+ "follow_suggestions.personalized_suggestion": "フォローに基づく提案",
+ "follow_suggestions.popular_suggestion": "人気のアカウント",
+ "follow_suggestions.popular_suggestion_longer": "{domain} で人気",
+ "follow_suggestions.similar_to_recently_followed_longer": "最近フォローしたユーザーと似ているアカウント",
+ "follow_suggestions.view_all": "すべて表示",
+ "follow_suggestions.who_to_follow": "フォローを増やしてみませんか？",
"followed_tags": "フォロー中のハッシュタグ",
"footer.about": "概要",
"footer.directory": "ディレクトリ",
@@ -302,17 +343,12 @@
"hashtag.column_settings.tag_toggle": "このカラムに追加のタグを含める",
"hashtag.counter_by_accounts": "{count, plural, other {{counter}人投稿}}",
"hashtag.counter_by_uses": "{count, plural, other {{counter}件}}",
- "hashtag.counter_by_uses_today": "今日{count, plural, other {{counter}件}}",
+ "hashtag.counter_by_uses_today": "本日{count, plural, other {#件}}",
"hashtag.follow": "ハッシュタグをフォローする",
"hashtag.unfollow": "ハッシュタグのフォローを解除",
"hashtags.and_other": "ほか{count, plural, other {#個}}",
- "home.actions.go_to_explore": "話題をさがす",
- "home.actions.go_to_suggestions": "フォローするユーザーを検索",
- "home.column_settings.basic": "基本設定",
"home.column_settings.show_reblogs": "ブースト表示",
"home.column_settings.show_replies": "返信表示",
- "home.explore_prompt.body": "ユーザーやハッシュタグをフォローすると、この「ホーム」タイムラインに投稿やブーストが流れるようになります。タイムラインをもう少しにぎやかにしてみませんか？",
- "home.explore_prompt.title": "Mastodonのタイムラインへようこそ。",
"home.hide_announcements": "お知らせを隠す",
"home.pending_critical_update.body": "速やかにMastodonサーバーをアップデートしてください。",
"home.pending_critical_update.link": "詳細",
@@ -396,9 +432,15 @@
"loading_indicator.label": "読み込み中…",
"media_gallery.toggle_visible": "{number, plural, one {画像を閉じる} other {画像を閉じる}}",
"moved_to_account_banner.text": "あなたのアカウント『{disabledAccount}』は『{movedToAccount}』に移動したため現在無効になっています。",
- "mute_modal.duration": "ミュートする期間",
- "mute_modal.hide_notifications": "このユーザーからの通知を隠しますか？",
+ "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": "ブロックしたユーザー",
@@ -408,7 +450,6 @@
"navigation_bar.direct": "非公開の返信",
"navigation_bar.discover": "見つける",
"navigation_bar.domain_blocks": "ブロックしたドメイン",
- "navigation_bar.edit_profile": "プロフィールを編集",
"navigation_bar.explore": "探索する",
"navigation_bar.favourites": "お気に入り",
"navigation_bar.filters": "フィルター設定",
@@ -432,11 +473,29 @@
"notification.follow": "{name}さんにフォローされました",
"notification.follow_request": "{name}さんがあなたにフォローリクエストしました",
"notification.mention": "{name}さんがあなたに返信しました",
+ "notification.moderation-warning.learn_more": "さらに詳しく",
+ "notification.moderation_warning": "管理者から警告が来ています",
+ "notification.moderation_warning.action_delete_statuses": "あなたによるいくつかの投稿が削除されました。",
+ "notification.moderation_warning.action_disable": "あなたのアカウントは無効になりました。",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "あなたの投稿のいくつかは閲覧注意として判定されています。",
+ "notification.moderation_warning.action_none": "あなたのアカウントは管理者からの警告を受けています。",
+ "notification.moderation_warning.action_sensitive": "あなたの投稿はこれから閲覧注意としてマークされます。",
+ "notification.moderation_warning.action_silence": "あなたのアカウントは制限されています。",
+ "notification.moderation_warning.action_suspend": "あなたのアカウントは停止されました。",
"notification.own_poll": "アンケートが終了しました",
"notification.poll": "アンケートが終了しました",
"notification.reblog": "{name}さんがあなたの投稿をブーストしました",
+ "notification.relationships_severance_event": "{name} との関係が失われました",
+ "notification.relationships_severance_event.account_suspension": "{from} の管理者が {target} さんを停止したため、今後このユーザーとの交流や新しい投稿の受け取りができなくなりました。",
+ "notification.relationships_severance_event.domain_block": "{from} の管理者が {target} をブロックしました。これにより{followersCount}フォロワーと{followingCount, plural, other {#フォロー}}が失われました。",
+ "notification.relationships_severance_event.learn_more": "詳細を確認",
+ "notification.relationships_severance_event.user_domain_block": "{target} のブロックにより{followersCount}フォロワーと{followingCount, plural, other {#フォロー}}が解除されました。",
"notification.status": "{name}さんが投稿しました",
"notification.update": "{name}さんが投稿を編集しました",
+ "notification_requests.accept": "受け入れる",
+ "notification_requests.dismiss": "無視",
+ "notification_requests.notifications_from": "{name}からの通知",
+ "notification_requests.title": "保留中の通知",
"notifications.clear": "通知を消去",
"notifications.clear_confirmation": "本当に通知を消去しますか？",
"notifications.column_settings.admin.report": "新しい通報:",
@@ -445,7 +504,6 @@
"notifications.column_settings.favourite": "お気に入り:",
"notifications.column_settings.filter_bar.advanced": "すべてのカテゴリを表示",
"notifications.column_settings.filter_bar.category": "クイックフィルターバー:",
- "notifications.column_settings.filter_bar.show_bar": "フィルターバーを表示",
"notifications.column_settings.follow": "新しいフォロワー:",
"notifications.column_settings.follow_request": "新しいフォローリクエスト:",
"notifications.column_settings.mention": "返信:",
@@ -471,6 +529,15 @@
"notifications.permission_denied": "ブラウザの通知が拒否されているためデスクトップ通知は利用できません",
"notifications.permission_denied_alert": "ブラウザの通知が拒否されているためデスクトップ通知を有効にできません",
"notifications.permission_required": "必要な権限が付与されていないため、デスクトップ通知は利用できません。",
+ "notifications.policy.filter_new_accounts.hint": "作成から{days, plural, other {#日}}以内のアカウントからの通知がブロックされます",
+ "notifications.policy.filter_new_accounts_title": "新しいアカウントからの通知をブロックする",
+ "notifications.policy.filter_not_followers_hint": "フォローされていても、フォローから{days, plural, other {#日}}経っていない場合はブロックされます",
+ "notifications.policy.filter_not_followers_title": "フォローされていないアカウントからの通知をブロックする",
+ "notifications.policy.filter_not_following_hint": "手動で通知を受け入れたアカウントはブロックされません",
+ "notifications.policy.filter_not_following_title": "フォローしていないアカウントからの通知をブロックする",
+ "notifications.policy.filter_private_mentions_hint": "あなたがメンションした相手からの返信、およびフォローしているアカウントからの返信以外がブロックされます",
+ "notifications.policy.filter_private_mentions_title": "外部からの非公開の返信をブロックする",
+ "notifications.policy.title": "通知のフィルタリング",
"notifications_permission_banner.enable": "デスクトップ通知を有効にする",
"notifications_permission_banner.how_to_control": "Mastodonを閉じている間でも通知を受信するにはデスクトップ通知を有効にしてください。有効にすると上の {icon} ボタンから通知の内容を細かくカスタマイズできます。",
"notifications_permission_banner.title": "お見逃しなく",
@@ -526,14 +593,15 @@
"poll_button.add_poll": "アンケートを追加",
"poll_button.remove_poll": "アンケートを削除",
"privacy.change": "公開範囲を変更",
- "privacy.direct.long": "指定された相手のみ閲覧可",
- "privacy.direct.short": "指定された相手のみ",
- "privacy.private.long": "フォロワーのみ閲覧可",
- "privacy.private.short": "フォロワーのみ",
- "privacy.public.long": "誰でも閲覧可",
+ "privacy.direct.long": "本文で指定した相手のみ",
+ "privacy.direct.short": "特定の人",
+ "privacy.private.long": "フォロワーのみ",
+ "privacy.private.short": "フォロワー",
+ "privacy.public.long": "すべての人 (Mastodon以外も含む)",
"privacy.public.short": "公開",
- "privacy.unlisted.long": "誰でも閲覧可、サイレント",
- "privacy.unlisted.short": "非収載",
+ "privacy.unlisted.additional": "「公開」とほとんど同じですが、リアルタイムフィードやハッシュタグ、探索機能、Mastodon検索などに投稿が表示されない点で「公開」と異なります。また、アカウント設定で投稿の検索や表示を許可している場合でも、この公開範囲を設定した投稿は前述の機能には表示されません。",
+ "privacy.unlisted.long": "より表示機会の少ない公開",
+ "privacy.unlisted.short": "ひかえめな公開",
"privacy_policy.last_updated": "{date}に更新",
"privacy_policy.title": "プライバシーポリシー",
"recommended": "おすすめ",
@@ -551,7 +619,9 @@
"relative_time.minutes": "{number}分前",
"relative_time.seconds": "{number}秒前",
"relative_time.today": "今日",
+ "reply_indicator.attachments": "{count, plural, other {#件のメディア}}",
"reply_indicator.cancel": "キャンセル",
+ "reply_indicator.poll": "アンケート",
"report.block": "ブロック",
"report.block_explanation": "相手の投稿が表示されなくなります。相手はあなたの投稿を見ることやフォローすることができません。相手はブロックされていることがわかります。",
"report.categories.legal": "法令違反",
@@ -644,10 +714,11 @@
"status.direct": "@{name}さんに非公開で投稿",
"status.direct_indicator": "非公開の返信",
"status.edit": "編集",
- "status.edited": "{date}に編集",
+ "status.edited": "最終更新日 {date}",
"status.edited_x_times": "{count}回編集",
"status.embed": "埋め込み",
"status.favourite": "お気に入り",
+ "status.favourites": "{count, plural, one {お気に入り} other {お気に入り}}",
"status.filter": "この投稿をフィルターする",
"status.filtered": "フィルターされました",
"status.hide": "投稿を非表示",
@@ -668,6 +739,7 @@
"status.reblog": "ブースト",
"status.reblog_private": "ブースト",
"status.reblogged_by": "{name}さんがブースト",
+ "status.reblogs": "{count, plural, one {ブースト} other {ブースト}}",
"status.reblogs.empty": "まだ誰もブーストしていません。ブーストされるとここに表示されます。",
"status.redraft": "削除して下書きに戻す",
"status.remove_bookmark": "ブックマークを削除",
@@ -715,10 +787,8 @@
"upload_error.poll": "アンケートではファイルをアップロードできません。",
"upload_form.audio_description": "聴き取りが難しいユーザーへの説明",
"upload_form.description": "視覚的に閲覧が難しいユーザーへの説明",
- "upload_form.description_missing": "説明を追加していません",
"upload_form.edit": "編集",
"upload_form.thumbnail": "サムネイルを変更",
- "upload_form.undo": "削除",
"upload_form.video_description": "聴き取りや視覚的に閲覧が難しいユーザーへの説明",
"upload_modal.analyzing_picture": "画像を解析中…",
"upload_modal.apply": "適用",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index 9d977e93312076..7af4dccd86bb2f 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -36,7 +36,6 @@
"admin.dashboard.retention.cohort_size": "ახალი მომხმარებელი",
"alert.unexpected.message": "წარმოიშვა მოულოდნელი შეცდომა.",
"alert.unexpected.title": "უპს!",
- "autosuggest_hashtag.per_week": "კვირაში {count}",
"boost_modal.combo": "შეგიძლიათ დააჭიროთ {combo}-ს რათა შემდეგ ჯერზე გამოტოვოთ ეს",
"bundle_column_error.retry": "სცადეთ კიდევ ერთხელ",
"bundle_modal_error.close": "დახურვა",
@@ -68,22 +67,16 @@
"compose_form.lock_disclaimer.lock": "ჩაკეტილი",
"compose_form.placeholder": "რაზე ფიქრობ?",
"compose_form.publish_form": "Publish",
- "compose_form.sensitive.marked": "მედია მონიშნულია მგრძნობიარედ",
- "compose_form.sensitive.unmarked": "მედია არაა მონიშნული მგრძნობიარედ",
"compose_form.spoiler.marked": "გაფრთხილების უკან ტექსტი დამალულია",
"compose_form.spoiler.unmarked": "ტექსტი არაა დამალული",
- "compose_form.spoiler_placeholder": "თქვენი გაფრთხილება დაწერეთ აქ",
"confirmation_modal.cancel": "უარყოფა",
"confirmations.block.confirm": "ბლოკი",
- "confirmations.block.message": "დარწმუნებული ხართ, გსურთ დაბლოკოთ {name}?",
"confirmations.delete.confirm": "გაუქმება",
"confirmations.delete.message": "დარწმუნებული ხართ, გსურთ გააუქმოთ ეს სტატუსი?",
"confirmations.delete_list.confirm": "გაუქმება",
"confirmations.delete_list.message": "დარწმუნებული ხართ, გსურთ სამუდამოდ გააუქმოთ ეს სია?",
- "confirmations.domain_block.confirm": "მთელი დომენის დამალვა",
"confirmations.domain_block.message": "ნაღდად, ნაღდად, დარწმუნებული ხართ, გსურთ დაბლოკოთ მთელი {domain}? უმეტეს შემთხვევაში რამდენიმე გამიზნული ბლოკი ან გაჩუმება საკმარისი და უკეთესია. კონტენტს ამ დომენიდან ვერ იხილავთ ვერც ერთ ღია თაიმლაინზე ან თქვენს შეტყობინებებში. ამ დომენიდან არსებული მიმდევრები ამოიშლება.",
"confirmations.mute.confirm": "გაჩუმება",
- "confirmations.mute.message": "დარწმუნებული ხართ, გსურთ გააჩუმოთ {name}?",
"confirmations.redraft.confirm": "გაუქმება და გადანაწილება",
"confirmations.unfollow.confirm": "ნუღარ მიჰყვები",
"confirmations.unfollow.message": "დარწმუნებული ხართ, აღარ გსურთ მიჰყვებოდეთ {name}-ს?",
@@ -118,7 +111,6 @@
"follow_request.reject": "უარყოფა",
"getting_started.heading": "დაწყება",
"hashtag.column_settings.tag_toggle": "Include additional tags in this column",
- "home.column_settings.basic": "ძირითადი",
"home.column_settings.show_reblogs": "ბუსტების ჩვენება",
"home.column_settings.show_replies": "პასუხების ჩვენება",
"keyboard_shortcuts.back": "უკან გადასასვლელად",
@@ -165,13 +157,11 @@
"lists.search": "ძებნა ადამიანებს შორის რომელთაც მიჰყვებით",
"lists.subheading": "თქვენი სიები",
"media_gallery.toggle_visible": "ხილვადობის ჩართვა",
- "mute_modal.hide_notifications": "დავმალოთ შეტყობინებები ამ მომხმარებლისგან?",
"navigation_bar.blocks": "დაბლოკილი მომხმარებლები",
"navigation_bar.community_timeline": "ლოკალური თაიმლაინი",
"navigation_bar.compose": "Compose new toot",
"navigation_bar.discover": "აღმოაჩინე",
"navigation_bar.domain_blocks": "დამალული დომენები",
- "navigation_bar.edit_profile": "შეცვალე პროფილი",
"navigation_bar.filters": "გაჩუმებული სიტყვები",
"navigation_bar.follow_requests": "დადევნების მოთხოვნები",
"navigation_bar.lists": "სიები",
@@ -211,12 +201,7 @@
"onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
"onboarding.steps.share_profile.title": "Share your profile",
"privacy.change": "სტატუსის კონფიდენციალურობის მითითება",
- "privacy.direct.long": "დაიპოსტოს მხოლოდ დასახელებულ მომხმარებლებთან",
- "privacy.direct.short": "Direct",
- "privacy.private.long": "დაიპოსტოს მხოლოდ მიმდევრებთან",
- "privacy.private.short": "Followers-only",
"privacy.public.short": "საჯარო",
- "privacy.unlisted.short": "ჩამოუთვლელი",
"regeneration_indicator.label": "იტვირთება…",
"regeneration_indicator.sublabel": "თქვენი სახლის ლენტა მზადდება!",
"relative_time.days": "{number}დღ",
@@ -279,7 +264,6 @@
"upload_button.label": "მედიის დამატება",
"upload_form.audio_description": "Describe for people with hearing loss",
"upload_form.description": "აღწერილობა ვიზუალურად უფასურისთვის",
- "upload_form.undo": "გაუქმება",
"upload_form.video_description": "Describe for people with hearing loss or visual impairment",
"upload_progress.label": "იტვირთება...",
"video.close": "ვიდეოს დახურვა",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 08c70a9405a658..9fdf602992022e 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -1,5 +1,8 @@
{
"about.contact": "Anermis:",
+ "about.disclaimer": "Mastodon d aseɣẓan ilelli, d aseɣẓan n uɣbalu yeldin, d tnezzut n Mastodon gGmbH.",
+ "about.not_available": "Talɣut-a ur tettwabder ara deg uqeddac-a.",
+ "about.powered_by": "Azeṭṭa inmetti yettwasɣelsen sɣur {mastodon}",
"about.rules": "Ilugan n uqeddac",
"account.account_note_header": "Tazmilt",
"account.add_or_remove_from_list": "Rnu neɣ kkes seg tebdarin",
@@ -10,31 +13,42 @@
"account.block_short": "Sewḥel",
"account.blocked": "Yettusewḥel",
"account.browse_more_on_origin_server": "Snirem ugar deg umeɣnu aneẓli",
- "account.cancel_follow_request": "Withdraw follow request",
+ "account.cancel_follow_request": "Sefsex taḍfart",
+ "account.copy": "Nɣel assaɣ ɣer umaɣnu",
+ "account.direct": "Bder-d @{name} weḥd-s",
"account.disable_notifications": "Ḥbes ur iyi-d-ttazen ara ilɣa mi ara d-isuffeɣ @{name}",
"account.domain_blocked": "Taɣult yeffren",
"account.edit_profile": "Ẓreg amaɣnu",
"account.enable_notifications": "Azen-iyi-d ilɣa mi ara d-isuffeɣ @{name}",
"account.endorse": "Welleh fell-as deg umaɣnu-inek",
+ "account.featured_tags.last_status_at": "Tasuffeɣt taneggarut ass n {date}",
+ "account.featured_tags.last_status_never": "Ulac tisuffaɣ",
"account.follow": "Ḍfer",
"account.followers": "Imeḍfaren",
"account.followers.empty": "Ar tura, ulac yiwen i yeṭṭafaṛen amseqdac-agi.",
"account.followers_counter": "{count, plural, one {{count} n umeḍfar} other {{count} n imeḍfaren}}",
+ "account.following": "Yeṭṭafaṛ",
"account.following_counter": "{count, plural, one {{counter} yettwaḍfaren} other {{counter} yettwaḍfaren}}",
"account.follows.empty": "Ar tura, amseqdac-agi ur yeṭṭafaṛ yiwen.",
+ "account.go_to_profile": "Ddu ɣer umaɣnu",
"account.hide_reblogs": "Ffer ayen i ibeṭṭu @{name}",
+ "account.joined_short": "Izeddi da seg ass n",
"account.link_verified_on": "Taɣara n useɣwen-a tettwasenqed ass n {date}",
"account.locked_info": "Amiḍan-agi uslig isekweṛ. D bab-is kan i izemren ad yeǧǧ, s ufus-is, win ara t-iḍefṛen.",
"account.media": "Timidyatin",
"account.mention": "Bder-d @{name}",
+ "account.moved_to": "{name} yenna-d dakken amiḍan-is amaynut yuɣal :",
"account.mute": "Sgugem @{name}",
+ "account.mute_notifications_short": "Susem ilɣa",
"account.mute_short": "Sgugem",
"account.muted": "Yettwasgugem",
+ "account.no_bio": "Ulac aglam i d-yettunefken.",
"account.open_original_page": "Ldi asebter anasli",
"account.posts": "Tisuffaɣ",
"account.posts_with_replies": "Tisuffaɣ d tririyin",
"account.report": "Cetki ɣef @{name}",
"account.requested": "Di laɛḍil ad yettwaqbel. Ssit i wakken ad yefsex usuter n uḍfar",
+ "account.requested_follow": "{name} yessuter ad k·m-yeḍfer",
"account.share": "Bḍu amaɣnu n @{name}",
"account.show_reblogs": "Ssken-d inebḍa n @{name}",
"account.statuses_counter": "{count, plural, one {{counter} n tsuffeɣt} other {{counter} n tsuffaɣ}}",
@@ -53,8 +67,12 @@
"alert.unexpected.title": "Ayhuh!",
"announcement.announcement": "Ulɣu",
"audio.hide": "Ffer amesli",
- "autosuggest_hashtag.per_week": "{count} i yimalas",
- "boost_modal.combo": "Tzemreḍ ad tetekkiḍ ɣef {combo} akken ad tessurfeḍ aya tikelt-nniḍen",
+ "block_modal.show_less": "Ssken-d drus",
+ "block_modal.show_more": "Ssken-d ugar",
+ "block_modal.they_cant_mention": "Ur zmiren ad k·m-id-bedren, ur zmiren ad k·m-ḍefren.",
+ "block_modal.they_cant_see_posts": "Ur zmiren ad walin tisufaɣ-nwen, ur tettwalim tid-nsen.",
+ "block_modal.title": "Sewḥel aseqdac ?",
+ "boost_modal.combo": "Tzemreḍ ad tsiteḍ ɣef {combo} akken ad tzegleḍ aya tikelt i d-iteddun",
"bundle_column_error.copy_stacktrace": "Nɣel tuccḍa n uneqqis",
"bundle_column_error.error.title": "Uh, ala !",
"bundle_column_error.network.title": "Tuccḍa deg uẓeṭṭa",
@@ -64,12 +82,15 @@
"bundle_modal_error.close": "Mdel",
"bundle_modal_error.message": "Tella-d kra n tuccḍa mi d-yettali ugbur-agi.",
"bundle_modal_error.retry": "Ɛreḍ tikelt-nniḍen",
+ "closed_registrations_modal.description": "Asnulfu n umiḍan deg {domain} mačči d ayen izemren ad yili, maca ttxil-k·m, err deg lbal-ik·im belli ur teḥwaǧeḍ ara amiḍan s wudem ibanen ɣef {domain} akken ad tesqedceḍ Mastodon.",
"closed_registrations_modal.find_another_server": "Aff-d aqeddac nniḍen",
- "column.about": "Γef",
+ "closed_registrations_modal.title": "Ajerred deg Masṭudun",
+ "column.about": "Ɣef",
"column.blocks": "Imiḍanen yettusḥebsen",
"column.bookmarks": "Ticraḍ",
"column.community": "Tasuddemt tadigant",
- "column.directory": "Inig deg imaɣnuten",
+ "column.direct": "Tabdarin tusligin",
+ "column.directory": "Inig deg imeɣna",
"column.domain_blocks": "Taɣulin yeffren",
"column.favourites": "Imenyafen",
"column.follow_requests": "Isuturen n teḍfeṛt",
@@ -77,7 +98,7 @@
"column.lists": "Tibdarin",
"column.mutes": "Imiḍanen yettwasgugmen",
"column.notifications": "Tilɣa",
- "column.pins": "Tijewwaqin yettwasenṭḍen",
+ "column.pins": "Tisuffaɣ yettwasenṭḍen",
"column.public": "Tasuddemt tamatut",
"column_back_button.label": "Tuɣalin",
"column_header.hide_settings": "Ffer iɣewwaṛen",
@@ -88,46 +109,43 @@
"column_header.unpin": "Kkes asenteḍ",
"column_subheading.settings": "Iɣewwaṛen",
"community.column_settings.local_only": "Adigan kan",
- "community.column_settings.media_only": "Allal n teywalt kan",
+ "community.column_settings.media_only": "Imidyaten kan",
"community.column_settings.remote_only": "Anmeggag kan",
"compose.language.change": "Beddel tutlayt",
"compose.language.search": "Nadi tutlayin …",
+ "compose.published.body": "Yeffeɣ-d yizen-nni.",
"compose.published.open": "Ldi",
+ "compose.saved.body": "Tettwasekles tsuffeɣt.",
"compose_form.direct_message_warning_learn_more": "Issin ugar",
- "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
- "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
+ "compose_form.encryption_warning": "",
+ "compose_form.hashtag_warning": "",
"compose_form.lock_disclaimer": "Amiḍan-ik·im ur yelli ara {locked}. Menwala yezmer ad k·kem-yeḍfeṛ akken ad iẓer acu tbeṭṭuḍ akked yimeḍfaṛen-ik·im.",
"compose_form.lock_disclaimer.lock": "yettwacekkel",
"compose_form.placeholder": "D acu i itezzin deg wallaɣ?",
- "compose_form.poll.add_option": "Rnu afran",
"compose_form.poll.duration": "Tanzagt n tefrant",
- "compose_form.poll.option_placeholder": "Afran {number}",
- "compose_form.poll.remove_option": "Sfeḍ afran-agi",
+ "compose_form.poll.multiple": "Aṭas n ufran",
+ "compose_form.poll.option_placeholder": "Taxtiṛt {number}",
+ "compose_form.poll.single": "Fren yiwen",
+ "compose_form.poll.type": "Aɣanib",
"compose_form.publish": "Suffeɣ",
- "compose_form.publish_form": "Suffeɣ",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Sekles ibeddilen",
- "compose_form.sensitive.hide": "Creḍ allal n teywalt d anafri",
- "compose_form.sensitive.marked": "Allal n teywalt yettwacreḍ d anafri",
- "compose_form.sensitive.unmarked": "{count, plural, one {Amidya ur yettwacreḍ ara d anafri} other {Imidyaten ur ttwacreḍen ara d inafriyen}}",
+ "compose_form.publish_form": "Tasuffeɣt tamaynut",
+ "compose_form.reply": "Err",
+ "compose_form.save_changes": "Leqqem",
"compose_form.spoiler.marked": "Kkes aḍris yettwaffren deffir n walɣu",
"compose_form.spoiler.unmarked": "Rnu aḍris yettwaffren deffir n walɣu",
- "compose_form.spoiler_placeholder": "Aru alɣu-inek·inem da",
"confirmation_modal.cancel": "Sefsex",
- "confirmations.block.block_and_report": "Sewḥel & sewɛed",
"confirmations.block.confirm": "Sewḥel",
- "confirmations.block.message": "Tebγiḍ s tidet ad tesḥebseḍ {name}?",
"confirmations.delete.confirm": "Kkes",
"confirmations.delete.message": "Tebɣiḍ s tidet ad tekkseḍ tasuffeɣt-agi?",
"confirmations.delete_list.confirm": "Kkes",
"confirmations.delete_list.message": "Tebɣiḍ s tidet ad tekkseḍ umuɣ-agi i lebda?",
"confirmations.discard_edit_media.confirm": "Sefsex",
- "confirmations.domain_block.confirm": "Ffer taɣult meṛṛa",
+ "confirmations.domain_block.confirm": "Sewḥel aqeddac",
+ "confirmations.edit.confirm": "Ẓreg",
+ "confirmations.edit.message": "Abeddel tura ad d-yaru izen-nni i d-tegreḍ akka tura. Tetḥeqqeḍ tebɣiḍ ad tkemmleḍ?",
"confirmations.logout.confirm": "Ffeɣ",
"confirmations.logout.message": "D tidet tebɣiḍ ad teffɣeḍ?",
"confirmations.mute.confirm": "Sgugem",
- "confirmations.mute.explanation": "Aya ad yeffer iznan-is d wid i deg d-yettwabder neɣ d-tettwabder, maca xas akka yezmer neɣ tezmer awali n yiznan-inek d uḍfaṛ-ik.",
- "confirmations.mute.message": "Tetḥeqqeḍ belli tebɣiḍ ad ttegugmeḍ {name}?",
"confirmations.redraft.confirm": "Sfeḍ & Ɛiwed tira",
"confirmations.reply.confirm": "Err",
"confirmations.reply.message": "Tiririt akka tura ad k-degger izen-agi i tettaruḍ. Tebɣiḍ ad tkemmleḍ?",
@@ -137,17 +155,28 @@
"conversation.mark_as_read": "Creḍ yettwaɣṛa",
"conversation.open": "Ssken adiwenni",
"conversation.with": "Akked {names}",
+ "copy_icon_button.copied": "Yettwanɣel ɣer ufus",
"copypaste.copied": "Yettwanɣel",
+ "copypaste.copy_to_clipboard": "Nɣel ɣer afus",
"directory.federated": "Deg fedivers yettwasnen",
"directory.local": "Seg {domain} kan",
"directory.new_arrivals": "Imaynuten id yewḍen",
"directory.recently_active": "Yermed xas melmi kan",
- "disabled_account_banner.account_settings": "Iγewwaṛen n umiḍan",
- "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
- "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+ "disabled_account_banner.account_settings": "Iɣewwaṛen n umiḍan",
+ "dismissable_banner.dismiss": "Agi",
+ "dismissable_banner.explore_links": "D tiqsiḍin n yisallen i yettwabḍan ass-a deg web inmetti. Tiqsiḍin n yisallen timaynutin i d-yettwassufɣen s wugar n medden yemgaraden, d tid i d-yufraren ugar.",
+ "dismissable_banner.explore_statuses": "Ti d tisufaɣ seg uzeṭṭa anmetti i d-yettawin tamyigawt ass-a. Tisufaɣ timaynutin yesεan aṭas n lǧehd d tid iḥemmlen s waṭas, ttwaεlayit d timezwura.",
+ "dismissable_banner.explore_tags": "D wiyi i d ihacṭagen i d-yettawin tamyigawt deg web anmetti ass-a. Ihacṭagen i sseqdacen ugar n medden, εlayit d imezwura.",
+ "domain_block_modal.block": "Sewḥel aqeddac",
+ "domain_block_modal.they_cant_follow": "Yiwen ur yezmir ad k·m-id-yeḍfer seg uqeddac-a.",
+ "domain_pill.activitypub_like_language": "ActivityPub am tutlayt yettmeslay Mastodon d izeḍwan inmettiyen nniḍen.",
+ "domain_pill.server": "Aqeddac",
+ "domain_pill.username": "Isem n useqdac",
+ "domain_pill.your_server": "D axxam-inek·inem umḍin, anda i zedɣent akk tsuffaɣ-ik·im. Ur k·m-yeεǧib ara wa? Ssenfel-d iqeddacen melmi i ak·m-yehwa, awi-d daɣen ineḍfaren-ik·im yid-k·m.",
"embed.instructions": "Ẓẓu addad-agi deg usmel-inek s wenγal n tangalt yellan sdaw-agi.",
"embed.preview": "Akka ara d-iban:",
"emoji_button.activity": "Aqeddic",
+ "emoji_button.clear": "Sfeḍ",
"emoji_button.custom": "Udmawan",
"emoji_button.flags": "Innayen",
"emoji_button.food": "Tegwella & Tissit",
@@ -162,19 +191,19 @@
"emoji_button.symbols": "Izamulen",
"emoji_button.travel": "Imeḍqan d Yinigen",
"empty_column.account_suspended": "Amiḍan yettwaḥbas",
- "empty_column.account_timeline": "Ulac tijewwaqin dagi!",
+ "empty_column.account_timeline": "Ulac tisuffaɣ da !",
"empty_column.account_unavailable": "Ur nufi ara amaɣnu-ayi",
"empty_column.blocks": "Ur tesḥebseḍ ula yiwen n umseqdac ar tura.",
- "empty_column.bookmarked_statuses": "Ulac tijewwaqin i terniḍ ɣer yismenyifen-ik ar tura. Ticki terniḍ yiwet, ad d-tettwasken da.",
+ "empty_column.bookmarked_statuses": "Ulac kra n tsuffeɣt i terniḍ ɣer yismenyifen-ik·im ar tura. Ticki terniḍ yiwet, ad d-tettwasken da.",
"empty_column.community": "Tasuddemt tazayezt tadigant n yisallen d tilemt. Aru ihi kra akken ad tt-teččareḍ!",
"empty_column.domain_blocks": "Ulac kra n taɣult yettwaffren ar tura.",
- "empty_column.follow_requests": "Ulac ɣur-k ula yiwen n usuter n teḍfeṛt. Ticki teṭṭfeḍ-d yiwen ad d-yettwasken da.",
+ "empty_column.follow_requests": "Ulac ɣur-k·m ula yiwen n usuter n teḍfeṛt. Ticki teṭṭfeḍ-d yiwen ad d-yettwasken da.",
"empty_column.hashtag": "Ar tura ulac kra n ugbur yesɛan assaɣ ɣer uhacṭag-agi.",
"empty_column.home": "Tasuddemt tagejdant n yisallen d tilemt! Ẓer {public} neɣ nadi ad tafeḍ imseqdacen-nniḍen ad ten-ḍefṛeḍ.",
"empty_column.list": "Ar tura ur yelli kra deg umuɣ-a. Ad d-yettwasken da ticki iɛeggalen n wumuɣ-a suffɣen-d kra.",
- "empty_column.lists": "Ulac ɣur-k kra n wumuɣ yakan. Ad d-tettwasken da ticki tesluleḍ-d yiwet.",
- "empty_column.mutes": "Ulac ɣur-k imseqdacen i yettwasgugmen.",
- "empty_column.notifications": "Ulac ɣur-k tilɣa. Sedmer akked yemdanen-nniḍen akken ad tebduḍ adiwenni.",
+ "empty_column.lists": "Ulac ɣur-k·m kra n wumuɣ yakan. Ad d-tettwasken da ticki tesluleḍ-d yiwet.",
+ "empty_column.mutes": "Ulac ɣur-k·m imseqdacen i yettwasgugmen.",
+ "empty_column.notifications": "Ulac ɣur-k·m tilɣa. Sedmer akked yemdanen-nniḍen akken ad tebduḍ adiwenni.",
"empty_column.public": "Ulac kra da! Aru kra, neɣ ḍfeṛ imdanen i yellan deg yiqeddacen-nniḍen akken ad d-teččar tsuddemt tazayezt",
"error.unexpected_crash.next_steps": "Smiren asebter-a, ma ur yekkis ara wugur, ẓer d akken tzemreḍ ad tesqedceḍ Maṣṭudun deg yiminig-nniḍen neɣ deg usnas anaṣli.",
"errors.unexpected_crash.copy_stacktrace": "Nɣel stacktrace ɣef wafus",
@@ -183,17 +212,27 @@
"explore.suggested_follows": "Imdanen",
"explore.title": "Snirem",
"explore.trending_links": "Isallen",
- "explore.trending_statuses": "Tisuffiɣin",
+ "explore.trending_statuses": "Tisuffaɣ",
"explore.trending_tags": "Ihacṭagen",
+ "filter_modal.added.review_and_configure_title": "Iɣewwaṛen n imzizdig",
"filter_modal.added.settings_link": "asebter n yiɣewwaṛen",
+ "filter_modal.added.short_explanation": "Tasuffeɣt-a tettwarna ɣer taggayt-a n yimsizdegen: {title}.",
+ "filter_modal.select_filter.expired": "yemmut",
"filter_modal.select_filter.prompt_new": "Taggayt tamaynutt : {name}",
"filter_modal.select_filter.search": "Nadi neɣ snulfu-d",
+ "filter_modal.select_filter.title": "Sizdeg tassufeɣt-a",
+ "filter_modal.title.status": "Sizdeg tassufeɣt",
"firehose.all": "Akk",
"firehose.local": "Deg uqeddac-ayi",
+ "firehose.remote": "Iqeddacen nniḍen",
"follow_request.authorize": "Ssireg",
"follow_request.reject": "Agi",
- "footer.about": "Γef",
- "footer.directory": "Akaram n imaγnuten",
+ "follow_suggestions.dismiss": "Ur ttɛawad ara ad t-id-sekneṭ",
+ "follow_suggestions.view_all": "Wali-ten akk",
+ "follow_suggestions.who_to_follow": "Menhu ara ḍefṛeḍ",
+ "followed_tags": "Ihacṭagen yettwaḍfaren",
+ "footer.about": "Ɣef",
+ "footer.directory": "Akaram n imeɣna",
"footer.get_app": "Awi-d asnas",
"footer.invite": "Ɛreḍ-d kra n yimdanen",
"footer.keyboard_shortcuts": "Inegzumen n unasiw",
@@ -210,14 +249,30 @@
"hashtag.column_settings.tag_mode.any": "Yiwen seg-sen",
"hashtag.column_settings.tag_mode.none": "Yiwen ala seg-sen",
"hashtag.column_settings.tag_toggle": "Glu-d s yihacṭagen imerna i ujgu-agi",
+ "hashtag.counter_by_accounts": "{count, plural, one {{counter} imtekki} other {{counter} n imtekkiyen}}",
+ "hashtag.counter_by_uses": "{count, plural, one {{counter} n tsuffeɣt} other {{counter} n tsuffaɣ}}",
+ "hashtag.counter_by_uses_today": "{count, plural, one {{counter} n tsuffeɣt} other {{counter} n tsuffaɣ}} assa",
"hashtag.follow": "Ḍfeṛ ahacṭag",
- "home.column_settings.basic": "Igejdanen",
+ "hashtags.and_other": "…d {count, plural, one {}other {# nniḍen}}",
"home.column_settings.show_reblogs": "Ssken-d beṭṭu",
"home.column_settings.show_replies": "Ssken-d tiririyin",
"home.hide_announcements": "Ffer ulɣuyen",
+ "home.pending_critical_update.body": "Ma ulac aɣilif, leqqem aqeddac-ik Mastodon akken kan tzemreḍ !",
+ "home.pending_critical_update.link": "Wali ileqman",
"home.show_announcements": "Ssken-d ulɣuyen",
+ "interaction_modal.description.favourite": "S umiḍan ɣef Mastodon, tzemreḍ ad tesmenyifeḍ tasuffeɣt-a akken ad teǧǧeḍ amaru ad iẓer belli tḥemmleḍ-tt u ad tt-id-tsellkeḍ i ticki.",
+ "interaction_modal.description.follow": "S umiḍan deg Mastodon, tzemreḍ ad tḍefreḍ {name} akken ad d-teṭṭfeḍ iznan-is deg lxiḍ-ik·im agejdan.",
+ "interaction_modal.description.reblog": "S umiḍan deg Mastodon, tzemreḍ ad tesnerniḍ tasuffeɣt-a akken ad tt-tebḍuḍ d yineḍfaren-ik·im.",
+ "interaction_modal.description.reply": "S umiḍan deg Mastodon, tzemreḍ ad d-terreḍ ɣef tsuffeɣt-a.",
+ "interaction_modal.login.action": "Awi-yi ɣer uqeddac-iw",
+ "interaction_modal.login.prompt": "Taɣult n uqeddac-ik·im agejdan, amedya mastodon.social",
+ "interaction_modal.no_account_yet": "Ulac-ik·ikem deg Maṣṭudun?",
+ "interaction_modal.on_another_server": "Deg uqeddac nniḍen",
"interaction_modal.on_this_server": "Deg uqeddac-ayi",
+ "interaction_modal.sign_in": "Ur tekcimeḍ ara ɣer uqeddac-a. Anda yella umiḍan-ik·im ?",
+ "interaction_modal.sign_in_hint": "Ihi : Wa d asmel ideg tjerdeḍ. Ma ur tecfiḍ ara, nadi imayl n ummager deg tenkult-ik·im. Tzemreḍ daɣen ad d-tefkeḍ isem-ik·im n useqdac ummid ! (amedya @Mastodon@mastodon.social)",
"interaction_modal.title.follow": "Ḍfer {name}",
+ "interaction_modal.title.reply": "Tiririt i tsuffeɣt n {name}",
"intervals.full.days": "{number, plural, one {# n wass} other {# n wussan}}",
"intervals.full.hours": "{number, plural, one {# n usarag} other {# n yesragen}}",
"intervals.full.minutes": "{number, plural, one {# n tesdat} other {# n tesdatin}}",
@@ -230,6 +285,7 @@
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "i kennu ɣer wadda n tebdart",
"keyboard_shortcuts.enter": "i tildin n tsuffeɣt",
+ "keyboard_shortcuts.favourites": "Ldi tabdert n yismenyifen",
"keyboard_shortcuts.federated": "i tildin n tsuddemt tamatut n yisallen",
"keyboard_shortcuts.heading": "Inegzumen n unasiw",
"keyboard_shortcuts.home": "i tildin n tsuddemt tagejdant n yisallen",
@@ -256,8 +312,9 @@
"lightbox.close": "Mdel",
"lightbox.compress": "Ḥemmeẓ tamnaḍt n uskan n tugna",
"lightbox.expand": "Simeɣer tamnaḍt n uskan n tugna",
- "lightbox.next": "Γer zdat",
- "lightbox.previous": "Γer deffir",
+ "lightbox.next": "Ɣer zdat",
+ "lightbox.previous": "Ɣer deffir",
+ "limited_account_hint.action": "Wali amaɣnu akken yebɣu yili",
"link_preview.author": "S-ɣur {name}",
"lists.account.add": "Rnu ɣer tebdart",
"lists.account.remove": "Kkes seg tebdart",
@@ -273,45 +330,52 @@
"lists.search": "Nadi gar yemdanen i teṭṭafaṛeḍ",
"lists.subheading": "Tibdarin-ik·im",
"load_pending": "{count, plural, one {# n uferdis amaynut} other {# n yiferdisen imaynuten}}",
- "media_gallery.toggle_visible": "Ffer {number, plural, one {tugna} other {tugniwin}}",
- "mute_modal.duration": "Tanzagt",
- "mute_modal.hide_notifications": "Tebɣiḍ ad teffreḍ talɣutin n umseqdac-a?",
- "mute_modal.indefinite": "Ur yettwasbadu ara",
- "navigation_bar.about": "Γef",
- "navigation_bar.blocks": "Imseqdacen yettusḥebsen",
+ "loading_indicator.label": "Yessalay-d …",
+ "media_gallery.toggle_visible": "{number, plural, one {Ffer tugna} other {Ffer tugniwin}}",
+ "mute_modal.hide_options": "Ffer tinefrunin",
+ "mute_modal.show_options": "Sken-d tinefrunin",
+ "mute_modal.title": "Sgugem aseqdac?",
+ "navigation_bar.about": "Ɣef",
+ "navigation_bar.advanced_interface": "Ldi deg ugrudem n web leqqayen",
+ "navigation_bar.blocks": "Iseqdacen yettusḥebsen",
"navigation_bar.bookmarks": "Ticraḍ",
"navigation_bar.community_timeline": "Tasuddemt tadigant",
"navigation_bar.compose": "Aru tajewwiqt tamaynut",
"navigation_bar.discover": "Ẓer",
"navigation_bar.domain_blocks": "Tiɣula yeffren",
- "navigation_bar.edit_profile": "Ẓreg amaɣnu",
"navigation_bar.explore": "Snirem",
"navigation_bar.favourites": "Imenyafen",
"navigation_bar.filters": "Awalen i yettwasgugmen",
"navigation_bar.follow_requests": "Isuturen n teḍfeṛt",
+ "navigation_bar.followed_tags": "Ihacṭagen yettwaḍfaren",
"navigation_bar.follows_and_followers": "Imeḍfaṛen akked wid i teṭṭafaṛeḍ",
"navigation_bar.lists": "Tibdarin",
"navigation_bar.logout": "Ffeɣ",
"navigation_bar.mutes": "Iseqdacen yettwasusmen",
+ "navigation_bar.opened_in_classic_interface": "Tisuffaɣ, imiḍanen akked isebtar-nniḍen igejdanen ldin-d s wudem amezwer deg ugrudem web aklasiki.",
"navigation_bar.personal": "Udmawan",
- "navigation_bar.pins": "Tijewwiqin yettwasentḍen",
+ "navigation_bar.pins": "Tisuffaɣ yettwasenṭḍen",
"navigation_bar.preferences": "Imenyafen",
"navigation_bar.public_timeline": "Tasuddemt tazayezt tamatut",
"navigation_bar.search": "Nadi",
"navigation_bar.security": "Taɣellist",
"not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
- "notification.follow": "{name} yeṭṭafaṛ-ik",
- "notification.follow_request": "{name} yessuter-d ad k-yeḍfeṛ",
+ "notification.follow": "iṭṭafar-ik·em-id {name}",
+ "notification.follow_request": "{name} yessuter-d ad k·m-yeḍfeṛ",
"notification.mention": "{name} yebder-ik-id",
"notification.own_poll": "Tafrant-ik·im tfuk",
"notification.poll": "Tfukk tefrant ideg tettekkaḍ",
"notification.reblog": "{name} yebḍa tajewwiqt-ik i tikelt-nniḍen",
+ "notification.relationships_severance_event.learn_more": "Issin ugar",
"notification.status": "{name} akken i d-yessufeɣ",
+ "notification_requests.accept": "Qbel",
+ "notification_requests.dismiss": "Agi",
+ "notification_requests.notifications_from": "Ilɣa sɣur {name}",
"notifications.clear": "Sfeḍ tilɣa",
"notifications.clear_confirmation": "Tebɣiḍ s tidet ad tekkseḍ akk tilɣa-inek·em i lebda?",
"notifications.column_settings.alert": "Tilɣa n tnarit",
"notifications.column_settings.favourite": "Imenyafen:",
- "notifications.column_settings.filter_bar.advanced": "Ssken-d meṛṛa tiggayin",
+ "notifications.column_settings.filter_bar.advanced": "Sken-d akk taggayin",
"notifications.column_settings.filter_bar.category": "Iri n usizdeg uzrib",
"notifications.column_settings.follow": "Imeḍfaṛen imaynuten:",
"notifications.column_settings.follow_request": "Isuturen imaynuten n teḍfeṛt:",
@@ -321,7 +385,8 @@
"notifications.column_settings.reblog": "Seǧhed:",
"notifications.column_settings.show": "Ssken-d tilɣa deg ujgu",
"notifications.column_settings.sound": "Rmed imesli",
- "notifications.column_settings.status": "Tiẓenẓunin timaynutin:",
+ "notifications.column_settings.status": "Tisuffaɣ timaynutin :",
+ "notifications.column_settings.unread_notifications.category": "Ilɣa ur nettwaɣra",
"notifications.filter.all": "Akk",
"notifications.filter.boosts": "Seǧhed",
"notifications.filter.favourites": "Imenyafen",
@@ -333,25 +398,48 @@
"notifications.group": "{count} n tilɣa",
"notifications.mark_as_read": "Creḍ meṛṛa iilɣa am wakken ttwaɣran",
"notifications.permission_denied": "D awezɣi ad yili wermad n yilɣa n tnarit axateṛ turagt tettwagdel.",
+ "notifications.policy.filter_new_accounts.hint": "Imiḍanen imaynuten i d-yennulfan deg {days, plural, one {yiwen n wass} other {# n wussan}} yezrin",
+ "notifications.policy.filter_new_accounts_title": "Imiḍan imaynuten",
+ "notifications.policy.filter_not_followers_hint": "Ula d wid akked tid i k·m-id-iḍefren, ur wwiḍen ara {days, plural, one {yiwen n wass} other {# n wussan}}",
+ "notifications.policy.filter_not_followers_title": "Wid akked tid ur k·m-id-yeṭṭafaren ara",
+ "notifications.policy.filter_not_following_hint": "Alamma tqebleḍ-ten s ufus",
+ "notifications.policy.filter_not_following_title": "Wid akked tid ur tettḍafareḍ ara",
+ "notifications.policy.filter_private_mentions_title": "Abdar uslig ur yettwasferken ara",
+ "notifications.policy.title": "Sizdeg ilɣa sɣur …",
"notifications_permission_banner.enable": "Rmed talɣutin n tnarit",
"notifications_permission_banner.title": "Ur zeggel acemma",
+ "onboarding.action.back": "Tuɣalin ɣer deffir",
+ "onboarding.actions.back": "Tuɣalin ɣer deffir",
"onboarding.actions.go_to_explore": "See what's trending",
"onboarding.actions.go_to_home": "Go to your home feed",
"onboarding.compose.template": "Azul a #Mastodon!",
"onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
- "onboarding.follows.title": "Popular on Mastodon",
+ "onboarding.follows.title": "Ttwassnen deg Mastodon",
+ "onboarding.profile.display_name": "Isem ara d-yettwaskanen",
+ "onboarding.profile.note": "Tameddurt",
+ "onboarding.profile.note_hint": "Tzemreḍ ad d-@tbedreḍ imdanen niḍen neɣ #ihacṭagen …",
+ "onboarding.profile.save_and_continue": "Sekles, tkemmleḍ",
+ "onboarding.profile.title": "Asbadu n umaɣnu",
+ "onboarding.profile.upload_avatar": "Sali tugna n umaɣnu",
+ "onboarding.profile.upload_header": "Sali tacacit n umaɣnu",
+ "onboarding.share.lead": "Ini-asen i medden amek ara k·m-id-afen deg Mastodon!",
+ "onboarding.share.message": "Nekk d {username} deg #Mastodon! Ḍfer iyi-d sya {url}",
+ "onboarding.share.title": "Bḍu amaɣnu-inek·inem",
"onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
"onboarding.start.skip": "Want to skip right ahead?",
- "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
+ "onboarding.start.title": "Tseggmeḍ-tt !",
+ "onboarding.steps.follow_people.body": "Aḍfer n medden yelhan, d tikti n Mastodon.",
"onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
- "onboarding.steps.publish_status.body": "Say hello to the world.",
+ "onboarding.steps.publish_status.body": "Ini-as azul i umaḍal s uḍris, s tiwlafin, s tividyutin neɣ s tefranin {emoji}",
+ "onboarding.steps.publish_status.title": "Aru tasuffeɣt-inek·inem tamezwarutt",
"onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
"onboarding.steps.setup_profile.title": "Customize your profile",
"onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
"onboarding.steps.share_profile.title": "Share your profile",
"picture_in_picture.restore": "Err-it amkan-is",
- "poll.closed": "Ifukk",
+ "poll.closed": "Tfukk",
"poll.refresh": "Smiren",
+ "poll.reveal": "Wali igmaḍ",
"poll.total_people": "{count, plural, one {# n wemdan} other {# n yemdanen}}",
"poll.total_votes": "{count, plural, one {# n udɣaṛ} other {# n yedɣaṛen}}",
"poll.vote": "Dɣeṛ",
@@ -359,13 +447,16 @@
"poll_button.add_poll": "Rnu asenqed",
"poll_button.remove_poll": "Kkes asenqed",
"privacy.change": "Seggem tabaḍnit n yizen",
- "privacy.direct.long": "Bḍu gar yimseqdacen i tbedreḍ kan",
- "privacy.direct.short": "Direct",
- "privacy.private.long": "Bḍu i yimeḍfaṛen-ik kan",
- "privacy.private.short": "Imeḍfaṛen kan",
+ "privacy.direct.long": "Wid akk i d-yettwabdaren deg tsuffeɣt",
+ "privacy.direct.short": "Imdanen yettwafernen",
+ "privacy.private.long": "Ala wid i k·m-yeṭṭafaṛen",
+ "privacy.private.short": "Imeḍfaren",
+ "privacy.public.long": "Kra n win yellan deg Masṭudun neɣ berra-s",
"privacy.public.short": "Azayez",
- "privacy.unlisted.short": "War tabdert",
+ "privacy.unlisted.long": "Kra kan n ilguritmen",
+ "privacy_policy.last_updated": "Aleqqem aneggaru {date}",
"privacy_policy.title": "Tasertit tabaḍnit",
+ "recommended": "Yettuwelleh",
"refresh": "Smiren",
"regeneration_indicator.label": "Yessalay-d…",
"regeneration_indicator.sublabel": "Tasuddemt tagejdant ara d-tettwaheggay!",
@@ -380,24 +471,41 @@
"report.block": "Sewḥel",
"report.categories.other": "Tiyyaḍ",
"report.categories.spam": "Aspam",
- "report.category.title_account": "ameγnu",
+ "report.category.title_account": "ameɣnu",
"report.category.title_status": "tasuffeɣt",
"report.close": "Immed",
"report.forward": "Bren-it ɣeṛ {target}",
"report.mute": "Sgugem",
+ "report.next": "Uḍfiṛ",
"report.placeholder": "Iwenniten-nniḍen",
+ "report.reasons.dislike": "Ur t-ḥemmleɣ ara",
+ "report.reasons.other": "D ayen nniḍen",
"report.reasons.spam": "D aspam",
"report.submit": "Azen",
"report.target": "Mmel {target}",
+ "report.thanks.title": "Ur tebɣiḍ ara ad twaliḍ aya?",
"report.unfollow": "Seḥbes aḍfar n @{name}",
"report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
"report_notification.categories.other": "Ayen nniḍen",
"report_notification.categories.spam": "Aspam",
"report_notification.open": "Ldi aneqqis",
+ "search.no_recent_searches": "Ulac inadiyen ineggura",
"search.placeholder": "Nadi",
+ "search.quick_action.account_search": "Imaɣnuten mṣadan d {x}",
+ "search.quick_action.go_to_account": "Ddu ɣer umaɣnu {x}",
+ "search.quick_action.go_to_hashtag": "Ddu ɣer uhacṭag {x}",
+ "search.quick_action.open_url": "Ldi tansa URL deg Mastodon",
+ "search.quick_action.status_search": "Tisuffaɣ mṣadan d {x}",
"search.search_or_paste": "Nadi neɣ senṭeḍ URL",
+ "search_popout.full_text_search_disabled_message": "Ur yelli ara deg {domain}.",
+ "search_popout.language_code": "Tangalt ISO n tutlayt",
+ "search_popout.options": "Iwellihen n unadi",
+ "search_popout.recent": "Inadiyen ineggura",
+ "search_popout.user": "amseqdac",
+ "search_results.accounts": "Imeɣna",
"search_results.all": "Akk",
"search_results.hashtags": "Ihacṭagen",
+ "search_results.see_all": "Wali-ten akk",
"search_results.statuses": "Tisuffaɣ",
"search_results.title": "Anadi ɣef {q}",
"server_banner.administered_by": "Yettwadbel sɣur :",
@@ -413,12 +521,13 @@
"status.copy": "Nɣel assaɣ ɣer tasuffeɣt",
"status.delete": "Kkes",
"status.edit": "Ẓreg",
- "status.edited": "Tettwaẓreg deg {date}",
"status.edited_x_times": "Tettwaẓreg {count, plural, one {{count} n tikkelt} other {{count} n tikkal}}",
"status.embed": "Seddu",
+ "status.filter": "Sizdeg tassufeɣt-a",
"status.filtered": "Yettwasizdeg",
+ "status.hide": "Ffer tasuffeɣt",
"status.load_more": "Sali ugar",
- "status.media_hidden": "Taɣwalt tettwaffer",
+ "status.media_hidden": "Amidya yettwaffer",
"status.mention": "Bder-d @{name}",
"status.more": "Ugar",
"status.mute": "Sussem @{name}",
@@ -432,13 +541,15 @@
"status.reblogs.empty": "Ula yiwen ur yebḍi tajewwiqt-agi ar tura. Ticki yebḍa-tt yiwen, ad d-iban da.",
"status.redraft": "Kkes tɛiwdeḍ tira",
"status.remove_bookmark": "Kkes tacreḍt",
+ "status.replied_to": "Y·terra-yas i {name}",
"status.reply": "Err",
"status.replyAll": "Err i lxiḍ",
"status.report": "Cetki ɣef @{name}",
"status.sensitive_warning": "Agbur amḥulfu",
"status.share": "Bḍu",
+ "status.show_filter_reason": "Ssken-d akken yebɣu yili",
"status.show_less": "Ssken-d drus",
- "status.show_less_all": "Semẓi akk tisuffγin",
+ "status.show_less_all": "Semẓi akk tisuffɣin",
"status.show_more": "Ssken-d ugar",
"status.show_more_all": "Ẓerr ugar lebda",
"status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
@@ -457,8 +568,8 @@
"timeline_hint.remote_resource_not_displayed": "{resource} seg yiqeddacen-nniḍen ur d-ttwaskanent ara.",
"timeline_hint.resources.followers": "Imeḍfaṛen",
"timeline_hint.resources.follows": "T·Yeṭafaṛ",
- "timeline_hint.resources.statuses": "Tijewwaqin tiqdimin",
- "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
+ "timeline_hint.resources.statuses": "Tisuffaɣ tiqdimin",
+ "trends.counter_by_accounts": "{count, plural, one {{counter} n wemdan} other {{counter} n medden}} deg {days, plural, one {ass} other {{days} n wussan}} iɛeddan",
"trends.trending_now": "Ayen mucaɛen tura",
"ui.beforeunload": "Arewway-ik·im ad iruḥ ma yella tefeɣ-d deg Maṣṭudun.",
"units.short.billion": "{count}B",
@@ -472,17 +583,17 @@
"upload_form.description": "Glem-d i yemdaneni yesɛan ugur deg yiẓri",
"upload_form.edit": "Ẓreg",
"upload_form.thumbnail": "Beddel tugna",
- "upload_form.undo": "Kkes",
"upload_form.video_description": "Glem-d i yemdanen i yesɛan ugur deg tmesliwt neɣ deg yiẓri",
"upload_modal.analyzing_picture": "Tasleḍt n tugna tetteddu…",
"upload_modal.apply": "Snes",
"upload_modal.choose_image": "Fren tugna",
"upload_modal.description_placeholder": "Aberraɣ arurad ineggez nnig n uqjun amuṭṭis",
"upload_modal.detect_text": "Sefru-d aḍris seg tugna",
- "upload_modal.edit_media": "Ẓreg taɣwalt",
+ "upload_modal.edit_media": "Ẓreg amidya",
"upload_modal.preparing_ocr": "Aheyyi n OCR…",
"upload_modal.preview_label": "Taskant ({ratio})",
"upload_progress.label": "Asali iteddu...",
+ "username.taken": "Yettwaṭṭef yisem-a n useqdac. Ɛreḍ wayeḍ",
"video.close": "Mdel tabidyutt",
"video.download": "Sidered afaylu",
"video.exit_fullscreen": "Ffeɣ seg ugdil ačuran",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index 97b1991803272c..bd0a806cdb9abe 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -64,7 +64,6 @@
"alert.unexpected.message": "Бір нәрсе дұрыс болмады.",
"alert.unexpected.title": "Өй!",
"announcement.announcement": "Хабарландыру",
- "autosuggest_hashtag.per_week": "{count} аптасына",
"boost_modal.combo": "Келесіде өткізіп жіберу үшін басыңыз {combo}",
"bundle_column_error.retry": "Қайтадан көріңіз",
"bundle_modal_error.close": "Жабу",
@@ -99,34 +98,22 @@
"compose_form.lock_disclaimer": "Аккаунтыңыз {locked} емес. Кез келген адам жазылып, сізді оқи алады.",
"compose_form.lock_disclaimer.lock": "жабық",
"compose_form.placeholder": "Не бөліскіңіз келеді?",
- "compose_form.poll.add_option": "Жауап қос",
"compose_form.poll.duration": "Сауалнама мерзімі",
- "compose_form.poll.option_placeholder": "Жауап {number}",
- "compose_form.poll.remove_option": "Бұл жауапты өшір",
"compose_form.poll.switch_to_multiple": "Бірнеше жауап таңдайтындай қылу",
"compose_form.poll.switch_to_single": "Тек бір жауап таңдайтындай қылу",
"compose_form.publish_form": "Publish",
- "compose_form.sensitive.hide": "Сезімтал ретінде белгіле",
- "compose_form.sensitive.marked": "Медиа нәзік деп белгіленген",
- "compose_form.sensitive.unmarked": "Медиа нәзік деп белгіленбеген",
"compose_form.spoiler.marked": "Мәтін ескертумен жасырылған",
"compose_form.spoiler.unmarked": "Мәтін жасырылмаған",
- "compose_form.spoiler_placeholder": "Ескертуіңізді осында жазыңыз",
"confirmation_modal.cancel": "Қайтып алу",
- "confirmations.block.block_and_report": "Блок және Шағым",
"confirmations.block.confirm": "Бұғаттау",
- "confirmations.block.message": "{name} атты қолданушыны бұғаттайтыныңызға сенімдісіз бе?",
"confirmations.delete.confirm": "Өшіру",
"confirmations.delete.message": "Бұл жазбаны өшіресіз бе?",
"confirmations.delete_list.confirm": "Өшіру",
"confirmations.delete_list.message": "Бұл тізімді жоясыз ба шынымен?",
- "confirmations.domain_block.confirm": "Бұл доменді бұғатта",
"confirmations.domain_block.message": "Бұл домендегі {domain} жазбаларды шынымен бұғаттайсыз ба? Кейде үнсіз қылып тастау да жеткілікті.",
"confirmations.logout.confirm": "Шығу",
"confirmations.logout.message": "Шығатыныңызға сенімдісіз бе?",
"confirmations.mute.confirm": "Үнсіз қылу",
- "confirmations.mute.explanation": "Олардың посттары же олар туралы меншндар сізге көрінбейді, бірақ олар сіздің посттарды көре алады және жазыла алады.",
- "confirmations.mute.message": "{name} атты қолданушы үнсіз болсын ба?",
"confirmations.redraft.confirm": "Өшіруді құптау",
"confirmations.reply.confirm": "Жауап",
"confirmations.reply.message": "Жауабыңыз жазып жатқан жазбаңыздың үстіне кетеді. Жалғастырамыз ба?",
@@ -189,7 +176,6 @@
"hashtag.column_settings.tag_mode.any": "Осылардың біреуін",
"hashtag.column_settings.tag_mode.none": "Бұлардың ешқайсысын",
"hashtag.column_settings.tag_toggle": "Осы бағанға қосымша тегтерді қосыңыз",
- "home.column_settings.basic": "Негізгі",
"home.column_settings.show_reblogs": "Бөлісулерді көрсету",
"home.column_settings.show_replies": "Жауаптарды көрсету",
"home.hide_announcements": "Анонстарды жасыр",
@@ -243,14 +229,12 @@
"lists.subheading": "Тізімдеріңіз",
"load_pending": "{count, plural, one {# жаңа нәрсе} other {# жаңа нәрсе}}",
"media_gallery.toggle_visible": "Көрінуді қосу",
- "mute_modal.hide_notifications": "Бұл қолданушы ескертпелерін жасырамыз ба?",
"navigation_bar.blocks": "Бұғатталғандар",
"navigation_bar.bookmarks": "Бетбелгілер",
"navigation_bar.community_timeline": "Жергілікті желі",
"navigation_bar.compose": "Жаңа жазба бастау",
"navigation_bar.discover": "шарлау",
"navigation_bar.domain_blocks": "Жабық домендер",
- "navigation_bar.edit_profile": "Профиль түзету",
"navigation_bar.filters": "Үнсіз сөздер",
"navigation_bar.follow_requests": "Жазылуға сұранғандар",
"navigation_bar.follows_and_followers": "Жазылымдар және оқырмандар",
@@ -272,8 +256,6 @@
"notifications.clear": "Ескертпелерді тазарт",
"notifications.clear_confirmation": "Шынымен барлық ескертпелерді өшіресіз бе?",
"notifications.column_settings.alert": "Үстел ескертпелері",
- "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": "Аталымдар:",
@@ -311,12 +293,7 @@
"poll_button.add_poll": "Сауалнама қосу",
"poll_button.remove_poll": "Сауалнаманы өшіру",
"privacy.change": "Құпиялылықты реттеу",
- "privacy.direct.long": "Аталған адамдарға ғана көрінетін жазба",
- "privacy.direct.short": "Direct",
- "privacy.private.long": "Тек оқырмандарға арналған жазба",
- "privacy.private.short": "Followers-only",
"privacy.public.short": "Ашық",
- "privacy.unlisted.short": "Тізімсіз",
"refresh": "Жаңарту",
"regeneration_indicator.label": "Жүктеу…",
"regeneration_indicator.sublabel": "Жергілікті желі құрылуда!",
@@ -399,7 +376,6 @@
"upload_form.description": "Көру қабілеті нашар адамдар үшін сипаттаңыз",
"upload_form.edit": "Түзету",
"upload_form.thumbnail": "Суретті өзгерту",
- "upload_form.undo": "Өшіру",
"upload_form.video_description": "Есту немесе көру қабілеті нашар адамдарға сипаттама беріңіз",
"upload_modal.analyzing_picture": "Суретті анализ жасау…",
"upload_modal.apply": "Қолдану",
diff --git a/app/javascript/mastodon/locales/kn.json b/app/javascript/mastodon/locales/kn.json
index 473690070fcbe2..ceb0f8b9b6139b 100644
--- a/app/javascript/mastodon/locales/kn.json
+++ b/app/javascript/mastodon/locales/kn.json
@@ -31,7 +31,6 @@
"compose_form.spoiler.marked": "Text is hidden behind warning",
"compose_form.spoiler.unmarked": "Text is not hidden",
"confirmations.delete.message": "Are you sure you want to delete this status?",
- "confirmations.domain_block.confirm": "Hide entire domain",
"dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
"dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
"embed.instructions": "Embed this status on your website by copying the code below.",
@@ -91,10 +90,6 @@
"onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
"onboarding.steps.share_profile.title": "Share your profile",
"privacy.change": "Adjust status privacy",
- "privacy.direct.long": "Post to mentioned users only",
- "privacy.direct.short": "Direct",
- "privacy.private.long": "Post to followers only",
- "privacy.private.short": "Followers-only",
"report.placeholder": "Type or paste additional comments",
"report.submit": "Submit report",
"report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 70ce6611d62b83..7cd74fa5017e5c 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -68,7 +68,7 @@
"account.unblock_domain": "도메인 {domain} 차단 해제",
"account.unblock_short": "차단 해제",
"account.unendorse": "프로필에 추천하지 않기",
- "account.unfollow": "팔로우 해제",
+ "account.unfollow": "언팔로우",
"account.unmute": "@{name} 뮤트 해제",
"account.unmute_notifications_short": "알림 뮤트 해제",
"account.unmute_short": "뮤트 해제",
@@ -89,7 +89,14 @@
"announcement.announcement": "공지사항",
"attachments_list.unprocessed": "(처리 안 됨)",
"audio.hide": "소리 숨기기",
- "autosuggest_hashtag.per_week": "주간 {count}회",
+ "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": "요청한 페이지를 렌더링 할 수 없습니다. 저희의 코드에 버그가 있거나, 브라우저 호환성 문제일 수 있습니다.",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "이 계정은 {locked}상태가 아닙니다. 누구나 이 계정을 팔로우 하여 팔로워 전용의 게시물을 볼 수 있습니다.",
"compose_form.lock_disclaimer.lock": "비공개",
"compose_form.placeholder": "지금 무슨 생각을 하고 있나요?",
- "compose_form.poll.add_option": "항목 추가",
"compose_form.poll.duration": "투표 기간",
- "compose_form.poll.option_placeholder": "{number}번 항목",
- "compose_form.poll.remove_option": "이 항목 삭제",
+ "compose_form.poll.multiple": "다중 선택",
+ "compose_form.poll.option_placeholder": "{option}번째 항목",
+ "compose_form.poll.single": "단일 선택",
"compose_form.poll.switch_to_multiple": "다중 선택이 가능한 투표로 변경",
"compose_form.poll.switch_to_single": "단일 선택 투표로 변경",
+ "compose_form.poll.type": "형식",
"compose_form.publish": "게시",
"compose_form.publish_form": "새 게시물",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "변경사항 저장",
- "compose_form.sensitive.hide": "미디어를 민감함으로 설정하기",
- "compose_form.sensitive.marked": "미디어가 열람주의로 설정되어 있습니다",
- "compose_form.sensitive.unmarked": "미디어가 열람주의로 설정 되어 있지 않습니다",
+ "compose_form.reply": "답장",
+ "compose_form.save_changes": "수정",
"compose_form.spoiler.marked": "열람주의 제거",
"compose_form.spoiler.unmarked": "열람 주의 문구 추가",
- "compose_form.spoiler_placeholder": "경고 문구를 여기에 작성하세요",
+ "compose_form.spoiler_placeholder": "내용 경고 (선택사항)",
"confirmation_modal.cancel": "취소",
- "confirmations.block.block_and_report": "차단하고 신고하기",
"confirmations.block.confirm": "차단",
- "confirmations.block.message": "정말로 {name}를 차단하시겠습니까?",
"confirmations.cancel_follow_request.confirm": "요청 삭제",
"confirmations.cancel_follow_request.message": "정말 {name}님에 대한 팔로우 요청을 취소하시겠습니까?",
"confirmations.delete.confirm": "삭제",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "정말로 이 리스트를 영구적으로 삭제하시겠습니까?",
"confirmations.discard_edit_media.confirm": "저장 안함",
"confirmations.discard_edit_media.message": "미디어 설명이나 미리보기에 대한 저장하지 않은 변경사항이 있습니다. 버리시겠습니까?",
- "confirmations.domain_block.confirm": "도메인 전체를 차단",
+ "confirmations.domain_block.confirm": "서버 차단",
"confirmations.domain_block.message": "정말로 {domain} 전체를 차단하시겠습니까? 대부분의 경우 개별 차단이나 뮤트로 충분합니다. 모든 공개 타임라인과 알림에서 해당 도메인에서 작성된 콘텐츠를 보지 못합니다. 해당 도메인에 속한 팔로워와의 관계가 사라집니다.",
"confirmations.edit.confirm": "수정",
"confirmations.edit.message": "지금 편집하면 작성 중인 메시지를 덮어씁니다. 진행이 확실한가요?",
"confirmations.logout.confirm": "로그아웃",
"confirmations.logout.message": "정말로 로그아웃 하시겠습니까?",
"confirmations.mute.confirm": "뮤트",
- "confirmations.mute.explanation": "이 동작은 해당 계정의 게시물과 해당 계정을 멘션하는 게시물을 숨깁니다, 하지만 여전히 해당 계정이 당신의 게시물을 보고 팔로우 할 수 있습니다.",
- "confirmations.mute.message": "정말로 {name} 님을 뮤트하시겠습니까?",
"confirmations.redraft.confirm": "삭제하고 다시 쓰기",
"confirmations.redraft.message": "정말로 이 게시물을 삭제하고 다시 쓰시겠습니까? 해당 게시물에 대한 부스트와 좋아요를 잃게 되고 원본에 대한 답장은 연결 되지 않습니다.",
"confirmations.reply.confirm": "답글",
@@ -208,14 +209,35 @@
"dismissable_banner.explore_statuses": "이 게시물들은 오늘 소셜 웹에서 호응을 얻고 있는 게시물들입니다. 부스트와 관심을 받는 새로운 글들이 높은 순위가 됩니다.",
"dismissable_banner.explore_tags": "이 해시태그들은 이 서버와 분산화된 네트워크의 다른 서버에서 사람들의 인기를 끌고 있는 것들입니다.",
"dismissable_banner.public_timeline": "이것들은 {domain}에 있는 사람들이 팔로우한 사람들의 최신 공개 게시물들입니다.",
+ "domain_block_modal.block": "서버 차단",
+ "domain_block_modal.block_account_instead": "대신 @{name}를 차단",
+ "domain_block_modal.they_can_interact_with_old_posts": "이 서버에 있는 사람들이 내 예전 게시물에 상호작용할 수는 있습니다.",
+ "domain_block_modal.they_cant_follow": "이 서버의 누구도 나를 팔로우 할 수 없습니다.",
+ "domain_block_modal.they_wont_know": "내가 차단했다는 사실을 모를 것입니다.",
+ "domain_block_modal.title": "도메인을 차단할까요?",
+ "domain_block_modal.you_will_lose_followers": "이 서버에 있는 팔로워들이 모두 제거될 것입니다.",
+ "domain_block_modal.you_wont_see_posts": "이 서버 사용자의 게시물이나 알림을 보지 않게 됩니다.",
+ "domain_pill.activitypub_lets_connect": "이것은 마스토돈 뿐만이 아니라 다른 소셜 앱들을 넘나들며 사람들을 연결하고 상호작용 할 수 있게 합니다.",
+ "domain_pill.activitypub_like_language": "액티비티펍은 마스토돈이 다른 소셜 네트워크와 대화할 때 쓰는 언어 같은 것입니다.",
+ "domain_pill.server": "서버",
+ "domain_pill.their_handle": "이 사람의 핸들:",
+ "domain_pill.their_server": "그의 게시물이 살고 있는 디지털 거처입니다.",
+ "domain_pill.their_username": "그의 서버에서 유일한 식별자입니다. 다른 서버에서 같은 사용자명을 가진 사용자를 찾을 수도 있습니다.",
+ "domain_pill.username": "사용자명",
+ "domain_pill.whats_in_a_handle": "핸들엔 무엇이 담겨 있나요?",
+ "domain_pill.who_they_are": "핸들은 어디에 있는 누구인지를 나타내기 때문에 들의 소셜 웹을 넘나들며 사람들과 상호작용 할 수 있습니다.",
+ "domain_pill.who_you_are": "내 핸들은 내가 어디에 있는 누군지 나타내기 때문에 사람들은 을 통해 소셜 웹을 넘나들며 나와 상호작용 할 수 있습니다.",
+ "domain_pill.your_handle": "내 핸들:",
+ "domain_pill.your_server": "내 게시물들이 살고 있는 나의 디지털 거처입니다. 마음에 들지 않나요? 팔로워를 데리고 언제든지 다른 서버로 거처를 옮길 수도 있습니다.",
+ "domain_pill.your_username": "이 서버에서 유일한 내 식별자입니다. 다른 서버에서 같은 사용자명을 가진 사용자를 찾을 수도 있습니다.",
"embed.instructions": "아래의 코드를 복사하여 대화를 원하는 곳으로 공유하세요.",
"embed.preview": "이렇게 표시됩니다:",
"emoji_button.activity": "활동",
"emoji_button.clear": "지우기",
- "emoji_button.custom": "사용자 지정",
+ "emoji_button.custom": "커스텀",
"emoji_button.flags": "깃발",
"emoji_button.food": "음식과 마실것",
- "emoji_button.label": "에모지를 추가",
+ "emoji_button.label": "에모지 추가",
"emoji_button.nature": "자연",
"emoji_button.not_found": "해당하는 에모지가 없습니다",
"emoji_button.objects": "물건",
@@ -244,6 +266,7 @@
"empty_column.list": "리스트에 아직 아무것도 없습니다. 리스트의 누군가가 게시물을 올리면 여기에 나타납니다.",
"empty_column.lists": "아직 리스트가 없습니다. 리스트를 만들면 여기에 나타납니다.",
"empty_column.mutes": "아직 아무도 뮤트하지 않았습니다.",
+ "empty_column.notification_requests": "깔끔합니다! 여기엔 아무 것도 없습니다. 알림을 받게 되면 설정에 따라 여기에 나타나게 됩니다.",
"empty_column.notifications": "아직 알림이 없습니다. 다른 사람들이 당신에게 반응했을 때, 여기에서 볼 수 있습니다.",
"empty_column.public": "여기엔 아직 아무 것도 없습니다! 공개적으로 무언가 포스팅하거나, 다른 서버의 사용자를 팔로우 해서 채워보세요",
"error.unexpected_crash.explanation": "버그 혹은 브라우저 호환성 문제로 이 페이지를 올바르게 표시할 수 없습니다.",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "기존의 카테고리를 사용하거나 새로 하나를 만듧니다",
"filter_modal.select_filter.title": "이 게시물을 필터",
"filter_modal.title.status": "게시물 필터",
+ "filtered_notifications_banner.mentions": "{count, plural, other {멘션}}",
+ "filtered_notifications_banner.pending_requests": "알 수도 있는 {count, plural, =0 {0 명} one {한 명} other {# 명}}의 사람들로부터의 알림",
+ "filtered_notifications_banner.title": "걸러진 알림",
"firehose.all": "모두",
"firehose.local": "이 서버",
"firehose.remote": "다른 서버",
- "follow_request.authorize": "허가",
+ "follow_request.authorize": "승인",
"follow_request.reject": "거부",
"follow_requests.unlocked_explanation": "귀하의 계정이 잠긴 계정이 아닐지라도, {domain} 스태프는 이 계정들의 팔로우 요청을 수동으로 처리해 주시면 좋겠다고 생각했습니다.",
+ "follow_suggestions.curated_suggestion": "스태프의 추천",
+ "follow_suggestions.dismiss": "다시 보지 않기",
+ "follow_suggestions.featured_longer": "{domain} 팀이 손수 고름",
+ "follow_suggestions.friends_of_friends_longer": "내가 팔로우 하는 사람들 사이에서 인기",
+ "follow_suggestions.hints.featured": "이 프로필은 {domain} 팀이 손수 선택했습니다.",
+ "follow_suggestions.hints.friends_of_friends": "이 프로필은 내가 팔로우 하는 사람들에게서 유명합니다.",
+ "follow_suggestions.hints.most_followed": "이 프로필은 {domain}에서 가장 많이 팔로우 된 사람들 중 하나입니다.",
+ "follow_suggestions.hints.most_interactions": "이 프로필은 최근 {domain}에서 많은 관심을 받았습니다.",
+ "follow_suggestions.hints.similar_to_recently_followed": "이 프로필은 내가 최근에 팔로우 한 프로필들과 유사합니다.",
+ "follow_suggestions.personalized_suggestion": "개인화된 추천",
+ "follow_suggestions.popular_suggestion": "인기있는 추천",
+ "follow_suggestions.popular_suggestion_longer": "{domain}에서 인기",
+ "follow_suggestions.similar_to_recently_followed_longer": "내가 최근에 팔로우 한 프로필들과 유사",
+ "follow_suggestions.view_all": "모두 보기",
+ "follow_suggestions.who_to_follow": "팔로우할 만한 사람",
"followed_tags": "팔로우 중인 해시태그",
"footer.about": "정보",
"footer.directory": "프로필 책자",
@@ -306,13 +347,8 @@
"hashtag.follow": "팔로우",
"hashtag.unfollow": "팔로우 해제",
"hashtags.and_other": "…그리고 {count, plural,other {#개 더}}",
- "home.actions.go_to_explore": "무엇이 유행인지 보기",
- "home.actions.go_to_suggestions": "팔로우할 사람 찾기",
- "home.column_settings.basic": "기본",
"home.column_settings.show_reblogs": "부스트 표시",
"home.column_settings.show_replies": "답글 표시",
- "home.explore_prompt.body": "홈 피드에는 내가 팔로우한 해시태그 그리고 팔로우한 사람과 부스트가 함께 나타납니다. 너무 고요하게 느껴진다면, 다음 것들을 살펴볼 수 있습니다.",
- "home.explore_prompt.title": "이곳은 마스토돈의 내 본거지입니다.",
"home.hide_announcements": "공지사항 숨기기",
"home.pending_critical_update.body": "서둘러 마스토돈 서버를 업데이트 하세요!",
"home.pending_critical_update.link": "업데이트 보기",
@@ -378,6 +414,7 @@
"limited_account_hint.action": "그래도 프로필 보기",
"limited_account_hint.title": "이 프로필은 {domain}의 중재자에 의해 숨겨진 상태입니다.",
"link_preview.author": "{name}",
+ "link_preview.more_from_author": "{name} 더 둘러보기",
"lists.account.add": "리스트에 추가",
"lists.account.remove": "리스트에서 제거",
"lists.delete": "리스트 삭제",
@@ -396,9 +433,15 @@
"loading_indicator.label": "불러오는 중...",
"media_gallery.toggle_visible": "이미지 숨기기",
"moved_to_account_banner.text": "당신의 계정 {disabledAccount}는 {movedToAccount}로 이동하였기 때문에 현재 비활성화 상태입니다.",
- "mute_modal.duration": "기간",
- "mute_modal.hide_notifications": "이 사용자로부터의 알림을 숨기시겠습니까?",
- "mute_modal.indefinite": "무기한",
+ "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": "차단한 사용자",
@@ -408,7 +451,6 @@
"navigation_bar.direct": "개인적인 멘션",
"navigation_bar.discover": "발견하기",
"navigation_bar.domain_blocks": "차단한 도메인",
- "navigation_bar.edit_profile": "프로필 수정",
"navigation_bar.explore": "둘러보기",
"navigation_bar.favourites": "좋아요",
"navigation_bar.filters": "뮤트한 단어",
@@ -432,20 +474,37 @@
"notification.follow": "{name} 님이 나를 팔로우했습니다",
"notification.follow_request": "{name} 님이 팔로우 요청을 보냈습니다",
"notification.mention": "{name} 님의 멘션",
+ "notification.moderation-warning.learn_more": "더 알아보기",
+ "notification.moderation_warning": "중재 경고를 받았습니다",
+ "notification.moderation_warning.action_delete_statuses": "게시물 몇 개가 삭제되었습니다.",
+ "notification.moderation_warning.action_disable": "계정이 비활성화되었습니다.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "게시물 몇 개가 민감함 처리되었습니다.",
+ "notification.moderation_warning.action_none": "계정에 중재 경고를 받았습니다.",
+ "notification.moderation_warning.action_sensitive": "앞으로의 게시물을 민감한 것으로 표시됩니다.",
+ "notification.moderation_warning.action_silence": "계정이 제한되었습니다.",
+ "notification.moderation_warning.action_suspend": "계정이 정지되었습니다.",
"notification.own_poll": "설문을 마침",
"notification.poll": "참여한 설문이 종료됨",
"notification.reblog": "{name} 님이 부스트했습니다",
+ "notification.relationships_severance_event": "{name} 님과의 연결이 끊어졌습니다",
+ "notification.relationships_severance_event.account_suspension": "{from}의 관리자가 {target}를 정지시켰기 때문에 그들과 더이상 상호작용 할 수 없고 정보를 받아볼 수 없습니다.",
+ "notification.relationships_severance_event.domain_block": "{from}의 관리자가 {target}를 차단하였고 여기에는 나의 {followersCount} 명의 팔로워와 {followingCount, plural, other {#}} 명의 팔로우가 포함되었습니다.",
+ "notification.relationships_severance_event.learn_more": "더 알아보기",
+ "notification.relationships_severance_event.user_domain_block": "내가 {target}를 차단하여 {followersCount} 명의 팔로워와 {followingCount, plural, other {#}} 명의 팔로우가 제거되었습니다.",
"notification.status": "{name} 님이 방금 게시물을 올렸습니다",
"notification.update": "{name} 님이 게시물을 수정했습니다",
+ "notification_requests.accept": "수락",
+ "notification_requests.dismiss": "지우기",
+ "notification_requests.notifications_from": "{name} 님으로부터의 알림",
+ "notification_requests.title": "걸러진 알림",
"notifications.clear": "알림 비우기",
"notifications.clear_confirmation": "정말로 알림을 삭제하시겠습니까?",
"notifications.column_settings.admin.report": "새 신고:",
"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.advanced": "모든 범주 표시",
"notifications.column_settings.filter_bar.category": "빠른 필터 막대",
- "notifications.column_settings.filter_bar.show_bar": "필터 막대 보이기",
"notifications.column_settings.follow": "새 팔로워:",
"notifications.column_settings.follow_request": "새 팔로우 요청:",
"notifications.column_settings.mention": "멘션:",
@@ -471,6 +530,15 @@
"notifications.permission_denied": "권한이 거부되었기 때문에 데스크탑 알림을 활성화할 수 없음",
"notifications.permission_denied_alert": "이전에 브라우저 권한이 거부되었기 때문에, 데스크탑 알림이 활성화 될 수 없습니다.",
"notifications.permission_required": "필요한 권한이 승인되지 않아 데스크탑 알림을 사용할 수 없습니다.",
+ "notifications.policy.filter_new_accounts.hint": "{days, plural, one {하루} other {#일}} 안에 만들어진",
+ "notifications.policy.filter_new_accounts_title": "새 계정",
+ "notifications.policy.filter_not_followers_hint": "나를 팔로우 한 지 {days, plural, other {# 일}}이 되지 않은 사람들을 포함",
+ "notifications.policy.filter_not_followers_title": "나를 팔로우하지 않는 사람들",
+ "notifications.policy.filter_not_following_hint": "내가 수동으로 승인하지 않는 한",
+ "notifications.policy.filter_not_following_title": "내가 팔로우하지 않는 사람들",
+ "notifications.policy.filter_private_mentions_hint": "내가 한 멘션에 단 답글이거나 내가 발신자를 팔로우 한 것이 아닌 이상 걸러집니다",
+ "notifications.policy.filter_private_mentions_title": "청하지 않은 개인적인 멘션",
+ "notifications.policy.title": "알림을 제외할 조건들…",
"notifications_permission_banner.enable": "데스크탑 알림 활성화",
"notifications_permission_banner.how_to_control": "마스토돈이 열려 있지 않을 때에도 알림을 받으려면, 데스크탑 알림을 활성화 하세요. 당신은 어떤 종류의 반응이 데스크탑 알림을 발생할 지를 {icon} 버튼을 통해 세세하게 설정할 수 있습니다.",
"notifications_permission_banner.title": "아무것도 놓치지 마세요",
@@ -479,7 +547,7 @@
"onboarding.actions.go_to_explore": "무엇이 유행인지 보러 가기",
"onboarding.actions.go_to_home": "홈 피드로 가기",
"onboarding.compose.template": "안녕 #마스토돈!",
- "onboarding.follows.empty": "안타깝지만 아직은 아무 것도 보여드릴 수 없습니다. 검색을 이용하거나 발견하기 페이지에서 팔로우 할 사람을 찾을 수 있습니다. 아니면 잠시 후에 다시 시도하세요.",
+ "onboarding.follows.empty": "안타깝지만 아직은 아무 것도 보여드릴 수 없습니다. 검색을 이용하거나 둘러보기 페이지에서 팔로우 할 사람을 찾을 수 있습니다. 아니면 잠시 후에 다시 시도하세요.",
"onboarding.follows.lead": "홈 피드는 마스토돈을 경험하는 주된 경로입니다. 더 많은 사람들을 팔로우 할수록 더 활발하고 흥미로워질 것입니다. 여기 시작을 위한 몇몇 추천을 드립니다:",
"onboarding.follows.title": "내게 맞는 홈 피드 꾸미기",
"onboarding.profile.discoverable": "내 프로필을 발견 가능하도록 설정",
@@ -526,14 +594,15 @@
"poll_button.add_poll": "설문 추가",
"poll_button.remove_poll": "설문 제거",
"privacy.change": "게시물의 프라이버시 설정을 변경",
- "privacy.direct.long": "언급된 사용자만 볼 수 있음",
- "privacy.direct.short": "멘션한 사람들만",
- "privacy.private.long": "팔로워에게만 공개",
- "privacy.private.short": "팔로워 전용",
- "privacy.public.long": "모두가 볼 수 있음",
+ "privacy.direct.long": "이 게시물에서 언급된 모두",
+ "privacy.direct.short": "특정 인물",
+ "privacy.private.long": "내 팔로워만",
+ "privacy.private.short": "팔로워",
+ "privacy.public.long": "마스토돈 내외 모두",
"privacy.public.short": "공개",
- "privacy.unlisted.long": "모두가 볼 수 있지만, 발견하기 기능에서는 제외됨",
- "privacy.unlisted.short": "미등재",
+ "privacy.unlisted.additional": "공개와 똑같지만 게시물이 실시간 피드나 해시태그, 둘러보기, (계정 설정에서 허용했더라도) 마스토돈 검색에서 제외됩니다.",
+ "privacy.unlisted.long": "더 적은 알고리즘 팡파르",
+ "privacy.unlisted.short": "조용한 공개",
"privacy_policy.last_updated": "{date}에 마지막으로 업데이트됨",
"privacy_policy.title": "개인정보처리방침",
"recommended": "추천함",
@@ -551,7 +620,9 @@
"relative_time.minutes": "{number}분 전",
"relative_time.seconds": "{number}초 전",
"relative_time.today": "오늘",
+ "reply_indicator.attachments": "{count, plural, one {#} other {#}}개의 첨부파일",
"reply_indicator.cancel": "취소",
+ "reply_indicator.poll": "투표",
"report.block": "차단",
"report.block_explanation": "당신은 해당 계정의 게시물을 보지 않게 됩니다. 해당 계정은 당신의 게시물을 보거나 팔로우 할 수 없습니다. 해당 계정은 자신이 차단되었다는 사실을 알 수 있습니다.",
"report.categories.legal": "법적인 문제",
@@ -644,10 +715,11 @@
"status.direct": "@{name} 님에게 개인적으로 멘션",
"status.direct_indicator": "개인적인 멘션",
"status.edit": "수정",
- "status.edited": "{date}에 수정함",
+ "status.edited": "{date}에 마지막으로 편집됨",
"status.edited_x_times": "{count}번 수정됨",
"status.embed": "임베드",
"status.favourite": "좋아요",
+ "status.favourites": "{count, plural, other {좋아요}}",
"status.filter": "이 게시물을 필터",
"status.filtered": "필터로 걸러짐",
"status.hide": "게시물 숨기기",
@@ -668,6 +740,7 @@
"status.reblog": "부스트",
"status.reblog_private": "원래의 수신자들에게 부스트",
"status.reblogged_by": "{name} 님이 부스트했습니다",
+ "status.reblogs": "{count, plural, other {부스트}}",
"status.reblogs.empty": "아직 아무도 이 게시물을 부스트하지 않았습니다. 부스트 한 사람들이 여기에 표시 됩니다.",
"status.redraft": "지우고 다시 쓰기",
"status.remove_bookmark": "북마크 삭제",
@@ -715,10 +788,8 @@
"upload_error.poll": "파일 업로드는 설문과 함께 쓸 수 없습니다.",
"upload_form.audio_description": "청각 장애인을 위한 설명",
"upload_form.description": "시각장애인을 위한 설명",
- "upload_form.description_missing": "설명이 추가되지 않음",
"upload_form.edit": "수정",
"upload_form.thumbnail": "썸네일 변경",
- "upload_form.undo": "삭제",
"upload_form.video_description": "청각, 시각 장애인을 위한 설명",
"upload_modal.analyzing_picture": "사진 분석 중…",
"upload_modal.apply": "적용",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index 7d8603cae178fc..c78861b60c9953 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -77,7 +77,6 @@
"announcement.announcement": "Daxuyanî",
"attachments_list.unprocessed": "(bêpêvajo)",
"audio.hide": "Dengê veşêre",
- "autosuggest_hashtag.per_week": "Her hefte {count}",
"boost_modal.combo": "Ji bo derbas bî carekî din de pêlê {combo} bike",
"bundle_column_error.copy_stacktrace": "Rapora çewtiyê jê bigire",
"bundle_column_error.error.body": "Rûpela xwestî nehate pêşkêşkirin. Dibe ku ew ji ber şaşetiyeke koda me, an jî pirsgirêkeke lihevhatina gerokê be.",
@@ -129,26 +128,14 @@
"compose_form.lock_disclaimer": "Ajimêrê te ne {locked}. Herkes dikare te bişopîne da ku şandiyên te yên tenê ji şopînerên re têne xuyakirin bibînin.",
"compose_form.lock_disclaimer.lock": "girtî ye",
"compose_form.placeholder": "Çi di hişê te derbas dibe?",
- "compose_form.poll.add_option": "Hilbijartinekî tevlî bike",
"compose_form.poll.duration": "Dema rapirsî yê",
- "compose_form.poll.option_placeholder": "{number} Hilbijêre",
- "compose_form.poll.remove_option": "Vê hilbijarê rake",
"compose_form.poll.switch_to_multiple": "Rapirsî yê biguherînin da ku destûr bidin vebijarkên pirjimar",
"compose_form.poll.switch_to_single": "Rapirsîyê biguherîne da ku mafê bidî tenê vebijêrkek",
- "compose_form.publish": "Biweşîne",
"compose_form.publish_form": "Biweşîne",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Guhertinan tomar bike",
- "compose_form.sensitive.hide": "{count, plural, one {Medya wekî hestiyar nîşan bide} other {Medya wekî hestiyar nîşan bide}}",
- "compose_form.sensitive.marked": "{count, plural, one {Medya wekî hestiyar hate nîşan} other {Medya wekî hestiyar nîşan}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Medya wekî hestiyar nehatiye nîşan} other {Medya wekî hestiyar nehatiye nîşan}}",
"compose_form.spoiler.marked": "Hişyariya naverokê rake",
"compose_form.spoiler.unmarked": "Hişyariya naverokê tevlî bike",
- "compose_form.spoiler_placeholder": "Li vir hişyariya xwe binivîse",
"confirmation_modal.cancel": "Dev jê berde",
- "confirmations.block.block_and_report": "Asteng bike & ragihîne",
"confirmations.block.confirm": "Asteng bike",
- "confirmations.block.message": "Ma tu dixwazî ku {name} asteng bikî?",
"confirmations.cancel_follow_request.confirm": "Daxwazê vekişîne",
"confirmations.cancel_follow_request.message": "Tu dixwazî daxwaza xwe ya şopandina {name} vekşînî?",
"confirmations.delete.confirm": "Jê bibe",
@@ -157,14 +144,11 @@
"confirmations.delete_list.message": "Tu ji dil dixwazî vê lîsteyê bi awayekî mayînde jê bibî?",
"confirmations.discard_edit_media.confirm": "Biavêje",
"confirmations.discard_edit_media.message": "Guhertinên neqedandî di danasîna an pêşdîtina medyayê de hene, wan bi her awayî bavêje?",
- "confirmations.domain_block.confirm": "Tevahiya navperê asteng bike",
"confirmations.domain_block.message": "Tu pê bawerî ku tu dixwazî tevahiya {domain} asteng bikî? Di gelek rewşan de astengkirin an jî bêdengkirin têrê dike û tê hilbijartin. Tu nikarî naveroka vê navperê di demnameyê an jî agahdariyên xwe de bibînî. Şopînerên te yê di vê navperê wê werin jêbirin.",
"confirmations.edit.confirm": "Serrast bike",
"confirmations.logout.confirm": "Derkeve",
"confirmations.logout.message": "Ma tu dixwazî ku derkevî?",
"confirmations.mute.confirm": "Bêdeng bike",
- "confirmations.mute.explanation": "Ev ê şandinên ji wan tê û şandinên ku behsa wan dike veşêre, lê hê jî maf dide ku ew şandinên te bibînin û te bişopînin.",
- "confirmations.mute.message": "Bi rastî tu dixwazî {name} bêdeng bikî?",
"confirmations.redraft.confirm": "Jê bibe & ji nû ve serrast bike",
"confirmations.reply.confirm": "Bersivê bide",
"confirmations.reply.message": "Bersiva niha li ser peyama ku tu niha berhev dikî dê binivsîne. Ma pê bawer î ku tu dixwazî bidomînî?",
@@ -269,7 +253,6 @@
"hashtag.column_settings.tag_toggle": "Ji bo vê stûnê hin pêvekan tevlî bike",
"hashtag.follow": "Hashtagê bişopîne",
"hashtag.unfollow": "Hashtagê neşopîne",
- "home.column_settings.basic": "Bingehîn",
"home.column_settings.show_reblogs": "Bilindkirinan nîşan bike",
"home.column_settings.show_replies": "Bersivan nîşan bide",
"home.hide_announcements": "Reklaman veşêre",
@@ -340,9 +323,6 @@
"load_pending": "{count, plural, one {# hêmaneke nû} other {#hêmaneke nû}}",
"media_gallery.toggle_visible": "{number, plural, one {Wêneyê veşêre} other {Wêneyan veşêre}}",
"moved_to_account_banner.text": "Ajimêrê te {disabledAccount} niha neçalak e ji ber ku te bar kir bo {movedToAccount}.",
- "mute_modal.duration": "Dem",
- "mute_modal.hide_notifications": "Agahdariyan ji ev bikarhêner veşêre?",
- "mute_modal.indefinite": "Nediyar",
"navigation_bar.about": "Derbar",
"navigation_bar.blocks": "Bikarhênerên astengkirî",
"navigation_bar.bookmarks": "Şûnpel",
@@ -351,7 +331,6 @@
"navigation_bar.direct": "Qalkirinên taybet",
"navigation_bar.discover": "Vekolê",
"navigation_bar.domain_blocks": "Navperên astengkirî",
- "navigation_bar.edit_profile": "Profîlê serrast bike",
"navigation_bar.explore": "Vekole",
"navigation_bar.filters": "Peyvên bêdengkirî",
"navigation_bar.follow_requests": "Daxwazên şopandinê",
@@ -382,9 +361,6 @@
"notifications.column_settings.admin.report": "Ragihandinên nû:",
"notifications.column_settings.admin.sign_up": "Tomarkirinên nû:",
"notifications.column_settings.alert": "Agahdariyên sermaseyê",
- "notifications.column_settings.filter_bar.advanced": "Hemû beşan nîşan bide",
- "notifications.column_settings.filter_bar.category": "Şivika parzûna bilêz",
- "notifications.column_settings.filter_bar.show_bar": "Darika parzûnê nîşan bide",
"notifications.column_settings.follow": "Şopînerên nû:",
"notifications.column_settings.follow_request": "Daxwazên şopandinê nû:",
"notifications.column_settings.mention": "Qalkirin:",
@@ -437,14 +413,7 @@
"poll_button.add_poll": "Rapirsîyek zêde bike",
"poll_button.remove_poll": "Rapirsî yê rake",
"privacy.change": "Nepênîtiya şandiyan biguherîne",
- "privacy.direct.long": "Tenê ji bo bikarhênerên qalkirî tê dîtin",
- "privacy.direct.short": "Tenê kesên qalkirî",
- "privacy.private.long": "Tenê bo şopîneran xuyabar e",
- "privacy.private.short": "Tenê şopîneran",
- "privacy.public.long": "Ji bo hemûyan xuyabar e",
"privacy.public.short": "Gelemperî",
- "privacy.unlisted.long": "Ji bo hemûyan xuyabar e, lê ji taybetmendiyên vekolînê veqetiya ye",
- "privacy.unlisted.short": "Nelîstekirî",
"privacy_policy.last_updated": "Rojanekirina dawî {date}",
"privacy_policy.title": "Politîka taybetiyê",
"refresh": "Nû bike",
@@ -541,7 +510,6 @@
"status.direct": "Bi taybetî qale @{name} bike",
"status.direct_indicator": "Qalkirinê taybet",
"status.edit": "Serrast bike",
- "status.edited": "Di {date} de hate serrastkirin",
"status.edited_x_times": "{count, plural, one {{count} car} other {{count} car}} hate serrastkirin",
"status.embed": "Bi cih bike",
"status.filter": "Vê şandiyê parzûn bike",
@@ -608,10 +576,8 @@
"upload_error.poll": "Di rapirsîyan de mafê barkirina pelan nayê dayîn.",
"upload_form.audio_description": "Ji bona kesên kêm dibihîsin re pênase bike",
"upload_form.description": "Ji bona astengdarên dîtinê re vebêje",
- "upload_form.description_missing": "Ti danasîn nehatiye tevlîkirin",
"upload_form.edit": "Serrast bike",
"upload_form.thumbnail": "Wêneyê biçûk biguherîne",
- "upload_form.undo": "Jê bibe",
"upload_form.video_description": "Ji bo kesên kerr û lalan pênase bike",
"upload_modal.analyzing_picture": "Wêne tê analîzkirin…",
"upload_modal.apply": "Bisepîne",
diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json
index 8f384fe1257ea2..794cbd9ede362d 100644
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@@ -45,7 +45,6 @@
"alert.unexpected.message": "Gwall anwaytyadow re dharva.",
"alert.unexpected.title": "Oups!",
"announcement.announcement": "Deklaryans",
- "autosuggest_hashtag.per_week": "{count} an seythen",
"boost_modal.combo": "Hwi a yll gwaska {combo} dhe woheles hemma an nessa tro",
"bundle_column_error.retry": "Assayewgh arta",
"bundle_modal_error.close": "Degea",
@@ -80,35 +79,22 @@
"compose_form.lock_disclaimer": "Nyns yw agas akont {locked}. Piwpynag a yll agas holya dhe weles agas postow holyoryon-hepken.",
"compose_form.lock_disclaimer.lock": "Alhwedhys",
"compose_form.placeholder": "Pyth eus yn agas brys?",
- "compose_form.poll.add_option": "Keworra dewis",
"compose_form.poll.duration": "Duryans sondyans",
- "compose_form.poll.option_placeholder": "Dewis {number}",
- "compose_form.poll.remove_option": "Dilea'n dewis ma",
"compose_form.poll.switch_to_multiple": "Chanjya sondyans dhe asa lies dewis",
"compose_form.poll.switch_to_single": "Chanjya sondyans dhe asa unn dewis hepken",
"compose_form.publish_form": "Publish",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.sensitive.hide": "{count, plural, one {Merkya myski vel tender} other {Merkya myski vel tender}}",
- "compose_form.sensitive.marked": "{count, plural, one {Myski merkys vel tender} other {Myski merkys vel tender}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Nyns yw myski merkys vel tender} other {Nyns yw myski merkys vel tender}}",
"compose_form.spoiler.marked": "Dilea gwarnyans dalgh",
"compose_form.spoiler.unmarked": "Keworra gwarnyans dalgh",
- "compose_form.spoiler_placeholder": "Skrifewgh agas gwarnyans omma",
"confirmation_modal.cancel": "Hedhi",
- "confirmations.block.block_and_report": "Lettya & Reportya",
"confirmations.block.confirm": "Lettya",
- "confirmations.block.message": "Owgh hwi sur a vynnes lettya {name}?",
"confirmations.delete.confirm": "Dilea",
"confirmations.delete.message": "Owgh hwi sur a vynnes dilea'n post ma?",
"confirmations.delete_list.confirm": "Dilea",
"confirmations.delete_list.message": "Owgh hwi sur a vynnes dilea'n rol ma yn fast?",
- "confirmations.domain_block.confirm": "Lettya gorfarth dhien",
"confirmations.domain_block.message": "Owgh hwi wir, wir sur a vynnes lettya'n {domain} dhien? Y'n brassa rann a gasow, boghes lettyansow medrys po tawheansow yw lowr ha gwell. Ny wrewgh hwi gweles dalgh a'n worfarth na yn py amserlin boblek pynag po yn agas gwarnyansow. Agas holyoryon an worfarth na a vydh diles.",
"confirmations.logout.confirm": "Digelmi",
"confirmations.logout.message": "Owgh hwi sur a vynnes digelmi?",
"confirmations.mute.confirm": "Tawhe",
- "confirmations.mute.explanation": "Hemm a wra kudha postow anedha ha postow orth aga meneges, mes hwath aga gasa dhe weles agas postow ha'gas holya.",
- "confirmations.mute.message": "Owgh hwi sur a vynnes tawhe {name}?",
"confirmations.redraft.confirm": "Dilea & daskynskrifa",
"confirmations.reply.confirm": "Gorthebi",
"confirmations.reply.message": "Gorthebi lemmyn a wra ughskrifa'n messach esowgh hwi orth y skrifa lemmyn. Owgh hwi sur a vynnes pesya?",
@@ -175,7 +161,6 @@
"hashtag.column_settings.tag_mode.any": "Pynag a'n re ma",
"hashtag.column_settings.tag_mode.none": "Travyth a'n re ma",
"hashtag.column_settings.tag_toggle": "Yssynsi taggys ynwedhek rag an goloven ma",
- "home.column_settings.basic": "Selyek",
"home.column_settings.show_reblogs": "Diskwedhes kenerthow",
"home.column_settings.show_replies": "Diskwedhes gorthebow",
"home.hide_announcements": "Kudha deklaryansow",
@@ -235,16 +220,12 @@
"lists.subheading": "Agas rolyow",
"load_pending": "{count, plural, one {# daklennowydh} other {# a daklennow nowydh}}",
"media_gallery.toggle_visible": "Hide {number, plural, one {aven} other {aven}}",
- "mute_modal.duration": "Duryans",
- "mute_modal.hide_notifications": "Kudha gwarnyansow a'n devnydhyer ma?",
- "mute_modal.indefinite": "Andhevri",
"navigation_bar.blocks": "Devnydhyoryon lettys",
"navigation_bar.bookmarks": "Folennosow",
"navigation_bar.community_timeline": "Amserlin leel",
"navigation_bar.compose": "Komposya post nowydh",
"navigation_bar.discover": "Diskudha",
"navigation_bar.domain_blocks": "Gorfarthow lettys",
- "navigation_bar.edit_profile": "Golegi profil",
"navigation_bar.filters": "Geryow tawhes",
"navigation_bar.follow_requests": "Govynnow holya",
"navigation_bar.follows_and_followers": "Holyansow ha holyoryon",
@@ -267,8 +248,6 @@
"notifications.clear": "Dilea gwarnyansow",
"notifications.clear_confirmation": "Owgh hwi sur a vynnes dilea agas gwarnyansow oll yn fast?",
"notifications.column_settings.alert": "Gwarnyansow pennskrin",
- "notifications.column_settings.filter_bar.advanced": "Displetya rummow oll",
- "notifications.column_settings.filter_bar.category": "Barr sidhla skav",
"notifications.column_settings.follow": "Holyoryon nowydh:",
"notifications.column_settings.follow_request": "Govynnow holya nowydh:",
"notifications.column_settings.mention": "Menegow:",
@@ -316,12 +295,7 @@
"poll_button.add_poll": "Keworra sondyans",
"poll_button.remove_poll": "Dilea sondyans",
"privacy.change": "Chanjya privetter an post",
- "privacy.direct.long": "Gweladow dhe'n dhevnydhyoryon menegys hepken",
- "privacy.direct.short": "Direct",
- "privacy.private.long": "Gweladow dhe holyoryon hepken",
- "privacy.private.short": "Followers-only",
"privacy.public.short": "Poblek",
- "privacy.unlisted.short": "Anrelys",
"refresh": "Daskarga",
"regeneration_indicator.label": "Ow karga…",
"regeneration_indicator.sublabel": "Yma agas lin dre ow pos pareusys!",
@@ -407,7 +381,6 @@
"upload_form.description": "Deskrifewgh rag tus dhallek",
"upload_form.edit": "Golegi",
"upload_form.thumbnail": "Chanjya avenik",
- "upload_form.undo": "Dilea",
"upload_form.video_description": "Deskrifa rag tus vodharek po dallek",
"upload_modal.analyzing_picture": "Ow tytratya skeusen…",
"upload_modal.apply": "Gweytha",
diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json
index 3e5747ba8ba5a1..48b23340088bdc 100644
--- a/app/javascript/mastodon/locales/la.json
+++ b/app/javascript/mastodon/locales/la.json
@@ -34,16 +34,13 @@
"compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
"compose_form.lock_disclaimer.lock": "clausum",
"compose_form.placeholder": "What is on your mind?",
- "compose_form.publish": "Barrire",
"compose_form.publish_form": "Barrire",
- "compose_form.publish_loud": "{publish}!",
"compose_form.spoiler.marked": "Text is hidden behind warning",
"compose_form.spoiler.unmarked": "Text is not hidden",
"confirmations.block.confirm": "Impedire",
"confirmations.delete.confirm": "Oblitterare",
"confirmations.delete.message": "Are you sure you want to delete this status?",
"confirmations.delete_list.confirm": "Oblitterare",
- "confirmations.domain_block.confirm": "Hide entire domain",
"confirmations.mute.confirm": "Confutare",
"confirmations.reply.confirm": "Respondere",
"dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
@@ -116,9 +113,6 @@
"poll_button.add_poll": "Addere electionem",
"poll_button.remove_poll": "Auferre electionem",
"privacy.change": "Adjust status privacy",
- "privacy.direct.short": "Direct",
- "privacy.private.short": "Followers-only",
- "privacy.public.long": "Coram publico",
"privacy.public.short": "Coram publico",
"relative_time.full.just_now": "nunc",
"relative_time.just_now": "nunc",
@@ -144,7 +138,6 @@
"status.copy": "Copy link to status",
"status.delete": "Oblitterare",
"status.edit": "Recolere",
- "status.edited": "Recultum {date}",
"status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
"status.open": "Expand this status",
"status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
@@ -153,7 +146,6 @@
"trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
"upload_form.audio_description": "Describe for people who are hard of hearing",
"upload_form.edit": "Recolere",
- "upload_form.undo": "Oblitterare",
"upload_progress.label": "Uploading…",
"video.mute": "Confutare soni"
}
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 8fde68742774a2..533f074004caf6 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -4,16 +4,16 @@
"about.disclaimer": "Mastodon es un programario libero, kon kodiche avierto i una marka komersiala de Mastodon gGmbH.",
"about.domain_blocks.no_reason_available": "Razon no desponivle",
"about.domain_blocks.preamble": "Mastodon djeneralmente te permete ver kontenido de i enteraktuar kon utilizadores de kualseker otro sirvidor en el fediverso. Estas son las eksepsiones en este sirvidor en partikolar.",
- "about.domain_blocks.silenced.explanation": "\"Djeneralmente no veras profiles i kontenido de este sirvidor, salvo ke eksplisitamente lo bushkes o sigas algun kuento de el.",
+ "about.domain_blocks.silenced.explanation": "Djeneralmente no veras profiles i kontenido de este sirvidor, salvo ke eksplisitamente lo bushkes o sigas algun kuento de el.",
"about.domain_blocks.silenced.title": "Limitado",
- "about.domain_blocks.suspended.explanation": "Dingunos datos de este sirvidor sera prosesado, magazinado o enterkambiado kon este sirvidor. Enteraksyon o komunikasyon kon sus utilizadores sera imposivle.",
+ "about.domain_blocks.suspended.explanation": "Dingunos datos de este sirvidor seran prosesados, magazinados o enterkambiados. Enteraksyon o komunikasyon kon sus utilizadores sera imposivle.",
"about.domain_blocks.suspended.title": "Suspendido",
"about.not_available": "Esta enformasyon no esta desponivle en este sirvidor.",
"about.powered_by": "Redes sosyalas desentralizadas kon uzo de {mastodon}",
"about.rules": "Reglas del sirvidor",
"account.account_note_header": "Nota",
"account.add_or_remove_from_list": "Adjusta a o kita de listas",
- "account.badges.bot": "Bot",
+ "account.badges.bot": "Otomatizado",
"account.badges.group": "Grupo",
"account.block": "Bloka @{name}",
"account.block_domain": "Bloka el domeno {domain}",
@@ -23,13 +23,13 @@
"account.cancel_follow_request": "Anula solisitud de segir",
"account.copy": "Kopia atadijo de profil",
"account.direct": "Enmenta a @{name} en privado",
- "account.disable_notifications": "No me avizes mas sovre publikasyones de @{name}",
+ "account.disable_notifications": "Desha de avizarme sovre publikasyones de @{name}",
"account.domain_blocked": "Domeno blokado",
"account.edit_profile": "Edita profil",
"account.enable_notifications": "Avizame kuando @{name} publike",
"account.endorse": "Avalia en profil",
"account.featured_tags.last_status_at": "Ultima publikasyon de {date}",
- "account.featured_tags.last_status_never": "\"No ay publikasyones",
+ "account.featured_tags.last_status_never": "No ay publikasyones",
"account.featured_tags.title": "Etiketas avaliadas de {name}",
"account.follow": "Sige",
"account.follow_back": "Sige tamyen",
@@ -38,19 +38,19 @@
"account.followers_counter": "{count, plural, one {{counter} suivante} other {{counter} suivantes}}",
"account.following": "Sigiendo",
"account.following_counter": "{count, plural, other {Sigiendo a {counter}}}",
- "account.follows.empty": "Este utilizador ainda no sige a ningun.",
+ "account.follows.empty": "Este utilizador ainda no sige a dingun.",
"account.go_to_profile": "Va al profil",
"account.hide_reblogs": "Eskonde repartajasyones de @{name}",
"account.in_memoriam": "De bendicha memoria.",
"account.joined_short": "Adjunto",
- "account.languages": "Troka linguas suskrividas",
+ "account.languages": "Troka linguas abonadas",
"account.link_verified_on": "La propriedad de este atadijo fue verifikada el {date}",
"account.locked_info": "El estado de privasita de este konto esta konfigurado komo serado. El proprietario reviza manualmente kien le puede segir.",
"account.media": "Multimedia",
"account.mention": "Enmenta a @{name}",
"account.moved_to": "{name} tiene endikado ke su muevo kuento agora es:",
"account.mute": "Silensia a @{name}",
- "account.mute_notifications_short": "Silensia avizos de @{name}",
+ "account.mute_notifications_short": "Silensia avizos",
"account.mute_short": "Silensia",
"account.muted": "Silensiado",
"account.mutual": "Mutual",
@@ -64,7 +64,7 @@
"account.share": "Partaja el profil de @{name}",
"account.show_reblogs": "Amostra repartajasyones de @{name}",
"account.statuses_counter": "{count, plural, one {{counter} publikasyon} other {{counter} publikasyones}}",
- "account.unblock": "Dezbloka @{name}",
+ "account.unblock": "Dezbloka a @{name}",
"account.unblock_domain": "Dezbloka domeno {domain}",
"account.unblock_short": "Dezbloka",
"account.unendorse": "No avalia en profil",
@@ -79,8 +79,8 @@
"admin.dashboard.retention.cohort": "Mez de enrejistrasyon",
"admin.dashboard.retention.cohort_size": "Muevos utilizadores",
"admin.impact_report.instance_accounts": "Profiles de kuentos esto efasaria",
- "admin.impact_report.instance_followers": "Suivantes a los kualos nuestros utilizadores perderian",
- "admin.impact_report.instance_follows": "Suivantes a los kualos sus utilizadores perderian",
+ "admin.impact_report.instance_followers": "Suivantes a los kualos nuestros utilizadores pedrerian",
+ "admin.impact_report.instance_follows": "Suivantes a los kualos sus utilizadores pedrerian",
"admin.impact_report.title": "Rezumen de impakto",
"alert.rate_limited.message": "Por favor aprova dempues de {retry_time, time, medium}.",
"alert.rate_limited.title": "Trafiko limitado",
@@ -88,8 +88,13 @@
"alert.unexpected.title": "Atyo!",
"announcement.announcement": "Pregon",
"attachments_list.unprocessed": "(no prosesado)",
- "audio.hide": "Eskonder audio",
- "autosuggest_hashtag.per_week": "{count} por semana",
+ "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.",
@@ -111,7 +116,7 @@
"column.about": "Sovre mozotros",
"column.blocks": "Utilizadores blokados",
"column.bookmarks": "Markadores",
- "column.community": "Linya de tiempo lokala",
+ "column.community": "Linya lokala",
"column.direct": "Enmentaduras privadas",
"column.directory": "Eksplora profiles",
"column.domain_blocks": "Domenos blokados",
@@ -123,7 +128,7 @@
"column.mutes": "Utilizadores silensiados",
"column.notifications": "Avizos",
"column.pins": "Publikasyones fiksadas",
- "column.public": "Linya de tiempo federada",
+ "column.public": "Linya federada",
"column_back_button.label": "Atras",
"column_header.hide_settings": "Eskonde opsyones",
"column_header.moveLeft_settings": "Move kolumna a la siedra",
@@ -146,26 +151,22 @@
"compose_form.lock_disclaimer": "Tu kuento no esta {locked}. Todos pueden segirte para ver tus publikasyones solo para suivantes.",
"compose_form.lock_disclaimer.lock": "serrado",
"compose_form.placeholder": "Ke haber?",
- "compose_form.poll.add_option": "Adjusta opsyon",
"compose_form.poll.duration": "Durasion de anketa",
+ "compose_form.poll.multiple": "Multiples opsyones",
"compose_form.poll.option_placeholder": "Opsyon {number}",
- "compose_form.poll.remove_option": "Kita esta opsyon",
- "compose_form.poll.switch_to_multiple": "Trokar anketa para permeter a eskojer mas ke una opsyon",
- "compose_form.poll.switch_to_single": "Trokar anketa para permeter a eskojer solo una opsyon",
+ "compose_form.poll.single": "Eskoje uno",
+ "compose_form.poll.switch_to_multiple": "Troka anketa para permeter a eskojer mas ke una opsyon",
+ "compose_form.poll.switch_to_single": "Troka anketa para permeter a eskojer solo una opsyon",
+ "compose_form.poll.type": "Estilo",
"compose_form.publish": "Publika",
"compose_form.publish_form": "Mueva publikasyon",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Guadra trokamientos",
- "compose_form.sensitive.hide": "{count, plural, one {Marka material komo sensivle} other {Marka material komo sensivle}}",
- "compose_form.sensitive.marked": "{count, plural, one {Material markado komo sensivle} other {Material markado komo sensivle}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Material no markado komo sensivle} other {Material no markado komo sensivle}}",
+ "compose_form.reply": "Arisponde",
+ "compose_form.save_changes": "Aktualiza",
"compose_form.spoiler.marked": "Kita avertensya de kontenido",
"compose_form.spoiler.unmarked": "Adjusta avertensya de kontenido",
- "compose_form.spoiler_placeholder": "Eskrive tu avertensya aki",
+ "compose_form.spoiler_placeholder": "Avertensya de kontenido (opsyonal)",
"confirmation_modal.cancel": "Anula",
- "confirmations.block.block_and_report": "Bloka i raporta",
"confirmations.block.confirm": "Bloka",
- "confirmations.block.message": "Estas siguro ke keres blokar a {name}?",
"confirmations.cancel_follow_request.confirm": "Anula solisitud",
"confirmations.cancel_follow_request.message": "Estas siguro ke keres anular tu solisitud de segir a {name}?",
"confirmations.delete.confirm": "Efasa",
@@ -174,19 +175,17 @@
"confirmations.delete_list.message": "Estas siguro ke keres permanentemente efasar esta lista?",
"confirmations.discard_edit_media.confirm": "Anula",
"confirmations.discard_edit_media.message": "Tienes trokamientos no guadrados en la deskripsion o vista previa. Keres efasarlos entanto?",
- "confirmations.domain_block.confirm": "Bloka domeno entero",
+ "confirmations.domain_block.confirm": "Bloka sirvidor",
"confirmations.domain_block.message": "Estas totalmente siguro ke keres blokar todo el domeno {domain}? En djeneral unos kuantos blokos o silensiamientos son sufisientes i preferavles. No veras kontenido de akel domeno en dinguna linya de tiempo publika ni ent tus avizos. Tus suivantes de akel domeno seran kitados.",
"confirmations.edit.confirm": "Edita",
- "confirmations.edit.message": "Editar agora kitara el mesaj kualo estas eskriviendo aktualmente. Estas siguro ke keres fazerlo?",
+ "confirmations.edit.message": "Si edites agora, kitaras el mesaj kualo estas eskriviendo aktualmente. Estas siguro ke keres fazerlo?",
"confirmations.logout.confirm": "Sal",
"confirmations.logout.message": "Estas siguro ke keres salir de tu kuento?",
"confirmations.mute.confirm": "Silensia",
- "confirmations.mute.explanation": "Esto eskondera las publikasyones de este kuento i publikasyones ke lo enmentan, pero ainda les permetera segirte.",
- "confirmations.mute.message": "Estas siguro ke keres silensiar a {name}?",
- "confirmations.redraft.confirm": "Efasar i reeskrivir",
+ "confirmations.redraft.confirm": "Efasa i reeskrive",
"confirmations.redraft.message": "Estas siguro ke keres efasar esta publikasyon i reeskrivirla? Pedreras todos los favoritos i repartajasyones asosiados kon esta publikasyon i repuestas a eya seran guerfanadas.",
"confirmations.reply.confirm": "Arisponde",
- "confirmations.reply.message": "Arispondir agora kitara el mesaj kualo estas eskriviendo aktualmente. Estas siguro ke keres fazerlo?",
+ "confirmations.reply.message": "Si arispondas agora, kitaras el mesaj kualo estas eskriviendo aktualmente. Estas siguro ke keres fazerlo?",
"confirmations.unfollow.confirm": "Desige",
"confirmations.unfollow.message": "Estas siguro ke keres deshar de segir a {name}?",
"conversation.delete": "Efasa konversasyon",
@@ -208,14 +207,26 @@
"dismissable_banner.explore_statuses": "Estas publikasyones de este sirvidor i otros de la red desentralizada estan agora popularas. Publikasyones mas muevas, kon mas repartajasiones i favoritadas por mas djente aparesen primero.",
"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": "Ansi paresera:",
+ "embed.preview": "Paresera ansina:",
"emoji_button.activity": "Aktivita",
"emoji_button.clear": "Alimpia",
"emoji_button.custom": "Personalizado",
"emoji_button.flags": "Bandieras",
"emoji_button.food": "Kumidas i beverajes",
- "emoji_button.label": "Adjustar emoji",
+ "emoji_button.label": "Adjusta emoji",
"emoji_button.nature": "Natura",
"emoji_button.not_found": "Emojis no topados",
"emoji_button.objects": "Objektos",
@@ -225,7 +236,7 @@
"emoji_button.search_results": "Rizultados de bushkeda",
"emoji_button.symbols": "Simbolos",
"emoji_button.travel": "Viajes i lugares",
- "empty_column.account_hides_collections": "Este utilizador desidio no mostrar esta enformasyon",
+ "empty_column.account_hides_collections": "Este utilizador desidio no amostrar esta enformasyon",
"empty_column.account_suspended": "Kuento suspendido",
"empty_column.account_timeline": "No ay publikasyones aki!",
"empty_column.account_unavailable": "Profil no desponivle",
@@ -236,9 +247,9 @@
"empty_column.domain_blocks": "Ainda no ay domenos blokados.",
"empty_column.explore_statuses": "No ay dingunos trendes agora. Mira mas tadre!",
"empty_column.favourited_statuses": "Ainda no tienes publikasyones favoritas. Kuando indikes ke una te plaze, se amostrara aki.",
- "empty_column.favourites": "Nadie tiene indikado ke le plaze una de tus publikasyones. Kuando algun lo aga, se amostrara aki.",
+ "empty_column.favourites": "Dingun no tiene indikado ke le plaze una de tus publikasyones. Kuando algun lo ayga, se amostrara aki.",
"empty_column.follow_requests": "No tienes dinguna solisitud de suivante. Kuando risivas una, se amostrara aki.",
- "empty_column.followed_tags": "Ainda no tienes segido dinguna etiketa. Kuando lo agas, se amostraran aki.",
+ "empty_column.followed_tags": "Ainda no tienes segido dinguna etiketa. Kuando lo aygas, se amostraran aki.",
"empty_column.hashtag": "Ainda no ay niente en esta etiketa.",
"empty_column.home": "Tu linya de tiempo esta vaziya! Sige a mas personas para inchirla.",
"empty_column.list": "Ainda no ay niente en esta lista. Kuando miembros de esta lista publiken muevas publikasyones, se amostraran aki.",
@@ -247,14 +258,14 @@
"empty_column.notifications": "Ainda no tienes dingun avizo. Kuando otras personas enteraktuen kontigo, se amostraran aki.",
"empty_column.public": "No ay niente aki! Eskrive algo publikamente o manualmente sige utilizadores de otros sirvidores para inchirlo",
"error.unexpected_crash.explanation": "Por un yerro en muestro kodiche o un problem de kompatibilita kon el navigador, no se puede amostrar esta pajina djustamente.",
- "error.unexpected_crash.explanation_addons": "No se puede amostrar esta pajina djustamente. Este yerro probavlemente fue kauzado por un komplimento del navigador o por un enstrumento de traduksion.",
+ "error.unexpected_crash.explanation_addons": "No se puede amostrar esta pajina djustamente. Este yerro probavlemente fue kauzado por un komplimento del navigador o por un enstrumento de traduksyon.",
"error.unexpected_crash.next_steps": "Aprova arefreskar la pajina. Si esto no ayuda, es posivle ke ainda puedas kulaenar Mastodon kon otro navigador u otra aplikasyon nativa.",
- "error.unexpected_crash.next_steps_addons": "Aprova inkapasitarlos i arefreskar la pajina. Si esto no ayuda, es posivle ke ainda puedas kulanear Mastodon kon otro navigador u otra aplikasyon nativa.",
- "errors.unexpected_crash.copy_stacktrace": "Kopiar stacktrace al portapapeles",
- "errors.unexpected_crash.report_issue": "Raportar problema",
+ "error.unexpected_crash.next_steps_addons": "Aprova inkapasitarlos i arefreskar la pajina. Si esto no te ayuda, es posivle ke ainda puedas kulanear Mastodon kon otro navigador u otra aplikasyon nativa.",
+ "errors.unexpected_crash.copy_stacktrace": "Kopia stacktrace al portapapeles",
+ "errors.unexpected_crash.report_issue": "Raporta problema",
"explore.search_results": "Rizultados de bushkeda",
"explore.suggested_follows": "Djente",
- "explore.title": "Eksplorar",
+ "explore.title": "Eksplora",
"explore.trending_links": "Haberes",
"explore.trending_statuses": "Publikasyones",
"explore.trending_tags": "Etiketas",
@@ -270,22 +281,36 @@
"filter_modal.select_filter.context_mismatch": "no se aplika a este konteksto",
"filter_modal.select_filter.expired": "kadukado",
"filter_modal.select_filter.prompt_new": "Mueva kategoria: {name}",
- "filter_modal.select_filter.search": "Bushkar o kriyar",
- "filter_modal.select_filter.subtitle": "Kulanear una kategoria egzistente o kriya mueva",
- "filter_modal.select_filter.title": "Filtrar esta publikasyon",
- "filter_modal.title.status": "Filtrar una publikasyon",
+ "filter_modal.select_filter.search": "Bushka o kriya",
+ "filter_modal.select_filter.subtitle": "Kulanea una kategoria egzistente o kriya mueva",
+ "filter_modal.select_filter.title": "Filtra esta publikasyon",
+ "filter_modal.title.status": "Filtra una publikasyon",
+ "filtered_notifications_banner.pending_requests": "Avizos de {count, plural, =0 {dingun} one {una persona} other {# personas}} ke puedes koneser",
+ "filtered_notifications_banner.title": "Avizos filtrados",
"firehose.all": "Todo",
"firehose.local": "Este sirvidor",
"firehose.remote": "Otros sirvidores",
"follow_request.authorize": "Autoriza",
"follow_request.reject": "Refuza",
"follow_requests.unlocked_explanation": "Aunke tu kuento no esta serrado, la taifa de {domain} kreye ke talvez keres revizar manualmente las solisitudes de segimento de estos kuentos.",
+ "follow_suggestions.curated_suggestion": "Seleksyon de la taifa",
+ "follow_suggestions.dismiss": "No amostra mas",
+ "follow_suggestions.friends_of_friends_longer": "Popular entre personas a las kualas siges",
+ "follow_suggestions.hints.featured": "Este profil tiene sido eskojido por la taifa de {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "Este profil es popular entre las personas ke siges.",
+ "follow_suggestions.hints.most_followed": "Este profil es uno de los mas segidos en {domain}.",
+ "follow_suggestions.hints.most_interactions": "Este profil tiene resivido muncha atansion resientemente en {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Este profil es similar a otros ke tienes segido resientemente.",
+ "follow_suggestions.personalized_suggestion": "Sujestion personalizada",
+ "follow_suggestions.popular_suggestion": "Sujestion populara",
+ "follow_suggestions.view_all": "Ve todos",
+ "follow_suggestions.who_to_follow": "A ken segir",
"followed_tags": "Etiketas segidas",
"footer.about": "Sovre mozotros",
"footer.directory": "Katalogo de profiles",
"footer.get_app": "Abasha aplikasyon",
- "footer.invite": "Envitar a djente",
- "footer.keyboard_shortcuts": "Akortamientos de klavye",
+ "footer.invite": "Envita a djente",
+ "footer.keyboard_shortcuts": "Akortamientos de klaviatura",
"footer.privacy_policy": "Politika de privasita",
"footer.source_code": "Ve kodiche fuente",
"footer.status": "Estado",
@@ -295,24 +320,19 @@
"hashtag.column_header.tag_mode.any": "o {additional}",
"hashtag.column_header.tag_mode.none": "sin {additional}",
"hashtag.column_settings.select.no_options_message": "Rekomendasyones no topadas",
- "hashtag.column_settings.select.placeholder": "Meter etiketas…",
+ "hashtag.column_settings.select.placeholder": "Mete etiketas…",
"hashtag.column_settings.tag_mode.all": "Todos estos",
"hashtag.column_settings.tag_mode.any": "Kualsekera de estos",
"hashtag.column_settings.tag_mode.none": "Dinguno de estos",
- "hashtag.column_settings.tag_toggle": "Inkluir etiketas adisionalas en esta kolumna",
+ "hashtag.column_settings.tag_toggle": "Inkluye etiketas adisionalas en esta kolumna",
"hashtag.counter_by_accounts": "{count, plural, one {{counter} partisipante} other {{counter} partisipantes}}",
"hashtag.counter_by_uses": "{count, plural, one {{counter} publikasyon} other {{counter} publikasyones}}",
"hashtag.counter_by_uses_today": "{count, plural, one {{counter} publikasyon} other {{counter} publikasyones}} oy",
- "hashtag.follow": "Segir etiketa",
- "hashtag.unfollow": "Desegir etiketa",
+ "hashtag.follow": "Sige etiketa",
+ "hashtag.unfollow": "Desige etiketa",
"hashtags.and_other": "…i {count, plural, one {}other {# mas}}",
- "home.actions.go_to_explore": "Ve los trendes",
- "home.actions.go_to_suggestions": "Topa a djente para segir",
- "home.column_settings.basic": "Opsyones bazikas",
- "home.column_settings.show_reblogs": "Amostrar repartajasyones",
- "home.column_settings.show_replies": "Amostrar repuestas",
- "home.explore_prompt.body": "Tu linya prinsipala es una mikstura de publikasyones kon etiketas a las kualas eskojites a segir, la djente a la kuala eskojites a segir i las publikasyones ke eyos repartajan. Si esta demaziado trankila, puedes:",
- "home.explore_prompt.title": "Esta es tu baza prinsipala en Mastodon.",
+ "home.column_settings.show_reblogs": "Amostra repartajasyones",
+ "home.column_settings.show_replies": "Amostra repuestas",
"home.hide_announcements": "Eskonde pregones",
"home.pending_critical_update.body": "Por favor aktualiza tu sirvidor de Mastodon pishin!",
"home.pending_critical_update.link": "Ve aktualizasyones",
@@ -348,7 +368,7 @@
"keyboard_shortcuts.favourite": "Endika ke te plaze una publikasyon",
"keyboard_shortcuts.favourites": "Avre lista de favoritos",
"keyboard_shortcuts.federated": "Avre linya federada",
- "keyboard_shortcuts.heading": "Akortamientos de klavye",
+ "keyboard_shortcuts.heading": "Akortamientos de klaviatura",
"keyboard_shortcuts.home": "Avre linya prinsipala",
"keyboard_shortcuts.hotkey": "Klave rapido",
"keyboard_shortcuts.legend": "Amostra esta lejenda",
@@ -396,9 +416,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.duration": "Durasyon",
- "mute_modal.hide_notifications": "Eskonder avizos de este utilizador?",
- "mute_modal.indefinite": "Indefinida",
+ "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",
@@ -408,8 +432,7 @@
"navigation_bar.direct": "Enmentaduras privadas",
"navigation_bar.discover": "Diskuvre",
"navigation_bar.domain_blocks": "Domenos blokados",
- "navigation_bar.edit_profile": "Edita profil",
- "navigation_bar.explore": "Eksplorar",
+ "navigation_bar.explore": "Eksplora",
"navigation_bar.favourites": "Te plazen",
"navigation_bar.filters": "Biervos silensiados",
"navigation_bar.follow_requests": "Solisitudes de segimiento",
@@ -422,7 +445,7 @@
"navigation_bar.personal": "Personal",
"navigation_bar.pins": "Publikasyones fiksadas",
"navigation_bar.preferences": "Preferensyas",
- "navigation_bar.public_timeline": "Linya de tiempo federada",
+ "navigation_bar.public_timeline": "Linya federada",
"navigation_bar.search": "Bushka",
"navigation_bar.security": "Segurita",
"not_signed_in_indicator.not_signed_in": "Nesesitas konektarse kon tu kuento para akseder este rekurso.",
@@ -432,12 +455,21 @@
"notification.follow": "{name} te ampeso a segir",
"notification.follow_request": "{name} tiene solisitado segirte",
"notification.mention": "{name} te enmento",
+ "notification.moderation-warning.learn_more": "Ambezate mas",
+ "notification.moderation_warning.action_silence": "Tu kuento tiene sido limitado.",
+ "notification.moderation_warning.action_suspend": "Tu kuento tiene sido suspendido.",
"notification.own_poll": "Tu anketa eskapo",
"notification.poll": "Anketa en ke votates eskapo",
"notification.reblog": "{name} repartajo tu publikasyon",
+ "notification.relationships_severance_event": "Koneksyones pedridas kon {name}",
+ "notification.relationships_severance_event.learn_more": "Ambezate mas",
"notification.status": "{name} publiko algo",
"notification.update": "{name} edito una publikasyon",
- "notifications.clear": "Efasar avizos",
+ "notification_requests.accept": "Acheta",
+ "notification_requests.dismiss": "Kita",
+ "notification_requests.notifications_from": "Avizos de {name}",
+ "notification_requests.title": "Avizos filtrados",
+ "notifications.clear": "Efasa avizos",
"notifications.clear_confirmation": "Estas siguro ke keres permanentemente efasar todos tus avizos?",
"notifications.column_settings.admin.report": "Muveos raportos:",
"notifications.column_settings.admin.sign_up": "Muevas enrejistrasyones:",
@@ -445,7 +477,6 @@
"notifications.column_settings.favourite": "Te plazen:",
"notifications.column_settings.filter_bar.advanced": "Amostra todas las kategorias",
"notifications.column_settings.filter_bar.category": "Vara de filtrado rapido",
- "notifications.column_settings.filter_bar.show_bar": "Amostra vara de filtros",
"notifications.column_settings.follow": "Muevos suivantes:",
"notifications.column_settings.follow_request": "Muevas solisitudes de segimiento:",
"notifications.column_settings.mention": "Enmentaduras:",
@@ -453,10 +484,10 @@
"notifications.column_settings.push": "Avizos arrepushados",
"notifications.column_settings.reblog": "Repartajasyones:",
"notifications.column_settings.show": "Amostra en kolumna",
- "notifications.column_settings.sound": "Reproduzir son",
+ "notifications.column_settings.sound": "Reproduse son",
"notifications.column_settings.status": "Publikasyones muevas:",
"notifications.column_settings.unread_notifications.category": "Avizos no meldados",
- "notifications.column_settings.unread_notifications.highlight": "Avaliar avizos no meldados",
+ "notifications.column_settings.unread_notifications.highlight": "Avalia avizos no meldados",
"notifications.column_settings.update": "Edisyones:",
"notifications.filter.all": "Todos",
"notifications.filter.boosts": "Repartajasyones",
@@ -471,17 +502,26 @@
"notifications.permission_denied": "Avizos de ensimameza no estan desponivles porke ya se tiene refuzado el permiso",
"notifications.permission_denied_alert": "\"No se pueden kapasitar los avizos de ensimameza, porke ya se tiene refuzado el permiso de navigador",
"notifications.permission_required": "Avizos de ensimameza no estan desponivles porke los nesesarios permisos no tienen sido risividos.",
- "notifications_permission_banner.enable": "Kapasitar avizos de ensimameza",
+ "notifications.policy.filter_new_accounts.hint": "Kriyadas durante {days, plural, one {el ultimo diya} other {los ultimos # diyas}}",
+ "notifications.policy.filter_new_accounts_title": "Muevos kuentos",
+ "notifications.policy.filter_not_followers_title": "Personas ke te no sigen",
+ "notifications.policy.filter_not_following_hint": "Asta ke las aproves manualmente",
+ "notifications.policy.filter_not_following_title": "Personas ke no siges",
+ "notifications.policy.filter_private_mentions_title": "Enmentaduras privadas no solisitadas",
+ "notifications.policy.title": "Filtra avizos de…",
+ "notifications_permission_banner.enable": "Kapasita avizos de ensimameza",
"notifications_permission_banner.how_to_control": "Para risivir avizos kuando Mastodon no esta avierto, kapasita avizos de ensimameza. Puedes kontrolar presizamente kualos tipos de enteraksiones djeneren avizos de ensimameza kon el boton {icon} arriva kuando esten kapasitadas.",
- "notifications_permission_banner.title": "Nunka te piedres niente",
+ "notifications_permission_banner.title": "Nunkua te piedres niente",
"onboarding.action.back": "Va atras",
"onboarding.actions.back": "Va atras",
"onboarding.actions.go_to_explore": "Va a los trendes",
"onboarding.actions.go_to_home": "Va a tu linya prinsipala",
"onboarding.compose.template": "Ke haber, #Mastodon?",
"onboarding.follows.empty": "Malorozamente, no se pueden amostrar rezultados en este momento. Puedes aprovar uzar la bushkeda o navigar por la pajina de eksplorasyon para topar personas a las que segir, o aprovarlo de muevo mas tadre.",
+ "onboarding.follows.lead": "Tu linya prinsipala es la forma prinsipala de eksperiensa de Mastodon. Kuantas mas personas sigas, sera mas aktiva o interesante. Para ampesar, aki ay algunas sujestyones:",
"onboarding.follows.title": "Personaliza tu linya prinsipala",
"onboarding.profile.discoverable": "Faz ke mi profil apareska en bushkedas",
+ "onboarding.profile.discoverable_hint": "Kuando permites ke tu profil sea diskuvriravle en Mastodon, tus publikasyones podran apareser en rezultados de bushkedas i trendes i tu profil podra ser sujerido a personas kon intereses similares a los tuyos.",
"onboarding.profile.display_name": "Nombre amostrado",
"onboarding.profile.display_name_hint": "Tu nombre para amostrar.",
"onboarding.profile.lead": "Siempre puedes kompletar esto mas tadre en las preferensyas, ande tambien ay mas opsyones de personalizasyon.",
@@ -495,16 +535,21 @@
"onboarding.share.message": "Soy {username} en #Mastodon! Segidme en {url}",
"onboarding.share.next_steps": "Posivles sigientes pasos:",
"onboarding.share.title": "Partaja tu profil",
+ "onboarding.start.lead": "Agora eres parte de Mastodon, una red sosyala unika y desentralizada ande tu, no un algoritmo, puedes personalizar tu propya eksperyensya. Te entrodiziramos a esta mueva frontera sosyala:",
"onboarding.start.skip": "No nesesitas ayudo para ampesar?",
"onboarding.start.title": "Lo logrates!",
"onboarding.steps.follow_people.body": "El buto de Mastodon es segir a djente interesante.",
"onboarding.steps.follow_people.title": "Personaliza tu linya prinsipala",
- "onboarding.steps.publish_status.body": "Puedes introdusirte al mundo con teksto, fotos, videos o anketas {emoji}",
+ "onboarding.steps.publish_status.body": "Puedes introdusirte al mundo kon teksto, fotos, videos o anketas {emoji}",
"onboarding.steps.publish_status.title": "Eskrive tu primera publikasyon",
"onboarding.steps.setup_profile.body": "Kompleta tu profil para aumentar tus enteraksyones.",
"onboarding.steps.setup_profile.title": "Personaliza tu profil",
- "onboarding.steps.share_profile.body": "Informe a tus amigos komo toparte en Mastodon",
+ "onboarding.steps.share_profile.body": "Informa a tus amigos komo toparte en Mastodon",
"onboarding.steps.share_profile.title": "Partaja tu profil de Mastodon",
+ "onboarding.tips.2fa": "Saviyas? Puedes protejar tu kuento konfigurando la autentifikasyon de dos pasos en la konfigurasyon de tu kuento. Funksyona kon kualsekera aplikasyon de TOTP ke eskojas. No ay menester de uzar tu numero de telefon!",
+ "onboarding.tips.accounts_from_other_servers": "Saviyas? komo Mastodon es desentralizado, algunos profiles que topas estan lokalizados en sirvidores distinktos del tuyo. I malgrado esto, puedes enteraktuar kon eyos! Sus sirvidor forma la sigunda mitad de sus nombres de utilizador!",
+ "onboarding.tips.migration": "Savias? Si en el avenir pensas ke {domain} no es el sirvidor adekuado para ti, puedes moverte a otruno sirvidor de Mastodon sir pedrer a tus suivantes. Inkluzo puedes ser el balabay de tu propyo sirvidor!",
+ "onboarding.tips.verification": "Savias? Puedes verifikar tu kuento ponyendo un atadijo a tu profil de Mastodon en tu propio sitio web i adjustando el sitio a tu profil. No ay menester de pagamyentos o dokumentos!",
"password_confirmation.exceeds_maxlength": "La konfirmasyon de kod es demaziado lunga",
"password_confirmation.mismatching": "Los dos kodes son desferentes",
"picture_in_picture.restore": "Restora",
@@ -519,14 +564,15 @@
"poll_button.add_poll": "Adjusta anketa",
"poll_button.remove_poll": "Kita anketa",
"privacy.change": "Troka privasita de publikasyon",
- "privacy.direct.long": "Vizivle solo para utilizadores enmentados",
- "privacy.direct.short": "Solo personas enmentadas",
- "privacy.private.long": "Vizivle solo para suivantes",
- "privacy.private.short": "Solo suivantes",
- "privacy.public.long": "Vizivle para todos",
+ "privacy.direct.long": "Todos enmentados en la publikasyon",
+ "privacy.direct.short": "Djente espesifika",
+ "privacy.private.long": "Solo para tus suivantes",
+ "privacy.private.short": "Suivantes",
+ "privacy.public.long": "Todos en i afuera de Mastodon",
"privacy.public.short": "Publiko",
- "privacy.unlisted.long": "Vizivle para todos, ama eskluido de las fonksiones de diskuvrimyento",
- "privacy.unlisted.short": "No listado",
+ "privacy.unlisted.additional": "Esto funksyona exaktamente komo publiko, eksepto ke la publikasyon no aparesera en linyas publikas o etiketas, la eksplorasyon o bushkedas de Mastodon, inkluzo si kapasites esto para tu kuento.",
+ "privacy.unlisted.long": "Vizivle para todos, ama no en trendes, etiketas o linyas publikas",
+ "privacy.unlisted.short": "Publiko i silensyozo",
"privacy_policy.last_updated": "Ultima aktualizasyon: {date}",
"privacy_policy.title": "Politika de privasita",
"recommended": "Rekomendado",
@@ -544,7 +590,9 @@
"relative_time.minutes": "{number} m",
"relative_time.seconds": "{number} s",
"relative_time.today": "oy",
+ "reply_indicator.attachments": "{count, plural, one {# anekso} other {# aneksos}}",
"reply_indicator.cancel": "Anula",
+ "reply_indicator.poll": "Anketa",
"report.block": "Bloka",
"report.block_explanation": "No veras sus publikasyones. No podra ver tus publikasyones ni segirte. Podra saver ke le blokates.",
"report.categories.legal": "Legal",
@@ -557,7 +605,7 @@
"report.category.title_status": "publikasyon",
"report.close": "Fecho",
"report.comment.title": "Ay algo mas ke deveriamos saver?",
- "report.forward": "Reembiar a {target}",
+ "report.forward": "Reembia a {target}",
"report.forward_hint": "Este kuento es de otro sirvidor. Embiar una kopia anonimizada del raporto ayi tamyen?",
"report.mute": "Silensia",
"report.mute_explanation": "No veras sus publikasyones. Ainda pueden segirte i no va saver ke le silensiates.",
@@ -577,19 +625,19 @@
"report.rules.title": "Kualas reglas estan violadas?",
"report.statuses.subtitle": "Eskoje todas ke korespondan",
"report.statuses.title": "Ay alguna publikasyon ke suporta este raporto?",
- "report.submit": "Embiar",
+ "report.submit": "Embia",
"report.target": "Raportando a {target}",
"report.thanks.take_action": "Aki estan tus opsyones para kontrolar lo ke ves en Mastodon:",
"report.thanks.take_action_actionable": "Mientres revizamos esto, puedes tomar aksyones kontra @{name}:",
"report.thanks.title": "No keres ver esto?",
"report.thanks.title_actionable": "Mersi por raportarlo, vamos revizarlo.",
- "report.unfollow": "Desegir a @{name}",
+ "report.unfollow": "Desige a @{name}",
"report.unfollow_explanation": "Estas sigiendo este kuento. Para no ver sus publikasyones en tu linya de tiempo, puedes deshar de segirlo.",
"report_notification.attached_statuses": "{count, plural, one {{count} publikasyon} other {{count} publikasyones}} atadas",
"report_notification.categories.legal": "Legal",
"report_notification.categories.other": "Otros",
"report_notification.categories.spam": "Spam",
- "report_notification.categories.violation": "Violasion de reglas",
+ "report_notification.categories.violation": "Violasyon de reglas",
"report_notification.open": "Avre raporto",
"search.no_recent_searches": "No ay bushkedas resientes",
"search.placeholder": "Bushka",
@@ -603,7 +651,7 @@
"search_popout.full_text_search_logged_out_message": "Solo desponivle kuando estas konektado kon tu kuento.",
"search_popout.language_code": "kodiche ISO de lingua",
"search_popout.options": "Opsyones de bushkeda",
- "search_popout.quick_actions": "Aksiones rapidas",
+ "search_popout.quick_actions": "Aksyones rapidas",
"search_popout.recent": "Bushkedas resientes",
"search_popout.specific_date": "dato espesifiko",
"search_popout.user": "utilizador",
@@ -637,7 +685,7 @@
"status.direct": "Enmenta a @{name} en privado",
"status.direct_indicator": "Enmentadura privada",
"status.edit": "Edita",
- "status.edited": "Editado {date}",
+ "status.edited": "Ultima edisyon: {date}",
"status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} vezes}}",
"status.embed": "Inkrusta",
"status.favourite": "Te plaze",
@@ -680,7 +728,7 @@
"status.translate": "Trezlada",
"status.translated_from_with": "Trezladado dizde {lang} kon {provider}",
"status.uncached_media_warning": "Vista previa no desponivle",
- "status.unmute_conversation": "Desilensiar konversasyon",
+ "status.unmute_conversation": "Desilensia konversasyon",
"status.unpin": "Defiksar del profil",
"subscribed_languages.lead": "Solo publikasyones en linguas eskojidas se amostraran en tus linya de tiempo prinsipala i listas dempues del trokamiento. Eskoje dinguna para risivir publikasyones en todas las linguas.",
"subscribed_languages.save": "Guadra trokamientos",
@@ -708,10 +756,8 @@
"upload_error.poll": "No se permite kargar dosyas kon anketas.",
"upload_form.audio_description": "Deskrive para personas sodras o kon problemes auditivos",
"upload_form.description": "Deskrive para personas siegas o kon problemes vizuales",
- "upload_form.description_missing": "No adjustates deskripsion",
"upload_form.edit": "Edita",
"upload_form.thumbnail": "Troka minyatura",
- "upload_form.undo": "Efasa",
"upload_form.video_description": "Deskrive para personas sodras, kon problemes auditivos, siegas o kon problemes vizuales",
"upload_modal.analyzing_picture": "Analizando imaje…",
"upload_modal.apply": "Aplika",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 623ff2248f9ae5..5fc7d32869a676 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -1,7 +1,7 @@
{
"about.blocks": "Prižiūrimi serveriai",
- "about.contact": "Kontaktuoti:",
- "about.disclaimer": "Mastodon – nemokama atvirojo kodo programa ir Mastodon gGmbH prekės ženklas.",
+ "about.contact": "Kontaktai:",
+ "about.disclaimer": "Mastodon – tai nemokama atvirojo kodo programinė įranga ir Mastodon gGmbH prekės ženklas.",
"about.domain_blocks.no_reason_available": "Priežastis nepateikta",
"about.domain_blocks.preamble": "Mastodon paprastai leidžia peržiūrėti turinį ir bendrauti su naudotojais iš bet kurio kito fediverse esančio serverio. Šios yra išimtys, kurios buvo padarytos šiame konkrečiame serveryje.",
"about.domain_blocks.silenced.explanation": "Paprastai nematysi profilių ir turinio iš šio serverio, nebent jį aiškiai ieškosi arba pasirinksi jį sekdamas (-a).",
@@ -27,10 +27,10 @@
"account.domain_blocked": "Užblokuotas domenas",
"account.edit_profile": "Redaguoti profilį",
"account.enable_notifications": "Pranešti man, kai @{name} paskelbia",
- "account.endorse": "Rekomenduoti profilyje",
- "account.featured_tags.last_status_at": "Paskutinį kartą paskelbta {date}",
+ "account.endorse": "Rodyti profilyje",
+ "account.featured_tags.last_status_at": "Paskutinis įrašas {date}",
"account.featured_tags.last_status_never": "Nėra įrašų",
- "account.featured_tags.title": "{name} rekomenduojami saitažodžiai",
+ "account.featured_tags.title": "{name} rodomi saitažodžiai",
"account.follow": "Sekti",
"account.follow_back": "Sekti atgal",
"account.followers": "Sekėjai",
@@ -38,13 +38,13 @@
"account.followers_counter": "{count, plural, one {{counter} sekėjas} few {{counter} sekėjai} many {{counter} sekėjo} other {{counter} sekėjų}}",
"account.following": "Sekama",
"account.following_counter": "{count, plural, one {{counter} sekimas} few {{counter} sekimai} many {{counter} sekimo} other {{counter} sekimų}}",
- "account.follows.empty": "Šis (-i) naudotojas (-a) dar nieko neseka.",
+ "account.follows.empty": "Šis naudotojas dar nieko neseka.",
"account.go_to_profile": "Eiti į profilį",
"account.hide_reblogs": "Slėpti pakėlimus iš @{name}",
"account.in_memoriam": "Atminimui.",
"account.joined_short": "Prisijungė",
"account.languages": "Keisti prenumeruojamas kalbas",
- "account.link_verified_on": "Šios nuorodos nuosavybė buvo patikrinta {date}.",
+ "account.link_verified_on": "Šios nuorodos nuosavybė buvo patikrinta {date}",
"account.locked_info": "Šios paskyros privatumo būsena nustatyta kaip užrakinta. Savininkas (-ė) rankiniu būdu peržiūri, kas gali sekti.",
"account.media": "Medija",
"account.mention": "Paminėti @{name}",
@@ -53,13 +53,13 @@
"account.mute_notifications_short": "Nutildyti pranešimus",
"account.mute_short": "Nutildyti",
"account.muted": "Nutildytas",
- "account.mutual": "Abipusis",
+ "account.mutual": "Bendri",
"account.no_bio": "Nėra pateikto aprašymo.",
"account.open_original_page": "Atidaryti originalinį puslapį",
"account.posts": "Įrašai",
"account.posts_with_replies": "Įrašai ir atsakymai",
"account.report": "Pranešti apie @{name}",
- "account.requested": "Laukiama patvirtinimo. Spustelėk, jei nori atšaukti sekimo prašymą.",
+ "account.requested": "Laukiama patvirtinimo. Spustelėk, jei nori atšaukti sekimo prašymą",
"account.requested_follow": "{name} paprašė tave sekti",
"account.share": "Bendrinti @{name} profilį",
"account.show_reblogs": "Rodyti pakėlimus iš @{name}",
@@ -72,7 +72,7 @@
"account.unmute": "Atšaukti nutildymą @{name}",
"account.unmute_notifications_short": "Atšaukti nutildymą pranešimams",
"account.unmute_short": "Atšaukti nutildymą",
- "account_note.placeholder": "Spustelėk norėdamas (-a) pridėti pastabą",
+ "account_note.placeholder": "Spustelėk norint pridėti pastabą.",
"admin.dashboard.daily_retention": "Naudotojų pasilikimo rodiklis pagal dieną po registracijos",
"admin.dashboard.monthly_retention": "Naudotojų pasilikimo rodiklis pagal mėnesį po registracijos",
"admin.dashboard.retention.average": "Vidurkis",
@@ -82,29 +82,36 @@
"admin.impact_report.instance_followers": "Sekėjai, kuriuos prarastų mūsų naudotojai",
"admin.impact_report.instance_follows": "Sekėjai, kuriuos prarastų jų naudotojai",
"admin.impact_report.title": "Poveikio apibendrinimas",
- "alert.rate_limited.message": "Pabandyk vėliau po {retry_time, time, medium}.",
- "alert.rate_limited.title": "Sparta ribota",
+ "alert.rate_limited.message": "Bandyk vėliau po {retry_time, time, medium}.",
+ "alert.rate_limited.title": "Sparta ribota.",
"alert.unexpected.message": "Įvyko netikėta klaida.",
"alert.unexpected.title": "Ups!",
"announcement.announcement": "Skelbimas",
"attachments_list.unprocessed": "(neapdorotas)",
"audio.hide": "Slėpti garsą",
- "autosuggest_hashtag.per_week": "{count} per savaitę",
- "boost_modal.combo": "Gali paspausti {combo}, kad praleisti kitą kartą",
+ "block_modal.remote_users_caveat": "Paprašysime serverio {domain} gerbti tavo sprendimą. Tačiau atitiktis negarantuojama, nes kai kurie serveriai gali skirtingai tvarkyti blokavimus. Vieši įrašai vis tiek gali būti matomi neprisijungusiems naudotojams.",
+ "block_modal.show_less": "Rodyti mažiau",
+ "block_modal.show_more": "Rodyti daugiau",
+ "block_modal.they_cant_mention": "Jie negali tave paminėti ar sekti.",
+ "block_modal.they_cant_see_posts": "Jie negali matyti tavo įrašus, o tu nematysi jų.",
+ "block_modal.they_will_know": "Jie mato, kad yra užblokuoti.",
+ "block_modal.title": "Blokuoti naudotoją?",
+ "block_modal.you_wont_see_mentions": "Nematysi įrašus, kuriuose jie paminimi.",
+ "boost_modal.combo": "Galima paspausti {combo}, kad praleisti tai kitą kartą",
"bundle_column_error.copy_stacktrace": "Kopijuoti klaidos ataskaitą",
- "bundle_column_error.error.body": "Užklausos puslapio nepavyko atvaizduoti. Tai gali būti dėl mūsų kodo klaidos arba naršyklės suderinamumo problemos.",
+ "bundle_column_error.error.body": "Paprašytos puslapio nepavyko atvaizduoti. Tai gali būti dėl mūsų kodo klaidos arba naršyklės suderinamumo problemos.",
"bundle_column_error.error.title": "O, ne!",
"bundle_column_error.network.body": "Bandant užkrauti šį puslapį įvyko klaida. Tai galėjo atsitikti dėl laikinos tavo interneto ryšio arba šio serverio problemos.",
"bundle_column_error.network.title": "Tinklo klaida",
"bundle_column_error.retry": "Bandyti dar kartą",
- "bundle_column_error.return": "Grįžti į pradžią",
+ "bundle_column_error.return": "Grįžti į pagrindinį",
"bundle_column_error.routing.body": "Prašyto puslapio nepavyko rasti. Ar esi tikras (-a), kad adreso juostoje nurodytas URL adresas yra teisingas?",
"bundle_column_error.routing.title": "404",
"bundle_modal_error.close": "Uždaryti",
"bundle_modal_error.message": "Kraunant šį komponentą kažkas nepavyko.",
"bundle_modal_error.retry": "Bandyti dar kartą",
"closed_registrations.other_server_instructions": "Kadangi Mastodon yra decentralizuotas, gali susikurti paskyrą kitame serveryje ir vis tiek bendrauti su šiuo serveriu.",
- "closed_registrations_modal.description": "Sukurti paskyrą {domain} šiuo metu neįmanoma, tačiau nepamiršk, kad norint naudotis Mastodon nebūtina turėti paskyrą domene {domain}.",
+ "closed_registrations_modal.description": "Sukurti paskyrą {domain} šiuo metu neįmanoma, bet nepamiršk, kad norint naudotis Mastodon nebūtina turėti paskyrą domene {domain}.",
"closed_registrations_modal.find_another_server": "Rasti kitą serverį",
"closed_registrations_modal.preamble": "Mastodon yra decentralizuotas, todėl nesvarbu, kur susikursi paskyrą, galėsi sekti ir bendrauti su bet kuriuo šiame serveryje esančiu asmeniu. Jį gali net savarankiškai talpinti!",
"closed_registrations_modal.title": "Užsiregistruoti Mastodon",
@@ -115,9 +122,9 @@
"column.direct": "Privatūs paminėjimai",
"column.directory": "Naršyti profilius",
"column.domain_blocks": "Užblokuoti domenai",
- "column.favourites": "Mėgstamiausi",
+ "column.favourites": "Mėgstami",
"column.firehose": "Tiesioginiai srautai",
- "column.follow_requests": "Sekimo prašymus",
+ "column.follow_requests": "Sekimo prašymai",
"column.home": "Pagrindinis",
"column.lists": "Sąrašai",
"column.mutes": "Nutildyti naudotojai",
@@ -132,7 +139,7 @@
"column_header.show_settings": "Rodyti nustatymus",
"column_header.unpin": "Atsegti",
"column_subheading.settings": "Nustatymai",
- "community.column_settings.local_only": "Tik vietinis",
+ "community.column_settings.local_only": "Tik vietinė",
"community.column_settings.media_only": "Tik medija",
"community.column_settings.remote_only": "Tik nuotolinis",
"compose.language.change": "Keisti kalbą",
@@ -141,52 +148,48 @@
"compose.published.open": "Atidaryti",
"compose.saved.body": "Įrašas išsaugotas.",
"compose_form.direct_message_warning_learn_more": "Sužinoti daugiau",
- "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
- "compose_form.hashtag_warning": "Šis įrašas nebus įtraukta į jokį saitažodį, nes ji nėra vieša. Tik viešų įrašų galima ieškoti pagal saitažodį.",
+ "compose_form.encryption_warning": "Mastodon įrašai nėra visapusiškai šifruojami. Per Mastodon nesidalyk jokia slapta informacija.",
+ "compose_form.hashtag_warning": "Šis įrašas nebus įtrauktas į jokį saitažodį, nes ji nėra vieša. Tik viešų įrašų galima ieškoti pagal saitažodį.",
"compose_form.lock_disclaimer": "Tavo paskyra nėra {locked}. Bet kas gali sekti tave ir peržiūrėti tik sekėjams skirtus įrašus.",
"compose_form.lock_disclaimer.lock": "užrakinta",
"compose_form.placeholder": "Kas tavo mintyse?",
- "compose_form.poll.add_option": "Pridėti pasirinkimą",
"compose_form.poll.duration": "Apklausos trukmė",
- "compose_form.poll.option_placeholder": "{number} pasirinkimas",
- "compose_form.poll.remove_option": "Pašalinti šį pasirinkimą",
+ "compose_form.poll.multiple": "Keli pasirinkimai",
+ "compose_form.poll.option_placeholder": "{number} parinktis",
+ "compose_form.poll.single": "Pasirinkti vieną",
"compose_form.poll.switch_to_multiple": "Keisti apklausą, kad būtų galima pasirinkti kelis pasirinkimus",
- "compose_form.poll.switch_to_single": "Pakeisti apklausą, kad būtų galima pasirinkti vieną variantą",
+ "compose_form.poll.switch_to_single": "Keisti apklausą, kad būtų galima pasirinkti vieną pasirinkimą",
+ "compose_form.poll.type": "Stilius",
"compose_form.publish": "Skelbti",
"compose_form.publish_form": "Naujas įrašas",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Išsaugoti pakeitimus",
- "compose_form.sensitive.hide": "{count, plural, one {Žymėti mediją kaip jautrią} few {Žymėti medijas kaip jautrias} many {Žymėti medijo kaip jautrio} other {Žymėti medijų kaip jautrių}}",
- "compose_form.sensitive.marked": "{count, plural, one {Medija pažymėta kaip jautri} few {Medijos pažymėtos kaip jautrios} many {Medijo pažymėta kaip jautrio} other {Medijų pažymėtų kaip jautrių}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Medija nepažymėta kaip jautri} few {Medijos nepažymėtos kaip jautrios} many {Medijo nepažymėta kaip jautrio} other {Medijų nepažymėtų kaip jautrių}}",
+ "compose_form.reply": "Atsakyti",
+ "compose_form.save_changes": "Atnaujinti",
"compose_form.spoiler.marked": "Pašalinti turinio įspėjimą",
"compose_form.spoiler.unmarked": "Pridėti turinio įspėjimą",
- "compose_form.spoiler_placeholder": "Rašyk savo įspėjimą čia",
+ "compose_form.spoiler_placeholder": "Turinio įspėjimas (pasirinktinis)",
"confirmation_modal.cancel": "Atšaukti",
- "confirmations.block.block_and_report": "Blokuoti ir pranešti",
"confirmations.block.confirm": "Blokuoti",
- "confirmations.block.message": "Ar tikrai nori užblokuoti {name}?",
"confirmations.cancel_follow_request.confirm": "Atšaukti prašymą",
"confirmations.cancel_follow_request.message": "Ar tikrai nori atšaukti savo prašymą sekti {name}?",
"confirmations.delete.confirm": "Ištrinti",
- "confirmations.delete.message": "Are you sure you want to delete this status?",
+ "confirmations.delete.message": "Ar tikrai nori ištrinti šį įrašą?",
"confirmations.delete_list.confirm": "Ištrinti",
"confirmations.delete_list.message": "Ar tikrai nori visam laikui ištrinti šį sąrašą?",
"confirmations.discard_edit_media.confirm": "Atmesti",
"confirmations.discard_edit_media.message": "Turi neišsaugotų medijos aprašymo ar peržiūros pakeitimų, vis tiek juos atmesti?",
- "confirmations.domain_block.confirm": "Hide entire domain",
+ "confirmations.domain_block.confirm": "Blokuoti serverį",
+ "confirmations.domain_block.message": "Ar tikrai, tikrai nori užblokuoti visą {domain}? Daugeliu atvejų užtenka kelių tikslinių blokavimų arba nutildymų. Šio domeno turinio nematysi jokiose viešose laiko skalėse ar pranešimuose. Tavo sekėjai iš to domeno bus pašalinti.",
"confirmations.edit.confirm": "Redaguoti",
"confirmations.edit.message": "Redaguojant dabar, bus perrašyta šiuo metu kuriama žinutė. Ar tikrai nori tęsti?",
"confirmations.logout.confirm": "Atsijungti",
"confirmations.logout.message": "Ar tikrai nori atsijungti?",
"confirmations.mute.confirm": "Nutildyti",
- "confirmations.mute.explanation": "Tai paslėps jų įrašus ir įrašus, kuriuose jie menėmi, tačiau jie vis tiek galės matyti tavo įrašus ir sekti.",
- "confirmations.mute.message": "Ar tikrai norite nutildyti {name}?",
"confirmations.redraft.confirm": "Ištrinti ir perrašyti",
+ "confirmations.redraft.message": "Ar tikrai nori ištrinti šį įrašą ir parašyti jį iš naujo? Bus prarastos mėgstamai ir pakėlimai, o atsakymai į originalinį įrašą taps liekamojais.",
"confirmations.reply.confirm": "Atsakyti",
- "confirmations.reply.message": "Atsakant dabar, bus perrašyta metu kuriama žinutė. Ar tikrai nori tęsti?",
+ "confirmations.reply.message": "Atsakant dabar, bus perrašyta šiuo metu kuriama žinutė. Ar tikrai nori tęsti?",
"confirmations.unfollow.confirm": "Nebesekti",
- "confirmations.unfollow.message": "Ar tikrai norite atsisakyti sekimo {name}?",
+ "confirmations.unfollow.message": "Ar tikrai nori nebesekti {name}?",
"conversation.delete": "Ištrinti pokalbį",
"conversation.mark_as_read": "Žymėti kaip skaitytą",
"conversation.open": "Peržiūrėti pokalbį",
@@ -194,85 +197,131 @@
"copy_icon_button.copied": "Nukopijuota į iškarpinę",
"copypaste.copied": "Nukopijuota",
"copypaste.copy_to_clipboard": "Kopijuoti į iškarpinę",
- "directory.local": "Iš {domain} tik",
- "directory.new_arrivals": "Naujos prekės",
- "directory.recently_active": "Neseniai aktyvus",
+ "directory.federated": "Iš žinomų fediversų",
+ "directory.local": "Tik iš {domain}",
+ "directory.new_arrivals": "Nauji atvykėliai",
+ "directory.recently_active": "Neseniai aktyvus (-i)",
"disabled_account_banner.account_settings": "Paskyros nustatymai",
- "disabled_account_banner.text": "Jūsų paskyra {disabledAccount} šiuo metu yra išjungta.",
+ "disabled_account_banner.text": "Tavo paskyra {disabledAccount} šiuo metu yra išjungta.",
+ "dismissable_banner.community_timeline": "Tai – naujausi vieši įrašai iš žmonių, kurių paskyros talpinamos {domain}.",
"dismissable_banner.dismiss": "Atmesti",
- "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
- "dismissable_banner.explore_statuses": "Tai įrašai iš viso socialinio tinklo, kurie šiandien sulaukia vis daugiau dėmesio. Naujesni įrašai, turintys daugiau boosts ir mėgstamiausių įrašų, yra vertinami aukščiau.",
- "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
- "embed.instructions": "Embed this status on your website by copying the code below.",
+ "dismissable_banner.explore_links": "Tai – naujienos, kuriomis šiandien daugiausiai bendrinamasi socialiniame žiniatinklyje. Naujesnės naujienų istorijos, kurias paskelbė daugiau skirtingų žmonių, vertinamos aukščiau.",
+ "dismissable_banner.explore_statuses": "Tai – įrašai iš viso socialinio žiniatinklio, kurie šiandien sulaukia daug dėmesio. Naujesni įrašai, turintys daugiau pakėlimų ir mėgstamų, vertinami aukščiau.",
+ "dismissable_banner.explore_tags": "Tai – saitažodžiai, kurie šiandien sulaukia daug dėmesio socialiniame žiniatinklyje. Saitažodžiai, kuriuos naudoja daugiau skirtingų žmonių, vertinami aukščiau.",
+ "dismissable_banner.public_timeline": "Tai – naujausi vieši įrašai iš žmonių socialiniame žiniatinklyje, kuriuos seka {domain} žmonės.",
+ "domain_block_modal.block": "Blokuoti serverį",
+ "domain_block_modal.block_account_instead": "Blokuoti {name} vietoj to",
+ "domain_block_modal.they_can_interact_with_old_posts": "Žmonės iš šio serverio gali sąveikauti su tavo senomis įrašomis.",
+ "domain_block_modal.they_cant_follow": "Niekas iš šio serverio negali tavęs sekti.",
+ "domain_block_modal.they_wont_know": "Jie nežinos, kad buvo užblokuoti.",
+ "domain_block_modal.title": "Blokuoti domeną?",
+ "domain_block_modal.you_will_lose_followers": "Visi tavo sekėjai iš šio serverio bus pašalinti.",
+ "domain_block_modal.you_wont_see_posts": "Nematysi naudotojų įrašų ar pranešimų šiame serveryje.",
+ "domain_pill.activitypub_lets_connect": "Tai leidžia tau sąveikauti su žmonėmis ne tik Mastodon, bet ir įvairiose socialinėse programėlėse.",
+ "domain_pill.activitypub_like_language": "ActivityPub – tai tarsi kalba, kuria Mastodon kalba su kitais socialiniais tinklais.",
+ "domain_pill.server": "Serveris",
+ "domain_pill.their_handle": "Jų socialinis medijos vardas:",
+ "domain_pill.their_server": "Jų skaitmeniniai namai, kuriuose saugomi visi jų įrašai.",
+ "domain_pill.their_username": "Jų unikalus identifikatorius jų serveryje. Skirtinguose serveriuose galima rasti naudotojų, turinčių tą patį naudotojo vardą.",
+ "domain_pill.username": "Naudotojo vardas",
+ "domain_pill.whats_in_a_handle": "Kas yra socialiniame medijos varde?",
+ "domain_pill.who_they_are": "Kadangi socialines medijos vardai nurodo, kas žmogus yra ir kur jie yra, gali sąveikauti su žmonėmis visame socialiniame žiniatinklyje, kurį sudaro .",
+ "domain_pill.who_you_are": "Kadangi tavo socialinis medijos vardas nurodo, kas esi ir kur esi, žmonės gali sąveikauti su tavimi visame socialiniame tinkle, kurį sudaro .",
+ "domain_pill.your_handle": "Tavo socialinis medijos vardas:",
+ "domain_pill.your_server": "Tavo skaitmeniniai namai, kuriuose saugomi visi tavo įrašai. Nepatinka šis? Bet kada perkelk serverius ir atsivesk ir savo sekėjus.",
+ "domain_pill.your_username": "Tavo unikalus identifikatorius šiame serveryje. Skirtinguose serveriuose galima rasti naudotojų su tuo pačiu naudotojo vardu.",
+ "embed.instructions": "Įterpk šį įrašą į savo svetainę nukopijavus (-usi) toliau pateiktą kodą.",
"embed.preview": "Štai kaip tai atrodys:",
"emoji_button.activity": "Veikla",
"emoji_button.clear": "Išvalyti",
"emoji_button.custom": "Pasirinktinis",
"emoji_button.flags": "Vėliavos",
- "emoji_button.food": "Maistas ir Gėrimai",
- "emoji_button.label": "Įterpti veidelius",
+ "emoji_button.food": "Maistas ir gėrimai",
+ "emoji_button.label": "Įterpti jaustuką",
"emoji_button.nature": "Gamta",
- "emoji_button.not_found": "Nerasta jokių tinkamų jaustukų",
+ "emoji_button.not_found": "Nerasta jokių tinkamų jaustukų.",
"emoji_button.objects": "Objektai",
"emoji_button.people": "Žmonės",
- "emoji_button.recent": "Dažniausiai naudojama",
- "emoji_button.search": "Paieška...",
+ "emoji_button.recent": "Dažniausiai naudojami",
+ "emoji_button.search": "Ieškoti...",
"emoji_button.search_results": "Paieškos rezultatai",
"emoji_button.symbols": "Simboliai",
- "emoji_button.travel": "Kelionės ir Vietos",
- "empty_column.account_hides_collections": "Šis naudotojas (-a) pasirinko nepadaryti šią informaciją prieinamą",
- "empty_column.account_suspended": "Paskyra sustabdyta",
- "empty_column.account_timeline": "No toots here!",
- "empty_column.account_unavailable": "Profilis neprieinamas",
- "empty_column.blocks": "Dar neužblokavote nė vieno naudotojo.",
- "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
- "empty_column.community": "Vietinė laiko juosta yra tuščia. Parašykite ką nors viešai, kad pradėtumėte veikti!",
- "empty_column.direct": "Dar neturite jokių privačių paminėjimų. Kai išsiųsite arba gausite tokį pranešimą, jis bus rodomas čia.",
- "empty_column.domain_blocks": "There are no hidden domains yet.",
- "empty_column.favourited_statuses": "Dar neturite mėgstamiausių įrašų. Kai vieną iš jų pamėgsite, jis bus rodomas čia.",
- "empty_column.follow_requests": "Dar neturite jokių sekimo užklausų. Kai gausite tokį prašymą, jis bus rodomas čia.",
- "empty_column.followed_tags": "Dar nesekėte jokių grotažymių. Kai tai padarysite, jie bus rodomi čia.",
+ "emoji_button.travel": "Kelionės ir vietos",
+ "empty_column.account_hides_collections": "Šis (-i) naudotojas (-a) pasirinko nepadaryti šią informaciją prieinamą.",
+ "empty_column.account_suspended": "Paskyra pristabdyta.",
+ "empty_column.account_timeline": "Nėra čia įrašų.",
+ "empty_column.account_unavailable": "Profilis neprieinamas.",
+ "empty_column.blocks": "Dar neužblokavai nė vieno naudotojo.",
+ "empty_column.bookmarked_statuses": "Dar neturi nė vienos įrašo pridėtos žymės. Kai vieną iš jų pridėsi į žymes, jis bus rodomas čia.",
+ "empty_column.community": "Vietinė laiko skalė yra tuščia. Parašyk ką nors viešai, kad pradėtum sąveikauti.",
+ "empty_column.direct": "Dar neturi jokių privačių paminėjimų. Kai išsiųsi arba gausi vieną iš jų, jis bus rodomas čia.",
+ "empty_column.domain_blocks": "Dar nėra užblokuotų domenų.",
+ "empty_column.explore_statuses": "Šiuo metu niekas nėra tendencinga. Patikrink vėliau!",
+ "empty_column.favourited_statuses": "Dar neturi mėgstamų įrašų. Kai vieną iš jų pamėgsi, jis bus rodomas čia.",
+ "empty_column.favourites": "Šio įrašo dar niekas nepamėgo. Kai kas nors tai padarys, jie bus rodomi čia.",
+ "empty_column.follow_requests": "Dar neturi jokių sekimo prašymų. Kai gausi tokį prašymą, jis bus rodomas čia.",
+ "empty_column.followed_tags": "Dar neseki jokių saitažodžių. Kai tai padarysi, jie bus rodomi čia.",
"empty_column.hashtag": "Nėra nieko šiame saitažodyje kol kas.",
- "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
- "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
- "empty_column.lists": "Dar neturite jokių sąrašų. Kai jį sukursite, jis bus rodomas čia.",
- "empty_column.mutes": "Dar nesate nutildę nė vieno naudotojo.",
- "empty_column.notifications": "Dar neturite jokių pranešimų. Kai kiti žmonės su jumis bendraus, matysite tai čia.",
- "empty_column.public": "Čia nieko nėra! Parašykite ką nors viešai arba rankiniu būdu sekite naudotojus iš kitų serverių, kad jį užpildytumėte",
- "error.unexpected_crash.explanation": "Dėl mūsų kodo klaidos arba naršyklės suderinamumo problemos šis puslapis negalėjo būti rodomas teisingai.",
- "error.unexpected_crash.explanation_addons": "Šį puslapį nepavyko teisingai parodyti. Šią klaidą greičiausiai sukėlė naršyklės priedas arba automatinio vertimo įrankiai.",
- "error.unexpected_crash.next_steps": "Pabandykite atnaujinti puslapį. Jei tai nepadeda, galbūt vis dar galėsite naudotis \"Mastodon\" naudodami kitą naršyklę arba vietinę programėlę.",
- "error.unexpected_crash.next_steps_addons": "Pabandykite juos išjungti ir atnaujinti puslapį. Jei tai nepadeda, galbūt vis dar galėsite naudotis \"Mastodon\" naudodami kitą naršyklę arba vietinę programėlę.",
- "errors.unexpected_crash.report_issue": "Pranešti apie triktį",
+ "empty_column.home": "Tavo pagrindinio laiko skalė tuščia. Sek daugiau žmonių, kad ją užpildytum.",
+ "empty_column.list": "Nėra nieko šiame sąraše kol kas. Kai šio sąrašo nariai paskelbs naujų įrašų, jie bus rodomi čia.",
+ "empty_column.lists": "Dar neturi jokių sąrašų. Kai jį sukursi, jis bus rodomas čia.",
+ "empty_column.mutes": "Dar nesi nutildęs (-usi) nė vieno naudotojo.",
+ "empty_column.notification_requests": "Viskas švaru! Čia nieko nėra. Kai gausi naujų pranešimų, jie bus rodomi čia pagal tavo nustatymus.",
+ "empty_column.notifications": "Dar neturi jokių pranešimų. Kai kiti žmonės su tavimi sąveikaus, matysi tai čia.",
+ "empty_column.public": "Čia nieko nėra. Parašyk ką nors viešai arba rankiniu būdu sek naudotojus iš kitų serverių, kad jį užpildytum.",
+ "error.unexpected_crash.explanation": "Dėl mūsų kodo riktos arba naršyklės suderinamumo problemos šis puslapis negalėjo būti rodomas teisingai.",
+ "error.unexpected_crash.explanation_addons": "Šį puslapį nepavyko parodyti teisingai. Šią klaidą greičiausiai sukėlė naršyklės priedas arba automatinio vertimo įrankiai.",
+ "error.unexpected_crash.next_steps": "Pabandyk atnaujinti puslapį. Jei tai nepadeda, galbūt vis dar galėsi naudotis Mastodon per kitą naršyklę arba savąją programėlę.",
+ "error.unexpected_crash.next_steps_addons": "Pabandyk juos išjungti ir atnaujinti puslapį. Jei tai nepadeda, galbūt vis dar galėsi naudotis Mastodon per kitą naršyklę arba savąją programėlę.",
+ "errors.unexpected_crash.copy_stacktrace": "Kopijuoti dėklo eigą į iškarpinę",
+ "errors.unexpected_crash.report_issue": "Pranešti apie problemą",
"explore.search_results": "Paieškos rezultatai",
"explore.suggested_follows": "Žmonės",
"explore.title": "Naršyti",
"explore.trending_links": "Naujienos",
"explore.trending_statuses": "Įrašai",
"explore.trending_tags": "Saitažodžiai",
- "filter_modal.added.context_mismatch_explanation": "Ši filtro kategorija netaikoma kontekste, kuriame peržiūrėjote šį pranešimą. Jei norite, kad pranešimas būtų filtruojamas ir šiame kontekste, turėsite redaguoti filtrą.",
- "filter_modal.added.context_mismatch_title": "Konteksto neatitikimas!",
- "filter_modal.added.expired_explanation": "Ši filtro kategorija nustojo galioti, kad ji būtų taikoma, turėsite pakeisti galiojimo datą.",
- "filter_modal.added.expired_title": "Pasibaigė filtro galiojimo laikas!",
- "filter_modal.added.review_and_configure": "Norėdami peržiūrėti ir toliau konfigūruoti šią filtro kategoriją, eikite į {settings_link}.",
- "filter_modal.added.review_and_configure_title": "Filtro nuostatos",
- "filter_modal.added.settings_link": "nustatymų puslapis",
- "filter_modal.added.short_explanation": "Šis pranešimas buvo įtrauktas į šią filtro kategoriją: {title}.",
- "filter_modal.added.title": "Pridėtas filtras!",
- "filter_modal.select_filter.context_mismatch": "netaikoma šiame kontekste",
- "filter_modal.select_filter.expired": "nebegalioja",
+ "filter_modal.added.context_mismatch_explanation": "Ši filtro kategorija netaikoma kontekstui, kuriame peržiūrėjai šį įrašą. Jei nori, kad įrašas būtų filtruojamas ir šiame kontekste, turėsi redaguoti filtrą.",
+ "filter_modal.added.context_mismatch_title": "Konteksto neatitikimas.",
+ "filter_modal.added.expired_explanation": "Ši filtro kategorija nustojo galioti. Kad ji būtų taikoma, turėsi pakeisti galiojimo datą.",
+ "filter_modal.added.expired_title": "Baigėsi filtro galiojimas.",
+ "filter_modal.added.review_and_configure": "Norint peržiūrėti ir toliau konfigūruoti šią filtro kategoriją, eik į {settings_link}.",
+ "filter_modal.added.review_and_configure_title": "Filtro nustatymai",
+ "filter_modal.added.settings_link": "nustatymų puslapį",
+ "filter_modal.added.short_explanation": "Šis įrašas buvo pridėtas į šią filtro kategoriją: {title}.",
+ "filter_modal.added.title": "Pridėtas filtras.",
+ "filter_modal.select_filter.context_mismatch": "netaikoma šiame kontekste.",
+ "filter_modal.select_filter.expired": "nebegalioja.",
"filter_modal.select_filter.prompt_new": "Nauja kategorija: {name}",
"filter_modal.select_filter.search": "Ieškoti arba sukurti",
- "filter_modal.select_filter.subtitle": "Naudoti esamą kategoriją arba sukurti naują",
+ "filter_modal.select_filter.subtitle": "Naudok esamą kategoriją arba sukurk naują.",
"filter_modal.select_filter.title": "Filtruoti šį įrašą",
- "filter_modal.title.status": "Filtruoti šį įrašą",
+ "filter_modal.title.status": "Filtruoti įrašą",
+ "filtered_notifications_banner.mentions": "{count, plural, one {paminėjimas} few {paminėjimai} many {paminėjimo} other {paminėjimų}}",
+ "filtered_notifications_banner.pending_requests": "Pranešimai iš {count, plural, =0 {nė vieno} one {vienos žmogaus} few {# žmonių} many {# žmonių} other {# žmonių}}, kuriuos galbūt pažįsti",
+ "filtered_notifications_banner.title": "Filtruojami pranešimai",
"firehose.all": "Visi",
"firehose.local": "Šis serveris",
"firehose.remote": "Kiti serveriai",
- "follow_request.authorize": "Autorizuoti",
+ "follow_request.authorize": "Leisti",
"follow_request.reject": "Atmesti",
- "follow_requests.unlocked_explanation": "Nors tavo paskyra neužrakinta, {domain} personalas mano, kad galbūt norėsi rankiniu būdu patikrinti šių paskyrų sekimo užklausas.",
- "followed_tags": "Sekamos saitažodžiai",
+ "follow_requests.unlocked_explanation": "Nors tavo paskyra neužrakinta, {domain} personalas mano, kad galbūt norėsi rankiniu būdu patikrinti šių paskyrų sekimo prašymus.",
+ "follow_suggestions.curated_suggestion": "Personalo pasirinkimai",
+ "follow_suggestions.dismiss": "Daugiau nerodyti",
+ "follow_suggestions.featured_longer": "Rankomis atrinkta {domain} komanda",
+ "follow_suggestions.friends_of_friends_longer": "Populiarus tarp žmonių, kurių seki",
+ "follow_suggestions.hints.featured": "Šį profilį atrinko {domain} komanda.",
+ "follow_suggestions.hints.friends_of_friends": "Šis profilis yra populiarus tarp žmonių, kuriuos seki.",
+ "follow_suggestions.hints.most_followed": "Šis profilis yra vienas iš labiausiai sekamų domene {domain}.",
+ "follow_suggestions.hints.most_interactions": "Pastaruoju metu šis profilis sulaukia daug dėmesio domane {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Šis profilis panašus į profilius, kuriuos neseniai sekei.",
+ "follow_suggestions.personalized_suggestion": "Suasmenintas pasiūlymas",
+ "follow_suggestions.popular_suggestion": "Populiarus pasiūlymas",
+ "follow_suggestions.popular_suggestion_longer": "Populiarus domene {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Panašūs į profilius, kuriuos neseniai seki",
+ "follow_suggestions.view_all": "Peržiūrėti viską",
+ "follow_suggestions.who_to_follow": "Ką sekti",
+ "followed_tags": "Sekami saitažodžiai",
"footer.about": "Apie",
"footer.directory": "Profilių katalogas",
"footer.get_app": "Gauti programėlę",
@@ -280,222 +329,300 @@
"footer.keyboard_shortcuts": "Spartieji klavišai",
"footer.privacy_policy": "Privatumo politika",
"footer.source_code": "Peržiūrėti šaltinio kodą",
- "footer.status": "Būsena",
- "generic.saved": "Išsaugoti",
- "getting_started.heading": "Pradedant",
+ "footer.status": "Statusas",
+ "generic.saved": "Išsaugota",
+ "getting_started.heading": "Kaip pradėti",
"hashtag.column_header.tag_mode.all": "ir {additional}",
"hashtag.column_header.tag_mode.any": "ar {additional}",
"hashtag.column_header.tag_mode.none": "be {additional}",
- "hashtag.column_settings.select.no_options_message": "Pasiūlymų nerasta",
- "hashtag.column_settings.select.placeholder": "Įvesti grotažymes…",
+ "hashtag.column_settings.select.no_options_message": "Pasiūlymų nerasta.",
+ "hashtag.column_settings.select.placeholder": "Įvesti saitažodžius…",
"hashtag.column_settings.tag_mode.all": "Visi šie",
- "hashtag.column_settings.tag_mode.any": "Bet kuris šių",
+ "hashtag.column_settings.tag_mode.any": "Bet kuris iš šių",
"hashtag.column_settings.tag_mode.none": "Nė vienas iš šių",
- "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
- "hashtag.counter_by_accounts": "{count, plural,one {{counter} dalyvis}other {{counter} dalyviai}}",
- "hashtag.counter_by_uses": "{count, plural, one {{counter} įrašas} other {{counter} įrašų}}",
- "hashtag.counter_by_uses_today": "{count, plural, one {{counter} įrašas} other {{counter} įrašų}} šiandien",
- "hashtag.follow": "Sekti grotažymę",
- "hashtag.unfollow": "Nesekti grotažymės",
- "hashtags.and_other": "…ir{count, plural,other {#daugiau}}",
- "home.actions.go_to_explore": "Žiūrėti kas populiaru",
- "home.actions.go_to_suggestions": "Rasti žmonių sekimui",
- "home.column_settings.basic": "Pagrindinis",
- "home.column_settings.show_reblogs": "Rodyti \"boosts\"",
+ "hashtag.column_settings.tag_toggle": "Įtraukti papildomas šio stulpelio žymes",
+ "hashtag.counter_by_accounts": "{count, plural, one {{counter} dalyvis} few {{counter} dalyviai} many {{counter} dalyvio} other {{counter} dalyvių}}",
+ "hashtag.counter_by_uses": "{count, plural, one {{counter} įrašas} few {{counter} įrašai} many {{counter} įrašo} other {{counter} įrašų}}",
+ "hashtag.counter_by_uses_today": "{count, plural, one {{counter} įrašas} few {{counter} įrašai} many {{counter} įrašo} other {{counter} įrašų}} šiandien",
+ "hashtag.follow": "Sekti saitažodį",
+ "hashtag.unfollow": "Nebesekti saitažodį",
+ "hashtags.and_other": "…ir {count, plural, one {# daugiau} few {# daugiau} many {# daugiau}other {# daugiau}}",
+ "home.column_settings.show_reblogs": "Rodyti pakėlimus",
"home.column_settings.show_replies": "Rodyti atsakymus",
"home.hide_announcements": "Slėpti skelbimus",
+ "home.pending_critical_update.body": "Kuo greičiau atnaujink savo Mastodon serverį.",
+ "home.pending_critical_update.link": "Žiūrėti naujinimus",
+ "home.pending_critical_update.title": "Galimas kritinis saugumo naujinimas.",
+ "home.show_announcements": "Rodyti skelbimus",
+ "interaction_modal.description.favourite": "Su Mastodon paskyra gali pamėgti šį įrašą, kad autorius (-ė) žinotų, jog vertinti tai ir išsaugoti jį vėliau.",
+ "interaction_modal.description.follow": "Su Mastodon paskyra gali sekti {name}, kad gautum jų įrašus į pagrindinį srautą.",
+ "interaction_modal.description.reblog": "Su Mastodon paskyra gali pakelti šią įrašą ir pasidalyti juo su savo sekėjais.",
+ "interaction_modal.description.reply": "Su Mastodon paskyra gali atsakyti į šį įrašą.",
+ "interaction_modal.login.action": "Į pagrindinį puslapį",
+ "interaction_modal.login.prompt": "Tavo pagrindinio serverio domenas, pvz., mastodon.social.",
"interaction_modal.no_account_yet": "Nesi Mastodon?",
"interaction_modal.on_another_server": "Kitame serveryje",
"interaction_modal.on_this_server": "Šiame serveryje",
- "interaction_modal.sign_in": "Nesi prisijungęs (-usi) prie šio serverio. Kur yra laikoma tavo paskyra?",
+ "interaction_modal.sign_in": "Nesi prisijungęs (-usi) prie šio serverio. Kur yra talpinama tavo paskyra?",
"interaction_modal.sign_in_hint": "Patarimas: tai svetainė, kurioje užsiregistravai. Jei neprisimeni, ieškok sveikinimo el. laiško savo pašto dėžutėje. Taip pat gali įvesti visą savo naudotojo vardą (pvz., @Mastodon@mastodon.social).",
- "interaction_modal.title.favourite": "Mėgstamiausias {name} įrašas",
- "keyboard_shortcuts.back": "to navigate back",
- "keyboard_shortcuts.blocked": "to open blocked users list",
- "keyboard_shortcuts.boost": "to boost",
- "keyboard_shortcuts.column": "to focus a status in one of the columns",
- "keyboard_shortcuts.compose": "to focus the compose textarea",
- "keyboard_shortcuts.direct": "to open direct messages column",
- "keyboard_shortcuts.down": "to move down in the list",
- "keyboard_shortcuts.enter": "to open status",
- "keyboard_shortcuts.federated": "to open federated timeline",
- "keyboard_shortcuts.heading": "Keyboard Shortcuts",
- "keyboard_shortcuts.home": "to open home timeline",
+ "interaction_modal.title.favourite": "Pamėgti {name} įrašą",
+ "interaction_modal.title.follow": "Sekti {name}",
+ "interaction_modal.title.reblog": "Pakelti {name} įrašą",
+ "interaction_modal.title.reply": "Atsakyti į {name} įrašą",
+ "intervals.full.days": "{number, plural, one {# diena} few {# dienos} many {# dienos} other {# dienų}}",
+ "intervals.full.hours": "{number, plural, one {# valanda} few {# valandos} many {# valandos} other {# valandų}}",
+ "intervals.full.minutes": "{number, plural, one {# minutė} few {# minutes} many {# minutės} other {# minučių}}",
+ "keyboard_shortcuts.back": "Naršyti atgal",
+ "keyboard_shortcuts.blocked": "Atidaryti užblokuotų naudotojų sąrašą",
+ "keyboard_shortcuts.boost": "Pakelti įrašą",
+ "keyboard_shortcuts.column": "Fokusuoti stulpelį",
+ "keyboard_shortcuts.compose": "Fokusuoti rengykles teksto sritį",
+ "keyboard_shortcuts.description": "Aprašymas",
+ "keyboard_shortcuts.direct": "atidaryti privačių paminėjimų stulpelį",
+ "keyboard_shortcuts.down": "Perkelti žemyn sąraše",
+ "keyboard_shortcuts.enter": "Atidaryti įrašą",
+ "keyboard_shortcuts.favourite": "Pamėgti įrašą",
+ "keyboard_shortcuts.favourites": "Atidaryti mėgstamųjų sąrašą",
+ "keyboard_shortcuts.federated": "Atidaryti federacinę laiko skalę",
+ "keyboard_shortcuts.heading": "Spartieji klavišai",
+ "keyboard_shortcuts.home": "Atidaryti pagrindinį laiko skalę",
"keyboard_shortcuts.hotkey": "Spartusis klavišas",
- "keyboard_shortcuts.legend": "to display this legend",
- "keyboard_shortcuts.local": "to open local timeline",
- "keyboard_shortcuts.mention": "to mention author",
- "keyboard_shortcuts.muted": "to open muted users list",
- "keyboard_shortcuts.my_profile": "to open your profile",
- "keyboard_shortcuts.notifications": "to open notifications column",
+ "keyboard_shortcuts.legend": "Rodyti šią legendą",
+ "keyboard_shortcuts.local": "Atidaryti vietinę laiko skalę",
+ "keyboard_shortcuts.mention": "Paminėti autorių (-ę)",
+ "keyboard_shortcuts.muted": "Atidaryti nutildytų naudotojų sąrašą",
+ "keyboard_shortcuts.my_profile": "Atidaryti savo profilį",
+ "keyboard_shortcuts.notifications": "Atidaryti pranešimų stulpelį",
"keyboard_shortcuts.open_media": "Atidaryti mediją",
- "keyboard_shortcuts.pinned": "to open pinned toots list",
- "keyboard_shortcuts.profile": "to open author's profile",
- "keyboard_shortcuts.reply": "to reply",
- "keyboard_shortcuts.requests": "to open follow requests list",
- "keyboard_shortcuts.search": "to focus search",
- "keyboard_shortcuts.spoilers": "to show/hide CW field",
- "keyboard_shortcuts.start": "to open \"get started\" column",
- "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+ "keyboard_shortcuts.pinned": "Atidaryti prisegtų įrašų sąrašą",
+ "keyboard_shortcuts.profile": "Atidaryti autoriaus (-ės) profilį",
+ "keyboard_shortcuts.reply": "Atsakyti į įrašą",
+ "keyboard_shortcuts.requests": "Atidaryti sekimo prašymų sąrašą",
+ "keyboard_shortcuts.search": "Fokusuoti paieškos juostą",
+ "keyboard_shortcuts.spoilers": "Rodyti / slėpti TĮ lauką",
+ "keyboard_shortcuts.start": "Atidarykite stulpelį Kaip pradėti",
+ "keyboard_shortcuts.toggle_hidden": "Rodyti / slėpti tekstą po TĮ",
"keyboard_shortcuts.toggle_sensitivity": "Rodyti / slėpti mediją",
- "keyboard_shortcuts.toot": "to start a brand new toot",
- "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
- "keyboard_shortcuts.up": "to move up in the list",
+ "keyboard_shortcuts.toot": "Pradėti naują įrašą",
+ "keyboard_shortcuts.unfocus": "Nebefokusuoti rengykles teksto sritį / paiešką",
+ "keyboard_shortcuts.up": "Perkelti į viršų sąraše",
"lightbox.close": "Uždaryti",
+ "lightbox.compress": "Suspausti vaizdo peržiūros langelį",
+ "lightbox.expand": "Išplėsti vaizdo peržiūros langelį",
+ "lightbox.next": "Kitas",
+ "lightbox.previous": "Ankstesnis",
+ "limited_account_hint.action": "Vis tiek rodyti profilį",
+ "limited_account_hint.title": "Šį profilį paslėpė {domain} prižiūrėtojai.",
+ "link_preview.author": "Sukūrė {name}",
+ "lists.account.add": "Pridėti į sąrašą",
+ "lists.account.remove": "Pašalinti iš sąrašo",
+ "lists.delete": "Ištrinti sąrašą",
+ "lists.edit": "Redaguoti sąrašą",
+ "lists.edit.submit": "Keisti pavadinimą",
+ "lists.exclusive": "Slėpti šiuos įrašus iš pagrindinio",
+ "lists.new.create": "Pridėti sąrašą",
+ "lists.new.title_placeholder": "Naujas sąrašo pavadinimas",
+ "lists.replies_policy.followed": "Bet kuriam sekamam naudotojui",
+ "lists.replies_policy.list": "Sąrašo nariams",
+ "lists.replies_policy.none": "Nei vienam",
+ "lists.replies_policy.title": "Rodyti atsakymus:",
+ "lists.search": "Ieškoti tarp sekamų žmonių",
+ "lists.subheading": "Tavo sąrašai",
+ "load_pending": "{count, plural, one {# naujas elementas} few {# nauji elementai} many {# naujo elemento} other {# naujų elementų}}",
"loading_indicator.label": "Kraunama…",
"media_gallery.toggle_visible": "{number, plural, one {Slėpti vaizdą} few {Slėpti vaizdus} many {Slėpti vaizdo} other {Slėpti vaizdų}}",
- "moved_to_account_banner.text": "Tavo paskyra {disabledAccount} šiuo metu yra išjungta, nes persikėlei į {movedToAccount}.",
- "mute_modal.duration": "Trukmė",
- "mute_modal.hide_notifications": "Slėpti šio naudotojo pranešimus?",
- "mute_modal.indefinite": "Neribotas",
+ "moved_to_account_banner.text": "Tavo paskyra {disabledAccount} šiuo metu išjungta, nes persikėlei į {movedToAccount}.",
+ "mute_modal.show_options": "Rodyti parinktis",
"navigation_bar.about": "Apie",
- "navigation_bar.advanced_interface": "Atidarykite išplėstinę žiniatinklio sąsają",
+ "navigation_bar.advanced_interface": "Atidaryti išplėstinę žiniatinklio sąsają",
"navigation_bar.blocks": "Užblokuoti naudotojai",
"navigation_bar.bookmarks": "Žymės",
- "navigation_bar.compose": "Compose new toot",
+ "navigation_bar.community_timeline": "Vietinė laiko skalė",
+ "navigation_bar.compose": "Sukurti naują įrašą",
"navigation_bar.direct": "Privatūs paminėjimai",
"navigation_bar.discover": "Atrasti",
- "navigation_bar.domain_blocks": "Hidden domains",
- "navigation_bar.edit_profile": "Redaguoti profilį",
+ "navigation_bar.domain_blocks": "Užblokuoti domenai",
"navigation_bar.explore": "Naršyti",
- "navigation_bar.favourites": "Mėgstamiausi",
- "navigation_bar.filters": "Nutylėti žodžiai",
- "navigation_bar.follow_requests": "Sekti prašymus",
- "navigation_bar.followed_tags": "Sekti grotažymę",
+ "navigation_bar.favourites": "Mėgstami",
+ "navigation_bar.filters": "Nutildyti žodžiai",
+ "navigation_bar.follow_requests": "Sekimo prašymai",
+ "navigation_bar.followed_tags": "Sekami saitažodžiai",
"navigation_bar.follows_and_followers": "Sekimai ir sekėjai",
"navigation_bar.lists": "Sąrašai",
"navigation_bar.logout": "Atsijungti",
- "navigation_bar.mutes": "Užtildyti naudotojai",
+ "navigation_bar.mutes": "Nutildyti naudotojai",
"navigation_bar.opened_in_classic_interface": "Įrašai, paskyros ir kiti konkretūs puslapiai pagal numatytuosius nustatymus atidaromi klasikinėje žiniatinklio sąsajoje.",
"navigation_bar.personal": "Asmeninis",
- "navigation_bar.pins": "Pinned toots",
+ "navigation_bar.pins": "Prisegti įrašai",
"navigation_bar.preferences": "Nuostatos",
- "navigation_bar.public_timeline": "Federuota laiko juosta",
+ "navigation_bar.public_timeline": "Federacinė laiko skalė",
"navigation_bar.search": "Ieškoti",
"navigation_bar.security": "Apsauga",
- "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
- "notification.admin.report": "{name} pranešė.{target}",
+ "not_signed_in_indicator.not_signed_in": "Norint pasiekti šį išteklį, reikia prisijungti.",
+ "notification.admin.report": "{name} pranešė {target}",
"notification.admin.sign_up": "{name} užsiregistravo",
- "notification.favourite": "{name} pamėgo jūsų įrašą",
- "notification.follow": "{name} pradėjo jus sekti",
- "notification.follow_request": "{name} nori tapti jūsų sekėju",
- "notification.mention": "{name} paminėjo jus",
+ "notification.favourite": "{name} pamėgo tavo įrašą",
+ "notification.follow": "{name} seka tave",
+ "notification.follow_request": "{name} paprašė tave sekti",
+ "notification.mention": "{name} paminėjo tave",
+ "notification.moderation-warning.learn_more": "Sužinoti daugiau",
+ "notification.moderation_warning": "Gavai prižiūrėjimo įspėjimą",
+ "notification.moderation_warning.action_delete_statuses": "Kai kurie tavo įrašai buvo pašalintos.",
+ "notification.moderation_warning.action_disable": "Tavo paskyra buvo išjungta.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Kai kurie tavo įrašai buvo pažymėtos kaip jautrios.",
+ "notification.moderation_warning.action_none": "Tavo paskyra gavo prižiūrėjimo įspėjimą.",
+ "notification.moderation_warning.action_sensitive": "Nuo šiol tavo įrašai bus pažymėti kaip jautrūs.",
+ "notification.moderation_warning.action_silence": "Tavo paskyra buvo apribota.",
+ "notification.moderation_warning.action_suspend": "Tavo paskyra buvo sustabdyta.",
"notification.own_poll": "Tavo apklausa baigėsi",
"notification.poll": "Apklausa, kurioje balsavai, pasibaigė",
- "notification.reblog": "{name} boosted your status",
+ "notification.reblog": "{name} pakėlė tavo įrašą",
+ "notification.relationships_severance_event.learn_more": "Sužinoti daugiau",
+ "notification.relationships_severance_event.user_domain_block": "Tu užblokavai {target}. Pašalinama {followersCount} savo sekėjų ir {followingCount, plural, one {# paskyrą} few {# paskyrai} many {# paskyros} other {# paskyrų}}, kurios seki.",
"notification.status": "{name} ką tik paskelbė",
"notification.update": "{name} redagavo įrašą",
+ "notification_requests.accept": "Priimti",
+ "notification_requests.dismiss": "Atmesti",
+ "notification_requests.notifications_from": "Pranešimai iš {name}",
+ "notification_requests.title": "Filtruojami pranešimai",
"notifications.clear": "Išvalyti pranešimus",
"notifications.clear_confirmation": "Ar tikrai nori visam laikui išvalyti visus pranešimus?",
- "notifications.column_settings.admin.report": "Nauji ataskaitos:",
- "notifications.column_settings.admin.sign_up": "Nauji prisiregistravimai:",
+ "notifications.column_settings.admin.report": "Naujos ataskaitos:",
+ "notifications.column_settings.admin.sign_up": "Naujos registracijos:",
"notifications.column_settings.alert": "Darbalaukio pranešimai",
- "notifications.column_settings.favourite": "Mėgstamiausi:",
+ "notifications.column_settings.favourite": "Mėgstami:",
"notifications.column_settings.filter_bar.advanced": "Rodyti visas kategorijas",
- "notifications.column_settings.filter_bar.category": "Greito filtro juosta",
- "notifications.column_settings.filter_bar.show_bar": "Rodyti filtro juostą",
+ "notifications.column_settings.filter_bar.category": "Spartaus filtro juosta",
"notifications.column_settings.follow": "Nauji sekėjai:",
- "notifications.column_settings.follow_request": "Nauji prašymai sekti:",
+ "notifications.column_settings.follow_request": "Nauji sekimo prašymai:",
"notifications.column_settings.mention": "Paminėjimai:",
"notifications.column_settings.poll": "Balsavimo rezultatai:",
- "notifications.column_settings.push": "\"Push\" pranešimai",
- "notifications.column_settings.reblog": "\"Boost\" kiekis:",
+ "notifications.column_settings.push": "Tiesioginiai pranešimai",
+ "notifications.column_settings.reblog": "Pakėlimai:",
"notifications.column_settings.show": "Rodyti stulpelyje",
"notifications.column_settings.sound": "Paleisti garsą",
- "notifications.column_settings.status": "New toots:",
+ "notifications.column_settings.status": "Nauji įrašai:",
"notifications.column_settings.unread_notifications.category": "Neperskaityti pranešimai",
"notifications.column_settings.unread_notifications.highlight": "Paryškinti neperskaitytus pranešimus",
"notifications.column_settings.update": "Redagavimai:",
"notifications.filter.all": "Visi",
- "notifications.filter.boosts": "\"Boost\" kiekis",
- "notifications.filter.favourites": "Mėgstamiausi",
+ "notifications.filter.boosts": "Pakėlimai",
+ "notifications.filter.favourites": "Mėgstami",
"notifications.filter.follows": "Sekimai",
"notifications.filter.mentions": "Paminėjimai",
"notifications.filter.polls": "Balsavimo rezultatai",
- "notifications.filter.statuses": "Atnaujinimai iš žmonių kuriuos sekate",
+ "notifications.filter.statuses": "Naujinimai iš žmonių, kuriuos seki",
"notifications.grant_permission": "Suteikti leidimą.",
"notifications.group": "{count} pranešimai",
"notifications.mark_as_read": "Pažymėti kiekvieną pranešimą kaip perskaitytą",
- "notifications.permission_denied": "Darbalaukio pranešimai nepasiekiami dėl anksčiau atmestos naršyklės leidimų užklausos",
- "notifications.permission_denied_alert": "Negalima įjungti darbalaukio pranešimų, nes prieš tai naršyklės leidimas buvo atmestas",
- "notifications.permission_required": "Darbalaukio pranešimai nepasiekiami, nes nesuteiktas reikiamas leidimas.",
+ "notifications.permission_denied": "Darbalaukio pranešimai nepasiekiami dėl anksčiau atmestos naršyklės leidimų užklausos.",
+ "notifications.permission_denied_alert": "Negalima įjungti darbalaukio pranešimų, nes prieš tai naršyklės leidimas buvo atmestas.",
+ "notifications.permission_required": "Darbalaukio pranešimai nepasiekiami, nes nebuvo suteiktas reikiamas leidimas.",
+ "notifications.policy.filter_new_accounts.hint": "Sukurta per {days, plural, one {vieną dieną} few {# dienas} many {# dienos} other {# dienų}}",
+ "notifications.policy.filter_new_accounts_title": "Naujos paskyros",
+ "notifications.policy.filter_not_following_hint": "Kol jų nepatvirtinsi rankiniu būdu",
+ "notifications.policy.filter_not_following_title": "Žmonių, kuriuos neseki",
+ "notifications.policy.filter_private_mentions_title": "Nepageidaujami privatūs paminėjimai",
+ "notifications.policy.title": "Filtruoti pranešimus iš…",
"notifications_permission_banner.enable": "Įjungti darbalaukio pranešimus",
- "notifications_permission_banner.how_to_control": "Jei norite gauti pranešimus, kai \"Mastodon\" nėra atidarytas, įjunkite darbalaukio pranešimus. Įjungę darbalaukio pranešimus, galite tiksliai valdyti, kokių tipų sąveikos generuoja darbalaukio pranešimus, naudodamiesi pirmiau esančiu mygtuku {icon}.",
- "notifications_permission_banner.title": "Niekada nieko nepraleiskite",
- "onboarding.action.back": "Gražinkite mane atgal",
- "onboarding.actions.back": "Gražinkite mane atgal",
- "onboarding.actions.go_to_explore": "See what's trending",
- "onboarding.actions.go_to_home": "Go to your home feed",
+ "notifications_permission_banner.how_to_control": "Jei nori gauti pranešimus, kai Mastodon nėra atidarytas, įjunk darbalaukio pranešimus. Įjungęs (-usi) darbalaukio pranešimus, gali tiksliai valdyti, kokių tipų sąveikos generuoja darbalaukio pranešimus, naudojant pirmiau esančiu mygtuku {icon}.",
+ "notifications_permission_banner.title": "Niekada nieko nepraleisk",
+ "onboarding.action.back": "Grąžinti mane atgal",
+ "onboarding.actions.back": "Grąžinti mane atgal",
+ "onboarding.actions.go_to_explore": "Į tendencijų puslapį",
+ "onboarding.actions.go_to_home": "Į mano pagrindinį srautų puslapį",
"onboarding.compose.template": "Sveiki #Mastodon!",
- "onboarding.follows.empty": "Deja, šiuo metu jokių rezultatų parodyti negalima. Galite pabandyti naudoti paiešką arba naršyti atradimo puslapyje, kad surastumėte žmonių, kuriuos norite sekti, arba pabandyti vėliau.",
- "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
- "onboarding.follows.title": "Popular on Mastodon",
+ "onboarding.follows.empty": "Deja, šiuo metu jokių rezultatų parodyti negalima. Gali pabandyti naudoti paiešką arba naršyti atradimo puslapį, kad surastum žmonių, kuriuos nori sekti, arba bandyti vėliau.",
+ "onboarding.follows.lead": "Tavo pagrindinis srautas – pagrindinis būdas patirti Mastodon. Kuo daugiau žmonių seksi, tuo jis bus aktyvesnis ir įdomesnis. Norint pradėti, pateikiame keletą pasiūlymų:",
+ "onboarding.follows.title": "Suasmenink savo pagrindinį srautą",
"onboarding.profile.discoverable": "Padaryti mano profilį atrandamą",
- "onboarding.profile.discoverable_hint": "Kai pasirenki Mastodon atrandamumą, tavo įrašai gali būti rodomi paieškos rezultatuose ir trendose, o profilis gali būti siūlomas panašių interesų turintiems žmonėms.",
+ "onboarding.profile.discoverable_hint": "Kai sutinki su Mastodon atrandamumu, tavo įrašai gali būti rodomi paieškos rezultatuose ir tendencijose, o profilis gali būti siūlomas panašių pomėgių turintiems žmonėms.",
"onboarding.profile.display_name": "Rodomas vardas",
"onboarding.profile.display_name_hint": "Tavo pilnas vardas arba linksmas vardas…",
"onboarding.profile.lead": "Gali visada tai užbaigti vėliau nustatymuose, kur yra dar daugiau pritaikymo parinkčių.",
"onboarding.profile.note": "Biografija",
"onboarding.profile.note_hint": "Gali @paminėti kitus žmones arba #saitažodžius…",
"onboarding.profile.save_and_continue": "Išsaugoti ir tęsti",
- "onboarding.profile.title": "Profilio konfigūravimas",
+ "onboarding.profile.title": "Profilio sąranka",
"onboarding.profile.upload_avatar": "Įkelti profilio nuotrauką",
"onboarding.profile.upload_header": "Įkelti profilio antraštę",
- "onboarding.share.lead": "Praneškite žmonėms, kaip jus rasti \"Mastodon\"!",
- "onboarding.share.message": "Aš {username} #Mastodon! Ateik sekti manęs adresu {url}",
+ "onboarding.share.lead": "Leisk žmonėms sužinoti, kaip tave rasti Mastodon!",
+ "onboarding.share.message": "Aš {username}, esant #Mastodon! Ateik sekti manęs adresu {url}.",
"onboarding.share.next_steps": "Galimi kiti žingsniai:",
- "onboarding.share.title": "Bendrinkite savo profilį",
- "onboarding.start.lead": "Dabar esi Mastodon dalis – unikalios decentralizuotos socialinės žiniasklaidos platformos, kurioje tu, o ne algoritmas, pats nustatai savo patirtį. Pradėkime tavo kelionę šioje naujoje socialinėje erdvėje:",
- "onboarding.start.skip": "Want to skip right ahead?",
- "onboarding.start.title": "Jums pavyko!",
- "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
- "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
- "onboarding.steps.publish_status.body": "Say hello to the world.",
- "onboarding.steps.publish_status.title": "Susikūrk savo pirmąjį įrašą",
- "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
- "onboarding.steps.setup_profile.title": "Customize your profile",
- "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
- "onboarding.steps.share_profile.title": "Share your profile",
- "picture_in_picture.restore": "Padėkite jį atgal",
- "poll.closed": "Uždaryti",
+ "onboarding.share.title": "Bendrink savo profilį",
+ "onboarding.start.lead": "Dabar esi Mastodon dalis – unikalios decentralizuotos socialinės medijos platformos, kurioje tu, o ne algoritmas, pats nustatai savo patirtį. Pradėkime tavo kelionę šioje naujoje socialinėje erdvėje:",
+ "onboarding.start.skip": "Nereikia pagalbos pradėti?",
+ "onboarding.start.title": "Tau pavyko!",
+ "onboarding.steps.follow_people.body": "Sekti įdomius žmones – tai, kas yra Mastodon.",
+ "onboarding.steps.follow_people.title": "Suasmenink savo pagrindinį srautą",
+ "onboarding.steps.publish_status.body": "Sakyk labas pasauliui tekstu, nuotraukomis, vaizdo įrašais arba apklausomis {emoji}.",
+ "onboarding.steps.publish_status.title": "Sukūrk savo pirmąjį įrašą",
+ "onboarding.steps.setup_profile.body": "Padidink savo sąveiką turint išsamų profilį.",
+ "onboarding.steps.setup_profile.title": "Suasmenink savo profilį",
+ "onboarding.steps.share_profile.body": "Leisk draugams sužinoti, kaip tave rasti Mastodon.",
+ "onboarding.steps.share_profile.title": "Bendrink savo Mastodon profilį",
+ "onboarding.tips.2fa": "Ar žinojai? Savo paskyrą gali apsaugoti nustatęs (-usi) dviejų veiksnių tapatybės nustatymą paskyros nustatymuose. Jis veikia su bet kuria pasirinkta TOTP programėle, telefono numeris nebūtinas.",
+ "onboarding.tips.accounts_from_other_servers": "Ar žinojai? Kadangi Mastodon decentralizuotas, kai kurie profiliai, su kuriais susidursi, bus talpinami ne tavo, o kituose serveriuose. Ir vis tiek galėsi su jais sklandžiai bendrauti! Jų serveris yra antroje naudotojo vardo pusėje.",
+ "onboarding.tips.migration": "Ar žinojai? Jei manai, kad {domain} serveris ateityje tau netiks, gali persikelti į kitą Mastodon serverį neprarandant savo sekėjų. Gali net talpinti savo paties serverį.",
+ "onboarding.tips.verification": "Ar žinojai? Savo paskyrą gali patvirtinti pateikęs (-usi) nuorodą į Mastodon profilį savo interneto svetainėje ir pridėjęs (-usi) svetainę prie savo profilio. Nereikia jokių mokesčių ar dokumentų.",
+ "password_confirmation.exceeds_maxlength": "Slaptažodžio patvirtinimas viršija maksimalų slaptažodžio ilgį.",
+ "password_confirmation.mismatching": "Slaptažodžio patvirtinimas nesutampa.",
+ "picture_in_picture.restore": "Padėti jį atgal",
+ "poll.closed": "Uždaryta",
"poll.refresh": "Atnaujinti",
"poll.reveal": "Peržiūrėti rezultatus",
+ "poll.total_people": "{count, plural, one {# žmogus} few {# žmonės} many {# žmogus} other {# žmonių}}",
+ "poll.total_votes": "{count, plural, one {# balsas} few {# balsai} many {# balso} other {# balsų}}",
"poll.vote": "Balsuoti",
"poll.voted": "Tu balsavai už šį atsakymą",
"poll.votes": "{votes, plural, one {# balsas} few {# balsai} many {# balso} other {# balsų}}",
"poll_button.add_poll": "Pridėti apklausą",
- "poll_button.remove_poll": "Šalinti apklausą",
- "privacy.change": "Adjust status privacy",
- "privacy.direct.long": "Post to mentioned users only",
- "privacy.direct.short": "Direct",
- "privacy.private.long": "Post to followers only",
- "privacy.private.short": "Followers-only",
- "privacy.public.long": "Visiems matomas",
- "privacy.public.short": "Viešas",
- "privacy.unlisted.long": "Matomas visiems, bet atsisakyta atradimo funkcijų",
- "privacy.unlisted.short": "Neįtrauktas į sąrašą",
+ "poll_button.remove_poll": "Pašalinti apklausą",
+ "privacy.change": "Keisti įrašo privatumą",
+ "privacy.direct.long": "Visus, paminėtus įraše",
+ "privacy.direct.short": "Konkretūs žmonės",
+ "privacy.private.long": "Tik sekėjams",
+ "privacy.private.short": "Sekėjai",
+ "privacy.public.long": "Bet kas iš Mastodon ir ne Mastodon",
+ "privacy.public.short": "Vieša",
+ "privacy.unlisted.additional": "Tai veikia lygiai taip pat, kaip ir vieša, tik įrašas nebus rodomas tiesioginiuose srautuose, saitažodžiose, naršyme ar Mastodon paieškoje, net jei esi įtraukęs (-usi) visą paskyrą.",
+ "privacy.unlisted.long": "Mažiau algoritminių fanfarų",
+ "privacy.unlisted.short": "Tyliai vieša",
"privacy_policy.last_updated": "Paskutinį kartą atnaujinta {date}",
"privacy_policy.title": "Privatumo politika",
"recommended": "Rekomenduojama",
"refresh": "Atnaujinti",
- "regeneration_indicator.label": "Kraunasi…",
+ "regeneration_indicator.label": "Kraunama…",
+ "regeneration_indicator.sublabel": "Ruošiamas tavo pagrindinis srautas!",
+ "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ų}}",
"relative_time.full.just_now": "ką tik",
+ "relative_time.full.minutes": "prieš {number, plural, one {# minutę} few {# minutes} many {# minutės} other {# minučių}}",
+ "relative_time.full.seconds": "prieš {number, plural, one {# sekundę} few {# sekundes} many {# sekundės} other {# sekundžių}}",
"relative_time.hours": "{number} val.",
"relative_time.just_now": "dabar",
"relative_time.minutes": "{number} min.",
"relative_time.seconds": "{number} sek.",
"relative_time.today": "šiandien",
+ "reply_indicator.attachments": "{count, plural, one {# priedas} few {# priedai} many {# priedo} other {# priedų}}",
"reply_indicator.cancel": "Atšaukti",
+ "reply_indicator.poll": "Apklausa",
"report.block": "Blokuoti",
- "report.categories.legal": "Legalus",
+ "report.block_explanation": "Jų įrašų nematysi. Jie negalės matyti tavo įrašų ar sekti tavęs. Jie galės pamatyti, kad yra užblokuoti.",
+ "report.categories.legal": "Teisinės",
"report.categories.other": "Kita",
"report.categories.spam": "Šlamštas",
"report.categories.violation": "Turinys pažeidžia vieną ar daugiau serverio taisyklių",
- "report.category.subtitle": "Pasirinkite tinkamiausią variantą",
+ "report.category.subtitle": "Pasirink geriausią atitikmenį.",
+ "report.category.title": "Papasakok mums, kas vyksta su šiuo {type}",
"report.category.title_account": "profilis",
"report.category.title_status": "įrašas",
"report.close": "Atlikta",
- "report.comment.title": "Ar yra dar kas nors, ką, jūsų manymu, turėtume žinoti?",
+ "report.comment.title": "Ar yra dar kas nors, ką, tavo manymu, turėtume žinoti?",
+ "report.forward": "Persiųsti į {target}",
+ "report.forward_hint": "Paskyra yra iš kito serverio. Siųsti anoniminę šios ataskaitos kopiją ir ten?",
+ "report.mute": "Nutildyti",
"report.mute_explanation": "Jų įrašų nematysi. Jie vis tiek gali tave sekti ir matyti įrašus, bet nežinos, kad jie nutildyti.",
"report.next": "Tęsti",
"report.placeholder": "Papildomi komentarai",
@@ -504,57 +631,107 @@
"report.reasons.legal": "Tai nelegalu",
"report.reasons.legal_description": "Manai, kad tai pažeidžia tavo arba serverio šalies įstatymus",
"report.reasons.other": "Tai kažkas kita",
- "report.rules.subtitle": "Pasirink viską, kas tinka",
+ "report.reasons.other_description": "Problema netinka kitoms kategorijoms",
+ "report.reasons.spam": "Tai šlamštas",
+ "report.reasons.spam_description": "Kenkėjiškos nuorodos, netikras įsitraukimas arba pasikartojantys atsakymai",
+ "report.reasons.violation": "Tai pažeidžia serverio taisykles",
+ "report.reasons.violation_description": "Žinai, kad tai pažeidžia konkrečias taisykles",
+ "report.rules.subtitle": "Pasirink viską, kas tinka.",
"report.rules.title": "Kokios taisyklės pažeidžiamos?",
- "report.statuses.subtitle": "Pasirinkti viską, kas tinka",
- "report.statuses.title": "Ar yra kokių nors įrašų, patvirtinančių šį pranešimą?",
+ "report.statuses.subtitle": "Pasirink viską, kas tinka.",
+ "report.statuses.title": "Ar yra kokių nors įrašų, patvirtinančių šį ataskaitą?",
"report.submit": "Pateikti",
- "report.target": "Report {target}",
- "report.thanks.take_action": "Čia pateikiamos galimybės kontroliuoti, ką matote \"Mastodon\":",
- "report.thanks.take_action_actionable": "Kol tai peržiūrėsime, galite imtis veiksmų prieš @{name}:",
- "report.thanks.title": "Nenorite to matyti?",
- "report.thanks.title_actionable": "Ačiū, kad pranešėte, mes tai išnagrinėsime.",
+ "report.target": "Pranešama apie {target}",
+ "report.thanks.take_action": "Štai parinktys, kaip kontroliuoti, ką matai Mastodon:",
+ "report.thanks.take_action_actionable": "Kol peržiūrėsime, gali imtis veiksmų prieš {name}:",
+ "report.thanks.title": "Nenori to matyti?",
+ "report.thanks.title_actionable": "Ačiū, kad pranešei, mes tai išnagrinėsime.",
"report.unfollow": "Nebesekti @{name}",
- "report.unfollow_explanation": "Jūs sekate šią paskyrą. Norėdami nebematyti jų įrašų savo pagrindiniame kanale, panaikinkite jų sekimą.",
- "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
+ "report.unfollow_explanation": "Tu seki šią paskyrą. Jei nori nebematyti jų įrašų savo pagrindiniame sraute, nebesek jų.",
+ "report_notification.attached_statuses": "Pridėti {count, plural, one {{count} įrašas} few {{count} įrašai} many {{count} įrašo} other {{count} įrašų}}",
+ "report_notification.categories.legal": "Teisinės",
+ "report_notification.categories.other": "Kita",
+ "report_notification.categories.spam": "Šlamštas",
+ "report_notification.categories.violation": "Taisyklės pažeidimas",
+ "report_notification.open": "Atidaryti ataskaitą",
+ "search.no_recent_searches": "Nėra naujausių paieškų.",
"search.placeholder": "Paieška",
- "search.search_or_paste": "Ieškok arba įklijuok URL",
+ "search.quick_action.account_search": "Profiliai, atitinkantys {x}",
+ "search.quick_action.go_to_account": "Eiti į profilį {x}",
+ "search.quick_action.go_to_hashtag": "Eiti į saitažodį {x}",
+ "search.quick_action.open_url": "Atidaryti URL adresą Mastodon",
+ "search.quick_action.status_search": "Pranešimai, atitinkantys {x}",
+ "search.search_or_paste": "Ieškoti arba įklijuoti URL",
"search_popout.full_text_search_disabled_message": "Nepasiekima {domain}.",
"search_popout.full_text_search_logged_out_message": "Pasiekiama tik prisijungus.",
"search_popout.language_code": "ISO kalbos kodas",
+ "search_popout.options": "Paieškos nustatymai",
+ "search_popout.quick_actions": "Spartūs veiksmai",
+ "search_popout.recent": "Naujausios paieškos",
"search_popout.specific_date": "konkreti data",
"search_popout.user": "naudotojas",
"search_results.accounts": "Profiliai",
"search_results.all": "Visi",
"search_results.hashtags": "Saitažodžiai",
"search_results.nothing_found": "Nepavyko rasti nieko pagal šiuos paieškos terminus.",
- "search_results.statuses": "Toots",
+ "search_results.see_all": "Žiūrėti viską",
+ "search_results.statuses": "Įrašai",
+ "search_results.title": "Ieškoti {q}",
"server_banner.about_active_users": "Žmonės, kurie naudojosi šiuo serveriu per pastarąsias 30 dienų (mėnesio aktyvūs naudotojai)",
"server_banner.active_users": "aktyvūs naudotojai",
+ "server_banner.administered_by": "Administruoja:",
+ "server_banner.introduction": "{domain} – decentralizuoto socialinio tinklo dalis, kurį palaiko {mastodon}.",
+ "server_banner.learn_more": "Sužinoti daugiau",
+ "server_banner.server_stats": "Serverio statistika:",
+ "sign_in_banner.create_account": "Sukurti paskyrą",
"sign_in_banner.sign_in": "Prisijungimas",
+ "sign_in_banner.sso_redirect": "Prisijungti arba užsiregistruoti",
"sign_in_banner.text": "Prisijunk, kad galėtum sekti profilius arba saitažodžius, mėgsti, bendrinti ir atsakyti į įrašus. Taip pat gali bendrauti iš savo paskyros kitame serveryje.",
- "status.admin_status": "Open this status in the moderation interface",
+ "status.admin_account": "Atidaryti prižiūrėjimo sąsają @{name}",
+ "status.admin_domain": "Atidaryti prižiūrėjimo sąsają {domain}",
+ "status.admin_status": "Atidaryti šį įrašą prižiūrėjimo sąsajoje",
+ "status.block": "Blokuoti @{name}",
+ "status.bookmark": "Pridėti į žymės",
+ "status.cancel_reblog_private": "Nebepakelti",
+ "status.cannot_reblog": "Šis įrašas negali būti pakeltas.",
"status.copy": "Kopijuoti nuorodą į įrašą",
"status.delete": "Ištrinti",
+ "status.detailed_status": "Išsami pokalbio peržiūra",
+ "status.direct": "Privačiai paminėti @{name}",
+ "status.direct_indicator": "Privatus paminėjimas",
"status.edit": "Redaguoti",
- "status.edited": "Redaguota {date}",
- "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
+ "status.edited": "Paskutinį kartą redaguota {date}",
+ "status.edited_x_times": "Redaguota {count, plural, one {{count} kartą} few {{count} kartus} many {{count} karto} other {{count} kartų}}",
+ "status.embed": "Įterpti",
+ "status.favourite": "Pamėgti",
+ "status.favourites": "{count, plural, one {mėgstamas} few {mėgstamai} many {mėgstamų} other {mėgstamų}}",
+ "status.filter": "Filtruoti šį įrašą",
+ "status.filtered": "Filtruota",
"status.hide": "Slėpti įrašą",
- "status.load_more": "Pakrauti daugiau",
+ "status.history.created": "{name} sukurta {date}",
+ "status.history.edited": "{name} redaguota {date}",
+ "status.load_more": "Krauti daugiau",
"status.media.open": "Spausk, kad atidaryti",
"status.media.show": "Spausk, kad matyti",
"status.media_hidden": "Paslėpta medija",
"status.mention": "Paminėti @{name}",
"status.more": "Daugiau",
- "status.open": "Expand this status",
+ "status.mute": "Nutildyti @{name}",
+ "status.mute_conversation": "Nutildyti pokalbį",
+ "status.open": "Išplėsti šį įrašą",
"status.pin": "Prisegti prie profilio",
"status.pinned": "Prisegtas įrašas",
"status.read_more": "Skaityti daugiau",
- "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
- "status.redraft": "Ištrinti ir iš naujo parengti juodraštį",
+ "status.reblog": "Pakelti",
+ "status.reblog_private": "Pakelti su originaliu matomumu",
+ "status.reblogged_by": "{name} pakėlė",
+ "status.reblogs.empty": "Šio įrašo dar niekas nepakėlė. Kai kas nors tai padarys, jie bus rodomi čia.",
+ "status.redraft": "Ištrinti ir parengti iš naujo",
+ "status.remove_bookmark": "Pašalinti žymę",
+ "status.replied_to": "Atsakyta į {name}",
"status.reply": "Atsakyti",
"status.replyAll": "Atsakyti į giją",
- "status.report": "Pranešti @{name}",
+ "status.report": "Pranešti apie @{name}",
"status.sensitive_warning": "Jautrus turinys",
"status.share": "Bendrinti",
"status.show_filter_reason": "Rodyti vis tiek",
@@ -563,38 +740,62 @@
"status.show_more": "Rodyti daugiau",
"status.show_more_all": "Rodyti daugiau visiems",
"status.show_original": "Rodyti originalą",
- "status.title.with_attachments": "{user}{attachmentCount, plural, one {priedas} few {{attachmentCount} priedai} many {{attachmentCount} priedo} other {{attachmentCount} priedų}}",
+ "status.title.with_attachments": "{user} paskelbė {attachmentCount, plural, one {priedą} few {{attachmentCount} priedus} many {{attachmentCount} priedo} other {{attachmentCount} priedų}}",
"status.translate": "Versti",
- "status.translated_from_with": "Išversta iš {lang} naudojant {provider}",
- "status.uncached_media_warning": "Peržiūra nepasiekiama",
- "tabs_bar.home": "Pradžia",
+ "status.translated_from_with": "Išversta iš {lang} naudojant {provider}.",
+ "status.uncached_media_warning": "Peržiūra nepasiekiama.",
+ "status.unmute_conversation": "Atšaukti pokalbio nutildymą",
+ "status.unpin": "Atsegti iš profilio",
+ "subscribed_languages.lead": "Po pakeitimo tavo pagrindinėje ir sąrašo laiko skalėje bus rodomi tik įrašai pasirinktomis kalbomis. Jei nori gauti įrašus visomis kalbomis, pasirink nė vieno.",
+ "subscribed_languages.save": "Išsaugoti pakeitimus",
+ "subscribed_languages.target": "Keisti prenumeruojamas kalbas {target}",
+ "tabs_bar.home": "Pagrindinis",
"tabs_bar.notifications": "Pranešimai",
- "time_remaining.days": "Liko {number, plural, one {# diena} few {# dienos} many {# dieno} other {# dienų}}",
- "timeline_hint.remote_resource_not_displayed": "{resource} iš kitų serverių nerodomas.",
+ "time_remaining.days": "liko {number, plural, one {# diena} few {# dienos} many {# dienos} other {# dienų}}",
+ "time_remaining.hours": "liko {number, plural, one {# valanda} few {# valandos} many {# valandos} other {# valandų}}",
+ "time_remaining.minutes": "liko {number, plural, one {# minutė} few {# minutės} many {# minutės} other {# minučių}}",
+ "time_remaining.moments": "liko akimirkos",
+ "time_remaining.seconds": "liko {number, plural, one {# sekundė} few {# sekundės} many {# sekundės} other {# sekundžių}}",
+ "timeline_hint.remote_resource_not_displayed": "{resource} iš kitų serverių nerodomi.",
"timeline_hint.resources.followers": "Sekėjai",
"timeline_hint.resources.follows": "Seka",
"timeline_hint.resources.statuses": "Senesni įrašai",
- "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
+ "trends.counter_by_accounts": "{count, plural, one {{counter} žmogus} few {{counter} žmonės} many {{counter} žmogus} other {{counter} žmonių}} per {days, plural, one {dieną} few {{days} dienas} many {{days} dienas} other {{days} dienų}}",
+ "trends.trending_now": "Tendencinga dabar",
"ui.beforeunload": "Jei paliksi Mastodon, tavo juodraštis bus prarastas.",
+ "units.short.billion": "{count} mlrd.",
+ "units.short.million": "{count} mln.",
"units.short.thousand": "{count} tūkst.",
- "upload_form.audio_description": "Describe for people with hearing loss",
- "upload_form.description": "Describe for the visually impaired",
- "upload_form.description_missing": "Nėra pridėto aprašymo",
+ "upload_area.title": "Nuvilk, kad įkeltum",
+ "upload_button.label": "Pridėti vaizdų, vaizdo įrašą arba garso failą",
+ "upload_error.limit": "Viršyta failo įkėlimo riba.",
+ "upload_error.poll": "Failų įkėlimas neleidžiamas su apklausomis.",
+ "upload_form.audio_description": "Aprašyk žmonėms, kurie yra kurtieji ar neprigirdintys.",
+ "upload_form.description": "Aprašyk žmonėms, kurie yra aklieji arba silpnaregiai.",
"upload_form.edit": "Redaguoti",
- "upload_form.undo": "Ištrinti",
- "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
+ "upload_form.thumbnail": "Keisti miniatiūrą",
+ "upload_form.video_description": "Aprašyk žmonėms, kurie yra kurtieji, neprigirdintys, aklieji ar silpnaregiai.",
+ "upload_modal.analyzing_picture": "Analizuojamas vaizdas…",
+ "upload_modal.apply": "Taikyti",
+ "upload_modal.applying": "Pritaikoma…",
"upload_modal.choose_image": "Pasirinkti vaizdą",
"upload_modal.description_placeholder": "Greita rudoji lapė peršoka tinginį šunį",
+ "upload_modal.detect_text": "Aptikti tekstą iš nuotraukos",
"upload_modal.edit_media": "Redaguoti mediją",
+ "upload_modal.hint": "Spustelėk arba nuvilk apskritimą peržiūroje, kad pasirinktum centrinį tašką, kuris visada bus matomas visose miniatiūrose.",
+ "upload_modal.preparing_ocr": "Rengimas OCR…",
+ "upload_modal.preview_label": "Peržiūra ({ratio})",
"upload_progress.label": "Įkeliama...",
"upload_progress.processing": "Apdorojama…",
"username.taken": "Šis naudotojo vardas užimtas. Pabandyk kitą.",
"video.close": "Uždaryti vaizdo įrašą",
"video.download": "Atsisiųsti failą",
"video.exit_fullscreen": "Išeiti iš viso ekrano",
+ "video.expand": "Išplėsti vaizdo įrašą",
"video.fullscreen": "Visas ekranas",
"video.hide": "Slėpti vaizdo įrašą",
- "video.mute": "Nutildyti garsą",
+ "video.mute": "Išjungti garsą",
+ "video.pause": "Pristabdyti",
"video.play": "Leisti",
- "video.unmute": "Atitildyti garsą"
+ "video.unmute": "Įjungti garsą"
}
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index c06a1d936826fd..b61a2c0c360c5d 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -8,7 +8,7 @@
"about.domain_blocks.silenced.title": "Ierobežotie",
"about.domain_blocks.suspended.explanation": "Nekādi dati no šī servera netiks apstrādāti, uzglabāti vai apmainīti, padarot neiespējamu mijiedarbību vai saziņu ar lietotājiem no šī servera.",
"about.domain_blocks.suspended.title": "Apturētie",
- "about.not_available": "Šī informācija šajā serverī nav bijusi pieejama.",
+ "about.not_available": "Šī informācija nav padarīta pieejama šajā serverī.",
"about.powered_by": "Decentralizētu sociālo tīklu nodrošina {mastodon}",
"about.rules": "Servera noteikumi",
"account.account_note_header": "Piezīme",
@@ -21,24 +21,26 @@
"account.blocked": "Bloķēts",
"account.browse_more_on_origin_server": "Pārlūkot vairāk sākotnējā profilā",
"account.cancel_follow_request": "Atsaukt sekošanas pieprasījumu",
+ "account.copy": "Ievietot saiti uz profilu starpliktuvē",
"account.direct": "Pieminēt @{name} privāti",
"account.disable_notifications": "Pārtraukt man paziņot, kad @{name} publicē ierakstu",
"account.domain_blocked": "Domēns ir bloķēts",
- "account.edit_profile": "Rediģēt profilu",
+ "account.edit_profile": "Labot profilu",
"account.enable_notifications": "Paziņot man, kad @{name} publicē ierakstu",
"account.endorse": "Izcelts profilā",
"account.featured_tags.last_status_at": "Beidzamā ziņa {date}",
"account.featured_tags.last_status_never": "Ierakstu nav",
"account.featured_tags.title": "{name} izceltie tēmturi",
"account.follow": "Sekot",
+ "account.follow_back": "Sekot atpakaļ",
"account.followers": "Sekotāji",
"account.followers.empty": "Šim lietotājam vēl nav sekotāju.",
- "account.followers_counter": "{count, plural, one {{counter} Sekotājs} other {{counter} Sekotāji}}",
+ "account.followers_counter": "{count, plural, zero {{counter} sekotāju} one {{counter} sekotājs} other {{counter} sekotāji}}",
"account.following": "Seko",
- "account.following_counter": "{count, plural, one {{counter} sekojamais} other {{counter} sekojamie}}",
+ "account.following_counter": "{count, plural, zero{{counter} sekojamo} one {{counter} sekojamais} other {{counter} sekojamie}}",
"account.follows.empty": "Šis lietotājs pagaidām nevienam neseko.",
"account.go_to_profile": "Doties uz profilu",
- "account.hide_reblogs": "Slēpt @{name} izceltas ziņas",
+ "account.hide_reblogs": "Paslēpt @{name} pastiprinātos ierakstus",
"account.in_memoriam": "Piemiņai.",
"account.joined_short": "Pievienojās",
"account.languages": "Mainīt abonētās valodas",
@@ -51,13 +53,14 @@
"account.mute_notifications_short": "Izslēgt paziņojumu skaņu",
"account.mute_short": "Apklusināt",
"account.muted": "Apklusināts",
+ "account.mutual": "Savstarpējs",
"account.no_bio": "Apraksts nav sniegts.",
"account.open_original_page": "Atvērt oriģinālo lapu",
"account.posts": "Ieraksti",
"account.posts_with_replies": "Ieraksti un atbildes",
"account.report": "Sūdzēties par @{name}",
"account.requested": "Gaida apstiprinājumu. Nospied, lai atceltu sekošanas pieparasījumu",
- "account.requested_follow": "{name} nosūtīja tev sekošanas pieprasījumu",
+ "account.requested_follow": "{name} nosūtīja Tev sekošanas pieprasījumu",
"account.share": "Dalīties ar @{name} profilu",
"account.show_reblogs": "Parādīt @{name} pastiprinātos ierakstus",
"account.statuses_counter": "{count, plural, zero {{counter} ierakstu} one {{counter} ieraksts} other {{counter} ieraksti}}",
@@ -86,7 +89,9 @@
"announcement.announcement": "Paziņojums",
"attachments_list.unprocessed": "(neapstrādāti)",
"audio.hide": "Slēpt audio",
- "autosuggest_hashtag.per_week": "{count} nedēļā",
+ "block_modal.remote_users_caveat": "Mēs vaicāsim serverim {domain} ņemt vērā Tavu lēmumu. Tomēr atbilstība nav nodrošināta, jo atsevišķi serveri var apstrādāt bloķēšanu citādi. Publiski ieraksti joprojām var būt redzami lietotājiem, kuri nav pieteikušies.",
+ "block_modal.show_less": "Rādīt mazāk",
+ "block_modal.show_more": "Parādīt mazāk",
"boost_modal.combo": "Nospied {combo}, lai nākamreiz šo izlaistu",
"bundle_column_error.copy_stacktrace": "Kopēt kļūdu ziņojumu",
"bundle_column_error.error.body": "Pieprasīto lapu nevarēja atveidot. Tas varētu būt saistīts ar kļūdu mūsu kodā, vai tā ir pārlūkprogrammas saderības problēma.",
@@ -98,18 +103,18 @@
"bundle_column_error.routing.body": "Pieprasīto lapu nevarēja atrast. Vai esi pārliecināts, ka URL adreses joslā ir pareizs?",
"bundle_column_error.routing.title": "404",
"bundle_modal_error.close": "Aizvērt",
- "bundle_modal_error.message": "Kaut kas nogāja greizi, ielādējot šo komponenti.",
+ "bundle_modal_error.message": "Kaut kas nogāja greizi šīs sastāvdaļas ielādēšanas laikā.",
"bundle_modal_error.retry": "Mēģināt vēlreiz",
"closed_registrations.other_server_instructions": "Tā kā Mastodon ir decentralizēts, tu vari izveidot kontu citā serverī un joprojām mijiedarboties ar šo.",
- "closed_registrations_modal.description": "Pašlaik nav iespējams izveidot kontu domēnā {domain}, taču ņem vērā, ka tev nav nepieciešams konts tieši {domain}, lai lietotu Mastodon.",
+ "closed_registrations_modal.description": "Pašlaik nav iespējams izveidot kontu {domain}, bet, lūdzu, ņem vērā, ka Tev nav nepieciešams tieši {domain} konts, lai lietotu Mastodon!",
"closed_registrations_modal.find_another_server": "Atrast citu serveri",
- "closed_registrations_modal.preamble": "Mastodon ir decentralizēts, tāpēc neatkarīgi no tā, kur tu izveido savu kontu, varēsi sekot līdzi un sazināties ar ikvienu šajā serverī. Tu pat vari vadīt to pats!",
+ "closed_registrations_modal.preamble": "Mastodon ir decentralizēts, tāpēc neatkarīgi no tā, kur Tu izveido savu kontu, varēsi sekot un mijiedarboties ar ikvienu šajā serverī. Tu pat vari to pašizvietot!",
"closed_registrations_modal.title": "Reģistrēšanās Mastodon",
"column.about": "Par",
"column.blocks": "Bloķētie lietotāji",
"column.bookmarks": "Grāmatzīmes",
"column.community": "Vietējā laika līnija",
- "column.direct": "Privāti pieminēti",
+ "column.direct": "Privātas pieminēšanas",
"column.directory": "Pārlūkot profilus",
"column.domain_blocks": "Bloķētie domēni",
"column.favourites": "Iecienītie",
@@ -134,76 +139,72 @@
"community.column_settings.remote_only": "Tikai attālinātie",
"compose.language.change": "Mainīt valodu",
"compose.language.search": "Meklēt valodas...",
- "compose.published.body": "Ziņa publicēta.",
+ "compose.published.body": "Ieraksts publicēta.",
"compose.published.open": "Atvērt",
"compose.saved.body": "Ziņa saglabāta.",
"compose_form.direct_message_warning_learn_more": "Uzzināt vairāk",
- "compose_form.encryption_warning": "Ziņas vietnē Mastodon nav pilnībā šifrētas. Nedalies ar sensitīvu informāciju caur Mastodon.",
+ "compose_form.encryption_warning": "Mastodon ieraksti nav pilnībā šifrēti. Nedalies ar jebkādu jutīgu informāciju caur Mastodon!",
"compose_form.hashtag_warning": "Šī ziņa netiks norādīta zem nevienas atsauces, jo tā nav publiska. Tikai publiskās ziņās var meklēt pēc atsauces.",
- "compose_form.lock_disclaimer": "Tavs konts nav {locked}. Ikviens var tev piesekot un redzēt tikai sekotājiem paredzētos ziņojumus.",
+ "compose_form.lock_disclaimer": "Tavs konts nav {locked}. Ikviens var Tev sekot, lai redzētu tikai sekotājiem paredzētos ierakstus.",
"compose_form.lock_disclaimer.lock": "slēgts",
- "compose_form.placeholder": "Kas tev padomā?",
- "compose_form.poll.add_option": "Pievienot izvēli",
+ "compose_form.placeholder": "Kas Tev padomā?",
"compose_form.poll.duration": "Aptaujas ilgums",
- "compose_form.poll.option_placeholder": "Izvēle Nr. {number}",
- "compose_form.poll.remove_option": "Noņemt šo izvēli",
+ "compose_form.poll.multiple": "Vairākas izvēles iespējas",
+ "compose_form.poll.option_placeholder": "Izvēle {number}",
+ "compose_form.poll.single": "Jāizvēlas viens",
"compose_form.poll.switch_to_multiple": "Mainīt aptaujas veidu, lai atļautu vairākas izvēles",
"compose_form.poll.switch_to_single": "Mainīt aptaujas veidu, lai atļautu vienu izvēli",
- "compose_form.publish": "Publicēt",
+ "compose_form.publish": "Iesūtīt",
"compose_form.publish_form": "Jauns ieraksts",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Saglabāt izmaiņas",
- "compose_form.sensitive.hide": "{count, plural, one {Atzīmēt multividi kā sensitīvu} other {Atzīmēt multivides kā sensitīvas}}",
- "compose_form.sensitive.marked": "{count, plural, one {Multivide ir atzīmēta kā sensitīva} other {Multivides ir atzīmētas kā sensitīvas}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Multivide nav atzīmēta kā sensitīva} other {Multivides nav atzīmētas kā sensitīvas}}",
+ "compose_form.reply": "Atbildēt",
+ "compose_form.save_changes": "Atjaunināt",
"compose_form.spoiler.marked": "Noņemt satura brīdinājumu",
"compose_form.spoiler.unmarked": "Pievienot satura brīdinājumu",
- "compose_form.spoiler_placeholder": "Ieraksti savu brīdinājumu šeit",
+ "compose_form.spoiler_placeholder": "Satura brīdinājums (pēc izvēles)",
"confirmation_modal.cancel": "Atcelt",
- "confirmations.block.block_and_report": "Bloķēt un ziņot",
"confirmations.block.confirm": "Bloķēt",
- "confirmations.block.message": "Vai tiešām vēlies bloķēt {name}?",
"confirmations.cancel_follow_request.confirm": "Atsaukt pieprasījumu",
"confirmations.cancel_follow_request.message": "Vai tiešām vēlies atsaukt pieprasījumu sekot {name}?",
"confirmations.delete.confirm": "Dzēst",
"confirmations.delete.message": "Vai tiešām vēlies dzēst šo ierakstu?",
"confirmations.delete_list.confirm": "Dzēst",
- "confirmations.delete_list.message": "Vai tiešam vēlies neatgriezeniski dzēst šo sarakstu?",
+ "confirmations.delete_list.message": "Vai tiešām neatgriezeniski izdzēst šo sarakstu?",
"confirmations.discard_edit_media.confirm": "Atmest",
- "confirmations.discard_edit_media.message": "Tev ir nesaglabātas izmaiņas multivides aprakstā vai priekšskatījumā. Vēlies tās atmest?",
- "confirmations.domain_block.confirm": "Bloķēt visu domēnu",
+ "confirmations.discard_edit_media.message": "Ir nesaglabātas izmaiņas informācijas nesēja aprakstā vai priekšskatījumā. Vēlies tās atmest tik un tā?",
"confirmations.domain_block.message": "Vai tu tiešām vēlies bloķēt visu domēnu {domain}? Parasti pietiek, ja nobloķē vai apklusini kādu. Tu neredzēsi saturu vai paziņojumus no šī domēna nevienā laika līnijā. Tavi sekotāji no šī domēna tiks noņemti.",
- "confirmations.edit.confirm": "Rediģēt",
+ "confirmations.edit.confirm": "Labot",
"confirmations.edit.message": "Rediģējot, tiks pārrakstīts ziņojums, kuru tu šobrīd raksti. Vai tiešām vēlies turpināt?",
"confirmations.logout.confirm": "Iziet",
"confirmations.logout.message": "Vai tiešām vēlies izrakstīties?",
"confirmations.mute.confirm": "Apklusināt",
- "confirmations.mute.explanation": "Šādi no viņiem tiks slēptas ziņas un ziņas, kurās viņi tiek pieminēti, taču viņi joprojām varēs redzēt tavas ziņas un sekot tev.",
- "confirmations.mute.message": "Vai tiešām vēlies apklusināt {name}?",
"confirmations.redraft.confirm": "Dzēst un pārrakstīt",
"confirmations.redraft.message": "Vai tiešām vēlies dzēst šo ziņu un no jauna noformēt to? Izlase un pastiprinājumi tiks zaudēti, un atbildes uz sākotnējo ziņu tiks atstātas bez autoratlīdzības.",
"confirmations.reply.confirm": "Atbildēt",
- "confirmations.reply.message": "Ja tagad atbildēsi, tavs ziņas uzmetums tiks dzēsts. Vai tiešām vēlies turpināt?",
+ "confirmations.reply.message": "Tūlītēja atbildēšana pārrakstīs pašlaik sastādīto ziņu. Vai tiešām turpināt?",
"confirmations.unfollow.confirm": "Pārstāt sekot",
"confirmations.unfollow.message": "Vai tiešam vairs nevēlies sekot lietotājam {name}?",
"conversation.delete": "Dzēst sarunu",
"conversation.mark_as_read": "Atzīmēt kā izlasītu",
"conversation.open": "Skatīt sarunu",
"conversation.with": "Ar {names}",
+ "copy_icon_button.copied": "Ievietots starpliktuvē",
"copypaste.copied": "Nokopēts",
"copypaste.copy_to_clipboard": "Kopēt uz starpliktuvi",
"directory.federated": "No pazīstamas federācijas",
"directory.local": "Tikai no {domain}",
"directory.new_arrivals": "Jaunpienācēji",
- "directory.recently_active": "Nesen aktīvie",
+ "directory.recently_active": "Nesen aktīvi",
"disabled_account_banner.account_settings": "Konta iestatījumi",
"disabled_account_banner.text": "Tavs konts {disabledAccount} pašlaik ir atspējots.",
- "dismissable_banner.community_timeline": "Šīs ir jaunākās publiskās ziņas no personām, kuru kontus mitina {domain}.",
+ "dismissable_banner.community_timeline": "Šie ir jaunākie publiskie ieraksti no cilvēkiem, kuru konti ir mitināti {domain}.",
"dismissable_banner.dismiss": "Atcelt",
"dismissable_banner.explore_links": "Par šiem jaunumiem šobrīd runā cilvēki šajā un citos decentralizētā tīkla serveros.",
- "dismissable_banner.explore_statuses": "Ieraksti, kas šobrīd gūst arvien lielāku ievērību visā sociālajā tīklā. Augstāk tiek kārtoti neseni ieraksti, kas pastiprināti un pievienoti izlasēm.",
+ "dismissable_banner.explore_statuses": "Šie ir ieraksti, kas šodien gūst arvien lielāku ievērību visā sociālajā tīklā. Augstāk tiek kārtoti jaunāki ieraksti, kuri tiek vairāk pastiprināti un ievietoti izlasēs.",
"dismissable_banner.explore_tags": "Šie tēmturi šobrīd kļūst arvien populārāki cilvēku vidū šajā un citos decentralizētā tīkla serveros.",
- "dismissable_banner.public_timeline": "Šīs ir jaunākās publiskās ziņas no lietotājiem sociālajā tīmeklī, kurām seko lietotāji domēnā {domain}.",
+ "dismissable_banner.public_timeline": "Šie ir jaunākie publiskie ieraksti no lietotājiem sociālajā tīmeklī, kuriem {domain} seko cilvēki.",
+ "domain_block_modal.they_cant_follow": "Neviens šajā serverī nevar Tev sekot.",
+ "domain_pill.server": "Serveris",
+ "domain_pill.username": "Lietotājvārds",
"embed.instructions": "Iestrādā šo ziņu savā mājaslapā, kopējot zemāk redzamo kodu.",
"embed.preview": "Tas izskatīsies šādi:",
"emoji_button.activity": "Aktivitāte",
@@ -226,22 +227,22 @@
"empty_column.account_timeline": "Šeit ziņojumu nav!",
"empty_column.account_unavailable": "Profils nav pieejams",
"empty_column.blocks": "Pašreiz tu neesi nevienu bloķējis.",
- "empty_column.bookmarked_statuses": "Pašreiz tev nav neviena grāmatzīmēm pievienota ieraksta. Kad tādu pievienosi, tas parādīsies šeit.",
+ "empty_column.bookmarked_statuses": "Pašlaik Tev nav neviena grāmatzīmēs pievienota ieraksta. Kad tādu pievienosi, tas parādīsies šeit.",
"empty_column.community": "Vietējā laika līnija ir tukša. Uzraksti kaut ko publiski, lai viss notiktu!",
- "empty_column.direct": "Jums vēl nav nevienas privātas pieminēšanas. Nosūtot vai saņemot to, tas tiks parādīts šeit.",
+ "empty_column.direct": "Tev vēl nav privātu pieminēšanu. Kad Tu nosūtīsi vai saņemsi kādu, tā pārādīsies šeit.",
"empty_column.domain_blocks": "Vēl nav neviena bloķēta domēna.",
- "empty_column.explore_statuses": "Pašlaik nekā aktuāla nav. Pārbaudi vēlāk!",
- "empty_column.favourited_statuses": "Tev vēl nav nevienas iecienītākās ziņas. Kad iecienīsi kādu, tas tiks parādīts šeit.",
+ "empty_column.explore_statuses": "Pašlaik nav nekā aktuāla. Ieskaties šeit vēlāk!",
+ "empty_column.favourited_statuses": "Tev vēl nav iecienītāko ierakstu. Kad pievienosi kādu izlasei, tas tiks parādīts šeit.",
"empty_column.favourites": "Šo ziņu neviens vēl nav pievienojis izlasei. Kad kāds to izdarīs, tas parādīsies šeit.",
- "empty_column.follow_requests": "Šobrīd tev nav sekošanas pieprasījumu. Kad kāds pieteiksies tev sekot, pieprasījums parādīsies šeit.",
+ "empty_column.follow_requests": "Šobrīd Tev nav sekošanas pieprasījumu. Kad saņemsi kādu, tas parādīsies šeit.",
"empty_column.followed_tags": "Tu vēl neesi sekojis nevienam tēmturim. Kad to izdarīsi, tie tiks parādīti šeit.",
"empty_column.hashtag": "Ar šo tēmturi nekas nav atrodams.",
- "empty_column.home": "Tava mājas laikrinda ir tukša! Lai to aizpildītu, pieseko vairāk cilvēkiem.",
- "empty_column.list": "Šis saraksts pašreiz ir tukšs. Kad šī saraksta dalībnieki publicēs jaunas ziņas, tās parādīsies šeit.",
- "empty_column.lists": "Pašreiz tev nav neviena saraksta. Kad tādu izveidosi, tas parādīsies šeit.",
+ "empty_column.home": "Tava mājas laikjosla ir tukša. Seko vairāk cilvēkiem, lai to piepildītu!",
+ "empty_column.list": "Pagaidām šajā sarakstā nekā nav. Kad šī saraksta dalībnieki ievietos jaunus ierakstus, tie parādīsies šeit.",
+ "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 vēl nekā nav! Ieraksti ko publiski vai pieseko lietotājiem no citiem serveriem",
+ "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",
"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.",
@@ -250,13 +251,13 @@
"errors.unexpected_crash.report_issue": "Ziņot par problēmu",
"explore.search_results": "Meklēšanas rezultāti",
"explore.suggested_follows": "Cilvēki",
- "explore.title": "Pārlūkot",
+ "explore.title": "Izpētīt",
"explore.trending_links": "Jaunumi",
- "explore.trending_statuses": "Ziņas",
+ "explore.trending_statuses": "Ieraksti",
"explore.trending_tags": "Tēmturi",
- "filter_modal.added.context_mismatch_explanation": "Šī filtra kategorija neattiecas uz kontekstu, kurā esi piekļuvis šai ziņai. Ja vēlies, lai ziņa tiktu filtrēta arī šajā kontekstā, tev būs jārediģē filtrs.",
+ "filter_modal.added.context_mismatch_explanation": "Šī atlases kategorija neattiecas uz kontekstu, kurā esi piekļuvis šim ierakstam. Ja vēlies, lai ieraksts tiktu atlasīts arī šajā kontekstā, Tev būs jālabo atlase.",
"filter_modal.added.context_mismatch_title": "Konteksta neatbilstība!",
- "filter_modal.added.expired_explanation": "Šai filtra kategorijai ir beidzies derīguma termiņš. Lai to lietotu, tev būs jāmaina derīguma termiņš.",
+ "filter_modal.added.expired_explanation": "Šai atlases kategorijai ir beidzies derīguma termiņš. Lai to lietotu, Tev būs jāmaina derīguma termiņš.",
"filter_modal.added.expired_title": "Filtra termiņš beidzies!",
"filter_modal.added.review_and_configure": "Lai pārskatītu un tālāk konfigurētu šo filtru kategoriju, dodies uz {settings_link}.",
"filter_modal.added.review_and_configure_title": "Filtra iestatījumi",
@@ -266,16 +267,23 @@
"filter_modal.select_filter.context_mismatch": "neattiecas uz šo kontekstu",
"filter_modal.select_filter.expired": "beidzies",
"filter_modal.select_filter.prompt_new": "Jauna kategorija: {name}",
- "filter_modal.select_filter.search": "Meklē vai izveido",
+ "filter_modal.select_filter.search": "Meklēt vai izveidot",
"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",
"follow_request.authorize": "Autorizēt",
"follow_request.reject": "Noraidīt",
- "follow_requests.unlocked_explanation": "Lai gan tavs konts nav bloķēts, {domain} darbinieki iedomājās, ka, iespējams, vēlēsies pārskatīt pieprasījumus no šiem kontiem.",
+ "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.similar_to_recently_followed_longer": "Līdzīgi profieliem, kuriem nesen sāki sekot",
+ "follow_suggestions.view_all": "Skatīt visu",
+ "follow_suggestions.who_to_follow": "Kam sekot",
"followed_tags": "Sekojamie tēmturi",
"footer.about": "Par",
"footer.directory": "Profilu direktorija",
@@ -297,34 +305,29 @@
"hashtag.column_settings.tag_mode.none": "Neviens no šiem",
"hashtag.column_settings.tag_toggle": "Pievienot kolonnai papildu tēmturus",
"hashtag.counter_by_accounts": "{count, plural, one {{counter} dalībnieks} other {{counter} dalībnieki}}",
- "hashtag.counter_by_uses": "{count, plural, zero {{counter} ziņa} one {{counter} ieraksts} other {{counter} ziņas}}",
- "hashtag.counter_by_uses_today": "{count, plural, one {{counter} ziņa} other {{counter} ziņas}} šodien",
+ "hashtag.counter_by_uses": "{count, plural, zero {{counter} ierakstu} one {{counter} ieraksts} other {{counter} ieraksti}}",
+ "hashtag.counter_by_uses_today": "{count, plural, zero {{counter} ierakstu} one {{counter} ieraksts} other {{counter} ieraksti}} šodien",
"hashtag.follow": "Sekot tēmturim",
"hashtag.unfollow": "Pārstāt sekot tēmturim",
- "hashtags.and_other": "..un {count, plural, other {# vairāk}}",
- "home.actions.go_to_explore": "Skatīt tendences",
- "home.actions.go_to_suggestions": "Atrodi cilvēkus kam sekot",
- "home.column_settings.basic": "Pamata",
+ "hashtags.and_other": "… un {count, plural, other {vēl #}}",
"home.column_settings.show_reblogs": "Rādīt pastiprinātos ierakstus",
"home.column_settings.show_replies": "Rādīt atbildes",
- "home.explore_prompt.body": "Tavā mājas plūsmā būs dažādu ziņu sajaukums no atsaucēm, kurām esi izvēlējies sekot, personām, kurām esi izvēlējies sekot, un ziņām, kuras tās izceļ. Ja tas šķiet pārāk kluss, iespējams, vēlēsies:",
- "home.explore_prompt.title": "Šī ir tava Mastodon mājvieta.",
"home.hide_announcements": "Slēpt paziņojumus",
"home.pending_critical_update.body": "Lūdzu, pēc iespējas ātrāk atjaunini savu Mastodon serveri!",
"home.pending_critical_update.link": "Skatīt jauninājumus",
"home.pending_critical_update.title": "Pieejams kritisks drošības jauninājums!",
"home.show_announcements": "Rādīt paziņojumus",
"interaction_modal.description.favourite": "Ar Mastodon kontu tu vari pievienot šo ziņu izlasei, lai informētu autoru, ka to novērtē, un saglabātu to vēlākai lasīšanai.",
- "interaction_modal.description.follow": "Ar Mastodon kontu tu vari sekot {name}, lai saņemtu viņu ziņas savā mājas plūsmā.",
- "interaction_modal.description.reblog": "Izmantojot kontu Mastodon, tu vari izcelt šo ziņu, lai kopīgotu to ar saviem sekotājiem.",
+ "interaction_modal.description.follow": "Ar Mastodon kontu Tu vari sekot {name}, lai saņemtu lietotāja ierakstus savā mājas plūsmā.",
+ "interaction_modal.description.reblog": "Ar Mastodon kontu Tu vari izvirzīt šo ierakstu, lai kopīgotu to ar saviem sekotājiem.",
"interaction_modal.description.reply": "Ar Mastodon kontu tu vari atbildēt uz šo ziņu.",
- "interaction_modal.login.action": "Nogādā mani mājās",
+ "interaction_modal.login.action": "Nogādāt mani mājās",
"interaction_modal.login.prompt": "Tavas mājvietas servera domēns, piem., mastodon.social",
"interaction_modal.no_account_yet": "Neesi Mastodon?",
"interaction_modal.on_another_server": "Citā serverī",
"interaction_modal.on_this_server": "Šajā serverī",
- "interaction_modal.sign_in": "Tu neesi pieteicies šajā serverī. Kur tiek mitināts tavs konts?",
- "interaction_modal.sign_in_hint": "Padoms: Šī ir vietne, kurā tu piereģistrējies. Ja neatceries, meklē sveiciena e-pastu savā iesūtnē. Vari arī ievadīt pilnu lietotājvārdu! (piem., @Mastodon@mastodon.social)",
+ "interaction_modal.sign_in": "Tu neesi pieteicies šajā serverī. Kur tiek mitināts Tavs konts?",
+ "interaction_modal.sign_in_hint": "Padoms: tā ir tīmekļvietne, kurā Tu reģistrējies. Ja neatceries, jāmeklē sveiciena e-pasts savā iesūtnē. Vari arī ievadīt pilnu lietotājvārdu (piem., @Mastodon@mastodon.social).",
"interaction_modal.title.favourite": "Pievienot {name} ziņu izlasei",
"interaction_modal.title.follow": "Sekot {name}",
"interaction_modal.title.reblog": "Pastiprināt {name} ierakstu",
@@ -376,12 +379,12 @@
"link_preview.author": "Pēc {name}",
"lists.account.add": "Pievienot sarakstam",
"lists.account.remove": "Noņemt no saraksta",
- "lists.delete": "Dzēst sarakstu",
- "lists.edit": "Rediģēt sarakstu",
+ "lists.delete": "Izdzēst sarakstu",
+ "lists.edit": "Labot sarakstu",
"lists.edit.submit": "Mainīt virsrakstu",
- "lists.exclusive": "Paslēpt šīs ziņas no mājvietas",
+ "lists.exclusive": "Nerādīt šos ierakstus sākumā",
"lists.new.create": "Pievienot sarakstu",
- "lists.new.title_placeholder": "Jaunais saraksta nosaukums",
+ "lists.new.title_placeholder": "Jaunā saraksta nosaukums",
"lists.replies_policy.followed": "Jebkuram sekotajam lietotājam",
"lists.replies_policy.list": "Saraksta dalībniekiem",
"lists.replies_policy.none": "Nevienam",
@@ -389,22 +392,23 @@
"lists.search": "Meklēt starp cilvēkiem, kuriem tu seko",
"lists.subheading": "Tavi saraksti",
"load_pending": "{count, plural, one {# jauna lieta} other {# jaunas lietas}}",
+ "loading_indicator.label": "Ielādē…",
"media_gallery.toggle_visible": "{number, plural, one {Slēpt attēlu} other {Slēpt attēlus}}",
- "moved_to_account_banner.text": "Tavs konts {disabledAccount} pašlaik ir atspējots, jo pārcēlies uz kontu {movedToAccount}.",
- "mute_modal.duration": "Ilgums",
- "mute_modal.hide_notifications": "Slēpt paziņojumus no šī lietotāja?",
- "mute_modal.indefinite": "Beztermiņa",
+ "moved_to_account_banner.text": "Tavs konts {disabledAccount} pašlaik ir atspējots, jo Tu pārcēlies uz kontu {movedToAccount}.",
+ "mute_modal.hide_from_notifications": "Paslēpt paziņojumos",
+ "mute_modal.hide_options": "Paslēpt iespējas",
+ "mute_modal.show_options": "Parādīt iespējas",
+ "mute_modal.title": "Apklusināt lietotāju?",
"navigation_bar.about": "Par",
"navigation_bar.advanced_interface": "Atvērt paplašinātā tīmekļa saskarnē",
"navigation_bar.blocks": "Bloķētie lietotāji",
"navigation_bar.bookmarks": "Grāmatzīmes",
"navigation_bar.community_timeline": "Vietējā laika līnija",
"navigation_bar.compose": "Veidot jaunu ziņu",
- "navigation_bar.direct": "Privāti pieminēti",
+ "navigation_bar.direct": "Privātas pieminēšanas",
"navigation_bar.discover": "Atklāt",
"navigation_bar.domain_blocks": "Bloķētie domēni",
- "navigation_bar.edit_profile": "Rediģēt profilu",
- "navigation_bar.explore": "Pārlūkot",
+ "navigation_bar.explore": "Izpētīt",
"navigation_bar.favourites": "Izlase",
"navigation_bar.filters": "Apklusinātie vārdi",
"navigation_bar.follow_requests": "Sekošanas pieprasījumi",
@@ -413,37 +417,46 @@
"navigation_bar.lists": "Saraksti",
"navigation_bar.logout": "Iziet",
"navigation_bar.mutes": "Apklusinātie lietotāji",
- "navigation_bar.opened_in_classic_interface": "Ziņas, konti un citas noteiktas lapas pēc noklusējuma tiek atvērtas klasiskajā tīmekļa saskarnē.",
+ "navigation_bar.opened_in_classic_interface": "Ieraksti, konti un citas noteiktas lapas pēc noklusējuma tiek atvērtas klasiskajā tīmekļa saskarnē.",
"navigation_bar.personal": "Personīgie",
"navigation_bar.pins": "Piespraustās ziņas",
"navigation_bar.preferences": "Iestatījumi",
"navigation_bar.public_timeline": "Apvienotā laika līnija",
"navigation_bar.search": "Meklēt",
"navigation_bar.security": "Drošība",
- "not_signed_in_indicator.not_signed_in": "Lai piekļūtu šim resursam, tev ir jāpierakstās.",
+ "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",
- "notification.mention": "{name} pieminēja tevi",
+ "notification.follow": "{name} uzsāka Tev sekot",
+ "notification.follow_request": "{name} nosūtīja Tev sekošanas pieprasījumu",
+ "notification.mention": "{name} pieminēja Tevi",
+ "notification.moderation-warning.learn_more": "Uzzināt vairāk",
+ "notification.moderation_warning.action_delete_statuses": "Daži no Taviem ierakstiem tika noņemti.",
+ "notification.moderation_warning.action_disable": "Tavs konts tika atspējots.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Daži no Taviem ierakstiem tika atzīmēti kā jutīgi.",
+ "notification.moderation_warning.action_sensitive": "Tavi ieraksti turpmāk tiks atzīmēti kā jutīgi.",
+ "notification.moderation_warning.action_silence": "Tavs konts tika ierobežots.",
+ "notification.moderation_warning.action_suspend": "Tava konta darbība tika apturēta.",
"notification.own_poll": "Tava aptauja ir noslēgusies",
"notification.poll": "Aptauja, kurā tu piedalījies, ir noslēgusies",
- "notification.reblog": "{name} pastiprināja tavu ierakstu",
+ "notification.reblog": "{name} pastiprināja Tavu ierakstu",
+ "notification.relationships_severance_event": "Zaudēti savienojumi ar {name}",
+ "notification.relationships_severance_event.learn_more": "Uzzināt vairāk",
"notification.status": "{name} tikko publicēja",
"notification.update": "{name} rediģēja ierakstu",
+ "notification_requests.accept": "Pieņemt",
+ "notification_requests.dismiss": "Noraidīt",
+ "notification_requests.notifications_from": "Paziņojumi no {name}",
"notifications.clear": "Notīrīt paziņojumus",
"notifications.clear_confirmation": "Vai tiešām vēlies neatgriezeniski notīrīt visus savus paziņojumus?",
"notifications.column_settings.admin.report": "Jauni ziņojumi:",
"notifications.column_settings.admin.sign_up": "Jaunas pierakstīšanās:",
"notifications.column_settings.alert": "Darbvirsmas paziņojumi",
"notifications.column_settings.favourite": "Izlase:",
- "notifications.column_settings.filter_bar.advanced": "Rādīt visas kategorijas",
- "notifications.column_settings.filter_bar.category": "Ātro filtru josla",
- "notifications.column_settings.filter_bar.show_bar": "Rādīt filtru joslu",
"notifications.column_settings.follow": "Jauni sekotāji:",
"notifications.column_settings.follow_request": "Jauni sekošanas pieprasījumi:",
- "notifications.column_settings.mention": "Pieminējumi:",
+ "notifications.column_settings.mention": "Pieminēšanas:",
"notifications.column_settings.poll": "Aptaujas rezultāti:",
"notifications.column_settings.push": "Uznirstošie paziņojumi",
"notifications.column_settings.reblog": "Pastiprinātie ieraksti:",
@@ -457,7 +470,7 @@
"notifications.filter.boosts": "Pastiprinātie ieraksti",
"notifications.filter.favourites": "Izlases",
"notifications.filter.follows": "Seko",
- "notifications.filter.mentions": "Pieminējumi",
+ "notifications.filter.mentions": "Pieminēšanas",
"notifications.filter.polls": "Aptaujas rezultāti",
"notifications.filter.statuses": "Jaunumi no cilvēkiem, kuriem tu seko",
"notifications.grant_permission": "Piešķirt atļauju.",
@@ -466,6 +479,9 @@
"notifications.permission_denied": "Darbvirsmas paziņojumi nav pieejami, jo iepriekš tika noraidīts pārlūka atļauju pieprasījums",
"notifications.permission_denied_alert": "Darbvirsmas paziņojumus nevar iespējot, jo pārlūkprogrammai atļauja tika iepriekš atteikta",
"notifications.permission_required": "Darbvirsmas paziņojumi nav pieejami, jo nav piešķirta nepieciešamā atļauja.",
+ "notifications.policy.filter_new_accounts_title": "Jauni konti",
+ "notifications.policy.filter_not_followers_title": "Cilvēki, kuri Tev neseko",
+ "notifications.policy.filter_not_following_title": "Cilvēki, kuriem Tu neseko",
"notifications_permission_banner.enable": "Iespējot darbvirsmas paziņojumus",
"notifications_permission_banner.how_to_control": "Lai saņemtu paziņojumus, kad Mastodon nav atvērts, iespējo darbvirsmas paziņojumus. Vari precīzi kontrolēt, kāda veida mijiedarbības rada darbvirsmas paziņojumus, izmantojot augstāk redzamo pogu {icon}, kad tie būs iespējoti.",
"notifications_permission_banner.title": "Nekad nepalaid neko garām",
@@ -474,35 +490,44 @@
"onboarding.actions.go_to_explore": "Skatīt tendences",
"onboarding.actions.go_to_home": "Dodieties uz manu mājas plūsmu",
"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 personas, kurām sekot, vai mēģināt vēlreiz vēlāk.",
- "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.share.lead": "Paziņo citiem, kā viņi tevi var atrast 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ā pieredzēt Mastodon. Jo vairāk cilvēkiem sekosi, jo dzīvīgāka un aizraujošāka tā būs. Lai sāktu, šeit ir daži ieteikumi:",
+ "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…",
+ "onboarding.profile.note": "Apraksts",
+ "onboarding.profile.note_hint": "Tu vari @pieminēt citus cilvēkus vai #tēmturus…",
+ "onboarding.profile.save_and_continue": "Saglabāt un turpināt",
+ "onboarding.profile.title": "Profila iestatīšana",
+ "onboarding.profile.upload_avatar": "Augšupielādēt profila attēlu",
+ "onboarding.profile.upload_header": "Augšupielādēt profila galveni",
+ "onboarding.share.lead": "Dari cilvēkiem zināmu, ka viņi var Tevi atrast Mastodon!",
"onboarding.share.message": "Es esmu {username} #Mastodon! Nāc sekot man uz {url}",
"onboarding.share.next_steps": "Iespējamie nākamie soļi:",
"onboarding.share.title": "Kopīgo savu profilu",
- "onboarding.start.lead": "Tagad tu esat daļa no Mastodon — unikālas, decentralizētas sociālo mediju platformas, kurā tu, nevis algoritms, veido savu pieredzi. Sāksim darbu šajā jaunajā sociālajā jomā:",
+ "onboarding.start.lead": "Tagad Tu esi daļa no Mastodon — vienreizējas, decentralizētas sociālās mediju platformas, kurā Tu, nevis algoritms, veido Tavu pieredzi. Sāksim darbu šajā jaunajā sociālajā jomā:",
"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.publish_status.body": "Sveicini pasauli ar tekstu, fotoattēliem, video, vai aptaujām {emoji}",
+ "onboarding.steps.follow_people.title": "Pielāgo savu mājas barotni",
+ "onboarding.steps.publish_status.body": "Pasveicini pasauli ar tekstu, attēliem, video vai aptaujām {emoji}",
"onboarding.steps.publish_status.title": "Izveido savu pirmo ziņu",
- "onboarding.steps.setup_profile.body": "Citi, visticamāk, sazināsies ar tevi, izmantojot aizpildītu profilu.",
+ "onboarding.steps.setup_profile.body": "Palielini mijiedarbību ar aptverošu profilu!",
"onboarding.steps.setup_profile.title": "Pielāgo savu profilu",
- "onboarding.steps.share_profile.body": "Paziņo saviem draugiem, kā tevi atrast Mastodon!",
+ "onboarding.steps.share_profile.body": "Dari saviem draugiem zināmu, kā Tevi atrast Mastodon!",
"onboarding.steps.share_profile.title": "Kopīgo savu Mastodon profilu",
- "onboarding.tips.2fa": "Vai zināji? Tu vari aizsargāt savu kontu, konta iestatījumos iestatot divu faktoru autentifikāciju. Tas darbojas ar jebkuru tevis izvēlētu TOTP lietotni, nav nepieciešams tālruņa numurs!",
+ "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 personīgo 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.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 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",
@@ -510,16 +535,14 @@
"poll_button.add_poll": "Pievienot aptauju",
"poll_button.remove_poll": "Noņemt aptauju",
"privacy.change": "Mainīt ieraksta privātumu",
- "privacy.direct.long": "Redzama tikai pieminētajiem lietotājiem",
- "privacy.direct.short": "Tikai minētie cilvēki",
- "privacy.private.long": "Redzama tikai sekotājiem",
- "privacy.private.short": "Tikai sekotājiem",
- "privacy.public.long": "Redzams visiem",
+ "privacy.direct.long": "Visi ierakstā pieminētie",
+ "privacy.direct.short": "Noteikti cilvēki",
+ "privacy.private.long": "Tikai Tavi sekotāji",
+ "privacy.private.short": "Sekotāji",
"privacy.public.short": "Publiska",
- "privacy.unlisted.long": "Redzams visiem, bet izslēgts no satura atklāšanas funkcijām",
- "privacy.unlisted.short": "Neiekļautie",
"privacy_policy.last_updated": "Pēdējo reizi atjaunināta {date}",
"privacy_policy.title": "Privātuma politika",
+ "recommended": "Ieteicams",
"refresh": "Atsvaidzināt",
"regeneration_indicator.label": "Ielādē…",
"regeneration_indicator.sublabel": "Tiek gatavota tava plūsma!",
@@ -535,8 +558,9 @@
"relative_time.seconds": "{number}s",
"relative_time.today": "šodien",
"reply_indicator.cancel": "Atcelt",
+ "reply_indicator.poll": "Aptauja",
"report.block": "Bloķēt",
- "report.block_explanation": "Tu neredzēsi viņu ziņas. Viņi nevarēs redzēt tavas ziņas vai sekot tev. Viņi varēs saprast, ka ir bloķēti.",
+ "report.block_explanation": "Tu neredzēsi viņu ierakstus. Viņi nevarēs redzēt Tavus ierakstus vai sekot tev. Viņi varēs saprast, ka ir bloķēti.",
"report.categories.legal": "Tiesisks",
"report.categories.other": "Citi",
"report.categories.spam": "Spams",
@@ -550,7 +574,7 @@
"report.forward": "Pārsūtīt {target}",
"report.forward_hint": "Konts ir no cita servera. Vai nosūtīt anonimizētu sūdzības kopiju arī tam?",
"report.mute": "Apklusināt",
- "report.mute_explanation": "Tu neredzēsi viņu ziņas. Viņi joprojām var tev sekot un redzēt tavas ziņas un nezinās, ka viņi ir apklusināti.",
+ "report.mute_explanation": "Tu neredzēsi viņu ierakstus. Viņi joprojām var Tev sekot un redzēt Tavus ierakstus un nezinās, ka viņi ir apklusināti.",
"report.next": "Tālāk",
"report.placeholder": "Papildu komentāri",
"report.reasons.dislike": "Man tas nepatīk",
@@ -566,15 +590,15 @@
"report.rules.subtitle": "Atlasi visus atbilstošos",
"report.rules.title": "Kuri noteikumi tiek pārkāpti?",
"report.statuses.subtitle": "Atlasi visus atbilstošos",
- "report.statuses.title": "Vai ir kādi ieraksti, kas atbalsta šo sūdzību?",
+ "report.statuses.title": "Vai ir kādi ieraksti, kas apstiprina šo ziņojumu?",
"report.submit": "Iesniegt",
"report.target": "Ziņošana par: {target}",
- "report.thanks.take_action": "Tālāk ir norādītas iespējas, kā kontrolēt Mastodon redzamo saturu:",
+ "report.thanks.take_action": "Šeit ir iespējas, lai pārvaldītu Mastodon redzamo saturu:",
"report.thanks.take_action_actionable": "Kamēr mēs to izskatām, tu vari veikt darbības pret @{name}:",
"report.thanks.title": "Vai nevēlies to redzēt?",
"report.thanks.title_actionable": "Paldies, ka ziņoji, mēs to izskatīsim.",
"report.unfollow": "Pārtraukt sekot @{name}",
- "report.unfollow_explanation": "Tu seko šim kontam. Lai vairs neredzētu viņu ziņas savā mājas plūsmā, pārtrauc viņiem sekot.",
+ "report.unfollow_explanation": "Tu seko šim kontam. Lai vairs neredzētu tā ierakstus savā mājas plūsmā, pārtrauc sekot tam!",
"report_notification.attached_statuses": "Pievienoti {count, plural,one {{count} sūtījums} other {{count} sūtījumi}}",
"report_notification.categories.legal": "Tiesisks",
"report_notification.categories.other": "Cita",
@@ -587,56 +611,57 @@
"search.quick_action.go_to_account": "Doties uz profilu {x}",
"search.quick_action.go_to_hashtag": "Doties uz tēmturi {x}",
"search.quick_action.open_url": "Atvērt URL Mastodonā",
- "search.quick_action.status_search": "Ziņas atbilst {x}",
- "search.search_or_paste": "Meklē vai iekopē URL",
+ "search.quick_action.status_search": "Ieraksti, kas atbilst {x}",
+ "search.search_or_paste": "Meklēt vai ielīmēt URL",
"search_popout.full_text_search_disabled_message": "Nav pieejams {domain}.",
+ "search_popout.full_text_search_logged_out_message": "Pieejams tikai pēc pieteikšanās.",
"search_popout.language_code": "ISO valodas kods",
"search_popout.options": "Meklēšanas iespējas",
"search_popout.quick_actions": "Ātrās darbības",
"search_popout.recent": "Nesen meklētais",
- "search_popout.specific_date": "konkrēts datums",
+ "search_popout.specific_date": "noteikts datums",
"search_popout.user": "lietotājs",
"search_results.accounts": "Profili",
"search_results.all": "Visi",
"search_results.hashtags": "Tēmturi",
- "search_results.nothing_found": "Nevarēja atrast neko šiem meklēšanas vienumiem",
+ "search_results.nothing_found": "Nevarēja atrast neko, kas atbilstu šim meklēšanas vaicājumam",
"search_results.see_all": "Skatīt visus",
"search_results.statuses": "Ieraksti",
"search_results.title": "Meklēt {q}",
"server_banner.about_active_users": "Cilvēki, kas izmantojuši šo serveri pēdējo 30 dienu laikā (aktīvie lietotāji mēnesī)",
- "server_banner.active_users": "aktīvie lietotāji",
+ "server_banner.active_users": "aktīvi lietotāji",
"server_banner.administered_by": "Administrē:",
"server_banner.introduction": "{domain} ir daļa no decentralizētā sociālā tīkla, ko nodrošina {mastodon}.",
"server_banner.learn_more": "Uzzināt vairāk",
"server_banner.server_stats": "Servera statistika:",
"sign_in_banner.create_account": "Izveidot kontu",
- "sign_in_banner.sign_in": "Pierakstīties",
+ "sign_in_banner.sign_in": "Pieteikties",
"sign_in_banner.sso_redirect": "Piesakies vai Reģistrējies",
- "sign_in_banner.text": "Pieraksties, lai sekotu profiliem vai atsaucēm, pievienotu izlasei, kopīgotu ziņas un atbildētu uz tām. Vari arī mijiedarboties no sava konta citā serverī.",
+ "sign_in_banner.text": "Jāpiesakās, lai sekotu profiliem vai tēmturiem, pievienotu izlasei, kopīgotu ierakstus un atbildētu uz tiem. Vari arī mijiedarboties ar savu kontu citā serverī.",
"status.admin_account": "Atvērt @{name} moderēšanas saskarni",
"status.admin_domain": "Atvērt {domain} moderēšanas saskarni",
"status.admin_status": "Atvērt šo ziņu moderācijas saskarnē",
"status.block": "Bloķēt @{name}",
"status.bookmark": "Grāmatzīme",
- "status.cancel_reblog_private": "Neizcelt",
+ "status.cancel_reblog_private": "Nepastiprināt",
"status.cannot_reblog": "Šo ziņu nevar izcelt",
- "status.copy": "Kopēt saiti uz ziņu",
+ "status.copy": "Ievietot ieraksta saiti starpliktuvē",
"status.delete": "Dzēst",
"status.detailed_status": "Detalizēts sarunas skats",
"status.direct": "Pieminēt @{name} privāti",
"status.direct_indicator": "Pieminēts privāti",
- "status.edit": "Rediģēt",
- "status.edited": "Rediģēts {date}",
- "status.edited_x_times": "Rediģēts {count, plural, one {{count} reize} other {{count} reizes}}",
- "status.embed": "Iestrādāt",
- "status.favourite": "Iecienīts",
+ "status.edit": "Labot",
+ "status.edited": "Pēdējoreiz labots {date}",
+ "status.edited_x_times": "Labots {count, plural, one {{count} reizi} other {{count} reizes}}",
+ "status.embed": "Iegult",
+ "status.favourite": "Izlasē",
"status.filter": "Filtrē šo ziņu",
"status.filtered": "Filtrēts",
"status.hide": "Slēpt ierakstu",
"status.history.created": "{name} izveidoja {date}",
- "status.history.edited": "{name} rediģēja {date}",
+ "status.history.edited": "{name} laboja {date}",
"status.load_more": "Ielādēt vairāk",
- "status.media.open": "Noklikšķini, lai atvērtu",
+ "status.media.open": "Jānoklikšķina, lai atvērtu",
"status.media.show": "Noklikšķini, lai parādītu",
"status.media_hidden": "Multivides ir paslēpts",
"status.mention": "Pieminēt @{name}",
@@ -671,7 +696,7 @@
"status.uncached_media_warning": "Priekšskatījums nav pieejams",
"status.unmute_conversation": "Noņemt sarunas apklusinājumu",
"status.unpin": "Noņemt profila piespraudumu",
- "subscribed_languages.lead": "Pēc izmaiņu veikšanas tavā mājas un sarakstu laika līnijā tiks rādītas tikai ziņas atlasītajās valodās. Neatlasi nevienu, lai saņemtu ziņas visās valodās.",
+ "subscribed_languages.lead": "Pēc izmaiņu veikšanas Tavā mājas un sarakstu laika līnijā tiks rādīti tikai tie ieraksti atlasītajās valodās. Neatlasīt nevienu, lai saņemtu ierakstus visās valodās.",
"subscribed_languages.save": "Saglabāt izmaiņas",
"subscribed_languages.target": "Mainīt abonētās valodas priekš {target}",
"tabs_bar.home": "Sākums",
@@ -685,8 +710,8 @@
"timeline_hint.resources.followers": "Sekotāji",
"timeline_hint.resources.follows": "Seko",
"timeline_hint.resources.statuses": "Vecāki ieraksti",
- "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} cilvēki}} par {days, plural, one {# dienu} other {{days} dienām}}",
- "trends.trending_now": "Aktuālās tendences",
+ "trends.counter_by_accounts": "{count, plural, zero {{counter} cilvēku} one {{counter} cilvēks} other {{counter} cilvēki}} {days, plural, one {{day} dienā} other {{days} dienās}}",
+ "trends.trending_now": "Pašlaik populāri",
"ui.beforeunload": "Ja pametīsit Mastodonu, jūsu melnraksts tiks zaudēts.",
"units.short.billion": "{count}Mjd",
"units.short.million": "{count}M",
@@ -697,10 +722,8 @@
"upload_error.poll": "Datņu augšupielādes aptaujās nav atļautas.",
"upload_form.audio_description": "Pievieno aprakstu cilvēkiem ar dzirdes zudumu",
"upload_form.description": "Pievieno aprakstu vājredzīgajiem",
- "upload_form.description_missing": "Apraksts nav pievienots",
- "upload_form.edit": "Rediģēt",
+ "upload_form.edit": "Labot",
"upload_form.thumbnail": "Nomainīt sīktēlu",
- "upload_form.undo": "Dzēst",
"upload_form.video_description": "Pievieno aprakstu cilvēkiem ar dzirdes vai redzes traucējumiem",
"upload_modal.analyzing_picture": "Analizē attēlu…",
"upload_modal.apply": "Pielietot",
@@ -708,7 +731,7 @@
"upload_modal.choose_image": "Izvēlēties attēlu",
"upload_modal.description_placeholder": "Raibais runcis rīgā ratu rumbā rūc",
"upload_modal.detect_text": "Noteikt tekstu no attēla",
- "upload_modal.edit_media": "Rediģēt multividi",
+ "upload_modal.edit_media": "Labot informācijas nesēju",
"upload_modal.hint": "Noklikšķini vai velc apli priekšskatījumā, lai izvēlētos fokusa punktu, kas vienmēr būs redzams visos sīktēlos.",
"upload_modal.preparing_ocr": "Sagatavo OCR…",
"upload_modal.preview_label": "Priekšskatīt ({ratio})",
diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json
index bdef3f4a5feeb6..d8a470ed47ead9 100644
--- a/app/javascript/mastodon/locales/mk.json
+++ b/app/javascript/mastodon/locales/mk.json
@@ -48,7 +48,6 @@
"alert.rate_limited.message": "Обидете се повторно после {retry_time, time, medium}.",
"alert.unexpected.message": "Неочекувана грешка.",
"alert.unexpected.title": "Упс!",
- "autosuggest_hashtag.per_week": "{count} неделно",
"boost_modal.combo": "Кликни {combo} за да го прескокниш ова нареден пат",
"bundle_column_error.retry": "Обидете се повторно",
"bundle_modal_error.close": "Затвори",
@@ -76,31 +75,20 @@
"compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
"compose_form.lock_disclaimer.lock": "заклучен",
"compose_form.placeholder": "Што имате на ум?",
- "compose_form.poll.add_option": "Додај избор",
"compose_form.poll.duration": "Времетрање на анкета",
- "compose_form.poll.option_placeholder": "Избери {number}",
- "compose_form.poll.remove_option": "Избриши избор",
"compose_form.publish_form": "Publish",
- "compose_form.sensitive.hide": "Обележи медиа како сензитивна",
- "compose_form.sensitive.marked": "Медиата е обележана како сензитивна",
- "compose_form.sensitive.unmarked": "Медиата не е обележана како сензитивна",
"compose_form.spoiler.marked": "Текстот е сокриен зад предупредување",
"compose_form.spoiler.unmarked": "Текстот не е сокриен",
"confirmation_modal.cancel": "Откажи",
- "confirmations.block.block_and_report": "Блокирај и Пријави",
"confirmations.block.confirm": "Блокирај",
- "confirmations.block.message": "Сигурни сте дека дека го блокирате {name}?",
"confirmations.delete.confirm": "Избриши",
"confirmations.delete.message": "Сигурни сте дека го бришите статусот?",
"confirmations.delete_list.confirm": "Избриши",
"confirmations.delete_list.message": "Дали сте сигурни дека сакате да го избришете списоков?",
- "confirmations.domain_block.confirm": "Сокриј цел домеин",
"confirmations.domain_block.message": "Дали скроз сте сигурни дека ќе блокирате сѐ од {domain}? Во повеќето случаеви неколку таргетирани блокирања или заќутувања се доволни и предложени. Нема да ја видите содржината од тој домеин во никој јавен времеплов или вашите нотификации. Вашите следбеници од тој домеин ќе бидат остранети.",
"confirmations.logout.confirm": "Одјави се",
"confirmations.logout.message": "Дали сте сигурни дека сакате да се одјавите?",
"confirmations.mute.confirm": "Заќути",
- "confirmations.mute.explanation": "Ќе сокрие објави од нив и објави кои ги спомнуваат нив, но сеуште ќе им дозволи да ги видат вашите постови и ве следат.",
- "confirmations.mute.message": "Дали ќе го заќутите {name}?",
"confirmations.reply.confirm": "Одговори",
"confirmations.unfollow.confirm": "Одследи",
"confirmations.unfollow.message": "Сигурни сте дека ќе го отследите {name}?",
@@ -144,7 +132,6 @@
"hashtag.column_settings.tag_mode.any": "Било кои",
"hashtag.column_settings.tag_mode.none": "Никои",
"hashtag.column_settings.tag_toggle": "Стави додатни тагови за оваа колона",
- "home.column_settings.basic": "Основно",
"home.column_settings.show_reblogs": "Прикажи бустирања",
"home.column_settings.show_replies": "Прикажи одговори",
"intervals.full.days": "{number, plural, one {# ден} other {# дена}}",
@@ -182,7 +169,6 @@
"keyboard_shortcuts.up": "to move up in the list",
"navigation_bar.compose": "Compose new toot",
"navigation_bar.domain_blocks": "Hidden domains",
- "navigation_bar.edit_profile": "Уреди профил",
"navigation_bar.filters": "Замолќени зборови",
"navigation_bar.follow_requests": "Следи покани",
"navigation_bar.follows_and_followers": "Следења и следбеници",
@@ -229,12 +215,7 @@
"poll_button.add_poll": "Додадете нова анкета",
"poll_button.remove_poll": "Избришете анкета",
"privacy.change": "Штеловај статус на приватност",
- "privacy.direct.long": "Објави само на спомнати корисници",
- "privacy.direct.short": "Direct",
- "privacy.private.long": "Објави само на следбеници",
- "privacy.private.short": "Followers-only",
"privacy.public.short": "Јавно",
- "privacy.unlisted.short": "Необјавено",
"refresh": "Освежи",
"regeneration_indicator.label": "Вчитување…",
"regeneration_indicator.sublabel": "Вашиот новости се подготвуваат!",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index 11636646b26c0a..8fb4e818db2ead 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -60,7 +60,6 @@
"announcement.announcement": "അറിയിപ്പ്",
"attachments_list.unprocessed": "(പ്രോസസ്സ് ചെയ്യാത്തത്)",
"audio.hide": "ശബ്ദം ഒഴിവാക്കുക",
- "autosuggest_hashtag.per_week": "ആഴ്ച തോറും {count}",
"boost_modal.combo": "അടുത്ത തവണ ഇത് ഒഴിവാക്കുവാൻ {combo} ഞെക്കാവുന്നതാണ്",
"bundle_column_error.network.title": "നെറ്റ്വർക്ക് പിശക്",
"bundle_column_error.retry": "വീണ്ടും ശ്രമിക്കുക",
@@ -102,26 +101,18 @@
"compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
"compose_form.lock_disclaimer.lock": "ലോക്കുചെയ്തു",
"compose_form.placeholder": "നിങ്ങളുടെ മനസ്സിൽ എന്താണ്?",
- "compose_form.poll.add_option": "ഒരു ചോയ്സ് ചേർക്കുക",
"compose_form.poll.duration": "തിരഞ്ഞെടുപ്പിന്റെ സമയദൈർഖ്യം",
- "compose_form.poll.option_placeholder": "ചോയ്സ് {number}",
- "compose_form.poll.remove_option": "ഈ ഡിവൈസ് മാറ്റുക",
"compose_form.poll.switch_to_multiple": "വോട്ടെടുപ്പിൽ ഒന്നിലധികം ചോയ്സുകൾ ഉൾപ്പെടുതുക",
"compose_form.poll.switch_to_single": "വോട്ടെടുപ്പിൽ ഒരൊറ്റ ചോയ്സ് മാത്രം ആക്കുക",
"compose_form.publish_form": "Publish",
- "compose_form.publish_loud": "{പ്രസിദ്ധീകരിക്കുക}!",
"compose_form.spoiler.marked": "എഴുത്ത് മുന്നറിയിപ്പിനാൽ മറച്ചിരിക്കുന്നു",
"compose_form.spoiler.unmarked": "എഴുത്ത് മറയ്ക്കപ്പെട്ടിട്ടില്ല",
- "compose_form.spoiler_placeholder": "നിങ്ങളുടെ മുന്നറിയിപ്പ് ഇവിടെ എഴുതുക",
"confirmation_modal.cancel": "റദ്ദാക്കുക",
- "confirmations.block.block_and_report": "തടയുകയും റിപ്പോർട്ടും ചെയ്യുക",
"confirmations.block.confirm": "തടയുക",
- "confirmations.block.message": "{name} തടയാൻ നിങ്ങൾ ആഗ്രഹിക്കുന്നുണ്ടോ?",
"confirmations.delete.confirm": "മായ്ക്കുക",
"confirmations.delete.message": "ഈ ടൂട്ട് ഇല്ലാതാക്കണം എന്ന് നിങ്ങൾക്ക് ഉറപ്പാണോ?",
"confirmations.delete_list.confirm": "മായ്ക്കുക",
"confirmations.delete_list.message": "ഈ പട്ടിക എന്നെന്നേക്കുമായി നീക്കം ചെയ്യാൻ നിങ്ങൾ ആഗ്രഹിക്കുന്നുണ്ടോ?",
- "confirmations.domain_block.confirm": "മുഴുവൻ ഡൊമെയ്നും തടയുക",
"confirmations.logout.confirm": "പുറത്തുകടക്കുക",
"confirmations.logout.message": "നിങ്ങൾക്ക് ലോഗ് ഔട്ട് ചെയ്യണമെന്ന് ഉറപ്പാണോ?",
"confirmations.mute.confirm": "നിശ്ശബ്ദമാക്കുക",
@@ -187,7 +178,6 @@
"hashtag.column_settings.tag_mode.any": "ഇവയിലേതെങ്കിലും",
"hashtag.column_settings.tag_mode.none": "ഇതിലൊന്നുമല്ല",
"hashtag.column_settings.tag_toggle": "ഈ എഴുത്തുപംക്തിക്ക് കൂടുതൽ ഉപനാമങ്ങൾ ചേർക്കുക",
- "home.column_settings.basic": "അടിസ്ഥാനം",
"home.column_settings.show_reblogs": "ബൂസ്റ്റുകൾ കാണിക്കുക",
"home.column_settings.show_replies": "മറുപടികൾ കാണിക്കുക",
"home.hide_announcements": "പ്രഖ്യാപനങ്ങൾ മറയ്ക്കുക",
@@ -236,15 +226,12 @@
"lists.replies_policy.none": "ആരുമില്ല",
"lists.replies_policy.title": "ഇതിനുള്ള മറുപടികൾ കാണിക്കുക:",
"lists.subheading": "എന്റെ പട്ടികകൾ",
- "mute_modal.duration": "കാലാവധി",
- "mute_modal.indefinite": "അനിശ്ചിതകാല",
"navigation_bar.blocks": "തടയപ്പെട്ട ഉപയോക്താക്കൾ",
"navigation_bar.bookmarks": "ബുക്ക്മാർക്കുകൾ",
"navigation_bar.community_timeline": "പ്രാദേശിക സമയരേഖ",
"navigation_bar.compose": "പുതിയ ടൂട്ട് എഴുതുക",
"navigation_bar.discover": "കണ്ടെത്തുക",
"navigation_bar.domain_blocks": "Hidden domains",
- "navigation_bar.edit_profile": "പ്രൊഫൈൽ തിരുത്തുക",
"navigation_bar.follow_requests": "പിന്തുടരാനുള്ള അഭ്യർത്ഥനകൾ",
"navigation_bar.lists": "ലിസ്റ്റുകൾ",
"navigation_bar.logout": "ലോഗൗട്ട്",
@@ -262,7 +249,6 @@
"notifications.clear": "അറിയിപ്പ് മായ്ക്കുക",
"notifications.clear_confirmation": "നിങ്ങളുടെ എല്ലാ അറിയിപ്പുകളും ശാശ്വതമായി മായ്ക്കണമെന്ന് നിങ്ങൾക്ക് ഉറപ്പാണോ?",
"notifications.column_settings.alert": "ഡെസ്ക്ടോപ്പ് അറിയിപ്പുകൾ",
- "notifications.column_settings.filter_bar.advanced": "എല്ലാ വിഭാഗങ്ങളും പ്രദർശിപ്പിക്കുക",
"notifications.column_settings.follow": "പുതിയ പിന്തുടരുന്നവർ:",
"notifications.column_settings.follow_request": "പുതിയ പിന്തുടരൽ അഭ്യർത്ഥനകൾ:",
"notifications.column_settings.mention": "സൂചനകൾ:",
@@ -302,10 +288,6 @@
"poll_button.add_poll": "ഒരു പോൾ ചേർക്കുക",
"poll_button.remove_poll": "പോൾ നീക്കംചെയ്യുക",
"privacy.change": "ടൂട്ട് സ്വകാര്യത ക്രമീകരിക്കുക",
- "privacy.direct.long": "Post to mentioned users only",
- "privacy.direct.short": "Direct",
- "privacy.private.long": "Post to followers only",
- "privacy.private.short": "Followers-only",
"privacy.public.short": "എല്ലാവര്ക്കും",
"refresh": "പുതുക്കുക",
"regeneration_indicator.label": "ലഭ്യമാക്കുന്നു…",
@@ -372,7 +354,6 @@
"upload_form.description": "കാഴ്ചശക്തി ഇല്ലാത്തവർക്ക് വേണ്ടി വിവരണം നൽകൂ",
"upload_form.edit": "തിരുത്തുക",
"upload_form.thumbnail": "ലഘുചിത്രം മാറ്റുക",
- "upload_form.undo": "ഇല്ലാതാക്കുക",
"upload_form.video_description": "Describe for people with hearing loss or visual impairment",
"upload_modal.analyzing_picture": "ചിത്രം വിശകലനം ചെയ്യുന്നു…",
"upload_modal.apply": "പ്രയോഗിക്കുക",
diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json
index 7f5b7d65248ed5..a00b39e838a0e0 100644
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@@ -73,7 +73,6 @@
"alert.unexpected.message": "एक अनपेक्षित त्रुटी आली.",
"alert.unexpected.title": "अरेरे!",
"announcement.announcement": "घोषणा",
- "autosuggest_hashtag.per_week": "{count} प्रतिसप्ताह",
"bundle_column_error.retry": "पुन्हा प्रयत्न करा",
"bundle_modal_error.close": "बंद करा",
"bundle_modal_error.message": "हा घटक लोड करतांना काहीतरी चुकले आहे.",
@@ -99,9 +98,6 @@
"compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
"compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
"compose_form.placeholder": "आपल्या मनात काय आहे?",
- "compose_form.poll.add_option": "नवीन पर्याय",
- "compose_form.poll.option_placeholder": "निवड {number}",
- "compose_form.poll.remove_option": "हा पर्याय काढा",
"compose_form.publish_form": "Publish",
"compose_form.spoiler.marked": "Text is hidden behind warning",
"compose_form.spoiler.unmarked": "Text is not hidden",
@@ -109,7 +105,6 @@
"confirmations.delete.message": "हे स्टेटस तुम्हाला नक्की हटवायचंय?",
"confirmations.delete_list.confirm": "हटवा",
"confirmations.delete_list.message": "ही यादी तुम्हाला नक्की कायमची हटवायचीय?",
- "confirmations.domain_block.confirm": "संपूर्ण डोमेन लपवा",
"confirmations.logout.message": "तुमची खात्री आहे की तुम्ही लॉग आउट करू इच्छिता?",
"confirmations.mute.confirm": "आवाज बंद करा",
"dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
@@ -126,7 +121,6 @@
"hashtag.column_settings.tag_toggle": "Include additional tags in this column",
"hashtag.follow": "हॅशटॅग फॉलो करा",
"hashtag.unfollow": "हॅशटॅग अनफॉलो करा",
- "home.column_settings.basic": "मूळ",
"home.column_settings.show_reblogs": "बूस्ट दाखवा",
"home.column_settings.show_replies": "उत्तरे दाखवा",
"home.hide_announcements": "घोषणा लपवा",
@@ -228,10 +222,6 @@
"onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
"onboarding.steps.share_profile.title": "Share your profile",
"privacy.change": "Adjust status privacy",
- "privacy.direct.long": "Post to mentioned users only",
- "privacy.direct.short": "Direct",
- "privacy.private.long": "Post to followers only",
- "privacy.private.short": "Followers-only",
"report.placeholder": "Type or paste additional comments",
"report.submit": "Submit report",
"report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 50a48db1ea03d0..8fe043c5dcec02 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -21,6 +21,7 @@
"account.blocked": "Disekat",
"account.browse_more_on_origin_server": "Layari selebihnya di profil asal",
"account.cancel_follow_request": "Menarik balik permintaan mengikut",
+ "account.copy": "Salin pautan ke profil",
"account.direct": "Sebut secara persendirian @{name}",
"account.disable_notifications": "Berhenti maklumkan saya apabila @{name} mengirim hantaran",
"account.domain_blocked": "Domain disekat",
@@ -31,6 +32,7 @@
"account.featured_tags.last_status_never": "Tiada hantaran",
"account.featured_tags.title": "Tanda pagar pilihan {name}",
"account.follow": "Ikuti",
+ "account.follow_back": "Ikut balik",
"account.followers": "Pengikut",
"account.followers.empty": "Belum ada yang mengikuti pengguna ini.",
"account.followers_counter": "{count, plural, one {{counter} Pengikut} other {{counter} Pengikut}}",
@@ -51,6 +53,7 @@
"account.mute_notifications_short": "Redam pemberitahuan",
"account.mute_short": "Redam",
"account.muted": "Dibisukan",
+ "account.mutual": "Rakan kongsi",
"account.no_bio": "Tiada penerangan diberikan.",
"account.open_original_page": "Buka halaman asal",
"account.posts": "Hantaran",
@@ -86,7 +89,6 @@
"announcement.announcement": "Pengumuman",
"attachments_list.unprocessed": "(belum diproses)",
"audio.hide": "Sembunyikan audio",
- "autosuggest_hashtag.per_week": "{count} seminggu",
"boost_modal.combo": "Anda boleh tekan {combo} untuk melangkauinya pada waktu lain",
"bundle_column_error.copy_stacktrace": "Salin laporan ralat",
"bundle_column_error.error.body": "Halaman yang diminta gagal dipaparkan. Ini mungkin disebabkan oleh pepijat dalam kod kami, atau masalah keserasian pelayar.",
@@ -143,26 +145,22 @@
"compose_form.lock_disclaimer": "Akaun anda tidak {locked}. Sesiapa pun boleh mengikuti anda untuk melihat hantaran pengikut-sahaja anda.",
"compose_form.lock_disclaimer.lock": "dikunci",
"compose_form.placeholder": "Apakah yang sedang anda fikirkan?",
- "compose_form.poll.add_option": "Tambah pilihan",
"compose_form.poll.duration": "Tempoh undian",
+ "compose_form.poll.multiple": "Pelbagai pilihan",
"compose_form.poll.option_placeholder": "Pilihan {number}",
- "compose_form.poll.remove_option": "Buang pilihan ini",
+ "compose_form.poll.single": "Pilih satu",
"compose_form.poll.switch_to_multiple": "Ubah kepada membenarkan aneka undian",
"compose_form.poll.switch_to_single": "Ubah kepada undian pilihan tunggal",
- "compose_form.publish": "Terbit",
+ "compose_form.poll.type": "Gaya",
+ "compose_form.publish": "Siaran",
"compose_form.publish_form": "Terbit",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Simpan perubahan",
- "compose_form.sensitive.hide": "{count, plural, one {Tandakan media sbg sensitif} other {Tandakan media sbg sensitif}}",
- "compose_form.sensitive.marked": "{count, plural, one {Media telah ditanda sbg sensitif} other {Media telah ditanda sbg sensitif}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Media tidak ditanda sbg sensitif} other {Media tidak ditanda sbg sensitif}}",
+ "compose_form.reply": "Balas",
+ "compose_form.save_changes": "Kemas kini",
"compose_form.spoiler.marked": "Buang amaran kandungan",
"compose_form.spoiler.unmarked": "Tambah amaran kandungan",
- "compose_form.spoiler_placeholder": "Tulis amaran anda di sini",
+ "compose_form.spoiler_placeholder": "Amaran kandungan (pilihan)",
"confirmation_modal.cancel": "Batal",
- "confirmations.block.block_and_report": "Sekat & Lapor",
"confirmations.block.confirm": "Sekat",
- "confirmations.block.message": "Adakah anda pasti anda ingin menyekat {name}?",
"confirmations.cancel_follow_request.confirm": "Tarik balik permintaan",
"confirmations.cancel_follow_request.message": "Adakah anda pasti ingin menarik balik permintaan anda untuk mengikut {name}?",
"confirmations.delete.confirm": "Padam",
@@ -171,15 +169,12 @@
"confirmations.delete_list.message": "Adakah anda pasti anda ingin memadam senarai ini secara kekal?",
"confirmations.discard_edit_media.confirm": "Singkir",
"confirmations.discard_edit_media.message": "Anda belum menyimpan perubahan pada penerangan atau pratonton media. Anda ingin membuangnya?",
- "confirmations.domain_block.confirm": "Sekat keseluruhan domain",
"confirmations.domain_block.message": "Adakah anda betul-betul, sungguh-sungguh pasti anda ingin menyekat keseluruhan {domain}? Selalunya, beberapa sekatan atau pembisuan tersasar sudah memadai dan lebih diutamakan. Anda tidak akan nampak kandungan daripada domain tersebut di mana-mana garis masa awam mahupun pemberitahuan anda. Pengikut anda daripada domain tersebut juga akan dibuang.",
"confirmations.edit.confirm": "Sunting",
"confirmations.edit.message": "Mengedit sekarang akan menimpa mesej yang sedang anda karang. Adakah anda pasti mahu meneruskan?",
"confirmations.logout.confirm": "Log keluar",
"confirmations.logout.message": "Adakah anda pasti anda ingin log keluar?",
"confirmations.mute.confirm": "Bisukan",
- "confirmations.mute.explanation": "Ini akan menyembunyikan hantaran daripada mereka dan juga hantaran yang menyebut mereka, tetapi ia masih membenarkan mereka melihat hantaran anda dan mengikuti anda.",
- "confirmations.mute.message": "Adakah anda pasti anda ingin membisukan {name}?",
"confirmations.redraft.confirm": "Padam & rangka semula",
"confirmations.redraft.message": "Adakah anda pasti anda ingin memadam pos ini dan merangkanya semula? Kegemaran dan galakan akan hilang, dan balasan ke pos asal akan menjadi yatim.",
"confirmations.reply.confirm": "Balas",
@@ -190,6 +185,7 @@
"conversation.mark_as_read": "Tanda sudah dibaca",
"conversation.open": "Lihat perbualan",
"conversation.with": "Dengan {names}",
+ "copy_icon_button.copied": "Disalin ke papan klip",
"copypaste.copied": "Disalin",
"copypaste.copy_to_clipboard": "Salin ke papan klip",
"directory.federated": "Dari fediverse yang diketahui",
@@ -221,6 +217,7 @@
"emoji_button.search_results": "Hasil carian",
"emoji_button.symbols": "Simbol",
"emoji_button.travel": "Kembara & Tempat",
+ "empty_column.account_hides_collections": "Pengguna ini telah memilih untuk tidak menyediakan informasi tersebut",
"empty_column.account_suspended": "Akaun digantung",
"empty_column.account_timeline": "Tiada hantaran di sini!",
"empty_column.account_unavailable": "Profil tidak tersedia",
@@ -275,6 +272,14 @@
"follow_request.authorize": "Benarkan",
"follow_request.reject": "Tolak",
"follow_requests.unlocked_explanation": "Walaupun akaun anda tidak dikunci, kakitangan {domain} merasakan anda mungkin ingin menyemak permintaan ikutan daripada akaun ini secara manual.",
+ "follow_suggestions.curated_suggestion": "",
+ "follow_suggestions.dismiss": "Jangan papar lagi",
+ "follow_suggestions.hints.featured": "Profil{domain.",
+ "follow_suggestions.hints.friends_of_friends": "This profile is popular among the people you follow.",
+ "follow_suggestions.hints.most_followed": ".",
+ "follow_suggestions.personalized_suggestion": "Cadangan peribadi",
+ "follow_suggestions.popular_suggestion": "Cadangan terkenal",
+ "follow_suggestions.view_all": "Lihat semua",
"followed_tags": "Topik terpilih",
"footer.about": "Perihal",
"footer.directory": "Direktori profil",
@@ -295,16 +300,14 @@
"hashtag.column_settings.tag_mode.any": "Mana-mana daripada yang ini",
"hashtag.column_settings.tag_mode.none": "Tiada apa pun daripada yang ini",
"hashtag.column_settings.tag_toggle": "Sertakan tag tambahan untuk lajur ini",
+ "hashtag.counter_by_accounts": "{count, plural, other {{counter} peserta}}",
+ "hashtag.counter_by_uses": "{count, plural, other {{counter} siaran}}",
+ "hashtag.counter_by_uses_today": "{count, plural, other {{counter} siaran}} hari ini",
"hashtag.follow": "Ikuti hashtag",
"hashtag.unfollow": "Nyahikut tanda pagar",
"hashtags.and_other": "…dan {count, plural, other {# more}}",
- "home.actions.go_to_explore": "Lihat apa yand sedang tren",
- "home.actions.go_to_suggestions": "Cari orang untuk diikuti",
- "home.column_settings.basic": "Asas",
"home.column_settings.show_reblogs": "Tunjukkan galakan",
"home.column_settings.show_replies": "Tunjukkan balasan",
- "home.explore_prompt.body": "Suapan rumah anda akan mempunyai gabungan pos daripada hashtag yang telah anda pilih untuk diikuti, orang yang telah anda pilih untuk diikuti dan pos yang mereka tingkatkan. Jika itu terasa terlalu senyap, anda mungkin mahu:",
- "home.explore_prompt.title": "Ini adalah pusat operasi anda dalam Mastodon.",
"home.hide_announcements": "Sembunyikan pengumuman",
"home.pending_critical_update.body": "Sila kemas kini pelayan Mastodon anda secepat yang mungkin!",
"home.pending_critical_update.link": "Lihat pengemaskinian",
@@ -385,11 +388,9 @@
"lists.search": "Cari dalam kalangan orang yang anda ikuti",
"lists.subheading": "Senarai anda",
"load_pending": "{count, plural, one {# item baharu} other {# item baharu}}",
+ "loading_indicator.label": "Memuatkan…",
"media_gallery.toggle_visible": "{number, plural, other {Sembunyikan imej}}",
"moved_to_account_banner.text": "Akaun anda {disabledAccount} kini dinyahdayakan kerana anda berpindah ke {movedToAccount}.",
- "mute_modal.duration": "Tempoh",
- "mute_modal.hide_notifications": "Sembunyikan pemberitahuan daripada pengguna ini?",
- "mute_modal.indefinite": "Tidak tentu",
"navigation_bar.about": "Perihal",
"navigation_bar.advanced_interface": "Buka dalam antara muka web lanjutan",
"navigation_bar.blocks": "Pengguna yang disekat",
@@ -399,7 +400,6 @@
"navigation_bar.direct": "Sebutan peribadi",
"navigation_bar.discover": "Teroka",
"navigation_bar.domain_blocks": "Domain disekat",
- "navigation_bar.edit_profile": "Sunting profil",
"navigation_bar.explore": "Teroka",
"navigation_bar.favourites": "Kegemaran",
"navigation_bar.filters": "Perkataan yang dibisukan",
@@ -434,9 +434,6 @@
"notifications.column_settings.admin.sign_up": "Pendaftaran baru:",
"notifications.column_settings.alert": "Pemberitahuan atas meja",
"notifications.column_settings.favourite": "Kegemaran:",
- "notifications.column_settings.filter_bar.advanced": "Papar semua kategori",
- "notifications.column_settings.filter_bar.category": "Bar penapis pantas",
- "notifications.column_settings.filter_bar.show_bar": "Paparkan bar penapis",
"notifications.column_settings.follow": "Pengikut baharu:",
"notifications.column_settings.follow_request": "Permintaan ikutan baharu:",
"notifications.column_settings.mention": "Sebutan:",
@@ -473,6 +470,11 @@
"onboarding.follows.empty": "Malangnya, tiada hasil dapat ditunjukkan sekarang. Anda boleh cuba menggunakan carian atau menyemak imbas halaman teroka untuk mencari orang untuk diikuti atau cuba lagi kemudian.",
"onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
"onboarding.follows.title": "Popular on Mastodon",
+ "onboarding.profile.display_name": "Nama paparan",
+ "onboarding.profile.display_name_hint": "Nama penuh anda atau nama anda yang menyeronokkan…",
+ "onboarding.profile.note_hint": "Anda boleh @menyebut orang lain atau #hashtags…",
+ "onboarding.profile.save_and_continue": "Simpan dan teruskan",
+ "onboarding.profile.upload_avatar": "Muat naik gambar profil",
"onboarding.share.lead": "Beritahu orang ramai bagaimana mereka boleh menemui anda di Mastodon!",
"onboarding.share.message": "Saya {username} di #Mastodon! Jom ikut saya di {url}",
"onboarding.share.next_steps": "Langkah seterusnya yang mungkin:",
@@ -506,16 +508,14 @@
"poll_button.add_poll": "Tambah undian",
"poll_button.remove_poll": "Buang undian",
"privacy.change": "Ubah privasi hantaran",
- "privacy.direct.long": "Hanya boleh dilihat oleh pengguna disebut",
- "privacy.direct.short": "Orang yang disebut sahaja",
- "privacy.private.long": "Hanya boleh dilihat oleh pengikut",
- "privacy.private.short": "Pengikut sahaja",
- "privacy.public.long": "Kelihatan untuk semua",
+ "privacy.direct.long": "Semua orang yang disebutkan dalam siaran",
+ "privacy.direct.short": "Orang tertentu",
+ "privacy.private.long": "Pengikut anda sahaja",
+ "privacy.private.short": "Pengikut",
"privacy.public.short": "Awam",
- "privacy.unlisted.long": "Terpapar untuk semua, tetapi menarik diri daripada ciri penemuan",
- "privacy.unlisted.short": "Tidak tersenarai",
"privacy_policy.last_updated": "Dikemaskini {date}",
"privacy_policy.title": "Dasar Privasi",
+ "recommended": "Disyorkan",
"refresh": "Muat semula",
"regeneration_indicator.label": "Memuatkan…",
"regeneration_indicator.sublabel": "Suapan rumah anda sedang disediakan!",
@@ -530,7 +530,9 @@
"relative_time.minutes": "{number}m",
"relative_time.seconds": "{number}s",
"relative_time.today": "hari ini",
+ "reply_indicator.attachments": "{count, plural, other {# lampiran}}",
"reply_indicator.cancel": "Batal",
+ "reply_indicator.poll": "Undian",
"report.block": "Sekat",
"report.block_explanation": "Anda tidak akan melihat hantaran mereka. Mereka tidak dapat melihat hantaran anda atau mengikuti anda. Mereka akan sedar bahawa mereka disekat.",
"report.categories.legal": "Sah",
@@ -622,7 +624,6 @@
"status.direct": "Sebut secara peribadi @{name}",
"status.direct_indicator": "Sebutan peribadi",
"status.edit": "Sunting",
- "status.edited": "Disunting {date}",
"status.edited_x_times": "Disunting {count, plural, other {{count} kali}}",
"status.embed": "Benaman",
"status.favourite": "Kegemaran",
@@ -693,10 +694,8 @@
"upload_error.poll": "Tidak boleh memuat naik fail bersama undian.",
"upload_form.audio_description": "Jelaskan untuk orang yang ada masalah pendengaran",
"upload_form.description": "Jelaskan untuk orang yang ada masalah penglihatan",
- "upload_form.description_missing": "Tiada keterangan ditambah",
"upload_form.edit": "Sunting",
"upload_form.thumbnail": "Ubah gambar kecil",
- "upload_form.undo": "Padam",
"upload_form.video_description": "Jelaskan untuk orang yang ada masalah pendengaran atau penglihatan",
"upload_modal.analyzing_picture": "Menganalisis gambar…",
"upload_modal.apply": "Guna",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index 3ca03b616a9620..23eaa8564b5470 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -87,7 +87,6 @@
"announcement.announcement": "ကြေငြာချက်",
"attachments_list.unprocessed": "(မလုပ်ဆောင်ရသေး)",
"audio.hide": "အသံပိတ်မည်",
- "autosuggest_hashtag.per_week": "တစ်ပတ်လျှင် {count}\n",
"boost_modal.combo": "ဤအရာကို နောက်တစ်ကြိမ်ကျော်ရန် {combo} ကိုနှိပ်နိုင်သည်။",
"bundle_column_error.copy_stacktrace": "စာကူးရာတွင်ပြဿနာရှိသည်",
"bundle_column_error.error.body": "ဤစာမျက်နှာကို ဖော်ပြရာတွင် ပြဿနာရှိနေသည်",
@@ -144,26 +143,14 @@
"compose_form.lock_disclaimer": "သင့်အကောင့်ကို {သော့ခတ်မထားပါ}။ သင့်နောက်လိုက်-သီးသန့်ပို့စ်များကို ကြည့်ရှုရန် မည်သူမဆို သင့်အား လိုက်ကြည့်နိုင်ပါသည်။",
"compose_form.lock_disclaimer.lock": "သော့ခတ်ထားမယ်",
"compose_form.placeholder": "What is on your mind?",
- "compose_form.poll.add_option": "ရွေးချယ်မှုထပ်မံပေါင်းထည့်ပါ",
"compose_form.poll.duration": "စစ်တမ်းကြာချိန်",
- "compose_form.poll.option_placeholder": "ရွေးချယ်မှု {number}\n",
- "compose_form.poll.remove_option": "ဤရွေးချယ်မှုကို ဖယ်ထုတ်ပါ",
"compose_form.poll.switch_to_multiple": "စစ်တမ်းတွင်တစ်ခုထပ်ပိုသောဆန္ဒပြုချက်လက်ခံမည်",
"compose_form.poll.switch_to_single": "စစ်တမ်းတွင် တစ်ခုကိုသာရွေးချယ်ခွင့်ပြုမည်",
- "compose_form.publish": "ပို့စ်တင်မည်",
"compose_form.publish_form": "ပို့စ်တင်မည်",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "ပြောင်းလဲမှုများကို သိမ်းဆည်းပါ",
- "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
- "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
"compose_form.spoiler.marked": "Text is hidden behind warning",
"compose_form.spoiler.unmarked": "Text is not hidden",
- "compose_form.spoiler_placeholder": "သတိပေးစာကိုဤနေရာတွင်ရေးပါ",
"confirmation_modal.cancel": "ပယ်ဖျက်မည်",
- "confirmations.block.block_and_report": "ဘလော့ပြီး တိုင်ကြားမည်",
"confirmations.block.confirm": "ဘလော့မည်",
- "confirmations.block.message": "အကောင့်မှ ထွက်ရန် သေချာပါသလား?",
"confirmations.cancel_follow_request.confirm": "ပန်ကြားချက်ကို ပယ်ဖျက်မည်",
"confirmations.cancel_follow_request.message": "{name} ကို စောင့်ကြည့်ခြင်းအားပယ်ဖျက်ရန် သေချာပါသလား။",
"confirmations.delete.confirm": "ဖျက်မည်",
@@ -172,15 +159,12 @@
"confirmations.delete_list.message": "ဖျက်ရန် သေချာပါသလား?",
"confirmations.discard_edit_media.confirm": "ဖယ်ထုတ်ပါ",
"confirmations.discard_edit_media.message": "သင်သည် မီဒီယာဖော်ပြချက် သို့မဟုတ် အစမ်းကြည့်ရှုခြင်းတွင် မသိမ်းဆည်းရသေးသော အပြောင်းအလဲများရှိသည်။ မည်သို့ပင်ဖြစ်စေ ဖျက်ပစ်မည်လား။",
- "confirmations.domain_block.confirm": "Hide entire domain",
"confirmations.domain_block.message": "{domain} တစ်ခုလုံးကို ဘလော့လုပ်ရန် တကယ် သေချာပါသလား? များသောအားဖြင့် အနည်းစုကို ပစ်မှတ်ထား ဘလော့လုပ်ခြင်းသည် လုံလောက်ပါသည်။ ထို ဒိုမိန်းမှ အကြောင်းအရာ တစ်ခုမှ မြင်ရမည်မဟုတ်သည့်အပြင် ထို ဒိုမိန်းတွင်ရှိသော သင်၏ စောင့်ကြည့်သူများပါ ဖယ်ရှားပစ်မည်ဖြစ်သည်။",
"confirmations.edit.confirm": "ပြင်ရန်",
"confirmations.edit.message": "ယခုပြင်ဆင်ခြင်းတွင် သင်လက်ရှိမက်ဆေ့ချ်ကို ဖျက်ပစ်ပြီး အသစ်ရေးပါမည်။ ရှေ့ဆက်လိုသည်မှာ သေချာပါသလား။",
"confirmations.logout.confirm": "အကောင့်မှထွက်မည်",
"confirmations.logout.message": "အကောင့်မှ ထွက်ရန် သေချာပါသလား?",
"confirmations.mute.confirm": "ပိတ်ထားရန်",
- "confirmations.mute.explanation": "၎င်းသည် ၎င်းတို့ထံမှ ပို့စ်များနှင့် ၎င်းတို့ကို ဖော်ပြထားသော ပို့စ်များကို ဖျောက်ထားမည်ဖြစ်ပြီး၊ သို့သော် ၎င်းတို့သည် သင့်ပို့စ်များကို မြင်နိုင်ပြီး သင့်အား လိုက်ကြည့်နိုင်စေမည်ဖြစ်သည်။",
- "confirmations.mute.message": "{name} ကို မမြင်လိုသည်မှာ သေချာပါသလား။ ",
"confirmations.redraft.confirm": "ဖျက်ပြီး ပြန်လည်ရေးမည်။",
"confirmations.redraft.message": "သင် ဒီပိုစ့်ကိုဖျက်ပြီး ပြန်တည်းဖြတ်မှာ သေချာပြီလား။ ကြယ်ပွင့်တွေ နဲ့ ပြန်မျှဝေမှုတွေကိုဆုံးရှုံးမည်။မူရင်းပို့စ်ဆီကို ပြန်စာတွေမှာလည်း \nပိုစ့်ကိုတွေ့ရမည်မဟုတ်တော့ပါ။.",
"confirmations.reply.confirm": "စာပြန်မည်",
@@ -303,13 +287,8 @@
"hashtag.follow": "Hashtag ကို စောင့်ကြည့်မယ်",
"hashtag.unfollow": "Hashtag ကို မစောင့်ကြည့်ပါ",
"hashtags.and_other": "{count, plural, other {# more}} နှင့်",
- "home.actions.go_to_explore": "ခေတ်စားနေသည်များကို ကြည့်ပါ",
- "home.actions.go_to_suggestions": "စောင့်ကြည့်သူများရှာပါ",
- "home.column_settings.basic": "အခြေခံ",
"home.column_settings.show_reblogs": "Boost များကို ပြပါ",
"home.column_settings.show_replies": "ပြန်စာများကို ပြပါ",
- "home.explore_prompt.body": "သင့်ရဲ့သတင်းစဥ် မှာ သင် စောင့်ကြည့်နေတယ့် ခေါင်းစဥ်တွေ၊သင်စောင့်ကြည့်နေတယ့်အကောင့်တွေ နဲ့ အဆိုပါ အကောင့်တွေပြန်မျှဝေထားတယ့် ပိုစ့်တွေကို မြင်ရမှာပါ။:",
- "home.explore_prompt.title": "ဤသည်မှာ Mastodon ရှိ သင့်ပင်မစာမျက်နှာဖြစ်သည်။",
"home.hide_announcements": "ကြေညာချက်များကို ဖျောက်ပါ",
"home.pending_critical_update.body": "သင့် Mastodon ဆာဗာ အမြန်ဆုံး အပ်ဒိတ်လုပ်ပါ။",
"home.pending_critical_update.link": "အပ်ဒိတ်များကြည့်ရန်",
@@ -393,9 +372,6 @@
"loading_indicator.label": "လုပ်ဆောင်နေသည်…",
"media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
"moved_to_account_banner.text": "{movedToAccount} အကောင့်သို့ပြောင်းလဲထားသဖြင့် {disabledAccount} အကောင့်မှာပိတ်ထားသည်",
- "mute_modal.duration": "ကြာချိန်",
- "mute_modal.hide_notifications": "ဤအကောင့်မှသတိပေးချက်များကိုပိတ်မလား?",
- "mute_modal.indefinite": "ရေတွက်လို့မရပါ",
"navigation_bar.about": "အကြောင်း",
"navigation_bar.advanced_interface": "အဆင့်မြင့်ဝဘ်ပုံစံ ဖွင့်ပါ",
"navigation_bar.blocks": "ဘလော့ထားသောအကောင့်များ",
@@ -405,7 +381,6 @@
"navigation_bar.direct": "သီးသန့်ဖော်ပြချက်များ",
"navigation_bar.discover": "ရှာဖွေပါ",
"navigation_bar.domain_blocks": "Hidden domains",
- "navigation_bar.edit_profile": "ကိုယ်ရေးမှတ်တမ်းပြင်ဆင်မည်",
"navigation_bar.explore": "စူးစမ်းရန်",
"navigation_bar.favourites": "Favorites",
"navigation_bar.filters": "စကားလုံးများ ပိတ်ထားပါ",
@@ -440,9 +415,6 @@
"notifications.column_settings.admin.sign_up": "အကောင့်အသစ်များ -",
"notifications.column_settings.alert": "Desktop သတိပေးချက်များ",
"notifications.column_settings.favourite": "Favorites:",
- "notifications.column_settings.filter_bar.advanced": "ခေါင်းစဥ်အားလုံးများကိုဖော်ပြပါ",
- "notifications.column_settings.filter_bar.category": "အမြန်စစ်ထုတ်မှုဘား",
- "notifications.column_settings.filter_bar.show_bar": "စစ်ထုတ်မှုဘားကို ပြပါ",
"notifications.column_settings.follow": "စောင့်ကြည့်သူအသစ်များ -",
"notifications.column_settings.follow_request": "စောင့်ကြည့်ရန် တောင်းဆိုမှုအသစ်များ -",
"notifications.column_settings.mention": "ဖော်ပြချက်များ -",
@@ -519,14 +491,7 @@
"poll_button.add_poll": "စစ်တမ်းကောက်မည်",
"poll_button.remove_poll": "စစ်တမ်းပယ်ဖျက်မည်",
"privacy.change": "Adjust status privacy",
- "privacy.direct.long": "မန်းရှင်းခေါ်သူသီးသန့်",
- "privacy.direct.short": "Direct",
- "privacy.private.long": "ဖော်လိုးလုပ်သူသီးသန့်",
- "privacy.private.short": "စောင့်ကြည့်သူများသာ",
- "privacy.public.long": "အားလုံး မြင်နိုင်သည်",
"privacy.public.short": "အများကိုပြမည်",
- "privacy.unlisted.long": "အားလုံးမြင်နိုင်သော်လည်း ရှာဖွေမှုများမှ ဖယ်ထုတ်ထားသည်",
- "privacy.unlisted.short": "စာရင်းမသွင်းထားပါ",
"privacy_policy.last_updated": "နောက်ဆုံး ပြင်ဆင်ခဲ့သည့်ရက်စွဲ {date}",
"privacy_policy.title": "ကိုယ်ရေးအချက်အလက်မူဝါဒ",
"recommended": "အကြံပြုသည်",
@@ -637,7 +602,6 @@
"status.direct": "@{name} ကို သီးသန့်ဖော်ပြမည်\n",
"status.direct_indicator": "သီးသန့်ဖော်ပြခြင်း။",
"status.edit": "ပြင်ဆင်ရန်",
- "status.edited": "{date} ကို ပြင်ဆင်ပြီးပါပြီ",
"status.edited_x_times": "{count, plural, one {{count} time} other {{count} times}} ပြင်ဆင်ခဲ့သည်",
"status.embed": "Embed",
"status.favourite": "Favorite",
@@ -708,10 +672,8 @@
"upload_error.poll": "စစ်တမ်းနှင့်အတူဖိုင်များတင်ခွင့်မပြုပါ",
"upload_form.audio_description": "အကြားအာရုံချို့ယွင်းသော ခက်ခဲသောသူများအတွက် ဖော်ပြထားသည်",
"upload_form.description": "အမြင်အာရုံချို့ယွင်းသော ခက်ခဲသောသူများအတွက် ဖော်ပြထားသည်",
- "upload_form.description_missing": "ဖော်ပြချက် မထည့်ပါ",
"upload_form.edit": "ပြင်ရန်",
"upload_form.thumbnail": "ပုံသေးကို ပြောင်းပါ",
- "upload_form.undo": "ဖျက်ရန်",
"upload_form.video_description": "အမြင်အာရုံနှင့်အကြားအာရုံ ချို့ယွင်းသော ခက်ခဲသောသူများအတွက် ဖော်ပြထားသည်",
"upload_modal.analyzing_picture": "ပုံအား ပိုင်းခြားစိတ်ဖြာနေသည်...",
"upload_modal.apply": "သုံးပါ",
diff --git a/app/javascript/mastodon/locales/ne.json b/app/javascript/mastodon/locales/ne.json
index 229d4f4718d40b..500261a34be6e1 100644
--- a/app/javascript/mastodon/locales/ne.json
+++ b/app/javascript/mastodon/locales/ne.json
@@ -50,6 +50,12 @@
"admin.dashboard.retention.cohort_size": "नयाँ प्रयोगकर्ताहरू",
"alert.rate_limited.message": "कृपया {retry_time, time, medium} पछि पुन: प्रयास गर्नुहोस्।",
"alert.unexpected.message": "एउटा अनपेक्षित त्रुटि भयो।",
+ "announcement.announcement": "घोषणा",
+ "block_modal.remote_users_caveat": "हामी सर्भर {domain} लाई तपाईंको निर्णयको सम्मान गर्न सोध्नेछौं। तर, हामी अनुपालनको ग्यारेन्टी दिन सक्दैनौं किनभने केही सर्भरहरूले ब्लकहरू फरक रूपमा ह्यान्डल गर्न सक्छन्। सार्वजनिक पोस्टहरू लग इन नभएका प्रयोगकर्ताहरूले देख्न सक्छन्।",
+ "block_modal.show_less": "कम देखाउनुहोस्",
+ "block_modal.show_more": "थप देखाउनुहोस्",
+ "bundle_column_error.copy_stacktrace": "त्रुटि रिपोर्ट प्रतिलिपि गर्नुहोस्",
+ "bundle_column_error.network.title": "नेटवर्क त्रुटि",
"bundle_column_error.retry": "पुन: प्रयास गर्नुहोस्",
"bundle_modal_error.close": "बन्द गर्नुहोस्",
"bundle_modal_error.message": "यो कम्पोनेन्ट लोड गर्दा केही गडबड भयो।",
@@ -69,12 +75,5 @@
"compose.language.change": "भाषा परिवर्तन गर्नुहोस्",
"compose.language.search": "भाषाहरू खोज्नुहोस्...",
"compose_form.direct_message_warning_learn_more": "थप जान्नुहोस्",
- "compose_form.poll.add_option": "विकल्प थप्नुहोस्",
- "compose_form.poll.remove_option": "यो विकल्प हटाउनुहोस्",
- "compose_form.publish_form": "नयाँ पोस्ट",
- "compose_form.save_changes": "परिवर्तनहरू सेभ गर्नुहोस",
- "compose_form.sensitive.hide": "{count, plural, one {संवेदनशील मिडियाको रूपमा चिन्ह लगाउनुहोस्} other {संवेदनशील मिडियाहरूको रूपमा चिन्ह लगाउनुहोस्}}",
- "compose_form.sensitive.marked": "{count, plural, one {मिडियालाई संवेदनशील रूपमा चिन्ह लगाइएको छ} other {मिडियाहरूलाई संवेदनशील रूपमा चिन्ह लगाइएको छ}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {मिडियालाई संवेदनशील रूपमा चिन्ह लगाइएको छैन} other {मिडियाहरूलाई संवेदनशील रूपमा चिन्ह लगाइएको छैन}}",
- "compose_form.spoiler_placeholder": "यहाँ आफ्नो चेतावनी लेख्नुहोस्"
+ "compose_form.publish_form": "नयाँ पोस्ट"
}
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 86617d4a54b90c..1958e4a6a09410 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -89,7 +89,14 @@
"announcement.announcement": "Mededeling",
"attachments_list.unprocessed": "(niet verwerkt)",
"audio.hide": "Audio verbergen",
- "autosuggest_hashtag.per_week": "{count} per week",
+ "block_modal.remote_users_caveat": "We vragen de server {domain} om je besluit te respecteren. Het naleven hiervan is echter niet gegarandeerd, omdat sommige servers blokkades anders kunnen interpreteren. Openbare berichten zijn mogelijk nog steeds zichtbaar voor niet-ingelogde gebruikers.",
+ "block_modal.show_less": "Minder tonen",
+ "block_modal.show_more": "Meer tonen",
+ "block_modal.they_cant_mention": "De persoon kan jou niet vermelden of volgen.",
+ "block_modal.they_cant_see_posts": "De persoon kan jouw berichten niet zien en jij ook niet diens berichten.",
+ "block_modal.they_will_know": "De persoon kan zien dat die wordt geblokkeerd.",
+ "block_modal.title": "Gebruiker blokkeren?",
+ "block_modal.you_wont_see_mentions": "Je ziet geen berichten meer die dit account vermelden.",
"boost_modal.combo": "Je kunt {combo} klikken om dit de volgende keer over te slaan",
"bundle_column_error.copy_stacktrace": "Foutrapportage kopiëren",
"bundle_column_error.error.body": "De opgevraagde pagina kon niet worden weergegeven. Dit kan het gevolg zijn van een fout in onze broncode, of van een compatibiliteitsprobleem met je webbrowser.",
@@ -114,7 +121,7 @@
"column.community": "Lokale tijdlijn",
"column.direct": "Privéberichten",
"column.directory": "Gebruikersgids",
- "column.domain_blocks": "Geblokkeerde domeinen",
+ "column.domain_blocks": "Geblokkeerde servers",
"column.favourites": "Favorieten",
"column.firehose": "Openbare tijdlijnen",
"column.follow_requests": "Volgverzoeken",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "Jouw account is niet {locked}. Iedereen kan jou volgen en kan de berichten zien die je alleen aan jouw volgers hebt gericht.",
"compose_form.lock_disclaimer.lock": "vergrendeld",
"compose_form.placeholder": "Wat wil je kwijt?",
- "compose_form.poll.add_option": "Keuze toevoegen",
"compose_form.poll.duration": "Duur van de peiling",
- "compose_form.poll.option_placeholder": "Keuze {number}",
- "compose_form.poll.remove_option": "Deze keuze verwijderen",
+ "compose_form.poll.multiple": "Meerkeuze",
+ "compose_form.poll.option_placeholder": "Optie {number}",
+ "compose_form.poll.single": "Enkele keuze",
"compose_form.poll.switch_to_multiple": "Peiling wijzigen om meerdere keuzes toe te staan",
"compose_form.poll.switch_to_single": "Peiling wijzigen om een enkele keuze toe te staan",
+ "compose_form.poll.type": "Stijl",
"compose_form.publish": "Toot",
"compose_form.publish_form": "Nieuw bericht",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Wijzigingen opslaan",
- "compose_form.sensitive.hide": "{count, plural, one {Media als gevoelig markeren} other {Media als gevoelig markeren}}",
- "compose_form.sensitive.marked": "{count, plural, one {Media is als gevoelig gemarkeerd} other {Media is als gevoelig gemarkeerd}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Media is niet als gevoelig gemarkeerd} other {Media is niet als gevoelig gemarkeerd}}",
+ "compose_form.reply": "Reageren",
+ "compose_form.save_changes": "Bijwerken",
"compose_form.spoiler.marked": "Inhoudswaarschuwing verwijderen",
"compose_form.spoiler.unmarked": "Inhoudswaarschuwing toevoegen",
- "compose_form.spoiler_placeholder": "Waarschuwingstekst",
+ "compose_form.spoiler_placeholder": "Inhoudswaarschuwing (optioneel)",
"confirmation_modal.cancel": "Annuleren",
- "confirmations.block.block_and_report": "Blokkeren en rapporteren",
"confirmations.block.confirm": "Blokkeren",
- "confirmations.block.message": "Weet je het zeker dat je {name} wilt blokkeren?",
"confirmations.cancel_follow_request.confirm": "Verzoek annuleren",
"confirmations.cancel_follow_request.message": "Weet je zeker dat je jouw verzoek om {name} te volgen wilt annuleren?",
"confirmations.delete.confirm": "Verwijderen",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "Weet je zeker dat je deze lijst definitief wilt verwijderen?",
"confirmations.discard_edit_media.confirm": "Weggooien",
"confirmations.discard_edit_media.message": "Je hebt niet-opgeslagen wijzigingen in de mediabeschrijving of voorvertonning, wil je deze toch weggooien?",
- "confirmations.domain_block.confirm": "Blokkeer alles van deze server",
- "confirmations.domain_block.message": "Weet je het echt heel erg zeker dat je alles van {domain} wilt blokkeren? In de meeste gevallen is het blokkeren of negeren van een paar specifieke personen voldoende en beter. Je zult geen berichten van deze server op openbare tijdlijnen zien of in jouw meldingen. Jouw volgers van deze server worden verwijderd.",
+ "confirmations.domain_block.confirm": "Server blokkeren",
+ "confirmations.domain_block.message": "Weet je het echt heel erg zeker dat je alles van {domain} wilt blokkeren? In de meeste gevallen is het blokkeren of negeren van een paar specifieke personen voldoende en beter. Je ziet geen berichten van deze server meer op openbare tijdlijnen of in jouw meldingen. Jouw volgers van deze server worden verwijderd.",
"confirmations.edit.confirm": "Bewerken",
"confirmations.edit.message": "Door nu te reageren overschrijf je het bericht dat je op dit moment aan het schrijven bent. Weet je zeker dat je verder wil gaan?",
"confirmations.logout.confirm": "Uitloggen",
"confirmations.logout.message": "Weet je zeker dat je wilt uitloggen?",
"confirmations.mute.confirm": "Negeren",
- "confirmations.mute.explanation": "Dit verbergt diens berichten en berichten waar diegene in wordt vermeld, maar diegene kan nog steeds jouw berichten bekijken en jou volgen.",
- "confirmations.mute.message": "Weet je het zeker dat je {name} wilt negeren?",
"confirmations.redraft.confirm": "Verwijderen en herschrijven",
"confirmations.redraft.message": "Weet je zeker dat je dit bericht wilt verwijderen en herschrijven? Je verliest wel de boosts en favorieten, en de reacties op het originele bericht raak je kwijt.",
"confirmations.reply.confirm": "Reageren",
@@ -204,10 +205,31 @@
"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.",
+ "domain_block_modal.they_cant_follow": "Niemand op deze server kan jou volgen.",
+ "domain_block_modal.they_wont_know": "Ze krijgen niet te weten dat ze worden geblokkeerd.",
+ "domain_block_modal.title": "Server blokkeren?",
+ "domain_block_modal.you_will_lose_followers": "Al jouw volgers van deze server worden ontvolgd.",
+ "domain_block_modal.you_wont_see_posts": "Je ziet geen berichten of meldingen meer van gebruikers op deze server.",
+ "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 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 fediverse-adres?",
+ "domain_pill.who_they_are": "Omdat je aan een fediverse-adres kunt zien hoe iemand heet en op welke server 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 hoe je heet en op welke server 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.",
"embed.preview": "Zo komt het eruit te zien:",
"emoji_button.activity": "Activiteiten",
@@ -232,18 +254,19 @@
"empty_column.blocks": "Je hebt nog geen gebruikers geblokkeerd.",
"empty_column.bookmarked_statuses": "Jij hebt nog geen berichten aan je bladwijzers toegevoegd. Wanneer je er een aan jouw bladwijzers toevoegt, valt deze hier te zien.",
"empty_column.community": "De lokale tijdlijn is nog leeg. Plaats een openbaar bericht om de spits af te bijten!",
- "empty_column.direct": "Je hebt nog geen privéberichten. Wanneer je er een verstuurt of ontvangt, zullen deze hier verschijnen.",
- "empty_column.domain_blocks": "Er zijn nog geen geblokkeerde domeinen.",
+ "empty_column.direct": "Je hebt nog geen privéberichten. Wanneer je er een verstuurt of ontvangt, komen deze hier te staan.",
+ "empty_column.domain_blocks": "Er zijn nog geen geblokkeerde servers.",
"empty_column.explore_statuses": "Momenteel zijn er geen trends. Kom later terug!",
"empty_column.favourited_statuses": "Jij hebt nog geen favoriete berichten. Wanneer je een bericht als favoriet markeert, valt deze hier te zien.",
"empty_column.favourites": "Niemand heeft dit bericht nog als favoriet gemarkeerd. Wanneer iemand dit doet, valt dat hier te zien.",
- "empty_column.follow_requests": "Je hebt nog geen volgverzoeken. Wanneer je er een ontvangt, zal dat hier te zien zijn.",
- "empty_column.followed_tags": "Je hebt nog geen hashtags gevolgd. Wanneer je dit doet, zullen ze hier verschijnen.",
+ "empty_column.follow_requests": "Jij hebt nog enkel volgverzoek ontvangen. Wanneer je er eentje ontvangt, valt dat hier te zien.",
+ "empty_column.followed_tags": "Je hebt nog geen hashtags gevolgd. Nadat je dit doet, komen deze hier te staan.",
"empty_column.hashtag": "Er is nog niks te vinden onder deze hashtag.",
"empty_column.home": "Deze tijdlijn is leeg! Volg meer mensen om het te vullen.",
"empty_column.list": "Er is nog niks te zien in deze lijst. Wanneer lijstleden nieuwe berichten plaatsen, zijn deze hier te zien.",
- "empty_column.lists": "Je hebt nog geen lijsten. Wanneer je er een aanmaakt, zal dat hier verschijnen.",
+ "empty_column.lists": "Je hebt nog geen lijsten. Wanneer je er een aanmaakt, valt dat hier te zien.",
"empty_column.mutes": "Jij hebt nog geen gebruikers genegeerd.",
+ "empty_column.notification_requests": "Helemaal leeg! Er is hier niets. Wanneer je nieuwe meldingen ontvangt, verschijnen deze hier volgens jouw instellingen.",
"empty_column.notifications": "Je hebt nog geen meldingen. Begin met iemand een gesprek.",
"empty_column.public": "Er is hier helemaal niks! Plaatst een openbaar bericht of volg mensen van andere servers om het te vullen",
"error.unexpected_crash.explanation": "Als gevolg van een bug in onze broncode of als gevolg van een compatibiliteitsprobleem met jouw webbrowser, kan deze pagina niet goed worden weergegeven.",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "Een bestaande categorie gebruiken of een nieuwe aanmaken",
"filter_modal.select_filter.title": "Dit bericht filteren",
"filter_modal.title.status": "Een bericht filteren",
+ "filtered_notifications_banner.mentions": "{count, plural, one {vermelding} other {vermeldingen}}",
+ "filtered_notifications_banner.pending_requests": "Meldingen van {count, plural, =0 {niemand} one {één persoon} other {# mensen}} die je misschien kent",
+ "filtered_notifications_banner.title": "Gefilterde meldingen",
"firehose.all": "Alles",
"firehose.local": "Deze server",
"firehose.remote": "Andere servers",
"follow_request.authorize": "Goedkeuren",
"follow_request.reject": "Afwijzen",
"follow_requests.unlocked_explanation": "Ook al is jouw account niet besloten, de medewerkers van {domain} denken dat jij misschien de volgende volgverzoeken handmatig wil controleren.",
+ "follow_suggestions.curated_suggestion": "Speciaal geselecteerd",
+ "follow_suggestions.dismiss": "Niet meer weergeven",
+ "follow_suggestions.featured_longer": "Handmatig geselecteerd door het team van {domain}",
+ "follow_suggestions.friends_of_friends_longer": "Populair onder mensen die je volgt",
+ "follow_suggestions.hints.featured": "Deze gebruiker is handmatig geselecteerd door het team van {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "Deze gebruiker is populair onder de mensen die jij volgt.",
+ "follow_suggestions.hints.most_followed": "Deze gebruiker is een van de meest gevolgde gebruikers op {domain}.",
+ "follow_suggestions.hints.most_interactions": "Deze gebruiker is de laatste tijd erg populair op {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Deze gebruiker is vergelijkbaar met gebruikers die je recentelijk hebt gevolgd.",
+ "follow_suggestions.personalized_suggestion": "Gepersonaliseerde aanbeveling",
+ "follow_suggestions.popular_suggestion": "Populaire aanbeveling",
+ "follow_suggestions.popular_suggestion_longer": "Populair op {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Vergelijkbaar met accounts die je recentelijk bent gaan volgen",
+ "follow_suggestions.view_all": "Alles weergeven",
+ "follow_suggestions.who_to_follow": "Wie te volgen",
"followed_tags": "Gevolgde hashtags",
"footer.about": "Over",
"footer.directory": "Gebruikersgids",
@@ -306,13 +347,8 @@
"hashtag.follow": "Hashtag volgen",
"hashtag.unfollow": "Hashtag ontvolgen",
"hashtags.and_other": "…en {count, plural, one {}other {# meer}}",
- "home.actions.go_to_explore": "De huidige trends bekijken",
- "home.actions.go_to_suggestions": "Zoek mensen om te volgen",
- "home.column_settings.basic": "Algemeen",
"home.column_settings.show_reblogs": "Boosts tonen",
"home.column_settings.show_replies": "Reacties tonen",
- "home.explore_prompt.body": "Jouw starttijdlijn bevat een mix van berichten met hashtags die je volgt, van accounts die je volgt en van berichten die deze accounts boosten. Wanneer je dit te stil vind, kun je:",
- "home.explore_prompt.title": "Dit is jouw thuisbasis op Mastodon.",
"home.hide_announcements": "Mededelingen verbergen",
"home.pending_critical_update.body": "Update alstublieft zo snel mogelijk jouw Mastodon-server!",
"home.pending_critical_update.link": "Bekijk updates",
@@ -396,9 +432,15 @@
"loading_indicator.label": "Laden…",
"media_gallery.toggle_visible": "{number, plural, one {afbeelding verbergen} other {afbeeldingen verbergen}}",
"moved_to_account_banner.text": "Omdat je naar {movedToAccount} bent verhuisd is jouw account {disabledAccount} momenteel uitgeschakeld.",
- "mute_modal.duration": "Tijdsduur",
- "mute_modal.hide_notifications": "Verberg meldingen van deze persoon?",
- "mute_modal.indefinite": "Voor onbepaalde tijd",
+ "mute_modal.hide_from_notifications": "Onder meldingen verbergen",
+ "mute_modal.hide_options": "Opties verbergen",
+ "mute_modal.indefinite": "Totdat ik ze niet meer negeer",
+ "mute_modal.show_options": "Opties tonen",
+ "mute_modal.they_can_mention_and_follow": "De persoon kan jou vermelden en volgen, maar jij ziet niks meer van deze persoon.",
+ "mute_modal.they_wont_know": "De persoon krijgt niet te weten dat die wordt genegeerd.",
+ "mute_modal.title": "Gebruiker negeren?",
+ "mute_modal.you_wont_see_mentions": "Je ziet geen berichten meer die dit account vermelden.",
+ "mute_modal.you_wont_see_posts": "De persoon kan nog steeds jouw berichten zien, maar diens berichten zie je niet meer.",
"navigation_bar.about": "Over",
"navigation_bar.advanced_interface": "In geavanceerde webinterface openen",
"navigation_bar.blocks": "Geblokkeerde gebruikers",
@@ -407,8 +449,7 @@
"navigation_bar.compose": "Nieuw bericht schrijven",
"navigation_bar.direct": "Privéberichten",
"navigation_bar.discover": "Ontdekken",
- "navigation_bar.domain_blocks": "Geblokkeerde domeinen",
- "navigation_bar.edit_profile": "Profiel bewerken",
+ "navigation_bar.domain_blocks": "Geblokkeerde servers",
"navigation_bar.explore": "Verkennen",
"navigation_bar.favourites": "Favorieten",
"navigation_bar.filters": "Filters",
@@ -432,11 +473,29 @@
"notification.follow": "{name} volgt jou nu",
"notification.follow_request": "{name} wil jou graag volgen",
"notification.mention": "{name} vermeldde jou",
+ "notification.moderation-warning.learn_more": "Meer informatie",
+ "notification.moderation_warning": "Je hebt een moderatie-waarschuwing ontvangen",
+ "notification.moderation_warning.action_delete_statuses": "Sommige van je berichten zijn verwijderd.",
+ "notification.moderation_warning.action_disable": "Je account is uitgeschakeld.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Sommige van je berichten zijn gemarkeerd als gevoelig.",
+ "notification.moderation_warning.action_none": "Jouw account heeft een moderatie-waarschuwing ontvangen.",
+ "notification.moderation_warning.action_sensitive": "Je berichten worden vanaf nu als gevoelig gemarkeerd.",
+ "notification.moderation_warning.action_silence": "Jouw account is beperkt.",
+ "notification.moderation_warning.action_suspend": "Jouw account is opgeschort.",
"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.relationships_severance_event": "Verloren verbindingen met {name}",
+ "notification.relationships_severance_event.account_suspension": "Een beheerder van {from} heeft {target} geschorst, wat betekent dat je geen updates meer van hen kunt ontvangen of met hen kunt communiceren.",
+ "notification.relationships_severance_event.domain_block": "Een beheerder van {from} heeft {target} geblokkeerd, inclusief {followersCount} van jouw volgers en {followingCount, plural, one {# account} other {# accounts}} die jij volgt.",
+ "notification.relationships_severance_event.learn_more": "Meer informatie",
+ "notification.relationships_severance_event.user_domain_block": "Je hebt {target} geblokkeerd, waarmee je {followersCount} van je volgers en {followingCount, plural, one {# account} other {# accounts}} die jij volgt, bent verloren.",
"notification.status": "{name} heeft zojuist een bericht geplaatst",
"notification.update": "{name} heeft een bericht bewerkt",
+ "notification_requests.accept": "Accepteren",
+ "notification_requests.dismiss": "Afwijzen",
+ "notification_requests.notifications_from": "Meldingen van {name}",
+ "notification_requests.title": "Gefilterde meldingen",
"notifications.clear": "Meldingen verwijderen",
"notifications.clear_confirmation": "Weet je het zeker dat je al jouw meldingen wilt verwijderen?",
"notifications.column_settings.admin.report": "Nieuwe rapportages:",
@@ -445,7 +504,6 @@
"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.filter_bar.show_bar": "Filterbalk tonen",
"notifications.column_settings.follow": "Nieuwe volgers:",
"notifications.column_settings.follow_request": "Nieuw volgverzoek:",
"notifications.column_settings.mention": "Vermeldingen:",
@@ -471,6 +529,15 @@
"notifications.permission_denied": "Desktopmeldingen zijn niet beschikbaar omdat een eerdere browsertoestemming werd geweigerd",
"notifications.permission_denied_alert": "Desktopmeldingen kunnen niet worden ingeschakeld, omdat een eerdere browsertoestemming werd geweigerd",
"notifications.permission_required": "Desktopmeldingen zijn niet beschikbaar omdat de benodigde toestemming niet is verleend.",
+ "notifications.policy.filter_new_accounts.hint": "In de afgelopen {days, plural, one {24 uur} other {# dagen}} geregistreerd",
+ "notifications.policy.filter_new_accounts_title": "Nieuwe accounts",
+ "notifications.policy.filter_not_followers_hint": "Inclusief mensen die jou korter dan {days, plural, one {24 uur} other {# dagen}} volgen",
+ "notifications.policy.filter_not_followers_title": "Mensen die jou niet volgen",
+ "notifications.policy.filter_not_following_hint": "Totdat je ze handmatig goedkeurt",
+ "notifications.policy.filter_not_following_title": "Mensen die jij niet volgt",
+ "notifications.policy.filter_private_mentions_hint": "Onzichtbaar tenzij het een antwoord is op een privébericht van jou of wanneer je de afzender volgt",
+ "notifications.policy.filter_private_mentions_title": "Ongevraagde privéberichten",
+ "notifications.policy.title": "Meldingen verbergen van…",
"notifications_permission_banner.enable": "Desktopmeldingen inschakelen",
"notifications_permission_banner.how_to_control": "Om meldingen te ontvangen wanneer Mastodon niet open staat. Je kunt precies bepalen welke soort interacties wel of geen desktopmeldingen geven via de bovenstaande {icon} knop.",
"notifications_permission_banner.title": "Mis nooit meer iets",
@@ -480,7 +547,7 @@
"onboarding.actions.go_to_home": "Ga naar je starttijdlijn",
"onboarding.compose.template": "Hallo #Mastodon!",
"onboarding.follows.empty": "Helaas kunnen op dit moment geen resultaten worden getoond. Je kunt proberen te zoeken of op de verkenningspagina te bladeren om mensen te vinden die je kunt volgen, of probeer het later opnieuw.",
- "onboarding.follows.lead": "Jouw starttijdlijn is de belangrijkste manier om Mastodon te ervaren. Hoe meer mensen je volgt, hoe actiever en interessanter het zal zijn. Om te beginnen, zijn hier enkele suggesties:",
+ "onboarding.follows.lead": "Jouw starttijdlijn is de belangrijkste manier om Mastodon te ervaren. Hoe meer mensen je volgt, hoe actiever en interessanter het wordt. Om te beginnen zijn hier enkele suggesties:",
"onboarding.follows.title": "Je starttijdlijn aan jouw wensen aanpassen",
"onboarding.profile.discoverable": "Maak mijn profiel vindbaar",
"onboarding.profile.discoverable_hint": "Wanneer je akkoord gaat met het vindbaar zijn op Mastodon, verschijnen je berichten in zoekresultaten en kunnen ze trending worden, en je profiel kan aan andere mensen worden aanbevolen wanneer ze vergelijkbare interesses hebben.",
@@ -504,7 +571,7 @@
"onboarding.steps.follow_people.title": "Je starttijdlijn aan jouw wensen aanpassen",
"onboarding.steps.publish_status.body": "Zeg hallo tegen de wereld met tekst, foto's, video's of peilingen {emoji}",
"onboarding.steps.publish_status.title": "Maak je eerste bericht",
- "onboarding.steps.setup_profile.body": "Anderen zullen eerder met je in contact treden als je wat over jezelf vertelt.",
+ "onboarding.steps.setup_profile.body": "Wanneer je meer over jezelf vertelt, krijg je meer interactie met andere mensen.",
"onboarding.steps.setup_profile.title": "Je profiel aanpassen",
"onboarding.steps.share_profile.body": "Laat je vrienden weten waar je te vinden bent op Mastodon",
"onboarding.steps.share_profile.title": "Deel je Mastodonprofiel",
@@ -526,12 +593,13 @@
"poll_button.add_poll": "Peiling toevoegen",
"poll_button.remove_poll": "Peiling verwijderen",
"privacy.change": "Zichtbaarheid van bericht aanpassen",
- "privacy.direct.long": "Alleen aan vermelde gebruikers tonen",
+ "privacy.direct.long": "Alleen voor mensen die specifiek in het bericht worden vermeld",
"privacy.direct.short": "Privébericht",
- "privacy.private.long": "Alleen aan volgers tonen",
- "privacy.private.short": "Alleen volgers",
- "privacy.public.long": "Voor iedereen zichtbaar",
+ "privacy.private.long": "Alleen jouw volgers",
+ "privacy.private.short": "Volgers",
+ "privacy.public.long": "Iedereen op Mastodon en daarbuiten",
"privacy.public.short": "Openbaar",
+ "privacy.unlisted.additional": "Dit is vergelijkbaar met openbaar, behalve dat het bericht niet op openbare tijdlijnen, onder hashtags, verkennen of zoeken verschijnt, zelfs als je je account daarvoor hebt ingesteld.",
"privacy.unlisted.long": "Voor iedereen zichtbaar, maar niet onder trends, hashtags en op openbare tijdlijnen",
"privacy.unlisted.short": "Minder openbaar",
"privacy_policy.last_updated": "Laatst bijgewerkt op {date}",
@@ -551,7 +619,9 @@
"relative_time.minutes": "{number}m",
"relative_time.seconds": "{number}s",
"relative_time.today": "vandaag",
+ "reply_indicator.attachments": "{count, plural, one {# bijlage} other {# bijlagen}}",
"reply_indicator.cancel": "Annuleren",
+ "reply_indicator.poll": "Peiling",
"report.block": "Blokkeren",
"report.block_explanation": "Je kunt diens berichten niet zien. Je kunt door diegene niet gevolgd worden en jouw berichten zijn onzichtbaar. Diegene kan zien dat die door jou is geblokkeerd.",
"report.categories.legal": "Juridisch",
@@ -644,10 +714,11 @@
"status.direct": "@{name} een privébericht sturen",
"status.direct_indicator": "Privébericht",
"status.edit": "Bewerken",
- "status.edited": "Bewerkt op {date}",
+ "status.edited": "Laatste bewerking op {date}",
"status.edited_x_times": "{count, plural, one {{count} keer} other {{count} keer}} bewerkt",
"status.embed": "Embedden",
"status.favourite": "Favoriet",
+ "status.favourites": "{count, plural, one {favoriet} other {favorieten}}",
"status.filter": "Dit bericht filteren",
"status.filtered": "Gefilterd",
"status.hide": "Bericht verbergen",
@@ -660,7 +731,7 @@
"status.mention": "@{name} vermelden",
"status.more": "Meer",
"status.mute": "@{name} negeren",
- "status.mute_conversation": "Negeer gesprek",
+ "status.mute_conversation": "Gesprek negeren",
"status.open": "Volledig bericht tonen",
"status.pin": "Aan profielpagina vastmaken",
"status.pinned": "Vastgemaakt bericht",
@@ -668,12 +739,13 @@
"status.reblog": "Boosten",
"status.reblog_private": "Boost naar oorspronkelijke ontvangers",
"status.reblogged_by": "{name} boostte",
+ "status.reblogs": "{count, plural, one {boost} other {boosts}}",
"status.reblogs.empty": "Niemand heeft dit bericht nog geboost. Wanneer iemand dit doet, valt dat hier te zien.",
"status.redraft": "Verwijderen en herschrijven",
"status.remove_bookmark": "Bladwijzer verwijderen",
"status.replied_to": "Reageerde op {name}",
"status.reply": "Reageren",
- "status.replyAll": "Reageer op iedereen",
+ "status.replyAll": "Op iedereen reageren",
"status.report": "@{name} rapporteren",
"status.sensitive_warning": "Gevoelige inhoud",
"status.share": "Delen",
@@ -715,10 +787,8 @@
"upload_error.poll": "Het uploaden van bestanden is bij peilingen niet toegestaan.",
"upload_form.audio_description": "Omschrijf dit voor dove of slechthorende mensen",
"upload_form.description": "Omschrijf dit voor blinde of slechtziende mensen",
- "upload_form.description_missing": "Geen omschrijving toegevoegd",
"upload_form.edit": "Bewerken",
"upload_form.thumbnail": "Miniatuurafbeelding wijzigen",
- "upload_form.undo": "Verwijderen",
"upload_form.video_description": "Omschrijf dit voor dove, slechthorende, blinde of slechtziende mensen",
"upload_modal.analyzing_picture": "Afbeelding analyseren…",
"upload_modal.apply": "Toepassen",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index ec2ff8214457b7..3711cc0ae33267 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}}",
@@ -40,7 +40,7 @@
"account.following_counter": "{count, plural, one {Fylgjer {counter}} other {Fylgjer {counter}}}",
"account.follows.empty": "Denne brukaren fylgjer ikkje nokon enno.",
"account.go_to_profile": "Gå til profil",
- "account.hide_reblogs": "Skjul framhevingar frå @{name}",
+ "account.hide_reblogs": "Gøym framhevingar frå @{name}",
"account.in_memoriam": "Til minne om.",
"account.joined_short": "Vart med",
"account.languages": "Endre språktingingar",
@@ -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,14 @@
"announcement.announcement": "Kunngjering",
"attachments_list.unprocessed": "(ubehandla)",
"audio.hide": "Gøym lyd",
- "autosuggest_hashtag.per_week": "{count} per veke",
+ "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.",
+ "block_modal.they_cant_see_posts": "Dei kan ikkje sjå innlegga dine, og du vil ikkje sjå deira.",
+ "block_modal.they_will_know": "Dei kan sjå at dei er blokkerte.",
+ "block_modal.title": "Blokker brukaren?",
+ "block_modal.you_wont_see_mentions": "Du ser ikkje innlegg som nemner dei.",
"boost_modal.combo": "Du kan trykkja {combo} for å hoppa over dette neste gong",
"bundle_column_error.copy_stacktrace": "Kopier feilrapport",
"bundle_column_error.error.body": "Den etterspurde sida kan ikke hentast fram. Det kan skuldast ein feil i koden vår eller eit kompatibilitetsproblem.",
@@ -114,7 +121,7 @@
"column.community": "Lokal tidsline",
"column.direct": "Private omtaler",
"column.directory": "Sjå gjennom profilar",
- "column.domain_blocks": "Skjulte domene",
+ "column.domain_blocks": "Blokkerte domene",
"column.favourites": "Favorittar",
"column.firehose": "Tidslinjer",
"column.follow_requests": "Fylgjeførespurnadar",
@@ -125,7 +132,7 @@
"column.pins": "Festa tut",
"column.public": "Samla tidsline",
"column_back_button.label": "Attende",
- "column_header.hide_settings": "Gøym innstillingar",
+ "column_header.hide_settings": "Gøym innstillingane",
"column_header.moveLeft_settings": "Flytt kolonne til venstre",
"column_header.moveRight_settings": "Flytt kolonne til høgre",
"column_header.pin": "Fest",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "Kontoen din er ikkje {locked}. Kven som helst kan fylgja deg for å sjå innlegga dine.",
"compose_form.lock_disclaimer.lock": "låst",
"compose_form.placeholder": "Kva har du på hjarta?",
- "compose_form.poll.add_option": "Legg til eit val",
"compose_form.poll.duration": "Varigheit for rundspørjing",
- "compose_form.poll.option_placeholder": "Val {number}",
- "compose_form.poll.remove_option": "Fjern dette valet",
+ "compose_form.poll.multiple": "Fleirval",
+ "compose_form.poll.option_placeholder": "Alternativ {number}",
+ "compose_form.poll.single": "Vel ein",
"compose_form.poll.switch_to_multiple": "Endre rundspørjinga til å tillate fleire val",
"compose_form.poll.switch_to_single": "Endre rundspørjinga til å tillate berre eitt val",
- "compose_form.publish": "Legg ut",
+ "compose_form.poll.type": "Stil",
+ "compose_form.publish": "Publiser",
"compose_form.publish_form": "Legg ut",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Lagre endringar",
- "compose_form.sensitive.hide": "{count, plural, one {Marker mediet som ømtolig} other {Marker media som ømtolige}}",
- "compose_form.sensitive.marked": "{count, plural, one {Mediet er markert som ømtolig} other {Media er markerte som ømtolige}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Mediet er ikkje markert som ømtolig} other {Media er ikkje markerte som ømtolige}}",
+ "compose_form.reply": "Svar",
+ "compose_form.save_changes": "Oppdater",
"compose_form.spoiler.marked": "Fjern innhaldsåtvaring",
"compose_form.spoiler.unmarked": "Legg til innhaldsåtvaring",
- "compose_form.spoiler_placeholder": "Skriv åtvaringa di her",
+ "compose_form.spoiler_placeholder": "Innhaldsåtvaring (valfritt)",
"confirmation_modal.cancel": "Avbryt",
- "confirmations.block.block_and_report": "Blokker & rapporter",
"confirmations.block.confirm": "Blokker",
- "confirmations.block.message": "Er du sikker på at du vil blokkera {name}?",
"confirmations.cancel_follow_request.confirm": "Trekk attende førespurnad",
"confirmations.cancel_follow_request.message": "Er du sikker på at du vil trekkje attende førespurnaden din om å fylgje {name}?",
"confirmations.delete.confirm": "Slett",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "Er du sikker på at du vil sletta denne lista for alltid?",
"confirmations.discard_edit_media.confirm": "Forkast",
"confirmations.discard_edit_media.message": "Du har ulagra endringar i mediaskildringa eller førehandsvisinga. Vil du forkasta dei likevel?",
- "confirmations.domain_block.confirm": "Skjul alt frå domenet",
- "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.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 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.explanation": "Dette vil skjula innlegg som kjem frå og som nemner dei, men vil framleis la dei sjå innlegga dine og fylgje deg.",
- "confirmations.mute.message": "Er du sikker på at du vil målbinda {name}?",
+ "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",
@@ -207,7 +208,28 @@
"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.",
+ "domain_block_modal.they_cant_follow": "Ingen på denne tenaren kan fylgja deg.",
+ "domain_block_modal.they_wont_know": "Dei veit ikkje at dei er blokkerte.",
+ "domain_block_modal.title": "Blokker domenet?",
+ "domain_block_modal.you_will_lose_followers": "Alle fylgjarane dine frå denne tenaren blir fjerna.",
+ "domain_block_modal.you_wont_see_posts": "Du vil ikkje sjå innlegg eller varslingar frå brukarar på denne tenaren.",
+ "domain_pill.activitypub_lets_connect": "Den lar deg kople til og samhandle med folk ikkje berre på Mastodon, men òg på tvers av forskjellige sosiale appar.",
+ "domain_pill.activitypub_like_language": "ActivityPub er som språket Mastodon snakkar med andre sosiale nettverk.",
+ "domain_pill.server": "Tenar",
+ "domain_pill.their_handle": "Deira handtak:",
+ "domain_pill.their_server": "Deira digitale heim, som alle innlegga deira bur.",
+ "domain_pill.their_username": "Deira unike identifikator på serveren deira. Det er mogleg å finne brukarar med same brukarnamn på forskjellige tenarar.",
+ "domain_pill.username": "Brukarnamn",
+ "domain_pill.whats_in_a_handle": "Kva er i eit handtak?",
+ "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, 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:",
"emoji_button.activity": "Aktivitet",
@@ -226,26 +248,27 @@
"emoji_button.symbols": "Symbol",
"emoji_button.travel": "Reise & stader",
"empty_column.account_hides_collections": "Denne brukaren har valt å ikkje gjere denne informasjonen tilgjengeleg",
- "empty_column.account_suspended": "Kontoen er suspendert",
+ "empty_column.account_suspended": "Kontoen er utestengd",
"empty_column.account_timeline": "Ingen tut her!",
"empty_column.account_unavailable": "Profil ikkje tilgjengeleg",
"empty_column.blocks": "Du har ikkje blokkert nokon enno.",
"empty_column.bookmarked_statuses": "Du har ikkje lagra noko bokmerke enno. Når du set bokmerke på eit innlegg, dukkar det opp her.",
"empty_column.community": "Den lokale tidslina er tom. Skriv noko offentleg å få ballen til å rulle!",
"empty_column.direct": "Du har ingen private omtaler enda. Etter du har sendt eller mottatt en, så vil den dukke opp her.",
- "empty_column.domain_blocks": "Det er ingen skjulte domene til no.",
+ "empty_column.domain_blocks": "Det er ingen blokkerte domene enno.",
"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.",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "Bruk ein eksisterande kategori eller opprett ein ny",
"filter_modal.select_filter.title": "Filtrer dette innlegget",
"filter_modal.title.status": "Filtrer eit innlegg",
+ "filtered_notifications_banner.mentions": "{count, plural, one {omtale} other {omtaler}}",
+ "filtered_notifications_banner.pending_requests": "Varsel frå {count, plural, =0 {ingen} one {ein person} other {# folk}} du kanskje kjenner",
+ "filtered_notifications_banner.title": "Filtrerte varslingar",
"firehose.all": "Alle",
"firehose.local": "Denne tenaren",
"firehose.remote": "Andre tenarar",
"follow_request.authorize": "Autoriser",
"follow_request.reject": "Avvis",
"follow_requests.unlocked_explanation": "Sjølv om kontoen din ikkje er låst tenkte dei som driv {domain} at du kanskje ville gå gjennom førespurnadar frå desse kontoane manuelt.",
+ "follow_suggestions.curated_suggestion": "Utvalt av staben",
+ "follow_suggestions.dismiss": "Ikkje vis igjen",
+ "follow_suggestions.featured_longer": "Hanplukka av gjengen på {domain}",
+ "follow_suggestions.friends_of_friends_longer": "Populært hjå dei du fylgjer",
+ "follow_suggestions.hints.featured": "Denne profilen er handplukka av folka på {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "Denne profilen er populær hjå dei du fylgjer.",
+ "follow_suggestions.hints.most_followed": "Mange på {domain} fylgjer denne profilen.",
+ "follow_suggestions.hints.most_interactions": "Denne profilen har nyss fått mykje merksemd på {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Denne profilen liknar på dei andre profilane du har fylgt i det siste.",
+ "follow_suggestions.personalized_suggestion": "Personleg forslag",
+ "follow_suggestions.popular_suggestion": "Populært forslag",
+ "follow_suggestions.popular_suggestion_longer": "Populært på {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Liknar på profilar du har fylgt i det siste",
+ "follow_suggestions.view_all": "Vis alle",
+ "follow_suggestions.who_to_follow": "Kven du kan fylgja",
"followed_tags": "Fylgde emneknaggar",
"footer.about": "Om",
"footer.directory": "Profilmappe",
@@ -306,13 +347,8 @@
"hashtag.follow": "Fylg emneknagg",
"hashtag.unfollow": "Slutt å fylgje emneknaggen",
"hashtags.and_other": "…og {count, plural, one {}other {# fleire}}",
- "home.actions.go_to_explore": "Sjå kva som er populært",
- "home.actions.go_to_suggestions": "Finn folk å følgje",
- "home.column_settings.basic": "Grunnleggjande",
"home.column_settings.show_reblogs": "Vis framhevingar",
"home.column_settings.show_replies": "Vis svar",
- "home.explore_prompt.body": "Tidslinja di vil ha ei blanding av innlegg frå emneknaggar du har vald å følgje, personane du har vald å følgje, og innlegga dei framhevar. Om det ser ganske stille ut akkurat no, så kan du:",
- "home.explore_prompt.title": "Dette er heimen din i Mastodon.",
"home.hide_announcements": "Skjul kunngjeringar",
"home.pending_critical_update.body": "Oppdater mastodontenaren din så snart som mogleg!",
"home.pending_critical_update.link": "Sjå oppdateringar",
@@ -396,9 +432,15 @@
"loading_indicator.label": "Lastar…",
"media_gallery.toggle_visible": "{number, plural, one {Skjul bilete} other {Skjul bilete}}",
"moved_to_account_banner.text": "Kontoen din, {disabledAccount} er for tida deaktivert fordi du har flytta til {movedToAccount}.",
- "mute_modal.duration": "Varigheit",
- "mute_modal.hide_notifications": "Skjul varsel frå denne brukaren?",
- "mute_modal.indefinite": "På ubestemt tid",
+ "mute_modal.hide_from_notifications": "Ikkje vis varslingar",
+ "mute_modal.hide_options": "Gøym val",
+ "mute_modal.indefinite": "Til eg avdempar dei",
+ "mute_modal.show_options": "Vis val",
+ "mute_modal.they_can_mention_and_follow": "Dei kan nemna og fylgja deg, men du vil ikkje sjå dei.",
+ "mute_modal.they_wont_know": "Dei veit ikkje at dei er dempa.",
+ "mute_modal.title": "Demp brukaren?",
+ "mute_modal.you_wont_see_mentions": "Du vil ikkje sjå innlegg som nemner dei.",
+ "mute_modal.you_wont_see_posts": "Dei kan framleis sjå innlegga dine, men du vil ikkje sjå deira.",
"navigation_bar.about": "Om",
"navigation_bar.advanced_interface": "Opne i avansert nettgrensesnitt",
"navigation_bar.blocks": "Blokkerte brukarar",
@@ -408,7 +450,6 @@
"navigation_bar.direct": "Private omtaler",
"navigation_bar.discover": "Oppdag",
"navigation_bar.domain_blocks": "Skjulte domene",
- "navigation_bar.edit_profile": "Rediger profil",
"navigation_bar.explore": "Utforsk",
"navigation_bar.favourites": "Favorittar",
"navigation_bar.filters": "Målbundne ord",
@@ -432,11 +473,29 @@
"notification.follow": "{name} fylgde deg",
"notification.follow_request": "{name} har bedt om å fylgja deg",
"notification.mention": "{name} nemnde deg",
+ "notification.moderation-warning.learn_more": "Lær meir",
+ "notification.moderation_warning": "Du har mottatt ei moderasjonsåtvaring",
+ "notification.moderation_warning.action_delete_statuses": "Nokre av innlegga dine har blitt fjerna.",
+ "notification.moderation_warning.action_disable": "Kontoen din har blitt deaktivert.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Nokre av innlegga dine har blitt markert som sensitive.",
+ "notification.moderation_warning.action_none": "Kontoen din har mottatt ei moderasjonsåtvaring.",
+ "notification.moderation_warning.action_sensitive": "Innlegga dine vil bli markerte som sensitive frå no av.",
+ "notification.moderation_warning.action_silence": "Kontoen din har blitt avgrensa.",
+ "notification.moderation_warning.action_suspend": "Kontoen din har blitt suspendert.",
"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.relationships_severance_event": "Tapte samband med {name}",
+ "notification.relationships_severance_event.account_suspension": "Ein administrator på {from} har utvist {target}, som tyder at du ikkje lenger får oppdateringar frå dei eller kan samhandla med dei.",
+ "notification.relationships_severance_event.domain_block": "Ein administrator på {from} har blokkert {target}, inkludert {followersCount} av fylgjarane dine og {followingCount, plural, one {# konto} other {# kontoar}} du fylgjer.",
+ "notification.relationships_severance_event.learn_more": "Lær meir",
+ "notification.relationships_severance_event.user_domain_block": "Du har blokkert {target}, fjerna {followersCount} av fylgjarane dine og {followingCount, plural, one {# konto} other {# kontoar}} du fylgjer.",
"notification.status": "{name} la nettopp ut",
"notification.update": "{name} redigerte eit innlegg",
+ "notification_requests.accept": "Godkjenn",
+ "notification_requests.dismiss": "Avvis",
+ "notification_requests.notifications_from": "Varslingar frå {name}",
+ "notification_requests.title": "Filtrerte varslingar",
"notifications.clear": "Tøm varsel",
"notifications.clear_confirmation": "Er du sikker på at du vil fjerna alle varsla dine for alltid?",
"notifications.column_settings.admin.report": "Nye rapportar:",
@@ -444,8 +503,7 @@
"notifications.column_settings.alert": "Skrivebordsvarsel",
"notifications.column_settings.favourite": "Favorittar:",
"notifications.column_settings.filter_bar.advanced": "Vis alle kategoriar",
- "notifications.column_settings.filter_bar.category": "Snarfilterlinje",
- "notifications.column_settings.filter_bar.show_bar": "Vis filterlinja",
+ "notifications.column_settings.filter_bar.category": "Snøggfilterline",
"notifications.column_settings.follow": "Nye fylgjarar:",
"notifications.column_settings.follow_request": "Ny fylgjarførespurnader:",
"notifications.column_settings.mention": "Omtalar:",
@@ -471,6 +529,15 @@
"notifications.permission_denied": "Skrivebordsvarsel er ikkje tilgjengelege på grunn av at nettlesaren tidlegare ikkje har fått naudsynte rettar til å vise dei",
"notifications.permission_denied_alert": "Sidan nettlesaren tidlegare har blitt nekta naudsynte rettar, kan ikkje skrivebordsvarsel aktiverast",
"notifications.permission_required": "Skrivebordsvarsel er utilgjengelege fordi naudsynte rettar ikkje er gitt.",
+ "notifications.policy.filter_new_accounts.hint": "Skrive siste {days, plural, one {dag} other {# dagar}}",
+ "notifications.policy.filter_new_accounts_title": "Nye brukarkontoar",
+ "notifications.policy.filter_not_followers_hint": "Inkludert folk som har fylgt deg mindre enn {days, plural, one {ein dag} other {# dagar}}",
+ "notifications.policy.filter_not_followers_title": "Folk som ikkje fylgjer deg",
+ "notifications.policy.filter_not_following_hint": "Til du godkjenner dei manuelt",
+ "notifications.policy.filter_not_following_title": "Folk du ikkje fylgjer",
+ "notifications.policy.filter_private_mentions_hint": "Filtrert viss det ikkje er eit svar på dine eigne nemningar eller viss du fylgjer avsendaren",
+ "notifications.policy.filter_private_mentions_title": "Masseutsende private nemningar",
+ "notifications.policy.title": "Filtrer ut varslingar frå…",
"notifications_permission_banner.enable": "Skru på skrivebordsvarsel",
"notifications_permission_banner.how_to_control": "Aktiver skrivebordsvarsel for å få varsel når Mastodon ikkje er open. Du kan nøye bestemme kva samhandlingar som skal føre til skrivebordsvarsel gjennom {icon}-knappen ovanfor etter at varsel er aktivert.",
"notifications_permission_banner.title": "Gå aldri glipp av noko",
@@ -482,7 +549,8 @@
"onboarding.follows.empty": "Me kan ikkje visa deg nokon resultat no. Du kan prøva å søkja eller bla gjennom utforsk-sida for å finna folk å fylgja, eller du kan prøva att seinare.",
"onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
"onboarding.follows.title": "Popular on Mastodon",
- "onboarding.profile.discoverable": "Gjør min profil synlig",
+ "onboarding.profile.discoverable": "Gjer profilen min synleg",
+ "onboarding.profile.discoverable_hint": "Når du vel å gjera profilen din synleg på Mastodon, vil innlegga dine syna i søkjeresultat og populære innlegg, og profilen din kan bli føreslegen for folk med liknande interesser som deg.",
"onboarding.profile.display_name": "Synleg namn",
"onboarding.profile.display_name_hint": "Det fulle namnet eller kallenamnet ditt…",
"onboarding.profile.lead": "Du kan alltid fullføra dette seinare i innstillingane, og der er det endå fleire tilpassingsalternativ.",
@@ -525,17 +593,18 @@
"poll_button.add_poll": "Lag ei rundspørjing",
"poll_button.remove_poll": "Fjern rundspørjing",
"privacy.change": "Endre personvernet på innlegg",
- "privacy.direct.long": "Synleg kun for omtala brukarar",
- "privacy.direct.short": "Kun nemnde personar",
- "privacy.private.long": "Kun synleg for fylgjarar",
- "privacy.private.short": "Kun fylgjarar",
- "privacy.public.long": "Synleg for alle",
+ "privacy.direct.long": "Alle nemnde i innlegget",
+ "privacy.direct.short": "Spesifikke folk",
+ "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.long": "Synleg for alle, men blir ikkje vist i oppdagsfunksjonar",
- "privacy.unlisted.short": "Uoppført",
+ "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.",
+ "privacy.unlisted.long": "Færre algoritmiske fanfarar",
+ "privacy.unlisted.short": "Stille offentleg",
"privacy_policy.last_updated": "Sist oppdatert {date}",
"privacy_policy.title": "Personvernsreglar",
- "recommended": "Anbefalt",
+ "recommended": "Tilrådd",
"refresh": "Oppdater",
"regeneration_indicator.label": "Lastar…",
"regeneration_indicator.sublabel": "Heimetidslina di vert førebudd!",
@@ -550,7 +619,9 @@
"relative_time.minutes": "{number}min",
"relative_time.seconds": "{number}sek",
"relative_time.today": "i dag",
+ "reply_indicator.attachments": "{count, plural, one {# vedlegg} other {# vedlegg}}",
"reply_indicator.cancel": "Avbryt",
+ "reply_indicator.poll": "Avstemming",
"report.block": "Blokker",
"report.block_explanation": "Du vil ikkje kunne sjå innlegga deira. Dei vil ikkje kunne sjå innlegga dine eller fylgje deg. Dei kan sjå at dei er blokkert.",
"report.categories.legal": "Juridisk",
@@ -565,7 +636,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",
@@ -602,11 +673,11 @@
"search.quick_action.account_search": "Profiler som samsvarer med {x}",
"search.quick_action.go_to_account": "Gå til profil {x}",
"search.quick_action.go_to_hashtag": "Gå til emneknagg {x}",
- "search.quick_action.open_url": "Åpne URL i Mastodon",
+ "search.quick_action.open_url": "Opne adressa i Mastodon",
"search.quick_action.status_search": "Innlegg som samsvarer med {x}",
"search.search_or_paste": "Søk eller lim inn URL",
"search_popout.full_text_search_disabled_message": "Ikkje tilgjengeleg på {domain}.",
- "search_popout.full_text_search_logged_out_message": "Bare tilgjengelig når man er logget inn.",
+ "search_popout.full_text_search_logged_out_message": "Berre tilgjengeleg når du er logga inn.",
"search_popout.language_code": "ISO-språkkode",
"search_popout.options": "Søkjealternativ",
"search_popout.quick_actions": "Hurtighandlinger",
@@ -636,17 +707,18 @@
"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",
"status.direct": "Nevn @{name} privat",
"status.direct_indicator": "Privat omtale",
"status.edit": "Rediger",
- "status.edited": "Redigert {date}",
+ "status.edited": "Sist endra {date}",
"status.edited_x_times": "Redigert {count, plural, one {{count} gong} other {{count} gonger}}",
"status.embed": "Bygg inn",
"status.favourite": "Favoritt",
+ "status.favourites": "{count, plural, one {favoritt} other {favorittar}}",
"status.filter": "Filtrer dette innlegget",
"status.filtered": "Filtrert",
"status.hide": "Skjul innlegget",
@@ -655,11 +727,11 @@
"status.load_more": "Last inn meir",
"status.media.open": "Klikk for å opne",
"status.media.show": "Klikk for å vise",
- "status.media_hidden": "Medium gøymd",
+ "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",
@@ -667,6 +739,7 @@
"status.reblog": "Framhev",
"status.reblog_private": "Framhev til dei originale mottakarane",
"status.reblogged_by": "{name} framheva",
+ "status.reblogs": "{count, plural, one {framheving} other {framhevingar}}",
"status.reblogs.empty": "Ingen har framheva dette tutet enno. Om nokon gjer, så dukkar det opp her.",
"status.redraft": "Slett & skriv på nytt",
"status.remove_bookmark": "Fjern bokmerke",
@@ -682,11 +755,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",
@@ -714,10 +787,8 @@
"upload_error.poll": "Filopplasting er ikkje lov for rundspørjingar.",
"upload_form.audio_description": "Skildre for dei med nedsett høyrsel",
"upload_form.description": "Skildre for blinde og svaksynte",
- "upload_form.description_missing": "Inga skildring er lagt til",
"upload_form.edit": "Rediger",
"upload_form.thumbnail": "Bytt miniatyrbilete",
- "upload_form.undo": "Slett",
"upload_form.video_description": "Skildre for dei med nedsett høyrsel eller redusert syn",
"upload_modal.analyzing_picture": "Analyserer bilete…",
"upload_modal.apply": "Bruk",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 50da3bb2be109b..7f93ff04650262 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -89,7 +89,6 @@
"announcement.announcement": "Kunngjøring",
"attachments_list.unprocessed": "(ubehandlet)",
"audio.hide": "Skjul lyd",
- "autosuggest_hashtag.per_week": "{count} per uke",
"boost_modal.combo": "You kan trykke {combo} for å hoppe over dette neste gang",
"bundle_column_error.copy_stacktrace": "Kopier feilrapport",
"bundle_column_error.error.body": "Den forespurte siden kan ikke gjengis. Den kan skyldes en feil i vår kode eller et kompatibilitetsproblem med nettleseren.",
@@ -146,26 +145,22 @@
"compose_form.lock_disclaimer": "Din konto er ikke {locked}. Hvem som helst kan følge deg og se dine private poster.",
"compose_form.lock_disclaimer.lock": "låst",
"compose_form.placeholder": "Hva har du på hjertet?",
- "compose_form.poll.add_option": "Legg til et valg",
"compose_form.poll.duration": "Avstemningens varighet",
+ "compose_form.poll.multiple": "Flervalg",
"compose_form.poll.option_placeholder": "Valg {number}",
- "compose_form.poll.remove_option": "Fjern dette valget",
+ "compose_form.poll.single": "Velg en",
"compose_form.poll.switch_to_multiple": "Endre avstemning til å tillate flere valg",
"compose_form.poll.switch_to_single": "Endre avstemning til å tillate ett valg",
+ "compose_form.poll.type": "Stil",
"compose_form.publish": "Publiser",
"compose_form.publish_form": "Publiser",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Lagre endringer",
- "compose_form.sensitive.hide": "{count, plural,one {Merk media som følsomt} other {Merk medier som følsomme}}",
- "compose_form.sensitive.marked": "{count, plural,one {Mediet er merket som følsomt}other {Mediene er merket som følsomme}}",
- "compose_form.sensitive.unmarked": "{count, plural,one {Mediet er ikke merket som følsomt}other {Mediene er ikke merket som følsomme}}",
+ "compose_form.reply": "Svar",
+ "compose_form.save_changes": "Oppdater",
"compose_form.spoiler.marked": "Fjern innholdsvarsel",
"compose_form.spoiler.unmarked": "Legg til innholdsvarsel",
- "compose_form.spoiler_placeholder": "Skriv advarselen din her",
+ "compose_form.spoiler_placeholder": "Innholdsadvarsel (valgfritt)",
"confirmation_modal.cancel": "Avbryt",
- "confirmations.block.block_and_report": "Blokker og rapporter",
"confirmations.block.confirm": "Blokkèr",
- "confirmations.block.message": "Er du sikker på at du vil blokkere {name}?",
"confirmations.cancel_follow_request.confirm": "Trekk tilbake forespørsel",
"confirmations.cancel_follow_request.message": "Er du sikker på at du vil trekke tilbake forespørselen din for å følge {name}?",
"confirmations.delete.confirm": "Slett",
@@ -174,15 +169,12 @@
"confirmations.delete_list.message": "Er du sikker på at du vil slette denne listen permanent?",
"confirmations.discard_edit_media.confirm": "Forkast",
"confirmations.discard_edit_media.message": "Du har ulagrede endringer i mediebeskrivelsen eller i forhåndsvisning, forkast dem likevel?",
- "confirmations.domain_block.confirm": "Skjul alt fra domenet",
"confirmations.domain_block.message": "Er du sikker på at du vil skjule hele domenet {domain}? I de fleste tilfeller er det bedre med målrettet blokkering eller demping.",
"confirmations.edit.confirm": "Redigér",
"confirmations.edit.message": "Å redigere nå vil overskrive meldingen du skriver for øyeblikket. Er du sikker på at du vil fortsette?",
"confirmations.logout.confirm": "Logg ut",
"confirmations.logout.message": "Er du sikker på at du vil logge ut?",
"confirmations.mute.confirm": "Demp",
- "confirmations.mute.explanation": "Dette vil skjule innlegg fra dem og innlegg som nevner dem, men det vil fortsatt la dem se dine innlegg og å følge deg.",
- "confirmations.mute.message": "Er du sikker på at du vil dempe {name}?",
"confirmations.redraft.confirm": "Slett og skriv på nytt",
"confirmations.redraft.message": "Er du sikker på at du vil slette dette innlegget og lagre det på nytt? Favoritter og fremhevinger vil gå tapt, og svar til det originale innlegget vil bli foreldreløse.",
"confirmations.reply.confirm": "Svar",
@@ -280,6 +272,7 @@
"follow_request.authorize": "Autoriser",
"follow_request.reject": "Avvis",
"follow_requests.unlocked_explanation": "Selv om kontoen din ikke er låst, tror {domain} ansatte at du kanskje vil gjennomgå forespørsler fra disse kontoene manuelt.",
+ "follow_suggestions.view_all": "Vis alle",
"followed_tags": "Fulgte emneknagger",
"footer.about": "Om",
"footer.directory": "Profilkatalog",
@@ -306,13 +299,8 @@
"hashtag.follow": "Følg emneknagg",
"hashtag.unfollow": "Slutt å følge emneknagg",
"hashtags.and_other": "…og {count, plural, one{en til} other {# til}}",
- "home.actions.go_to_explore": "Se hva som er populært",
- "home.actions.go_to_suggestions": "Finn folk å følge",
- "home.column_settings.basic": "Enkelt",
"home.column_settings.show_reblogs": "Vis fremhevinger",
"home.column_settings.show_replies": "Vis svar",
- "home.explore_prompt.body": "Tidslinjen din inneholder en blanding av innlegg fra emneknagger du har valgt å følge, personene du har valgt å følge, og innleggene de fremhever. Hvis det føles for stille, kan det være lurt å:",
- "home.explore_prompt.title": "Dette er hjemmet ditt i Mastodon.",
"home.hide_announcements": "Skjul kunngjøring",
"home.pending_critical_update.body": "Vennligst oppdater Mastodon-serveren din så snart som mulig!",
"home.pending_critical_update.link": "Se oppdateringer",
@@ -396,9 +384,6 @@
"loading_indicator.label": "Laster…",
"media_gallery.toggle_visible": "Veksle synlighet",
"moved_to_account_banner.text": "Din konto {disabledAccount} er for øyeblikket deaktivert fordi du flyttet til {movedToAccount}.",
- "mute_modal.duration": "Varighet",
- "mute_modal.hide_notifications": "Skjul varslinger fra denne brukeren?",
- "mute_modal.indefinite": "På ubestemt tid",
"navigation_bar.about": "Om",
"navigation_bar.advanced_interface": "Åpne i det avanserte nettgrensesnittet",
"navigation_bar.blocks": "Blokkerte brukere",
@@ -408,7 +393,6 @@
"navigation_bar.direct": "Private omtaler",
"navigation_bar.discover": "Oppdag",
"navigation_bar.domain_blocks": "Skjulte domener",
- "navigation_bar.edit_profile": "Rediger profil",
"navigation_bar.explore": "Utforsk",
"navigation_bar.favourites": "Favoritter",
"navigation_bar.filters": "Stilnede ord",
@@ -443,9 +427,6 @@
"notifications.column_settings.admin.sign_up": "Nye registreringer:",
"notifications.column_settings.alert": "Skrivebordsvarslinger",
"notifications.column_settings.favourite": "Favoritter:",
- "notifications.column_settings.filter_bar.advanced": "Vis alle kategorier",
- "notifications.column_settings.filter_bar.category": "Hurtigfiltreringslinje",
- "notifications.column_settings.filter_bar.show_bar": "Vis filterlinjen",
"notifications.column_settings.follow": "Nye følgere:",
"notifications.column_settings.follow_request": "Nye følgerforespørsler:",
"notifications.column_settings.mention": "Nevnt:",
@@ -525,14 +506,14 @@
"poll_button.add_poll": "Legg til en avstemning",
"poll_button.remove_poll": "Fjern avstemningen",
"privacy.change": "Juster synlighet",
- "privacy.direct.long": "Post kun til nevnte brukere",
- "privacy.direct.short": "Kun nevnte personer",
- "privacy.private.long": "Post kun til følgere",
- "privacy.private.short": "Kun følgere",
- "privacy.public.long": "Synlig for alle",
+ "privacy.direct.long": "Alle nevnt i innlegget",
+ "privacy.direct.short": "Spesifikke folk",
+ "privacy.private.long": "Bare følgerne dine",
+ "privacy.private.short": "Følgere",
+ "privacy.public.long": "Alle på og utenfor Mastodon",
"privacy.public.short": "Offentlig",
- "privacy.unlisted.long": "Synlig for alle, men vises ikke i oppdagsfunksjoner",
- "privacy.unlisted.short": "Uoppført",
+ "privacy.unlisted.long": "Færre algoritmiske fanfarer",
+ "privacy.unlisted.short": "Stille offentlig",
"privacy_policy.last_updated": "Sist oppdatert {date}",
"privacy_policy.title": "Personvernregler",
"recommended": "Anbefalt",
@@ -550,7 +531,9 @@
"relative_time.minutes": "{number}m",
"relative_time.seconds": "{number}s",
"relative_time.today": "i dag",
+ "reply_indicator.attachments": "{count, plural, one {# vedlegg} other {# vedlegg}}",
"reply_indicator.cancel": "Avbryt",
+ "reply_indicator.poll": "Avstemming",
"report.block": "Blokker",
"report.block_explanation": "Du kommer ikke til å se innleggene deres. De vil ikke kunne se innleggene dine eller følge deg. De vil kunne se at de er blokkert.",
"report.categories.legal": "Juridisk",
@@ -643,7 +626,6 @@
"status.direct": "Nevn @{name} privat",
"status.direct_indicator": "Privat omtale",
"status.edit": "Rediger",
- "status.edited": "Redigert {date}",
"status.edited_x_times": "Redigert {count, plural,one {{count} gang} other {{count} ganger}}",
"status.embed": "Bygge inn",
"status.favourite": "Favoritt",
@@ -714,10 +696,8 @@
"upload_error.poll": "Filopplasting er ikke tillatt for avstemninger.",
"upload_form.audio_description": "Beskriv det for folk med hørselstap",
"upload_form.description": "Beskriv for synshemmede",
- "upload_form.description_missing": "Ingen beskrivelse lagt til",
"upload_form.edit": "Rediger",
"upload_form.thumbnail": "Endre miniatyrbilde",
- "upload_form.undo": "Angre",
"upload_form.video_description": "Beskriv det for folk med hørselstap eller synshemminger",
"upload_modal.analyzing_picture": "Analyserer bildet …",
"upload_modal.apply": "Bruk",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 1ecfbcaf065173..3c32fed0efc2fa 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -80,7 +80,6 @@
"announcement.announcement": "Anóncia",
"attachments_list.unprocessed": "(pas tractat)",
"audio.hide": "Amagar àudio",
- "autosuggest_hashtag.per_week": "{count} per setmana",
"boost_modal.combo": "Podètz botar {combo} per passar aquò lo còp que ven",
"bundle_column_error.copy_stacktrace": "Copiar senhalament d’avaria",
"bundle_column_error.error.title": "Oh non !",
@@ -131,26 +130,14 @@
"compose_form.lock_disclaimer": "Vòstre compte es pas {locked}. Tot lo mond pòt vos sègre e veire los estatuts reservats als seguidors.",
"compose_form.lock_disclaimer.lock": "clavat",
"compose_form.placeholder": "A de qué pensatz ?",
- "compose_form.poll.add_option": "Ajustar una causida",
"compose_form.poll.duration": "Durada del sondatge",
- "compose_form.poll.option_placeholder": "Opcion {number}",
- "compose_form.poll.remove_option": "Levar aquesta opcion",
"compose_form.poll.switch_to_multiple": "Cambiar lo sondatge per permetre de causidas multiplas",
"compose_form.poll.switch_to_single": "Cambiar lo sondatge per permetre una sola causida",
- "compose_form.publish": "Publicar",
"compose_form.publish_form": "Publicar",
- "compose_form.publish_loud": "{publish} !",
- "compose_form.save_changes": "Salvar los cambiaments",
- "compose_form.sensitive.hide": "Marcar coma sensible",
- "compose_form.sensitive.marked": "Lo mèdia es marcat coma sensible",
- "compose_form.sensitive.unmarked": "Lo mèdia es pas marcat coma sensible",
"compose_form.spoiler.marked": "Lo tèxte es rescondut jos l’avertiment",
"compose_form.spoiler.unmarked": "Lo tèxte es pas rescondut",
- "compose_form.spoiler_placeholder": "Escrivètz l’avertiment aquí",
"confirmation_modal.cancel": "Anullar",
- "confirmations.block.block_and_report": "Blocar e senhalar",
"confirmations.block.confirm": "Blocar",
- "confirmations.block.message": "Volètz vertadièrament blocar {name} ?",
"confirmations.cancel_follow_request.confirm": "Retirar la demandar",
"confirmations.cancel_follow_request.message": "Volètz vertadièrament retirar la demanda de seguiment de {name} ?",
"confirmations.delete.confirm": "Escafar",
@@ -158,14 +145,11 @@
"confirmations.delete_list.confirm": "Suprimir",
"confirmations.delete_list.message": "Volètz vertadièrament suprimir aquesta lista per totjorn ?",
"confirmations.discard_edit_media.confirm": "Ignorar",
- "confirmations.domain_block.confirm": "Amagar tot lo domeni",
"confirmations.domain_block.message": "Volètz vertadièrament blocar complètament {domain} ? De còps cal pas que blocar o rescondre unas personas solament.\nVeiretz pas cap de contengut d’aquel domeni dins cap de flux public o dins vòstras notificacions. Vòstres seguidors d’aquel domeni seràn levats.",
"confirmations.edit.confirm": "Modificar",
"confirmations.logout.confirm": "Desconnexion",
"confirmations.logout.message": "Volètz vertadièrament vos desconnectar ?",
"confirmations.mute.confirm": "Rescondre",
- "confirmations.mute.explanation": "Aquò lor escondrà las publicacions e mencions, mas aquò lor permetrà encara de veire vòstra publicacions e de vos sègre.",
- "confirmations.mute.message": "Volètz vertadièrament rescondre {name} ?",
"confirmations.redraft.confirm": "Escafar & tornar formular",
"confirmations.reply.confirm": "Respondre",
"confirmations.reply.message": "Respondre remplaçarà lo messatge que sètz a escriure. Volètz vertadièrament contunhar ?",
@@ -273,9 +257,6 @@
"hashtag.follow": "Sègre l’etiqueta",
"hashtag.unfollow": "Quitar de sègre l’etiqueta",
"hashtags.and_other": "…e {count, plural, one {}other {# de mai}}",
- "home.actions.go_to_explore": "Agachatz las tendéncias",
- "home.actions.go_to_suggestions": "Trobatz de monde de sègre",
- "home.column_settings.basic": "Basic",
"home.column_settings.show_reblogs": "Mostrar los partatges",
"home.column_settings.show_replies": "Mostrar las responsas",
"home.hide_announcements": "Rescondre las anóncias",
@@ -347,9 +328,6 @@
"load_pending": "{count, plural, one {# nòu element} other {# nòu elements}}",
"loading_indicator.label": "Cargament…",
"media_gallery.toggle_visible": "Modificar la visibilitat",
- "mute_modal.duration": "Durada",
- "mute_modal.hide_notifications": "Rescondre las notificacions d’aquesta persona ?",
- "mute_modal.indefinite": "Cap de data de fin",
"navigation_bar.about": "A prepaus",
"navigation_bar.advanced_interface": "Dobrir l’interfàcia web avançada",
"navigation_bar.blocks": "Personas blocadas",
@@ -359,7 +337,6 @@
"navigation_bar.direct": "Mencions privadas",
"navigation_bar.discover": "Trobar",
"navigation_bar.domain_blocks": "Domenis resconduts",
- "navigation_bar.edit_profile": "Modificar lo perfil",
"navigation_bar.explore": "Explorar",
"navigation_bar.favourites": "Favorits",
"navigation_bar.filters": "Mots ignorats",
@@ -393,9 +370,6 @@
"notifications.column_settings.admin.sign_up": "Nòus inscrits :",
"notifications.column_settings.alert": "Notificacions localas",
"notifications.column_settings.favourite": "Favorits :",
- "notifications.column_settings.filter_bar.advanced": "Mostrar totas las categorias",
- "notifications.column_settings.filter_bar.category": "Barra de recèrca rapida",
- "notifications.column_settings.filter_bar.show_bar": "Afichar la barra de filtres",
"notifications.column_settings.follow": "Nòus seguidors :",
"notifications.column_settings.follow_request": "Novèla demanda d’abonament :",
"notifications.column_settings.mention": "Mencions :",
@@ -457,14 +431,7 @@
"poll_button.add_poll": "Ajustar un sondatge",
"poll_button.remove_poll": "Levar lo sondatge",
"privacy.change": "Ajustar la confidencialitat del messatge",
- "privacy.direct.long": "Mostrar pas qu’a las personas mencionadas",
- "privacy.direct.short": "Sonque per las personas mencionadas",
- "privacy.private.long": "Mostrar pas qu’a vòstres seguidors",
- "privacy.private.short": "Sonque pels seguidors",
- "privacy.public.long": "Visiblas per totes",
"privacy.public.short": "Public",
- "privacy.unlisted.long": "Visible per totes mas desactivat per las foncionalitats de descobèrta",
- "privacy.unlisted.short": "Pas-listat",
"privacy_policy.last_updated": "Darrièra actualizacion {date}",
"privacy_policy.title": "Politica de confidencialitat",
"refresh": "Actualizar",
@@ -550,7 +517,6 @@
"status.direct": "Mencionar @{name} en privat",
"status.direct_indicator": "Mencion privada",
"status.edit": "Modificar",
- "status.edited": "Modificat {date}",
"status.edited_x_times": "Modificat {count, plural, un {{count} còp} other {{count} còps}}",
"status.embed": "Embarcar",
"status.favourite": "Apondre als favorits",
@@ -621,10 +587,8 @@
"upload_error.poll": "Lo mandadís de fichièr es pas autorizat pels sondatges.",
"upload_form.audio_description": "Descriure per las personas amb pèrdas auditivas",
"upload_form.description": "Descripcion pels mal vesents",
- "upload_form.description_missing": "Cap de descripcion pas aponduda",
"upload_form.edit": "Modificar",
"upload_form.thumbnail": "Cambiar la vinheta",
- "upload_form.undo": "Suprimir",
"upload_form.video_description": "Descriure per las personas amb pèrdas auditivas o mal vesent",
"upload_modal.analyzing_picture": "Analisi de l’imatge…",
"upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index 132b695cda8478..c693c24721c6e9 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -1,5 +1,6 @@
{
"about.contact": "ਸੰਪਰਕ:",
+ "about.domain_blocks.no_reason_available": "ਕਾਰਨ ਮੌਜੂਦ ਨਹੀਂ ਹੈ",
"about.domain_blocks.silenced.title": "ਸੀਮਿਤ",
"about.domain_blocks.suspended.title": "ਮੁਅੱਤਲ ਕੀਤੀ",
"about.rules": "ਸਰਵਰ ਨਿਯਮ",
@@ -12,18 +13,34 @@
"account.block_short": "ਪਾਬੰਦੀ",
"account.blocked": "ਪਾਬੰਦੀਸ਼ੁਦਾ",
"account.cancel_follow_request": "ਫ਼ਾਲੋ ਕਰਨ ਨੂੰ ਰੱਦ ਕਰੋ",
+ "account.copy": "ਪਰੋਫਾਇਲ ਲਈ ਲਿੰਕ ਕਾਪੀ ਕਰੋ",
+ "account.direct": "ਨਿੱਜੀ ਜ਼ਿਕਰ @{name}",
+ "account.domain_blocked": "ਡੋਮੇਨ ਉੱਤੇ ਪਾਬੰਦੀ",
"account.edit_profile": "ਪਰੋਫਾਈਲ ਨੂੰ ਸੋਧੋ",
+ "account.enable_notifications": "ਜਦੋਂ {name} ਪੋਸਟ ਕਰੇ ਤਾਂ ਮੈਨੂੰ ਸੂਚਨਾ ਦਿਓ",
+ "account.endorse": "ਪਰੋਫਾਇਲ ਉੱਤੇ ਫ਼ੀਚਰ",
+ "account.featured_tags.last_status_at": "{date} ਨੂੰ ਆਖਰੀ ਪੋਸਟ",
+ "account.featured_tags.last_status_never": "ਕੋਈ ਪੋਸਟ ਨਹੀਂ",
"account.follow": "ਫ਼ਾਲੋ",
+ "account.follow_back": "ਵਾਪਸ ਫਾਲ਼ੋ ਕਰੋ",
"account.followers": "ਫ਼ਾਲੋਅਰ",
"account.followers.empty": "ਇਸ ਵਰਤੋਂਕਾਰ ਨੂੰ ਹਾਲੇ ਕੋਈ ਫ਼ਾਲੋ ਨਹੀਂ ਕਰਦਾ ਹੈ।",
+ "account.followers_counter": "{count, plural, one {{counter} ਫ਼ਾਲੋਅਰ} other {{counter} ਫ਼ਾਲੋਅਰ}}",
"account.following": "ਫ਼ਾਲੋ ਕੀਤਾ",
+ "account.following_counter": "{count, plural, one {{counter} ਨੂੰ ਫ਼ਾਲੋ} other {{counter} ਨੂੰ ਫ਼ਾਲੋ}}",
"account.follows.empty": "ਇਹ ਵਰਤੋਂਕਾਰ ਹਾਲੇ ਕਿਸੇ ਨੂੰ ਫ਼ਾਲੋ ਨਹੀਂ ਕਰਦਾ ਹੈ।",
+ "account.go_to_profile": "ਪਰੋਫਾਇਲ ਉੱਤੇ ਜਾਓ",
"account.media": "ਮੀਡੀਆ",
"account.muted": "ਮੌਨ ਕੀਤੀਆਂ",
+ "account.mutual": "ਸਾਂਝੇ",
+ "account.no_bio": "ਕੋਈ ਵਰਣਨ ਨਹੀਂ ਦਿੱਤਾ।",
+ "account.open_original_page": "ਅਸਲ ਸਫ਼ੇ ਨੂੰ ਖੋਲ੍ਹੋ",
"account.posts": "ਪੋਸਟਾਂ",
"account.posts_with_replies": "ਪੋਸਤਾਂ ਅਤੇ ਜਵਾਬ",
+ "account.report": "{name} ਬਾਰੇ ਰਿਪੋਰਟ ਕਰੋ",
"account.requested": "ਮਨਜ਼ੂਰੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ। ਫ਼ਾਲੋ ਬੇਨਤੀਆਂ ਨੂੰ ਰੱਦ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ",
"account.requested_follow": "{name} ਨੇ ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਕਰਨ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ",
+ "account.share": "{name} ਦਾ ਪਰੋਫ਼ਾਇਲ ਸਾਂਝਾ ਕਰੋ",
"account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
"account.unblock": "@{name} ਤੋਂ ਪਾਬੰਦੀ ਹਟਾਓ",
"account.unblock_domain": "{domain} ਡੋਮੇਨ ਤੋਂ ਪਾਬੰਦੀ ਹਟਾਓ",
@@ -35,9 +52,16 @@
"admin.dashboard.retention.cohort_size": "ਨਵੇਂ ਵਰਤੋਂਕਾਰ",
"alert.unexpected.title": "ਓਹੋ!",
"announcement.announcement": "ਹੋਕਾ",
+ "block_modal.show_less": "ਘੱਟ ਦਿਖਾਓ",
+ "block_modal.show_more": "ਵੱਧ ਦਿਖਾਓ",
+ "block_modal.title": "ਵਰਤੋਂਕਾਰ ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਉਣੀ ਹੈ?",
+ "bundle_column_error.error.title": "ਓਹ ਹੋ!",
"bundle_column_error.network.title": "ਨੈੱਟਵਰਕ ਦੀ ਸਮੱਸਿਆ",
"bundle_column_error.retry": "ਮੁੜ-ਕੋਸ਼ਿਸ਼ ਕਰੋ",
+ "bundle_column_error.return": "ਵਾਪਸ ਮੁੱਖ ਸਫ਼ੇ ਉੱਤੇ ਜਾਓ",
+ "bundle_column_error.routing.title": "404",
"bundle_modal_error.close": "ਬੰਦ ਕਰੋ",
+ "bundle_modal_error.message": "ਭਾਗ ਲੋਡ ਕਰਨ ਦੌਰਾਨ ਕੁਝ ਗਲਤ ਵਾਪਰਿਆ ਹੈ।",
"bundle_modal_error.retry": "ਮੁੜ-ਕੋਸ਼ਿਸ਼ ਕਰੋ",
"column.about": "ਸਾਡੇ ਬਾਰੇ",
"column.blocks": "ਪਾਬੰਦੀ ਲਾਏ ਵਰਤੋਂਕਾਰ",
@@ -67,18 +91,20 @@
"compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
"compose_form.lock_disclaimer.lock": "ਲਾਕ ਹੈ",
"compose_form.placeholder": "What is on your mind?",
- "compose_form.publish": "ਪ੍ਰਕਾਸ਼ਨ ਕਰੋ",
+ "compose_form.poll.type": "ਸਟਾਈਲ",
+ "compose_form.publish": "ਪੋਸਟ",
"compose_form.publish_form": "Publish",
- "compose_form.save_changes": "ਤਬਦੀਲੀਆਂ ਸਾਂਭੋ",
+ "compose_form.reply": "ਜਵਾਬ ਦਿਓ",
+ "compose_form.save_changes": "ਅੱਪਡੇਟ",
"compose_form.spoiler.marked": "ਸਮੱਗਰੀ ਚੇਤਾਵਨੀ ਨੂੰ ਹਟਾਓ",
"compose_form.spoiler.unmarked": "ਸਮੱਗਰੀ ਬਾਰੇ ਚੇਤਾਵਨੀ ਜੋੜੋ",
+ "compose_form.spoiler_placeholder": "ਸਮੱਗਰੀ ਬਾਰੇ ਚੇਤਾਵਨੀ (ਚੋਣਵਾਂ)",
"confirmation_modal.cancel": "ਰੱਦ ਕਰੋ",
"confirmations.block.confirm": "ਪਾਬੰਦੀ",
"confirmations.delete.confirm": "ਹਟਾਓ",
"confirmations.delete.message": "ਕੀ ਤੁਸੀਂ ਇਹ ਪੋਸਟ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?",
"confirmations.delete_list.confirm": "ਹਟਾਓ",
"confirmations.discard_edit_media.confirm": "ਰੱਦ ਕਰੋ",
- "confirmations.domain_block.confirm": "ਪੂਰੀ ਡੋਮੇਨ ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਓ",
"confirmations.edit.confirm": "ਸੋਧ",
"confirmations.logout.confirm": "ਬਾਹਰ ਹੋਵੋ",
"confirmations.mute.confirm": "ਮੌਨ ਕਰੋ",
@@ -118,7 +144,10 @@
"firehose.local": "ਇਹ ਸਰਵਰ",
"firehose.remote": "ਹੋਰ ਸਰਵਰ",
"follow_request.reject": "ਰੱਦ ਕਰੋ",
+ "follow_suggestions.dismiss": "ਮੁੜ ਨਾ ਵੇਖਾਓ",
+ "follow_suggestions.view_all": "ਸਭ ਵੇਖੋ",
"footer.about": "ਸਾਡੇ ਬਾਰੇ",
+ "footer.directory": "ਪਰੋਫਾਇਲ ਡਾਇਰੈਕਟਰੀ",
"footer.get_app": "ਐਪ ਲਵੋ",
"footer.invite": "ਲੋਕਾਂ ਨੂੰ ਸੱਦਾ ਭੇਜੋ",
"footer.keyboard_shortcuts": "ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ",
@@ -130,12 +159,13 @@
"hashtag.column_header.tag_mode.all": "ਅਤੇ {additional}",
"hashtag.column_header.tag_mode.any": "ਜਾਂ {additional}",
"hashtag.column_header.tag_mode.none": "{additional} ਬਿਨਾਂ",
+ "hashtag.column_settings.select.no_options_message": "ਕੋਈ ਸੁਝਾਅ ਨਹੀਂ ਲੱਭਾ",
"hashtag.column_settings.tag_mode.any": "ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੋਈ",
"hashtag.column_settings.tag_mode.none": "ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੋਈ ਨਹੀਂ",
"hashtag.column_settings.tag_toggle": "Include additional tags in this column",
"hashtag.follow": "ਹੈਸ਼ਟੈਗ ਨੂੰ ਫ਼ਾਲੋ ਕਰੋ",
"hashtag.unfollow": "ਹੈਸ਼ਟੈਗ ਨੂੰ ਅਣ-ਫ਼ਾਲੋ ਕਰੋ",
- "home.column_settings.basic": "ਆਮ",
+ "home.pending_critical_update.link": "ਅੱਪਡੇਟ ਵੇਖੋ",
"interaction_modal.title.follow": "{name} ਨੂੰ ਫ਼ਾਲੋ ਕਰੋ",
"keyboard_shortcuts.back": "ਪਿੱਛੇ ਜਾਓ",
"keyboard_shortcuts.blocked": "ਪਾਬੰਦੀ ਲਾਏ ਵਰਤੋਂਕਾਰਾਂ ਦੀ ਸੂਚੀ ਖੋਲ੍ਹੋ",
@@ -178,7 +208,6 @@
"lists.replies_policy.followed": "ਕੋਈ ਵੀ ਫ਼ਾਲੋ ਕੀਤਾ ਵਰਤੋਂਕਾਰ",
"lists.replies_policy.none": "ਕੋਈ ਨਹੀਂ",
"loading_indicator.label": "ਲੋਡ ਹੋ ਰਿਹਾ ਹੈ…",
- "mute_modal.duration": "ਮਿਆਦ",
"navigation_bar.about": "ਇਸ ਬਾਰੇ",
"navigation_bar.advanced_interface": "ਤਕਨੀਕੀ ਵੈੱਬ ਇੰਟਰਫੇਸ ਵਿੱਚ ਖੋਲ੍ਹੋ",
"navigation_bar.blocks": "ਪਾਬੰਦੀ ਲਾਏ ਵਰਤੋਂਕਾਰ",
@@ -188,14 +217,15 @@
"navigation_bar.direct": "ਨਿੱਜੀ ਜ਼ਿਕਰ",
"navigation_bar.discover": "ਖੋਜ",
"navigation_bar.domain_blocks": "ਪਾਬੰਦੀ ਲਾਏ ਡੋਮੇਨ",
- "navigation_bar.edit_profile": "ਪਰੋਫਾਈਲ ਨੂੰ ਸੋਧੋ",
"navigation_bar.explore": "ਪੜਚੋਲ ਕਰੋ",
"navigation_bar.favourites": "ਮਨਪਸੰਦ",
+ "navigation_bar.filters": "ਮੌਨ ਕੀਤੇ ਸ਼ਬਦ",
"navigation_bar.follow_requests": "ਫ਼ਾਲੋ ਦੀਆਂ ਬੇਨਤੀਆਂ",
"navigation_bar.followed_tags": "ਫ਼ਾਲੋ ਕੀਤੇ ਹੈਸ਼ਟੈਗ",
"navigation_bar.follows_and_followers": "ਫ਼ਾਲੋ ਅਤੇ ਫ਼ਾਲੋ ਕਰਨ ਵਾਲੇ",
"navigation_bar.lists": "ਸੂਚੀਆਂ",
"navigation_bar.logout": "ਲਾਗ ਆਉਟ",
+ "navigation_bar.mutes": "ਮੌਨ ਕੀਤੇ ਵਰਤੋਂਕਾਰ",
"navigation_bar.personal": "ਨਿੱਜੀ",
"navigation_bar.pins": "ਟੰਗੀਆਂ ਪੋਸਟਾਂ",
"navigation_bar.preferences": "ਪਸੰਦਾਂ",
@@ -205,6 +235,8 @@
"notification.follow": "{name} ਨੇ ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਕੀਤਾ",
"notification.follow_request": "{name} ਨੇ ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਕਰਨ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ",
"notification.reblog": "{name} boosted your status",
+ "notifications.column_settings.alert": "ਡੈਸਕਟਾਪ ਸੂਚਨਾਵਾਂ",
+ "notifications.column_settings.favourite": "ਮਨਪਸੰਦ:",
"notifications.column_settings.follow": "ਨਵੇਂ ਫ਼ਾਲੋਅਰ:",
"notifications.column_settings.follow_request": "ਨਵੀਆਂ ਫ਼ਾਲੋ ਬੇਨਤੀਆਂ:",
"notifications.column_settings.status": "ਨਵੀਆਂ ਪੋਸਟਾਂ:",
@@ -238,8 +270,6 @@
"poll.refresh": "ਤਾਜ਼ਾ ਕਰੋ",
"poll.vote": "ਵੋਟ ਪਾਓ",
"privacy.change": "ਪੋਸਟ ਦੀ ਪਰਦੇਦਾਰੀ ਨੂੰ ਬਦਲੋ",
- "privacy.direct.short": "ਸਿੱਧਾ ਲੋਕਾਂ ਦਾ ਜ਼ਿਕਰ ਕਰੋ",
- "privacy.private.short": "ਸਿਰਫ਼ ਫ਼ਾਲੋਅਰ",
"privacy.public.short": "ਜਨਤਕ",
"privacy_policy.title": "ਪਰਦੇਦਾਰੀ ਨੀਤੀ",
"refresh": "ਤਾਜ਼ਾ ਕਰੋ",
@@ -266,9 +296,11 @@
"report.target": "{target} ਰਿਪੋਰਟ",
"report.unfollow": "@{name} ਨੂੰ ਅਣ-ਫ਼ਾਲੋ ਕਰੋ",
"report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
+ "report_notification.categories.legal": "ਕਨੂੰਨੀ",
"report_notification.categories.other": "ਬਾਕੀ",
"report_notification.categories.spam": "ਸਪੈਮ",
"report_notification.categories.violation": "ਨਿਯਮ ਦੀ ਉਲੰਘਣਾ",
+ "report_notification.open": "ਰਿਪੋਰਟ ਨੂੰ ਖੋਲ੍ਹੋ",
"search.placeholder": "ਖੋਜੋ",
"search_popout.quick_actions": "ਫੌਰੀ ਕਾਰਵਾਈਆਂ",
"search_popout.specific_date": "ਖਾਸ ਤਾਰੀਖ",
@@ -276,17 +308,19 @@
"search_results.accounts": "ਪਰੋਫਾਈਲ",
"search_results.all": "ਸਭ",
"search_results.hashtags": "ਹੈਸ਼ਟੈਗ",
+ "search_results.see_all": "ਸਭ ਵੇਖੋ",
"search_results.statuses": "ਪੋਸਟਾਂ",
+ "search_results.title": "{q} ਲਈ ਖੋਜ",
"server_banner.learn_more": "ਹੋਰ ਜਾਣੋ",
"sign_in_banner.create_account": "ਖਾਤਾ ਬਣਾਓ",
"sign_in_banner.sign_in": "ਲਾਗਇਨ",
+ "sign_in_banner.sso_redirect": "ਲਾਗਇਨ ਜਾਂ ਰਜਿਸਟਰ ਕਰੋ",
"status.admin_status": "",
"status.block": "@{name} ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਓ",
"status.bookmark": "ਬੁੱਕਮਾਰਕ",
"status.copy": "ਪੋਸਟ ਲਈ ਲਿੰਕ ਕਾਪੀ ਕਰੋ",
"status.delete": "ਹਟਾਓ",
"status.edit": "ਸੋਧ",
- "status.edited": "{date} ਨੂੰ ਸੋਧਿਆ",
"status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
"status.embed": "ਮੜ੍ਹੋ",
"status.favourite": "ਪਸੰਦ",
@@ -327,7 +361,6 @@
"upload_form.audio_description": "ਬੋਲ਼ੇ ਜਾਂ ਸੁਣਨ ਵਿੱਚ ਮੁਸ਼ਕਿਲ ਵਾਲੇ ਲੋਕਾਂ ਲਈ ਵੇਰਵੇ",
"upload_form.description": "ਅੰਨ੍ਹੇ ਜਾਂ ਦੇਖਣ ਲਈ ਮੁਸ਼ਕਲ ਵਾਲੇ ਲੋਕਾਂ ਲਈ ਵੇਰਵੇ",
"upload_form.edit": "ਸੋਧ",
- "upload_form.undo": "ਹਟਾਓ",
"upload_form.video_description": "ਬੋਲ਼ੇ, ਸੁਣਨ ਵਿੱਚ ਮੁਸ਼ਕਿਲ, ਅੰਨ੍ਹੇ ਜਾਂ ਘੱਟ ਨਿਗ੍ਹਾ ਵਾਲੇ ਲੋਕਾਂ ਲਈ ਵੇਰਵਾ",
"upload_modal.apply": "ਲਾਗੂ ਕਰੋ",
"upload_modal.applying": "ਲਾਗੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 35dbc6661d857d..6f67e8f74f08c1 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -89,7 +89,14 @@
"announcement.announcement": "Ogłoszenie",
"attachments_list.unprocessed": "(nieprzetworzone)",
"audio.hide": "Ukryj dźwięk",
- "autosuggest_hashtag.per_week": "{count} co tydzień",
+ "block_modal.remote_users_caveat": "Poprosimy serwer {domain} o uszanowanie twojej decyzji. Zgodność nie jest jednak gwarantowana, bo niektóre serwery mogą inaczej obsługiwać blokowanie. Wpisy publiczne mogą być widoczne dla niezalogowanych użytkowników.",
+ "block_modal.show_less": "Pokaż mniej",
+ "block_modal.show_more": "Pokaż więcej",
+ "block_modal.they_cant_mention": "Użytkownik nie może Cię obserwować ani dodawać wzmianek o Tobie.",
+ "block_modal.they_cant_see_posts": "Użytkownik nie będzie widzieć Twoich wpisów, a Ty jego.",
+ "block_modal.they_will_know": "Użytkownik będzie wiedział, że jest zablokowany.",
+ "block_modal.title": "Zablokować użytkownika?",
+ "block_modal.you_wont_see_mentions": "Nie zobaczysz wpisów, które wspominają tego użytkownika.",
"boost_modal.combo": "Naciśnij {combo}, aby pominąć to następnym razem",
"bundle_column_error.copy_stacktrace": "Skopiuj raport o błędzie",
"bundle_column_error.error.body": "Nie można zrenderować żądanej strony. Może to być spowodowane błędem w naszym kodzie lub problemami z kompatybilnością przeglądarki.",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "Twoje konto nie jest {locked}. Każdy, kto Cię obserwuje, może wyświetlać Twoje wpisy przeznaczone tylko dla obserwujących.",
"compose_form.lock_disclaimer.lock": "zablokowane",
"compose_form.placeholder": "Co chodzi ci po głowie?",
- "compose_form.poll.add_option": "Dodaj opcję",
"compose_form.poll.duration": "Czas trwania głosowania",
+ "compose_form.poll.multiple": "Wielokrotny wybór",
"compose_form.poll.option_placeholder": "Opcja {number}",
- "compose_form.poll.remove_option": "Usuń tę opcję",
+ "compose_form.poll.single": "Wybierz jedną",
"compose_form.poll.switch_to_multiple": "Pozwól na wybranie wielu opcji",
"compose_form.poll.switch_to_single": "Pozwól na wybranie tylko jednej opcji",
+ "compose_form.poll.type": "Styl",
"compose_form.publish": "Opublikuj",
"compose_form.publish_form": "Opublikuj",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Zapisz zmiany",
- "compose_form.sensitive.hide": "{count, plural, one {Oznacz treść multimedialną jako wrażliwą} other {Oznacz treści multimedialne jako wrażliwe}}",
- "compose_form.sensitive.marked": "{count, plural, one {Treść multimedialna jest oznaczona jako wrażliwa} other {Treści multimedialne są oznaczone jako wrażliwe}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Treść multimedialna nie jest oznaczona jako wrażliwa} other {Treści multimedialne nie są oznaczone jako wrażliwe}}",
+ "compose_form.reply": "Odpowiedz",
+ "compose_form.save_changes": "Aktualizuj",
"compose_form.spoiler.marked": "Usuń ostrzeżenie o treści",
"compose_form.spoiler.unmarked": "Dodaj ostrzeżenie o treści",
- "compose_form.spoiler_placeholder": "Wpisz ostrzeżenie tutaj",
+ "compose_form.spoiler_placeholder": "Ostrzeżenie o treści (opcjonalne)",
"confirmation_modal.cancel": "Anuluj",
- "confirmations.block.block_and_report": "Zablokuj i zgłoś",
"confirmations.block.confirm": "Zablokuj",
- "confirmations.block.message": "Czy na pewno chcesz zablokować {name}?",
"confirmations.cancel_follow_request.confirm": "Wycofaj prośbę",
"confirmations.cancel_follow_request.message": "Czy na pewno chcesz wycofać prośbę o możliwość obserwowania {name}?",
"confirmations.delete.confirm": "Usuń",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "Czy na pewno chcesz bezpowrotnie usunąć tą listę?",
"confirmations.discard_edit_media.confirm": "Odrzuć",
"confirmations.discard_edit_media.message": "Masz niezapisane zmiany w opisie lub podglądzie, odrzucić je mimo to?",
- "confirmations.domain_block.confirm": "Ukryj wszystko z domeny",
+ "confirmations.domain_block.confirm": "Blokuj serwer",
"confirmations.domain_block.message": "Czy na pewno chcesz zablokować całą domenę {domain}? Zwykle lepszym rozwiązaniem jest blokada lub wyciszenie kilku użytkowników.",
"confirmations.edit.confirm": "Edytuj",
"confirmations.edit.message": "Edytowanie wpisu nadpisze wiadomość, którą obecnie piszesz. Czy na pewno chcesz to zrobić?",
"confirmations.logout.confirm": "Wyloguj",
"confirmations.logout.message": "Czy na pewno chcesz się wylogować?",
"confirmations.mute.confirm": "Wycisz",
- "confirmations.mute.explanation": "To schowa ich i wspominające ich posty, ale wciąż pozwoli im widzieć twoje posty i obserwować cię.",
- "confirmations.mute.message": "Czy na pewno chcesz wyciszyć {name}?",
"confirmations.redraft.confirm": "Usuń i przeredaguj",
"confirmations.redraft.message": "Czy na pewno chcesz usunąć i przeredagować ten wpis? Polubienia i podbicia zostaną utracone, a odpowiedzi do oryginalnego wpisu zostaną osierocone.",
"confirmations.reply.confirm": "Odpowiedz",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "Obecnie te wpisy z tego serwera i pozostałych serwerów w zdecentralizowanej sieci zyskują popularność na tym serwerze.",
"dismissable_banner.explore_tags": "Te hasztagi obecnie zyskują popularność wśród osób z tego serwera i pozostałych w zdecentralizowanej sieci.",
"dismissable_banner.public_timeline": "Są to najnowsze publiczne wpisy osób w serwisie społecznościowym, które obserwują ludzie w serwisie {domain}.",
+ "domain_block_modal.block": "Blokuj serwer",
+ "domain_block_modal.block_account_instead": "Zamiast tego zablokuj @{name}",
+ "domain_block_modal.they_can_interact_with_old_posts": "Ludzie z tego serwera mogą wchodzić w interakcje z Twoimi starymi wpisami.",
+ "domain_block_modal.they_cant_follow": "Nikt z tego serwera nie może Cię obserwować.",
+ "domain_block_modal.they_wont_know": "Użytkownik nie dowie się, że został zablokowany.",
+ "domain_block_modal.title": "Zablokować domenę?",
+ "domain_block_modal.you_will_lose_followers": "Wszyscy twoi obserwujący z tego serwera zostaną usunięci.",
+ "domain_block_modal.you_wont_see_posts": "Nie zobaczysz postów ani powiadomień od użytkowników na tym serwerze.",
+ "domain_pill.activitypub_lets_connect": "Pozwala połączyć się z ludźmi na Mastodonie, jak i na innych serwisach społecznościowych.",
+ "domain_pill.activitypub_like_language": "ActivityPub jest językiem używanym przez Mastodon do wymiany danych z innymi serwisami społecznościowymi.",
+ "domain_pill.server": "Serwer",
+ "domain_pill.their_handle": "Uchwyt:",
+ "domain_pill.their_server": "Cyfrowy dom, w którym znajdują się wszystkie wpisy.",
+ "domain_pill.their_username": "Unikalny identyfikator na serwerze. Możliwe jest znalezienie użytkowników o tej samej nazwie użytkownika na różnych serwerach.",
+ "domain_pill.username": "Nazwa użytkownika",
+ "domain_pill.whats_in_a_handle": "Co zawiera uchwyt użytkownika?",
+ "domain_pill.who_they_are": "Ponieważ uchwyty mówią kto jest kim i gdzie się znajduje, możesz wchodzić w interakcje z ludźmi korzystającymi z .",
+ "domain_pill.who_you_are": "Ponieważ Twój uchwyt mówi kim jesteś i gdzie się znajdujesz, inni mogą wchodzić z Tobą w interakcje korzystając z .",
+ "domain_pill.your_handle": "Twój uchwyt:",
+ "domain_pill.your_server": "Twój cyfrowy dom, w którym żyją wszystkie Twoje wpisy. Nie lubisz tego? Zmień serwer w dowolnym momencie i przenieś swoich obserwujących.",
+ "domain_pill.your_username": "Twój unikalny identyfikator na tym serwerze. Użytkownicy o tej samej nazwie mogą współistnieć na różnych serwerach.",
"embed.instructions": "Osadź ten wpis na swojej stronie wklejając poniższy kod.",
"embed.preview": "Będzie to wyglądać tak:",
"emoji_button.activity": "Aktywność",
@@ -244,6 +266,7 @@
"empty_column.list": "Nie ma nic na tej liście. Kiedy członkowie listy dodadzą nowe wpisy, pojawia się one tutaj.",
"empty_column.lists": "Nie masz żadnych list. Kiedy utworzysz jedną, pojawi się tutaj.",
"empty_column.mutes": "Nie wyciszyłeś(-aś) jeszcze żadnego użytkownika.",
+ "empty_column.notification_requests": "To wszystko – kiedy otrzymasz nowe powiadomienia, pokażą się tutaj zgodnie z twoimi ustawieniami.",
"empty_column.notifications": "Nie masz żadnych powiadomień. Rozpocznij interakcje z innymi użytkownikami.",
"empty_column.public": "Tu nic nie ma! Napisz coś publicznie, lub dodaj ludzi z innych serwerów, aby to wyświetlić",
"error.unexpected_crash.explanation": "W związku z błędem w naszym kodzie lub braku kompatybilności przeglądarki, ta strona nie może być poprawnie wyświetlona.",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "Użyj istniejącej kategorii lub utwórz nową",
"filter_modal.select_filter.title": "Filtruj ten wpis",
"filter_modal.title.status": "Filtruj wpis",
+ "filtered_notifications_banner.mentions": "{count, plural, one {wzmianka} few {wzmianki} other {wzmianek}}",
+ "filtered_notifications_banner.pending_requests": "Powiadomienia od {count, plural, =0 {żadnej osoby którą możesz znać} one {# osoby którą możesz znać} other {# osób które możesz znać}}",
+ "filtered_notifications_banner.title": "Powiadomienia filtrowane",
"firehose.all": "Wszystko",
"firehose.local": "Ten serwer",
"firehose.remote": "Inne serwery",
"follow_request.authorize": "Autoryzuj",
"follow_request.reject": "Odrzuć",
"follow_requests.unlocked_explanation": "Mimo że Twoje konto nie jest zablokowane, zespół {domain} uznał że możesz chcieć ręcznie przejrzeć prośby o możliwość obserwacji.",
+ "follow_suggestions.curated_suggestion": "Wybrane przez personel",
+ "follow_suggestions.dismiss": "Nie pokazuj ponownie",
+ "follow_suggestions.featured_longer": "Wybrane przez zespół {domain}",
+ "follow_suggestions.friends_of_friends_longer": "Popularni wśród ludzi których obserwujesz",
+ "follow_suggestions.hints.featured": "Ten profil został wybrany przez zespół {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "Ten profil jest popularny w gronie użytkowników, których obserwujesz.",
+ "follow_suggestions.hints.most_followed": "Ten profil jest jednym z najczęściej obserwowanych na {domain}.",
+ "follow_suggestions.hints.most_interactions": "Ten profil otrzymuje dużo interakcji na {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Ten profil jest podobny do profili ostatnio przez ciebie zaobserwowanych.",
+ "follow_suggestions.personalized_suggestion": "Sugestia spersonalizowana",
+ "follow_suggestions.popular_suggestion": "Sugestia popularna",
+ "follow_suggestions.popular_suggestion_longer": "Popularni na {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Podobne do ostatnio zaobserwowanych przez ciebie profilów",
+ "follow_suggestions.view_all": "Pokaż wszystkie",
+ "follow_suggestions.who_to_follow": "Kogo obserwować",
"followed_tags": "Obserwowane hasztagi",
"footer.about": "O serwerze",
"footer.directory": "Katalog profilów",
@@ -306,13 +347,8 @@
"hashtag.follow": "Obserwuj hasztag",
"hashtag.unfollow": "Przestań obserwować hashtag",
"hashtags.and_other": "…i {count, plural, other {jeszcze #}}",
- "home.actions.go_to_explore": "Zobacz, co jest teraz popularne",
- "home.actions.go_to_suggestions": "Znajdź ludzi wartych obserwowania",
- "home.column_settings.basic": "Podstawowe",
"home.column_settings.show_reblogs": "Pokazuj podbicia",
"home.column_settings.show_replies": "Pokazuj odpowiedzi",
- "home.explore_prompt.body": "Twój kanał główny będzie zawierał kombinację postów z tagów i osób które obserwujesz oraz wpisów przezeń podbitych. Jeżeli wydaje się to za spokojnym, spróbuj czegoś poniżej.",
- "home.explore_prompt.title": "To twój punkt podparcia w Mastodonie.",
"home.hide_announcements": "Ukryj ogłoszenia",
"home.pending_critical_update.body": "Zaktualizuj serwer jak tylko będzie to możliwe!",
"home.pending_critical_update.link": "Pokaż aktualizacje",
@@ -378,6 +414,7 @@
"limited_account_hint.action": "Pokaż profil mimo to",
"limited_account_hint.title": "Ten profil został ukryty przez moderatorów {domain}.",
"link_preview.author": "{name}",
+ "link_preview.more_from_author": "Więcej od {name}",
"lists.account.add": "Dodaj do listy",
"lists.account.remove": "Usunąć z listy",
"lists.delete": "Usuń listę",
@@ -396,9 +433,15 @@
"loading_indicator.label": "Ładowanie…",
"media_gallery.toggle_visible": "Przełącz widoczność",
"moved_to_account_banner.text": "Twoje konto {disabledAccount} jest obecnie wyłączone, ponieważ zostało przeniesione na {movedToAccount}.",
- "mute_modal.duration": "Czas",
- "mute_modal.hide_notifications": "Chcesz ukryć powiadomienia od tego użytkownika?",
- "mute_modal.indefinite": "Nieokreślony",
+ "mute_modal.hide_from_notifications": "Ukryj z powiadomień",
+ "mute_modal.hide_options": "Ukryj opcje",
+ "mute_modal.indefinite": "Do ręcznego usunięcia wyciszenia",
+ "mute_modal.show_options": "Pokaż opcje",
+ "mute_modal.they_can_mention_and_follow": "Użytkownik może Cię obserwować oraz dodawać wzmianki, ale Ty ich nie zobaczysz.",
+ "mute_modal.they_wont_know": "Użytkownik nie dowie się, że został wyciszony.",
+ "mute_modal.title": "Wyciszyć użytkownika?",
+ "mute_modal.you_wont_see_mentions": "Nie zobaczysz wpisów, które wspominają tego użytkownika.",
+ "mute_modal.you_wont_see_posts": "Użytkownik dalej będzie widzieć Twoje posty, ale Ty nie będziesz widzieć jego.",
"navigation_bar.about": "O serwerze",
"navigation_bar.advanced_interface": "Otwórz w zaawansowanym interfejsie użytkownika",
"navigation_bar.blocks": "Zablokowani użytkownicy",
@@ -408,7 +451,6 @@
"navigation_bar.direct": "Prywatne wzmianki",
"navigation_bar.discover": "Odkrywaj",
"navigation_bar.domain_blocks": "Ukryte domeny",
- "navigation_bar.edit_profile": "Edytuj profil",
"navigation_bar.explore": "Odkrywaj",
"navigation_bar.favourites": "Ulubione",
"navigation_bar.filters": "Wyciszone słowa",
@@ -432,11 +474,28 @@
"notification.follow": "{name} obserwuje Cię",
"notification.follow_request": "{name} chce cię zaobserwować",
"notification.mention": "Wspomniało o Tobie przez {name}",
+ "notification.moderation-warning.learn_more": "Dowiedz się więcej",
+ "notification.moderation_warning": "Otrzymałeś/-łaś ostrzeżenie moderacyjne",
+ "notification.moderation_warning.action_delete_statuses": "Niektóre twoje wpisy zostały usunięte.",
+ "notification.moderation_warning.action_disable": "Twoje konto zostało wyłączone.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Niektóre twoje wpisy zostały oznaczone jako wrażliwe.",
+ "notification.moderation_warning.action_none": "Twoje konto otrzymało ostrzeżenie moderacyjne.",
+ "notification.moderation_warning.action_sensitive": "Twoje wpisy będą od teraz oznaczane jako wrażliwe.",
+ "notification.moderation_warning.action_silence": "Twoje konto zostało ograniczone.",
+ "notification.moderation_warning.action_suspend": "Twoje konto zostało zawieszone.",
"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.relationships_severance_event": "Utracone związki z {name}",
+ "notification.relationships_severance_event.account_suspension": "Administrator z {from} zawiesił {target}, więc nie dostaniesz wieści ani nie wejdziesz w interakcje z użytkownikami z tego serwera.",
+ "notification.relationships_severance_event.domain_block": "Administrator z {from} zablokował {target}, w tym {followersCount} z Twoich obserwujących i {followingCount, plural, one {# konto} other {# konta}} które obserwujesz.",
+ "notification.relationships_severance_event.learn_more": "Dowiedz się więcej",
"notification.status": "{name} opublikował(a) nowy wpis",
"notification.update": "{name} edytował(a) post",
+ "notification_requests.accept": "Akceptuj",
+ "notification_requests.dismiss": "Odrzuć",
+ "notification_requests.notifications_from": "Powiadomienia od {name}",
+ "notification_requests.title": "Powiadomienia filtrowane",
"notifications.clear": "Wyczyść powiadomienia",
"notifications.clear_confirmation": "Czy na pewno chcesz bezpowrotnie usunąć wszystkie powiadomienia?",
"notifications.column_settings.admin.report": "Nowe zgłoszenia:",
@@ -445,7 +504,6 @@
"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.filter_bar.show_bar": "Pokaż filtry",
"notifications.column_settings.follow": "Nowi obserwujący:",
"notifications.column_settings.follow_request": "Nowe prośby o możliwość obserwacji:",
"notifications.column_settings.mention": "Wspomnienia:",
@@ -471,6 +529,15 @@
"notifications.permission_denied": "Powiadomienia na pulpicie nie są dostępne, ponieważ wcześniej nie udzielono uprawnień w przeglądarce",
"notifications.permission_denied_alert": "Powiadomienia na pulpicie nie mogą zostać włączone, ponieważ wcześniej odmówiono uprawnień",
"notifications.permission_required": "Powiadomienia na pulpicie nie są dostępne, ponieważ nie przyznano wymaganego uprawnienia.",
+ "notifications.policy.filter_new_accounts.hint": "Utworzone w ciągu {days, plural, one {ostatniego dnia} other {ostatnich # dni}}",
+ "notifications.policy.filter_new_accounts_title": "Nowe konta",
+ "notifications.policy.filter_not_followers_hint": "Zawierające osoby które obserwują cię krócej niż {days, plural, one {dzień} other {# dni}}",
+ "notifications.policy.filter_not_followers_title": "Ludzie, którzy cię nie obserwują",
+ "notifications.policy.filter_not_following_hint": "Aż ich ręcznie nie zatwierdzisz",
+ "notifications.policy.filter_not_following_title": "Ludzie, których nie obserwujesz",
+ "notifications.policy.filter_private_mentions_hint": "Odfiltrowane, chyba że są odpowiedzią na twoją własną wzmiankę, lub obserwujesz wysyłającego",
+ "notifications.policy.filter_private_mentions_title": "Nieproszone prywatne wzmianki",
+ "notifications.policy.title": "Odfiltruj powiadomienia od…",
"notifications_permission_banner.enable": "Włącz powiadomienia na pulpicie",
"notifications_permission_banner.how_to_control": "Aby otrzymywać powiadomienia, gdy Mastodon nie jest otwarty, włącz powiadomienia pulpitu. Możesz dokładnie kontrolować, októrych działaniach będziesz powiadomienia na pulpicie za pomocą przycisku {icon} powyżej, jeżeli tylko zostaną włączone.",
"notifications_permission_banner.title": "Nie przegap niczego",
@@ -526,12 +593,13 @@
"poll_button.add_poll": "Dodaj głosowanie",
"poll_button.remove_poll": "Usuń głosowanie",
"privacy.change": "Dostosuj widoczność wpisów",
- "privacy.direct.long": "Widoczny tylko dla wspomnianych",
- "privacy.direct.short": "Tylko wspomniane osoby",
- "privacy.private.long": "Widoczny tylko dla osób, które Cię obserwują",
- "privacy.private.short": "Tylko obserwujący",
- "privacy.public.long": "Widoczne dla każdego",
+ "privacy.direct.long": "Wszyscy wspomnieni w tym wpisie",
+ "privacy.direct.short": "Konkretni ludzie",
+ "privacy.private.long": "Tylko ci, którzy cię obserwują",
+ "privacy.private.short": "Obserwujący",
+ "privacy.public.long": "Ktokolwiek na i poza Mastodonem",
"privacy.public.short": "Publiczny",
+ "privacy.unlisted.additional": "Taki sam jak \"Publiczny\", ale wpis nie pojawi się w kanałach na żywo, hasztagach, odkrywaniu, ani w wyszukiwaniu w Mastodonie, nawet jeżeli jest to włączone w ustawieniach konta.",
"privacy.unlisted.long": "Widoczne dla każdego, z wyłączeniem funkcji odkrywania",
"privacy.unlisted.short": "Niewidoczny",
"privacy_policy.last_updated": "Data ostatniej aktualizacji: {date}",
@@ -551,7 +619,9 @@
"relative_time.minutes": "{number} min.",
"relative_time.seconds": "{number} s.",
"relative_time.today": "dzisiaj",
+ "reply_indicator.attachments": "{count, plural, one {# załącznik} few {# załączniki} many {# załączników} other {# załączniku}}",
"reply_indicator.cancel": "Anuluj",
+ "reply_indicator.poll": "Ankieta",
"report.block": "Zablokuj",
"report.block_explanation": "Nie zobaczysz ich wpisów. Nie będą mogli zobaczyć Twoich postów ani cię obserwować. Będą mogli domyślić się, że są zablokowani.",
"report.categories.legal": "Prawne",
@@ -644,10 +714,11 @@
"status.direct": "Prywatna wzmianka @{name}",
"status.direct_indicator": "Prywatna wzmianka",
"status.edit": "Edytuj",
- "status.edited": "Edytowano {date}",
+ "status.edited": "Ostatnio edytowane {date}",
"status.edited_x_times": "Edytowano {count, plural, one {{count} raz} other {{count} razy}}",
"status.embed": "Osadź",
"status.favourite": "Dodaj do ulubionych",
+ "status.favourites": "{count, plural, one {polubienie} few {polubienia} other {polubień}}",
"status.filter": "Filtruj ten wpis",
"status.filtered": "Filtrowany(-a)",
"status.hide": "Ukryj post",
@@ -668,6 +739,7 @@
"status.reblog": "Podbij",
"status.reblog_private": "Podbij dla odbiorców oryginalnego wpisu",
"status.reblogged_by": "Podbite przez {name}",
+ "status.reblogs": "{count, plural, one {podbicie} few {podbicia} other {podbić}}",
"status.reblogs.empty": "Nikt nie podbił jeszcze tego wpisu. Gdy ktoś to zrobi, pojawi się tutaj.",
"status.redraft": "Usuń i przeredaguj",
"status.remove_bookmark": "Usuń zakładkę",
@@ -715,10 +787,8 @@
"upload_error.poll": "Dołączanie plików nie dozwolone z głosowaniami.",
"upload_form.audio_description": "Opisz dla osób niesłyszących i niedosłyszących",
"upload_form.description": "Wprowadź opis dla niewidomych i niedowidzących",
- "upload_form.description_missing": "Nie dodano opisu",
"upload_form.edit": "Edytuj",
"upload_form.thumbnail": "Zmień miniaturę",
- "upload_form.undo": "Usuń",
"upload_form.video_description": "Opisz dla osób niesłyszących, niedosłyszących, niewidomych i niedowidzących",
"upload_modal.analyzing_picture": "Analizowanie obrazu…",
"upload_modal.apply": "Zastosuj",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index b8e18e1229a4b9..3c8f3cf416885d 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -89,7 +89,14 @@
"announcement.announcement": "Comunicados",
"attachments_list.unprocessed": "(não processado)",
"audio.hide": "Ocultar áudio",
- "autosuggest_hashtag.per_week": "{count} por semana",
+ "block_modal.remote_users_caveat": "Pediremos ao servidor {domínio} que respeite sua decisão. No entanto, a conformidade não é garantida pois alguns servidores podem lidar com os blocos de maneira diferente. As postagens públicas ainda podem estar visíveis para usuários não logados.",
+ "block_modal.show_less": "Mostrar menos",
+ "block_modal.show_more": "Mostrar mais",
+ "block_modal.they_cant_mention": "Eles não podem mencionar ou seguir você.",
+ "block_modal.they_cant_see_posts": "Eles não podem ver suas postagens e você não verá as deles.",
+ "block_modal.they_will_know": "Eles podem ver que estão bloqueados.",
+ "block_modal.title": "Bloquear usuário?",
+ "block_modal.you_wont_see_mentions": "Você não verá publicações que os mencionem.",
"boost_modal.combo": "Pressione {combo} para pular isso na próxima vez",
"bundle_column_error.copy_stacktrace": "Copiar relatório do erro",
"bundle_column_error.error.body": "A página solicitada não pôde ser renderizada. Pode ser devido a um erro no nosso código, ou um problema de compatibilidade do seu navegador.",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "Seu perfil não está {locked}. Qualquer um pode te seguir e ver os toots privados.",
"compose_form.lock_disclaimer.lock": "trancado",
"compose_form.placeholder": "No que você está pensando?",
- "compose_form.poll.add_option": "Adicionar opção",
"compose_form.poll.duration": "Duração da enquete",
+ "compose_form.poll.multiple": "Múltipla escolha",
"compose_form.poll.option_placeholder": "Opção {number}",
- "compose_form.poll.remove_option": "Remover opção",
+ "compose_form.poll.single": "Escolha uma",
"compose_form.poll.switch_to_multiple": "Permitir múltiplas escolhas",
"compose_form.poll.switch_to_single": "Opção única",
- "compose_form.publish": "Publicar",
+ "compose_form.poll.type": "Estilo",
+ "compose_form.publish": "Publicação",
"compose_form.publish_form": "Publicar",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Salvar alterações",
- "compose_form.sensitive.hide": "{count, plural, one {Marcar mídia como sensível} other {Marcar mídias como sensível}}",
- "compose_form.sensitive.marked": "{count, plural, one {Mídia marcada como sensível} other {Mídias marcadas como sensível}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Mídia não está marcada como sensível} other {Mídias não estão marcadas como sensível}}",
+ "compose_form.reply": "Resposta",
+ "compose_form.save_changes": "Atualização",
"compose_form.spoiler.marked": "Com Aviso de Conteúdo",
"compose_form.spoiler.unmarked": "Sem Aviso de Conteúdo",
- "compose_form.spoiler_placeholder": "Aviso de Conteúdo aqui",
+ "compose_form.spoiler_placeholder": "Aviso de conteúdo (opcional)",
"confirmation_modal.cancel": "Cancelar",
- "confirmations.block.block_and_report": "Bloquear e denunciar",
"confirmations.block.confirm": "Bloquear",
- "confirmations.block.message": "Você tem certeza de que deseja bloquear {name}?",
"confirmations.cancel_follow_request.confirm": "Cancelar a solicitação",
"confirmations.cancel_follow_request.message": "Tem certeza de que deseja cancelar seu pedido para seguir {name}?",
"confirmations.delete.confirm": "Excluir",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "Você tem certeza de que deseja excluir esta lista?",
"confirmations.discard_edit_media.confirm": "Descartar",
"confirmations.discard_edit_media.message": "Há mudanças não salvas na descrição ou pré-visualização da mídia. Descartar assim mesmo?",
- "confirmations.domain_block.confirm": "Bloquear instância",
+ "confirmations.domain_block.confirm": "Servidor de blocos",
"confirmations.domain_block.message": "Você tem certeza de que deseja bloquear tudo de {domain}? Você não verá mais o conteúdo desta instância em nenhuma linha do tempo pública ou nas suas notificações. Seus seguidores desta instância serão removidos.",
"confirmations.edit.confirm": "Editar",
"confirmations.edit.message": "Editar agora irá substituir a mensagem que está sendo criando. Tem certeza de que deseja continuar?",
"confirmations.logout.confirm": "Sair",
"confirmations.logout.message": "Você tem certeza de que deseja sair?",
"confirmations.mute.confirm": "Silenciar",
- "confirmations.mute.explanation": "Isso ocultará toots do usuário e toots que o mencionam, mas ainda permitirá que ele veja teus toots e te siga.",
- "confirmations.mute.message": "Você tem certeza de que deseja silenciar {name}?",
"confirmations.redraft.confirm": "Excluir e rascunhar",
"confirmations.redraft.message": "Você tem certeza de que quer apagar essa postagem e rascunhá-la? Favoritos e impulsos serão perdidos, e respostas à postagem original ficarão órfãs.",
"confirmations.reply.confirm": "Responder",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "Estas são postagens de toda a rede social que estão ganhando tração hoje. Postagens mais recentes com mais impulsos e favoritos têm classificações mais altas.",
"dismissable_banner.explore_tags": "Estas hashtags estão ganhando popularidade no momento entre as pessoas deste e de outros servidores da rede descentralizada.",
"dismissable_banner.public_timeline": "Estas são as publicações públicas mais recentes de pessoas na rede social que pessoas em {domain} seguem.",
+ "domain_block_modal.block": "Servidor de blocos.",
+ "domain_block_modal.block_account_instead": "Bloco @(nome)",
+ "domain_block_modal.they_can_interact_with_old_posts": "Pessoas deste servidor podem interagir com suas publicações antigas.",
+ "domain_block_modal.they_cant_follow": "Ninguém deste servidor pode lhe seguir.",
+ "domain_block_modal.they_wont_know": "Eles não saberão que foram bloqueados.",
+ "domain_block_modal.title": "Dominio do bloco",
+ "domain_block_modal.you_will_lose_followers": "Todos os seus seguidores deste servidor serão removidos.",
+ "domain_block_modal.you_wont_see_posts": "Você não verá postagens ou notificações de usuários neste servidor.",
+ "domain_pill.activitypub_lets_connect": "Ele permite que você se conecte e interaja com pessoas não apenas no Mastodon, mas também em diferentes aplicativos sociais.",
+ "domain_pill.activitypub_like_language": "ActivityPub é como a linguagem que o Mastodon fala com outras redes sociais.",
+ "domain_pill.server": "Servidor",
+ "domain_pill.their_handle": "Seu identificador:",
+ "domain_pill.their_server": "Sua casa digital, onde ficam todas as suas postagens.",
+ "domain_pill.their_username": "Seu identificador exclusivo em seu servidor. É possível encontrar usuários com o mesmo nome de usuário em servidores diferentes.",
+ "domain_pill.username": "Nome de usuário",
+ "domain_pill.whats_in_a_handle": "O que há em uma alça?",
+ "domain_pill.who_they_are": "Como os identificadores indicam quem alguém é e onde está, você pode interagir com pessoas na web social de .",
+ "domain_pill.who_you_are": "Como seu identificador indica quem você é e onde está, as pessoas podem interagir com você nas redes sociais das .",
+ "domain_pill.your_handle": "Seu identificador:",
+ "domain_pill.your_server": "Sua casa digital, onde ficam todas as suas postagens. Não gosta deste? Transfira servidores a qualquer momento e traga seus seguidores também.",
+ "domain_pill.your_username": "Seu identificador exclusivo neste servidor. É possível encontrar usuários com o mesmo nome de usuário em servidores diferentes.",
"embed.instructions": "Incorpore este toot no seu site ao copiar o código abaixo.",
"embed.preview": "Aqui está como vai ficar:",
"emoji_button.activity": "Atividade",
@@ -244,6 +266,7 @@
"empty_column.list": "Nada aqui. Quando membros da lista tootarem, eles aparecerão aqui.",
"empty_column.lists": "Nada aqui. Quando você criar listas, elas aparecerão aqui.",
"empty_column.mutes": "Nada aqui.",
+ "empty_column.notification_requests": "Tudo limpo! Não há nada aqui. Quando você receber novas notificações, elas aparecerão aqui de acordo com suas configurações.",
"empty_column.notifications": "Interaja com outros usuários para começar a conversar.",
"empty_column.public": "Publique algo ou siga manualmente usuários de outros servidores",
"error.unexpected_crash.explanation": "Esta página não pôde ser mostrada corretamente. Este erro provavelmente é devido a um bug em nosso código ou um problema de compatibilidade de navegador.",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "Use uma categoria existente ou crie uma nova",
"filter_modal.select_filter.title": "Filtrar esta publicação",
"filter_modal.title.status": "Filtrar uma publicação",
+ "filtered_notifications_banner.mentions": "{count, plural, one {menção} other {menções}}",
+ "filtered_notifications_banner.pending_requests": "Notificações de {count, plural, =0 {no one} one {one person} other {# people}} que você talvez conheça",
+ "filtered_notifications_banner.title": "Notificações filtradas",
"firehose.all": "Tudo",
"firehose.local": "Este servidor",
"firehose.remote": "Outros servidores",
"follow_request.authorize": "Aprovar",
"follow_request.reject": "Recusar",
"follow_requests.unlocked_explanation": "Apesar de seu perfil não ser trancado, {domain} exige que você revise a solicitação para te seguir destes perfis manualmente.",
+ "follow_suggestions.curated_suggestion": "Escolha da equipe",
+ "follow_suggestions.dismiss": "Não mostrar novamente",
+ "follow_suggestions.featured_longer": "Escolhido à mão pela equipe de {domain}",
+ "follow_suggestions.friends_of_friends_longer": "Popular entre as pessoas que você segue",
+ "follow_suggestions.hints.featured": "Este perfil foi escolhido a dedo pela equipe {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "Este perfil é popular entre as pessoas que você segue.",
+ "follow_suggestions.hints.most_followed": "Este perfil é um dos mais seguidos em {domain}.",
+ "follow_suggestions.hints.most_interactions": "Este perfil tem recebido recentemente muita atenção em {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Este perfil é semelhante aos perfis que você seguiu recentemente.",
+ "follow_suggestions.personalized_suggestion": "Sugestão personalizada",
+ "follow_suggestions.popular_suggestion": "Sugestão popular",
+ "follow_suggestions.popular_suggestion_longer": "Popular em {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Similar a perfis que você seguiu recentemente",
+ "follow_suggestions.view_all": "Visualizar tudo",
+ "follow_suggestions.who_to_follow": "Quem seguir",
"followed_tags": "Hashtags seguidas",
"footer.about": "Sobre",
"footer.directory": "Diretório de perfis",
@@ -306,13 +347,8 @@
"hashtag.follow": "Seguir hashtag",
"hashtag.unfollow": "Parar de seguir hashtag",
"hashtags.and_other": "…e {count, plural, one {}other {outros #}}",
- "home.actions.go_to_explore": "Veja o que está acontecendo",
- "home.actions.go_to_suggestions": "Encontre pessoas para seguir",
- "home.column_settings.basic": "Básico",
"home.column_settings.show_reblogs": "Mostrar boosts",
"home.column_settings.show_replies": "Mostrar respostas",
- "home.explore_prompt.body": "Seu feed inicial terá uma mistura de publicações das hashtags que você escolheu seguir, das pessoas que você escolheu seguir e das publicações que elas impulsionam. Se está parecendo tranquilo demais, então que tal:",
- "home.explore_prompt.title": "Esta é a sua base principal dentro do Mastodon.",
"home.hide_announcements": "Ocultar comunicados",
"home.pending_critical_update.body": "Por favor, atualize o seu servidor Mastodon o mais rápido possível!",
"home.pending_critical_update.link": "Ver atualizações",
@@ -378,6 +414,7 @@
"limited_account_hint.action": "Exibir perfil mesmo assim",
"limited_account_hint.title": "Este perfil foi ocultado pelos moderadores do {domain}.",
"link_preview.author": "Por {name}",
+ "link_preview.more_from_author": "Mais de {name}",
"lists.account.add": "Adicionar à lista",
"lists.account.remove": "Remover da lista",
"lists.delete": "Excluir lista",
@@ -396,9 +433,15 @@
"loading_indicator.label": "Carregando…",
"media_gallery.toggle_visible": "{number, plural, one {Ocultar mídia} other {Ocultar mídias}}",
"moved_to_account_banner.text": "Sua conta {disabledAccount} está desativada porque você a moveu para {movedToAccount}.",
- "mute_modal.duration": "Duração",
- "mute_modal.hide_notifications": "Ocultar notificações deste usuário?",
- "mute_modal.indefinite": "Indefinido",
+ "mute_modal.hide_from_notifications": "Ocultar das notificações",
+ "mute_modal.hide_options": "Ocultar opções",
+ "mute_modal.indefinite": "Até que eu os ative",
+ "mute_modal.show_options": "Mostrar opções",
+ "mute_modal.they_can_mention_and_follow": "Eles podem mencionar e seguir você, mas você não os verá.",
+ "mute_modal.they_wont_know": "Eles não saberão que foram silenciados.",
+ "mute_modal.title": "Silenciar usuário?",
+ "mute_modal.you_wont_see_mentions": "Você não verá publicações que os mencionem.",
+ "mute_modal.you_wont_see_posts": "Eles ainda poderão ver suas publicações, mas você não verá as deles.",
"navigation_bar.about": "Sobre",
"navigation_bar.advanced_interface": "Ativar na interface web avançada",
"navigation_bar.blocks": "Usuários bloqueados",
@@ -408,7 +451,6 @@
"navigation_bar.direct": "Menções privadas",
"navigation_bar.discover": "Descobrir",
"navigation_bar.domain_blocks": "Domínios bloqueados",
- "navigation_bar.edit_profile": "Editar perfil",
"navigation_bar.explore": "Explorar",
"navigation_bar.favourites": "Favoritos",
"navigation_bar.filters": "Palavras filtradas",
@@ -432,20 +474,37 @@
"notification.follow": "{name} te seguiu",
"notification.follow_request": "{name} quer te seguir",
"notification.mention": "{name} te mencionou",
+ "notification.moderation-warning.learn_more": "Aprender mais",
+ "notification.moderation_warning": "Você recebeu um aviso de moderação",
+ "notification.moderation_warning.action_delete_statuses": "Algumas das suas publicações foram removidas.",
+ "notification.moderation_warning.action_disable": "Sua conta foi desativada.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Algumas de suas publicações foram marcadas por ter conteúdo sensível.",
+ "notification.moderation_warning.action_none": "Sua conta recebeu um aviso de moderação.",
+ "notification.moderation_warning.action_sensitive": "Suas publicações serão marcadas como sensíveis a partir de agora.",
+ "notification.moderation_warning.action_silence": "Sua conta foi limitada.",
+ "notification.moderation_warning.action_suspend": "Sua conta foi suspensa.",
"notification.own_poll": "Sua enquete terminou",
"notification.poll": "Uma enquete que você votou terminou",
"notification.reblog": "{name} deu boost no teu toot",
+ "notification.relationships_severance_event": "Conexões perdidas com {name}",
+ "notification.relationships_severance_event.account_suspension": "Um administrador de {from} suspendeu {target}, o que significa que você não pode mais receber atualizações deles ou interagir com eles.",
+ "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": "Saber mais",
+ "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} acabou de tootar",
"notification.update": "{name} editou uma publicação",
+ "notification_requests.accept": "Aceitar",
+ "notification_requests.dismiss": "Rejeitar",
+ "notification_requests.notifications_from": "Notificações de {name}",
+ "notification_requests.title": "Notificações filtradas",
"notifications.clear": "Limpar notificações",
"notifications.clear_confirmation": "Você tem certeza de que deseja limpar todas as suas notificações?",
"notifications.column_settings.admin.report": "Novas denúncias:",
"notifications.column_settings.admin.sign_up": "Novas inscrições:",
"notifications.column_settings.alert": "Notificações no computador",
"notifications.column_settings.favourite": "Favoritos:",
- "notifications.column_settings.filter_bar.advanced": "Mostrar todas as categorias",
- "notifications.column_settings.filter_bar.category": "Barra de filtro rápido das notificações",
- "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtro",
+ "notifications.column_settings.filter_bar.advanced": "Exibir todas as categorias",
+ "notifications.column_settings.filter_bar.category": "Barra de filtro rápido",
"notifications.column_settings.follow": "Seguidores:",
"notifications.column_settings.follow_request": "Seguidores pendentes:",
"notifications.column_settings.mention": "Menções:",
@@ -471,6 +530,15 @@
"notifications.permission_denied": "Navegador não tem permissão para ativar notificações no computador.",
"notifications.permission_denied_alert": "Verifique a permissão do navegador para ativar notificações no computador.",
"notifications.permission_required": "Ativar notificações no computador exige permissão do navegador.",
+ "notifications.policy.filter_new_accounts.hint": "Created within the past {days, plural, one {one day} other {# days}}",
+ "notifications.policy.filter_new_accounts_title": "Novas contas",
+ "notifications.policy.filter_not_followers_hint": "Including people who have been following you fewer than {days, plural, one {one day} other {# days}}",
+ "notifications.policy.filter_not_followers_title": "Pessoas que não estão te seguindo",
+ "notifications.policy.filter_not_following_hint": "Até que você os aprove manualmente",
+ "notifications.policy.filter_not_following_title": "Pessoas que você não segue",
+ "notifications.policy.filter_private_mentions_hint": "Filtrado, a menos que respondido em sua própria menção ou se você segue o remetente",
+ "notifications.policy.filter_private_mentions_title": "Menções privadas não solicitadas",
+ "notifications.policy.title": "Filtrar notificações de…",
"notifications_permission_banner.enable": "Ativar notificações no computador",
"notifications_permission_banner.how_to_control": "Para receber notificações quando o Mastodon não estiver aberto, ative as notificações no computador. Você pode controlar precisamente quais tipos de interações geram notificações no computador através do botão {icon}.",
"notifications_permission_banner.title": "Nunca perca nada",
@@ -526,14 +594,15 @@
"poll_button.add_poll": "Adicionar enquete",
"poll_button.remove_poll": "Remover enquete",
"privacy.change": "Alterar privacidade do toot",
- "privacy.direct.long": "Postar só para usuários mencionados",
- "privacy.direct.short": "Apenas pessoas mencionadas",
- "privacy.private.long": "Postar só para seguidores",
- "privacy.private.short": "Apenas seguidores",
- "privacy.public.long": "Visível para todos",
+ "privacy.direct.long": "Todos mencionados na publicação",
+ "privacy.direct.short": "Pessoas específicas",
+ "privacy.private.long": "Apenas seus seguidores",
+ "privacy.private.short": "Seguidores",
+ "privacy.public.long": "Qualquer um dentro ou fora do Mastodon",
"privacy.public.short": "Público",
- "privacy.unlisted.long": "Visível para todos, mas desativou os recursos de descoberta",
- "privacy.unlisted.short": "Não-listado",
+ "privacy.unlisted.additional": "Isso se comporta exatamente como público, exceto que a publicação não aparecerá nos _feeds ao vivo_ ou nas _hashtags_, explorar, ou barra de busca, mesmo que você seja escolhido em toda a conta.",
+ "privacy.unlisted.long": "Menos notificações e recomendações do algoritmo",
+ "privacy.unlisted.short": "Público (silencioso)",
"privacy_policy.last_updated": "Atualizado {date}",
"privacy_policy.title": "Política de privacidade",
"recommended": "Recomendado",
@@ -551,7 +620,9 @@
"relative_time.minutes": "{number}m",
"relative_time.seconds": "{number}s",
"relative_time.today": "hoje",
+ "reply_indicator.attachments": "{count, plural, one {# attachment} other {# attachments}}",
"reply_indicator.cancel": "Cancelar",
+ "reply_indicator.poll": "Enquete",
"report.block": "Bloquear",
"report.block_explanation": "Você não verá suas publicações. Ele não poderá ver suas publicações ou segui-lo, e será capaz de perceber que está bloqueado.",
"report.categories.legal": "Jurídico",
@@ -644,10 +715,11 @@
"status.direct": "Mencione em privado @{name}",
"status.direct_indicator": "Menção privada",
"status.edit": "Editar",
- "status.edited": "Editado em {date}",
+ "status.edited": "Última edição em {date}",
"status.edited_x_times": "Editado {count, plural, one {{count} hora} other {{count} vezes}}",
"status.embed": "Incorporar",
"status.favourite": "Favorita",
+ "status.favourites": "{count, plural, one {favorite} other {favorites}}",
"status.filter": "Filtrar esta publicação",
"status.filtered": "Filtrado",
"status.hide": "Ocultar publicação",
@@ -668,6 +740,7 @@
"status.reblog": "Dar boost",
"status.reblog_private": "Dar boost para o mesmo público",
"status.reblogged_by": "{name} deu boost",
+ "status.reblogs": "{count, plural, one {boost} other {boosts}}",
"status.reblogs.empty": "Nada aqui. Quando alguém der boost, o usuário aparecerá aqui.",
"status.redraft": "Excluir e rascunhar",
"status.remove_bookmark": "Remover do Salvos",
@@ -715,10 +788,8 @@
"upload_error.poll": "Mídias não podem ser anexadas em toots com enquetes.",
"upload_form.audio_description": "Descrever para deficientes auditivos",
"upload_form.description": "Descrever para deficientes visuais",
- "upload_form.description_missing": "Sem descrição",
"upload_form.edit": "Editar",
"upload_form.thumbnail": "Alterar miniatura",
- "upload_form.undo": "Excluir",
"upload_form.video_description": "Descrever para deficientes auditivos ou visuais",
"upload_modal.analyzing_picture": "Analisando imagem…",
"upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index a6d0ffee9a5334..c389d4f4fcf6e4 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -89,7 +89,14 @@
"announcement.announcement": "Anúncio",
"attachments_list.unprocessed": "(não processado)",
"audio.hide": "Ocultar áudio",
- "autosuggest_hashtag.per_week": "{count} por semana",
+ "block_modal.remote_users_caveat": "Vamos pedir ao servidor {domain} para respeitar a sua decisão. No entanto, não é garantido o seu cumprimento, uma vez que alguns servidores podem tratar os bloqueios de forma diferente. As mensagens públicas podem continuar a ser visíveis para utilizadores não autenticados.",
+ "block_modal.show_less": "Mostrar menos",
+ "block_modal.show_more": "Mostrar mais",
+ "block_modal.they_cant_mention": "Eles não o podem mencionar ou seguir.",
+ "block_modal.they_cant_see_posts": "Eles não podem ver as suas publicações e você não verá as deles.",
+ "block_modal.they_will_know": "Eles podem ver que estão bloqueados.",
+ "block_modal.title": "Bloquear utilizador?",
+ "block_modal.you_wont_see_mentions": "Não verá publicações que os mencionem.",
"boost_modal.combo": "Pode clicar {combo} para não voltar a ver",
"bundle_column_error.copy_stacktrace": "Copiar relatório de erros",
"bundle_column_error.error.body": "A página solicitada não pôde ser sintetizada. Isto pode ser devido a uma falha no nosso código ou a um problema de compatibilidade com o navegador.",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "A sua conta não é {locked}. Qualquer pessoa pode segui-lo e ver as publicações direcionadas apenas a seguidores.",
"compose_form.lock_disclaimer.lock": "fechada",
"compose_form.placeholder": "Em que está a pensar?",
- "compose_form.poll.add_option": "Adicionar uma opção",
"compose_form.poll.duration": "Duração do inquérito",
+ "compose_form.poll.multiple": "Escolha múltipla",
"compose_form.poll.option_placeholder": "Opção {number}",
- "compose_form.poll.remove_option": "Eliminar esta opção",
+ "compose_form.poll.single": "Escolha uma",
"compose_form.poll.switch_to_multiple": "Alterar o inquérito para permitir várias respostas",
"compose_form.poll.switch_to_single": "Alterar o inquérito para permitir uma única resposta",
+ "compose_form.poll.type": "Estilo",
"compose_form.publish": "Publicar",
"compose_form.publish_form": "Publicar",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Guardar alterações",
- "compose_form.sensitive.hide": "Marcar media como sensível",
- "compose_form.sensitive.marked": "Media marcada como sensível",
- "compose_form.sensitive.unmarked": "Media não está marcada como sensível",
+ "compose_form.reply": "Responder",
+ "compose_form.save_changes": "Atualizar",
"compose_form.spoiler.marked": "Texto escondido atrás de aviso",
"compose_form.spoiler.unmarked": "Juntar um aviso de conteúdo",
- "compose_form.spoiler_placeholder": "Escreva o seu aviso aqui",
+ "compose_form.spoiler_placeholder": "Aviso de conteúdo (opcional)",
"confirmation_modal.cancel": "Cancelar",
- "confirmations.block.block_and_report": "Bloquear e Denunciar",
"confirmations.block.confirm": "Bloquear",
- "confirmations.block.message": "De certeza que queres bloquear {name}?",
"confirmations.cancel_follow_request.confirm": "Retirar pedido",
"confirmations.cancel_follow_request.message": "Tem a certeza que pretende retirar o pedido para seguir {name}?",
"confirmations.delete.confirm": "Eliminar",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "Tens a certeza de que deseja eliminar permanentemente esta lista?",
"confirmations.discard_edit_media.confirm": "Descartar",
"confirmations.discard_edit_media.message": "Tem alterações por guardar na descrição ou pré-visualização do conteúdo. Descartar mesmo assim?",
- "confirmations.domain_block.confirm": "Esconder tudo deste domínio",
+ "confirmations.domain_block.confirm": "Bloquear servidor",
"confirmations.domain_block.message": "De certeza que queres bloquear completamente o domínio {domain}? Na maioria dos casos, silenciar ou bloquear alguns utilizadores é suficiente e é o recomendado. Não irás ver conteúdo daquele domínio em cronologia alguma nem nas tuas notificações. Os teus seguidores daquele domínio serão removidos.",
"confirmations.edit.confirm": "Editar",
"confirmations.edit.message": "Editar agora irá sobrescrever a mensagem que está a compor. Tem a certeza de que deseja continuar?",
"confirmations.logout.confirm": "Terminar sessão",
"confirmations.logout.message": "Tem a certeza de que quer terminar a sessão?",
"confirmations.mute.confirm": "Silenciar",
- "confirmations.mute.explanation": "Isto irá esconder publicações deles ou publicações que os mencionem, mas irá permitir que vejam as suas publicações e sejam seus seguidores.",
- "confirmations.mute.message": "De certeza que queres silenciar {name}?",
"confirmations.redraft.confirm": "Eliminar & reescrever",
"confirmations.redraft.message": "Tem a certeza de que quer eliminar e reescrever esta publicação? Os favoritos e partilhas perder-se-ão e as respostas à publicação original ficarão órfãs.",
"confirmations.reply.confirm": "Responder",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "Estas são publicações de toda a rede social que estão a ganhar popularidade atualmente. As mensagens mais recentes com mais partilhas e favoritos obtêm uma classificação mais elevada.",
"dismissable_banner.explore_tags": "Estas #etiquetas estão presentemente a ganhar atenção entre as pessoas neste e noutros servidores da rede descentralizada.",
"dismissable_banner.public_timeline": "Estas são as publicações públicas mais recentes de pessoas na rede social que as pessoas em {domain} seguem.",
+ "domain_block_modal.block": "Bloquear servidor",
+ "domain_block_modal.block_account_instead": "Bloquear @{name} em alternativa",
+ "domain_block_modal.they_can_interact_with_old_posts": "As pessoas deste servidor podem interagir com as suas publicações antigas.",
+ "domain_block_modal.they_cant_follow": "Ninguém deste servidor pode segui-lo.",
+ "domain_block_modal.they_wont_know": "Eles não saberão que foram bloqueados.",
+ "domain_block_modal.title": "Bloquear domínio?",
+ "domain_block_modal.you_will_lose_followers": "Todos os seus seguidores deste servidor serão removidos.",
+ "domain_block_modal.you_wont_see_posts": "Não verá publicações ou notificações de utilizadores neste servidor.",
+ "domain_pill.activitypub_lets_connect": "Permite-lhe conectar e interagir com pessoas não só no Mastodon, mas também em diferentes aplicações sociais.",
+ "domain_pill.activitypub_like_language": "O ActivityPub é como a linguagem que o Mastodon fala com outras redes sociais.",
+ "domain_pill.server": "Servidor",
+ "domain_pill.their_handle": "O seu identificador:",
+ "domain_pill.their_server": "A sua casa digital, onde se encontram todas as suas publicações.",
+ "domain_pill.their_username": "O seu identificador único no seu servidor. É possível encontrar utilizadores com o mesmo nome de utilizador em diferentes servidores.",
+ "domain_pill.username": "Nome de utilizador",
+ "domain_pill.whats_in_a_handle": "Em que consiste um identificador?",
+ "domain_pill.who_they_are": "Uma vez que os identificadores dizem quem é alguém e onde está, pode interagir com as pessoas através da rede social de .",
+ "domain_pill.who_you_are": "Uma vez que o seu identificador indica quem é e onde está, as pessoas podem interagir consigo através da rede social de .",
+ "domain_pill.your_handle": "O seu identificador:",
+ "domain_pill.your_server": "A sua casa digital, onde se encontram todas as suas publicações. Não gosta deste? Mude de servidor a qualquer momento e leve também os seus seguidores.",
+ "domain_pill.your_username": "O seu identificador único neste servidor. É possível encontrar utilizadores com o mesmo nome de utilizador em diferentes servidores.",
"embed.instructions": "Incorpore esta publicação no seu site copiando o código abaixo.",
"embed.preview": "Podes ver aqui como irá ficar:",
"emoji_button.activity": "Actividade",
@@ -244,6 +266,7 @@
"empty_column.list": "Ainda não existem publicações nesta lista. Quando membros desta lista fizerem novas publicações, elas aparecerão aqui.",
"empty_column.lists": "Ainda não tem qualquer lista. Quando criar uma, ela irá aparecer aqui.",
"empty_column.mutes": "Ainda não silenciaste qualquer utilizador.",
+ "empty_column.notification_requests": "Tudo limpo! Não há nada aqui. Quando você receber novas notificações, elas aparecerão aqui conforme as suas configurações.",
"empty_column.notifications": "Não tens notificações. Interage com outros utilizadores para iniciar uma conversa.",
"empty_column.public": "Não há nada aqui! Escreve algo publicamente ou segue outros utilizadores para veres aqui os conteúdos públicos",
"error.unexpected_crash.explanation": "Devido a um erro no nosso código ou a uma compatilidade com o seu navegador, esta página não pôde ser apresentada correctamente.",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "Utilize uma categoria existente ou crie uma nova",
"filter_modal.select_filter.title": "Filtrar esta publicação",
"filter_modal.title.status": "Filtrar uma publicação",
+ "filtered_notifications_banner.mentions": "{count, plural, one {menção} other {menções}}",
+ "filtered_notifications_banner.pending_requests": "Notificações de {count, plural, =0 {ninguém} one {uma pessoa} other {# pessoas}} que talvez conheça",
+ "filtered_notifications_banner.title": "Notificações filtradas",
"firehose.all": "Todas",
"firehose.local": "Este servidor",
"firehose.remote": "Outros servidores",
"follow_request.authorize": "Autorizar",
"follow_request.reject": "Rejeitar",
"follow_requests.unlocked_explanation": "Apesar de a sua não ser privada, a administração de {domain} pensa que poderá querer rever manualmente os pedidos de seguimento dessas contas.",
+ "follow_suggestions.curated_suggestion": "Escolha da equipe",
+ "follow_suggestions.dismiss": "Não mostrar novamente",
+ "follow_suggestions.featured_longer": "Escolhido a dedo pela equipa de {domain}",
+ "follow_suggestions.friends_of_friends_longer": "Popular entre as pessoas que segue",
+ "follow_suggestions.hints.featured": "Este perfil foi escolhido a dedo pela equipe {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "Este perfil é popular entre as pessoas que você segue.",
+ "follow_suggestions.hints.most_followed": "Este perfil é um dos mais seguidos no {domain}.",
+ "follow_suggestions.hints.most_interactions": "Este perfil tem recebido recentemente muita atenção no {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Este perfil é semelhante aos perfis que você seguiu mais recentemente.",
+ "follow_suggestions.personalized_suggestion": "Sugestão personalizada",
+ "follow_suggestions.popular_suggestion": "Sugestão popular",
+ "follow_suggestions.popular_suggestion_longer": "Popular em {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Semelhantes aos perfis que seguiu recentemente",
+ "follow_suggestions.view_all": "Ver tudo",
+ "follow_suggestions.who_to_follow": "Quem seguir",
"followed_tags": "Hashtags seguidas",
"footer.about": "Sobre",
"footer.directory": "Diretório de perfis",
@@ -306,13 +347,8 @@
"hashtag.follow": "Seguir #etiqueta",
"hashtag.unfollow": "Deixar de seguir #etiqueta",
"hashtags.and_other": "…e {count, plural, other {mais #}}",
- "home.actions.go_to_explore": "Veja as tendências atuais",
- "home.actions.go_to_suggestions": "Encontrar pessoas para seguir",
- "home.column_settings.basic": "Básico",
"home.column_settings.show_reblogs": "Mostrar impulsos",
"home.column_settings.show_replies": "Mostrar respostas",
- "home.explore_prompt.body": "A sua página inicial terá uma mistura de publicações com as hashtags que escolheu seguir, das pessoas que escolheu seguir e as publicações que elas partilham. Parece bastante sossegado por agora, talvez queira:",
- "home.explore_prompt.title": "Esta é a sua base principal dentro do Mastodon.",
"home.hide_announcements": "Ocultar comunicações",
"home.pending_critical_update.body": "Por favor, atualize o seu servidor Mastodon assim que possível!",
"home.pending_critical_update.link": "Ver atualizações",
@@ -378,6 +414,7 @@
"limited_account_hint.action": "Exibir perfil mesmo assim",
"limited_account_hint.title": "Este perfil foi ocultado pelos moderadores de {domain}.",
"link_preview.author": "Por {name}",
+ "link_preview.more_from_author": "Mais de {name}",
"lists.account.add": "Adicionar à lista",
"lists.account.remove": "Remover da lista",
"lists.delete": "Eliminar lista",
@@ -396,9 +433,15 @@
"loading_indicator.label": "A carregar…",
"media_gallery.toggle_visible": "Alternar visibilidade",
"moved_to_account_banner.text": "A sua conta {disabledAccount} está, no momento, desativada, porque você migrou para {movedToAccount}.",
- "mute_modal.duration": "Duração",
- "mute_modal.hide_notifications": "Esconder notificações deste utilizador?",
- "mute_modal.indefinite": "Indefinidamente",
+ "mute_modal.hide_from_notifications": "Ocultar das notificações",
+ "mute_modal.hide_options": "Ocultar opções",
+ "mute_modal.indefinite": "Até que eu os tire do silêncio",
+ "mute_modal.show_options": "Mostrar opções",
+ "mute_modal.they_can_mention_and_follow": "Eles podem mencioná-lo e segui-lo, mas você não os verá.",
+ "mute_modal.they_wont_know": "Eles não saberão que foram silenciados.",
+ "mute_modal.title": "Silenciar utilizador?",
+ "mute_modal.you_wont_see_mentions": "Não verá publicações que os mencionem.",
+ "mute_modal.you_wont_see_posts": "Eles podem continuar a ver as suas publicações, mas você não verá as deles.",
"navigation_bar.about": "Sobre",
"navigation_bar.advanced_interface": "Abrir na interface web avançada",
"navigation_bar.blocks": "Utilizadores bloqueados",
@@ -408,7 +451,6 @@
"navigation_bar.direct": "Menções privadas",
"navigation_bar.discover": "Descobrir",
"navigation_bar.domain_blocks": "Domínios escondidos",
- "navigation_bar.edit_profile": "Editar perfil",
"navigation_bar.explore": "Explorar",
"navigation_bar.favourites": "Favoritos",
"navigation_bar.filters": "Palavras silenciadas",
@@ -432,11 +474,29 @@
"notification.follow": "{name} começou a seguir-te",
"notification.follow_request": "{name} pediu para segui-lo",
"notification.mention": "{name} mencionou-te",
+ "notification.moderation-warning.learn_more": "Saber mais",
+ "notification.moderation_warning": "Recebeu um aviso de moderação",
+ "notification.moderation_warning.action_delete_statuses": "Algumas das suas publicações foram removidas.",
+ "notification.moderation_warning.action_disable": "A sua conta foi desativada.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Algumas das suas publicações foram assinaladas como sensíveis.",
+ "notification.moderation_warning.action_none": "A sua conta recebeu um aviso de moderação.",
+ "notification.moderation_warning.action_sensitive": "As suas publicações serão, a partir de agora, assinaladas como sensíveis.",
+ "notification.moderation_warning.action_silence": "A sua conta foi limitada.",
+ "notification.moderation_warning.action_suspend": "A sua conta foi suspensa.",
"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.relationships_severance_event": "Perdeu as ligações com {name}",
+ "notification.relationships_severance_event.account_suspension": "Um administrador de {from} suspendeu {target}, o que significa que já não pode receber atualizações dele ou interagir com ele.",
+ "notification.relationships_severance_event.domain_block": "Um administrador de {from} bloqueou {target}, incluindo {followersCount} dos seus seguidores e {followingCount, plural, one {# conta} other {# contas}} que segue.",
+ "notification.relationships_severance_event.learn_more": "Saber mais",
+ "notification.relationships_severance_event.user_domain_block": "Bloqueou {target}, removendo {followersCount} dos seus seguidores e {followingCount, plural, one {# conta} other {# contas}} que segue.",
"notification.status": "{name} acabou de publicar",
"notification.update": "{name} editou uma publicação",
+ "notification_requests.accept": "Aceitar",
+ "notification_requests.dismiss": "Descartar",
+ "notification_requests.notifications_from": "Notificações de {name}",
+ "notification_requests.title": "Notificações filtradas",
"notifications.clear": "Limpar notificações",
"notifications.clear_confirmation": "Queres mesmo limpar todas as notificações?",
"notifications.column_settings.admin.report": "Novas denúncias:",
@@ -445,7 +505,6 @@
"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.filter_bar.show_bar": "Mostrar barra de filtros",
"notifications.column_settings.follow": "Novos seguidores:",
"notifications.column_settings.follow_request": "Novos pedidos de seguidor:",
"notifications.column_settings.mention": "Menções:",
@@ -471,6 +530,15 @@
"notifications.permission_denied": "Notificações no ambiente de trabalho não estão disponíveis porque a permissão, solicitada pelo navegador, foi recusada anteriormente",
"notifications.permission_denied_alert": "Notificações no ambiente de trabalho não podem ser ativadas, pois a permissão do navegador foi recusada anteriormente",
"notifications.permission_required": "Notificações no ambiente de trabalho não estão disponíveis porque a permissão necessária não foi concedida.",
+ "notifications.policy.filter_new_accounts.hint": "Criada nos últimos {days, plural, one {um dia} other {# dias}}",
+ "notifications.policy.filter_new_accounts_title": "Novas contas",
+ "notifications.policy.filter_not_followers_hint": "Incluindo pessoas que o seguem há menos de {days, plural, one {um dia} other {# dias}}",
+ "notifications.policy.filter_not_followers_title": "Pessoas não te seguem",
+ "notifications.policy.filter_not_following_hint": "Até que você os aprove manualmente",
+ "notifications.policy.filter_not_following_title": "Pessoas que você não segue",
+ "notifications.policy.filter_private_mentions_hint": "Filtrado, a menos que seja em resposta à sua própria menção ou se você seguir o remetente",
+ "notifications.policy.filter_private_mentions_title": "Menções privadas não solicitadas",
+ "notifications.policy.title": "Filtrar notificações de…",
"notifications_permission_banner.enable": "Ativar notificações no ambiente de trabalho",
"notifications_permission_banner.how_to_control": "Para receber notificações quando o Mastodon não estiver aberto, ative as notificações no ambiente de trabalho. Depois da sua ativação, pode controlar precisamente quais tipos de interações geram notificações, através do botão {icon} acima.",
"notifications_permission_banner.title": "Nunca perca nada",
@@ -526,14 +594,15 @@
"poll_button.add_poll": "Adicionar votação",
"poll_button.remove_poll": "Remover sondagem",
"privacy.change": "Ajustar a privacidade da publicação",
- "privacy.direct.long": "Apenas para utilizadores mencionados",
- "privacy.direct.short": "Apenas pessoas mencionadas",
- "privacy.private.long": "Apenas para os seguidores",
- "privacy.private.short": "Apenas seguidores",
- "privacy.public.long": "Visível para todos",
+ "privacy.direct.long": "Todos os mencionados na publicação",
+ "privacy.direct.short": "Pessoas específicas",
+ "privacy.private.long": "Apenas os seus seguidores",
+ "privacy.private.short": "Seguidores",
+ "privacy.public.long": "Qualquer pessoa no Mastodon ou não",
"privacy.public.short": "Público",
- "privacy.unlisted.long": "Visível para todos, mas não incluir em funcionalidades de divulgação",
- "privacy.unlisted.short": "Não listar",
+ "privacy.unlisted.additional": "Isto comporta-se exatamente como público, exceto que a publicação não aparecerá em feeds nem em etiquetas, explorar ou pesquisa Mastodon, mesmo que tenha optado por isso na sua conta.",
+ "privacy.unlisted.long": "Menos fanfarras algorítmicas",
+ "privacy.unlisted.short": "Público silencioso",
"privacy_policy.last_updated": "Última atualização em {date}",
"privacy_policy.title": "Política de privacidade",
"recommended": "Recomendado",
@@ -551,7 +620,9 @@
"relative_time.minutes": "{number}m",
"relative_time.seconds": "{number}s",
"relative_time.today": "hoje",
+ "reply_indicator.attachments": "{count, plural, one {# anexo} other {# anexos}}",
"reply_indicator.cancel": "Cancelar",
+ "reply_indicator.poll": "Sondagem",
"report.block": "Bloquear",
"report.block_explanation": "Não verá as publicações deles. Eles não serão capazes de ver suas publicações ou de o seguir. Eles vão conseguir saber que estão bloqueados.",
"report.categories.legal": "Legal",
@@ -644,10 +715,11 @@
"status.direct": "Mencionar @{name} em privado",
"status.direct_indicator": "Menção privada",
"status.edit": "Editar",
- "status.edited": "Editado em {date}",
+ "status.edited": "Última edição em {date}",
"status.edited_x_times": "Editado {count, plural,one {{count} vez} other {{count} vezes}}",
"status.embed": "Embutir",
"status.favourite": "Assinalar como favorito",
+ "status.favourites": "{count, plural, one {favorito} other {favoritos}}",
"status.filter": "Filtrar esta publicação",
"status.filtered": "Filtrada",
"status.hide": "Ocultar publicação",
@@ -668,6 +740,7 @@
"status.reblog": "Partilhar",
"status.reblog_private": "Partilhar com a visibilidade original",
"status.reblogged_by": "{name} reforçou",
+ "status.reblogs": "{count, plural, one {partilha} other {partilhas}}",
"status.reblogs.empty": "Ainda ninguém reforçou esta publicação. Quando alguém o fizer, ele irá aparecer aqui.",
"status.redraft": "Apagar & reescrever",
"status.remove_bookmark": "Retirar dos marcadores",
@@ -715,10 +788,8 @@
"upload_error.poll": "O carregamento de ficheiros não é permitido em sondagens.",
"upload_form.audio_description": "Descreva para pessoas com diminuição da acuidade auditiva",
"upload_form.description": "Descreva para pessoas com diminuição da acuidade visual",
- "upload_form.description_missing": "Nenhuma descrição adicionada",
"upload_form.edit": "Editar",
"upload_form.thumbnail": "Alterar miniatura",
- "upload_form.undo": "Eliminar",
"upload_form.video_description": "Descreva para pessoas com diminuição da acuidade auditiva ou visual",
"upload_modal.analyzing_picture": "A analizar imagem…",
"upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index 88dbfa4b8ec6ed..0aef0ebd9617ee 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -21,6 +21,8 @@
"account.blocked": "Blocat",
"account.browse_more_on_origin_server": "Vezi mai multe pe profilul original",
"account.cancel_follow_request": "Retrage cererea de urmărire",
+ "account.copy": "Copiază link-ul profilului",
+ "account.direct": "Menționează pe @{name} în privat",
"account.disable_notifications": "Nu îmi mai trimite notificări când postează @{name}",
"account.domain_blocked": "Domeniu blocat",
"account.edit_profile": "Modifică profilul",
@@ -30,6 +32,7 @@
"account.featured_tags.last_status_never": "Fără postări",
"account.featured_tags.title": "Haștagurile recomandate de {name}",
"account.follow": "Abonează-te",
+ "account.follow_back": "Urmăreşte înapoi",
"account.followers": "Urmăritori",
"account.followers.empty": "Acest utilizator nu are încă urmăritori.",
"account.followers_counter": "{count, plural, one {Un abonat} few {{counter} abonați} other {{counter} de abonați}}",
@@ -38,6 +41,7 @@
"account.follows.empty": "Momentan acest utilizator nu are niciun abonament.",
"account.go_to_profile": "Mergi la profil",
"account.hide_reblogs": "Ascunde distribuirile de la @{name}",
+ "account.in_memoriam": "În Memoriam.",
"account.joined_short": "Înscris",
"account.languages": "Schimbă limbile abonate",
"account.link_verified_on": "Proprietatea acestui link a fost verificată pe {date}",
@@ -46,7 +50,10 @@
"account.mention": "Menționează pe @{name}",
"account.moved_to": "{name} a indicat că noul său cont este acum:",
"account.mute": "Pune pe @{name} pe silențios",
+ "account.mute_notifications_short": "Amuțește notificările",
+ "account.mute_short": "Ignoră",
"account.muted": "Pus pe silențios",
+ "account.no_bio": "Nicio descriere furnizată.",
"account.open_original_page": "Deschide pagina originală",
"account.posts": "Postări",
"account.posts_with_replies": "Postări și răspunsuri",
@@ -69,6 +76,7 @@
"admin.dashboard.retention.average": "În medie",
"admin.dashboard.retention.cohort": "Înregistrări lunar",
"admin.dashboard.retention.cohort_size": "Utilizatori noi",
+ "admin.impact_report.title": "Rezumatul impactului",
"alert.rate_limited.message": "Vă rugăm să reîncercați după {retry_time, time, medium}.",
"alert.rate_limited.title": "Debit limitat",
"alert.unexpected.message": "A apărut o eroare neașteptată.",
@@ -76,7 +84,6 @@
"announcement.announcement": "Anunț",
"attachments_list.unprocessed": "(neprocesate)",
"audio.hide": "Ascunde audio",
- "autosuggest_hashtag.per_week": "{count} pe săptămână",
"boost_modal.combo": "Poți apăsa {combo} pentru a sări peste asta data viitoare",
"bundle_column_error.copy_stacktrace": "Copiază raportul de eroare",
"bundle_column_error.error.body": "Pagina solicitată nu a putut fi randată. Ar putea fi cauzată de o eroare în codul nostru sau de o problemă de compatibilitate cu browser-ul.",
@@ -99,9 +106,11 @@
"column.blocks": "Utilizatori blocați",
"column.bookmarks": "Marcaje",
"column.community": "Cronologie locală",
+ "column.direct": "Mențiuni private",
"column.directory": "Explorează profiluri",
"column.domain_blocks": "Domenii blocate",
"column.favourites": "Favorite",
+ "column.firehose": "Fluxuri live",
"column.follow_requests": "Cereri de abonare",
"column.home": "Acasă",
"column.lists": "Liste",
@@ -131,26 +140,22 @@
"compose_form.lock_disclaimer": "Contul tău nu este {locked}. Oricine se poate abona la tine pentru a îți vedea postările numai pentru abonați.",
"compose_form.lock_disclaimer.lock": "privat",
"compose_form.placeholder": "La ce te gândești?",
- "compose_form.poll.add_option": "Adaugă o opțiune",
"compose_form.poll.duration": "Durata sondajului",
- "compose_form.poll.option_placeholder": "Opțiunea {number}",
- "compose_form.poll.remove_option": "Elimină acestă opțiune",
+ "compose_form.poll.multiple": "Alegeri multiple",
+ "compose_form.poll.option_placeholder": "Opțiune {number}",
+ "compose_form.poll.single": "Alegeți unul",
"compose_form.poll.switch_to_multiple": "Modifică sondajul pentru a permite mai multe opțiuni",
"compose_form.poll.switch_to_single": "Modifică sondajul pentru a permite o singură opțiune",
- "compose_form.publish": "Publică",
+ "compose_form.poll.type": "Stil",
+ "compose_form.publish": "Postare",
"compose_form.publish_form": "Publică",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Salvează modificările",
- "compose_form.sensitive.hide": "{count, plural, one {Marchează conținutul media ca fiind sensibil} few {Marchează conținuturile media ca fiind sensibile} other {Marchează conținuturile media ca fiind sensibile}}",
- "compose_form.sensitive.marked": "{count, plural, one {Conținutul media este marcat ca fiind sensibil} other {Conținuturile media sunt marcate ca fiind sensibile}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Conținutul media nu este marcat ca fiind sensibil} other {Conținuturile media nu sunt marcate ca fiind sensibile}}",
+ "compose_form.reply": "Răspundeți",
+ "compose_form.save_changes": "Actualizare",
"compose_form.spoiler.marked": "Elimină avertismentul privind conținutul",
"compose_form.spoiler.unmarked": "Adaugă un avertisment privind conținutul",
- "compose_form.spoiler_placeholder": "Scrie avertismentul aici",
+ "compose_form.spoiler_placeholder": "Atenționare de conținut (opțional)",
"confirmation_modal.cancel": "Anulează",
- "confirmations.block.block_and_report": "Blochează și raportează",
"confirmations.block.confirm": "Blochează",
- "confirmations.block.message": "Ești sigur că vrei să blochezi pe {name}?",
"confirmations.cancel_follow_request.confirm": "Retrage cererea",
"confirmations.cancel_follow_request.message": "Sunteți sigur că doriți să retrageți cererea dvs. de urmărire pentru {name}?",
"confirmations.delete.confirm": "Elimină",
@@ -159,14 +164,12 @@
"confirmations.delete_list.message": "Ești sigur că vrei să elimini definitiv această listă?",
"confirmations.discard_edit_media.confirm": "Renunță",
"confirmations.discard_edit_media.message": "Ai modificări nesalvate în descrierea sau previzualizarea media, renunți oricum?",
- "confirmations.domain_block.confirm": "Blochează întregul domeniu",
"confirmations.domain_block.message": "Ești absolut sigur că vrei să blochezi tot domeniul {domain}? În cele mai multe cazuri, raportarea sau blocarea anumitor lucruri este suficientă și de preferat. Nu vei mai vedea niciun conținut din acest domeniu în vreun flux public sau în vreo notificare. Abonații tăi din acest domeniu vor fi eliminați.",
"confirmations.edit.confirm": "Modifică",
+ "confirmations.edit.message": "Editarea acum va suprascrie mesajul pe care îl compuneți în prezent. Sunteți sigur că vreți să continuați?",
"confirmations.logout.confirm": "Deconectare",
"confirmations.logout.message": "Ești sigur că vrei să te deconectezi?",
"confirmations.mute.confirm": "Ignoră",
- "confirmations.mute.explanation": "Postările acestei persoane și postările în care este menționată vor fi ascunse, însă tot va putea să îți vadă postările și să se aboneze la tine.",
- "confirmations.mute.message": "Ești sigur că vrei să ignori pe {name}?",
"confirmations.redraft.confirm": "Șterge și scrie din nou",
"confirmations.reply.confirm": "Răspunde",
"confirmations.reply.message": "Dacă răspunzi acum, mesajul pe care îl scrii în acest moment va fi șters. Ești sigur că vrei să continui?",
@@ -176,6 +179,7 @@
"conversation.mark_as_read": "Marchează ca citit",
"conversation.open": "Vizualizează conversația",
"conversation.with": "Cu {names}",
+ "copy_icon_button.copied": "Copiat în clipboard",
"copypaste.copied": "Copiat",
"copypaste.copy_to_clipboard": "Copiază în clipboard",
"directory.federated": "Din fediversul cunoscut",
@@ -251,10 +255,16 @@
"filter_modal.select_filter.title": "Filtrează această postare",
"filter_modal.title.status": "Filtrează o postare",
"firehose.all": "Toate",
+ "firehose.local": "Acest Server",
"firehose.remote": "Alte servere",
"follow_request.authorize": "Acceptă",
"follow_request.reject": "Respinge",
"follow_requests.unlocked_explanation": "Chiar dacă contul tău nu este blocat, personalul {domain} a considerat că ai putea prefera să consulți manual cererile de abonare de la aceste conturi.",
+ "follow_suggestions.dismiss": "Nu mai afișa din nou",
+ "follow_suggestions.personalized_suggestion": "Sugestie personalizată",
+ "follow_suggestions.popular_suggestion": "Sugestie populară",
+ "follow_suggestions.view_all": "Vizualizați tot",
+ "follow_suggestions.who_to_follow": "Pe cine să urmăriți",
"followed_tags": "Hastaguri urmărite",
"footer.about": "Despre",
"footer.directory": "Catalogul de profiluri",
@@ -277,19 +287,20 @@
"hashtag.column_settings.tag_toggle": "Adaugă etichete suplimentare pentru această coloană",
"hashtag.follow": "Urmărește haștagul",
"hashtag.unfollow": "Nu mai urmări haștagul",
- "home.actions.go_to_suggestions": "Găsește persoane de urmărit",
- "home.column_settings.basic": "De bază",
"home.column_settings.show_reblogs": "Afișează distribuirile",
"home.column_settings.show_replies": "Afișează răspunsurile",
"home.hide_announcements": "Ascunde anunțurile",
"home.pending_critical_update.body": "Te rugăm să-ți actualizezi serverul de Mastodon cat mai curând posibil!",
"home.pending_critical_update.link": "Vezi noutăți",
+ "home.pending_critical_update.title": "Actualizare critică de securitate disponibilă!",
"home.show_announcements": "Afișează anunțurile",
+ "interaction_modal.description.favourite": "Cu un cont pe Mastodon, poți adăuga această postare la favorite pentru a-l informa pe autorul ei că o apreciezi și pentru a o salva pentru mai târziu.",
"interaction_modal.description.follow": "Cu un cont Mastodon, poți urmări pe {name} pentru a vedea postările sale în cronologia ta principală.",
"interaction_modal.description.reblog": "Cu un cont pe Mastodon, poți distribui această postare pentru a le-o arăta și celor abonați ție.",
"interaction_modal.description.reply": "Cu un cont pe Mastodon, poți răspunde acestei postări.",
"interaction_modal.login.action": "Du-mă acasă",
"interaction_modal.login.prompt": "Adresa serverului tău acasă, de ex. mastodon.social",
+ "interaction_modal.no_account_yet": "Nu ești încă pe Mastodon?",
"interaction_modal.on_another_server": "Pe un alt server",
"interaction_modal.on_this_server": "Pe acest server",
"interaction_modal.title.follow": "Urmărește pe {name}",
@@ -354,9 +365,6 @@
"load_pending": "{count, plural, one {# element nou} other {# elemente noi}}",
"media_gallery.toggle_visible": "{number, plural, one {Ascunde imaginea} other {Ascunde imaginile}}",
"moved_to_account_banner.text": "Contul tău {disabledAccount} este în acest moment dezactivat deoarece te-ai mutat la {movedToAccount}.",
- "mute_modal.duration": "Durata",
- "mute_modal.hide_notifications": "Ascunde notificările de la acest utilizator?",
- "mute_modal.indefinite": "Nedeterminat",
"navigation_bar.about": "Despre",
"navigation_bar.advanced_interface": "Deschide în interfața web avansată",
"navigation_bar.blocks": "Utilizatori blocați",
@@ -365,7 +373,6 @@
"navigation_bar.compose": "Compune o nouă postare",
"navigation_bar.discover": "Descoperă",
"navigation_bar.domain_blocks": "Domenii blocate",
- "navigation_bar.edit_profile": "Modifică profilul",
"navigation_bar.explore": "Explorează",
"navigation_bar.filters": "Cuvinte ignorate",
"navigation_bar.follow_requests": "Cereri de abonare",
@@ -398,9 +405,6 @@
"notifications.column_settings.admin.report": "Raportări noi:",
"notifications.column_settings.admin.sign_up": "Înscrieri noi:",
"notifications.column_settings.alert": "Notificări pe desktop",
- "notifications.column_settings.filter_bar.advanced": "Afișează toate categoriile",
- "notifications.column_settings.filter_bar.category": "Bară de filtrare rapidă",
- "notifications.column_settings.filter_bar.show_bar": "Arată bara de filtrare",
"notifications.column_settings.follow": "Noi urmăritori:",
"notifications.column_settings.follow_request": "Noi cereri de abonare:",
"notifications.column_settings.mention": "Mențiuni:",
@@ -461,14 +465,7 @@
"poll_button.add_poll": "Adaugă un sondaj",
"poll_button.remove_poll": "Elimină sondajul",
"privacy.change": "Modifică confidențialitatea postării",
- "privacy.direct.long": "Vizibil doar pentru utilizatorii menționați",
- "privacy.direct.short": "Doar persoane menționate",
- "privacy.private.long": "Vizibil doar pentru abonați",
- "privacy.private.short": "Doar abonați",
- "privacy.public.long": "Vizibil pentru toți",
"privacy.public.short": "Public",
- "privacy.unlisted.long": "Vizibil pentru toți dar fără funcții de descoperire",
- "privacy.unlisted.short": "Nelistat",
"privacy_policy.last_updated": "Ultima actualizare în data de {date}",
"privacy_policy.title": "Politică de confidențialitate",
"refresh": "Reîncarcă",
@@ -571,7 +568,6 @@
"status.direct": "Menționează @{name} în privat",
"status.direct_indicator": "Mențiune privată",
"status.edit": "Modifică",
- "status.edited": "Modificat în data de {date}",
"status.edited_x_times": "Modificată {count, plural, one {o dată} few {de {count} ori} other {de {count} de ori}}",
"status.embed": "Înglobează",
"status.filter": "Filtrează această postare",
@@ -641,10 +637,8 @@
"upload_error.poll": "Încărcarea fișierului nu este permisă cu sondaje.",
"upload_form.audio_description": "Descrie pentru persoanele cu deficiență a auzului",
"upload_form.description": "Adaugă o descriere pentru persoanele cu deficiențe de vedere",
- "upload_form.description_missing": "Nicio descriere adăugată",
"upload_form.edit": "Modifică",
"upload_form.thumbnail": "Schimbă miniatura",
- "upload_form.undo": "Șterge",
"upload_form.video_description": "Adaugă o descriere pentru persoanele cu deficiențe vizuale sau auditive",
"upload_modal.analyzing_picture": "Se analizează imaginea…",
"upload_modal.apply": "Aplică",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index a8ff90cc003b1b..07a41385a2bf26 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -89,7 +89,14 @@
"announcement.announcement": "Объявление",
"attachments_list.unprocessed": "(не обработан)",
"audio.hide": "Скрыть аудио",
- "autosuggest_hashtag.per_week": "{count} / неделю",
+ "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": "Запрошенная страница не может быть отображена. Это может быть вызвано ошибкой в нашем коде или проблемой совместимости браузера.",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "Ваша учётная запись {locked}. Любой пользователь сможет подписаться на вас и просматривать посты для подписчиков.",
"compose_form.lock_disclaimer.lock": "не закрыта",
"compose_form.placeholder": "О чём думаете?",
- "compose_form.poll.add_option": "Добавить вариант",
"compose_form.poll.duration": "Продолжительность опроса",
+ "compose_form.poll.multiple": "Несколько вариантов ответа",
"compose_form.poll.option_placeholder": "Вариант {number}",
- "compose_form.poll.remove_option": "Убрать этот вариант",
+ "compose_form.poll.single": "Выберите один",
"compose_form.poll.switch_to_multiple": "Разрешить выбор нескольких вариантов",
"compose_form.poll.switch_to_single": "Переключить в режим выбора одного ответа",
+ "compose_form.poll.type": "Стиль",
"compose_form.publish": "Опубликовать",
"compose_form.publish_form": "Опубликовать",
- "compose_form.publish_loud": "{publish}!",
+ "compose_form.reply": "Ответить",
"compose_form.save_changes": "Сохранить",
- "compose_form.sensitive.hide": "{count, plural, one {Отметить медифайл как деликатный} other {Отметить медифайлы как деликатные}}",
- "compose_form.sensitive.marked": "Медиа{count, plural, =1 {файл отмечен} other {файлы отмечены}} как «деликатного характера»",
- "compose_form.sensitive.unmarked": "Медиа{count, plural, =1 {файл не отмечен} other {файлы не отмечены}} как «деликатного характера»",
"compose_form.spoiler.marked": "Текст скрыт за предупреждением",
"compose_form.spoiler.unmarked": "Текст не скрыт",
- "compose_form.spoiler_placeholder": "Текст предупреждения",
+ "compose_form.spoiler_placeholder": "Предупреждение о контенте (опционально)",
"confirmation_modal.cancel": "Отмена",
- "confirmations.block.block_and_report": "Заблокировать и пожаловаться",
"confirmations.block.confirm": "Заблокировать",
- "confirmations.block.message": "Вы уверены, что хотите заблокировать {name}?",
"confirmations.cancel_follow_request.confirm": "Отменить запрос",
"confirmations.cancel_follow_request.message": "Вы уверены, что хотите отозвать свой запрос на подписку {name}?",
"confirmations.delete.confirm": "Удалить",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "Вы действительно хотите навсегда удалить этот список?",
"confirmations.discard_edit_media.confirm": "Отменить",
"confirmations.discard_edit_media.message": "У вас есть несохранённые изменения описания мультимедиа или предпросмотра, отменить их?",
- "confirmations.domain_block.confirm": "Да, заблокировать узел",
+ "confirmations.domain_block.confirm": "Заблокировать сервер",
"confirmations.domain_block.message": "Вы точно уверены, что хотите заблокировать {domain} полностью? В большинстве случаев нескольких блокировок и игнорирований вполне достаточно. Вы перестанете видеть публичную ленту и уведомления оттуда. Ваши подписчики из этого домена будут удалены.",
"confirmations.edit.confirm": "Редактировать",
"confirmations.edit.message": "В данный момент, редактирование перезапишет составляемое вами сообщение. Вы уверены, что хотите продолжить?",
"confirmations.logout.confirm": "Выйти",
"confirmations.logout.message": "Вы уверены, что хотите выйти?",
"confirmations.mute.confirm": "Игнорировать",
- "confirmations.mute.explanation": "Это действие скроет посты данного пользователя и те, в которых он упоминается, но при этом он по-прежнему сможет подписаться и смотреть ваши посты.",
- "confirmations.mute.message": "Вы уверены, что хотите добавить {name} в список игнорируемых?",
"confirmations.redraft.confirm": "Удалить и исправить",
"confirmations.redraft.message": "Вы уверены, что хотите удалить и переписать этот пост? Отметки «избранного», продвижения и ответы к оригинальному посту будут удалены.",
"confirmations.reply.confirm": "Ответить",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "Эти сообщения со связанных серверов сети сейчас набирают популярность.",
"dismissable_banner.explore_tags": "Эти хэштеги привлекают людей на этом и других серверах децентрализованной сети прямо сейчас.",
"dismissable_banner.public_timeline": "Это самые последние публичные сообщения от людей в социальной сети, за которыми подписались пользователи {domain}.",
+ "domain_block_modal.block": "Заблокировать сервер",
+ "domain_block_modal.block_account_instead": "Заблокировать @{name} вместо",
+ "domain_block_modal.they_can_interact_with_old_posts": "Люди с этого сервера могут взаимодействовать с вашими старыми записями.",
+ "domain_block_modal.they_cant_follow": "Никто из этого сервера не может подписываться на вас.",
+ "domain_block_modal.they_wont_know": "Он не будет знать, что его заблокировали.",
+ "domain_block_modal.title": "Заблокировать домен?",
+ "domain_block_modal.you_will_lose_followers": "Все ваши подписчики с этого сервера будут удалены.",
+ "domain_block_modal.you_wont_see_posts": "Вы не будете видеть записи или уведомления от пользователей на этом сервере.",
+ "domain_pill.activitypub_lets_connect": "Это позволяет вам общаться и взаимодействовать с людьми не только на Mastodon, но и в различных социальных приложениях.",
+ "domain_pill.activitypub_like_language": "ActivityPub как язык Mastodon говорит с другими социальными сетями.",
+ "domain_pill.server": "Сервер",
+ "domain_pill.their_handle": "Его бейдж:",
+ "domain_pill.their_server": "Цифровой дом, где находятся все записи.",
+ "domain_pill.their_username": "Уникальный идентификатор на сервере. Возможно найти пользователей с одним и тем же именем пользователя на разных серверах.",
+ "domain_pill.username": "Имя пользователя",
+ "domain_pill.whats_in_a_handle": "Что такое бейдж?",
+ "domain_pill.who_they_are": "Поскольку бейджи говорят о том, кто и где находится, вы можете взаимодействовать с людьми в социальной сети .",
+ "domain_pill.who_you_are": "Поскольку ваш бейдж говорит о том, кто вы и где находитесь, люди могут взаимодействовать с вами через социальную сеть .",
+ "domain_pill.your_handle": "Ваш бейдж:",
+ "domain_pill.your_server": "Сервер, где живут все ваши посты. Этот не нравится? Поменяй сервер в любое время вместе со своими подписчиками.",
+ "domain_pill.your_username": "Ваш уникальный идентификатор на этом сервере. Вы можете найти пользователей с одним именем пользователя на разных серверах.",
"embed.instructions": "Встройте этот пост на свой сайт, скопировав следующий код:",
"embed.preview": "Так это будет выглядеть:",
"emoji_button.activity": "Занятия",
@@ -240,10 +262,11 @@
"empty_column.follow_requests": "Вам ещё не приходили запросы на подписку. Все новые запросы будут показаны здесь.",
"empty_column.followed_tags": "Вы еще не подписались ни на один хэштег. Когда вы это сделаете, они появятся здесь.",
"empty_column.hashtag": "С этим хэштегом пока ещё ничего не постили.",
- "empty_column.home": "Ваша лента совсем пуста! Подпишитесь на других, чтобы заполнить её. {suggestions}",
+ "empty_column.home": "Ваша лента совсем пуста! Подписывайтесь на других, чтобы заполнить её.",
"empty_column.list": "В этом списке пока ничего нет.",
"empty_column.lists": "У вас ещё нет списков. Созданные вами списки будут показаны здесь.",
"empty_column.mutes": "Вы ещё никого не добавляли в список игнорируемых.",
+ "empty_column.notification_requests": "Здесь ничего нет! Когда вы получите новые уведомления, они здесь появятся согласно вашим настройкам.",
"empty_column.notifications": "У вас пока нет уведомлений. Взаимодействуйте с другими, чтобы завести разговор.",
"empty_column.public": "Здесь ничего нет! Опубликуйте что-нибудь или подпишитесь на пользователей с других узлов, чтобы заполнить ленту",
"error.unexpected_crash.explanation": "Из-за несовместимого браузера или ошибки в нашем коде, эта страница не может быть корректно отображена.",
@@ -274,12 +297,25 @@
"filter_modal.select_filter.subtitle": "Используйте существующую категорию или создайте новую",
"filter_modal.select_filter.title": "Фильтровать этот пост",
"filter_modal.title.status": "Фильтровать пост",
+ "filtered_notifications_banner.pending_requests": "Уведомления от {count, plural, =0 {никого} one {# человека} other {# других людей, с кем вы можете быть знакомы}}",
+ "filtered_notifications_banner.title": "Отфильтрованные уведомления",
"firehose.all": "Все",
"firehose.local": "Текущий сервер",
"firehose.remote": "Другие серверы",
"follow_request.authorize": "Авторизовать",
"follow_request.reject": "Отказать",
"follow_requests.unlocked_explanation": "Хотя ваша учетная запись не закрыта, команда {domain} подумала, что вы захотите просмотреть запросы от этих учетных записей вручную.",
+ "follow_suggestions.curated_suggestion": "Выбор администрации",
+ "follow_suggestions.dismiss": "Больше не показывать",
+ "follow_suggestions.hints.featured": "Этот профиль был вручную выбран командой {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "Этот профиль популярен среди людей, на которых вы подписаны.",
+ "follow_suggestions.hints.most_followed": "Этот профиль один из самых отслеживаемых на {domain}.",
+ "follow_suggestions.hints.most_interactions": "Этот профиль в последнее время привлекает много внимания на {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Этот профиль похож на другие профили, на которые вы подписывались в последнее время.",
+ "follow_suggestions.personalized_suggestion": "Персонализированное предложение",
+ "follow_suggestions.popular_suggestion": "Популярное предложение",
+ "follow_suggestions.view_all": "Посмотреть все",
+ "follow_suggestions.who_to_follow": "На кого подписаться",
"followed_tags": "Отслеживаемые хэштеги",
"footer.about": "О проекте",
"footer.directory": "Каталог профилей",
@@ -306,13 +342,8 @@
"hashtag.follow": "Подписаться на новые посты",
"hashtag.unfollow": "Отписаться",
"hashtags.and_other": "...и {count, plural, other {# ещё}}",
- "home.actions.go_to_explore": "Посмотреть, что актуально",
- "home.actions.go_to_suggestions": "Подпишитесь на людей",
- "home.column_settings.basic": "Основные",
"home.column_settings.show_reblogs": "Показывать продвижения",
"home.column_settings.show_replies": "Показывать ответы",
- "home.explore_prompt.body": "В вашем доме появятся сообщения из хэштегов, на которые вы хотите подписаться, люди, которых вы выбрали подписаться, и сообщения, которые они увеличили. Сейчас выглядит спокойно, так что:",
- "home.explore_prompt.title": "Это ваша домашняя база в Мастодоне.",
"home.hide_announcements": "Скрыть объявления",
"home.pending_critical_update.body": "Пожалуйста, обновите свой сервер Mastodon как можно скорее!",
"home.pending_critical_update.link": "Посмотреть обновления",
@@ -377,7 +408,7 @@
"lightbox.previous": "Назад",
"limited_account_hint.action": "Все равно показать профиль",
"limited_account_hint.title": "Этот профиль был скрыт модераторами {domain}.",
- "link_preview.author": "По алфавиту",
+ "link_preview.author": "Автор: {name}",
"lists.account.add": "Добавить в список",
"lists.account.remove": "Убрать из списка",
"lists.delete": "Удалить список",
@@ -396,9 +427,15 @@
"loading_indicator.label": "Загрузка…",
"media_gallery.toggle_visible": "Показать/скрыть {number, plural, =1 {изображение} other {изображения}}",
"moved_to_account_banner.text": "Ваша учетная запись {disabledAccount} в настоящее время заморожена, потому что вы переехали на {movedToAccount}.",
- "mute_modal.duration": "Продолжительность",
- "mute_modal.hide_notifications": "Скрыть уведомления от этого пользователя?",
- "mute_modal.indefinite": "Не определена",
+ "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": "Заблокированные пользователи",
@@ -408,7 +445,6 @@
"navigation_bar.direct": "Личные упоминания",
"navigation_bar.discover": "Изучайте",
"navigation_bar.domain_blocks": "Скрытые домены",
- "navigation_bar.edit_profile": "Изменить профиль",
"navigation_bar.explore": "Обзор",
"navigation_bar.favourites": "Избранные",
"navigation_bar.filters": "Игнорируемые слова",
@@ -432,20 +468,27 @@
"notification.follow": "{name} подписался (-лась) на вас",
"notification.follow_request": "{name} отправил запрос на подписку",
"notification.mention": "{name} упомянул(а) вас",
+ "notification.moderation_warning.action_delete_statuses": "Некоторые из ваших публикаций были удалены.",
"notification.own_poll": "Ваш опрос закончился",
"notification.poll": "Опрос, в котором вы приняли участие, завершился",
"notification.reblog": "{name} продвинул(а) ваш пост",
+ "notification.relationships_severance_event": "Потеряно соединение с {name}",
+ "notification.relationships_severance_event.account_suspension": "Администратор {from} заблокировал {target}, что означает, что вы больше не сможете получать обновления от них или взаймодествовать с ними.",
+ "notification.relationships_severance_event.domain_block": "Администратор {from} заблокировал {target} включая {followersCount} ваших подписчиков и {followingCount, plural, one {# аккаунт} few {# аккаунта} other {# аккаунтов}}, на которые вы подписаны.",
+ "notification.relationships_severance_event.learn_more": "Узнать больше",
+ "notification.relationships_severance_event.user_domain_block": "Вы заблокировали {target} включая {followersCount} ваших подписчиков и {followingCount, plural, one {# аккаунт} few {# аккаунта} other {# аккаунтов}}, на которые вы подписаны.",
"notification.status": "{name} только что запостил",
"notification.update": "{name} изменил(а) пост",
+ "notification_requests.accept": "Принять",
+ "notification_requests.dismiss": "Отклонить",
+ "notification_requests.notifications_from": "Уведомления от {name}",
+ "notification_requests.title": "Отфильтрованные уведомления",
"notifications.clear": "Очистить уведомления",
"notifications.clear_confirmation": "Вы уверены, что хотите очистить все уведомления?",
"notifications.column_settings.admin.report": "Новые жалобы:",
"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.filter_bar.show_bar": "Отображать панель сортировки",
"notifications.column_settings.follow": "У вас новый подписчик:",
"notifications.column_settings.follow_request": "Новые запросы на подписку:",
"notifications.column_settings.mention": "Вас упомянули в посте:",
@@ -471,6 +514,7 @@
"notifications.permission_denied": "Уведомления на рабочем столе недоступны, так как вы запретили их отправку в браузере. Проверьте настройки для сайта, чтобы включить их обратно.",
"notifications.permission_denied_alert": "Уведомления на рабочем столе недоступны, так как вы ранее отклонили запрос на их отправку.",
"notifications.permission_required": "Чтобы включить уведомления на рабочем столе, необходимо разрешить их в браузере.",
+ "notifications.policy.filter_new_accounts_title": "Новые учётные записи",
"notifications_permission_banner.enable": "Включить уведомления",
"notifications_permission_banner.how_to_control": "Получайте уведомления даже когда Mastodon закрыт, включив уведомления на рабочем столе. А чтобы лишний шум не отвлекал, вы можете настроить какие уведомления вы хотите получать, нажав на кнопку {icon} выше.",
"notifications_permission_banner.title": "Будьте в курсе происходящего",
@@ -526,14 +570,15 @@
"poll_button.add_poll": "Добавить опрос",
"poll_button.remove_poll": "Удалить опрос",
"privacy.change": "Изменить видимость поста",
- "privacy.direct.long": "Показать только упомянутым",
- "privacy.direct.short": "Только упомянутые",
- "privacy.private.long": "Показать только подписчикам",
- "privacy.private.short": "Для подписчиков",
- "privacy.public.long": "Виден всем",
+ "privacy.direct.long": "Все упомянутые в посте",
+ "privacy.direct.short": "Определённые люди",
+ "privacy.private.long": "Только ваши подписчики",
+ "privacy.private.short": "Подписчики",
+ "privacy.public.long": "Любой, находящийся на Mastodon и вне его",
"privacy.public.short": "Публичный",
- "privacy.unlisted.long": "Виден всем, но не через функции обзора",
- "privacy.unlisted.short": "Скрытый",
+ "privacy.unlisted.additional": "Работает точно так же, как public, за исключением того, что пост не будет отображаться в прямых лентах, хэштегах, исследованиях или поиске Mastodon, даже если ваш аккаунт подписан на это на уровне всего аккаунта.",
+ "privacy.unlisted.long": "Меньше алгоритмических фанфар",
+ "privacy.unlisted.short": "Тихий публичный",
"privacy_policy.last_updated": "Последнее обновление {date}",
"privacy_policy.title": "Политика конфиденциальности",
"recommended": "Рекомендуется",
@@ -551,7 +596,9 @@
"relative_time.minutes": "{number} мин",
"relative_time.seconds": "{number} с",
"relative_time.today": "сегодня",
+ "reply_indicator.attachments": "{count, plural, one {# вложение} other {# вложения}}",
"reply_indicator.cancel": "Отмена",
+ "reply_indicator.poll": "Опрос",
"report.block": "Заблокировать",
"report.block_explanation": "Вы перестанете видеть посты этого пользователя, и он(а) больше не сможет подписаться на вас и читать ваши посты. Он(а) сможет понять, что вы заблокировали его/её.",
"report.categories.legal": "Правовая информация",
@@ -644,7 +691,6 @@
"status.direct": "Лично упоминать @{name}",
"status.direct_indicator": "Личные упоминания",
"status.edit": "Изменить",
- "status.edited": "Последнее изменение: {date}",
"status.edited_x_times": "{count, plural, one {{count} изменение} many {{count} изменений} other {{count} изменения}}",
"status.embed": "Встроить на свой сайт",
"status.favourite": "Избранное",
@@ -715,10 +761,8 @@
"upload_error.poll": "К опросам нельзя прикреплять файлы.",
"upload_form.audio_description": "Опишите аудиофайл для людей с нарушением слуха",
"upload_form.description": "Добавьте описание для людей с нарушениями зрения:",
- "upload_form.description_missing": "Описание не добавлено",
"upload_form.edit": "Изменить",
"upload_form.thumbnail": "Изменить обложку",
- "upload_form.undo": "Отменить",
"upload_form.video_description": "Опишите видео для людей с нарушением слуха или зрения",
"upload_modal.analyzing_picture": "Обработка изображения…",
"upload_modal.apply": "Применить",
diff --git a/app/javascript/mastodon/locales/ry.json b/app/javascript/mastodon/locales/ry.json
index 0967ef424bce67..67aad910054010 100644
--- a/app/javascript/mastodon/locales/ry.json
+++ b/app/javascript/mastodon/locales/ry.json
@@ -1 +1,80 @@
-{}
+{
+ "about.blocks": "Модеровані серверы",
+ "about.contact": "Контакт:",
+ "about.disclaimer": "Mastodon є задарьнов проґрамов из удпертым кодом тай торговов значков Mastodon gGmbH.",
+ "about.domain_blocks.no_reason_available": "Причины не ясні",
+ "about.domain_blocks.silenced.title": "Обмежено",
+ "about.domain_blocks.suspended.explanation": "Ниякі податкы из сього сервера не будут уброблені, усокочені ци поміняні, што чинит невозможнов хоть-яку інтеракцію ци зязок из хосновачами из сього сервера.",
+ "about.domain_blocks.suspended.title": "Заблоковано",
+ "about.not_available": "Ися інформація не была доступна на сюм сервері.",
+ "about.powered_by": "Децентралізована медіа основана на {mastodon}",
+ "about.rules": "Правила сервера",
+ "account.account_note_header": "Примітка",
+ "account.add_or_remove_from_list": "Дати авадь забрати из исписа",
+ "account.badges.bot": "Автоматічно",
+ "account.badges.group": "Ґрупа",
+ "account.block": "Заблоковати @{name}",
+ "account.block_domain": "Заблоковати домен {domain}",
+ "account.block_short": "Заблоковати",
+ "account.blocked": "Заблоковано",
+ "account.browse_more_on_origin_server": "Позирайте бульше на ориґіналнум профілю",
+ "account.cancel_follow_request": "Удмінити пудписку",
+ "account.copy": "Зкопіровати удкликованя на профіл",
+ "account.disable_notifications": "Бульше не сповіщати ми коли {name} пише",
+ "account.domain_blocked": "Домен заблокованый",
+ "account.edit_profile": "Управити профіл",
+ "account.enable_notifications": "Уповістити ня, кой {name} пише",
+ "account.endorse": "Указовати на профілови",
+ "account.featured_tags.last_status_at": "Датум послідньої публикації {date}",
+ "account.featured_tags.last_status_never": "Ниє публикацій",
+ "account.featured_tags.title": "Ублюблені гештеґы {name}",
+ "account.follow": "Пудписати ся",
+ "account.follow_back": "Пудписати ся тоже",
+ "account.followers": "Пудписникы",
+ "account.followers.empty": "У сього хосновача раз ниє пудписникув.",
+ "account.following": "Слідуєте",
+ "account.follows.empty": "Сись хосновач щи никого не слідує.",
+ "account.go_to_profile": "Перейти на профіл",
+ "account.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": "Стишено",
+ "account.mutual": "Взайомно",
+ "account.no_bio": "Описа ниє.",
+ "account.open_original_page": "Удоперти ориґіналну сторунку",
+ "account.posts": "Публикації",
+ "account.posts_with_replies": "Публикації тай удповіді",
+ "account.report": "Скарговати ся на {name}",
+ "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",
+ "bundle_modal_error.close": "Заперти",
+ "bundle_modal_error.message": "Штось ся показило, закидь сьме ладовали сись компонент.",
+ "bundle_modal_error.retry": "Попробовати зась",
+ "closed_registrations.other_server_instructions": "Mastodon є децентралізованов платформов, можете си учинити профіл и на другому серверови тай комуніковати из сим."
+}
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index 051ec5d6f80f16..99aa46bc89f7ab 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -77,7 +77,6 @@
"announcement.announcement": "उद्घोषणा",
"attachments_list.unprocessed": "(अप्रकृतम्)",
"audio.hide": "ध्वनिं प्रच्छादय",
- "autosuggest_hashtag.per_week": "{count} प्रतिसप्ताहे",
"boost_modal.combo": "{combo} अत्र स्प्रष्टुं शक्यते, त्यक्तुमेतमन्यस्मिन् समये",
"bundle_column_error.copy_stacktrace": "त्रुट्यावेदनं प्रतिलिपिङ्कुरु",
"bundle_column_error.error.body": "अनुरोधितं पृष्ठं प्रतिपादयितुं न शक्यते। अस्माकं कोडि दोषस्य कारणेन, अथवा ब्राउजर् संगततायास्समस्यायाः कारणेन भवितुमर्हति।",
@@ -129,26 +128,14 @@
"compose_form.lock_disclaimer": "तव लेखा न प्रवेष्टुमशक्या {locked} । कोऽप्यनुसर्ता ते केवलमनुसर्तृृणां कृते स्थितानि पत्राणि द्रष्टुं शक्नोति ।",
"compose_form.lock_disclaimer.lock": "अवरुद्धः",
"compose_form.placeholder": "मनसि ते किमस्ति?",
- "compose_form.poll.add_option": "मतमपरं युज्यताम्",
"compose_form.poll.duration": "मतदान-समयावधिः",
- "compose_form.poll.option_placeholder": "मतम् {number}",
- "compose_form.poll.remove_option": "मतमेतन्नश्यताम्",
"compose_form.poll.switch_to_multiple": "मतदानं परिवर्तयित्वा बहुवैकल्पिकमतदानं क्रियताम्",
"compose_form.poll.switch_to_single": "मतदानं परिवर्तयित्वा निर्विकल्पमतदानं क्रियताम्",
- "compose_form.publish": "प्रकाशीकुरु",
"compose_form.publish_form": "प्रकाशीकुरु",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "परिवर्तनानि रक्ष",
- "compose_form.sensitive.hide": "संवेदनशीलसामग्रीत्यङ्यताम्",
- "compose_form.sensitive.marked": "संवेदनशीलसामग्रीत्यङ्कितम्",
- "compose_form.sensitive.unmarked": "संवेदनशीलसामग्रीति नाङ्कितम्",
"compose_form.spoiler.marked": "प्रच्छान्नाक्षरं विद्यते",
"compose_form.spoiler.unmarked": "अप्रच्छन्नाक्षरं विद्यते",
- "compose_form.spoiler_placeholder": "प्रत्यादेशस्ते लिख्यताम्",
"confirmation_modal.cancel": "नश्यताम्",
- "confirmations.block.block_and_report": "अवरुध्य आविद्यताम्",
"confirmations.block.confirm": "निषेधः",
- "confirmations.block.message": "निश्चयेनाऽवरोधो विधेयः {name}?",
"confirmations.cancel_follow_request.confirm": "अनुरोधनमपनय",
"confirmations.cancel_follow_request.message": "{name} अनुसरणस्यानुरोधमपनेतुं दृढीकृतं वा?",
"confirmations.delete.confirm": "मार्जय",
@@ -157,15 +144,12 @@
"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": "सम्पादनमिदानीं लिख्यते तर्हि पूर्वलिखितसन्देशं विनश्य पुनः लिख्यते। निश्चयेनैवं कर्तव्यम्?",
"confirmations.logout.confirm": "बहिर्गम्यताम्",
"confirmations.logout.message": "निश्चयेनैव बहिर्गमनं वाञ्छितम्?",
"confirmations.mute.confirm": "निःशब्दम्",
- "confirmations.mute.explanation": "एतेन तेषां पत्राणि तथा च यत्र ते उल्लिखिताः तानि छाद्यन्ते, किन्त्वेवं सत्यपि ते त्वामनुसर्तुं ततश्च पत्राणि द्रष्टुं शक्नुवन्ति ।",
- "confirmations.mute.message": "किं निश्चयेन निःशब्दं भवेत् {name} मित्रमेतत् ?",
"confirmations.redraft.confirm": "मार्जय पुनश्च लिख्यताम्",
"confirmations.reply.confirm": "उत्तरम्",
"confirmations.reply.message": "प्रत्युत्तरमिदानीं लिख्यते तर्हि पूर्वलिखितसन्देशं विनश्य पुनः लिख्यते । निश्चयेनैवं कर्तव्यम् ?",
@@ -275,7 +259,6 @@
"hashtag.column_settings.tag_toggle": "Include additional tags in this column",
"hashtag.follow": "प्रचलितवस्तु अनुसर",
"hashtag.unfollow": "प्रचलितवस्तु अनुसरणं वारय",
- "home.column_settings.basic": "मूलभूतम्",
"home.column_settings.show_reblogs": "बुस्त् दर्शय",
"home.column_settings.show_replies": "उत्तराणि दर्शय",
"home.hide_announcements": "विज्ञापनानि प्रच्छादय",
@@ -346,9 +329,6 @@
"load_pending": "{count, plural, one {# नूतनवस्तु} other {# नूतनवस्तूनि}}",
"media_gallery.toggle_visible": "{number, plural, one {चित्रं प्रच्छादय} other {चित्राणि प्रच्छादय}}",
"moved_to_account_banner.text": "तव एकौण्ट् {disabledAccount} अधुना निष्कृतो यतोहि {movedToAccount} अस्मिन्त्वमसार्षीः।",
- "mute_modal.duration": "परिमाणम्",
- "mute_modal.hide_notifications": "अस्मादुपभोक्तुर्विज्ञापनानि प्रच्छादयितुमिच्छसि वा?",
- "mute_modal.indefinite": "अ॑परिमितम्",
"navigation_bar.about": "विषये",
"navigation_bar.blocks": "निषिद्धभोक्तारः",
"navigation_bar.bookmarks": "पुटचिह्नानि",
@@ -357,7 +337,6 @@
"navigation_bar.direct": "गोपनीयरूपेण उल्लिखितानि",
"navigation_bar.discover": "आविष्कुरु",
"navigation_bar.domain_blocks": "Hidden domains",
- "navigation_bar.edit_profile": "प्रोफैलं सम्पाद्यताम्",
"navigation_bar.explore": "अन्विच्छ",
"navigation_bar.filters": "मूकीकृतानि पदानि",
"navigation_bar.follow_requests": "अनुसरणानुरोधाः",
@@ -388,9 +367,6 @@
"notifications.column_settings.admin.report": "नूतनावेदनानि",
"notifications.column_settings.admin.sign_up": "नूतनपञ्जीकरणम्:",
"notifications.column_settings.alert": "देस्क्टप्विज्ञापनानि",
- "notifications.column_settings.filter_bar.advanced": "सर्वाणि वर्गाणि प्रदर्शय",
- "notifications.column_settings.filter_bar.category": "द्रुतशोधकशलाका",
- "notifications.column_settings.filter_bar.show_bar": "शोधकशालकां दर्शय",
"notifications.column_settings.follow": "नूतनानुसारिणः:",
"notifications.column_settings.follow_request": "नूतनानुसरणानुरोधाः:",
"notifications.column_settings.mention": "उल्लिखितानि :",
@@ -453,14 +429,7 @@
"poll_button.add_poll": "निर्वाचनं योजय",
"poll_button.remove_poll": "निर्वाचनं मार्जय",
"privacy.change": "पत्रस्य गोपनीयतां परिवर्तय",
- "privacy.direct.long": "केवलमुल्लिखितोभोक्तृभ्यो दृश्यते",
- "privacy.direct.short": "Direct",
- "privacy.private.long": "केवलं येऽनुसरन्ति त्वां तेभ्यो दृश्यते",
- "privacy.private.short": "Followers-only",
- "privacy.public.long": "सर्वेभ्यो दृश्यते",
"privacy.public.short": "सार्वजनिकम्",
- "privacy.unlisted.long": "सर्वेभ्यो दृश्यते किन्तु आविष्कारविशेषताभ्योऽन्तरभूतं नास्ति",
- "privacy.unlisted.short": "असूचीकृतम्",
"privacy_policy.last_updated": "अन्तिमवारं परिवर्तितम् {date}",
"privacy_policy.title": "गोपनीयतानीतिः",
"refresh": "नवीकुरु",
@@ -546,7 +515,6 @@
"status.delete": "मार्जय",
"status.detailed_status": "विस्तृतसंभाषणदृश्यम्",
"status.edit": "सम्पादय",
- "status.edited": "सम्पादितं {date}",
"status.edited_x_times": "Edited {count, plural, one {{count} वारम्} other {{count} वारम्}}",
"status.embed": "निहितम्",
"status.filter": "पत्रमिदं फिल्तरं कुरु",
@@ -572,7 +540,6 @@
"trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
"upload_form.audio_description": "Describe for people with hearing loss",
"upload_form.description": "Describe for the visually impaired",
- "upload_form.undo": "मार्जय",
"upload_form.video_description": "Describe for people with hearing loss or visual impairment",
"upload_progress.label": "Uploading…"
}
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index 89e951f77d37b0..1a5f2ef0f396be 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -60,7 +60,6 @@
"alert.unexpected.title": "Oh!",
"announcement.announcement": "Annùntziu",
"audio.hide": "Cua s'àudio",
- "autosuggest_hashtag.per_week": "{count} a sa chida",
"boost_modal.combo": "Podes incarcare {combo} pro brincare custu sa borta chi benit",
"bundle_column_error.error.title": "Oh, no!",
"bundle_column_error.network.title": "Faddina de connessione",
@@ -100,38 +99,23 @@
"compose_form.lock_disclaimer": "Su contu tuo no est {locked}. Cale si siat persone ti podet sighire pro bìdere is messàgios tuos chi imbies a sa gente chi ti sighit.",
"compose_form.lock_disclaimer.lock": "blocadu",
"compose_form.placeholder": "A ite ses pensende?",
- "compose_form.poll.add_option": "Agiunghe unu sèberu",
"compose_form.poll.duration": "Longària de su sondàgiu",
- "compose_form.poll.option_placeholder": "Optzione {number}",
- "compose_form.poll.remove_option": "Boga custa optzione",
"compose_form.poll.switch_to_multiple": "Muda su sondàgiu pro permìtere multi-optziones",
"compose_form.poll.switch_to_single": "Muda su sondàgiu pro permìtere un'optzione isceti",
- "compose_form.publish": "Pùblica",
"compose_form.publish_form": "Publish",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Sarva is modìficas",
- "compose_form.sensitive.hide": "{count, plural, one {Marca elementu multimediale comente a sensìbile} other {Marca elementos multimediales comente sensìbiles}}",
- "compose_form.sensitive.marked": "{count, plural, one {Elementu multimediale marcadu comente a sensìbile} other {Elementos multimediales marcados comente a sensìbiles}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Elementu multimediale non marcadu comente a sensìbile} other {Elementos multimediales non marcados comente a sensìbiles}}",
"compose_form.spoiler.marked": "Boga avisu de cuntenutu",
"compose_form.spoiler.unmarked": "Agiunghe avisu de cuntenutu",
- "compose_form.spoiler_placeholder": "Iscrie s'avisu tuo inoghe",
"confirmation_modal.cancel": "Annulla",
- "confirmations.block.block_and_report": "Bloca e signala",
"confirmations.block.confirm": "Bloca",
- "confirmations.block.message": "Seguru chi boles blocare {name}?",
"confirmations.delete.confirm": "Cantzella",
"confirmations.delete.message": "Seguru chi boles cantzellare custa publicatzione?",
"confirmations.delete_list.confirm": "Cantzella",
"confirmations.delete_list.message": "Seguru chi boles cantzellare custa lista in manera permanente?",
- "confirmations.domain_block.confirm": "Bloca totu su domìniu",
"confirmations.domain_block.message": "Boles de seguru, ma a beru a beru, blocare {domain}? In sa parte manna de is casos, pagos blocos o silentziamentos de persones sunt sufitzientes e preferìbiles. No as a bìdere cuntenutos dae custu domìniu in peruna lìnia de tempus pùblica o in is notìficas tuas. Sa gente chi ti sighit dae cussu domìniu at a èssere bogada.",
"confirmations.edit.confirm": "Modìfica",
"confirmations.logout.confirm": "Essi·nche",
"confirmations.logout.message": "Seguru chi boles essire?",
"confirmations.mute.confirm": "A sa muda",
- "confirmations.mute.explanation": "Custu at a cuare is publicatziones issoro e is messàgios chi ddos mèntovant, ma ant a pòdere bìdere is messàgios tuos e t'ant a pòdere sighire.",
- "confirmations.mute.message": "Seguru chi boles pònnere a {name} a sa muda?",
"confirmations.redraft.confirm": "Cantzella e torra a fàghere",
"confirmations.reply.confirm": "Risponde",
"confirmations.reply.message": "Rispondende immoe as a subrascrìere su messàgiu chi ses iscriende. Seguru chi boles sighire?",
@@ -211,7 +195,6 @@
"hashtag.column_settings.tag_mode.none": "Perunu de custos",
"hashtag.column_settings.tag_toggle": "Include etichetas additzionales pro custa colunna",
"hashtag.follow": "Sighi su hashtag",
- "home.column_settings.basic": "Bàsicu",
"home.column_settings.show_reblogs": "Ammustra is cumpartziduras",
"home.column_settings.show_replies": "Ammustra rispostas",
"home.hide_announcements": "Cua annùntzios",
@@ -277,9 +260,6 @@
"load_pending": "{count, plural, one {# elementu nou} other {# elementos noos}}",
"loading_indicator.label": "Carrighende…",
"media_gallery.toggle_visible": "Cua {number, plural, one {immàgine} other {immàgines}}",
- "mute_modal.duration": "Durada",
- "mute_modal.hide_notifications": "Boles cuare is notìficas de custa persone?",
- "mute_modal.indefinite": "Indefinida",
"navigation_bar.about": "Informatziones",
"navigation_bar.blocks": "Persones blocadas",
"navigation_bar.bookmarks": "Sinnalibros",
@@ -287,7 +267,6 @@
"navigation_bar.compose": "Cumpone una publicatzione noa",
"navigation_bar.discover": "Iscoberi",
"navigation_bar.domain_blocks": "Domìnios blocados",
- "navigation_bar.edit_profile": "Modìfica profilu",
"navigation_bar.filters": "Faeddos a sa muda",
"navigation_bar.follow_requests": "Rechestas de sighidura",
"navigation_bar.follows_and_followers": "Gente chi sighis e sighiduras",
@@ -312,8 +291,6 @@
"notifications.clear": "Lìmpia notìficas",
"notifications.clear_confirmation": "Seguru chi boles isboidare in manera permanente totu is notìficas tuas?",
"notifications.column_settings.alert": "Notìficas de iscrivania",
- "notifications.column_settings.filter_bar.advanced": "Ammustra totu is categorias",
- "notifications.column_settings.filter_bar.category": "Barra lestra de filtros",
"notifications.column_settings.follow": "Sighiduras noas:",
"notifications.column_settings.follow_request": "Rechestas noas de sighidura:",
"notifications.column_settings.mention": "Mèntovos:",
@@ -364,12 +341,7 @@
"poll_button.add_poll": "Agiunghe unu sondàgiu",
"poll_button.remove_poll": "Cantzella su sondàgiu",
"privacy.change": "Modìfica s'istadu de riservadesa",
- "privacy.direct.long": "Visìbile isceti pro is persones mentovadas",
- "privacy.direct.short": "Direct",
- "privacy.private.long": "Visìbile isceti pro chie ti sighit",
- "privacy.private.short": "Followers-only",
"privacy.public.short": "Pùblicu",
- "privacy.unlisted.short": "Esclùidu de sa lista",
"recommended": "Cussigiadu",
"refresh": "Atualiza",
"regeneration_indicator.label": "Carrighende…",
@@ -473,7 +445,6 @@
"upload_form.description": "Descritzione pro persones cun problemas visuales",
"upload_form.edit": "Modìfica",
"upload_form.thumbnail": "Càmbia sa miniadura",
- "upload_form.undo": "Cantzella",
"upload_form.video_description": "Descritzione pro persones cun pèrdida auditiva o problemas visuales",
"upload_modal.analyzing_picture": "Analizende immàgine…",
"upload_modal.apply": "Àplica",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index 0378cd2926e938..ba62c11f71a715 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@@ -74,7 +74,6 @@
"announcement.announcement": "Annooncement",
"attachments_list.unprocessed": "(No processed)",
"audio.hide": "Stow audio",
- "autosuggest_hashtag.per_week": "{count} a week",
"boost_modal.combo": "Ye kin chap {combo} tae dingie this neist tim",
"bundle_column_error.copy_stacktrace": "Copy error report",
"bundle_column_error.error.body": "The requestit page cuidnae be rennert. Hit cuid be doon tae a bug in wir code, or a brooser compatability issue.",
@@ -125,26 +124,14 @@
"compose_form.lock_disclaimer": "Yer accoont isnae {locked}. Awbody kin follae ye for tae luik at yer follaer-ainly posts.",
"compose_form.lock_disclaimer.lock": "lockit",
"compose_form.placeholder": "Whit's on yer mind?",
- "compose_form.poll.add_option": "Pit in a chyce",
"compose_form.poll.duration": "Poll lenth",
- "compose_form.poll.option_placeholder": "Chyce {number}",
- "compose_form.poll.remove_option": "Tak oot this chyce",
"compose_form.poll.switch_to_multiple": "Chynge poll tae alloo multiple chyces",
"compose_form.poll.switch_to_single": "Chynge poll tae alloo fir a single chyce",
- "compose_form.publish": "Publish",
"compose_form.publish_form": "Publish",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Save chynges",
- "compose_form.sensitive.hide": "{count, plural, one {Mairk media as sensitive} other {Mairk media as sensitive}}",
- "compose_form.sensitive.marked": "{count, plural, one {Media is mairkit as sensitive} other {Media is mairkit as sensitive}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Media isnae mairkit as sensitive} other {Media isnae mairkit as sensitive}}",
"compose_form.spoiler.marked": "Tak aff the content warnin",
"compose_form.spoiler.unmarked": "Pit on a content warnin",
- "compose_form.spoiler_placeholder": "Scrieve yer warnin in here",
"confirmation_modal.cancel": "Stap",
- "confirmations.block.block_and_report": "Dingie & Clype",
"confirmations.block.confirm": "Dingie",
- "confirmations.block.message": "Ye shair thit ye'r wantin tae dingie {name}?",
"confirmations.cancel_follow_request.confirm": "Tak back yer request",
"confirmations.cancel_follow_request.message": "Ye shair thit ye'r wantin tae tak back yer request fir tae follae {name}?",
"confirmations.delete.confirm": "Delete",
@@ -153,13 +140,10 @@
"confirmations.delete_list.message": "Ye shair thit ye'r wantin fir tae delete this post fir ever?",
"confirmations.discard_edit_media.confirm": "Fling awa",
"confirmations.discard_edit_media.message": "Ye'v chynges tae the media description or preview thit ye'v no saved, fling them awa onie weys?",
- "confirmations.domain_block.confirm": "Dingie the hail domain",
"confirmations.domain_block.message": "Ye a hunner percent shair thit ye'r wantin tae dingie the hail {domain}? In maist cases a haunfae tairgtit dingies an wheeshts are eneuch an preferit. Ye wullnae see content fae that domain in onie public timelines or in yer notes. Yer follaers fae that domain wull be taen awa.",
"confirmations.logout.confirm": "Log oot",
"confirmations.logout.message": "Ye shair thit ye'r wantin tae log oot?",
"confirmations.mute.confirm": "Wheesht",
- "confirmations.mute.explanation": "This'll hide posts fae them an posts mentionin them, but it'll stull alloo them tae see yer posts an follae ye.",
- "confirmations.mute.message": "Ye sure thit ye'r wantin tae wheesht {name}?",
"confirmations.redraft.confirm": "Delete an stert anew",
"confirmations.reply.confirm": "Reply",
"confirmations.reply.message": "Replyin noo'll owerwrite the message ye'r screivin the noo. Ur ye sure thit ye'r wantin tae dae that?",
@@ -260,7 +244,6 @@
"hashtag.column_settings.tag_toggle": "Pit in mair hashtags fir this column",
"hashtag.follow": "Follae hashtag",
"hashtag.unfollow": "Unfollae hashtag",
- "home.column_settings.basic": "Basic",
"home.column_settings.show_reblogs": "Shaw boosts",
"home.column_settings.show_replies": "Shaw replies",
"home.hide_announcements": "Hide annooncements",
@@ -331,9 +314,6 @@
"load_pending": "{count, plural, one {# new item} other {# new items}}",
"media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
"moved_to_account_banner.text": "Yer accoont {disabledAccount} is disabilt the noo acause ye flittit tae {movedToAccount}.",
- "mute_modal.duration": "Lenth",
- "mute_modal.hide_notifications": "Hide notifications fae this uiser?",
- "mute_modal.indefinite": "Indefinite",
"navigation_bar.about": "Aboot",
"navigation_bar.blocks": "Dingied uisers",
"navigation_bar.bookmarks": "Buikmairks",
@@ -341,7 +321,6 @@
"navigation_bar.compose": "Scrieve new post",
"navigation_bar.discover": "Fin",
"navigation_bar.domain_blocks": "Dingied domains",
- "navigation_bar.edit_profile": "Edit profile",
"navigation_bar.explore": "Splore",
"navigation_bar.filters": "Wheesht wirds",
"navigation_bar.follow_requests": "Follae requests",
@@ -371,9 +350,6 @@
"notifications.column_settings.admin.report": "New reports:",
"notifications.column_settings.admin.sign_up": "New sign-ups:",
"notifications.column_settings.alert": "Desktap notes",
- "notifications.column_settings.filter_bar.advanced": "Shaw aw caitegories",
- "notifications.column_settings.filter_bar.category": "Quick filter baur",
- "notifications.column_settings.filter_bar.show_bar": "Shaw filter baur",
"notifications.column_settings.follow": "New follaers:",
"notifications.column_settings.follow_request": "New follae requests:",
"notifications.column_settings.mention": "Menshies:",
@@ -425,14 +401,7 @@
"poll_button.add_poll": "Dae a poll",
"poll_button.remove_poll": "Tak doon poll",
"privacy.change": "Chynge post privacy",
- "privacy.direct.long": "Ainly menshied uisers kin see this",
- "privacy.direct.short": "Menshied fowk ainly",
- "privacy.private.long": "Ainly follaers kin see this",
- "privacy.private.short": "Ainly follaers",
- "privacy.public.long": "Awbody kin see this",
"privacy.public.short": "Public",
- "privacy.unlisted.long": "Aw kin see this, but optit-oot o discovery features",
- "privacy.unlisted.short": "No listit",
"privacy_policy.last_updated": "Last updatit {date}",
"privacy_policy.title": "Privacy Policy",
"refresh": "Refresh",
@@ -517,7 +486,6 @@
"status.delete": "Delete",
"status.detailed_status": "Detailt conversation view",
"status.edit": "Edit",
- "status.edited": "Editit {date}",
"status.edited_x_times": "Editit {count, plural, one {{count} time} other {{count} times}}",
"status.embed": "Embed",
"status.filter": "Filter this post",
@@ -583,10 +551,8 @@
"upload_error.poll": "File upload isnae allooed wi polls.",
"upload_form.audio_description": "Describe fir fowk wi hearin loss",
"upload_form.description": "Describe fir thaim wi visual impairments",
- "upload_form.description_missing": "Nae description addit",
"upload_form.edit": "Edit",
"upload_form.thumbnail": "Chynge thoomnail",
- "upload_form.undo": "Delete",
"upload_form.video_description": "Describe fir fowk wi hearin loss or wi visual impairment",
"upload_modal.analyzing_picture": "Analyzin picture…",
"upload_modal.apply": "Apply",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index c2d2a41cc50808..ccbface05ae031 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -18,6 +18,7 @@
"account.edit_profile": "පැතිකඩ සංස්කරණය",
"account.enable_notifications": "@{name} පළ කරන විට මට දැනුම් දෙන්න",
"account.endorse": "පැතිකඩෙහි විශේෂාංගය",
+ "account.featured_tags.last_status_at": "අවසාන ලිපිය: {date}",
"account.featured_tags.last_status_never": "ලිපි නැත",
"account.follow": "අනුගමනය",
"account.followers": "අනුගාමිකයින්",
@@ -53,7 +54,6 @@
"alert.unexpected.title": "අපොයි!",
"announcement.announcement": "නිවේදනය",
"audio.hide": "හඬපටය සඟවන්න",
- "autosuggest_hashtag.per_week": "සතියකට {count}",
"boost_modal.combo": "ඊළඟ වතාවේ මෙය මඟ හැරීමට {combo} එබීමට හැකිය",
"bundle_column_error.copy_stacktrace": "දෝෂ වාර්තාවේ පිටපතක්",
"bundle_column_error.error.title": "අපොයි!",
@@ -102,35 +102,25 @@
"compose_form.encryption_warning": "මාස්ටඩන් වෙත පළ කරන දෑ අන්ත සංකේතනයෙන් ආරක්ෂා නොවේ. මාස්ටඩන් හරහා කිසිදු සංවේදී තොරතුරක් බෙදා නොගන්න.",
"compose_form.lock_disclaimer.lock": "අගුළු දමා ඇත",
"compose_form.placeholder": "ඔබගේ සිතුවිලි මොනවාද?",
- "compose_form.poll.add_option": "තේරීමක් යොදන්න",
"compose_form.poll.duration": "මත විමසීමේ කාලය",
- "compose_form.poll.option_placeholder": "තේරීම {number}",
- "compose_form.poll.remove_option": "මෙම ඉවත් කරන්න",
"compose_form.poll.switch_to_multiple": "තේරීම් කිහිපයකට මත විමසුම වෙනස් කරන්න",
"compose_form.poll.switch_to_single": "තනි තේරීමකට මත විමසුම වෙනස් කරන්න",
"compose_form.publish": "ප්රකාශනය",
"compose_form.publish_form": "නව ලිපිය",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "වෙනස්කම් සුරකින්න",
"compose_form.spoiler.marked": "අන්තර්ගත අවවාදය ඉවත් කරන්න",
"compose_form.spoiler.unmarked": "අන්තර්ගත අවවාදයක් එක් කරන්න",
- "compose_form.spoiler_placeholder": "අවවාදය මෙහි ලියන්න",
"confirmation_modal.cancel": "අවලංගු",
- "confirmations.block.block_and_report": "අවහිර කර වාර්තා කරන්න",
"confirmations.block.confirm": "අවහිර",
- "confirmations.block.message": "ඔබට {name} අවහිර කිරීමට වුවමනා ද?",
"confirmations.delete.confirm": "මකන්න",
"confirmations.delete.message": "ඔබට මෙම ලිපිය මැකීමට වුවමනා ද?",
"confirmations.delete_list.confirm": "මකන්න",
"confirmations.delete_list.message": "ඔබට මෙම ලැයිස්තුව සදහටම මැකීමට වුවමනා ද?",
"confirmations.discard_edit_media.confirm": "ඉවත ලන්න",
"confirmations.discard_edit_media.message": "ඔබට මාධ්ය විස්තරයට හෝ පෙරදසුනට නොසුරකින ලද වෙනස්කම් තිබේ, කෙසේ වෙතත් ඒවා ඉවත දමන්නද?",
- "confirmations.domain_block.confirm": "සම්පූර්ණ වසම අවහිර කරන්න",
"confirmations.edit.confirm": "සංස්කරණය",
"confirmations.logout.confirm": "නික්මෙන්න",
"confirmations.logout.message": "ඔබට නික්මෙන්න අවශ්ය බව විශ්වාසද?",
"confirmations.mute.confirm": "නිශ්ශබ්ද",
- "confirmations.mute.message": "{name} නිහඬ කිරීමට වුවමනා ද?",
"confirmations.reply.confirm": "පිළිතුර",
"conversation.delete": "සංවාදය මකන්න",
"conversation.mark_as_read": "කියවූ බව යොදන්න",
@@ -166,6 +156,7 @@
"empty_column.bookmarked_statuses": "ඔබ සතුව පොත්යොමු තබන ලද ලිපි කිසිවක් නැත. ඔබ පොත්යොමුවක් තබන විට, එය මෙහි දිස්වනු ඇත.",
"empty_column.domain_blocks": "අවහිර කරන ලද වසම් නැත.",
"empty_column.explore_statuses": "දැන් කිසිවක් නැඹුරු නොවේ. පසුව නැවත පරීක්ෂා කරන්න!",
+ "empty_column.favourited_statuses": "ඔබ සතුව ප්රියතම ලිපි කිසිවක් නැත. ඔබ යමකට ප්රිය කළ විට එය මෙහි පෙන්වනු ඇත.",
"empty_column.follow_requests": "ඔබට තවමත් අනුගමන ඉල්ලීම් ලැබී නැත. ඉල්ලීමක් ලැබුණු විට, එය මෙහි පෙන්වනු ඇත.",
"empty_column.home": "මුල් පිටුව හිස් ය! මෙය පිරවීමට බොහෝ පුද්ගලයින් අනුගමනය කරන්න.",
"empty_column.lists": "ඔබට තවමත් ලැයිස්තු කිසිවක් නැත. ඔබ එකක් සාදන විට, එය මෙහි පෙන්වනු ඇත.",
@@ -209,11 +200,7 @@
"hashtag.column_settings.tag_mode.all": "මේ සියල්ලම",
"hashtag.column_settings.tag_mode.none": "මේ කිසිවක් නැත",
"hashtag.column_settings.tag_toggle": "මෙම තීරුවේ අමතර ටැග් ඇතුළත් කරන්න",
- "home.actions.go_to_explore": "නැගී එන දෑ බලන්න",
- "home.actions.go_to_suggestions": "පුද්ගලයින් සොයන්න",
- "home.column_settings.basic": "මූලික",
"home.column_settings.show_replies": "පිළිතුරු පෙන්වන්න",
- "home.explore_prompt.title": "මෙය ඔබගේ මාස්ටඩන් මුල් පිටුවයි.",
"home.hide_announcements": "නිවේදන සඟවන්න",
"home.pending_critical_update.link": "යාවත්කාල බලන්න",
"home.show_announcements": "නිවේදන පෙන්වන්න",
@@ -221,6 +208,7 @@
"interaction_modal.on_this_server": "මෙම සේවාදායකයෙහි",
"interaction_modal.title.favourite": "{name}ගේ ලිපිය ප්රිය කරන්න",
"interaction_modal.title.follow": "{name} අනුගමනය",
+ "interaction_modal.title.reply": "{name}ගේ ලිපියට පිළිතුරු",
"intervals.full.days": "{number, plural, one {දවස් #} other {දවස් #}}",
"intervals.full.hours": "{number, plural, one {පැය #} other {පැය #}}",
"intervals.full.minutes": "{number, plural, one {විනාඩි #} other {විනාඩි #}}",
@@ -255,13 +243,12 @@
"lists.delete": "ලැයිස්තුව මකන්න",
"lists.edit": "ලැයිස්තුව සංස්කරණය",
"lists.edit.submit": "සිරැසිය සංශෝධනය",
+ "lists.new.create": "එකතු",
"lists.new.title_placeholder": "නව ලැයිස්තුවේ සිරැසිය",
"lists.replies_policy.list": "ලැයිස්තුවේ සාමාජිකයින්",
"lists.replies_policy.none": "කිසිවෙක් නැත",
"lists.replies_policy.title": "පිළිතුරු පෙන්වන්න:",
"lists.subheading": "ඔබගේ ලැයිස්තු",
- "mute_modal.duration": "පරාසය",
- "mute_modal.hide_notifications": "මෙම පුද්ගලයාගේ දැනුම්දීම් සඟවන්නද?",
"navigation_bar.about": "පිළිබඳව",
"navigation_bar.blocks": "අවහිර කළ අය",
"navigation_bar.bookmarks": "පොත්යොමු",
@@ -269,7 +256,6 @@
"navigation_bar.compose": "නව ලිපියක් ලියන්න",
"navigation_bar.direct": "පෞද්ගලික සැඳහුම්",
"navigation_bar.domain_blocks": "අවහිර කළ වසම්",
- "navigation_bar.edit_profile": "පැතිකඩ සංස්කරණය",
"navigation_bar.explore": "ගවේශනය",
"navigation_bar.favourites": "ප්රියතමයන්",
"navigation_bar.filters": "නිහඬ කළ වචන",
@@ -285,6 +271,7 @@
"navigation_bar.search": "සොයන්න",
"navigation_bar.security": "ආරක්ෂාව",
"not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+ "notification.favourite": "{name} ඔබගේ ලිපියට ප්රිය කළා",
"notification.follow": "{name} ඔබව අනුගමනය කළා",
"notification.mention": "{name} ඔබව සඳහන් කර ඇත",
"notification.own_poll": "ඔබගේ මත විමසුම නිමයි",
@@ -297,9 +284,6 @@
"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.filter_bar.show_bar": "පෙරහන් තීරුව පෙන්වන්න",
"notifications.column_settings.follow": "නව අනුගාමිකයින්:",
"notifications.column_settings.follow_request": "නව අනුගමන ඉල්ලීම්:",
"notifications.column_settings.mention": "සැඳහුම්:",
@@ -335,11 +319,6 @@
"poll_button.add_poll": "මත විමසුමක් අරඹන්න",
"poll_button.remove_poll": "මත විමසුම ඉවතලන්න",
"privacy.change": "ලිපියේ රහස්යතාව සංශෝධනය",
- "privacy.direct.long": "සඳහන් කළ අයට දිස්වෙයි",
- "privacy.direct.short": "සඳහන් කළ අයට පමණි",
- "privacy.private.long": "අනුගාමිකයින්ට දිස්වේ",
- "privacy.private.short": "අනුගාමිකයින් පමණි",
- "privacy.public.long": "සැමට දිස්වෙයි",
"privacy.public.short": "ප්රසිද්ධ",
"privacy_policy.title": "රහස්යතා ප්රතිපත්තිය",
"refresh": "නැවුම් කරන්න",
@@ -422,10 +401,10 @@
"status.admin_status": "මෙම ලිපිය මැදිහත්කරණ අතුරුමුහුණතෙහි අරින්න",
"status.block": "@{name} අවහිර",
"status.bookmark": "පොත්යොමුවක්",
+ "status.copy": "ලිපියට සබැඳියේ පිටපතක්",
"status.delete": "මකන්න",
"status.detailed_status": "විස්තරාත්මක සංවාද දැක්ම",
"status.edit": "සංස්කරණය",
- "status.edited": "සංශෝධිතයි {date}",
"status.edited_x_times": "සංශෝධිතයි {count, plural, one {වාර {count}} other {වාර {count}}}",
"status.embed": "කාවැද්දූ",
"status.filter": "මෙම ලිපිය පෙරන්න",
@@ -481,10 +460,8 @@
"upload_error.poll": "මත විමසුම් සමඟ ගොනු යෙදීමට ඉඩ නොදේ.",
"upload_form.audio_description": "නොඇසෙන අය සඳහා විස්තර කරන්න",
"upload_form.description": "දෘශ්යාබාධිතයන් සඳහා විස්තර කරන්න",
- "upload_form.description_missing": "සවිස්තරයක් නැත",
"upload_form.edit": "සංස්කරණය",
"upload_form.thumbnail": "සිඟිති රුව වෙනස් කරන්න",
- "upload_form.undo": "මකන්න",
"upload_form.video_description": "ශ්රවණාබාධ හෝ දෘශ්යාබාධිත පුද්ගලයන් සඳහා විස්තර කරන්න",
"upload_modal.analyzing_picture": "පින්තූරය විශ්ලේෂණය කරමින්…",
"upload_modal.apply": "යොදන්න",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 3e41a2035a0046..c583b58220ead8 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -1,745 +1,774 @@
{
"about.blocks": "Moderované servery",
"about.contact": "Kontakt:",
- "about.disclaimer": "Mastodon je bezplatný softvér s otvoreným zdrojovým kódom a ochranná známka spoločnosti Mastodon gGmbH.",
- "about.domain_blocks.no_reason_available": "Dôvod nie je k dispozícii",
- "about.domain_blocks.preamble": "Mastodon vo všeobecnosti umožňuje prezerať obsah a komunikovať s používateľmi z akéhokoľvek iného servera vo fediverse. Toto sú výnimky, ktoré boli urobené na tomto konkrétnom serveri.",
- "about.domain_blocks.silenced.explanation": "Vo všeobecnosti neuvidíte profily a obsah z tohto servera, pokiaľ si ho nevyhľadáte alebo sa neprihlásite k jeho sledovaniu.",
- "about.domain_blocks.silenced.title": "Obmedzená",
+ "about.disclaimer": "Mastodon je bezplatný open-source softvér s otvoreným zdrojovým kódom a ochranná známka spoločnosti Mastodon gGmbH.",
+ "about.domain_blocks.no_reason_available": "Dôvod nebol uvedený",
+ "about.domain_blocks.preamble": "Mastodon vo všeobecnosti umožňuje prezerať obsah a komunikovať s používateľmi z akéhokoľvek iného servera vo fediverze. Tu sú uvedené výnimky, ktoré boli urobené na tomto konkrétnom serveri.",
+ "about.domain_blocks.silenced.explanation": "Vo všeobecnosti neuvidíte profily a obsah z tohto servera, pokiaľ si ich nevyhľadáte alebo sa neprihlásite k ich sledovaniu.",
+ "about.domain_blocks.silenced.title": "Obmedzený",
"about.domain_blocks.suspended.explanation": "Žiadne údaje z tohto servera nebudú spracovávané, ukladané ani vymieňané, čo znemožní akúkoľvek interakciu alebo komunikáciu s používateľmi z tohto servera.",
- "about.domain_blocks.suspended.title": "Vylúčená",
+ "about.domain_blocks.suspended.title": "Vylúčený",
"about.not_available": "Tieto informácie neboli sprístupnené na tomto serveri.",
- "about.powered_by": "Decentralizované sociálne médiá poháňané technológiou {mastodon}",
+ "about.powered_by": "Decentralizovaná sociálna sieť na základe technológie {mastodon}",
"about.rules": "Pravidlá servera",
"account.account_note_header": "Poznámka",
- "account.add_or_remove_from_list": "Pridaj alebo odober zo zoznamov",
+ "account.add_or_remove_from_list": "Pridať alebo odobrať zo zoznamov",
"account.badges.bot": "Bot",
"account.badges.group": "Skupina",
- "account.block": "Blokuj @{name}",
- "account.block_domain": "Skry všetko z {domain}",
- "account.block_short": "Blokuj",
- "account.blocked": "Blokovaný/á",
- "account.browse_more_on_origin_server": "Prehľadávaj viac na pôvodnom profile",
- "account.cancel_follow_request": "Zruš žiadosť o sledovanie",
- "account.copy": "Skopíruj odkaz na profil",
- "account.direct": "Spomeň @{name} súkromne",
- "account.disable_notifications": "Prestaň mi oznamovať, keď má @{name} príspevky",
- "account.domain_blocked": "Doména skrytá",
- "account.edit_profile": "Uprav profil",
- "account.enable_notifications": "Oznamuj mi, keď má @{name} príspevky",
- "account.endorse": "Zobrazuj na profile",
+ "account.block": "Blokovať @{name}",
+ "account.block_domain": "Blokovať doménu {domain}",
+ "account.block_short": "Blokovať",
+ "account.blocked": "Účet blokovaný",
+ "account.browse_more_on_origin_server": "Zobraziť viac na pôvodnom profile",
+ "account.cancel_follow_request": "Zrušiť žiadosť o sledovanie",
+ "account.copy": "Skopírovať odkaz na profil",
+ "account.direct": "Súkromne označiť @{name}",
+ "account.disable_notifications": "Zrušiť upozornenia na príspevky od @{name}",
+ "account.domain_blocked": "Doména blokovaná",
+ "account.edit_profile": "Upraviť profil",
+ "account.enable_notifications": "Zapnúť upozornenia na príspevky od @{name}",
+ "account.endorse": "Zobraziť na vlastnom profile",
"account.featured_tags.last_status_at": "Posledný príspevok dňa {date}",
"account.featured_tags.last_status_never": "Žiadne príspevky",
- "account.featured_tags.title": "Odporúčané hashtagy používateľa {name}",
- "account.follow": "Sleduj",
- "account.follow_back": "Nasleduj späť",
+ "account.featured_tags.title": "Odporúčané hashtagy účtu {name}",
+ "account.follow": "Sledovať",
+ "account.follow_back": "Sledovať späť",
"account.followers": "Sledovatelia",
- "account.followers.empty": "Tohto používateľa ešte nikto nenasleduje.",
- "account.followers_counter": "{count, plural, one {{counter} Sledujúci} few {{counter} Sledujúci} many {{counter} Sledujúcich} other {{counter} Sledujúcich}}",
- "account.following": "Sledujem",
- "account.following_counter": "{count, plural, one {{counter} Sledovaných} other {{counter} Sledujúcich}}",
- "account.follows.empty": "Tento používateľ ešte nikoho nesleduje.",
- "account.go_to_profile": "Prejdi na profil",
- "account.hide_reblogs": "Skry zdieľania od @{name}",
- "account.in_memoriam": "In Memoriam.",
- "account.joined_short": "Pridal/a sa",
+ "account.followers.empty": "Tento účet ešte nikto nesleduje.",
+ "account.followers_counter": "{count, plural, one {{counter} sledujúci účet} few {{counter} sledujúce účty} many {{counter} sledujúcich účtov} other {{counter} sledujúcich účtov}}",
+ "account.following": "Sledovaný účet",
+ "account.following_counter": "{count, plural, one {{counter} sledovaný účet} few {{counter} sledované účty} many {{counter} sledovaných účtov} other {{counter} sledovaných účtov}}",
+ "account.follows.empty": "Tento účet ešte nikoho nesleduje.",
+ "account.go_to_profile": "Prejsť na profil",
+ "account.hide_reblogs": "Skryť zdieľania od @{name}",
+ "account.in_memoriam": "In memoriam.",
+ "account.joined_short": "Dátum registrácie",
"account.languages": "Zmeniť odoberané jazyky",
"account.link_verified_on": "Vlastníctvo tohto odkazu bolo skontrolované {date}",
"account.locked_info": "Stav súkromia pre tento účet je nastavený na zamknutý. Jeho vlastník sa sám rozhoduje, kto ho môže sledovať.",
"account.media": "Médiá",
- "account.mention": "Spomeň @{name}",
- "account.moved_to": "{name} uvádza, že jeho/jej nový účet je teraz:",
- "account.mute": "Stíš @{name}",
- "account.mute_notifications_short": "Stíš oznámenia",
- "account.mute_short": "Stíš",
- "account.muted": "Stíšený",
+ "account.mention": "Označiť @{name}",
+ "account.moved_to": "{name} uvádza, že má nový účet:",
+ "account.mute": "Stíšiť @{name}",
+ "account.mute_notifications_short": "Stíšiť upozornenia",
+ "account.mute_short": "Stíšiť",
+ "account.muted": "Účet stíšený",
"account.mutual": "Spoločné",
"account.no_bio": "Nie je uvedený žiadny popis.",
- "account.open_original_page": "Otvor pôvodnú stránku",
+ "account.open_original_page": "Otvoriť pôvodnú stránku",
"account.posts": "Príspevky",
"account.posts_with_replies": "Príspevky a odpovede",
- "account.report": "Nahlás @{name}",
- "account.requested": "Čaká na schválenie. Klikni pre zrušenie žiadosti",
- "account.requested_follow": "{name} ti poslal žiadosť na sledovanie",
- "account.share": "Zdieľaj @{name} profil",
- "account.show_reblogs": "Ukáž vyzdvihnutia od @{name}",
- "account.statuses_counter": "{count, plural, one {{counter} príspevok} other {{counter} príspevkov}}",
- "account.unblock": "Odblokuj @{name}",
- "account.unblock_domain": "Prestaň skrývať {domain}",
- "account.unblock_short": "Odblokuj",
- "account.unendorse": "Nezobrazuj na profile",
- "account.unfollow": "Prestaň nasledovať",
- "account.unmute": "Prestaň ignorovať @{name}",
- "account.unmute_notifications_short": "Zruš nevšímanie si obznámení",
- "account.unmute_short": "Zruš nevšímanie",
- "account_note.placeholder": "Klikni pre vloženie poznámky",
+ "account.report": "Nahlásiť @{name}",
+ "account.requested": "Čaká na schválenie. Žiadosť zrušíte kliknutím sem",
+ "account.requested_follow": "{name} vás chce sledovať",
+ "account.share": "Zdieľaj profil @{name}",
+ "account.show_reblogs": "Zobrazovať zdieľania od @{name}",
+ "account.statuses_counter": "{count, plural, one {{counter} príspevok} few {{counter} príspevky} many {{counter} príspevkov} other {{counter} príspevkov}}",
+ "account.unblock": "Odblokovať @{name}",
+ "account.unblock_domain": "Odblokovať doménu {domain}",
+ "account.unblock_short": "Odblokovať",
+ "account.unendorse": "Nezobrazovať na vlastnom profile",
+ "account.unfollow": "Zrušiť sledovanie",
+ "account.unmute": "Vypnúť stíšenie @{name}",
+ "account.unmute_notifications_short": "Vypnúť stíšenie upozornení",
+ "account.unmute_short": "Zrušiť stíšenie",
+ "account_note.placeholder": "Kliknutím pridať poznámku",
"admin.dashboard.daily_retention": "Miera udržania používateľov podľa dňa po registrácii",
"admin.dashboard.monthly_retention": "Miera udržania používateľov podľa mesiaca po registrácii",
"admin.dashboard.retention.average": "Priemer",
- "admin.dashboard.retention.cohort": "Mesiac zaregistrovania sa",
- "admin.dashboard.retention.cohort_size": "Noví užívatelia",
+ "admin.dashboard.retention.cohort": "Dátum registrácie",
+ "admin.dashboard.retention.cohort_size": "Nové účty",
"admin.impact_report.instance_accounts": "Profily účtov, ktoré by boli odstránené",
"admin.impact_report.instance_followers": "Sledovatelia, o ktorých by naši používatelia prišli",
"admin.impact_report.instance_follows": "Sledovatelia, o ktorých by ich používatelia prišli",
"admin.impact_report.title": "Zhrnutie dopadu",
- "alert.rate_limited.message": "Prosím, skús to znova za {retry_time, time, medium}.",
- "alert.rate_limited.title": "Tempo obmedzené",
+ "alert.rate_limited.message": "Prosím, skúste to znova o {retry_time, time, medium}.",
+ "alert.rate_limited.title": "Priveľa žiadostí",
"alert.unexpected.message": "Vyskytla sa nečakaná chyba.",
"alert.unexpected.title": "Ups!",
"announcement.announcement": "Oznámenie",
"attachments_list.unprocessed": "(nespracované)",
- "audio.hide": "Skry zvuk",
- "autosuggest_hashtag.per_week": "{count} týždenne",
- "boost_modal.combo": "Nabudúce môžeš kliknúť {combo} pre preskočenie",
+ "audio.hide": "Skryť zvuk",
+ "block_modal.show_less": "Zobraziť menej",
+ "block_modal.show_more": "Zobraziť viac",
+ "block_modal.title": "Blokovať užívateľa?",
+ "boost_modal.combo": "Nabudúce môžete preskočiť stlačením {combo}",
"bundle_column_error.copy_stacktrace": "Kopírovať chybovú hlášku",
"bundle_column_error.error.body": "Požadovanú stránku nebolo možné vykresliť. Môže to byť spôsobené chybou v našom kóde alebo problémom s kompatibilitou prehliadača.",
"bundle_column_error.error.title": "Ale nie!",
- "bundle_column_error.network.body": "Pri pokuse o načítanie tejto stránky sa vyskytla chyba. Môže to byť spôsobené dočasným problémom s Vaším internetovým pripojením alebo týmto serverom.",
+ "bundle_column_error.network.body": "Pri pokuse o načítanie tejto stránky sa vyskytla chyba. Môže to byť spôsobené dočasným problémom s vaším internetovým pripojením alebo týmto serverom.",
"bundle_column_error.network.title": "Chyba siete",
- "bundle_column_error.retry": "Skús to znova",
- "bundle_column_error.return": "Prejdi späť na domovskú stránku",
- "bundle_column_error.routing.body": "Žiadaná stránka nebola nájdená. Ste si istý, že zadaná adresa URL je správna?",
+ "bundle_column_error.retry": "Skúste to znova",
+ "bundle_column_error.return": "Prejdite späť na domovskú stránku",
+ "bundle_column_error.routing.body": "Žiadaná stránka nebola nájdená. Ste si istí, že zadaná adresa URL je správna?",
"bundle_column_error.routing.title": "404",
- "bundle_modal_error.close": "Zatvor",
- "bundle_modal_error.message": "Nastala chyba pri načítaní tohto komponentu.",
+ "bundle_modal_error.close": "Zatvoriť",
+ "bundle_modal_error.message": "Pri načítavaní tohto komponentu nastala chyba.",
"bundle_modal_error.retry": "Skúsiť znova",
"closed_registrations.other_server_instructions": "Keďže Mastodon je decentralizovaný, môžete si vytvoriť účet na inom serveri a stále komunikovať s týmto serverom.",
- "closed_registrations_modal.description": "Vytvorenie účtu na {domain} nie je v súčasnosti možné, ale majte prosím na pamäti, že nepotrebujete účet práve na {domain}, aby bolo možné používať Mastodon.",
- "closed_registrations_modal.find_another_server": "Nájdi iný server",
+ "closed_registrations_modal.description": "Vytvorenie účtu na {domain} nie je v súčasnosti možné, ale myslite na to, že na používanie Mastodonu nepotrebujete účet práve na {domain}.",
+ "closed_registrations_modal.find_another_server": "Nájsť iný server",
"closed_registrations_modal.preamble": "Mastodon je decentralizovaný, takže bez ohľadu na to, kde si vytvoríte účet, budete môcť sledovať a komunikovať s kýmkoľvek na tomto serveri. Môžete ho dokonca hostiť sami!",
- "closed_registrations_modal.title": "Registrácia na Mastodon",
+ "closed_registrations_modal.title": "Registrácia na Mastodone",
"column.about": "O tomto serveri",
- "column.blocks": "Blokovaní užívatelia",
+ "column.blocks": "Blokované účty",
"column.bookmarks": "Záložky",
"column.community": "Miestna časová os",
- "column.direct": "Súkromné spomenutia",
- "column.directory": "Prehľadávaj profily",
- "column.domain_blocks": "Skryté domény",
+ "column.direct": "Súkromné označenia",
+ "column.directory": "Prehľadávať profily",
+ "column.domain_blocks": "Blokované domény",
"column.favourites": "Obľúbené",
"column.firehose": "Živé kanály",
"column.follow_requests": "Žiadosti o sledovanie",
"column.home": "Domov",
"column.lists": "Zoznamy",
- "column.mutes": "Nevšímaní užívatelia",
- "column.notifications": "Oznámenia",
+ "column.mutes": "Stíšené účty",
+ "column.notifications": "Upozornenia",
"column.pins": "Pripnuté príspevky",
"column.public": "Federovaná časová os",
"column_back_button.label": "Späť",
"column_header.hide_settings": "Skryť nastavenia",
- "column_header.moveLeft_settings": "Presuň stĺpec doľava",
- "column_header.moveRight_settings": "Presuň stĺpec doprava",
- "column_header.pin": "Pripni",
- "column_header.show_settings": "Ukáž nastavenia",
- "column_header.unpin": "Odopni",
+ "column_header.moveLeft_settings": "Presunúť stĺpec doľava",
+ "column_header.moveRight_settings": "Presunúť stĺpec doprava",
+ "column_header.pin": "Pripnúť",
+ "column_header.show_settings": "Zobraziť nastavenia",
+ "column_header.unpin": "Odopnúť",
"column_subheading.settings": "Nastavenia",
- "community.column_settings.local_only": "Iba miestna",
+ "community.column_settings.local_only": "Iba miestne",
"community.column_settings.media_only": "Iba médiá",
- "community.column_settings.remote_only": "Iba odľahlé",
- "compose.language.change": "Zmeň jazyk",
- "compose.language.search": "Hľadaj medzi jazykmi...",
+ "community.column_settings.remote_only": "Iba vzdialené",
+ "compose.language.change": "Zmeniť jazyk",
+ "compose.language.search": "Vyhľadávať jazyky…",
"compose.published.body": "Príspevok zverejnený.",
- "compose.published.open": "Otvor",
+ "compose.published.open": "Otvoriť",
"compose.saved.body": "Príspevok uložený.",
- "compose_form.direct_message_warning_learn_more": "Zisti viac",
- "compose_form.encryption_warning": "Príspevky na Mastodon nie sú end-to-end šifrované. Nezdieľajte cez Mastodon žiadne citlivé informácie.",
- "compose_form.hashtag_warning": "Tento príspevok nebude zobrazený pod žiadným haštagom, lebo nieje verejne listovaný. Iba verejné príspevky môžu byť nájdené podľa haštagu.",
- "compose_form.lock_disclaimer": "Tvoj účet nie je {locked}. Ktokoľvek ťa môže nasledovať a vidieť tvoje správy pre sledujúcich.",
+ "compose_form.direct_message_warning_learn_more": "Viac informácií",
+ "compose_form.encryption_warning": "Príspevky na Mastodone nie sú šifrované end-to-end. Nezdieľajte cez Mastodon žiadne citlivé informácie.",
+ "compose_form.hashtag_warning": "Tento príspevok nebude zobrazený pod žiadným hashtagom, lebo nie je verejný. Iba verejné príspevky môžu byť nájdené podľa hashtagu.",
+ "compose_form.lock_disclaimer": "Váš účet nie je {locked}. Ktokoľvek vás môže sledovať a vidieť vaše príspevky pre sledujúcich.",
"compose_form.lock_disclaimer.lock": "zamknutý",
- "compose_form.placeholder": "Čo máš na mysli?",
- "compose_form.poll.add_option": "Pridaj voľbu",
+ "compose_form.placeholder": "Na čo práve myslíte?",
"compose_form.poll.duration": "Trvanie ankety",
- "compose_form.poll.option_placeholder": "Voľba {number}",
- "compose_form.poll.remove_option": "Odstráň túto voľbu",
- "compose_form.poll.switch_to_multiple": "Zmeň anketu pre povolenie viacerých možností",
- "compose_form.poll.switch_to_single": "Zmeň anketu na takú s jedinou voľbou",
- "compose_form.publish": "Zverejni",
- "compose_form.publish_form": "Zverejniť",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Ulož zmeny",
- "compose_form.sensitive.hide": "Označ médiá ako chúlostivé",
- "compose_form.sensitive.marked": "Médiálny obsah je označený ako chúlostivý",
- "compose_form.sensitive.unmarked": "Médiálny obsah nieje označený ako chúlostivý",
- "compose_form.spoiler.marked": "Text je ukrytý za varovaním",
- "compose_form.spoiler.unmarked": "Text nieje ukrytý",
- "compose_form.spoiler_placeholder": "Sem napíš tvoje varovanie",
+ "compose_form.poll.multiple": "Viacero možností",
+ "compose_form.poll.option_placeholder": "Možnosť {number}",
+ "compose_form.poll.single": "Jediný výber",
+ "compose_form.poll.switch_to_multiple": "Zmeniť anketu a povoliť viaceré možnosti",
+ "compose_form.poll.switch_to_single": "Zmeniť anketu na jediný povolený výber",
+ "compose_form.poll.type": "Typ",
+ "compose_form.publish": "Uverejniť",
+ "compose_form.publish_form": "Nový príspevok",
+ "compose_form.reply": "Odpovedať",
+ "compose_form.save_changes": "Aktualizovať",
+ "compose_form.spoiler.marked": "Odstrániť varovanie o obsahu",
+ "compose_form.spoiler.unmarked": "Pridať varovanie o obsahu",
+ "compose_form.spoiler_placeholder": "Varovanie o obsahu (voliteľné)",
"confirmation_modal.cancel": "Zruš",
- "confirmations.block.block_and_report": "Zablokuj a nahlás",
- "confirmations.block.confirm": "Blokuj",
- "confirmations.block.message": "Si si istý/á, že chceš blokovať {name}?",
- "confirmations.cancel_follow_request.confirm": "Odvolanie žiadosti",
- "confirmations.cancel_follow_request.message": "Naozaj chcete stiahnuť svoju žiadosť o sledovanie {name}?",
- "confirmations.delete.confirm": "Vymaž",
- "confirmations.delete.message": "Si si istý/á, že chceš vymazať túto správu?",
- "confirmations.delete_list.confirm": "Vymaž",
- "confirmations.delete_list.message": "Si si istý/á, že chceš natrvalo vymazať tento zoznam?",
- "confirmations.discard_edit_media.confirm": "Zahoď",
+ "confirmations.block.confirm": "Zablokovať",
+ "confirmations.cancel_follow_request.confirm": "Stiahnuť žiadosť",
+ "confirmations.cancel_follow_request.message": "Určite chcete stiahnuť svoju žiadosť o sledovanie {name}?",
+ "confirmations.delete.confirm": "Vymazať",
+ "confirmations.delete.message": "Určite chcete tento príspevok vymazať?",
+ "confirmations.delete_list.confirm": "Vymazať",
+ "confirmations.delete_list.message": "Určite chcete tento zoznam trvalo vymazať?",
+ "confirmations.discard_edit_media.confirm": "Zahodiť",
"confirmations.discard_edit_media.message": "Máte neuložené zmeny v popise alebo náhľade média, zahodiť ich aj tak?",
- "confirmations.domain_block.confirm": "Skry celú doménu",
- "confirmations.domain_block.message": "Si si naozaj istý/á, že chceš blokovať celú doménu {domain}? Vo väčšine prípadov stačí blokovať alebo ignorovať pár konkrétnych užívateľov, čo sa doporučuje. Neuvidíš obsah z tejto domény v žiadnej verejnej časovej osi, ani v oznámeniach. Tvoji následovníci pochádzajúci z tejto domény budú odstránení.",
- "confirmations.edit.confirm": "Uprav",
- "confirmations.edit.message": "Úpravou teraz prepíšeš správu, ktorú práve zostavuješ. Si si istý/á, že chceš pokračovať?",
- "confirmations.logout.confirm": "Odhlás sa",
- "confirmations.logout.message": "Si si istý/á, že sa chceš odhlásiť?",
- "confirmations.mute.confirm": "Nevšímaj si",
- "confirmations.mute.explanation": "Toto nastavenie skryje ich príspevky, alebo príspevky od iných v ktorých sú spomenutí, ale umožní im vidieť tvoje príspevky, aj ťa nasledovať.",
- "confirmations.mute.message": "Naozaj si chceš nevšímať {name}?",
- "confirmations.redraft.confirm": "Vyčisti a prepíš",
- "confirmations.redraft.message": "Ste si istý, že chcete premazať a prepísať tento príspevok? Jeho nadobudnuté vyzdvihnutia a obľúbenia, ale i odpovede na pôvodný príspevok budú odlúčené.",
- "confirmations.reply.confirm": "Odpovedz",
+ "confirmations.domain_block.confirm": "Blokovať server",
+ "confirmations.domain_block.message": "Určite chcete blokovať celú doménu {domain}? Vo väčšine prípadov stačí blokovať alebo ignorovať pár konkrétnych účtov, čo aj odporúčame. Obsah z tejto domény neuvidíte v žiadnej verejnej časovej osi ani v upozorneniach. Vaši sledujúci pochádzajúci z tejto domény budú odstránení.",
+ "confirmations.edit.confirm": "Upraviť",
+ "confirmations.edit.message": "Úpravou prepíšete príspevok, ktorý máte rozpísaný. Určite chcete pokračovať?",
+ "confirmations.logout.confirm": "Odhlásiť sa",
+ "confirmations.logout.message": "Určite sa chcete odhlásiť?",
+ "confirmations.mute.confirm": "Stíšiť",
+ "confirmations.redraft.confirm": "Vymazať a prepísať",
+ "confirmations.redraft.message": "Určite chcete tento príspevok vymazať a prepísať? Prídete o jeho zdieľania a ohviezdičkovania a odpovede na pôvodný príspevok budú odlúčené.",
+ "confirmations.reply.confirm": "Odpovedať",
"confirmations.reply.message": "Odpovedaním akurát teraz prepíšeš správu, ktorú máš práve rozpísanú. Si si istý/á, že chceš pokračovať?",
- "confirmations.unfollow.confirm": "Prestaň sledovať",
- "confirmations.unfollow.message": "Naozaj chceš prestať sledovať {name}?",
- "conversation.delete": "Vymaž konverzáciu",
- "conversation.mark_as_read": "Označ za prečítané",
- "conversation.open": "Ukáž konverzáciu",
+ "confirmations.unfollow.confirm": "Prestať sledovať",
+ "confirmations.unfollow.message": "Určite chcete prestať sledovať {name}?",
+ "conversation.delete": "Vymazať konverzáciu",
+ "conversation.mark_as_read": "Označiť ako prečítanú",
+ "conversation.open": "Zobraziť konverzáciu",
"conversation.with": "S {names}",
- "copy_icon_button.copied": "Skopírovaný do schránky",
+ "copy_icon_button.copied": "Skopírované do schránky",
"copypaste.copied": "Skopírované",
- "copypaste.copy_to_clipboard": "Skopíruj do schránky",
- "directory.federated": "Zo známého fedivesmíru",
+ "copypaste.copy_to_clipboard": "Skopírovať do schránky",
+ "directory.federated": "Zo známého fediverza",
"directory.local": "Iba z {domain}",
"directory.new_arrivals": "Nové príchody",
- "directory.recently_active": "Nedávno aktívne",
+ "directory.recently_active": "Nedávna aktivita",
"disabled_account_banner.account_settings": "Nastavenia účtu",
- "disabled_account_banner.text": "Vaše konto {disabledAccount} je momentálne vypnuté.",
- "dismissable_banner.community_timeline": "Toto sú najnovšie verejné príspevky od ľudí, ktorých účty sú hostované na {domain}.",
+ "disabled_account_banner.text": "Váš účet {disabledAccount} je momentálne deaktivovaný.",
+ "dismissable_banner.community_timeline": "Toto sú najnovšie verejné príspevky od účtov hostených na {domain}.",
"dismissable_banner.dismiss": "Zrušiť",
- "dismissable_banner.explore_links": "Tieto správy sú dnes najviac zdieľané naprieč sociálnou sieťou. Novšie správy, zdieľané viacerými rôznymi ľudmi sú zoradené vyššie.",
- "dismissable_banner.explore_statuses": "Toto sú príspevky naprieč celej sociálnej sieti, ktoré dnes naberajú na ťahu. Novšie príspevky s viacerými vyzdvihnutiami sú radené vyššie.",
- "dismissable_banner.explore_tags": "Tieto haštagy práve teraz získavajú popularitu, medzi ľuďmi na tomto a ďalších serveroch decentralizovanej siete.",
- "dismissable_banner.public_timeline": "Toto sú najnovšie verejné príspevky od ľudí, ktorí sledujú {domain}, cez celú sociálnu sieť.",
- "embed.instructions": "Umiestni kód uvedený nižšie pre pridanie tohto statusu na tvoju web stránku.",
- "embed.preview": "Tu je ako to bude vyzerať:",
+ "dismissable_banner.explore_links": "Toto sú správy zo sociálnej siete, ktoré sú dnes populárne. Novšie správy s viacerými ohviezdičkovaniami a zdieľaniami sú radené vyššie.",
+ "dismissable_banner.explore_statuses": "Toto sú príspevky z celej sociálnej siete, ktoré sú dnes populárne. Novšie príspevky s viacerými ohviezdičkovaniami a zdieľaniami sú radené vyššie.",
+ "dismissable_banner.explore_tags": "Toto sú hashtagy zo sociálnej siete, ktoré sú dnes populárne. Novšie hashtagy používané viacerými ľuďmi sú radené vyššie.",
+ "dismissable_banner.public_timeline": "Toto sú najnovšie verejné príspevky od účtov na sociálnej sieti, ktoré sú sledované účtami z {domain}.",
+ "domain_block_modal.block": "Blokovať server",
+ "domain_block_modal.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ť:",
"emoji_button.activity": "Aktivita",
- "emoji_button.clear": "Vyčisti",
+ "emoji_button.clear": "Vyčistiť",
"emoji_button.custom": "Vlastné",
"emoji_button.flags": "Vlajky",
"emoji_button.food": "Jedlá a nápoje",
- "emoji_button.label": "Vlož emotikony",
- "emoji_button.nature": "Prírodné",
- "emoji_button.not_found": "Nie emotikony!! (╯°□°）╯︵ ┻━┻",
+ "emoji_button.label": "Vložiť emotikony",
+ "emoji_button.nature": "Príroda",
+ "emoji_button.not_found": "Žiadne emotikony",
"emoji_button.objects": "Predmety",
"emoji_button.people": "Ľudia",
"emoji_button.recent": "Často používané",
- "emoji_button.search": "Hľadaj...",
+ "emoji_button.search": "Hľadať…",
"emoji_button.search_results": "Výsledky hľadania",
"emoji_button.symbols": "Symboly",
"emoji_button.travel": "Cestovanie a miesta",
- "empty_column.account_hides_collections": "Tento užívateľ si zvolil nesprístupniť túto informáciu",
+ "empty_column.account_hides_collections": "Tento účet sa rozhodol túto informáciu nesprístupniť",
"empty_column.account_suspended": "Účet bol pozastavený",
- "empty_column.account_timeline": "Nie sú tu žiadne príspevky!",
+ "empty_column.account_timeline": "Nie sú tu žiadne príspevky.",
"empty_column.account_unavailable": "Profil nedostupný",
- "empty_column.blocks": "Ešte si nikoho nezablokoval/a.",
- "empty_column.bookmarked_statuses": "Ešte nemáš žiadné záložky. Keď si pridáš príspevok k záložkám, zobrazí sa tu.",
- "empty_column.community": "Lokálna časová os je prázdna. Napíšte niečo, aby sa to tu začalo hýbať!",
- "empty_column.direct": "Ešte nemáš žiadne priame zmienky. Keď nejakú pošleš alebo dostaneš, ukáže sa tu.",
- "empty_column.domain_blocks": "Žiadne domény ešte niesú skryté.",
- "empty_column.explore_statuses": "Momentálne nie je nič trendové. Pozrite sa neskôr!",
- "empty_column.favourited_statuses": "Zatiaľ nemáš žiadne obľúbené príspevky. Akonáhle označíš nejaký ako obľúbený, zobrazí sa tu.",
- "empty_column.favourites": "Nikto si zatiaľ tento príspevok neobľúbil. Akonáhle tak niekto urobí, zobrazí sa tu.",
- "empty_column.follow_requests": "Ešte nemáš žiadne požiadavky o následovanie. Keď nejaké dostaneš, budú tu zobrazené.",
- "empty_column.followed_tags": "Ešte nenasleduješ žiadne haštagy. Keď tak urobíš, zobrazia sa tu.",
+ "empty_column.blocks": "Nemáte blokované žiadne účty.",
+ "empty_column.bookmarked_statuses": "Ešte nemáte záložku v žiadnom príspevku. Keď si ju do nejakého príspevkuk pridáte, zobrazí sa tu.",
+ "empty_column.community": "Miesta časová os je prázdna. Napíšte niečo, aby to tu ožilo!",
+ "empty_column.direct": "Ešte nemáte žiadne súkromné označenia. Keď nejaké pošlete alebo dostanete, zobrazí sa tu.",
+ "empty_column.domain_blocks": "Žiadne domény ešte nie sú blokované.",
+ "empty_column.explore_statuses": "Momentálne nie je nič populárne. Skontrolujte to zas neskôr.",
+ "empty_column.favourited_statuses": "Zatiaľ nemáte žiadne ohviezdičkované príspevky. Akonáhle nejaký ohviezdičkujete, zobrazí sa tu.",
+ "empty_column.favourites": "Zatiaľ tento príspevok nikto neohviezdičkoval. Akonáhle sa tak stane, zobrazí sa tu.",
+ "empty_column.follow_requests": "Zatiaľ nemáte žiadne žiadosti o sledovanie. Keď nejakú dostanete, zobrazí sa tu.",
+ "empty_column.followed_tags": "Zatiaľ nesledujete žiadne hashtagy. Keď tak urobíte, zobrazia sa tu.",
"empty_column.hashtag": "Pod týmto hashtagom sa ešte nič nenachádza.",
- "empty_column.home": "Tvoja lokálna osa je zatiaľ prázdna! Pre začiatok navštív {public}, alebo použi vyhľadávanie a nájdi tak aj iných užívateľov.",
- "empty_column.list": "Tento zoznam je ešte prázdny. Keď ale členovia tohoto zoznamu napíšu nové správy, tak tie sa objavia priamo tu.",
- "empty_column.lists": "Nemáš ešte žiadne zoznamy. Keď nejaký vytvoríš, bude zobrazený práve tu.",
- "empty_column.mutes": "Ešte si nestĺmil žiadných užívateľov.",
- "empty_column.notifications": "Ešte nemáš žiadne oznámenia. Začni komunikovať s ostatnými, aby diskusia mohla začať.",
- "empty_column.public": "Ešte tu nič nie je. Napíš niečo verejne, alebo začni sledovať užívateľov z iných serverov, aby tu niečo pribudlo",
- "error.unexpected_crash.explanation": "Kvôli chybe v našom kóde, alebo problému s kompatibilitou prehliadača, túto stránku nebolo možné zobraziť správne.",
- "error.unexpected_crash.explanation_addons": "Túto stránku sa nepodarilo zobraziť správne. Táto chyba je pravdepodobne spôsobená rozšírením v prehliadači, alebo nástrojmi automatického prekladu.",
- "error.unexpected_crash.next_steps": "Skús obnoviť stránku. Ak to nepomôže, pravdepodobne budeš stále môcť používať Mastodon cez iný prehliadač, alebo natívnu aplikáciu.",
- "error.unexpected_crash.next_steps_addons": "Skús ich vypnúť, a obnoviť túto stránku. Ak to nepomôže, pravdepodobne budeš stále môcť Mastodon používať cez iný prehliadač, alebo natívnu aplikáciu.",
- "errors.unexpected_crash.copy_stacktrace": "Skopíruj stacktrace do schránky",
- "errors.unexpected_crash.report_issue": "Nahlás problém",
+ "empty_column.home": "Vaša domáca časová os je zatiaľ prázdna. Začnite sledovať ostatných a naplňte si ju.",
+ "empty_column.list": "Tento zoznam je zatiaľ prázdny. Keď ale členovia tohoto zoznamu uverejnia nové príspevky, objavia sa tu.",
+ "empty_column.lists": "Zatiaľ nemáte žiadne zoznamy. Keď nejaký vytvoríte, zobrazí sa tu.",
+ "empty_column.mutes": "Zatiaľ ste si nikoho nestíšili.",
+ "empty_column.notification_requests": "Všetko čisté! Nič tu nieje. Keď dostaneš nové oboznámenia, zobrazia sa tu podľa tvojich nastavení.",
+ "empty_column.notifications": "Zatiaľ nemáte žiadne upozornenia. Začnú vám pribúdať, keď s vami začnú interagovať ostatní.",
+ "empty_column.public": "Zatiaľ tu nič nie je. Napíšte niečo verejné alebo začnite sledovať účty z iných serverov, aby tu niečo pribudlo.",
+ "error.unexpected_crash.explanation": "Pre chybu v našom kóde alebo problém s kompatibilitou prehliadača nebolo túto stránku možné zobraziť správne.",
+ "error.unexpected_crash.explanation_addons": "Túto stránku sa nepodarilo zobraziť správne. Táto chyba je pravdepodobne spôsobená rozšírením v prehliadači alebo nástrojmi automatického prekladu.",
+ "error.unexpected_crash.next_steps": "Skúste stránku obnoviť. Ak to nepomôže, pravdepodobne budete stále môcť používať Mastodon cez iný prehliadač alebo natívnu aplikáciu.",
+ "error.unexpected_crash.next_steps_addons": "Skúste ich vypnúť a stránku obnoviť. Ak to nepomôže, pravdepodobne budete stále môcť Mastodon používať cez iný prehliadač alebo natívnu aplikáciu.",
+ "errors.unexpected_crash.copy_stacktrace": "Kopírovať stacktrace do schránky",
+ "errors.unexpected_crash.report_issue": "Nahlásiť problém",
"explore.search_results": "Výsledky hľadania",
"explore.suggested_follows": "Ľudia",
- "explore.title": "Objavuj",
- "explore.trending_links": "Novinky",
+ "explore.title": "Objavovať",
+ "explore.trending_links": "Správy",
"explore.trending_statuses": "Príspevky",
- "explore.trending_tags": "Haštagy",
+ "explore.trending_tags": "Hashtagy",
"filter_modal.added.context_mismatch_explanation": "Táto kategória filtrov sa nevzťahuje na kontext, v ktorom ste získali prístup k tomuto príspevku. Ak chcete, aby sa príspevok filtroval aj v tomto kontexte, budete musieť filter upraviť.",
"filter_modal.added.context_mismatch_title": "Nesúlad kontextu!",
"filter_modal.added.expired_explanation": "Platnosť tejto kategórie filtra vypršala, aby sa použila, je potrebné zmeniť dátum vypršania platnosti.",
"filter_modal.added.expired_title": "Vypršala platnosť filtra!",
"filter_modal.added.review_and_configure": "Ak chcete skontrolovať a ďalej konfigurovať túto kategóriu filtrov, prejdite na odkaz {settings_link}.",
- "filter_modal.added.review_and_configure_title": "Nastavenie triedenia",
- "filter_modal.added.settings_link": "stránka s nastaveniami",
+ "filter_modal.added.review_and_configure_title": "Nastavenia filtrov",
+ "filter_modal.added.settings_link": "stránka nastavení",
"filter_modal.added.short_explanation": "Tento príspevok bol pridaný do nasledujúcej kategórie filtrov: {title}.",
- "filter_modal.added.title": "Triedenie pridané!",
+ "filter_modal.added.title": "Filter bol pridaný.",
"filter_modal.select_filter.context_mismatch": "sa na tento kontext nevzťahuje",
- "filter_modal.select_filter.expired": "vypršalo",
+ "filter_modal.select_filter.expired": "vypršal",
"filter_modal.select_filter.prompt_new": "Nová kategória: {name}",
- "filter_modal.select_filter.search": "Vyhľadávať alebo vytvoriť",
+ "filter_modal.select_filter.search": "Vyhľadať alebo vytvoriť",
"filter_modal.select_filter.subtitle": "Použite existujúcu kategóriu alebo vytvorte novú",
"filter_modal.select_filter.title": "Filtrovanie tohto príspevku",
"filter_modal.title.status": "Filtrovanie príspevku",
- "firehose.all": "Všetky",
+ "filtered_notifications_banner.pending_requests": "Oboznámenia od {count, plural, =0 {nikoho} one {jedného človeka} other {# ľudí}} čo môžeš poznať",
+ "filtered_notifications_banner.title": "Filtrované oznámenia",
+ "firehose.all": "Všetko",
"firehose.local": "Tento server",
- "firehose.remote": "Iné servery",
- "follow_request.authorize": "Povoľ prístup",
- "follow_request.reject": "Odmietni",
- "follow_requests.unlocked_explanation": "Síce Váš učet nie je uzamknutý, ale {domain} tím si myslel že môžete chcieť skontrolovať žiadosti o sledovanie z týchto účtov manuálne.",
- "followed_tags": "Nasledované haštagy",
- "footer.about": "O",
+ "firehose.remote": "Ostatné servery",
+ "follow_request.authorize": "Povoliť",
+ "follow_request.reject": "Zamietnuť",
+ "follow_requests.unlocked_explanation": "Aj keď váš účet nie je uzamknutý, tím domény {domain} si myslel, že môžete chcieť skontrolovať žiadosti o sledovanie z týchto účtov manuálne.",
+ "follow_suggestions.curated_suggestion": "Výber redakcie",
+ "follow_suggestions.dismiss": "Znova nezobrazovať",
+ "follow_suggestions.hints.featured": "Tento profil bol ručne zvolený tímom domény {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "Tento profil je obľúbený medzi účtami, ktoré sledujete.",
+ "follow_suggestions.hints.most_followed": "Tento profil patrí na doméne {domain} medzi najsledovanejšie.",
+ "follow_suggestions.hints.most_interactions": "Tento profil má v poslednej dobe na doméne {domain} veľa interakcií.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Tento profil je podobný profilom, ktoré ste nedávno začali sledovať.",
+ "follow_suggestions.personalized_suggestion": "Prispôsobený návrh",
+ "follow_suggestions.popular_suggestion": "Obľúbený návrh",
+ "follow_suggestions.popular_suggestion_longer": "Populárne na {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Podobné profilom, ktoré si nedávno nasledoval/a",
+ "follow_suggestions.view_all": "Zobraziť všetky",
+ "follow_suggestions.who_to_follow": "Koho sledovať",
+ "followed_tags": "Sledované hashtagy",
+ "footer.about": "Viac informácií",
"footer.directory": "Adresár profilov",
"footer.get_app": "Stiahnuť aplikáciu",
- "footer.invite": "Pozvi ľudí",
+ "footer.invite": "Pozvať ľudí",
"footer.keyboard_shortcuts": "Klávesové skratky",
- "footer.privacy_policy": "Zásady súkromia",
+ "footer.privacy_policy": "Pravidlá ochrany súkromia",
"footer.source_code": "Zobraziť zdrojový kód",
"footer.status": "Stav",
"generic.saved": "Uložené",
- "getting_started.heading": "Začni tu",
+ "getting_started.heading": "Začíname",
"hashtag.column_header.tag_mode.all": "a {additional}",
"hashtag.column_header.tag_mode.any": "alebo {additional}",
"hashtag.column_header.tag_mode.none": "bez {additional}",
"hashtag.column_settings.select.no_options_message": "Žiadne návrhy neboli nájdené",
- "hashtag.column_settings.select.placeholder": "Zadaj haštagy…",
+ "hashtag.column_settings.select.placeholder": "Zadajte hashtagy…",
"hashtag.column_settings.tag_mode.all": "Všetky tieto",
- "hashtag.column_settings.tag_mode.any": "Hociktorý z týchto",
+ "hashtag.column_settings.tag_mode.any": "Ľubovoľné z týchto",
"hashtag.column_settings.tag_mode.none": "Žiaden z týchto",
- "hashtag.column_settings.tag_toggle": "Vlož dodatočné haštagy pre tento stĺpec",
- "hashtag.counter_by_accounts": "{count, plural, one {{counter} sledujúci} few {{counter} sledujúci} many {{counter} sledujúcich} other {{counter} sledujúcich}}",
+ "hashtag.column_settings.tag_toggle": "Vložte dodatočné hashtagy pre tento stĺpec",
+ "hashtag.counter_by_accounts": "{count, plural, one {{counter} prispievateľ} few {{counter} prispievatelia} many {{counter} prispievateľov} other {{counter} prispievateľov}}",
"hashtag.counter_by_uses": "{count, plural, one {{counter} príspevok} few {{counter} príspevky} many {{counter} príspevkov} other {{counter} príspevkov}}",
"hashtag.counter_by_uses_today": "{count, plural, one {{counter} príspevok} few {{counter} príspevky} many {{counter} príspevkov} other {{counter} príspevkov}} dnes",
- "hashtag.follow": "Sleduj haštag",
- "hashtag.unfollow": "Nesleduj haštag",
- "hashtags.and_other": "…a {count, plural, one {} few {# ďalšie} many {# ďalších}other {# ďalších}}",
- "home.actions.go_to_explore": "Pozrieť, čo je trendy",
- "home.actions.go_to_suggestions": "Nájdi ľudí na sledovanie",
- "home.column_settings.basic": "Základné",
- "home.column_settings.show_reblogs": "Ukáž vyzdvihnuté",
- "home.column_settings.show_replies": "Ukáž odpovede",
- "home.explore_prompt.body": "Váš domovský informačný kanál bude obsahovať mix príspevkov z mriežok, ktoré ste sa rozhodli sledovať, ľudí, ktorých ste sa rozhodli sledovať, a príspevkov, ktoré preferujú. Ak sa vám to zdá príliš málo, možno budete chcieť:",
- "home.explore_prompt.title": "Toto je tvoja domovina v rámci Mastodonu.",
- "home.hide_announcements": "Skry oznámenia",
- "home.pending_critical_update.body": "Prosím aktualizuj si svoj Mastodon server, ako náhle to bude možné!",
- "home.pending_critical_update.link": "Pozri aktualizácie",
- "home.pending_critical_update.title": "Je dostupná kritická bezpečnostná aktualizácia!",
- "home.show_announcements": "Ukáž oznámenia",
- "interaction_modal.description.favourite": "S účtom na Mastodone si môžeš tento príspevok obľúbiť, aby si dal/a autorovi vedieť, že ho oceňuješ, a uložiť si ho na neskôr.",
- "interaction_modal.description.follow": "Ak máte konto na Mastodone, môžete sledovať {name} a dostávať príspevky do svojho domovského kanála.",
- "interaction_modal.description.reblog": "Ak máte účet na Mastodone, môžete tento príspevok posilniť a zdieľať ho s vlastnými sledovateľmi.",
- "interaction_modal.description.reply": "Ak máte účet na Mastodone, môžete reagovať na tento príspevok.",
+ "hashtag.follow": "Sledovať hashtag",
+ "hashtag.unfollow": "Prestať sledovať hashtag",
+ "hashtags.and_other": "…a {count, plural, other {# ďalších}}",
+ "home.column_settings.show_reblogs": "Zobraziť zdieľania",
+ "home.column_settings.show_replies": "Zobraziť odpovede",
+ "home.hide_announcements": "Skryť oznámenia",
+ "home.pending_critical_update.body": "Prosíme, aktualizujte si svoj Mastodon server, hneď ako to bude možné.",
+ "home.pending_critical_update.link": "Zobraziť aktualizácie",
+ "home.pending_critical_update.title": "Je dostupná kritická bezpečnostná aktualizácia.",
+ "home.show_announcements": "Zobraziť oznámenia",
+ "interaction_modal.description.favourite": "S účtom na Mastodone môžete tento príspevok ohviezdičkovať, tak dať autorovi vedieť, že sa vám páči, a uložiť si ho na neskôr.",
+ "interaction_modal.description.follow": "S účtom na Mastodone môžete {name} sledovať a vidieť ich príspevky vo svojom domovskom kanáli.",
+ "interaction_modal.description.reblog": "S účtom na Mastodone môžete tento príspevok zdeľať so svojimi sledovateľmi.",
+ "interaction_modal.description.reply": "S účtom na Mastodone môžete na tento príspevok odpovedať.",
"interaction_modal.login.action": "Prejsť domov",
- "interaction_modal.login.prompt": "Doména tvojho domovského servera, napr. mastodon.social",
- "interaction_modal.no_account_yet": "Niesi na Mastodone?",
+ "interaction_modal.login.prompt": "Doména vášho domovského servera, napr. mastodon.social",
+ "interaction_modal.no_account_yet": "Nie ste na Mastodone?",
"interaction_modal.on_another_server": "Na inom serveri",
"interaction_modal.on_this_server": "Na tomto serveri",
- "interaction_modal.sign_in": "Nie si prihláseý/á na tomto serveri. Kde je tvoj účet hostovaný?",
- "interaction_modal.sign_in_hint": "Tip: Toto je webová stránka, na ktorej ste sa zaregistrovali. Ak si nepamätáte, pohľadajte uvítací e-mail vo svojej schránke. Môžete tiež zadať svoje celé používateľské meno! (napr. @Mastodon@mastodon.social)",
- "interaction_modal.title.favourite": "Obľúb si {name} ov/in príspevok",
- "interaction_modal.title.follow": "Nasleduj {name}",
- "interaction_modal.title.reblog": "Vyzdvihni {name}ov/in príspevok",
- "interaction_modal.title.reply": "Odpovedz na {name}ov/in príspevok",
- "intervals.full.days": "{number, plural, one {# deň} few {# dní} many {# dní} other {# dní}}",
- "intervals.full.hours": "{number, plural, one {# hodina} few {# hodín} many {# hodín} other {# hodín}}",
- "intervals.full.minutes": "{number, plural, one {# minúta} few {# minút} many {# minút} other {# minút}}",
- "keyboard_shortcuts.back": "dostať sa naspäť",
- "keyboard_shortcuts.blocked": "otvor zoznam blokovaných užívateľov",
- "keyboard_shortcuts.boost": "Vyzdvihni príspevok",
- "keyboard_shortcuts.column": "zameraj sa na príspevok v jednom zo stĺpcov",
- "keyboard_shortcuts.compose": "zameraj sa na písaciu plochu",
+ "interaction_modal.sign_in": "Na tomto serveri nie ste prihlásený. Kde je váš účet hostený?",
+ "interaction_modal.sign_in_hint": "Tip: Toto je webová stránka, na ktorej ste sa zaregistrovali. Ak si nepamätáte, pohľadajte uvítací e-mail vo svojej schránke. Môžete tiež zadať svoje celé používateľské meno (napr. @Mastodon@mastodon.social).",
+ "interaction_modal.title.favourite": "Ohviezdičkovať príspevok od {name}",
+ "interaction_modal.title.follow": "Sledovať {name}",
+ "interaction_modal.title.reblog": "Zdieľať príspevok od {name}",
+ "interaction_modal.title.reply": "Odpovedať na príspevok od {name}",
+ "intervals.full.days": "{number, plural, one {# deň} few {# dni} many {# dní} other {# dní}}",
+ "intervals.full.hours": "{number, plural, one {# hodina} few {# hodiny} many {# hodín} other {# hodín}}",
+ "intervals.full.minutes": "{number, plural, one {# minúta} few {# minúty} many {# minút} other {# minút}}",
+ "keyboard_shortcuts.back": "Ísť späť",
+ "keyboard_shortcuts.blocked": "Otvoriť zoznam blokovaných užívateľov",
+ "keyboard_shortcuts.boost": "Zdieľať príspevok",
+ "keyboard_shortcuts.column": "Prejsť na stĺpec",
+ "keyboard_shortcuts.compose": "Prejsť na textové pole",
"keyboard_shortcuts.description": "Popis",
- "keyboard_shortcuts.direct": "to open direct messages column",
- "keyboard_shortcuts.down": "posunúť sa dole v zozname",
- "keyboard_shortcuts.enter": "Otvor príspevok",
- "keyboard_shortcuts.favourite": "Obľúb si príspevok",
- "keyboard_shortcuts.favourites": "Otvor zoznam obľúbených",
- "keyboard_shortcuts.federated": "otvor federovanú časovú os",
+ "keyboard_shortcuts.direct": "Otvoriť stĺpec súkromných označení",
+ "keyboard_shortcuts.down": "Posunúť sa dole v zozname",
+ "keyboard_shortcuts.enter": "Otvoriť príspevok",
+ "keyboard_shortcuts.favourite": "Ohviezdičkovať príspevok",
+ "keyboard_shortcuts.favourites": "Otvoriť zoznam ohviezdičkovaných",
+ "keyboard_shortcuts.federated": "Otvoriť federovanú časovú os",
"keyboard_shortcuts.heading": "Klávesové skratky",
- "keyboard_shortcuts.home": "otvor domácu časovú os",
- "keyboard_shortcuts.hotkey": "Klávesa",
- "keyboard_shortcuts.legend": "zobraz túto legendu",
- "keyboard_shortcuts.local": "otvor miestnu časovú os",
- "keyboard_shortcuts.mention": "spomeň autora",
- "keyboard_shortcuts.muted": "otvor zoznam stíšených užívateľov",
- "keyboard_shortcuts.my_profile": "otvor svoj profil",
- "keyboard_shortcuts.notifications": "Otvor panel oznámení",
- "keyboard_shortcuts.open_media": "na otvorenie médií",
- "keyboard_shortcuts.pinned": "otvor zoznam pripnutých príspevkov",
- "keyboard_shortcuts.profile": "otvor autorov profil",
- "keyboard_shortcuts.reply": "odpovedať",
- "keyboard_shortcuts.requests": "otvor zoznam žiadostí o sledovanie",
- "keyboard_shortcuts.search": "zameraj sa na vyhľadávanie",
- "keyboard_shortcuts.spoilers": "to show/hide CW field",
- "keyboard_shortcuts.start": "otvor panel ''začíname''",
- "keyboard_shortcuts.toggle_hidden": "ukáž/skry text za CW",
- "keyboard_shortcuts.toggle_sensitivity": "pre zobrazenie/skrytie médií",
- "keyboard_shortcuts.toot": "začni úplne nový príspevok",
- "keyboard_shortcuts.unfocus": "nesústreď sa na písaciu plochu, alebo hľadanie",
- "keyboard_shortcuts.up": "posuň sa vyššie v zozname",
- "lightbox.close": "Zatvor",
+ "keyboard_shortcuts.home": "Otvoriť domácu časovú os",
+ "keyboard_shortcuts.hotkey": "Kláves",
+ "keyboard_shortcuts.legend": "Zobraziť túto legendu",
+ "keyboard_shortcuts.local": "Otvoriť miestnu časovú os",
+ "keyboard_shortcuts.mention": "Označiť autora",
+ "keyboard_shortcuts.muted": "Otvoriť zoznam stíšených užívateľov",
+ "keyboard_shortcuts.my_profile": "Otvoriť svoj profil",
+ "keyboard_shortcuts.notifications": "Otvoriť panel upozornení",
+ "keyboard_shortcuts.open_media": "Otvoriť médiá",
+ "keyboard_shortcuts.pinned": "Otvoriť zoznam pripnutých príspevkov",
+ "keyboard_shortcuts.profile": "Otvoriť autorov profil",
+ "keyboard_shortcuts.reply": "Odpovedať na príspevok",
+ "keyboard_shortcuts.requests": "Otvoriť zoznam žiadostí o sledovanie",
+ "keyboard_shortcuts.search": "Prejsť na vyhľadávacie pole",
+ "keyboard_shortcuts.spoilers": "Zobraziť/skryť pole varovania o obsahu",
+ "keyboard_shortcuts.start": "Otvoriť panel „Začíname“",
+ "keyboard_shortcuts.toggle_hidden": "Zobraziť/skryť text za varovaním o obsahu",
+ "keyboard_shortcuts.toggle_sensitivity": "Zobraziť/skryť médiá",
+ "keyboard_shortcuts.toot": "Vytvoriť nový príspevok",
+ "keyboard_shortcuts.unfocus": "Odísť z textového poľa",
+ "keyboard_shortcuts.up": "Posunúť sa vyššie v zozname",
+ "lightbox.close": "Zatvoriť",
"lightbox.compress": "Zmenšiť náhľad obrázku",
"lightbox.expand": "Rozšíriť náhľad obrázku",
- "lightbox.next": "Ďalšie",
- "lightbox.previous": "Predchádzajúci",
- "limited_account_hint.action": "Ukáž profil aj tak",
- "limited_account_hint.title": "Tento profil bol skrytý moderátormi stránky {domain}.",
- "link_preview.author": "Podľa {name}",
- "lists.account.add": "Pridaj do zoznamu",
- "lists.account.remove": "Odober zo zoznamu",
- "lists.delete": "Vymaž list",
- "lists.edit": "Uprav zoznam",
- "lists.edit.submit": "Zmeň názov",
+ "lightbox.next": "Ďalej",
+ "lightbox.previous": "Späť",
+ "limited_account_hint.action": "Aj tak zobraziť profil",
+ "limited_account_hint.title": "Tento profil bol skrytý správcami servera {domain}.",
+ "link_preview.author": "Autor: {name}",
+ "lists.account.add": "Pridať do zoznamu",
+ "lists.account.remove": "Odstrániť zo zoznamu",
+ "lists.delete": "Vymazať zoznam",
+ "lists.edit": "Upraviť zoznam",
+ "lists.edit.submit": "Zmeniť názov",
"lists.exclusive": "Skryť tieto príspevky z domovskej stránky",
- "lists.new.create": "Pridaj zoznam",
+ "lists.new.create": "Pridať zoznam",
"lists.new.title_placeholder": "Názov nového zoznamu",
- "lists.replies_policy.followed": "Akýkoľvek nasledovaný užívateľ",
- "lists.replies_policy.list": "Členovia na zozname",
- "lists.replies_policy.none": "Nikto",
- "lists.replies_policy.title": "Ukáž odpovede na:",
- "lists.search": "Vyhľadávaj medzi užívateľmi, ktorých sleduješ",
- "lists.subheading": "Tvoje zoznamy",
- "load_pending": "{count, plural, one {# nová položka} other {# nových položiek}}",
- "loading_indicator.label": "Načítam…",
- "media_gallery.toggle_visible": "Zapni/Vypni viditeľnosť",
- "moved_to_account_banner.text": "Vaše konto {disabledAccount} je momentálne zablokované, pretože ste sa presunuli na {movedToAccount}.",
- "mute_modal.duration": "Trvanie",
- "mute_modal.hide_notifications": "Skry oznámenia od tohto používateľa?",
- "mute_modal.indefinite": "Bez obmedzenia",
+ "lists.replies_policy.followed": "Akémukoľvek sledovanému účtu",
+ "lists.replies_policy.list": "Členom zoznamu",
+ "lists.replies_policy.none": "Nikomu",
+ "lists.replies_policy.title": "Zobraziť odpovede:",
+ "lists.search": "Vyhľadávať medzi účtami, ktoré sledujete",
+ "lists.subheading": "Vaše zoznamy",
+ "load_pending": "{count, plural, one {# nová položka} few {# nové položky} many {# nových položiek} other {# nových položiek}}",
+ "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?",
"navigation_bar.about": "O tomto serveri",
- "navigation_bar.advanced_interface": "Otvor v pokročilom webovom rozhraní",
- "navigation_bar.blocks": "Blokovaní užívatelia",
+ "navigation_bar.advanced_interface": "Otvoriť v pokročilom webovom rozhraní",
+ "navigation_bar.blocks": "Blokované účty",
"navigation_bar.bookmarks": "Záložky",
"navigation_bar.community_timeline": "Miestna časová os",
- "navigation_bar.compose": "Napíš nový príspevok",
- "navigation_bar.direct": "Súkromné spomenutia",
- "navigation_bar.discover": "Objavuj",
- "navigation_bar.domain_blocks": "Skryté domény",
- "navigation_bar.edit_profile": "Uprav profil",
- "navigation_bar.explore": "Objavuj",
- "navigation_bar.favourites": "Obľúbené",
+ "navigation_bar.compose": "Vytvoriť nový príspevok",
+ "navigation_bar.direct": "Súkromné označenia",
+ "navigation_bar.discover": "Objavovanie",
+ "navigation_bar.domain_blocks": "Blokované domény",
+ "navigation_bar.explore": "Objavovať",
+ "navigation_bar.favourites": "Ohviezdičkované",
"navigation_bar.filters": "Filtrované slová",
"navigation_bar.follow_requests": "Žiadosti o sledovanie",
- "navigation_bar.followed_tags": "Nasledované haštagy",
- "navigation_bar.follows_and_followers": "Sledovania a následovatelia",
+ "navigation_bar.followed_tags": "Sledované hashtagy",
+ "navigation_bar.follows_and_followers": "Sledovania a sledovatelia",
"navigation_bar.lists": "Zoznamy",
- "navigation_bar.logout": "Odhlás sa",
- "navigation_bar.mutes": "Stíšení užívatelia",
- "navigation_bar.opened_in_classic_interface": "Príspevky, účty a iné špeciálne stránky, sú z východiska otvárané v klasickom webovom rozhraní.",
+ "navigation_bar.logout": "Odhlásiť sa",
+ "navigation_bar.mutes": "Stíšené účty",
+ "navigation_bar.opened_in_classic_interface": "Príspevky, účty a iné špeciálne stránky sú predvolene otvárané v klasickom webovom rozhraní.",
"navigation_bar.personal": "Osobné",
"navigation_bar.pins": "Pripnuté príspevky",
"navigation_bar.preferences": "Nastavenia",
"navigation_bar.public_timeline": "Federovaná časová os",
- "navigation_bar.search": "Hľadaj",
- "navigation_bar.security": "Zabezbečenie",
- "not_signed_in_indicator.not_signed_in": "Ak chcete získať prístup k tomuto zdroju, musíte sa prihlásiť.",
- "notification.admin.report": "{name} nahlásil/a {target}",
- "notification.admin.sign_up": "{name} sa zaregistroval/a",
- "notification.favourite": "{name} si obľúbil/a tvoj príspevok",
- "notification.follow": "{name} ťa začal/a nasledovať",
- "notification.follow_request": "{name} ťa žiada nasledovať",
- "notification.mention": "{name} ťa spomenul/a",
- "notification.own_poll": "Tvoja anketa sa skončila",
- "notification.poll": "Anketa v ktorej si hlasoval/a sa skončila",
- "notification.reblog": "{name} zdieľal/a tvoj príspevok",
- "notification.status": "{name} práve uverejnil/a",
- "notification.update": "{name} upravil/a príspevok",
- "notifications.clear": "Vyčisti oznámenia",
- "notifications.clear_confirmation": "Naozaj chceš nenávratne odstrániť všetky tvoje oznámenia?",
+ "navigation_bar.search": "Hľadať",
+ "navigation_bar.security": "Zabezpečenie",
+ "not_signed_in_indicator.not_signed_in": "Ak chcete získať prístup k tomuto zdroju, prihláste sa.",
+ "notification.admin.report": "Účet {name} nahlásil {target}",
+ "notification.admin.sign_up": "Nová registráciu účtu {name}",
+ "notification.favourite": "{name} hviezdičkuje váš príspevok",
+ "notification.follow": "{name} vás sleduje",
+ "notification.follow_request": "{name} vás žiada sledovať",
+ "notification.mention": "{name} vás spomína",
+ "notification.moderation-warning.learn_more": "Zisti viac",
+ "notification.moderation_warning.action_disable": "Tvoj účet bol vypnutý.",
+ "notification.moderation_warning.action_silence": "Tvoj účet bol obmedzený.",
+ "notification.moderation_warning.action_suspend": "Tvoj účet bol pozastavený.",
+ "notification.own_poll": "Vaša anketa sa skončila",
+ "notification.poll": "Anketa, v ktorej ste hlasovali, sa skončila",
+ "notification.reblog": "{name} zdieľa váš príspevok",
+ "notification.relationships_severance_event": "Stratené prepojenia s {name}",
+ "notification.relationships_severance_event.account_suspension": "Správca z {from} pozastavil/a {target}, čo znamená, že od nich viac nemôžeš dostávať aktualizácie, alebo s nimi interaktovať.",
+ "notification.relationships_severance_event.learn_more": "Zisti viac",
+ "notification.status": "{name} uverejňuje niečo nové",
+ "notification.update": "{name} upravuje príspevok",
+ "notification_requests.accept": "Prijať",
+ "notification_requests.dismiss": "Zamietnuť",
+ "notification_requests.notifications_from": "Oboznámenia od {name}",
+ "notification_requests.title": "Filtrované oboznámenia",
+ "notifications.clear": "Vyčistiť upozornenia",
+ "notifications.clear_confirmation": "Určite chcete nenávratne odstrániť všetky svoje upozornenia?",
"notifications.column_settings.admin.report": "Nové hlásenia:",
"notifications.column_settings.admin.sign_up": "Nové registrácie:",
- "notifications.column_settings.alert": "Oznámenia na ploche",
- "notifications.column_settings.favourite": "Obľúbené:",
- "notifications.column_settings.filter_bar.advanced": "Zobraz všetky kategórie",
- "notifications.column_settings.filter_bar.category": "Rýchle triedenie",
- "notifications.column_settings.filter_bar.show_bar": "Ukáž filtrovací panel",
- "notifications.column_settings.follow": "Noví sledujúci:",
- "notifications.column_settings.follow_request": "Nové žiadosti o následovanie:",
- "notifications.column_settings.mention": "Zmienenia:",
- "notifications.column_settings.poll": "Výsledky ankiet:",
- "notifications.column_settings.push": "Push notifikácie",
- "notifications.column_settings.reblog": "Vyzdvihnutia:",
- "notifications.column_settings.show": "Ukáž v stĺpci",
- "notifications.column_settings.sound": "Prehraj zvuk",
+ "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:",
+ "notifications.column_settings.poll": "Výsledky ankety:",
+ "notifications.column_settings.push": "Upozornenia push",
+ "notifications.column_settings.reblog": "Zdieľania:",
+ "notifications.column_settings.show": "Zobraziť v stĺpci",
+ "notifications.column_settings.sound": "Prehrať zvuk",
"notifications.column_settings.status": "Nové príspevky:",
- "notifications.column_settings.unread_notifications.category": "Neprečítané oznámenia",
- "notifications.column_settings.unread_notifications.highlight": "Zdôrazni neprečítané oznámenia",
+ "notifications.column_settings.unread_notifications.category": "Neprečítané upozornenia",
+ "notifications.column_settings.unread_notifications.highlight": "Zvýrazniť neprečítané upozornenia",
"notifications.column_settings.update": "Úpravy:",
"notifications.filter.all": "Všetky",
- "notifications.filter.boosts": "Vyzdvihnutia",
- "notifications.filter.favourites": "Obľúbené",
+ "notifications.filter.boosts": "Zdieľania",
+ "notifications.filter.favourites": "Ohviezdičkovania",
"notifications.filter.follows": "Sledovania",
- "notifications.filter.mentions": "Iba spomenutia",
+ "notifications.filter.mentions": "Označenia",
"notifications.filter.polls": "Výsledky ankiet",
- "notifications.filter.statuses": "Aktualizácie od ľudí, ktorých nasleduješ",
- "notifications.grant_permission": "Udeľ povolenie.",
- "notifications.group": "{count} Oznámení",
- "notifications.mark_as_read": "Označ každé oznámenie za prečítané",
- "notifications.permission_denied": "Oznámenia na ploche sú nedostupné, kvôli predtým zamietnutej požiadavke prehliadača",
- "notifications.permission_denied_alert": "Oznámenia na ploche nemôžu byť zapnuté, pretože požiadavka prehliadača bola už skôr zamietnutá",
- "notifications.permission_required": "Oznámenia na ploche sú nedostupné, pretože potrebné povolenia neboli udelené.",
- "notifications_permission_banner.enable": "Povoliť oznámenia na ploche",
+ "notifications.filter.statuses": "Novinky od ľudí, ktorých sledujete",
+ "notifications.grant_permission": "Udeliť povolenie.",
+ "notifications.group": "{count} upozornení",
+ "notifications.mark_as_read": "Označiť všetky upozornenia ako prečítané",
+ "notifications.permission_denied": "Upozornenia na ploche sú nedostupné pre už skôr zamietnutú požiadavku prehliadača",
+ "notifications.permission_denied_alert": "Upozornenia na ploche nemôžu byť zapnuté, pretože požiadavka prehliadača bola už skôr zamietnutá",
+ "notifications.permission_required": "Upozornenia na ploche sú nedostupné, pretože neboli udelené potrebné povolenia.",
+ "notifications.policy.filter_new_accounts_title": "Nové účty",
+ "notifications.policy.filter_not_followers_title": "Ľudia, ktorí ťa nenasledujú",
+ "notifications.policy.filter_not_following_title": "Ľudia, ktorých nenasleduješ",
+ "notifications.policy.filter_private_mentions_title": "Nevyžiadané priame spomenutia",
+ "notifications.policy.title": "Filtrovať oznámenia od…",
+ "notifications_permission_banner.enable": "Povoliť upozornenia na ploche",
"notifications_permission_banner.how_to_control": "Ak chcete dostávať upozornenia, keď Mastodon nie je otvorený, povoľte upozornenia na ploche. Po ich zapnutí môžete presne kontrolovať, ktoré typy interakcií generujú upozornenia na ploche, a to prostredníctvom tlačidla {icon} vyššie.",
- "notifications_permission_banner.title": "Nikdy nezmeškaj jedinú vec",
- "onboarding.action.back": "Vziať ma späť",
- "onboarding.actions.back": "Vziať ma späť",
- "onboarding.actions.go_to_explore": "See what's trending",
- "onboarding.actions.go_to_home": "Go to your home feed",
- "onboarding.compose.template": "Nazdar #Mastodon!",
+ "notifications_permission_banner.title": "Nenechajte si nič ujsť",
+ "onboarding.action.back": "Ísť späť",
+ "onboarding.actions.back": "Ísť späť",
+ "onboarding.actions.go_to_explore": "Prejsť na populárne",
+ "onboarding.actions.go_to_home": "Prejsť na domovský kanál",
+ "onboarding.compose.template": "Ahoj, #Mastodon!",
"onboarding.follows.empty": "Žiaľ, momentálne sa nedajú zobraziť žiadne výsledky. Môžete skúsiť použiť vyhľadávanie alebo navštíviť stránku objavovania a nájsť ľudí, ktorých chcete sledovať, alebo to skúste znova neskôr.",
- "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
- "onboarding.follows.title": "Popular on Mastodon",
- "onboarding.profile.discoverable": "Urob môj profil objaviteľný",
- "onboarding.profile.display_name": "Zobrazované meno",
- "onboarding.profile.display_name_hint": "Tvoje plné meno, alebo tvoje zábavné meno…",
- "onboarding.profile.lead": "Toto môžeš vždy dokončiť neskôr v nastaveniach, kde je dostupných ešte viac volieb na prispôsobenie.",
- "onboarding.profile.note": "O tebe",
- "onboarding.profile.note_hint": "Môžeš @spomenúť iných ľudí, alebo #haštagy…",
- "onboarding.profile.save_and_continue": "Ulož a pokračuj",
+ "onboarding.follows.lead": "Váš domovský kanál je váš hlavný spôsob objavovania Mastodonu. Čím viac ľudí sledujete, tým bude aktívnejší a zaujímavejší. Tu je pár tipov na začiatok:",
+ "onboarding.follows.title": "Prispôsobte si svoj domovský kanál",
+ "onboarding.profile.discoverable": "Nastavte svoj profil ako objaviteľný",
+ "onboarding.profile.discoverable_hint": "Keď si na Mastodone zapnete objaviteľnosť, vaše príspevky sa môžu zobrazovať vo výsledkoch vyhľadávania a v populárnych. Váš profil môže byť navyše navrhovaný ľuďom, s ktorými máte podobné záujmy.",
+ "onboarding.profile.display_name": "Používateľské meno",
+ "onboarding.profile.display_name_hint": "Vaše celé meno alebo pokojne aj vtipná prezývka…",
+ "onboarding.profile.lead": "Vždy si to môžete doplniť neskôr v nastaveniach, kde nájdete aj ďalšie možnosti prispôsobenia.",
+ "onboarding.profile.note": "Niečo o vás",
+ "onboarding.profile.note_hint": "Môžete @označiť iných ľudí alebo #hashtagy…",
+ "onboarding.profile.save_and_continue": "Uložiť a pokračovať",
"onboarding.profile.title": "Nastavenie profilu",
- "onboarding.profile.upload_avatar": "Nahraj profilový obrázok",
- "onboarding.profile.upload_header": "Nahraj profilové záhlavie",
- "onboarding.share.lead": "Daj ľudom vedieť, ako ťa môžu na Mastodone nájsť!",
- "onboarding.share.message": "Na Mastodone som {username}. Príď ma nasledovať na {url}",
+ "onboarding.profile.upload_avatar": "Nahrať profilový obrázok",
+ "onboarding.profile.upload_header": "Nahrať obrázok záhlavia profilu",
+ "onboarding.share.lead": "Dajte ostatným vedieť, ako vás môžu na Mastodone nájsť.",
+ "onboarding.share.message": "Na #Mastodone som {username}. Príď ma sledovať na {url}!",
"onboarding.share.next_steps": "Ďalšie možné kroky:",
- "onboarding.share.title": "Zdieľaj svoj profil",
- "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
- "onboarding.start.skip": "Want to skip right ahead?",
+ "onboarding.share.title": "Zdieľajte svoj profil",
+ "onboarding.start.lead": "Teraz ste súčasťou Mastodonu, jedinečnej decentralizovanej sociálnej platformy, kde o všetkom rozhodujete vy, nie algoritmus. Poďme sa pozrieť, ako môžete začať:",
+ "onboarding.start.skip": "Nepotrebujete pomoc so začiatkom?",
"onboarding.start.title": "Zvládli ste to!",
- "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
- "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
- "onboarding.steps.publish_status.body": "Say hello to the world.",
- "onboarding.steps.publish_status.title": "Vytvor svoj prvý príspevok",
- "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
- "onboarding.steps.setup_profile.title": "Customize your profile",
- "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
- "onboarding.steps.share_profile.title": "Share your profile",
+ "onboarding.steps.follow_people.body": "Mastodon je vybudovaný okolo sledovania zaujímavých ľudí.",
+ "onboarding.steps.follow_people.title": "Prispôsobte si svoj domovský kanál",
+ "onboarding.steps.publish_status.body": "Predstavte sa svetu textom, fotkami, videami či anketami {emoji}",
+ "onboarding.steps.publish_status.title": "Vytvorte svoj prvý príspevok",
+ "onboarding.steps.setup_profile.body": "Plnší profil vám pomôže mať viac interakcií.",
+ "onboarding.steps.setup_profile.title": "Upravte si profil",
+ "onboarding.steps.share_profile.body": "Dajte svojej partii vedieť, ako vás môžu na Mastodone nájsť.",
+ "onboarding.steps.share_profile.title": "Zdieľajte svoj profil na Mastodone",
"onboarding.tips.2fa": "Vedeli ste? Svoj účet môžete zabezpečiť nastavením dvojfaktorového overenia v nastaveniach účtu. Funguje to s akoukoľvek aplikáciou TOTP podľa vášho výberu, nie je potrebné žiadne telefónne číslo!",
"onboarding.tips.accounts_from_other_servers": "Vedeli ste? Keďže Mastodon je decentralizovaný, niektoré profily, s ktorými sa stretnete, budú na iných serveroch, ako je váš. Aj napriek tomu s nimi môžete bezproblémovo komunikovať! Ich server je v druhej časti ich používateľského mena!",
- "onboarding.tips.migration": "Vedeli ste? Ak máte pocit, že doména {domain} pre vás v budúcnosti nebude skvelou voľbou, môžete prejsť na iný server Mastodon bez straty svojich sledovateľov. Môžete dokonca hostovať svoj vlastný server!",
- "onboarding.tips.verification": "Vedeli ste? Svoj účet môžete overiť umiestnením odkazu na svoj profil Mastodon na svoju vlastnú webovú lokalitu a pridaním webovej lokality do svojho profilu. Nie sú potrebné žiadne poplatky ani doklady!",
+ "onboarding.tips.migration": "Vedeli ste? Ak máte pocit, že doména {domain} pre vás v budúcnosti nebude skvelou voľbou, môžete prejsť na iný server Mastodon bez straty svojich sledovateľov. Môžete dokonca hostiť svoj vlastný server!",
+ "onboarding.tips.verification": "Vedeli ste? Svoj účet môžete overiť umiestnením odkazu na svoj profil na Mastodone na svoju vlastnú webovú lokalitu a pridaním webovej lokality do svojho profilu. Nie sú potrebné žiadne poplatky ani doklady!",
"password_confirmation.exceeds_maxlength": "Potvrdené heslo presahuje maximálnu dĺžku hesla",
"password_confirmation.mismatching": "Zadané heslá sa nezhodujú",
"picture_in_picture.restore": "Vrátiť späť",
"poll.closed": "Uzatvorená",
"poll.refresh": "Obnoviť",
- "poll.reveal": "Pozri výsledky",
- "poll.total_people": "{count, plural, one {# človek} few {# ľudia} other {# ľudí}}",
- "poll.total_votes": "{count, plural, one {# hlas} few {# hlasov} many {# hlasov} other {# hlasov}}",
- "poll.vote": "Hlasuj",
- "poll.voted": "Hlasoval/a si za túto voľbu",
- "poll.votes": "{votes, plural, one {# hlas} few {# hlasov} many {# hlasov} other {# hlasy}}",
- "poll_button.add_poll": "Pridaj anketu",
- "poll_button.remove_poll": "Odstráň anketu",
- "privacy.change": "Uprav súkromie príspevku",
- "privacy.direct.long": "Pošli iba spomenutým užívateľom",
- "privacy.direct.short": "Iba spomenutým ľudom",
- "privacy.private.long": "Pošli iba následovateľom",
- "privacy.private.short": "Iba pre sledujúcich",
- "privacy.public.long": "Viditeľné pre všetkých",
+ "poll.reveal": "Zobraziť výsledky",
+ "poll.total_people": "{count, plural, one {# človek} few {# ľudia} many {# ľudí} other {# ľudí}}",
+ "poll.total_votes": "{count, plural, one {# hlas} few {# hlasy} many {# hlasov} other {# hlasov}}",
+ "poll.vote": "Hlasovať",
+ "poll.voted": "Hlasovali ste za túto voľbu",
+ "poll.votes": "{votes, plural, one {# hlas} few {# hlasy} many {# hlasov} other {# hlasov}}",
+ "poll_button.add_poll": "Pridať anketu",
+ "poll_button.remove_poll": "Odstrániť anketu",
+ "privacy.change": "Zmeniť nastavenia súkromia príspevku",
+ "privacy.direct.long": "Všetci spomenutí v príspevku",
+ "privacy.direct.short": "Konkrétni ľudia",
+ "privacy.private.long": "Iba vaši sledovatelia",
+ "privacy.private.short": "Sledovatelia",
+ "privacy.public.long": "Ktokoľvek na Mastodone aj mimo neho",
"privacy.public.short": "Verejné",
- "privacy.unlisted.long": "Viditeľné pre všetkých, ale odmietnuté funkcie zisťovania",
- "privacy.unlisted.short": "Verejne, ale nezobraziť v osi",
+ "privacy.unlisted.additional": "Presne ako verejné, s tým rozdielom, že sa príspevok nezobrazí v živých kanáloch, hashtagoch, objavovaní či vo vyhľadávaní na Mastodone, aj keď máte pre účet objaviteľnosť zapnutú.",
+ "privacy.unlisted.long": "Menej algoritmických výmyslov",
+ "privacy.unlisted.short": "Tiché verejné",
"privacy_policy.last_updated": "Posledná úprava {date}",
- "privacy_policy.title": "Zásady súkromia",
+ "privacy_policy.title": "Pravidlá ochrany súkromia",
"recommended": "Odporúčané",
"refresh": "Obnoviť",
- "regeneration_indicator.label": "Načítava sa…",
- "regeneration_indicator.sublabel": "Tvoja domovská nástenka sa pripravuje!",
- "relative_time.days": "{number}dní",
- "relative_time.full.days": "Ostáva {number, plural, one {# deň} few {# dní} many {# dní} other {# dni}}",
- "relative_time.full.hours": "Pred {number, plural, one {# hodinou} few {# hodinami} many {# hodinami} other {# hodinami}}",
- "relative_time.full.just_now": "práve teraz",
- "relative_time.full.minutes": "Pred {number, plural, one {# minútou} few {# minútami} many {# minútami} other {# minútami}}",
- "relative_time.full.seconds": "Pred {number, plural, one {# sekundou} few {# sekundami} many {# sekundami} other {# sekundami}}",
- "relative_time.hours": "{number}hod",
- "relative_time.just_now": "teraz",
- "relative_time.minutes": "{number}min",
- "relative_time.seconds": "{number}sek",
- "relative_time.today": "dnes",
+ "regeneration_indicator.label": "Načítavanie…",
+ "regeneration_indicator.sublabel": "Váš domovský kanál sa pripravuje.",
+ "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}}",
+ "relative_time.full.just_now": "Práve teraz",
+ "relative_time.full.minutes": "Pred {number, plural, one {# minútou} other {# minútami}}",
+ "relative_time.full.seconds": "Pred {number, plural, one {# sekundou} other {# sekundami}}",
+ "relative_time.hours": "{number} hod",
+ "relative_time.just_now": "Teraz",
+ "relative_time.minutes": "{number} min",
+ "relative_time.seconds": "{number} sek",
+ "relative_time.today": "Dnes",
+ "reply_indicator.attachments": "{count, plural, one {# príloha} few {# prílohy} other {# príloh}}",
"reply_indicator.cancel": "Zrušiť",
- "report.block": "Blokuj",
+ "reply_indicator.poll": "Anketa",
+ "report.block": "Blokovať",
"report.block_explanation": "Ich príspevky neuvidíte. Nebudú môcť vidieť vaše príspevky ani vás sledovať. Budú môcť zistiť, že sú zablokovaní.",
- "report.categories.legal": "Právne ujednania",
+ "report.categories.legal": "Právne",
"report.categories.other": "Ostatné",
"report.categories.spam": "Spam",
"report.categories.violation": "Obsah porušuje jedno alebo viacero pravidiel servera",
- "report.category.subtitle": "Vyberte si najlepšiu voľbu",
- "report.category.title": "Povedzte nám, čo sa deje s týmto {type}",
- "report.category.title_account": "profilom",
- "report.category.title_status": "príspevkom",
+ "report.category.subtitle": "Vyberte najlepšiu voľbu",
+ "report.category.title": "Povedzte nám, čo je zlé na tomto {type}",
+ "report.category.title_account": "profile",
+ "report.category.title_status": "príspevku",
"report.close": "Hotovo",
"report.comment.title": "Je ešte niečo, čo by sme podľa vás mali vedieť?",
- "report.forward": "Posuň ku {target}",
- "report.forward_hint": "Tento účet je z iného serveru. Chceš poslať anonymnú kópiu hlásenia aj tam?",
- "report.mute": "Nevšímaj si",
- "report.mute_explanation": "Ich príspevky neuvidíte. Stále vás môžu sledovať a vidieť vaše príspevky a nebudú vedieť, že sú stlmené.",
+ "report.forward": "Preposlať na {target}",
+ "report.forward_hint": "Tento účet je z iného serveru. Chcete poslať anonymnú kópiu hlásenia aj tam?",
+ "report.mute": "Stíšiť",
+ "report.mute_explanation": "Ich príspevky neuvidíte. Stále vás môžu sledovať a vidieť vaše príspevky a nebudú vedieť, že ste ich stíšili.",
"report.next": "Ďalej",
"report.placeholder": "Ďalšie komentáre",
"report.reasons.dislike": "Nepáči sa mi",
- "report.reasons.dislike_description": "Nieje to niečo, čo chceš vidieť",
- "report.reasons.legal": "Je to nelegálne",
+ "report.reasons.dislike_description": "Nie je to niečo, čo chcete vidieť",
+ "report.reasons.legal": "Je nelegálny",
"report.reasons.legal_description": "Domnievate sa, že porušuje zákony vašej krajiny alebo krajiny servera",
- "report.reasons.other": "Je to niečo iné",
+ "report.reasons.other": "Ide o niečo iné",
"report.reasons.other_description": "Tento problém nepatrí do iných kategórií",
"report.reasons.spam": "Je to spam",
"report.reasons.spam_description": "Škodlivé odkazy, falošné zapojenie alebo opakované odpovede",
"report.reasons.violation": "Porušuje pravidlá servera",
"report.reasons.violation_description": "Ste si vedomí, že porušuje špecifické pravidlá",
- "report.rules.subtitle": "Vyberte všetky, ktoré sa vzťahujú",
- "report.rules.title": "Ktoré pravidlá sa porušujú?",
- "report.statuses.subtitle": "Vyberte všetky, ktoré sa vzťahujú",
+ "report.rules.subtitle": "Vyberte všetky príslušné možnosti",
+ "report.rules.title": "Ktoré pravidlá sú porušované?",
+ "report.statuses.subtitle": "Vyberte všetky príslušné možnosti",
"report.statuses.title": "Sú k dispozícii príspevky podporujúce toto hlásenie?",
- "report.submit": "Odošli",
- "report.target": "Nahlás {target}",
- "report.thanks.take_action": "Tu sú tvoje možnosti kontrolovať, čo vidíš na Mastodone:",
- "report.thanks.take_action_actionable": "Kým to vyhodnotíme, môžeš podniknúť kroky voči @{name}:",
- "report.thanks.title": "Nechceš to vidieť?",
- "report.thanks.title_actionable": "Vďaka za nahlásenie, pozrieme sa na to.",
- "report.unfollow": "Nesleduj @{name}",
- "report.unfollow_explanation": "Tento účet sledujete. Ak už nechcete vidieť jeho príspevky vo svojom domovskom kanáli, zrušte jeho sledovanie.",
- "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
- "report_notification.categories.legal": "Právne ujednania",
+ "report.submit": "Odoslať",
+ "report.target": "Nahlásiť {target}",
+ "report.thanks.take_action": "Tu sú vaše možnosti kontrolovať to, čo vidíte na Mastodone:",
+ "report.thanks.take_action_actionable": "Kým to vyhodnotíme, môžete podniknúť kroky voči @{name}:",
+ "report.thanks.title": "Nechcete to vidieť?",
+ "report.thanks.title_actionable": "Ďakujeme za nahlásenie, pozrieme sa na to.",
+ "report.unfollow": "Prestať sledovať @{name}",
+ "report.unfollow_explanation": "Tento účet sledujete. Ak už nechcete vidieť jeho príspevky vo svojom domovskom kanáli, prestaňte ho sledovať.",
+ "report_notification.attached_statuses": "{count, plural, one {{count} príspevok} few {{count} príspevky} other {{count} príspevkov}} ako príloha",
+ "report_notification.categories.legal": "Právne",
"report_notification.categories.other": "Ostatné",
"report_notification.categories.spam": "Spam",
"report_notification.categories.violation": "Porušenie pravidla",
- "report_notification.open": "Otvor hlásenie",
+ "report_notification.open": "Otvoriť hlásenie",
"search.no_recent_searches": "Žiadne nedávne vyhľadávania",
- "search.placeholder": "Hľadaj",
+ "search.placeholder": "Hľadať",
"search.quick_action.account_search": "Profily zodpovedajúce {x}",
- "search.quick_action.go_to_account": "Prejdi na profil {x}",
- "search.quick_action.go_to_hashtag": "Choď na haštag {x}",
- "search.quick_action.open_url": "Otvor URL v rámci Mastodonu",
+ "search.quick_action.go_to_account": "Prejsť na profil {x}",
+ "search.quick_action.go_to_hashtag": "Prejsť na hashtag {x}",
+ "search.quick_action.open_url": "Otvoriť URL v rámci Mastodonu",
"search.quick_action.status_search": "Príspevky zodpovedajúce {x}",
- "search.search_or_paste": "Hľadaj, alebo vlož URL adresu",
+ "search.search_or_paste": "Hľadať alebo vložiť adresu URL",
"search_popout.full_text_search_disabled_message": "Nie je k dispozícii v doméne {domain}.",
- "search_popout.full_text_search_logged_out_message": "Dostupné iba keď si prihlásený/á.",
- "search_popout.language_code": "ISO kód jazyka",
+ "search_popout.full_text_search_logged_out_message": "Dostupné iba po prihlásení.",
+ "search_popout.language_code": "Kód jazyka ISO",
"search_popout.options": "Možnosti vyhľadávania",
"search_popout.quick_actions": "Rýchle akcie",
"search_popout.recent": "Nedávne vyhľadávania",
- "search_popout.specific_date": "presný dátum",
- "search_popout.user": "užívateľ",
+ "search_popout.specific_date": "Presný dátum",
+ "search_popout.user": "Účet",
"search_results.accounts": "Profily",
"search_results.all": "Všetky",
- "search_results.hashtags": "Haštagy",
- "search_results.nothing_found": "Pre tieto výrazy nemožno nič nájsť",
- "search_results.see_all": "Ukáž všetky",
+ "search_results.hashtags": "Hashtagy",
+ "search_results.nothing_found": "Pre tieto výrazy nebolo možné nič nájsť",
+ "search_results.see_all": "Zobraziť všetky",
"search_results.statuses": "Príspevky",
- "search_results.title": "Hľadaj {q}",
- "server_banner.about_active_users": "Ľudia používajúci tento server za posledných 30 dní (Aktívni používatelia za mesiac)",
- "server_banner.active_users": "aktívni užívatelia",
- "server_banner.administered_by": "Správcom je:",
+ "search_results.title": "Hľadať {q}",
+ "server_banner.about_active_users": "Ľudia používajúci tento server za posledných 30 dní (aktívni používatelia za mesiac)",
+ "server_banner.active_users": "Aktívne účty",
+ "server_banner.administered_by": "Správa servera:",
"server_banner.introduction": "{domain} je súčasťou decentralizovanej sociálnej siete využívajúcej technológiu {mastodon}.",
- "server_banner.learn_more": "Zisti viac",
- "server_banner.server_stats": "Serverové štatistiky:",
- "sign_in_banner.create_account": "Vytvor účet",
- "sign_in_banner.sign_in": "Prihlás sa",
- "sign_in_banner.sso_redirect": "Prihlás sa, alebo zaregistruj",
- "sign_in_banner.text": "Prihláste sa, aby ste mohli sledovať profily alebo haštagy, obľúbené veci, zdieľať ich a odpovedať na príspevky. Môžete tiež komunikovať zo svojho účtu na inom serveri.",
- "status.admin_account": "Otvor moderovacie rozhranie užívateľa @{name}",
- "status.admin_domain": "Otvor rozhranie na moderovanie domény {domain}",
- "status.admin_status": "Otvor tento príspevok v moderovacom rozhraní",
- "status.block": "Blokuj @{name}",
- "status.bookmark": "Záložka",
- "status.cancel_reblog_private": "Nezdieľaj",
- "status.cannot_reblog": "Tento príspevok nemôže byť zdieľaný",
- "status.copy": "Skopíruj odkaz na príspevok",
- "status.delete": "Zmazať",
+ "server_banner.learn_more": "Viac informácií",
+ "server_banner.server_stats": "Štatistiky servera:",
+ "sign_in_banner.create_account": "Vytvoriť účet",
+ "sign_in_banner.sign_in": "Prihlásiť sa",
+ "sign_in_banner.sso_redirect": "Prihlásenie alebo registrácia",
+ "sign_in_banner.text": "Prihláste sa, aby ste mohli sledovať profily alebo hashtagy, hviezdičkovať, zdieľať a odpovedať na príspevky. Môžete tiež komunikovať zo svojho účtu na inom serveri.",
+ "status.admin_account": "Moderovať @{name}",
+ "status.admin_domain": "Moderovať {domain}",
+ "status.admin_status": "Moderovať príspevok",
+ "status.block": "Blokovať @{name}",
+ "status.bookmark": "Pridať záložku",
+ "status.cancel_reblog_private": "Zrušiť zdieľanie",
+ "status.cannot_reblog": "Tento príspevok nie je možné zdieľať",
+ "status.copy": "Kopírovať odkaz na príspevok",
+ "status.delete": "Vymazať",
"status.detailed_status": "Podrobný náhľad celej konverzácie",
- "status.direct": "Spomeň @{name} v súkromí",
- "status.direct_indicator": "Súkromné spomenutie",
- "status.edit": "Uprav",
- "status.edited": "Upravené {date}",
- "status.edited_x_times": "Upravený {count, plural, one {{count} krát} other {{count} krát}}",
+ "status.direct": "Súkromne označiť @{name}",
+ "status.direct_indicator": "Súkromné označenie",
+ "status.edit": "Upraviť",
+ "status.edited": "Naposledy upravený {date}",
+ "status.edited_x_times": "Upravený {count, plural, other {{count}×}}",
"status.embed": "Vložiť",
- "status.favourite": "Páči sa mi",
+ "status.favourite": "Ohviezdičkované",
"status.filter": "Filtrovanie tohto príspevku",
"status.filtered": "Filtrované",
- "status.hide": "Skry príspevok",
- "status.history.created": "{name} vytvoril/a {date}",
- "status.history.edited": "{name} upravil/a {date}",
- "status.load_more": "Ukáž viac",
- "status.media.open": "Klikni pre otvorenie",
- "status.media.show": "Kliknutím zobrazíš",
+ "status.hide": "Skryť príspevok",
+ "status.history.created": "Vytvorené účtom {name} {date}",
+ "status.history.edited": "Upravené účtom {name} {date}",
+ "status.load_more": "Načitať viac",
+ "status.media.open": "Otvoriť kliknutím",
+ "status.media.show": "Zobraziť kliknutím",
"status.media_hidden": "Skryté médiá",
- "status.mention": "Spomeň @{name}",
+ "status.mention": "Označiť @{name}",
"status.more": "Viac",
- "status.mute": "Nevšímaj si @{name}",
- "status.mute_conversation": "Nevšímaj si konverzáciu",
- "status.open": "Otvor tento príspevok",
- "status.pin": "Pripni na profil",
+ "status.mute": "Stíšiť @{name}",
+ "status.mute_conversation": "Stíšiť konverzáciu",
+ "status.open": "Rozbaliť príspevok",
+ "status.pin": "Pripnúť na profil",
"status.pinned": "Pripnutý príspevok",
"status.read_more": "Čítaj ďalej",
- "status.reblog": "Vyzdvihni",
- "status.reblog_private": "Vyzdvihni k pôvodnému publiku",
- "status.reblogged_by": "{name} vyzdvihli",
- "status.reblogs.empty": "Nikto ešte nevyzdvihol tento príspevok. Keď tak niekto urobí, bude to zobrazené práve tu.",
- "status.redraft": "Vymaž a prepíš",
- "status.remove_bookmark": "Odstráň záložku",
+ "status.reblog": "Zdieľať",
+ "status.reblog_private": "Zdieľať pôvodnému publiku",
+ "status.reblogged_by": "{name} zdieľa",
+ "status.reblogs.empty": "Nikto ešte tento príspevok nezdieľal. Keď tak niekto urobí, zobrazí sa to tu.",
+ "status.redraft": "Vymazať a prepísať",
+ "status.remove_bookmark": "Odstrániť záložku",
"status.replied_to": "Odpoveď na {name}",
"status.reply": "Odpovedať",
- "status.replyAll": "Odpovedz na diskusiu",
- "status.report": "Nahlás @{name}",
- "status.sensitive_warning": "Chúlostivý obsah",
- "status.share": "Zdieľaj",
- "status.show_filter_reason": "Ukáž aj tak",
- "status.show_less": "Zobraz menej",
- "status.show_less_all": "Všetkým ukáž menej",
- "status.show_more": "Ukáž viac",
- "status.show_more_all": "Všetkým ukáž viac",
- "status.show_original": "Ukáž pôvodný",
- "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
+ "status.replyAll": "Odpovedať vo vlákne",
+ "status.report": "Nahlásiť @{name}",
+ "status.sensitive_warning": "Citlivý obsah",
+ "status.share": "Zdieľať",
+ "status.show_filter_reason": "Aj tak zobraziť",
+ "status.show_less": "Zobraziť menej",
+ "status.show_less_all": "Všetkým zobraziť menej",
+ "status.show_more": "Zobraziť viac",
+ "status.show_more_all": "Všetkým zobraziť viac",
+ "status.show_original": "Zobraziť originál",
+ "status.title.with_attachments": "Účet {user} nahral {attachmentCount, plural, one {prílohu} few {{attachmentCount} prílohy} many {{attachmentCount} príloh} other {{attachmentCount} príloh}}",
"status.translate": "Preložiť",
"status.translated_from_with": "Preložené z {lang} pomocou {provider}",
"status.uncached_media_warning": "Náhľad nie je k dispozícii",
- "status.unmute_conversation": "Prestaň si nevšímať konverzáciu",
- "status.unpin": "Odopni z profilu",
+ "status.unmute_conversation": "Zrušiť stíšenie konverzácie",
+ "status.unpin": "Odopnúť z profilu",
"subscribed_languages.lead": "Po zmene sa na vašej domovskej stránke a časovej osi zoznamu zobrazia iba príspevky vo vybraných jazykoch. Ak chcete dostávať príspevky vo všetkých jazykoch, vyberte možnosť žiadne.",
- "subscribed_languages.save": "Ulož zmeny",
+ "subscribed_languages.save": "Uložiť zmeny",
"subscribed_languages.target": "Zmeniť prihlásené jazyky pre {target}",
"tabs_bar.home": "Domov",
- "tabs_bar.notifications": "Oznámenia",
- "time_remaining.days": "Ostáva {number, plural, one {# deň} few {# dní} many {# dní} other {# dní}}",
- "time_remaining.hours": "Ostáva {number, plural, one {# hodina} few {# hodín} many {# hodín} other {# hodiny}}",
- "time_remaining.minutes": "Ostáva {number, plural, one {# minúta} few {# minút} many {# minút} other {# minúty}}",
+ "tabs_bar.notifications": "Upozornenia",
+ "time_remaining.days": "Ostáva{number, plural, one { # deň} few {jú # dni} many { # dní} other { # dní}}",
+ "time_remaining.hours": "Ostáva{number, plural, one { # hodina} few {jú # hodiny} many { # hodín} other { # hodín}}",
+ "time_remaining.minutes": "Ostáva{number, plural, one { # minúta} few {jú # minúty} many { # minút} other { # minút}}",
"time_remaining.moments": "Ostáva už iba chviľka",
- "time_remaining.seconds": "Ostáva {number, plural, one {# sekunda} few {# sekúnd} many {# sekúnd} other {# sekúnd}}",
- "timeline_hint.remote_resource_not_displayed": "{resource} z iných serverov sa nezobrazí.",
+ "time_remaining.seconds": "Ostáva{number, plural, one { # sekunda} few {jú # sekundy} many { # sekúnd} other { # sekúnd}}",
+ "timeline_hint.remote_resource_not_displayed": "{resource} z iných serverov sa nezobrazia.",
"timeline_hint.resources.followers": "Sledujúci",
- "timeline_hint.resources.follows": "Nasleduje",
+ "timeline_hint.resources.follows": "Sledovaní",
"timeline_hint.resources.statuses": "Staršie príspevky",
- "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
+ "trends.counter_by_accounts": "{count, plural, one {{counter} osoba} few {{counter} ľudia} many {{counter} ľudí} other {{counter} ľudí}} za posledn{days, plural, one {ý deň} few {é {days} dni} many {ých {days} dní} other {ých {days} dní}}",
"trends.trending_now": "Teraz populárne",
- "ui.beforeunload": "Čo máš rozpísané sa stratí, ak opustíš Mastodon.",
- "units.short.billion": "{count}mld.",
- "units.short.million": "{count}mil.",
- "units.short.thousand": "{count}tis.",
- "upload_area.title": "Pretiahni a pusť pre nahratie",
- "upload_button.label": "Pridaj médiálny súbor (JPEG, PNG, GIF, WebM, MP4, MOV)",
+ "ui.beforeunload": "Po opustení Mastodonu prídete o to, čo máte rozpísané.",
+ "units.short.billion": "{count} mld.",
+ "units.short.million": "{count} mil.",
+ "units.short.thousand": "{count} tis.",
+ "upload_area.title": "Nahráte potiahnutím a pustením",
+ "upload_button.label": "Pridať obrázky, video alebo zvukový súbor",
"upload_error.limit": "Limit pre nahrávanie súborov bol prekročený.",
- "upload_error.poll": "Nahrávanie súborov pri anketách nieje možné.",
- "upload_form.audio_description": "Popíš, pre ľudí so stratou sluchu",
- "upload_form.description": "Opis pre slabo vidiacich",
- "upload_form.description_missing": "Nepridaný žiadny popis",
- "upload_form.edit": "Uprav",
+ "upload_error.poll": "Nahrávanie súborov nie je pri anketách možné.",
+ "upload_form.audio_description": "Popis pre sluchovo postihnutých ľudí",
+ "upload_form.description": "Popis pre zrakovo postihnutých ľudí",
+ "upload_form.edit": "Upraviť",
"upload_form.thumbnail": "Zmeniť miniatúru",
- "upload_form.undo": "Vymaž",
- "upload_form.video_description": "Popíš, pre ľudí so stratou sluchu, alebo očným znevýhodnením",
- "upload_modal.analyzing_picture": "Analyzujem obrázok…",
- "upload_modal.apply": "Použi",
- "upload_modal.applying": "Nastavovanie…",
- "upload_modal.choose_image": "Vyber obrázok",
- "upload_modal.description_placeholder": "Rýchla hnedá líška skáče ponad lenivého psa",
- "upload_modal.detect_text": "Rozpoznaj text z obrázka",
- "upload_modal.edit_media": "Uprav médiá",
- "upload_modal.hint": "Klikni, alebo potiahni okruh ukážky pre zvolenie z ktorého východzieho bodu bude vždy v dohľadne na všetkých náhľadoch.",
- "upload_modal.preparing_ocr": "Pripravujem OCR…",
+ "upload_form.video_description": "Popís pre ľudí so zrakovým alebo sluchovým postihnutím",
+ "upload_modal.analyzing_picture": "Prebieha analýza obrázka…",
+ "upload_modal.apply": "Použiť",
+ "upload_modal.applying": "Ukladanie…",
+ "upload_modal.choose_image": "Vybrať obrázok",
+ "upload_modal.description_placeholder": "Kde bolo, tam bolo, bol raz jeden Mastodon",
+ "upload_modal.detect_text": "Rozpoznať text z obrázka",
+ "upload_modal.edit_media": "Upraviť médiá",
+ "upload_modal.hint": "Kliknite alebo potiahnite kruh na ukážke, a tak vyberte bod, ktorý bude viditeľný na všetkých náhľadoch.",
+ "upload_modal.preparing_ocr": "Pripravujem rozpoznávanie…",
"upload_modal.preview_label": "Náhľad ({ratio})",
- "upload_progress.label": "Nahráva sa...",
+ "upload_progress.label": "Nahráva sa…",
"upload_progress.processing": "Spracovávanie…",
"username.taken": "Používateľské meno je obsadené. Skúste iné",
- "video.close": "Zavri video",
- "video.download": "Stiahni súbor",
- "video.exit_fullscreen": "Vypni zobrazenie na celú obrazovku",
- "video.expand": "Zväčši video",
- "video.fullscreen": "Zobraz na celú obrazovku",
- "video.hide": "Skry video",
- "video.mute": "Stlm zvuk",
- "video.pause": "Pauza",
- "video.play": "Prehraj",
- "video.unmute": "Zapni zvuk"
+ "video.close": "Zatvoriť video",
+ "video.download": "Stiahnuť súbor",
+ "video.exit_fullscreen": "Ukončiť režim celej obrazovky",
+ "video.expand": "Zväčšiť video",
+ "video.fullscreen": "Zobraziť na celú obrazovku",
+ "video.hide": "Skryť video",
+ "video.mute": "Stlmiť zvuk",
+ "video.pause": "Pozastaviť",
+ "video.play": "Prehrať",
+ "video.unmute": "Zapnúť zvuk"
}
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index b3998b91104263..a8cce3202cf45e 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -89,7 +89,14 @@
"announcement.announcement": "Obvestilo",
"attachments_list.unprocessed": "(neobdelano)",
"audio.hide": "Skrij zvok",
- "autosuggest_hashtag.per_week": "{count} na teden",
+ "block_modal.remote_users_caveat": "Od strežnika {domain} bomo zahtevali, da spoštuje vašo odločitev. Izpolnjevanje zahteve ni zagotovljeno, ker nekateri strežniki blokiranja obravnavajo drugače. Javne objave bodo morda še vedno vidne neprijavljenim uporabnikom.",
+ "block_modal.show_less": "Pokaži manj",
+ "block_modal.show_more": "Pokaži več",
+ "block_modal.they_cant_mention": "Ne morejo vas omenjati ali vam slediti.",
+ "block_modal.they_cant_see_posts": "Ne vidijo vaših objav, vi pa ne njihovih.",
+ "block_modal.they_will_know": "Ne morejo videti, da so blokirani.",
+ "block_modal.title": "Blokiraj uporabnika?",
+ "block_modal.you_wont_see_mentions": "Objav, ki jih omenjajo, ne boste videli.",
"boost_modal.combo": "Če želite preskočiti to, lahko pritisnete {combo}",
"bundle_column_error.copy_stacktrace": "Kopiraj poročilo o napaki",
"bundle_column_error.error.body": "Zahtevane strani ni mogoče upodobiti. Vzrok težave je morda hrošč v naši kodi ali pa nezdružljivost z brskalnikom.",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "Vaš račun ni {locked}. Vsakdo vam lahko sledi in si ogleda objave, ki so namenjene samo sledilcem.",
"compose_form.lock_disclaimer.lock": "zaklenjen",
"compose_form.placeholder": "O čem razmišljate?",
- "compose_form.poll.add_option": "Dodaj izbiro",
"compose_form.poll.duration": "Trajanje ankete",
- "compose_form.poll.option_placeholder": "Izbira {number}",
- "compose_form.poll.remove_option": "Odstrani to izbiro",
+ "compose_form.poll.multiple": "Več možnosti",
+ "compose_form.poll.option_placeholder": "Možnost {number}",
+ "compose_form.poll.single": "Izberite eno možnost",
"compose_form.poll.switch_to_multiple": "Spremenite anketo, da omogočite več izbir",
"compose_form.poll.switch_to_single": "Spremenite anketo, da omogočite eno izbiro",
+ "compose_form.poll.type": "Slog",
"compose_form.publish": "Objavi",
"compose_form.publish_form": "Objavi",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Shrani spremembe",
- "compose_form.sensitive.hide": "{count, plural,one {Označi medij kot občutljiv} two {Označi medija kot občutljiva} other {Označi medije kot občutljive}}",
- "compose_form.sensitive.marked": "{count, plural,one {Medij je označen kot občutljiv} two {Medija sta označena kot občutljiva} other {Mediji so označeni kot občutljivi}}",
- "compose_form.sensitive.unmarked": "{count, plural,one {Medij ni označen kot občutljiv} two {Medija nista označena kot občutljiva} other {Mediji niso označeni kot občutljivi}}",
+ "compose_form.reply": "Odgovori",
+ "compose_form.save_changes": "Posodobi",
"compose_form.spoiler.marked": "Odstrani opozorilo o vsebini",
"compose_form.spoiler.unmarked": "Dodaj opozorilo o vsebini",
- "compose_form.spoiler_placeholder": "Tukaj napišite opozorilo",
+ "compose_form.spoiler_placeholder": "Opozorilo o vsebini (ni obvezno)",
"confirmation_modal.cancel": "Prekliči",
- "confirmations.block.block_and_report": "Blokiraj in prijavi",
"confirmations.block.confirm": "Blokiraj",
- "confirmations.block.message": "Ali ste prepričani, da želite blokirati {name}?",
"confirmations.cancel_follow_request.confirm": "Umakni zahtevo",
"confirmations.cancel_follow_request.message": "Ali ste prepričani, da želite umakniti svojo zahtevo, da bi sledili {name}?",
"confirmations.delete.confirm": "Izbriši",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "Ali ste prepričani, da želite trajno izbrisati ta seznam?",
"confirmations.discard_edit_media.confirm": "Opusti",
"confirmations.discard_edit_media.message": "Imate ne shranjene spremembe za medijski opis ali predogled; jih želite kljub temu opustiti?",
- "confirmations.domain_block.confirm": "Blokiraj celotno domeno",
+ "confirmations.domain_block.confirm": "Blokiraj strežnik",
"confirmations.domain_block.message": "Ali ste res, res prepričani, da želite blokirati celotno {domain}? V večini primerov je nekaj ciljnih blokiranj ali utišanj dovolj in boljše. Vsebino iz te domene ne boste videli v javnih časovnicah ali obvestilih. Vaši sledilci iz te domene bodo odstranjeni.",
"confirmations.edit.confirm": "Uredi",
"confirmations.edit.message": "Urejanje bo prepisalo sporočilo, ki ga trenutno sestavljate. Ali ste prepričani, da želite nadaljevati?",
"confirmations.logout.confirm": "Odjava",
"confirmations.logout.message": "Ali ste prepričani, da se želite odjaviti?",
"confirmations.mute.confirm": "Utišanje",
- "confirmations.mute.explanation": "S tem boste skrili objave pred njimi in objave, ki jih omenjajo, še vedno pa bodo lahko videli vaše objave in vam sledili.",
- "confirmations.mute.message": "Ali ste prepričani, da želite utišati {name}?",
"confirmations.redraft.confirm": "Izbriši in preoblikuj",
"confirmations.redraft.message": "Ali ste prepričani, da želite izbrisati ta status in ga preoblikovati? Vzljubi in izpostavitve bodo izgubljeni, odgovori na izvirno objavo pa bodo osiroteli.",
"confirmations.reply.confirm": "Odgovori",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "Te objave s tega in drugih strežnikov v decentraliziranem omrežju pridobivajo ravno zdaj veliko pozornosti na tem strežniku.",
"dismissable_banner.explore_tags": "Ravno zdaj dobivajo ti ključniki veliko pozoronosti med osebami na tem in drugih strežnikih decentraliziranega omrežja.",
"dismissable_banner.public_timeline": "To so najnovejše javne objave oseb z družabnega omrežja, ki jim sledijo osebe na {domain}.",
+ "domain_block_modal.block": "Blokiraj strežnik",
+ "domain_block_modal.block_account_instead": "Namesto tega blokiraj @{name}",
+ "domain_block_modal.they_can_interact_with_old_posts": "Osebe s tega strežnika se lahko odzivajo na vaše stare objave.",
+ "domain_block_modal.they_cant_follow": "Nihče s tega strežnika vam ne more slediti.",
+ "domain_block_modal.they_wont_know": "Ne bodo vedeli, da so blokirani.",
+ "domain_block_modal.title": "Blokiraj domeno?",
+ "domain_block_modal.you_will_lose_followers": "Vsi vaši sledilci s tega strežnika bodo odstranjeni.",
+ "domain_block_modal.you_wont_see_posts": "Objav ali obvestil uporabnikov s tega strežnika ne boste videli.",
+ "domain_pill.activitypub_lets_connect": "Omogoča vam povezovanje in interakcijo z ljudmi, ki niso samo na Mastodonu, ampak tudi na drugih družabnih platformah.",
+ "domain_pill.activitypub_like_language": "Protokol ActivityPub je kot jezik, s katerim se Mastodon pogovarja z drugimi družabnimi omrežji.",
+ "domain_pill.server": "Strežnik",
+ "domain_pill.their_handle": "Njihova ročica:",
+ "domain_pill.their_server": "Njihovo digitalno domovanje, kjer bivajo vse njihove objave.",
+ "domain_pill.their_username": "Njihov edinstveni identifikator na njihovem strežniku. Uporabnike z istim uporabniškim imenom lahko najdete na različnih strežnikih.",
+ "domain_pill.username": "Uporabniško ime",
+ "domain_pill.whats_in_a_handle": "Kaj je v ročici?",
+ "domain_pill.who_they_are": "Ker ročice povedo, kdo je kdo in kje so, ste lahko z osebami v interakciji prek družabnega spleta .",
+ "domain_pill.who_you_are": "Ker ročice povedo, kdo ste in kje ste, ste lahko z osebami v interakciji prek družabnega spleta .",
+ "domain_pill.your_handle": "Vaša ročica:",
+ "domain_pill.your_server": "Vaše digitalno domovanje, kjer bivajo vse vaše objave. Vam ta ni všeč? Prenesite ga med strežniki kadar koli in z njim tudi svoje sledilce.",
+ "domain_pill.your_username": "Vaš edinstveni identifikator na tem strežniku. Uporabnike z istim uporabniškim imenom je možno najti na različnih strežnikih.",
"embed.instructions": "Vstavite to objavo na svojo spletno stran tako, da kopirate spodnjo kodo.",
"embed.preview": "Tako bo izgledalo:",
"emoji_button.activity": "Dejavnost",
@@ -244,6 +266,7 @@
"empty_column.list": "Na tem seznamu ni ničesar. Ko bodo člani tega seznama objavili nove statuse, se bodo pojavili tukaj.",
"empty_column.lists": "Nimate seznamov. Ko ga boste ustvarili, se bo prikazal tukaj.",
"empty_column.mutes": "Niste utišali še nobenega uporabnika.",
+ "empty_column.notification_requests": "Vse prebrano! Tu ni ničesar več. Ko prejmete nova obvestila, se bodo pojavila tu glede na vaše nastavitve.",
"empty_column.notifications": "Nimate še nobenih obvestil. Povežite se z drugimi, da začnete pogovor.",
"empty_column.public": "Tukaj ni ničesar! Da ga napolnite, napišite nekaj javnega ali pa ročno sledite uporabnikom iz drugih strežnikov",
"error.unexpected_crash.explanation": "Zaradi hrošča v naši kodi ali težave z združljivostjo brskalnika te strani ni mogoče ustrezno prikazati.",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "Uporabite obstoječo kategorijo ali ustvarite novo",
"filter_modal.select_filter.title": "Filtriraj to objavo",
"filter_modal.title.status": "Filtrirajte objavo",
+ "filtered_notifications_banner.mentions": "{count, plural, one {omemba} two {omembi} few {omembe} other {omemb}}",
+ "filtered_notifications_banner.pending_requests": "Obvestila od {count, plural, =0 {nikogar, ki bi ga} one {# človeka, ki bi ga} two {# ljudi, ki bi ju} few {# ljudi, ki bi jih} other {# ljudi, ki bi jih}} lahko poznali",
+ "filtered_notifications_banner.title": "Filtrirana obvestila",
"firehose.all": "Vse",
"firehose.local": "Ta strežnik",
"firehose.remote": "Drugi strežniki",
"follow_request.authorize": "Overi",
"follow_request.reject": "Zavrni",
"follow_requests.unlocked_explanation": "Čeprav vaš račun ni zaklenjen, zaposleni pri {domain} menijo, da bi morda želeli pregledati zahteve za sledenje teh računov ročno.",
+ "follow_suggestions.curated_suggestion": "Izbor osebja",
+ "follow_suggestions.dismiss": "Ne pokaži več",
+ "follow_suggestions.featured_longer": "Osebno izbrala ekipa {domain}",
+ "follow_suggestions.friends_of_friends_longer": "Priljubljeno med osebami, ki jim sledite",
+ "follow_suggestions.hints.featured": "Ta profil so izbrali skrbniki strežnika {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "Ta profil je priljubljen med osebami, ki jim sledite.",
+ "follow_suggestions.hints.most_followed": "Ta profil na strežniku {domain} je en izmed najbolj sledenih.",
+ "follow_suggestions.hints.most_interactions": "Ta profil na strežniku {domain} je nedavno prejel veliko pozornosti.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Ta profil je podoben profilom, ki ste jim nedavno začeli slediti.",
+ "follow_suggestions.personalized_suggestion": "Osebno prilagojen predlog",
+ "follow_suggestions.popular_suggestion": "Priljubljen predlog",
+ "follow_suggestions.popular_suggestion_longer": "Priljubljeno na {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Podobno profilom, ki ste jim pred kratkim sledili",
+ "follow_suggestions.view_all": "Pokaži vse",
+ "follow_suggestions.who_to_follow": "Komu slediti",
"followed_tags": "Sledeni ključniki",
"footer.about": "O Mastodonu",
"footer.directory": "Imenik profilov",
@@ -306,13 +347,8 @@
"hashtag.follow": "Sledi ključniku",
"hashtag.unfollow": "Nehaj slediti ključniku",
"hashtags.and_other": "…in še {count, plural, other {#}}",
- "home.actions.go_to_explore": "Poglejte, kaj je v trendu",
- "home.actions.go_to_suggestions": "Poiščite osebe, ki jim želite slediti",
- "home.column_settings.basic": "Osnovno",
"home.column_settings.show_reblogs": "Pokaži izpostavitve",
"home.column_settings.show_replies": "Pokaži odgovore",
- "home.explore_prompt.body": "Vaš domači vir bo vseboval mešanico objav ključnikov, ki ste jih izbrali za sledenje, oseb, ki ste jih izbrali za sledenje, in objav, ki jih ti izpostavljajo. Če se vam to zdi preveč tiho, morda želite:",
- "home.explore_prompt.title": "To je vaš dom v okviru Mastodona.",
"home.hide_announcements": "Skrij obvestila",
"home.pending_critical_update.body": "Čim prej posodobite svoj strežnik Mastodon!",
"home.pending_critical_update.link": "Glejte posodobitve",
@@ -378,6 +414,7 @@
"limited_account_hint.action": "Vseeno pokaži profil",
"limited_account_hint.title": "Profil so moderatorji strežnika {domain} skrili.",
"link_preview.author": "Avtor_ica {name}",
+ "link_preview.more_from_author": "Več od {name}",
"lists.account.add": "Dodaj na seznam",
"lists.account.remove": "Odstrani s seznama",
"lists.delete": "Izbriši seznam",
@@ -396,9 +433,15 @@
"loading_indicator.label": "Nalaganje …",
"media_gallery.toggle_visible": "{number, plural,one {Skrij sliko} two {Skrij sliki} other {Skrij slike}}",
"moved_to_account_banner.text": "Vaš račun {disabledAccount} je trenutno onemogočen, ker ste se prestavili na {movedToAccount}.",
- "mute_modal.duration": "Trajanje",
- "mute_modal.hide_notifications": "Ali želite skriti obvestila tega uporabnika?",
- "mute_modal.indefinite": "Nedoločeno",
+ "mute_modal.hide_from_notifications": "Skrijte se pred obvestili",
+ "mute_modal.hide_options": "Skrij možnosti",
+ "mute_modal.indefinite": "Dokler jim ne povrnem glasu",
+ "mute_modal.show_options": "Pokaži možnosti",
+ "mute_modal.they_can_mention_and_follow": "Lahko vas omenijo ali vam sledijo, vi pa jih ne morete videti.",
+ "mute_modal.they_wont_know": "Ne bodo vedeli, da so utišani.",
+ "mute_modal.title": "Utišaj uporabnika?",
+ "mute_modal.you_wont_see_mentions": "Objav, ki jih omenjajo, ne boste videli.",
+ "mute_modal.you_wont_see_posts": "Še vedno vidijo vaše objave, vi pa ne njihovih.",
"navigation_bar.about": "O Mastodonu",
"navigation_bar.advanced_interface": "Odpri v naprednem spletnem vmesniku",
"navigation_bar.blocks": "Blokirani uporabniki",
@@ -408,7 +451,6 @@
"navigation_bar.direct": "Zasebne omembe",
"navigation_bar.discover": "Odkrijte",
"navigation_bar.domain_blocks": "Blokirane domene",
- "navigation_bar.edit_profile": "Uredi profil",
"navigation_bar.explore": "Razišči",
"navigation_bar.favourites": "Priljubljeni",
"navigation_bar.filters": "Utišane besede",
@@ -432,11 +474,29 @@
"notification.follow": "{name} vam sledi",
"notification.follow_request": "{name} vam želi slediti",
"notification.mention": "{name} vas je omenil/a",
+ "notification.moderation-warning.learn_more": "Več o tem",
+ "notification.moderation_warning": "Prejeli ste opozorilo moderatorjev",
+ "notification.moderation_warning.action_delete_statuses": "Nekatere vaše objave so odstranjene.",
+ "notification.moderation_warning.action_disable": "Vaš račun je bil onemogočen.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Nekatere vaše objave so bile označene kot občutljive.",
+ "notification.moderation_warning.action_none": "Vaš račun je prejel opozorilo moderatorjev.",
+ "notification.moderation_warning.action_sensitive": "Vaše objave bodo odslej označene kot občutljive.",
+ "notification.moderation_warning.action_silence": "Vaš račun je bil omejen.",
+ "notification.moderation_warning.action_suspend": "Vaš račun je bil suspendiran.",
"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.relationships_severance_event": "Povezave z {name} prekinjene",
+ "notification.relationships_severance_event.account_suspension": "Skrbnik na {from} je suspendiral račun {target}, kar pomeni, da od računa ne morete več prejemati posodobitev ali imeti z njim interakcij.",
+ "notification.relationships_severance_event.domain_block": "Skrbnik na {from} je blokiral domeno {target}, vključno z vašimi sledilci ({followersCount}) in {followingCount, plural, one {# računom, ki mu sledite} two {# računoma, ki jima sledite} few {# računi, ki jim sledite} other {# računi, ki jim sledite}}.",
+ "notification.relationships_severance_event.learn_more": "Več o tem",
+ "notification.relationships_severance_event.user_domain_block": "Blokirali ste domeno {target}, vključno z vašimi sledilci ({followersCount}) in {followingCount, plural, one {# računom, ki mu sledite} two {# računoma, ki jima sledite} few {# računi, ki jim sledite} other {# računi, ki jim sledite}}.",
"notification.status": "{name} je pravkar objavil/a",
"notification.update": "{name} je uredil(a) objavo",
+ "notification_requests.accept": "Sprejmi",
+ "notification_requests.dismiss": "Zavrni",
+ "notification_requests.notifications_from": "Obvestila od {name}",
+ "notification_requests.title": "Filtrirana obvestila",
"notifications.clear": "Počisti obvestila",
"notifications.clear_confirmation": "Ali ste prepričani, da želite trajno izbrisati vsa svoja obvestila?",
"notifications.column_settings.admin.report": "Nove prijave:",
@@ -445,7 +505,6 @@
"notifications.column_settings.favourite": "Priljubljeni:",
"notifications.column_settings.filter_bar.advanced": "Prikaži vse kategorije",
"notifications.column_settings.filter_bar.category": "Vrstica za hitro filtriranje",
- "notifications.column_settings.filter_bar.show_bar": "Pokaži vrstico s filtri",
"notifications.column_settings.follow": "Novi sledilci:",
"notifications.column_settings.follow_request": "Nove prošnje za sledenje:",
"notifications.column_settings.mention": "Omembe:",
@@ -471,6 +530,15 @@
"notifications.permission_denied": "Namizna obvestila niso na voljo zaradi poprej zavrnjene zahteve dovoljenja brskalnika.",
"notifications.permission_denied_alert": "Namiznih obvestil ni mogoče omogočiti, ker je bilo dovoljenje brskalnika že prej zavrnjeno",
"notifications.permission_required": "Namizna obvestila niso na voljo, ker zahtevano dovoljenje ni bilo podeljeno.",
+ "notifications.policy.filter_new_accounts.hint": "Ustvarjen v {days, plural, one {zadnjem # dnevu} two {zadnjih # dnevih} few {zadnjih # dnevih} other {zadnjih # dnevih}}",
+ "notifications.policy.filter_new_accounts_title": "Novi računi",
+ "notifications.policy.filter_not_followers_hint": "Vključujoč ljudi, ki vam sledijo manj kot {days, plural, one {# dan} two {# dneva} few {# dni} other {# dni}}",
+ "notifications.policy.filter_not_followers_title": "Ljudje, ki vam ne sledijo",
+ "notifications.policy.filter_not_following_hint": "Dokler jih ročno ne odobrite",
+ "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": "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",
@@ -526,14 +594,15 @@
"poll_button.add_poll": "Dodaj anketo",
"poll_button.remove_poll": "Odstrani anketo",
"privacy.change": "Spremeni zasebnost objave",
- "privacy.direct.long": "Objavi samo omenjenim uporabnikom",
- "privacy.direct.short": "Samo omenjeni",
- "privacy.private.long": "Vidno samo sledilcem",
- "privacy.private.short": "Samo sledilci",
- "privacy.public.long": "Vidno vsem",
+ "privacy.direct.long": "Vsem omenjenim v objavi",
+ "privacy.direct.short": "Določenim ljudem",
+ "privacy.private.long": "Samo vašim sledilcem",
+ "privacy.private.short": "Sledilcem",
+ "privacy.public.long": "Vsem, ki so ali niso na Mastodonu",
"privacy.public.short": "Javno",
- "privacy.unlisted.long": "Vidno za vse, vendar izključeno iz funkcionalnosti odkrivanja",
- "privacy.unlisted.short": "Ni prikazano",
+ "privacy.unlisted.additional": "Učinek je enak kot pri javni objavi, le da se ta ne bo prikazala v živih virih, med ključniki, raziskovanjem ali iskanjem, četudi ste to vključili na ravni računa.",
+ "privacy.unlisted.long": "Manj vsebine po izboru algoritma",
+ "privacy.unlisted.short": "Tiho javno",
"privacy_policy.last_updated": "Zadnja posodobitev {date}",
"privacy_policy.title": "Pravilnik o zasebnosti",
"recommended": "Priporočeno",
@@ -551,7 +620,9 @@
"relative_time.minutes": "{number} m",
"relative_time.seconds": "{number} s",
"relative_time.today": "danes",
+ "reply_indicator.attachments": "{count, plural, one {# priloga} two {# prilogi} few {# priloge} other {# prilog}}",
"reply_indicator.cancel": "Prekliči",
+ "reply_indicator.poll": "Anketa",
"report.block": "Blokiraj",
"report.block_explanation": "Njihovih objav ne boste videli. Oni ne bodo videli vaših objav, niti vam ne morejo slediti. Lahko bodo ugotovili, da so blokirani.",
"report.categories.legal": "Pravno obvestilo",
@@ -644,10 +715,11 @@
"status.direct": "Zasebno omeni @{name}",
"status.direct_indicator": "Zasebna omemba",
"status.edit": "Uredi",
- "status.edited": "Urejeno {date}",
+ "status.edited": "Zadnje urejanje {date}",
"status.edited_x_times": "Urejeno {count, plural, one {#-krat} two {#-krat} few {#-krat} other {#-krat}}",
"status.embed": "Vdelaj",
"status.favourite": "Priljubljen_a",
+ "status.favourites": "{count, plural, one {priljubitev} two {priljubitvi} few {priljubitve} other {priljubitev}}",
"status.filter": "Filtriraj to objavo",
"status.filtered": "Filtrirano",
"status.hide": "Skrij objavo",
@@ -668,6 +740,7 @@
"status.reblog": "Izpostavi",
"status.reblog_private": "Izpostavi z izvirno vidljivostjo",
"status.reblogged_by": "{name} je izpostavil/a",
+ "status.reblogs": "{count, plural, one {izpostavitev} two {izpostavitvi} few {izpostavitve} other {izpostavitev}}",
"status.reblogs.empty": "Nihče še ni izpostavil te objave. Ko se bo to zgodilo, se bodo pojavile tukaj.",
"status.redraft": "Izbriši in preoblikuj",
"status.remove_bookmark": "Odstrani zaznamek",
@@ -715,10 +788,8 @@
"upload_error.poll": "Prenos datoteke z anketami ni dovoljen.",
"upload_form.audio_description": "Opiši za osebe z okvaro sluha",
"upload_form.description": "Opišite za slabovidne",
- "upload_form.description_missing": "Noben opis ni dodan",
"upload_form.edit": "Uredi",
"upload_form.thumbnail": "Spremeni sličico",
- "upload_form.undo": "Izbriši",
"upload_form.video_description": "Opišite za osebe z okvaro sluha in/ali vida",
"upload_modal.analyzing_picture": "Analiziranje slike …",
"upload_modal.apply": "Uveljavi",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index f45266c845819b..b496f8e20385a5 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -89,7 +89,14 @@
"announcement.announcement": "Lajmërim",
"attachments_list.unprocessed": "(e papërpunuar)",
"audio.hide": "Fshihe audion",
- "autosuggest_hashtag.per_week": "{count} për javë",
+ "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.",
+ "block_modal.show_less": "Shfaq më pak",
+ "block_modal.show_more": "Shfaq më tepër",
+ "block_modal.they_cant_mention": "S’mund t’u përmendin, ose t’ju ndjekin.",
+ "block_modal.they_cant_see_posts": "S’mund të shohin postimet tuaja dhe as ju të tyret.",
+ "block_modal.they_will_know": "Mund të shohin se janë bllokuar.",
+ "block_modal.title": "Të bllokohet përdoruesi?",
+ "block_modal.you_wont_see_mentions": "S’do të shihni postimet ku përmenden.",
"boost_modal.combo": "Që kjo të anashkalohet herës tjetër, mund të shtypni {combo}",
"bundle_column_error.copy_stacktrace": "Kopjo raportim gabimi",
"bundle_column_error.error.body": "Faqja e kërkuar s’u vizatua dot. Kjo mund të vijë nga një e metë në kodin tonë, ose nga një problem përputhshmërie i shfletuesit.",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "Llogaria juaj s’është {locked}. Mund ta ndjekë cilido, për të parë postimet tuaja vetëm për ndjekësit.",
"compose_form.lock_disclaimer.lock": "e kyçur",
"compose_form.placeholder": "Ç’bluani në mendje?",
- "compose_form.poll.add_option": "Shtoni një zgjedhje",
"compose_form.poll.duration": "Kohëzgjatje pyetësori",
- "compose_form.poll.option_placeholder": "Zgjedhja {number}",
- "compose_form.poll.remove_option": "Hiqe këtë zgjedhje",
+ "compose_form.poll.multiple": "Shumë zgjedhje",
+ "compose_form.poll.option_placeholder": "Mundësia {number}",
+ "compose_form.poll.single": "Zgjidhni një",
"compose_form.poll.switch_to_multiple": "Ndrysho votimin për të lejuar shumë zgjedhje",
"compose_form.poll.switch_to_single": "Ndrysho votimin për të lejuar vetëm një zgjedhje",
- "compose_form.publish": "Botoje",
+ "compose_form.poll.type": "Stil",
+ "compose_form.publish": "Postim",
"compose_form.publish_form": "Publikoje",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Ruaji ndryshimet",
- "compose_form.sensitive.hide": "{count, plural, one {Vëri shenjë medias si rezervat} other {Vëru shenjë mediave si rezervat}}",
- "compose_form.sensitive.marked": "{count, plural, one {Medias i është vënë shenjë rezervat} other {Mediave u është vënë shenjë si rezervat}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Media s’ka shenjë si rezervat} other {Mediat s’kanë shenja si rezervat}}",
+ "compose_form.reply": "Përgjigjuni",
+ "compose_form.save_changes": "Përditësoje",
"compose_form.spoiler.marked": "Hiq sinjalizim lënde",
"compose_form.spoiler.unmarked": "Shtoni sinjalizim lënde",
- "compose_form.spoiler_placeholder": "Shkruani këtu sinjalizimin tuaj",
+ "compose_form.spoiler_placeholder": "Sinjalizim lënde (opsional)",
"confirmation_modal.cancel": "Anuloje",
- "confirmations.block.block_and_report": "Bllokojeni & Raportojeni",
"confirmations.block.confirm": "Bllokoje",
- "confirmations.block.message": "Jeni i sigurt se doni të bllokohet {name}?",
"confirmations.cancel_follow_request.confirm": "Tërhiqeni mbrapsht kërkesën",
"confirmations.cancel_follow_request.message": "Jeni i sigurt se doni të tërhiqni mbrapsht kërkesën tuaj për ndjekje të {name}?",
"confirmations.delete.confirm": "Fshije",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "Jeni i sigurt se doni të fshihet përgjithmonë kjo listë?",
"confirmations.discard_edit_media.confirm": "Hidhe tej",
"confirmations.discard_edit_media.message": "Keni ndryshime të paruajtura te përshkrimi ose paraparja e medias, të hidhen tej, sido qoftë?",
- "confirmations.domain_block.confirm": "Bllokoje krejt përkatësinë",
+ "confirmations.domain_block.confirm": "Bllokoje shërbyesin",
"confirmations.domain_block.message": "Jeni i sigurt, shumë i sigurt se doni të bllokohet krejt {domain}? Në shumicën e rasteve, ndoca bllokime ose heshtime me synim të caktuar janë të mjaftueshme dhe të parapëlqyera. S’keni për të parë lëndë nga kjo përkatësi në ndonjë rrjedhë kohore publike, apo te njoftimet tuaja. Ndjekësit tuaj prej asaj përkatësie do të hiqen.",
"confirmations.edit.confirm": "Përpunojeni",
"confirmations.edit.message": "Përpunimi tani do të sjellë mbishkrim të mesazhit që po hartoni aktualisht. Jeni i sigurt se doni të vazhdohet?",
"confirmations.logout.confirm": "Dilni",
"confirmations.logout.message": "Jeni i sigurt se doni të dilet?",
"confirmations.mute.confirm": "Heshtoje",
- "confirmations.mute.explanation": "Kjo do t’u fshehë postimet dhe përmendje postimesh, por ende do t’u lejojë të shohin postimet tuaja dhe t’ju ndjekin.",
- "confirmations.mute.message": "Jeni i sigurt se doni të heshtohet {name}?",
"confirmations.redraft.confirm": "Fshijeni & rihartojeni",
"confirmations.redraft.message": "Jeni i sigurt se doni të fshihet kjo gjendje dhe të rihartohet? Të parapëlqyerit dhe përforcimet do të humbin, ndërsa përgjigjet te postimi origjinal do të bëhen jetime.",
"confirmations.reply.confirm": "Përgjigjuni",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "Këto janë postime nga rrjeti shoqëror që po tërheqin vëmendjen tani. Postimet më të reja me më përforcime dhe më të parapëlqyera nga njerëzit renditen më sipër.",
"dismissable_banner.explore_tags": "Këta hashtag-ë po tërheqin vëmendjen mes personave në këtë shërbyes dhe të tjerë të tillë të rrjetit të decentralizuar mu tani.",
"dismissable_banner.public_timeline": "Këto janë postimet më të reja publike prej personash në rrjetin shoqëror që ndjekin njerëzit në {domain}.",
+ "domain_block_modal.block": "Bllokoje shërbyesin",
+ "domain_block_modal.block_account_instead": "Blloko @{name} në vend të kësaj",
+ "domain_block_modal.they_can_interact_with_old_posts": "Persona nga ky shërbyes mund të ndërveprojnë me postimet tuaja të vjetra.",
+ "domain_block_modal.they_cant_follow": "S’mund t’ju ndjekë askush nga ky shërbyes.",
+ "domain_block_modal.they_wont_know": "S’do ta dinë se janë bllokuar.",
+ "domain_block_modal.title": "Të bllokohet përkatësia?",
+ "domain_block_modal.you_will_lose_followers": "Krejt ndjekësit tuaj nga ky shërbyes do të hiqen.",
+ "domain_block_modal.you_wont_see_posts": "S’do të shihni postime, apo njoftime nga përdorues në këtë shërbyes.",
+ "domain_pill.activitypub_lets_connect": "Ju lejon të lidheni dhe ndërveproni me persona jo thjesht në Mastodon, por edhe nëpër aplikacione të ndryshme shoqërore.",
+ "domain_pill.activitypub_like_language": "ActivityPub është si gjuha me të cilën Mastodon-i komunikon me rrjete të tjerë shoqërorë.",
+ "domain_pill.server": "Shërbyes",
+ "domain_pill.their_handle": "Targa e tij:",
+ "domain_pill.their_server": "Shtëpia e tij dixhitale, ku rrinë krejt postimet prej tij.",
+ "domain_pill.their_username": "Identifikuesi i tij unik në shërbyesin e vet. Është e mundur të gjenden përdorues me të njëjtin emër përdoruesi në shërbyes të ndryshëm.",
+ "domain_pill.username": "Emër përdoruesi",
+ "domain_pill.whats_in_a_handle": "Ç’është një targë?",
+ "domain_pill.who_they_are": "Nga targat thonë se cili është dikush dhe se ku gjendet, ju mund të ndërveproni me persona nëpër web-in shoqëror të .",
+ "domain_pill.who_you_are": "Ngaqë targa juaj thotë se cili jeni dhe se ku gjendeni, njerëzit mund të ndërveprojnë me ju nëpër web-in shoqëror të .",
+ "domain_pill.your_handle": "Targa juaj:",
+ "domain_pill.your_server": "Shtëpia juaj dixhitale, kur gjenden krejt postimet tuaja. S’ju pëlqen kjo këtu? Shpërngulni shërbyes kur të doni dhe sillni edhe ndjekësit tuaj.",
+ "domain_pill.your_username": "Identifikuesi juja unik në këtë shërbyes. Është e mundur të gjenden përdorues me të njëjtin emër përdoruesi në shërbyes të ndryshëm.",
"embed.instructions": "Trupëzojeni këtë gjendje në sajtin tuaj duke kopjuar kodin më poshtë.",
"embed.preview": "Ja si do të duket:",
"emoji_button.activity": "Veprimtari",
@@ -244,6 +266,7 @@
"empty_column.list": "Në këtë listë ende s’ka gjë. Kur anëtarë të kësaj liste postojnë gjendje të reja, ato do të shfaqen këtu.",
"empty_column.lists": "Ende s’keni ndonjë listë. Kur të krijoni një të tillë, do të duket këtu.",
"empty_column.mutes": "S’keni heshtuar ende ndonjë përdorues.",
+ "empty_column.notification_requests": "Gjithçka si duhet! S’ka ç’bëhet këtu. Kur merrni njoftime të reja, do të shfaqen këtu, në përputhje me rregullimet tuaja.",
"empty_column.notifications": "Ende s’keni ndonjë njoftim. Ndërveproni me të tjerët që të nisë biseda.",
"empty_column.public": "S’ka gjë këtu! Shkruani diçka publikisht, ose ndiqni dorazi përdorues prej instancash të tjera, që kjo të mbushet",
"error.unexpected_crash.explanation": "Për shkak të një të mete në kodin tonë ose të një problemi përputhshmërie të shfletuesit, kjo faqe s’mund të shfaqet saktë.",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "Përdorni një kategori ekzistuese, ose krijoni një të re",
"filter_modal.select_filter.title": "Filtroje këtë postim",
"filter_modal.title.status": "Filtroni një postim",
+ "filtered_notifications_banner.mentions": "{count, plural, one {përmendje} other {përmendje}}",
+ "filtered_notifications_banner.pending_requests": "Njoftime prej {count, plural, =0 {askujt} one {një personi} other {# vetësh}} që mund të njihni",
+ "filtered_notifications_banner.title": "Njoftime të filtruar",
"firehose.all": "Krejt",
"firehose.local": "Këtë shërbyes",
"firehose.remote": "Shërbyes të tjerë",
"follow_request.authorize": "Autorizoje",
"follow_request.reject": "Hidhe tej",
"follow_requests.unlocked_explanation": "Edhe pse llogaria juaj s’është e kyçur, ekipi i {domain} mendoi se mund të donit të shqyrtonit dorazi kërkesa ndjekjeje prej këtyre llogarive.",
+ "follow_suggestions.curated_suggestion": "Zgjedhur nga ekipi",
+ "follow_suggestions.dismiss": "Mos shfaq më",
+ "follow_suggestions.featured_longer": "Zgjedhur enkas nga ekipi {domain}",
+ "follow_suggestions.friends_of_friends_longer": "Popullore mes personash që ndiqni",
+ "follow_suggestions.hints.featured": "Ky profil është zgjedhur nga ekipi {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "Ky profil është popullor mes personave që ndiqni.",
+ "follow_suggestions.hints.most_followed": "Ky profil është një nga më të ndjekur në {domain}.",
+ "follow_suggestions.hints.most_interactions": "Ky profil ka tërhequr mjaft vëmendjen së fundi në {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Ky profil është i ngjashëm me profile që keni ndjekur tani afër.",
+ "follow_suggestions.personalized_suggestion": "Sugjerim i personalizuar",
+ "follow_suggestions.popular_suggestion": "Sugjerim popullor",
+ "follow_suggestions.popular_suggestion_longer": "Popullore në {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "I ngjashëm me profile që keni zënë të ndiqni së fundi",
+ "follow_suggestions.view_all": "Shihni krejt",
+ "follow_suggestions.who_to_follow": "Cilët të ndiqen",
"followed_tags": "Hashtag-ë të ndjekur",
"footer.about": "Mbi",
"footer.directory": "Drejtori profilesh",
@@ -306,13 +347,8 @@
"hashtag.follow": "Ndiqe hashtag-un",
"hashtag.unfollow": "Hiqe ndjekjen e hashtag-ut",
"hashtags.and_other": "…dhe {count, plural, one {}other {# më tepër}}",
- "home.actions.go_to_explore": "Shihni ç’është në modë",
- "home.actions.go_to_suggestions": "Gjeni persona për ndjekje",
- "home.column_settings.basic": "Bazë",
"home.column_settings.show_reblogs": "Shfaq përforcime",
"home.column_settings.show_replies": "Shfaq përgjigje",
- "home.explore_prompt.body": "Prurja juaj bazë do të ketë një përzierje postimesh nga hashtag-ë që keni zgjedhur të ndiqni, persona që keni zgjedhur të ndiqni dhe postime që ata përforcojnë. Nëse kjo duket si shumë qetësi, mund të doni të:",
- "home.explore_prompt.title": "Kjo është baza juaj brenda Mastodon-it.",
"home.hide_announcements": "Fshihi lajmërimet",
"home.pending_critical_update.body": "Ju lutemi, përditësoni sa më shpejt të jetë e mundur shërbyesin tuaj Mastodon!",
"home.pending_critical_update.link": "Shihni përditësime",
@@ -396,9 +432,15 @@
"loading_indicator.label": "Po ngarkohet…",
"media_gallery.toggle_visible": "Fshihni {number, plural, one {figurë} other {figura}}",
"moved_to_account_banner.text": "Llogaria juaj {disabledAccount} aktualisht është e çaktivizuar, ngaqë kaluat te {movedToAccount}.",
- "mute_modal.duration": "Kohëzgjatje",
- "mute_modal.hide_notifications": "Të kalohen të fshehura njoftimet prej këtij përdoruesi?",
- "mute_modal.indefinite": "E pacaktuar",
+ "mute_modal.hide_from_notifications": "Fshihe prej njoftimeve",
+ "mute_modal.hide_options": "Fshihi mundësitë",
+ "mute_modal.indefinite": "Deri sa t’u heq heshtimin",
+ "mute_modal.show_options": "Shfaq mundësi",
+ "mute_modal.they_can_mention_and_follow": "Mund t’ju përmendin dhe ndjekin, por s’do t’i shihni.",
+ "mute_modal.they_wont_know": "S’do ta dinë se janë heshtuar.",
+ "mute_modal.title": "Të heshtohet përdoruesi?",
+ "mute_modal.you_wont_see_mentions": "S’do të shihni postime ku përmenden.",
+ "mute_modal.you_wont_see_posts": "Ata munden ende të shohin postimet tuaja, por ju s’do të shihni të tyret.",
"navigation_bar.about": "Mbi",
"navigation_bar.advanced_interface": "Hape në ndërfaqe web të thelluar",
"navigation_bar.blocks": "Përdorues të bllokuar",
@@ -408,7 +450,6 @@
"navigation_bar.direct": "Përmendje private",
"navigation_bar.discover": "Zbuloni",
"navigation_bar.domain_blocks": "Përkatësi të bllokuara",
- "navigation_bar.edit_profile": "Përpunoni profilin",
"navigation_bar.explore": "Eksploroni",
"navigation_bar.favourites": "Të parapëlqyer",
"navigation_bar.filters": "Fjalë të heshtuara",
@@ -432,11 +473,29 @@
"notification.follow": "{name} zuri t’ju ndjekë",
"notification.follow_request": "{name} ka kërkuar t’ju ndjekë",
"notification.mention": "{name} ju ka përmendur",
+ "notification.moderation-warning.learn_more": "Mësoni më tepër",
+ "notification.moderation_warning": "Ju është dhënë një sinjalizim moderimi",
+ "notification.moderation_warning.action_delete_statuses": "Disa nga postimet tuaja janë hequr.",
+ "notification.moderation_warning.action_disable": "Llogaria juaj është çaktivizuar.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Disa prej postimeve tuaja u është vënë shenjë si me spec.",
+ "notification.moderation_warning.action_none": "Llogaria juaj ka marrë një sinjalizim moderimi.",
+ "notification.moderation_warning.action_sensitive": "Postimeve tuaja do t’u vihet shenjë si me spec, nga tani e tutje.",
+ "notification.moderation_warning.action_silence": "Llogaria juaj është kufizuar.",
+ "notification.moderation_warning.action_suspend": "Llogaria juaj është pezulluar.",
"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.relationships_severance_event": "Lidhje të humbura me {name}",
+ "notification.relationships_severance_event.account_suspension": "Një përgjegjës nga {from} ka pezulluar {target}, që do të thotë se s’mund të merrni më përditësime prej tij, apo të ndërveproni me të.",
+ "notification.relationships_severance_event.domain_block": "Një përgjegjës nga {from} ka bllokuar {target}, përfshi {followersCount} të ndjekësve tuaj dhe {followingCount, plural, one {# llogari} other {# llogari}} që ndiqni.",
+ "notification.relationships_severance_event.learn_more": "Mësoni më tepër",
+ "notification.relationships_severance_event.user_domain_block": "Keni bllokuar {target}, duke hequr {followersCount} nga ndjekësit tuaj dhe {followingCount, plural, one {# llogari} other {# llogari}} që ndiqni.",
"notification.status": "{name} sapo postoi",
"notification.update": "{name} përpunoi një postim",
+ "notification_requests.accept": "Pranoje",
+ "notification_requests.dismiss": "Hidhe tej",
+ "notification_requests.notifications_from": "Njoftime prej {name}",
+ "notification_requests.title": "Njoftime të filtruar",
"notifications.clear": "Spastroji njoftimet",
"notifications.clear_confirmation": "Jeni i sigurt se doni të spastrohen përgjithmonë krejt njoftimet tuaja?",
"notifications.column_settings.admin.report": "Raportime të reja:",
@@ -445,7 +504,6 @@
"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.filter_bar.show_bar": "Shfaq shtyllë filtrash",
"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:",
@@ -471,6 +529,15 @@
"notifications.permission_denied": "S’merren dot njoftime në desktop, ngaqë më herët shfletuesit i janë mohuar lejet për këtë",
"notifications.permission_denied_alert": "S’mund të aktivizohen njoftimet në desktop, ngaqë lejet e shfletuesit për këtë janë mohuar më herët",
"notifications.permission_required": "S’merren dot njoftime desktop, ngaqë s’është akorduar leja përkatëse.",
+ "notifications.policy.filter_new_accounts.hint": "Krijuar brenda {days, plural, one {një dite} other {# ditësh}} të shkuara",
+ "notifications.policy.filter_new_accounts_title": "Llogari të reja",
+ "notifications.policy.filter_not_followers_hint": "Përfshi persona që ju kanë ndjekur brenda më pak se {days, plural, one {një dite} other {# ditësh}}",
+ "notifications.policy.filter_not_followers_title": "Persona që s’ju ndjekin",
+ "notifications.policy.filter_not_following_hint": "Deri sa t’i miratoni dorazi",
+ "notifications.policy.filter_not_following_title": "Persona që s’i ndiqni",
+ "notifications.policy.filter_private_mentions_hint": "Filtruar, hiq rastin nëse gjendet te përgjigje ndaj përmendjes tuaj, ose nëse dërguesin e ndiqni",
+ "notifications.policy.filter_private_mentions_title": "Përmendje private të pakërkuara",
+ "notifications.policy.title": "Filtroni njoftime nga…",
"notifications_permission_banner.enable": "Aktivizo njoftime në desktop",
"notifications_permission_banner.how_to_control": "Për të marrë njoftime, kur Mastodon-i s’është i hapur, aktivizoni njoftime në desktop. Përmes butoni {icon} më sipër, mund të kontrolloni me përpikëri cilat lloje ndërveprimesh prodhojnë njoftime në desktop, pasi të jenë aktivizuar.",
"notifications_permission_banner.title": "Mos t’ju shpëtojë gjë",
@@ -526,14 +593,15 @@
"poll_button.add_poll": "Shtoni një pyetësor",
"poll_button.remove_poll": "Hiqe pyetësorin",
"privacy.change": "Rregulloni privatësi mesazhesh",
- "privacy.direct.long": "I dukshëm vetëm për përdorues të përmendur",
- "privacy.direct.short": "Vetëm për personat e përmendur",
- "privacy.private.long": "I dukshëm vetëm për ndjekës",
- "privacy.private.short": "Vetëm ndjekës",
- "privacy.public.long": "I dukshëm për të tërë",
+ "privacy.direct.long": "Gjithkënd i përmendur te postimi",
+ "privacy.direct.short": "Persona të veçantë",
+ "privacy.private.long": "Vetëm ndjekësit tuaj",
+ "privacy.private.short": "Ndjekës",
+ "privacy.public.long": "Cilido që hyn e del në Mastodon",
"privacy.public.short": "Publik",
- "privacy.unlisted.long": "I dukshëm për të tërë, por lënë jashtë nga veçoritë e zbulimit",
- "privacy.unlisted.short": "Jo në lista",
+ "privacy.unlisted.additional": "Ky sillet saktësisht si publik, vetëm se postimi s’do të shfaqet në prurje të drejtpërdrejta, ose në hashtag-ë, te eksploroni, apo kërkim në Mastodon, edhe kur keni zgjedhur të jetë për tërë llogarinë.",
+ "privacy.unlisted.long": "Më pak fanfara algoritmike",
+ "privacy.unlisted.short": "Publik i qetë",
"privacy_policy.last_updated": "Përditësuar së fundi më {date}",
"privacy_policy.title": "Rregulla Privatësie",
"recommended": "E rekomanduar",
@@ -551,7 +619,9 @@
"relative_time.minutes": "{number}m",
"relative_time.seconds": "{number}s",
"relative_time.today": "sot",
+ "reply_indicator.attachments": "{count, plural, one {# bashkëngjitje} other {# bashkëngjitje}}",
"reply_indicator.cancel": "Anuloje",
+ "reply_indicator.poll": "Pyetësor",
"report.block": "Bllokoje",
"report.block_explanation": "S’do të shihni postime prej tyre. S’do të jenë në gjendje të shohin postimet tuaja, apo t’ju ndjekin. Do të jenë në gjendje të shohin se janë bllokuar.",
"report.categories.legal": "Ligjore",
@@ -644,10 +714,11 @@
"status.direct": "Përmendje private për @{name}",
"status.direct_indicator": "Përmendje private",
"status.edit": "Përpunojeni",
- "status.edited": "Përpunuar më {date}",
+ "status.edited": "Përpunuar së fundi më {date}",
"status.edited_x_times": "Përpunuar {count, plural, one {{count} herë} other {{count} herë}}",
"status.embed": "Trupëzim",
"status.favourite": "I vini shenjë si të parapëlqyer",
+ "status.favourites": "{count, plural, one {i parapëlqyer} other {të parapëlqyer}}",
"status.filter": "Filtroje këtë postim",
"status.filtered": "I filtruar",
"status.hide": "Fshihe postimin",
@@ -668,6 +739,7 @@
"status.reblog": "Përforcojeni",
"status.reblog_private": "Përforcim për publikun origjinal",
"status.reblogged_by": "{name} përforcoi",
+ "status.reblogs": "{count, plural, one {përforcim} other {përforcime}}",
"status.reblogs.empty": "Këtë mesazh s’e ka përforcuar njeri deri tani. Kur ta bëjë dikush, kjo do të duket këtu.",
"status.redraft": "Fshijeni & rihartojeni",
"status.remove_bookmark": "Hiqe faqerojtësin",
@@ -715,10 +787,8 @@
"upload_error.poll": "Me pyetësorët s’lejohet ngarkim kartelash.",
"upload_form.audio_description": "Përshkruajeni për persona me dëgjim të kufizuar",
"upload_form.description": "Përshkruajeni për persona me probleme shikimi",
- "upload_form.description_missing": "S’u shtua përshkrim",
"upload_form.edit": "Përpunoni",
"upload_form.thumbnail": "Ndryshoni miniaturën",
- "upload_form.undo": "Fshije",
"upload_form.video_description": "Përshkruajeni për persona me dëgjim të kufizuar ose probleme shikimi",
"upload_modal.analyzing_picture": "Po analizohet fotoja…",
"upload_modal.apply": "Aplikoje",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 77c262e9571293..67b706fa130b9b 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -13,14 +13,14 @@
"about.rules": "Pravila servera",
"account.account_note_header": "Napomena",
"account.add_or_remove_from_list": "Dodaj ili ukloni sa lista",
- "account.badges.bot": "Bot",
+ "account.badges.bot": "Automatizovano",
"account.badges.group": "Grupa",
"account.block": "Blokiraj @{name}",
"account.block_domain": "Blokiraj domen {domain}",
"account.block_short": "Blokiraj",
"account.blocked": "Blokiran",
"account.browse_more_on_origin_server": "Pregledajte još na originalnom profilu",
- "account.cancel_follow_request": "Povuci zahtev za praćenje",
+ "account.cancel_follow_request": "Otkaži praćenje",
"account.copy": "Kopiraj vezu u profil",
"account.direct": "Privatno pomeni @{name}",
"account.disable_notifications": "Zaustavi obaveštavanje za objave korisnika @{name}",
@@ -89,7 +89,14 @@
"announcement.announcement": "Najava",
"attachments_list.unprocessed": "(neobrađeno)",
"audio.hide": "Sakrij audio",
- "autosuggest_hashtag.per_week": "{count} nedeljno",
+ "block_modal.remote_users_caveat": "Zamolićemo server {domain} da poštuje vašu odluku. Međutim, usklađenost nije zagarantovana jer neki serveri mogu drugačije da obrađuju blokove. Javne objave mogu i dalje biti vidljive korisnicima koji nisu prijavljeni.",
+ "block_modal.show_less": "Prikaži manje",
+ "block_modal.show_more": "Prikaži više",
+ "block_modal.they_cant_mention": "Ne mogu da vas pominju ili prate.",
+ "block_modal.they_cant_see_posts": "Ne mogu da vide vaše objave, a vi nećete videti njihove.",
+ "block_modal.they_will_know": "Mogu da vide da su blokirani.",
+ "block_modal.title": "Blokirati korisnika?",
+ "block_modal.you_wont_see_mentions": "Nećete videti objave koje ih pominju.",
"boost_modal.combo": "Možete pritisnuti {combo} da preskočite ovo sledeći put",
"bundle_column_error.copy_stacktrace": "Kopiraj izveštaj o grešci",
"bundle_column_error.error.body": "Nije moguće prikazati traženu stranicu. Razlog može biti greška u našem kodu ili problem sa kompatibilnošću pretraživača.",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "Vaš nalog nije {locked}. Svako može da vas prati i da vidi vaše objave namenjene samo za vaše pratioce.",
"compose_form.lock_disclaimer.lock": "zaključan",
"compose_form.placeholder": "O čemu razmišljate?",
- "compose_form.poll.add_option": "Dodajte izbor",
"compose_form.poll.duration": "Trajanje ankete",
- "compose_form.poll.option_placeholder": "Izbor {number}",
- "compose_form.poll.remove_option": "Ukloni ovaj izbor",
+ "compose_form.poll.multiple": "Višestruki izbor",
+ "compose_form.poll.option_placeholder": "Opcija {number}",
+ "compose_form.poll.single": "Odaberite jedno",
"compose_form.poll.switch_to_multiple": "Promenite anketu da biste omogućili više izbora",
"compose_form.poll.switch_to_single": "Promenite anketu da biste omogućili jedan izbor",
+ "compose_form.poll.type": "Stil",
"compose_form.publish": "Objavi",
- "compose_form.publish_form": "Objavi",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Sačuvaj promene",
- "compose_form.sensitive.hide": "{count, plural, one {Označi multimediju kao osetljivu} few {Označi multimediju kao osetljivu} other {Označi multimediju kao osetljivu}}",
- "compose_form.sensitive.marked": "{count, plural, one {Multimedija je označena kao osetljiva} few {Multimedija je označena kao osetljiva} other {Multimedija je označena kao osetljiva}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Multimedija nije označena kao osetljiva} few {Multimedija nije označena kao osetljiva} other {Multimedija nije označena kao osetljiva}}",
+ "compose_form.publish_form": "Nova objava",
+ "compose_form.reply": "Odgovori",
+ "compose_form.save_changes": "Ažuriraj",
"compose_form.spoiler.marked": "Ukloni upozorenje o sadržaju",
"compose_form.spoiler.unmarked": "Dodaj upozorenje o sadržaju",
- "compose_form.spoiler_placeholder": "Ovde napišite upozorenje",
+ "compose_form.spoiler_placeholder": "Upozorenje o sadržaju (opciono)",
"confirmation_modal.cancel": "Otkaži",
- "confirmations.block.block_and_report": "Blokiraj i prijavi",
"confirmations.block.confirm": "Blokiraj",
- "confirmations.block.message": "Da li ste sigurni da želite da blokirate korisnika {name}?",
"confirmations.cancel_follow_request.confirm": "Povuci zahtev",
"confirmations.cancel_follow_request.message": "Da li ste sigurni da želite da povučete zahtev da pratite {name}?",
"confirmations.delete.confirm": "Izbriši",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "Da li ste sigurni da želite da trajno izbrišete ovu listu?",
"confirmations.discard_edit_media.confirm": "Odbaci",
"confirmations.discard_edit_media.message": "Imate nesačuvane promene u opisu ili pregledu medija, da li ipak hoćete da ih odbacite?",
- "confirmations.domain_block.confirm": "Blokiraj ceo domen",
+ "confirmations.domain_block.confirm": "Blokiraj server",
"confirmations.domain_block.message": "Da li ste zaista sigurni da želite da blokirate ceo domen {domain}? U većini slučajeva, dovoljno je i poželjno nekoliko ciljanih blokiranja ili ignorisanja. Nećete videti sadržaj sa tog domena ni u jednoj javnoj vremenskoj liniji ili u vašim obaveštenjima. Vaši pratioci sa tog domena će biti uklonjeni.",
"confirmations.edit.confirm": "Uredi",
"confirmations.edit.message": "Uređivanjem će se obrisati poruka koju trenutno sastavljate. Da li ste sigurni da želite da nastavite?",
"confirmations.logout.confirm": "Odjava",
"confirmations.logout.message": "Da li ste sigurni da želite da se odjavite?",
"confirmations.mute.confirm": "Ignoriši",
- "confirmations.mute.explanation": "Ovo će sakriti objave korisnika i objave koje ga pominju, ali će mu i dalje biti dozvoljeno da vidi Vaše objave i da Vas prati.",
- "confirmations.mute.message": "Da li stvarno želite da ignorišete korisnika {name}?",
"confirmations.redraft.confirm": "Izbriši i prepravi",
"confirmations.redraft.message": "Da li ste sigurni da želite da izbrišete ovu objavu i da je prepravite? Podržavanja i oznake kao omiljenih će biti izgubljeni, a odgovori će ostati bez originalne objave.",
"confirmations.reply.confirm": "Odgovori",
@@ -204,10 +205,31 @@
"disabled_account_banner.text": "Vaš nalog {disabledAccount} je trenutno onemogućen.",
"dismissable_banner.community_timeline": "Ovo su najnovije javne objave ljudi čije naloge hostuje {domain}.",
"dismissable_banner.dismiss": "Odbaci",
- "dismissable_banner.explore_links": "O ovim vestima trenutno razgovaraju ljudi na ovom i drugim serverima decentralizovane mreže.",
+ "dismissable_banner.explore_links": "Ovo su vesti koje se danas najviše dele na društvenoj mreži. Novije vesti koje je objavilo više različitih ljudi su bolje rangirane.",
"dismissable_banner.explore_statuses": "Ovo su objave širom društvenog veba koje danas postaju sve popularnije. Novije objave sa više podržavanja i omiljene su rangirane više.",
- "dismissable_banner.explore_tags": "Ove heš oznake postaju sve popularnije među ljudima na ovom i drugim serverima decentralizovane mreže.",
+ "dismissable_banner.explore_tags": "Ovo su heš oznake koje danas postaju sve popularnije na društvenoj mreži. Heš oznake koje koristi više različitih ljudi su rangirane više.",
"dismissable_banner.public_timeline": "Ovo su najnovije javne objave ljudi sa društvenog veba koje ljudi na {domain}-u prate.",
+ "domain_block_modal.block": "Blokiraj server",
+ "domain_block_modal.block_account_instead": "Umesto toga, blokiraj @{name}",
+ "domain_block_modal.they_can_interact_with_old_posts": "Ljudi sa ovog servera mogu da imaju interakciju sa vašim starim objavama.",
+ "domain_block_modal.they_cant_follow": "Niko sa ovog servera ne može da vas prati.",
+ "domain_block_modal.they_wont_know": "Neće znati da su blokirani.",
+ "domain_block_modal.title": "Blokirati domen?",
+ "domain_block_modal.you_will_lose_followers": "Svi vaši pratioci sa ovog servera će biti uklonjeni.",
+ "domain_block_modal.you_wont_see_posts": "Nećete videti objave ili obaveštenja korisnika na ovom serveru.",
+ "domain_pill.activitypub_lets_connect": "Omogućuje vam da se povežete i komunicirate sa ljudima ne samo na Mastodon-u, već i u različitim društvenim aplikacijama.",
+ "domain_pill.activitypub_like_language": "ActivityPub je kao jezik kojim Mastodon govori sa drugim društvenim mrežama.",
+ "domain_pill.server": "Server",
+ "domain_pill.their_handle": "Njegov regulator:",
+ "domain_pill.their_server": "Njihov digitalni dom, gde žive sve njihove objave.",
+ "domain_pill.their_username": "Njihov jedinstveni identifikator na njihovom serveru. Moguće je pronaći korisnike sa istim korisničkim imenom na različitim serverima.",
+ "domain_pill.username": "Korisničko ime",
+ "domain_pill.whats_in_a_handle": "Šta je regulator?",
+ "domain_pill.who_they_are": "Pošto regulatori govore ko je neko i gde se nalazi, možete da komunicirate sa ljudima širom društvenog veba na .",
+ "domain_pill.who_you_are": "Pošto vaši regulatori govori ko ste i gde ste, ljudi mogu da komuniciraju sa vama širom društvenog veba na .",
+ "domain_pill.your_handle": "Vaš regulator:",
+ "domain_pill.your_server": "Vaš digitalni dom, gde žive sve vaše objave. Ne sviđa vam se ovaj? Prenesite servere u bilo koje vreme i dovedite i svoje pratioce.",
+ "domain_pill.your_username": "Njihov jedinstveni identifikator na njihovom serveru. Moguće je pronaći korisnike sa istim korisničkim imenom na različitim serverima.",
"embed.instructions": "Ugradite ovu objavu na svoj veb sajt kopiranjem koda ispod.",
"embed.preview": "Evo kako će to izgledati:",
"emoji_button.activity": "Aktivnosti",
@@ -240,10 +262,11 @@
"empty_column.follow_requests": "Još uvek nemate nijedan zahtev za praćenje. Kada primite zahtev, on će se pojaviti ovde.",
"empty_column.followed_tags": "Još uvek niste zapratili nijednu heš oznaku. Kada to uradite, one će se pojaviti ovde.",
"empty_column.hashtag": "Još uvek nema ničega u ovoj heš oznaci.",
- "empty_column.home": "Vaša početna vremenska linija je prazna! Pratite više ljudi da biste je popunili. {suggestions}",
+ "empty_column.home": "Vaša početna vremenska linija je prazna! Pratite više ljudi da biste je popunili.",
"empty_column.list": "U ovoj listi još nema ničega. Kada članovi ove liste objave nešto novo, pojaviće se ovde.",
"empty_column.lists": "Još uvek nemate nijednu listu. Kada napravite jednu, ona će se pojaviti ovde.",
"empty_column.mutes": "Još uvek ne ignorišete nijednog korisnika.",
+ "empty_column.notification_requests": "Sve je čisto! Ovde nema ničega. Kada dobijete nova obaveštenja, ona će se pojaviti ovde u skladu sa vašim podešavanjima.",
"empty_column.notifications": "Još uvek nemate nikakva obaveštenja. Kada drugi ljudi budu u interakciji sa vama, videćete to ovde.",
"empty_column.public": "Ovde nema ničega! Napišite nešto javno ili ručno pratite korisnike sa drugih servera da biste ovo popunili",
"error.unexpected_crash.explanation": "Zbog greške u našem kodu ili problema sa kompatibilnošću pregledača, ova stranica se nije mogla pravilno prikazati.",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "Koristite postojeću kategoriju ili kreirajte novu",
"filter_modal.select_filter.title": "Filtriraj ovu objavu",
"filter_modal.title.status": "Filtriraj objavu",
+ "filtered_notifications_banner.mentions": "{count, plural, one {pominjanje} few {pominjanja} other {pominjanja}}",
+ "filtered_notifications_banner.pending_requests": "Obaveštenja od {count, plural, =0 {nikoga koga možda poznajete} one {# osobe koju možda poznajete} few {# osobe koje možda poznajete} other {# osoba koje možda poznajete}}",
+ "filtered_notifications_banner.title": "Filtrirana obaveštenja",
"firehose.all": "Sve",
"firehose.local": "Ovaj server",
"firehose.remote": "Ostali serveri",
"follow_request.authorize": "Odobri",
"follow_request.reject": "Odbij",
"follow_requests.unlocked_explanation": "Iako vaš nalog nije zaključan, osoblje {domain} smatra da biste možda želeli da ručno pregledate zahteve za praćenje sa ovih naloga.",
+ "follow_suggestions.curated_suggestion": "Izbor osoblja",
+ "follow_suggestions.dismiss": "Ne prikazuj ponovo",
+ "follow_suggestions.featured_longer": "Ručno odabrao tim {domain}",
+ "follow_suggestions.friends_of_friends_longer": "Popularno među ljudima koje pratite",
+ "follow_suggestions.hints.featured": "Ovaj profil je ručno izabrao tim {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "Ovaj profil je popularan među ljudima koje pratite.",
+ "follow_suggestions.hints.most_followed": "Ovaj profil je jedan od najpraćenijih na {domain}.",
+ "follow_suggestions.hints.most_interactions": "Ovaj profil je nedavno dobio veliku pažnju na {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Ovaj profil je sličan profilima koje ste nedavno zapratili.",
+ "follow_suggestions.personalized_suggestion": "Personalizovani predlog",
+ "follow_suggestions.popular_suggestion": "Popularni predlog",
+ "follow_suggestions.popular_suggestion_longer": "Popularno na {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Slično profilima koje ste nedavno zapratili",
+ "follow_suggestions.view_all": "Prikaži sve",
+ "follow_suggestions.who_to_follow": "Koga pratiti",
"followed_tags": "Praćene heš oznake",
"footer.about": "Osnovni podaci",
"footer.directory": "Direktorijum profila",
@@ -306,15 +347,10 @@
"hashtag.follow": "Zaprati heš oznaku",
"hashtag.unfollow": "Otprati heš oznaku",
"hashtags.and_other": "…i {count, plural, one {još #} few {još #}other {još #}}",
- "home.actions.go_to_explore": "Pogledate šta je u trendu",
- "home.actions.go_to_suggestions": "Pronađete ljude koje biste pratili",
- "home.column_settings.basic": "Osnovna",
"home.column_settings.show_reblogs": "Prikaži podržavanja",
"home.column_settings.show_replies": "Prikaži odgovore",
- "home.explore_prompt.body": "Vaša početna stranica će imati mešavinu objava od heš oznaka koje ste izabrali da pratite, ljudi koje ste izabrali da pratite i objava koje su podržali. Ako izgleda previše tiho, možda ćete želeti da:",
- "home.explore_prompt.title": "Ovo je vaša matična baza u Mastodon-u.",
"home.hide_announcements": "Sakrij najave",
- "home.pending_critical_update.body": "Ažurirajte svoj Mastodon server što je pre moguće!",
+ "home.pending_critical_update.body": "Ažurirajte svoj Mastodon server što je pre moguće!",
"home.pending_critical_update.link": "Pogledajte ažuriranja",
"home.pending_critical_update.title": "Dostupno je kritično bezbednosno ažuriranje!",
"home.show_announcements": "Prijaži najave",
@@ -328,7 +364,7 @@
"interaction_modal.on_another_server": "Na drugom serveru",
"interaction_modal.on_this_server": "Na ovom serveru",
"interaction_modal.sign_in": "Niste prijavljeni na ovaj server. Gde je hostovan vaš nalog?",
- "interaction_modal.sign_in_hint": "Savet: To je veb sajt na kome ste se registrovali. Ako se ne sećate, potražite e-poruku dobrodošlice u svom prijemnom sandučetu. Takođe možete uneti svoje puno korisničko ime! (npr. @Mastodon@mastodon.social)",
+ "interaction_modal.sign_in_hint": "Savet: To je veb sajt na kome ste se registrovali. Ako se ne sećate, potražite e-poruku dobrodošlice u svom prijemnom sandučetu. Takođe možete uneti svoje puno korisničko ime! (npr. @Mastodon@mastodon.social)",
"interaction_modal.title.favourite": "Označi objavu korisnika {name} kao omiljenu",
"interaction_modal.title.follow": "Zaprati {name}",
"interaction_modal.title.reblog": "Podrži objavu korisnika {name}",
@@ -396,9 +432,15 @@
"loading_indicator.label": "Učitavanje…",
"media_gallery.toggle_visible": "{number, plural, one {Sakrij sliku} few {Sakrij slike} other {Sakrij slike}}",
"moved_to_account_banner.text": "Vaš nalog {disabledAccount} je trenutno onemogućen jer ste prešli na {movedToAccount}.",
- "mute_modal.duration": "Trajanje",
- "mute_modal.hide_notifications": "Sakriti obaveštenja od ovog korisnika?",
- "mute_modal.indefinite": "Neodređeno",
+ "mute_modal.hide_from_notifications": "Sakrij iz obaveštenja",
+ "mute_modal.hide_options": "Sakrij opcije",
+ "mute_modal.indefinite": "Dok ih ne uklonim iz ignorisanih",
+ "mute_modal.show_options": "Prikaži opcije",
+ "mute_modal.they_can_mention_and_follow": "Mogu da vas pominju i prate, ali ih nećete videti.",
+ "mute_modal.they_wont_know": "Neće znati da su ignorisani.",
+ "mute_modal.title": "Ignorisati korisnika?",
+ "mute_modal.you_wont_see_mentions": "Nećete videti objave koje ga pominju.",
+ "mute_modal.you_wont_see_posts": "I dalje može da vidi vaše objave, ali vi nećete videti njegove.",
"navigation_bar.about": "Osnovni podaci",
"navigation_bar.advanced_interface": "Otvori u naprednom veb okruženju",
"navigation_bar.blocks": "Blokirani korisnici",
@@ -408,7 +450,6 @@
"navigation_bar.direct": "Privatna pominjanja",
"navigation_bar.discover": "Otkrij",
"navigation_bar.domain_blocks": "Blokirani domeni",
- "navigation_bar.edit_profile": "Uredi profil",
"navigation_bar.explore": "Istraži",
"navigation_bar.favourites": "Omiljeno",
"navigation_bar.filters": "Ignorisane reči",
@@ -432,11 +473,29 @@
"notification.follow": "{name} vas je zapratio",
"notification.follow_request": "{name} je zatražio da vas prati",
"notification.mention": "{name} vas je pomenuo",
+ "notification.moderation-warning.learn_more": "Saznajte više",
+ "notification.moderation_warning": "Dobili ste moderatorsko upozorenje",
+ "notification.moderation_warning.action_delete_statuses": "Neke od vaših objava su uklonjene.",
+ "notification.moderation_warning.action_disable": "Vaš nalog je onemogućen.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Neke od vaših objava su obeležene kao osetljive.",
+ "notification.moderation_warning.action_none": "Vaš nalog je dobio moderatorsko upozorenje.",
+ "notification.moderation_warning.action_sensitive": "Vaše objave će ubuduće biti označene kao osetljive.",
+ "notification.moderation_warning.action_silence": "Vaš nalog je ograničen.",
+ "notification.moderation_warning.action_suspend": "Vaš nalog je suspendovan.",
"notification.own_poll": "Vaša anketa je završena",
"notification.poll": "Završena je anketa u kojoj ste glasali",
"notification.reblog": "{name} je podržao vašu objavu",
+ "notification.relationships_severance_event": "Izgubljena veza sa {name}",
+ "notification.relationships_severance_event.account_suspension": "Administrator sa {from} je suspendovao {target}, što znači da više ne možete da primate ažuriranja od njih niti da komunicirate sa njima.",
+ "notification.relationships_severance_event.domain_block": "Administrator sa {from} je blokirao {target}, uključujući vaše pratioce: {followersCount} i {followingCount, plural, one {# nalog} few {# naloga} other {# naloga}} koje pratite.",
+ "notification.relationships_severance_event.learn_more": "Saznajte više",
+ "notification.relationships_severance_event.user_domain_block": "Blokirači ste {target}, uključujući vaše pratioce: {followersCount} i {followingCount, plural, one {# nalog} few {# naloga} other {# naloga}} koje pratite.",
"notification.status": "{name} je upravo objavio",
"notification.update": "{name} je uredio objavu",
+ "notification_requests.accept": "Prihvati",
+ "notification_requests.dismiss": "Odbaci",
+ "notification_requests.notifications_from": "Obaveštenja od {name}",
+ "notification_requests.title": "Filtrirana obaveštenja",
"notifications.clear": "Obriši obaveštenja",
"notifications.clear_confirmation": "Da li ste sigurni da želite trajno da obrišete sva vaša obaveštenja?",
"notifications.column_settings.admin.report": "Nove prijave:",
@@ -445,7 +504,6 @@
"notifications.column_settings.favourite": "Omiljeno:",
"notifications.column_settings.filter_bar.advanced": "Prikaži sve kategorije",
"notifications.column_settings.filter_bar.category": "Traka za brzo filtriranje",
- "notifications.column_settings.filter_bar.show_bar": "Prikaži traku sa filterima",
"notifications.column_settings.follow": "Novi pratioci:",
"notifications.column_settings.follow_request": "Novi zahtevi za praćenje:",
"notifications.column_settings.mention": "Pominjanja:",
@@ -471,19 +529,28 @@
"notifications.permission_denied": "Obaveštenja na radnoj površini nisu dostupna zbog prethodno odbijenog zahteva za dozvolu pregledača",
"notifications.permission_denied_alert": "Obaveštenja na radnoj površini ne mogu biti omogućena, jer je dozvola pregledača ranije bila odbijena",
"notifications.permission_required": "Obaveštenja na radnoj površini nisu dostupna jer potrebna dozvola nije dodeljena.",
+ "notifications.policy.filter_new_accounts.hint": "Kreirano {days, plural, one {u poslednjeg # dana} few {u poslednja # dana} other {u poslednjih # dana}}",
+ "notifications.policy.filter_new_accounts_title": "Novi nalozi",
+ "notifications.policy.filter_not_followers_hint": "Uključujući ljude koji su vas pratili manje od {days, plural, one {# dana} few {# dana} other {# dana}}",
+ "notifications.policy.filter_not_followers_title": "Ljudi koji vas ne prate",
+ "notifications.policy.filter_not_following_hint": "Dok ih ručno ne odobrite",
+ "notifications.policy.filter_not_following_title": "Ljudi koje ne pratite",
+ "notifications.policy.filter_private_mentions_hint": "Filtrirano osim ako je odgovor na vaše pominjanje ili ako pratite pošiljaoca",
+ "notifications.policy.filter_private_mentions_title": "Neželjena privatna pominjanja",
+ "notifications.policy.title": "Filtriraj obaveštenja od…",
"notifications_permission_banner.enable": "Omogućiti obaveštenja na radnoj površini",
"notifications_permission_banner.how_to_control": "Da biste primali obaveštenja kada Mastodon nije otvoren, omogućite obaveštenja na radnoj površini. Kada su obaveštenja na radnoj površini omogućena vrste interakcija koje ona generišu mogu se podešavati pomoću dugmeta {icon}.",
"notifications_permission_banner.title": "Nikada ništa ne propustite",
"onboarding.action.back": "Vrati me nazad",
"onboarding.actions.back": "Vrati me nazad",
- "onboarding.actions.go_to_explore": "Pogledaj šta je u trendu",
- "onboarding.actions.go_to_home": "Idi na početnu stranicu",
+ "onboarding.actions.go_to_explore": "Odvedi me u trending",
+ "onboarding.actions.go_to_home": "Odvedi me na početnu stranicu",
"onboarding.compose.template": "Zdravo #Mastodon!",
"onboarding.follows.empty": "Nažalost, trenutno se ne mogu prikazati rezultati. Možete pokušati sa korišćenjem pretrage ili pregledanjem stranice za istraživanje da biste pronašli ljude koje ćete pratiti ili pokušajte ponovo kasnije.",
- "onboarding.follows.lead": "Vi sami birate svoju početnu stranicu. Što više ljudi pratite, to će biti aktivnije i zanimljivije. Ovi profili mogu biti dobra polazna tačka—uvek možete da ih prestanete pratiti kasnije!",
+ "onboarding.follows.lead": "Vaša početna stranica je primarni način da doživite Mastodon. Što više ljudi budete pratili, to će biti aktivnije i zanimljivije. Da biste započeli, evo nekoliko predloga:",
"onboarding.follows.title": "Personalizujte svoju početnu stranicu",
"onboarding.profile.discoverable": "Neka se moj profil može otkriti drugima",
- "onboarding.profile.discoverable_hint": "Kada omogućite mogućnost otkrivanja na Mastodon-u, vaše objave se mogu pojaviti u rezultatima pretrage i u trendu, a vaš profil može biti predložen ljudima sa sličnim interesovanjima.",
+ "onboarding.profile.discoverable_hint": "Kada omogućite mogućnost otkrivanja na Mastodon-u, vaše objave se mogu pojaviti u rezultatima pretrage i u trendu, a vaš profil može biti predložen ljudima sa sličnim interesovanjima.",
"onboarding.profile.display_name": "Ime za prikaz",
"onboarding.profile.display_name_hint": "Vaše puno ime ili nadimak…",
"onboarding.profile.lead": "Ovo možete uvek dovršiti kasnije u podešavanjima, gde je dostupno još više opcija prilagođavanja.",
@@ -497,17 +564,17 @@
"onboarding.share.message": "Ja sam {username} na #Mastodon-u! Pratite me na {url}",
"onboarding.share.next_steps": "Mogući sledeći koraci:",
"onboarding.share.title": "Podelite svoj profil",
- "onboarding.start.lead": "Vaš novi Mastodon nalog je spreman. Evo kako to možete iskoristiti na najbolji način:",
- "onboarding.start.skip": "Želite da preskočite?",
+ "onboarding.start.lead": "Sada ste deo Mastodon-a, jedinstvene, decentralizovane platforme društvenih medija na kojoj vi – a ne algoritam – birate svoje iskustvo. Hajde da počnemo na ovoj novoj društvenoj granici:",
+ "onboarding.start.skip": "Ne treba vam pomoć za početak?",
"onboarding.start.title": "Uspeli ste!",
- "onboarding.steps.follow_people.body": "Vi sami birate svoju početnu stranicu. Hajde da ga ispunimo zanimljivim ljudima.",
+ "onboarding.steps.follow_people.body": "Praćenje zanimljivih ljudi je ono o čemu se radi u Mastodon-u.",
"onboarding.steps.follow_people.title": "Personalizujte svoju početnu stranicu",
- "onboarding.steps.publish_status.body": "Reci zdravo svetu.",
+ "onboarding.steps.publish_status.body": "Pozdravite svet tekstom, slikama, video snimcima ili anketama {emoji}",
"onboarding.steps.publish_status.title": "Napišite svoju prvu objavu",
- "onboarding.steps.setup_profile.body": "Veća je verovatnoća da će drugi komunicirati sa vama sa popunjenim profilom.",
- "onboarding.steps.setup_profile.title": "Prilagodite svoj profil",
+ "onboarding.steps.setup_profile.body": "Pojačajte svoje interakcije tako što ćete imati sveobuhvatan profil.",
+ "onboarding.steps.setup_profile.title": "Personalizujte svoj profil",
"onboarding.steps.share_profile.body": "Neka vaši prijatelji znaju kako da vas pronađu na Mastodon-u!",
- "onboarding.steps.share_profile.title": "Podelite svoj profil",
+ "onboarding.steps.share_profile.title": "Podelite svoj Mastodon profil",
"onboarding.tips.2fa": "Da li ste znali? Možete da zaštitite svoj nalog podešavanjem dvostruke potvrde identiteta u podešavanjima naloga. Radi sa bilo kojom TOTP aplikacijom po vašem izboru, nije potreban broj telefona!",
"onboarding.tips.accounts_from_other_servers": "Da li ste znali? Pošto je Mastodon decentralizovan, neki profili na koje naiđete biće smešteni na serverima različitim od vašeg. A ipak možete da komunicirate sa njima besprekorno! Njihov server je u drugoj polovini njihovog korisničkog imena!",
"onboarding.tips.migration": "Da li ste znali? Ako smatrate da {domain} nije odličan izbor servera za vas u budućnosti, možete da pređete na drugi Mastodon server bez gubitka pratilaca. Možete čak i da hostujete sopstveni server!",
@@ -526,14 +593,15 @@
"poll_button.add_poll": "Dodaj anketu",
"poll_button.remove_poll": "Ukloni anketu",
"privacy.change": "Promeni privatnost objave",
- "privacy.direct.long": "Vidljivo samo pomenutim korisnicima",
- "privacy.direct.short": "Samo pomenute osobe",
- "privacy.private.long": "Vidljivo samo pratiocima",
- "privacy.private.short": "Samo pratioci",
- "privacy.public.long": "Vidljivo za sve",
+ "privacy.direct.long": "Svi pomenuti u objavi",
+ "privacy.direct.short": "Određeni ljudi",
+ "privacy.private.long": "Samo vaši pratioci",
+ "privacy.private.short": "Pratioci",
+ "privacy.public.long": "Bilo ko na Mastodon-u i van njega",
"privacy.public.short": "Javno",
- "privacy.unlisted.long": "Vidljivo svima, ali isključeno iz funkcija otkrivanja",
- "privacy.unlisted.short": "Neizlistano",
+ "privacy.unlisted.additional": "Ovo se ponaša potpuno kao javno, osim što se objava neće pojavljivati u izvorima uživo ili heš oznakama, istraživanjima ili pretrazi Mastodon-a, čak i ako ste uključeni u celom nalogu.",
+ "privacy.unlisted.long": "Manje algoritamskih fanfara",
+ "privacy.unlisted.short": "Tiha javnost",
"privacy_policy.last_updated": "Poslednje ažuriranje {date}",
"privacy_policy.title": "Politika privatnosti",
"recommended": "Preporučeno",
@@ -551,7 +619,9 @@
"relative_time.minutes": "{number} min.",
"relative_time.seconds": "{number} sek.",
"relative_time.today": "danas",
+ "reply_indicator.attachments": "{count, plural, one {# prilog} few {# priloga} other {# priloga}}",
"reply_indicator.cancel": "Otkaži",
+ "reply_indicator.poll": "Anketa",
"report.block": "Blokiraj",
"report.block_explanation": "Nećete videti objave korisnika. Ni on neće videti Vaše objave niti će moći da Vas prati. Takođe će moći da sazna da je blokiran.",
"report.categories.legal": "Pravni",
@@ -644,10 +714,11 @@
"status.direct": "Privatno pomeni @{name}",
"status.direct_indicator": "Privatno pominjanje",
"status.edit": "Uredi",
- "status.edited": "Uređeno {date}",
+ "status.edited": "Poslednje uređivanje {date}",
"status.edited_x_times": "Uređeno {count, plural, one {{count} put} other {{count} puta}}",
"status.embed": "Ugradi",
"status.favourite": "Omiljeno",
+ "status.favourites": "{count, plural, one {# omiljeno} few {# omiljena} other {# omiljenih}}",
"status.filter": "Filtriraj ovu objavu",
"status.filtered": "Filtrirano",
"status.hide": "Sakrij objavu",
@@ -668,6 +739,7 @@
"status.reblog": "Podrži",
"status.reblog_private": "Podrži sa originalnom vidljivošću",
"status.reblogged_by": "{name} je podržao/la",
+ "status.reblogs": "{count, plural, one {# podržavanje} few {# podržavanja} other {# podržavanja}}",
"status.reblogs.empty": "Još uvek niko nije podržao ovu objavu. Kada bude podržana, pojaviće se ovde.",
"status.redraft": "Izbriši i preoblikuj",
"status.remove_bookmark": "Ukloni obeleživač",
@@ -715,10 +787,8 @@
"upload_error.poll": "Otpremanje datoteka nije dozvoljeno kod anketa.",
"upload_form.audio_description": "Dodajte opis za osobe sa oštećenim sluhom",
"upload_form.description": "Dodajte opis za osobe sa oštećenim vidom",
- "upload_form.description_missing": "Nema dodatog opisa",
"upload_form.edit": "Uredi",
"upload_form.thumbnail": "Promeni sličicu",
- "upload_form.undo": "Izbriši",
"upload_form.video_description": "Opišite za osobe sa oštećenim sluhom ili vidom",
"upload_modal.analyzing_picture": "Analiziranje slike…",
"upload_modal.apply": "Primeni",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 85e7567bf42166..9898a10a3e2f12 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -89,7 +89,14 @@
"announcement.announcement": "Најава",
"attachments_list.unprocessed": "(необрађено)",
"audio.hide": "Сакриј аудио",
- "autosuggest_hashtag.per_week": "{count} недељно",
+ "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": "Није могуће приказати тражену страницу. Разлог може бити грешка у нашем коду или проблем са компатибилношћу претраживача.",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "Ваш налог није {locked}. Свако може да Вас запрати и да види објаве намењене само Вашим пратиоцима.",
"compose_form.lock_disclaimer.lock": "закључан",
"compose_form.placeholder": "О чему размишљате?",
- "compose_form.poll.add_option": "Додајте избор",
"compose_form.poll.duration": "Трајање анкете",
- "compose_form.poll.option_placeholder": "Избор {number}",
- "compose_form.poll.remove_option": "Уклони овај избор",
+ "compose_form.poll.multiple": "Вишеструки избор",
+ "compose_form.poll.option_placeholder": "Опција {number}",
+ "compose_form.poll.single": "Одаберите једно",
"compose_form.poll.switch_to_multiple": "Промените анкету да бисте омогућили више избора",
"compose_form.poll.switch_to_single": "Промените анкету да бисте омогућили један избор",
+ "compose_form.poll.type": "Стил",
"compose_form.publish": "Објави",
"compose_form.publish_form": "Нова објава",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Сачувај промене",
- "compose_form.sensitive.hide": "{count, plural, one {Означи мултимедију као осетљиву} few {Означи мултимедију као осетљиву} other {Означи мултимедију као осетљиву}}",
- "compose_form.sensitive.marked": "{count, plural, one {Мултимедија је означена као осетљива} few {Мултимедија је означена као осетљива} other {Мултимедија је означена као осетљива}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Мултимедија није означена као осетљива} few {Мултимедија није означена као осетљива} other {Мултимедија није означена као осетљива}}",
+ "compose_form.reply": "Одговори",
+ "compose_form.save_changes": "Ажурирај",
"compose_form.spoiler.marked": "Уклони упозорење о садржају",
"compose_form.spoiler.unmarked": "Додај упозорење о садржају",
- "compose_form.spoiler_placeholder": "Овде напишите упозорење",
+ "compose_form.spoiler_placeholder": "Упозорење о садржају (опционо)",
"confirmation_modal.cancel": "Откажи",
- "confirmations.block.block_and_report": "Блокирај и пријави",
"confirmations.block.confirm": "Блокирај",
- "confirmations.block.message": "Да ли сте сигурни да желите да блокирате корисника {name}?",
"confirmations.cancel_follow_request.confirm": "Повуци захтев",
"confirmations.cancel_follow_request.message": "Да ли сте сигурни да желите да повучете захтев да пратите {name}?",
"confirmations.delete.confirm": "Избриши",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "Да ли сте сигурни да желите да трајно избришете ову листу?",
"confirmations.discard_edit_media.confirm": "Одбаци",
"confirmations.discard_edit_media.message": "Имате несачуване промене у опису или прегледу медија, да ли ипак хоћете да их одбаците?",
- "confirmations.domain_block.confirm": "Блокирај цео домен",
+ "confirmations.domain_block.confirm": "Блокирај сервер",
"confirmations.domain_block.message": "Да ли сте заиста сигурни да желите да блокирате цео домен {domain}? У већини случајева, довољно је и пожељно неколико циљаних блокирања или игнорисања. Нећете видети садржај са тог домена ни у једној јавној временској линији или у вашим обавештењима. Ваши пратиоци са тог домена ће бити уклоњени.",
"confirmations.edit.confirm": "Уреди",
"confirmations.edit.message": "Уређивањем ће се обрисати порука коју тренутно састављате. Да ли сте сигурни да желите да наставите?",
"confirmations.logout.confirm": "Одјава",
"confirmations.logout.message": "Да ли сте сигурни да желите да се одјавите?",
"confirmations.mute.confirm": "Игнориши",
- "confirmations.mute.explanation": "Ово ће сакрити објаве корисника и објаве које га помињу, али ће му и даље бити дозвољено да види Ваше објаве и да Вас прати.",
- "confirmations.mute.message": "Да ли стварно желите да игноришете корисника {name}?",
"confirmations.redraft.confirm": "Избриши и преправи",
"confirmations.redraft.message": "Да ли сте сигурни да желите да избришете ову објаву и да је преправите? Подржавања и ознаке као омиљених ће бити изгубљени, а одговори ће остати без оригиналне објаве.",
"confirmations.reply.confirm": "Одговори",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "Ово су објаве широм друштвеног веба које данас постају све популарније. Новије објаве са више подржавања и омиљене су рангиране више.",
"dismissable_banner.explore_tags": "Ово су хеш ознаке које данас постају све популарније на друштвеној мрежи. Хеш ознаке које користи више различитих људи су рангиране више.",
"dismissable_banner.public_timeline": "Ово су најновије јавне објаве људи са друштвеног веба које људи на {domain}-у прате.",
+ "domain_block_modal.block": "Блокирај сервер",
+ "domain_block_modal.block_account_instead": "Уместо тога, блокирај @{name}",
+ "domain_block_modal.they_can_interact_with_old_posts": "Људи са овог сервера могу да имају интеракцију са вашим старим објавама.",
+ "domain_block_modal.they_cant_follow": "Нико са овог сервера не може да вас прати.",
+ "domain_block_modal.they_wont_know": "Неће знати да су блокирани.",
+ "domain_block_modal.title": "Блокирати домен?",
+ "domain_block_modal.you_will_lose_followers": "Сви ваши пратиоци са овог сервера ће бити уклоњени.",
+ "domain_block_modal.you_wont_see_posts": "Нећете видети објаве или обавештења корисника на овом серверу.",
+ "domain_pill.activitypub_lets_connect": "Омогућује вам да се повежете и комуницирате са људима не само на Mastodon-у, већ и у различитим друштвеним апликацијама.",
+ "domain_pill.activitypub_like_language": "ActivityPub је као језик којим Mastodon говори са другим друштвеним мрежама.",
+ "domain_pill.server": "Сервер",
+ "domain_pill.their_handle": "Његов регулатор:",
+ "domain_pill.their_server": "Њихов дигитални дом, где живе све њихове објаве.",
+ "domain_pill.their_username": "Њихов јединствени идентификатор на њиховом серверу. Могуће је пронаћи кориснике са истим корисничким именом на различитим серверима.",
+ "domain_pill.username": "Корисничко име",
+ "domain_pill.whats_in_a_handle": "Шта је регулатор?",
+ "domain_pill.who_they_are": "Пошто регулатори говоре ко је неко и где се налази, можете да комуницирате са људима широм друштвеног веба на .",
+ "domain_pill.who_you_are": "Пошто ваши регулатори говори ко сте и где сте, људи могу да комуницирају са вама широм друштвеног веба на .",
+ "domain_pill.your_handle": "Ваш регулатор:",
+ "domain_pill.your_server": "Ваш дигитални дом, где живе све ваше објаве. Не свиђа вам се овај? Пренесите сервере у било које време и доведите и своје пратиоце.",
+ "domain_pill.your_username": "Њихов јединствени идентификатор на њиховом серверу. Могуће је пронаћи кориснике са истим корисничким именом на различитим серверима.",
"embed.instructions": "Уградите ову објаву на свој веб сајт копирањем кода испод.",
"embed.preview": "Ево како ће то изгледати:",
"emoji_button.activity": "Активности",
@@ -244,6 +266,7 @@
"empty_column.list": "У овој листи још нема ничега. Када чланови ове листе објаве нешто ново, појавиће се овде.",
"empty_column.lists": "Још увек немате ниједну листу. Када направите једну, она ће се појавити овде.",
"empty_column.mutes": "Још увек не игноришете ниједног корисника.",
+ "empty_column.notification_requests": "Све је чисто! Овде нема ничега. Када добијете нова обавештења, она ће се појавити овде у складу са вашим подешавањима.",
"empty_column.notifications": "Још увек немате никаква обавештења. Када други људи буду у интеракцији са вама, видећете то овде.",
"empty_column.public": "Овде нема ничега! Напишите нешто јавно или ручно пратите кориснике са других сервера да бисте ово попунили",
"error.unexpected_crash.explanation": "Због грешке у нашем коду или проблема са компатибилношћу прегледача, ова страница се није могла правилно приказати.",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "Користите постојећу категорију или креирајте нову",
"filter_modal.select_filter.title": "Филтрирај ову објаву",
"filter_modal.title.status": "Филтрирај објаву",
+ "filtered_notifications_banner.mentions": "{count, plural, one {помињање} few {помињања} other {помињања}}",
+ "filtered_notifications_banner.pending_requests": "Обавештења од {count, plural, =0 {никога кога можда познајете} one {# особе коју можда познајете} few {# особе које можда познајете} other {# особа које можда познајете}}",
+ "filtered_notifications_banner.title": "Филтрирана обавештења",
"firehose.all": "Све",
"firehose.local": "Овај сервер",
"firehose.remote": "Остали сервери",
"follow_request.authorize": "Одобри",
"follow_request.reject": "Одбиј",
"follow_requests.unlocked_explanation": "Иако ваш налог није закључан, особље {domain} сматра да бисте можда желели да ручно прегледате захтеве за праћење са ових налога.",
+ "follow_suggestions.curated_suggestion": "Избор особља",
+ "follow_suggestions.dismiss": "Не приказуј поново",
+ "follow_suggestions.featured_longer": "Ручно одабрао тим {domain}",
+ "follow_suggestions.friends_of_friends_longer": "Популарно међу људима које пратите",
+ "follow_suggestions.hints.featured": "Овај профил је ручно изабрао тим {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "Овај профил је популаран међу људима које пратите.",
+ "follow_suggestions.hints.most_followed": "Овај профил је један од најпраћенијих на {domain}.",
+ "follow_suggestions.hints.most_interactions": "Овај профил је недавно добио велику пажњу на {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Овај профил је сличан профилима које сте недавно запратили.",
+ "follow_suggestions.personalized_suggestion": "Персонализовани предлог",
+ "follow_suggestions.popular_suggestion": "Популарни предлог",
+ "follow_suggestions.popular_suggestion_longer": "Популарно на {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Слично профилима које сте недавно запратили",
+ "follow_suggestions.view_all": "Прикажи све",
+ "follow_suggestions.who_to_follow": "Кога пратити",
"followed_tags": "Праћене хеш ознаке",
"footer.about": "Основни подаци",
"footer.directory": "Директоријум профила",
@@ -306,13 +347,8 @@
"hashtag.follow": "Запрати хеш ознаку",
"hashtag.unfollow": "Отпрати хеш ознаку",
"hashtags.and_other": "…и {count, plural, one {још #} few {још #}other {још #}}",
- "home.actions.go_to_explore": "Погледате шта је у тренду",
- "home.actions.go_to_suggestions": "Пронађете људе које бисте пратили",
- "home.column_settings.basic": "Основна",
"home.column_settings.show_reblogs": "Прикажи подржавања",
"home.column_settings.show_replies": "Прикажи одговоре",
- "home.explore_prompt.body": "Ваша почетна страница ће имати мешавину објава од хеш ознака које сте изабрали да пратите, људи које сте изабрали да пратите и објава које су подржали. Ако изгледа превише тихо, можда ћете желети да:",
- "home.explore_prompt.title": "Ово је ваша матична база у Mastodon-у.",
"home.hide_announcements": "Сакриј најаве",
"home.pending_critical_update.body": "Ажурирајте свој Mastodon сервер што је пре могуће!",
"home.pending_critical_update.link": "Погледајте ажурирања",
@@ -396,9 +432,15 @@
"loading_indicator.label": "Учитавање…",
"media_gallery.toggle_visible": "{number, plural, one {Сакриј слику} few {Сакриј слике} other {Сакриј слике}}",
"moved_to_account_banner.text": "Ваш налог {disabledAccount} је тренутно онемогућен јер сте прешли на {movedToAccount}.",
- "mute_modal.duration": "Трајање",
- "mute_modal.hide_notifications": "Сакрити обавештења од овог корисника?",
- "mute_modal.indefinite": "Неодређено",
+ "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": "Блокирани корисници",
@@ -408,7 +450,6 @@
"navigation_bar.direct": "Приватна помињања",
"navigation_bar.discover": "Откриј",
"navigation_bar.domain_blocks": "Блокирани домени",
- "navigation_bar.edit_profile": "Уреди профил",
"navigation_bar.explore": "Истражи",
"navigation_bar.favourites": "Омиљено",
"navigation_bar.filters": "Игнорисане речи",
@@ -432,11 +473,29 @@
"notification.follow": "{name} вас је запратио",
"notification.follow_request": "{name} је затражио да вас прати",
"notification.mention": "{name} вас је поменуо",
+ "notification.moderation-warning.learn_more": "Сазнајте више",
+ "notification.moderation_warning": "Добили сте модераторско упозорење",
+ "notification.moderation_warning.action_delete_statuses": "Неке од ваших објава су уклоњене.",
+ "notification.moderation_warning.action_disable": "Ваш налог је онемогућен.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Неке од ваших објава су обележене као осетљиве.",
+ "notification.moderation_warning.action_none": "Ваш налог је добио модераторско упозорење.",
+ "notification.moderation_warning.action_sensitive": "Ваше објаве ће убудуће бити означене као осетљиве.",
+ "notification.moderation_warning.action_silence": "Ваш налог је ограничен.",
+ "notification.moderation_warning.action_suspend": "Ваш налог је суспендован.",
"notification.own_poll": "Ваша анкета је завршена",
"notification.poll": "Завршена је анкета у којој сте гласали",
"notification.reblog": "{name} је подржао вашу објаву",
+ "notification.relationships_severance_event": "Изгубљена веза са {name}",
+ "notification.relationships_severance_event.account_suspension": "Администратор са {from} је суспендовао {target}, што значи да више не можете да примате ажурирања од њих нити да комуницирате са њима.",
+ "notification.relationships_severance_event.domain_block": "Администратор са {from} је блокирао {target}, укључујући ваше пратиоце: {followersCount} и {followingCount, plural, one {# налог} few {# налогa} other {# налога}} које пратите.",
+ "notification.relationships_severance_event.learn_more": "Сазнајте више",
+ "notification.relationships_severance_event.user_domain_block": "Блокирачи сте {target}, укључујући ваше пратиоце: {followersCount} и {followingCount, plural, one {# налог} few {# налогa} other {# налога}} које пратите.",
"notification.status": "{name} је управо објавио",
"notification.update": "{name} је уредио објаву",
+ "notification_requests.accept": "Прихвати",
+ "notification_requests.dismiss": "Одбаци",
+ "notification_requests.notifications_from": "Обавештења од {name}",
+ "notification_requests.title": "Филтрирана обавештења",
"notifications.clear": "Обриши обавештења",
"notifications.clear_confirmation": "Да ли сте сигурни да желите трајно да обришете сва ваша обавештења?",
"notifications.column_settings.admin.report": "Нове пријаве:",
@@ -445,7 +504,6 @@
"notifications.column_settings.favourite": "Омиљено:",
"notifications.column_settings.filter_bar.advanced": "Прикажи све категорије",
"notifications.column_settings.filter_bar.category": "Трака за брзо филтрирање",
- "notifications.column_settings.filter_bar.show_bar": "Прикажи траку са филтерима",
"notifications.column_settings.follow": "Нови пратиоци:",
"notifications.column_settings.follow_request": "Нови захтеви за праћење:",
"notifications.column_settings.mention": "Помињања:",
@@ -471,6 +529,15 @@
"notifications.permission_denied": "Обавештења на радној површини нису доступна због претходно одбијеног захтева за дозволу прегледача",
"notifications.permission_denied_alert": "Обавештења на радној површини не могу бити омогућена, јер је дозвола прегледача раније била одбијена",
"notifications.permission_required": "Обавештења на радној површини нису доступна јер потребна дозвола није додељена.",
+ "notifications.policy.filter_new_accounts.hint": "Креирано {days, plural, one {у последњег # дана} few {у последња # дана} other {у последњих # дана}}",
+ "notifications.policy.filter_new_accounts_title": "Нови налози",
+ "notifications.policy.filter_not_followers_hint": "Укључујући људе који су вас пратили мање од {days, plural, one {# дана} few {# дана} other {# дана}}",
+ "notifications.policy.filter_not_followers_title": "Људи који вас не прате",
+ "notifications.policy.filter_not_following_hint": "Док их ручно не одобрите",
+ "notifications.policy.filter_not_following_title": "Људи које не пратите",
+ "notifications.policy.filter_private_mentions_hint": "Филтрирано осим ако је одговор на ваше помињање или ако пратите пошиљаоца",
+ "notifications.policy.filter_private_mentions_title": "Нежељена приватна помињања",
+ "notifications.policy.title": "Филтрирај обавештења од…",
"notifications_permission_banner.enable": "Омогућити обавештења на радној површини",
"notifications_permission_banner.how_to_control": "Да бисте примали обавештења када Mastodon није отворен, омогућите обавештења на радној површини. Kада су обавештења на радној површини омогућена врсте интеракција које она генеришу могу се подешавати помоћу дугмета {icon}.",
"notifications_permission_banner.title": "Никада ништа не пропустите",
@@ -505,7 +572,7 @@
"onboarding.steps.publish_status.body": "Поздравите свет текстом, сликама, видео снимцима или анкетама {emoji}",
"onboarding.steps.publish_status.title": "Напишите своју прву објаву",
"onboarding.steps.setup_profile.body": "Појачајте своје интеракције тако што ћете имати свеобухватан профил.",
- "onboarding.steps.setup_profile.title": "Персонализујтее свој профил",
+ "onboarding.steps.setup_profile.title": "Персонализујте свој профил",
"onboarding.steps.share_profile.body": "Нека ваши пријатељи знају како да вас пронађу на Mastodon-у!",
"onboarding.steps.share_profile.title": "Поделите свој Mastodon профил",
"onboarding.tips.2fa": "Да ли сте знали? Можете да заштитите свој налог подешавањем двоструке потврде идентитета у подешавањима налога. Ради са било којом TOTP апликацијом по вашем избору, није потребан број телефона!",
@@ -526,14 +593,15 @@
"poll_button.add_poll": "Додај анкету",
"poll_button.remove_poll": "Уклони анкету",
"privacy.change": "Промени приватност објаве",
- "privacy.direct.long": "Видљиво само поменутим корисницима",
- "privacy.direct.short": "Само поменуте особе",
- "privacy.private.long": "Видљиво само пратиоцима",
- "privacy.private.short": "Само пратиоци",
- "privacy.public.long": "Видљиво за све",
+ "privacy.direct.long": "Сви поменути у објави",
+ "privacy.direct.short": "Одређени људи",
+ "privacy.private.long": "Само ваши пратиоци",
+ "privacy.private.short": "Пратиоци",
+ "privacy.public.long": "Било ко на Mastodon-у и ван њега",
"privacy.public.short": "Јавно",
- "privacy.unlisted.long": "Видљиво свима, али искључено из функција откривања",
- "privacy.unlisted.short": "Неизлистано",
+ "privacy.unlisted.additional": "Ово се понаша потпуно као јавно, осим што се објава неће појављивати у изворима уживо или хеш ознакама, истраживањима или претрази Mastodon-а, чак и ако сте укључени у целом налогу.",
+ "privacy.unlisted.long": "Мање алгоритамских фанфара",
+ "privacy.unlisted.short": "Тиха јавност",
"privacy_policy.last_updated": "Последње ажурирање {date}",
"privacy_policy.title": "Политика приватности",
"recommended": "Препоручено",
@@ -551,7 +619,9 @@
"relative_time.minutes": "{number} мин.",
"relative_time.seconds": "{number} сек.",
"relative_time.today": "данас",
+ "reply_indicator.attachments": "{count, plural, one {# прилог} few {# прилога} other {# прилога}}",
"reply_indicator.cancel": "Откажи",
+ "reply_indicator.poll": "Анкета",
"report.block": "Блокирај",
"report.block_explanation": "Нећете видети објаве корисника. Ни он неће видети Ваше објаве нити ће моћи да Вас прати. Такође ће моћи да сазна да је блокиран.",
"report.categories.legal": "Правни",
@@ -644,10 +714,11 @@
"status.direct": "Приватно помени @{name}",
"status.direct_indicator": "Приватно помињање",
"status.edit": "Уреди",
- "status.edited": "Уређено {date}",
+ "status.edited": "Последње уређивање {date}",
"status.edited_x_times": "Уређено {count, plural, one {{count} пут} other {{count} пута}}",
"status.embed": "Угради",
"status.favourite": "Омиљено",
+ "status.favourites": "{count, plural, one {# омиљено} few {# омиљена} other {# омиљених}}",
"status.filter": "Филтрирај ову објаву",
"status.filtered": "Филтрирано",
"status.hide": "Сакриј објаву",
@@ -668,6 +739,7 @@
"status.reblog": "Подржи",
"status.reblog_private": "Подржи са оригиналном видљивошћу",
"status.reblogged_by": "{name} је подржао/ла",
+ "status.reblogs": "{count, plural, one {# подржавање} few {# подржавања} other {# подржавања}}",
"status.reblogs.empty": "Још увек нико није подржао ову објаву. Када буде подржана, појавиће се овде.",
"status.redraft": "Избриши и преобликуј",
"status.remove_bookmark": "Уклони обележивач",
@@ -715,10 +787,8 @@
"upload_error.poll": "Отпремање датотека није дозвољено код анкета.",
"upload_form.audio_description": "Додајте опис за особе са оштећеним слухом",
"upload_form.description": "Додајте опис за особе са оштећеним видом",
- "upload_form.description_missing": "Нема додатог описа",
"upload_form.edit": "Уреди",
"upload_form.thumbnail": "Промени сличицу",
- "upload_form.undo": "Избриши",
"upload_form.video_description": "Опишите за особе са оштећеним слухом или видом",
"upload_modal.analyzing_picture": "Анализирање слике…",
"upload_modal.apply": "Примени",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index d3ca776bd9e5cb..ba3a6b2f51ebda 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -89,7 +89,14 @@
"announcement.announcement": "Meddelande",
"attachments_list.unprocessed": "(obehandlad)",
"audio.hide": "Dölj audio",
- "autosuggest_hashtag.per_week": "{count} per vecka",
+ "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.",
+ "block_modal.they_cant_see_posts": "De kan inte se dina inlägg och du kan inte se deras.",
+ "block_modal.they_will_know": "De kan se att de är blockerade.",
+ "block_modal.title": "Blockera användare?",
+ "block_modal.you_wont_see_mentions": "Du kommer inte att se inlägg som nämner dem.",
"boost_modal.combo": "Du kan trycka på {combo} för att hoppa över detta nästa gång",
"bundle_column_error.copy_stacktrace": "Kopiera felrapport",
"bundle_column_error.error.body": "Den begärda sidan kunde inte visas. Det kan bero på ett fel i vår kod eller ett problem med webbläsarens kompatibilitet.",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "Ditt konto är inte {locked}. Vem som helst kan följa dig för att se dina inlägg som endast är för följare.",
"compose_form.lock_disclaimer.lock": "låst",
"compose_form.placeholder": "Vad tänker du på?",
- "compose_form.poll.add_option": "Lägg till ett val",
"compose_form.poll.duration": "Varaktighet för omröstning",
- "compose_form.poll.option_placeholder": "Val {number}",
- "compose_form.poll.remove_option": "Ta bort detta val",
+ "compose_form.poll.multiple": "Flera val",
+ "compose_form.poll.option_placeholder": "Alternativ {number}",
+ "compose_form.poll.single": "Välj en",
"compose_form.poll.switch_to_multiple": "Ändra enkät för att tillåta flera val",
"compose_form.poll.switch_to_single": "Ändra enkät för att tillåta ett enda val",
+ "compose_form.poll.type": "Stil",
"compose_form.publish": "Publicera",
"compose_form.publish_form": "Publicera",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Spara ändringar",
- "compose_form.sensitive.hide": "Markera media som känsligt",
- "compose_form.sensitive.marked": "Media har markerats som känsligt",
- "compose_form.sensitive.unmarked": "Media är inte markerat som känsligt",
+ "compose_form.reply": "Svara",
+ "compose_form.save_changes": "Uppdatera",
"compose_form.spoiler.marked": "Texten är dold bakom en varning",
"compose_form.spoiler.unmarked": "Texten är inte dold",
- "compose_form.spoiler_placeholder": "Skriv din varning här",
+ "compose_form.spoiler_placeholder": "Innehållsvarning (valfritt)",
"confirmation_modal.cancel": "Avbryt",
- "confirmations.block.block_and_report": "Blockera & rapportera",
"confirmations.block.confirm": "Blockera",
- "confirmations.block.message": "Är du säker på att du vill blockera {name}?",
"confirmations.cancel_follow_request.confirm": "Återkalla förfrågan",
"confirmations.cancel_follow_request.message": "Är du säker på att du vill återkalla din begäran om att följa {name}?",
"confirmations.delete.confirm": "Radera",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "Är du säker på att du vill radera denna lista permanent?",
"confirmations.discard_edit_media.confirm": "Kasta",
"confirmations.discard_edit_media.message": "Du har osparade ändringar till mediabeskrivningen eller förhandsgranskningen, kasta bort dem ändå?",
- "confirmations.domain_block.confirm": "Dölj hela domänen",
+ "confirmations.domain_block.confirm": "Blockera server",
"confirmations.domain_block.message": "Är du verkligen, verkligen säker på att du vill blockera hela {domain}? I de flesta fall är några riktade blockeringar eller nedtystade konton tillräckligt och att föredra. Du kommer inte se innehåll från den domänen i den allmänna tidslinjen eller i dina aviseringar. Dina följare från den domänen komer att tas bort.",
"confirmations.edit.confirm": "Redigera",
"confirmations.edit.message": "Om du svarar nu kommer det att ersätta meddelandet du håller på att skapa. Är du säker på att du vill fortsätta?",
"confirmations.logout.confirm": "Logga ut",
"confirmations.logout.message": "Är du säker på att du vill logga ut?",
"confirmations.mute.confirm": "Tysta",
- "confirmations.mute.explanation": "Detta kommer dölja inlägg från hen och inlägg som nämner hen, men hen tillåts fortfarande se dina inlägg och följa dig.",
- "confirmations.mute.message": "Är du säker på att du vill tysta {name}?",
"confirmations.redraft.confirm": "Radera & gör om",
"confirmations.redraft.message": "Är du säker på att du vill radera detta inlägg och göra om det? Favoritmarkeringar, boostar och svar till det ursprungliga inlägget kommer förlora sitt sammanhang.",
"confirmations.reply.confirm": "Svara",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "Dessa inlägg, från denna och andra servrar i det decentraliserade nätverket, pratas det om just nu på denna server.",
"dismissable_banner.explore_tags": "Dessa hashtaggar pratas det om just nu bland folk på denna och andra servrar i det decentraliserade nätverket.",
"dismissable_banner.public_timeline": "De här är de aktuella publika inlägg från personer på det sociala nätet som personer i {domain} följer.",
+ "domain_block_modal.block": "Blockera server",
+ "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_handle": "Deras handtag:",
+ "domain_pill.their_server": "Deras digitala hem, där alla deras tjänster bor.",
+ "domain_pill.their_username": "Deras unika identifierare på deras server. Det är möjligt att hitta användare med samma användarnamn på olika servrar.",
+ "domain_pill.username": "Användarnamn",
+ "domain_pill.whats_in_a_handle": "Vad finns i ett handtag?",
+ "domain_pill.who_they_are": "Eftersom handtag säger vem någon är och var de är, kan du interagera med människor på det sociala nätet av .",
+ "domain_pill.who_you_are": "Eftersom handtag säger vem någon är och var de är, kan människor interagera med dig på det sociala nätet av .",
+ "domain_pill.your_handle": "Ditt handtag:",
+ "domain_pill.your_server": "Ditt digitala hem, där alla dina inlägg bor. Gillar du inte just denna? Byt server när som helst och ta med dina anhängare också.",
+ "domain_pill.your_username": "Din unika identifierare på denna server. Det är möjligt att hitta användare med samma användarnamn på olika servrar.",
"embed.instructions": "Bädda in detta inlägg på din webbplats genom att kopiera koden nedan.",
"embed.preview": "Så här kommer det att se ut:",
"emoji_button.activity": "Aktivitet",
@@ -244,6 +266,7 @@
"empty_column.list": "Det finns inget i denna lista än. När listmedlemmar publicerar nya inlägg kommer de synas här.",
"empty_column.lists": "Du har inga listor än. När skapar en kommer den dyka upp här.",
"empty_column.mutes": "Du har ännu inte tystat några användare.",
+ "empty_column.notification_requests": "Allt klart! Det finns inget mer här. När du får nya meddelanden visas de här enligt dina inställningar.",
"empty_column.notifications": "Du har inga meddelanden än. Interagera med andra för att starta konversationen.",
"empty_column.public": "Det finns inget här! Skriv något offentligt, eller följ manuellt användarna från andra instanser för att fylla på det",
"error.unexpected_crash.explanation": "På grund av en bugg i vår kod eller kompatiblitetsproblem i webbläsaren kan den här sidan inte visas korrekt.",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "Använd en befintlig kategori eller skapa en ny",
"filter_modal.select_filter.title": "Filtrera detta inlägg",
"filter_modal.title.status": "Filtrera ett inlägg",
+ "filtered_notifications_banner.mentions": "{count, plural, one {omnämning} other {omnämnanden}}",
+ "filtered_notifications_banner.pending_requests": "Aviseringar från {count, plural, =0 {ingen} one {en person} other {# personer}} du kanske känner",
+ "filtered_notifications_banner.title": "Filtrerade aviseringar",
"firehose.all": "Allt",
"firehose.local": "Denna server",
"firehose.remote": "Andra servrar",
"follow_request.authorize": "Godkänn",
"follow_request.reject": "Avvisa",
- "follow_requests.unlocked_explanation": "Även om ditt konto inte är låst tror {domain} personalen att du kanske vill granska dessa följares förfrågningar manuellt.",
+ "follow_requests.unlocked_explanation": "Även om ditt konto inte är låst tror {domain}-personalen att du kanske vill granska dessa följares förfrågningar manuellt.",
+ "follow_suggestions.curated_suggestion": "Utvald av personalen",
+ "follow_suggestions.dismiss": "Visa inte igen",
+ "follow_suggestions.featured_longer": "Handplockad av {domain}-teamet",
+ "follow_suggestions.friends_of_friends_longer": "Populärt bland personer du följer",
+ "follow_suggestions.hints.featured": "Denna profil är handplockad av {domain}-teamet.",
+ "follow_suggestions.hints.friends_of_friends": "Denna profil är populär bland de personer du följer.",
+ "follow_suggestions.hints.most_followed": "Denna profil är en av de mest följda på {domain}.",
+ "follow_suggestions.hints.most_interactions": "Denna profil har nyligen fått mycket uppmärksamhet på {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Denna profil liknar de profiler som du nyligen har följt.",
+ "follow_suggestions.personalized_suggestion": "Personligt förslag",
+ "follow_suggestions.popular_suggestion": "Populärt förslag",
+ "follow_suggestions.popular_suggestion_longer": "Populärt på {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Liknar profiler du nyligen följde",
+ "follow_suggestions.view_all": "Visa alla",
+ "follow_suggestions.who_to_follow": "Rekommenderade profiler",
"followed_tags": "Följda hashtags",
"footer.about": "Om",
"footer.directory": "Profilkatalog",
@@ -306,13 +347,8 @@
"hashtag.follow": "Följ hashtagg",
"hashtag.unfollow": "Avfölj hashtagg",
"hashtags.and_other": "…och {count, plural, one {}other {# mer}}",
- "home.actions.go_to_explore": "Se vad som trendar",
- "home.actions.go_to_suggestions": "Hitta personer att följa",
- "home.column_settings.basic": "Grundläggande",
"home.column_settings.show_reblogs": "Visa boostar",
"home.column_settings.show_replies": "Visa svar",
- "home.explore_prompt.body": "Din hemflöde kommer att ha en blandning av inlägg från taggar du har valt att följa, de människor som du har valt att följa och de inlägg som de boostar. Om det känns för tyst kanske du vill:",
- "home.explore_prompt.title": "Detta är din hembas inom Mastodon.",
"home.hide_announcements": "Dölj notiser",
"home.pending_critical_update.body": "Uppdatera din Mastodon-server så snart som möjligt!",
"home.pending_critical_update.link": "Se uppdateringar",
@@ -396,9 +432,15 @@
"loading_indicator.label": "Laddar…",
"media_gallery.toggle_visible": "Växla synlighet",
"moved_to_account_banner.text": "Ditt konto {disabledAccount} är för närvarande inaktiverat eftersom du flyttat till {movedToAccount}.",
- "mute_modal.duration": "Varaktighet",
- "mute_modal.hide_notifications": "Dölj aviseringar från denna användare?",
- "mute_modal.indefinite": "Obestämt",
+ "mute_modal.hide_from_notifications": "Dölj från aviseringslistan",
+ "mute_modal.hide_options": "Dölj alternativ",
+ "mute_modal.indefinite": "Tills jag avtystar dem",
+ "mute_modal.show_options": "Visa alternativ",
+ "mute_modal.they_can_mention_and_follow": "De kan nämna och följa dig, men du ser dem inte.",
+ "mute_modal.they_wont_know": "De vet inte att de har blivit tysta.",
+ "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",
"navigation_bar.advanced_interface": "Öppna i avancerat webbgränssnitt",
"navigation_bar.blocks": "Blockerade användare",
@@ -408,7 +450,6 @@
"navigation_bar.direct": "Privata nämningar",
"navigation_bar.discover": "Upptäck",
"navigation_bar.domain_blocks": "Dolda domäner",
- "navigation_bar.edit_profile": "Redigera profil",
"navigation_bar.explore": "Utforska",
"navigation_bar.favourites": "Favoriter",
"navigation_bar.filters": "Tystade ord",
@@ -432,11 +473,29 @@
"notification.follow": "{name} följer dig",
"notification.follow_request": "{name} har begärt att följa dig",
"notification.mention": "{name} nämnde dig",
+ "notification.moderation-warning.learn_more": "Läs mer",
+ "notification.moderation_warning": "Du har fått en moderationsvarning",
+ "notification.moderation_warning.action_delete_statuses": "Några av dina inlägg har tagits bort.",
+ "notification.moderation_warning.action_disable": "Ditt konto har inaktiverats.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Några av dina inlägg har markerats som känsliga.",
+ "notification.moderation_warning.action_none": "Ditt konto har mottagit en modereringsvarning.",
+ "notification.moderation_warning.action_sensitive": "Dina inlägg kommer markeras som känsliga från och med nu.",
+ "notification.moderation_warning.action_silence": "Ditt konto har begränsats.",
+ "notification.moderation_warning.action_suspend": "Ditt konto har stängts av.",
"notification.own_poll": "Din röstning har avslutats",
"notification.poll": "En omröstning du röstat i har avslutats",
"notification.reblog": "{name} boostade ditt inlägg",
+ "notification.relationships_severance_event": "Förlorade kontakter med {name}",
+ "notification.relationships_severance_event.account_suspension": "En administratör från {from} har stängt av {target}, vilket innebär att du inte längre kan ta emot uppdateringar från dem eller interagera med dem.",
+ "notification.relationships_severance_event.domain_block": "En administratör från {from} har blockerat {target}, inklusive {followersCount} av dina följare och {followingCount, plural, one {# konto} other {# konton}} du följer.",
+ "notification.relationships_severance_event.learn_more": "Läs mer",
+ "notification.relationships_severance_event.user_domain_block": "Du har blockerat {target} och tar därmed bort {followersCount} av dina följare samt {followingCount, plural, one {# konto} other {# konton}} du följer.",
"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:",
@@ -445,7 +504,6 @@
"notifications.column_settings.favourite": "Favoriter:",
"notifications.column_settings.filter_bar.advanced": "Visa alla kategorier",
"notifications.column_settings.filter_bar.category": "Snabbfilter",
- "notifications.column_settings.filter_bar.show_bar": "Visa filterfält",
"notifications.column_settings.follow": "Nya följare:",
"notifications.column_settings.follow_request": "Ny följ-förfrågan:",
"notifications.column_settings.mention": "Omnämningar:",
@@ -471,6 +529,15 @@
"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_hint": "Inklusive personer som har följt dig kortare än {days, plural, one {en dag} other {# dagar}}",
+ "notifications.policy.filter_not_followers_title": "Personer som inte följer dig",
+ "notifications.policy.filter_not_following_hint": "Tills du manuellt godkänner dem",
+ "notifications.policy.filter_not_following_title": "Personer du inte följer",
+ "notifications.policy.filter_private_mentions_hint": "Filtrerat om det inte är som svar på ditt eget omnämnande eller om du följer avsändaren",
+ "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",
@@ -490,7 +557,9 @@
"onboarding.profile.note": "Bio",
"onboarding.profile.note_hint": "Du kan @nämna andra personer eller #hashtags…",
"onboarding.profile.save_and_continue": "Spara och fortsätt",
+ "onboarding.profile.title": "Konfiguration av profil",
"onboarding.profile.upload_avatar": "Ladda upp profilbild",
+ "onboarding.profile.upload_header": "Ladda upp profilbanner",
"onboarding.share.lead": "Låt folk veta hur de kan hitta dig på Mastodon!",
"onboarding.share.message": "Jag är {username} på #Mastodon! Följ mig på {url}",
"onboarding.share.next_steps": "Möjliga nästa steg:",
@@ -524,14 +593,15 @@
"poll_button.add_poll": "Lägg till en omröstning",
"poll_button.remove_poll": "Ta bort omröstning",
"privacy.change": "Ändra inläggsintegritet",
- "privacy.direct.long": "Skicka endast till nämnda användare",
- "privacy.direct.short": "Endast omnämnda personer",
- "privacy.private.long": "Endast synligt för följare",
- "privacy.private.short": "Endast följare",
- "privacy.public.long": "Synlig för alla",
- "privacy.public.short": "Publik",
- "privacy.unlisted.long": "Synlig för alla, men visas inte i upptäcksfunktioner",
- "privacy.unlisted.short": "Olistad",
+ "privacy.direct.long": "Alla som nämns i inlägget",
+ "privacy.direct.short": "Särskilda personer",
+ "privacy.private.long": "Endast dina följare",
+ "privacy.private.short": "Följare",
+ "privacy.public.long": "Alla på och utanför Mastodon",
+ "privacy.public.short": "Offentlig",
+ "privacy.unlisted.additional": "Detta fungerar precis som offentlig, förutom att inlägget inte visas i liveflöden eller hashtaggar, utforska eller Mastodon-sökning, även om du har valt detta för hela kontot.",
+ "privacy.unlisted.long": "Mindre beaktat av algoritmen",
+ "privacy.unlisted.short": "Offentlig (begränsad)",
"privacy_policy.last_updated": "Senast uppdaterad {date}",
"privacy_policy.title": "Integritetspolicy",
"recommended": "Rekommenderas",
@@ -549,7 +619,9 @@
"relative_time.minutes": "{number}min",
"relative_time.seconds": "{number}sek",
"relative_time.today": "idag",
+ "reply_indicator.attachments": "{count, plural, one {# bilaga} other {# bilagor}}",
"reply_indicator.cancel": "Ångra",
+ "reply_indicator.poll": "Omröstning",
"report.block": "Blockera",
"report.block_explanation": "Du kommer inte se hens inlägg. Hen kommer inte kunna se dina inlägg eller följa dig. Hen kommer kunna se att hen är blockerad.",
"report.categories.legal": "Juridisk",
@@ -642,10 +714,11 @@
"status.direct": "Nämn @{name} privat",
"status.direct_indicator": "Privat nämning",
"status.edit": "Redigera",
- "status.edited": "Ändrad {date}",
+ "status.edited": "Senast ändrad {date}",
"status.edited_x_times": "Redigerad {count, plural, one {{count} gång} other {{count} gånger}}",
"status.embed": "Bädda in",
"status.favourite": "Favoritmarkera",
+ "status.favourites": "{count, plural, one {favorit} other {favoriter}}",
"status.filter": "Filtrera detta inlägg",
"status.filtered": "Filtrerat",
"status.hide": "Dölj inlägg",
@@ -666,6 +739,7 @@
"status.reblog": "Boosta",
"status.reblog_private": "Boosta med ursprunglig synlighet",
"status.reblogged_by": "{name} boostade",
+ "status.reblogs": "{count, plural, one {# röst} other {# röster}}",
"status.reblogs.empty": "Ingen har boostat detta inlägg än. När någon gör det kommer de synas här.",
"status.redraft": "Radera & gör om",
"status.remove_bookmark": "Ta bort bokmärke",
@@ -713,10 +787,8 @@
"upload_error.poll": "Filuppladdning tillåts inte med omröstningar.",
"upload_form.audio_description": "Beskriv för personer med hörselnedsättning",
"upload_form.description": "Beskriv för synskadade",
- "upload_form.description_missing": "Beskrivning saknas",
"upload_form.edit": "Redigera",
"upload_form.thumbnail": "Ändra miniatyr",
- "upload_form.undo": "Radera",
"upload_form.video_description": "Beskriv för personer med hörsel- eller synnedsättning",
"upload_modal.analyzing_picture": "Analyserar bild…",
"upload_modal.apply": "Verkställ",
diff --git a/app/javascript/mastodon/locales/szl.json b/app/javascript/mastodon/locales/szl.json
index abbdf9b7daaf89..43cfc78d5bb373 100644
--- a/app/javascript/mastodon/locales/szl.json
+++ b/app/javascript/mastodon/locales/szl.json
@@ -34,7 +34,6 @@
"compose_form.spoiler.marked": "Text is hidden behind warning",
"compose_form.spoiler.unmarked": "Text is not hidden",
"confirmations.delete.message": "Are you sure you want to delete this status?",
- "confirmations.domain_block.confirm": "Hide entire domain",
"dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
"dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
"embed.instructions": "Embed this status on your website by copying the code below.",
@@ -93,8 +92,6 @@
"onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
"onboarding.steps.share_profile.title": "Share your profile",
"privacy.change": "Adjust status privacy",
- "privacy.direct.short": "Direct",
- "privacy.private.short": "Followers-only",
"report.placeholder": "Type or paste additional comments",
"report.submit": "Submit report",
"report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index 5290e13ff4cdfa..ac0984293af780 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -66,7 +66,6 @@
"announcement.announcement": "அறிவிப்பு",
"attachments_list.unprocessed": "(செயலாக்கப்படாதது)",
"audio.hide": "ஆடியோவை மறை",
- "autosuggest_hashtag.per_week": "ஒவ்வொரு வாரம் {count}",
"boost_modal.combo": "நீங்கள் இதை அடுத்தமுறை தவிர்க்க {combo} வை அழுத்தவும்",
"bundle_column_error.error.title": "அடடே!",
"bundle_column_error.network.body": "இந்தப் பக்கத்தைத் திறக்கும்பொழுது ஒரு பிழை ஏற்பட்டுவிட்டது. இது உங்கள் இணைய தொடர்பில் அல்லது இப்பத்தின் வழங்க்கியில் ஏற்பட்டுள்ள ஒரு தற்காலிக பிரச்சணையாக இருக்கலாம்.",
@@ -120,39 +119,24 @@
"compose_form.lock_disclaimer": "உங்கள் கணக்கு {locked} செய்யப்படவில்லை. உங்கள் பதிவுகளை யார் வேண்டுமானாலும் பின்தொடர்ந்து காணலாம்.",
"compose_form.lock_disclaimer.lock": "பூட்டப்பட்டது",
"compose_form.placeholder": "உங்கள் மனதில் என்ன இருக்கிறது?",
- "compose_form.poll.add_option": "தேர்வை சேர்",
"compose_form.poll.duration": "கருத்துக்கணிப்பின் கால அளவு",
- "compose_form.poll.option_placeholder": "தேர்வு எண் {number}",
- "compose_form.poll.remove_option": "இந்தத் தேர்வை அகற்று",
"compose_form.poll.switch_to_multiple": "பல தேர்வுகளை அனுமதிக்குமாறு மாற்று",
"compose_form.poll.switch_to_single": "ஒரே ஒரு தேர்வை மட்டும் அனுமதிக்குமாறு மாற்று",
- "compose_form.publish": "வெளியிடு",
"compose_form.publish_form": "Publish",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "மாற்றங்களை சேமி",
- "compose_form.sensitive.hide": "அனைவருக்கும் ஏற்றப் படம் இல்லை எனக் குறியிடு",
- "compose_form.sensitive.marked": "இப்படம் அனைவருக்கும் ஏற்றதல்ல எனக் குறியிடப்பட்டுள்ளது",
- "compose_form.sensitive.unmarked": "இப்படம் அனைவருக்கும் ஏற்றதல்ல எனக் குறியிடப்படவில்லை",
"compose_form.spoiler.marked": "எச்சரிக்கையின் பின்னால் பதிவு மறைக்கப்பட்டுள்ளது",
"compose_form.spoiler.unmarked": "பதிவு மறைக்கப்படவில்லை",
- "compose_form.spoiler_placeholder": "உங்கள் எச்சரிக்கையை இங்கு எழுதவும்",
"confirmation_modal.cancel": "ரத்து",
- "confirmations.block.block_and_report": "தடுத்துப் புகாரளி",
"confirmations.block.confirm": "தடு",
- "confirmations.block.message": "{name}-ஐ நிச்சயமாகத் தடுக்க விரும்புகிறீர்களா?",
"confirmations.delete.confirm": "நீக்கு",
"confirmations.delete.message": "இப்பதிவை நிச்சயமாக நீக்க விரும்புகிறீர்களா?",
"confirmations.delete_list.confirm": "நீக்கு",
"confirmations.delete_list.message": "இப்பட்டியலை நிரந்தரமாக நீக்க நிச்சயம் விரும்புகிறீர்களா?",
"confirmations.discard_edit_media.confirm": "நிராகரி",
"confirmations.discard_edit_media.message": "சேமிக்கப்படாத மாற்றங்கள் ஊடக விளக்கம் அல்லது முன்னோட்டத்தில் உள்ளது. அவற்றை நிராகரிக்கவா?",
- "confirmations.domain_block.confirm": "முழு களத்தையும் மறை",
"confirmations.domain_block.message": "நீங்கள் முழு {domain} களத்தையும் நிச்சயமாக, நிச்சயமாகத் தடுக்க விரும்புகிறீர்களா? பெரும்பாலும் சில குறிப்பிட்ட பயனர்களைத் தடுப்பதே போதுமானது. முழு களத்தையும் தடுத்தால், அதிலிருந்து வரும் எந்தப் பதிவையும் உங்களால் காண முடியாது, மேலும் அப்பதிவுகள் குறித்த அறிவிப்புகளும் உங்களுக்கு வராது. அந்தக் களத்தில் இருக்கும் பின்தொடர்பவர்கள் உங்கள் பக்கத்திலிருந்து நீக்கப்படுவார்கள்.",
"confirmations.logout.confirm": "வெளியேறு",
"confirmations.logout.message": "நிச்சயமாக நீங்கள் வெளியேற விரும்புகிறீர்களா?",
"confirmations.mute.confirm": "அமைதியாக்கு",
- "confirmations.mute.explanation": "இந்தத் தேர்வு அவர்களின் பதிவுகளையும், அவர்களைக் குறிப்பிடும் பதிவுகளையும் மறைத்துவிடும். ஆனால், அவர்களால் உங்களைப் பின்தொடர்ந்து உங்கள் பதிவுகளைக் காண முடியும்.",
- "confirmations.mute.message": "{name}-ஐ நிச்சயமாக நீங்கள் அமைதியாக்க விரும்புகிறீர்களா?",
"confirmations.redraft.confirm": "பதிவை நீக்கி மறுவரைவு செய்",
"confirmations.reply.confirm": "மறுமொழி",
"confirmations.reply.message": "ஏற்கனவே ஒரு பதிவு எழுதப்பட்டுக்கொண்டிருக்கிறது. இப்பொழுது பதில் எழுத முனைந்தால் அது அழிக்கப்படும். பரவாயில்லையா?",
@@ -222,7 +206,6 @@
"hashtag.column_settings.tag_mode.any": "இவற்றில் எவையேனும்",
"hashtag.column_settings.tag_mode.none": "இவற்றில் ஏதுமில்லை",
"hashtag.column_settings.tag_toggle": "இந்த நெடுவரிசையில் கூடுதல் சிட்டைகளைச் சேர்க்கவும்",
- "home.column_settings.basic": "அடிப்படையானவை",
"home.column_settings.show_reblogs": "பகிர்வுகளைக் காண்பி",
"home.column_settings.show_replies": "மறுமொழிகளைக் காண்பி",
"home.hide_announcements": "அறிவிப்புகளை மறை",
@@ -276,14 +259,12 @@
"lists.subheading": "உங்கள் பட்டியல்கள்",
"load_pending": "{count, plural,one {# புதியது}other {# புதியவை}}",
"media_gallery.toggle_visible": "நிலைமாற்று தெரியும்",
- "mute_modal.hide_notifications": "இந்த பயனரின் அறிவிப்புகளை மறைக்கவா?",
"navigation_bar.blocks": "தடுக்கப்பட்ட பயனர்கள்",
"navigation_bar.bookmarks": "அடையாளக்குறிகள்",
"navigation_bar.community_timeline": "உள்ளூர் காலக்கெடு",
"navigation_bar.compose": "புதியவற்றை எழுதுக toot",
"navigation_bar.discover": "கண்டு பிடி",
"navigation_bar.domain_blocks": "மறைந்த களங்கள்",
- "navigation_bar.edit_profile": "சுயவிவரத்தைத் திருத்தவும்",
"navigation_bar.filters": "முடக்கப்பட்ட வார்த்தைகள்",
"navigation_bar.follow_requests": "கோரிக்கைகளை பின்பற்றவும்",
"navigation_bar.follows_and_followers": "பின்பற்றல்கள் மற்றும் பின்பற்றுபவர்கள்",
@@ -305,8 +286,6 @@
"notifications.clear": "அறிவிப்புகளை அழிக்கவும்",
"notifications.clear_confirmation": "உங்கள் எல்லா அறிவிப்புகளையும் நிரந்தரமாக அழிக்க விரும்புகிறீர்களா?",
"notifications.column_settings.alert": "டெஸ்க்டாப் அறிவிப்புகள்",
- "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": "குறிப்பிடுகிறது:",
@@ -344,12 +323,7 @@
"poll_button.add_poll": "வாக்கெடுப்பைச் சேர்க்கவும்",
"poll_button.remove_poll": "வாக்கெடுப்பை அகற்று",
"privacy.change": "நிலை தனியுரிமை",
- "privacy.direct.long": "குறிப்பிடப்பட்ட பயனர்களுக்கு மட்டுமே இடுகையிடவும்",
- "privacy.direct.short": "Direct",
- "privacy.private.long": "பின்தொடர்பவர்களுக்கு மட்டுமே இடுகை",
- "privacy.private.short": "Followers-only",
"privacy.public.short": "பொது",
- "privacy.unlisted.short": "பட்டியலிடப்படாத",
"refresh": "புதுப்பி",
"regeneration_indicator.label": "சுமையேற்றம்…",
"regeneration_indicator.sublabel": "உங்கள் வீட்டு ஊட்டம் தயார் செய்யப்படுகிறது!",
@@ -432,7 +406,6 @@
"upload_form.description": "பார்வையற்ற விவரிக்கவும்",
"upload_form.edit": "தொகு",
"upload_form.thumbnail": "சிறுபடத்தை மாற்ற",
- "upload_form.undo": "நீக்கு",
"upload_form.video_description": "செவித்திறன் மற்றும் பார்வைக் குறைபாடு உள்ளவர்களுக்காக விளக்குக",
"upload_modal.analyzing_picture": "படம் ஆராயப்படுகிறது…",
"upload_modal.apply": "உபயோகி",
diff --git a/app/javascript/mastodon/locales/tai.json b/app/javascript/mastodon/locales/tai.json
index 7c1956d95b93c1..825cfb93bdff25 100644
--- a/app/javascript/mastodon/locales/tai.json
+++ b/app/javascript/mastodon/locales/tai.json
@@ -2,25 +2,24 @@
"about.blocks": "Siū kuán-tsè ê su-hāu-khì",
"about.contact": "Liân-lo̍k:",
"about.disclaimer": "Ling-khí-tshiūnn sī tsi̍t-ê khai-guân nńg-thé，i ê siong-phiau sī Mastodon gGmbH.",
- "account.badges.bot": "Bot",
- "account.cancel_follow_request": "Withdraw follow request",
+ "account.badges.bot": "Tsū-tōng-ê",
+ "account.cancel_follow_request": "Mài-koh tui-tsong",
"account.media": "Mûi-thé",
"account.mention": "Thê-khí @{name}",
- "account.posts": "Toots",
- "account.posts_with_replies": "Toots and replies",
- "account.requested": "Awaiting approval",
- "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
- "account_note.placeholder": "Click to add a note",
- "column.pins": "Pinned toot",
- "community.column_settings.media_only": "Media only",
- "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
- "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
- "compose_form.placeholder": "What is on your mind?",
- "compose_form.publish_form": "Publish",
- "compose_form.spoiler.marked": "Text is hidden behind warning",
- "compose_form.spoiler.unmarked": "Text is not hidden",
- "confirmations.delete.message": "Are you sure you want to delete this status?",
- "confirmations.domain_block.confirm": "Hide entire domain",
+ "account.posts": "Huah-siann",
+ "account.posts_with_replies": "Huah-siann kah huê-ìng",
+ "account.requested": "Tán-thāi phue-tsún",
+ "account.statuses_counter": "{count, plural, one {{counter} Huah-siann} other {{counter} Huah-siann}}",
+ "account_note.placeholder": "Tiám tsi̍t-ē ka-thiam pī-tsù",
+ "column.pins": "Tah thâu-tsîng ê huah-siann",
+ "community.column_settings.media_only": "Kan-na muî-thé",
+ "compose_form.encryption_warning": "Tī Mastodon tah huah-siann m̄-sī tuan-tuì-tuan ka-pì ê. M̄-thang tī Mastodon hun-hióng jīm-hô bín-kám ê tsū-sìn.",
+ "compose_form.hashtag_warning": "Tsit-ê huah-siann in-uī m̄-sī kong-khai ê, sóo-í buē tī jīm-hô tsú-tê piau-tshiam hián-sī. Kan-na kong-khai ê huah-siann ē-tàng hōo tsú-tê piau-tshiam tshâ-tshuē.",
+ "compose_form.placeholder": "Lí teh siūnn siánn?",
+ "compose_form.publish_form": "Huah--tshut-khì",
+ "compose_form.spoiler.marked": "Î-tû luē-iông kíng-kò",
+ "compose_form.spoiler.unmarked": "Tsing-ka luē-iông kíng-kò",
+ "confirmations.delete.message": "Lí kám bueh thâi-tiāu tsi̍t-ē huah-siann?",
"dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
"dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
"embed.instructions": "Embed this status on your website by copying the code below.",
@@ -46,7 +45,7 @@
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
- "keyboard_shortcuts.open_media": "to open media",
+ "keyboard_shortcuts.open_media": "Khui muî-thé",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "to reply",
@@ -79,8 +78,6 @@
"onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
"onboarding.steps.share_profile.title": "Share your profile",
"privacy.change": "Adjust status privacy",
- "privacy.direct.short": "Direct",
- "privacy.private.short": "Followers-only",
"report.placeholder": "Type or paste additional comments",
"report.submit": "Submit report",
"report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index 3c231871fa71aa..284102c381bc6d 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -64,27 +64,18 @@
"compose_form.lock_disclaimer": "మీ ఖాతా {locked} చేయబడలేదు. ఎవరైనా మిమ్మల్ని అనుసరించి మీ అనుచరులకు-మాత్రమే పోస్ట్లను వీక్షించవచ్చు.",
"compose_form.lock_disclaimer.lock": "బిగించబడినది",
"compose_form.placeholder": "మీ మనస్సులో ఏముంది?",
- "compose_form.poll.add_option": "ఒక ఎంపికను చేర్చండి",
"compose_form.poll.duration": "ఎన్నిక వ్యవధి",
- "compose_form.poll.option_placeholder": "ఎంపిక {number}",
- "compose_form.poll.remove_option": "ఈ ఎంపికను తొలగించు",
"compose_form.publish_form": "Publish",
- "compose_form.sensitive.marked": "మీడియా సున్నితమైనదిగా గుర్తించబడింది",
- "compose_form.sensitive.unmarked": "మీడియా సున్నితమైనదిగా గుర్తించబడలేదు",
"compose_form.spoiler.marked": "హెచ్చరిక వెనుక పాఠ్యం దాచబడింది",
"compose_form.spoiler.unmarked": "పాఠ్యం దాచబడలేదు",
- "compose_form.spoiler_placeholder": "ఇక్కడ మీ హెచ్చరికను రాయండి",
"confirmation_modal.cancel": "రద్దు చెయ్యి",
"confirmations.block.confirm": "బ్లాక్ చేయి",
- "confirmations.block.message": "మీరు ఖచ్చితంగా {name}ని బ్లాక్ చేయాలనుకుంటున్నారా?",
"confirmations.delete.confirm": "తొలగించు",
"confirmations.delete.message": "మీరు ఖచ్చితంగా ఈ స్టేటస్ ని తొలగించాలనుకుంటున్నారా?",
"confirmations.delete_list.confirm": "తొలగించు",
"confirmations.delete_list.message": "మీరు ఖచ్చితంగా ఈ జాబితాను శాశ్వతంగా తొలగించాలనుకుంటున్నారా?",
- "confirmations.domain_block.confirm": "మొత్తం డొమైన్ను దాచు",
"confirmations.domain_block.message": "మీరు నిజంగా నిజంగా మొత్తం {domain} ని బ్లాక్ చేయాలనుకుంటున్నారా? చాలా సందర్భాలలో కొన్ని లక్ష్యంగా ఉన్న బ్లాక్స్ లేదా మ్యూట్స్ సరిపోతాయి మరియు ఉత్తమమైనవి. మీరు ఆ డొమైన్ నుండి కంటెంట్ను ఏ ప్రజా కాలక్రమాలలో లేదా మీ నోటిఫికేషన్లలో చూడలేరు. ఆ డొమైన్ నుండి మీ అనుచరులు తీసివేయబడతారు.",
"confirmations.mute.confirm": "మ్యూట్ చేయి",
- "confirmations.mute.message": "{name}ను మీరు ఖచ్చితంగా మ్యూట్ చేయాలనుకుంటున్నారా?",
"confirmations.redraft.confirm": "తొలగించు & తిరగరాయు",
"confirmations.reply.confirm": "ప్రత్యుత్తరమివ్వు",
"confirmations.reply.message": "ఇప్పుడే ప్రత్యుత్తరం ఇస్తే మీరు ప్రస్తుతం వ్రాస్తున్న సందేశం తిరగరాయబడుతుంది. మీరు ఖచ్చితంగా కొనసాగించాలనుకుంటున్నారా?",
@@ -133,7 +124,6 @@
"hashtag.column_settings.tag_mode.any": "వీటిలో ఏవైనా",
"hashtag.column_settings.tag_mode.none": "ఇవేవీ కావు",
"hashtag.column_settings.tag_toggle": "ఈ నిలువు వరుసలో మరికొన్ని ట్యాగులను చేర్చండి",
- "home.column_settings.basic": "ప్రాథమిక",
"home.column_settings.show_reblogs": "బూస్ట్ లను చూపించు",
"home.column_settings.show_replies": "ప్రత్యుత్తరాలను చూపించు",
"keyboard_shortcuts.back": "వెనక్కి తిరిగి వెళ్ళడానికి",
@@ -180,13 +170,11 @@
"lists.search": "మీరు అనుసరించే వ్యక్తులలో శోధించండి",
"lists.subheading": "మీ జాబితాలు",
"media_gallery.toggle_visible": "దృశ్యమానతను టోగుల్ చేయండి",
- "mute_modal.hide_notifications": "ఈ వినియోగదారు నుండి నోటిఫికేషన్లను దాచాలా?",
"navigation_bar.blocks": "బ్లాక్ చేయబడిన వినియోగదారులు",
"navigation_bar.community_timeline": "స్థానిక కాలక్రమం",
"navigation_bar.compose": "కొత్త టూట్ను రాయండి",
"navigation_bar.discover": "కనుగొను",
"navigation_bar.domain_blocks": "దాచిన డొమైన్లు",
- "navigation_bar.edit_profile": "ప్రొఫైల్ని సవరించండి",
"navigation_bar.filters": "మ్యూట్ చేయబడిన పదాలు",
"navigation_bar.follow_requests": "అనుసరించడానికి అభ్యర్ధనలు",
"navigation_bar.lists": "జాబితాలు",
@@ -205,8 +193,6 @@
"notifications.clear": "ప్రకటనలను తుడిచివేయు",
"notifications.clear_confirmation": "మీరు మీ అన్ని నోటిఫికేషన్లను శాశ్వతంగా తొలగించాలనుకుంటున్నారా?",
"notifications.column_settings.alert": "డెస్క్టాప్ నోటిఫికేషన్లు",
- "notifications.column_settings.filter_bar.advanced": "అన్ని విభాగాలను చూపించు",
- "notifications.column_settings.filter_bar.category": "క్విక్ ఫిల్టర్ బార్",
"notifications.column_settings.follow": "క్రొత్త అనుచరులు:",
"notifications.column_settings.mention": "ప్రస్తావనలు:",
"notifications.column_settings.poll": "ఎన్నిక ఫలితాలు:",
@@ -240,12 +226,7 @@
"poll_button.add_poll": "ఒక ఎన్నికను చేర్చు",
"poll_button.remove_poll": "ఎన్నికను తొలగించు",
"privacy.change": "స్టేటస్ గోప్యతను సర్దుబాటు చేయండి",
- "privacy.direct.long": "పేర్కొన్న వినియోగదారులకు మాత్రమే పోస్ట్ చేయి",
- "privacy.direct.short": "Direct",
- "privacy.private.long": "అనుచరులకు మాత్రమే పోస్ట్ చేయి",
- "privacy.private.short": "Followers-only",
"privacy.public.short": "ప్రజా",
- "privacy.unlisted.short": "జాబితా చేయబడనిది",
"regeneration_indicator.label": "లోడ్ అవుతోంది…",
"regeneration_indicator.sublabel": "మీ హోమ్ ఫీడ్ సిద్ధమవుతోంది!",
"relative_time.just_now": "ఇప్పుడు",
@@ -308,7 +289,6 @@
"upload_button.label": "మీడియాను జోడించండి (JPEG, PNG, GIF, WebM, MP4, MOV)",
"upload_form.audio_description": "Describe for people with hearing loss",
"upload_form.description": "దృష్టి లోపమున్న వారి కోసం వివరించండి",
- "upload_form.undo": "తొలగించు",
"upload_form.video_description": "Describe for people with hearing loss or visual impairment",
"upload_progress.label": "అప్లోడ్ అవుతోంది...",
"video.close": "వీడియోని మూసివేయి",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 65f27ef0618650..b1b9407ba11d9a 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -1,5 +1,5 @@
{
- "about.blocks": "เซิร์ฟเวอร์ที่มีการควบคุม",
+ "about.blocks": "เซิร์ฟเวอร์ที่มีการกลั่นกรอง",
"about.contact": "ติดต่อ:",
"about.disclaimer": "Mastodon เป็นซอฟต์แวร์เสรี โอเพนซอร์ส และเครื่องหมายการค้าของ Mastodon gGmbH",
"about.domain_blocks.no_reason_available": "เหตุผลไม่พร้อมใช้งาน",
@@ -89,7 +89,14 @@
"announcement.announcement": "ประกาศ",
"attachments_list.unprocessed": "(ยังไม่ได้ประมวลผล)",
"audio.hide": "ซ่อนเสียง",
- "autosuggest_hashtag.per_week": "{count} ต่อสัปดาห์",
+ "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": "ไม่สามารถแสดงผลหน้าที่ขอ ข้อผิดพลาดอาจเป็นเพราะข้อบกพร่องในโค้ดของเรา หรือปัญหาความเข้ากันได้ของเบราว์เซอร์",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "บัญชีของคุณไม่ได้ {locked} ใครก็ตามสามารถติดตามคุณเพื่อดูโพสต์สำหรับผู้ติดตามเท่านั้นของคุณ",
"compose_form.lock_disclaimer.lock": "ล็อคอยู่",
"compose_form.placeholder": "คุณกำลังคิดอะไรอยู่?",
- "compose_form.poll.add_option": "เพิ่มตัวเลือก",
"compose_form.poll.duration": "ระยะเวลาการสำรวจความคิดเห็น",
+ "compose_form.poll.multiple": "หลายตัวเลือก",
"compose_form.poll.option_placeholder": "ตัวเลือก {number}",
- "compose_form.poll.remove_option": "เอาตัวเลือกนี้ออก",
+ "compose_form.poll.single": "เลือกอย่างใดอย่างหนึ่ง",
"compose_form.poll.switch_to_multiple": "เปลี่ยนการสำรวจความคิดเห็นเป็นอนุญาตหลายตัวเลือก",
- "compose_form.poll.switch_to_single": "เปลี่ยนการสำรวจความคิดเห็นเป็นอนุญาตตัวเลือกเดี่ยว",
- "compose_form.publish": "เผยแพร่",
+ "compose_form.poll.switch_to_single": "เปลี่ยนการสำรวจความคิดเห็นเป็นอนุญาตตัวเลือกเดียว",
+ "compose_form.poll.type": "ลักษณะ",
+ "compose_form.publish": "โพสต์",
"compose_form.publish_form": "โพสต์ใหม่",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "บันทึกการเปลี่ยนแปลง",
- "compose_form.sensitive.hide": "{count, plural, other {ทำเครื่องหมายสื่อว่าละเอียดอ่อน}}",
- "compose_form.sensitive.marked": "{count, plural, other {มีการทำเครื่องหมายสื่อว่าละเอียดอ่อน}}",
- "compose_form.sensitive.unmarked": "{count, plural, other {ไม่มีการทำเครื่องหมายสื่อว่าละเอียดอ่อน}}",
+ "compose_form.reply": "ตอบกลับ",
+ "compose_form.save_changes": "อัปเดต",
"compose_form.spoiler.marked": "เอาคำเตือนเนื้อหาออก",
"compose_form.spoiler.unmarked": "เพิ่มคำเตือนเนื้อหา",
- "compose_form.spoiler_placeholder": "เขียนคำเตือนของคุณที่นี่",
+ "compose_form.spoiler_placeholder": "คำเตือนเนื้อหา (ไม่จำเป็น)",
"confirmation_modal.cancel": "ยกเลิก",
- "confirmations.block.block_and_report": "ปิดกั้นแล้วรายงาน",
"confirmations.block.confirm": "ปิดกั้น",
- "confirmations.block.message": "คุณแน่ใจหรือไม่ว่าต้องการปิดกั้น {name}?",
"confirmations.cancel_follow_request.confirm": "ถอนคำขอ",
"confirmations.cancel_follow_request.message": "คุณแน่ใจหรือไม่ว่าต้องการถอนคำขอเพื่อติดตาม {name} ของคุณ?",
"confirmations.delete.confirm": "ลบ",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "คุณแน่ใจหรือไม่ว่าต้องการลบรายการนี้อย่างถาวร?",
"confirmations.discard_edit_media.confirm": "ละทิ้ง",
"confirmations.discard_edit_media.message": "คุณมีการเปลี่ยนแปลงคำอธิบายหรือตัวอย่างสื่อที่ยังไม่ได้บันทึก ละทิ้งการเปลี่ยนแปลงเหล่านั้นต่อไป?",
- "confirmations.domain_block.confirm": "ปิดกั้นทั้งโดเมน",
+ "confirmations.domain_block.confirm": "ปิดกั้นเซิร์ฟเวอร์",
"confirmations.domain_block.message": "คุณแน่ใจจริง ๆ หรือไม่ว่าต้องการปิดกั้นทั้ง {domain}? ในกรณีส่วนใหญ่ การปิดกั้นหรือการซ่อนแบบกำหนดเป้าหมายไม่กี่รายการนั้นเพียงพอและเป็นที่นิยม คุณจะไม่เห็นเนื้อหาจากโดเมนนั้นในเส้นเวลาสาธารณะใด ๆ หรือการแจ้งเตือนของคุณ จะเอาผู้ติดตามของคุณจากโดเมนนั้นออก",
"confirmations.edit.confirm": "แก้ไข",
"confirmations.edit.message": "การแก้ไขในตอนนี้จะเขียนทับข้อความที่คุณกำลังเขียนในปัจจุบัน คุณแน่ใจหรือไม่ว่าต้องการดำเนินการต่อ?",
"confirmations.logout.confirm": "ออกจากระบบ",
"confirmations.logout.message": "คุณแน่ใจหรือไม่ว่าต้องการออกจากระบบ?",
"confirmations.mute.confirm": "ซ่อน",
- "confirmations.mute.explanation": "นี่จะซ่อนโพสต์จากเขาและโพสต์ที่กล่าวถึงเขา แต่จะยังคงอนุญาตให้เขาเห็นโพสต์ของคุณและติดตามคุณ",
- "confirmations.mute.message": "คุณแน่ใจหรือไม่ว่าต้องการซ่อน {name}?",
"confirmations.redraft.confirm": "ลบแล้วร่างใหม่",
"confirmations.redraft.message": "คุณแน่ใจหรือไม่ว่าต้องการลบโพสต์นี้แล้วร่างโพสต์ใหม่? รายการโปรดและการดันจะสูญหาย และการตอบกลับโพสต์ดั้งเดิมจะไม่มีความเกี่ยวพัน",
"confirmations.reply.confirm": "ตอบกลับ",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "นี่คือโพสต์จากทั่วทั้งเว็บสังคมที่กำลังได้รับความสนใจวันนี้ โพสต์ที่ใหม่กว่าที่มีการดันและรายการโปรดมากกว่าจะได้รับการจัดอันดับที่สูงกว่า",
"dismissable_banner.explore_tags": "นี่คือแฮชแท็กที่กำลังได้รับความสนใจในเว็บสังคมวันนี้ แฮชแท็กที่มีการใช้โดยผู้คนต่าง ๆ มากกว่าจะได้รับการจัดอันดับที่สูงกว่า",
"dismissable_banner.public_timeline": "นี่คือโพสต์สาธารณะล่าสุดจากผู้คนในเว็บสังคมที่ผู้คนใน {domain} ติดตาม",
+ "domain_block_modal.block": "ปิดกั้นเซิร์ฟเวอร์",
+ "domain_block_modal.block_account_instead": "ปิดกั้น @{name} แทน",
+ "domain_block_modal.they_can_interact_with_old_posts": "ผู้คนจากเซิร์ฟเวอร์นี้สามารถโต้ตอบกับโพสต์เก่า ๆ ของคุณ",
+ "domain_block_modal.they_cant_follow": "ไม่มีใครจากเซิร์ฟเวอร์นี้สามารถติดตามคุณ",
+ "domain_block_modal.they_wont_know": "เขาจะไม่ทราบว่ามีการปิดกั้นเขา",
+ "domain_block_modal.title": "ปิดกั้นโดเมน?",
+ "domain_block_modal.you_will_lose_followers": "จะเอาผู้ติดตามทั้งหมดของคุณจากเซิร์ฟเวอร์นี้ออก",
+ "domain_block_modal.you_wont_see_posts": "คุณจะไม่เห็นโพสต์หรือการแจ้งเตือนจากผู้ใช้ในเซิร์ฟเวอร์นี้",
+ "domain_pill.activitypub_lets_connect": "โปรโตคอลช่วยให้คุณเชื่อมต่อและโต้ตอบกับผู้คนไม่ใช่แค่ใน Mastodon แต่ทั่วทั้งแอปสังคมต่าง ๆ เช่นกัน",
+ "domain_pill.activitypub_like_language": "ActivityPub เป็นเหมือนภาษาที่ Mastodon พูดกับเครือข่ายสังคมอื่น ๆ",
+ "domain_pill.server": "เซิร์ฟเวอร์",
+ "domain_pill.their_handle": "นามของเขา:",
+ "domain_pill.their_server": "บ้านดิจิทัลของเขา ที่ซึ่งโพสต์ทั้งหมดของเขาอาศัยอยู่",
+ "domain_pill.their_username": "ตัวระบุที่ไม่ซ้ำกันของเขาในเซิร์ฟเวอร์ของเขา เป็นไปได้ที่จะค้นหาผู้ใช้ที่มีชื่อผู้ใช้เดียวกันในเซิร์ฟเวอร์ที่แตกต่างกัน",
+ "domain_pill.username": "ชื่อผู้ใช้",
+ "domain_pill.whats_in_a_handle": "ในนามมีอะไรอยู่?",
+ "domain_pill.who_they_are": "เนื่องจากนามบอกว่าใครสักคนคือใครและเขาอยู่ที่ไหน คุณสามารถโต้ตอบกับผู้คนทั่วทั้งเว็บสังคมของ ",
+ "domain_pill.who_you_are": "เนื่องจากนามของคุณบอกว่าคุณคือใครและคุณอยู่ที่ไหน ผู้คนสามารถโต้ตอบกับคุณทั่วทั้งเว็บสังคมของ ",
+ "domain_pill.your_handle": "นามของคุณ:",
+ "domain_pill.your_server": "บ้านดิจิทัลของคุณ ที่ซึ่งโพสต์ทั้งหมดของคุณอาศัยอยู่ ไม่ชอบเซิร์ฟเวอร์นี้? ถ่ายโอนเซิร์ฟเวอร์เมื่อใดก็ได้และนำผู้ติดตามของคุณไปด้วยเช่นกัน",
+ "domain_pill.your_username": "ตัวระบุที่ไม่ซ้ำกันของคุณในเซิร์ฟเวอร์นี้ เป็นไปได้ที่จะค้นหาผู้ใช้ที่มีชื่อผู้ใช้เดียวกันในเซิร์ฟเวอร์ที่แตกต่างกัน",
"embed.instructions": "ฝังโพสต์นี้ในเว็บไซต์ของคุณโดยคัดลอกโค้ดด้านล่าง",
"embed.preview": "นี่คือลักษณะของการฝังที่จะปรากฏ:",
"emoji_button.activity": "กิจกรรม",
@@ -244,6 +266,7 @@
"empty_column.list": "ยังไม่มีสิ่งใดในรายการนี้ เมื่อสมาชิกของรายการนี้โพสต์โพสต์ใหม่ โพสต์จะปรากฏที่นี่",
"empty_column.lists": "คุณยังไม่มีรายการใด ๆ เมื่อคุณสร้างรายการ รายการจะปรากฏที่นี่",
"empty_column.mutes": "คุณยังไม่ได้ซ่อนผู้ใช้ใด ๆ",
+ "empty_column.notification_requests": "โล่งทั้งหมด! ไม่มีสิ่งใดที่นี่ เมื่อคุณได้รับการแจ้งเตือนใหม่ การแจ้งเตือนจะปรากฏที่นี่ตามการตั้งค่าของคุณ",
"empty_column.notifications": "คุณยังไม่มีการแจ้งเตือนใด ๆ เมื่อผู้คนอื่น ๆ โต้ตอบกับคุณ คุณจะเห็นการแจ้งเตือนที่นี่",
"empty_column.public": "ไม่มีสิ่งใดที่นี่! เขียนบางอย่างเป็นสาธารณะ หรือติดตามผู้ใช้จากเซิร์ฟเวอร์อื่น ๆ ด้วยตนเองเพื่อเติมเส้นเวลาให้เต็ม",
"error.unexpected_crash.explanation": "เนื่องจากข้อบกพร่องในโค้ดของเราหรือปัญหาความเข้ากันได้ของเบราว์เซอร์ จึงไม่สามารถแสดงหน้านี้ได้อย่างถูกต้อง",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "ใช้หมวดหมู่ที่มีอยู่หรือสร้างหมวดหมู่ใหม่",
"filter_modal.select_filter.title": "กรองโพสต์นี้",
"filter_modal.title.status": "กรองโพสต์",
+ "filtered_notifications_banner.mentions": "{count, plural, other {การกล่าวถึง}}",
+ "filtered_notifications_banner.pending_requests": "การแจ้งเตือนจาก {count, plural, =0 {ไม่มีใคร} other {# คน}} ที่คุณอาจรู้จัก",
+ "filtered_notifications_banner.title": "การแจ้งเตือนที่กรองอยู่",
"firehose.all": "ทั้งหมด",
"firehose.local": "เซิร์ฟเวอร์นี้",
"firehose.remote": "เซิร์ฟเวอร์อื่น ๆ",
"follow_request.authorize": "อนุญาต",
"follow_request.reject": "ปฏิเสธ",
"follow_requests.unlocked_explanation": "แม้ว่าไม่มีการล็อคบัญชีของคุณ พนักงานของ {domain} คิดว่าคุณอาจต้องการตรวจทานคำขอติดตามจากบัญชีเหล่านี้ด้วยตนเอง",
+ "follow_suggestions.curated_suggestion": "คัดสรรโดยพนักงาน",
+ "follow_suggestions.dismiss": "ไม่ต้องแสดงอีก",
+ "follow_suggestions.featured_longer": "คัดสรรโดยทีม {domain}",
+ "follow_suggestions.friends_of_friends_longer": "เป็นที่นิยมในหมู่ผู้คนที่คุณติดตาม",
+ "follow_suggestions.hints.featured": "โปรไฟล์นี้ได้รับการคัดสรรโดยทีม {domain}",
+ "follow_suggestions.hints.friends_of_friends": "โปรไฟล์นี้เป็นที่นิยมในหมู่ผู้คนที่คุณติดตาม",
+ "follow_suggestions.hints.most_followed": "โปรไฟล์นี้เป็นหนึ่งในโปรไฟล์ที่ได้รับการติดตามมากที่สุดใน {domain}",
+ "follow_suggestions.hints.most_interactions": "โปรไฟล์นี้เพิ่งได้รับความสนใจอย่างมากใน {domain}",
+ "follow_suggestions.hints.similar_to_recently_followed": "โปรไฟล์นี้คล้ายกับโปรไฟล์ที่คุณได้ติดตามล่าสุด",
+ "follow_suggestions.personalized_suggestion": "ข้อเสนอแนะเฉพาะบุคคล",
+ "follow_suggestions.popular_suggestion": "ข้อเสนอแนะยอดนิยม",
+ "follow_suggestions.popular_suggestion_longer": "เป็นที่นิยมใน {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "คล้ายกับโปรไฟล์ที่คุณได้ติดตามล่าสุด",
+ "follow_suggestions.view_all": "ดูทั้งหมด",
+ "follow_suggestions.who_to_follow": "ติดตามใครดี",
"followed_tags": "แฮชแท็กที่ติดตาม",
"footer.about": "เกี่ยวกับ",
"footer.directory": "ไดเรกทอรีโปรไฟล์",
@@ -306,13 +347,8 @@
"hashtag.follow": "ติดตามแฮชแท็ก",
"hashtag.unfollow": "เลิกติดตามแฮชแท็ก",
"hashtags.and_other": "…และอีก {count, plural, other {# เพิ่มเติม}}",
- "home.actions.go_to_explore": "ดูสิ่งที่กำลังนิยม",
- "home.actions.go_to_suggestions": "ค้นหาผู้คนที่จะติดตาม",
- "home.column_settings.basic": "พื้นฐาน",
"home.column_settings.show_reblogs": "แสดงการดัน",
"home.column_settings.show_replies": "แสดงการตอบกลับ",
- "home.explore_prompt.body": "ฟีดหน้าแรกของคุณจะมีการผสมผสานของโพสต์จากแฮชแท็กที่คุณได้เลือกติดตาม, ผู้คนที่คุณได้เลือกติดตาม และโพสต์ที่เขาดัน หากนั่นรู้สึกเงียบเกินไป คุณอาจต้องการ:",
- "home.explore_prompt.title": "นี่คือฐานหน้าแรกของคุณภายใน Mastodon",
"home.hide_announcements": "ซ่อนประกาศ",
"home.pending_critical_update.body": "โปรดอัปเดตเซิร์ฟเวอร์ Mastodon ของคุณโดยเร็วที่สุดเท่าที่จะเป็นไปได้!",
"home.pending_critical_update.link": "ดูการอัปเดต",
@@ -376,7 +412,7 @@
"lightbox.next": "ถัดไป",
"lightbox.previous": "ก่อนหน้า",
"limited_account_hint.action": "แสดงโปรไฟล์ต่อไป",
- "limited_account_hint.title": "มีการซ่อนโปรไฟล์นี้โดยผู้ควบคุมของ {domain}",
+ "limited_account_hint.title": "มีการซ่อนโปรไฟล์นี้โดยผู้กลั่นกรองของ {domain}",
"link_preview.author": "โดย {name}",
"lists.account.add": "เพิ่มไปยังรายการ",
"lists.account.remove": "เอาออกจากรายการ",
@@ -396,9 +432,15 @@
"loading_indicator.label": "กำลังโหลด…",
"media_gallery.toggle_visible": "{number, plural, other {ซ่อนภาพ}}",
"moved_to_account_banner.text": "มีการปิดใช้งานบัญชีของคุณ {disabledAccount} ในปัจจุบันเนื่องจากคุณได้ย้ายไปยัง {movedToAccount}",
- "mute_modal.duration": "ระยะเวลา",
- "mute_modal.hide_notifications": "ซ่อนการแจ้งเตือนจากผู้ใช้นี้?",
- "mute_modal.indefinite": "ไม่มีกำหนด",
+ "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": "ผู้ใช้ที่ปิดกั้นอยู่",
@@ -408,7 +450,6 @@
"navigation_bar.direct": "การกล่าวถึงแบบส่วนตัว",
"navigation_bar.discover": "ค้นพบ",
"navigation_bar.domain_blocks": "โดเมนที่ปิดกั้นอยู่",
- "navigation_bar.edit_profile": "แก้ไขโปรไฟล์",
"navigation_bar.explore": "สำรวจ",
"navigation_bar.favourites": "รายการโปรด",
"navigation_bar.filters": "คำที่ซ่อนอยู่",
@@ -432,11 +473,29 @@
"notification.follow": "{name} ได้ติดตามคุณ",
"notification.follow_request": "{name} ได้ขอติดตามคุณ",
"notification.mention": "{name} ได้กล่าวถึงคุณ",
+ "notification.moderation-warning.learn_more": "เรียนรู้เพิ่มเติม",
+ "notification.moderation_warning": "คุณได้รับคำเตือนการกลั่นกรอง",
+ "notification.moderation_warning.action_delete_statuses": "เอาโพสต์บางส่วนของคุณออกแล้ว",
+ "notification.moderation_warning.action_disable": "ปิดใช้งานบัญชีของคุณแล้ว",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "ทำเครื่องหมายโพสต์บางส่วนของคุณว่าละเอียดอ่อนแล้ว",
+ "notification.moderation_warning.action_none": "บัญชีของคุณได้รับคำเตือนการกลั่นกรอง",
+ "notification.moderation_warning.action_sensitive": "จะทำเครื่องหมายโพสต์ของคุณว่าละเอียดอ่อนนับจากนี้ไป",
+ "notification.moderation_warning.action_silence": "จำกัดบัญชีของคุณแล้ว",
+ "notification.moderation_warning.action_suspend": "ระงับบัญชีของคุณแล้ว",
"notification.own_poll": "การสำรวจความคิดเห็นของคุณได้สิ้นสุดแล้ว",
"notification.poll": "การสำรวจความคิดเห็นที่คุณได้ลงคะแนนได้สิ้นสุดแล้ว",
"notification.reblog": "{name} ได้ดันโพสต์ของคุณ",
+ "notification.relationships_severance_event": "สูญเสียการเชื่อมต่อกับ {name}",
+ "notification.relationships_severance_event.account_suspension": "ผู้ดูแลจาก {from} ได้ระงับ {target} ซึ่งหมายความว่าคุณจะไม่สามารถรับการอัปเดตจากเขาหรือโต้ตอบกับเขาได้อีกต่อไป",
+ "notification.relationships_severance_event.domain_block": "ผู้ดูแลจาก {from} ได้ปิดกั้น {target} รวมถึง {followersCount} ผู้ติดตามของคุณและ {followingCount, plural, other {# บัญชี}}ที่คุณติดตาม",
+ "notification.relationships_severance_event.learn_more": "เรียนรู้เพิ่มเติม",
+ "notification.relationships_severance_event.user_domain_block": "คุณได้ปิดกั้น {target} เอา {followersCount} ผู้ติดตามของคุณและ {followingCount, plural, other {# บัญชี}}ที่คุณติดตามออก",
"notification.status": "{name} เพิ่งโพสต์",
"notification.update": "{name} ได้แก้ไขโพสต์",
+ "notification_requests.accept": "ยอมรับ",
+ "notification_requests.dismiss": "ปิด",
+ "notification_requests.notifications_from": "การแจ้งเตือนจาก {name}",
+ "notification_requests.title": "การแจ้งเตือนที่กรองอยู่",
"notifications.clear": "ล้างการแจ้งเตือน",
"notifications.clear_confirmation": "คุณแน่ใจหรือไม่ว่าต้องการล้างการแจ้งเตือนทั้งหมดของคุณอย่างถาวร?",
"notifications.column_settings.admin.report": "รายงานใหม่:",
@@ -445,7 +504,6 @@
"notifications.column_settings.favourite": "รายการโปรด:",
"notifications.column_settings.filter_bar.advanced": "แสดงหมวดหมู่ทั้งหมด",
"notifications.column_settings.filter_bar.category": "แถบตัวกรองด่วน",
- "notifications.column_settings.filter_bar.show_bar": "แสดงแถบตัวกรอง",
"notifications.column_settings.follow": "ผู้ติดตามใหม่:",
"notifications.column_settings.follow_request": "คำขอติดตามใหม่:",
"notifications.column_settings.mention": "การกล่าวถึง:",
@@ -471,6 +529,15 @@
"notifications.permission_denied": "การแจ้งเตือนบนเดสก์ท็อปไม่พร้อมใช้งานเนื่องจากมีการปฏิเสธคำขอสิทธิอนุญาตเบราว์เซอร์ก่อนหน้านี้",
"notifications.permission_denied_alert": "ไม่สามารถเปิดใช้งานการแจ้งเตือนบนเดสก์ท็อป เนื่องจากมีการปฏิเสธสิทธิอนุญาตเบราว์เซอร์ก่อนหน้านี้",
"notifications.permission_required": "การแจ้งเตือนบนเดสก์ท็อปไม่พร้อมใช้งานเนื่องจากไม่ได้ให้สิทธิอนุญาตที่จำเป็น",
+ "notifications.policy.filter_new_accounts.hint": "สร้างขึ้นภายใน {days, plural, other {# วัน}}ที่ผ่านมา",
+ "notifications.policy.filter_new_accounts_title": "บัญชีใหม่",
+ "notifications.policy.filter_not_followers_hint": "รวมถึงผู้คนที่ได้ติดตามคุณน้อยกว่า {days, plural, other {# วัน}}",
+ "notifications.policy.filter_not_followers_title": "ผู้คนที่ไม่ได้ติดตามคุณ",
+ "notifications.policy.filter_not_following_hint": "จนกว่าคุณจะอนุมัติเขาด้วยตนเอง",
+ "notifications.policy.filter_not_following_title": "ผู้คนที่คุณไม่ได้ติดตาม",
+ "notifications.policy.filter_private_mentions_hint": "กรองไว้เว้นแต่การกล่าวถึงแบบส่วนตัวอยู่ในการตอบกลับการกล่าวถึงของคุณเองหรือหากคุณติดตามผู้ส่ง",
+ "notifications.policy.filter_private_mentions_title": "การกล่าวถึงแบบส่วนตัวที่ไม่พึงประสงค์",
+ "notifications.policy.title": "กรองการแจ้งเตือนจาก…",
"notifications_permission_banner.enable": "เปิดใช้งานการแจ้งเตือนบนเดสก์ท็อป",
"notifications_permission_banner.how_to_control": "เพื่อรับการแจ้งเตือนเมื่อ Mastodon ไม่ได้เปิด เปิดใช้งานการแจ้งเตือนบนเดสก์ท็อป คุณสามารถควบคุมชนิดของการโต้ตอบที่สร้างการแจ้งเตือนบนเดสก์ท็อปได้อย่างแม่นยำผ่านปุ่ม {icon} ด้านบนเมื่อเปิดใช้งานการแจ้งเตือน",
"notifications_permission_banner.title": "ไม่พลาดสิ่งใด",
@@ -526,14 +593,15 @@
"poll_button.add_poll": "เพิ่มการสำรวจความคิดเห็น",
"poll_button.remove_poll": "เอาการสำรวจความคิดเห็นออก",
"privacy.change": "เปลี่ยนความเป็นส่วนตัวของโพสต์",
- "privacy.direct.long": "ปรากฏแก่ผู้ใช้ที่กล่าวถึงเท่านั้น",
- "privacy.direct.short": "ผู้คนที่กล่าวถึงเท่านั้น",
- "privacy.private.long": "ปรากฏแก่ผู้ติดตามเท่านั้น",
- "privacy.private.short": "ผู้ติดตามเท่านั้น",
- "privacy.public.long": "ปรากฏแก่ทั้งหมด",
+ "privacy.direct.long": "ทุกคนที่กล่าวถึงในโพสต์",
+ "privacy.direct.short": "ผู้คนที่เฉพาะเจาะจง",
+ "privacy.private.long": "เฉพาะผู้ติดตามของคุณเท่านั้น",
+ "privacy.private.short": "ผู้ติดตาม",
+ "privacy.public.long": "ใครก็ตามที่อยู่ในและนอก Mastodon",
"privacy.public.short": "สาธารณะ",
- "privacy.unlisted.long": "ปรากฏแก่ทั้งหมด แต่เลือกไม่รับคุณลักษณะการค้นพบ",
- "privacy.unlisted.short": "ไม่อยู่ในรายการ",
+ "privacy.unlisted.additional": "สิ่งนี้ทำงานเหมือนกับสาธารณะทุกประการ ยกเว้นโพสต์จะไม่ปรากฏในฟีดสดหรือแฮชแท็ก, การสำรวจ หรือการค้นหา Mastodon แม้ว่าคุณได้เลือกรับทั่วทั้งบัญชีก็ตาม",
+ "privacy.unlisted.long": "การประโคมอัลกอริทึมที่น้อยลง",
+ "privacy.unlisted.short": "สาธารณะแบบเงียบ",
"privacy_policy.last_updated": "อัปเดตล่าสุดเมื่อ {date}",
"privacy_policy.title": "นโยบายความเป็นส่วนตัว",
"recommended": "แนะนำ",
@@ -551,7 +619,9 @@
"relative_time.minutes": "{number} นาที",
"relative_time.seconds": "{number} วินาที",
"relative_time.today": "วันนี้",
+ "reply_indicator.attachments": "{count, plural, other {# ไฟล์แนบ}}",
"reply_indicator.cancel": "ยกเลิก",
+ "reply_indicator.poll": "การสำรวจความคิดเห็น",
"report.block": "ปิดกั้น",
"report.block_explanation": "คุณจะไม่เห็นโพสต์ของเขา เขาจะไม่สามารถเห็นโพสต์ของคุณหรือติดตามคุณ เขาจะสามารถบอกได้ว่ามีการปิดกั้นเขา",
"report.categories.legal": "กฎหมาย",
@@ -631,9 +701,9 @@
"sign_in_banner.sign_in": "เข้าสู่ระบบ",
"sign_in_banner.sso_redirect": "เข้าสู่ระบบหรือลงทะเบียน",
"sign_in_banner.text": "เข้าสู่ระบบเพื่อติดตามโปรไฟล์หรือแฮชแท็ก ชื่นชอบ แชร์ และตอบกลับโพสต์ คุณยังสามารถโต้ตอบจากบัญชีของคุณในเซิร์ฟเวอร์อื่น",
- "status.admin_account": "เปิดส่วนติดต่อการควบคุมสำหรับ @{name}",
- "status.admin_domain": "เปิดส่วนติดต่อการควบคุมสำหรับ {domain}",
- "status.admin_status": "เปิดโพสต์นี้ในส่วนติดต่อการควบคุม",
+ "status.admin_account": "เปิดส่วนติดต่อการกลั่นกรองสำหรับ @{name}",
+ "status.admin_domain": "เปิดส่วนติดต่อการกลั่นกรองสำหรับ {domain}",
+ "status.admin_status": "เปิดโพสต์นี้ในส่วนติดต่อการกลั่นกรอง",
"status.block": "ปิดกั้น @{name}",
"status.bookmark": "เพิ่มที่คั่นหน้า",
"status.cancel_reblog_private": "เลิกดัน",
@@ -644,10 +714,11 @@
"status.direct": "กล่าวถึง @{name} แบบส่วนตัว",
"status.direct_indicator": "การกล่าวถึงแบบส่วนตัว",
"status.edit": "แก้ไข",
- "status.edited": "แก้ไขเมื่อ {date}",
+ "status.edited": "แก้ไขล่าสุดเมื่อ {date}",
"status.edited_x_times": "แก้ไข {count, plural, other {{count} ครั้ง}}",
"status.embed": "ฝัง",
"status.favourite": "ชื่นชอบ",
+ "status.favourites": "{count, plural, other {รายการโปรด}}",
"status.filter": "กรองโพสต์นี้",
"status.filtered": "กรองอยู่",
"status.hide": "ซ่อนโพสต์",
@@ -668,6 +739,7 @@
"status.reblog": "ดัน",
"status.reblog_private": "ดันด้วยการมองเห็นดั้งเดิม",
"status.reblogged_by": "{name} ได้ดัน",
+ "status.reblogs": "{count, plural, other {การดัน}}",
"status.reblogs.empty": "ยังไม่มีใครดันโพสต์นี้ เมื่อใครสักคนดัน เขาจะปรากฏที่นี่",
"status.redraft": "ลบแล้วร่างใหม่",
"status.remove_bookmark": "เอาที่คั่นหน้าออก",
@@ -715,10 +787,8 @@
"upload_error.poll": "ไม่อนุญาตการอัปโหลดไฟล์โดยมีการสำรวจความคิดเห็น",
"upload_form.audio_description": "อธิบายสำหรับผู้ที่สูญเสียการได้ยิน",
"upload_form.description": "อธิบายสำหรับผู้คนที่พิการทางการมองเห็นหรือมีสายตาเลือนราง",
- "upload_form.description_missing": "ไม่ได้เพิ่มคำอธิบาย",
"upload_form.edit": "แก้ไข",
"upload_form.thumbnail": "เปลี่ยนภาพขนาดย่อ",
- "upload_form.undo": "ลบ",
"upload_form.video_description": "อธิบายสำหรับผู้คนที่พิการทางการได้ยิน ได้ยินไม่ชัด พิการทางการมองเห็น หรือมีสายตาเลือนราง",
"upload_modal.analyzing_picture": "กำลังวิเคราะห์รูปภาพ…",
"upload_modal.apply": "นำไปใช้",
diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
new file mode 100644
index 00000000000000..80d412a20bc35a
--- /dev/null
+++ b/app/javascript/mastodon/locales/tok.json
@@ -0,0 +1,405 @@
+{
+ "about.blocks": "ma lawa",
+ "about.contact": "toki:",
+ "about.domain_blocks.no_reason_available": "mi sona ala e tan",
+ "about.domain_blocks.preamble": "ilo Masoton li ken e ni: sina lukin e toki jan pi ma ilo mute. sina ken toki tawa ona lon kulupu ma. taso, ma ni li ken ala e ni tawa ma ni:",
+ "about.domain_blocks.silenced.explanation": "sina lukin ala e toki e jan tan ma ni. taso, sina wile la, sina ken ni.",
+ "about.domain_blocks.silenced.title": "ken lili lukin",
+ "about.domain_blocks.suspended.title": "weka",
+ "about.not_available": "lon kulupu ni la sina ken alasa ala e sona ni.",
+ "about.rules": "lawa kulupu",
+ "account.account_note_header": "sona awen",
+ "account.add_or_remove_from_list": "o ante e lipu jan",
+ "account.badges.bot": "ilo nanpa li lawa e ni",
+ "account.badges.group": "kulupu",
+ "account.block": "o weka e @{name}",
+ "account.block_domain": "o weka e ma {domain}",
+ "account.block_short": "o weka e jan tawa mi",
+ "account.blocked": "jan li weka tawa mi",
+ "account.browse_more_on_origin_server": "sina tawa ma tan pi jan ni la sina ken lukin e mute",
+ "account.cancel_follow_request": "o pini kute",
+ "account.copy": "o pali same e linja pi lipu jan",
+ "account.direct": "len la o mu e @{name}",
+ "account.disable_notifications": "@{name} li toki la o mu ala e mi",
+ "account.domain_blocked": "ma ni li weka tawa sina",
+ "account.edit_profile": "o ante e lipu mi",
+ "account.enable_notifications": "@{name} li toki la o toki e toki ona tawa mi",
+ "account.endorse": "lipu jan la o suli e ni",
+ "account.featured_tags.last_status_at": "sitelen pini pi jan ni li lon tenpo {date}",
+ "account.featured_tags.last_status_never": "toki ala li lon",
+ "account.follow": "o kute",
+ "account.follow_back": "jan ni li kute e sina. o kute",
+ "account.followers": "jan kute",
+ "account.followers.empty": "jan ala li kute e jan ni",
+ "account.following": "sina kute e jan ni",
+ "account.follows.empty": "jan ni li kute e jan ala",
+ "account.go_to_profile": "o tawa lipu jan",
+ "account.hide_reblogs": "o lukin ala e pana toki tan @{name}",
+ "account.in_memoriam": "jan ni li moli. pona o tawa ona.",
+ "account.joined_short": "li kama",
+ "account.languages": "sina wile lukin e sitelen pi toki seme",
+ "account.locked_info": "sina wile kute e jan ni la ona o toki e ken",
+ "account.media": "sitelen",
+ "account.mention": "o toki e jan @{name}",
+ "account.moved_to": "lipu jan sin pi jan {name} li ni:",
+ "account.mute": "o len e @{name}",
+ "account.mute_notifications_short": "o kute ala e mu tan jan ni",
+ "account.mute_short": "o kute ala",
+ "account.muted": "sina len e jan ni",
+ "account.no_bio": "lipu li weka",
+ "account.open_original_page": "o open e lipu open",
+ "account.posts": "toki suli",
+ "account.posts_with_replies": "toki ale",
+ "account.report": "jan @{name} la o toki tawa lawa",
+ "account.requested": "jan ni o ken e kute sina. sina pini wile kute la o luka e ni",
+ "account.requested_follow": "{name} li wile kute e sina",
+ "account.share": "o pana e lipu jan @{name}",
+ "account.show_reblogs": "o lukin e pana toki tan @{name}",
+ "account.unblock": "o weka ala e jan {name}",
+ "account.unblock_domain": "o weka ala e ma {domain}",
+ "account.unblock_short": "o pini weka",
+ "account.unendorse": "lipu jan la o suli ala e ni",
+ "account.unfollow": "o pini kute",
+ "account.unmute": "o len ala e @{name}",
+ "account.unmute_notifications_short": "o kute e mu tan jan ni",
+ "account.unmute_short": "o len ala",
+ "admin.dashboard.retention.average": "sama",
+ "admin.dashboard.retention.cohort": "tenpo mun open",
+ "admin.dashboard.retention.cohort_size": "jan sin",
+ "alert.rate_limited.message": "tenpo {retry_time, time, medium} la o pali awen",
+ "alert.unexpected.message": "pakala li lon",
+ "alert.unexpected.title": "pakala a!",
+ "announcement.announcement": "toki suli",
+ "audio.hide": "o len e kalama",
+ "block_modal.show_less": "o lili e lukin",
+ "block_modal.show_more": "o mute e lukin",
+ "block_modal.they_cant_mention": "ona li ken ala toki e sina li ken ala alasa e sina",
+ "block_modal.title": "o weka ala weka e jan",
+ "boost_modal.combo": "sina ken luka e nena {combo} tawa ni: sina wile ala luka e nena lon tenpo kama",
+ "bundle_column_error.copy_stacktrace": "o awen e sona pakala lon ilo sina",
+ "bundle_column_error.error.body": "ilo li ken ala pana e lipu ni. ni li ken tan pakala ilo.",
+ "bundle_column_error.error.title": "ike a!",
+ "bundle_column_error.network.title": "pakala la ilo sina li toki ala tawa ilo ante",
+ "bundle_column_error.retry": "o ni sin",
+ "bundle_column_error.return": "o tawa tomo",
+ "bundle_column_error.routing.body": "ilo li sona ala e lipu wile. sina pana ala pana e nasin pona tawa lipu?",
+ "bundle_column_error.routing.title": "pakala nanpa 404",
+ "bundle_modal_error.close": "o pini",
+ "bundle_modal_error.message": "ilo li wile kama e ijo ni, taso pakala li lon.",
+ "bundle_modal_error.retry": "o ni sin",
+ "closed_registrations_modal.find_another_server": "o alasa e ma ante",
+ "column.about": "sona",
+ "column.blocks": "kulupu pi jan weka",
+ "column.bookmarks": "awen toki",
+ "column.community": "linja tenpo pi ma ni",
+ "column.favourites": "ijo pona",
+ "column.firehose": "toki pi tenpo ni",
+ "column.follow_requests": "wile alasa pi jan ante",
+ "column.home": "lipu open",
+ "column.lists": "kulupu lipu",
+ "column.mutes": "jan len",
+ "column.pins": "toki sewi",
+ "column_back_button.label": "o tawa monsi",
+ "column_header.hide_settings": "o len e lawa",
+ "column_header.pin": "o sewi",
+ "column_header.show_settings": "o lukin e lawa",
+ "column_header.unpin": "o sewi ala",
+ "column_subheading.settings": "ken ilo",
+ "community.column_settings.local_only": "toki tan ni taso",
+ "community.column_settings.media_only": "sitelen taso",
+ "community.column_settings.remote_only": "toki tan ante taso",
+ "compose.language.change": "o ante e nasin toki",
+ "compose.language.search": "o alasa e nasin toki...",
+ "compose.published.body": "toki li pana.",
+ "compose.published.open": "o lukin",
+ "compose.saved.body": "ilo li awen e ijo pana sina.",
+ "compose_form.direct_message_warning_learn_more": "o kama sona e ijo ante",
+ "compose_form.encryption_warning": "toki li len ala lon ilo Masoton ꞏ o pana ala e sona suli len lon ilo Masoton",
+ "compose_form.placeholder": "sina wile toki e seme?",
+ "compose_form.poll.duration": "tenpo pana",
+ "compose_form.poll.multiple": "pana mute",
+ "compose_form.poll.option_placeholder": "ken nanpa {number}",
+ "compose_form.poll.single": "pana pi wan taso",
+ "compose_form.poll.switch_to_multiple": "o ante e nasin pana. pana mute o ken",
+ "compose_form.poll.switch_to_single": "o ante e nasin pana. pana wan taso o lon",
+ "compose_form.poll.type": "nasin",
+ "compose_form.publish": "o toki",
+ "compose_form.publish_form": "o open toki sin",
+ "compose_form.reply": "o toki lon ijo ni",
+ "compose_form.save_changes": "o sin e ni",
+ "compose_form.spoiler.marked": "o weka e toki pi ijo ike ken",
+ "confirmation_modal.cancel": "o pini",
+ "confirmations.block.confirm": "o weka",
+ "confirmations.cancel_follow_request.confirm": "o weka e wile sina",
+ "confirmations.cancel_follow_request.message": "sina awen ala awen wile weka e wile kute sina lon {name}?",
+ "confirmations.delete.confirm": "o weka",
+ "confirmations.delete.message": "sina wile ala wile weka e toki ni?",
+ "confirmations.delete_list.confirm": "o weka",
+ "confirmations.delete_list.message": "sina wile ala wile weka e lipu ni?",
+ "confirmations.discard_edit_media.confirm": "o weka",
+ "confirmations.discard_edit_media.message": "toki sitelen anu lukin lili sitelen la ante pi awen ala li lon. sina wile weka e ante ni?",
+ "confirmations.domain_block.message": "sina wile ala a wile a len e ma {domain} ꞏ ken suli la len jan taso li pona ꞏ len pi ma ni la sina ken ala lukin e ijo pi ma ni lon lipu toki ale anu lukin toki ꞏ len ni la jan kute sina pi ma ni li weka",
+ "confirmations.edit.confirm": "o ante",
+ "confirmations.edit.message": "sina ante e toki sina la toki pali sina li weka. sina wile ala wile e ni?",
+ "confirmations.logout.confirm": "o weka",
+ "confirmations.logout.message": "sina wile ala wile weka",
+ "confirmations.mute.confirm": "o len",
+ "confirmations.redraft.confirm": "o weka o pali sin e toki",
+ "confirmations.redraft.message": "pali sin e toki ni la sina wile ala wile weka e ona? sina ni la suli pi toki ni en wawa pi toki ni li weka. kin la toki lon toki ni li jo e mama ala.",
+ "confirmations.reply.confirm": "toki lon toki ni",
+ "confirmations.reply.message": "sina toki lon toki ni la toki pali sina li weka. sina wile ala wile e ni?",
+ "confirmations.unfollow.confirm": "o pini kute",
+ "confirmations.unfollow.message": "sina o wile ala wile pini kute e jan {name}?",
+ "conversation.delete": "o weka e toki ni",
+ "conversation.mark_as_read": "ni o sin ala",
+ "conversation.open": "o lukin e toki",
+ "conversation.with": "lon {names}",
+ "copy_icon_button.copied": "toki li awen lon ilo sina",
+ "copypaste.copy_to_clipboard": "o awen lon ilo sina",
+ "directory.local": "tan {domain} taso",
+ "directory.new_arrivals": "jan pi kama sin",
+ "directory.recently_active": "jan lon tenpo poka",
+ "disabled_account_banner.account_settings": "wile pi lipu jan",
+ "disabled_account_banner.text": "sina ken ala kepeken e lipu jan sina pi nimi {disabledAccount}.",
+ "dismissable_banner.community_timeline": "ni li toki pi tenpo poka tawa ale tan jan lon ma lawa pi nimi {domain}.",
+ "dismissable_banner.dismiss": "o weka",
+ "dismissable_banner.explore_links": "ni li toki pi ijo sin ꞏ jan mute li pana e ni lon tenpo suno ni ꞏ sin la jan mute li pana la ni li kama suli",
+ "dismissable_banner.explore_statuses": "suni ni la jan mute li lukin e toki ni. jan mute li wawa e toki li suli e toki la toki ni li lon sewi. toki li sin la toki ni li lon sewi.",
+ "dismissable_banner.explore_tags": "suni ni la jan mute li lukin e toki pi toki ni. jan mute li kepeken toki la toki ni li lon sewi.",
+ "dismissable_banner.public_timeline": "toki ni li sin. jan li pali e toki ni la jan ante mute pi ma {domain} li kute e jan ni.",
+ "domain_block_modal.block": "o weka e ma",
+ "domain_block_modal.you_will_lose_followers": "ma ni la jan alasa ale sina li weka",
+ "domain_block_modal.you_wont_see_posts": "sina ken ala lukin e toki tan jan pi ma ni",
+ "embed.preview": "ni li jo e sitelen ni:",
+ "emoji_button.activity": "musi",
+ "emoji_button.flags": "len ma",
+ "emoji_button.food": "moku",
+ "emoji_button.label": "o pana e sitelen pilin",
+ "emoji_button.nature": "soweli en kasi",
+ "emoji_button.not_found": "sitelen pilin ala li lon",
+ "emoji_button.objects": "ijo",
+ "emoji_button.people": "jan",
+ "emoji_button.search": "o alasa...",
+ "emoji_button.search_results": "ijo pi alasa ni",
+ "emoji_button.symbols": "sitelen",
+ "emoji_button.travel": "ma en tawa",
+ "empty_column.account_hides_collections": "jan ni li wile len e sona ni",
+ "empty_column.account_timeline": "toki ala li lon!",
+ "empty_column.account_unavailable": "ken ala lukin e lipu jan",
+ "empty_column.blocks": "jan ala li weka tawa sina.",
+ "empty_column.direct": "jan ala li toki len e sina. jan li toki len e sina la sina ken lukin e ni lon ni.",
+ "empty_column.domain_blocks": "ma ala li weka tawa sina.",
+ "empty_column.favourited_statuses": "sina suli ala e toki. sina suli e toki la sina ken lukin e toki ni lon ni.",
+ "empty_column.favourites": "jan ala li suli e toki ni. jan li suli e toki ni la sina ken lukin e ona lon ni.",
+ "empty_column.follow_requests": "jan ala li toki pi wile kute tawa sina. jan li toki pi wile kute tawa sina la sina ken lukin e toki ni lon ni.",
+ "empty_column.followed_tags": "sina alasa ala e toki ꞏ sina alasa e toki la toki li lon ni",
+ "empty_column.hashtag": "ala li lon toki ni",
+ "empty_column.home": "ala a li lon lipu open sina! sina wile lon e ijo lon ni la o kute e jan pi toki suli.",
+ "empty_column.list": "ala li lon kulupu lipu ni. jan pi kulupu lipu ni li toki sin la toki ni li lon ni.",
+ "empty_column.lists": "sina jo ala e kulupu lipu. sina pali sin e kulupu lipu la ona li lon ni.",
+ "empty_column.mutes": "jan ala li len tawa sina.",
+ "error.unexpected_crash.explanation": "ilo li ken ala pana e lipu ni. ni li ken tan pakala mi tan pakala pi ilo sina.",
+ "errors.unexpected_crash.report_issue": "o toki e pakala tawa lawa",
+ "explore.search_results": "ijo pi alasa ni",
+ "explore.suggested_follows": "jan",
+ "explore.title": "o alasa",
+ "explore.trending_links": "sin",
+ "explore.trending_statuses": "toki",
+ "filter_modal.added.settings_link": "lipu lawa",
+ "filter_modal.select_filter.expired": "tenpo pini",
+ "filter_modal.select_filter.search": "o alasa anu pali",
+ "firehose.all": "ale",
+ "firehose.local": "kulupu ni",
+ "firehose.remote": "kulupu ante",
+ "follow_request.authorize": "o ken",
+ "follow_request.reject": "o ala",
+ "follow_suggestions.hints.friends_of_friends": "jan kute sina li lukin mute e toki pi jan ni.",
+ "follow_suggestions.hints.most_followed": "jan mute lon ma {domain} li kute e jan ni.",
+ "follow_suggestions.hints.most_interactions": "tenpo poka la jan mute pi ma {domain} li lukin mute e toki pi jan ni.",
+ "follow_suggestions.hints.similar_to_recently_followed": "sina kute e jan lon tenpo poka la jan ni li sama ona.",
+ "follow_suggestions.view_all": "o lukin e ale",
+ "follow_suggestions.who_to_follow": "sina o kute e ni",
+ "footer.about": "sona",
+ "footer.directory": "lipu jan",
+ "footer.get_app": "o jo e ilo",
+ "footer.privacy_policy": "lawa len",
+ "footer.source_code": "o lukin e toki ilo",
+ "footer.status": "lon",
+ "generic.saved": "ni li awen",
+ "hashtag.column_header.tag_mode.all": "en {additional}",
+ "hashtag.column_header.tag_mode.any": "anu {additional}",
+ "hashtag.column_header.tag_mode.none": "en {additional} ala",
+ "hashtag.column_settings.tag_mode.all": "ale ni",
+ "hashtag.column_settings.tag_mode.any": "wan ni",
+ "hashtag.column_settings.tag_mode.none": "ala ni",
+ "home.pending_critical_update.link": "o lukin e ijo ilo sin",
+ "interaction_modal.login.action": "o lon tomo",
+ "interaction_modal.on_another_server": "lon ma ante",
+ "interaction_modal.on_this_server": "lon ma ni",
+ "interaction_modal.title.favourite": "o suli e toki {name}",
+ "interaction_modal.title.follow": "o kute e {name}",
+ "interaction_modal.title.reblog": "o wawa e toki {name}",
+ "interaction_modal.title.reply": "o toki lon toki pi jan {name}",
+ "intervals.full.days": "{number, plural, other {suni #}}",
+ "keyboard_shortcuts.blocked": "o lukin e lipu sina pi jan weka",
+ "keyboard_shortcuts.boost": "o pana sin e toki",
+ "keyboard_shortcuts.down": "o tawa anpa lon lipu",
+ "keyboard_shortcuts.enter": "o lukin e toki",
+ "keyboard_shortcuts.favourite": "o sitelen pona e toki",
+ "keyboard_shortcuts.favourites": "o lukin e lipu sina pi toki suli",
+ "keyboard_shortcuts.muted": "o lukin e lipu sina pi jan len",
+ "keyboard_shortcuts.my_profile": "o lukin e lipu sina",
+ "keyboard_shortcuts.open_media": "o lukin e sitelen",
+ "keyboard_shortcuts.pinned": "o lukin pi lipu sina pi toki sewi",
+ "keyboard_shortcuts.toggle_sensitivity": "o ante e ken lukin",
+ "keyboard_shortcuts.toot": "o toki",
+ "keyboard_shortcuts.up": "o tawa sewi lon lipu",
+ "lightbox.close": "o pini",
+ "lightbox.compress": "o lili e sitelen",
+ "lightbox.expand": "o suli e sitelen",
+ "lightbox.next": "sinpin",
+ "lightbox.previous": "monsi",
+ "link_preview.author": "tan {name}",
+ "lists.account.add": "o pana tawa kulupu lipu",
+ "lists.account.remove": "o weka tan kulupu lipu",
+ "lists.delete": "o weka e kulupu lipu",
+ "lists.edit": "o ante e kulupu lipu",
+ "lists.edit.submit": "o ante e nimi",
+ "lists.exclusive": "o len e toki lon lipu open",
+ "lists.new.create": "o sin e kulupu lipu",
+ "lists.replies_policy.followed": "jan kute ale",
+ "lists.replies_policy.list": "jan pi kulupu ni taso",
+ "lists.replies_policy.none": "jan ala",
+ "lists.subheading": "kulupu lipu sina",
+ "load_pending": "{count, plural, other {ijo sin #}}",
+ "loading_indicator.label": "ni li kama…",
+ "media_gallery.toggle_visible": "{number, plural, other {o len e sitelen}}",
+ "navigation_bar.about": "sona",
+ "navigation_bar.blocks": "jan weka",
+ "navigation_bar.compose": "o pali e toki sin",
+ "navigation_bar.favourites": "ijo pona",
+ "navigation_bar.filters": "nimi len",
+ "navigation_bar.lists": "kulupu lipu",
+ "navigation_bar.mutes": "sina wile ala kute e jan ni",
+ "navigation_bar.pins": "toki sewi",
+ "navigation_bar.preferences": "wile sina",
+ "navigation_bar.search": "o alasa",
+ "notification.admin.report": "jan {name} li toki e jan {target} tawa lawa",
+ "notification.admin.sign_up": "{name} li kama",
+ "notification.favourite": "toki sina li pona tawa {name}",
+ "notification.follow": " {name} li kute e sina",
+ "notification.follow_request": "{name} li wile kute e sina",
+ "notification.mention": "jan {name} li toki e sina",
+ "notification.poll": "sina pana lon pana la pana ni li pini",
+ "notification.reblog": "{name} li wawa e toki sina",
+ "notification.status": "{name} li toki",
+ "notification.update": "{name} li ante e toki",
+ "notifications.column_settings.favourite": "ijo pona:",
+ "notifications.column_settings.follow": "jan kute sin",
+ "notifications.column_settings.poll": "pana lon pana ni:",
+ "notifications.column_settings.reblog": "wawa:",
+ "notifications.column_settings.update": "ante toki:",
+ "notifications.filter.all": "ale",
+ "notifications.filter.favourites": "ijo pona",
+ "notifications.filter.polls": "pana lon pana ni",
+ "onboarding.compose.template": "toki a, #Mastodon o!",
+ "onboarding.profile.display_name": "nimi tawa jan ante",
+ "onboarding.share.lead": "o toki lon nasin Masoton pi alasa sina tawa jan",
+ "onboarding.share.message": "ilo #Mastodon la mi jan {username} a! o kute e mi lon ni: {url}",
+ "onboarding.start.title": "sina o kama pona a!",
+ "onboarding.tips.migration": "sina sona ala sona e ni? tenpo kama la sina pilin ike tawa ma {domain} la, sina ken tawa ma ante lon ilo Masoton. jan li kute e sina la jan ni li awen kute e sina. kin la sina ken lawa e ma pi sina taso a!",
+ "poll.total_people": "{count, plural, other {jan #}}",
+ "poll.total_votes": "{count, plural, other {pana #}}",
+ "poll.vote": "o pana",
+ "poll.voted": "sina pana e ni",
+ "poll.votes": "{votes, plural, other {pana #}}",
+ "privacy.direct.long": "jan ale lon toki",
+ "privacy.public.short": "tawa ale",
+ "relative_time.full.just_now": "tenpo ni",
+ "relative_time.just_now": "tenpo ni",
+ "relative_time.today": "tenpo suno ni",
+ "report.block": "o weka e jan",
+ "report.block_explanation": "sina kama lukin ala e toki ona. ona li kama ala ken lukin e toki sina li kama ala ken kute e sina. ona li ken sona e kama ni.",
+ "report.categories.other": "ante",
+ "report.categories.spam": "ike tan toki mute",
+ "report.category.title": "ike seme li lon {type} ni",
+ "report.category.title_account": "lipu",
+ "report.category.title_status": "toki",
+ "report.close": "o pini",
+ "report.mute": "o kute ala e ona",
+ "report.mute_explanation": "sina kama ala lukin e ijo pana ona. ona li awen ken kute e sina li awen ken lukin e sina li sona ala e weka kute sina e weka lukin sina.",
+ "report.next": "awen",
+ "report.reasons.dislike": "ni li ike tawa mi",
+ "report.reasons.legal": "ni li ike tawa lawa",
+ "report.reasons.other": "ni li ike tan ante",
+ "report.reasons.spam": "ni li ike tan toki mute",
+ "report.thanks.title": "sina wile ala lukin e ni anu seme?",
+ "report.unfollow": "o pini kute e {name}",
+ "report_notification.categories.legal": "ike tawa nasin lawa",
+ "search.placeholder": "o alasa",
+ "search.quick_action.go_to_account": "o tawa lipu jan {x}",
+ "search_popout.language_code": "nimi toki kepeken nasin ISO",
+ "search_results.all": "ale",
+ "search_results.see_all": "ale",
+ "search_results.statuses": "toki",
+ "search_results.title": "o alasa e {q}",
+ "status.block": "o weka e @{name}",
+ "status.cancel_reblog_private": "o pini e pana",
+ "status.delete": "o weka",
+ "status.edit": "o ante",
+ "status.embed": "ni o lon insa pi lipu ante",
+ "status.favourite": "o sitelen pona",
+ "status.hide": "o len",
+ "status.history.created": "{name} li pali e ni lon {date}",
+ "status.history.edited": "{name} li ante lon {date}",
+ "status.load_more": "o kama e ijo ante",
+ "status.media.open": "o open",
+ "status.media.show": "o lukin",
+ "status.media_hidden": "sitelen li len",
+ "status.mute": "o len e @{name}",
+ "status.mute_conversation": "o kute ala e ijo pi toki ni",
+ "status.pin": "o sewi lon lipu sina",
+ "status.pinned": "toki sewi",
+ "status.reblog": "o wawa",
+ "status.share": "o pana tawa ante",
+ "status.show_less": "o lili e ni",
+ "status.show_less_all": "o lili e ale",
+ "status.show_more": "o suli e ni",
+ "status.show_more_all": "o suli e ale",
+ "status.show_original": "o lukin e mama",
+ "status.translate": "o ante pi nasin toki",
+ "status.translated_from_with": "toki li ante tan {lang} kepeken {provider}",
+ "status.uncached_media_warning": "lukin lili li weka",
+ "status.unmute_conversation": "o ken kute e ijo pi toki ni",
+ "status.unpin": "o sewi ala lon lipu sina",
+ "subscribed_languages.save": "o awen e ante",
+ "tabs_bar.home": "lipu open",
+ "timeline_hint.resources.followers": "jan kute",
+ "timeline_hint.resources.follows": "jan lukin",
+ "timeline_hint.resources.statuses": "ijo pi tenpo suli",
+ "trends.trending_now": "jan mute li toki",
+ "units.short.million": "{count}AAA",
+ "upload_button.label": "o pana e sitelen anu kalama",
+ "upload_error.limit": "ilo li ken ala e suli pi ijo ni.",
+ "upload_form.audio_description": "o toki e ijo kute tawa jan pi kute ala, tawa jan pi kute lili",
+ "upload_form.description": "o toki e ijo lukin tawa jan pi lukin ala, tawa jan pi lukin lili",
+ "upload_form.edit": "o ante",
+ "upload_form.thumbnail": "o ante e sitelen lili",
+ "upload_form.video_description": "o toki e ijo kute tawa jan pi kute ala, tawa jan pi kute lili, e ijo lukin tawa jan pi lukin ala, tawa jan pi lukin lili",
+ "upload_modal.choose_image": "o wile e sitelen",
+ "upload_modal.description_placeholder": "mi pu jaki tan soweli",
+ "upload_modal.detect_text": "ilo o alasa e nimi tan sitelen",
+ "upload_modal.edit_media": "o ante e sitelen",
+ "upload_modal.preparing_ocr": "ilo li open e alasa nimi lon sitelen…",
+ "upload_progress.label": "ilo li kama jo e ijo sina...",
+ "upload_progress.processing": "ilo li pali…",
+ "username.taken": "jan ante li kepeken e nimi ni. sina o kepeken e nimi sin",
+ "video.close": "o weka e ni",
+ "video.download": "o jo e ni",
+ "video.exit_fullscreen": "o weka tan sitelen suli",
+ "video.expand": "o suli e ni",
+ "video.hide": "o len e sitelen",
+ "video.mute": "o kalama ala",
+ "video.pause": "o lape e ni",
+ "video.unmute": "o kalama"
+}
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index e85db817b9fb95..6c011065932473 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -89,7 +89,14 @@
"announcement.announcement": "Duyuru",
"attachments_list.unprocessed": "(işlenmemiş)",
"audio.hide": "Sesi gizle",
- "autosuggest_hashtag.per_week": "Haftada {count}",
+ "block_modal.remote_users_caveat": "{domain} sunucusundan kararınıza saygı duymasını isteyeceğiz. Ancak, Uymaları garanti değildir çünkü bazı sunucular engellemeyi farklı şekilde yapıyorlar. Herkese açık gönderiler giriş yapmamış kullanıcılara görüntülenmeye devam edebilir.",
+ "block_modal.show_less": "Daha az göster",
+ "block_modal.show_more": "Daha fazla göster",
+ "block_modal.they_cant_mention": "Sizden bahsedemez veya sizi takip edemezler.",
+ "block_modal.they_cant_see_posts": "Onlar sizin gönderilerinizi görmeye devam edebilir, ancak siz onlarınkini göremezsiniz.",
+ "block_modal.they_will_know": "Engellendiklerini görebiliyorlar.",
+ "block_modal.title": "Kullanıcıyı engelle?",
+ "block_modal.you_wont_see_mentions": "Onlardan bahseden gönderiler göremezsiniz.",
"boost_modal.combo": "Bir daha ki sefere {combo} tuşuna basabilirsin",
"bundle_column_error.copy_stacktrace": "Hata raporunu kopyala",
"bundle_column_error.error.body": "İstenen sayfa gösterilemiyor. Bu durum kodumuzdaki bir hatadan veya tarayıcı uyum sorunundan kaynaklanıyor olabilir.",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "Hesabın {locked} değil. Yalnızca takipçilere özel gönderilerini görüntülemek için herkes seni takip edebilir.",
"compose_form.lock_disclaimer.lock": "kilitli",
"compose_form.placeholder": "Aklında ne var?",
- "compose_form.poll.add_option": "Bir seçenek ekleyin",
"compose_form.poll.duration": "Anket süresi",
- "compose_form.poll.option_placeholder": "{number}.seçenek",
- "compose_form.poll.remove_option": "Bu seçeneği kaldır",
+ "compose_form.poll.multiple": "Çoktan seçmeli",
+ "compose_form.poll.option_placeholder": "Seçenek {number}",
+ "compose_form.poll.single": "Birini seç",
"compose_form.poll.switch_to_multiple": "Birden çok seçeneğe izin vermek için anketi değiştir",
"compose_form.poll.switch_to_single": "Tek bir seçeneğe izin vermek için anketi değiştir",
+ "compose_form.poll.type": "Stil",
"compose_form.publish": "Gönder",
"compose_form.publish_form": "Gönder",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Değişiklikleri kaydet",
- "compose_form.sensitive.hide": "{count, plural, one {Medyayı hassas olarak işaretle} other {Medyayı hassas olarak işaretle}}",
- "compose_form.sensitive.marked": "{count, plural, one {Medya hassas olarak işaretlendi} other {Medya hassas olarak işaretlendi}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Medya hassas olarak işaretlenmemiş} other {Medya hassas olarak işaretlenmemiş}}",
+ "compose_form.reply": "Yanıtla",
+ "compose_form.save_changes": "Güncelle",
"compose_form.spoiler.marked": "Metin uyarının arkasına gizlenir",
"compose_form.spoiler.unmarked": "Metin gizli değil",
- "compose_form.spoiler_placeholder": "Uyarınızı buraya yazın",
+ "compose_form.spoiler_placeholder": "İçerik uyarısı (isteğe bağlı)",
"confirmation_modal.cancel": "İptal",
- "confirmations.block.block_and_report": "Engelle ve Bildir",
"confirmations.block.confirm": "Engelle",
- "confirmations.block.message": "{name} adlı kullanıcıyı engellemek istediğinden emin misin?",
"confirmations.cancel_follow_request.confirm": "İsteği geri çek",
"confirmations.cancel_follow_request.message": "{name} kişisini takip etme isteğini geri çekmek istediğinden emin misin?",
"confirmations.delete.confirm": "Sil",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "Bu listeyi kalıcı olarak silmek istediğinden emin misin?",
"confirmations.discard_edit_media.confirm": "Vazgeç",
"confirmations.discard_edit_media.message": "Medya açıklaması veya ön izlemede kaydedilmemiş değişiklikleriniz var, yine de vazgeçmek istiyor musunuz?",
- "confirmations.domain_block.confirm": "Alanın tamamını engelle",
+ "confirmations.domain_block.confirm": "Sunucuyu engelle",
"confirmations.domain_block.message": "{domain} alanının tamamını engellemek istediğinden gerçekten emin misin? Genellikle hedeflenen birkaç engelleme veya sessize alma yeterlidir ve tercih edilir. Bu alan adından gelen içeriği herhangi bir genel zaman çizelgesinde veya bildirimlerinde görmezsin. Bu alan adındaki takipçilerin kaldırılır.",
"confirmations.edit.confirm": "Düzenle",
"confirmations.edit.message": "Şimdi düzenlersen şu an oluşturduğun iletinin üzerine yazılır. Devam etmek istediğine emin misin?",
"confirmations.logout.confirm": "Oturumu kapat",
"confirmations.logout.message": "Oturumu kapatmak istediğinden emin misin?",
"confirmations.mute.confirm": "Sessize al",
- "confirmations.mute.explanation": "Bu, onlardan gelen ve bahseden gönderileri gizler. Ancak yine de gönderilerini görmelerine ve seni takip etmelerine izin verilir.",
- "confirmations.mute.message": "{name} kullanıcısını sessize almak istediğinden emin misin?",
"confirmations.redraft.confirm": "Sil Düzenle ve yeniden paylaş",
"confirmations.redraft.message": "Bu gönderiyi silip taslak haline getirmek istediğinize emin misiniz? Mevcut favoriler ve boostlar silinecek ve gönderiye verilen yanıtlar başıboş kalacak.",
"confirmations.reply.confirm": "Yanıtla",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "Bunlar, sosyal ağ genelinde bugün ilgi gören gönderiler. Daha çok yinelenen ve favorilenen yeni gönderiler daha üst sıralarda yer alır.",
"dismissable_banner.explore_tags": "Bu etiketler, merkeziyetsiz ağda bulunan bu ve diğer sunuculardaki insanların şimdilerde ilgisini çekiyor.",
"dismissable_banner.public_timeline": "Bunlar, {domain} üzerindeki insanların, sosyal ağ da takip ettiği insanlarca gönderilen en son ve herkese açık gönderilerdir.",
+ "domain_block_modal.block": "Sunucuyu engelle",
+ "domain_block_modal.block_account_instead": "Bunun yerine {name} hesabını engelle",
+ "domain_block_modal.they_can_interact_with_old_posts": "Bu sunucudan kişiler eski gönderilerinizle etkileşebilirler.",
+ "domain_block_modal.they_cant_follow": "Bu sunucudan hiç kimse sizi takip edemez.",
+ "domain_block_modal.they_wont_know": "Engellendiklerini bilmeyecekler.",
+ "domain_block_modal.title": "Alan adını engelle?",
+ "domain_block_modal.you_will_lose_followers": "Bu sunucudaki tüm takipçileriniz kaldırılacaktır.",
+ "domain_block_modal.you_wont_see_posts": "Bu sunucudaki kullanıcılardan gelen gönderileri veya bildirimleri göremezsiniz.",
+ "domain_pill.activitypub_lets_connect": "Sadece Mastodon üzerindeki değil, diğer sosyal uygulamalardaki kişilerle de bağlantı kurmanıza ve etkileşmenize olanak sağlar.",
+ "domain_pill.activitypub_like_language": "ActivityPub, Mastodon'un diğer sosyal ağlarla konuşmak için kullandığı dil gibidir.",
+ "domain_pill.server": "Sunucu",
+ "domain_pill.their_handle": "Tanıtıcıları:",
+ "domain_pill.their_server": "Dijital evleri, tüm gönderilerinin yaşadığı yerdir.",
+ "domain_pill.their_username": "Sunucularındaki tekil tanımlayıcıları. Farklı sunucularda aynı kullanıcı adına sahip kullanıcıları bulmak mümkündür.",
+ "domain_pill.username": "Kullanıcı adı",
+ "domain_pill.whats_in_a_handle": "Tanıtıcı nedir?",
+ "domain_pill.who_they_are": "Tanıtıcılar bir kişinin kim olduğunu ve nerede olduğunu söylediği için, sosyal ağındaki insanlarla etkileşime geçebilirsiniz.",
+ "domain_pill.who_you_are": "Tanıtıcınız kim olduğunuzu ve nerede olduğunuzu söylediği için, sosyal ağındaki insanlar sizinle etkileşime geçebilir.",
+ "domain_pill.your_handle": "Tanıtıcınız:",
+ "domain_pill.your_server": "Dijital anasayfanız, tüm gönderilerinizin yaşadığı yerdir. Bunu beğenmediniz mi? İstediğiniz zaman sunucularınızı değiştirin ve takipçilerinizi de getirin.",
+ "domain_pill.your_username": "Bu sunucudaki tekil tanımlayıcınız. Farklı sunucularda aynı kullanıcı adına sahip kullanıcıları bulmak mümkündür.",
"embed.instructions": "Aşağıdaki kodu kopyalayarak bu durumu sitenize gömün.",
"embed.preview": "İşte nasıl görüneceği:",
"emoji_button.activity": "Aktivite",
@@ -217,7 +239,7 @@
"emoji_button.food": "Yiyecek ve İçecek",
"emoji_button.label": "İfade ekle",
"emoji_button.nature": "Doğa",
- "emoji_button.not_found": "İfade yok!! (╯°□°）╯︵ ┻━┻",
+ "emoji_button.not_found": "Eşleşen emoji yok",
"emoji_button.objects": "Nesneler",
"emoji_button.people": "Kullanıcılar",
"emoji_button.recent": "Sık kullanılan",
@@ -244,6 +266,7 @@
"empty_column.list": "Henüz bu listede bir şey yok. Bu listenin üyeleri bir şey paylaşığında burada gözükecek.",
"empty_column.lists": "Henüz listen yok. Liste oluşturduğunda burada görünür.",
"empty_column.mutes": "Henüz bir kullanıcıyı sessize almadınız.",
+ "empty_column.notification_requests": "Hepsi tamam! Burada yeni bir şey yok. Yeni bildirim aldığınızda, ayarlarınıza göre burada görüntülenecekler.",
"empty_column.notifications": "Henüz bildiriminiz yok. Sohbete başlamak için başkalarıyla etkileşim kurun.",
"empty_column.public": "Burada hiçbir şey yok! Herkese açık bir şeyler yazın veya burayı doldurmak için diğer sunuculardaki kullanıcıları takip edin",
"error.unexpected_crash.explanation": "Bizim kodumuzdaki bir hatadan ya da tarayıcı uyumluluk sorunundan dolayı, bu sayfa düzgün görüntülenemedi.",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "Mevcut bir kategoriyi kullan veya yeni bir tane oluştur",
"filter_modal.select_filter.title": "Bu gönderiyi süzgeçle",
"filter_modal.title.status": "Bir gönderi süzgeçle",
+ "filtered_notifications_banner.mentions": "{count, plural, one {bahsetme} other {bahsetme}}",
+ "filtered_notifications_banner.pending_requests": "Bildiğiniz {count, plural, =0 {hiç kimseden} one {bir kişiden} other {# kişiden}} bildirim",
+ "filtered_notifications_banner.title": "Filtrelenmiş bildirimler",
"firehose.all": "Tümü",
"firehose.local": "Bu sunucu",
"firehose.remote": "Diğer sunucular",
"follow_request.authorize": "İzin Ver",
"follow_request.reject": "Reddet",
"follow_requests.unlocked_explanation": "Hesabınız kilitli olmasa da, {domain} personeli bu hesaplardan gelen takip isteklerini gözden geçirmek isteyebileceğinizi düşündü.",
+ "follow_suggestions.curated_suggestion": "Çalışanların seçtikleri",
+ "follow_suggestions.dismiss": "Tekrar gösterme",
+ "follow_suggestions.featured_longer": "{domain} takımı tarafından elle seçildi",
+ "follow_suggestions.friends_of_friends_longer": "Takip ettiğiniz kişiler arasında popüler",
+ "follow_suggestions.hints.featured": "Bu profil {domain} ekibi tarafından elle seçilmiştir.",
+ "follow_suggestions.hints.friends_of_friends": "Bu profil takip ettiğiniz insanlar arasında popülerdir.",
+ "follow_suggestions.hints.most_followed": "Bu, {domain} sunucusunda en fazla izlenen profildir.",
+ "follow_suggestions.hints.most_interactions": "Bu, {domain} sunucusunda son zamanlarda oldukça fazla dikkat çeken bir profildir.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Bu profil, son zamanlarda takip ettiğiniz profillere benziyor.",
+ "follow_suggestions.personalized_suggestion": "Kişiselleşmiş öneriler",
+ "follow_suggestions.popular_suggestion": "Popüler öneriler",
+ "follow_suggestions.popular_suggestion_longer": "{domain} üzerinde popüler",
+ "follow_suggestions.similar_to_recently_followed_longer": "Yakın zamanda takip ettiğiniz hesaplara benziyor",
+ "follow_suggestions.view_all": "Tümünü gör",
+ "follow_suggestions.who_to_follow": "Takip edebileceklerin",
"followed_tags": "Takip edilen etiketler",
"footer.about": "Hakkında",
"footer.directory": "Profil dizini",
@@ -306,13 +347,8 @@
"hashtag.follow": "Etiketi takip et",
"hashtag.unfollow": "Etiketi takibi bırak",
"hashtags.and_other": "…ve {count, plural, one {}other {# fazlası}}",
- "home.actions.go_to_explore": "Öne çıkanları gör",
- "home.actions.go_to_suggestions": "Takip edecek kişileri bulun",
- "home.column_settings.basic": "Temel",
"home.column_settings.show_reblogs": "Yeniden paylaşımları göster",
"home.column_settings.show_replies": "Yanıtları göster",
- "home.explore_prompt.body": "Ana sayfa akışınızda, takip etmeyi seçtiğiniz ETİKETlerden, takip etmeyi seçtiğiniz kişilerden ve öne çıkardıkları gönderilerden oluşan bir karışım bulunur. Şu anda oldukça sessiz görünüyor, gör ve takip et :",
- "home.explore_prompt.title": "Burası Mastodon'daki Anasayfanız.",
"home.hide_announcements": "Duyuruları gizle",
"home.pending_critical_update.body": "Lütfen Mastodon sunucunuzu en kısa sürede güncelleyin!",
"home.pending_critical_update.link": "Güncellemelerini görün",
@@ -344,7 +380,7 @@
"keyboard_shortcuts.description": "Açıklama",
"keyboard_shortcuts.direct": "özel değinmeler sütununu açmak için",
"keyboard_shortcuts.down": "Listede aşağıya inmek için",
- "keyboard_shortcuts.enter": "gönderiyi aç",
+ "keyboard_shortcuts.enter": "Gönderiyi açınız",
"keyboard_shortcuts.favourite": "Gönderiyi favorilerine ekle",
"keyboard_shortcuts.favourites": "Gözde listeni aç",
"keyboard_shortcuts.federated": "Federe akışı aç",
@@ -353,7 +389,7 @@
"keyboard_shortcuts.hotkey": "Kısayol tuşu",
"keyboard_shortcuts.legend": "Bu efsaneyi görüntülemek için",
"keyboard_shortcuts.local": "Yerel akışı aç",
- "keyboard_shortcuts.mention": "Yazandan bahsetmek için",
+ "keyboard_shortcuts.mention": "Yazana değinmek için",
"keyboard_shortcuts.muted": "Sessize alınmış kullanıcı listesini açmak için",
"keyboard_shortcuts.my_profile": "Profilinizi açmak için",
"keyboard_shortcuts.notifications": "Bildirimler sütununu açmak için",
@@ -396,9 +432,15 @@
"loading_indicator.label": "Yükleniyor…",
"media_gallery.toggle_visible": "{number, plural, one {Resmi} other {Resimleri}} gizle",
"moved_to_account_banner.text": "{disabledAccount} hesabınız, {movedToAccount} hesabına taşıdığınız için şu an devre dışı.",
- "mute_modal.duration": "Süre",
- "mute_modal.hide_notifications": "Bu kullanıcıdan bildirimler gizlensin mı?",
- "mute_modal.indefinite": "Belirsiz",
+ "mute_modal.hide_from_notifications": "Bildirimlerde gizle",
+ "mute_modal.hide_options": "Seçenekleri gizle",
+ "mute_modal.indefinite": "Ben sessizliklerini kaldırana kadar",
+ "mute_modal.show_options": "Seçenekleri göster",
+ "mute_modal.they_can_mention_and_follow": "Sizden bahsedebilir ve sizi takip edebilirler, ancak siz onları göremezsiniz.",
+ "mute_modal.they_wont_know": "Susturulduklarını bilmeyecekler.",
+ "mute_modal.title": "Kullanıcıyı sustur?",
+ "mute_modal.you_wont_see_mentions": "Onlardan bahseden gönderiler göremezsiniz.",
+ "mute_modal.you_wont_see_posts": "Onlar sizin gönderilerinizi görmeye devam edebilir, ancak siz onlarınkini göremezsiniz.",
"navigation_bar.about": "Hakkında",
"navigation_bar.advanced_interface": "Gelişmiş web arayüzünde aç",
"navigation_bar.blocks": "Engellenen kullanıcılar",
@@ -408,7 +450,6 @@
"navigation_bar.direct": "Özel değinmeler",
"navigation_bar.discover": "Keşfet",
"navigation_bar.domain_blocks": "Engellenen alan adları",
- "navigation_bar.edit_profile": "Profili düzenle",
"navigation_bar.explore": "Keşfet",
"navigation_bar.favourites": "Favorilerin",
"navigation_bar.filters": "Sessize alınmış kelimeler",
@@ -432,11 +473,29 @@
"notification.follow": "{name} seni takip etti",
"notification.follow_request": "{name} size takip isteği gönderdi",
"notification.mention": "{name} senden bahsetti",
+ "notification.moderation-warning.learn_more": "Daha fazlası",
+ "notification.moderation_warning": "Hesabınız bir denetim uyarısı aldı",
+ "notification.moderation_warning.action_delete_statuses": "Bazı gönderileriniz kaldırıldı.",
+ "notification.moderation_warning.action_disable": "Hesabınız devre dışı bırakıldı.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Bazı gönderileriniz hassas olarak işaretlendi.",
+ "notification.moderation_warning.action_none": "Hesabınız bir denetim uyarısı aldı.",
+ "notification.moderation_warning.action_sensitive": "Gönderileriniz artık hassas olarak işaretlenecek.",
+ "notification.moderation_warning.action_silence": "Hesabınız sınırlandırıldı.",
+ "notification.moderation_warning.action_suspend": "Hesabınız askıya alındı.",
"notification.own_poll": "Anketiniz sona erdi",
"notification.poll": "Oy verdiğiniz bir anket sona erdi",
"notification.reblog": "{name} gönderini yeniden paylaştı",
+ "notification.relationships_severance_event": "{name} ile bağlantılar koptu",
+ "notification.relationships_severance_event.account_suspension": "{from} yöneticisi, {target} askıya aldı, bunun anlamı onlardan artık güncelleme alamayacak veya etkileşemeyeceksiniz demektir.",
+ "notification.relationships_severance_event.domain_block": "{from} yöneticisi {target} engelledi, {followersCount} takipçiniz ve takip ettiğiniz {followingCount, plural, one {# hesap} other {# hesap}} buna dahil.",
+ "notification.relationships_severance_event.learn_more": "Daha fazlası",
+ "notification.relationships_severance_event.user_domain_block": "{target} engellediniz, takipçilerinizden {followersCount} ve takip eden {followingCount, plural, one {# hesap} other {# hesap}} kaldırılıyor.",
"notification.status": "{name} az önce gönderdi",
"notification.update": "{name} bir gönderiyi düzenledi",
+ "notification_requests.accept": "Onayla",
+ "notification_requests.dismiss": "Yoksay",
+ "notification_requests.notifications_from": "{name} bildirimleri",
+ "notification_requests.title": "Filtrelenmiş bildirimler",
"notifications.clear": "Bildirimleri temizle",
"notifications.clear_confirmation": "Tüm bildirimlerinizi kalıcı olarak temizlemek ister misiniz?",
"notifications.column_settings.admin.report": "Yeni bildirimler:",
@@ -444,11 +503,10 @@
"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ı süzgeç çubuğu",
- "notifications.column_settings.filter_bar.show_bar": "Süzgeç çubuğunu göster",
+ "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:",
+ "notifications.column_settings.mention": "Bahsetmeler:",
"notifications.column_settings.poll": "Anket sonuçları:",
"notifications.column_settings.push": "Anlık bildirimler",
"notifications.column_settings.reblog": "Yeniden paylaşanlar:",
@@ -462,7 +520,7 @@
"notifications.filter.boosts": "Yeniden paylaşımlar",
"notifications.filter.favourites": "Favorilerin",
"notifications.filter.follows": "Takip edilenler",
- "notifications.filter.mentions": "Değinmeler",
+ "notifications.filter.mentions": "Bahsetmeler",
"notifications.filter.polls": "Anket sonuçları",
"notifications.filter.statuses": "Takip ettiğiniz kişilerden gelen güncellemeler",
"notifications.grant_permission": "İzin ver.",
@@ -471,6 +529,15 @@
"notifications.permission_denied": "Daha önce reddedilen tarayıcı izinleri isteği nedeniyle masaüstü bildirimleri kullanılamıyor",
"notifications.permission_denied_alert": "Tarayıcı izni daha önce reddedildiğinden, masaüstü bildirimleri etkinleştirilemez",
"notifications.permission_required": "Masaüstü bildirimleri, gereksinim duyulan izin verilmediği için mevcut değil.",
+ "notifications.policy.filter_new_accounts.hint": "Son {days, plural, one {bir gün} other {# gün}}de oluşturuldu",
+ "notifications.policy.filter_new_accounts_title": "Yeni hesaplar",
+ "notifications.policy.filter_not_followers_hint": "Sizi {days, plural, one {bir gün} other {# gün}}den azdır takip eden kişileri de içeriyor",
+ "notifications.policy.filter_not_followers_title": "Seni takip etmeyen kullanıcılar",
+ "notifications.policy.filter_not_following_hint": "Onları manuel olarak onaylayana kadar",
+ "notifications.policy.filter_not_following_title": "Takip etmediğin kullanıcılar",
+ "notifications.policy.filter_private_mentions_hint": "Kendi değinmenize yanıt veya takip ettiğiniz kullanıcıdan değilse filtrelenir",
+ "notifications.policy.filter_private_mentions_title": "İstenmeyen özel değinmeler",
+ "notifications.policy.title": "Şundan bildirimleri filtrele…",
"notifications_permission_banner.enable": "Masaüstü bildirimlerini etkinleştir",
"notifications_permission_banner.how_to_control": "Mastodon açık olmadığında bildirim almak için masaüstü bildirimlerini etkinleştirin. Etkinleştirildikten sonra yukarıdaki {icon} düğmesini kullanarak hangi etkileşim türlerinin masaüstü bildirimleri oluşturduğunu tam olarak kontrol edebilirsiniz.",
"notifications_permission_banner.title": "Hiçbir şeyi kaçırmayın",
@@ -526,14 +593,15 @@
"poll_button.add_poll": "Bir anket ekleyin",
"poll_button.remove_poll": "Anketi kaldır",
"privacy.change": "Gönderi gizliliğini değiştir",
- "privacy.direct.long": "Sadece bahsedilen kullanıcılar için görünür",
- "privacy.direct.short": "Sadece bahsedilen kişiler",
- "privacy.private.long": "Sadece takipçiler için görünür",
- "privacy.private.short": "Sadece takipçiler",
- "privacy.public.long": "Herkese açık",
+ "privacy.direct.long": "Gönderide değinilen herkes",
+ "privacy.direct.short": "Belirli kişiler",
+ "privacy.private.long": "Sadece takipçileriniz",
+ "privacy.private.short": "Takipçiler",
+ "privacy.public.long": "Mastodon'da olan olmayan herkes",
"privacy.public.short": "Herkese açık",
- "privacy.unlisted.long": "Keşfet harici herkese açık",
- "privacy.unlisted.short": "Listelenmemiş",
+ "privacy.unlisted.additional": "Bu neredeyse herkese açık gibi çalışır, tek farkı gönderi canlı akışlarda veya etiketlerde, keşfette, veya Mastodon aramasında gözükmez, hesap çapında öyle seçmiş olsanız bile.",
+ "privacy.unlisted.long": "Daha az algoritmik tantana",
+ "privacy.unlisted.short": "Sessizce herkese açık",
"privacy_policy.last_updated": "Son güncelleme {date}",
"privacy_policy.title": "Gizlilik Politikası",
"recommended": "Önerilen",
@@ -551,7 +619,9 @@
"relative_time.minutes": "{number}m",
"relative_time.seconds": "{number}sn",
"relative_time.today": "bugün",
+ "reply_indicator.attachments": "{count, plural, one {# ek} other {# ek}}",
"reply_indicator.cancel": "İptal",
+ "reply_indicator.poll": "Anket",
"report.block": "Engelle",
"report.block_explanation": "Gönderilerini göremeyeceksiniz. Gönderilerinizi göremezler veya sizi takip edemezler. Engelli olduklarını anlayabilecekler.",
"report.categories.legal": "Yasal",
@@ -644,10 +714,11 @@
"status.direct": "@{name} kullanıcısına özelden değin",
"status.direct_indicator": "Özel değinme",
"status.edit": "Düzenle",
- "status.edited": "{date} tarihinde düzenlenmiş",
+ "status.edited": "Son düzenleme {date}",
"status.edited_x_times": "{count, plural, one {{count} kez} other {{count} kez}} düzenlendi",
"status.embed": "Gömülü",
"status.favourite": "Favori",
+ "status.favourites": "{count, plural, one {beğeni} other {beğeni}}",
"status.filter": "Bu gönderiyi süzgeçle",
"status.filtered": "Süzgeçlenmiş",
"status.hide": "Gönderiyi gizle",
@@ -668,6 +739,7 @@
"status.reblog": "Yeniden paylaş",
"status.reblog_private": "Özgün görünürlük ile yeniden paylaş",
"status.reblogged_by": "{name} yeniden paylaştı",
+ "status.reblogs": "{count, plural, one {yeniden paylaşım} other {yeniden paylaşım}}",
"status.reblogs.empty": "Henüz hiç kimse bu Gönderiyi Yeniden Paylaşmadı. Herhangi bir kullanıcı yeniden paylaştığında burada görüntülenecek.",
"status.redraft": "Sil,Düzenle ve Yeniden paylaş",
"status.remove_bookmark": "Yer işaretini kaldır",
@@ -715,15 +787,13 @@
"upload_error.poll": "Anketlerde dosya yüklemesine izin verilmez.",
"upload_form.audio_description": "İşitme kaybı olan kişiler için yazı ekleyiniz",
"upload_form.description": "Görme engelliler için açıklama",
- "upload_form.description_missing": "Açıklama eklenmedi",
"upload_form.edit": "Düzenle",
"upload_form.thumbnail": "Küçük resmi değiştir",
- "upload_form.undo": "Sil",
"upload_form.video_description": "İşitme kaybı veya görme engeli olan kişiler için açıklama ekleyiniz",
- "upload_modal.analyzing_picture": "Resim analiz ediliyor…",
+ "upload_modal.analyzing_picture": "Görsel analiz ediliyor…",
"upload_modal.apply": "Uygula",
"upload_modal.applying": "Uygulanıyor…",
- "upload_modal.choose_image": "Resim seç",
+ "upload_modal.choose_image": "Görsel seç",
"upload_modal.description_placeholder": "Pijamalı hasta yağız şoföre çabucak güvendi",
"upload_modal.detect_text": "Resimdeki metni algıla",
"upload_modal.edit_media": "Medyayı düzenle",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index 47fe60bd252781..9a402472d9136e 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -76,7 +76,6 @@
"announcement.announcement": "Игълан",
"attachments_list.unprocessed": "(чимал)",
"audio.hide": "Аудионы яшерү",
- "autosuggest_hashtag.per_week": "{count} атнага",
"boost_modal.combo": "Сез баса аласыз {combo} киләсе тапкыр моны сагыну өчен",
"bundle_column_error.copy_stacktrace": "Күчереп алу хата турында Отчет",
"bundle_column_error.error.body": "Соралган бит күрсәтелә алмый. Бу безнең кодтагы хата яки браузерга туры килү проблемасы аркасында булырга мөмкин.",
@@ -128,26 +127,14 @@
"compose_form.lock_disclaimer": "Сезнең хисап түгел {locked}. Апуәрбер теләгән кеше сезнең язма өчен иярә ала.",
"compose_form.lock_disclaimer.lock": "бикле",
"compose_form.placeholder": "What is on your mind?",
- "compose_form.poll.add_option": "Сайлау өстәгез",
"compose_form.poll.duration": "Сораштыру озынлыгы",
- "compose_form.poll.option_placeholder": "Сайлау {number}",
- "compose_form.poll.remove_option": "бетерү",
"compose_form.poll.switch_to_multiple": "Берничә вариантны чишү өчен сораштыруны Үзгәртегез",
"compose_form.poll.switch_to_single": "Бердәнбер сайлау өчен сораштыруны Үзгәртегез",
- "compose_form.publish": "Бастыру",
"compose_form.publish_form": "Бастыру",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Үзгәрешләрне саклау",
- "compose_form.sensitive.hide": "{count, plural, one {Медианы сизгер итеп билгеләгез} other {Медианы сизгер итеп билгеләгез}}",
- "compose_form.sensitive.marked": "{count, plural, one {Ташучы сизгер дип язылган} other {Ташучы сизгер дип язылган}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Медиа сизгер буларак билгеле түгел} other {Медиа сизгер буларак билгеле түгел}}",
"compose_form.spoiler.marked": "Text is hidden behind warning",
"compose_form.spoiler.unmarked": "Text is not hidden",
- "compose_form.spoiler_placeholder": "Кисәтүегезне монда языгыз",
"confirmation_modal.cancel": "Баш тарту",
- "confirmations.block.block_and_report": "Блоклау һәм шикаять итү",
"confirmations.block.confirm": "Блоклау",
- "confirmations.block.message": "Сез {name} кулланучыны блокларга телисезме?",
"confirmations.cancel_follow_request.confirm": "Сорауны баш тарту",
"confirmations.cancel_follow_request.message": "Сез абонемент соравыгызны кире кайтарырга телисез {name}?",
"confirmations.delete.confirm": "Бетерү",
@@ -156,14 +143,11 @@
"confirmations.delete_list.message": "Сез бу исемлекне мәңгегә бетерергә телисезме?",
"confirmations.discard_edit_media.confirm": "Баш тарту",
"confirmations.discard_edit_media.message": "Сезнең медиа тасвирламасында яки алдан карау өчен сакланмаган үзгәрешләр бармы? ",
- "confirmations.domain_block.confirm": "Hide entire domain",
"confirmations.domain_block.message": "Сез чыннан да барысын да блокларга телисез {domain}? Күпчелек очракта берничә максатлы блоклар яки тавышсызлар җитәрлек һәм өстенлекле. Сез бу доменнан эчтәлекне җәмәгать срокларында яки хәбәрләрегездә күрмәячәксез. Бу доменнан сезнең шәкертләр бетереләчәк.",
"confirmations.edit.confirm": "Үзгәртү",
"confirmations.logout.confirm": "Чыгу",
"confirmations.logout.message": "Сез чыгарга телисезме?",
"confirmations.mute.confirm": "Тавышсыз",
- "confirmations.mute.explanation": "Бу алардан ураза тотуны һәм алар турында искә алуны яшерәчәк, ләкин бу аларга уразаларыгызны күрергә һәм язылырга мөмкинлек бирәчәк.",
- "confirmations.mute.message": "Сез тавышны сүндерергә телисез {name}?",
"confirmations.redraft.confirm": "Бетерү & эшкәртү",
"confirmations.reply.confirm": "Җавап бирү",
"confirmations.reply.message": "Тһеавап хәзер сез ясаган хәбәрне яңадан язуга китерәчәк. Сез дәвам итәсегез киләме?",
@@ -247,7 +231,6 @@
"hashtag.column_settings.tag_toggle": "Include additional tags in this column",
"hashtag.follow": "Хэштегка язылу",
"hashtag.unfollow": "Хэштегка язылу юк",
- "home.column_settings.basic": "Төп",
"home.column_settings.show_reblogs": "Табышмаклау",
"home.column_settings.show_replies": "Җаваплар күрсәтү",
"home.hide_announcements": "Игъланнарны яшерү",
@@ -313,8 +296,6 @@
"lists.replies_policy.none": "Һичкем",
"lists.subheading": "Исемлегегегезләр",
"load_pending": "{count, plural, one {# яңа элемент} other {# яңа элемент}}",
- "mute_modal.duration": "Дәвамлык",
- "mute_modal.indefinite": "Билгесез",
"navigation_bar.about": "Проект турында",
"navigation_bar.blocks": "Блокланган кулланучылар",
"navigation_bar.bookmarks": "Кыстыргычлар",
@@ -322,7 +303,6 @@
"navigation_bar.compose": "Compose new toot",
"navigation_bar.direct": "Хосусый искә алулар",
"navigation_bar.domain_blocks": "Hidden domains",
- "navigation_bar.edit_profile": "Профильны үзгәртү",
"navigation_bar.explore": "Күзәтү",
"navigation_bar.lists": "Исемлекләр",
"navigation_bar.logout": "Чыгу",
@@ -376,9 +356,6 @@
"poll_button.add_poll": "Сораштыруны өстәү",
"poll_button.remove_poll": "Сораштыруны бетерү",
"privacy.change": "Adjust status privacy",
- "privacy.direct.short": "Direct",
- "privacy.private.short": "Followers-only",
- "privacy.public.long": "Һәркемгә ачык",
"privacy.public.short": "Һәркемгә ачык",
"privacy_policy.last_updated": "Соңгы яңарту {date}",
"privacy_policy.title": "Хосусыйлык Сәясәте",
@@ -441,7 +418,6 @@
"status.delete": "Бетерү",
"status.direct_indicator": "Хосусый искә алу",
"status.edit": "Үзгәртү",
- "status.edited": "{date} көнне төзәтте",
"status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
"status.embed": "Веб-биткә кертү",
"status.filtered": "Сөзелгән",
@@ -473,14 +449,12 @@
"time_remaining.seconds": "{number, plural, one {# секунд} other {# секунд}} калды",
"timeline_hint.resources.statuses": "Older toots",
"trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
- "units.short.billion": "{count}Млрд",
- "units.short.million": "{count}Млн",
- "units.short.thousand": "{count}М",
+ "units.short.billion": "{count} млрд",
+ "units.short.million": "{count} млн",
+ "units.short.thousand": "{count} мең",
"upload_form.audio_description": "Describe for people with hearing loss",
"upload_form.description": "Describe for the visually impaired",
- "upload_form.description_missing": "Тасвирлама өстәлмәде",
"upload_form.edit": "Үзгәртү",
- "upload_form.undo": "Бетерү",
"upload_form.video_description": "Describe for people with hearing loss or visual impairment",
"upload_modal.analyzing_picture": "Рәсемгә анализ ясау…",
"upload_modal.apply": "Куллан",
diff --git a/app/javascript/mastodon/locales/ug.json b/app/javascript/mastodon/locales/ug.json
index 6bb5ba0ebf95da..4120d4483b264c 100644
--- a/app/javascript/mastodon/locales/ug.json
+++ b/app/javascript/mastodon/locales/ug.json
@@ -17,7 +17,6 @@
"compose_form.spoiler.marked": "Text is hidden behind warning",
"compose_form.spoiler.unmarked": "Text is not hidden",
"confirmations.delete.message": "Are you sure you want to delete this status?",
- "confirmations.domain_block.confirm": "Hide entire domain",
"dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
"dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
"embed.instructions": "Embed this status on your website by copying the code below.",
@@ -76,8 +75,6 @@
"onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
"onboarding.steps.share_profile.title": "Share your profile",
"privacy.change": "Adjust status privacy",
- "privacy.direct.short": "Direct",
- "privacy.private.short": "Followers-only",
"report.placeholder": "Type or paste additional comments",
"report.submit": "Submit report",
"report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 5ec0da599b28a9..3a7f63206d37e7 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -89,7 +89,14 @@
"announcement.announcement": "Оголошення",
"attachments_list.unprocessed": "(не оброблено)",
"audio.hide": "Сховати аудіо",
- "autosuggest_hashtag.per_week": "{count} на тиждень",
+ "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": "Неможливо показати запитану сторінку. Це може бути спричинено помилкою у нашому коді, або через проблему сумісності з браузером.",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "Ваш обліковий запис не {locked}. Будь-який користувач може підписатися на вас та переглядати ваші дописи для підписників.",
"compose_form.lock_disclaimer.lock": "приватний",
"compose_form.placeholder": "Що у вас на думці?",
- "compose_form.poll.add_option": "Додати варіант",
"compose_form.poll.duration": "Тривалість опитування",
+ "compose_form.poll.multiple": "Кілька варіантів",
"compose_form.poll.option_placeholder": "Варіант {number}",
- "compose_form.poll.remove_option": "Видалити цей варіант",
+ "compose_form.poll.single": "Виберіть варіант",
"compose_form.poll.switch_to_multiple": "Дозволити вибір декількох відповідей",
"compose_form.poll.switch_to_single": "Перемкнути у режим вибору однієї відповіді",
+ "compose_form.poll.type": "Стиль",
"compose_form.publish": "Опублікувати",
"compose_form.publish_form": "Новий допис",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Зберегти зміни",
- "compose_form.sensitive.hide": "{count, plural, one {Позначити медіа делікатним} other {Позначити медіа делікатними}}",
- "compose_form.sensitive.marked": "{count, plural, one {Медіа позначене делікатним} other {Медіа позначені делікатними}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Медіа не позначене делікатним} other {Медіа не позначені делікатними}}",
+ "compose_form.reply": "Відповісти",
+ "compose_form.save_changes": "Оновити",
"compose_form.spoiler.marked": "Прибрати попередження про вміст",
"compose_form.spoiler.unmarked": "Додати попередження про вміст",
- "compose_form.spoiler_placeholder": "Напишіть своє попередження тут",
+ "compose_form.spoiler_placeholder": "Попередження про вміст (необов'язково)",
"confirmation_modal.cancel": "Скасувати",
- "confirmations.block.block_and_report": "Заблокувати та поскаржитися",
"confirmations.block.confirm": "Заблокувати",
- "confirmations.block.message": "Ви впевнені, що хочете заблокувати {name}?",
"confirmations.cancel_follow_request.confirm": "Відкликати запит",
"confirmations.cancel_follow_request.message": "Ви дійсно бажаєте відкликати запит на стеження за {name}?",
"confirmations.delete.confirm": "Видалити",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "Ви впевнені, що хочете видалити цей список назавжди?",
"confirmations.discard_edit_media.confirm": "Відкинути",
"confirmations.discard_edit_media.message": "У вас є незбережені зміни в описі медіа або попереднього перегляду, все одно відкинути їх?",
- "confirmations.domain_block.confirm": "Заблокувати весь домен",
+ "confirmations.domain_block.confirm": "Блокувати сервер",
"confirmations.domain_block.message": "Ви точно, точно впевнені, що хочете заблокувати весь домен {domain}? У більшості випадків для нормальної роботи краще заблокувати або приховати лише деяких користувачів. Ви не зможете бачити контент з цього домену у будь-яких стрічках або ваших сповіщеннях. Ваші підписники з цього домену будуть відписані від вас.",
"confirmations.edit.confirm": "Змінити",
"confirmations.edit.message": "Редагування перезапише повідомлення, яке ви зараз пишете. Ви впевнені, що хочете продовжити?",
"confirmations.logout.confirm": "Вийти",
"confirmations.logout.message": "Ви впевнені, що хочете вийти?",
"confirmations.mute.confirm": "Приховати",
- "confirmations.mute.explanation": "Це сховає дописи від них і дописи зі згадками про них, проте вони все одно матимуть змогу бачити ваші дописи й підписуватися на вас.",
- "confirmations.mute.message": "Ви впевнені, що хочете приховати {name}?",
"confirmations.redraft.confirm": "Видалити та виправити",
"confirmations.redraft.message": "Ви впевнені, що хочете видалити цей допис та переписати його? Додавання у вибране та поширення буде втрачено, а відповіді на оригінальний допис залишаться без першоджерела.",
"confirmations.reply.confirm": "Відповісти",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "Ці дописи з цього та інших серверів децентралізованої мережі зараз набирають популярності на цьому сервері. Новіші дописи з частішим поширенням та додаванням до вподобаного мають вищий рейтинг.",
"dismissable_banner.explore_tags": "Ці хештеги зараз набирають популярності серед людей на цьому та інших серверах децентралізованої мережі. Хештеги, які використовуються більшою кількістю людей, мають вищий рейтинг.",
"dismissable_banner.public_timeline": "Це найновіші загальнодоступні дописи від людей в соціальній мережі, на які підписані люди в {domain}.",
+ "domain_block_modal.block": "Блокувати сервер",
+ "domain_block_modal.block_account_instead": "Блокувати @{name} натомість",
+ "domain_block_modal.they_can_interact_with_old_posts": "Люди з цього сервера можуть взаємодіяти зі своїми старими дописами.",
+ "domain_block_modal.they_cant_follow": "Ніхто з цього сервера не може слідкувати за вами.",
+ "domain_block_modal.they_wont_know": "Вони не знають, що їх заблоковано.",
+ "domain_block_modal.title": "Заблокувати домен?",
+ "domain_block_modal.you_will_lose_followers": "Усіх ваших підписників з цього сервера буде вилучено.",
+ "domain_block_modal.you_wont_see_posts": "Ви не бачитимете дописів і сповіщень від користувачів на цьому сервері.",
+ "domain_pill.activitypub_lets_connect": "Це дозволяє вам спілкуватися та взаємодіяти з людьми не лише на Mastodon, але й у різних соціальних додатках.",
+ "domain_pill.activitypub_like_language": "ActivityPub - це як мова, якою Мастодонт розмовляє з іншими соціальними мережами.",
+ "domain_pill.server": "Сервер",
+ "domain_pill.their_handle": "Їхня адреса:",
+ "domain_pill.their_server": "Їхній цифровий дім, де живуть усі їхні пости.",
+ "domain_pill.their_username": "Їхній унікальний ідентифікатор на їхньому сервері. Ви можете знайти користувачів з однаковими іменами на різних серверах.",
+ "domain_pill.username": "Ім'я користувача",
+ "domain_pill.whats_in_a_handle": "Що є в адресі?",
+ "domain_pill.who_they_are": "Оскільки дескриптори вказують, хто це і де він знаходиться, ви можете взаємодіяти з людьми через соціальну мережу платформ на основі .",
+ "domain_pill.who_you_are": "Оскільки ваш нікнейм вказує, хто ви та де ви, люди можуть взаємодіяти з вами через соціальну мережу платформ на основі .",
+ "domain_pill.your_handle": "Ваша адреса:",
+ "domain_pill.your_server": "Ваш цифровий дім, де живуть усі ваші публікації. Не подобається цей? Перенесіть сервери в будь-який час і залучайте своїх підписників.",
+ "domain_pill.your_username": "Ваш унікальний ідентифікатор на цьому сервері. Ви можете знайти користувачів з однаковими іменами на різних серверах.",
"embed.instructions": "Вбудуйте цей допис до вашого вебсайту, скопіювавши код нижче.",
"embed.preview": "Ось який вигляд це матиме:",
"emoji_button.activity": "Діяльність",
@@ -244,6 +266,7 @@
"empty_column.list": "Цей список порожній. Коли його учасники додадуть нові дописи, вони з'являться тут.",
"empty_column.lists": "У вас ще немає списків. Коли ви їх створите, вони з'являться тут.",
"empty_column.mutes": "Ви ще не приховали жодного користувача.",
+ "empty_column.notification_requests": "Усе чисто! Тут нічого немає. Коли ви отримаєте нові сповіщення, вони з'являться тут відповідно до ваших налаштувань.",
"empty_column.notifications": "У вас ще немає сповіщень. Коли інші люди почнуть взаємодіяти з вами, ви побачите їх тут.",
"empty_column.public": "Тут поки нічого немає! Опублікуйте щось, або вручну підпишіться на користувачів інших серверів, щоб заповнити стрічку",
"error.unexpected_crash.explanation": "Через помилку у нашому коді або несумісність браузера, ця сторінка не може бути зображена коректно.",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "Використати наявну категорію або створити нову",
"filter_modal.select_filter.title": "Фільтрувати цей допис",
"filter_modal.title.status": "Фільтрувати допис",
+ "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentions}}",
+ "filtered_notifications_banner.pending_requests": "Сповіщення від {count, plural, =0 {жодної особи} one {однієї особи} few {# осіб} many {# осіб} other {# особи}}, котрих ви можете знати",
+ "filtered_notifications_banner.title": "Відфільтровані сповіщення",
"firehose.all": "Всі",
"firehose.local": "Цей сервер",
"firehose.remote": "Інші сервери",
"follow_request.authorize": "Авторизувати",
"follow_request.reject": "Відмовити",
"follow_requests.unlocked_explanation": "Хоча ваш обліковий запис не заблоковано, персонал {domain} припускає, що, можливо, ви хотіли б переглянути ці запити на підписку.",
+ "follow_suggestions.curated_suggestion": "Відібрано командою",
+ "follow_suggestions.dismiss": "Більше не показувати",
+ "follow_suggestions.featured_longer": "Вибрано командою {domain} вручну",
+ "follow_suggestions.friends_of_friends_longer": "Популярні серед людей, за якими ви слідкуєте",
+ "follow_suggestions.hints.featured": "Цей профіль був обраний командою {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "Цей профіль популярний серед тих людей, на яких ви підписані.",
+ "follow_suggestions.hints.most_followed": "За цим профілем один з найпопулярніших на {domain}.",
+ "follow_suggestions.hints.most_interactions": "Нещодавно цей профіль отримав багато уваги на {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Цей профіль схожий на профілі, за якими ви стежили останнім часом.",
+ "follow_suggestions.personalized_suggestion": "Персоналізована пропозиція",
+ "follow_suggestions.popular_suggestion": "Популярна пропозиція",
+ "follow_suggestions.popular_suggestion_longer": "Популярно на {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Схожі на профілі, за якими ви нещодавно стежили",
+ "follow_suggestions.view_all": "Переглянути все",
+ "follow_suggestions.who_to_follow": "На кого підписатися",
"followed_tags": "Відстежувані хештеґи",
"footer.about": "Про проєкт",
"footer.directory": "Каталог профілів",
@@ -306,13 +347,8 @@
"hashtag.follow": "Стежити за хештегом",
"hashtag.unfollow": "Не стежити за хештегом",
"hashtags.and_other": "…і {count, plural, other {ще #}}",
- "home.actions.go_to_explore": "Переглянути тенденції",
- "home.actions.go_to_suggestions": "Знайти людей, аби підписатися",
- "home.column_settings.basic": "Основні",
"home.column_settings.show_reblogs": "Показувати поширення",
"home.column_settings.show_replies": "Показувати відповіді",
- "home.explore_prompt.body": "Ваша домашня стрічка буде сумішшю дописів з обраних для стеження хештегів, людей і поширених ними дописів. Якщо цього замало, ви також можете:",
- "home.explore_prompt.title": "Це ваша домашня база у Mastodon.",
"home.hide_announcements": "Приховати оголошення",
"home.pending_critical_update.body": "Якнайшвидше оновіть свій сервер Mastodon!",
"home.pending_critical_update.link": "Переглянути оновлення",
@@ -396,9 +432,15 @@
"loading_indicator.label": "Завантаження…",
"media_gallery.toggle_visible": "{number, plural, one {Приховати зображення} other {Приховати зображення}}",
"moved_to_account_banner.text": "Ваш обліковий запис {disabledAccount} наразі вимкнений, оскільки вас перенесено до {movedToAccount}.",
- "mute_modal.duration": "Тривалість",
- "mute_modal.hide_notifications": "Сховати сповіщення цього користувача?",
- "mute_modal.indefinite": "Невизначений строк",
+ "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": "Заблоковані користувачі",
@@ -408,7 +450,6 @@
"navigation_bar.direct": "Особисті згадки",
"navigation_bar.discover": "Дослідити",
"navigation_bar.domain_blocks": "Заблоковані домени",
- "navigation_bar.edit_profile": "Редагувати профіль",
"navigation_bar.explore": "Огляд",
"navigation_bar.favourites": "Уподобане",
"navigation_bar.filters": "Приховані слова",
@@ -432,11 +473,29 @@
"notification.follow": "{name} підписалися на вас",
"notification.follow_request": "{name} відправили запит на підписку",
"notification.mention": "{name} згадали вас",
+ "notification.moderation-warning.learn_more": "Дізнатися більше",
+ "notification.moderation_warning": "Ви отримали попередження модерації",
+ "notification.moderation_warning.action_delete_statuses": "Деякі з ваших дописів було видалено.",
+ "notification.moderation_warning.action_disable": "Ваш обліковий запис було вимкнено.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Деякі з ваших дописів були позначені як чутливі.",
+ "notification.moderation_warning.action_none": "Ваш обліковий запис отримав попередження модерації.",
+ "notification.moderation_warning.action_sensitive": "Відтепер ваші дописи будуть позначені як чутливі.",
+ "notification.moderation_warning.action_silence": "Ваш обліковий запис було обмежено.",
+ "notification.moderation_warning.action_suspend": "Ваш обліковий запис було заблоковано.",
"notification.own_poll": "Ваше опитування завершилося",
"notification.poll": "Опитування, у якому ви голосували, скінчилося",
"notification.reblog": "{name} поширює ваш допис",
+ "notification.relationships_severance_event": "Втрачено з'єднання з {name}",
+ "notification.relationships_severance_event.account_suspension": "Адміністратор з {from} призупинив {target}, що означає, що ви більше не можете отримувати оновлення від них або взаємодіяти з ними.",
+ "notification.relationships_severance_event.domain_block": "Адміністратор з {from} заблокував {target}, включаючи {followersCount} ваших підписників і {{followingCount, plural, one {# account} other {# accounts}}, на які ви підписані.",
+ "notification.relationships_severance_event.learn_more": "Дізнатися більше",
+ "notification.relationships_severance_event.user_domain_block": "Ви заблокували {target}, видаливши {followersCount} ваших підписників і {followingCount, plural, one {# account} other {# accounts}}, за якими ви стежите.",
"notification.status": "{name} щойно дописує",
"notification.update": "{name} змінює допис",
+ "notification_requests.accept": "Прийняти",
+ "notification_requests.dismiss": "Відхилити",
+ "notification_requests.notifications_from": "Сповіщення від {name}",
+ "notification_requests.title": "Відфільтровані сповіщення",
"notifications.clear": "Очистити сповіщення",
"notifications.clear_confirmation": "Ви впевнені, що хочете назавжди видалити всі сповіщення?",
"notifications.column_settings.admin.report": "Нові скарги:",
@@ -444,8 +503,7 @@
"notifications.column_settings.alert": "Сповіщення стільниці",
"notifications.column_settings.favourite": "Уподобане:",
"notifications.column_settings.filter_bar.advanced": "Показати всі категорії",
- "notifications.column_settings.filter_bar.category": "Панель швидкого фільтру",
- "notifications.column_settings.filter_bar.show_bar": "Показати панель фільтра",
+ "notifications.column_settings.filter_bar.category": "Панель швидкого фільтра",
"notifications.column_settings.follow": "Нові підписники:",
"notifications.column_settings.follow_request": "Нові запити на підписку:",
"notifications.column_settings.mention": "Згадки:",
@@ -471,6 +529,15 @@
"notifications.permission_denied": "Сповіщення стільниці недоступні через раніше відхилений запит дозволів для браузера",
"notifications.permission_denied_alert": "Сповіщення не можна ввімкнути оскільки у дозволі вже було відмовлено раніше",
"notifications.permission_required": "Сповіщення на стільниці не доступні, оскільки необхідний дозвіл не надано.",
+ "notifications.policy.filter_new_accounts.hint": "Створено впродовж {days, plural, one {одного} few {# днів} many {# днів} other {# дня}}",
+ "notifications.policy.filter_new_accounts_title": "Нові облікові записи",
+ "notifications.policy.filter_not_followers_hint": "Включаючи людей, які стежать за вами менше {days, plural, one {one day} other {# days}}",
+ "notifications.policy.filter_not_followers_title": "Люди не підписані на вас",
+ "notifications.policy.filter_not_following_hint": "Доки ви не схвалюєте їх вручну",
+ "notifications.policy.filter_not_following_title": "Люди, на яких ви не підписані",
+ "notifications.policy.filter_private_mentions_hint": "Відфільтровується, якщо це не відповідь на вашу власну згадку або якщо ви відстежуєте відправника",
+ "notifications.policy.filter_private_mentions_title": "Небажані приватні згадки",
+ "notifications.policy.title": "Відфільтрувати сповіщення від…",
"notifications_permission_banner.enable": "Увімкнути сповіщення стільниці",
"notifications_permission_banner.how_to_control": "Щоб отримувати сповіщення, коли Mastodon не відкрито, увімкніть сповіщення стільниці. Ви можете контролювати, які типи взаємодій створюють сповіщення через кнопку {icon} вгорі після їхнього увімкнення.",
"notifications_permission_banner.title": "Не проґавте нічого",
@@ -526,14 +593,15 @@
"poll_button.add_poll": "Додати опитування",
"poll_button.remove_poll": "Видалити опитування",
"privacy.change": "Змінити видимість допису",
- "privacy.direct.long": "Показати тільки згаданим користувачам",
- "privacy.direct.short": "Лише згадані люди",
- "privacy.private.long": "Показати тільки підписникам",
- "privacy.private.short": "Тільки для підписників",
- "privacy.public.long": "Видимий для всіх",
+ "privacy.direct.long": "Усі згадані в дописі",
+ "privacy.direct.short": "Певні люди",
+ "privacy.private.long": "Лише ваші підписники",
+ "privacy.private.short": "Підписники",
+ "privacy.public.long": "Усі з Mastodon",
"privacy.public.short": "Публічно",
- "privacy.unlisted.long": "Видимий для всіх, але не через можливості виявлення",
- "privacy.unlisted.short": "Прихований",
+ "privacy.unlisted.additional": "Має таку ж поведінку, як у людей, але повідомлення не з'являтимуться у стрічках або хештегах, оглядах, або пошуку Mastodon, навіть якщо ви використовуєте облікові записи.",
+ "privacy.unlisted.long": "Менше взаємодій з алгоритмами",
+ "privacy.unlisted.short": "Без додавання до стрічки",
"privacy_policy.last_updated": "Оновлено {date}",
"privacy_policy.title": "Політика приватності",
"recommended": "Рекомендовано",
@@ -551,7 +619,9 @@
"relative_time.minutes": "{number}х",
"relative_time.seconds": "{number}с",
"relative_time.today": "сьогодні",
+ "reply_indicator.attachments": "{count, plural, one {# вкладення} few {# вкладення} many {# вкладень} other {# вкладення}}",
"reply_indicator.cancel": "Скасувати",
+ "reply_indicator.poll": "Опитування",
"report.block": "Заблокувати",
"report.block_explanation": "Ви не будете бачити дописи цього користувача, а вони не зможуть бачити ваші дописи або підписуватися на вас. Вони будуть бачити, що ви їх заблокували.",
"report.categories.legal": "Правові положення",
@@ -644,10 +714,11 @@
"status.direct": "Особиста згадка @{name}",
"status.direct_indicator": "Особиста згадка",
"status.edit": "Редагувати",
- "status.edited": "Відредаговано {date}",
+ "status.edited": "Востаннє змінено {date}",
"status.edited_x_times": "Відредаговано {count, plural, one {{count} раз} few {{count} рази} many {{counter} разів} other {{counter} разів}}",
"status.embed": "Вбудувати",
"status.favourite": "Уподобане",
+ "status.favourites": "{count, plural, one {вподобання} few {вподобання} many {вподобань} other {вподобання}}",
"status.filter": "Фільтрувати цей допис",
"status.filtered": "Відфільтровано",
"status.hide": "Сховати допис",
@@ -668,6 +739,7 @@
"status.reblog": "Поширити",
"status.reblog_private": "Поширити для початкової аудиторії",
"status.reblogged_by": "{name} поширює",
+ "status.reblogs": "{count, plural, one {поширення} few {поширення} many {поширень} other {поширення}}",
"status.reblogs.empty": "Ніхто ще не поширив цей допис. Коли хтось це зроблять, вони будуть зображені тут.",
"status.redraft": "Видалити та виправити",
"status.remove_bookmark": "Видалити закладку",
@@ -715,10 +787,8 @@
"upload_error.poll": "Не можна завантажувати файли до опитувань.",
"upload_form.audio_description": "Опишіть для людей із вадами слуху",
"upload_form.description": "Опишіть для людей з вадами зору",
- "upload_form.description_missing": "Немає опису",
"upload_form.edit": "Змінити",
"upload_form.thumbnail": "Змінити мініатюру",
- "upload_form.undo": "Видалити",
"upload_form.video_description": "Опишіть для людей із вадами слуху або зору",
"upload_modal.analyzing_picture": "Аналізуємо зображення…",
"upload_modal.apply": "Застосувати",
diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index 563b2dedf8e32b..37f156c28fc9f6 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -72,7 +72,6 @@
"alert.unexpected.message": "ایک غیر متوقع سہو ہوا ہے.",
"alert.unexpected.title": "ا رے!",
"announcement.announcement": "اعلان",
- "autosuggest_hashtag.per_week": "{count} فی ہفتہ",
"boost_modal.combo": "آئیندہ یہ نہ دیکھنے کیلئے آپ {combo} دبا سکتے ہیں",
"bundle_column_error.error.title": "اوف، نہیں!",
"bundle_column_error.network.title": "نیٹ ورک کی خرابی",
@@ -115,37 +114,22 @@
"compose_form.lock_disclaimer": "آپ کا اکاؤنٹ {locked} نہیں ہے. کوئی بھی آپ کے مخصوص برائے پیروکار ٹوٹ دیکھنے کی خاطر آپ کی پیروی کر سکتا ہے.",
"compose_form.lock_disclaimer.lock": "مقفل",
"compose_form.placeholder": "آپ کیا سوچ رہے ہیں؟",
- "compose_form.poll.add_option": "انتخاب شامل کریں",
"compose_form.poll.duration": "مدتِ رائے",
- "compose_form.poll.option_placeholder": "انتخاب {number}",
- "compose_form.poll.remove_option": "یہ انتخاب ہٹا دیں",
"compose_form.poll.switch_to_multiple": "متعدد انتخاب کی اجازت دینے کے لیے پول تبدیل کریں",
"compose_form.poll.switch_to_single": "کسی ایک انتخاب کے لیے پول تبدیل کریں",
- "compose_form.publish": "اشاعت کردہ",
"compose_form.publish_form": "اشاعت کریں",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "تبدیلیاں محفوظ کریں",
- "compose_form.sensitive.hide": "وسائل کو حساس نشاندہ کریں",
- "compose_form.sensitive.marked": "وسائل حساس نشاندہ ہے",
- "compose_form.sensitive.unmarked": "{count, plural, one {میڈیا کو حساس کے طور پر نشان زد نہیں کیا گیا ہے} other {میڈیا کو حساس کے طور پر نشان زد نہیں کیا گیا ہے}}",
"compose_form.spoiler.marked": "Text is hidden behind warning",
"compose_form.spoiler.unmarked": "Text is not hidden",
- "compose_form.spoiler_placeholder": "اپنی وارننگ یہاں لکھیں",
"confirmation_modal.cancel": "منسوخ",
- "confirmations.block.block_and_report": "شکایت کریں اور بلاک کریں",
"confirmations.block.confirm": "بلاک",
- "confirmations.block.message": "کیا واقعی آپ {name} کو بلاک کرنا چاہتے ہیں؟",
"confirmations.delete.confirm": "ڈیلیٹ",
"confirmations.delete.message": "Are you sure you want to delete this status?",
"confirmations.delete_list.confirm": "ڈیلیٹ",
"confirmations.delete_list.message": "کیا آپ واقعی اس فہرست کو مستقل طور پر ڈیلیٹ کرنا چاہتے ہیں؟",
- "confirmations.domain_block.confirm": "Hide entire domain",
"confirmations.domain_block.message": "کیا آپ واقعی، واقعی یقین رکھتے ہیں کہ آپ پورے {domain} کو بلاک کرنا چاہتے ہیں؟ زیادہ تر معاملات میں چند ٹارگٹیڈ بلاکس یا خاموش کرنا کافی اور افضل ہیں۔ آپ اس ڈومین کا مواد کسی بھی عوامی ٹائم لائنز یا اپنی اطلاعات میں نہیں دیکھیں گے۔ اس ڈومین سے آپ کے پیروکاروں کو ہٹا دیا جائے گا۔",
"confirmations.logout.confirm": "لاگ آؤٹ",
"confirmations.logout.message": "کیا واقعی آپ لاگ آؤٹ ہونا چاہتے ہیں؟",
"confirmations.mute.confirm": "خاموش",
- "confirmations.mute.explanation": "یہ ان سے پوسٹس اور ان کا تذکرہ کرنے والی پوسٹس کو چھپائے گا، لیکن یہ پھر بھی انہیں آپ کی پوسٹس دیکھنے اور آپ کی پیروی کرنے کی اجازت دے گا۔",
- "confirmations.mute.message": "کیا واقعی آپ {name} کو خاموش کرنا چاہتے ہیں؟",
"confirmations.redraft.confirm": "ڈیلیٹ کریں اور دوبارہ ڈرافٹ کریں",
"confirmations.reply.confirm": "جواب دیں",
"confirmations.reply.message": "ابھی جواب دینے سے وہ پیغام اوور رائٹ ہو جائے گا جو آپ فی الحال لکھ رہے ہیں۔ کیا آپ واقعی آگے بڑھنا چاہتے ہیں؟",
@@ -200,7 +184,6 @@
"hashtag.column_settings.tag_mode.any": "ان میں سے کوئی",
"hashtag.column_settings.tag_mode.none": "ان میں سے کوئی بھی نہیں",
"hashtag.column_settings.tag_toggle": "اس کالم کے لئے مزید ٹیگز شامل کریں",
- "home.column_settings.basic": "بنیادی",
"home.column_settings.show_reblogs": "افزائشات دکھائیں",
"home.column_settings.show_replies": "جوابات دکھائیں",
"intervals.full.days": "{number, plural, one {# روز} other {# روز}}",
@@ -235,14 +218,12 @@
"keyboard_shortcuts.toot": "to start a brand new toot",
"keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
"keyboard_shortcuts.up": "to move up in the list",
- "mute_modal.indefinite": "غیر معینہ",
"navigation_bar.blocks": "مسدود صارفین",
"navigation_bar.bookmarks": "بُک مارکس",
"navigation_bar.community_timeline": "مقامی ٹائم لائن",
"navigation_bar.compose": "Compose new toot",
"navigation_bar.discover": "دریافت کریں",
"navigation_bar.domain_blocks": "Hidden domains",
- "navigation_bar.edit_profile": "پروفائل میں ترمیم کریں",
"navigation_bar.filters": "خاموش کردہ الفاظ",
"navigation_bar.follow_requests": "پیروی کی درخواستیں",
"navigation_bar.follows_and_followers": "پیروی کردہ اور پیروکار",
@@ -265,7 +246,6 @@
"notifications.clear": "اطلاعات ہٹائیں",
"notifications.clear_confirmation": "کیا آپ واقعی اپنی تمام اطلاعات کو صاف کرنا چاہتے ہیں؟",
"notifications.column_settings.alert": "ڈیسک ٹاپ اطلاعات",
- "notifications.column_settings.filter_bar.advanced": "تمام زمرے دکھائیں",
"notifications.column_settings.status": "New toots:",
"onboarding.actions.go_to_explore": "See what's trending",
"onboarding.actions.go_to_home": "Go to your home feed",
@@ -281,10 +261,6 @@
"onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
"onboarding.steps.share_profile.title": "Share your profile",
"privacy.change": "Adjust status privacy",
- "privacy.direct.long": "Post to mentioned users only",
- "privacy.direct.short": "Direct",
- "privacy.private.long": "Post to followers only",
- "privacy.private.short": "Followers-only",
"report.placeholder": "Type or paste additional comments",
"report.submit": "Submit report",
"report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/uz.json b/app/javascript/mastodon/locales/uz.json
index 8eeee42a5e68c2..77892914a42263 100644
--- a/app/javascript/mastodon/locales/uz.json
+++ b/app/javascript/mastodon/locales/uz.json
@@ -75,7 +75,6 @@
"announcement.announcement": "E'lonlar",
"attachments_list.unprocessed": "(qayta ishlanmagan)",
"audio.hide": "Audioni yashirish",
- "autosuggest_hashtag.per_week": "{count} haftasiga",
"boost_modal.combo": "Keyingi safar buni oʻtkazib yuborish uchun {combo} tugmasini bosishingiz mumkin",
"bundle_column_error.copy_stacktrace": "Xato hisobotini nusxalash",
"bundle_column_error.error.body": "Soʻralgan sahifani koʻrsatib boʻlmadi. Buning sababi bizning kodimizdagi xato yoki brauzer mosligi muammosi bo'lishi mumkin.",
@@ -126,26 +125,14 @@
"compose_form.lock_disclaimer": "Hisobingiz {locked}. Faqat obunachilarga moʻljallangan postlaringizni koʻrish uchun har kim sizni kuzatishi mumkin.",
"compose_form.lock_disclaimer.lock": "yopilgan",
"compose_form.placeholder": "Xalolizda nima?",
- "compose_form.poll.add_option": "Tanlov qo'shing",
"compose_form.poll.duration": "So‘rov muddati",
- "compose_form.poll.option_placeholder": "Tanlov {number}",
- "compose_form.poll.remove_option": "Olib tashlash",
"compose_form.poll.switch_to_multiple": "Bir nechta tanlovga ruxsat berish uchun so'rovnomani o'zgartirish",
"compose_form.poll.switch_to_single": "Yagona tanlovga ruxsat berish uchun so‘rovnomani o‘zgartirish",
- "compose_form.publish": "Nashr qilish",
"compose_form.publish_form": "Nashr qilish",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "O‘zgarishlarni saqlash",
- "compose_form.sensitive.hide": "{count, plural, one {Mediani sezgir deb belgilang} other {Medialarni sezgir deb belgilang}}",
- "compose_form.sensitive.marked": "{count, plural, one {Mediani sezgir deb belgilang} other {Medialarni sezgir deb belgilang}}",
- "compose_form.sensitive.unmarked": "{count, plural, one {Mediani sezgir deb belgilang} other {Medialarni sezgir deb belgilang}}",
"compose_form.spoiler.marked": "Kontent ogohlantirishini olib tashlang",
"compose_form.spoiler.unmarked": "Kontent haqida ogohlantirish qo'shing",
- "compose_form.spoiler_placeholder": "Sharhingizni bu erga yozing",
"confirmation_modal.cancel": "Bekor qilish",
- "confirmations.block.block_and_report": "Bloklash va hisobot berish",
"confirmations.block.confirm": "Bloklash",
- "confirmations.block.message": "Haqiqatan ham {name}ni bloklamoqchimisiz?",
"confirmations.cancel_follow_request.confirm": "Bekor qilish",
"confirmations.cancel_follow_request.message": "Haqiqatan ham {name}ga obuna boʻlish soʻrovingizni qaytarib olmoqchimisiz?",
"confirmations.delete.confirm": "Oʻchirish",
@@ -154,13 +141,10 @@
"confirmations.delete_list.message": "Haqiqatan ham bu roʻyxatni butunlay oʻchirib tashlamoqchimisiz?",
"confirmations.discard_edit_media.confirm": "Bekor qilish",
"confirmations.discard_edit_media.message": "Sizda media tavsifi yoki oldindan ko‘rishda saqlanmagan o‘zgarishlar bor, ular baribir bekor qilinsinmi?",
- "confirmations.domain_block.confirm": "Butun domenni bloklash",
"confirmations.domain_block.message": "Haqiqatan ham, {domain} ni butunlay bloklamoqchimisiz? Ko'pgina hollarda bir nechta maqsadli bloklar yoki ovozni o'chirish etarli va afzaldir. Siz oʻsha domendagi kontentni hech qanday umumiy vaqt jadvallarida yoki bildirishnomalaringizda koʻrmaysiz. Bu domendagi obunachilaringiz olib tashlanadi.",
"confirmations.logout.confirm": "Chiqish",
"confirmations.logout.message": "Chiqishingizga aminmisiz?",
"confirmations.mute.confirm": "Ovozsiz",
- "confirmations.mute.explanation": "Bu ulardagi postlar va ular haqida eslatib o'tilgan postlarni yashiradi, ammo bu ularga sizning postlaringizni ko'rish va sizni kuzatish imkonini beradi.",
- "confirmations.mute.message": "Haqiqatan ham {name} ovozini o‘chirib qo‘ymoqchimisiz?",
"confirmations.redraft.confirm": "O'chirish va qayta loyihalash",
"confirmations.reply.confirm": "Javob berish",
"confirmations.reply.message": "Hozir javob bersangiz, hozir yozayotgan xabaringiz ustidan yoziladi. Davom etishni xohlaysizmi?",
@@ -266,7 +250,6 @@
"hashtag.column_settings.tag_toggle": "Ushbu ustun uchun qo'shimcha teglarni qo'shing",
"hashtag.follow": "Hashtagni kuzatish",
"hashtag.unfollow": "Hashtagni kuzatishni to'xtatish",
- "home.column_settings.basic": "Asos",
"home.column_settings.show_reblogs": "Boostlarni ko'rish",
"home.column_settings.show_replies": "Javoblarni ko'rish",
"home.hide_announcements": "E'lonlarni yashirish",
@@ -326,9 +309,6 @@
"load_pending": "{count, plural, one {# yangi element} other {# yangi elementlar}}",
"media_gallery.toggle_visible": "{number, plural, one {Rasmni yashirish} other {Rasmlarni yashirish}}",
"moved_to_account_banner.text": "{movedToAccount} hisobiga koʻchganingiz uchun {disabledAccount} hisobingiz hozirda oʻchirib qoʻyilgan.",
- "mute_modal.duration": "Davomiyligi",
- "mute_modal.hide_notifications": "Bu foydalanuvchidan bildirishnomalar berkitilsinmi?",
- "mute_modal.indefinite": "Cheksiz",
"navigation_bar.about": "Haqida",
"navigation_bar.blocks": "Bloklangan foydalanuvchilar",
"navigation_bar.bookmarks": "Xatcho‘plar",
@@ -336,7 +316,6 @@
"navigation_bar.compose": "Yangi post yozing",
"navigation_bar.discover": "Kashf qilish",
"navigation_bar.domain_blocks": "Bloklangan domenlar",
- "navigation_bar.edit_profile": "Profilni tahrirlash",
"navigation_bar.explore": "O‘rganish",
"navigation_bar.filters": "E'tiborga olinmagan so'zlar",
"navigation_bar.followed_tags": "Kuzatilgan hashtaglar",
@@ -368,8 +347,6 @@
"onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
"onboarding.steps.share_profile.title": "Share your profile",
"privacy.change": "Adjust status privacy",
- "privacy.direct.short": "Direct",
- "privacy.private.short": "Followers-only",
"report.placeholder": "Type or paste additional comments",
"report.submit": "Submit report",
"report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index c623caa3fb6424..56b2f7e52cc196 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -89,7 +89,14 @@
"announcement.announcement": "Có gì mới?",
"attachments_list.unprocessed": "(chưa xử lí)",
"audio.hide": "Ẩn âm thanh",
- "autosuggest_hashtag.per_week": "{count} mỗi tuần",
+ "block_modal.remote_users_caveat": "Chúng tôi sẽ yêu cầu {domain} tôn trọng quyết định của bạn. Tuy nhiên, việc tuân thủ không được đảm bảo vì một số máy chủ có thể xử lý việc chặn theo cách khác nhau. Các tút công khai vẫn có thể hiển thị đối với người dùng chưa đăng nhập.",
+ "block_modal.show_less": "Thu gọn",
+ "block_modal.show_more": "Hiện thêm",
+ "block_modal.they_cant_mention": "Họ không thể nhắc đến hay theo dõi bạn.",
+ "block_modal.they_cant_see_posts": "Bạn và họ sẽ không nhìn thấy tút của nhau.",
+ "block_modal.they_will_know": "Họ sẽ biết đã bị bạn chặn.",
+ "block_modal.title": "Chặn người này?",
+ "block_modal.you_wont_see_mentions": "Bạn sẽ không nhìn thấy tút có nhắc đến họ.",
"boost_modal.combo": "Nhấn {combo} để bỏ qua bước này",
"bundle_column_error.copy_stacktrace": "Sao chép báo lỗi",
"bundle_column_error.error.body": "Không thể hiện trang này. Đây có thể là một lỗi trong mã lập trình của chúng tôi, hoặc là vấn đề tương thích của trình duyệt.",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "Tài khoản của bạn không {locked}. Bất cứ ai cũng có thể theo dõi và xem tút riêng tư của bạn.",
"compose_form.lock_disclaimer.lock": "khóa",
"compose_form.placeholder": "Bạn đang nghĩ gì?",
- "compose_form.poll.add_option": "Thêm lựa chọn",
"compose_form.poll.duration": "Hết hạn vào",
+ "compose_form.poll.multiple": "Nhiều lựa chọn",
"compose_form.poll.option_placeholder": "Lựa chọn {number}",
- "compose_form.poll.remove_option": "Xóa lựa chọn này",
+ "compose_form.poll.single": "Chọn một",
"compose_form.poll.switch_to_multiple": "Có thể chọn nhiều lựa chọn",
"compose_form.poll.switch_to_single": "Chỉ cho phép chọn duy nhất một lựa chọn",
+ "compose_form.poll.type": "Loại",
"compose_form.publish": "Đăng",
"compose_form.publish_form": "Đăng",
- "compose_form.publish_loud": "{publish}!",
- "compose_form.save_changes": "Lưu thay đổi",
- "compose_form.sensitive.hide": "{count, plural, other {Đánh dấu nội dung nhạy cảm}}",
- "compose_form.sensitive.marked": "{count, plural, other {Nội dung này nhạy cảm}}",
- "compose_form.sensitive.unmarked": "{count, plural, other {Nội dung này bình thường}}",
+ "compose_form.reply": "Trả lời",
+ "compose_form.save_changes": "Cập nhật",
"compose_form.spoiler.marked": "Hủy nội dung ẩn",
"compose_form.spoiler.unmarked": "Tạo nội dung ẩn",
- "compose_form.spoiler_placeholder": "Lời dẫn cho nội dung ẩn",
+ "compose_form.spoiler_placeholder": "Nội dung ẩn (tùy chọn)",
"confirmation_modal.cancel": "Hủy bỏ",
- "confirmations.block.block_and_report": "Chặn & Báo cáo",
"confirmations.block.confirm": "Chặn",
- "confirmations.block.message": "Bạn có thật sự muốn chặn {name}?",
"confirmations.cancel_follow_request.confirm": "Thu hồi yêu cầu",
"confirmations.cancel_follow_request.message": "Bạn có chắc muốn thu hồi yêu cầu theo dõi của bạn với {name}?",
"confirmations.delete.confirm": "Xóa bỏ",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "Bạn thật sự muốn xóa vĩnh viễn danh sách này?",
"confirmations.discard_edit_media.confirm": "Bỏ qua",
"confirmations.discard_edit_media.message": "Bạn chưa lưu thay đổi đối với phần mô tả hoặc bản xem trước của media, vẫn bỏ luôn?",
- "confirmations.domain_block.confirm": "Ẩn toàn bộ máy chủ",
+ "confirmations.domain_block.confirm": "Chặn máy chủ",
"confirmations.domain_block.message": "Bạn thật sự muốn ẩn toàn bộ nội dung từ {domain}? Sẽ hợp lý hơn nếu bạn chỉ chặn hoặc ẩn một vài tài khoản cụ thể. Ẩn toàn bộ nội dung từ máy chủ sẽ khiến bạn không còn thấy nội dung từ máy chủ đó ở bất kỳ nơi nào, kể cả thông báo. Người quan tâm bạn từ máy chủ đó cũng sẽ bị xóa luôn.",
"confirmations.edit.confirm": "Sửa",
"confirmations.edit.message": "Nội dung tút cũ sẽ bị ghi đè, bạn có tiếp tục?",
"confirmations.logout.confirm": "Đăng xuất",
"confirmations.logout.message": "Bạn có thật sự muốn thoát?",
"confirmations.mute.confirm": "Ẩn",
- "confirmations.mute.explanation": "Điều này sẽ khiến tút của họ và những tút có nhắc đến họ bị ẩn, tuy nhiên họ vẫn có thể xem tút của bạn và theo dõi bạn.",
- "confirmations.mute.message": "Bạn thật sự muốn ẩn {name}?",
"confirmations.redraft.confirm": "Xóa & viết lại",
"confirmations.redraft.message": "Bạn thật sự muốn xóa tút và viết lại? Điều này sẽ xóa mất những lượt thích và đăng lại của tút, cũng như những trả lời sẽ không còn nội dung gốc.",
"confirmations.reply.confirm": "Trả lời",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "Đây là những tút đang phổ biến trong mạng liên hợp của máy chủ này.",
"dismissable_banner.explore_tags": "Đây là những hashtag đang được sử dụng nhiều trong mạng liên hợp của máy chủ này.",
"dismissable_banner.public_timeline": "Đây là những tút công khai gần đây trong mạng liên hợp của máy chủ {domain}.",
+ "domain_block_modal.block": "Chặn máy chủ",
+ "domain_block_modal.block_account_instead": "Chỉ chặn {name}",
+ "domain_block_modal.they_can_interact_with_old_posts": "Thành viên máy chủ này có thể tương tác với các tút cũ của bạn.",
+ "domain_block_modal.they_cant_follow": "Không ai trên máy chủ này có thể theo dõi bạn.",
+ "domain_block_modal.they_wont_know": "Họ sẽ không biết đã bị bạn chặn.",
+ "domain_block_modal.title": "Chặn máy chủ?",
+ "domain_block_modal.you_will_lose_followers": "Những người theo dõi bạn ở máy chủ này sẽ bị xóa.",
+ "domain_block_modal.you_wont_see_posts": "Bạn sẽ không thấy tút hoặc thông báo từ thành viên máy chủ này.",
+ "domain_pill.activitypub_lets_connect": "Nó cho phép bạn kết nối và tương tác với mọi người không chỉ trên Mastodon mà còn trên các ứng dụng xã hội khác.",
+ "domain_pill.activitypub_like_language": "ActivityPub giống như ngôn ngữ Mastodon giao tiếp với các mạng xã hội khác.",
+ "domain_pill.server": "Máy chủ",
+ "domain_pill.their_handle": "Địa chỉ Mastodon:",
+ "domain_pill.their_server": "Ngôi nhà kỹ thuật số, nơi lưu giữ tút của ai đó.",
+ "domain_pill.their_username": "Danh tính duy nhất của họ trên máy chủ này. Có thể có tên người dùng giống nhau trên các máy chủ khác.",
+ "domain_pill.username": "Tên người dùng",
+ "domain_pill.whats_in_a_handle": "Địa chỉ Mastodon là gì?",
+ "domain_pill.who_they_are": "Vì địa chỉ Mastodon cho biết một người là ai và họ ở đâu, nên bạn có thể tương tác với mọi người trên các nền tảng có .",
+ "domain_pill.who_you_are": "Vì địa chỉ Mastodon cho biết bạn là ai và bạn ở đâu, nên bạn có thể tương tác với mọi người trên các nền tảng có .",
+ "domain_pill.your_handle": "Địa chỉ Mastodon của bạn:",
+ "domain_pill.your_server": "Ngôi nhà kỹ thuật số, nơi lưu giữ tút của bạn. Không thích ở đây? Chuyển sang máy chủ khác và mang theo người theo dõi của bạn.",
+ "domain_pill.your_username": "Danh tính duy nhất của bạn trên máy chủ này. Có thể có tên người dùng giống bạn trên các máy chủ khác.",
"embed.instructions": "Sao chép đoạn mã dưới đây và chèn vào trang web của bạn.",
"embed.preview": "Nó sẽ hiển thị như vầy:",
"emoji_button.activity": "Hoạt động",
@@ -244,6 +266,7 @@
"empty_column.list": "Chưa có tút. Khi những người trong danh sách này đăng tút mới, chúng sẽ xuất hiện ở đây.",
"empty_column.lists": "Bạn chưa tạo danh sách nào.",
"empty_column.mutes": "Bạn chưa ẩn bất kỳ ai.",
+ "empty_column.notification_requests": "Sạch sẽ! Không còn gì ở đây. Khi bạn nhận được thông báo mới, chúng sẽ xuất hiện ở đây theo cài đặt của bạn.",
"empty_column.notifications": "Bạn chưa có thông báo nào. Hãy thử theo dõi hoặc nhắn riêng cho ai đó.",
"empty_column.public": "Trống trơn! Bạn hãy viết gì đó hoặc bắt đầu theo dõi những người khác",
"error.unexpected_crash.explanation": "Trang này có thể không hiển thị chính xác do lỗi lập trình Mastodon hoặc vấn đề tương thích trình duyệt.",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "Sử dụng một danh mục hiện có hoặc tạo một danh mục mới",
"filter_modal.select_filter.title": "Lọc tút này",
"filter_modal.title.status": "Lọc một tút",
+ "filtered_notifications_banner.mentions": "{count, plural, other {lượt nhắc}}",
+ "filtered_notifications_banner.pending_requests": "Thông báo từ {count, plural, =0 {không ai} other {# người}} bạn có thể biết",
+ "filtered_notifications_banner.title": "Thông báo đã lọc",
"firehose.all": "Toàn bộ",
"firehose.local": "Máy chủ này",
"firehose.remote": "Máy chủ khác",
- "follow_request.authorize": "Cho phép",
+ "follow_request.authorize": "Chấp nhận",
"follow_request.reject": "Từ chối",
"follow_requests.unlocked_explanation": "Mặc dù tài khoản của bạn đang ở chế độ công khai, quản trị viên của {domain} vẫn tin rằng bạn sẽ muốn xem lại yêu cầu theo dõi từ những người khác.",
+ "follow_suggestions.curated_suggestion": "Gợi ý từ máy chủ",
+ "follow_suggestions.dismiss": "Không hiện lại",
+ "follow_suggestions.featured_longer": "Tuyển chọn bởi {domain}",
+ "follow_suggestions.friends_of_friends_longer": "Nổi tiếng với những người mà bạn theo dõi",
+ "follow_suggestions.hints.featured": "Người này được đội ngũ {domain} đề xuất.",
+ "follow_suggestions.hints.friends_of_friends": "Người này nổi tiếng với những người bạn theo dõi.",
+ "follow_suggestions.hints.most_followed": "Người này được theo dõi nhiều nhất trên {domain}.",
+ "follow_suggestions.hints.most_interactions": "Người này đang thu hút sự chú ý trên {domain}.",
+ "follow_suggestions.hints.similar_to_recently_followed": "Người này có nét giống những người mà bạn theo dõi gần đây.",
+ "follow_suggestions.personalized_suggestion": "Gợi ý cá nhân hóa",
+ "follow_suggestions.popular_suggestion": "Những người nổi tiếng",
+ "follow_suggestions.popular_suggestion_longer": "Nổi tiếng trên {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Tương tự những người mà bạn theo dõi gần đây",
+ "follow_suggestions.view_all": "Xem tất cả",
+ "follow_suggestions.who_to_follow": "Gợi ý theo dõi",
"followed_tags": "Hashtag theo dõi",
"footer.about": "Giới thiệu",
"footer.directory": "Cộng đồng",
@@ -306,13 +347,8 @@
"hashtag.follow": "Theo dõi hashtag",
"hashtag.unfollow": "Bỏ theo dõi hashtag",
"hashtags.and_other": "…và {count, plural, other {# nữa}}",
- "home.actions.go_to_explore": "Khám phá xu hướng",
- "home.actions.go_to_suggestions": "Tìm người theo dõi",
- "home.column_settings.basic": "Tùy chỉnh",
"home.column_settings.show_reblogs": "Hiện những lượt đăng lại",
"home.column_settings.show_replies": "Hiện những tút dạng trả lời",
- "home.explore_prompt.body": "Bảng tin của bạn sẽ bao gồm các tút có hashtag bạn theo dõi, những người bạn theo dõi và các tút mà họ đăng lại. Lúc này có vẻ hơi trống, sao bạn không:",
- "home.explore_prompt.title": "Đây là ngôi nhà Mastodon của bạn.",
"home.hide_announcements": "Ẩn thông báo máy chủ",
"home.pending_critical_update.body": "Vui lòng cập nhật máy chủ Mastodon của bạn càng sớm càng tốt!",
"home.pending_critical_update.link": "Xem bản cập nhật",
@@ -358,7 +394,7 @@
"keyboard_shortcuts.my_profile": "mở hồ sơ của bạn",
"keyboard_shortcuts.notifications": "mở thông báo",
"keyboard_shortcuts.open_media": "mở ảnh hoặc video",
- "keyboard_shortcuts.pinned": "Open pinned posts list",
+ "keyboard_shortcuts.pinned": "mở những tút đã ghim",
"keyboard_shortcuts.profile": "mở trang của người đăng tút",
"keyboard_shortcuts.reply": "trả lời",
"keyboard_shortcuts.requests": "mở danh sách yêu cầu theo dõi",
@@ -378,6 +414,7 @@
"limited_account_hint.action": "Vẫn cứ xem",
"limited_account_hint.title": "Người này đã bị ẩn bởi quản trị viên của {domain}.",
"link_preview.author": "Bởi {name}",
+ "link_preview.more_from_author": "Thêm từ {name}",
"lists.account.add": "Thêm vào danh sách",
"lists.account.remove": "Xóa khỏi danh sách",
"lists.delete": "Xóa danh sách",
@@ -396,9 +433,15 @@
"loading_indicator.label": "Đang tải…",
"media_gallery.toggle_visible": "{number, plural, other {Ẩn hình ảnh}}",
"moved_to_account_banner.text": "Tài khoản {disabledAccount} của bạn hiện không khả dụng vì bạn đã chuyển sang {movedToAccount}.",
- "mute_modal.duration": "Thời hạn",
- "mute_modal.hide_notifications": "Ẩn thông báo từ người này?",
- "mute_modal.indefinite": "Vĩnh viễn",
+ "mute_modal.hide_from_notifications": "Ẩn thông báo",
+ "mute_modal.hide_options": "Tùy chọn ẩn",
+ "mute_modal.indefinite": "Cho tới khi bỏ ẩn",
+ "mute_modal.show_options": "Hiển thị tùy chọn",
+ "mute_modal.they_can_mention_and_follow": "Họ có thể nhắc đến và theo dõi bạn, nhưng bạn không thấy họ.",
+ "mute_modal.they_wont_know": "Họ sẽ không biết đã bị bạn ẩn.",
+ "mute_modal.title": "Ẩn người này?",
+ "mute_modal.you_wont_see_mentions": "Bạn sẽ không nhìn thấy tút có nhắc đến họ.",
+ "mute_modal.you_wont_see_posts": "Bạn sẽ không nhìn thấy tút của họ.",
"navigation_bar.about": "Giới thiệu",
"navigation_bar.advanced_interface": "Dùng bố cục nhiều cột",
"navigation_bar.blocks": "Người đã chặn",
@@ -408,7 +451,6 @@
"navigation_bar.direct": "Nhắn riêng",
"navigation_bar.discover": "Khám phá",
"navigation_bar.domain_blocks": "Máy chủ đã ẩn",
- "navigation_bar.edit_profile": "Sửa hồ sơ",
"navigation_bar.explore": "Xu hướng",
"navigation_bar.favourites": "Lượt thích",
"navigation_bar.filters": "Bộ lọc từ ngữ",
@@ -432,11 +474,29 @@
"notification.follow": "{name} theo dõi bạn",
"notification.follow_request": "{name} yêu cầu theo dõi bạn",
"notification.mention": "{name} nhắc đến bạn",
+ "notification.moderation-warning.learn_more": "Tìm hiểu",
+ "notification.moderation_warning": "Bạn vừa nhận một cảnh báo kiểm duyệt",
+ "notification.moderation_warning.action_delete_statuses": "Một vài tút của bạn bị gỡ.",
+ "notification.moderation_warning.action_disable": "Tài khoản của bạn đã bị vô hiệu hóa.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Vài tút bạn bị đánh dấu nhạy cảm.",
+ "notification.moderation_warning.action_none": "Bạn đã nhận một cảnh báo kiểm duyệt.",
+ "notification.moderation_warning.action_sensitive": "Tút của bạn sẽ bị đánh dấu nhạy cảm kể từ bây giờ.",
+ "notification.moderation_warning.action_silence": "Tài khoản của bạn đã bị hạn chế.",
+ "notification.moderation_warning.action_suspend": "Tài khoản của bạn đã bị vô hiệu hóa.",
"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.relationships_severance_event": "Mất kết nối với {name}",
+ "notification.relationships_severance_event.account_suspension": "Quản trị viên {from} đã vô hiệu hóa {target}, điều này có nghĩa là bạn không còn có thể nhận được cập nhật từ họ hoặc tương tác với họ nữa.",
+ "notification.relationships_severance_event.domain_block": "Quản trị viên {from} đã chặn {target}, bao gồm {followersCount} người theo dõi bạn và {followingCount, plural, other {# người}} mà bạn theo dõi.",
+ "notification.relationships_severance_event.learn_more": "Tìm hiểu thêm",
+ "notification.relationships_severance_event.user_domain_block": "Bạn đã chặn {target}, xóa {followersCount} người theo dõi bạn và {followingCount, plural, other {# người}} theo dõi bạn.",
"notification.status": "{name} đăng tút mới",
"notification.update": "{name} đã sửa tút",
+ "notification_requests.accept": "Chấp nhận",
+ "notification_requests.dismiss": "Bỏ qua",
+ "notification_requests.notifications_from": "Thông báo từ {name}",
+ "notification_requests.title": "Thông báo đã lọc",
"notifications.clear": "Xóa hết thông báo",
"notifications.clear_confirmation": "Bạn thật sự muốn xóa vĩnh viễn tất cả thông báo của mình?",
"notifications.column_settings.admin.report": "Báo cáo mới:",
@@ -444,8 +504,7 @@
"notifications.column_settings.alert": "Báo trên máy tính",
"notifications.column_settings.favourite": "Lượt thích:",
"notifications.column_settings.filter_bar.advanced": "Toàn bộ",
- "notifications.column_settings.filter_bar.category": "Phân loại",
- "notifications.column_settings.filter_bar.show_bar": "Hiện bộ lọc",
+ "notifications.column_settings.filter_bar.category": "Thanh lọc nhanh",
"notifications.column_settings.follow": "Người theo dõi:",
"notifications.column_settings.follow_request": "Yêu cầu theo dõi:",
"notifications.column_settings.mention": "Lượt nhắc đến:",
@@ -471,6 +530,15 @@
"notifications.permission_denied": "Trình duyệt không cho phép hiển thị thông báo trên màn hình.",
"notifications.permission_denied_alert": "Không thể bật thông báo trên màn hình bởi vì trình duyệt đã cấm trước đó",
"notifications.permission_required": "Không hiện thông báo trên màn hình bởi vì chưa cho phép.",
+ "notifications.policy.filter_new_accounts.hint": "Đã tạo trong vòng {days, plural, other {# ngày}}",
+ "notifications.policy.filter_new_accounts_title": "Tài khoản mới",
+ "notifications.policy.filter_not_followers_hint": "Bao gồm những người đã theo dõi bạn ít hơn {days, plural, other {# ngày}}",
+ "notifications.policy.filter_not_followers_title": "Những người không theo dõi bạn",
+ "notifications.policy.filter_not_following_hint": "Cho tới khi bạn duyệt họ",
+ "notifications.policy.filter_not_following_title": "Những người bạn không theo dõi",
+ "notifications.policy.filter_private_mentions_hint": "Được lọc trừ khi nó trả lời lượt nhắc từ bạn hoặc nếu bạn theo dõi người gửi",
+ "notifications.policy.filter_private_mentions_title": "Lượt nhắc riêng tư không được yêu cầu",
+ "notifications.policy.title": "Lọc ra thông báo từ…",
"notifications_permission_banner.enable": "Cho phép thông báo trên màn hình",
"notifications_permission_banner.how_to_control": "Hãy bật thông báo trên màn hình để không bỏ lỡ những thông báo từ Mastodon. Một khi đã bật, bạn có thể lựa chọn từng loại thông báo khác nhau thông qua {icon} nút bên dưới.",
"notifications_permission_banner.title": "Không bỏ lỡ điều thú vị nào",
@@ -526,13 +594,14 @@
"poll_button.add_poll": "Tạo bình chọn",
"poll_button.remove_poll": "Hủy cuộc bình chọn",
"privacy.change": "Chọn kiểu tút",
- "privacy.direct.long": "Chỉ người được nhắc đến mới thấy",
- "privacy.direct.short": "Nhắn riêng",
- "privacy.private.long": "Dành riêng cho người theo dõi",
- "privacy.private.short": "Chỉ người theo dõi",
- "privacy.public.long": "Hiển thị với mọi người",
+ "privacy.direct.long": "Những người được nhắc trong tút",
+ "privacy.direct.short": "Người cụ thể",
+ "privacy.private.long": "Chỉ người theo dõi",
+ "privacy.private.short": "Người theo dõi",
+ "privacy.public.long": "Bất cứ ai",
"privacy.public.short": "Công khai",
- "privacy.unlisted.long": "Công khai nhưng ẩn trên bảng tin",
+ "privacy.unlisted.additional": "Giống hệt như công khai, ngoại trừ tút sẽ không xuất hiện trong bảng tin hoặc hashtag, khám phá hoặc tìm kiếm Mastodon, ngay cả khi bạn chọn cho phép trong cài đặt tài khoản.",
+ "privacy.unlisted.long": "Ít hướng thuật toán hơn",
"privacy.unlisted.short": "Hạn chế",
"privacy_policy.last_updated": "Cập nhật lần cuối {date}",
"privacy_policy.title": "Chính sách bảo mật",
@@ -551,7 +620,9 @@
"relative_time.minutes": "{number} phút",
"relative_time.seconds": "{number}s",
"relative_time.today": "hôm nay",
+ "reply_indicator.attachments": "{count, plural, other {# tập tin đính kèm}}",
"reply_indicator.cancel": "Hủy bỏ",
+ "reply_indicator.poll": "Bình chọn",
"report.block": "Chặn",
"report.block_explanation": "Bạn sẽ không còn thấy tút của người này. Họ sẽ không thể thấy tút của bạn hoặc theo dõi bạn. Họ biết là bạn đã chặn họ.",
"report.categories.legal": "Phạm pháp",
@@ -644,10 +715,11 @@
"status.direct": "Nhắn riêng @{name}",
"status.direct_indicator": "Nhắn riêng",
"status.edit": "Sửa",
- "status.edited": "Đã sửa {date}",
+ "status.edited": "Sửa lần cuối {date}",
"status.edited_x_times": "Đã sửa {count, plural, other {{count} lần}}",
"status.embed": "Nhúng",
"status.favourite": "Thích",
+ "status.favourites": "{count, plural, other {lượt thích}}",
"status.filter": "Lọc tút này",
"status.filtered": "Bộ lọc",
"status.hide": "Ẩn tút",
@@ -668,6 +740,7 @@
"status.reblog": "Đăng lại",
"status.reblog_private": "Đăng lại (Riêng tư)",
"status.reblogged_by": "{name} đăng lại",
+ "status.reblogs": "{count, plural, other {đăng lại}}",
"status.reblogs.empty": "Tút này chưa có ai đăng lại. Nếu có, nó sẽ hiển thị ở đây.",
"status.redraft": "Xóa và viết lại",
"status.remove_bookmark": "Bỏ lưu",
@@ -715,10 +788,8 @@
"upload_error.poll": "Không cho phép đính kèm tập tin.",
"upload_form.audio_description": "Mô tả cho người mất thính giác",
"upload_form.description": "Mô tả cho người khiếm thị",
- "upload_form.description_missing": "Chưa thêm mô tả",
"upload_form.edit": "Biên tập",
"upload_form.thumbnail": "Đổi ảnh thumbnail",
- "upload_form.undo": "Xóa bỏ",
"upload_form.video_description": "Mô tả cho người mất thị lực hoặc không thể nghe",
"upload_modal.analyzing_picture": "Phân tích hình ảnh",
"upload_modal.apply": "Áp dụng",
diff --git a/app/javascript/mastodon/locales/zgh.json b/app/javascript/mastodon/locales/zgh.json
index 008a9636db42b4..1d3a22108cd7ba 100644
--- a/app/javascript/mastodon/locales/zgh.json
+++ b/app/javascript/mastodon/locales/zgh.json
@@ -22,7 +22,6 @@
"account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
"account.unfollow": "ⴽⴽⵙ ⴰⴹⴼⴼⵓⵕ",
"account_note.placeholder": "Click to add a note",
- "autosuggest_hashtag.per_week": "{count} ⵙ ⵉⵎⴰⵍⴰⵙⵙ",
"bundle_column_error.retry": "ⴰⵍⵙ ⴰⵔⵎ",
"bundle_modal_error.close": "ⵔⴳⵍ",
"bundle_modal_error.retry": "ⴰⵍⵙ ⴰⵔⵎ",
@@ -44,18 +43,14 @@
"compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
"compose_form.lock_disclaimer.lock": "ⵉⵜⵜⵓⵔⴳⵍ",
"compose_form.placeholder": "ⵎⴰⵢⴷ ⵉⵍⵍⴰⵏ ⴳ ⵉⵅⴼ ⵏⵏⴽ?",
- "compose_form.poll.option_placeholder": "ⴰⵙⵜⵜⴰⵢ {number}",
"compose_form.publish_form": "Publish",
- "compose_form.publish_loud": "{publish}!",
"compose_form.spoiler.marked": "Text is hidden behind warning",
"compose_form.spoiler.unmarked": "Text is not hidden",
"confirmation_modal.cancel": "ⵙⵔ",
"confirmations.block.confirm": "ⴳⴷⵍ",
- "confirmations.block.message": "ⵉⵙ ⵏⵉⵜ ⵜⵅⵙⴷ ⴰⴷ ⵜⴳⴷⵍⴷ {name}?",
"confirmations.delete.confirm": "ⴽⴽⵙ",
"confirmations.delete.message": "ⵉⵙ ⵏⵉⵜ ⵜⵅⵙⴷ ⴰⴷ ⵜⴽⴽⵙⴷ ⵜⴰⵥⵕⵉⴳⵜ ⴰ?",
"confirmations.delete_list.confirm": "ⴽⴽⵙ",
- "confirmations.domain_block.confirm": "Hide entire domain",
"confirmations.logout.confirm": "ⴼⴼⵖ",
"confirmations.logout.message": "ⵉⵙ ⵏⵉⵜ ⵜⵅⵙⴷ ⴰⴷ ⵜⴼⴼⵖⴷ?",
"confirmations.mute.confirm": "ⵥⵥⵉⵥⵏ",
@@ -129,7 +124,6 @@
"media_gallery.toggle_visible": "ⴼⴼⵔ {number, plural, one {ⵜⴰⵡⵍⴰⴼⵜ} other {ⵜⵉⵡⵍⴰⴼⵉⵏ}}",
"navigation_bar.compose": "Compose new toot",
"navigation_bar.domain_blocks": "Hidden domains",
- "navigation_bar.edit_profile": "ⵙⵏⴼⵍ ⵉⴼⵔⵙ",
"navigation_bar.follow_requests": "ⵜⵓⵜⵔⴰⵡⵉⵏ ⵏ ⵓⴹⴼⴰⵕ",
"navigation_bar.lists": "ⵜⵉⵍⴳⴰⵎⵉⵏ",
"navigation_bar.logout": "ⴼⴼⵖ",
@@ -161,8 +155,6 @@
"poll_button.add_poll": "ⵔⵏⵓ ⵢⴰⵏ ⵢⵉⴷⵣ",
"poll_button.remove_poll": "ⵙⵙⵉⵜⵢ ⵉⴷⵣ",
"privacy.change": "Adjust status privacy",
- "privacy.direct.short": "Direct",
- "privacy.private.short": "Followers-only",
"privacy.public.short": "ⵜⴰⴳⴷⵓⴷⴰⵏⵜ",
"regeneration_indicator.label": "ⴰⵣⴷⴰⵎ…",
"relative_time.days": "{number}ⴰⵙ",
@@ -211,7 +203,6 @@
"upload_form.audio_description": "Describe for people with hearing loss",
"upload_form.description": "Describe for the visually impaired",
"upload_form.edit": "ⵙⵏⴼⵍ",
- "upload_form.undo": "ⴽⴽⵙ",
"upload_form.video_description": "Describe for people with hearing loss or visual impairment",
"upload_modal.choose_image": "ⴷⵖⵔ ⵜⴰⵡⵍⴰⴼⵜ",
"upload_progress.label": "Uploading…",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 720e4331b3afa2..0f8bcae6f8be85 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -21,7 +21,7 @@
"account.blocked": "已屏蔽",
"account.browse_more_on_origin_server": "在原始个人资料页面上浏览详情",
"account.cancel_follow_request": "撤回关注请求",
- "account.copy": "复制资料卡链接",
+ "account.copy": "复制个人资料链接",
"account.direct": "私下提及 @{name}",
"account.disable_notifications": "当 @{name} 发布嘟文时不要通知我",
"account.domain_blocked": "域名已屏蔽",
@@ -53,7 +53,7 @@
"account.mute_notifications_short": "关闭通知",
"account.mute_short": "隐藏",
"account.muted": "已隐藏",
- "account.mutual": "互粉好友",
+ "account.mutual": "互相关注",
"account.no_bio": "未提供描述。",
"account.open_original_page": "打开原始页面",
"account.posts": "嘟文",
@@ -89,7 +89,14 @@
"announcement.announcement": "公告",
"attachments_list.unprocessed": "(未处理)",
"audio.hide": "隐藏音频",
- "autosuggest_hashtag.per_week": "每星期 {count} 条",
+ "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": "请求的页面无法渲染，可能是代码出现错误或浏览器存在兼容性问题。",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "你的账户没有{locked}。任何人都可以在关注你后立即查看仅关注者可见的嘟文。",
"compose_form.lock_disclaimer.lock": "开启保护",
"compose_form.placeholder": "想写什么？",
- "compose_form.poll.add_option": "添加选项",
"compose_form.poll.duration": "投票期限",
+ "compose_form.poll.multiple": "多选",
"compose_form.poll.option_placeholder": "选项 {number}",
- "compose_form.poll.remove_option": "移除此选项",
+ "compose_form.poll.single": "单选",
"compose_form.poll.switch_to_multiple": "将投票改为多选",
"compose_form.poll.switch_to_single": "将投票改为单选",
+ "compose_form.poll.type": "样式",
"compose_form.publish": "发布",
"compose_form.publish_form": "发布",
- "compose_form.publish_loud": "{publish}！",
- "compose_form.save_changes": "保存更改",
- "compose_form.sensitive.hide": "标记媒体为敏感内容",
- "compose_form.sensitive.marked": "媒体已被标记为敏感内容",
- "compose_form.sensitive.unmarked": "媒体未被标记为敏感内容",
+ "compose_form.reply": "回复",
+ "compose_form.save_changes": "更新",
"compose_form.spoiler.marked": "移除内容警告",
"compose_form.spoiler.unmarked": "添加内容警告",
- "compose_form.spoiler_placeholder": "写下你的警告",
+ "compose_form.spoiler_placeholder": "内容警告 (可选)",
"confirmation_modal.cancel": "取消",
- "confirmations.block.block_and_report": "屏蔽与举报",
"confirmations.block.confirm": "屏蔽",
- "confirmations.block.message": "确定要屏蔽 {name} 吗？",
"confirmations.cancel_follow_request.confirm": "撤回请求",
"confirmations.cancel_follow_request.message": "确定撤回关注 {name} 的请求吗？",
"confirmations.delete.confirm": "删除",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "确定永久删除这个列表吗？",
"confirmations.discard_edit_media.confirm": "丢弃",
"confirmations.discard_edit_media.message": "您还有未保存的媒体描述或预览修改，仍要丢弃吗？",
- "confirmations.domain_block.confirm": "屏蔽整个域名",
+ "confirmations.domain_block.confirm": "屏蔽服务器",
"confirmations.domain_block.message": "你真的确定要屏蔽所有来自 {domain} 的内容吗？多数情况下，对几个特定的用户进行屏蔽或禁用对他们的消息提醒就足够了。屏蔽后，来自该域名的内容将不再出现在你任何的公共时间轴或通知列表里，你来自该域名下的关注者也将被移除。",
"confirmations.edit.confirm": "编辑",
"confirmations.edit.message": "编辑此消息将会覆盖当前正在撰写的信息。仍要继续吗？",
"confirmations.logout.confirm": "退出登录",
"confirmations.logout.message": "确定要退出登录吗？",
"confirmations.mute.confirm": "隐藏",
- "confirmations.mute.explanation": "他们的嘟文以及提到他们的嘟文都会隐藏，但他们仍然可以看到你的嘟文，也可以关注你。",
- "confirmations.mute.message": "你确定要隐藏 {name} 吗？",
"confirmations.redraft.confirm": "删除并重新编辑",
"confirmations.redraft.message": "确定删除这条嘟文并重写吗？所有相关的喜欢和转嘟都将丢失，嘟文的回复也会失去关联。",
"confirmations.reply.confirm": "回复",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "这些是目前在社交网络上引起关注的嘟文。嘟文的喜欢和转嘟次数越多，排名越高。",
"dismissable_banner.explore_tags": "这些标签正在本站和分布式网络上其他站点的用户中引起关注。",
"dismissable_banner.public_timeline": "这些是在 {domain} 上关注的人们最新发布的公开嘟文。",
+ "domain_block_modal.block": "屏蔽服务器",
+ "domain_block_modal.block_account_instead": "改为屏蔽 @{name}",
+ "domain_block_modal.they_can_interact_with_old_posts": "来自该服务器的人可以与你之前的嘟文交互。",
+ "domain_block_modal.they_cant_follow": "此服务器上没有人可以关注你。",
+ "domain_block_modal.they_wont_know": "他们不会知道自己被屏蔽。",
+ "domain_block_modal.title": "屏蔽该域名？",
+ "domain_block_modal.you_will_lose_followers": "该服务器上你的所有关注者都会被删除。",
+ "domain_block_modal.you_wont_see_posts": "你将不会看到此服务器上用户的嘟文或通知。",
+ "domain_pill.activitypub_lets_connect": "它让你不仅能与Mastodon上的人交流互动，还能与其它不同社交应用上的人联系。",
+ "domain_pill.activitypub_like_language": "ActivityPub就像Mastodon与其它社交网络交流时使用的语言。",
+ "domain_pill.server": "服务器",
+ "domain_pill.their_handle": "它们的代号：",
+ "domain_pill.their_server": "它们的数字家园，它们的所有嘟文都存放在那里。",
+ "domain_pill.their_username": "它们在它们的服务器上的唯一标识符。在不同的服务器上可能会找到相同用户名的用户。",
+ "domain_pill.username": "用户名",
+ "domain_pill.whats_in_a_handle": "代号里都有什么？",
+ "domain_pill.who_they_are": "代号可以告诉你一个人是谁和在哪里，所以你可以在社交网络上与的人们互动。",
+ "domain_pill.who_you_are": "你的代号可以告诉别人你是谁和你在哪里，这样社交网络上来自的人们就可以与你互动。",
+ "domain_pill.your_handle": "你的代号：",
+ "domain_pill.your_server": "你的数字家园，你的所有嘟文都存放在这里。不喜欢这个服务器吗？随时带上你的关注者一起迁移到其它服务器。",
+ "domain_pill.your_username": "你在这个服务器上的唯一标识符。在不同的服务器上可能会找到相同用户名的用户。",
"embed.instructions": "复制下列代码以在你的网站中嵌入此嘟文。",
"embed.preview": "它会像这样显示出来：",
"emoji_button.activity": "活动",
@@ -244,6 +266,7 @@
"empty_column.list": "列表中还没有任何内容。当列表成员发布新嘟文时，它们将出现在这里。",
"empty_column.lists": "你还没有创建过列表。你创建的列表会在这里显示。",
"empty_column.mutes": "你没有隐藏任何用户。",
+ "empty_column.notification_requests": "都看完了！这里没有任何未读通知。当收到新的通知时，它们将根据您的设置显示在这里。",
"empty_column.notifications": "你还没有收到过任何通知，快和其他用户互动吧。",
"empty_column.public": "这里什么都没有！写一些公开的嘟文，或者关注其他服务器的用户后，这里就会有嘟文出现了",
"error.unexpected_crash.explanation": "此页面无法正确显示，这可能是因为我们的代码中有错误，也可能是因为浏览器兼容问题。",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "使用一个已存在类别，或创建一个新类别",
"filter_modal.select_filter.title": "过滤此嘟文",
"filter_modal.title.status": "过滤一条嘟文",
+ "filtered_notifications_banner.mentions": "{count, plural, other {提及}}",
+ "filtered_notifications_banner.pending_requests": "来自你可能认识的 {count, plural, =0 {0 个人} other {# 个人}}的通知",
+ "filtered_notifications_banner.title": "通知（已过滤）",
"firehose.all": "全部",
"firehose.local": "此服务器",
"firehose.remote": "其他服务器",
"follow_request.authorize": "同意",
"follow_request.reject": "拒绝",
"follow_requests.unlocked_explanation": "尽管你没有锁嘟，但是 {domain} 的工作人员认为你也许会想手动审核审核这些账号的关注请求。",
+ "follow_suggestions.curated_suggestion": "站务人员精选",
+ "follow_suggestions.dismiss": "不再显示",
+ "follow_suggestions.featured_longer": "由 {domain} 管理团队精选",
+ "follow_suggestions.friends_of_friends_longer": "在你关注的人中很受欢迎",
+ "follow_suggestions.hints.featured": "该用户已被 {domain} 管理团队精选。",
+ "follow_suggestions.hints.friends_of_friends": "该用户在您关注的人中很受欢迎。",
+ "follow_suggestions.hints.most_followed": "该用户是 {domain} 上关注度最高的用户之一。",
+ "follow_suggestions.hints.most_interactions": "该用户最近在 {domain} 上获得了很多关注。",
+ "follow_suggestions.hints.similar_to_recently_followed": "该用户与您最近关注的用户类似。",
+ "follow_suggestions.personalized_suggestion": "个性化建议",
+ "follow_suggestions.popular_suggestion": "热门建议",
+ "follow_suggestions.popular_suggestion_longer": "在 {domain} 上很受欢迎",
+ "follow_suggestions.similar_to_recently_followed_longer": "与你近期关注的用户相似",
+ "follow_suggestions.view_all": "查看全部",
+ "follow_suggestions.who_to_follow": "推荐关注",
"followed_tags": "关注的话题标签",
"footer.about": "关于",
"footer.directory": "用户目录",
@@ -306,13 +347,8 @@
"hashtag.follow": "关注话题标签",
"hashtag.unfollow": "取消关注话题标签",
"hashtags.and_other": "… 和另外 {count, plural, other {# 个话题}}",
- "home.actions.go_to_explore": "查看热门话题",
- "home.actions.go_to_suggestions": "寻找要关注的人",
- "home.column_settings.basic": "基本设置",
"home.column_settings.show_reblogs": "显示转嘟",
"home.column_settings.show_replies": "显示回复",
- "home.explore_prompt.body": "你的主页动态会推送一系列关注的话题标签和用户，以及转发的嘟文。如果你觉得过于清净，不妨试一下：",
- "home.explore_prompt.title": "这是你在 Mastodon 的主页。",
"home.hide_announcements": "隐藏公告",
"home.pending_critical_update.body": "请尽快更新您的 Mastodon 服务器！",
"home.pending_critical_update.link": "查看更新",
@@ -378,6 +414,7 @@
"limited_account_hint.action": "仍要显示个人资料",
"limited_account_hint.title": "此账号资料已被 {domain} 管理员隐藏。",
"link_preview.author": "由 {name}",
+ "link_preview.more_from_author": "查看 {name} 的更多内容",
"lists.account.add": "添加到列表",
"lists.account.remove": "从列表中移除",
"lists.delete": "删除列表",
@@ -396,9 +433,15 @@
"loading_indicator.label": "加载中…",
"media_gallery.toggle_visible": "{number, plural, other {隐藏图像}}",
"moved_to_account_banner.text": "您的账号 {disabledAccount} 已禁用，因为您已迁移到 {movedToAccount}。",
- "mute_modal.duration": "持续时长",
- "mute_modal.hide_notifications": "同时隐藏来自这个用户的通知？",
- "mute_modal.indefinite": "无期限",
+ "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": "已屏蔽的用户",
@@ -408,7 +451,6 @@
"navigation_bar.direct": "私下提及",
"navigation_bar.discover": "发现",
"navigation_bar.domain_blocks": "已屏蔽的域名",
- "navigation_bar.edit_profile": "修改个人资料",
"navigation_bar.explore": "探索",
"navigation_bar.favourites": "喜欢",
"navigation_bar.filters": "忽略的关键词",
@@ -432,11 +474,29 @@
"notification.follow": "{name} 开始关注你",
"notification.follow_request": "{name} 向你发送了关注请求",
"notification.mention": "{name} 提及了你",
+ "notification.moderation-warning.learn_more": "了解更多",
+ "notification.moderation_warning": "你收到了一条管理警告",
+ "notification.moderation_warning.action_delete_statuses": "你的一些嘟文已被移除。",
+ "notification.moderation_warning.action_disable": "你的账号已被禁用。",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "你的一些嘟文已被标记为敏感内容。",
+ "notification.moderation_warning.action_none": "你的账号收到了管理警告。",
+ "notification.moderation_warning.action_sensitive": "今后你的嘟文都会被标记为敏感内容。",
+ "notification.moderation_warning.action_silence": "你的账号已被限制。",
+ "notification.moderation_warning.action_suspend": "你的账号已被封禁.",
"notification.own_poll": "你的投票已经结束",
"notification.poll": "你参与的一个投票已经结束",
"notification.reblog": "{name} 转发了你的嘟文",
+ "notification.relationships_severance_event": "与 {name} 的联系已断开",
+ "notification.relationships_severance_event.account_suspension": "一名来自 {from} 的管理员已经封禁了{target}，这意味着你将无法再收到他们的更新或与他们互动。",
+ "notification.relationships_severance_event.domain_block": "一名来自 {from} 的管理员已经屏蔽了 {target}，其中包括你的 {followersCount} 个关注者和 {followingCount, plural, other {# 个关注}}。",
+ "notification.relationships_severance_event.learn_more": "了解更多",
+ "notification.relationships_severance_event.user_domain_block": "你已经屏蔽了 {target}，移除了你的 {followersCount} 个关注者和 {followingCount, plural, other {# 个关注}}。",
"notification.status": "{name} 刚刚发布嘟文",
"notification.update": "{name} 编辑了嘟文",
+ "notification_requests.accept": "接受",
+ "notification_requests.dismiss": "拒绝",
+ "notification_requests.notifications_from": "来自 {name} 的通知",
+ "notification_requests.title": "通知（已过滤）",
"notifications.clear": "清空通知列表",
"notifications.clear_confirmation": "你确定要永久清空通知列表吗？",
"notifications.column_settings.admin.report": "新举报：",
@@ -444,8 +504,7 @@
"notifications.column_settings.alert": "桌面通知",
"notifications.column_settings.favourite": "喜欢：",
"notifications.column_settings.filter_bar.advanced": "显示所有类别",
- "notifications.column_settings.filter_bar.category": "快速过滤栏",
- "notifications.column_settings.filter_bar.show_bar": "显示过滤栏",
+ "notifications.column_settings.filter_bar.category": "快速筛选栏",
"notifications.column_settings.follow": "新粉丝：",
"notifications.column_settings.follow_request": "新关注请求：",
"notifications.column_settings.mention": "提及：",
@@ -471,6 +530,15 @@
"notifications.permission_denied": "由于权限被拒绝，无法启用桌面通知。",
"notifications.permission_denied_alert": "由于在此之前浏览器权限请求就已被拒绝，所以启用桌面通知失败",
"notifications.permission_required": "所需权限未被授予，所以桌面通知不可用",
+ "notifications.policy.filter_new_accounts.hint": "在 {days, plural, other {# 天}}内创建的账户",
+ "notifications.policy.filter_new_accounts_title": "新账户",
+ "notifications.policy.filter_not_followers_hint": "包括关注你少于 {days, plural, other {# 天}}的人",
+ "notifications.policy.filter_not_followers_title": "未关注你的人",
+ "notifications.policy.filter_not_following_hint": "直到你手动批准",
+ "notifications.policy.filter_not_following_title": "你没有关注的人",
+ "notifications.policy.filter_private_mentions_hint": "过滤通知，除非通知是在回复提及你自己的内容，或发送者是你关注的人",
+ "notifications.policy.filter_private_mentions_title": "不请自来的提及",
+ "notifications.policy.title": "通知过滤范围",
"notifications_permission_banner.enable": "启用桌面通知",
"notifications_permission_banner.how_to_control": "启用桌面通知以在 Mastodon 未打开时接收通知。你可以通过交互通过上面的 {icon} 按钮来精细控制可以发送桌面通知的交互类型。",
"notifications_permission_banner.title": "精彩不容错过",
@@ -526,14 +594,15 @@
"poll_button.add_poll": "发起投票",
"poll_button.remove_poll": "移除投票",
"privacy.change": "设置嘟文的可见范围",
- "privacy.direct.long": "只有被提及的用户能看到",
- "privacy.direct.short": "仅提到的人",
- "privacy.private.long": "仅对关注者可见",
- "privacy.private.short": "仅关注者可见",
- "privacy.public.long": "所有人可见",
+ "privacy.direct.long": "帖子中提到的每个人",
+ "privacy.direct.short": "具体的人",
+ "privacy.private.long": "仅限您的关注者",
+ "privacy.private.short": "关注者",
+ "privacy.public.long": "所有 Mastodon 内外的人",
"privacy.public.short": "公开",
- "privacy.unlisted.long": "所有人可见，但不在探索功能出现",
- "privacy.unlisted.short": "不公开",
+ "privacy.unlisted.additional": "该模式的行为与“公开”完全相同，只是帖子不会出现在实时动态、话题标签、探索或 Mastodon 搜索中，即使你已在账户级设置中选择加入。",
+ "privacy.unlisted.long": "减少算法影响",
+ "privacy.unlisted.short": "悄悄公开",
"privacy_policy.last_updated": "最近更新于 {date}",
"privacy_policy.title": "隐私政策",
"recommended": "推荐",
@@ -551,7 +620,9 @@
"relative_time.minutes": "{number} 分钟前",
"relative_time.seconds": "{number} 秒前",
"relative_time.today": "今天",
+ "reply_indicator.attachments": "{count, plural, other {# 个附件}}",
"reply_indicator.cancel": "取消",
+ "reply_indicator.poll": "投票",
"report.block": "屏蔽",
"report.block_explanation": "你将无法看到他们的嘟文。他们也将无法看到你的嘟文或关注你。他们将能够判断出他们被屏蔽了。",
"report.categories.legal": "法律义务",
@@ -644,10 +715,11 @@
"status.direct": "私下提及 @{name}",
"status.direct_indicator": "私下提及",
"status.edit": "编辑",
- "status.edited": "编辑于 {date}",
+ "status.edited": "最近编辑于 {date}",
"status.edited_x_times": "共编辑 {count, plural, one {{count} 次} other {{count} 次}}",
"status.embed": "嵌入",
"status.favourite": "喜欢",
+ "status.favourites": "{count, plural, other {次喜欢}}",
"status.filter": "过滤此嘟文",
"status.filtered": "已过滤",
"status.hide": "隐藏嘟文",
@@ -668,6 +740,7 @@
"status.reblog": "转嘟",
"status.reblog_private": "转嘟（可见者不变）",
"status.reblogged_by": "{name} 转嘟了",
+ "status.reblogs": "{count, plural, other {次转嘟}}",
"status.reblogs.empty": "没有人转嘟过此条嘟文。如果有人转嘟了，就会显示在这里。",
"status.redraft": "删除并重新编辑",
"status.remove_bookmark": "移除书签",
@@ -715,10 +788,8 @@
"upload_error.poll": "投票中不允许上传文件。",
"upload_form.audio_description": "为听障人士添加文字描述",
"upload_form.description": "为视觉障碍人士添加文字说明",
- "upload_form.description_missing": "未添加描述",
"upload_form.edit": "编辑",
"upload_form.thumbnail": "更改缩略图",
- "upload_form.undo": "删除",
"upload_form.video_description": "为听障人士和视障人士添加文字描述",
"upload_modal.analyzing_picture": "分析图片…",
"upload_modal.apply": "应用",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index cd0845b6e2e309..eaa5dabe93134b 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -89,7 +89,14 @@
"announcement.announcement": "公告",
"attachments_list.unprocessed": "（未處理）",
"audio.hide": "隱藏音訊",
- "autosuggest_hashtag.per_week": "每週 {count} 次",
+ "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": "無法提供請求的頁面。這可能是因為代碼出現錯誤或瀏覽器出現兼容問題。",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "你的用戶狀態沒有{locked}，任何人都能立即關注你，然後看到「只有關注者能看」的文章。",
"compose_form.lock_disclaimer.lock": "鎖定",
"compose_form.placeholder": "你在想甚麼？",
- "compose_form.poll.add_option": "新增選擇",
"compose_form.poll.duration": "投票期限",
- "compose_form.poll.option_placeholder": "第 {number} 個選擇",
- "compose_form.poll.remove_option": "移除此選擇",
+ "compose_form.poll.multiple": "多選",
+ "compose_form.poll.option_placeholder": "選項 {number}",
+ "compose_form.poll.single": "選擇一個",
"compose_form.poll.switch_to_multiple": "變更投票為允許多個選項",
"compose_form.poll.switch_to_single": "變更投票為限定單一選項",
+ "compose_form.poll.type": "風格",
"compose_form.publish": "發佈",
"compose_form.publish_form": "發佈",
- "compose_form.publish_loud": "{publish}！",
- "compose_form.save_changes": "儲存變更",
- "compose_form.sensitive.hide": "標記媒體為敏感內容",
- "compose_form.sensitive.marked": "媒體被標示為敏感",
- "compose_form.sensitive.unmarked": "媒體沒有被標示為敏感",
+ "compose_form.reply": "回覆",
+ "compose_form.save_changes": "更新",
"compose_form.spoiler.marked": "文字被警告隱藏",
"compose_form.spoiler.unmarked": "文字沒有被隱藏",
- "compose_form.spoiler_placeholder": "敏感警告訊息",
+ "compose_form.spoiler_placeholder": "內容警告 (選用)",
"confirmation_modal.cancel": "取消",
- "confirmations.block.block_and_report": "封鎖並檢舉",
"confirmations.block.confirm": "封鎖",
- "confirmations.block.message": "你確定要封鎖{name}嗎？",
"confirmations.cancel_follow_request.confirm": "撤回請求",
"confirmations.cancel_follow_request.message": "您確定要撤回追蹤 {name} 的請求嗎？",
"confirmations.delete.confirm": "刪除",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "你確定要永久刪除這列表嗎？",
"confirmations.discard_edit_media.confirm": "捨棄",
"confirmations.discard_edit_media.message": "您在媒體描述或預覽有尚未儲存的變更。確定要捨棄它們嗎？",
- "confirmations.domain_block.confirm": "封鎖整個網站",
+ "confirmations.domain_block.confirm": "封鎖伺服器",
"confirmations.domain_block.message": "你真的真的確定要封鎖整個 {domain} ？多數情況下，封鎖或靜音幾個特定目標就已經有效，也是比較建議的做法。若然封鎖全站，你將不會再在這裏看到該站的內容和通知。來自該站的關注者亦會被移除。",
"confirmations.edit.confirm": "編輯",
"confirmations.edit.message": "現在編輯將會覆蓋你目前正在撰寫的訊息。你確定要繼續嗎？",
"confirmations.logout.confirm": "登出",
"confirmations.logout.message": "確定要登出嗎？",
"confirmations.mute.confirm": "靜音",
- "confirmations.mute.explanation": "這將會隱藏來自他們的貼文與通知，但是他們還是可以查閱你的貼文與關注你。",
- "confirmations.mute.message": "你確定要將{name}靜音嗎？",
"confirmations.redraft.confirm": "刪除並編輯",
"confirmations.redraft.message": "你確定要移除並重新起草這篇帖文嗎？你將會失去最愛和轉推，而回覆也會與原始帖文斷開連接。",
"confirmations.reply.confirm": "回覆",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "這些是今天在社交網絡上受到關注的帖文。新的帖文如果有較多轉推和最愛會排得更高。",
"dismissable_banner.explore_tags": "這些主題標籤正在被本站以及去中心化網路上的人們熱烈討論。",
"dismissable_banner.public_timeline": "這些是 {domain} 使用者追蹤的社交網絡上最新的公開帖文。",
+ "domain_block_modal.block": "封鎖伺服器",
+ "domain_block_modal.block_account_instead": "封鎖 @{name} 即可",
+ "domain_block_modal.they_can_interact_with_old_posts": "此伺服器的人們可與你的舊帖文互動。",
+ "domain_block_modal.they_cant_follow": "此伺服器的人無法追蹤你。",
+ "domain_block_modal.they_wont_know": "對方不會知道自己被封鎖。",
+ "domain_block_modal.title": "封鎖網域？",
+ "domain_block_modal.you_will_lose_followers": "你在此伺服器的所有追蹤者都將會被移除。",
+ "domain_block_modal.you_wont_see_posts": "你將看不到此伺服器使用者的帖文和通知。",
+ "domain_pill.activitypub_lets_connect": "這讓你不僅能在 Mastodon 上，也能在其他社交應用程式中與人交流互動。",
+ "domain_pill.activitypub_like_language": "ActivityPub 就像 Mastodon 與其他社交網絡溝通所用的語言。",
+ "domain_pill.server": "伺服器",
+ "domain_pill.their_handle": "他們的帳號：",
+ "domain_pill.their_server": "他們的數碼家園，所有帖文的棲息地。",
+ "domain_pill.their_username": "在他們的伺服器上的獨特識別碼。不同伺服器上的使用者有可能擁有相同的使用者名稱。",
+ "domain_pill.username": "使用者名稱",
+ "domain_pill.whats_in_a_handle": "帳號是甚麼？",
+ "domain_pill.who_they_are": "帳號代表了使用者的身份和所在之處，因此你能夠在以 構建的社交網絡中與他人互動交流。",
+ "domain_pill.who_you_are": "你的帳號代表了你的身份和所在之處，因此人們能夠在以 構建的社交網絡中與你互動交流。",
+ "domain_pill.your_handle": "你的帳號：",
+ "domain_pill.your_server": "你的數碼家園，你所有帖文的棲息地。不喜歡這裏嗎？隨時搬家到其他伺服器，把你的追蹤者也帶來。",
+ "domain_pill.your_username": "你在這台伺服器的獨特識別碼。可以在不同伺服器上找到相同使用者名稱的人。",
"embed.instructions": "要內嵌此文章，請將以下代碼貼進你的網站。",
"embed.preview": "看上去會是這樣：",
"emoji_button.activity": "活動",
@@ -244,6 +266,7 @@
"empty_column.list": "這個列表暫時未有內容。",
"empty_column.lists": "你還沒有建立任何名單。這裡將會顯示你所建立的名單。",
"empty_column.mutes": "你尚未靜音任何使用者。",
+ "empty_column.notification_requests": "沒有新通知了！當有新通知時，會根據設定顯示在這裏。",
"empty_column.notifications": "你沒有任何通知紀錄，快向其他用戶搭訕吧。",
"empty_column.public": "跨站時間軸暫時沒有內容！快寫一些公共的文章，或者關注另一些服務站的用戶吧！你和本站、友站的交流，將決定這裏出現的內容。",
"error.unexpected_crash.explanation": "由於發生系統故障或瀏覽器相容性問題，故無法正常顯示頁面。",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "使用既有類別，或創建一個新類別",
"filter_modal.select_filter.title": "過濾此帖文",
"filter_modal.title.status": "過濾一則帖文",
+ "filtered_notifications_banner.mentions": "{count, plural, one {則提及} other {則提及}}",
+ "filtered_notifications_banner.pending_requests": "來自 {count, plural, =0 {0 位} other {# 位}}你可能認識的人的通知",
+ "filtered_notifications_banner.title": "已過濾之通知",
"firehose.all": "全部",
"firehose.local": "本伺服器",
"firehose.remote": "其他伺服器",
"follow_request.authorize": "批准",
"follow_request.reject": "拒絕",
"follow_requests.unlocked_explanation": "即使您的帳號未上鎖，{domain} 的工作人員認為您可能會想手動審核來自這些帳號的追蹤請求。",
+ "follow_suggestions.curated_suggestion": "編輯精選",
+ "follow_suggestions.dismiss": "不再顯示",
+ "follow_suggestions.featured_longer": "{domain} 團隊精選",
+ "follow_suggestions.friends_of_friends_longer": "受你的追蹤對象歡迎",
+ "follow_suggestions.hints.featured": "這個人檔案是由 {domain} 團隊精挑細選。",
+ "follow_suggestions.hints.friends_of_friends": "這個人檔案在你追蹤的人當中很受歡迎。",
+ "follow_suggestions.hints.most_followed": "這個人檔案是在 {domain} 上最多追蹤之一。",
+ "follow_suggestions.hints.most_interactions": "這個人檔案最近在 {domain} 上備受關注。",
+ "follow_suggestions.hints.similar_to_recently_followed": "這個人檔案與你最近追蹤的類似。",
+ "follow_suggestions.personalized_suggestion": "個人化推薦",
+ "follow_suggestions.popular_suggestion": "熱門推薦",
+ "follow_suggestions.popular_suggestion_longer": "{domain} 熱門",
+ "follow_suggestions.similar_to_recently_followed_longer": "與你最近追蹤的帳號相似",
+ "follow_suggestions.view_all": "查看所有",
+ "follow_suggestions.who_to_follow": "追蹤對象",
"followed_tags": "已追蹤標籤",
"footer.about": "關於",
"footer.directory": "個人檔案目錄",
@@ -306,13 +347,8 @@
"hashtag.follow": "追蹤主題標籤",
"hashtag.unfollow": "取消追蹤主題標籤",
"hashtags.and_other": "…及{count, plural, other {其他 # 個}}",
- "home.actions.go_to_explore": "即時熱門話題",
- "home.actions.go_to_suggestions": "尋找追蹤對象",
- "home.column_settings.basic": "基本",
"home.column_settings.show_reblogs": "顯示被轉推的文章",
"home.column_settings.show_replies": "顯示回應文章",
- "home.explore_prompt.body": "你的首頁時間軸將顯示來自你追蹤的標籤、使用者及他們轉推的帖文。如果時間軸感覺太安靜，你可以考慮：",
- "home.explore_prompt.title": "這是你在 Mastodon 中的主頁。",
"home.hide_announcements": "隱藏公告",
"home.pending_critical_update.body": "請盡快更新你的 Mastodon 伺服器！",
"home.pending_critical_update.link": "查看更新",
@@ -396,9 +432,15 @@
"loading_indicator.label": "載入中…",
"media_gallery.toggle_visible": "隱藏圖片",
"moved_to_account_banner.text": "您的帳號 {disabledAccount} 目前已停用，因為您已搬家至 {movedToAccount}。",
- "mute_modal.duration": "時間",
- "mute_modal.hide_notifications": "需要隱藏這使用者的通知嗎？",
- "mute_modal.indefinite": "沒期限",
+ "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": "封鎖名單",
@@ -408,7 +450,6 @@
"navigation_bar.direct": "私人提及",
"navigation_bar.discover": "探索",
"navigation_bar.domain_blocks": "封鎖的服務站",
- "navigation_bar.edit_profile": "修改個人資料",
"navigation_bar.explore": "探索",
"navigation_bar.favourites": "最愛",
"navigation_bar.filters": "靜音詞彙",
@@ -432,11 +473,28 @@
"notification.follow": "{name} 開始追蹤你",
"notification.follow_request": "{name} 要求追蹤你",
"notification.mention": "{name} 提及你",
+ "notification.moderation-warning.learn_more": "了解更多",
+ "notification.moderation_warning.action_delete_statuses": "你的部份帖文已被刪除。",
+ "notification.moderation_warning.action_disable": "你的帳號已被停用。",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "你某些帖文已被標記為敏感內容。",
+ "notification.moderation_warning.action_none": "你的帳號收到一則審核警告。",
+ "notification.moderation_warning.action_sensitive": "從現在起，你的帖文將被標記為敏感內容。",
+ "notification.moderation_warning.action_silence": "你的帳號已受到限制。",
+ "notification.moderation_warning.action_suspend": "你的帳號已被停權。",
"notification.own_poll": "你的投票已結束",
"notification.poll": "你參與過的一個投票已經結束",
"notification.reblog": "{name} 轉推你的文章",
+ "notification.relationships_severance_event": "失去與 {name} 的連結",
+ "notification.relationships_severance_event.account_suspension": "{from} 的管理員已將 {target} 停權，這表示你無法再收到他們的更新或與他們互動。",
+ "notification.relationships_severance_event.domain_block": "{from} 的管理員已封鎖 {target}，包括你的 {followersCount} 位追蹤者和 {followingCount, plural, other {# 個你追蹤的帳號}}。",
+ "notification.relationships_severance_event.learn_more": "了解更多",
+ "notification.relationships_severance_event.user_domain_block": "你已封鎖 {target}，並移除了你的 {followersCount} 位追蹤者和你追蹤的 {followingCount, plural, other {# 個帳號}}。",
"notification.status": "{name} 剛發表了文章",
"notification.update": "{name} 編輯了帖文",
+ "notification_requests.accept": "接受",
+ "notification_requests.dismiss": "忽略",
+ "notification_requests.notifications_from": "來自 {name} 的通知",
+ "notification_requests.title": "已過濾之通知",
"notifications.clear": "清空通知紀錄",
"notifications.clear_confirmation": "你確定要清空通知紀錄嗎？",
"notifications.column_settings.admin.report": "新舉報：",
@@ -444,8 +502,7 @@
"notifications.column_settings.alert": "顯示桌面通知",
"notifications.column_settings.favourite": "最愛：",
"notifications.column_settings.filter_bar.advanced": "顯示所有分類",
- "notifications.column_settings.filter_bar.category": "快速過濾欄",
- "notifications.column_settings.filter_bar.show_bar": "顯示篩選欄",
+ "notifications.column_settings.filter_bar.category": "快速篩選欄",
"notifications.column_settings.follow": "新追蹤者：",
"notifications.column_settings.follow_request": "新的追蹤請求：",
"notifications.column_settings.mention": "提及你：",
@@ -471,6 +528,15 @@
"notifications.permission_denied": "本站不能發送桌面通知，因為瀏覽器先前拒絕了本站的桌面通知權限請求",
"notifications.permission_denied_alert": "無法啟用桌面通知，因為瀏覽器先前拒絕了本站的桌面通知權限請求",
"notifications.permission_required": "由於瀏覽器未有授予桌面通知權限，本站暫未能發送桌面通知。",
+ "notifications.policy.filter_new_accounts.hint": "在過去 {days, plural, other {# 天}}內建立",
+ "notifications.policy.filter_new_accounts_title": "新帳號",
+ "notifications.policy.filter_not_followers_hint": "包括追蹤你不到 {days, plural, other {# 天}}的人",
+ "notifications.policy.filter_not_followers_title": "未追蹤你的人",
+ "notifications.policy.filter_not_following_hint": "直至你手動核准他們",
+ "notifications.policy.filter_not_following_title": "你未追蹤的人",
+ "notifications.policy.filter_private_mentions_hint": "除非回覆你的提及或來自你追蹤的人，否則將被過濾",
+ "notifications.policy.filter_private_mentions_title": "未經請求的私人提及",
+ "notifications.policy.title": "過濾來自以下的通知…",
"notifications_permission_banner.enable": "啟用桌面通知",
"notifications_permission_banner.how_to_control": "只要啟用桌面通知，便可在 Mastodon 網站沒有打開時收到通知。在已經啟用桌面通知的時候，你可以透過上面的 {icon} 按鈕準確控制哪些類型的互動會產生桌面通知。",
"notifications_permission_banner.title": "不放過任何事情",
@@ -526,14 +592,15 @@
"poll_button.add_poll": "建立投票",
"poll_button.remove_poll": "移除投票",
"privacy.change": "調整私隱設定",
- "privacy.direct.long": "只有提及的使用者能看到",
- "privacy.direct.short": "僅限提及的人",
- "privacy.private.long": "只有你的關注者能看到",
- "privacy.private.short": "僅限追隨者",
- "privacy.public.long": "對所有人可見",
+ "privacy.direct.long": "帖文提及的人",
+ "privacy.direct.short": "特定的人",
+ "privacy.private.long": "只有你的追蹤者",
+ "privacy.private.short": "追蹤者",
+ "privacy.public.long": "Mastodon 內外的任何人",
"privacy.public.short": "公共",
- "privacy.unlisted.long": "對所有人可見，但不包括探索功能",
- "privacy.unlisted.short": "公開",
+ "privacy.unlisted.additional": "這與公開完全相同，但是你的帖文不會顯示在即時動態、標籤、探索和 Mastodon 的搜尋結果中，即使你的帳戶啟用了相關設定也好。",
+ "privacy.unlisted.long": "較少用演算法宣傳",
+ "privacy.unlisted.short": "半公開",
"privacy_policy.last_updated": "最後更新 {date}",
"privacy_policy.title": "私隱政策",
"recommended": "推薦",
@@ -551,7 +618,9 @@
"relative_time.minutes": "{number}分鐘前",
"relative_time.seconds": "{number}秒前",
"relative_time.today": "今天",
+ "reply_indicator.attachments": "{count, plural, one {# 附件} other {# 附件}}",
"reply_indicator.cancel": "取消",
+ "reply_indicator.poll": "投票",
"report.block": "封鎖",
"report.block_explanation": "你將不會看到他們的帖文。他們將無法看到你的帖文或追隨你。他們將發現自己被封鎖了。",
"report.categories.legal": "法律",
@@ -644,10 +713,11 @@
"status.direct": "私下提及 @{name}",
"status.direct_indicator": "私人提及",
"status.edit": "編輯",
- "status.edited": "編輯於 {date}",
+ "status.edited": "最後編輯於 {date}",
"status.edited_x_times": "Edited {count, plural, one {{count} 次} other {{count} 次}}",
"status.embed": "嵌入",
"status.favourite": "最愛",
+ "status.favourites": "{count, plural, one {則最愛} other {則最愛}}",
"status.filter": "篩選此帖文",
"status.filtered": "已過濾",
"status.hide": "隱藏帖文",
@@ -668,6 +738,7 @@
"status.reblog": "轉推",
"status.reblog_private": "轉推到原讀者",
"status.reblogged_by": "{name} 轉推",
+ "status.reblogs": "{count, plural, one {則轉推} other {則轉推}}",
"status.reblogs.empty": "還未有人轉推。有的話會顯示在這裡。",
"status.redraft": "刪除並編輯",
"status.remove_bookmark": "移除書籤",
@@ -715,10 +786,8 @@
"upload_error.poll": "不允許在投票上傳檔案。",
"upload_form.audio_description": "簡單描述內容給聽障人士",
"upload_form.description": "為視覺障礙人士添加文字說明",
- "upload_form.description_missing": "沒有加入描述",
"upload_form.edit": "編輯",
"upload_form.thumbnail": "更改預覽圖",
- "upload_form.undo": "刪除",
"upload_form.video_description": "簡單描述給聽障或視障人士",
"upload_modal.analyzing_picture": "正在分析圖片…",
"upload_modal.apply": "套用",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index cc8b5831202927..1d20034db88425 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -6,7 +6,7 @@
"about.domain_blocks.preamble": "Mastodon 基本上允許您瀏覽聯邦宇宙中任何伺服器的內容並與使用者互動。以下是在本伺服器上設定的例外。",
"about.domain_blocks.silenced.explanation": "一般來說您不會看到來自這個伺服器的個人檔案和內容，除非您明確搜尋或主動跟隨對方。",
"about.domain_blocks.silenced.title": "已受限",
- "about.domain_blocks.suspended.explanation": "來自此伺服器的資料都不會被處理、儲存或交換，也無法與此伺服器上的使用者互動或交流。",
+ "about.domain_blocks.suspended.explanation": "來自此伺服器的資料都不會被處理、儲存或交換，也無法和此伺服器上的使用者互動與交流。",
"about.domain_blocks.suspended.title": "已停權",
"about.not_available": "無法於本伺服器上使用此資訊。",
"about.powered_by": "由 {mastodon} 提供的去中心化社群媒體",
@@ -70,7 +70,7 @@
"account.unendorse": "取消於個人檔案推薦對方",
"account.unfollow": "取消跟隨",
"account.unmute": "解除靜音 @{name}",
- "account.unmute_notifications_short": "取消靜音推播通知",
+ "account.unmute_notifications_short": "解除靜音推播通知",
"account.unmute_short": "解除靜音",
"account_note.placeholder": "按此新增備註",
"admin.dashboard.daily_retention": "註冊後使用者存留率（日）",
@@ -89,7 +89,14 @@
"announcement.announcement": "公告",
"attachments_list.unprocessed": "（未經處理）",
"audio.hide": "隱藏音訊",
- "autosuggest_hashtag.per_week": "{count} / 週",
+ "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": "無法繪製請求的頁面。這可能是因為我們程式碼中的臭蟲或是瀏覽器的相容問題。",
@@ -146,26 +153,22 @@
"compose_form.lock_disclaimer": "您的帳號尚未 {locked}。任何人皆能跟隨您並看到您設定成只對跟隨者顯示的嘟文。",
"compose_form.lock_disclaimer.lock": "上鎖",
"compose_form.placeholder": "正在想些什麼嗎？",
- "compose_form.poll.add_option": "新增選項",
"compose_form.poll.duration": "投票期限",
- "compose_form.poll.option_placeholder": "第 {number} 個選項",
- "compose_form.poll.remove_option": "移除此選項",
+ "compose_form.poll.multiple": "多選",
+ "compose_form.poll.option_placeholder": "選項 {number}",
+ "compose_form.poll.single": "選擇一個",
"compose_form.poll.switch_to_multiple": "變更投票為允許多個選項",
"compose_form.poll.switch_to_single": "變更投票為允許單一選項",
- "compose_form.publish": "嘟出去",
+ "compose_form.poll.type": "投票方式",
+ "compose_form.publish": "發嘟",
"compose_form.publish_form": "嘟出去",
- "compose_form.publish_loud": "{publish}！",
- "compose_form.save_changes": "儲存變更",
- "compose_form.sensitive.hide": "{count, plural, other {將媒體標記為敏感內容}}",
- "compose_form.sensitive.marked": "此媒體被標記為敏感內容",
- "compose_form.sensitive.unmarked": "此媒體未被標記為敏感內容",
+ "compose_form.reply": "回覆",
+ "compose_form.save_changes": "更新",
"compose_form.spoiler.marked": "移除內容警告",
"compose_form.spoiler.unmarked": "新增內容警告",
- "compose_form.spoiler_placeholder": "請於此處填寫內容警告訊息",
+ "compose_form.spoiler_placeholder": "內容警告 (可選的)",
"confirmation_modal.cancel": "取消",
- "confirmations.block.block_and_report": "封鎖並檢舉",
"confirmations.block.confirm": "封鎖",
- "confirmations.block.message": "您確定要封鎖 {name} 嗎？",
"confirmations.cancel_follow_request.confirm": "收回跟隨請求",
"confirmations.cancel_follow_request.message": "您確定要收回跟隨 {name} 的請求嗎？",
"confirmations.delete.confirm": "刪除",
@@ -174,15 +177,13 @@
"confirmations.delete_list.message": "您確定要永久刪除此列表嗎？",
"confirmations.discard_edit_media.confirm": "捨棄",
"confirmations.discard_edit_media.message": "您於媒體描述或預覽區塊有未儲存的變更。是否要捨棄這些變更？",
- "confirmations.domain_block.confirm": "封鎖整個網域",
+ "confirmations.domain_block.confirm": "封鎖伺服器",
"confirmations.domain_block.message": "您真的非常確定要封鎖整個 {domain} 網域嗎？大部分情況下，封鎖或靜音少數特定的帳號就能滿足需求了。您將不能在任何公開的時間軸及通知中看到來自此網域的內容。您來自該網域的跟隨者也將被移除。",
"confirmations.edit.confirm": "編輯",
"confirmations.edit.message": "編輯嘟文將覆蓋掉您目前正在撰寫之嘟文內容。您是否仍要繼續？",
"confirmations.logout.confirm": "登出",
"confirmations.logout.message": "您確定要登出嗎？",
"confirmations.mute.confirm": "靜音",
- "confirmations.mute.explanation": "此操作將隱藏來自他們的嘟文與通知，但是他們還是可以查閱您的嘟文與跟隨您。",
- "confirmations.mute.message": "您確定要靜音 {name} 嗎？",
"confirmations.redraft.confirm": "刪除並重新編輯",
"confirmations.redraft.message": "您確定要刪除這則嘟文並重新編輯嗎？您將失去這則嘟文之轉嘟及最愛，且對此嘟文之回覆會變成獨立的嘟文。",
"confirmations.reply.confirm": "回覆",
@@ -208,6 +209,27 @@
"dismissable_banner.explore_statuses": "這些於此伺服器以及去中心化網路中其他伺服器發出的嘟文正在被此伺服器上的人們熱烈討論著。越多不同人轉嘟及最愛排名更高。",
"dismissable_banner.explore_tags": "這些主題標籤正在被此伺服器以及去中心化網路上的人們熱烈討論著。越多不同人所嘟出的主題標籤排名更高。",
"dismissable_banner.public_timeline": "這些是來自 {domain} 使用者們跟隨中帳號所發表之最新公開嘟文。",
+ "domain_block_modal.block": "封鎖伺服器",
+ "domain_block_modal.block_account_instead": "改為封鎖 @{name}",
+ "domain_block_modal.they_can_interact_with_old_posts": "來自此伺服器之使用者能與您以往的嘟文互動。",
+ "domain_block_modal.they_cant_follow": "來自此伺服器之使用者將無法跟隨您。",
+ "domain_block_modal.they_wont_know": "他們不會知道他們已被封鎖。",
+ "domain_block_modal.title": "是否封鎖該網域？",
+ "domain_block_modal.you_will_lose_followers": "所有您來自此伺服器之跟隨者將被移除。",
+ "domain_block_modal.you_wont_see_posts": "您不會見到來自此伺服器使用者之任何嘟文或通知。",
+ "domain_pill.activitypub_lets_connect": "它使您能於 Mastodon 及其他不同的社群應用程式與人連結及互動。",
+ "domain_pill.activitypub_like_language": "ActivityPub 像是 Mastodon 與其他社群網路溝通時所用的語言。",
+ "domain_pill.server": "伺服器",
+ "domain_pill.their_handle": "他們的帳號：",
+ "domain_pill.their_server": "他們數位世界的家，他們所有的嘟文都在這裡。",
+ "domain_pill.their_username": "他們於他們的伺服器中獨一無二的識別。於不同的伺服器上可能找到具有相同帳號的使用者。",
+ "domain_pill.username": "使用者名稱",
+ "domain_pill.whats_in_a_handle": "什麼是帳號 (@handle) ？",
+ "domain_pill.who_they_are": "由於帳號 (@handle) 能說明某人是誰以及他們來自何方，您能於 之社群網路上與人們互動。",
+ "domain_pill.who_you_are": "由於帳號 (@handle) 能說明您是誰以及您來自何方，人們能於 之社群網路上與您互動。",
+ "domain_pill.your_handle": "您的帳號：",
+ "domain_pill.your_server": "您數位世界的家，您所有的嘟文都在這裡。不喜歡這台伺服器嗎？您能隨時搬家至其他伺服器並且仍保有您的跟隨者。",
+ "domain_pill.your_username": "您於您的伺服器中獨一無二的識別。於不同的伺服器上可能找到具有相同帳號的使用者。",
"embed.instructions": "若您欲於您的網站嵌入此嘟文，請複製以下程式碼。",
"embed.preview": "它將顯示成這樣：",
"emoji_button.activity": "活動",
@@ -215,7 +237,7 @@
"emoji_button.custom": "自訂",
"emoji_button.flags": "旗幟",
"emoji_button.food": "食物 & 飲料",
- "emoji_button.label": "插入表情符號",
+ "emoji_button.label": "插入 emoji 表情符號",
"emoji_button.nature": "自然",
"emoji_button.not_found": "啊就沒這表情符號吼！！ (╯°□°）╯︵ ┻━┻",
"emoji_button.objects": "物件",
@@ -230,7 +252,7 @@
"empty_column.account_timeline": "這裡還沒有嘟文！",
"empty_column.account_unavailable": "無法取得個人檔案",
"empty_column.blocks": "您還沒有封鎖任何使用者。",
- "empty_column.bookmarked_statuses": "您還沒有建立任何書籤。當您建立書籤時，它將於此顯示。",
+ "empty_column.bookmarked_statuses": "您還沒有新增任何書籤。當您新增書籤時，它將於此顯示。",
"empty_column.community": "本站時間軸是空的。快公開嘟些文搶頭香啊！",
"empty_column.direct": "您還沒有收到任何私訊。當您私訊別人或收到私訊時，它將於此顯示。",
"empty_column.domain_blocks": "尚未封鎖任何網域。",
@@ -242,8 +264,9 @@
"empty_column.hashtag": "這個主題標籤下什麼也沒有。",
"empty_column.home": "您的首頁時間軸是空的！跟隨更多人來將它填滿吧！",
"empty_column.list": "這份列表下什麼也沒有。當此列表的成員嘟出新的嘟文時，它們將顯示於此。",
- "empty_column.lists": "您還沒有建立任何列表。當您建立列表時，它將於此顯示。",
+ "empty_column.lists": "您還沒有新增任何列表。當您新增列表時，它將於此顯示。",
"empty_column.mutes": "您尚未靜音任何使用者。",
+ "empty_column.notification_requests": "清空啦！已經沒有任何通知。當您收到新通知時，它們將依照您的設定於此顯示。",
"empty_column.notifications": "您還沒有收到任何通知，當您與別人開始互動時，它將於此顯示。",
"empty_column.public": "這裡什麼都沒有！嘗試寫些公開的嘟文，或者跟隨其他伺服器的使用者後，就會有嘟文出現了",
"error.unexpected_crash.explanation": "由於發生系統故障或瀏覽器相容性問題，無法正常顯示此頁面。",
@@ -274,12 +297,30 @@
"filter_modal.select_filter.subtitle": "使用既有的類別或是新增",
"filter_modal.select_filter.title": "過濾此嘟文",
"filter_modal.title.status": "過濾一則嘟文",
+ "filtered_notifications_banner.mentions": "{count, plural, other {# 則提及}}",
+ "filtered_notifications_banner.pending_requests": "來自您可能認識的 {count, plural, =0 {0 人} other {# 人}} 之通知",
+ "filtered_notifications_banner.title": "已過濾之通知",
"firehose.all": "全部",
"firehose.local": "本站",
"firehose.remote": "聯邦宇宙",
"follow_request.authorize": "授權",
"follow_request.reject": "拒絕",
"follow_requests.unlocked_explanation": "即便您的帳號未被鎖定，{domain} 的管理員認為您可能想要自己審核這些帳號的跟隨請求。",
+ "follow_suggestions.curated_suggestion": "精選內容",
+ "follow_suggestions.dismiss": "不再顯示",
+ "follow_suggestions.featured_longer": "{domain} 團隊精選",
+ "follow_suggestions.friends_of_friends_longer": "受您跟隨之使用者愛戴的風雲人物",
+ "follow_suggestions.hints.featured": "這個個人檔案是 {domain} 管理團隊精心挑選。",
+ "follow_suggestions.hints.friends_of_friends": "這個個人檔案於您跟隨的帳號中很受歡迎。",
+ "follow_suggestions.hints.most_followed": "這個個人檔案是 {domain} 中最受歡迎的帳號之一。",
+ "follow_suggestions.hints.most_interactions": "這個個人檔案最近於 {domain} 受到非常多關注。",
+ "follow_suggestions.hints.similar_to_recently_followed": "這個個人檔案與您最近跟隨之帳號類似。",
+ "follow_suggestions.personalized_suggestion": "個人化推薦",
+ "follow_suggestions.popular_suggestion": "熱門推薦",
+ "follow_suggestions.popular_suggestion_longer": "{domain} 上的人氣王",
+ "follow_suggestions.similar_to_recently_followed_longer": "與您近日跟隨相近之帳號",
+ "follow_suggestions.view_all": "檢視全部",
+ "follow_suggestions.who_to_follow": "推薦跟隨帳號",
"followed_tags": "已跟隨主題標籤",
"footer.about": "關於",
"footer.directory": "個人檔案目錄",
@@ -306,22 +347,17 @@
"hashtag.follow": "跟隨主題標籤",
"hashtag.unfollow": "取消跟隨主題標籤",
"hashtags.and_other": "…及其他 {count, plural, other {# 個}}",
- "home.actions.go_to_explore": "看看發生什麼新鮮事",
- "home.actions.go_to_suggestions": "尋找一些人來跟隨",
- "home.column_settings.basic": "基本設定",
"home.column_settings.show_reblogs": "顯示轉嘟",
"home.column_settings.show_replies": "顯示回覆",
- "home.explore_prompt.body": "您的首頁時間軸將由您所跟隨之主題標籤、帳號以及其轉嘟所組成。若目前流速有點慢，您可以考慮以下幾點：",
- "home.explore_prompt.title": "這是您於 Mastodon 的基地",
"home.hide_announcements": "隱藏公告",
"home.pending_critical_update.body": "請立即升級您的 Mastodon 伺服器！",
"home.pending_critical_update.link": "檢視更新內容",
"home.pending_critical_update.title": "有可取得的重要安全性更新！",
"home.show_announcements": "顯示公告",
- "interaction_modal.description.favourite": "在 Mastodon 上有個帳號的話，您可以將此嘟文加入最愛以讓作者知道您欣賞它且將它儲存下來。",
- "interaction_modal.description.follow": "在 Mastodon 上有個帳號的話，您可以跟隨 {name} 以於首頁時間軸接收他們的嘟文。",
- "interaction_modal.description.reblog": "在 Mastodon 上有個帳號的話，您可以轉嘟此嘟文以分享給您的跟隨者們。",
- "interaction_modal.description.reply": "在 Mastodon 上有個帳號的話，您可以回覆此嘟文。",
+ "interaction_modal.description.favourite": "若於 Mastodon 上有個帳號，您可以將此嘟文加入最愛使作者知道您欣賞它且將它儲存下來。",
+ "interaction_modal.description.follow": "若於 Mastodon 上有個帳號，您可以跟隨 {name} 以於首頁時間軸接收他們的嘟文。",
+ "interaction_modal.description.reblog": "若於 Mastodon 上有個帳號，您可以轉嘟此嘟文以分享給您的跟隨者們。",
+ "interaction_modal.description.reply": "若於 Mastodon 上有個帳號，您可以回覆此嘟文。",
"interaction_modal.login.action": "返回首頁",
"interaction_modal.login.prompt": "您帳號所屬伺服器之網域，例如：mastodon.social",
"interaction_modal.no_account_yet": "還沒有 Mastodon 帳號嗎？",
@@ -343,7 +379,7 @@
"keyboard_shortcuts.compose": "將游標移至文字撰寫區塊",
"keyboard_shortcuts.description": "說明",
"keyboard_shortcuts.direct": "開啟私訊對話欄",
- "keyboard_shortcuts.down": "往下移動",
+ "keyboard_shortcuts.down": "向下移動",
"keyboard_shortcuts.enter": "檢視嘟文",
"keyboard_shortcuts.favourite": "加到最愛",
"keyboard_shortcuts.favourites": "開啟最愛列表",
@@ -369,7 +405,7 @@
"keyboard_shortcuts.toggle_sensitivity": "顯示或隱藏媒體",
"keyboard_shortcuts.toot": "發個新嘟文",
"keyboard_shortcuts.unfocus": "跳離文字撰寫區塊或搜尋框",
- "keyboard_shortcuts.up": "往上移動",
+ "keyboard_shortcuts.up": "向上移動",
"lightbox.close": "關閉",
"lightbox.compress": "折疊圖片檢視框",
"lightbox.expand": "展開圖片檢視框",
@@ -378,6 +414,7 @@
"limited_account_hint.action": "一律顯示個人檔案",
"limited_account_hint.title": "此個人檔案已被 {domain} 的管理員隱藏。",
"link_preview.author": "來自 {name}",
+ "link_preview.more_from_author": "來自 {name} 之更多內容",
"lists.account.add": "新增至列表",
"lists.account.remove": "自列表中移除",
"lists.delete": "刪除列表",
@@ -390,15 +427,21 @@
"lists.replies_policy.list": "列表成員",
"lists.replies_policy.none": "沒有人",
"lists.replies_policy.title": "顯示回覆：",
- "lists.search": "搜尋您跟隨的使用者",
+ "lists.search": "搜尋您跟隨之使用者",
"lists.subheading": "您的列表",
"load_pending": "{count, plural, one {# 個新項目} other {# 個新項目}}",
"loading_indicator.label": "正在載入...",
"media_gallery.toggle_visible": "切換可見性",
"moved_to_account_banner.text": "您的帳號 {disabledAccount} 目前已停用，因為您已搬家至 {movedToAccount}。",
- "mute_modal.duration": "持續時間",
- "mute_modal.hide_notifications": "是否隱藏來自這位使用者的通知？",
- "mute_modal.indefinite": "無期限",
+ "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": "已封鎖的使用者",
@@ -408,7 +451,6 @@
"navigation_bar.direct": "私訊",
"navigation_bar.discover": "探索",
"navigation_bar.domain_blocks": "已封鎖網域",
- "navigation_bar.edit_profile": "編輯個人檔案",
"navigation_bar.explore": "探索",
"navigation_bar.favourites": "最愛",
"navigation_bar.filters": "已靜音的關鍵字",
@@ -432,11 +474,29 @@
"notification.follow": "{name} 已跟隨您",
"notification.follow_request": "{name} 要求跟隨您",
"notification.mention": "{name} 已提到您",
+ "notification.moderation-warning.learn_more": "了解更多",
+ "notification.moderation_warning": "您已收到管理員警告",
+ "notification.moderation_warning.action_delete_statuses": "某些您的嘟文已被刪除。",
+ "notification.moderation_warning.action_disable": "您的帳號已被停用。",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "某些您的嘟文已被標記為敏感內容。",
+ "notification.moderation_warning.action_none": "您的帳號已收到管理員警告。",
+ "notification.moderation_warning.action_sensitive": "即日起，您的嘟文將會被標記為敏感內容。",
+ "notification.moderation_warning.action_silence": "您的帳號已被限制。",
+ "notification.moderation_warning.action_suspend": "您的帳號已被停權。",
"notification.own_poll": "您的投票已結束",
"notification.poll": "您曾投過的投票已經結束",
"notification.reblog": "{name} 已轉嘟您的嘟文",
+ "notification.relationships_severance_event": "與 {name} 失去連結",
+ "notification.relationships_severance_event.account_suspension": "{from} 之管理員已將 {target} 停權，意味著您將不再收到來自他們的更新或與之互動。",
+ "notification.relationships_severance_event.domain_block": "{from} 之管理員已將 {target} 封鎖，包含 {followersCount} 名您的跟隨者及 {followingCount, plural, other {#}} 名您跟隨的帳號。",
+ "notification.relationships_severance_event.learn_more": "了解更多",
+ "notification.relationships_severance_event.user_domain_block": "您已將 {target} 封鎖，將移除 {followersCount} 名您的跟隨者及 {followingCount, plural, other {#}} 名您跟隨的帳號。",
"notification.status": "{name} 剛剛嘟文",
"notification.update": "{name} 已編輯嘟文",
+ "notification_requests.accept": "接受",
+ "notification_requests.dismiss": "關閉",
+ "notification_requests.notifications_from": "來自 {name} 之通知",
+ "notification_requests.title": "已過濾之通知",
"notifications.clear": "清除通知",
"notifications.clear_confirmation": "您確定要永久清除您的通知嗎？",
"notifications.column_settings.admin.report": "新檢舉報告：",
@@ -445,7 +505,6 @@
"notifications.column_settings.favourite": "最愛：",
"notifications.column_settings.filter_bar.advanced": "顯示所有分類",
"notifications.column_settings.filter_bar.category": "快速過濾器",
- "notifications.column_settings.filter_bar.show_bar": "顯示過濾器",
"notifications.column_settings.follow": "新的跟隨者：",
"notifications.column_settings.follow_request": "新的跟隨請求：",
"notifications.column_settings.mention": "提及：",
@@ -471,6 +530,15 @@
"notifications.permission_denied": "由於之前已拒絕瀏覽器請求，因此無法使用桌面通知",
"notifications.permission_denied_alert": "由於之前瀏覽器權限被拒絕，無法啟用桌面通知",
"notifications.permission_required": "由於尚未授予所需的權限，因此無法使用桌面通知。",
+ "notifications.policy.filter_new_accounts.hint": "新增於過去 {days, plural, other {# 日}}",
+ "notifications.policy.filter_new_accounts_title": "新帳號",
+ "notifications.policy.filter_not_followers_hint": "包含最近 {days, plural, other {# 日}} 內跟隨您之使用者",
+ "notifications.policy.filter_not_followers_title": "未跟隨您之使用者",
+ "notifications.policy.filter_not_following_hint": "直至您手動核准他們",
+ "notifications.policy.filter_not_following_title": "您未跟隨之使用者",
+ "notifications.policy.filter_private_mentions_hint": "過濾通知，除非嘟文包含於您的提及，或您跟隨該發嘟帳號",
+ "notifications.policy.filter_private_mentions_title": "不請自來的私訊",
+ "notifications.policy.title": "過濾通知來自...",
"notifications_permission_banner.enable": "啟用桌面通知",
"notifications_permission_banner.how_to_control": "啟用桌面通知以於 Mastodon 沒有開啟的時候接收通知。啟用桌面通知後，您可以透過上面的 {icon} 按鈕準確的控制哪些類型的互動會產生桌面通知。",
"notifications_permission_banner.title": "不要錯過任何東西！",
@@ -480,10 +548,10 @@
"onboarding.actions.go_to_home": "前往您的首頁時間軸",
"onboarding.compose.template": "哈囉 #Mastodon！",
"onboarding.follows.empty": "很遺憾，目前未能顯示任何結果。您可以嘗試使用搜尋、瀏覽探索頁面以找尋人們跟隨、或稍候再試。",
- "onboarding.follows.lead": "您的首頁時間軸是 Mastodon 的核心體驗。若您跟隨更多人的話，它將會變得更活躍有趣。這些個人檔案也許是個好起點，您可以隨時取消跟隨他們！",
+ "onboarding.follows.lead": "您的首頁時間軸是 Mastodon 的核心體驗。若您跟隨更多人，它將會變得更活躍有趣。這些個人檔案也許是個好起點，您可以隨時取消跟隨他們！",
"onboarding.follows.title": "客製化您的首頁時間軸",
"onboarding.profile.discoverable": "使我的個人檔案可以被找到",
- "onboarding.profile.discoverable_hint": "當您於 Mastodon 上選擇加入可發現性時，您的嘟文可能會出現於搜尋結果與趨勢中。您的個人檔案可能會被推薦給與您志趣相投的人。",
+ "onboarding.profile.discoverable_hint": "當您於 Mastodon 上選擇加入可發現性時，您的嘟文可能會顯示於搜尋結果與趨勢中。您的個人檔案可能會被推薦給與您志趣相投的人。",
"onboarding.profile.display_name": "顯示名稱",
"onboarding.profile.display_name_hint": "完整名稱或暱稱...",
"onboarding.profile.lead": "您隨時可以稍候於設定中完成此操作，將有更多自訂選項可使用。",
@@ -502,7 +570,7 @@
"onboarding.start.title": "噹噹！完成啦！",
"onboarding.steps.follow_people.body": "Mastodon 的趣味就是跟隨些有趣的人們！",
"onboarding.steps.follow_people.title": "客製化您的首頁時間軸",
- "onboarding.steps.publish_status.body": "向新世界打聲招呼吧。",
+ "onboarding.steps.publish_status.body": "透過文字、照片、影片或投票 {emoji} 向新世界打聲招呼吧。",
"onboarding.steps.publish_status.title": "撰寫您第一則嘟文",
"onboarding.steps.setup_profile.body": "若您完整填寫個人檔案，其他人比較願意與您互動。",
"onboarding.steps.setup_profile.title": "客製化您的個人檔案",
@@ -523,16 +591,17 @@
"poll.vote": "投票",
"poll.voted": "您已對此問題投票",
"poll.votes": "{votes, plural, one {# 張票} other {# 張票}}",
- "poll_button.add_poll": "建立投票",
+ "poll_button.add_poll": "新增投票",
"poll_button.remove_poll": "移除投票",
"privacy.change": "調整嘟文隱私狀態",
- "privacy.direct.long": "只有被提及的使用者能看到",
- "privacy.direct.short": "僅限提及者",
- "privacy.private.long": "只有跟隨您的使用者能看到",
- "privacy.private.short": "僅限跟隨者",
- "privacy.public.long": "對所有人可見",
+ "privacy.direct.long": "此嘟文提及之所有人",
+ "privacy.direct.short": "指定使用者",
+ "privacy.private.long": "只有跟隨您之使用者能看到",
+ "privacy.private.short": "跟隨者",
+ "privacy.public.long": "所有人 (無論在 Mastodon 上與否)",
"privacy.public.short": "公開",
- "privacy.unlisted.long": "對所有人可見，但選擇退出探索功能",
+ "privacy.unlisted.additional": "此與公開嘟文完全相同，但嘟文不會出現於即時內容或主題標籤、探索、及 Mastodon 搜尋中，即使您在帳戶設定中選擇加入。",
+ "privacy.unlisted.long": "悄然無聲",
"privacy.unlisted.short": "不公開",
"privacy_policy.last_updated": "最後更新：{date}",
"privacy_policy.title": "隱私權政策",
@@ -551,7 +620,9 @@
"relative_time.minutes": "{number} 分鐘前",
"relative_time.seconds": "{number} 秒",
"relative_time.today": "今天",
+ "reply_indicator.attachments": "{count, plural, other {# 個附加檔案}}",
"reply_indicator.cancel": "取消",
+ "reply_indicator.poll": "投票",
"report.block": "封鎖",
"report.block_explanation": "您將不再看到他們的嘟文。他們將無法看到您的嘟文或是跟隨您。他們會發現他們已被封鎖。",
"report.categories.legal": "合法性",
@@ -644,10 +715,11 @@
"status.direct": "私訊 @{name}",
"status.direct_indicator": "私訊",
"status.edit": "編輯",
- "status.edited": "編輯於 {date}",
+ "status.edited": "上次編輯於 {date}",
"status.edited_x_times": "已編輯 {count, plural, one {{count} 次} other {{count} 次}}",
"status.embed": "內嵌嘟文",
"status.favourite": "最愛",
+ "status.favourites": "{count, plural, other {# 則最愛}}",
"status.filter": "過濾此嘟文",
"status.filtered": "已過濾",
"status.hide": "隱藏嘟文",
@@ -662,16 +734,17 @@
"status.mute": "靜音 @{name}",
"status.mute_conversation": "靜音對話",
"status.open": "展開此嘟文",
- "status.pin": "釘選到個人檔案頁面",
+ "status.pin": "釘選至個人檔案頁面",
"status.pinned": "釘選嘟文",
"status.read_more": "閱讀更多",
"status.reblog": "轉嘟",
"status.reblog_private": "依照原嘟可見性轉嘟",
"status.reblogged_by": "{name} 已轉嘟",
+ "status.reblogs": "{count, plural, other {# 則轉嘟}}",
"status.reblogs.empty": "還沒有人轉嘟過這則嘟文。當有人轉嘟時，它將於此顯示。",
"status.redraft": "刪除並重新編輯",
"status.remove_bookmark": "移除書籤",
- "status.replied_to": "回覆給 {name}",
+ "status.replied_to": "回覆 {name}",
"status.reply": "回覆",
"status.replyAll": "回覆討論串",
"status.report": "檢舉 @{name}",
@@ -710,15 +783,13 @@
"units.short.million": "{count}M",
"units.short.thousand": "{count}K",
"upload_area.title": "拖放來上傳",
- "upload_button.label": "上傳圖片、影片、或者音樂檔案",
+ "upload_button.label": "上傳圖片、影片、或者音訊檔案",
"upload_error.limit": "已達到檔案上傳限制。",
"upload_error.poll": "不允許於投票時上傳檔案。",
"upload_form.audio_description": "為聽障人士增加文字說明",
"upload_form.description": "為視障人士增加文字說明",
- "upload_form.description_missing": "沒有任何描述",
"upload_form.edit": "編輯",
"upload_form.thumbnail": "更改預覽圖",
- "upload_form.undo": "刪除",
"upload_form.video_description": "為聽障或視障人士增加文字說明",
"upload_modal.analyzing_picture": "正在分析圖片…",
"upload_modal.apply": "套用",
diff --git a/app/javascript/mastodon/models/status.ts b/app/javascript/mastodon/models/status.ts
new file mode 100644
index 00000000000000..7907fc34f8e186
--- /dev/null
+++ b/app/javascript/mastodon/models/status.ts
@@ -0,0 +1,4 @@
+export type { StatusVisibility } from 'mastodon/api_types/statuses';
+
+// Temporary until we type it correctly
+export type Status = Immutable.Map;
diff --git a/app/javascript/mastodon/reducers/blocks.js b/app/javascript/mastodon/reducers/blocks.js
deleted file mode 100644
index 1b65071634fb16..00000000000000
--- a/app/javascript/mastodon/reducers/blocks.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import Immutable from 'immutable';
-
-import {
- BLOCKS_INIT_MODAL,
-} from '../actions/blocks';
-
-const initialState = Immutable.Map({
- new: Immutable.Map({
- account_id: null,
- }),
-});
-
-export default function mutes(state = initialState, action) {
- switch (action.type) {
- case BLOCKS_INIT_MODAL:
- return state.withMutations((state) => {
- state.setIn(['new', 'account_id'], action.account.get('id'));
- });
- default:
- return state;
- }
-}
diff --git a/app/javascript/mastodon/reducers/boosts.js b/app/javascript/mastodon/reducers/boosts.js
deleted file mode 100644
index d0d825057cdfa0..00000000000000
--- a/app/javascript/mastodon/reducers/boosts.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import Immutable from 'immutable';
-
-import {
- BOOSTS_INIT_MODAL,
- BOOSTS_CHANGE_PRIVACY,
-} from 'mastodon/actions/boosts';
-
-const initialState = Immutable.Map({
- new: Immutable.Map({
- privacy: 'public',
- }),
-});
-
-export default function mutes(state = initialState, action) {
- switch (action.type) {
- case BOOSTS_INIT_MODAL:
- return state.withMutations((state) => {
- state.setIn(['new', 'privacy'], action.privacy);
- });
- case BOOSTS_CHANGE_PRIVACY:
- return state.setIn(['new', 'privacy'], action.privacy);
- default:
- return state;
- }
-}
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index d12e4e7628a30c..3b46548d6ca805 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -41,13 +41,12 @@ import {
COMPOSE_RESET,
COMPOSE_POLL_ADD,
COMPOSE_POLL_REMOVE,
- COMPOSE_POLL_OPTION_ADD,
COMPOSE_POLL_OPTION_CHANGE,
- COMPOSE_POLL_OPTION_REMOVE,
COMPOSE_POLL_SETTINGS_CHANGE,
INIT_MEDIA_EDIT_MODAL,
COMPOSE_CHANGE_MEDIA_DESCRIPTION,
COMPOSE_CHANGE_MEDIA_FOCUS,
+ COMPOSE_CHANGE_MEDIA_ORDER,
COMPOSE_SET_STATUS,
COMPOSE_FOCUS,
} from '../actions/compose';
@@ -302,6 +301,18 @@ const updateSuggestionTags = (state, token) => {
});
};
+const updatePoll = (state, index, value, maxOptions) => state.updateIn(['poll', 'options'], options => {
+ const tmp = options.set(index, value).filterNot(x => x.trim().length === 0);
+
+ if (tmp.size === 0) {
+ return tmp.push('').push('');
+ } else if (tmp.size < maxOptions) {
+ return tmp.push('');
+ }
+
+ return tmp;
+});
+
export default function compose(state = initialState, action) {
switch(action.type) {
case STORE_HYDRATE:
@@ -325,8 +336,8 @@ export default function compose(state = initialState, action) {
map.set('spoiler', !state.get('spoiler'));
map.set('idempotencyKey', uuid());
- if (!state.get('sensitive') && state.get('media_attachments').size >= 1) {
- map.set('sensitive', true);
+ if (state.get('media_attachments').size >= 1 && !state.get('default_sensitive')) {
+ map.set('sensitive', !state.get('spoiler'));
}
});
case COMPOSE_SPOILER_TEXT_CHANGE:
@@ -540,18 +551,22 @@ export default function compose(state = initialState, action) {
return state.set('poll', initialPoll);
case COMPOSE_POLL_REMOVE:
return state.set('poll', null);
- case COMPOSE_POLL_OPTION_ADD:
- return state.updateIn(['poll', 'options'], options => options.push(action.title));
case COMPOSE_POLL_OPTION_CHANGE:
- return state.setIn(['poll', 'options', action.index], action.title);
- case COMPOSE_POLL_OPTION_REMOVE:
- return state.updateIn(['poll', 'options'], options => options.delete(action.index));
+ return updatePoll(state, action.index, action.title, action.maxOptions);
case COMPOSE_POLL_SETTINGS_CHANGE:
return state.update('poll', poll => poll.set('expires_in', action.expiresIn).set('multiple', action.isMultiple));
case COMPOSE_LANGUAGE_CHANGE:
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/index.ts b/app/javascript/mastodon/reducers/index.ts
index ecef63387377b5..6296ef202690a0 100644
--- a/app/javascript/mastodon/reducers/index.ts
+++ b/app/javascript/mastodon/reducers/index.ts
@@ -7,8 +7,6 @@ import { accountsReducer } from './accounts';
import accounts_map from './accounts_map';
import alerts from './alerts';
import announcements from './announcements';
-import blocks from './blocks';
-import boosts from './boosts';
import compose from './compose';
import contexts from './contexts';
import conversations from './conversations';
@@ -22,13 +20,14 @@ import history from './history';
import listAdder from './list_adder';
import listEditor from './list_editor';
import lists from './lists';
-import markers from './markers';
+import { markersReducer } from './markers';
import media_attachments from './media_attachments';
import meta from './meta';
import { modalReducer } from './modal';
-import mutes from './mutes';
+import { notificationPolicyReducer } from './notification_policy';
+import { notificationRequestsReducer } from './notification_requests';
import notifications from './notifications';
-import picture_in_picture from './picture_in_picture';
+import { pictureInPictureReducer } from './picture_in_picture';
import polls from './polls';
import push_notifications from './push_notifications';
import { relationshipsReducer } from './relationships';
@@ -60,9 +59,6 @@ const reducers = {
relationships: relationshipsReducer,
settings,
push_notifications,
- mutes,
- blocks,
- boosts,
server,
contexts,
compose,
@@ -79,11 +75,13 @@ const reducers = {
suggestions,
polls,
trends,
- markers,
- picture_in_picture,
+ markers: markersReducer,
+ picture_in_picture: pictureInPictureReducer,
history,
tags,
followed_tags,
+ notificationPolicy: notificationPolicyReducer,
+ notificationRequests: notificationRequestsReducer,
};
// We want the root state to be an ImmutableRecord, which is an object with a defined list of keys,
diff --git a/app/javascript/mastodon/reducers/markers.js b/app/javascript/mastodon/reducers/markers.js
deleted file mode 100644
index c7c5d99f6143f4..00000000000000
--- a/app/javascript/mastodon/reducers/markers.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Map as ImmutableMap } from 'immutable';
-
-import {
- MARKERS_SUBMIT_SUCCESS,
-} from '../actions/markers';
-
-
-const initialState = ImmutableMap({
- home: '0',
- notifications: '0',
-});
-
-export default function markers(state = initialState, action) {
- switch(action.type) {
- case MARKERS_SUBMIT_SUCCESS:
- if (action.home) {
- state = state.set('home', action.home);
- }
- if (action.notifications) {
- state = state.set('notifications', action.notifications);
- }
- return state;
- default:
- return state;
- }
-}
diff --git a/app/javascript/mastodon/reducers/markers.ts b/app/javascript/mastodon/reducers/markers.ts
new file mode 100644
index 00000000000000..ec85d0f17328cb
--- /dev/null
+++ b/app/javascript/mastodon/reducers/markers.ts
@@ -0,0 +1,18 @@
+import { createReducer } from '@reduxjs/toolkit';
+
+import { submitMarkersAction } from 'mastodon/actions/markers';
+
+const initialState = {
+ home: '0',
+ notifications: '0',
+};
+
+export const markersReducer = createReducer(initialState, (builder) => {
+ builder.addCase(
+ submitMarkersAction.fulfilled,
+ (state, { payload: { home, notifications } }) => {
+ if (home) state.home = home;
+ if (notifications) state.notifications = notifications;
+ },
+ );
+});
diff --git a/app/javascript/mastodon/reducers/meta.js b/app/javascript/mastodon/reducers/meta.js
index 96baf2f1152cbb..ddb78845929464 100644
--- a/app/javascript/mastodon/reducers/meta.js
+++ b/app/javascript/mastodon/reducers/meta.js
@@ -6,7 +6,6 @@ import { layoutFromWindow } from 'mastodon/is_mobile';
const initialState = ImmutableMap({
streaming_api_base_url: null,
- access_token: null,
layout: layoutFromWindow(),
permissions: '0',
});
@@ -14,7 +13,8 @@ const initialState = ImmutableMap({
export default function meta(state = initialState, action) {
switch(action.type) {
case STORE_HYDRATE:
- return state.merge(action.state.get('meta')).set('permissions', action.state.getIn(['role', 'permissions']));
+ // we do not want `access_token` to be stored in the state
+ return state.merge(action.state.get('meta')).delete('access_token').set('permissions', action.state.getIn(['role', 'permissions']));
case changeLayout.type:
return state.set('layout', action.payload.layout);
default:
diff --git a/app/javascript/mastodon/reducers/mutes.js b/app/javascript/mastodon/reducers/mutes.js
deleted file mode 100644
index a9eb61ff834cbc..00000000000000
--- a/app/javascript/mastodon/reducers/mutes.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import Immutable from 'immutable';
-
-import {
- MUTES_INIT_MODAL,
- MUTES_TOGGLE_HIDE_NOTIFICATIONS,
- MUTES_CHANGE_DURATION,
-} from '../actions/mutes';
-
-const initialState = Immutable.Map({
- new: Immutable.Map({
- account: null,
- notifications: true,
- duration: 0,
- }),
-});
-
-export default function mutes(state = initialState, action) {
- switch (action.type) {
- case MUTES_INIT_MODAL:
- return state.withMutations((state) => {
- state.setIn(['new', 'account'], action.account);
- state.setIn(['new', 'notifications'], true);
- });
- case MUTES_TOGGLE_HIDE_NOTIFICATIONS:
- return state.updateIn(['new', 'notifications'], (old) => !old);
- case MUTES_CHANGE_DURATION:
- return state.setIn(['new', 'duration'], Number(action.duration));
- default:
- return state;
- }
-}
diff --git a/app/javascript/mastodon/reducers/notification_policy.js b/app/javascript/mastodon/reducers/notification_policy.js
new file mode 100644
index 00000000000000..8edb4d12a151ef
--- /dev/null
+++ b/app/javascript/mastodon/reducers/notification_policy.js
@@ -0,0 +1,12 @@
+import { fromJS } from 'immutable';
+
+import { NOTIFICATION_POLICY_FETCH_SUCCESS } from 'mastodon/actions/notifications';
+
+export const notificationPolicyReducer = (state = null, action) => {
+ switch(action.type) {
+ case NOTIFICATION_POLICY_FETCH_SUCCESS:
+ return fromJS(action.policy);
+ default:
+ return state;
+ }
+};
diff --git a/app/javascript/mastodon/reducers/notification_requests.js b/app/javascript/mastodon/reducers/notification_requests.js
new file mode 100644
index 00000000000000..4247062a582704
--- /dev/null
+++ b/app/javascript/mastodon/reducers/notification_requests.js
@@ -0,0 +1,96 @@
+import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
+
+import {
+ NOTIFICATION_REQUESTS_EXPAND_REQUEST,
+ NOTIFICATION_REQUESTS_EXPAND_SUCCESS,
+ NOTIFICATION_REQUESTS_EXPAND_FAIL,
+ NOTIFICATION_REQUESTS_FETCH_REQUEST,
+ NOTIFICATION_REQUESTS_FETCH_SUCCESS,
+ NOTIFICATION_REQUESTS_FETCH_FAIL,
+ NOTIFICATION_REQUEST_FETCH_REQUEST,
+ NOTIFICATION_REQUEST_FETCH_SUCCESS,
+ NOTIFICATION_REQUEST_FETCH_FAIL,
+ NOTIFICATION_REQUEST_ACCEPT_REQUEST,
+ NOTIFICATION_REQUEST_DISMISS_REQUEST,
+ NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST,
+ NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS,
+ NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL,
+ NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST,
+ NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS,
+ NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL,
+} from 'mastodon/actions/notifications';
+
+import { notificationToMap } from './notifications';
+
+const initialState = ImmutableMap({
+ items: ImmutableList(),
+ isLoading: false,
+ next: null,
+ current: ImmutableMap({
+ isLoading: false,
+ item: null,
+ removed: false,
+ notifications: ImmutableMap({
+ items: ImmutableList(),
+ isLoading: false,
+ next: null,
+ }),
+ }),
+});
+
+const normalizeRequest = request => fromJS({
+ ...request,
+ account: request.account.id,
+});
+
+const removeRequest = (state, id) => {
+ if (state.getIn(['current', 'item', 'id']) === id) {
+ state = state.setIn(['current', 'removed'], true);
+ }
+
+ return state.update('items', list => list.filterNot(item => item.get('id') === id));
+};
+
+export const notificationRequestsReducer = (state = initialState, action) => {
+ switch(action.type) {
+ case NOTIFICATION_REQUESTS_FETCH_SUCCESS:
+ return state.withMutations(map => {
+ map.update('items', list => ImmutableList(action.requests.map(normalizeRequest)).concat(list));
+ map.set('isLoading', false);
+ map.update('next', next => next ?? action.next);
+ });
+ case NOTIFICATION_REQUESTS_EXPAND_SUCCESS:
+ return state.withMutations(map => {
+ map.update('items', list => list.concat(ImmutableList(action.requests.map(normalizeRequest))));
+ map.set('isLoading', false);
+ map.set('next', action.next);
+ });
+ case NOTIFICATION_REQUESTS_EXPAND_REQUEST:
+ case NOTIFICATION_REQUESTS_FETCH_REQUEST:
+ return state.set('isLoading', true);
+ case NOTIFICATION_REQUESTS_EXPAND_FAIL:
+ case NOTIFICATION_REQUESTS_FETCH_FAIL:
+ return state.set('isLoading', false);
+ case NOTIFICATION_REQUEST_ACCEPT_REQUEST:
+ case NOTIFICATION_REQUEST_DISMISS_REQUEST:
+ return removeRequest(state, action.id);
+ case NOTIFICATION_REQUEST_FETCH_REQUEST:
+ return state.set('current', initialState.get('current').set('isLoading', true));
+ case NOTIFICATION_REQUEST_FETCH_SUCCESS:
+ return state.update('current', map => map.set('isLoading', false).set('item', normalizeRequest(action.request)));
+ case NOTIFICATION_REQUEST_FETCH_FAIL:
+ return state.update('current', map => map.set('isLoading', false));
+ case NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST:
+ case NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST:
+ return state.setIn(['current', 'notifications', 'isLoading'], true);
+ case NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS:
+ return state.updateIn(['current', 'notifications'], map => map.set('isLoading', false).update('items', list => ImmutableList(action.notifications.map(notificationToMap)).concat(list)).update('next', next => next ?? action.next));
+ case NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS:
+ return state.updateIn(['current', 'notifications'], map => map.set('isLoading', false).update('items', list => list.concat(ImmutableList(action.notifications.map(notificationToMap)))).set('next', action.next));
+ case NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL:
+ case NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL:
+ return state.setIn(['current', 'notifications', 'isLoading'], false);
+ default:
+ return state;
+ }
+};
diff --git a/app/javascript/mastodon/reducers/notifications.js b/app/javascript/mastodon/reducers/notifications.js
index 2ca301b19a6718..64cddcb666864f 100644
--- a/app/javascript/mastodon/reducers/notifications.js
+++ b/app/javascript/mastodon/reducers/notifications.js
@@ -13,7 +13,7 @@ import {
unfocusApp,
} from '../actions/app';
import {
- MARKERS_FETCH_SUCCESS,
+ fetchMarkers,
} from '../actions/markers';
import {
notificationsUpdate,
@@ -48,13 +48,15 @@ const initialState = ImmutableMap({
browserPermission: 'default',
});
-const notificationToMap = notification => ImmutableMap({
+export const notificationToMap = notification => ImmutableMap({
id: notification.id,
type: notification.type,
account: notification.account.id,
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,
+ moderation_warning: notification.moderation_warning ? fromJS(notification.moderation_warning) : null,
});
const normalizeNotification = (state, notification, usePendingItems) => {
@@ -254,8 +256,8 @@ const recountUnread = (state, last_read_id) => {
export default function notifications(state = initialState, action) {
switch(action.type) {
- case MARKERS_FETCH_SUCCESS:
- return action.markers.notifications ? recountUnread(state, action.markers.notifications.last_read_id) : state;
+ case fetchMarkers.fulfilled.type:
+ return action.payload.markers.notifications ? recountUnread(state, action.payload.markers.notifications.last_read_id) : state;
case NOTIFICATIONS_MOUNT:
return updateMounted(state);
case NOTIFICATIONS_UNMOUNT:
diff --git a/app/javascript/mastodon/reducers/picture_in_picture.js b/app/javascript/mastodon/reducers/picture_in_picture.js
deleted file mode 100644
index 6824ad9303c328..00000000000000
--- a/app/javascript/mastodon/reducers/picture_in_picture.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { PICTURE_IN_PICTURE_DEPLOY, PICTURE_IN_PICTURE_REMOVE } from 'mastodon/actions/picture_in_picture';
-
-import { TIMELINE_DELETE } from '../actions/timelines';
-
-const initialState = {
- statusId: null,
- accountId: null,
- type: null,
- src: null,
- muted: false,
- volume: 0,
- currentTime: 0,
-};
-
-export default function pictureInPicture(state = initialState, action) {
- switch(action.type) {
- case PICTURE_IN_PICTURE_DEPLOY:
- return { statusId: action.statusId, accountId: action.accountId, type: action.playerType, ...action.props };
- case PICTURE_IN_PICTURE_REMOVE:
- return { ...initialState };
- case TIMELINE_DELETE:
- return (state.statusId === action.id) ? { ...initialState } : state;
- default:
- return state;
- }
-}
diff --git a/app/javascript/mastodon/reducers/picture_in_picture.ts b/app/javascript/mastodon/reducers/picture_in_picture.ts
new file mode 100644
index 00000000000000..0feddcb706319f
--- /dev/null
+++ b/app/javascript/mastodon/reducers/picture_in_picture.ts
@@ -0,0 +1,56 @@
+import type { Reducer } from '@reduxjs/toolkit';
+
+import {
+ deployPictureInPictureAction,
+ removePictureInPicture,
+} from 'mastodon/actions/picture_in_picture';
+
+import { TIMELINE_DELETE } from '../actions/timelines';
+
+export interface PIPMediaProps {
+ src: string;
+ muted: boolean;
+ volume: number;
+ currentTime: number;
+ poster: string;
+ backgroundColor: string;
+ foregroundColor: string;
+ accentColor: string;
+}
+
+interface PIPStateWithValue extends Partial {
+ statusId: string;
+ accountId: string;
+ type: 'audio' | 'video';
+}
+
+interface PIPStateEmpty extends Partial {
+ type: null;
+}
+
+type PIPState = PIPStateWithValue | PIPStateEmpty;
+
+const initialState = {
+ type: null,
+ muted: false,
+ volume: 0,
+ currentTime: 0,
+};
+
+export const pictureInPictureReducer: Reducer = (
+ state = initialState,
+ action,
+) => {
+ if (deployPictureInPictureAction.match(action))
+ return {
+ statusId: action.payload.statusId,
+ accountId: action.payload.accountId,
+ type: action.payload.playerType,
+ ...action.payload.props,
+ };
+ else if (removePictureInPicture.match(action)) return initialState;
+ else if (action.type === TIMELINE_DELETE)
+ if (state.type && state.statusId === action.id) return initialState;
+
+ return state;
+};
diff --git a/app/javascript/mastodon/reducers/search.js b/app/javascript/mastodon/reducers/search.js
index 72835eb91745f3..7828d49eeedd9a 100644
--- a/app/javascript/mastodon/reducers/search.js
+++ b/app/javascript/mastodon/reducers/search.js
@@ -50,6 +50,7 @@ export default function search(state = initialState, action) {
return state.set('hidden', true);
case SEARCH_FETCH_REQUEST:
return state.withMutations(map => {
+ map.set('results', ImmutableMap());
map.set('isLoading', true);
map.set('submitted', true);
map.set('type', action.searchType);
diff --git a/app/javascript/mastodon/reducers/settings.js b/app/javascript/mastodon/reducers/settings.js
index a605ecbb8bd62d..0e353e0d1b7c51 100644
--- a/app/javascript/mastodon/reducers/settings.js
+++ b/app/javascript/mastodon/reducers/settings.js
@@ -104,7 +104,7 @@ const initialState = ImmutableMap({
dismissed_banners: ImmutableMap({
'public_timeline': false,
'community_timeline': false,
- 'home.explore_prompt': false,
+ 'home/follow-suggestions': false,
'explore/links': false,
'explore/statuses': false,
'explore/tags': false,
diff --git a/app/javascript/mastodon/reducers/statuses.js b/app/javascript/mastodon/reducers/statuses.js
index 683fe848f776cd..ca766f73a36e5d 100644
--- a/app/javascript/mastodon/reducers/statuses.js
+++ b/app/javascript/mastodon/reducers/statuses.js
@@ -3,10 +3,6 @@ import { Map as ImmutableMap, fromJS } from 'immutable';
import { STATUS_IMPORT, STATUSES_IMPORT } from '../actions/importer';
import { normalizeStatusTranslation } from '../actions/importer/normalizer';
import {
- REBLOG_REQUEST,
- REBLOG_FAIL,
- UNREBLOG_REQUEST,
- UNREBLOG_FAIL,
FAVOURITE_REQUEST,
FAVOURITE_FAIL,
UNFAVOURITE_REQUEST,
@@ -16,6 +12,10 @@ import {
UNBOOKMARK_REQUEST,
UNBOOKMARK_FAIL,
} from '../actions/interactions';
+import {
+ reblog,
+ unreblog,
+} from '../actions/interactions_typed';
import {
STATUS_MUTE_SUCCESS,
STATUS_UNMUTE_SUCCESS,
@@ -65,6 +65,7 @@ const statusTranslateUndo = (state, id) => {
const initialState = ImmutableMap();
+/** @type {import('@reduxjs/toolkit').Reducer} */
export default function statuses(state = initialState, action) {
switch(action.type) {
case STATUS_FETCH_REQUEST:
@@ -91,14 +92,6 @@ export default function statuses(state = initialState, action) {
return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'bookmarked'], false);
case UNBOOKMARK_FAIL:
return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'bookmarked'], true);
- case REBLOG_REQUEST:
- return state.setIn([action.status.get('id'), 'reblogged'], true);
- case REBLOG_FAIL:
- return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'reblogged'], false);
- case UNREBLOG_REQUEST:
- return state.setIn([action.status.get('id'), 'reblogged'], false);
- case UNREBLOG_FAIL:
- return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'reblogged'], true);
case STATUS_MUTE_SUCCESS:
return state.setIn([action.id, 'muted'], true);
case STATUS_UNMUTE_SUCCESS:
@@ -128,6 +121,15 @@ export default function statuses(state = initialState, action) {
case STATUS_TRANSLATE_UNDO:
return statusTranslateUndo(state, action.id);
default:
- return state;
+ if(reblog.pending.match(action))
+ return state.setIn([action.meta.arg.statusId, 'reblogged'], true);
+ else if(reblog.rejected.match(action))
+ return state.get(action.meta.arg.statusId) === undefined ? state : state.setIn([action.meta.arg.statusId, 'reblogged'], false);
+ else if(unreblog.pending.match(action))
+ return state.setIn([action.meta.arg.statusId, 'reblogged'], false);
+ else if(unreblog.rejected.match(action))
+ return state.get(action.meta.arg.statusId) === undefined ? state : state.setIn([action.meta.arg.statusId, 'reblogged'], true);
+ else
+ return state;
}
}
diff --git a/app/javascript/mastodon/reducers/suggestions.js b/app/javascript/mastodon/reducers/suggestions.js
index 0f224ff4b94f34..5b9d983dea4c73 100644
--- a/app/javascript/mastodon/reducers/suggestions.js
+++ b/app/javascript/mastodon/reducers/suggestions.js
@@ -28,12 +28,12 @@ export default function suggestionsReducer(state = initialState, action) {
case SUGGESTIONS_FETCH_FAIL:
return state.set('isLoading', false);
case SUGGESTIONS_DISMISS:
- return state.update('items', list => list.filterNot(x => x.account === action.id));
+ return state.update('items', list => list.filterNot(x => x.get('account') === action.id));
case blockAccountSuccess.type:
case muteAccountSuccess.type:
- return state.update('items', list => list.filterNot(x => x.account === action.payload.relationship.id));
+ return state.update('items', list => list.filterNot(x => x.get('account') === action.payload.relationship.id));
case blockDomainSuccess.type:
- return state.update('items', list => list.filterNot(x => action.payload.accounts.includes(x.account)));
+ return state.update('items', list => list.filterNot(x => action.payload.accounts.includes(x.get('account'))));
default:
return state;
}
diff --git a/app/javascript/mastodon/reducers/timelines.js b/app/javascript/mastodon/reducers/timelines.js
index 43dedd6e6d8cc8..4c9ab98a82ec65 100644
--- a/app/javascript/mastodon/reducers/timelines.js
+++ b/app/javascript/mastodon/reducers/timelines.js
@@ -17,6 +17,9 @@ import {
TIMELINE_DISCONNECT,
TIMELINE_LOAD_PENDING,
TIMELINE_MARK_AS_PARTIAL,
+ TIMELINE_INSERT,
+ TIMELINE_GAP,
+ TIMELINE_SUGGESTIONS,
} from '../actions/timelines';
import { compareId } from '../compare_id';
@@ -32,6 +35,8 @@ const initialTimeline = ImmutableMap({
items: ImmutableList(),
});
+const isPlaceholder = value => value === TIMELINE_GAP || value === TIMELINE_SUGGESTIONS;
+
const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, isLoadingRecent, usePendingItems) => {
// This method is pretty tricky because:
// - existing items in the timeline might be out of order
@@ -63,20 +68,20 @@ const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, is
// First, find the furthest (if properly sorted, oldest) item in the timeline that is
// newer than the oldest fetched one, as it's most likely that it delimits the gap.
// Start the gap *after* that item.
- const lastIndex = oldIds.findLastIndex(id => id !== null && compareId(id, newIds.last()) >= 0) + 1;
+ const lastIndex = oldIds.findLastIndex(id => !isPlaceholder(id) && compareId(id, newIds.last()) >= 0) + 1;
// Then, try to find the furthest (if properly sorted, oldest) item in the timeline that
// is newer than the most recent fetched one, as it delimits a section comprised of only
// items older or within `newIds` (or that were deleted from the server, so should be removed
// anyway).
// Stop the gap *after* that item.
- const firstIndex = oldIds.take(lastIndex).findLastIndex(id => id !== null && compareId(id, newIds.first()) > 0) + 1;
+ const firstIndex = oldIds.take(lastIndex).findLastIndex(id => !isPlaceholder(id) && compareId(id, newIds.first()) > 0) + 1;
let insertedIds = ImmutableOrderedSet(newIds).withMutations(insertedIds => {
// It is possible, though unlikely, that the slice we are replacing contains items older
// than the elements we got from the API. Get them and add them back at the back of the
// slice.
- const olderIds = oldIds.slice(firstIndex, lastIndex).filter(id => id !== null && compareId(id, newIds.last()) < 0);
+ const olderIds = oldIds.slice(firstIndex, lastIndex).filter(id => !isPlaceholder(id) && compareId(id, newIds.last()) < 0);
insertedIds.union(olderIds);
// Make sure we aren't inserting duplicates
@@ -84,8 +89,8 @@ const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, is
}).toList();
// Finally, insert a gap marker if the data is marked as partial by the server
- if (isPartial && (firstIndex === 0 || oldIds.get(firstIndex - 1) !== null)) {
- insertedIds = insertedIds.unshift(null);
+ if (isPartial && (firstIndex === 0 || oldIds.get(firstIndex - 1) !== TIMELINE_GAP)) {
+ insertedIds = insertedIds.unshift(TIMELINE_GAP);
}
return oldIds.take(firstIndex).concat(
@@ -178,7 +183,7 @@ const reconnectTimeline = (state, usePendingItems) => {
}
return state.withMutations(mMap => {
- mMap.update(usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(null) : items);
+ mMap.update(usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(TIMELINE_GAP) : items);
mMap.set('online', true);
});
};
@@ -213,7 +218,7 @@ export default function timelines(state = initialState, action) {
return state.update(
action.timeline,
initialTimeline,
- map => map.set('online', false).update(action.usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(null) : items),
+ map => map.set('online', false).update(action.usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(TIMELINE_GAP) : items),
);
case TIMELINE_MARK_AS_PARTIAL:
return state.update(
@@ -221,6 +226,18 @@ export default function timelines(state = initialState, action) {
initialTimeline,
map => map.set('isPartial', true).set('items', ImmutableList()).set('pendingItems', ImmutableList()).set('unread', 0),
);
+ case TIMELINE_INSERT:
+ return state.update(
+ action.timeline,
+ initialTimeline,
+ map => map.update('items', ImmutableList(), list => {
+ if (!list.includes(action.key)) {
+ return list.insert(action.index, action.key);
+ }
+
+ return list;
+ })
+ );
default:
return state;
}
diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index b1c60403e9ff60..bd9b53919c3a90 100644
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -60,7 +60,7 @@ export const makeGetStatus = () => {
export const makeGetPictureInPicture = () => {
return createSelector([
- (state, { id }) => state.get('picture_in_picture').statusId === id,
+ (state, { id }) => state.picture_in_picture.statusId === id,
(state) => state.getIn(['meta', 'layout']) !== 'mobile',
], (inUse, available) => ImmutableMap({
inUse: inUse && available,
diff --git a/app/javascript/mastodon/store/middlewares/errors.ts b/app/javascript/mastodon/store/middlewares/errors.ts
index e11aa7817822a6..e77cec34ed9fb6 100644
--- a/app/javascript/mastodon/store/middlewares/errors.ts
+++ b/app/javascript/mastodon/store/middlewares/errors.ts
@@ -1,16 +1,27 @@
-import { isAction } from '@reduxjs/toolkit';
+import {
+ isAction,
+ isAsyncThunkAction,
+ isRejectedWithValue,
+} from '@reduxjs/toolkit';
import type { Action, Middleware } from '@reduxjs/toolkit';
import type { RootState } from '..';
import { showAlertForError } from '../../actions/alerts';
+import type { AsyncThunkRejectValue } from '../typed_functions';
const defaultFailSuffix = 'FAIL';
const isFailedAction = new RegExp(`${defaultFailSuffix}$`, 'g');
-interface ActionWithMaybeAlertParams extends Action {
- skipAlert?: boolean;
- skipNotFound?: boolean;
- error?: unknown;
+interface ActionWithMaybeAlertParams extends Action, AsyncThunkRejectValue {}
+
+interface RejectedAction extends Action {
+ payload: AsyncThunkRejectValue;
+}
+
+function isRejectedActionWithPayload(
+ action: unknown,
+): action is RejectedAction {
+ return isAsyncThunkAction(action) && isRejectedWithValue(action);
}
function isActionWithmaybeAlertParams(
@@ -19,11 +30,16 @@ function isActionWithmaybeAlertParams(
return isAction(action);
}
-export const errorsMiddleware: Middleware, RootState> =
+// eslint-disable-next-line @typescript-eslint/ban-types -- we need to use `{}` here to ensure the dispatch types can be merged
+export const errorsMiddleware: Middleware<{}, RootState> =
({ dispatch }) =>
(next) =>
(action) => {
- if (
+ if (isRejectedActionWithPayload(action) && !action.payload.skipAlert) {
+ dispatch(
+ showAlertForError(action.payload.error, action.payload.skipNotFound),
+ );
+ } else if (
isActionWithmaybeAlertParams(action) &&
!action.skipAlert &&
action.type.match(isFailedAction)
diff --git a/app/javascript/mastodon/store/middlewares/sounds.ts b/app/javascript/mastodon/store/middlewares/sounds.ts
index 51839f427aee8d..91407b1ec0a1dd 100644
--- a/app/javascript/mastodon/store/middlewares/sounds.ts
+++ b/app/javascript/mastodon/store/middlewares/sounds.ts
@@ -51,7 +51,8 @@ const play = (audio: HTMLAudioElement) => {
};
export const soundsMiddleware = (): Middleware<
- Record,
+ // eslint-disable-next-line @typescript-eslint/ban-types -- we need to use `{}` here to ensure the dispatch types can be merged
+ {},
RootState
> => {
const soundCache: Record = {};
@@ -73,8 +74,9 @@ export const soundsMiddleware = (): Middleware<
if (isActionWithMetaSound(action)) {
const sound = action.meta.sound;
- if (sound && Object.hasOwn(soundCache, sound)) {
- play(soundCache[sound]);
+ if (sound) {
+ const s = soundCache[sound];
+ if (s) play(s);
}
}
diff --git a/app/javascript/mastodon/store/typed_functions.ts b/app/javascript/mastodon/store/typed_functions.ts
index 4859b82651ec75..dae37e62255269 100644
--- a/app/javascript/mastodon/store/typed_functions.ts
+++ b/app/javascript/mastodon/store/typed_functions.ts
@@ -2,13 +2,198 @@ import { createAsyncThunk } from '@reduxjs/toolkit';
// eslint-disable-next-line @typescript-eslint/no-restricted-imports
import { useDispatch, useSelector } from 'react-redux';
+import type { BaseThunkAPI } from '@reduxjs/toolkit/dist/createAsyncThunk';
+
import type { AppDispatch, RootState } from './store';
export const useAppDispatch = useDispatch.withTypes();
export const useAppSelector = useSelector.withTypes();
+export interface AsyncThunkRejectValue {
+ skipAlert?: boolean;
+ skipNotFound?: boolean;
+ error?: unknown;
+}
+
+interface AppMeta {
+ skipLoading?: boolean;
+}
+
export const createAppAsyncThunk = createAsyncThunk.withTypes<{
state: RootState;
dispatch: AppDispatch;
- rejectValue: string;
+ rejectValue: AsyncThunkRejectValue;
}>();
+
+type AppThunkApi = Pick<
+ BaseThunkAPI<
+ RootState,
+ unknown,
+ AppDispatch,
+ AsyncThunkRejectValue,
+ AppMeta,
+ AppMeta
+ >,
+ 'getState' | 'dispatch'
+>;
+
+interface AppThunkOptions {
+ skipLoading?: boolean;
+}
+
+const createBaseAsyncThunk = createAsyncThunk.withTypes<{
+ state: RootState;
+ dispatch: AppDispatch;
+ rejectValue: AsyncThunkRejectValue;
+ fulfilledMeta: AppMeta;
+ rejectedMeta: AppMeta;
+}>();
+
+export function createThunk(
+ name: string,
+ creator: (arg: Arg, api: AppThunkApi) => Returned | Promise,
+ options: AppThunkOptions = {},
+) {
+ return createBaseAsyncThunk(
+ name,
+ async (
+ arg: Arg,
+ { getState, dispatch, fulfillWithValue, rejectWithValue },
+ ) => {
+ try {
+ const result = await creator(arg, { dispatch, getState });
+
+ return fulfillWithValue(result, {
+ skipLoading: options.skipLoading,
+ });
+ } catch (error) {
+ return rejectWithValue({ error }, { skipLoading: true });
+ }
+ },
+ {
+ getPendingMeta() {
+ if (options.skipLoading) return { skipLoading: true };
+ return {};
+ },
+ },
+ );
+}
+
+const discardLoadDataInPayload = Symbol('discardLoadDataInPayload');
+type DiscardLoadData = typeof discardLoadDataInPayload;
+
+type OnData = (
+ data: LoadDataResult,
+ api: AppThunkApi & {
+ discardLoadData: DiscardLoadData;
+ },
+) => ReturnedData | DiscardLoadData | Promise;
+
+type ArgsType = Record | undefined;
+
+// Overload when there is no `onData` method, the payload is the `onData` result
+export function createDataLoadingThunk(
+ name: string,
+ loadData: (args: Args) => Promise,
+ thunkOptions?: AppThunkOptions,
+): ReturnType>;
+
+// Overload when the `onData` method returns discardLoadDataInPayload, then the payload is empty
+export function createDataLoadingThunk(
+ name: string,
+ loadData: (args: Args) => Promise,
+ onDataOrThunkOptions?:
+ | AppThunkOptions
+ | OnData,
+ thunkOptions?: AppThunkOptions,
+): ReturnType>;
+
+// Overload when the `onData` method returns nothing, then the mayload is the `onData` result
+export function createDataLoadingThunk(
+ name: string,
+ loadData: (args: Args) => Promise,
+ onDataOrThunkOptions?: AppThunkOptions | OnData,
+ thunkOptions?: AppThunkOptions,
+): ReturnType>;
+
+// Overload when there is an `onData` method returning something
+export function createDataLoadingThunk<
+ LoadDataResult,
+ Args extends ArgsType,
+ Returned,
+>(
+ name: string,
+ loadData: (args: Args) => Promise,
+ onDataOrThunkOptions?: AppThunkOptions | OnData,
+ thunkOptions?: AppThunkOptions,
+): ReturnType>;
+
+/**
+ * This function creates a Redux Thunk that handles loading data asynchronously (usually from the API), dispatching `pending`, `fullfilled` and `rejected` actions.
+ *
+ * You can run a callback on the `onData` results to either dispatch side effects or modify the payload.
+ *
+ * It is a wrapper around RTK's [`createAsyncThunk`](https://redux-toolkit.js.org/api/createAsyncThunk)
+ * @param name Prefix for the actions types
+ * @param loadData Function that loads the data. It's (object) argument will become the thunk's argument
+ * @param onDataOrThunkOptions
+ * Callback called on the results from `loadData`.
+ *
+ * First argument will be the return from `loadData`.
+ *
+ * Second argument is an object with: `dispatch`, `getState` and `discardLoadData`.
+ * It can return:
+ * - `undefined` (or no explicit return), meaning that the `onData` results will be the payload
+ * - `discardLoadData` to discard the `onData` results and return an empty payload
+ * - anything else, which will be the payload
+ *
+ * You can also omit this parameter and pass `thunkOptions` directly
+ * @param maybeThunkOptions
+ * Additional Mastodon specific options for the thunk. Currently supports:
+ * - `skipLoading` to avoid showing the loading bar when the request is in progress
+ * @returns The created thunk
+ */
+export function createDataLoadingThunk<
+ LoadDataResult,
+ Args extends ArgsType,
+ Returned,
+>(
+ name: string,
+ loadData: (args: Args) => Promise,
+ onDataOrThunkOptions?: AppThunkOptions | OnData,
+ maybeThunkOptions?: AppThunkOptions,
+) {
+ let onData: OnData | undefined;
+ let thunkOptions: AppThunkOptions | undefined;
+
+ if (typeof onDataOrThunkOptions === 'function') onData = onDataOrThunkOptions;
+ else if (typeof onDataOrThunkOptions === 'object')
+ thunkOptions = onDataOrThunkOptions;
+
+ if (maybeThunkOptions) {
+ thunkOptions = maybeThunkOptions;
+ }
+
+ return createThunk(
+ name,
+ async (arg, { getState, dispatch }) => {
+ const data = await loadData(arg);
+
+ if (!onData) return data as Returned;
+
+ const result = await onData(data, {
+ dispatch,
+ getState,
+ discardLoadData: discardLoadDataInPayload,
+ });
+
+ // if there is no return in `onData`, we return the `onData` result
+ if (typeof result === 'undefined') return data as Returned;
+ // the user explicitely asked to discard the payload
+ else if (result === discardLoadDataInPayload)
+ return undefined as Returned;
+ else return result;
+ },
+ thunkOptions,
+ );
+}
diff --git a/app/javascript/mastodon/stream.js b/app/javascript/mastodon/stream.js
index ff3af5fd885c96..40d69136a84808 100644
--- a/app/javascript/mastodon/stream.js
+++ b/app/javascript/mastodon/stream.js
@@ -2,6 +2,8 @@
import WebSocketClient from '@gamestdio/websocket';
+import { getAccessToken } from './initial_state';
+
/**
* @type {WebSocketClient | undefined}
*/
@@ -145,9 +147,11 @@ const channelNameWithInlineParams = (channelName, params) => {
// @ts-expect-error
export const connectStream = (channelName, params, callbacks) => (dispatch, getState) => {
const streamingAPIBaseURL = getState().getIn(['meta', 'streaming_api_base_url']);
- const accessToken = getState().getIn(['meta', 'access_token']);
+ const accessToken = getAccessToken();
const { onConnect, onReceive, onDisconnect } = callbacks(dispatch, getState);
+ if(!accessToken) throw new Error("Trying to connect to the streaming server but no access token is available.");
+
// If we cannot use a websockets connection, we must fall back
// to using individual connections for each channel
if (!streamingAPIBaseURL.startsWith('ws')) {
diff --git a/app/javascript/mastodon/test_helpers.tsx b/app/javascript/mastodon/test_helpers.tsx
index 689589556956b4..93b5a8453accf1 100644
--- a/app/javascript/mastodon/test_helpers.tsx
+++ b/app/javascript/mastodon/test_helpers.tsx
@@ -1,7 +1,3 @@
-import PropTypes from 'prop-types';
-import type { PropsWithChildren } from 'react';
-import { Component } from 'react';
-
import { IntlProvider } from 'react-intl';
import { MemoryRouter } from 'react-router';
@@ -9,44 +5,26 @@ import { MemoryRouter } from 'react-router';
// eslint-disable-next-line import/no-extraneous-dependencies
import { render as rtlRender } from '@testing-library/react';
-class FakeIdentityWrapper extends Component<
- PropsWithChildren<{ signedIn: boolean }>
-> {
- static childContextTypes = {
- identity: PropTypes.shape({
- signedIn: PropTypes.bool.isRequired,
- accountId: PropTypes.string,
- disabledAccountId: PropTypes.string,
- accessToken: PropTypes.string,
- }).isRequired,
- };
-
- getChildContext() {
- return {
- identity: {
- signedIn: this.props.signedIn,
- accountId: '123',
- accessToken: 'test-access-token',
- },
- };
- }
-
- render() {
- return this.props.children;
- }
-}
+import { IdentityContext } from './identity_context';
function render(
ui: React.ReactElement,
{ locale = 'en', signedIn = true, ...renderOptions } = {},
) {
- const Wrapper = (props: { children: React.ReactElement }) => {
+ const fakeIdentity = {
+ signedIn: signedIn,
+ accountId: '123',
+ disabledAccountId: undefined,
+ permissions: 0,
+ };
+
+ const Wrapper = (props: { children: React.ReactNode }) => {
return (
-
+
{props.children}
-
+
);
diff --git a/app/javascript/mastodon/utils/__tests__/html-test.s b/app/javascript/mastodon/utils/__tests__/html-test.ts
similarity index 67%
rename from app/javascript/mastodon/utils/__tests__/html-test.s
rename to app/javascript/mastodon/utils/__tests__/html-test.ts
index d948cf4c5d26a0..99bfdcb8010a4c 100644
--- a/app/javascript/mastodon/utils/__tests__/html-test.s
+++ b/app/javascript/mastodon/utils/__tests__/html-test.ts
@@ -3,7 +3,9 @@ import * as html from '../html';
describe('html', () => {
describe('unescapeHTML', () => {
it('returns unescaped HTML', () => {
- const output = html.unescapeHTML('lorem
ipsum
<br>');
+ const output = html.unescapeHTML(
+ 'lorem
ipsum
<br>',
+ );
expect(output).toEqual('lorem\n\nipsum\n
');
});
});
diff --git a/app/javascript/mastodon/utils/__tests__/numbers.ts b/app/javascript/mastodon/utils/__tests__/numbers.ts
new file mode 100644
index 00000000000000..d1d1444e8add7d
--- /dev/null
+++ b/app/javascript/mastodon/utils/__tests__/numbers.ts
@@ -0,0 +1,24 @@
+import { DECIMAL_UNITS, toShortNumber } from '../numbers';
+
+interface TableRow {
+ input: number;
+ base: number;
+ unit: number;
+ digits: number;
+}
+
+describe.each`
+ input | base | unit | digits
+ ${10_000_000} | ${10} | ${DECIMAL_UNITS.MILLION} | ${0}
+ ${2_789_123} | ${2.789123} | ${DECIMAL_UNITS.MILLION} | ${1}
+ ${12_345_789} | ${12.345789} | ${DECIMAL_UNITS.MILLION} | ${0}
+ ${10_000_000_000} | ${10} | ${DECIMAL_UNITS.BILLION} | ${0}
+ ${12} | ${12} | ${DECIMAL_UNITS.ONE} | ${0}
+ ${123} | ${123} | ${DECIMAL_UNITS.ONE} | ${0}
+ ${1234} | ${1.234} | ${DECIMAL_UNITS.THOUSAND} | ${1}
+ ${6666} | ${6.666} | ${DECIMAL_UNITS.THOUSAND} | ${1}
+`('toShortNumber', ({ input, base, unit, digits }: TableRow) => {
+ test(`correctly formats ${input}`, () => {
+ expect(toShortNumber(input)).toEqual([base, unit, digits]);
+ });
+});
diff --git a/app/javascript/mastodon/utils/log_out.ts b/app/javascript/mastodon/utils/log_out.ts
index 3a4cc8ecb1e52a..b08a61a6a28162 100644
--- a/app/javascript/mastodon/utils/log_out.ts
+++ b/app/javascript/mastodon/utils/log_out.ts
@@ -1,5 +1,3 @@
-import Rails from '@rails/ujs';
-
export const logOut = () => {
const form = document.createElement('form');
@@ -9,13 +7,18 @@ export const logOut = () => {
methodInput.setAttribute('type', 'hidden');
form.appendChild(methodInput);
- const csrfToken = Rails.csrfToken();
- const csrfParam = Rails.csrfParam();
+ const csrfToken = document.querySelector(
+ 'meta[name=csrf-token]',
+ );
+
+ const csrfParam = document.querySelector(
+ 'meta[name=csrf-param]',
+ );
if (csrfParam && csrfToken) {
const csrfInput = document.createElement('input');
- csrfInput.setAttribute('name', csrfParam);
- csrfInput.setAttribute('value', csrfToken);
+ csrfInput.setAttribute('name', csrfParam.content);
+ csrfInput.setAttribute('value', csrfToken.content);
csrfInput.setAttribute('type', 'hidden');
form.appendChild(csrfInput);
}
diff --git a/app/javascript/mastodon/utils/numbers.ts b/app/javascript/mastodon/utils/numbers.ts
index 0a73061f69b616..0c11c268ddf2cb 100644
--- a/app/javascript/mastodon/utils/numbers.ts
+++ b/app/javascript/mastodon/utils/numbers.ts
@@ -69,3 +69,11 @@ export function pluralReady(
export function roundTo10(num: number): number {
return Math.round(num * 0.1) / 0.1;
}
+
+export function toCappedNumber(num: number, max = 99): string {
+ if (num > max) {
+ return `${max}+`;
+ } else {
+ return num.toString();
+ }
+}
diff --git a/app/javascript/mastodon/uuid.ts b/app/javascript/mastodon/uuid.ts
index 4d0a8a803637ba..0b4d55beb615d5 100644
--- a/app/javascript/mastodon/uuid.ts
+++ b/app/javascript/mastodon/uuid.ts
@@ -4,5 +4,6 @@ export function uuid(a?: string): string {
(a as unknown as number) ^
((Math.random() * 16) >> ((a as unknown as number) / 4))
).toString(16)
- : ('' + 1e7 + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, uuid);
+ : // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
+ ('' + 1e7 + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, uuid);
}
diff --git a/app/javascript/material-icons/400-20px/bar_chart_4_bars-fill.svg b/app/javascript/material-icons/400-20px/bar_chart_4_bars-fill.svg
new file mode 100644
index 00000000000000..78ce1472728890
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/bar_chart_4_bars-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/bar_chart_4_bars.svg b/app/javascript/material-icons/400-20px/bar_chart_4_bars.svg
new file mode 100644
index 00000000000000..78ce1472728890
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/bar_chart_4_bars.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/close-fill.svg b/app/javascript/material-icons/400-20px/close-fill.svg
new file mode 100644
index 00000000000000..46d8afd7e19ee0
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/close-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/close.svg b/app/javascript/material-icons/400-20px/close.svg
new file mode 100644
index 00000000000000..46d8afd7e19ee0
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/close.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/code-fill.svg b/app/javascript/material-icons/400-20px/code-fill.svg
new file mode 100644
index 00000000000000..83fb85354f26fb
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/code-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/code.svg b/app/javascript/material-icons/400-20px/code.svg
new file mode 100644
index 00000000000000..83fb85354f26fb
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/code.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/description-fill.svg b/app/javascript/material-icons/400-20px/description-fill.svg
new file mode 100644
index 00000000000000..5eed963e0b6935
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/description-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/description.svg b/app/javascript/material-icons/400-20px/description.svg
new file mode 100644
index 00000000000000..7ad7907881465e
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/description.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/markdown-fill.svg b/app/javascript/material-icons/400-20px/markdown-fill.svg
new file mode 100644
index 00000000000000..6fed3547f6e615
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/markdown-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/markdown.svg b/app/javascript/material-icons/400-20px/markdown.svg
new file mode 100644
index 00000000000000..c5e480e938434c
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/markdown.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/mood-fill.svg b/app/javascript/material-icons/400-20px/mood-fill.svg
new file mode 100644
index 00000000000000..ef72aeef6e8f83
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/mood-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/mood.svg b/app/javascript/material-icons/400-20px/mood.svg
new file mode 100644
index 00000000000000..abb44c466339b3
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/mood.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/photo_library-fill.svg b/app/javascript/material-icons/400-20px/photo_library-fill.svg
new file mode 100644
index 00000000000000..5f5e39fbf97929
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/photo_library-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/photo_library.svg b/app/javascript/material-icons/400-20px/photo_library.svg
new file mode 100644
index 00000000000000..5804edb01c237a
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/photo_library.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/quickreply-fill.svg b/app/javascript/material-icons/400-20px/quickreply-fill.svg
new file mode 100644
index 00000000000000..8adf5df3087600
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/quickreply-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/quickreply.svg b/app/javascript/material-icons/400-20px/quickreply.svg
new file mode 100644
index 00000000000000..4956ffcf3c7972
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/quickreply.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/settings-fill.svg b/app/javascript/material-icons/400-20px/settings-fill.svg
new file mode 100644
index 00000000000000..f5de77821d1bb5
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/settings-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/settings.svg b/app/javascript/material-icons/400-20px/settings.svg
new file mode 100644
index 00000000000000..472569ab6acea9
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/settings.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/share-fill.svg b/app/javascript/material-icons/400-20px/share-fill.svg
new file mode 100644
index 00000000000000..dc7011ff9fba7e
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/share-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/share.svg b/app/javascript/material-icons/400-20px/share.svg
new file mode 100644
index 00000000000000..5094eb336caad0
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/share.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/share_off-fill.svg b/app/javascript/material-icons/400-20px/share_off-fill.svg
new file mode 100644
index 00000000000000..eeb1cb4f39e756
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/share_off-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/share_off.svg b/app/javascript/material-icons/400-20px/share_off.svg
new file mode 100644
index 00000000000000..970fa28a25eec0
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/share_off.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/warning-fill.svg b/app/javascript/material-icons/400-20px/warning-fill.svg
new file mode 100644
index 00000000000000..85dd926d3934ff
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/warning-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/warning.svg b/app/javascript/material-icons/400-20px/warning.svg
new file mode 100644
index 00000000000000..d7d45a32112f5d
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/warning.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/badge-fill.svg b/app/javascript/material-icons/400-24px/badge-fill.svg
new file mode 100644
index 00000000000000..2f7175b7f12b88
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/badge-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/badge.svg b/app/javascript/material-icons/400-24px/badge.svg
new file mode 100644
index 00000000000000..d413363a4cc91a
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/badge.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/bar_chart_4_bars-fill.svg b/app/javascript/material-icons/400-24px/bar_chart_4_bars-fill.svg
new file mode 100644
index 00000000000000..63215a3e09424b
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/bar_chart_4_bars-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/bar_chart_4_bars.svg b/app/javascript/material-icons/400-24px/bar_chart_4_bars.svg
new file mode 100644
index 00000000000000..63215a3e09424b
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/bar_chart_4_bars.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/domain_disabled-fill.svg b/app/javascript/material-icons/400-24px/domain_disabled-fill.svg
new file mode 100644
index 00000000000000..2f16593d38e5fe
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/domain_disabled-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/domain_disabled.svg b/app/javascript/material-icons/400-24px/domain_disabled.svg
new file mode 100644
index 00000000000000..2f16593d38e5fe
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/domain_disabled.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/explore-fill.svg b/app/javascript/material-icons/400-24px/explore-fill.svg
new file mode 100644
index 00000000000000..febe0a63b44b3f
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/explore-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/explore.svg b/app/javascript/material-icons/400-24px/explore.svg
new file mode 100644
index 00000000000000..547a9994217ab5
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/explore.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/gavel-fill.svg b/app/javascript/material-icons/400-24px/gavel-fill.svg
new file mode 100644
index 00000000000000..9699b8480a8479
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/gavel-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/gavel.svg b/app/javascript/material-icons/400-24px/gavel.svg
new file mode 100644
index 00000000000000..9699b8480a8479
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/gavel.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/globe-fill.svg b/app/javascript/material-icons/400-24px/globe-fill.svg
new file mode 100644
index 00000000000000..c931f53c744fd3
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/globe-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/globe.svg b/app/javascript/material-icons/400-24px/globe.svg
new file mode 100644
index 00000000000000..c931f53c744fd3
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/globe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
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 00000000000000..75ff3932cde969
--- /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 00000000000000..2ce7de57f106e8
--- /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/history-fill.svg b/app/javascript/material-icons/400-24px/history-fill.svg
new file mode 100644
index 00000000000000..2d8124b474acac
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/history-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/history.svg b/app/javascript/material-icons/400-24px/history.svg
new file mode 100644
index 00000000000000..2d8124b474acac
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/history.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/inventory_2-fill.svg b/app/javascript/material-icons/400-24px/inventory_2-fill.svg
new file mode 100644
index 00000000000000..10ec85da046f87
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/inventory_2-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/inventory_2.svg b/app/javascript/material-icons/400-24px/inventory_2.svg
new file mode 100644
index 00000000000000..d00fb1a632cf2d
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/inventory_2.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 00000000000000..618e7753476fc2
--- /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 00000000000000..618e7753476fc2
--- /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/material-icons/400-24px/navigate_before-fill.svg b/app/javascript/material-icons/400-24px/navigate_before-fill.svg
new file mode 100644
index 00000000000000..53783746ae6c81
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/navigate_before-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/navigate_before.svg b/app/javascript/material-icons/400-24px/navigate_before.svg
new file mode 100644
index 00000000000000..53783746ae6c81
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/navigate_before.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/navigate_next-fill.svg b/app/javascript/material-icons/400-24px/navigate_next-fill.svg
new file mode 100644
index 00000000000000..41004673651a63
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/navigate_next-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/navigate_next.svg b/app/javascript/material-icons/400-24px/navigate_next.svg
new file mode 100644
index 00000000000000..41004673651a63
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/navigate_next.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/person_remove-fill.svg b/app/javascript/material-icons/400-24px/person_remove-fill.svg
new file mode 100644
index 00000000000000..239c7a49dcb7c0
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/person_remove-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/person_remove.svg b/app/javascript/material-icons/400-24px/person_remove.svg
new file mode 100644
index 00000000000000..725da3649b62a3
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/person_remove.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/photo_library-fill.svg b/app/javascript/material-icons/400-24px/photo_library-fill.svg
new file mode 100644
index 00000000000000..e68aec8321f1a9
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/photo_library-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/photo_library.svg b/app/javascript/material-icons/400-24px/photo_library.svg
new file mode 100644
index 00000000000000..3b22224b832259
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/photo_library.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/quiet_time-fill.svg b/app/javascript/material-icons/400-24px/quiet_time-fill.svg
new file mode 100644
index 00000000000000..aed5740db3dc89
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/quiet_time-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/quiet_time.svg b/app/javascript/material-icons/400-24px/quiet_time.svg
new file mode 100644
index 00000000000000..552da6658dfefa
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/quiet_time.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/share_off-fill.svg b/app/javascript/material-icons/400-24px/share_off-fill.svg
new file mode 100644
index 00000000000000..3b6a05d11807e9
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/share_off-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/share_off.svg b/app/javascript/material-icons/400-24px/share_off.svg
new file mode 100644
index 00000000000000..00bb28659b5449
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/share_off.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/star-fill.svg b/app/javascript/material-icons/400-24px/star-fill.svg
index cb2231e63436ba..84e8230ab75aa6 100644
--- a/app/javascript/material-icons/400-24px/star-fill.svg
+++ b/app/javascript/material-icons/400-24px/star-fill.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/star.svg b/app/javascript/material-icons/400-24px/star.svg
index 1736e085d0683a..6a72ecc226ddb4 100644
--- a/app/javascript/material-icons/400-24px/star.svg
+++ b/app/javascript/material-icons/400-24px/star.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/translate-fill.svg b/app/javascript/material-icons/400-24px/translate-fill.svg
new file mode 100644
index 00000000000000..ecaaf37f1eefea
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/translate-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/translate.svg b/app/javascript/material-icons/400-24px/translate.svg
new file mode 100644
index 00000000000000..ecaaf37f1eefea
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/translate.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/warning-fill.svg b/app/javascript/material-icons/400-24px/warning-fill.svg
new file mode 100644
index 00000000000000..c3727d3f57a943
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/warning-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/warning.svg b/app/javascript/material-icons/400-24px/warning.svg
new file mode 100644
index 00000000000000..238299e6064bc5
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/warning.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/packs/admin.jsx b/app/javascript/packs/admin.jsx
deleted file mode 100644
index 9ad84b70c1c222..00000000000000
--- a/app/javascript/packs/admin.jsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import './public-path';
-import { createRoot } from 'react-dom/client';
-
-import ready from '../mastodon/ready';
-
-ready(() => {
- [].forEach.call(document.querySelectorAll('[data-admin-component]'), element => {
- const componentName = element.getAttribute('data-admin-component');
- const componentProps = JSON.parse(element.getAttribute('data-props'));
-
- import('../mastodon/containers/admin_component').then(({ default: AdminComponent }) => {
- return import('../mastodon/components/admin/' + componentName).then(({ default: Component }) => {
- const root = createRoot(element);
-
- root.render (
-
-
- ,
- );
- });
- }).catch(error => {
- console.error(error);
- });
- });
-});
diff --git a/app/javascript/packs/common.js b/app/javascript/packs/common.js
deleted file mode 100644
index 05dff8e49482ca..00000000000000
--- a/app/javascript/packs/common.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import './public-path';
-import 'styles/application.scss';
diff --git a/app/javascript/packs/public.jsx b/app/javascript/packs/public.jsx
deleted file mode 100644
index 3831137762f794..00000000000000
--- a/app/javascript/packs/public.jsx
+++ /dev/null
@@ -1,230 +0,0 @@
-import './public-path';
-
-import { createRoot } from 'react-dom/client';
-
-import { IntlMessageFormat } from 'intl-messageformat';
-import { defineMessages } from 'react-intl';
-
-import Rails from '@rails/ujs';
-import axios from 'axios';
-import { throttle } from 'lodash';
-
-import { start } from '../mastodon/common';
-import { timeAgoString } from '../mastodon/components/relative_timestamp';
-import emojify from '../mastodon/features/emoji/emoji';
-import loadKeyboardExtensions from '../mastodon/load_keyboard_extensions';
-import { loadLocale, getLocale } from '../mastodon/locales';
-import { loadPolyfills } from '../mastodon/polyfills';
-import ready from '../mastodon/ready';
-
-import 'cocoon-js-vanilla';
-
-start();
-
-const messages = defineMessages({
- usernameTaken: { id: 'username.taken', defaultMessage: 'That username is taken. Try another' },
- passwordExceedsLength: { id: 'password_confirmation.exceeds_maxlength', defaultMessage: 'Password confirmation exceeds the maximum password length' },
- passwordDoesNotMatch: { id: 'password_confirmation.mismatching', defaultMessage: 'Password confirmation does not match' },
-});
-
-function loaded() {
- const { messages: localeData } = getLocale();
-
- const locale = document.documentElement.lang;
-
- const dateTimeFormat = new Intl.DateTimeFormat(locale, {
- year: 'numeric',
- month: 'long',
- day: 'numeric',
- hour: 'numeric',
- minute: 'numeric',
- });
-
- const dateFormat = new Intl.DateTimeFormat(locale, {
- year: 'numeric',
- month: 'short',
- day: 'numeric',
- timeFormat: false,
- });
-
- const timeFormat = new Intl.DateTimeFormat(locale, {
- timeStyle: 'short',
- hour12: false,
- });
-
- const formatMessage = ({ id, defaultMessage }, values) => {
- const messageFormat = new IntlMessageFormat(localeData[id] || defaultMessage, locale);
- return messageFormat.format(values);
- };
-
- [].forEach.call(document.querySelectorAll('.emojify'), (content) => {
- content.innerHTML = emojify(content.innerHTML);
- });
-
- [].forEach.call(document.querySelectorAll('time.formatted'), (content) => {
- const datetime = new Date(content.getAttribute('datetime'));
- const formattedDate = dateTimeFormat.format(datetime);
-
- content.title = formattedDate;
- content.textContent = formattedDate;
- });
-
- const isToday = date => {
- const today = new Date();
-
- return date.getDate() === today.getDate() &&
- date.getMonth() === today.getMonth() &&
- date.getFullYear() === today.getFullYear();
- };
- const todayFormat = new IntlMessageFormat(localeData['relative_format.today'] || 'Today at {time}', locale);
-
- [].forEach.call(document.querySelectorAll('time.relative-formatted'), (content) => {
- const datetime = new Date(content.getAttribute('datetime'));
-
- let formattedContent;
-
- if (isToday(datetime)) {
- const formattedTime = timeFormat.format(datetime);
-
- formattedContent = todayFormat.format({ time: formattedTime });
- } else {
- formattedContent = dateFormat.format(datetime);
- }
-
- content.title = formattedContent;
- content.textContent = formattedContent;
- });
-
- [].forEach.call(document.querySelectorAll('time.time-ago'), (content) => {
- const datetime = new Date(content.getAttribute('datetime'));
- const now = new Date();
-
- const timeGiven = content.getAttribute('datetime').includes('T');
- content.title = timeGiven ? dateTimeFormat.format(datetime) : dateFormat.format(datetime);
- content.textContent = timeAgoString({
- formatMessage,
- formatDate: (date, options) => (new Intl.DateTimeFormat(locale, options)).format(date),
- }, datetime, now, now.getFullYear(), timeGiven);
- });
-
- const reactComponents = document.querySelectorAll('[data-component]');
-
- if (reactComponents.length > 0) {
- import(/* webpackChunkName: "containers/media_container" */ '../mastodon/containers/media_container')
- .then(({ default: MediaContainer }) => {
- [].forEach.call(reactComponents, (component) => {
- [].forEach.call(component.children, (child) => {
- component.removeChild(child);
- });
- });
-
- const content = document.createElement('div');
-
- const root = createRoot(content);
- root.render();
- document.body.appendChild(content);
- })
- .catch(error => {
- console.error(error);
- });
- }
-
- Rails.delegate(document, '#user_account_attributes_username', 'input', throttle(({ target }) => {
- if (target.value && target.value.length > 0) {
- axios.get('/api/v1/accounts/lookup', { params: { acct: target.value } }).then(() => {
- target.setCustomValidity(formatMessage(messages.usernameTaken));
- }).catch(() => {
- target.setCustomValidity('');
- });
- } else {
- target.setCustomValidity('');
- }
- }, 500, { leading: false, trailing: true }));
-
- Rails.delegate(document, '#user_password,#user_password_confirmation', 'input', () => {
- const password = document.getElementById('user_password');
- const confirmation = document.getElementById('user_password_confirmation');
- if (!confirmation) return;
-
- if (confirmation.value && confirmation.value.length > password.maxLength) {
- confirmation.setCustomValidity(formatMessage(messages.passwordExceedsLength));
- } else if (password.value && password.value !== confirmation.value) {
- confirmation.setCustomValidity(formatMessage(messages.passwordDoesNotMatch));
- } else {
- confirmation.setCustomValidity('');
- }
- });
-
- Rails.delegate(document, '.status__content__spoiler-link', 'click', function() {
- const statusEl = this.parentNode.parentNode;
-
- if (statusEl.dataset.spoiler === 'expanded') {
- statusEl.dataset.spoiler = 'folded';
- this.textContent = (new IntlMessageFormat(localeData['status.show_more'] || 'Show more', locale)).format();
- } else {
- statusEl.dataset.spoiler = 'expanded';
- this.textContent = (new IntlMessageFormat(localeData['status.show_less'] || 'Show less', locale)).format();
- }
-
- return false;
- });
-
- [].forEach.call(document.querySelectorAll('.status__content__spoiler-link'), (spoilerLink) => {
- const statusEl = spoilerLink.parentNode.parentNode;
- const message = (statusEl.dataset.spoiler === 'expanded') ? (localeData['status.show_less'] || 'Show less') : (localeData['status.show_more'] || 'Show more');
- spoilerLink.textContent = (new IntlMessageFormat(message, locale)).format();
- });
-}
-
-const toggleSidebar = () => {
- const sidebar = document.querySelector('.sidebar ul');
- const toggleButton = document.querySelector('.sidebar__toggle__icon');
-
- if (sidebar.classList.contains('visible')) {
- document.body.style.overflow = null;
- toggleButton.setAttribute('aria-expanded', 'false');
- } else {
- document.body.style.overflow = 'hidden';
- toggleButton.setAttribute('aria-expanded', 'true');
- }
-
- toggleButton.classList.toggle('active');
- sidebar.classList.toggle('visible');
-};
-
-Rails.delegate(document, '.sidebar__toggle__icon', 'click', () => {
- toggleSidebar();
-});
-
-Rails.delegate(document, '.sidebar__toggle__icon', 'keydown', e => {
- if (e.key === ' ' || e.key === 'Enter') {
- e.preventDefault();
- toggleSidebar();
- }
-});
-
-Rails.delegate(document, '.custom-emoji', 'mouseover', ({ target }) => target.src = target.getAttribute('data-original'));
-Rails.delegate(document, '.custom-emoji', 'mouseout', ({ target }) => target.src = target.getAttribute('data-static'));
-
-// Empty the honeypot fields in JS in case something like an extension
-// automatically filled them.
-Rails.delegate(document, '#registration_new_user,#new_user', 'submit', () => {
- ['user_website', 'user_confirm_password', 'registration_user_website', 'registration_user_confirm_password'].forEach(id => {
- const field = document.getElementById(id);
- if (field) {
- field.value = '';
- }
- });
-});
-
-function main() {
- ready(loaded);
-}
-
-loadPolyfills()
- .then(loadLocale)
- .then(main)
- .then(loadKeyboardExtensions)
- .catch(error => {
- console.error(error);
- });
diff --git a/app/javascript/packs/sign_up.js b/app/javascript/packs/sign_up.js
deleted file mode 100644
index cf9c837773444c..00000000000000
--- a/app/javascript/packs/sign_up.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import './public-path';
-import axios from 'axios';
-
-import ready from '../mastodon/ready';
-
-ready(() => {
- setInterval(() => {
- axios.get('/api/v1/emails/check_confirmation').then((response) => {
- if (response.data) {
- window.location = '/start';
- }
- }).catch(error => {
- console.error(error);
- });
- }, 5000);
-
- document.querySelectorAll('.timer-button').forEach(button => {
- let counter = 30;
-
- const container = document.createElement('span');
-
- const updateCounter = () => {
- container.innerText = ` (${counter})`;
- };
-
- updateCounter();
-
- const countdown = setInterval(() => {
- counter--;
-
- if (counter === 0) {
- button.disabled = false;
- button.removeChild(container);
- clearInterval(countdown);
- } else {
- updateCounter();
- }
- }, 1000);
-
- button.appendChild(container);
- });
-});
diff --git a/app/javascript/skins/glitch/default/common.scss b/app/javascript/skins/glitch/default/common.scss
new file mode 100644
index 00000000000000..ff0d0831e084d1
--- /dev/null
+++ b/app/javascript/skins/glitch/default/common.scss
@@ -0,0 +1 @@
+@import 'flavours/glitch/styles/application';
diff --git a/app/javascript/skins/vanilla/default/common.scss b/app/javascript/skins/vanilla/default/common.scss
new file mode 100644
index 00000000000000..71ac01180a62b4
--- /dev/null
+++ b/app/javascript/skins/vanilla/default/common.scss
@@ -0,0 +1 @@
+@import 'styles/application';
diff --git a/app/javascript/styles/contrast/diff.scss b/app/javascript/styles/contrast/diff.scss
index 1c2386f02d2df9..ae607f484a8c9b 100644
--- a/app/javascript/styles/contrast/diff.scss
+++ b/app/javascript/styles/contrast/diff.scss
@@ -1,20 +1,7 @@
-.compose-form {
- .compose-form__modifiers {
- .compose-form__upload {
- &-description {
- input {
- &::placeholder {
- opacity: 1;
- }
- }
- }
- }
- }
-}
-
.status__content a,
-.link-footer a,
.reply-indicator__content a,
+.edit-indicator__content a,
+.link-footer a,
.status__content__read-more-button,
.status__content__translate-button {
text-decoration: underline;
@@ -42,7 +29,9 @@
}
}
-.status__content a {
+.status__content a,
+.reply-indicator__content a,
+.edit-indicator__content a {
color: $highlight-text-color;
}
@@ -50,24 +39,10 @@
color: $darker-text-color;
}
-.compose-form__poll-wrapper .button.button-secondary,
-.compose-form .autosuggest-textarea__textarea::placeholder,
-.compose-form .spoiler-input__input::placeholder,
-.report-dialog-modal__textarea::placeholder,
-.language-dropdown__dropdown__results__item__common-name,
-.compose-form .icon-button {
+.report-dialog-modal__textarea::placeholder {
color: $inverted-text-color;
}
-.text-icon-button.active {
- color: $ui-highlight-color;
-}
-
-.language-dropdown__dropdown__results__item.active {
- background: $ui-highlight-color;
- font-weight: 500;
-}
-
.link-button:disabled {
cursor: not-allowed;
diff --git a/app/javascript/styles/mailer.scss b/app/javascript/styles/mailer.scss
index a2cbb494b4a05b..e5d0c05f81d97b 100644
--- a/app/javascript/styles/mailer.scss
+++ b/app/javascript/styles/mailer.scss
@@ -192,6 +192,18 @@ table + p {
}
}
+.email-dir-rtl {
+ direction: rtl;
+
+ [dir='rtl'] & {
+ direction: ltr;
+ }
+}
+
+.email-dir-ltr {
+ direction: ltr;
+}
+
.email-padding-24 {
padding: 24px;
}
@@ -216,6 +228,30 @@ table + p {
border-bottom: 1px solid #dfdee3;
}
+.email-desktop-flex {
+ font-size: 0;
+ max-width: 740px;
+ margin-left: auto;
+ margin-right: auto;
+
+ &.email-dir-rtl > .email-desktop-column {
+ direction: ltr;
+
+ [dir='rtl'] & {
+ direction: rtl;
+ }
+ }
+}
+
+.email-desktop-column {
+ display: inline-block;
+ width: 100%;
+ max-width: none;
+ text-align: start;
+ vertical-align: top;
+ font-size: 16px;
+}
+
// Header
.email-header-td {
padding: 16px 32px;
@@ -312,6 +348,66 @@ table + p {
}
}
+.email-header-card-table {
+ width: 100%;
+ border-collapse: separate;
+ overflow: hidden;
+ border-radius: 12px;
+ background-color: #fff;
+ border: 2px solid #fff;
+ box-shadow: 0 4px 16px 0 rgba(23, 6, 59, 8%);
+}
+
+.email-header-card {
+ position: relative;
+ max-height: 100px;
+}
+
+.email-header-card-banner-td {
+ border-radius: 12px 12px 0 0;
+ height: 80px;
+ background-color: #f3f2f5 !important;
+ background-position: center !important;
+ background-size: cover !important;
+}
+
+.email-header-card-body-td {
+ padding: 12px;
+
+ .email-btn-table {
+ width: 100%;
+ max-width: 212px;
+ }
+}
+
+.email-header-card-instance {
+ margin-bottom: 4px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ word-break: break-all;
+ color: #17063b;
+ font-size: 14px;
+ line-height: 20px;
+ font-weight: 600;
+
+ &:only-of-type {
+ margin-bottom: 12px;
+ }
+}
+
+.email-header-card-description {
+ margin-bottom: 12px;
+ color: #746a89;
+ font-size: 12px;
+ line-height: 16px;
+ max-height: 32px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical;
+}
+
// To make the design work with images off
// we create an empty div that overlaps with
// the rest of the content with a dark background.
@@ -336,6 +432,16 @@ table + p {
mso-padding-alt: 32px;
}
+.email-body-columns-td {
+ border-top: 1px solid #dfdee3;
+ padding: 32px 24px 8px;
+}
+
+.email-body-huge-padding-td {
+ padding: 110px 32px 32px;
+ mso-padding-alt: 32px;
+}
+
.email-body-padding-td {
& > p {
font-size: 14px;
@@ -353,6 +459,30 @@ table + p {
}
}
+// Texts
+.email-h2 {
+ margin-bottom: 4px;
+ color: #17063b;
+ font-size: 18px;
+ font-weight: 600;
+ line-height: 28px;
+}
+
+.email-h-sub {
+ margin-bottom: 16px;
+ color: #746a89;
+ font-size: 14px;
+ line-height: 16px;
+}
+
+.email-p {
+ margin-bottom: 16px;
+ color: #746a89;
+ font-size: 14px;
+ font-weight: 400;
+ line-height: 20px;
+}
+
// Footer
.email-footer-td {
padding: 28px 32px 32px;
@@ -539,8 +669,13 @@ table + p {
background-color: #fff;
}
+.email-checklist-checked {
+ border-color: #c4e6d7;
+ background-color: #eaf6f1;
+}
+
.email-checklist-td {
- padding: 16px;
+ padding: 16px 16px 6px;
}
.email-checklist-icons-td {
@@ -576,10 +711,15 @@ table + p {
font-size: 14px;
font-weight: 600;
line-height: 16.8px;
+
+ .email-checklist-checked & {
+ color: #746a89;
+ text-decoration: line-through;
+ }
}
p {
- margin: 0 0 2px;
+ margin: 0 0 12px;
color: #746a89;
font-size: 14px;
line-height: 16.8px;
@@ -597,6 +737,194 @@ table + p {
padding-left: 10px;
padding-right: 10px;
}
+
+ div + div {
+ margin-inline-start: auto;
+ margin-bottom: 12px;
+ }
+}
+
+// Welcome email
+.email-welcome-apps-btns {
+ font-size: 12px;
+ line-height: 44px;
+}
+
+.email-column-td {
+ padding: 0 8px;
+ vertical-align: top;
+}
+
+.email-link-with-arrow {
+ color: #6364ff;
+ font-size: 14px;
+ font-weight: 600;
+ line-height: 16.8px;
+
+ &:hover {
+ color: #563acc !important;
+ }
+
+ span {
+ font-size: 12px;
+ font-weight: 400;
+ }
+}
+
+.email-column-action-td {
+ padding: 24px 0;
+ color: #6364ff;
+ font-size: 14px;
+ font-weight: 600;
+ line-height: 16.8px;
+ text-align: center;
+}
+
+// Follow and hashtags
+.email-mini-wrapper-td {
+ padding: 4px 0;
+
+ table {
+ table-layout: fixed;
+ }
+}
+
+.email-mini-td {
+ border-radius: 12px;
+ border: 1px solid #e8e6eb;
+ background-color: #fff;
+ padding: 15px 16px;
+}
+
+.email-mini-follow-img-td {
+ width: 40px;
+ vertical-align: top;
+
+ img {
+ border-radius: 8px;
+ }
+}
+
+.email-mini-follow-text-td {
+ padding-left: 8px;
+ padding-right: 16px;
+ vertical-align: top;
+
+ h3 {
+ color: #17063b;
+ font-size: 14px;
+ font-weight: 600;
+ line-height: 20px;
+ }
+
+ p {
+ color: #746a89;
+ font-size: 12px;
+ font-weight: 400;
+ line-height: 16px;
+ }
+}
+
+.email-mini-follow-btn-td {
+ width: 68px;
+ vertical-align: top;
+
+ .email-btn-table {
+ width: 100%;
+ }
+
+ .email-btn-td {
+ mso-padding-alt: 10px;
+ }
+
+ .email-btn-a {
+ padding-left: 10px;
+ padding-right: 10px;
+ }
+}
+
+.email-mini-hashtag-td {
+ height: 40px;
+
+ td {
+ vertical-align: middle;
+ }
+
+ h3 {
+ color: #17063b;
+ font-size: 14px;
+ font-weight: 600;
+ line-height: 20px;
+ }
+
+ p {
+ color: #746a89;
+ font-size: 12px;
+ font-weight: 400;
+ line-height: 16px;
+ word-break: break-all;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+}
+
+.email-mini-hashtag-img-td {
+ width: 40px;
+ height: 20px;
+ white-space: nowrap;
+ text-indent: -2px;
+ font-size: 0;
+
+ & + td {
+ padding-left: 8px;
+ }
+}
+
+.email-mini-hashtag-img-span {
+ display: inline-block;
+ max-width: 12px;
+ font-size: 12px;
+
+ img {
+ width: 16px;
+ height: 16px;
+ border-radius: 50%;
+ max-width: none;
+ border: 2px solid #fff;
+ vertical-align: middle;
+ }
+}
+
+// Extra content on light purple background
+.email-extra-wave {
+ height: 42px;
+ background-image: url('../images/mailer-new/welcome/purple-extra-soft-wave.png');
+ background-position: bottom center;
+ background-repeat: no-repeat;
+}
+
+.email-extra-td {
+ padding: 32px 32px 24px;
+ background-color: #f0f0ff;
+ background-image: url('../images/mailer-new/welcome/purple-extra-soft-spacer.png'); // Using an image to maintain the color even in forced dark modes
+
+ .email-column-td {
+ padding-top: 8px;
+ padding-bottom: 8px;
+ }
+}
+
+// Feature card
+.email-feature-wrapper-td {
+ padding: 8px 0;
+}
+
+.email-feature-td {
+ padding: 24px;
+ background-color: #fff;
+ border: 1px solid #e8e6eb;
+ border-radius: 12px;
}
// Responsive
@@ -617,4 +945,21 @@ table + p {
.email-desktop-flex {
display: flex;
}
+
+ .email-header-left {
+ padding-right: 32px;
+ }
+
+ .email-header-right {
+ width: 240px;
+ margin-inline-start: auto;
+ }
+
+ .email-desktop-column {
+ max-width: 346px !important;
+ }
+
+ .email-desktop-text-right {
+ text-align: right;
+ }
}
diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 3a27c974ad8978..07e9d9868b4272 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -21,25 +21,6 @@ html {
}
// Change default background colors of columns
-.column > .scrollable,
-.getting-started,
-.column-inline-form,
-.regeneration-indicator {
- background: $white;
- border: 1px solid lighten($ui-base-color, 8%);
- border-top: 0;
-}
-
-.error-column {
- border: 1px solid lighten($ui-base-color, 8%);
-}
-
-.column > .scrollable.about {
- border-top: 1px solid lighten($ui-base-color, 8%);
-}
-
-.about__meta,
-.about__section__title,
.interaction-modal {
background: $white;
border: 1px solid lighten($ui-base-color, 8%);
@@ -53,37 +34,10 @@ html {
background: lighten($ui-base-color, 12%);
}
-.filter-form {
- background: $white;
- border-bottom: 1px solid lighten($ui-base-color, 8%);
-}
-
-.column-back-button,
-.column-header {
- background: $white;
- border: 1px solid lighten($ui-base-color, 8%);
-
- @media screen and (max-width: $no-gap-breakpoint) {
- border-top: 0;
- }
-
- &--slim-button {
- top: -50px;
- right: 0;
- }
-}
-
-.column-header__back-button,
-.column-header__button,
-.column-header__button.active,
.account__header {
background: $white;
}
-.column-header {
- border-bottom: 0;
-}
-
.column-header__button.active {
color: $ui-highlight-color;
@@ -91,7 +45,6 @@ html {
&:active,
&:focus {
color: $ui-highlight-color;
- background: $white;
}
}
@@ -117,25 +70,6 @@ html {
}
}
-.column-subheading {
- background: darken($ui-base-color, 4%);
- border-bottom: 1px solid lighten($ui-base-color, 8%);
-}
-
-.getting-started,
-.scrollable {
- .column-link {
- background: $white;
- border-bottom: 1px solid lighten($ui-base-color, 8%);
-
- &:hover,
- &:active,
- &:focus {
- background: $ui-base-color;
- }
- }
-}
-
.getting-started .navigation-bar {
border-top: 1px solid lighten($ui-base-color, 8%);
border-bottom: 1px solid lighten($ui-base-color, 8%);
@@ -145,11 +79,8 @@ html {
}
}
-.compose-form__autosuggest-wrapper,
-.poll__option input[type='text'],
-.compose-form .spoiler-input__input,
-.compose-form__poll-wrapper select,
.search__input,
+.search__popout,
.setting-text,
.report-dialog-modal__textarea,
.audio-player {
@@ -172,86 +103,6 @@ html {
border-bottom: 0;
}
-.compose-form__poll-wrapper select {
- background: $simple-background-color
- url("data:image/svg+xml;utf8,")
- no-repeat right 8px center / auto 16px;
-}
-
-.compose-form__poll-wrapper,
-.compose-form__poll-wrapper .poll__footer {
- border-top-color: lighten($ui-base-color, 8%);
-}
-
-.notification__filter-bar {
- border: 1px solid lighten($ui-base-color, 8%);
- border-top: 0;
-}
-
-.compose-form .compose-form__buttons-wrapper {
- background: $ui-base-color;
- border: 1px solid lighten($ui-base-color, 8%);
- border-top: 0;
-}
-
-.drawer__header,
-.drawer__inner {
- background: $white;
- border: 1px solid lighten($ui-base-color, 8%);
-}
-
-.drawer__inner__mastodon {
- background: $white
- url('data:image/svg+xml;utf8,')
- no-repeat bottom / 100% auto;
-}
-
-// Change the colors used in compose-form
-.compose-form {
- .compose-form__modifiers {
- .compose-form__upload__actions .icon-button,
- .compose-form__upload__warning .icon-button {
- color: lighten($white, 7%);
-
- &:active,
- &:focus,
- &:hover {
- color: $white;
- }
- }
- }
-
- .compose-form__buttons-wrapper {
- background: darken($ui-base-color, 6%);
- }
-
- .autosuggest-textarea__suggestions {
- background: darken($ui-base-color, 6%);
- }
-
- .autosuggest-textarea__suggestions__item {
- &:hover,
- &:focus,
- &:active,
- &.selected {
- background: lighten($ui-base-color, 4%);
- }
- }
-}
-
-.emoji-mart-bar {
- border-color: lighten($ui-base-color, 4%);
-
- &:first-child {
- background: darken($ui-base-color, 6%);
- }
-}
-
-.emoji-mart-search input {
- background: rgba($ui-base-color, 0.3);
- border-color: $ui-base-color;
-}
-
.upload-progress__backdrop {
background: $ui-base-color;
}
@@ -261,11 +112,6 @@ html {
background: lighten($white, 4%);
}
-.detailed-status,
-.detailed-status__action-bar {
- background: $white;
-}
-
// Change the background colors of status__content__spoiler-link
.reply-indicator__content .status__content__spoiler-link,
.status__content .status__content__spoiler-link {
@@ -277,52 +123,11 @@ html {
}
}
-// Change the background colors of media and video spoilers
-.media-spoiler,
-.video-player__spoiler {
- background: $ui-base-color;
-}
-
-.privacy-dropdown.active .privacy-dropdown__value.active .icon-button {
- color: $white;
-}
-
.account-gallery__item a {
background-color: $ui-base-color;
}
-// Change the colors used in the dropdown menu
-.dropdown-menu {
- background: $white;
-
- &__arrow::before {
- background-color: $white;
- }
-
- &__item {
- color: $darker-text-color;
-
- &--dangerous {
- color: $error-value-color;
- }
-
- a,
- button {
- background: $white;
- }
- }
-}
-
// Change the text colors on inverted background
-.privacy-dropdown__option.active,
-.privacy-dropdown__option:hover,
-.privacy-dropdown__option.active .privacy-dropdown__option__content,
-.privacy-dropdown__option.active .privacy-dropdown__option__content strong,
-.privacy-dropdown__option:hover .privacy-dropdown__option__content,
-.privacy-dropdown__option:hover .privacy-dropdown__option__content strong,
-.dropdown-menu__item:not(.dropdown-menu__item--dangerous) a:active,
-.dropdown-menu__item:not(.dropdown-menu__item--dangerous) a:focus,
-.dropdown-menu__item:not(.dropdown-menu__item--dangerous) a:hover,
.actions-modal ul li:not(:empty) a.active,
.actions-modal ul li:not(:empty) a.active button,
.actions-modal ul li:not(:empty) a:active,
@@ -331,7 +136,6 @@ html {
.actions-modal ul li:not(:empty) a:focus button,
.actions-modal ul li:not(:empty) a:hover,
.actions-modal ul li:not(:empty) a:hover button,
-.language-dropdown__dropdown__results__item.active,
.admin-wrapper .sidebar ul .simple-navigation-active-leaf a,
.simple_form .block-button,
.simple_form .button,
@@ -339,19 +143,6 @@ html {
color: $white;
}
-.language-dropdown__dropdown__results__item
- .language-dropdown__dropdown__results__item__common-name {
- color: lighten($ui-base-color, 8%);
-}
-
-.language-dropdown__dropdown__results__item.active
- .language-dropdown__dropdown__results__item__common-name {
- color: darken($ui-base-color, 12%);
-}
-
-.dropdown-menu__separator,
-.dropdown-menu__item.edited-timestamp__history__item,
-.dropdown-menu__container__header,
.compare-history-modal .report-modal__target,
.report-dialog-modal .poll__option.dialog-option {
border-bottom-color: lighten($ui-base-color, 4%);
@@ -385,10 +176,7 @@ html {
.reactions-bar__item:hover,
.reactions-bar__item:focus,
-.reactions-bar__item:active,
-.language-dropdown__dropdown__results__item:hover,
-.language-dropdown__dropdown__results__item:focus,
-.language-dropdown__dropdown__results__item:active {
+.reactions-bar__item:active {
background-color: $ui-base-color;
}
@@ -476,11 +264,11 @@ html {
}
.react-toggle-track {
- background: $ui-secondary-color;
+ background: $ui-primary-color;
}
.react-toggle:hover:not(.react-toggle--disabled) .react-toggle-track {
- background: darken($ui-secondary-color, 10%);
+ background: lighten($ui-primary-color, 10%);
}
.react-toggle.react-toggle--checked:hover:not(.react-toggle--disabled)
@@ -631,11 +419,6 @@ html {
}
}
-.reply-indicator {
- background: transparent;
- border: 1px solid lighten($ui-base-color, 8%);
-}
-
.status__content,
.reply-indicator__content {
a {
@@ -657,7 +440,8 @@ html {
.directory__tag > div,
.card > a,
.page-header,
-.compose-form .compose-form__warning {
+.compose-form,
+.compose-form__warning {
box-shadow: none;
}
@@ -675,3 +459,47 @@ html {
background-color: rgba($ui-highlight-color, 0.15);
}
}
+
+.compose-form__actions .icon-button.active,
+.dropdown-button.active,
+.privacy-dropdown__option.active,
+.privacy-dropdown__option:focus,
+.language-dropdown__dropdown__results__item:focus,
+.language-dropdown__dropdown__results__item.active,
+.privacy-dropdown__option:focus .privacy-dropdown__option__content,
+.privacy-dropdown__option:focus .privacy-dropdown__option__content strong,
+.privacy-dropdown__option.active .privacy-dropdown__option__content,
+.privacy-dropdown__option.active .privacy-dropdown__option__content strong,
+.language-dropdown__dropdown__results__item:focus
+ .language-dropdown__dropdown__results__item__common-name,
+.language-dropdown__dropdown__results__item.active
+ .language-dropdown__dropdown__results__item__common-name {
+ color: $white;
+}
+
+.compose-form .spoiler-input__input {
+ color: lighten($ui-highlight-color, 8%);
+}
+
+.compose-form .autosuggest-textarea__textarea,
+.compose-form__highlightable,
+.search__input,
+.search__popout,
+.emoji-mart-search input,
+.language-dropdown__dropdown .emoji-mart-search input,
+.poll__option input[type='text'] {
+ background: darken($ui-base-color, 10%);
+}
+
+.inline-follow-suggestions {
+ background-color: rgba($ui-highlight-color, 0.1);
+ border-bottom-color: rgba($ui-highlight-color, 0.3);
+}
+
+.inline-follow-suggestions__body__scrollable__card {
+ background: $white;
+}
+
+.inline-follow-suggestions__body__scroll-button__icon {
+ color: $white;
+}
diff --git a/app/javascript/styles/mastodon-light/variables.scss b/app/javascript/styles/mastodon-light/variables.scss
index ac8a8312154c29..09a75a834b17db 100644
--- a/app/javascript/styles/mastodon-light/variables.scss
+++ b/app/javascript/styles/mastodon-light/variables.scss
@@ -5,7 +5,7 @@ $white: #ffffff;
$classic-base-color: #282c37;
$classic-primary-color: #9baec8;
$classic-secondary-color: #d9e1e8;
-$classic-highlight-color: #858afa;
+$classic-highlight-color: #6364ff;
$blurple-600: #563acc; // Iris
$blurple-500: #6364ff; // Brand purple
@@ -34,7 +34,7 @@ $ui-button-tertiary-border-color: $blurple-500 !default;
$primary-text-color: $black !default;
$darker-text-color: $classic-base-color !default;
-$highlight-text-color: darken($ui-highlight-color, 8%) !default;
+$highlight-text-color: $ui-highlight-color !default;
$dark-text-color: #444b5d;
$action-button-color: #606984;
@@ -55,3 +55,12 @@ $account-background-color: $white !default;
}
$emojis-requiring-inversion: 'chains';
+
+.theme-mastodon-light {
+ --dropdown-border-color: #d9e1e8;
+ --dropdown-background-color: #fff;
+ --background-border-color: #d9e1e8;
+ --background-color: #fff;
+ --background-color-tint: rgba(255, 255, 255, 90%);
+ --background-filter: blur(10px);
+}
diff --git a/app/javascript/styles/mastodon/_mixins.scss b/app/javascript/styles/mastodon/_mixins.scss
index dcfab6bd0157bc..d7f8586dd29623 100644
--- a/app/javascript/styles/mastodon/_mixins.scss
+++ b/app/javascript/styles/mastodon/_mixins.scss
@@ -15,13 +15,14 @@
outline: 0;
box-sizing: border-box;
width: 100%;
- border: 0;
box-shadow: none;
font-family: inherit;
background: $ui-base-color;
color: $darker-text-color;
border-radius: 4px;
- font-size: 14px;
+ border: 1px solid lighten($ui-base-color, 8%);
+ font-size: 17px;
+ line-height: normal;
margin: 0;
}
diff --git a/app/javascript/styles/mastodon/about.scss b/app/javascript/styles/mastodon/about.scss
index 0f02563b48d31e..48fe9449f0d477 100644
--- a/app/javascript/styles/mastodon/about.scss
+++ b/app/javascript/styles/mastodon/about.scss
@@ -26,7 +26,7 @@ $fluid-breakpoint: $maximum-width + 20px;
li {
position: relative;
- border-bottom: 1px solid lighten($ui-base-color, 8%);
+ border-bottom: 1px solid var(--background-border-color);
padding: 1em 1.75em;
padding-inline-start: 3em;
font-weight: 500;
@@ -53,4 +53,10 @@ $fluid-breakpoint: $maximum-width + 20px;
border-bottom: 0;
}
}
+
+ &__hint {
+ font-size: 14px;
+ font-weight: 400;
+ color: $darker-text-color;
+ }
}
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index 89c2adaea33270..1556b69e9d0ae2 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -10,6 +10,13 @@ $content-width: 840px;
width: 100%;
min-height: 100vh;
+ .icon {
+ width: 16px;
+ height: 16px;
+ vertical-align: middle;
+ margin: 0 2px;
+ }
+
.sidebar-wrapper {
min-height: 100vh;
overflow: hidden;
@@ -324,6 +331,23 @@ $content-width: 840px;
padding-bottom: 0;
margin-bottom: 0;
border-bottom: 0;
+
+ .comment {
+ display: block;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ margin-top: 4px;
+
+ &.private-comment {
+ display: block;
+ color: $darker-text-color;
+ }
+
+ &.public-comment {
+ display: block;
+ color: $secondary-text-color;
+ }
+ }
}
& > p {
@@ -638,16 +662,6 @@ body,
input.button {
margin: 0 5px 5px 0;
}
-
- .media-spoiler-toggle-buttons {
- margin-inline-start: auto;
-
- .button {
- overflow: visible;
- margin: 0 0 5px 5px;
- float: right;
- }
- }
}
.back-link {
@@ -1070,6 +1084,7 @@ a.name-tag,
display: flex;
justify-content: space-between;
margin-bottom: 0;
+ word-break: break-word;
}
&__permissions {
@@ -1330,6 +1345,9 @@ a.sparkline {
&__label {
padding: 15px;
+ display: flex;
+ gap: 8px;
+ align-items: center;
}
&__rules {
@@ -1340,6 +1358,9 @@ a.sparkline {
&__rule {
cursor: pointer;
padding: 15px;
+ display: flex;
+ gap: 8px;
+ align-items: center;
}
}
@@ -1380,8 +1401,21 @@ a.sparkline {
}
.account-card {
- background: $ui-base-color;
border-radius: 4px;
+ border: 1px solid lighten($ui-base-color, 8%);
+ position: relative;
+
+ &__warning-badge {
+ position: absolute;
+ padding: 4px 10px;
+ top: 10px;
+ inset-inline-start: 10px;
+ border-radius: 4px;
+ background:
+ url('~images/warning-stripes.svg') repeat-y left,
+ url('~images/warning-stripes.svg') repeat-y right,
+ var(--background-color);
+ }
&__permalink {
color: inherit;
diff --git a/app/javascript/styles/mastodon/basics.scss b/app/javascript/styles/mastodon/basics.scss
index 6714b24268f46a..2e7d5e5e9c5287 100644
--- a/app/javascript/styles/mastodon/basics.scss
+++ b/app/javascript/styles/mastodon/basics.scss
@@ -8,7 +8,7 @@
body {
font-family: $font-sans-serif, sans-serif;
- background: darken($ui-base-color, 7%);
+ background: var(--background-color);
font-size: 13px;
line-height: 18px;
font-weight: 400;
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 477aaa73a38ccc..ff06055bd49c59 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -106,17 +106,17 @@
}
&.button-secondary {
- color: $ui-button-secondary-color;
+ color: $highlight-text-color;
background: transparent;
padding: 6px 17px;
- border: 1px solid $ui-button-secondary-border-color;
+ border: 1px solid $highlight-text-color;
&:active,
&:focus,
&:hover {
- border-color: $ui-button-secondary-focus-background-color;
- color: $ui-button-secondary-focus-color;
- background-color: $ui-button-secondary-focus-background-color;
+ border-color: lighten($highlight-text-color, 4%);
+ color: lighten($highlight-text-color, 4%);
+ background-color: transparent;
text-decoration: none;
}
@@ -368,46 +368,155 @@ body > [data-popper-placement] {
}
}
-.compose-form {
- padding: 15px;
-
- &__sensitive-button {
- padding: 10px;
- padding-top: 0;
- font-size: 14px;
- font-weight: 500;
+.autosuggest-textarea {
+ &__textarea {
+ background: transparent;
+ min-height: 100px;
+ padding-bottom: 0;
+ resize: none;
+ scrollbar-color: initial;
- &.active {
- color: $highlight-text-color;
+ &::-webkit-scrollbar {
+ all: unset;
}
+ }
- input[type='checkbox'] {
- appearance: none;
- display: inline-block;
- position: relative;
- border: 1px solid $ui-primary-color;
+ &__suggestions {
+ box-shadow: var(--dropdown-shadow);
+ background: $ui-base-color;
+ border: 1px solid lighten($ui-base-color, 14%);
+ border-radius: 0 0 4px 4px;
+ color: $secondary-text-color;
+ font-size: 14px;
+ padding: 0;
+
+ &__item {
box-sizing: border-box;
- width: 18px;
- height: 18px;
- flex: 0 0 auto;
- margin-inline-end: 10px;
- top: -1px;
- border-radius: 4px;
- vertical-align: middle;
- cursor: inherit;
+ display: flex;
+ align-items: center;
+ height: 48px;
+ cursor: pointer;
+ font-size: 14px;
+ line-height: 20px;
+ letter-spacing: 0.25px;
+ color: $secondary-text-color;
- &:checked {
- border-color: $highlight-text-color;
- background: $highlight-text-color
- url("data:image/svg+xml;utf8,")
- center center no-repeat;
+ &:last-child {
+ border-radius: 0 0 4px 4px;
}
+
+ &:hover,
+ &:focus,
+ &:active,
+ &.selected {
+ background: $ui-highlight-color;
+ color: $primary-text-color;
+
+ .autosuggest-account .display-name__account {
+ color: inherit;
+ }
+ }
+ }
+ }
+}
+
+.autosuggest-account,
+.autosuggest-emoji,
+.autosuggest-hashtag {
+ flex: 1 0 0;
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ justify-content: flex-start;
+ gap: 12px;
+ padding: 8px 12px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+
+.autosuggest-account {
+ .display-name {
+ font-weight: 400;
+ display: flex;
+ flex-direction: column;
+ flex: 1 0 0;
+ }
+
+ .display-name__account {
+ display: block;
+ line-height: 16px;
+ font-size: 12px;
+ color: $dark-text-color;
+ }
+}
+
+.autosuggest-hashtag {
+ justify-content: space-between;
+
+ &__name {
+ flex: 1 1 auto;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+
+ &__uses {
+ flex: 0 0 auto;
+ text-align: end;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+}
+
+.autosuggest-emoji {
+ &__name {
+ flex: 1 0 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+}
+
+.autosuggest-account .account__avatar,
+.autosuggest-emoji img {
+ display: block;
+ width: 24px;
+ height: 24px;
+ flex: 0 0 auto;
+}
+
+.compose-form {
+ display: flex;
+ flex-direction: column;
+ gap: 32px;
+
+ .layout-multiple-columns &,
+ .column & {
+ padding: 15px;
+ }
+
+ &__highlightable {
+ display: flex;
+ flex-direction: column;
+ gap: 16px;
+ flex: 0 1 auto;
+ border-radius: 4px;
+ border: 1px solid lighten($ui-base-color, 8%);
+ transition: border-color 300ms linear;
+ min-height: 0;
+ position: relative;
+ background: $ui-base-color;
+ overflow-y: auto;
+
+ &.active {
+ transition: none;
+ border-color: $ui-highlight-color;
}
}
- .compose-form__warning {
+ &__warning {
color: $inverted-text-color;
- margin-bottom: 10px;
background: $ui-primary-color;
box-shadow: 0 2px 6px rgba($base-shadow-color, 0.3);
padding: 8px 10px;
@@ -455,22 +564,27 @@ body > [data-popper-placement] {
position: relative;
}
- .autosuggest-textarea,
- .autosuggest-input,
.spoiler-input {
- position: relative;
- width: 100%;
- }
+ display: flex;
+ align-items: stretch;
- .spoiler-input {
- height: 0;
- transform-origin: bottom;
- opacity: 0;
+ &__border {
+ background: url('~images/warning-stripes.svg') repeat-y;
+ width: 5px;
+ flex: 0 0 auto;
- &.spoiler-input--visible {
- height: 36px;
- margin-bottom: 11px;
- opacity: 1;
+ &:first-child {
+ border-start-start-radius: 4px;
+ }
+
+ &:last-child {
+ border-start-end-radius: 4px;
+ }
+ }
+
+ .autosuggest-input {
+ flex: 1 1 auto;
+ border-bottom: 1px solid lighten($ui-base-color, 8%);
}
}
@@ -480,273 +594,303 @@ body > [data-popper-placement] {
box-sizing: border-box;
width: 100%;
margin: 0;
- color: $inverted-text-color;
- background: $simple-background-color;
- padding: 10px;
+ color: $secondary-text-color;
+ background: $ui-base-color;
font-family: inherit;
font-size: 14px;
- resize: vertical;
+ padding: 12px;
+ line-height: normal;
border: 0;
outline: 0;
- &::placeholder {
- color: $dark-text-color;
- }
-
&:focus {
outline: 0;
}
-
- @media screen and (width <= 600px) {
- font-size: 16px;
- }
}
.spoiler-input__input {
- border-radius: 4px;
+ padding: 12px 12px - 5px;
+ background: mix($ui-base-color, $ui-highlight-color, 85%);
+ color: $highlight-text-color;
}
- .autosuggest-textarea__textarea {
- min-height: 100px;
- border-radius: 4px 4px 0 0;
- padding-bottom: 0;
- padding-right: 10px + 22px; // Cannot use inline-end because of dir=auto
- resize: none;
- scrollbar-color: initial;
-
- &::-webkit-scrollbar {
- all: unset;
- }
+ &__dropdowns {
+ display: flex;
+ align-items: center;
+ gap: 8px;
- @media screen and (width <= 600px) {
- height: 100px !important; // Prevent auto-resize textarea
- resize: vertical;
+ & > div {
+ overflow: hidden;
+ display: flex;
}
}
- .autosuggest-textarea__suggestions-wrapper {
- position: relative;
- height: 0;
+ &__uploads {
+ display: flex;
+ gap: 8px;
+ padding: 0 12px;
+ flex-wrap: wrap;
+ align-self: stretch;
+ align-items: flex-start;
+ align-content: flex-start;
+ justify-content: center;
}
- .autosuggest-textarea__suggestions {
- box-sizing: border-box;
- display: none;
- position: absolute;
- top: 100%;
- width: 100%;
- z-index: 99;
- box-shadow: 4px 4px 6px rgba($base-shadow-color, 0.4);
- background: $ui-secondary-color;
- border-radius: 0 0 4px 4px;
- color: $inverted-text-color;
- font-size: 14px;
- padding: 6px;
+ &__upload {
+ flex: 1 1 0;
+ min-width: calc(50% - 8px);
- &.autosuggest-textarea__suggestions--visible {
- display: block;
+ &__actions {
+ display: flex;
+ align-items: flex-start;
+ justify-content: space-between;
+ padding: 8px;
}
- }
- .autosuggest-textarea__suggestions__item {
- padding: 10px;
- cursor: pointer;
- border-radius: 4px;
+ &__preview {
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ border-radius: 6px;
+ z-index: -1;
+ top: 0;
+ inset-inline-start: 0;
+ }
- &:hover,
- &:focus,
- &:active,
- &.selected {
- background: darken($ui-secondary-color, 10%);
+ &__thumbnail {
+ width: 100%;
+ height: 144px;
+ border-radius: 6px;
+ background-position: center;
+ background-size: cover;
+ background-repeat: no-repeat;
+ overflow: hidden;
}
- }
- .autosuggest-account,
- .autosuggest-emoji,
- .autosuggest-hashtag {
- display: flex;
- flex-direction: row;
- align-items: center;
- justify-content: flex-start;
- line-height: 18px;
- font-size: 14px;
- }
+ .icon-button {
+ flex: 0 0 auto;
+ color: $white;
+ background: rgba(0, 0, 0, 75%);
+ border-radius: 6px;
+ font-size: 12px;
+ line-height: 16px;
+ font-weight: 500;
+ padding: 4px 8px;
+ font-family: inherit;
- .autosuggest-latex .hint {
- font-style: italic;
- }
+ .icon {
+ width: 15px;
+ height: 15px;
+ }
+ }
- .autosuggest-hashtag {
- justify-content: space-between;
+ .icon-button.compose-form__upload__delete {
+ padding: 2px;
+ border-radius: 50%;
- &__name {
- flex: 1 1 auto;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
+ .icon {
+ width: 20px;
+ height: 20px;
+ }
}
- strong {
- font-weight: 500;
- }
+ &__warning {
+ position: absolute;
+ z-index: 2;
+ bottom: 0;
+ inset-inline-start: 0;
+ inset-inline-end: 0;
+ padding: 8px;
- &__uses {
- flex: 0 0 auto;
- text-align: end;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
+ .icon-button.active {
+ color: #ffbe2e;
+ background: rgba(0, 0, 0, 75%);
+ }
}
}
- .autosuggest-account-icon,
- .autosuggest-emoji img {
- display: block;
- margin-inline-end: 8px;
- width: 16px;
- height: 16px;
+ &__footer {
+ display: flex;
+ flex-direction: column;
+ gap: 12px;
+ padding: 12px;
+ padding-top: 0;
}
- .autosuggest-account .display-name__account {
- color: $lighter-text-color;
+ &__submit {
+ display: flex;
+ align-items: center;
+ flex: 1 1 auto;
+ max-width: 100%;
+ overflow: hidden;
}
- .compose-form__modifiers {
- color: $inverted-text-color;
- font-family: inherit;
- font-size: 14px;
- background: $simple-background-color;
+ &__buttons {
+ display: flex;
+ gap: 8px;
+ align-items: center;
+ flex: 1 1 auto;
- .compose-form__upload-wrapper {
- overflow: hidden;
+ & > div {
+ display: flex;
}
- .compose-form__uploads-wrapper {
- display: flex;
- flex-direction: row;
- padding: 5px;
- flex-wrap: wrap;
+ .icon-button {
+ padding: 2px;
}
- .compose-form__upload {
- flex: 1 1 0;
- min-width: 40%;
- margin: 5px;
+ .icon-button .icon {
+ width: 20px;
+ height: 20px;
+ }
+ }
- &__actions {
- background: linear-gradient(
- 180deg,
- rgba($base-shadow-color, 0.8) 0,
- rgba($base-shadow-color, 0.35) 80%,
- transparent
- );
- display: flex;
- align-items: flex-start;
- justify-content: space-between;
- }
+ &__actions {
+ display: flex;
+ align-items: center;
+ flex: 0 0 auto;
+ gap: 12px;
+ flex-wrap: wrap;
- .icon-button {
- flex: 0 1 auto;
- color: $secondary-text-color;
- font-size: 14px;
- font-weight: 500;
- padding: 10px;
- font-family: inherit;
+ .button {
+ display: block; // Otherwise text-ellipsis doesn't work
+ font-size: 14px;
+ line-height: normal;
+ font-weight: 700;
+ flex: 1 1 auto;
+ padding: 5px 12px;
+ border-radius: 4px;
+ }
- .icon {
- width: 15px;
- height: 15px;
- }
+ .icon-button {
+ box-sizing: content-box;
+ color: $highlight-text-color;
- &:hover,
- &:focus,
- &:active {
- color: lighten($secondary-text-color, 7%);
- }
+ &:hover,
+ &:focus,
+ &:active {
+ color: $highlight-text-color;
}
- &__warning {
- position: absolute;
- z-index: 2;
- bottom: 0;
- inset-inline-start: 0;
- inset-inline-end: 0;
- box-sizing: border-box;
- background: linear-gradient(
- 0deg,
- rgba($base-shadow-color, 0.8) 0,
- rgba($base-shadow-color, 0.35) 80%,
- transparent
- );
+ &.disabled {
+ color: $highlight-text-color;
+ opacity: 0.5;
}
- }
- .compose-form__upload-thumbnail {
- border-radius: 4px;
- background-color: $base-shadow-color;
- background-position: center;
- background-size: cover;
- background-repeat: no-repeat;
- height: 140px;
- width: 100%;
- overflow: hidden;
+ &.active {
+ background: $ui-highlight-color;
+ color: $primary-text-color;
+ }
}
}
- .compose-form__buttons-wrapper {
- padding: 10px;
- background: darken($simple-background-color, 8%);
- border-radius: 0 0 4px 4px;
+ &__poll {
display: flex;
- justify-content: space-between;
- flex: 0 0 auto;
-
- .compose-form__buttons {
- display: flex;
- gap: 2px;
+ flex-direction: column;
+ align-self: stretch;
+ gap: 8px;
- .icon-button {
- height: 100%;
- }
+ .poll__option {
+ padding: 0 12px;
+ gap: 8px;
- .compose-form__upload-button-icon {
- line-height: 27px;
+ &.empty:not(:focus-within) {
+ opacity: 0.5;
}
+ }
- .compose-form__sensitive-button {
- display: none;
+ .poll__input {
+ width: 17px;
+ height: 17px;
+ border-color: $darker-text-color;
+ }
- &.compose-form__sensitive-button--visible {
- display: block;
- }
+ &__footer {
+ display: flex;
+ align-items: center;
+ gap: 16px;
+ padding-inline-start: 37px;
+ padding-inline-end: 40px;
- .compose-form__sensitive-button__icon {
- line-height: 27px;
- }
+ &__sep {
+ width: 1px;
+ height: 22px;
+ background: lighten($ui-base-color, 8%);
+ flex: 0 0 auto;
}
}
- .icon-button,
- .text-icon-button {
- box-sizing: content-box;
- padding: 0 3px;
- }
+ &__select {
+ display: flex;
+ flex-direction: column;
+ gap: 2px;
+ flex: 1 1 auto;
+ min-width: 0;
+
+ &__label {
+ flex: 0 0 auto;
+ font-size: 11px;
+ font-weight: 500;
+ line-height: 16px;
+ letter-spacing: 0.5px;
+ color: $darker-text-color;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ }
- .character-counter__wrapper {
- align-self: center;
- margin-inline-end: 4px;
+ &__value {
+ flex: 0 0 auto;
+ appearance: none;
+ background: transparent;
+ border: none;
+ padding: 0;
+ font-size: 14px;
+ font-weight: 500;
+ line-height: 20px;
+ letter-spacing: 0.1px;
+ color: $highlight-text-color;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ }
}
}
+}
- .compose-form__publish {
- display: flex;
- justify-content: flex-end;
- min-width: 0;
+.dropdown-button {
+ display: flex;
+ align-items: center;
+ gap: 4px;
+ background: transparent;
+ color: $highlight-text-color;
+ border-radius: 6px;
+ border: 1px solid $highlight-text-color;
+ padding: 4px 8px;
+ font-size: 13px;
+ line-height: normal;
+ font-weight: 400;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+
+ .icon {
+ width: 15px;
+ height: 15px;
flex: 0 0 auto;
+ }
- .compose-form__publish-button-wrapper {
- padding-top: 15px;
- }
+ &__label {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ flex: 1 1 auto;
+ }
+
+ &.active {
+ background: $ui-highlight-color;
+ border-color: $ui-highlight-color;
+ color: $primary-text-color;
}
}
@@ -754,11 +898,14 @@ body > [data-popper-placement] {
cursor: default;
font-family: $font-sans-serif, sans-serif;
font-size: 14px;
- font-weight: 600;
- color: $lighter-text-color;
+ font-weight: 400;
+ line-height: normal;
+ color: $darker-text-color;
+ flex: 1 0 auto;
+ text-align: end;
&.character-counter--over {
- color: $warning-red;
+ color: $error-red;
}
}
@@ -804,41 +951,6 @@ body > [data-popper-placement] {
}
}
-.reply-indicator {
- border-radius: 4px;
- margin-bottom: 10px;
- background: $ui-primary-color;
- padding: 10px;
- min-height: 23px;
- overflow-y: auto;
- flex: 0 2 auto;
-}
-
-.reply-indicator__header {
- margin-bottom: 5px;
- overflow: hidden;
-}
-
-.reply-indicator__cancel {
- float: right;
- line-height: 24px;
-}
-
-.reply-indicator__display-name {
- color: $inverted-text-color;
- display: block;
- max-width: 100%;
- line-height: 24px;
- overflow: hidden;
- padding-inline-end: 25px;
- text-decoration: none;
-}
-
-.reply-indicator__display-avatar {
- float: left;
- margin-inline-end: 5px;
-}
-
.status__content--with-action {
cursor: pointer;
}
@@ -848,14 +960,15 @@ body > [data-popper-placement] {
}
.status__content,
+.edit-indicator__content,
.reply-indicator__content {
position: relative;
- font-size: 15px;
- line-height: 22px;
word-wrap: break-word;
font-weight: 400;
overflow: hidden;
text-overflow: ellipsis;
+ font-size: 15px;
+ line-height: 22px;
padding-top: 2px;
color: $primary-text-color;
@@ -940,6 +1053,174 @@ body > [data-popper-placement] {
}
}
+.reply-indicator {
+ display: grid;
+ grid-template-columns: 46px minmax(0, 1fr);
+ grid-template-rows: 46px max-content;
+ gap: 0 10px;
+
+ .detailed-status__display-name {
+ margin-bottom: 4px;
+ }
+
+ .detailed-status__display-avatar {
+ grid-column-start: 1;
+ grid-row-start: 1;
+ grid-row-end: span 1;
+ }
+
+ &__main {
+ grid-column-start: 2;
+ grid-row-start: 1;
+ grid-row-end: span 2;
+ }
+
+ .display-name {
+ font-size: 14px;
+ line-height: 16px;
+
+ &__account {
+ display: none;
+ }
+ }
+
+ &__line {
+ grid-column-start: 1;
+ grid-row-start: 2;
+ grid-row-end: span 1;
+ position: relative;
+
+ &::before {
+ display: block;
+ content: '';
+ position: absolute;
+ inset-inline-start: 50%;
+ top: 4px;
+ transform: translateX(-50%);
+ background: lighten($ui-base-color, 8%);
+ width: 2px;
+ height: calc(100% + 32px - 8px); // Account for gap to next element
+ }
+ }
+
+ &__content {
+ font-size: 14px;
+ line-height: 20px;
+ letter-spacing: 0.25px;
+ display: -webkit-box;
+ -webkit-line-clamp: 4;
+ -webkit-box-orient: vertical;
+ padding: 0;
+ max-height: 4 * 20px;
+ overflow: hidden;
+ color: $darker-text-color;
+ }
+
+ &__attachments {
+ margin-top: 4px;
+ color: $darker-text-color;
+ font-size: 12px;
+ line-height: 16px;
+ display: flex;
+ align-items: center;
+ gap: 4px;
+
+ .icon {
+ width: 18px;
+ height: 18px;
+ }
+ }
+}
+
+.edit-indicator {
+ border-radius: 4px 4px 0 0;
+ background: lighten($ui-base-color, 4%);
+ padding: 12px;
+ overflow-y: auto;
+ flex: 0 0 auto;
+ border-bottom: 0.5px solid lighten($ui-base-color, 8%);
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
+
+ &__header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ color: $darker-text-color;
+ font-size: 12px;
+ line-height: 16px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+
+ &__cancel {
+ display: flex;
+
+ .icon {
+ width: 18px;
+ height: 18px;
+ }
+ }
+
+ &__display-name {
+ display: flex;
+ gap: 4px;
+
+ a {
+ color: inherit;
+ text-decoration: none;
+
+ &:hover,
+ &:focus,
+ &:active {
+ text-decoration: underline;
+ }
+ }
+ }
+
+ &__content {
+ color: $secondary-text-color;
+ font-size: 14px;
+ line-height: 20px;
+ letter-spacing: 0.25px;
+ padding-top: 0 !important;
+ display: -webkit-box;
+ -webkit-line-clamp: 4;
+ -webkit-box-orient: vertical;
+ max-height: 4 * 20px;
+ overflow: hidden;
+
+ a {
+ color: $highlight-text-color;
+ }
+ }
+
+ &__attachments {
+ color: $darker-text-color;
+ font-size: 12px;
+ line-height: 16px;
+ opacity: 0.75;
+ display: flex;
+ align-items: center;
+ gap: 4px;
+
+ .icon {
+ width: 18px;
+ height: 18px;
+ }
+ }
+}
+
+.edit-indicator__content,
+.reply-indicator__content {
+ .emojione {
+ width: 18px;
+ height: 18px;
+ margin: -3px 0 0;
+ }
+}
+
.announcements__item__content {
word-wrap: break-word;
overflow-y: auto;
@@ -1046,7 +1327,7 @@ body > [data-popper-placement] {
box-sizing: border-box;
width: 100%;
clear: both;
- border-bottom: 1px solid lighten($ui-base-color, 8%);
+ border-bottom: 1px solid var(--background-border-color);
&__button {
display: inline;
@@ -1067,19 +1348,14 @@ body > [data-popper-placement] {
.focusable {
&:focus {
outline: 0;
- background: lighten($ui-base-color, 4%);
-
- .detailed-status,
- .detailed-status__action-bar {
- background: lighten($ui-base-color, 8%);
- }
+ background: rgba($ui-highlight-color, 0.05);
}
}
.status {
padding: 16px;
min-height: 54px;
- border-bottom: 1px solid lighten($ui-base-color, 8%);
+ border-bottom: 1px solid var(--background-border-color);
cursor: auto;
@keyframes fade {
@@ -1323,10 +1599,10 @@ body > [data-popper-placement] {
}
.status__wrapper-direct {
- background: mix($ui-base-color, $ui-highlight-color, 95%);
+ background: rgba($ui-highlight-color, 0.05);
&:focus {
- background: mix(lighten($ui-base-color, 4%), $ui-highlight-color, 95%);
+ background: rgba($ui-highlight-color, 0.05);
}
.status__prepend {
@@ -1351,9 +1627,8 @@ body > [data-popper-placement] {
}
.detailed-status {
- background: lighten($ui-base-color, 4%);
padding: 16px;
- border-top: 1px solid lighten($ui-base-color, 8%);
+ border-top: 1px solid var(--background-border-color);
&--flex {
display: flex;
@@ -1399,23 +1674,43 @@ body > [data-popper-placement] {
border-top: 0;
}
-.detailed-status__meta {
- margin-top: 16px;
- color: $dark-text-color;
- font-size: 14px;
- line-height: 18px;
+.detailed-status__meta {
+ margin-top: 24px;
+ color: $dark-text-color;
+ font-size: 14px;
+ line-height: 18px;
+
+ &__line {
+ border-bottom: 1px solid var(--background-border-color);
+ padding: 8px 0;
+ display: flex;
+ align-items: center;
+ gap: 8px;
+
+ &:first-child {
+ padding-top: 0;
+ }
+
+ &:last-child {
+ padding-bottom: 0;
+ border-bottom: 0;
+ }
+ }
.icon {
- width: 15px;
- height: 15px;
- vertical-align: middle;
+ width: 18px;
+ height: 18px;
+ }
+
+ .animated-number {
+ color: $secondary-text-color;
+ font-weight: 500;
}
}
.detailed-status__action-bar {
- background: lighten($ui-base-color, 4%);
- border-top: 1px solid lighten($ui-base-color, 8%);
- border-bottom: 1px solid lighten($ui-base-color, 8%);
+ border-top: 1px solid var(--background-border-color);
+ border-bottom: 1px solid var(--background-border-color);
display: flex;
flex-direction: row;
padding: 10px 0;
@@ -1453,33 +1748,11 @@ body > [data-popper-placement] {
color: inherit;
text-decoration: none;
gap: 6px;
- position: relative;
- top: 0.145em;
-
- .icon {
- top: 0;
- }
-}
-
-.detailed-status__favorites,
-.detailed-status__reblogs {
- font-weight: 500;
- font-size: 12px;
- line-height: 18px;
-}
-
-.reply-indicator__content {
- color: $inverted-text-color;
- font-size: 14px;
-
- a {
- color: $lighter-text-color;
- }
}
.domain {
padding: 10px;
- border-bottom: 1px solid lighten($ui-base-color, 8%);
+ border-bottom: 1px solid var(--background-border-color);
.domain__domain-name {
flex: 1 1 auto;
@@ -1503,7 +1776,7 @@ body > [data-popper-placement] {
.account {
padding: 16px;
- border-bottom: 1px solid lighten($ui-base-color, 8%);
+ border-bottom: 1px solid var(--background-border-color);
.account__display-name {
flex: 1 1 auto;
@@ -1536,6 +1809,118 @@ body > [data-popper-placement] {
}
}
+ &__domain-pill {
+ display: inline-flex;
+ background: rgba($highlight-text-color, 0.2);
+ border-radius: 4px;
+ border: 0;
+ color: $highlight-text-color;
+ font-weight: 500;
+ font-size: 12px;
+ line-height: 16px;
+ padding: 4px 8px;
+
+ &.active {
+ color: $white;
+ background: $ui-highlight-color;
+ }
+
+ &__popout {
+ background: var(--dropdown-background-color);
+ backdrop-filter: var(--background-filter);
+ border: 1px solid var(--dropdown-border-color);
+ box-shadow: var(--dropdown-shadow);
+ max-width: 320px;
+ padding: 16px;
+ border-radius: 8px;
+ display: flex;
+ flex-direction: column;
+ gap: 24px;
+ font-size: 14px;
+ line-height: 20px;
+ color: $darker-text-color;
+
+ .link-button {
+ display: inline;
+ font-size: inherit;
+ line-height: inherit;
+ }
+
+ &__header {
+ display: flex;
+ align-items: center;
+ gap: 12px;
+
+ &__icon {
+ width: 40px;
+ height: 40px;
+ background: $ui-highlight-color;
+ color: $white;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border-radius: 50%;
+ flex-shrink: 0;
+ }
+
+ h3 {
+ font-size: 17px;
+ line-height: 22px;
+ color: $primary-text-color;
+ }
+ }
+
+ &__handle {
+ border: 2px dashed $highlight-text-color;
+ background: rgba($highlight-text-color, 0.1);
+ padding: 12px 8px;
+ color: $highlight-text-color;
+ border-radius: 4px;
+
+ &__label {
+ font-size: 11px;
+ line-height: 16px;
+ font-weight: 500;
+ }
+
+ &__handle {
+ user-select: all;
+ }
+ }
+
+ &__parts {
+ display: flex;
+ flex-direction: column;
+ gap: 8px;
+ font-size: 12px;
+ line-height: 16px;
+
+ & > div {
+ display: flex;
+ align-items: flex-start;
+ gap: 12px;
+ }
+
+ &__icon {
+ width: 40px;
+ height: 40px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-shrink: 0;
+ color: $highlight-text-color;
+ }
+
+ h6 {
+ font-size: 14px;
+ line-height: 20px;
+ font-weight: 500;
+ color: $primary-text-color;
+ }
+ }
+ }
+ }
+
&__note {
font-size: 14px;
font-weight: 400;
@@ -1646,7 +2031,22 @@ a .account__avatar {
white-space: nowrap;
display: flex;
align-items: center;
- gap: 4px;
+ gap: 8px;
+}
+
+.account__relationship,
+.explore__suggestions__card {
+ .icon-button {
+ border: 1px solid var(--background-border-color);
+ border-radius: 4px;
+ box-sizing: content-box;
+ padding: 5px;
+
+ .icon {
+ width: 24px;
+ height: 24px;
+ }
+ }
}
.account-authorize {
@@ -1687,7 +2087,6 @@ a .account__avatar {
}
.status__display-name,
-.reply-indicator__display-name,
.detailed-status__display-name,
a.account__display-name {
&:hover .display-name strong {
@@ -1762,7 +2161,7 @@ a.account__display-name {
.notification__report {
padding: 16px;
- border-bottom: 1px solid lighten($ui-base-color, 8%);
+ border-bottom: 1px solid var(--background-border-color);
display: flex;
gap: 10px;
@@ -1797,6 +2196,45 @@ a.account__display-name {
}
}
+.notification__relationships-severance-event,
+.notification__moderation-warning {
+ 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;
@@ -1838,14 +2276,14 @@ a.account__display-name {
&.activate {
& > .icon {
animation: spring-rotate-in 1s linear;
- transform-origin: 50% 55%;
+ transform-origin: 50% 52%;
}
}
&.deactivate {
& > .icon {
animation: spring-rotate-out 1s linear;
- transform-origin: 50% 55%;
+ transform-origin: 50% 52%;
}
}
}
@@ -1945,57 +2383,45 @@ a.account__display-name {
}
.navigation-bar {
- padding: 15px;
display: flex;
align-items: center;
flex-shrink: 0;
cursor: default;
gap: 10px;
- color: $darker-text-color;
-
- strong {
- color: $secondary-text-color;
- }
- a {
- color: inherit;
- text-decoration: none;
+ .column > & {
+ padding: 15px;
}
- .navigation-bar__actions {
- position: relative;
+ .account {
+ border-bottom: 0;
+ padding: 0;
+ flex: 1 1 auto;
+ min-width: 0;
- .compose__action-bar .icon-button {
- pointer-events: auto;
- transform: scale(1, 1) translate(0, 0);
- opacity: 1;
+ &__display-name {
+ font-size: 16px;
+ line-height: 24px;
+ letter-spacing: 0.15px;
+ font-weight: 500;
- .icon {
- width: 24px;
- height: 24px;
+ .display-name__account {
+ font-size: 14px;
+ line-height: 20px;
+ letter-spacing: 0.1px;
}
}
}
-}
-
-.navigation-bar__profile {
- display: flex;
- flex-direction: column;
- flex: 1 1 auto;
- line-height: 20px;
-}
-.navigation-bar__profile-account {
- display: inline;
- font-weight: 500;
- overflow: hidden;
- text-overflow: ellipsis;
-}
+ .icon-button {
+ padding: 8px;
+ color: $secondary-text-color;
+ }
-.navigation-bar__profile-edit {
- display: inline;
- color: inherit;
- text-decoration: none;
+ .icon-button .icon {
+ width: 24px;
+ height: 24px;
+ }
}
.dropdown-animation {
@@ -2033,6 +2459,7 @@ a.account__display-name {
.dropdown-menu {
background: var(--dropdown-background-color);
+ backdrop-filter: var(--background-filter);
border: 1px solid var(--dropdown-border-color);
padding: 4px;
border-radius: 4px;
@@ -2055,6 +2482,10 @@ a.account__display-name {
outline: 1px dotted;
}
+ &:hover {
+ text-decoration: underline;
+ }
+
.icon {
width: 15px;
height: 15px;
@@ -2173,6 +2604,7 @@ a.account__display-name {
&__panels {
display: flex;
justify-content: center;
+ gap: 16px;
width: 100%;
height: 100%;
min-height: 100vh;
@@ -2205,7 +2637,6 @@ a.account__display-name {
flex-direction: column;
@media screen and (min-width: $no-gap-breakpoint) {
- padding: 0 10px;
max-width: 600px;
}
}
@@ -2213,6 +2644,7 @@ a.account__display-name {
}
$ui-header-height: 55px;
+$ui-header-logo-wordmark-width: 99px;
.ui__header {
display: none;
@@ -2223,10 +2655,15 @@ $ui-header-height: 55px;
z-index: 3;
justify-content: space-between;
align-items: center;
+ backdrop-filter: var(--background-filter);
&__logo {
display: inline-flex;
padding: 15px;
+ flex-grow: 1;
+ flex-shrink: 1;
+ overflow: hidden;
+ container: header-logo / inline-size;
.logo {
height: $ui-header-height - 30px;
@@ -2237,7 +2674,7 @@ $ui-header-height: 55px;
display: none;
}
- @media screen and (width >= 320px) {
+ @container header-logo (min-width: #{$ui-header-logo-wordmark-width}) {
.logo--wordmark {
display: block;
}
@@ -2254,6 +2691,7 @@ $ui-header-height: 55px;
gap: 10px;
padding: 0 10px;
overflow: hidden;
+ flex-shrink: 0;
.button {
flex: 0 0 auto;
@@ -2271,7 +2709,8 @@ $ui-header-height: 55px;
}
.tabs-bar__wrapper {
- background: darken($ui-base-color, 8%);
+ background: var(--background-color);
+ backdrop-filter: var(--background-filter);
position: sticky;
top: $ui-header-height;
z-index: 2;
@@ -2307,8 +2746,15 @@ $ui-header-height: 55px;
flex-direction: column;
> .scrollable {
- background: $ui-base-color;
+ border: 1px solid var(--background-border-color);
+ border-top: 0;
border-radius: 0 0 4px 4px;
+
+ &.about,
+ &.privacy-policy {
+ border-top: 1px solid var(--background-border-color);
+ border-radius: 4px;
+ }
}
}
@@ -2338,7 +2784,6 @@ $ui-header-height: 55px;
font-size: 16px;
align-items: center;
justify-content: center;
- border-bottom: 2px solid transparent;
}
.column,
@@ -2455,6 +2900,7 @@ $ui-header-height: 55px;
.columns-area__panels {
min-height: calc(100vh - $ui-header-height);
+ gap: 0;
}
.columns-area__panels__pane--navigational {
@@ -2466,8 +2912,7 @@ $ui-header-height: 55px;
.navigation-panel {
margin: 0;
- background: $ui-base-color;
- border-inline-start: 1px solid lighten($ui-base-color, 8%);
+ border-inline-start: 1px solid var(--background-border-color);
height: 100vh;
}
@@ -2483,17 +2928,31 @@ $ui-header-height: 55px;
}
}
- .layout-single-column .ui__header {
- display: flex;
- background: $ui-base-color;
- border-bottom: 1px solid lighten($ui-base-color, 8%);
- }
+ .layout-single-column {
+ .ui__header {
+ display: flex;
+ background: var(--background-color);
+ border-bottom: 1px solid var(--background-border-color);
+ }
- .column-header,
- .column-back-button,
- .scrollable,
- .error-column {
- border-radius: 0 !important;
+ .column > .scrollable,
+ .tabs-bar__wrapper .column-header,
+ .tabs-bar__wrapper .column-back-button {
+ border-left: 0;
+ border-right: 0;
+ }
+
+ .column-header,
+ .column-back-button,
+ .scrollable,
+ .error-column {
+ border-radius: 0 !important;
+ }
+
+ .column-header,
+ .column-back-button {
+ border-top: 0;
+ }
}
}
@@ -2525,6 +2984,75 @@ $ui-header-height: 55px;
display: none;
}
+.explore__suggestions__card {
+ padding: 12px 16px;
+ gap: 8px;
+ display: flex;
+ flex-direction: column;
+ border-bottom: 1px solid var(--background-border-color);
+
+ &:last-child {
+ border-bottom: 0;
+ }
+
+ &__source {
+ padding-inline-start: 60px;
+ font-size: 13px;
+ line-height: 16px;
+ color: $dark-text-color;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ }
+
+ &__body {
+ display: flex;
+ gap: 12px;
+ align-items: center;
+
+ &__main {
+ flex: 1 1 auto;
+ display: flex;
+ flex-direction: column;
+ gap: 8px;
+ min-width: 0;
+
+ &__name-button {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+
+ &__name {
+ display: block;
+ color: inherit;
+ text-decoration: none;
+ flex: 1 1 auto;
+ min-width: 0;
+ }
+
+ .button {
+ min-width: 80px;
+ }
+
+ .display-name {
+ font-size: 15px;
+ line-height: 20px;
+ color: $secondary-text-color;
+
+ strong {
+ font-weight: 700;
+ }
+
+ &__account {
+ color: $darker-text-color;
+ display: block;
+ }
+ }
+ }
+ }
+ }
+}
+
@media screen and (max-width: $no-gap-breakpoint - 1px) {
.columns-area__panels__pane--compositional {
display: none;
@@ -2544,7 +3072,7 @@ $ui-header-height: 55px;
inset-inline-start: 9px;
top: -13px;
background: $ui-highlight-color;
- border: 2px solid lighten($ui-base-color, 8%);
+ border: 2px solid var(--background-color);
padding: 1px 6px;
border-radius: 6px;
font-size: 10px;
@@ -2566,7 +3094,7 @@ $ui-header-height: 55px;
}
.column-link--transparent .icon-with-badge__badge {
- border-color: darken($ui-base-color, 8%);
+ border-color: var(--background-color);
}
.column-title {
@@ -2854,21 +3382,6 @@ $ui-header-height: 55px;
}
}
-.compose-form__highlightable {
- display: flex;
- flex-direction: column;
- flex: 0 1 auto;
- border-radius: 4px;
- transition: box-shadow 300ms linear;
- min-height: 0;
- position: relative;
-
- &.active {
- transition: none;
- box-shadow: 0 0 0 6px rgba(lighten($highlight-text-color, 8%), 0.7);
- }
-}
-
.compose-panel {
width: 285px;
margin-top: 10px;
@@ -2897,32 +3410,9 @@ $ui-header-height: 55px;
}
}
- .navigation-bar {
- flex: 0 1 48px;
- }
-
.compose-form {
- flex: 1;
- display: flex;
- flex-direction: column;
- min-height: 310px;
- padding-bottom: 71px;
- margin-bottom: -71px;
- }
-
- .compose-form__autosuggest-wrapper {
- overflow-y: auto;
- background-color: $white;
- border-radius: 4px 4px 0 0;
- flex: 0 1 auto;
- }
-
- .autosuggest-textarea__textarea {
- overflow-y: hidden;
- }
-
- .compose-form__upload-thumbnail {
- height: 80px;
+ flex: 1 1 auto;
+ min-height: 0;
}
}
@@ -2942,6 +3432,10 @@ $ui-header-height: 55px;
height: 30px;
width: auto;
}
+
+ &__logo {
+ margin-bottom: 12px;
+ }
}
.navigation-panel,
@@ -2950,7 +3444,7 @@ $ui-header-height: 55px;
flex: 0 0 auto;
border: 0;
background: transparent;
- border-top: 1px solid lighten($ui-base-color, 4%);
+ border-top: 1px solid var(--background-border-color);
margin: 10px 0;
}
@@ -2967,13 +3461,14 @@ $ui-header-height: 55px;
overflow: hidden;
display: flex;
border-radius: 4px;
+ border: 1px solid var(--background-border-color);
}
.drawer__inner {
position: absolute;
top: 0;
inset-inline-start: 0;
- background: $ui-base-color;
+ background: var(--background-color);
box-sizing: border-box;
padding: 0;
display: flex;
@@ -2982,15 +3477,11 @@ $ui-header-height: 55px;
overflow-y: auto;
width: 100%;
height: 100%;
-
- &.darker {
- background: $ui-base-color;
- }
}
.drawer__inner__mastodon {
- background: $ui-base-color
- url('data:image/svg+xml;utf8,')
+ background: var(--background-color)
+ url('data:image/svg+xml;utf8,')
no-repeat bottom / 100% auto;
flex: 1;
min-height: 47px;
@@ -3011,24 +3502,20 @@ $ui-header-height: 55px;
}
}
-.pseudo-drawer {
- background: lighten($ui-base-color, 13%);
- font-size: 13px;
- text-align: start;
-}
-
.drawer__header {
flex: 0 0 auto;
font-size: 16px;
- background: $ui-base-color;
+ border: 1px solid var(--background-border-color);
margin-bottom: 10px;
display: flex;
flex-direction: row;
border-radius: 4px;
overflow: hidden;
- a:hover {
- background: lighten($ui-base-color, 3%);
+ a:hover,
+ a:focus,
+ a:active {
+ color: $primary-text-color;
}
}
@@ -3073,22 +3560,22 @@ $ui-header-height: 55px;
.column-back-button {
box-sizing: border-box;
width: 100%;
- background: $ui-base-color;
+ background: transparent;
+ border: 1px solid var(--background-border-color);
border-radius: 4px 4px 0 0;
color: $highlight-text-color;
cursor: pointer;
flex: 0 0 auto;
font-size: 16px;
line-height: inherit;
- border: 0;
- border-bottom: 1px solid lighten($ui-base-color, 8%);
text-align: unset;
- padding: 15px;
+ padding: 13px;
margin: 0;
z-index: 3;
outline: 0;
display: flex;
align-items: center;
+ gap: 5px;
&:hover {
text-decoration: underline;
@@ -3098,30 +3585,27 @@ $ui-header-height: 55px;
.column-header__back-button {
display: flex;
align-items: center;
- background: $ui-base-color;
+ gap: 5px;
+ background: transparent;
border: 0;
font-family: inherit;
color: $highlight-text-color;
cursor: pointer;
white-space: nowrap;
font-size: 16px;
- padding: 0 5px 0 0;
+ padding: 13px;
z-index: 3;
&:hover {
text-decoration: underline;
}
- &:last-child {
- padding: 0 15px 0 0;
+ &.compact {
+ padding-inline-end: 5px;
+ flex: 0 0 auto;
}
}
-.column-back-button__icon {
- display: inline-block;
- margin-inline-end: 5px;
-}
-
.react-toggle {
display: inline-block;
position: relative;
@@ -3157,7 +3641,7 @@ $ui-header-height: 55px;
height: 20px;
padding: 0;
border-radius: 10px;
- background-color: #626982;
+ background-color: $ui-primary-color;
}
.react-toggle--focus {
@@ -3180,7 +3664,7 @@ $ui-header-height: 55px;
width: 16px;
height: 16px;
border-radius: 50%;
- background-color: $primary-text-color;
+ background-color: $ui-button-color;
box-sizing: border-box;
transition: all 0.25s ease;
transition-property: border-color, left;
@@ -3191,6 +3675,15 @@ $ui-header-height: 55px;
border-color: $ui-highlight-color;
}
+.react-toggle:hover:not(.react-toggle--disabled) .react-toggle-track {
+ background: darken($ui-primary-color, 5%);
+}
+
+.react-toggle.react-toggle--checked:hover:not(.react-toggle--disabled)
+ .react-toggle-track {
+ background: lighten($ui-highlight-color, 5%);
+}
+
.switch-to-advanced {
color: $light-text-color;
background-color: $ui-base-color;
@@ -3208,8 +3701,6 @@ $ui-header-height: 55px;
}
.column-link {
- background: lighten($ui-base-color, 8%);
- color: $primary-text-color;
display: flex;
align-items: center;
gap: 5px;
@@ -3219,12 +3710,18 @@ $ui-header-height: 55px;
overflow: hidden;
white-space: nowrap;
border: 0;
+ background: transparent;
+ color: $secondary-text-color;
border-left: 4px solid transparent;
&:hover,
&:focus,
&:active {
- background: lighten($ui-base-color, 11%);
+ color: $primary-text-color;
+ }
+
+ &.active {
+ color: $highlight-text-color;
}
&:focus {
@@ -3236,22 +3733,6 @@ $ui-header-height: 55px;
border-radius: 0;
}
- &--transparent {
- background: transparent;
- color: $ui-secondary-color;
-
- &:hover,
- &:focus,
- &:active {
- background: transparent;
- color: $primary-text-color;
- }
-
- &.active {
- color: $highlight-text-color;
- }
- }
-
&--logo {
background: transparent;
padding: 10px;
@@ -3276,8 +3757,8 @@ $ui-header-height: 55px;
}
.column-subheading {
- background: $ui-base-color;
- color: $dark-text-color;
+ background: var(--surface-background-color);
+ color: $darker-text-color;
padding: 8px 20px;
font-size: 12px;
font-weight: 500;
@@ -3285,12 +3766,6 @@ $ui-header-height: 55px;
cursor: default;
}
-.getting-started__wrapper,
-.getting-started,
-.flex-spacer {
- background: $ui-base-color;
-}
-
.getting-started__wrapper {
flex: 0 0 auto;
}
@@ -3302,6 +3777,8 @@ $ui-header-height: 55px;
.getting-started {
color: $dark-text-color;
overflow: auto;
+ border: 1px solid var(--background-border-color);
+ border-top: 0;
&__trends {
flex: 0 1 auto;
@@ -3310,7 +3787,7 @@ $ui-header-height: 55px;
margin-top: 10px;
h4 {
- border-bottom: 1px solid lighten($ui-base-color, 8%);
+ border-bottom: 1px solid var(--background-border-color);
padding: 10px;
font-size: 12px;
text-transform: uppercase;
@@ -3432,9 +3909,13 @@ $ui-header-height: 55px;
margin-top: 14px;
text-decoration: none;
overflow: hidden;
- border: 1px solid lighten($ui-base-color, 8%);
+ border: 1px solid var(--background-border-color);
border-radius: 8px;
+ &.bottomless {
+ border-radius: 8px 8px 0 0;
+ }
+
&__actions {
bottom: 0;
inset-inline-start: 0;
@@ -3689,7 +4170,7 @@ a.status-card {
}
.load-gap {
- border-bottom: 1px solid lighten($ui-base-color, 8%);
+ border-bottom: 1px solid var(--background-border-color);
}
.timeline-hint {
@@ -3722,7 +4203,8 @@ a.status-card {
font-size: 16px;
font-weight: 500;
color: $dark-text-color;
- background: $ui-base-color;
+ border: 1px solid var(--background-border-color);
+ border-top: 0;
cursor: default;
display: flex;
flex: 1 1 auto;
@@ -3798,8 +4280,7 @@ a.status-card {
.column-header {
display: flex;
font-size: 16px;
- background: $ui-base-color;
- border-bottom: 1px solid lighten($ui-base-color, 8%);
+ border: 1px solid var(--background-border-color);
border-radius: 4px 4px 0 0;
flex: 0 0 auto;
cursor: pointer;
@@ -3807,7 +4288,7 @@ a.status-card {
z-index: 2;
outline: 0;
- & > button {
+ &__title {
display: flex;
align-items: center;
gap: 5px;
@@ -3829,8 +4310,18 @@ a.status-card {
}
}
- & > .column-header__back-button {
+ .column-header__back-button + &__title {
+ padding-inline-start: 0;
+ }
+
+ .column-header__back-button {
+ flex: 1;
color: $highlight-text-color;
+
+ &.compact {
+ flex: 0 0 auto;
+ color: $primary-text-color;
+ }
}
&.active {
@@ -3844,6 +4335,18 @@ a.status-card {
&:active {
outline: 0;
}
+
+ &__advanced-buttons {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 16px;
+ padding-top: 0;
+
+ &:first-child {
+ padding-top: 16px;
+ }
+ }
}
.column-header__buttons {
@@ -3863,9 +4366,9 @@ a.status-card {
display: flex;
justify-content: center;
align-items: center;
- background: $ui-base-color;
border: 0;
color: $darker-text-color;
+ background: transparent;
cursor: pointer;
font-size: 16px;
padding: 0 15px;
@@ -3884,11 +4387,14 @@ a.status-card {
&.active {
color: $primary-text-color;
- background: lighten($ui-base-color, 4%);
&:hover {
color: $primary-text-color;
}
+
+ .icon-sliders {
+ transform: rotate(60deg);
+ }
}
&:disabled {
@@ -3897,11 +4403,14 @@ a.status-card {
}
}
+.no-reduce-motion .column-header__button .icon-sliders {
+ transition: transform 150ms ease-in-out;
+}
+
.column-header__collapsible {
max-height: 70vh;
overflow: hidden;
overflow-y: auto;
- border-bottom: 1px solid lighten($ui-base-color, 8%);
color: $darker-text-color;
transition:
max-height 150ms ease-in-out,
@@ -3923,14 +4432,14 @@ a.status-card {
height: 0;
background: transparent;
border: 0;
- border-top: 1px solid lighten($ui-base-color, 8%);
+ border-top: 1px solid var(--background-border-color);
margin: 10px 0;
}
}
.column-header__collapsible-inner {
- background: $ui-base-color;
- padding: 15px;
+ border: 1px solid var(--background-border-color);
+ border-top: 0;
}
.column-header__setting-btn {
@@ -3952,20 +4461,8 @@ a.status-card {
}
.column-header__setting-arrows {
- float: right;
-
- .column-header__setting-btn {
- padding: 5px;
-
- &:first-child {
- padding-inline-end: 7px;
- }
-
- &:last-child {
- padding-inline-start: 7px;
- margin-inline-start: 5px;
- }
- }
+ display: flex;
+ align-items: center;
}
.text-btn {
@@ -4119,35 +4616,6 @@ a.status-card {
z-index: 100;
}
-.media-spoiler {
- background: $base-overlay-background;
- color: $darker-text-color;
- border: 0;
- padding: 0;
- width: 100%;
- height: 100%;
- border-radius: 4px;
- appearance: none;
-
- &:hover,
- &:active,
- &:focus {
- padding: 0;
- color: lighten($darker-text-color, 8%);
- }
-}
-
-.media-spoiler__warning {
- display: block;
- font-size: 14px;
-}
-
-.media-spoiler__trigger {
- display: block;
- font-size: 11px;
- font-weight: 700;
-}
-
.spoiler-button {
top: 0;
inset-inline-start: 0;
@@ -4217,9 +4685,8 @@ a.status-card {
}
.account--panel {
- background: lighten($ui-base-color, 4%);
- border-top: 1px solid lighten($ui-base-color, 8%);
- border-bottom: 1px solid lighten($ui-base-color, 8%);
+ border-top: 1px solid var(--background-border-color);
+ border-bottom: 1px solid var(--background-border-color);
display: flex;
flex-direction: row;
padding: 10px 0;
@@ -4231,24 +4698,56 @@ a.status-card {
text-align: center;
}
-.column-settings__outer {
- background: lighten($ui-base-color, 8%);
- padding: 15px;
-}
+.column-settings {
+ display: flex;
+ flex-direction: column;
-.column-settings__section {
- color: $darker-text-color;
- cursor: default;
- display: block;
- font-weight: 500;
- margin-bottom: 10px;
-}
+ &__section {
+ // FIXME: Legacy
+ color: $darker-text-color;
+ cursor: default;
+ display: block;
+ font-weight: 500;
+ }
-.column-settings__row--with-margin {
- margin-bottom: 15px;
+ .column-header__links {
+ margin: 0;
+ }
+
+ section {
+ padding: 16px;
+ border-bottom: 1px solid lighten($ui-base-color, 8%);
+
+ &:last-child {
+ border-bottom: 0;
+ }
+ }
+
+ h3 {
+ font-size: 16px;
+ line-height: 24px;
+ letter-spacing: 0.5px;
+ font-weight: 500;
+ color: $primary-text-color;
+ margin-bottom: 16px;
+ }
+
+ &__row {
+ display: flex;
+ flex-direction: column;
+ gap: 12px;
+ }
+
+ .app-form__toggle {
+ &__toggle > div {
+ border: 0;
+ }
+ }
}
.column-settings__hashtags {
+ margin-top: 15px;
+
.column-settings__row {
margin-bottom: 15px;
}
@@ -4372,16 +4871,13 @@ a.status-card {
}
.setting-toggle {
- display: block;
- line-height: 24px;
+ display: flex;
+ align-items: center;
+ gap: 8px;
}
.setting-toggle__label {
color: $darker-text-color;
- display: inline-block;
- margin-bottom: 14px;
- margin-inline-start: 8px;
- vertical-align: middle;
}
.limited-account-hint {
@@ -4396,7 +4892,6 @@ a.status-card {
.empty-column-indicator,
.follow_requests-unlocked_explanation {
color: $dark-text-color;
- background: $ui-base-color;
text-align: center;
padding: 20px;
font-size: 15px;
@@ -4422,15 +4917,15 @@ a.status-card {
}
.follow_requests-unlocked_explanation {
- background: darken($ui-base-color, 4%);
- border-bottom: 1px solid lighten($ui-base-color, 8%);
+ background: var(--surface-background-color);
+ border-bottom: 1px solid var(--background-border-color);
contain: initial;
flex-grow: 0;
}
.error-column {
padding: 20px;
- background: $ui-base-color;
+ border: 1px solid var(--background-border-color);
border-radius: 4px;
display: flex;
flex: 1 1 auto;
@@ -4505,50 +5000,15 @@ a.status-card {
animation: heartbeat 1.5s ease-in-out infinite both;
}
-@keyframes shake-bottom {
- 0%,
- 100% {
- transform: rotate(0deg);
- transform-origin: 50% 100%;
- }
-
- 10% {
- transform: rotate(2deg);
- }
-
- 20%,
- 40%,
- 60% {
- transform: rotate(-4deg);
- }
-
- 30%,
- 50%,
- 70% {
- transform: rotate(4deg);
- }
-
- 80% {
- transform: rotate(-2deg);
- }
-
- 90% {
- transform: rotate(2deg);
- }
-}
-
-.no-reduce-motion .shake-bottom {
- transform-origin: 50% 100%;
- animation: shake-bottom 0.8s cubic-bezier(0.455, 0.03, 0.515, 0.955) 2s 2 both;
-}
-
.emoji-picker-dropdown__menu {
- background: $simple-background-color;
position: relative;
- box-shadow: var(--dropdown-shadow);
- border-radius: 4px;
margin-top: 5px;
z-index: 2;
+ background: var(--dropdown-background-color);
+ backdrop-filter: var(--background-filter);
+ border: 1px solid var(--dropdown-border-color);
+ box-shadow: var(--dropdown-shadow);
+ border-radius: 5px;
.emoji-mart-scroll {
transition: opacity 200ms ease;
@@ -4569,11 +5029,12 @@ a.status-card {
.emoji-picker-dropdown__modifiers__menu {
position: absolute;
z-index: 4;
- top: -4px;
- inset-inline-start: -8px;
- background: $simple-background-color;
+ top: -5px;
+ inset-inline-start: -9px;
+ background: var(--dropdown-background-color);
+ border: 1px solid var(--dropdown-border-color);
border-radius: 4px;
- box-shadow: 1px 2px 6px rgba($base-shadow-color, 0.2);
+ box-shadow: var(--dropdown-shadow);
overflow: hidden;
button {
@@ -4586,7 +5047,7 @@ a.status-card {
&:hover,
&:focus,
&:active {
- background: rgba($ui-secondary-color, 0.4);
+ background: var(--dropdown-border-color);
}
}
@@ -4655,15 +5116,17 @@ a.status-card {
}
.upload-progress {
- padding: 10px;
- color: $lighter-text-color;
+ color: $darker-text-color;
overflow: hidden;
display: flex;
- gap: 10px;
+ gap: 8px;
+ align-items: center;
+ padding: 0 12px;
.icon {
width: 24px;
height: 24px;
+ color: $ui-highlight-color;
}
span {
@@ -4682,7 +5145,7 @@ a.status-card {
width: 100%;
height: 6px;
border-radius: 6px;
- background: darken($simple-background-color, 8%);
+ background: var(--background-color);
position: relative;
margin-top: 5px;
}
@@ -4771,12 +5234,17 @@ a.status-card {
filter: none;
}
-.privacy-dropdown__dropdown {
- background: $simple-background-color;
+.privacy-dropdown__dropdown,
+.language-dropdown__dropdown {
box-shadow: var(--dropdown-shadow);
+ background: var(--dropdown-background-color);
+ backdrop-filter: var(--background-filter);
+ border: 1px solid var(--dropdown-border-color);
+ padding: 4px;
border-radius: 4px;
overflow: hidden;
z-index: 2;
+ width: 300px;
&.top {
transform-origin: 50% 100%;
@@ -4797,28 +5265,41 @@ a.status-card {
}
.privacy-dropdown__option {
- color: $inverted-text-color;
- padding: 10px;
+ font-size: 14px;
+ line-height: 20px;
+ letter-spacing: 0.25px;
+ padding: 8px 12px;
cursor: pointer;
display: flex;
+ align-items: center;
+ gap: 12px;
+ border-radius: 4px;
+ color: $primary-text-color;
&:hover,
+ &:active {
+ background: var(--dropdown-border-color);
+ }
+
+ &:focus,
&.active {
background: $ui-highlight-color;
color: $primary-text-color;
outline: 0;
- .privacy-dropdown__option__content {
+ .privacy-dropdown__option__content,
+ .privacy-dropdown__option__content strong,
+ .privacy-dropdown__option__additional {
color: $primary-text-color;
-
- strong {
- color: $primary-text-color;
- }
}
}
- &.active:hover {
- background: lighten($ui-highlight-color, 4%);
+ &__additional {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: $darker-text-color;
+ cursor: help;
}
}
@@ -4826,17 +5307,16 @@ a.status-card {
display: flex;
align-items: center;
justify-content: center;
- margin-inline-end: 10px;
}
.privacy-dropdown__option__content {
flex: 1 1 auto;
- color: $lighter-text-color;
+ color: $darker-text-color;
strong {
+ color: $primary-text-color;
font-weight: 500;
display: block;
- color: $inverted-text-color;
@each $lang in $cjk-langs {
&:lang(#{$lang}) {
@@ -4958,64 +5438,78 @@ a.status-card {
.language-dropdown {
&__dropdown {
- background: $simple-background-color;
- box-shadow: var(--dropdown-shadow);
- border-radius: 4px;
- overflow: hidden;
- z-index: 2;
+ padding: 0;
- &.top {
- transform-origin: 50% 100%;
- }
+ .emoji-mart-search {
+ padding: 10px;
+ background: var(--dropdown-background-color);
- &.bottom {
- transform-origin: 50% 0;
- }
+ input {
+ padding: 8px 12px;
+ background: $ui-base-color;
+ border: 1px solid lighten($ui-base-color, 8%);
+ color: $darker-text-color;
- .emoji-mart-search {
- padding-inline-end: 10px;
+ @media screen and (width <= 600px) {
+ font-size: 16px;
+ line-height: 24px;
+ letter-spacing: 0.5px;
+ }
+ }
}
.emoji-mart-search-icon {
- inset-inline-end: 10px + 5px;
+ inset-inline-end: 15px;
+ opacity: 1;
+ color: $darker-text-color;
+
+ .icon {
+ width: 18px;
+ height: 18px;
+ }
+
+ &:disabled {
+ opacity: 0.38;
+ }
}
.emoji-mart-scroll {
padding: 0 10px 10px;
+ background: var(--dropdown-background-color);
}
&__results {
&__item {
cursor: pointer;
- color: $inverted-text-color;
+ color: $primary-text-color;
+ font-size: 14px;
+ line-height: 20px;
+ letter-spacing: 0.25px;
font-weight: 500;
- padding: 10px;
+ padding: 8px 12px;
border-radius: 4px;
- display: flex;
- gap: 6px;
- align-items: center;
-
- &:focus,
- &:active,
- &:hover {
- background: $ui-secondary-color;
- }
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
&__common-name {
color: $darker-text-color;
+ font-weight: 400;
}
+ &:active,
+ &:hover {
+ background: var(--dropdown-border-color);
+ }
+
+ &:focus,
&.active {
background: $ui-highlight-color;
color: $primary-text-color;
outline: 0;
.language-dropdown__dropdown__results__item__common-name {
- color: $secondary-text-color;
- }
-
- &:hover {
- background: lighten($ui-highlight-color, 4%);
+ color: $primary-text-color;
}
}
}
@@ -5024,9 +5518,13 @@ a.status-card {
}
.search {
- margin-bottom: 10px;
+ margin-bottom: 32px;
position: relative;
+ .layout-multiple-columns & {
+ margin-bottom: 10px;
+ }
+
&__popout {
box-sizing: border-box;
display: none;
@@ -5035,6 +5533,7 @@ a.status-card {
margin-top: -2px;
width: 100%;
background: $ui-base-color;
+ border: 1px solid lighten($ui-base-color, 8%);
border-radius: 0 0 4px 4px;
box-shadow: var(--dropdown-shadow);
z-index: 99;
@@ -5043,7 +5542,7 @@ a.status-card {
h4 {
text-transform: uppercase;
- color: $dark-text-color;
+ color: $darker-text-color;
font-weight: 500;
padding: 0 10px;
margin-bottom: 10px;
@@ -5051,6 +5550,7 @@ a.status-card {
.icon-button {
padding: 0;
+ color: $darker-text-color;
}
.icon {
@@ -5066,7 +5566,7 @@ a.status-card {
}
&__message {
- color: $dark-text-color;
+ color: $darker-text-color;
padding: 0 10px;
}
@@ -5122,6 +5622,10 @@ a.status-card {
}
&.active {
+ .search__input {
+ border-radius: 4px 4px 0 0;
+ }
+
.search__popout {
display: block;
}
@@ -5132,14 +5636,9 @@ a.status-card {
@include search-input;
display: block;
- padding: 15px;
- padding-inline-end: 30px;
- line-height: 18px;
- font-size: 16px;
-
- &::placeholder {
- color: lighten($darker-text-color, 4%);
- }
+ padding: 12px 16px;
+ padding-inline-start: 16px + 15px + 8px;
+ line-height: normal;
&::-moz-focus-inner {
border: 0;
@@ -5150,10 +5649,6 @@ a.status-card {
&:active {
outline: 0 !important;
}
-
- &:focus {
- background: lighten($ui-base-color, 4%);
- }
}
.search__icon {
@@ -5168,21 +5663,21 @@ a.status-card {
.icon {
position: absolute;
- top: 13px;
- inset-inline-end: 10px;
+ top: 12px + 2px;
display: inline-block;
opacity: 0;
transition: all 100ms linear;
transition-property: transform, opacity;
- width: 24px;
- height: 24px;
- color: $secondary-text-color;
+ width: 20px;
+ height: 20px;
+ color: $darker-text-color;
cursor: default;
pointer-events: none;
+ margin-inline-start: 16px - 2px;
&.active {
pointer-events: auto;
- opacity: 0.3;
+ opacity: 1;
}
}
@@ -5197,42 +5692,24 @@ a.status-card {
.icon-times-circle {
transform: rotate(0deg);
- color: $action-button-color;
cursor: pointer;
&.active {
transform: rotate(90deg);
- opacity: 1;
- }
-
- &:hover {
- color: lighten($action-button-color, 7%);
}
}
}
-.search-results__header {
- color: $dark-text-color;
- background: lighten($ui-base-color, 2%);
- padding: 15px;
- font-weight: 500;
- font-size: 16px;
- cursor: default;
- display: flex;
- align-items: center;
- gap: 5px;
-}
-
.search-results__section {
- border-bottom: 1px solid lighten($ui-base-color, 8%);
+ border-bottom: 1px solid var(--background-border-color);
&:last-child {
border-bottom: 0;
}
&__header {
- background: darken($ui-base-color, 4%);
- border-bottom: 1px solid lighten($ui-base-color, 8%);
+ border-bottom: 1px solid var(--background-border-color);
+ background: var(--surface-background-color);
padding: 15px;
font-weight: 500;
font-size: 14px;
@@ -5267,20 +5744,6 @@ a.status-card {
}
}
-.search-results__hashtag {
- display: block;
- padding: 10px;
- color: $secondary-text-color;
- text-decoration: none;
-
- &:hover,
- &:active,
- &:focus {
- color: lighten($secondary-text-color, 4%);
- text-decoration: underline;
- }
-}
-
.search-results__info {
padding: 20px;
color: $darker-text-color;
@@ -5308,6 +5771,8 @@ a.status-card {
inset-inline-start: 0;
width: 100%;
height: 100%;
+ max-width: 100vw;
+ max-height: 100vh;
box-sizing: border-box;
display: flex;
flex-direction: column;
@@ -5323,6 +5788,10 @@ a.status-card {
pointer-events: auto;
user-select: text;
display: flex;
+
+ @media screen and (width <= 630px) {
+ margin-top: auto;
+ }
}
.video-modal .video-player {
@@ -5584,74 +6053,222 @@ a.status-card {
display: flex;
padding: 25px;
- & > div {
- min-width: 33px;
+ & > div {
+ min-width: 33px;
+ }
+
+ .onboarding-modal__nav,
+ .error-modal__nav {
+ color: $lighter-text-color;
+ border: 0;
+ font-size: 14px;
+ font-weight: 500;
+ padding: 10px 25px;
+ line-height: inherit;
+ height: auto;
+ margin: -10px;
+ border-radius: 4px;
+ background-color: transparent;
+
+ &:hover,
+ &:focus,
+ &:active {
+ color: darken($lighter-text-color, 4%);
+ background-color: darken($ui-secondary-color, 16%);
+ }
+
+ &.onboarding-modal__done,
+ &.onboarding-modal__next {
+ color: $inverted-text-color;
+
+ &:hover,
+ &:focus,
+ &:active {
+ color: lighten($inverted-text-color, 4%);
+ }
+ }
+ }
+}
+
+.error-modal__footer {
+ justify-content: center;
+}
+
+.display-case {
+ text-align: center;
+ font-size: 15px;
+ margin-bottom: 15px;
+
+ &__label {
+ font-weight: 500;
+ color: $inverted-text-color;
+ margin-bottom: 5px;
+ text-transform: uppercase;
+ font-size: 12px;
+ }
+
+ &__case {
+ background: $ui-base-color;
+ color: $secondary-text-color;
+ font-weight: 500;
+ padding: 10px;
+ border-radius: 4px;
+ }
+}
+
+.onboard-sliders {
+ display: inline-block;
+ max-width: 30px;
+ max-height: auto;
+ margin-inline-start: 10px;
+}
+
+.safety-action-modal {
+ width: 600px;
+ flex-direction: column;
+
+ &__top,
+ &__bottom {
+ display: flex;
+ gap: 8px;
+ padding: 24px;
+ flex-direction: column;
+ background: var(--modal-background-color);
+ backdrop-filter: var(--background-filter);
+ border: 1px solid var(--modal-border-color);
+ }
+
+ &__top {
+ border-radius: 16px 16px 0 0;
+ border-bottom: 0;
+ gap: 16px;
+ }
+
+ &__bottom {
+ border-radius: 0 0 16px 16px;
+ border-top: 0;
+
+ @media screen and (max-width: $no-gap-breakpoint) {
+ border-radius: 0;
+ border-bottom: 0;
+ padding-bottom: 32px;
+ }
+ }
+
+ &__header {
+ display: flex;
+ gap: 16px;
+ align-items: center;
+ font-size: 14px;
+ line-height: 20px;
+ color: $darker-text-color;
+
+ &__icon {
+ border-radius: 64px;
+ background: $ui-highlight-color;
+ color: $white;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ width: 40px;
+ height: 40px;
+ flex-shrink: 0;
+
+ .icon {
+ width: 24px;
+ height: 24px;
+ }
+ }
+
+ h1 {
+ font-size: 22px;
+ line-height: 28px;
+ color: $primary-text-color;
+ }
}
- .onboarding-modal__nav,
- .error-modal__nav {
- color: $lighter-text-color;
- border: 0;
- font-size: 14px;
- font-weight: 500;
- padding: 10px 25px;
- line-height: inherit;
- height: auto;
- margin: -10px;
- border-radius: 4px;
- background-color: transparent;
+ &__bullet-points {
+ display: flex;
+ flex-direction: column;
+ gap: 8px;
+ font-size: 16px;
+ line-height: 24px;
- &:hover,
- &:focus,
- &:active {
- color: darken($lighter-text-color, 4%);
- background-color: darken($ui-secondary-color, 16%);
+ & > div {
+ display: flex;
+ gap: 16px;
+ align-items: center;
}
- &.onboarding-modal__done,
- &.onboarding-modal__next {
- color: $inverted-text-color;
+ &__icon {
+ width: 40px;
+ height: 40px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-shrink: 0;
- &:hover,
- &:focus,
- &:active {
- color: lighten($inverted-text-color, 4%);
+ .icon {
+ width: 24px;
+ height: 24px;
}
}
}
-}
-.error-modal__footer {
- justify-content: center;
-}
+ &__field-group {
+ display: flex;
+ flex-direction: column;
-.display-case {
- text-align: center;
- font-size: 15px;
- margin-bottom: 15px;
+ label {
+ display: flex;
+ gap: 16px;
+ align-items: center;
+ font-size: 16px;
+ line-height: 24px;
+ height: 32px;
+ padding: 0 12px;
+ }
+ }
- &__label {
- font-weight: 500;
- color: $inverted-text-color;
- margin-bottom: 5px;
- text-transform: uppercase;
- font-size: 12px;
+ &__caveats {
+ font-size: 14px;
+ padding: 0 12px;
+
+ strong {
+ font-weight: 500;
+ }
}
- &__case {
- background: $ui-base-color;
- color: $secondary-text-color;
- font-weight: 500;
- padding: 10px;
- border-radius: 4px;
+ &__bottom {
+ padding-top: 0;
+
+ &__collapsible {
+ display: none;
+ flex-direction: column;
+ gap: 16px;
+ }
+
+ &.active {
+ background: var(--modal-background-variant-color);
+ padding-top: 24px;
+
+ .safety-action-modal__bottom__collapsible {
+ display: flex;
+ }
+ }
}
-}
-.onboard-sliders {
- display: inline-block;
- max-width: 30px;
- max-height: auto;
- margin-inline-start: 10px;
+ &__actions {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+ justify-content: flex-end;
+
+ .link-button {
+ padding: 10px 12px;
+ font-weight: 600;
+ }
+ }
}
.boost-modal,
@@ -5813,6 +6430,11 @@ a.status-card {
}
}
+ .dialog-option {
+ align-items: center;
+ gap: 12px;
+ }
+
.dialog-option .poll__input {
border-color: $inverted-text-color;
color: $ui-secondary-color;
@@ -5821,8 +6443,8 @@ a.status-card {
justify-content: center;
svg {
- width: 8px;
- height: auto;
+ width: 15px;
+ height: 15px;
}
&:active,
@@ -5952,6 +6574,7 @@ a.status-card {
.report-modal__comment {
box-sizing: border-box;
width: 50%;
+ min-width: 50%;
@media screen and (width <= 480px) {
width: 100%;
@@ -6020,6 +6643,14 @@ a.status-card {
min-height: 100px;
max-height: 50vh;
border: 0;
+
+ @media screen and (height <= 600px) {
+ max-height: 20vh;
+ }
+
+ @media screen and (max-width: $no-columns-breakpoint) {
+ max-height: 20vh;
+ }
}
.setting-toggle {
@@ -6277,7 +6908,7 @@ a.status-card {
.attachment-list {
display: flex;
font-size: 14px;
- border: 1px solid lighten($ui-base-color, 8%);
+ border: 1px solid var(--background-border-color);
border-radius: 4px;
margin-top: 16px;
overflow: hidden;
@@ -6287,7 +6918,7 @@ a.status-card {
color: $dark-text-color;
padding: 8px 18px;
cursor: default;
- border-inline-end: 1px solid lighten($ui-base-color, 8%);
+ border-inline-end: 1px solid var(--background-border-color);
display: flex;
flex-direction: column;
align-items: center;
@@ -6439,7 +7070,7 @@ a.status-card {
overflow: hidden;
box-sizing: border-box;
position: relative;
- background: darken($ui-base-color, 8%);
+ background: var(--background-color);
border-radius: 8px;
padding-bottom: 44px;
width: 100%;
@@ -6835,7 +7466,6 @@ a.status-card {
.scrollable .account-card {
margin: 10px;
- background: lighten($ui-base-color, 8%);
}
.scrollable .account-card__title__avatar {
@@ -6846,11 +7476,7 @@ a.status-card {
}
.scrollable .account-card__bio::after {
- background: linear-gradient(
- to left,
- lighten($ui-base-color, 8%),
- transparent
- );
+ background: linear-gradient(to left, var(--background-color), transparent);
}
.account-gallery__container {
@@ -6879,8 +7505,8 @@ a.status-card {
.notification__filter-bar,
.account__section-headline {
- background: $ui-base-color;
- border-bottom: 1px solid lighten($ui-base-color, 8%);
+ border: 1px solid var(--background-border-color);
+ border-top: 0;
cursor: default;
display: flex;
flex-shrink: 0;
@@ -6913,43 +7539,54 @@ a.status-card {
content: '';
position: absolute;
bottom: -1px;
- left: 0;
- width: 100%;
+ left: 50%;
+ transform: translateX(-50%);
+ width: 40px;
height: 3px;
- border-radius: 4px;
+ border-radius: 4px 4px 0 0;
background: $highlight-text-color;
}
}
}
+
+ .scrollable & {
+ border-left: 0;
+ border-right: 0;
+ }
}
.filter-form {
- background: $ui-base-color;
+ border-bottom: 1px solid var(--background-border-color);
&__column {
- padding: 10px 15px;
- padding-bottom: 0;
+ display: flex;
+ flex-direction: column;
+ gap: 15px;
+ padding: 15px;
}
.radio-button {
- display: block;
+ display: flex;
}
}
.column-settings__row .radio-button {
- display: block;
+ display: flex;
}
-.radio-button {
+.radio-button,
+.check-box {
font-size: 14px;
position: relative;
- display: inline-block;
- padding: 6px 0;
+ display: inline-flex;
+ align-items: center;
line-height: 18px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
cursor: pointer;
+ gap: 10px;
+ color: $secondary-text-color;
input[type='radio'],
input[type='checkbox'] {
@@ -6957,21 +7594,53 @@ a.status-card {
}
&__input {
- display: inline-block;
+ display: flex;
+ align-items: center;
+ justify-content: center;
position: relative;
- border: 1px solid $ui-primary-color;
+ border: 2px solid $secondary-text-color;
box-sizing: border-box;
- width: 18px;
- height: 18px;
+ width: 20px;
+ height: 20px;
flex: 0 0 auto;
- margin-inline-end: 10px;
- top: -1px;
border-radius: 50%;
- vertical-align: middle;
&.checked {
- border-color: lighten($ui-highlight-color, 4%);
- background: lighten($ui-highlight-color, 4%);
+ border-color: $ui-highlight-color;
+
+ &::before {
+ position: absolute;
+ left: 2px;
+ top: 2px;
+ content: '';
+ display: block;
+ border-radius: 50%;
+ width: 12px;
+ height: 12px;
+ background: $ui-highlight-color;
+ }
+ }
+
+ .icon {
+ width: 18px;
+ height: 18px;
+ }
+ }
+}
+
+.check-box {
+ &__input {
+ width: 18px;
+ height: 18px;
+ border-radius: 2px;
+
+ &.checked {
+ background: $ui-highlight-color;
+ color: $white;
+
+ &::before {
+ display: none;
+ }
}
}
}
@@ -7020,90 +7689,6 @@ noscript {
}
}
-@media screen and (width <= 630px) and (height <= 400px) {
- $duration: 400ms;
- $delay: 100ms;
-
- .search {
- will-change: margin-top;
- transition: margin-top $duration $delay;
- }
-
- .navigation-bar {
- will-change: padding-bottom;
- transition: padding-bottom $duration $delay;
- }
-
- .navigation-bar {
- & > a:first-child {
- will-change: margin-top, margin-inline-start, margin-inline-end, width;
- transition:
- margin-top $duration $delay,
- margin-inline-start $duration ($duration + $delay),
- margin-inline-end $duration ($duration + $delay);
- }
-
- & > .navigation-bar__profile-edit {
- will-change: margin-top;
- transition: margin-top $duration $delay;
- }
-
- .navigation-bar__actions {
- & > .icon-button.close {
- will-change: opacity transform;
- transition:
- opacity $duration * 0.5 $delay,
- transform $duration $delay;
- }
-
- & > .compose__action-bar .icon-button {
- will-change: opacity transform;
- transition:
- opacity $duration * 0.5 $delay + $duration * 0.5,
- transform $duration $delay;
- }
- }
- }
-
- .is-composing {
- .search {
- margin-top: -50px;
- }
-
- .navigation-bar {
- padding-bottom: 0;
-
- & > a:first-child {
- margin: -100px 10px 0 -50px;
- }
-
- .navigation-bar__profile {
- padding-top: 2px;
- }
-
- .navigation-bar__profile-edit {
- position: absolute;
- margin-top: -60px;
- }
-
- .navigation-bar__actions {
- .icon-button.close {
- pointer-events: auto;
- opacity: 1;
- transform: scale(1, 1) translate(0, 0);
- bottom: 5px;
- }
-
- .compose__action-bar .icon-button {
- pointer-events: none;
- opacity: 0;
- transform: scale(0, 1) translate(100%, 0);
- }
- }
- }
- }
-}
-
.embed-modal {
width: auto;
max-width: 80vw;
@@ -7171,7 +7756,7 @@ noscript {
.follow-request-banner,
.account-memorial-banner {
padding: 20px;
- background: lighten($ui-base-color, 4%);
+ background: var(--surface-background-color);
display: flex;
align-items: center;
flex-direction: column;
@@ -7214,7 +7799,8 @@ noscript {
justify-content: flex-start;
gap: 15px;
align-items: center;
- background: lighten($ui-base-color, 4%);
+ border: 1px solid var(--background-border-color);
+ border-top: 0;
label {
flex: 1 1 auto;
@@ -7315,7 +7901,7 @@ noscript {
.list {
padding: 10px;
- border-bottom: 1px solid lighten($ui-base-color, 8%);
+ border-bottom: 1px solid var(--background-border-color);
}
.list__wrapper {
@@ -7459,7 +8045,7 @@ noscript {
height: 145px;
position: relative;
background: darken($ui-base-color, 4%);
- border-bottom: 1px solid lighten($ui-base-color, 8%);
+ border-bottom: 1px solid var(--background-border-color);
img {
object-fit: cover;
@@ -7473,7 +8059,7 @@ noscript {
&__bar {
position: relative;
padding: 0 20px;
- border-bottom: 1px solid lighten($ui-base-color, 8%);
+ border-bottom: 1px solid var(--background-border-color);
.avatar {
display: block;
@@ -7481,8 +8067,8 @@ noscript {
width: 94px;
.account__avatar {
- background: darken($ui-base-color, 8%);
- border: 2px solid $ui-base-color;
+ background: var(--background-color);
+ border: 2px solid var(--background-border-color);
}
}
}
@@ -7517,10 +8103,7 @@ noscript {
.button {
flex-shrink: 1;
white-space: nowrap;
-
- @media screen and (max-width: $no-gap-breakpoint) {
- min-width: 0;
- }
+ min-width: 80px;
}
.icon-button {
@@ -7539,8 +8122,13 @@ noscript {
}
}
- @container account-header (max-width: 372px) {
- .optional {
+ .optional {
+ @container account-header (max-width: 372px) {
+ display: none;
+ }
+
+ // Fallback for older browsers with no container queries support
+ @media screen and (max-width: 372px + 55px) {
display: none;
}
}
@@ -7559,14 +8147,17 @@ noscript {
font-size: 17px;
line-height: 22px;
color: $primary-text-color;
- font-weight: 700;
+ font-weight: 600;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
small {
- display: block;
- font-size: 15px;
+ display: flex;
+ align-items: center;
+ gap: 4px;
+ font-size: 14px;
+ line-height: 20px;
color: $darker-text-color;
font-weight: 400;
overflow: hidden;
@@ -7577,10 +8168,8 @@ noscript {
}
.icon-lock {
- height: 16px;
- width: 16px;
- position: relative;
- top: 3px;
+ height: 18px;
+ width: 18px;
}
}
}
@@ -7600,13 +8189,12 @@ noscript {
margin: 0;
margin-top: 16px;
border-radius: 4px;
- background: darken($ui-base-color, 4%);
- border: 0;
+ border: 1px solid var(--background-border-color);
dl {
display: block;
padding: 11px 16px;
- border-bottom-color: lighten($ui-base-color, 4%);
+ border-bottom-color: var(--background-border-color);
}
dd,
@@ -7781,7 +8369,7 @@ noscript {
display: flex;
align-items: center;
padding: 15px;
- border-bottom: 1px solid lighten($ui-base-color, 8%);
+ border-bottom: 1px solid var(--background-border-color);
gap: 15px;
&:last-child {
@@ -7899,7 +8487,7 @@ noscript {
.conversation {
display: flex;
- border-bottom: 1px solid lighten($ui-base-color, 8%);
+ border-bottom: 1px solid var(--background-border-color);
padding: 5px;
padding-bottom: 0;
@@ -8254,7 +8842,7 @@ noscript {
.picture-in-picture-placeholder {
box-sizing: border-box;
- border: 2px dashed lighten($ui-base-color, 8%);
+ border: 2px dashed var(--background-border-color);
background: $base-shadow-color;
display: flex;
flex-direction: column;
@@ -8282,7 +8870,7 @@ noscript {
.notifications-permission-banner {
padding: 30px;
- border-bottom: 1px solid lighten($ui-base-color, 8%);
+ border-bottom: 1px solid var(--background-border-color);
display: flex;
flex-direction: column;
align-items: center;
@@ -8306,6 +8894,12 @@ noscript {
color: $darker-text-color;
margin-bottom: 15px;
text-align: center;
+
+ .icon {
+ width: 20px;
+ height: 20px;
+ vertical-align: middle;
+ }
}
}
@@ -8323,7 +8917,7 @@ noscript {
.search__input {
border: 1px solid lighten($ui-base-color, 8%);
padding: 10px;
- padding-inline-end: 28px;
+ padding-inline-end: 30px;
}
.search__popout {
@@ -8341,7 +8935,8 @@ noscript {
flex: 1 1 auto;
display: flex;
flex-direction: column;
- background: $ui-base-color;
+ border: 1px solid var(--background-border-color);
+ border-top: 0;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
}
@@ -8352,7 +8947,7 @@ noscript {
color: $primary-text-color;
text-decoration: none;
padding: 15px;
- border-bottom: 1px solid lighten($ui-base-color, 8%);
+ border-bottom: 1px solid var(--background-border-color);
gap: 15px;
&:last-child {
@@ -8534,22 +9129,37 @@ noscript {
}
}
+.safety-action-modal,
.interaction-modal {
- max-width: 90vw;
+ max-width: 100vw;
width: 600px;
- background: var(--modal-background-color);
- border: 1px solid var(--modal-border-color);
- border-radius: 8px;
+ overflow-y: auto;
+}
+
+.interaction-modal {
overflow: visible;
position: relative;
display: block;
- padding: 40px;
+ border-radius: 16px;
+ background: var(--modal-background-color);
+ backdrop-filter: var(--background-filter);
+ border: 1px solid var(--modal-border-color);
+ padding: 24px;
+
+ @media screen and (max-width: $no-gap-breakpoint) {
+ border-radius: 16px 16px 0 0;
+ border-bottom: 0;
+ padding-bottom: 32px;
+ }
h3 {
font-size: 22px;
line-height: 33px;
font-weight: 700;
- text-align: center;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ gap: 8px;
}
p {
@@ -8570,7 +9180,9 @@ noscript {
&__icon {
color: $highlight-text-color;
- margin: 0 5px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
&__lead {
@@ -8603,6 +9215,7 @@ noscript {
border: 0;
padding: 15px - 4px 15px - 6px;
flex: 1 1 auto;
+ min-width: 0;
&::placeholder {
color: lighten($darker-text-color, 4%);
@@ -8731,7 +9344,6 @@ noscript {
}
.privacy-policy {
- background: $ui-base-color;
padding: 20px;
@media screen and (min-width: $no-gap-breakpoint) {
@@ -9065,11 +9677,14 @@ noscript {
.link-footer {
flex: 0 0 auto;
- padding: 10px;
padding-top: 20px;
z-index: 1;
font-size: 13px;
+ .column & {
+ padding: 15px;
+ }
+
p {
color: $dark-text-color;
margin-bottom: 20px;
@@ -9097,6 +9712,7 @@ noscript {
.about {
padding: 20px;
+ border-top: 1px solid var(--background-border-color);
@media screen and (min-width: $no-gap-breakpoint) {
border-radius: 4px;
@@ -9143,7 +9759,7 @@ noscript {
}
&__meta {
- background: lighten($ui-base-color, 4%);
+ border: 1px solid var(--background-border-color);
border-radius: 4px;
display: flex;
margin-bottom: 30px;
@@ -9159,7 +9775,7 @@ noscript {
width: 0;
border: 0;
border-style: solid;
- border-color: lighten($ui-base-color, 8%);
+ border-color: var(--background-border-color);
border-left-width: 1px;
min-height: calc(100% - 60px);
flex: 0 0 auto;
@@ -9267,7 +9883,7 @@ noscript {
line-height: 22px;
padding: 20px;
border-radius: 4px;
- background: lighten($ui-base-color, 4%);
+ border: 1px solid var(--background-border-color);
color: $highlight-text-color;
cursor: pointer;
}
@@ -9277,7 +9893,7 @@ noscript {
}
&__body {
- border: 1px solid lighten($ui-base-color, 4%);
+ border: 1px solid var(--background-border-color);
border-top: 0;
padding: 20px;
font-size: 15px;
@@ -9287,18 +9903,17 @@ noscript {
&__domain-blocks {
margin-top: 30px;
- background: darken($ui-base-color, 4%);
- border: 1px solid lighten($ui-base-color, 4%);
+ border: 1px solid var(--background-border-color);
border-radius: 4px;
&__domain {
- border-bottom: 1px solid lighten($ui-base-color, 4%);
+ border-bottom: 1px solid var(--background-border-color);
padding: 10px;
font-size: 15px;
color: $darker-text-color;
&:nth-child(2n) {
- background: darken($ui-base-color, 2%);
+ background: darken($ui-base-color, 4%);
}
&:last-child {
@@ -9394,7 +10009,7 @@ noscript {
}
.hashtag-header {
- border-bottom: 1px solid lighten($ui-base-color, 8%);
+ border-bottom: 1px solid var(--background-border-color);
padding: 15px;
font-size: 17px;
line-height: 22px;
@@ -9427,18 +10042,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%);
}
}
@@ -9449,3 +10070,360 @@ noscript {
padding: 0;
}
}
+
+.inline-follow-suggestions {
+ display: flex;
+ flex-direction: column;
+ gap: 12px;
+ padding: 16px 0;
+ padding-bottom: 0;
+ border-bottom: 1px solid var(--background-border-color);
+ background: rgba($ui-highlight-color, 0.05);
+
+ &__header {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 0 16px;
+
+ h3 {
+ font-size: 15px;
+ line-height: 22px;
+ font-weight: 500;
+ }
+
+ &__actions {
+ display: flex;
+ align-items: center;
+ gap: 24px;
+ }
+
+ .link-button {
+ font-size: 13px;
+ font-weight: 500;
+ }
+ }
+
+ &__body {
+ position: relative;
+
+ &__scroll-button {
+ position: absolute;
+ height: 100%;
+ background: transparent;
+ border: none;
+ cursor: pointer;
+ top: 0;
+ color: $primary-text-color;
+ opacity: 0.5;
+
+ &.left {
+ left: 0;
+ }
+
+ &.right {
+ right: 0;
+ }
+
+ &__icon {
+ border-radius: 50%;
+ background: $ui-highlight-color;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ aspect-ratio: 1;
+ padding: 8px;
+
+ .icon {
+ width: 24px;
+ height: 24px;
+ }
+ }
+
+ &:hover,
+ &:focus,
+ &:active {
+ opacity: 1;
+
+ .inline-follow-suggestions__body__scroll-button__icon {
+ background: lighten($ui-highlight-color, 4%);
+ }
+ }
+ }
+
+ &__scrollable {
+ display: flex;
+ flex-wrap: nowrap;
+ gap: 16px;
+ padding: 16px;
+ scroll-snap-type: x mandatory;
+ scroll-padding: 16px;
+ scroll-behavior: smooth;
+ overflow-x: scroll;
+
+ &__card {
+ background: var(--background-color);
+ border: 1px solid var(--background-border-color);
+ border-radius: 4px;
+ display: flex;
+ flex-direction: column;
+ gap: 12px;
+ align-items: center;
+ padding: 12px;
+ scroll-snap-align: start;
+ flex: 0 0 auto;
+ width: 200px;
+ box-sizing: border-box;
+ position: relative;
+
+ a {
+ text-decoration: none;
+ }
+
+ & > .icon-button {
+ position: absolute;
+ inset-inline-end: 8px;
+ top: 8px;
+ opacity: 0.75;
+ }
+
+ &__avatar {
+ height: 48px;
+ display: flex;
+
+ a {
+ display: flex;
+ text-decoration: none;
+ }
+ }
+
+ .account__avatar {
+ flex-shrink: 0;
+ align-self: flex-end;
+ border: 1px solid var(--background-border-color);
+ background-color: $ui-base-color;
+ }
+
+ &__text-stack {
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
+ align-items: center;
+ max-width: 100%;
+
+ a {
+ max-width: 100%;
+ }
+
+ &__source {
+ display: inline-flex;
+ align-items: center;
+ color: $dark-text-color;
+ gap: 4px;
+ overflow: hidden;
+ white-space: nowrap;
+ cursor: help;
+
+ > span {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+
+ .icon {
+ width: 16px;
+ height: 16px;
+ }
+ }
+ }
+
+ .display-name {
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
+ align-items: center;
+
+ & > * {
+ max-width: 100%;
+ }
+
+ &__html {
+ font-size: 15px;
+ font-weight: 500;
+ color: $secondary-text-color;
+ }
+
+ &__account {
+ font-size: 14px;
+ color: $darker-text-color;
+ }
+ }
+
+ .verified-badge {
+ font-size: 14px;
+ max-width: 100%;
+ }
+
+ .button {
+ display: block;
+ width: 100%;
+ }
+ }
+ }
+ }
+}
+
+.filtered-notifications-banner {
+ display: flex;
+ align-items: center;
+ border: 1px solid var(--background-border-color);
+ border-top: 0;
+ padding: 24px 32px;
+ gap: 16px;
+ color: $darker-text-color;
+ text-decoration: none;
+
+ &:hover,
+ &:active,
+ &:focus {
+ color: $secondary-text-color;
+ }
+
+ .icon {
+ width: 24px;
+ height: 24px;
+ padding: 2px;
+ }
+
+ &__text {
+ flex: 1 1 auto;
+ font-style: 14px;
+ line-height: 20px;
+
+ strong {
+ font-size: 16px;
+ line-height: 24px;
+ display: block;
+ }
+ }
+
+ &__badge {
+ 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;
+ word-break: keep-all;
+
+ &__badge {
+ background: $ui-button-background-color;
+ color: $white;
+ border-radius: 100px;
+ padding: 2px 8px;
+ }
+ }
+}
+
+.notification-request {
+ display: flex;
+ align-items: center;
+ gap: 16px;
+ padding: 15px;
+ border-bottom: 1px solid var(--background-border-color);
+
+ &__link {
+ display: flex;
+ align-items: center;
+ gap: 12px;
+ flex: 1 1 auto;
+ text-decoration: none;
+ color: inherit;
+ overflow: hidden;
+
+ .account__avatar {
+ flex-shrink: 0;
+ }
+ }
+
+ &__name {
+ flex: 1 1 auto;
+ color: $darker-text-color;
+ font-style: 14px;
+ line-height: 20px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+
+ &__display-name {
+ display: flex;
+ align-items: center;
+ gap: 6px;
+ font-size: 16px;
+ letter-spacing: 0.5px;
+ line-height: 24px;
+ color: $secondary-text-color;
+ }
+
+ .filtered-notifications-banner__badge {
+ background: $ui-button-background-color;
+ border-radius: 4px;
+ padding: 1px 6px;
+ color: $white;
+ }
+ }
+
+ &__actions {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+
+ .icon-button {
+ border-radius: 4px;
+ border: 1px solid var(--background-border-color);
+ padding: 5px;
+ }
+ }
+}
+
+.more-from-author {
+ font-size: 14px;
+ color: $darker-text-color;
+ background: var(--surface-background-color);
+ border: 1px solid var(--background-border-color);
+ border-top: 0;
+ border-radius: 0 0 8px 8px;
+ padding: 15px;
+ display: flex;
+ align-items: center;
+ gap: 8px;
+
+ .logo {
+ height: 16px;
+ color: $darker-text-color;
+ }
+
+ & > span {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+ }
+
+ a {
+ display: inline-flex;
+ align-items: center;
+ gap: 4px;
+ font-weight: 500;
+ color: $primary-text-color;
+ text-decoration: none;
+
+ &:hover,
+ &:focus,
+ &:active {
+ color: $highlight-text-color;
+ }
+ }
+}
diff --git a/app/javascript/styles/mastodon/containers.scss b/app/javascript/styles/mastodon/containers.scss
index b6e995787d2d48..8a472d75b13cf6 100644
--- a/app/javascript/styles/mastodon/containers.scss
+++ b/app/javascript/styles/mastodon/containers.scss
@@ -40,13 +40,12 @@
.compose-form {
width: 400px;
margin: 0 auto;
- padding: 20px 0;
- margin-top: 40px;
+ padding: 10px 0;
+ padding-bottom: 20px;
box-sizing: border-box;
@media screen and (width <= 400px) {
width: 100%;
- margin-top: 0;
padding: 20px;
}
}
@@ -56,13 +55,15 @@
width: 400px;
margin: 0 auto;
display: flex;
- font-size: 13px;
- line-height: 18px;
+ align-items: center;
+ gap: 10px;
+ font-size: 14px;
+ line-height: 20px;
box-sizing: border-box;
padding: 20px 0;
margin-top: 40px;
margin-bottom: 10px;
- border-bottom: 1px solid $ui-base-color;
+ border-bottom: 1px solid lighten($ui-base-color, 8%);
@media screen and (width <= 440px) {
width: 100%;
@@ -71,9 +72,9 @@
}
.avatar {
- width: 40px;
- height: 40px;
- margin-inline-end: 10px;
+ width: 48px;
+ height: 48px;
+ flex: 0 0 auto;
img {
width: 100%;
@@ -87,13 +88,14 @@
.name {
flex: 1 1 auto;
color: $secondary-text-color;
- width: calc(100% - 90px);
.username {
display: block;
- font-weight: 500;
+ font-size: 16px;
+ line-height: 24px;
text-overflow: ellipsis;
overflow: hidden;
+ color: $primary-text-color;
}
}
@@ -101,7 +103,7 @@
display: block;
font-size: 32px;
line-height: 40px;
- margin-inline-start: 10px;
+ flex: 0 0 auto;
}
}
diff --git a/app/javascript/styles/mastodon/emoji_picker.scss b/app/javascript/styles/mastodon/emoji_picker.scss
index c7247c3a5723cb..b9fdaa58473438 100644
--- a/app/javascript/styles/mastodon/emoji_picker.scss
+++ b/app/javascript/styles/mastodon/emoji_picker.scss
@@ -1,7 +1,6 @@
.emoji-mart {
font-size: 13px;
display: inline-block;
- color: $inverted-text-color;
&,
* {
@@ -15,20 +14,8 @@
}
.emoji-mart-bar {
- border: 0 solid darken($ui-secondary-color, 8%);
-
&:first-child {
- border-bottom-width: 1px;
- border-top-left-radius: 5px;
- border-top-right-radius: 5px;
- background: $ui-secondary-color;
- }
-
- &:last-child {
- border-top-width: 1px;
- border-bottom-left-radius: 5px;
- border-bottom-right-radius: 5px;
- display: none;
+ background: var(--dropdown-border-color);
}
}
@@ -36,7 +23,6 @@
display: flex;
justify-content: space-between;
padding: 0 6px;
- color: $lighter-text-color;
line-height: 0;
}
@@ -50,9 +36,10 @@
cursor: pointer;
background: transparent;
border: 0;
+ color: $darker-text-color;
&:hover {
- color: darken($lighter-text-color, 4%);
+ color: lighten($darker-text-color, 4%);
}
}
@@ -60,7 +47,7 @@
color: $highlight-text-color;
&:hover {
- color: darken($highlight-text-color, 4%);
+ color: lighten($highlight-text-color, 4%);
}
.emoji-mart-anchor-bar {
@@ -95,7 +82,6 @@
height: 270px;
max-height: 35vh;
padding: 0 6px 6px;
- background: $simple-background-color;
will-change: transform;
&::-webkit-scrollbar-track:hover,
@@ -107,7 +93,6 @@
.emoji-mart-search {
padding: 10px;
padding-inline-end: 45px;
- background: $simple-background-color;
position: relative;
input {
@@ -118,19 +103,20 @@
font-family: inherit;
display: block;
width: 100%;
- background: rgba($ui-secondary-color, 0.3);
- color: $inverted-text-color;
- border: 1px solid $ui-secondary-color;
+ background: $ui-base-color;
+ color: $darker-text-color;
+ border: 1px solid lighten($ui-base-color, 8%);
border-radius: 4px;
&::-moz-focus-inner {
border: 0;
}
- &::-moz-focus-inner,
- &:focus,
- &:active {
- outline: 0 !important;
+ &:active,
+ &:focus {
+ outline: none !important;
+ border-width: 1px !important;
+ border-color: $ui-button-background-color;
}
&::-webkit-search-cancel-button {
@@ -155,11 +141,10 @@
&:disabled {
cursor: default;
pointer-events: none;
- opacity: 0.3;
}
svg {
- fill: $action-button-color;
+ fill: $darker-text-color;
}
}
@@ -180,7 +165,7 @@
inset-inline-start: 0;
width: 100%;
height: 100%;
- background-color: rgba($ui-secondary-color, 0.7);
+ background-color: var(--dropdown-border-color);
border-radius: 100%;
}
}
@@ -197,7 +182,6 @@
width: 100%;
font-weight: 500;
padding: 5px 6px;
- background: $simple-background-color;
}
}
@@ -241,7 +225,7 @@
.emoji-mart-no-results {
font-size: 14px;
- color: $light-text-color;
+ color: $dark-text-color;
text-align: center;
padding: 5px 6px;
padding-top: 70px;
diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss
index 555d43cc1c4466..f6ec44fb5380fa 100644
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -1078,6 +1078,7 @@ code {
&__type {
color: $darker-text-color;
+ word-break: break-word;
}
}
@@ -1312,6 +1313,12 @@ code {
font-weight: 600;
}
+ .hint {
+ display: block;
+ font-size: 14px;
+ color: $darker-text-color;
+ }
+
.recommended {
position: absolute;
margin: 0 4px;
diff --git a/app/javascript/styles/mastodon/modal.scss b/app/javascript/styles/mastodon/modal.scss
index 0b7220b21d1115..60e7d622458e20 100644
--- a/app/javascript/styles/mastodon/modal.scss
+++ b/app/javascript/styles/mastodon/modal.scss
@@ -1,5 +1,5 @@
.modal-layout {
- background: $ui-base-color
+ background: darken($ui-base-color, 4%)
url('data:image/svg+xml;utf8,')
repeat-x bottom fixed;
display: flex;
diff --git a/app/javascript/styles/mastodon/polls.scss b/app/javascript/styles/mastodon/polls.scss
index 8a26e611ca8a2d..939fca3364af8c 100644
--- a/app/javascript/styles/mastodon/polls.scss
+++ b/app/javascript/styles/mastodon/polls.scss
@@ -52,6 +52,8 @@
&__option {
position: relative;
display: flex;
+ align-items: flex-start;
+ gap: 8px;
padding: 6px 0;
line-height: 18px;
cursor: default;
@@ -78,16 +80,22 @@
box-sizing: border-box;
width: 100%;
font-size: 14px;
- color: $inverted-text-color;
+ color: $secondary-text-color;
outline: 0;
font-family: inherit;
- background: $simple-background-color;
- border: 1px solid darken($simple-background-color, 14%);
+ background: $ui-base-color;
+ border: 1px solid $darker-text-color;
border-radius: 4px;
- padding: 6px 10px;
+ padding: 8px 12px;
&:focus {
- border-color: $highlight-text-color;
+ border-color: $ui-highlight-color;
+ }
+
+ @media screen and (width <= 600px) {
+ font-size: 16px;
+ line-height: 24px;
+ letter-spacing: 0.5px;
}
}
@@ -96,26 +104,20 @@
}
&.editable {
- display: flex;
align-items: center;
overflow: visible;
}
}
&__input {
- display: inline-block;
+ display: block;
position: relative;
border: 1px solid $ui-primary-color;
box-sizing: border-box;
- width: 18px;
- height: 18px;
- margin-inline-end: 10px;
- top: -1px;
+ width: 17px;
+ height: 17px;
border-radius: 50%;
- vertical-align: middle;
- margin-top: auto;
- margin-bottom: auto;
- flex: 0 0 18px;
+ flex: 0 0 auto;
&.checkbox {
border-radius: 4px;
@@ -159,6 +161,15 @@
}
}
+ &__option.editable &__input {
+ &:active,
+ &:focus,
+ &:hover {
+ border-color: $ui-primary-color;
+ border-width: 1px;
+ }
+ }
+
&__number {
display: inline-block;
width: 45px;
@@ -209,90 +220,6 @@
}
}
-.compose-form__poll-wrapper {
- border-top: 1px solid darken($simple-background-color, 8%);
-
- ul {
- padding: 10px;
- }
-
- .poll__input {
- &:active,
- &:focus,
- &:hover {
- border-color: $ui-button-focus-background-color;
- }
- }
-
- .poll__footer {
- border-top: 1px solid darken($simple-background-color, 8%);
- padding: 10px;
- display: flex;
- align-items: center;
-
- button,
- select {
- flex: 1 1 50%;
-
- &:focus {
- border-color: $highlight-text-color;
- }
- }
- }
-
- .button.button-secondary {
- font-size: 14px;
- font-weight: 400;
- padding: 6px 10px;
- height: auto;
- line-height: inherit;
- color: $action-button-color;
- border-color: $action-button-color;
- margin-inline-end: 5px;
-
- &:hover,
- &:focus,
- &.active {
- border-color: $action-button-color;
- background-color: $action-button-color;
- color: $ui-button-color;
- }
- }
-
- li {
- display: flex;
- align-items: center;
-
- .poll__option {
- flex: 0 0 auto;
- width: calc(100% - (23px + 6px));
- margin-inline-end: 6px;
- }
- }
-
- select {
- appearance: none;
- box-sizing: border-box;
- font-size: 14px;
- color: $inverted-text-color;
- display: inline-block;
- width: auto;
- outline: 0;
- font-family: inherit;
- background: $simple-background-color
- url("data:image/svg+xml;utf8,")
- no-repeat right 8px center / auto 16px;
- border: 1px solid darken($simple-background-color, 14%);
- border-radius: 4px;
- padding: 6px 10px;
- padding-inline-end: 30px;
- }
-
- .icon-button.disabled {
- color: darken($simple-background-color, 14%);
- }
-}
-
.muted .poll {
color: $dark-text-color;
diff --git a/app/javascript/styles/mastodon/rich_text.scss b/app/javascript/styles/mastodon/rich_text.scss
index c77c23bc4038f4..c57db26e036c32 100644
--- a/app/javascript/styles/mastodon/rich_text.scss
+++ b/app/javascript/styles/mastodon/rich_text.scss
@@ -1,5 +1,6 @@
.status__content__text,
.e-content,
+.edit-indicator__content,
.reply-indicator__content {
pre,
blockquote {
@@ -55,10 +56,3 @@
list-style-type: decimal;
}
}
-
-.reply-indicator__content {
- blockquote {
- border-left-color: $inverted-text-color;
- color: $inverted-text-color;
- }
-}
diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss
index 611c8bb5d18abe..58b9dd9b61b101 100644
--- a/app/javascript/styles/mastodon/variables.scss
+++ b/app/javascript/styles/mastodon/variables.scss
@@ -46,10 +46,10 @@ $ui-button-focus-background-color: $blurple-600 !default;
$ui-button-focus-outline-color: $blurple-400 !default;
$ui-button-focus-outline: solid 2px $ui-button-focus-outline-color !default;
-$ui-button-secondary-color: $grey-100 !default;
-$ui-button-secondary-border-color: $grey-100 !default;
-$ui-button-secondary-focus-background-color: $grey-600 !default;
-$ui-button-secondary-focus-color: $white !default;
+$ui-button-secondary-color: $blurple-500 !default;
+$ui-button-secondary-border-color: $blurple-500 !default;
+$ui-button-secondary-focus-border-color: $blurple-300 !default;
+$ui-button-secondary-focus-color: $blurple-300 !default;
$ui-button-tertiary-color: $blurple-300 !default;
$ui-button-tertiary-border-color: $blurple-300 !default;
@@ -94,10 +94,16 @@ $font-display: 'mastodon-font-display' !default;
$font-monospace: 'mastodon-font-monospace' !default;
:root {
- --dropdown-border-color: #{lighten($ui-base-color, 12%)};
- --dropdown-background-color: #{lighten($ui-base-color, 4%)};
+ --dropdown-border-color: #{lighten($ui-base-color, 4%)};
+ --dropdown-background-color: #{rgba(darken($ui-base-color, 8%), 0.9)};
--dropdown-shadow: 0 20px 25px -5px #{rgba($base-shadow-color, 0.25)},
0 8px 10px -6px #{rgba($base-shadow-color, 0.25)};
- --modal-background-color: #{darken($ui-base-color, 4%)};
+ --modal-background-color: #{rgba(darken($ui-base-color, 8%), 0.7)};
+ --modal-background-variant-color: #{rgba($ui-base-color, 0.7)};
--modal-border-color: #{lighten($ui-base-color, 4%)};
+ --background-border-color: #{lighten($ui-base-color, 4%)};
+ --background-filter: blur(10px) saturate(180%) contrast(75%) brightness(70%);
+ --background-color: #{darken($ui-base-color, 8%)};
+ --background-color-tint: #{rgba(darken($ui-base-color, 8%), 0.9)};
+ --surface-background-color: #{darken($ui-base-color, 4%)};
}
diff --git a/app/lib/access_token_extension.rb b/app/lib/access_token_extension.rb
index f51bde492736ef..4e9585dd1e6583 100644
--- a/app/lib/access_token_extension.rb
+++ b/app/lib/access_token_extension.rb
@@ -6,6 +6,8 @@ module AccessTokenExtension
included do
include Redisable
+ has_many :web_push_subscriptions, class_name: 'Web::PushSubscription', inverse_of: :access_token
+
after_commit :push_to_streaming_api
end
diff --git a/app/lib/account_statuses_filter.rb b/app/lib/account_statuses_filter.rb
index 2744ad414353f8..e5c2409148c71c 100644
--- a/app/lib/account_statuses_filter.rb
+++ b/app/lib/account_statuses_filter.rb
@@ -35,7 +35,7 @@ def initial_scope
return Status.none if account.unavailable?
if anonymous?
- account.statuses.not_local_only.where(visibility: %i(public unlisted))
+ account.statuses.not_local_only.distributable_visibility
elsif author?
account.statuses.all # NOTE: #merge! does not work without the #all
elsif blocked?
diff --git a/app/lib/activity_tracker.rb b/app/lib/activity_tracker.rb
index 9160ef22a69229..d0e675f07d2cda 100644
--- a/app/lib/activity_tracker.rb
+++ b/app/lib/activity_tracker.rb
@@ -24,7 +24,7 @@ def add(value = 1, at_time = Time.now.utc)
end
def get(start_at, end_at = Time.now.utc)
- (start_at.to_date...end_at.to_date).map do |date|
+ (start_at.to_date..end_at.to_date).map do |date|
key = key_at(date.to_time(:utc))
value = case @type
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 22b2becea74442..fbba95157d0939 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -110,7 +110,7 @@ def find_existing_status
def process_status_params
@status_parser = ActivityPub::Parser::StatusParser.new(@json, followers_collection: @account.followers_url, object: @object)
- attachment_ids = process_attachments.take(4).map(&:id)
+ attachment_ids = process_attachments.take(Status::MEDIA_ATTACHMENTS_LIMIT).map(&:id)
@params = {
uri: @status_parser.uri,
@@ -260,7 +260,7 @@ def process_attachments
as_array(@object['attachment']).each do |attachment|
media_attachment_parser = ActivityPub::Parser::MediaAttachmentParser.new(attachment)
- next if media_attachment_parser.remote_url.blank? || media_attachments.size >= 4
+ next if media_attachment_parser.remote_url.blank? || media_attachments.size >= Status::MEDIA_ATTACHMENTS_LIMIT
begin
media_attachment = MediaAttachment.create(
diff --git a/app/lib/activitypub/parser/status_parser.rb b/app/lib/activitypub/parser/status_parser.rb
index ea9b8a473cf890..025c46449d533b 100644
--- a/app/lib/activitypub/parser/status_parser.rb
+++ b/app/lib/activitypub/parser/status_parser.rb
@@ -3,6 +3,8 @@
class ActivityPub::Parser::StatusParser
include JsonLdHelper
+ NORMALIZED_LOCALE_NAMES = LanguagesHelper::SUPPORTED_LOCALES.keys.index_by(&:downcase).freeze
+
# @param [Hash] json
# @param [Hash] options
# @option options [String] :followers_collection
@@ -89,6 +91,13 @@ def visibility
end
def language
+ lang = raw_language_code
+ lang.presence && NORMALIZED_LOCALE_NAMES.fetch(lang.downcase.to_sym, lang)
+ end
+
+ private
+
+ def raw_language_code
if content_language_map?
@object['contentMap'].keys.first
elsif name_language_map?
@@ -102,8 +111,6 @@ def direct_message
@object['directMessage']
end
- private
-
def audience_to
as_array(@object['to'] || @json['to']).map { |x| value_or_id(x) }
end
diff --git a/app/lib/activitypub/serializer.rb b/app/lib/activitypub/serializer.rb
index 1fdc7931041bcf..b17ec3fdfba2b9 100644
--- a/app/lib/activitypub/serializer.rb
+++ b/app/lib/activitypub/serializer.rb
@@ -33,6 +33,6 @@ def serializable_hash(adapter_options = nil, options = {}, adapter_instance = se
adapter_options[:named_contexts].merge!(_named_contexts)
adapter_options[:context_extensions].merge!(_context_extensions)
end
- super(adapter_options, options, adapter_instance)
+ super
end
end
diff --git a/app/lib/admin/metrics/dimension.rb b/app/lib/admin/metrics/dimension.rb
index e0122a65b5eee7..824cb6d7c1c6e4 100644
--- a/app/lib/admin/metrics/dimension.rb
+++ b/app/lib/admin/metrics/dimension.rb
@@ -2,15 +2,15 @@
class Admin::Metrics::Dimension
DIMENSIONS = {
- languages: Admin::Metrics::Dimension::LanguagesDimension,
- sources: Admin::Metrics::Dimension::SourcesDimension,
- servers: Admin::Metrics::Dimension::ServersDimension,
- space_usage: Admin::Metrics::Dimension::SpaceUsageDimension,
- software_versions: Admin::Metrics::Dimension::SoftwareVersionsDimension,
- tag_servers: Admin::Metrics::Dimension::TagServersDimension,
- tag_languages: Admin::Metrics::Dimension::TagLanguagesDimension,
- instance_accounts: Admin::Metrics::Dimension::InstanceAccountsDimension,
- instance_languages: Admin::Metrics::Dimension::InstanceLanguagesDimension,
+ languages: LanguagesDimension,
+ sources: SourcesDimension,
+ servers: ServersDimension,
+ space_usage: SpaceUsageDimension,
+ software_versions: SoftwareVersionsDimension,
+ tag_servers: TagServersDimension,
+ tag_languages: TagLanguagesDimension,
+ instance_accounts: InstanceAccountsDimension,
+ instance_languages: InstanceLanguagesDimension,
}.freeze
def self.retrieve(dimension_keys, start_at, end_at, limit, params)
diff --git a/app/lib/admin/metrics/dimension/instance_languages_dimension.rb b/app/lib/admin/metrics/dimension/instance_languages_dimension.rb
index b478213808e842..661e6d93b751ca 100644
--- a/app/lib/admin/metrics/dimension/instance_languages_dimension.rb
+++ b/app/lib/admin/metrics/dimension/instance_languages_dimension.rb
@@ -37,11 +37,11 @@ def sql_query_string
end
def earliest_status_id
- Mastodon::Snowflake.id_at(@start_at, with_random: false)
+ Mastodon::Snowflake.id_at(@start_at.beginning_of_day, with_random: false)
end
def latest_status_id
- Mastodon::Snowflake.id_at(@end_at, with_random: false)
+ Mastodon::Snowflake.id_at(@end_at.end_of_day, with_random: false)
end
def params
diff --git a/app/lib/admin/metrics/dimension/servers_dimension.rb b/app/lib/admin/metrics/dimension/servers_dimension.rb
index 42aba8e2132480..2c8406d52fd614 100644
--- a/app/lib/admin/metrics/dimension/servers_dimension.rb
+++ b/app/lib/admin/metrics/dimension/servers_dimension.rb
@@ -30,10 +30,10 @@ def sql_query_string
end
def earliest_status_id
- Mastodon::Snowflake.id_at(@start_at)
+ Mastodon::Snowflake.id_at(@start_at.beginning_of_day, with_random: false)
end
def latest_status_id
- Mastodon::Snowflake.id_at(@end_at)
+ Mastodon::Snowflake.id_at(@end_at.end_of_day, with_random: false)
end
end
diff --git a/app/lib/admin/metrics/dimension/software_versions_dimension.rb b/app/lib/admin/metrics/dimension/software_versions_dimension.rb
index ccf556eae0864a..97cdaf589e8c5e 100644
--- a/app/lib/admin/metrics/dimension/software_versions_dimension.rb
+++ b/app/lib/admin/metrics/dimension/software_versions_dimension.rb
@@ -25,14 +25,11 @@ def mastodon_version
end
def ruby_version
- yjit = defined?(RubyVM::YJIT) && RubyVM::YJIT.enabled?
- value = "#{RUBY_VERSION}p#{RUBY_PATCHLEVEL}#{yjit ? ' +YJIT' : ''}"
-
{
key: 'ruby',
human_key: 'Ruby',
- value: value,
- human_value: value,
+ value: "#{RUBY_VERSION}p#{RUBY_PATCHLEVEL}",
+ human_value: RUBY_DESCRIPTION,
}
end
diff --git a/app/lib/admin/metrics/dimension/tag_languages_dimension.rb b/app/lib/admin/metrics/dimension/tag_languages_dimension.rb
index cd077ff863d697..6e283d2c655797 100644
--- a/app/lib/admin/metrics/dimension/tag_languages_dimension.rb
+++ b/app/lib/admin/metrics/dimension/tag_languages_dimension.rb
@@ -40,11 +40,11 @@ def tag_id
end
def earliest_status_id
- Mastodon::Snowflake.id_at(@start_at, with_random: false)
+ Mastodon::Snowflake.id_at(@start_at.beginning_of_day, with_random: false)
end
def latest_status_id
- Mastodon::Snowflake.id_at(@end_at, with_random: false)
+ Mastodon::Snowflake.id_at(@end_at.end_of_day, with_random: false)
end
def params
diff --git a/app/lib/admin/metrics/dimension/tag_servers_dimension.rb b/app/lib/admin/metrics/dimension/tag_servers_dimension.rb
index fc5e49a966a867..db820e965c5b3d 100644
--- a/app/lib/admin/metrics/dimension/tag_servers_dimension.rb
+++ b/app/lib/admin/metrics/dimension/tag_servers_dimension.rb
@@ -40,11 +40,11 @@ def tag_id
end
def earliest_status_id
- Mastodon::Snowflake.id_at(@start_at, with_random: false)
+ Mastodon::Snowflake.id_at(@start_at.beginning_of_day, with_random: false)
end
def latest_status_id
- Mastodon::Snowflake.id_at(@end_at, with_random: false)
+ Mastodon::Snowflake.id_at(@end_at.end_of_day, with_random: false)
end
def params
diff --git a/app/lib/admin/metrics/measure.rb b/app/lib/admin/metrics/measure.rb
index fe7e04929041c8..d23162dfabfdbd 100644
--- a/app/lib/admin/metrics/measure.rb
+++ b/app/lib/admin/metrics/measure.rb
@@ -2,20 +2,20 @@
class Admin::Metrics::Measure
MEASURES = {
- active_users: Admin::Metrics::Measure::ActiveUsersMeasure,
- new_users: Admin::Metrics::Measure::NewUsersMeasure,
- interactions: Admin::Metrics::Measure::InteractionsMeasure,
- opened_reports: Admin::Metrics::Measure::OpenedReportsMeasure,
- resolved_reports: Admin::Metrics::Measure::ResolvedReportsMeasure,
- tag_accounts: Admin::Metrics::Measure::TagAccountsMeasure,
- tag_uses: Admin::Metrics::Measure::TagUsesMeasure,
- tag_servers: Admin::Metrics::Measure::TagServersMeasure,
- instance_accounts: Admin::Metrics::Measure::InstanceAccountsMeasure,
- instance_media_attachments: Admin::Metrics::Measure::InstanceMediaAttachmentsMeasure,
- instance_reports: Admin::Metrics::Measure::InstanceReportsMeasure,
- instance_statuses: Admin::Metrics::Measure::InstanceStatusesMeasure,
- instance_follows: Admin::Metrics::Measure::InstanceFollowsMeasure,
- instance_followers: Admin::Metrics::Measure::InstanceFollowersMeasure,
+ active_users: ActiveUsersMeasure,
+ new_users: NewUsersMeasure,
+ interactions: InteractionsMeasure,
+ opened_reports: OpenedReportsMeasure,
+ resolved_reports: ResolvedReportsMeasure,
+ tag_accounts: TagAccountsMeasure,
+ tag_uses: TagUsesMeasure,
+ tag_servers: TagServersMeasure,
+ instance_accounts: InstanceAccountsMeasure,
+ instance_media_attachments: InstanceMediaAttachmentsMeasure,
+ instance_reports: InstanceReportsMeasure,
+ instance_statuses: InstanceStatusesMeasure,
+ instance_follows: InstanceFollowsMeasure,
+ instance_followers: InstanceFollowersMeasure,
}.freeze
def self.retrieve(measure_keys, start_at, end_at, params)
diff --git a/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb b/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
index 2d4b5f56b01e91..1d2dbbe4146a86 100644
--- a/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
+++ b/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
@@ -50,7 +50,7 @@ def sql_query_string
WHERE date_trunc('day', media_attachments.created_at)::date = axis.period
AND #{account_domain_sql(params[:include_subdomains])}
)
- SELECT SUM(size) FROM new_media_attachments
+ SELECT COALESCE(SUM(size), 0) FROM new_media_attachments
) AS value
FROM (
SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period
diff --git a/app/lib/admin/metrics/measure/instance_statuses_measure.rb b/app/lib/admin/metrics/measure/instance_statuses_measure.rb
index 8c71c6614545d5..b918a30a57cc09 100644
--- a/app/lib/admin/metrics/measure/instance_statuses_measure.rb
+++ b/app/lib/admin/metrics/measure/instance_statuses_measure.rb
@@ -51,11 +51,11 @@ def sql_query_string
end
def earliest_status_id
- Mastodon::Snowflake.id_at(@start_at, with_random: false)
+ Mastodon::Snowflake.id_at(@start_at.beginning_of_day, with_random: false)
end
def latest_status_id
- Mastodon::Snowflake.id_at(@end_at, with_random: false)
+ Mastodon::Snowflake.id_at(@end_at.end_of_day, with_random: false)
end
def time_period
diff --git a/app/lib/admin/metrics/measure/tag_servers_measure.rb b/app/lib/admin/metrics/measure/tag_servers_measure.rb
index e6378b8021c6e7..f273d739d04aaa 100644
--- a/app/lib/admin/metrics/measure/tag_servers_measure.rb
+++ b/app/lib/admin/metrics/measure/tag_servers_measure.rb
@@ -28,26 +28,29 @@ def sql_array
def sql_query_string
<<~SQL.squish
SELECT axis.*, (
- SELECT count(distinct accounts.domain) AS value
- FROM statuses
- INNER JOIN statuses_tags ON statuses.id = statuses_tags.status_id
- INNER JOIN accounts ON statuses.account_id = accounts.id
- WHERE statuses_tags.tag_id = :tag_id
- AND statuses.id BETWEEN :earliest_status_id AND :latest_status_id
- AND date_trunc('day', statuses.created_at)::date = axis.day
- )
+ WITH tag_servers AS (
+ SELECT DISTINCT accounts.domain
+ FROM statuses
+ INNER JOIN statuses_tags ON statuses.id = statuses_tags.status_id
+ INNER JOIN accounts ON statuses.account_id = accounts.id
+ WHERE statuses_tags.tag_id = :tag_id
+ AND statuses.id BETWEEN :earliest_status_id AND :latest_status_id
+ AND date_trunc('day', statuses.created_at)::date = axis.period
+ )
+ SELECT COUNT(*) FROM tag_servers
+ ) AS value
FROM (
- SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, ('1 day')::interval) AS day
+ SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period
) as axis
SQL
end
def earliest_status_id
- Mastodon::Snowflake.id_at(@start_at, with_random: false)
+ Mastodon::Snowflake.id_at(@start_at.beginning_of_day, with_random: false)
end
def latest_status_id
- Mastodon::Snowflake.id_at(@end_at, with_random: false)
+ Mastodon::Snowflake.id_at(@end_at.end_of_day, with_random: false)
end
def tag
diff --git a/app/lib/advanced_text_formatter.rb b/app/lib/advanced_text_formatter.rb
index 555ea82321748f..9328eb9b5e189b 100644
--- a/app/lib/advanced_text_formatter.rb
+++ b/app/lib/advanced_text_formatter.rb
@@ -31,7 +31,7 @@ def autolink(link, link_type)
# @option options [String] :content_type
def initialize(text, options = {})
@content_type = options.delete(:content_type)
- super(text, options)
+ super
@text = format_markdown(text) if content_type == 'text/markdown'
end
diff --git a/app/lib/annual_report/top_statuses.rb b/app/lib/annual_report/top_statuses.rb
index 112e5591ce2170..1ab1709523b7de 100644
--- a/app/lib/annual_report/top_statuses.rb
+++ b/app/lib/annual_report/top_statuses.rb
@@ -16,6 +16,6 @@ def generate
end
def base_scope
- @account.statuses.with_public_visibility.joins(:status_stat).where(id: year_as_snowflake_range).reorder(nil)
+ @account.statuses.public_visibility.joins(:status_stat).where(id: year_as_snowflake_range).reorder(nil)
end
end
diff --git a/app/lib/application_extension.rb b/app/lib/application_extension.rb
index 400c51a023d09b..2fea1057cb6db3 100644
--- a/app/lib/application_extension.rb
+++ b/app/lib/application_extension.rb
@@ -23,6 +23,12 @@ def confirmation_redirect_uri
redirect_uri.lines.first.strip
end
+ def redirect_uris
+ # Doorkeeper stores the redirect_uri value as a newline delimeted list in
+ # the database:
+ redirect_uri.split
+ end
+
def push_to_streaming_api
# TODO: #28793 Combine into a single topic
payload = Oj.dump(event: :kill)
diff --git a/app/lib/connection_pool/shared_connection_pool.rb b/app/lib/connection_pool/shared_connection_pool.rb
index 3ca22d0eff345d..1cfcc5823b2df0 100644
--- a/app/lib/connection_pool/shared_connection_pool.rb
+++ b/app/lib/connection_pool/shared_connection_pool.rb
@@ -5,7 +5,7 @@
class ConnectionPool::SharedConnectionPool < ConnectionPool
def initialize(options = {}, &block)
- super(options, &block)
+ super
@available = ConnectionPool::SharedTimedStack.new(@size, &block)
end
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index df9222e66fd5f2..56e561ec8345f4 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -18,7 +18,7 @@ class FeedManager
# @yield [Account]
# @return [void]
def with_active_accounts(&block)
- Account.joins(:user).where('users.current_sign_in_at > ?', User::ACTIVE_DURATION.ago).find_each(&block)
+ Account.joins(:user).merge(User.signed_in_recently).find_each(&block)
end
# Redis key of a feed
@@ -134,7 +134,7 @@ def unpush_from_direct(account, status, update: false)
def merge_into_home(from_account, into_account)
timeline_key = key(:home, into_account.id)
aggregate = into_account.user&.aggregates_reblogs?
- query = from_account.statuses.where(visibility: [:public, :unlisted, :private]).includes(:preloadable_poll, :media_attachments, reblog: :account).limit(FeedManager::MAX_ITEMS / 4)
+ query = from_account.statuses.list_eligible_visibility.includes(:preloadable_poll, :media_attachments, reblog: :account).limit(FeedManager::MAX_ITEMS / 4)
if redis.zcard(timeline_key) >= FeedManager::MAX_ITEMS / 4
oldest_home_score = redis.zrange(timeline_key, 0, 0, with_scores: true).first.last.to_i
@@ -160,7 +160,7 @@ def merge_into_home(from_account, into_account)
def merge_into_list(from_account, list)
timeline_key = key(:list, list.id)
aggregate = list.account.user&.aggregates_reblogs?
- query = from_account.statuses.where(visibility: [:public, :unlisted, :private]).includes(:preloadable_poll, :media_attachments, reblog: :account).limit(FeedManager::MAX_ITEMS / 4)
+ query = from_account.statuses.list_eligible_visibility.includes(:preloadable_poll, :media_attachments, reblog: :account).limit(FeedManager::MAX_ITEMS / 4)
if redis.zcard(timeline_key) >= FeedManager::MAX_ITEMS / 4
oldest_home_score = redis.zrange(timeline_key, 0, 0, with_scores: true).first.last.to_i
@@ -299,7 +299,7 @@ def populate_home(account)
next if last_status_score < oldest_home_score
end
- statuses = target_account.statuses.where(visibility: [:public, :unlisted, :private]).includes(:preloadable_poll, :media_attachments, :account, reblog: :account).limit(limit)
+ statuses = target_account.statuses.list_eligible_visibility.includes(:preloadable_poll, :media_attachments, :account, reblog: :account).limit(limit)
crutches = build_crutches(account.id, statuses)
statuses.each do |status|
@@ -491,10 +491,10 @@ def filter_from_direct?(status, receiver_id)
# @param [List] list
# @return [Boolean]
def filter_from_list?(status, list)
- if status.reply? && status.in_reply_to_account_id != status.account_id
- should_filter = status.in_reply_to_account_id != list.account_id
- should_filter &&= !list.show_followed?
- should_filter &&= !(list.show_list? && ListAccount.exists?(list_id: list.id, account_id: status.in_reply_to_account_id))
+ if status.reply? && status.in_reply_to_account_id != status.account_id # Status is a reply to account other than status account
+ should_filter = status.in_reply_to_account_id != list.account_id # Status replies to account id other than list account
+ should_filter &&= !list.show_followed? # List show_followed? is false
+ should_filter &&= !(list.show_list? && ListAccount.exists?(list_id: list.id, account_id: status.in_reply_to_account_id)) # If show_list? true, check for a ListAccount with list and reply to account
return !!should_filter
end
@@ -509,7 +509,11 @@ def filter_from_list?(status, list)
# @param [Hash] crutches
# @return [Boolean]
def filter_from_tags?(status, receiver_id, crutches)
- receiver_id == status.account_id || ((crutches[:active_mentions][status.id] || []) + [status.account_id]).any? { |target_account_id| crutches[:blocking][target_account_id] || crutches[:muting][target_account_id] } || crutches[:blocked_by][status.account_id] || crutches[:domain_blocking][status.account.domain]
+ receiver_id == status.account_id || # Receiver is status account?
+ ((crutches[:active_mentions][status.id] || []) + [status.account_id]) # For mentioned accounts or status account:
+ .any? { |target_account_id| crutches[:blocking][target_account_id] || crutches[:muting][target_account_id] } || # - Target account is muted or blocked?
+ crutches[:blocked_by][status.account_id] || # Blocked by status account?
+ crutches[:domain_blocking][status.account.domain] # Blocking domain of status account?
end
# Adds a status to an account's feed, returning true if a status was
diff --git a/app/lib/link_details_extractor.rb b/app/lib/link_details_extractor.rb
index bb031986d68186..2e49d3fb4f514f 100644
--- a/app/lib/link_details_extractor.rb
+++ b/app/lib/link_details_extractor.rb
@@ -156,7 +156,7 @@ def height
end
def title
- html_entities.decode(structured_data&.headline || opengraph_tag('og:title') || document.xpath('//title').map(&:content).first)
+ html_entities.decode(structured_data&.headline || opengraph_tag('og:title') || document.xpath('//title').map(&:content).first).strip
end
def description
@@ -195,6 +195,10 @@ def author_url
structured_data&.author_url
end
+ def author_account
+ opengraph_tag('fediverse:creator')
+ end
+
def embed_url
valid_url_or_nil(opengraph_tag('twitter:player:stream'))
end
@@ -282,6 +286,6 @@ def detector
end
def html_entities
- @html_entities ||= HTMLEntities.new
+ @html_entities ||= HTMLEntities.new(:expanded)
end
end
diff --git a/app/lib/rss/channel.rb b/app/lib/rss/channel.rb
index 9013ed066a1395..518ea714052e30 100644
--- a/app/lib/rss/channel.rb
+++ b/app/lib/rss/channel.rb
@@ -2,7 +2,7 @@
class RSS::Channel < RSS::Element
def initialize
- super()
+ super
@root = create_element('channel')
end
diff --git a/app/lib/rss/item.rb b/app/lib/rss/item.rb
index 6739a2c184d555..8be8d4bf35f22c 100644
--- a/app/lib/rss/item.rb
+++ b/app/lib/rss/item.rb
@@ -2,7 +2,7 @@
class RSS::Item < RSS::Element
def initialize
- super()
+ super
@root = create_element('item')
end
diff --git a/app/lib/signature_parser.rb b/app/lib/signature_parser.rb
new file mode 100644
index 00000000000000..7a75080d987ef4
--- /dev/null
+++ b/app/lib/signature_parser.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class SignatureParser
+ class ParsingError < StandardError; end
+
+ # The syntax of this header is defined in:
+ # https://datatracker.ietf.org/doc/html/draft-cavage-http-signatures-12#section-4
+ # See https://datatracker.ietf.org/doc/html/rfc7235#appendix-C
+ # and https://datatracker.ietf.org/doc/html/rfc7230#section-3.2.6
+
+ # In addition, ignore a `Signature ` string prefix that was added by old versions
+ # of `node-http-signatures`
+
+ TOKEN_RE = /[0-9a-zA-Z!#$%&'*+.^_`|~-]+/
+ # qdtext and quoted_pair are not exactly according to spec but meh
+ QUOTED_STRING_RE = /"([^\\"]|(\\.))*"/
+ PARAM_RE = /(?#{TOKEN_RE})\s*=\s*((?#{TOKEN_RE})|(?#{QUOTED_STRING_RE}))/
+
+ def self.parse(raw_signature)
+ # Old versions of node-http-signature add an incorrect "Signature " prefix to the header
+ raw_signature = raw_signature.delete_prefix('Signature ')
+
+ params = {}
+ scanner = StringScanner.new(raw_signature)
+
+ # Use `skip` instead of `scan` as we only care about the subgroups
+ while scanner.skip(PARAM_RE)
+ # This is not actually correct with regards to quoted pairs, but it's consistent
+ # with our previous implementation, and good enough in practice.
+ params[scanner[:key]] = scanner[:value] || scanner[:quoted_value][1...-1]
+
+ scanner.skip(/\s*/)
+ return params if scanner.eos?
+
+ raise ParsingError unless scanner.skip(/\s*,\s*/)
+ end
+
+ raise ParsingError
+ end
+end
diff --git a/app/lib/text_formatter.rb b/app/lib/text_formatter.rb
index 581ee835b3fcdf..2b3febc219bac4 100644
--- a/app/lib/text_formatter.rb
+++ b/app/lib/text_formatter.rb
@@ -50,6 +50,7 @@ def to_s
class << self
include ERB::Util
+ include ActionView::Helpers::TagHelper
def shortened_link(url, rel_me: false)
url = Addressable::URI.parse(url).to_s
@@ -60,9 +61,11 @@ def shortened_link(url, rel_me: false)
suffix = url[prefix.length + 30..]
cutoff = url[prefix.length..].length > 30
- <<~HTML.squish.html_safe # rubocop:disable Rails/OutputSafety
- #{h(prefix)}#{h(display_url)}#{h(suffix)}
- HTML
+ tag.a href: url, target: '_blank', rel: rel.join(' '), translate: 'no' do
+ tag.span(prefix, class: 'invisible') +
+ tag.span(display_url, class: (cutoff ? 'ellipsis' : '')) +
+ tag.span(suffix, class: 'invisible')
+ end
rescue Addressable::URI::InvalidURIError, IDN::Idna::IdnaError
h(url)
end
diff --git a/app/lib/themes.rb b/app/lib/themes.rb
index 45ba47780b5ffe..a87323d8e9cf65 100644
--- a/app/lib/themes.rb
+++ b/app/lib/themes.rb
@@ -6,14 +6,17 @@
class Themes
include Singleton
+ THEME_COLORS = {
+ dark: '#191b22',
+ light: '#f3f5f7',
+ }.freeze
+
def initialize
- core = YAML.load_file(Rails.root.join('app', 'javascript', 'core', 'theme.yml'))
- core['pack'] = {} unless core['pack']
+ @flavours = {}
- result = {}
Rails.root.glob('app/javascript/flavours/*/theme.yml') do |pathname|
data = YAML.load_file(pathname)
- next unless data['pack']
+ next unless data['pack_directory']
dir = pathname.dirname
name = dir.basename.to_s
@@ -38,45 +41,35 @@ def initialize
data['name'] = name
data['locales'] = locales
data['screenshot'] = screenshots
- data['skin'] = { 'default' => [] }
- result[name] = data
+ data['skins'] = []
+ @flavours[name] = data
end
Rails.root.glob('app/javascript/skins/*/*') do |pathname|
ext = pathname.extname.to_s
skin = pathname.basename.to_s
name = pathname.dirname.basename.to_s
- next unless result[name]
+ next unless @flavours[name]
if pathname.directory?
- pack = []
- pathname.glob('*.{css,scss}') do |sheet|
- pack.push(sheet.basename(sheet.extname).to_s)
- end
+ @flavours[name]['skins'] << skin if pathname.glob('{common,index,application}.{css,scss}').any?
elsif /^\.s?css$/i.match?(ext)
- skin = pathname.basename(ext).to_s
- pack = ['common']
+ @flavours[name]['skins'] << pathname.basename(ext).to_s
end
-
- result[name]['skin'][skin] = pack if skin != 'default'
end
-
- @core = core
- @conf = result
end
- attr_reader :core
-
def flavour(name)
- @conf[name]
+ @flavours[name]
end
def flavours
- @conf.keys
+ @flavours.keys
end
def skins_for(name)
- @conf[name]['skin'].keys
+ skins = @flavours[name]['skins']
+ skins.include?('default') && skins.include?('mastodon-light') ? ['system'] + skins : skins
end
def flavours_and_skins
diff --git a/app/lib/vacuum/applications_vacuum.rb b/app/lib/vacuum/applications_vacuum.rb
deleted file mode 100644
index ba88655f167c25..00000000000000
--- a/app/lib/vacuum/applications_vacuum.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-class Vacuum::ApplicationsVacuum
- def perform
- Doorkeeper::Application.where(owner_id: nil)
- .where.missing(:created_users, :access_tokens, :access_grants)
- .where(created_at: ...1.day.ago)
- .in_batches.delete_all
- end
-end
diff --git a/app/lib/vacuum/feeds_vacuum.rb b/app/lib/vacuum/feeds_vacuum.rb
index b0246bc0d2eff3..fd55be7bfe2658 100644
--- a/app/lib/vacuum/feeds_vacuum.rb
+++ b/app/lib/vacuum/feeds_vacuum.rb
@@ -28,7 +28,7 @@ def vacuum_inactive_direct_feeds!
end
def inactive_users
- User.confirmed.inactive
+ User.confirmed.not_signed_in_recently
end
def inactive_users_lists
diff --git a/app/lib/vacuum/imports_vacuum.rb b/app/lib/vacuum/imports_vacuum.rb
index ffb9449a4283d0..700bd81847f4ac 100644
--- a/app/lib/vacuum/imports_vacuum.rb
+++ b/app/lib/vacuum/imports_vacuum.rb
@@ -9,10 +9,10 @@ def perform
private
def clean_unconfirmed_imports!
- BulkImport.where(state: :unconfirmed).where('created_at <= ?', 10.minutes.ago).reorder(nil).in_batches.delete_all
+ BulkImport.state_unconfirmed.where(created_at: ..10.minutes.ago).reorder(nil).in_batches.delete_all
end
def clean_old_imports!
- BulkImport.where('created_at <= ?', 1.week.ago).reorder(nil).in_batches.delete_all
+ BulkImport.where(created_at: ..1.week.ago).reorder(nil).in_batches.delete_all
end
end
diff --git a/app/lib/vacuum/statuses_vacuum.rb b/app/lib/vacuum/statuses_vacuum.rb
index ad1de07380ceb9..92d3ccf4f40877 100644
--- a/app/lib/vacuum/statuses_vacuum.rb
+++ b/app/lib/vacuum/statuses_vacuum.rb
@@ -34,7 +34,7 @@ def vacuum_statuses!
def statuses_scope
Status.unscoped.kept
.joins(:account).merge(Account.remote)
- .where('statuses.id < ?', retention_period_as_id)
+ .where(statuses: { id: ...retention_period_as_id })
end
def retention_period_as_id
diff --git a/app/lib/video_metadata_extractor.rb b/app/lib/video_metadata_extractor.rb
index f27d34868a2798..df5409375f16ef 100644
--- a/app/lib/video_metadata_extractor.rb
+++ b/app/lib/video_metadata_extractor.rb
@@ -22,7 +22,7 @@ def valid?
private
def ffmpeg_command_output
- command = Terrapin::CommandLine.new('ffprobe', '-i :path -print_format :format -show_format -show_streams -show_error -loglevel :loglevel')
+ command = Terrapin::CommandLine.new(Rails.configuration.x.ffprobe_binary, '-i :path -print_format :format -show_format -show_streams -show_error -loglevel :loglevel')
command.run(path: @path, format: 'json', loglevel: 'fatal')
end
diff --git a/app/mailers/admin_mailer.rb b/app/mailers/admin_mailer.rb
index 2a6fbb0ab7e0a5..8dd7b6e59fb055 100644
--- a/app/mailers/admin_mailer.rb
+++ b/app/mailers/admin_mailer.rb
@@ -46,12 +46,16 @@ def new_trends(links, tags, statuses)
end
def new_software_updates
+ @software_updates = SoftwareUpdate.all.to_a.sort_by(&:gem_version)
+
locale_for_account(@me) do
mail subject: default_i18n_subject(instance: @instance)
end
end
def new_critical_software_updates
+ @software_updates = SoftwareUpdate.where(urgent: true).to_a.sort_by(&:gem_version)
+
headers['Priority'] = 'urgent'
headers['X-Priority'] = '1'
headers['Importance'] = 'high'
@@ -61,6 +65,12 @@ def new_critical_software_updates
end
end
+ def auto_close_registrations
+ locale_for_account(@me) do
+ mail subject: default_i18n_subject(instance: @instance)
+ end
+ end
+
private
def process_params
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 3b1a085cb88ef6..81a2c0c6d04bbc 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -5,10 +5,10 @@ class UserMailer < Devise::Mailer
helper :accounts
helper :application
- helper :instance
- helper :statuses
helper :formatting
+ helper :instance
helper :routing
+ helper :statuses
before_action :set_instance
@@ -135,6 +135,12 @@ def welcome(user)
return unless @resource.active_for_authentication?
+ @suggestions = AccountSuggestions.new(@resource.account).get(5)
+ @tags = Trends.tags.query.allowed.limit(5)
+ @has_account_fields = @resource.account.display_name.present? || @resource.account.note.present? || @resource.account.avatar.present?
+ @has_active_relationships = @resource.account.active_relationships.exists?
+ @has_statuses = @resource.account.statuses.exists?
+
I18n.with_locale(locale) do
mail subject: default_i18n_subject
end
diff --git a/app/models/account.rb b/app/models/account.rb
index 55eee725d2c4f5..f2d042a38d7994 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -64,11 +64,16 @@ class Account < ApplicationRecord
)
BACKGROUND_REFRESH_INTERVAL = 1.week.freeze
+ DEFAULT_FIELDS_SIZE = (ENV['MAX_PROFILE_FIELDS'] || 4).to_i
+ INSTANCE_ACTOR_ID = -99
USERNAME_RE = /[a-z0-9_]+([a-z0-9_.-]+[a-z0-9_]+)?/i
MENTION_RE = %r{(? { will_save_change_to_username? }
@@ -102,10 +103,10 @@ class Account < ApplicationRecord
validates :uri, presence: true, unless: :local?, on: :create
# Local user validations
- validates :username, format: { with: /\A[a-z0-9_]+\z/i }, length: { maximum: 30 }, if: -> { local? && will_save_change_to_username? && actor_type != 'Application' }
+ validates :username, format: { with: /\A[a-z0-9_]+\z/i }, length: { maximum: USERNAME_LENGTH_LIMIT }, if: -> { local? && will_save_change_to_username? && actor_type != 'Application' }
validates_with UnreservedUsernameValidator, if: -> { local? && will_save_change_to_username? && actor_type != 'Application' }
- validates :display_name, length: { maximum: MAX_DISPLAY_NAME_LENGTH }, if: -> { local? && will_save_change_to_display_name? }
- validates :note, note_length: { maximum: MAX_NOTE_LENGTH }, if: -> { local? && will_save_change_to_note? }
+ validates :display_name, length: { maximum: DISPLAY_NAME_LENGTH_LIMIT }, if: -> { local? && will_save_change_to_display_name? }
+ validates :note, note_length: { maximum: NOTE_LENGTH_LIMIT }, if: -> { local? && will_save_change_to_note? }
validates :fields, length: { maximum: DEFAULT_FIELDS_SIZE }, if: -> { local? && will_save_change_to_fields? }
validates :uri, absence: true, if: :local?, on: :create
validates :inbox_url, absence: true, if: :local?, on: :create
@@ -114,6 +115,7 @@ class Account < ApplicationRecord
normalizes :username, with: ->(username) { username.squish }
+ scope :without_internal, -> { where(id: 1...) }
scope :remote, -> { where.not(domain: nil) }
scope :local, -> { where(domain: nil) }
scope :partitioned, -> { order(Arel.sql('row_number() over (partition by domain)')) }
@@ -122,7 +124,7 @@ class Account < ApplicationRecord
scope :sensitized, -> { where.not(sensitized_at: nil) }
scope :without_suspended, -> { where(suspended_at: nil) }
scope :without_silenced, -> { where(silenced_at: nil) }
- scope :without_instance_actor, -> { where.not(id: -99) }
+ scope :without_instance_actor, -> { where.not(id: INSTANCE_ACTOR_ID) }
scope :recent, -> { reorder(id: :desc) }
scope :bots, -> { where(actor_type: %w(Application Service)) }
scope :groups, -> { where(actor_type: 'Group') }
@@ -134,12 +136,14 @@ class Account < ApplicationRecord
scope :auditable, -> { where(id: Admin::ActionLog.select(:account_id).distinct) }
scope :searchable, -> { without_unapproved.without_suspended.where(moved_to_account_id: nil) }
scope :discoverable, -> { searchable.without_silenced.where(discoverable: true).joins(:account_stat) }
- scope :by_recent_status, -> { includes(:account_stat).merge(AccountStat.order('last_status_at DESC NULLS LAST')).references(:account_stat) }
+ scope :by_recent_status, -> { includes(:account_stat).merge(AccountStat.by_recent_status).references(:account_stat) }
scope :by_recent_activity, -> { left_joins(:user, :account_stat).order(coalesced_activity_timestamps.desc).order(id: :desc) }
- scope :popular, -> { order('account_stats.followers_count desc') }
scope :by_domain_and_subdomains, ->(domain) { where(domain: Instance.by_domain_and_subdomains(domain).select(:domain)) }
scope :not_excluded_by_account, ->(account) { where.not(id: account.excluded_from_timeline_account_ids) }
scope :not_domain_blocked_by_account, ->(account) { where(arel_table[:domain].eq(nil).or(arel_table[:domain].not_in(account.excluded_from_timeline_domains))) }
+ scope :dormant, -> { joins(:account_stat).merge(AccountStat.without_recent_activity) }
+ scope :with_username, ->(value) { where arel_table[:username].lower.eq(value.to_s.downcase) }
+ scope :with_domain, ->(value) { where arel_table[:domain].lower.eq(value&.to_s&.downcase) }
after_update_commit :trigger_update_webhooks
@@ -180,7 +184,7 @@ def bot?
end
def instance_actor?
- id == -99
+ id == INSTANCE_ACTOR_ID
end
alias bot bot?
@@ -438,7 +442,7 @@ def readonly_attributes
end
def inboxes
- urls = reorder(nil).where(protocol: :activitypub).group(:preferred_inbox_url).pluck(Arel.sql("coalesce(nullif(accounts.shared_inbox_url, ''), accounts.inbox_url) AS preferred_inbox_url"))
+ urls = reorder(nil).activitypub.group(:preferred_inbox_url).pluck(Arel.sql("coalesce(nullif(accounts.shared_inbox_url, ''), accounts.inbox_url) AS preferred_inbox_url"))
DeliveryFailureTracker.without_unavailable(urls)
end
diff --git a/app/models/account_moderation_note.rb b/app/models/account_moderation_note.rb
index ff399bab0c0edf..79b8b4d25ee033 100644
--- a/app/models/account_moderation_note.rb
+++ b/app/models/account_moderation_note.rb
@@ -13,10 +13,12 @@
#
class AccountModerationNote < ApplicationRecord
+ CONTENT_SIZE_LIMIT = 2_000
+
belongs_to :account
belongs_to :target_account, class_name: 'Account'
scope :latest, -> { reorder('created_at DESC') }
- validates :content, presence: true, length: { maximum: 500 }
+ validates :content, presence: true, length: { maximum: CONTENT_SIZE_LIMIT }
end
diff --git a/app/models/account_note.rb b/app/models/account_note.rb
index 9bc704d988f83d..317e6873fa701e 100644
--- a/app/models/account_note.rb
+++ b/app/models/account_note.rb
@@ -14,9 +14,11 @@
class AccountNote < ApplicationRecord
include RelationshipCacheable
+ COMMENT_SIZE_LIMIT = 2_000
+
belongs_to :account
belongs_to :target_account, class_name: 'Account'
validates :account_id, uniqueness: { scope: :target_account_id }
- validates :comment, length: { maximum: 2_000 }
+ validates :comment, length: { maximum: COMMENT_SIZE_LIMIT }
end
diff --git a/app/models/account_relationship_severance_event.rb b/app/models/account_relationship_severance_event.rb
new file mode 100644
index 00000000000000..c1269fad6d9152
--- /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/account_stat.rb b/app/models/account_stat.rb
index 0fea7732e9874c..14aa7ef800787f 100644
--- a/app/models/account_stat.rb
+++ b/app/models/account_stat.rb
@@ -20,6 +20,9 @@ class AccountStat < ApplicationRecord
belongs_to :account, inverse_of: :account_stat
+ scope :by_recent_status, -> { order(arel_table[:last_status_at].desc.nulls_last) }
+ scope :without_recent_activity, -> { where(last_status_at: [nil, ...1.month.ago]) }
+
update_index('accounts', :account)
def following_count
diff --git a/app/models/account_suggestions.rb b/app/models/account_suggestions.rb
index 25c8b04d50f9f3..98ccf4ad4fd5f4 100644
--- a/app/models/account_suggestions.rb
+++ b/app/models/account_suggestions.rb
@@ -31,12 +31,12 @@ def get(limit, offset = 0)
account_ids = account_ids_with_sources[offset, limit]
accounts_map = Account.where(id: account_ids.map(&:first)).includes(:account_stat, :user).index_by(&:id)
- account_ids.filter_map do |(account_id, source)|
+ account_ids.filter_map do |(account_id, sources)|
next unless accounts_map.key?(account_id)
AccountSuggestions::Suggestion.new(
account: accounts_map[account_id],
- source: source
+ sources: sources
)
end
end
diff --git a/app/models/account_suggestions/friends_of_friends_source.rb b/app/models/account_suggestions/friends_of_friends_source.rb
index 28d0ab99b3b1f9..825b24f41981ed 100644
--- a/app/models/account_suggestions/friends_of_friends_source.rb
+++ b/app/models/account_suggestions/friends_of_friends_source.rb
@@ -1,8 +1,13 @@
# frozen_string_literal: true
class AccountSuggestions::FriendsOfFriendsSource < AccountSuggestions::Source
- def get(account, limit: 10)
- Account.find_by_sql([<<~SQL.squish, { id: account.id, limit: limit }]).map { |row| [row.id, key] }
+ def get(account, limit: DEFAULT_LIMIT)
+ source_query(account, limit: limit)
+ .map { |id, _frequency, _followers_count| [id, key] }
+ end
+
+ def source_query(account, limit: DEFAULT_LIMIT)
+ Account.find_by_sql([<<~SQL.squish, { id: account.id, limit: limit }]).map { |row| [row.id, row.frequency, row.followers_count] }
WITH first_degree AS (
SELECT target_account_id
FROM follows
@@ -10,12 +15,16 @@ def get(account, limit: 10)
WHERE account_id = :id
AND NOT target_accounts.hide_collections
)
- SELECT accounts.id, COUNT(*) AS frequency
+ SELECT accounts.id, COUNT(*) AS frequency, account_stats.followers_count as followers_count
FROM accounts
JOIN follows ON follows.target_account_id = accounts.id
JOIN account_stats ON account_stats.account_id = accounts.id
LEFT OUTER JOIN follow_recommendation_mutes ON follow_recommendation_mutes.target_account_id = accounts.id AND follow_recommendation_mutes.account_id = :id
WHERE follows.account_id IN (SELECT * FROM first_degree)
+ AND NOT EXISTS (SELECT 1 FROM blocks b WHERE b.target_account_id = follows.target_account_id AND b.account_id = :id)
+ AND NOT EXISTS (SELECT 1 FROM blocks b WHERE b.target_account_id = :id AND b.account_id = follows.target_account_id)
+ AND NOT EXISTS (SELECT 1 FROM mutes m WHERE m.target_account_id = follows.target_account_id AND m.account_id = :id)
+ AND (accounts.domain IS NULL OR NOT EXISTS (SELECT 1 FROM account_domain_blocks b WHERE b.account_id = :id AND b.domain = accounts.domain))
AND NOT EXISTS (SELECT 1 FROM follows f WHERE f.target_account_id = follows.target_account_id AND f.account_id = :id)
AND follows.target_account_id <> :id
AND accounts.discoverable
diff --git a/app/models/account_suggestions/global_source.rb b/app/models/account_suggestions/global_source.rb
index d68f285e4f4e89..c05bcf2ce8d88b 100644
--- a/app/models/account_suggestions/global_source.rb
+++ b/app/models/account_suggestions/global_source.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
class AccountSuggestions::GlobalSource < AccountSuggestions::Source
- def get(account, limit: 10)
+ def get(account, limit: DEFAULT_LIMIT)
FollowRecommendation.localized(content_locale).joins(:account).merge(base_account_scope(account)).order(rank: :desc).limit(limit).pluck(:account_id, :reason)
end
diff --git a/app/models/account_suggestions/setting_source.rb b/app/models/account_suggestions/setting_source.rb
index 4b7275bf7ada96..6143481723f9e8 100644
--- a/app/models/account_suggestions/setting_source.rb
+++ b/app/models/account_suggestions/setting_source.rb
@@ -1,9 +1,9 @@
# frozen_string_literal: true
class AccountSuggestions::SettingSource < AccountSuggestions::Source
- def get(account, limit: 10)
+ def get(account, limit: DEFAULT_LIMIT)
if setting_enabled?
- base_account_scope(account).where(setting_to_where_condition).limit(limit).pluck(:id).zip([key].cycle)
+ base_account_scope(account).merge(setting_to_where_condition).limit(limit).pluck(:id).zip([key].cycle)
else
[]
end
@@ -25,11 +25,9 @@ def setting_enabled?
def setting_to_where_condition
usernames_and_domains.map do |(username, domain)|
- Arel::Nodes::Grouping.new(
- Account.arel_table[:username].lower.eq(username.downcase).and(
- Account.arel_table[:domain].lower.eq(domain&.downcase)
- )
- )
+ Account
+ .with_username(username)
+ .with_domain(domain)
end.reduce(:or)
end
diff --git a/app/models/account_suggestions/similar_profiles_source.rb b/app/models/account_suggestions/similar_profiles_source.rb
index 733c5f0bbcd649..7ecdd607e5eef0 100644
--- a/app/models/account_suggestions/similar_profiles_source.rb
+++ b/app/models/account_suggestions/similar_profiles_source.rb
@@ -47,11 +47,12 @@ def should_clauses
end
end
- def get(account, limit: 10)
+ def get(account, limit: DEFAULT_LIMIT)
recently_followed_account_ids = account.active_relationships.recent.limit(5).pluck(:target_account_id)
if Chewy.enabled? && !recently_followed_account_ids.empty?
- QueryBuilder.new(recently_followed_account_ids, account).build.limit(limit).hits.pluck('_id').map(&:to_i).zip([key].cycle)
+ ids_from_es = QueryBuilder.new(recently_followed_account_ids, account).build.limit(limit).hits.pluck('_id').map(&:to_i)
+ base_account_scope(account).where(id: ids_from_es).pluck(:id).zip([key].cycle)
else
[]
end
diff --git a/app/models/account_suggestions/source.rb b/app/models/account_suggestions/source.rb
index d83f5e3773cf6c..7afc4c80edd3ba 100644
--- a/app/models/account_suggestions/source.rb
+++ b/app/models/account_suggestions/source.rb
@@ -1,6 +1,8 @@
# frozen_string_literal: true
class AccountSuggestions::Source
+ DEFAULT_LIMIT = 10
+
def get(_account, **kwargs)
raise NotImplementedError
end
@@ -10,6 +12,8 @@ def get(_account, **kwargs)
def base_account_scope(account)
Account
.searchable
+ .where(discoverable: true)
+ .without_silenced
.where.not(follows_sql, id: account.id)
.where.not(follow_requests_sql, id: account.id)
.not_excluded_by_account(account)
diff --git a/app/models/account_suggestions/suggestion.rb b/app/models/account_suggestions/suggestion.rb
index 2c6f4d27f5ce6e..8a5888069adb1b 100644
--- a/app/models/account_suggestions/suggestion.rb
+++ b/app/models/account_suggestions/suggestion.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
class AccountSuggestions::Suggestion < ActiveModelSerializers::Model
- attributes :account, :source
+ attributes :account, :sources
delegate :id, to: :account, prefix: true
end
diff --git a/app/models/account_summary.rb b/app/models/account_summary.rb
index 2a21d09a8bac6e..327c0ef305ab7c 100644
--- a/app/models/account_summary.rb
+++ b/app/models/account_summary.rb
@@ -10,19 +10,13 @@
#
class AccountSummary < ApplicationRecord
+ include DatabaseViewRecord
+
self.primary_key = :account_id
- has_many :follow_recommendation_suppressions, primary_key: :account_id, foreign_key: :account_id, inverse_of: false
+ has_many :follow_recommendation_suppressions, primary_key: :account_id, foreign_key: :account_id, inverse_of: false, dependent: nil
scope :safe, -> { where(sensitive: false) }
- scope :localized, ->(locale) { where(language: locale) }
+ scope :localized, ->(locale) { order(Arel::Nodes::Case.new.when(arel_table[:language].eq(locale)).then(1).else(0).desc) }
scope :filtered, -> { where.missing(:follow_recommendation_suppressions) }
-
- def self.refresh
- Scenic.database.refresh_materialized_view(table_name, concurrently: false, cascade: false)
- end
-
- def readonly?
- true
- end
end
diff --git a/app/models/account_warning.rb b/app/models/account_warning.rb
index 9286577f516e65..7aa474887b4e2a 100644
--- a/app/models/account_warning.rb
+++ b/app/models/account_warning.rb
@@ -17,7 +17,7 @@
#
class AccountWarning < ApplicationRecord
- enum action: {
+ enum :action, {
none: 0,
disable: 1_000,
mark_statuses_as_sensitive: 1_250,
@@ -25,7 +25,9 @@ class AccountWarning < ApplicationRecord
sensitive: 2_000,
silence: 3_000,
suspend: 4_000,
- }, _suffix: :action
+ }, suffix: :action
+
+ RECENT_PERIOD = 3.months.freeze
normalizes :text, with: ->(text) { text.to_s }, apply_to_nil: true
@@ -37,7 +39,7 @@ class AccountWarning < ApplicationRecord
scope :latest, -> { order(id: :desc) }
scope :custom, -> { where.not(text: '') }
- scope :recent, -> { where('account_warnings.created_at >= ?', 3.months.ago) }
+ scope :recent, -> { where(created_at: RECENT_PERIOD.ago..) }
def statuses
Status.with_discarded.where(id: status_ids || [])
diff --git a/app/models/admin/account_action.rb b/app/models/admin/account_action.rb
index 2b5560e2eba877..3700ce4cd6c735 100644
--- a/app/models/admin/account_action.rb
+++ b/app/models/admin/account_action.rb
@@ -52,7 +52,7 @@ def save!
process_reports!
end
- process_email!
+ process_notification!
process_queue!
end
@@ -158,8 +158,11 @@ def process_queue!
queue_suspension_worker! if type == 'suspend'
end
- def process_email!
- UserMailer.warning(target_account.user, warning).deliver_later! if warnable?
+ def process_notification!
+ return unless warnable?
+
+ UserMailer.warning(target_account.user, warning).deliver_later!
+ LocalNotificationWorker.perform_async(target_account.id, warning.id, 'AccountWarning', 'moderation_warning')
end
def warnable?
diff --git a/app/models/admin/action_log_filter.rb b/app/models/admin/action_log_filter.rb
index f581af74e8bf8c..fc984b2445bcdc 100644
--- a/app/models/admin/action_log_filter.rb
+++ b/app/models/admin/action_log_filter.rb
@@ -59,6 +59,7 @@ class Admin::ActionLogFilter
unsuspend_account: { target_type: 'Account', action: 'unsuspend' }.freeze,
update_announcement: { target_type: 'Announcement', action: 'update' }.freeze,
update_custom_emoji: { target_type: 'CustomEmoji', action: 'update' }.freeze,
+ update_report: { target_type: 'Report', action: 'update' }.freeze,
update_status: { target_type: 'Status', action: 'update' }.freeze,
update_user_role: { target_type: 'UserRole', action: 'update' }.freeze,
update_ip_block: { target_type: 'IpBlock', action: 'update' }.freeze,
diff --git a/app/models/admin/import.rb b/app/models/admin/import.rb
index 0fd4bdb824ea90..c12c9a86b91370 100644
--- a/app/models/admin/import.rb
+++ b/app/models/admin/import.rb
@@ -30,12 +30,14 @@ def csv_data
csv_converter = lambda do |field, field_info|
case field_info.header
- when '#domain', '#public_comment'
+ when '#domain'
+ field&.downcase&.strip
+ when '#public_comment'
field&.strip
when '#severity'
- field&.strip&.to_sym
+ field&.downcase&.strip&.to_sym
when '#reject_media', '#reject_reports', '#obfuscate'
- ActiveModel::Type::Boolean.new.cast(field)
+ ActiveModel::Type::Boolean.new.cast(field&.downcase)
else
field
end
diff --git a/app/models/admin/status_batch_action.rb b/app/models/admin/status_batch_action.rb
index 8a8e2fa3785497..4a10001935155a 100644
--- a/app/models/admin/status_batch_action.rb
+++ b/app/models/admin/status_batch_action.rb
@@ -65,7 +65,8 @@ def handle_delete!
statuses.each { |status| Tombstone.find_or_create_by(uri: status.uri, account: status.account, by_moderator: true) } unless target_account.local?
end
- UserMailer.warning(target_account.user, @warning).deliver_later! if warnable?
+ process_notification!
+
RemovalWorker.push_bulk(status_ids) { |status_id| [status_id, { 'preserve' => target_account.local?, 'immediate' => !target_account.local? }] }
end
@@ -101,7 +102,7 @@ def handle_mark_as_sensitive!
text: text
)
- UserMailer.warning(target_account.user, @warning).deliver_later! if warnable?
+ process_notification!
end
def handle_report!
@@ -127,6 +128,13 @@ def with_report?
!report.nil?
end
+ def process_notification!
+ return unless warnable?
+
+ UserMailer.warning(target_account.user, @warning).deliver_later!
+ LocalNotificationWorker.perform_async(target_account.id, @warning.id, 'AccountWarning', 'moderation_warning')
+ end
+
def warnable?
send_email_notification && target_account.local?
end
diff --git a/app/models/admin/status_filter.rb b/app/models/admin/status_filter.rb
index 4708785e7d4b74..8d20e4f6abce94 100644
--- a/app/models/admin/status_filter.rb
+++ b/app/models/admin/status_filter.rb
@@ -16,7 +16,7 @@ def initialize(account, params)
end
def results
- scope = @account.statuses.where(visibility: [:public, :unlisted])
+ scope = @account.statuses.distributable_visibility
params.each do |key, value|
next if IGNORED_PARAMS.include?(key.to_s)
diff --git a/app/models/announcement.rb b/app/models/announcement.rb
index e630570020ea57..54923ed0819e6a 100644
--- a/app/models/announcement.rb
+++ b/app/models/announcement.rb
@@ -59,11 +59,13 @@ def mentions
end
def statuses
- @statuses ||= if status_ids.nil?
- []
- else
- Status.where(id: status_ids, visibility: [:public, :unlisted])
- end
+ @statuses ||= begin
+ if status_ids.nil?
+ []
+ else
+ Status.with_includes.distributable_visibility.where(id: status_ids)
+ end
+ end
end
def tags
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index 014a73997d9793..299aad6340461f 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -22,4 +22,10 @@ def boolean_with_default(key, default_value)
value
end
end
+
+ # Prevent implicit serialization in ActiveModel::Serializer or other code paths.
+ # This is a hardening step to avoid accidental leaking of attributes.
+ def as_json
+ raise NotImplementedError
+ end
end
diff --git a/app/models/bulk_import.rb b/app/models/bulk_import.rb
index 406fb2aba26c7a..9b3f4c8a3ae64a 100644
--- a/app/models/bulk_import.rb
+++ b/app/models/bulk_import.rb
@@ -24,7 +24,7 @@ class BulkImport < ApplicationRecord
belongs_to :account
has_many :rows, class_name: 'BulkImportRow', inverse_of: :bulk_import, dependent: :delete_all
- enum type: {
+ enum :type, {
following: 0,
blocking: 1,
muting: 2,
@@ -33,12 +33,12 @@ class BulkImport < ApplicationRecord
lists: 5,
}
- enum state: {
+ enum :state, {
unconfirmed: 0,
scheduled: 1,
in_progress: 2,
finished: 3,
- }
+ }, prefix: true
validates :type, presence: true
diff --git a/app/models/concerns/account/associations.rb b/app/models/concerns/account/associations.rb
index 2bb6fed5ad0047..1c67b07e511618 100644
--- a/app/models/concerns/account/associations.rb
+++ b/app/models/concerns/account/associations.rb
@@ -15,10 +15,15 @@ module Account::Associations
has_many :favourites, inverse_of: :account, dependent: :destroy
has_many :bookmarks, inverse_of: :account, dependent: :destroy
has_many :mentions, inverse_of: :account, dependent: :destroy
- has_many :notifications, inverse_of: :account, dependent: :destroy
has_many :conversations, class_name: 'AccountConversation', dependent: :destroy, inverse_of: :account
has_many :scheduled_statuses, inverse_of: :account, dependent: :destroy
+ # Notifications
+ has_many :notifications, inverse_of: :account, dependent: :destroy
+ has_one :notification_policy, inverse_of: :account, dependent: :destroy
+ has_many :notification_permissions, inverse_of: :account, dependent: :destroy
+ has_many :notification_requests, inverse_of: :account, dependent: :destroy
+
# Pinned statuses
has_many :status_pins, inverse_of: :account, dependent: :destroy
has_many :pinned_statuses, -> { reorder('status_pins.created_at DESC') }, through: :status_pins, class_name: 'Status', source: :status
@@ -57,7 +62,7 @@ module Account::Associations
has_many :aliases, class_name: 'AccountAlias', dependent: :destroy, inverse_of: :account
# Hashtags
- has_and_belongs_to_many :tags
+ has_and_belongs_to_many :tags # rubocop:disable Rails/HasAndBelongsToMany
has_many :featured_tags, -> { includes(:tag) }, dependent: :destroy, inverse_of: :account
# Account deletion requests
diff --git a/app/models/concerns/account/counters.rb b/app/models/concerns/account/counters.rb
index 4488398128aab5..536d5ca7bcdabc 100644
--- a/app/models/concerns/account/counters.rb
+++ b/app/models/concerns/account/counters.rb
@@ -35,40 +35,11 @@ def update_count!(key, value)
raise ArgumentError, "Invalid key #{key}" unless ALLOWED_COUNTER_KEYS.include?(key)
raise ArgumentError, 'Do not call update_count! on dirty objects' if association(:account_stat).loaded? && account_stat&.changed? && account_stat.changed_attribute_names_to_save == %w(id)
- value = value.to_i
- default_value = value.positive? ? value : 0
-
- # We do an upsert using manually written SQL, as Rails' upsert method does
- # not seem to support writing expressions in the UPDATE clause, but only
- # re-insert the provided values instead.
- # Even ARel seem to be missing proper handling of upserts.
- sql = if value.positive? && key == :statuses_count
- <<-SQL.squish
- INSERT INTO account_stats(account_id, #{key}, created_at, updated_at, last_status_at)
- VALUES (:account_id, :default_value, now(), now(), now())
- ON CONFLICT (account_id) DO UPDATE
- SET #{key} = account_stats.#{key} + :value,
- last_status_at = now(),
- updated_at = now()
- RETURNING id;
- SQL
- else
- <<-SQL.squish
- INSERT INTO account_stats(account_id, #{key}, created_at, updated_at)
- VALUES (:account_id, :default_value, now(), now())
- ON CONFLICT (account_id) DO UPDATE
- SET #{key} = account_stats.#{key} + :value,
- updated_at = now()
- RETURNING id;
- SQL
- end
-
- sql = AccountStat.sanitize_sql([sql, account_id: id, default_value: default_value, value: value])
- account_stat_id = AccountStat.connection.exec_query(sql)[0]['id']
+ result = updated_account_stat(key, value.to_i)
# Reload account_stat if it was loaded, taking into account newly-created unsaved records
if association(:account_stat).loaded?
- account_stat.id = account_stat_id if account_stat.new_record?
+ account_stat.id = result.first['id'] if account_stat.new_record?
account_stat.reload
end
end
@@ -79,6 +50,28 @@ def account_stat
private
+ def updated_account_stat(key, value)
+ AccountStat.upsert(
+ initial_values(key, value),
+ on_duplicate: Arel.sql(
+ duplicate_values(key, value).join(', ')
+ ),
+ unique_by: :account_id
+ )
+ end
+
+ def initial_values(key, value)
+ { :account_id => id, key => [value, 0].max }.tap do |values|
+ values.merge!(last_status_at: Time.current) if key == :statuses_count
+ end
+ end
+
+ def duplicate_values(key, value)
+ ["#{key} = (account_stats.#{key} + #{value})", 'updated_at = CURRENT_TIMESTAMP'].tap do |values|
+ values << 'last_status_at = CURRENT_TIMESTAMP' if key == :statuses_count && value.positive?
+ end
+ end
+
def save_account_stat
return unless association(:account_stat).loaded? && account_stat&.changed?
diff --git a/app/models/concerns/account/finder_concern.rb b/app/models/concerns/account/finder_concern.rb
index 7faaddeb4302c6..249a7b5fd17e47 100644
--- a/app/models/concerns/account/finder_concern.rb
+++ b/app/models/concerns/account/finder_concern.rb
@@ -13,11 +13,11 @@ def find_remote!(username, domain)
end
def representative
- actor = Account.find(-99).tap(&:ensure_keys!)
+ actor = Account.find(Account::INSTANCE_ACTOR_ID).tap(&:ensure_keys!)
actor.update!(username: 'mastodon.internal') if actor.username.include?(':')
actor
rescue ActiveRecord::RecordNotFound
- Account.create!(id: -99, actor_type: 'Application', locked: true, username: 'mastodon.internal')
+ Account.create!(id: Account::INSTANCE_ACTOR_ID, actor_type: 'Application', locked: true, username: 'mastodon.internal')
end
def find_local(username)
@@ -25,42 +25,11 @@ def find_local(username)
end
def find_remote(username, domain)
- AccountFinder.new(username, domain).account
- end
- end
-
- class AccountFinder
- attr_reader :username, :domain
-
- def initialize(username, domain)
- @username = username
- @domain = domain
- end
-
- def account
- scoped_accounts.order(id: :asc).take
- end
-
- private
-
- def scoped_accounts
- Account.unscoped.tap do |scope|
- scope.merge! with_usernames
- scope.merge! matching_username
- scope.merge! matching_domain
- end
- end
-
- def with_usernames
- Account.where.not(Account.arel_table[:username].lower.eq '')
- end
-
- def matching_username
- Account.where(Account.arel_table[:username].lower.eq username.to_s.downcase)
- end
-
- def matching_domain
- Account.where(Account.arel_table[:domain].lower.eq(domain.nil? ? nil : domain.to_s.downcase))
+ Account
+ .with_username(username)
+ .with_domain(domain)
+ .order(id: :asc)
+ .take
end
end
end
diff --git a/app/models/concerns/account/interactions.rb b/app/models/concerns/account/interactions.rb
index 5b05c31e03f3c5..536afba17faf3b 100644
--- a/app/models/concerns/account/interactions.rb
+++ b/app/models/concerns/account/interactions.rb
@@ -83,6 +83,11 @@ def follow_mapping(query, field)
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
@@ -178,7 +183,7 @@ def unmute_conversation!(conversation)
end
def unblock_domain!(other_domain)
- block = domain_blocks.find_by(domain: other_domain)
+ block = domain_blocks.find_by(domain: normalized_domain(other_domain))
block&.destroy
end
@@ -242,10 +247,6 @@ def pinned?(status)
status_pins.exists?(status: status)
end
- def endorsed?(account)
- account_pins.exists?(target_account: account)
- end
-
def status_matches_filters(status)
active_filters = CustomFilter.cached_filters_for(id)
CustomFilter.apply_cached_filters(active_filters, status)
@@ -254,13 +255,13 @@ def status_matches_filters(status)
def followers_for_local_distribution
followers.local
.joins(:user)
- .where('users.current_sign_in_at > ?', User::ACTIVE_DURATION.ago)
+ .merge(User.signed_in_recently)
end
def lists_for_local_distribution
scope = lists.joins(account: :user)
scope.where.not(list_accounts: { follow_id: nil }).or(scope.where(account_id: id))
- .where('users.current_sign_in_at > ?', User::ACTIVE_DURATION.ago)
+ .merge(User.signed_in_recently)
end
def remote_followers_hash(url)
@@ -300,4 +301,8 @@ def relations_map(account_ids, domains = nil, **options)
domain_blocking_by_domain: Account.domain_blocking_map_by_domain(domains, id),
})
end
+
+ def normalized_domain(domain)
+ TagManager.instance.normalize_domain(domain)
+ end
end
diff --git a/app/models/concerns/account/merging.rb b/app/models/concerns/account/merging.rb
index 960ee1819f840b..bd8b162238b030 100644
--- a/app/models/concerns/account/merging.rb
+++ b/app/models/concerns/account/merging.rb
@@ -27,6 +27,16 @@ def merge_with!(other_account)
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 @@ def merge_with!(other_account)
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/account/statuses_search.rb b/app/models/concerns/account/statuses_search.rb
index 334b7145043cc2..93452b78b06ce0 100644
--- a/app/models/concerns/account/statuses_search.rb
+++ b/app/models/concerns/account/statuses_search.rb
@@ -31,7 +31,7 @@ def enqueue_remove_from_public_statuses_index
def add_to_public_statuses_index!
return unless Chewy.enabled?
- statuses.without_reblogs.where(visibility: :public).reorder(nil).find_in_batches do |batch|
+ statuses.without_reblogs.public_visibility.reorder(nil).find_in_batches do |batch|
PublicStatusesIndex.import(batch)
end
end
diff --git a/app/models/concerns/attachmentable.rb b/app/models/concerns/attachmentable.rb
index 3b7db1fcef3b7c..f457f5822b0b1b 100644
--- a/app/models/concerns/attachmentable.rb
+++ b/app/models/concerns/attachmentable.rb
@@ -23,7 +23,7 @@ module Attachmentable
included do
def self.has_attached_file(name, options = {}) # rubocop:disable Naming/PredicateName
- super(name, options)
+ super
send(:"before_#{name}_validate", prepend: true) do
attachment = send(name)
diff --git a/app/models/concerns/browser_detection.rb b/app/models/concerns/browser_detection.rb
new file mode 100644
index 00000000000000..d42d0a5c998283
--- /dev/null
+++ b/app/models/concerns/browser_detection.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module BrowserDetection
+ extend ActiveSupport::Concern
+
+ included do
+ before_save :assign_user_agent
+ end
+
+ def detection
+ @detection ||= Browser.new(user_agent)
+ end
+
+ def browser
+ detection.id
+ end
+
+ def platform
+ detection.platform.id
+ end
+
+ private
+
+ def assign_user_agent
+ self.user_agent ||= ''
+ end
+end
diff --git a/app/models/concerns/cacheable.rb b/app/models/concerns/cacheable.rb
index d7524cdfd011b0..0633f20c779681 100644
--- a/app/models/concerns/cacheable.rb
+++ b/app/models/concerns/cacheable.rb
@@ -14,6 +14,10 @@ def with_includes
includes(@cache_associated)
end
+ def preload_cacheable_associations(records)
+ ActiveRecord::Associations::Preloader.new(records: records, associations: @cache_associated).call
+ end
+
def cache_ids
select(:id, :updated_at)
end
diff --git a/app/models/concerns/custom_filter_cache.rb b/app/models/concerns/custom_filter_cache.rb
new file mode 100644
index 00000000000000..79b22f11f1e15b
--- /dev/null
+++ b/app/models/concerns/custom_filter_cache.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module CustomFilterCache
+ extend ActiveSupport::Concern
+
+ included do
+ after_commit :invalidate_cache!
+ before_destroy :prepare_cache_invalidation!
+ before_save :prepare_cache_invalidation!
+
+ delegate(
+ :invalidate_cache!,
+ :prepare_cache_invalidation!,
+ to: :custom_filter
+ )
+ end
+end
diff --git a/app/models/concerns/database_view_record.rb b/app/models/concerns/database_view_record.rb
new file mode 100644
index 00000000000000..8b6672e2991a4c
--- /dev/null
+++ b/app/models/concerns/database_view_record.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module DatabaseViewRecord
+ extend ActiveSupport::Concern
+
+ class_methods do
+ def refresh
+ Scenic.database.refresh_materialized_view(
+ table_name,
+ concurrently: true,
+ cascade: false
+ )
+ rescue ActiveRecord::StatementInvalid
+ Scenic.database.refresh_materialized_view(
+ table_name,
+ concurrently: false,
+ cascade: false
+ )
+ end
+ end
+
+ def readonly?
+ true
+ end
+end
diff --git a/app/models/concerns/domain_normalizable.rb b/app/models/concerns/domain_normalizable.rb
index 8e244c1d87c2a5..76f91c5b64029c 100644
--- a/app/models/concerns/domain_normalizable.rb
+++ b/app/models/concerns/domain_normalizable.rb
@@ -5,6 +5,18 @@ module DomainNormalizable
included do
before_validation :normalize_domain
+
+ scope :by_domain_length, -> { order(domain_char_length.desc) }
+ end
+
+ class_methods do
+ def domain_char_length
+ Arel.sql(
+ <<~SQL.squish
+ CHAR_LENGTH(domain)
+ SQL
+ )
+ end
end
private
diff --git a/app/models/concerns/expireable.rb b/app/models/concerns/expireable.rb
index c64fc7d807d006..26740e8213759d 100644
--- a/app/models/concerns/expireable.rb
+++ b/app/models/concerns/expireable.rb
@@ -4,7 +4,7 @@ module Expireable
extend ActiveSupport::Concern
included do
- scope :expired, -> { where.not(expires_at: nil).where('expires_at < ?', Time.now.utc) }
+ scope :expired, -> { where.not(expires_at: nil).where(expires_at: ...Time.now.utc) }
def expires_in
return @expires_in if defined?(@expires_in)
diff --git a/app/models/concerns/legacy_otp_secret.rb b/app/models/concerns/legacy_otp_secret.rb
new file mode 100644
index 00000000000000..466c4ec9bb3e98
--- /dev/null
+++ b/app/models/concerns/legacy_otp_secret.rb
@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+# TODO: This file is here for legacy support during devise-two-factor upgrade.
+# It should be removed after all records have been migrated.
+
+module LegacyOtpSecret
+ extend ActiveSupport::Concern
+
+ private
+
+ # Decrypt and return the `encrypted_otp_secret` attribute which was used in
+ # prior versions of devise-two-factor
+ # @return [String] The decrypted OTP secret
+ def legacy_otp_secret
+ return nil unless self[:encrypted_otp_secret]
+ return nil unless self.class.otp_secret_encryption_key
+
+ hmac_iterations = 2000 # a default set by the Encryptor gem
+ key = self.class.otp_secret_encryption_key
+ salt = Base64.decode64(encrypted_otp_secret_salt)
+ iv = Base64.decode64(encrypted_otp_secret_iv)
+
+ raw_cipher_text = Base64.decode64(encrypted_otp_secret)
+ # The last 16 bytes of the ciphertext are the authentication tag - we use
+ # Galois Counter Mode which is an authenticated encryption mode
+ cipher_text = raw_cipher_text[0..-17]
+ auth_tag = raw_cipher_text[-16..-1] # rubocop:disable Style/SlicingWithRange
+
+ # this alrorithm lifted from
+ # https://github.com/attr-encrypted/encryptor/blob/master/lib/encryptor.rb#L54
+
+ # create an OpenSSL object which will decrypt the AES cipher with 256 bit
+ # keys in Galois Counter Mode (GCM). See
+ # https://ruby.github.io/openssl/OpenSSL/Cipher.html
+ cipher = OpenSSL::Cipher.new('aes-256-gcm')
+
+ # tell the cipher we want to decrypt. Symmetric algorithms use a very
+ # similar process for encryption and decryption, hence the same object can
+ # do both.
+ cipher.decrypt
+
+ # Use a Password-Based Key Derivation Function to generate the key actually
+ # used for encryptoin from the key we got as input.
+ cipher.key = OpenSSL::PKCS5.pbkdf2_hmac_sha1(key, salt, hmac_iterations, cipher.key_len)
+
+ # set the Initialization Vector (IV)
+ cipher.iv = iv
+
+ # The tag must be set after calling Cipher#decrypt, Cipher#key= and
+ # Cipher#iv=, but before calling Cipher#final. After all decryption is
+ # performed, the tag is verified automatically in the call to Cipher#final.
+ #
+ # If the auth_tag does not verify, then #final will raise OpenSSL::Cipher::CipherError
+ cipher.auth_tag = auth_tag
+
+ # auth_data must be set after auth_tag has been set when decrypting See
+ # http://ruby-doc.org/stdlib-2.0.0/libdoc/openssl/rdoc/OpenSSL/Cipher.html#method-i-auth_data-3D
+ # we are not adding any authenticated data but OpenSSL docs say this should
+ # still be called.
+ cipher.auth_data = ''
+
+ # #update is (somewhat confusingly named) the method which actually
+ # performs the decryption on the given chunk of data. Our OTP secret is
+ # short so we only need to call it once.
+ #
+ # It is very important that we call #final because:
+ #
+ # 1. The authentication tag is checked during the call to #final
+ # 2. Block based cipher modes (e.g. CBC) work on fixed size chunks. We need
+ # to call #final to get it to process the last chunk properly. The output
+ # of #final should be appended to the decrypted value. This isn't
+ # required for streaming cipher modes but including it is a best practice
+ # so that your code will continue to function correctly even if you later
+ # change to a block cipher mode.
+ cipher.update(cipher_text) + cipher.final
+ end
+end
diff --git a/app/models/concerns/ranked_trend.rb b/app/models/concerns/ranked_trend.rb
new file mode 100644
index 00000000000000..add36afb0c2829
--- /dev/null
+++ b/app/models/concerns/ranked_trend.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module RankedTrend
+ extend ActiveSupport::Concern
+
+ included do
+ scope :by_rank, -> { order(rank: :desc) }
+ scope :ranked_below, ->(value) { where(rank: ..value) }
+ end
+
+ class_methods do
+ def recalculate_ordered_rank
+ connection
+ .exec_update(<<~SQL.squish)
+ UPDATE #{table_name}
+ SET rank = inner_ordered.calculated_rank
+ FROM (
+ SELECT id, row_number() OVER w AS calculated_rank
+ FROM #{table_name}
+ WINDOW w AS (
+ PARTITION BY language
+ ORDER BY score DESC
+ )
+ ) inner_ordered
+ WHERE #{table_name}.id = inner_ordered.id
+ SQL
+ end
+ end
+end
diff --git a/app/models/concerns/status/search_concern.rb b/app/models/concerns/status/search_concern.rb
index c16db8bd8c40aa..3f31b3b6750991 100644
--- a/app/models/concerns/status/search_concern.rb
+++ b/app/models/concerns/status/search_concern.rb
@@ -4,7 +4,7 @@ module Status::SearchConcern
extend ActiveSupport::Concern
included do
- scope :indexable, -> { without_reblogs.where(visibility: :public).joins(:account).where(account: { indexable: true }) }
+ scope :indexable, -> { without_reblogs.public_visibility.joins(:account).where(account: { indexable: true }) }
end
def searchable_by
diff --git a/app/models/concerns/status/threading_concern.rb b/app/models/concerns/status/threading_concern.rb
index 2606fd2f2783c2..478a139d633be2 100644
--- a/app/models/concerns/status/threading_concern.rb
+++ b/app/models/concerns/status/threading_concern.rb
@@ -3,6 +3,23 @@
module Status::ThreadingConcern
extend ActiveSupport::Concern
+ class_methods do
+ def permitted_statuses_from_ids(ids, account, stable: false)
+ statuses = Status.with_accounts(ids).to_a
+ account_ids = statuses.map(&:account_id).uniq
+ domains = statuses.filter_map(&:account_domain).uniq
+ relations = account&.relations_map(account_ids, domains) || {}
+
+ statuses.reject! { |status| StatusFilter.new(status, account, relations).filtered? }
+
+ if stable
+ statuses.sort_by! { |status| ids.index(status.id) }
+ else
+ statuses
+ end
+ end
+ end
+
def ancestors(limit, account = nil)
find_statuses_from_tree_path(ancestor_ids(limit), account)
end
@@ -12,7 +29,7 @@ def descendants(limit, account = nil, depth = nil)
end
def self_replies(limit)
- account.statuses.where(in_reply_to_id: id, visibility: [:public, :unlisted]).reorder(id: :asc).limit(limit)
+ account.statuses.distributable_visibility.where(in_reply_to_id: id).reorder(id: :asc).limit(limit)
end
private
@@ -76,15 +93,7 @@ def descendant_ids(limit, depth)
end
def find_statuses_from_tree_path(ids, account, promote: false)
- statuses = Status.with_accounts(ids).to_a
- account_ids = statuses.map(&:account_id).uniq
- domains = statuses.filter_map(&:account_domain).uniq
- relations = account&.relations_map(account_ids, domains) || {}
-
- statuses.reject! { |status| StatusFilter.new(status, account, relations).filtered? }
-
- # Order ancestors/descendants by tree path
- statuses.sort_by! { |status| ids.index(status.id) }
+ statuses = Status.permitted_statuses_from_ids(ids, account, stable: true)
# Bring self-replies to the top
if promote
diff --git a/app/models/concerns/user/has_settings.rb b/app/models/concerns/user/has_settings.rb
index 8b599dbf967253..53100cc097b4f5 100644
--- a/app/models/concerns/user/has_settings.rb
+++ b/app/models/concerns/user/has_settings.rb
@@ -27,10 +27,6 @@ def setting_default_sensitive
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/concerns/user/ldap_authenticable.rb b/app/models/concerns/user/ldap_authenticable.rb
index 180df9d3101ebb..fc1ee78d099376 100644
--- a/app/models/concerns/user/ldap_authenticable.rb
+++ b/app/models/concerns/user/ldap_authenticable.rb
@@ -22,7 +22,7 @@ def ldap_get_user(attributes = {})
safe_username = safe_username.gsub(keys, replacement)
end
- resource = joins(:account).find_by(accounts: { username: safe_username })
+ resource = joins(:account).merge(Account.with_username(safe_username)).take
if resource.blank?
resource = new(
diff --git a/app/models/custom_filter.rb b/app/models/custom_filter.rb
index c8120c239547a0..bacf1582618edc 100644
--- a/app/models/custom_filter.rb
+++ b/app/models/custom_filter.rb
@@ -28,10 +28,12 @@ class CustomFilter < ApplicationRecord
account
).freeze
+ EXPIRATION_DURATIONS = [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week].freeze
+
include Expireable
include Redisable
- enum action: { warn: 0, hide: 1 }, _suffix: :action
+ enum :action, { warn: 0, hide: 1 }, suffix: :action
belongs_to :account
has_many :keywords, class_name: 'CustomFilterKeyword', inverse_of: :custom_filter, dependent: :destroy
@@ -41,17 +43,17 @@ class CustomFilter < ApplicationRecord
validates :title, :context, presence: true
validate :context_must_be_valid
- before_validation :clean_up_contexts
+ normalizes :context, with: ->(context) { context.map(&:strip).filter_map(&:presence) }
+ scope :unexpired, -> { where(expires_at: nil).or where.not(expires_at: ..Time.zone.now) }
before_save :prepare_cache_invalidation!
before_destroy :prepare_cache_invalidation!
after_commit :invalidate_cache!
def expires_in
- return @expires_in if defined?(@expires_in)
return nil if expires_at.nil?
- [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week].find { |expires_in| expires_in.from_now >= expires_at }
+ EXPIRATION_DURATIONS.find { |expires_in| expires_in.from_now >= expires_at }
end
def irreversible=(value)
@@ -66,14 +68,16 @@ def self.cached_filters_for(account_id)
active_filters = Rails.cache.fetch("filters:v3:#{account_id}") do
filters_hash = {}
- scope = CustomFilterKeyword.includes(:custom_filter).where(custom_filter: { account_id: account_id }).where(Arel.sql('expires_at IS NULL OR expires_at > NOW()'))
+ scope = CustomFilterKeyword.left_outer_joins(:custom_filter).merge(unexpired.where(account_id: account_id))
+
scope.to_a.group_by(&:custom_filter).each do |filter, keywords|
keywords.map!(&:to_regex)
filters_hash[filter.id] = { keywords: Regexp.union(keywords), filter: filter }
end.to_h
- scope = CustomFilterStatus.includes(:custom_filter).where(custom_filter: { account_id: account_id }).where(Arel.sql('expires_at IS NULL OR expires_at > NOW()'))
+ scope = CustomFilterStatus.left_outer_joins(:custom_filter).merge(unexpired.where(account_id: account_id))
+
scope.to_a.group_by(&:custom_filter).each do |filter, statuses|
filters_hash[filter.id] ||= { filter: filter }
filters_hash[filter.id].merge!(status_ids: statuses.map(&:status_id))
@@ -114,10 +118,6 @@ def invalidate_cache!
private
- def clean_up_contexts
- self.context = Array(context).map(&:strip).filter_map(&:presence)
- end
-
def context_must_be_valid
errors.add(:context, I18n.t('filters.errors.invalid_context')) if invalid_context_value?
end
diff --git a/app/models/custom_filter_keyword.rb b/app/models/custom_filter_keyword.rb
index 979d0b822e6960..112798b10a91d8 100644
--- a/app/models/custom_filter_keyword.rb
+++ b/app/models/custom_filter_keyword.rb
@@ -13,16 +13,14 @@
#
class CustomFilterKeyword < ApplicationRecord
+ include CustomFilterCache
+
belongs_to :custom_filter
validates :keyword, presence: true
alias_attribute :phrase, :keyword
- before_save :prepare_cache_invalidation!
- before_destroy :prepare_cache_invalidation!
- after_commit :invalidate_cache!
-
def to_regex
if whole_word?
/(?mix:#{to_regex_sb}#{Regexp.escape(keyword)}#{to_regex_eb})/
@@ -40,12 +38,4 @@ def to_regex_sb
def to_regex_eb
/[[:word:]]\z/.match?(keyword) ? '\b' : ''
end
-
- def prepare_cache_invalidation!
- custom_filter.prepare_cache_invalidation!
- end
-
- def invalidate_cache!
- custom_filter.invalidate_cache!
- end
end
diff --git a/app/models/custom_filter_status.rb b/app/models/custom_filter_status.rb
index 0a5650204ac9f5..58b61cd79d4021 100644
--- a/app/models/custom_filter_status.rb
+++ b/app/models/custom_filter_status.rb
@@ -12,27 +12,17 @@
#
class CustomFilterStatus < ApplicationRecord
+ include CustomFilterCache
+
belongs_to :custom_filter
belongs_to :status
validates :status, uniqueness: { scope: :custom_filter }
validate :validate_status_access
- before_save :prepare_cache_invalidation!
- before_destroy :prepare_cache_invalidation!
- after_commit :invalidate_cache!
-
private
def validate_status_access
errors.add(:status_id, :invalid) unless StatusPolicy.new(custom_filter.account, status).show?
end
-
- def prepare_cache_invalidation!
- custom_filter.prepare_cache_invalidation!
- end
-
- def invalidate_cache!
- custom_filter.invalidate_cache!
- end
end
diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb
index a05db099a8d1d8..b5d1f2e0796645 100644
--- a/app/models/domain_block.rb
+++ b/app/models/domain_block.rb
@@ -21,7 +21,7 @@ class DomainBlock < ApplicationRecord
include DomainNormalizable
include DomainMaterializable
- enum severity: { silence: 0, suspend: 1, noop: 2 }
+ enum :severity, { silence: 0, suspend: 1, noop: 2 }
validates :domain, presence: true, uniqueness: true, domain: true
@@ -70,7 +70,7 @@ def rule_for(domain)
segments = uri.normalized_host.split('.')
variants = segments.map.with_index { |_, i| segments[i..].join('.') }
- where(domain: variants).order(Arel.sql('char_length(domain) desc')).first
+ where(domain: variants).by_domain_length.first
rescue Addressable::URI::InvalidURIError, IDN::Idna::IdnaError
nil
end
diff --git a/app/models/email_domain_block.rb b/app/models/email_domain_block.rb
index 40be59420aeb44..f3a86eae8f3533 100644
--- a/app/models/email_domain_block.rb
+++ b/app/models/email_domain_block.rb
@@ -56,7 +56,7 @@ def invalid_uri?
end
def blocking?(allow_with_approval: false)
- blocks = EmailDomainBlock.where(domain: domains_with_variants, allow_with_approval: allow_with_approval).order(Arel.sql('char_length(domain) desc'))
+ blocks = EmailDomainBlock.where(domain: domains_with_variants, allow_with_approval: allow_with_approval).by_domain_length
blocks.each { |block| block.history.add(@attempt_ip) } if @attempt_ip.present?
blocks.any?
end
diff --git a/app/models/featured_tag.rb b/app/models/featured_tag.rb
index ea8aa4787c4335..cdd97205eb71f8 100644
--- a/app/models/featured_tag.rb
+++ b/app/models/featured_tag.rb
@@ -74,6 +74,6 @@ def tag_already_featured_for_account?
end
def visible_tagged_account_statuses
- account.statuses.where(visibility: %i(public unlisted)).tagged_with(tag)
+ account.statuses.distributable_visibility.tagged_with(tag)
end
end
diff --git a/app/models/feed.rb b/app/models/feed.rb
index d9cab2cd1e558f..27e12809947882 100644
--- a/app/models/feed.rb
+++ b/app/models/feed.rb
@@ -28,7 +28,7 @@ def from_redis(limit, max_id, since_id, min_id)
unhydrated = redis.zrangebyscore(key, "(#{min_id}", "(#{max_id}", limit: [0, limit], with_scores: true).map { |id| id.first.to_i }
end
- Status.where(id: unhydrated).cache_ids
+ Status.where(id: unhydrated)
end
def key
diff --git a/app/models/follow_recommendation.rb b/app/models/follow_recommendation.rb
index 9d2648394bc79f..7ac9e6dfb95743 100644
--- a/app/models/follow_recommendation.rb
+++ b/app/models/follow_recommendation.rb
@@ -10,6 +10,8 @@
#
class FollowRecommendation < ApplicationRecord
+ include DatabaseViewRecord
+
self.primary_key = :account_id
self.table_name = :global_follow_recommendations
@@ -17,12 +19,4 @@ class FollowRecommendation < ApplicationRecord
belongs_to :account
scope :localized, ->(locale) { joins(:account_summary).merge(AccountSummary.localized(locale)) }
-
- def self.refresh
- Scenic.database.refresh_materialized_view(table_name, concurrently: false, cascade: false)
- end
-
- def readonly?
- true
- end
end
diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb
index 095733673e60d8..7dde2fc3141709 100644
--- a/app/models/form/admin_settings.rb
+++ b/app/models/form/admin_settings.rb
@@ -38,13 +38,14 @@ class Form::AdminSettings
noindex
outgoing_spoilers
require_invite_text
- captcha_enabled
media_cache_retention_period
content_cache_retention_period
backups_retention_period
status_page_url
captcha_enabled
authorized_fetch
+ app_icon
+ favicon
).freeze
INTEGER_KEYS = %i(
@@ -75,6 +76,8 @@ class Form::AdminSettings
UPLOAD_KEYS = %i(
thumbnail
mascot
+ app_icon
+ favicon
).freeze
PSEUDO_KEYS = %i(
diff --git a/app/models/form/import.rb b/app/models/form/import.rb
index fc83d9c58c1fdb..3cc4af064ffafc 100644
--- a/app/models/form/import.rb
+++ b/app/models/form/import.rb
@@ -111,12 +111,14 @@ def csv_data
csv_converter = lambda do |field, field_info|
case field_info.header
when 'Show boosts', 'Notify on new posts', 'Hide notifications'
- ActiveModel::Type::Boolean.new.cast(field)
+ ActiveModel::Type::Boolean.new.cast(field&.downcase)
when 'Languages'
field&.split(',')&.map(&:strip)&.presence
when 'Account address'
field.strip.gsub(/\A@/, '')
- when '#domain', '#uri', 'List name'
+ when '#domain'
+ field&.strip&.downcase
+ when '#uri', 'List name'
field.strip
else
field
diff --git a/app/models/import.rb b/app/models/import.rb
index 7cd6cccf7cec0b..4bdb392014b70d 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -28,7 +28,7 @@ class Import < ApplicationRecord
belongs_to :account
- enum type: { following: 0, blocking: 1, muting: 2, domain_blocking: 3, bookmarks: 4 }
+ enum :type, { following: 0, blocking: 1, muting: 2, domain_blocking: 3, bookmarks: 4 }
validates :type, presence: true
diff --git a/app/models/instance.rb b/app/models/instance.rb
index 0fd31c8097cab6..3bd4b924ae73c3 100644
--- a/app/models/instance.rb
+++ b/app/models/instance.rb
@@ -9,6 +9,8 @@
#
class Instance < ApplicationRecord
+ include DatabaseViewRecord
+
self.primary_key = :domain
attr_accessor :failure_days
@@ -27,10 +29,6 @@ class Instance < ApplicationRecord
scope :by_domain_and_subdomains, ->(domain) { where("reverse('.' || domain) LIKE reverse(?)", "%.#{domain}") }
scope :with_domain_follows, ->(domains) { where(domain: domains).where(domain_account_follows) }
- def self.refresh
- Scenic.database.refresh_materialized_view(table_name, concurrently: true, cascade: false)
- end
-
def self.domain_account_follows
Arel.sql(
<<~SQL.squish
@@ -44,10 +42,6 @@ def self.domain_account_follows
)
end
- def readonly?
- true
- end
-
def delivery_failure_tracker
@delivery_failure_tracker ||= DeliveryFailureTracker.new(domain)
end
diff --git a/app/models/invite.rb b/app/models/invite.rb
index c0cbc584586196..ea095a3ac17747 100644
--- a/app/models/invite.rb
+++ b/app/models/invite.rb
@@ -19,12 +19,14 @@
class Invite < ApplicationRecord
include Expireable
+ COMMENT_SIZE_LIMIT = 420
+
belongs_to :user, inverse_of: :invites
has_many :users, inverse_of: :invite, dependent: nil
- scope :available, -> { where(expires_at: nil).or(where('expires_at >= ?', Time.now.utc)) }
+ scope :available, -> { where(expires_at: nil).or(where(expires_at: Time.now.utc..)) }
- validates :comment, length: { maximum: 420 }
+ validates :comment, length: { maximum: COMMENT_SIZE_LIMIT }
before_validation :set_code
diff --git a/app/models/ip_block.rb b/app/models/ip_block.rb
index 99783050b8aac7..d6242efbf7db24 100644
--- a/app/models/ip_block.rb
+++ b/app/models/ip_block.rb
@@ -19,11 +19,11 @@ class IpBlock < ApplicationRecord
include Expireable
include Paginable
- enum severity: {
+ enum :severity, {
sign_up_requires_approval: 5000,
sign_up_block: 5500,
no_access: 9999,
- }
+ }, prefix: true
validates :ip, :severity, presence: true
validates :ip, uniqueness: true
diff --git a/app/models/list.rb b/app/models/list.rb
index fcef49e6e9ad5f..b45bd057bc7caa 100644
--- a/app/models/list.rb
+++ b/app/models/list.rb
@@ -18,7 +18,7 @@ class List < ApplicationRecord
PER_ACCOUNT_LIMIT = 50
- enum replies_policy: { list: 0, followed: 1, none: 2 }, _prefix: :show
+ enum :replies_policy, { list: 0, followed: 1, none: 2 }, prefix: :show
belongs_to :account, optional: true
diff --git a/app/models/login_activity.rb b/app/models/login_activity.rb
index 2b7b37f8e499f6..240d571c0edd38 100644
--- a/app/models/login_activity.rb
+++ b/app/models/login_activity.rb
@@ -16,21 +16,11 @@
#
class LoginActivity < ApplicationRecord
- enum authentication_method: { password: 'password', otp: 'otp', webauthn: 'webauthn', sign_in_token: 'sign_in_token', omniauth: 'omniauth' }
+ include BrowserDetection
+
+ enum :authentication_method, { password: 'password', otp: 'otp', webauthn: 'webauthn', sign_in_token: 'sign_in_token', omniauth: 'omniauth' }
belongs_to :user
validates :authentication_method, inclusion: { in: authentication_methods.keys }
-
- def detection
- @detection ||= Browser.new(user_agent)
- end
-
- def browser
- detection.id
- end
-
- def platform
- detection.platform.id
- end
end
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index 90eda3dc8df475..bf7d2c027239a2 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -34,8 +34,8 @@ class MediaAttachment < ApplicationRecord
include Attachmentable
- enum type: { image: 0, gifv: 1, video: 2, unknown: 3, audio: 4 }
- enum processing: { queued: 0, in_progress: 1, complete: 2, failed: 3 }, _prefix: true
+ enum :type, { image: 0, gifv: 1, video: 2, unknown: 3, audio: 4 }
+ enum :processing, { queued: 0, in_progress: 1, complete: 2, failed: 3 }, prefix: true
MAX_DESCRIPTION_LENGTH = 1_500
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 54212d675f1f9b..7cbab4dc8c3510 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -12,6 +12,7 @@
# account_id :bigint(8) not null
# from_account_id :bigint(8) not null
# type :string
+# filtered :boolean default(FALSE), not null
#
class Notification < ApplicationRecord
@@ -28,18 +29,46 @@ class Notification < ApplicationRecord
'Poll' => :poll,
}.freeze
- TYPES = %i(
- mention
- status
- reblog
- follow
- follow_request
- favourite
- poll
- update
- admin.sign_up
- admin.report
- ).freeze
+ PROPERTIES = {
+ mention: {
+ filterable: true,
+ }.freeze,
+ status: {
+ filterable: false,
+ }.freeze,
+ reblog: {
+ filterable: true,
+ }.freeze,
+ follow: {
+ filterable: true,
+ }.freeze,
+ follow_request: {
+ filterable: true,
+ }.freeze,
+ favourite: {
+ filterable: true,
+ }.freeze,
+ poll: {
+ filterable: false,
+ }.freeze,
+ update: {
+ filterable: false,
+ }.freeze,
+ severed_relationships: {
+ filterable: false,
+ }.freeze,
+ moderation_warning: {
+ filterable: false,
+ }.freeze,
+ 'admin.sign_up': {
+ filterable: false,
+ }.freeze,
+ 'admin.report': {
+ filterable: false,
+ }.freeze,
+ }.freeze
+
+ TYPES = PROPERTIES.keys.freeze
TARGET_STATUS_INCLUDES_BY_TYPE = {
status: :status,
@@ -63,6 +92,8 @@ 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
+ belongs_to :account_warning, inverse_of: false
end
validates :type, inclusion: { in: TYPES }
@@ -89,7 +120,7 @@ def target_status
end
class << self
- def browserable(types: [], exclude_types: [], from_account_id: nil)
+ def browserable(types: [], exclude_types: [], from_account_id: nil, include_filtered: false)
requested_types = if types.empty?
TYPES
else
@@ -99,6 +130,7 @@ def browserable(types: [], exclude_types: [], from_account_id: nil)
requested_types -= exclude_types.map(&:to_sym)
all.tap do |scope|
+ scope.merge!(where(filtered: false)) unless include_filtered || from_account_id.present?
scope.merge!(where(from_account_id: from_account_id)) if from_account_id.present?
scope.merge!(where(type: requested_types)) unless requested_types.size == TYPES.size
end
@@ -144,6 +176,8 @@ def preload_cache_collection_target_statuses(notifications, &_block)
after_initialize :set_from_account
before_validation :set_from_account
+ after_destroy :remove_from_notification_request
+
private
def set_from_account
@@ -156,6 +190,16 @@ def set_from_account
self.from_account_id = activity&.status&.account_id
when 'Account'
self.from_account_id = activity&.id
+ when 'AccountRelationshipSeveranceEvent', 'AccountWarning'
+ # 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
+
+ def remove_from_notification_request
+ notification_request = NotificationRequest.find_by(account_id: account_id, from_account_id: from_account_id)
+ notification_request&.reconsider_existence!
+ end
end
diff --git a/app/models/notification_permission.rb b/app/models/notification_permission.rb
new file mode 100644
index 00000000000000..e0001473f815a8
--- /dev/null
+++ b/app/models/notification_permission.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: notification_permissions
+#
+# id :bigint(8) not null, primary key
+# account_id :bigint(8) not null
+# from_account_id :bigint(8) not null
+# created_at :datetime not null
+# updated_at :datetime not null
+#
+class NotificationPermission < ApplicationRecord
+ belongs_to :account
+ belongs_to :from_account, class_name: 'Account'
+end
diff --git a/app/models/notification_policy.rb b/app/models/notification_policy.rb
new file mode 100644
index 00000000000000..f10b0c2a816e9e
--- /dev/null
+++ b/app/models/notification_policy.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: notification_policies
+#
+# id :bigint(8) not null, primary key
+# account_id :bigint(8) not null
+# filter_not_following :boolean default(FALSE), not null
+# filter_not_followers :boolean default(FALSE), not null
+# filter_new_accounts :boolean default(FALSE), not null
+# filter_private_mentions :boolean default(TRUE), not null
+# created_at :datetime not null
+# updated_at :datetime not null
+#
+
+class NotificationPolicy < ApplicationRecord
+ belongs_to :account
+
+ has_many :notification_requests, primary_key: :account_id, foreign_key: :account_id, dependent: nil, inverse_of: false
+
+ attr_reader :pending_requests_count, :pending_notifications_count
+
+ MAX_MEANINGFUL_COUNT = 100
+
+ def summarize!
+ @pending_requests_count = pending_notification_requests.first
+ @pending_notifications_count = pending_notification_requests.last
+ end
+
+ private
+
+ def pending_notification_requests
+ @pending_notification_requests ||= notification_requests.where(dismissed: false).limit(MAX_MEANINGFUL_COUNT).pick(Arel.sql('count(*), coalesce(sum(notifications_count), 0)::bigint'))
+ end
+end
diff --git a/app/models/notification_request.rb b/app/models/notification_request.rb
new file mode 100644
index 00000000000000..6e9cae66255032
--- /dev/null
+++ b/app/models/notification_request.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: notification_requests
+#
+# id :bigint(8) not null, primary key
+# account_id :bigint(8) not null
+# from_account_id :bigint(8) not null
+# last_status_id :bigint(8)
+# notifications_count :bigint(8) default(0), not null
+# dismissed :boolean default(FALSE), not null
+# created_at :datetime not null
+# updated_at :datetime not null
+#
+
+class NotificationRequest < ApplicationRecord
+ include Paginable
+
+ MAX_MEANINGFUL_COUNT = 100
+
+ belongs_to :account
+ belongs_to :from_account, class_name: 'Account'
+ belongs_to :last_status, class_name: 'Status'
+
+ before_save :prepare_notifications_count
+
+ def self.preload_cache_collection(requests)
+ cached_statuses_by_id = yield(requests.filter_map(&:last_status)).index_by(&:id) # Call cache_collection in block
+
+ requests.each do |request|
+ request.last_status = cached_statuses_by_id[request.last_status_id] unless request.last_status_id.nil?
+ end
+ end
+
+ def reconsider_existence!
+ return if dismissed?
+
+ prepare_notifications_count
+
+ if notifications_count.positive?
+ save
+ else
+ destroy
+ end
+ end
+
+ private
+
+ def prepare_notifications_count
+ self.notifications_count = Notification.where(account: account, from_account: from_account, filtered: true).limit(MAX_MEANINGFUL_COUNT).count
+ end
+end
diff --git a/app/models/preview_card.rb b/app/models/preview_card.rb
index 83759274306cf3..11fdd9d88ac346 100644
--- a/app/models/preview_card.rb
+++ b/app/models/preview_card.rb
@@ -32,6 +32,7 @@
# link_type :integer
# published_at :datetime
# image_description :string default(""), not null
+# author_account_id :bigint(8)
#
class PreviewCard < ApplicationRecord
@@ -47,13 +48,14 @@ class PreviewCard < ApplicationRecord
self.inheritance_column = false
- enum type: { link: 0, photo: 1, video: 2, rich: 3 }
- enum link_type: { unknown: 0, article: 1 }
+ enum :type, { link: 0, photo: 1, video: 2, rich: 3 }
+ enum :link_type, { unknown: 0, article: 1 }
has_many :preview_cards_statuses, dependent: :delete_all, inverse_of: :preview_card
has_many :statuses, through: :preview_cards_statuses
has_one :trend, class_name: 'PreviewCardTrend', inverse_of: :preview_card, dependent: :destroy
+ belongs_to :author_account, class_name: 'Account', optional: true
has_attached_file :image, processors: [:thumbnail, :blurhash_transcoder], styles: ->(f) { image_styles(f) }, convert_options: { all: '-quality 90 +profile "!icc,*" +set date:modify +set date:create +set date:timestamp' }, validate_media_type: false
diff --git a/app/models/preview_card_provider.rb b/app/models/preview_card_provider.rb
index 8ba24331bbabfb..756707e3f1aed8 100644
--- a/app/models/preview_card_provider.rb
+++ b/app/models/preview_card_provider.rb
@@ -54,6 +54,6 @@ def requires_review_notification?
def self.matching_domain(domain)
segments = domain.split('.')
- where(domain: segments.map.with_index { |_, i| segments[i..].join('.') }).order(Arel.sql('char_length(domain) desc')).first
+ where(domain: segments.map.with_index { |_, i| segments[i..].join('.') }).by_domain_length.first
end
end
diff --git a/app/models/preview_card_trend.rb b/app/models/preview_card_trend.rb
index 018400dfa99753..58155971a368cd 100644
--- a/app/models/preview_card_trend.rb
+++ b/app/models/preview_card_trend.rb
@@ -12,6 +12,10 @@
# language :string
#
class PreviewCardTrend < ApplicationRecord
+ include RankedTrend
+
belongs_to :preview_card
+
scope :allowed, -> { where(allowed: true) }
+ scope :not_allowed, -> { where(allowed: false) }
end
diff --git a/app/models/public_feed.rb b/app/models/public_feed.rb
index b40e47b609f8b7..18f355de40d6a4 100644
--- a/app/models/public_feed.rb
+++ b/app/models/public_feed.rb
@@ -33,7 +33,7 @@ def get(limit, max_id = nil, since_id = nil, min_id = nil)
scope.merge!(without_duplicate_reblogs) if with_reblogs?
- scope.cache_ids.to_a_paginated_by_id(limit, max_id: max_id, since_id: since_id, min_id: min_id)
+ scope.to_a_paginated_by_id(limit, max_id: max_id, since_id: since_id, min_id: min_id)
end
private
@@ -73,7 +73,7 @@ def media_only?
end
def public_scope
- Status.with_public_visibility.joins(:account).merge(Account.without_suspended.without_silenced)
+ Status.public_visibility.joins(:account).merge(Account.without_suspended.without_silenced)
end
def local_only_scope
diff --git a/app/models/relationship_filter.rb b/app/models/relationship_filter.rb
index d686f9ed89db44..828610e46a48d6 100644
--- a/app/models/relationship_filter.rb
+++ b/app/models/relationship_filter.rb
@@ -114,7 +114,7 @@ def order_scope(value)
def activity_scope(value)
case value
when 'dormant'
- Account.joins(:account_stat).where(account_stat: { last_status_at: [nil, ...1.month.ago] })
+ Account.dormant
else
raise Mastodon::InvalidParameterError, "Unknown activity: #{value}"
end
diff --git a/app/models/relationship_severance_event.rb b/app/models/relationship_severance_event.rb
new file mode 100644
index 00000000000000..30ada2576714d3
--- /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/relay.rb b/app/models/relay.rb
index 8d697b891f9360..f652b4864b66c0 100644
--- a/app/models/relay.rb
+++ b/app/models/relay.rb
@@ -15,7 +15,7 @@
class Relay < ApplicationRecord
validates :inbox_url, presence: true, uniqueness: true, url: true, if: :will_save_change_to_inbox_url?
- enum state: { idle: 0, pending: 1, accepted: 2, rejected: 3 }
+ enum :state, { idle: 0, pending: 1, accepted: 2, rejected: 3 }
scope :enabled, -> { accepted }
diff --git a/app/models/report.rb b/app/models/report.rb
index 38da26d7b75408..3df5a20e1819c1 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -26,6 +26,8 @@ class Report < ApplicationRecord
include Paginable
include RateLimitable
+ COMMENT_SIZE_LIMIT = 1_000
+
rate_limit by: :account, family: :reports
belongs_to :account
@@ -46,16 +48,16 @@ class Report < ApplicationRecord
# A report is considered local if the reporter is local
delegate :local?, to: :account
- validates :comment, length: { maximum: 1_000 }, if: :local?
- validates :rule_ids, absence: true, unless: :violation?
+ validates :comment, length: { maximum: COMMENT_SIZE_LIMIT }, if: :local?
+ validates :rule_ids, absence: true, if: -> { (category_changed? || rule_ids_changed?) && !violation? }
- validate :validate_rule_ids
+ validate :validate_rule_ids, if: -> { (category_changed? || rule_ids_changed?) && violation? }
# entries here need to be kept in sync with the front-end:
# - app/javascript/mastodon/features/notifications/components/report.jsx
# - app/javascript/mastodon/features/report/category.jsx
# - app/javascript/mastodon/components/admin/ReportReasonSelector.jsx
- enum category: {
+ enum :category, {
other: 0,
spam: 1_000,
legal: 1_500,
@@ -162,8 +164,6 @@ def set_uri
end
def validate_rule_ids
- return unless violation?
-
errors.add(:rule_ids, I18n.t('reports.errors.invalid_rules')) unless rules.size == rule_ids&.size
end
diff --git a/app/models/report_note.rb b/app/models/report_note.rb
index 74b46027e8bb42..7361c97e670a5e 100644
--- a/app/models/report_note.rb
+++ b/app/models/report_note.rb
@@ -13,10 +13,12 @@
#
class ReportNote < ApplicationRecord
+ CONTENT_SIZE_LIMIT = 2_000
+
belongs_to :account
belongs_to :report, inverse_of: :notes, touch: true
scope :latest, -> { reorder(created_at: :desc) }
- validates :content, presence: true, length: { maximum: 500 }
+ validates :content, presence: true, length: { maximum: CONTENT_SIZE_LIMIT }
end
diff --git a/app/models/rule.rb b/app/models/rule.rb
index 602e5d5874ee0e..99a36397aa3736 100644
--- a/app/models/rule.rb
+++ b/app/models/rule.rb
@@ -10,13 +10,16 @@
# text :text default(""), not null
# created_at :datetime not null
# updated_at :datetime not null
+# hint :text default(""), not null
#
class Rule < ApplicationRecord
include Discard::Model
+ TEXT_SIZE_LIMIT = 300
+
self.discard_column = :deleted_at
- validates :text, presence: true, length: { maximum: 300 }
+ validates :text, presence: true, length: { maximum: TEXT_SIZE_LIMIT }
scope :ordered, -> { kept.order(priority: :asc, id: :asc) }
end
diff --git a/app/models/session_activation.rb b/app/models/session_activation.rb
index c67180d3baf54e..d0a77daf0a666c 100644
--- a/app/models/session_activation.rb
+++ b/app/models/session_activation.rb
@@ -16,6 +16,8 @@
#
class SessionActivation < ApplicationRecord
+ include BrowserDetection
+
belongs_to :user, inverse_of: :session_activations
belongs_to :access_token, class_name: 'Doorkeeper::AccessToken', dependent: :destroy, optional: true
belongs_to :web_push_subscription, class_name: 'Web::PushSubscription', dependent: :destroy, optional: true
@@ -24,19 +26,6 @@ class SessionActivation < ApplicationRecord
to: :access_token,
allow_nil: true
- def detection
- @detection ||= Browser.new(user_agent)
- end
-
- def browser
- detection.id
- end
-
- def platform
- detection.platform.id
- end
-
- before_save :assign_user_agent
before_create :assign_access_token
class << self
@@ -67,10 +56,6 @@ def exclusive(id)
private
- def assign_user_agent
- self.user_agent = '' if user_agent.nil?
- end
-
def assign_access_token
self.access_token = Doorkeeper::AccessToken.create!(access_token_attributes)
end
diff --git a/app/models/severed_relationship.rb b/app/models/severed_relationship.rb
new file mode 100644
index 00000000000000..64b5b0001b751a
--- /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/site_upload.rb b/app/models/site_upload.rb
index 03d472cdb2e737..6431d1007d1434 100644
--- a/app/models/site_upload.rb
+++ b/app/models/site_upload.rb
@@ -19,7 +19,30 @@
class SiteUpload < ApplicationRecord
include Attachmentable
+ FAVICON_SIZES = [16, 32, 48].freeze
+ APPLE_ICON_SIZES = [57, 60, 72, 76, 114, 120, 144, 152, 167, 180, 1024].freeze
+ ANDROID_ICON_SIZES = [36, 48, 72, 96, 144, 192, 256, 384, 512].freeze
+
+ APP_ICON_SIZES = (APPLE_ICON_SIZES + ANDROID_ICON_SIZES).uniq.freeze
+
STYLES = {
+ app_icon:
+ APP_ICON_SIZES.to_h do |size|
+ [:"#{size}", { format: 'png', geometry: "#{size}x#{size}#", file_geometry_parser: FastGeometryParser }]
+ end.freeze,
+
+ favicon: {
+ ico: {
+ format: 'ico',
+ geometry: '48x48#',
+ file_geometry_parser: FastGeometryParser,
+ }.freeze,
+ }.merge(
+ FAVICON_SIZES.to_h do |size|
+ [:"#{size}", { format: 'png', geometry: "#{size}x#{size}#", file_geometry_parser: FastGeometryParser }]
+ end
+ ).freeze,
+
thumbnail: {
'@1x': {
format: 'png',
diff --git a/app/models/software_update.rb b/app/models/software_update.rb
index cb3a6df2aeb96e..51a73c27311d9a 100644
--- a/app/models/software_update.rb
+++ b/app/models/software_update.rb
@@ -16,7 +16,7 @@
class SoftwareUpdate < ApplicationRecord
self.inheritance_column = nil
- enum type: { patch: 0, minor: 1, major: 2 }, _suffix: :type
+ enum :type, { patch: 0, minor: 1, major: 2 }, suffix: :type
def gem_version
Gem::Version.new(version)
diff --git a/app/models/status.rb b/app/models/status.rb
index 18c9176b3a4420..a6ea7bb90b3e28 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -41,6 +41,8 @@ class Status < ApplicationRecord
include Status::SnapshotConcern
include Status::ThreadingConcern
+ MEDIA_ATTACHMENTS_LIMIT = 4
+
rate_limit by: :account, family: :statuses
self.discard_column = :deleted_at
@@ -52,7 +54,7 @@ class Status < ApplicationRecord
update_index('statuses', :proper)
update_index('public_statuses', :proper)
- enum visibility: { public: 0, unlisted: 1, private: 2, direct: 3, limited: 4 }, _suffix: :visibility
+ enum :visibility, { public: 0, unlisted: 1, private: 2, direct: 3, limited: 4 }, suffix: :visibility
belongs_to :application, class_name: 'Doorkeeper::Application', optional: true
@@ -84,7 +86,7 @@ class Status < ApplicationRecord
has_many :local_reblogged, -> { merge(Account.local) }, through: :reblogs, source: :account
has_many :local_bookmarked, -> { merge(Account.local) }, through: :bookmarks, source: :account
- has_and_belongs_to_many :tags
+ has_and_belongs_to_many :tags # rubocop:disable Rails/HasAndBelongsToMany
has_one :preview_cards_status, inverse_of: :status, dependent: :delete
@@ -109,12 +111,13 @@ class Status < ApplicationRecord
scope :remote, -> { where(local: false).where.not(uri: nil) }
scope :local, -> { where(local: true).or(where(uri: nil)) }
scope :with_accounts, ->(ids) { where(id: ids).includes(:account) }
- scope :without_replies, -> { where('statuses.reply = FALSE OR statuses.in_reply_to_account_id = statuses.account_id') }
+ scope :without_replies, -> { not_reply.or(reply_to_account) }
+ scope :not_reply, -> { where(reply: false) }
+ scope :reply_to_account, -> { where(arel_table[:in_reply_to_account_id].eq arel_table[:account_id]) }
scope :without_reblogs, -> { where(statuses: { reblog_of_id: nil }) }
- scope :with_public_visibility, -> { where(visibility: :public) }
scope :tagged_with, ->(tag_ids) { joins(:statuses_tags).where(statuses_tags: { tag_id: tag_ids }) }
scope :not_excluded_by_account, ->(account) { where.not(account_id: account.excluded_from_timeline_account_ids) }
- scope :not_domain_blocked_by_account, ->(account) { account.excluded_from_timeline_domains.blank? ? left_outer_joins(:account) : left_outer_joins(:account).where('accounts.domain IS NULL OR accounts.domain NOT IN (?)', account.excluded_from_timeline_domains) }
+ scope :not_domain_blocked_by_account, ->(account) { account.excluded_from_timeline_domains.blank? ? left_outer_joins(:account) : left_outer_joins(:account).merge(Account.not_domain_blocked_by_account(account)) }
scope :tagged_with_all, lambda { |tag_ids|
Array(tag_ids).map(&:to_i).reduce(self) do |result, id|
result.where(<<~SQL.squish, tag_id: id)
@@ -125,6 +128,8 @@ class Status < ApplicationRecord
scope :tagged_with_none, lambda { |tag_ids|
where('NOT EXISTS (SELECT * FROM statuses_tags forbidden WHERE forbidden.status_id = statuses.id AND forbidden.tag_id IN (?))', tag_ids)
}
+ scope :distributable_visibility, -> { where(visibility: %i(public unlisted)) }
+ scope :list_eligible_visibility, -> { where(visibility: %i(public unlisted private)) }
scope :not_local_only, -> { where(local_only: [false, nil]) }
@@ -159,9 +164,9 @@ class Status < ApplicationRecord
:status_stat,
:tags,
:preloadable_poll,
- preview_cards_status: [:preview_card],
+ preview_cards_status: { preview_card: { author_account: [:account_stat, user: :role] } },
account: [:account_stat, user: :role],
- active_mentions: { account: :account_stat },
+ active_mentions: :account,
reblog: [
:application,
:tags,
@@ -169,11 +174,11 @@ class Status < ApplicationRecord
:conversation,
:status_stat,
:preloadable_poll,
- preview_cards_status: [:preview_card],
+ preview_cards_status: { preview_card: { author_account: [:account_stat, user: :role] } },
account: [:account_stat, user: :role],
- active_mentions: { account: :account_stat },
+ active_mentions: :account,
],
- thread: { account: :account_stat }
+ thread: :account
delegate :domain, to: :account, prefix: true
@@ -270,7 +275,7 @@ def non_sensitive_with_media?
end
def reported?
- @reported ||= Report.where(target_account: account).unresolved.exists?(['? = ANY(status_ids)', id])
+ @reported ||= account.targeted_reports.unresolved.exists?(['? = ANY(status_ids)', id]) || account.strikes.exists?(['? = ANY(status_ids)', id.to_s])
end
def emojis
@@ -341,23 +346,23 @@ def as_direct_timeline(account, limit = 20, max_id = nil, since_id = nil)
# _from_me part does not require any timeline filters
query_from_me = where(account_id: account.id)
- .where(Status.arel_table[:visibility].eq(3))
+ .direct_visibility
.limit(limit)
- .order('statuses.id DESC')
+ .order(id: :desc)
# _to_me part requires mute and block filter.
# FIXME: may we check mutes.hide_notifications?
query_to_me = Status
+ .direct_visibility
.joins(:mentions)
- .merge(Mention.where(account_id: account.id))
- .where(Status.arel_table[:visibility].eq(3))
+ .where(mentions: { account_id: account.id })
.limit(limit)
.order('mentions.status_id DESC')
.not_excluded_by_account(account)
if max_id.present?
- query_from_me = query_from_me.where('statuses.id < ?', max_id)
- query_to_me = query_to_me.where('mentions.status_id < ?', max_id)
+ query_from_me = query_from_me.where(id: ...max_id)
+ query_to_me = query_to_me.where(mentions: { status_id: ...max_id })
end
if since_id.present?
@@ -365,9 +370,9 @@ def as_direct_timeline(account, limit = 20, max_id = nil, since_id = nil)
query_to_me = query_to_me.where('mentions.status_id > ?', since_id)
end
- # returns ActiveRecord.Relation
- items = (query_from_me.select(:id).to_a + query_to_me.select(:id).to_a).uniq(&:id).sort_by(&:id).reverse.take(limit)
- Status.where(id: items.map(&:id))
+ # TODO: use a single query?
+ ids = (query_from_me.pluck(:id) + query_to_me.pluck(:id)).sort.uniq.reverse.take(limit)
+ Status.where(id: ids)
end
def favourites_map(status_ids, account_id)
@@ -390,38 +395,6 @@ def pins_map(status_ids, account_id)
StatusPin.select('status_id').where(status_id: status_ids).where(account_id: account_id).each_with_object({}) { |p, h| h[p.status_id] = true }
end
- def reload_stale_associations!(cached_items)
- account_ids = []
-
- cached_items.each do |item|
- account_ids << item.account_id
- account_ids << item.reblog.account_id if item.reblog?
- end
-
- account_ids.uniq!
-
- status_ids = cached_items.map { |item| item.reblog? ? item.reblog_of_id : item.id }.uniq
-
- return if account_ids.empty?
-
- accounts = Account.where(id: account_ids).includes(:account_stat, :user).index_by(&:id)
-
- status_stats = StatusStat.where(status_id: status_ids).index_by(&:status_id)
-
- cached_items.each do |item|
- item.account = accounts[item.account_id]
- item.reblog.account = accounts[item.reblog.account_id] if item.reblog?
-
- if item.reblog?
- status_stat = status_stats[item.reblog.id]
- item.reblog.status_stat = status_stat if status_stat.present?
- else
- status_stat = status_stats[item.id]
- item.status_stat = status_stat if status_stat.present?
- end
- end
- end
-
def from_text(text)
return [] if text.blank?
@@ -495,7 +468,6 @@ def set_poll_id
def set_visibility
self.visibility = reblog.visibility if reblog? && visibility.nil?
self.visibility = (account.locked? ? :private : :public) if visibility.nil?
- self.sensitive = false if sensitive.nil?
end
def set_local_only
diff --git a/app/models/status_trend.rb b/app/models/status_trend.rb
index b0f1b6942ddebb..807efec0ff18cf 100644
--- a/app/models/status_trend.rb
+++ b/app/models/status_trend.rb
@@ -14,6 +14,8 @@
#
class StatusTrend < ApplicationRecord
+ include RankedTrend
+
belongs_to :status
belongs_to :account
diff --git a/app/models/tag.rb b/app/models/tag.rb
index f2168ae90470e7..3f88cb06807c73 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -21,8 +21,10 @@
class Tag < ApplicationRecord
include Paginable
+ # rubocop:disable Rails/HasAndBelongsToMany
has_and_belongs_to_many :statuses
has_and_belongs_to_many :accounts
+ # rubocop:enable Rails/HasAndBelongsToMany
has_many :passive_relationships, class_name: 'TagFollow', inverse_of: :tag, dependent: :destroy
has_many :featured_tags, dependent: :destroy, inverse_of: :tag
@@ -35,7 +37,7 @@ class Tag < ApplicationRecord
HASHTAG_LAST_SEQUENCE = '([[:word:]_]*[[:alpha:]][[:word:]_]*)'
HASHTAG_NAME_PAT = "#{HASHTAG_FIRST_SEQUENCE}|#{HASHTAG_LAST_SEQUENCE}"
- HASHTAG_RE = %r{(? { where(listable: [true, nil]) }
scope :trendable, -> { Setting.trendable_by_default ? where(trendable: [true, nil]) : where(trendable: true) }
scope :not_trendable, -> { where(trendable: false) }
+ scope :suggestions_for_account, ->(account) { recently_used(account).not_featured_by(account) }
+ scope :not_featured_by, ->(account) { where.not(id: account.featured_tags.select(:tag_id)) }
scope :recently_used, lambda { |account|
joins(:statuses)
.where(statuses: { id: account.statuses.select(:id).limit(RECENT_STATUS_LIMIT) })
diff --git a/app/models/tag_feed.rb b/app/models/tag_feed.rb
index 051b0d13064079..a4d371e4c162dc 100644
--- a/app/models/tag_feed.rb
+++ b/app/models/tag_feed.rb
@@ -34,7 +34,7 @@ def get(limit, max_id = nil, since_id = nil, min_id = nil)
scope.merge!(account_filters_scope) if account?
scope.merge!(media_only_scope) if media_only?
- scope.cache_ids.to_a_paginated_by_id(limit, max_id: max_id, since_id: since_id, min_id: min_id)
+ scope.to_a_paginated_by_id(limit, max_id: max_id, since_id: since_id, min_id: min_id)
end
private
diff --git a/app/models/trends/links.rb b/app/models/trends/links.rb
index b4eae9f7028c8e..0650c4109de8ac 100644
--- a/app/models/trends/links.rb
+++ b/app/models/trends/links.rb
@@ -81,13 +81,13 @@ def refresh(at_time = Time.now.utc)
# Now that all trends have up-to-date scores, and all the ones below the threshold have
# been removed, we can recalculate their positions
- PreviewCardTrend.connection.exec_update('UPDATE preview_card_trends SET rank = t0.calculated_rank FROM (SELECT id, row_number() OVER w AS calculated_rank FROM preview_card_trends WINDOW w AS (PARTITION BY language ORDER BY score DESC)) t0 WHERE preview_card_trends.id = t0.id')
+ PreviewCardTrend.recalculate_ordered_rank
end
def request_review
PreviewCardTrend.pluck('distinct language').flat_map do |language|
- score_at_threshold = PreviewCardTrend.where(language: language, allowed: true).order(rank: :desc).where('rank <= ?', options[:review_threshold]).first&.score || 0
- preview_card_trends = PreviewCardTrend.where(language: language, allowed: false).joins(:preview_card)
+ score_at_threshold = PreviewCardTrend.where(language: language).allowed.by_rank.ranked_below(options[:review_threshold]).first&.score || 0
+ preview_card_trends = PreviewCardTrend.where(language: language).not_allowed.joins(:preview_card)
preview_card_trends.filter_map do |trend|
preview_card = trend.preview_card
diff --git a/app/models/trends/statuses.rb b/app/models/trends/statuses.rb
index 4b113bfd79fa44..bbffc72fe638d0 100644
--- a/app/models/trends/statuses.rb
+++ b/app/models/trends/statuses.rb
@@ -74,12 +74,12 @@ def refresh(at_time = Time.now.utc)
# Now that all trends have up-to-date scores, and all the ones below the threshold have
# been removed, we can recalculate their positions
- StatusTrend.connection.exec_update('UPDATE status_trends SET rank = t0.calculated_rank FROM (SELECT id, row_number() OVER w AS calculated_rank FROM status_trends WINDOW w AS (PARTITION BY language ORDER BY score DESC)) t0 WHERE status_trends.id = t0.id')
+ StatusTrend.recalculate_ordered_rank
end
def request_review
StatusTrend.pluck('distinct language').flat_map do |language|
- score_at_threshold = StatusTrend.where(language: language, allowed: true).order(rank: :desc).where('rank <= ?', options[:review_threshold]).first&.score || 0
+ score_at_threshold = StatusTrend.where(language: language, allowed: true).by_rank.ranked_below(options[:review_threshold]).first&.score || 0
status_trends = StatusTrend.where(language: language, allowed: false).joins(:status).includes(status: :account)
status_trends.filter_map do |trend|
diff --git a/app/models/user.rb b/app/models/user.rb
index d2863b1e4aa6c0..3bd87c28178511 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)
@@ -41,6 +39,7 @@
# role_id :bigint(8)
# settings :text
# time_zone :string
+# otp_secret :string
#
class User < ApplicationRecord
@@ -74,6 +73,8 @@ class User < ApplicationRecord
devise :two_factor_authenticatable,
otp_secret_encryption_key: Rails.configuration.x.otp_secret
+ include LegacyOtpSecret # Must be after the above `devise` line in order to override the legacy method
+
devise :two_factor_backupable,
otp_number_of_backup_codes: 10
@@ -97,6 +98,8 @@ class User < ApplicationRecord
accepts_nested_attributes_for :invite_request, reject_if: ->(attributes) { attributes['text'].blank? && !Setting.require_invite_text }
validates :invite_request, presence: true, on: :create, if: :invite_text_required?
+ validates :email, presence: true, email_address: true
+
validates_with BlacklistedEmailValidator, if: -> { ENV['EMAIL_DOMAIN_LISTS_APPLY_AFTER_CONFIRMATION'] == 'true' || !confirmed? }
validates_with EmailMxValidator, if: :validate_email_dns?
validates :agreement, acceptance: { allow_nil: false, accept: [true, 'true', '1'] }, on: :create
@@ -109,14 +112,16 @@ class User < ApplicationRecord
validates :confirm_password, absence: true, on: :create
validate :validate_role_elevation
+ scope :account_not_suspended, -> { joins(:account).merge(Account.without_suspended) }
scope :recent, -> { order(id: :desc) }
scope :pending, -> { where(approved: false) }
scope :approved, -> { where(approved: true) }
scope :confirmed, -> { where.not(confirmed_at: nil) }
scope :enabled, -> { where(disabled: false) }
scope :disabled, -> { where(disabled: true) }
- scope :inactive, -> { where(arel_table[:current_sign_in_at].lt(ACTIVE_DURATION.ago)) }
- scope :active, -> { confirmed.where(arel_table[:current_sign_in_at].gteq(ACTIVE_DURATION.ago)).joins(:account).where(accounts: { suspended_at: nil }) }
+ scope :active, -> { confirmed.signed_in_recently.account_not_suspended }
+ scope :signed_in_recently, -> { where(current_sign_in_at: ACTIVE_DURATION.ago..) }
+ scope :not_signed_in_recently, -> { where(current_sign_in_at: ...ACTIVE_DURATION.ago) }
scope :matches_email, ->(value) { where(arel_table[:email].matches("#{value}%")) }
scope :matches_ip, ->(value) { left_joins(:ips).where('user_ips.ip <<= ?', value).group('users.id') }
@@ -129,11 +134,6 @@ class User < ApplicationRecord
normalizes :time_zone, with: ->(time_zone) { ActiveSupport::TimeZone[time_zone].nil? ? nil : time_zone }
normalizes :chosen_languages, with: ->(chosen_languages) { chosen_languages.compact_blank.presence }
- # This avoids a deprecation warning from Rails 5.1
- # It seems possible that a future release of devise-two-factor will
- # handle this itself, and this can be removed from our User class.
- attribute :otp_secret
-
has_many :session_activations, dependent: :destroy
delegate :can?, to: :role
@@ -446,7 +446,7 @@ def wrap_email_confirmation
end
def sign_up_from_ip_requires_approval?
- sign_up_ip.present? && IpBlock.sign_up_requires_approval.exists?(['ip >>= ?', sign_up_ip.to_s])
+ sign_up_ip.present? && IpBlock.severity_sign_up_requires_approval.exists?(['ip >>= ?', sign_up_ip.to_s])
end
def sign_up_email_requires_approval?
@@ -490,7 +490,7 @@ def prepare_new_user!
BootstrapTimelineWorker.perform_async(account_id)
ActivityTracker.increment('activity:accounts:local')
ActivityTracker.record('activity:logins', id)
- UserMailer.welcome(self).deliver_later
+ UserMailer.welcome(self).deliver_later(wait: 1.hour)
TriggerWebhookWorker.perform_async('account.approved', 'Account', account_id)
end
diff --git a/app/models/user_invite_request.rb b/app/models/user_invite_request.rb
index 2b76c88b944dcd..9dd67751668835 100644
--- a/app/models/user_invite_request.rb
+++ b/app/models/user_invite_request.rb
@@ -12,6 +12,8 @@
#
class UserInviteRequest < ApplicationRecord
+ TEXT_SIZE_LIMIT = 420
+
belongs_to :user, inverse_of: :invite_request
- validates :text, presence: true, length: { maximum: 420 }
+ validates :text, presence: true, length: { maximum: TEXT_SIZE_LIMIT }
end
diff --git a/app/models/user_ip.rb b/app/models/user_ip.rb
index 38287c2a607a58..a6da2c07401b44 100644
--- a/app/models/user_ip.rb
+++ b/app/models/user_ip.rb
@@ -10,11 +10,11 @@
#
class UserIp < ApplicationRecord
+ include DatabaseViewRecord
+
self.primary_key = :user_id
belongs_to :user
- def readonly?
- true
- end
+ scope :by_latest_used, -> { order(used_at: :desc) }
end
diff --git a/app/models/user_role.rb b/app/models/user_role.rb
index 89354da5423bb3..23cc28b9b7ca27 100644
--- a/app/models/user_role.rb
+++ b/app/models/user_role.rb
@@ -38,6 +38,9 @@ class UserRole < ApplicationRecord
delete_user_data: (1 << 19),
}.freeze
+ EVERYONE_ROLE_ID = -99
+ NOBODY_POSITION = -1
+
module Flags
NONE = 0
ALL = FLAGS.values.reduce(&:|)
@@ -94,18 +97,21 @@ module Flags
before_validation :set_position
- scope :assignable, -> { where.not(id: -99).order(position: :asc) }
+ scope :assignable, -> { where.not(id: EVERYONE_ROLE_ID).order(position: :asc) }
+ scope :highlighted, -> { where(highlighted: true) }
+ scope :with_color, -> { where.not(color: [nil, '']) }
+ scope :providing_styles, -> { highlighted.with_color }
has_many :users, inverse_of: :role, foreign_key: 'role_id', dependent: :nullify
def self.nobody
- @nobody ||= UserRole.new(permissions: Flags::NONE, position: -1)
+ @nobody ||= UserRole.new(permissions: Flags::NONE, position: NOBODY_POSITION)
end
def self.everyone
- UserRole.find(-99)
+ UserRole.find(EVERYONE_ROLE_ID)
rescue ActiveRecord::RecordNotFound
- UserRole.create!(id: -99, permissions: Flags::DEFAULT)
+ UserRole.create!(id: EVERYONE_ROLE_ID, permissions: Flags::DEFAULT)
end
def self.that_can(*any_of_privileges)
@@ -113,7 +119,7 @@ def self.that_can(*any_of_privileges)
end
def everyone?
- id == -99
+ id == EVERYONE_ROLE_ID
end
def nobody?
@@ -168,7 +174,7 @@ def in_permissions?(privilege)
end
def set_position
- self.position = -1 if everyone?
+ self.position = NOBODY_POSITION if everyone?
end
def validate_own_role_edition
diff --git a/app/models/user_settings.rb b/app/models/user_settings.rb
index 9956b88513bf74..886c5c9c4d0ccf 100644
--- a/app/models/user_settings.rb
+++ b/app/models/user_settings.rb
@@ -31,7 +31,6 @@ class KeyError < Error; end
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/policies/backup_policy.rb b/app/policies/backup_policy.rb
index 86b8efbe96fa7d..7a4c5b4347497d 100644
--- a/app/policies/backup_policy.rb
+++ b/app/policies/backup_policy.rb
@@ -4,6 +4,6 @@ class BackupPolicy < ApplicationPolicy
MIN_AGE = 6.days
def create?
- user_signed_in? && current_user.backups.where('created_at >= ?', MIN_AGE.ago).count.zero?
+ user_signed_in? && current_user.backups.where(created_at: MIN_AGE.ago..).count.zero?
end
end
diff --git a/app/presenters/instance_presenter.rb b/app/presenters/instance_presenter.rb
index 25df4d85aa45af..92415a69030af9 100644
--- a/app/presenters/instance_presenter.rb
+++ b/app/presenters/instance_presenter.rb
@@ -81,4 +81,16 @@ def thumbnail
def mascot
@mascot ||= Rails.cache.fetch('site_uploads/mascot') { SiteUpload.find_by(var: 'mascot') }
end
+
+ def favicon
+ return @favicon if defined?(@favicon)
+
+ @favicon ||= Rails.cache.fetch('site_uploads/favicon') { SiteUpload.find_by(var: 'favicon') }
+ end
+
+ def app_icon
+ return @app_icon if defined?(@app_icon)
+
+ @app_icon ||= Rails.cache.fetch('site_uploads/app_icon') { SiteUpload.find_by(var: 'app_icon') }
+ end
end
diff --git a/app/presenters/oauth_metadata_presenter.rb b/app/presenters/oauth_metadata_presenter.rb
new file mode 100644
index 00000000000000..546503bfcca22e
--- /dev/null
+++ b/app/presenters/oauth_metadata_presenter.rb
@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+class OauthMetadataPresenter < ActiveModelSerializers::Model
+ include RoutingHelper
+
+ attributes :issuer, :authorization_endpoint, :token_endpoint,
+ :revocation_endpoint, :scopes_supported,
+ :response_types_supported, :response_modes_supported,
+ :grant_types_supported, :token_endpoint_auth_methods_supported,
+ :service_documentation, :app_registration_endpoint
+
+ def issuer
+ root_url
+ end
+
+ def service_documentation
+ 'https://docs.joinmastodon.org/'
+ end
+
+ def authorization_endpoint
+ oauth_authorization_url
+ end
+
+ def token_endpoint
+ oauth_token_url
+ end
+
+ # As the api_v1_apps route doesn't technically conform to the specification
+ # for OAuth 2.0 Dynamic Client Registration defined in RFC 7591 we use a
+ # non-standard property for now to indicate the mastodon specific registration
+ # endpoint. See: https://datatracker.ietf.org/doc/html/rfc7591
+ def app_registration_endpoint
+ api_v1_apps_url
+ end
+
+ def revocation_endpoint
+ oauth_revoke_url
+ end
+
+ def scopes_supported
+ doorkeeper.scopes
+ end
+
+ def response_types_supported
+ doorkeeper.authorization_response_types
+ end
+
+ def response_modes_supported
+ doorkeeper.authorization_response_flows.flat_map(&:response_mode_matches).uniq
+ end
+
+ def grant_types_supported
+ grant_types_supported = doorkeeper.grant_flows.dup
+ grant_types_supported << 'refresh_token' if doorkeeper.refresh_token_enabled?
+ grant_types_supported
+ end
+
+ def token_endpoint_auth_methods_supported
+ %w(client_secret_basic client_secret_post)
+ end
+
+ private
+
+ def doorkeeper
+ @doorkeeper ||= Doorkeeper.configuration
+ end
+end
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index 4135d8ed39434a..fe6ab5e995195d 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -5,7 +5,7 @@ class InitialStateSerializer < ActiveModel::Serializer
attributes :meta, :compose, :accounts,
:media_attachments, :settings,
- :max_toot_chars, :max_feed_hashtags, :poll_limits,
+ :max_feed_hashtags, :poll_limits,
:languages
attribute :critical_updates_pending, if: -> { object&.role&.can?(:view_devops) && SoftwareUpdate.check_enabled? }
@@ -13,10 +13,6 @@ class InitialStateSerializer < ActiveModel::Serializer
has_one :push_subscription, serializer: REST::WebPushSubscriptionSerializer
has_one :role, serializer: REST::RoleSerializer
- def max_toot_chars
- StatusLengthValidator::MAX_CHARS
- end
-
def max_feed_hashtags
TagFeed::LIMIT_PER_MODE
end
@@ -35,7 +31,6 @@ def meta
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/manifest_serializer.rb b/app/serializers/manifest_serializer.rb
index 1c1f7d0ad534a3..a39fb5ef540765 100644
--- a/app/serializers/manifest_serializer.rb
+++ b/app/serializers/manifest_serializer.rb
@@ -1,21 +1,10 @@
# frozen_string_literal: true
class ManifestSerializer < ActiveModel::Serializer
+ include ApplicationHelper
include RoutingHelper
include ActionView::Helpers::TextHelper
- ICON_SIZES = %w(
- 36
- 48
- 72
- 96
- 144
- 192
- 256
- 384
- 512
- ).freeze
-
attributes :id, :name, :short_name,
:icons, :theme_color, :background_color,
:display, :start_url, :scope,
@@ -37,9 +26,12 @@ def short_name
end
def icons
- ICON_SIZES.map do |size|
+ SiteUpload::ANDROID_ICON_SIZES.map do |size|
+ src = app_icon_path(size.to_i)
+ src = URI.join(root_url, src).to_s if src.present?
+
{
- src: frontend_asset_url("icons/android-chrome-#{size}x#{size}.png"),
+ src: src || frontend_asset_url("icons/android-chrome-#{size}x#{size}.png"),
sizes: "#{size}x#{size}",
type: 'image/png',
purpose: 'any maskable',
diff --git a/app/serializers/oauth_metadata_serializer.rb b/app/serializers/oauth_metadata_serializer.rb
new file mode 100644
index 00000000000000..5f3dc7b87e2e05
--- /dev/null
+++ b/app/serializers/oauth_metadata_serializer.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class OauthMetadataSerializer < ActiveModel::Serializer
+ attributes :issuer, :authorization_endpoint, :token_endpoint,
+ :revocation_endpoint, :scopes_supported,
+ :response_types_supported, :response_modes_supported,
+ :grant_types_supported, :token_endpoint_auth_methods_supported,
+ :service_documentation, :app_registration_endpoint
+end
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 00000000000000..751bc103c2c348
--- /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/account_warning_serializer.rb b/app/serializers/rest/account_warning_serializer.rb
new file mode 100644
index 00000000000000..a0ef341d259d26
--- /dev/null
+++ b/app/serializers/rest/account_warning_serializer.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class REST::AccountWarningSerializer < ActiveModel::Serializer
+ attributes :id, :action, :text, :status_ids, :created_at
+
+ has_one :target_account, serializer: REST::AccountSerializer
+ has_one :appeal, serializer: REST::AppealSerializer
+
+ def id
+ object.id.to_s
+ end
+
+ def status_ids
+ object&.status_ids&.map(&:to_s)
+ end
+end
diff --git a/app/serializers/rest/admin/domain_block_serializer.rb b/app/serializers/rest/admin/domain_block_serializer.rb
index b955d008a6e62b..e94a337cb8d9f9 100644
--- a/app/serializers/rest/admin/domain_block_serializer.rb
+++ b/app/serializers/rest/admin/domain_block_serializer.rb
@@ -1,11 +1,15 @@
# frozen_string_literal: true
class REST::Admin::DomainBlockSerializer < ActiveModel::Serializer
- attributes :id, :domain, :created_at, :severity,
+ attributes :id, :domain, :digest, :created_at, :severity,
:reject_media, :reject_reports,
:private_comment, :public_comment, :obfuscate
def id
object.id.to_s
end
+
+ def digest
+ object.domain_digest
+ end
end
diff --git a/app/serializers/rest/announcement_serializer.rb b/app/serializers/rest/announcement_serializer.rb
index 8cee27127241e9..d1a011425dd3d1 100644
--- a/app/serializers/rest/announcement_serializer.rb
+++ b/app/serializers/rest/announcement_serializer.rb
@@ -9,7 +9,7 @@ class REST::AnnouncementSerializer < ActiveModel::Serializer
attribute :read, if: :current_user?
has_many :mentions
- has_many :statuses
+ has_many :statuses, serializer: REST::StatusSerializer
has_many :tags, serializer: REST::StatusSerializer::TagSerializer
has_many :emojis, serializer: REST::CustomEmojiSerializer
has_many :reactions, serializer: REST::ReactionSerializer
@@ -49,16 +49,4 @@ def acct
object.pretty_acct
end
end
-
- class StatusSerializer < ActiveModel::Serializer
- attributes :id, :url
-
- def id
- object.id.to_s
- end
-
- def url
- ActivityPub::TagManager.instance.url_for(object)
- end
- end
end
diff --git a/app/serializers/rest/appeal_serializer.rb b/app/serializers/rest/appeal_serializer.rb
new file mode 100644
index 00000000000000..a24cabc2728c35
--- /dev/null
+++ b/app/serializers/rest/appeal_serializer.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class REST::AppealSerializer < ActiveModel::Serializer
+ attributes :text, :state
+
+ def state
+ if object.approved?
+ 'approved'
+ elsif object.rejected?
+ 'rejected'
+ else
+ 'pending'
+ end
+ end
+end
diff --git a/app/serializers/rest/application_serializer.rb b/app/serializers/rest/application_serializer.rb
index 635508a17cbe64..1a7b9265f192f2 100644
--- a/app/serializers/rest/application_serializer.rb
+++ b/app/serializers/rest/application_serializer.rb
@@ -1,24 +1,18 @@
# frozen_string_literal: true
class REST::ApplicationSerializer < ActiveModel::Serializer
- attributes :id, :name, :website, :scopes, :redirect_uri,
- :client_id, :client_secret
+ attributes :id, :name, :website, :scopes, :redirect_uris
# NOTE: Deprecated in 4.3.0, needs to be removed in 5.0.0
attribute :vapid_key
+ # We should consider this property deprecated for 4.3.0
+ attribute :redirect_uri
+
def id
object.id.to_s
end
- def client_id
- object.uid
- end
-
- def client_secret
- object.secret
- end
-
def website
object.website.presence
end
diff --git a/app/serializers/rest/credential_application_serializer.rb b/app/serializers/rest/credential_application_serializer.rb
new file mode 100644
index 00000000000000..bfec7d03e80afa
--- /dev/null
+++ b/app/serializers/rest/credential_application_serializer.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class REST::CredentialApplicationSerializer < REST::ApplicationSerializer
+ attributes :client_id, :client_secret
+
+ def client_id
+ object.uid
+ end
+
+ def client_secret
+ object.secret
+ end
+end
diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb
index e7d4a646d4644b..cc557023ba5540 100644
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@ -54,11 +54,12 @@ def configuration
accounts: {
max_featured_tags: FeaturedTag::LIMIT,
+ max_pinned_statuses: StatusPinValidator::PIN_LIMIT,
},
statuses: {
max_characters: StatusLengthValidator::MAX_CHARS,
- max_media_attachments: 4,
+ max_media_attachments: Status::MEDIA_ATTACHMENTS_LIMIT,
characters_reserved_per_url: StatusLengthValidator::URL_PLACEHOLDER_CHARS,
supported_mime_types: HtmlAwareFormatter::STATUS_MIME_TYPES,
},
diff --git a/app/serializers/rest/marker_serializer.rb b/app/serializers/rest/marker_serializer.rb
index 2eaf3d5076724c..b0c1c553ffa621 100644
--- a/app/serializers/rest/marker_serializer.rb
+++ b/app/serializers/rest/marker_serializer.rb
@@ -1,6 +1,8 @@
# frozen_string_literal: true
class REST::MarkerSerializer < ActiveModel::Serializer
+ # Please update `app/javascript/mastodon/api_types/markers.ts` when making changes to the attributes
+
attributes :last_read_id, :version, :updated_at
def last_read_id
diff --git a/app/serializers/rest/media_attachment_serializer.rb b/app/serializers/rest/media_attachment_serializer.rb
index f27dda832adeb8..90a2a972750b3d 100644
--- a/app/serializers/rest/media_attachment_serializer.rb
+++ b/app/serializers/rest/media_attachment_serializer.rb
@@ -3,6 +3,8 @@
class REST::MediaAttachmentSerializer < ActiveModel::Serializer
include RoutingHelper
+ # Please update `app/javascript/mastodon/api_types/media_attachments.ts` when making changes to the attributes
+
attributes :id, :type, :url, :preview_url,
:remote_url, :preview_remote_url, :text_url, :meta,
:description, :blurhash
diff --git a/app/serializers/rest/notification_policy_serializer.rb b/app/serializers/rest/notification_policy_serializer.rb
new file mode 100644
index 00000000000000..a50ba9e66b827f
--- /dev/null
+++ b/app/serializers/rest/notification_policy_serializer.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class REST::NotificationPolicySerializer < ActiveModel::Serializer
+ attributes :filter_not_following,
+ :filter_not_followers,
+ :filter_new_accounts,
+ :filter_private_mentions,
+ :summary
+
+ def summary
+ {
+ pending_requests_count: object.pending_requests_count.to_i,
+ pending_notifications_count: object.pending_notifications_count.to_i,
+ }
+ end
+end
diff --git a/app/serializers/rest/notification_request_serializer.rb b/app/serializers/rest/notification_request_serializer.rb
new file mode 100644
index 00000000000000..581959d8273b4f
--- /dev/null
+++ b/app/serializers/rest/notification_request_serializer.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class REST::NotificationRequestSerializer < ActiveModel::Serializer
+ attributes :id, :created_at, :updated_at, :notifications_count
+
+ belongs_to :from_account, key: :account, serializer: REST::AccountSerializer
+ belongs_to :last_status, serializer: REST::StatusSerializer
+
+ def id
+ object.id.to_s
+ end
+
+ def notifications_count
+ object.notifications_count.to_s
+ end
+end
diff --git a/app/serializers/rest/notification_serializer.rb b/app/serializers/rest/notification_serializer.rb
index 137fc53ddab230..417245d19dda7a 100644
--- a/app/serializers/rest/notification_serializer.rb
+++ b/app/serializers/rest/notification_serializer.rb
@@ -6,6 +6,8 @@ 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
+ belongs_to :account_warning, key: :moderation_warning, if: :moderation_warning_event?, serializer: REST::AccountWarningSerializer
def id
object.id.to_s
@@ -18,4 +20,12 @@ def status_type?
def report_type?
object.type == :'admin.report'
end
+
+ def relationship_severance_event?
+ object.type == :severed_relationships
+ end
+
+ def moderation_warning_event?
+ object.type == :moderation_warning
+ end
end
diff --git a/app/serializers/rest/poll_serializer.rb b/app/serializers/rest/poll_serializer.rb
index df6ebd0d44676c..6e000607352b02 100644
--- a/app/serializers/rest/poll_serializer.rb
+++ b/app/serializers/rest/poll_serializer.rb
@@ -1,6 +1,8 @@
# frozen_string_literal: true
class REST::PollSerializer < ActiveModel::Serializer
+ # Please update `app/javascript/mastodon/api_types/polls.ts` when making changes to the attributes
+
attributes :id, :expires_at, :expired,
:multiple, :votes_count, :voters_count
diff --git a/app/serializers/rest/preview_card_serializer.rb b/app/serializers/rest/preview_card_serializer.rb
index 039262cd5f91be..7d4c99c2d1f9ac 100644
--- a/app/serializers/rest/preview_card_serializer.rb
+++ b/app/serializers/rest/preview_card_serializer.rb
@@ -8,6 +8,8 @@ class REST::PreviewCardSerializer < ActiveModel::Serializer
:provider_url, :html, :width, :height,
:image, :image_description, :embed_url, :blurhash, :published_at
+ has_one :author_account, serializer: REST::AccountSerializer, if: -> { object.author_account.present? }
+
def url
object.original_url.presence || object.url
end
diff --git a/app/serializers/rest/rule_serializer.rb b/app/serializers/rest/rule_serializer.rb
index fc925925a98d95..9e2bcda15e32ea 100644
--- a/app/serializers/rest/rule_serializer.rb
+++ b/app/serializers/rest/rule_serializer.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
class REST::RuleSerializer < ActiveModel::Serializer
- attributes :id, :text
+ attributes :id, :text, :hint
def id
object.id.to_s
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
index e78e694ff099b2..96bdd600cfbcc5 100644
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -3,6 +3,8 @@
class REST::StatusSerializer < ActiveModel::Serializer
include FormattingHelper
+ # Please update `app/javascript/mastodon/api_types/statuses.ts` when making changes to the attributes
+
attributes :id, :created_at, :in_reply_to_id, :in_reply_to_account_id,
:sensitive, :spoiler_text, :visibility, :language,
:uri, :url, :replies_count, :reblogs_count,
diff --git a/app/serializers/rest/suggestion_serializer.rb b/app/serializers/rest/suggestion_serializer.rb
index 3d697fd9f1f81c..c60f343ba41e75 100644
--- a/app/serializers/rest/suggestion_serializer.rb
+++ b/app/serializers/rest/suggestion_serializer.rb
@@ -1,7 +1,20 @@
# frozen_string_literal: true
class REST::SuggestionSerializer < ActiveModel::Serializer
- attributes :source
+ attributes :source, :sources
has_one :account, serializer: REST::AccountSerializer
+
+ LEGACY_SOURCE_TYPE_MAP = {
+ featured: 'staff',
+ most_followed: 'global',
+ most_interactions: 'global',
+ # NOTE: Those are not completely accurate, but those are personalized interactions
+ similar_to_recently_followed: 'past_interactions',
+ friends_of_friends: 'past_interactions',
+ }.freeze
+
+ def source
+ LEGACY_SOURCE_TYPE_MAP[object.sources.first]
+ end
end
diff --git a/app/serializers/rest/v1/instance_serializer.rb b/app/serializers/rest/v1/instance_serializer.rb
index c6cbaba4898007..69ffaa346f9c43 100644
--- a/app/serializers/rest/v1/instance_serializer.rb
+++ b/app/serializers/rest/v1/instance_serializer.rb
@@ -77,7 +77,7 @@ def configuration
statuses: {
max_characters: StatusLengthValidator::MAX_CHARS,
- max_media_attachments: 4,
+ max_media_attachments: Status::MEDIA_ATTACHMENTS_LIMIT,
characters_reserved_per_url: StatusLengthValidator::URL_PLACEHOLDER_CHARS,
supported_mime_types: HtmlAwareFormatter::STATUS_MIME_TYPES,
},
diff --git a/app/services/accept_notification_request_service.rb b/app/services/accept_notification_request_service.rb
new file mode 100644
index 00000000000000..e49eae6fd300e2
--- /dev/null
+++ b/app/services/accept_notification_request_service.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AcceptNotificationRequestService < BaseService
+ def call(request)
+ NotificationPermission.create!(account: request.account, from_account: request.from_account)
+ UnfilterNotificationsWorker.perform_async(request.id)
+ end
+end
diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb
index 571a0fa57d6852..b86c9b9e7ed1c4 100644
--- a/app/services/account_search_service.rb
+++ b/app/services/account_search_service.rb
@@ -151,13 +151,23 @@ def core_query
end
def call(query, account = nil, options = {})
- @query = query&.strip&.gsub(/\A@/, '')
- @limit = options[:limit].to_i
- @offset = options[:offset].to_i
- @options = options
- @account = account
+ MastodonOTELTracer.in_span('AccountSearchService#call') do |span|
+ @query = query&.strip&.gsub(/\A@/, '')
+ @limit = options[:limit].to_i
+ @offset = options[:offset].to_i
+ @options = options
+ @account = account
+
+ span.add_attributes(
+ 'search.offset' => @offset,
+ 'search.limit' => @limit,
+ 'search.backend' => Chewy.enabled? ? 'elasticsearch' : 'database'
+ )
- search_service_results.compact.uniq
+ search_service_results.compact.uniq.tap do |results|
+ span.set_attribute('search.results.count', results.size)
+ end
+ end
end
private
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb
index 9e787ace508a0d..b667e97f4d8019 100644
--- a/app/services/activitypub/process_account_service.rb
+++ b/app/services/activitypub/process_account_service.rb
@@ -201,10 +201,15 @@ def image_url(key)
value = first_of_value(@json[key])
return if value.nil?
- return value['url'] if value.is_a?(Hash)
- image = fetch_resource_without_id_validation(value)
- image['url'] if image
+ if value.is_a?(String)
+ value = fetch_resource_without_id_validation(value)
+ return if value.nil?
+ end
+
+ value = first_of_value(value['url']) if value.is_a?(Hash) && value['type'] == 'Image'
+ value = value['href'] if value.is_a?(Hash)
+ value if value.is_a?(String)
end
def public_key
diff --git a/app/services/activitypub/process_status_update_service.rb b/app/services/activitypub/process_status_update_service.rb
index fb2b33114ed47f..1dbed27f28db3e 100644
--- a/app/services/activitypub/process_status_update_service.rb
+++ b/app/services/activitypub/process_status_update_service.rb
@@ -73,7 +73,7 @@ def update_media_attachments!
as_array(@json['attachment']).each do |attachment|
media_attachment_parser = ActivityPub::Parser::MediaAttachmentParser.new(attachment)
- next if media_attachment_parser.remote_url.blank? || @next_media_attachments.size > 4
+ next if media_attachment_parser.remote_url.blank? || @next_media_attachments.size > Status::MEDIA_ATTACHMENTS_LIMIT
begin
media_attachment = previous_media_attachments.find { |previous_media_attachment| previous_media_attachment.remote_url == media_attachment_parser.remote_url }
diff --git a/app/services/after_block_domain_from_account_service.rb b/app/services/after_block_domain_from_account_service.rb
index 89d007c1cd9df6..fc5dc6568103e1 100644
--- a/app/services/after_block_domain_from_account_service.rb
+++ b/app/services/after_block_domain_from_account_service.rb
@@ -9,18 +9,22 @@ class AfterBlockDomainFromAccountService < BaseService
def call(account, domain)
@account = account
@domain = domain
+ @domain_block_event = nil
clear_notifications!
+ clear_notification_permissions!
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
@@ -28,9 +32,14 @@ def clear_notifications!
Notification.where(account: @account).where(from_account: Account.where(domain: @domain)).in_batches.delete_all
end
+ def clear_notification_permissions!
+ NotificationPermission.where(account: @account, from_account: Account.where(domain: @domain)).in_batches.delete_all
+ 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 +56,15 @@ def reject_follow!(follow)
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 76cc36ff6b0d00..00d020d2b396fa 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 @@ def suspend_accounts!
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 @@ def blocked_domain
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/block_service.rb b/app/services/block_service.rb
index 266a0f4b9d0384..98229d98c0eaaf 100644
--- a/app/services/block_service.rb
+++ b/app/services/block_service.rb
@@ -10,6 +10,8 @@ def call(account, target_account)
UnfollowService.new.call(target_account, account) if target_account.following?(account)
RejectFollowService.new.call(target_account, account) if target_account.requested?(account)
+ NotificationPermission.where(account: account, from_account: target_account).destroy_all
+
block = account.block!(target_account)
BlockWorker.perform_async(account.id, target_account.id)
diff --git a/app/services/bulk_import_row_service.rb b/app/services/bulk_import_row_service.rb
index ef4c18e78953ff..26909dfe04f5c1 100644
--- a/app/services/bulk_import_row_service.rb
+++ b/app/services/bulk_import_row_service.rb
@@ -10,7 +10,7 @@ def call(row)
when :following, :blocking, :muting, :lists
target_acct = @data['acct']
target_domain = domain(target_acct)
- @target_account = stoplight_wrap_request(target_domain) { ResolveAccountService.new.call(target_acct, { check_delivery_availability: true }) }
+ @target_account = stoplight_wrapper(target_domain).run { ResolveAccountService.new.call(target_acct, { check_delivery_availability: true }) }
return false if @target_account.nil?
when :bookmarks
target_uri = @data['uri']
@@ -18,7 +18,7 @@ def call(row)
@target_status = ActivityPub::TagManager.instance.uri_to_resource(target_uri, Status)
return false if @target_status.nil? && ActivityPub::TagManager.instance.local_uri?(target_uri)
- @target_status ||= stoplight_wrap_request(target_domain) { ActivityPub::FetchRemoteStatusService.new.call(target_uri) }
+ @target_status ||= stoplight_wrapper(target_domain).run { ActivityPub::FetchRemoteStatusService.new.call(target_uri) }
return false if @target_status.nil?
end
@@ -51,16 +51,15 @@ def domain(uri)
TagManager.instance.local_domain?(domain) ? nil : TagManager.instance.normalize_domain(domain)
end
- def stoplight_wrap_request(domain, &block)
+ def stoplight_wrapper(domain)
if domain.present?
- Stoplight("source:#{domain}", &block)
+ Stoplight("source:#{domain}")
.with_fallback { nil }
.with_threshold(1)
.with_cool_off_time(5.minutes.seconds)
.with_error_handler { |error, handle| error.is_a?(HTTP::Error) || error.is_a?(OpenSSL::SSL::SSLError) ? handle.call(error) : raise(error) }
- .run
else
- yield
+ Stoplight('domain-blank')
end
end
end
diff --git a/app/services/delete_account_service.rb b/app/services/delete_account_service.rb
index 7c7cb97df2643c..328d8ae8f83965 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 @@ def call(account, **options)
@options[:skip_activitypub] = true if @options[:skip_side_effects]
+ record_severed_relationships!
distribute_activities!
purge_content!
fulfill_deletion_request!
@@ -181,6 +185,7 @@ def purge_generated_notifications!
# 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 @@ def delete_actor!
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 @@ def skip_side_effects?
def skip_activitypub?
@options[:skip_activitypub]
end
+
+ def relationship_severance_event
+ @options[:relationship_severance_event]
+ end
end
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index c6b600dd7cd6bf..900cb9863dd395 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -56,7 +56,7 @@ def html
@html_charset = res.charset
- res.body_with_limit
+ res.truncated_body
end
end
@@ -147,9 +147,12 @@ def attempt_opengraph
return if html.nil?
link_details_extractor = LinkDetailsExtractor.new(@url, @html, @html_charset)
+ provider = PreviewCardProvider.matching_domain(Addressable::URI.parse(link_details_extractor.canonical_url).normalized_host)
+ linked_account = ResolveAccountService.new.call(link_details_extractor.author_account, suppress_errors: true) if link_details_extractor.author_account.present? && provider&.trendable?
@card = PreviewCard.find_or_initialize_by(url: link_details_extractor.canonical_url) if link_details_extractor.canonical_url != @card.url
@card.assign_attributes(link_details_extractor.to_preview_card_attributes)
+ @card.author_account = linked_account
@card.save_with_optional_image! unless @card.title.blank? && @card.html.blank?
end
end
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index 13eb20986e3e65..1f01c2d48e0425 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -9,128 +9,213 @@ class NotifyService < BaseService
update
poll
status
+ moderation_warning
+ # TODO: this probably warrants an email notification
+ severed_relationships
).freeze
- def call(recipient, type, activity)
- @recipient = recipient
- @activity = activity
- @notification = Notification.new(account: @recipient, type: type, activity: @activity)
+ class DismissCondition
+ def initialize(notification)
+ @recipient = notification.account
+ @sender = notification.from_account
+ @notification = notification
+ end
- return if recipient.user.nil? || blocked?
+ def dismiss?
+ blocked = @recipient.unavailable?
+ blocked ||= from_self? && %i(poll severed_relationships moderation_warning).exclude?(@notification.type)
- @notification.save!
+ return blocked if message? && from_staff?
- # It's possible the underlying activity has been deleted
- # between the save call and now
- return if @notification.activity.nil?
+ blocked ||= domain_blocking?
+ blocked ||= @recipient.blocking?(@sender)
+ blocked ||= @recipient.muting_notifications?(@sender)
+ blocked ||= conversation_muted?
+ blocked ||= blocked_mention? if message?
+ blocked
+ end
- push_notification!
- push_to_conversation! if direct_message?
- send_email! if email_needed?
- rescue ActiveRecord::RecordInvalid
- nil
- end
+ private
- private
+ def blocked_mention?
+ FeedManager.instance.filter?(:mentions, @notification.target_status, @recipient)
+ end
- def blocked_mention?
- FeedManager.instance.filter?(:mentions, @notification.mention.status, @recipient)
- end
+ def message?
+ @notification.type == :mention
+ end
- def following_sender?
- return @following_sender if defined?(@following_sender)
+ def from_staff?
+ @sender.local? && @sender.user.present? && @sender.user_role&.overrides?(@recipient.user_role)
+ end
- @following_sender = @recipient.following?(@notification.from_account) || @recipient.requested?(@notification.from_account)
- end
+ def from_self?
+ @recipient.id == @sender.id
+ end
- def optional_non_follower?
- @recipient.user.settings['interactions.must_be_follower'] && !@notification.from_account.following?(@recipient)
- end
+ def domain_blocking?
+ @recipient.domain_blocking?(@sender.domain) && !following_sender?
+ end
- def optional_non_following?
- @recipient.user.settings['interactions.must_be_following'] && !following_sender?
- end
+ def conversation_muted?
+ @notification.target_status && @recipient.muting_conversation?(@notification.target_status.conversation)
+ end
- def message?
- @notification.type == :mention
+ def following_sender?
+ @recipient.following?(@sender)
+ end
end
- def direct_message?
- message? && @notification.target_status.direct_visibility?
- end
+ class FilterCondition
+ NEW_ACCOUNT_THRESHOLD = 30.days.freeze
- # Returns true if the sender has been mentioned by the recipient up the thread
- def response_to_recipient?
- return false if @notification.target_status.in_reply_to_id.nil?
+ NEW_FOLLOWER_THRESHOLD = 3.days.freeze
- # Using an SQL CTE to avoid unneeded back-and-forth with SQL server in case of long threads
- !Status.count_by_sql([<<-SQL.squish, id: @notification.target_status.in_reply_to_id, recipient_id: @recipient.id, sender_id: @notification.from_account.id, depth_limit: 100]).zero?
- WITH RECURSIVE ancestors(id, in_reply_to_id, mention_id, path, depth) AS (
- SELECT s.id, s.in_reply_to_id, m.id, ARRAY[s.id], 0
- FROM statuses s
- LEFT JOIN mentions m ON m.silent = FALSE AND m.account_id = :sender_id AND m.status_id = s.id
- WHERE s.id = :id
- UNION ALL
- SELECT s.id, s.in_reply_to_id, m.id, st.path || s.id, st.depth + 1
- FROM ancestors st
- JOIN statuses s ON s.id = st.in_reply_to_id
- LEFT JOIN mentions m ON m.silent = FALSE AND m.account_id = :sender_id AND m.status_id = s.id
- WHERE st.mention_id IS NULL AND NOT s.id = ANY(path) AND st.depth < :depth_limit
- )
- SELECT COUNT(*)
- FROM ancestors st
- JOIN statuses s ON s.id = st.id
- WHERE st.mention_id IS NOT NULL AND s.visibility = 3
- SQL
- end
+ NON_FILTERABLE_TYPES = %i(
+ admin.sign_up
+ admin.report
+ poll
+ update
+ account_warning
+ ).freeze
- def from_staff?
- @notification.from_account.local? && @notification.from_account.user.present? && @notification.from_account.user_role&.overrides?(@recipient.user_role)
- end
+ def initialize(notification)
+ @notification = notification
+ @recipient = notification.account
+ @sender = notification.from_account
+ @policy = NotificationPolicy.find_or_initialize_by(account: @recipient)
+ end
- def optional_non_following_and_direct?
- direct_message? &&
- @recipient.user.settings['interactions.must_be_following_dm'] &&
- !following_sender? &&
- !response_to_recipient?
- end
+ def filter?
+ return false unless Notification::PROPERTIES[@notification.type][:filterable]
+ return false if override_for_sender?
- def hellbanned?
- @notification.from_account.silenced? && !following_sender?
- end
+ from_limited? ||
+ filtered_by_not_following_policy? ||
+ filtered_by_not_followers_policy? ||
+ filtered_by_new_accounts_policy? ||
+ filtered_by_private_mentions_policy?
+ end
- def from_self?
- @recipient.id == @notification.from_account.id
- end
+ private
- def domain_blocking?
- @recipient.domain_blocking?(@notification.from_account.domain) && !following_sender?
- end
+ def filtered_by_not_following_policy?
+ @policy.filter_not_following? && not_following?
+ end
+
+ def filtered_by_not_followers_policy?
+ @policy.filter_not_followers? && not_follower?
+ end
- def blocked?
- blocked = @recipient.unavailable?
- blocked ||= from_self? && @notification.type != :poll
+ def filtered_by_new_accounts_policy?
+ @policy.filter_new_accounts? && new_account?
+ end
- return blocked if message? && from_staff?
+ def filtered_by_private_mentions_policy?
+ @policy.filter_private_mentions? && not_following? && private_mention_not_in_response?
+ end
+
+ def not_following?
+ !@recipient.following?(@sender)
+ end
- blocked ||= domain_blocking?
- blocked ||= @recipient.blocking?(@notification.from_account)
- blocked ||= @recipient.muting_notifications?(@notification.from_account)
- blocked ||= hellbanned?
- blocked ||= optional_non_follower?
- blocked ||= optional_non_following?
- blocked ||= optional_non_following_and_direct?
- blocked ||= conversation_muted?
- blocked ||= blocked_mention? if @notification.type == :mention
- blocked
+ def not_follower?
+ follow = Follow.find_by(account: @sender, target_account: @recipient)
+ follow.nil? || follow.created_at > NEW_FOLLOWER_THRESHOLD.ago
+ end
+
+ def new_account?
+ @sender.created_at > NEW_ACCOUNT_THRESHOLD.ago
+ end
+
+ def override_for_sender?
+ NotificationPermission.exists?(account: @recipient, from_account: @sender)
+ end
+
+ def from_limited?
+ @sender.silenced? && not_following?
+ end
+
+ def private_mention_not_in_response?
+ @notification.type == :mention && @notification.target_status.direct_visibility? && !response_to_recipient?
+ end
+
+ def response_to_recipient?
+ return false if @notification.target_status.in_reply_to_id.nil?
+
+ statuses_that_mention_sender.positive?
+ end
+
+ def statuses_that_mention_sender
+ # This queries private mentions from the recipient to the sender up in the thread.
+ # This allows up to 100 messages that do not match in the thread, allowing conversations
+ # involving multiple people.
+ Status.count_by_sql([<<-SQL.squish, id: @notification.target_status.in_reply_to_id, recipient_id: @recipient.id, sender_id: @sender.id, depth_limit: 100])
+ WITH RECURSIVE ancestors(id, in_reply_to_id, mention_id, path, depth) AS (
+ SELECT s.id, s.in_reply_to_id, m.id, ARRAY[s.id], 0
+ FROM statuses s
+ LEFT JOIN mentions m ON m.silent = FALSE AND m.account_id = :sender_id AND m.status_id = s.id
+ WHERE s.id = :id
+ UNION ALL
+ SELECT s.id, s.in_reply_to_id, m.id, ancestors.path || s.id, ancestors.depth + 1
+ FROM ancestors
+ JOIN statuses s ON s.id = ancestors.in_reply_to_id
+ /* early exit if we already have a mention matching our requirements */
+ LEFT JOIN mentions m ON m.silent = FALSE AND m.account_id = :sender_id AND m.status_id = s.id AND s.account_id = :recipient_id
+ WHERE ancestors.mention_id IS NULL AND NOT s.id = ANY(path) AND ancestors.depth < :depth_limit
+ )
+ SELECT COUNT(*)
+ FROM ancestors
+ JOIN statuses s ON s.id = ancestors.id
+ WHERE ancestors.mention_id IS NOT NULL AND s.account_id = :recipient_id AND s.visibility = 3
+ SQL
+ end
end
- def conversation_muted?
- if @notification.target_status
- @recipient.muting_conversation?(@notification.target_status.conversation)
+ def call(recipient, type, activity)
+ return if recipient.user.nil?
+
+ @recipient = recipient
+ @activity = activity
+ @notification = Notification.new(account: @recipient, type: type, activity: @activity)
+
+ # For certain conditions we don't need to create a notification at all
+ return if dismiss?
+
+ @notification.filtered = filter?
+ @notification.save!
+
+ # It's possible the underlying activity has been deleted
+ # between the save call and now
+ return if @notification.activity.nil?
+
+ if @notification.filtered?
+ update_notification_request!
else
- false
+ push_notification!
+ push_to_conversation! if direct_message?
+ send_email! if email_needed?
end
+ rescue ActiveRecord::RecordInvalid
+ nil
+ end
+
+ private
+
+ def dismiss?
+ DismissCondition.new(@notification).dismiss?
+ end
+
+ def filter?
+ FilterCondition.new(@notification).filter?
+ end
+
+ def update_notification_request!
+ return unless @notification.type == :mention
+
+ notification_request = NotificationRequest.find_or_initialize_by(account_id: @recipient.id, from_account_id: @notification.from_account_id)
+ notification_request.last_status_id = @notification.target_status.id
+ notification_request.save
end
def push_notification!
@@ -150,6 +235,10 @@ def push_to_conversation!
AccountConversation.add_status(@recipient, @notification.target_status)
end
+ def direct_message?
+ @notification.type == :mention && @notification.target_status.direct_visibility?
+ end
+
def push_to_web_push_subscriptions!
::Web::PushNotificationWorker.push_bulk(web_push_subscriptions.select { |subscription| subscription.pushable?(@notification) }) { |subscription| [subscription.id, @notification.id] }
end
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 964ca91a67e929..71e44c23a6d430 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -146,9 +146,9 @@ def validate_media!
return
end
- raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > 4 || @options[:poll].present?
+ raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > Status::MEDIA_ATTACHMENTS_LIMIT || @options[:poll].present?
- @media = @account.media_attachments.where(status_id: nil).where(id: @options[:media_ids].take(4).map(&:to_i))
+ @media = @account.media_attachments.where(status_id: nil).where(id: @options[:media_ids].take(Status::MEDIA_ATTACHMENTS_LIMIT).map(&:to_i))
raise Mastodon::ValidationError, I18n.t('media_attachments.validations.images_and_video') if @media.size > 1 && @media.find(&:audio_or_video?)
raise Mastodon::ValidationError, I18n.t('media_attachments.validations.not_ready') if @media.any?(&:not_processed?)
@@ -176,7 +176,7 @@ def idempotency_given?
def idempotency_duplicate
if scheduled?
- @account.schedule_statuses.find(@idempotency_duplicate)
+ @account.scheduled_statuses.find(@idempotency_duplicate)
else
@account.statuses.find(@idempotency_duplicate)
end
@@ -228,7 +228,7 @@ def poll_attributes
end
def scheduled_options
- @options.tap do |options_hash|
+ @options.dup.tap do |options_hash|
options_hash[:in_reply_to_id] = options_hash.delete(:thread)&.id
options_hash[:application_id] = options_hash.delete(:application)&.id
options_hash[:scheduled_at] = nil
diff --git a/app/services/purge_domain_service.rb b/app/services/purge_domain_service.rb
index 9df81f13e66be0..ca0f0d441fe5bb 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|
+ @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
- CustomEmoji.remote.where(domain: domain).reorder(nil).find_each(&:destroy)
- Instance.refresh
+ end
+
+ def purge_emojis!
+ CustomEmoji.remote.where(domain: @domain).reorder(nil).find_each(&:destroy)
end
end
diff --git a/app/services/report_service.rb b/app/services/report_service.rb
index fe546c383e62c0..dea6df7b0a1b1b 100644
--- a/app/services/report_service.rb
+++ b/app/services/report_service.rb
@@ -81,7 +81,7 @@ def reported_status_ids
# If the account making reports is remote, it is likely anonymized so we have to relax the requirements for attaching statuses.
domain = @source_account.domain.to_s.downcase
- has_followers = @target_account.followers.where(Account.arel_table[:domain].lower.eq(domain)).exists?
+ has_followers = @target_account.followers.with_domain(domain).exists?
visibility = has_followers ? %i(public unlisted private) : %i(public unlisted)
scope = @target_account.statuses.with_discarded
scope.merge!(scope.where(visibility: visibility).or(scope.where('EXISTS (SELECT 1 FROM mentions m JOIN accounts a ON m.account_id = a.id WHERE lower(a.domain) = ?)', domain)))
diff --git a/app/services/statuses_search_service.rb b/app/services/statuses_search_service.rb
index 7d5b0203a0429c..ab8e28f61c6dad 100644
--- a/app/services/statuses_search_service.rb
+++ b/app/services/statuses_search_service.rb
@@ -2,14 +2,24 @@
class StatusesSearchService < BaseService
def call(query, account = nil, options = {})
- @query = query&.strip
- @account = account
- @options = options
- @limit = options[:limit].to_i
- @offset = options[:offset].to_i
-
- convert_deprecated_options!
- status_search_results
+ MastodonOTELTracer.in_span('StatusesSearchService#call') do |span|
+ @query = query&.strip
+ @account = account
+ @options = options
+ @limit = options[:limit].to_i
+ @offset = options[:offset].to_i
+ convert_deprecated_options!
+
+ span.add_attributes(
+ 'search.offset' => @offset,
+ 'search.limit' => @limit,
+ 'search.backend' => Chewy.enabled? ? 'elasticsearch' : 'database'
+ )
+
+ status_search_results.tap do |results|
+ span.set_attribute('search.results.count', results.size)
+ end
+ end
end
private
diff --git a/app/services/tag_search_service.rb b/app/services/tag_search_service.rb
index d5d1974275c039..57400b76ad140e 100644
--- a/app/services/tag_search_service.rb
+++ b/app/services/tag_search_service.rb
@@ -2,21 +2,56 @@
class TagSearchService < BaseService
def call(query, options = {})
- @query = query.strip.delete_prefix('#')
- @offset = options.delete(:offset).to_i
- @limit = options.delete(:limit).to_i
- @options = options
+ MastodonOTELTracer.in_span('TagSearchService#call') do |span|
+ @query = query.strip.delete_prefix('#')
+ @offset = options.delete(:offset).to_i
+ @limit = options.delete(:limit).to_i
+ @options = options
- results = from_elasticsearch if Chewy.enabled?
- results ||= from_database
+ span.add_attributes(
+ 'search.offset' => @offset,
+ 'search.limit' => @limit,
+ 'search.backend' => Chewy.enabled? ? 'elasticsearch' : 'database'
+ )
- results
+ results = from_elasticsearch if Chewy.enabled?
+ results ||= from_database
+
+ span.set_attribute('search.results.count', results.size)
+
+ results
+ end
end
private
def from_elasticsearch
- query = {
+ definition = TagsIndex.query(elastic_search_query)
+ definition = definition.filter(elastic_search_filter) if @options[:exclude_unreviewed]
+
+ ensure_exact_match(definition.limit(@limit).offset(@offset).objects.compact)
+ rescue Faraday::ConnectionFailed, Parslet::ParseFailed
+ nil
+ end
+
+ # Since the ElasticSearch Query doesn't guarantee the exact match will be the
+ # first result or that it will even be returned, patch the results accordingly
+ def ensure_exact_match(results)
+ return results unless @offset.nil? || @offset.zero?
+
+ normalized_query = Tag.normalize(@query)
+ exact_match = results.find { |tag| tag.name.downcase == normalized_query }
+ exact_match ||= Tag.find_normalized(normalized_query)
+ unless exact_match.nil?
+ results.delete(exact_match)
+ results = [exact_match] + results
+ end
+
+ results
+ end
+
+ def elastic_search_query
+ {
function_score: {
query: {
multi_match: {
@@ -50,8 +85,10 @@ def from_elasticsearch
boost_mode: 'multiply',
},
}
+ end
- filter = {
+ def elastic_search_filter
+ {
bool: {
should: [
{
@@ -72,29 +109,6 @@ def from_elasticsearch
],
},
}
-
- definition = TagsIndex.query(query)
- definition = definition.filter(filter) if @options[:exclude_unreviewed]
-
- ensure_exact_match(definition.limit(@limit).offset(@offset).objects.compact)
- rescue Faraday::ConnectionFailed, Parslet::ParseFailed
- nil
- end
-
- # Since the ElasticSearch Query doesn't guarantee the exact match will be the
- # first result or that it will even be returned, patch the results accordingly
- def ensure_exact_match(results)
- return results unless @offset.nil? || @offset.zero?
-
- normalized_query = Tag.normalize(@query)
- exact_match = results.find { |tag| tag.name.downcase == normalized_query }
- exact_match ||= Tag.find_normalized(normalized_query)
- unless exact_match.nil?
- results.delete(exact_match)
- results = [exact_match] + results
- end
-
- results
end
def from_database
diff --git a/app/services/update_status_service.rb b/app/services/update_status_service.rb
index b354a1b6071e24..70f5959f21a771 100644
--- a/app/services/update_status_service.rb
+++ b/app/services/update_status_service.rb
@@ -70,9 +70,9 @@ def update_media_attachments!
def validate_media!
return [] if @options[:media_ids].blank? || !@options[:media_ids].is_a?(Enumerable)
- raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > 4 || @options[:poll].present?
+ raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > Status::MEDIA_ATTACHMENTS_LIMIT || @options[:poll].present?
- media_attachments = @status.account.media_attachments.where(status_id: [nil, @status.id]).where(scheduled_status_id: nil).where(id: @options[:media_ids].take(4).map(&:to_i)).to_a
+ media_attachments = @status.account.media_attachments.where(status_id: [nil, @status.id]).where(scheduled_status_id: nil).where(id: @options[:media_ids].take(Status::MEDIA_ATTACHMENTS_LIMIT).map(&:to_i)).to_a
raise Mastodon::ValidationError, I18n.t('media_attachments.validations.images_and_video') if media_attachments.size > 1 && media_attachments.find(&:audio_or_video?)
raise Mastodon::ValidationError, I18n.t('media_attachments.validations.not_ready') if media_attachments.any?(&:not_processed?)
diff --git a/app/services/verify_link_service.rb b/app/services/verify_link_service.rb
index 707aeb4e08b47a..b317fc31a859da 100644
--- a/app/services/verify_link_service.rb
+++ b/app/services/verify_link_service.rb
@@ -19,7 +19,7 @@ def call(field)
def perform_request!
@body = Request.new(:get, @url).add_headers('Accept' => 'text/html').perform do |res|
- res.code == 200 ? res.body_with_limit : nil
+ res.code == 200 ? res.truncated_body : nil
end
end
diff --git a/app/validators/email_address_validator.rb b/app/validators/email_address_validator.rb
new file mode 100644
index 00000000000000..ed0bb116524aec
--- /dev/null
+++ b/app/validators/email_address_validator.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+# NOTE: I initially wrote this as `EmailValidator` but it ended up clashing
+# with an indirect dependency of ours, `validate_email`, which, turns out,
+# has the same approach as we do, but with an extra check disallowing
+# single-label domains. Decided to not switch to `validate_email` because
+# we do want to allow at least `localhost`.
+
+class EmailAddressValidator < ActiveModel::EachValidator
+ def validate_each(record, attribute, value)
+ value = value.strip
+
+ address = Mail::Address.new(value)
+ record.errors.add(attribute, :invalid) if address.address != value
+ rescue Mail::Field::FieldError
+ record.errors.add(attribute, :invalid)
+ end
+end
diff --git a/app/validators/unique_username_validator.rb b/app/validators/unique_username_validator.rb
index 09c8fadb55e073..c417e2f6962f00 100644
--- a/app/validators/unique_username_validator.rb
+++ b/app/validators/unique_username_validator.rb
@@ -6,10 +6,7 @@ class UniqueUsernameValidator < ActiveModel::Validator
def validate(account)
return if account.username.blank?
- normalized_username = account.username.downcase
- normalized_domain = account.domain&.downcase
-
- scope = Account.where(Account.arel_table[:username].lower.eq normalized_username).where(Account.arel_table[:domain].lower.eq normalized_domain)
+ scope = Account.with_username(account.username).with_domain(account.domain)
scope = scope.where.not(id: account.id) if account.persisted?
account.errors.add(:username, :taken) if scope.exists?
diff --git a/app/views/admin/account_actions/new.html.haml b/app/views/admin/account_actions/new.html.haml
index 4cb4401c70542d..bce1c31760d6e8 100644
--- a/app/views/admin/account_actions/new.html.haml
+++ b/app/views/admin/account_actions/new.html.haml
@@ -2,29 +2,48 @@
= t('admin.account_actions.title', acct: @account.pretty_acct)
= simple_form_for @account_action, url: admin_account_action_path(@account.id) do |f|
- = f.input :report_id, as: :hidden
+ = f.input :report_id,
+ as: :hidden
.fields-group
- = f.input :type, as: :radio_buttons, collection: Admin::AccountAction.types_for_account(@account), include_blank: false, wrapper: :with_block_label, label_method: ->(type) { account_action_type_label(type) }, hint: t('simple_form.hints.admin_account_action.type_html', acct: @account.pretty_acct)
+ = f.input :type,
+ as: :radio_buttons,
+ collection: Admin::AccountAction.types_for_account(@account),
+ hint: t('simple_form.hints.admin_account_action.type_html', acct: @account.pretty_acct),
+ include_blank: false,
+ label_method: ->(type) { account_action_type_label(type) },
+ wrapper: :with_block_label
- if @account.local?
%hr.spacer/
.fields-group
- = f.input :send_email_notification, as: :boolean, wrapper: :with_label
+ = f.input :send_email_notification,
+ as: :boolean,
+ wrapper: :with_label
- if params[:report_id].present?
.fields-group
- = f.input :include_statuses, as: :boolean, wrapper: :with_label
+ = f.input :include_statuses,
+ as: :boolean,
+ wrapper: :with_label
%hr.spacer/
- unless @warning_presets.empty?
.fields-group
- = f.input :warning_preset_id, collection: @warning_presets, label_method: ->(warning_preset) { [warning_preset.title.presence, truncate(warning_preset.text)].compact.join(' - ') }, wrapper: :with_block_label
+ = f.input :warning_preset_id,
+ collection: @warning_presets,
+ label_method: ->(warning_preset) { [warning_preset.title.presence, truncate(warning_preset.text)].compact.join(' - ') },
+ wrapper: :with_block_label
.fields-group
- = f.input :text, as: :text, wrapper: :with_block_label, hint: t('simple_form.hints.admin_account_action.text_html', path: admin_warning_presets_path)
+ = f.input :text,
+ as: :text,
+ hint: t('simple_form.hints.admin_account_action.text_html', path: admin_warning_presets_path),
+ wrapper: :with_block_label
.actions
- = f.button :button, t('admin.account_actions.action'), type: :submit
+ = f.button :button,
+ t('admin.account_actions.action'),
+ type: :submit
diff --git a/app/views/admin/account_warnings/_account_warning.html.haml b/app/views/admin/account_warnings/_account_warning.html.haml
index 5702e4f6d27652..368e69e63e20bb 100644
--- a/app/views/admin/account_warnings/_account_warning.html.haml
+++ b/app/views/admin/account_warnings/_account_warning.html.haml
@@ -2,7 +2,7 @@
.log-entry__header
.log-entry__avatar
.indicator-icon{ class: account_warning.overruled? ? 'success' : 'failure' }
- = fa_icon 'warning'
+ = material_symbol 'warning'
.log-entry__content
.log-entry__title
= t(account_warning.action,
diff --git a/app/views/admin/accounts/_local_account.html.haml b/app/views/admin/accounts/_local_account.html.haml
index 82197cda43d9d5..3ed392cd1a53db 100644
--- a/app/views/admin/accounts/_local_account.html.haml
+++ b/app/views/admin/accounts/_local_account.html.haml
@@ -62,13 +62,7 @@
%td
%time.formatted{ datetime: account.created_at.iso8601, title: l(account.created_at) }= l account.created_at
%td
-- recent_ips = account.user.ips.order(used_at: :desc).to_a
-- recent_ips.each_with_index do |recent_ip, i|
- %tr
- - if i.zero?
- %th{ rowspan: recent_ips.size }= t('admin.accounts.most_recent_ip')
- %td= recent_ip.ip
- %td= table_link_to 'search', t('admin.accounts.search_same_ip'), admin_accounts_path(ip: recent_ip.ip)
+ = render partial: 'admin/accounts/user_ip', collection: account.user.ips.by_latest_used
%tr
%th= t('admin.accounts.most_recent_activity')
%td
diff --git a/app/views/admin/accounts/_remote_account.html.haml b/app/views/admin/accounts/_remote_account.html.haml
index 99996e1d46d657..6755af2496c10c 100644
--- a/app/views/admin/accounts/_remote_account.html.haml
+++ b/app/views/admin/accounts/_remote_account.html.haml
@@ -2,14 +2,14 @@
%th= t('admin.accounts.inbox_url')
%td
= account.inbox_url
- = fa_icon DeliveryFailureTracker.available?(account.inbox_url) ? 'check' : 'times'
+ = material_symbol DeliveryFailureTracker.available?(account.inbox_url) ? 'check' : 'close'
%td
= table_link_to 'search', domain_block.present? ? t('admin.domain_blocks.view') : t('admin.accounts.view_domain'), admin_instance_path(account.domain)
%tr
%th= t('admin.accounts.shared_inbox_url')
%td
= account.shared_inbox_url
- = fa_icon DeliveryFailureTracker.available?(account.shared_inbox_url) ? 'check' : 'times'
+ = material_symbol DeliveryFailureTracker.available?(account.shared_inbox_url) ? 'check' : 'close'
%td
- if domain_block.nil?
= table_link_to 'ban', t('admin.domain_blocks.add_new'), new_admin_domain_block_path(_domain: account.domain)
diff --git a/app/views/admin/accounts/_user_ip.html.haml b/app/views/admin/accounts/_user_ip.html.haml
new file mode 100644
index 00000000000000..1938cf7edf09b2
--- /dev/null
+++ b/app/views/admin/accounts/_user_ip.html.haml
@@ -0,0 +1,5 @@
+%tr
+ - if user_ip_iteration.first?
+ %th{ rowspan: user_ip_iteration.size }= t('admin.accounts.most_recent_ip')
+ %td= user_ip.ip
+ %td= table_link_to 'search', t('admin.accounts.search_same_ip'), admin_accounts_path(ip: user_ip.ip)
diff --git a/app/views/admin/accounts/index.html.haml b/app/views/admin/accounts/index.html.haml
index 8354441895deb8..01b072938d1d14 100644
--- a/app/views/admin/accounts/index.html.haml
+++ b/app/views/admin/accounts/index.html.haml
@@ -6,19 +6,26 @@
.filter-subset.filter-subset--with-select
%strong= t('admin.accounts.location.title')
.input.select.optional
- = select_tag :origin, options_for_select([[t('admin.accounts.location.local'), 'local'], [t('admin.accounts.location.remote'), 'remote']], params[:origin]), prompt: I18n.t('generic.all')
+ = select_tag :origin,
+ options_for_select([[t('admin.accounts.location.local'), 'local'], [t('admin.accounts.location.remote'), 'remote']], params[:origin]),
+ prompt: I18n.t('generic.all')
.filter-subset.filter-subset--with-select
%strong= t('admin.accounts.moderation.title')
.input.select.optional
- = select_tag :status, options_for_select(admin_accounts_moderation_options, params[:status]), prompt: I18n.t('generic.all')
+ = select_tag :status,
+ options_for_select(admin_accounts_moderation_options, params[:status]),
+ prompt: I18n.t('generic.all')
.filter-subset.filter-subset--with-select
%strong= t('admin.accounts.role')
.input.select.optional
- = select_tag :role_ids, options_from_collection_for_select(UserRole.assignable, :id, :name, params[:role_ids]), prompt: I18n.t('admin.accounts.moderation.all')
+ = select_tag :role_ids,
+ options_from_collection_for_select(UserRole.assignable, :id, :name, params[:role_ids]),
+ prompt: I18n.t('admin.accounts.moderation.all')
.filter-subset.filter-subset--with-select
%strong= t 'generic.order_by'
.input.select
- = select_tag :order, options_for_select([[t('relationships.most_recent'), 'recent'], [t('relationships.last_active'), 'active']], params[:order])
+ = select_tag :order,
+ options_for_select([[t('relationships.most_recent'), 'recent'], [t('relationships.last_active'), 'active']], params[:order])
.fields-group
- %i(username by_domain display_name email ip).each do |key|
@@ -46,11 +53,23 @@
= check_box_tag :batch_checkbox_all, nil, false
.batch-table__toolbar__actions
- if @accounts.any?(&:user_pending?)
- = f.button safe_join([fa_icon('check'), t('admin.accounts.approve')]), name: :approve, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+ = f.button safe_join([material_symbol('check'), t('admin.accounts.approve')]),
+ class: 'table-action-link',
+ data: { confirm: t('admin.reports.are_you_sure') },
+ name: :approve,
+ type: :submit
- = f.button safe_join([fa_icon('times'), t('admin.accounts.reject')]), name: :reject, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+ = f.button safe_join([material_symbol('close'), t('admin.accounts.reject')]),
+ class: 'table-action-link',
+ data: { confirm: t('admin.reports.are_you_sure') },
+ name: :reject,
+ type: :submit
- = f.button safe_join([fa_icon('lock'), t('admin.accounts.perform_full_suspension')]), name: :suspend, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+ = f.button safe_join([material_symbol('lock'), t('admin.accounts.perform_full_suspension')]),
+ class: 'table-action-link',
+ data: { confirm: t('admin.reports.are_you_sure') },
+ name: :suspend,
+ type: :submit
- if @accounts.total_count > @accounts.size
.batch-table__select-all
.not-selected.active
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml
index da2f2055d073c8..f148b9a0822193 100644
--- a/app/views/admin/accounts/show.html.haml
+++ b/app/views/admin/accounts/show.html.haml
@@ -20,7 +20,7 @@
%dd{ title: field.value, class: custom_field_classes(field) }
- if field.verified?
%span.verified__mark{ title: t('accounts.link_verified_on', date: l(field.verified_at)) }
- = fa_icon 'check'
+ = material_symbol 'check'
= prerender_custom_emojis(account_field_value_format(field, with_rel_me: false), account.emojis)
- if account.note.present?
@@ -62,14 +62,16 @@
.report-notes
= render partial: 'admin/report_notes/report_note', collection: @moderation_notes
- = simple_form_for @account_moderation_note, url: admin_account_moderation_notes_path do |f|
- = f.hidden_field :target_account_id
+ = simple_form_for @account_moderation_note, url: admin_account_moderation_notes_path do |form|
+ = form.hidden_field :target_account_id
+
+ = render 'shared/error_messages', object: @account_moderation_note
.field-group
- = f.input :content, placeholder: t('admin.reports.notes.placeholder'), rows: 6
+ = form.input :content, input_html: { placeholder: t('admin.reports.notes.placeholder'), maxlength: AccountModerationNote::CONTENT_SIZE_LIMIT, rows: 6, autofocus: @account_moderation_note.errors.any? }
.actions
- = f.button :button, t('admin.account_moderation_notes.create'), type: :submit
+ = form.button :button, t('admin.account_moderation_notes.create'), type: :submit
%hr.spacer/
diff --git a/app/views/admin/announcements/_form.html.haml b/app/views/admin/announcements/_form.html.haml
new file mode 100644
index 00000000000000..3a9b371907776b
--- /dev/null
+++ b/app/views/admin/announcements/_form.html.haml
@@ -0,0 +1,28 @@
+.fields-group
+ = form.input :starts_at,
+ html5: true,
+ include_blank: true,
+ input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
+ wrapper: :with_block_label
+ = form.input :ends_at,
+ html5: true,
+ include_blank: true,
+ input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
+ wrapper: :with_block_label
+
+.fields-group
+ = form.input :all_day,
+ as: :boolean,
+ wrapper: :with_label
+
+.fields-group
+ = form.input :text,
+ wrapper: :with_block_label
+
+- unless form.object.published?
+ .fields-group
+ = form.input :scheduled_at,
+ html5: true,
+ include_blank: true,
+ input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
+ wrapper: :with_block_label
diff --git a/app/views/admin/announcements/edit.html.haml b/app/views/admin/announcements/edit.html.haml
index 150d98272fcd65..8cec7d36c2d9e1 100644
--- a/app/views/admin/announcements/edit.html.haml
+++ b/app/views/admin/announcements/edit.html.haml
@@ -1,22 +1,12 @@
- content_for :page_title do
= t('.title')
-= simple_form_for @announcement, url: admin_announcement_path(@announcement), html: { novalidate: false } do |f|
+= simple_form_for @announcement, url: admin_announcement_path(@announcement), html: { novalidate: false } do |form|
= render 'shared/error_messages', object: @announcement
- .fields-group
- = f.input :starts_at, include_blank: true, wrapper: :with_block_label, html5: true, input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder }
- = f.input :ends_at, include_blank: true, wrapper: :with_block_label, html5: true, input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder }
-
- .fields-group
- = f.input :all_day, as: :boolean, wrapper: :with_label
-
- .fields-group
- = f.input :text, wrapper: :with_block_label
-
- - unless @announcement.published?
- .fields-group
- = f.input :scheduled_at, include_blank: true, wrapper: :with_block_label, html5: true, input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder }
+ = render form
.actions
- = f.button :button, t('generic.save_changes'), type: :submit
+ = form.button :button,
+ t('generic.save_changes'),
+ type: :submit
diff --git a/app/views/admin/announcements/new.html.haml b/app/views/admin/announcements/new.html.haml
index 0123632ff47a53..266ca65e80ef9e 100644
--- a/app/views/admin/announcements/new.html.haml
+++ b/app/views/admin/announcements/new.html.haml
@@ -1,21 +1,12 @@
- content_for :page_title do
= t('.title')
-= simple_form_for @announcement, url: admin_announcements_path, html: { novalidate: false } do |f|
+= simple_form_for @announcement, url: admin_announcements_path, html: { novalidate: false } do |form|
= render 'shared/error_messages', object: @announcement
- .fields-group
- = f.input :starts_at, include_blank: true, wrapper: :with_block_label, html5: true, input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder }
- = f.input :ends_at, include_blank: true, wrapper: :with_block_label, html5: true, input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder }
-
- .fields-group
- = f.input :all_day, as: :boolean, wrapper: :with_label
-
- .fields-group
- = f.input :text, wrapper: :with_block_label
-
- .fields-group
- = f.input :scheduled_at, include_blank: true, wrapper: :with_block_label, html5: true, input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder }
+ = render form
.actions
- = f.button :button, t('.create'), type: :submit
+ = form.button :button,
+ t('.create'),
+ type: :submit
diff --git a/app/views/admin/custom_emojis/index.html.haml b/app/views/admin/custom_emojis/index.html.haml
index 8b4e93ac3594ff..e87dd4128297c2 100644
--- a/app/views/admin/custom_emojis/index.html.haml
+++ b/app/views/admin/custom_emojis/index.html.haml
@@ -48,19 +48,19 @@
- if params[:local] == '1'
= f.button safe_join([fa_icon('save'), t('generic.save_changes')]), name: :update, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
- = f.button safe_join([fa_icon('eye'), t('admin.custom_emojis.list')]), name: :list, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+ = f.button safe_join([material_symbol('visibility'), t('admin.custom_emojis.list')]), name: :list, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
- = f.button safe_join([fa_icon('eye-slash'), t('admin.custom_emojis.unlist')]), name: :unlist, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+ = f.button safe_join([material_symbol('visibility_off'), t('admin.custom_emojis.unlist')]), name: :unlist, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
= f.button safe_join([fa_icon('power-off'), t('admin.custom_emojis.enable')]), name: :enable, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
= f.button safe_join([fa_icon('power-off'), t('admin.custom_emojis.disable')]), name: :disable, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
- if can?(:destroy, :custom_emoji)
- = f.button safe_join([fa_icon('times'), t('admin.custom_emojis.delete')]), name: :delete, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+ = f.button safe_join([material_symbol('close'), t('admin.custom_emojis.delete')]), name: :delete, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
- if can?(:copy, :custom_emoji) && params[:local] != '1'
- = f.button safe_join([fa_icon('copy'), t('admin.custom_emojis.copy')]), name: :copy, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+ = f.button safe_join([material_symbol('content_copy'), t('admin.custom_emojis.copy')]), name: :copy, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
- if params[:local] == '1'
.batch-table__form.simple_form
@@ -68,12 +68,19 @@
.fields-group.fields-row__column.fields-row__column-6
.input.select.optional
.label_input
- = f.select :category_id, options_from_collection_for_select(CustomEmojiCategory.all, 'id', 'name'), prompt: t('admin.custom_emojis.assign_category'), class: 'select optional', 'aria-label': t('admin.custom_emojis.assign_category')
+ = f.select :category_id,
+ options_from_collection_for_select(CustomEmojiCategory.all, 'id', 'name'),
+ 'aria-label': t('admin.custom_emojis.assign_category'),
+ class: 'select optional',
+ prompt: t('admin.custom_emojis.assign_category')
.fields-group.fields-row__column.fields-row__column-6
.input.string.optional
.label_input
- = f.text_field :category_name, class: 'string optional', placeholder: t('admin.custom_emojis.create_new_category'), 'aria-label': t('admin.custom_emojis.create_new_category')
+ = f.text_field :category_name,
+ 'aria-label': t('admin.custom_emojis.create_new_category'),
+ class: 'string optional',
+ placeholder: t('admin.custom_emojis.create_new_category')
.batch-table__body
- if @custom_emojis.empty?
diff --git a/app/views/admin/custom_emojis/new.html.haml b/app/views/admin/custom_emojis/new.html.haml
index 69b0458ede0bc2..11ea0373517504 100644
--- a/app/views/admin/custom_emojis/new.html.haml
+++ b/app/views/admin/custom_emojis/new.html.haml
@@ -5,9 +5,17 @@
= render 'shared/error_messages', object: @custom_emoji
.fields-group
- = f.input :shortcode, wrapper: :with_label, label: t('admin.custom_emojis.shortcode'), hint: t('admin.custom_emojis.shortcode_hint')
+ = f.input :shortcode,
+ wrapper: :with_label,
+ label: t('admin.custom_emojis.shortcode'),
+ hint: t('admin.custom_emojis.shortcode_hint')
.fields-group
- = f.input :image, wrapper: :with_label, input_html: { accept: CustomEmoji::IMAGE_MIME_TYPES.join(',') }, hint: t('admin.custom_emojis.image_hint', size: number_to_human_size(CustomEmoji::LOCAL_LIMIT))
+ = f.input :image,
+ wrapper: :with_label,
+ input_html: { accept: CustomEmoji::IMAGE_MIME_TYPES.join(',') },
+ hint: t('admin.custom_emojis.image_hint', size: number_to_human_size(CustomEmoji::LOCAL_LIMIT))
.actions
- = f.button :button, t('admin.custom_emojis.upload'), type: :submit
+ = f.button :button,
+ t('admin.custom_emojis.upload'),
+ type: :submit
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index 3597152e09ed49..8430dd3c4f1327 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -16,53 +16,106 @@
.dashboard
.dashboard__item
- = react_admin_component :counter, measure: 'new_users', start_at: @time_period.first, end_at: @time_period.last, label: t('admin.dashboard.new_users'), href: admin_accounts_path(origin: 'local')
+ = react_admin_component :counter,
+ end_at: @time_period.last,
+ href: admin_accounts_path(origin: 'local'),
+ label: t('admin.dashboard.new_users'),
+ measure: 'new_users',
+ start_at: @time_period.first
.dashboard__item
- = react_admin_component :counter, measure: 'active_users', start_at: @time_period.first, end_at: @time_period.last, label: t('admin.dashboard.active_users'), href: admin_accounts_path(origin: 'local')
+ = react_admin_component :counter,
+ end_at: @time_period.last,
+ href: admin_accounts_path(origin: 'local'),
+ label: t('admin.dashboard.active_users'),
+ measure: 'active_users',
+ start_at: @time_period.first
.dashboard__item
- = react_admin_component :counter, measure: 'interactions', start_at: @time_period.first, end_at: @time_period.last, label: t('admin.dashboard.interactions')
+ = react_admin_component :counter,
+ end_at: @time_period.last,
+ label: t('admin.dashboard.interactions'),
+ measure: 'interactions',
+ start_at: @time_period.first
.dashboard__item
- = react_admin_component :counter, measure: 'opened_reports', start_at: @time_period.first, end_at: @time_period.last, label: t('admin.dashboard.opened_reports'), href: admin_reports_path
+ = react_admin_component :counter,
+ end_at: @time_period.last,
+ href: admin_reports_path,
+ label: t('admin.dashboard.opened_reports'),
+ measure: 'opened_reports',
+ start_at: @time_period.first
.dashboard__item
- = react_admin_component :counter, measure: 'resolved_reports', start_at: @time_period.first, end_at: @time_period.last, label: t('admin.dashboard.resolved_reports'), href: admin_reports_path(resolved: '1')
+ = react_admin_component :counter,
+ end_at: @time_period.last,
+ href: admin_reports_path(resolved: '1'),
+ label: t('admin.dashboard.resolved_reports'),
+ measure: 'resolved_reports',
+ start_at: @time_period.first
.dashboard__item
= link_to admin_reports_path, class: 'dashboard__quick-access' do
%span= t('admin.dashboard.pending_reports_html', count: @pending_reports_count)
- = fa_icon 'chevron-right fw'
+ = material_symbol 'chevron_right'
= link_to admin_accounts_path(status: 'pending'), class: 'dashboard__quick-access' do
%span= t('admin.dashboard.pending_users_html', count: @pending_users_count)
- = fa_icon 'chevron-right fw'
+ = material_symbol 'chevron_right'
= link_to admin_trends_tags_path(status: 'pending_review'), class: 'dashboard__quick-access' do
%span= t('admin.dashboard.pending_tags_html', count: @pending_tags_count)
- = fa_icon 'chevron-right fw'
+ = material_symbol 'chevron_right'
= link_to admin_disputes_appeals_path(status: 'pending'), class: 'dashboard__quick-access' do
%span= t('admin.dashboard.pending_appeals_html', count: @pending_appeals_count)
- = fa_icon 'chevron-right fw'
+ = material_symbol 'chevron_right'
.dashboard__item
- = react_admin_component :dimension, dimension: 'sources', start_at: @time_period.first, end_at: @time_period.last, limit: 8, label: t('admin.dashboard.sources')
+ = react_admin_component :dimension,
+ dimension: 'sources',
+ end_at: @time_period.last,
+ label: t('admin.dashboard.sources'),
+ limit: 8,
+ start_at: @time_period.first
.dashboard__item
- = react_admin_component :dimension, dimension: 'languages', start_at: @time_period.first, end_at: @time_period.last, limit: 8, label: t('admin.dashboard.top_languages')
+ = react_admin_component :dimension,
+ dimension: 'languages',
+ end_at: @time_period.last,
+ label: t('admin.dashboard.top_languages'),
+ limit: 8,
+ start_at: @time_period.first
.dashboard__item
- = react_admin_component :dimension, dimension: 'servers', start_at: @time_period.first, end_at: @time_period.last, limit: 8, label: t('admin.dashboard.top_servers')
+ = react_admin_component :dimension,
+ dimension: 'servers',
+ end_at: @time_period.last,
+ label: t('admin.dashboard.top_servers'),
+ limit: 8,
+ start_at: @time_period.first
.dashboard__item.dashboard__item--span-double-column
- = react_admin_component :retention, start_at: @time_period.last - 6.months, end_at: @time_period.last, frequency: 'month'
+ = react_admin_component :retention,
+ end_at: @time_period.last,
+ frequency: 'month',
+ start_at: @time_period.last - 6.months
.dashboard__item.dashboard__item--span-double-row
- = react_admin_component :trends, limit: 7
+ = react_admin_component :trends,
+ limit: 7
.dashboard__item
- = react_admin_component :dimension, dimension: 'software_versions', start_at: @time_period.first, end_at: @time_period.last, limit: 4, label: t('admin.dashboard.software')
+ = react_admin_component :dimension,
+ dimension: 'software_versions',
+ end_at: @time_period.last,
+ label: t('admin.dashboard.software'),
+ limit: 4,
+ start_at: @time_period.first
.dashboard__item
- = react_admin_component :dimension, dimension: 'space_usage', start_at: @time_period.first, end_at: @time_period.last, limit: 3, label: t('admin.dashboard.space')
+ = react_admin_component :dimension,
+ dimension: 'space_usage',
+ end_at: @time_period.last,
+ label: t('admin.dashboard.space'),
+ limit: 3,
+ start_at: @time_period.first
diff --git a/app/views/admin/domain_blocks/_form.html.haml b/app/views/admin/domain_blocks/_form.html.haml
new file mode 100644
index 00000000000000..f1785a1fddb8e0
--- /dev/null
+++ b/app/views/admin/domain_blocks/_form.html.haml
@@ -0,0 +1,46 @@
+.fields-row
+ .fields-row__column.fields-row__column-6.fields-group
+ = form.input :domain,
+ disabled: form.object.persisted?,
+ hint: t('admin.domain_blocks.new.hint'),
+ label: t('admin.domain_blocks.domain'),
+ readonly: form.object.persisted?,
+ required: true,
+ wrapper: :with_label
+ .fields-row__column.fields-row__column-6.fields-group
+ = form.input :severity,
+ collection: DomainBlock.severities.keys,
+ hint: t('admin.domain_blocks.new.severity.desc_html'),
+ include_blank: false,
+ label_method: ->(type) { t("admin.domain_blocks.new.severity.#{type}") },
+ wrapper: :with_label
+.fields-group
+ = form.input :reject_media,
+ as: :boolean,
+ hint: I18n.t('admin.domain_blocks.reject_media_hint'),
+ label: I18n.t('admin.domain_blocks.reject_media'),
+ wrapper: :with_label
+.fields-group
+ = form.input :reject_reports,
+ as: :boolean,
+ hint: I18n.t('admin.domain_blocks.reject_reports_hint'),
+ label: I18n.t('admin.domain_blocks.reject_reports'),
+ wrapper: :with_label
+.fields-group
+ = form.input :obfuscate,
+ as: :boolean,
+ hint: I18n.t('admin.domain_blocks.obfuscate_hint'),
+ label: I18n.t('admin.domain_blocks.obfuscate'),
+ wrapper: :with_label
+.field-group
+ = form.input :private_comment,
+ as: :string,
+ hint: t('admin.domain_blocks.private_comment_hint'),
+ label: I18n.t('admin.domain_blocks.private_comment'),
+ wrapper: :with_label
+.field-group
+ = form.input :public_comment,
+ as: :string,
+ hint: t('admin.domain_blocks.public_comment_hint'),
+ label: I18n.t('admin.domain_blocks.public_comment'),
+ wrapper: :with_label
diff --git a/app/views/admin/domain_blocks/confirm_suspension.html.haml b/app/views/admin/domain_blocks/confirm_suspension.html.haml
index a5df8ba3f3adb5..4c4f92d710d666 100644
--- a/app/views/admin/domain_blocks/confirm_suspension.html.haml
+++ b/app/views/admin/domain_blocks/confirm_suspension.html.haml
@@ -14,7 +14,8 @@
%hr.spacer
- = react_admin_component :impact_report, domain: @domain_block.domain
+ = react_admin_component :impact_report,
+ domain: @domain_block.domain
.actions
= link_to t('.cancel'), admin_instances_path, class: 'button button-tertiary'
diff --git a/app/views/admin/domain_blocks/edit.html.haml b/app/views/admin/domain_blocks/edit.html.haml
index ae76b6777a22ca..40c46b8b6b9404 100644
--- a/app/views/admin/domain_blocks/edit.html.haml
+++ b/app/views/admin/domain_blocks/edit.html.haml
@@ -1,30 +1,12 @@
- content_for :page_title do
= t('admin.domain_blocks.edit')
-= simple_form_for @domain_block, url: admin_domain_block_path(@domain_block), method: :put do |f|
+= simple_form_for @domain_block, url: admin_domain_block_path(@domain_block), method: :put do |form|
= render 'shared/error_messages', object: @domain_block
- .fields-row
- .fields-row__column.fields-row__column-6.fields-group
- = f.input :domain, wrapper: :with_label, label: t('admin.domain_blocks.domain'), hint: t('admin.domain_blocks.new.hint'), required: true, readonly: true, disabled: true
-
- .fields-row__column.fields-row__column-6.fields-group
- = f.input :severity, collection: DomainBlock.severities.keys, wrapper: :with_label, include_blank: false, label_method: ->(type) { t("admin.domain_blocks.new.severity.#{type}") }, hint: t('admin.domain_blocks.new.severity.desc_html')
-
- .fields-group
- = f.input :reject_media, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_media'), hint: I18n.t('admin.domain_blocks.reject_media_hint')
-
- .fields-group
- = f.input :reject_reports, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_reports'), hint: I18n.t('admin.domain_blocks.reject_reports_hint')
-
- .fields-group
- = f.input :obfuscate, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.obfuscate'), hint: I18n.t('admin.domain_blocks.obfuscate_hint')
-
- .field-group
- = f.input :private_comment, wrapper: :with_label, label: I18n.t('admin.domain_blocks.private_comment'), hint: t('admin.domain_blocks.private_comment_hint'), as: :string
-
- .field-group
- = f.input :public_comment, wrapper: :with_label, label: I18n.t('admin.domain_blocks.public_comment'), hint: t('admin.domain_blocks.public_comment_hint'), as: :string
+ = render form
.actions
- = f.button :button, t('generic.save_changes'), type: :submit
+ = form.button :button,
+ t('generic.save_changes'),
+ type: :submit
diff --git a/app/views/admin/domain_blocks/new.html.haml b/app/views/admin/domain_blocks/new.html.haml
index 86e519f451bdff..78bcfcba8e737d 100644
--- a/app/views/admin/domain_blocks/new.html.haml
+++ b/app/views/admin/domain_blocks/new.html.haml
@@ -1,30 +1,12 @@
- content_for :page_title do
= t('.title')
-= simple_form_for @domain_block, url: admin_domain_blocks_path do |f|
+= simple_form_for @domain_block, url: admin_domain_blocks_path do |form|
= render 'shared/error_messages', object: @domain_block
- .fields-row
- .fields-row__column.fields-row__column-6.fields-group
- = f.input :domain, wrapper: :with_label, label: t('admin.domain_blocks.domain'), hint: t('.hint'), required: true
-
- .fields-row__column.fields-row__column-6.fields-group
- = f.input :severity, collection: DomainBlock.severities.keys, wrapper: :with_label, include_blank: false, label_method: ->(type) { t(".severity.#{type}") }, hint: t('.severity.desc_html')
-
- .fields-group
- = f.input :reject_media, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_media'), hint: I18n.t('admin.domain_blocks.reject_media_hint')
-
- .fields-group
- = f.input :reject_reports, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_reports'), hint: I18n.t('admin.domain_blocks.reject_reports_hint')
-
- .fields-group
- = f.input :obfuscate, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.obfuscate'), hint: I18n.t('admin.domain_blocks.obfuscate_hint')
-
- .field-group
- = f.input :private_comment, wrapper: :with_label, label: I18n.t('admin.domain_blocks.private_comment'), hint: t('admin.domain_blocks.private_comment_hint'), as: :string
-
- .field-group
- = f.input :public_comment, wrapper: :with_label, label: I18n.t('admin.domain_blocks.public_comment'), hint: t('admin.domain_blocks.public_comment_hint'), as: :string
+ = render form
.actions
- = f.button :button, t('.create'), type: :submit
+ = form.button :button,
+ t('.create'),
+ type: :submit
diff --git a/app/views/admin/email_domain_blocks/index.html.haml b/app/views/admin/email_domain_blocks/index.html.haml
index 9f16e0d5c36460..684735c2070e5d 100644
--- a/app/views/admin/email_domain_blocks/index.html.haml
+++ b/app/views/admin/email_domain_blocks/index.html.haml
@@ -12,7 +12,11 @@
%label.batch-table__toolbar__select.batch-checkbox-all
= check_box_tag :batch_checkbox_all, nil, false
.batch-table__toolbar__actions
- = f.button safe_join([fa_icon('times'), t('admin.email_domain_blocks.delete')]), name: :delete, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+ = f.button safe_join([material_symbol('close'), t('admin.email_domain_blocks.delete')]),
+ class: 'table-action-link',
+ data: { confirm: t('admin.reports.are_you_sure') },
+ name: :delete,
+ type: :submit
.batch-table__body
- if @email_domain_blocks.empty?
= nothing_here 'nothing-here--under-tabs'
diff --git a/app/views/admin/email_domain_blocks/new.html.haml b/app/views/admin/email_domain_blocks/new.html.haml
index 3d31487733ee34..dd4b83ee3f2832 100644
--- a/app/views/admin/email_domain_blocks/new.html.haml
+++ b/app/views/admin/email_domain_blocks/new.html.haml
@@ -5,10 +5,16 @@
= render 'shared/error_messages', object: @email_domain_block
.fields-group
- = f.input :domain, wrapper: :with_block_label, label: t('admin.email_domain_blocks.domain'), input_html: { readonly: defined?(@resolved_records) }
+ = f.input :domain,
+ input_html: { readonly: defined?(@resolved_records) },
+ label: t('admin.email_domain_blocks.domain'),
+ wrapper: :with_block_label
.fields-group
- = f.input :allow_with_approval, wrapper: :with_label, hint: false, label: I18n.t('admin.email_domain_blocks.allow_registrations_with_approval')
+ = f.input :allow_with_approval,
+ hint: false,
+ label: I18n.t('admin.email_domain_blocks.allow_registrations_with_approval'),
+ wrapper: :with_label
- if defined?(@resolved_records)
%p.hint= t('admin.email_domain_blocks.resolved_dns_records_hint_html')
@@ -22,7 +28,11 @@
- @resolved_records.each do |record|
.batch-table__row
%label.batch-table__row__select.batch-table__row__select--aligned.batch-checkbox
- = f.input_field :other_domains, as: :boolean, checked_value: record.exchange.to_s, include_hidden: false, multiple: true
+ = f.input_field :other_domains,
+ as: :boolean,
+ checked_value: record.exchange.to_s,
+ include_hidden: false,
+ multiple: true
.batch-table__row__content.pending-account
.pending-account__header
%samp= record.exchange.to_s
diff --git a/app/views/admin/export_domain_allows/new.html.haml b/app/views/admin/export_domain_allows/new.html.haml
index dc0cf8c52a1ff2..66c6aa8d8ac688 100644
--- a/app/views/admin/export_domain_allows/new.html.haml
+++ b/app/views/admin/export_domain_allows/new.html.haml
@@ -4,7 +4,10 @@
= simple_form_for @import, url: import_admin_export_domain_allows_path, html: { multipart: true } do |f|
.fields-row
.fields-group.fields-row__column.fields-row__column-6
- = f.input :data, wrapper: :with_block_label, hint: t('simple_form.hints.imports.data'), as: :file
+ = f.input :data,
+ as: :file,
+ hint: t('simple_form.hints.imports.data'),
+ wrapper: :with_block_label
.actions
= f.button :button, t('imports.upload'), type: :submit
diff --git a/app/views/admin/export_domain_blocks/_domain_block.html.haml b/app/views/admin/export_domain_blocks/_domain_block.html.haml
index cdce4fd28a908c..79cc5595ca1ccd 100644
--- a/app/views/admin/export_domain_blocks/_domain_block.html.haml
+++ b/app/views/admin/export_domain_blocks/_domain_block.html.haml
@@ -23,5 +23,5 @@
= f.object.public_comment
- if existing_relationships
·
- = fa_icon 'warning fw'
+ = material_symbol 'warning'
= t('admin.export_domain_blocks.import.existing_relationships_warning')
diff --git a/app/views/admin/export_domain_blocks/import.html.haml b/app/views/admin/export_domain_blocks/import.html.haml
index 01add232d16d1d..52ffc3d465ce01 100644
--- a/app/views/admin/export_domain_blocks/import.html.haml
+++ b/app/views/admin/export_domain_blocks/import.html.haml
@@ -12,7 +12,11 @@
%label.batch-table__toolbar__select.batch-checkbox-all
= check_box_tag :batch_checkbox_all, nil, false
.batch-table__toolbar__actions
- = f.button safe_join([fa_icon('copy'), t('admin.domain_blocks.import')]), name: :save, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+ = f.button safe_join([material_symbol('content_copy'), t('admin.domain_blocks.import')]),
+ class: 'table-action-link',
+ data: { confirm: t('admin.reports.are_you_sure') },
+ name: :save,
+ type: :submit
.batch-table__body
- if @domain_blocks.empty?
= nothing_here 'nothing-here--under-tabs'
diff --git a/app/views/admin/export_domain_blocks/new.html.haml b/app/views/admin/export_domain_blocks/new.html.haml
index 0291aeed776e2d..9c960d47fe50e4 100644
--- a/app/views/admin/export_domain_blocks/new.html.haml
+++ b/app/views/admin/export_domain_blocks/new.html.haml
@@ -4,7 +4,10 @@
= simple_form_for @import, url: import_admin_export_domain_blocks_path, html: { multipart: true } do |f|
.fields-row
.fields-group.fields-row__column.fields-row__column-6
- = f.input :data, wrapper: :with_block_label, hint: t('simple_form.hints.imports.data'), as: :file
+ = f.input :data,
+ as: :file,
+ hint: t('simple_form.hints.imports.data'),
+ wrapper: :with_block_label
.actions
= f.button :button, t('imports.upload'), type: :submit
diff --git a/app/views/admin/follow_recommendations/show.html.haml b/app/views/admin/follow_recommendations/show.html.haml
index 9c2063d3c577ee..c8ad653a88a95f 100644
--- a/app/views/admin/follow_recommendations/show.html.haml
+++ b/app/views/admin/follow_recommendations/show.html.haml
@@ -13,7 +13,8 @@
.filter-subset.filter-subset--with-select
%strong= t('admin.follow_recommendations.language')
.input.select.optional
- = select_tag :language, options_for_select(Trends.available_locales.map { |key| [standard_locale_name(key), key] }, @language)
+ = select_tag :language,
+ options_for_select(Trends.available_locales.map { |key| [standard_locale_name(key), key] }, @language)
.filter-subset
%strong= t('admin.follow_recommendations.status')
%ul
@@ -30,9 +31,16 @@
= check_box_tag :batch_checkbox_all, nil, false
.batch-table__toolbar__actions
- if params[:status].blank? && can?(:suppress, :follow_recommendation)
- = f.button safe_join([fa_icon('times'), t('admin.follow_recommendations.suppress')]), name: :suppress, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+ = f.button safe_join([material_symbol('close'), t('admin.follow_recommendations.suppress')]),
+ class: 'table-action-link',
+ data: { confirm: t('admin.reports.are_you_sure') },
+ name: :suppress,
+ type: :submit
- if params[:status] == 'suppressed' && can?(:unsuppress, :follow_recommendation)
- = f.button safe_join([fa_icon('plus'), t('admin.follow_recommendations.unsuppress')]), name: :unsuppress, class: 'table-action-link', type: :submit
+ = f.button safe_join([material_symbol('add'), t('admin.follow_recommendations.unsuppress')]),
+ class: 'table-action-link',
+ name: :unsuppress,
+ type: :submit
.batch-table__body
- if @accounts.empty?
= nothing_here 'nothing-here--under-tabs'
diff --git a/app/views/admin/instances/_instance.html.haml b/app/views/admin/instances/_instance.html.haml
index 65cf789ce316df..522a2444bb9d6b 100644
--- a/app/views/admin/instances/_instance.html.haml
+++ b/app/views/admin/instances/_instance.html.haml
@@ -7,6 +7,10 @@
%small
- if instance.domain_block
= instance.domain_block.policies.map { |policy| t(policy, scope: 'admin.instances.content_policies.policies') }.join(' · ')
+ - if instance.domain_block.public_comment.present?
+ %span.comment.public-comment #{t('admin.domain_blocks.public_comment')}: #{instance.domain_block.public_comment}
+ - if instance.domain_block.private_comment.present?
+ %span.comment.private-comment #{t('admin.domain_blocks.private_comment')}: #{instance.domain_block.private_comment}
- elsif instance.domain_allow
= t('admin.accounts.whitelisted')
- else
diff --git a/app/views/admin/instances/show.html.haml b/app/views/admin/instances/show.html.haml
index 5f2664df76dc11..d916203d0c664f 100644
--- a/app/views/admin/instances/show.html.haml
+++ b/app/views/admin/instances/show.html.haml
@@ -9,26 +9,71 @@
- if @instance.persisted?
%p
- = fa_icon 'info fw'
+ = material_symbol 'info'
= t('admin.instances.totals_time_period_hint_html')
.dashboard
.dashboard__item
- = react_admin_component :counter, measure: 'instance_accounts', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, label: t('admin.instances.dashboard.instance_accounts_measure'), href: admin_accounts_path(origin: 'remote', by_domain: @instance.domain)
+ = react_admin_component :counter,
+ end_at: @time_period.last,
+ href: admin_accounts_path(origin: 'remote', by_domain: @instance.domain),
+ label: t('admin.instances.dashboard.instance_accounts_measure'),
+ measure: 'instance_accounts',
+ params: { domain: @instance.domain },
+ start_at: @time_period.first
.dashboard__item
- = react_admin_component :counter, measure: 'instance_statuses', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, label: t('admin.instances.dashboard.instance_statuses_measure')
+ = react_admin_component :counter,
+ end_at: @time_period.last,
+ label: t('admin.instances.dashboard.instance_statuses_measure'),
+ measure: 'instance_statuses',
+ params: { domain: @instance.domain },
+ start_at: @time_period.first
.dashboard__item
- = react_admin_component :counter, measure: 'instance_media_attachments', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, label: t('admin.instances.dashboard.instance_media_attachments_measure')
+ = react_admin_component :counter,
+ end_at: @time_period.last,
+ label: t('admin.instances.dashboard.instance_media_attachments_measure'),
+ measure: 'instance_media_attachments',
+ params: { domain: @instance.domain },
+ start_at: @time_period.first
.dashboard__item
- = react_admin_component :counter, measure: 'instance_follows', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, label: t('admin.instances.dashboard.instance_follows_measure')
+ = react_admin_component :counter,
+ end_at: @time_period.last,
+ label: t('admin.instances.dashboard.instance_follows_measure'),
+ measure: 'instance_follows',
+ params: { domain: @instance.domain },
+ start_at: @time_period.first
.dashboard__item
- = react_admin_component :counter, measure: 'instance_followers', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, label: t('admin.instances.dashboard.instance_followers_measure')
+ = react_admin_component :counter,
+ end_at: @time_period.last,
+ label: t('admin.instances.dashboard.instance_followers_measure'),
+ measure: 'instance_followers',
+ params: { domain: @instance.domain },
+ start_at: @time_period.first
.dashboard__item
- = react_admin_component :counter, measure: 'instance_reports', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, label: t('admin.instances.dashboard.instance_reports_measure'), href: admin_reports_path(by_target_domain: @instance.domain)
+ = react_admin_component :counter,
+ end_at: @time_period.last,
+ href: admin_reports_path(by_target_domain: @instance.domain),
+ label: t('admin.instances.dashboard.instance_reports_measure'),
+ measure: 'instance_reports',
+ params: { domain: @instance.domain },
+ start_at: @time_period.first
.dashboard__item
- = react_admin_component :dimension, dimension: 'instance_accounts', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, limit: 8, label: t('admin.instances.dashboard.instance_accounts_dimension')
+ = react_admin_component :dimension,
+ dimension: 'instance_accounts',
+ end_at: @time_period.last,
+ label: t('admin.instances.dashboard.instance_accounts_dimension'),
+ limit: 8,
+ params: { domain: @instance.domain },
+ start_at: @time_period.first
.dashboard__item
- = react_admin_component :dimension, dimension: 'instance_languages', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, limit: 8, label: t('admin.instances.dashboard.instance_languages_dimension')
+ = react_admin_component :dimension,
+ dimension: 'instance_languages',
+ end_at: @time_period.last,
+ label: t('admin.instances.dashboard.instance_languages_dimension'),
+ limit: 8,
+ params: { domain: @instance.domain },
+ start_at: @time_period.first
+
- else
%p
= t('admin.instances.unknown_instance')
diff --git a/app/views/admin/invites/_invite.html.haml b/app/views/admin/invites/_invite.html.haml
index e6ad9de34c9edc..f9cd6003f3da81 100644
--- a/app/views/admin/invites/_invite.html.haml
+++ b/app/views/admin/invites/_invite.html.haml
@@ -12,7 +12,7 @@
- if invite.valid_for_use?
%td
- = fa_icon 'user fw'
+ = material_symbol 'person'
= invite.uses
= " / #{invite.max_uses}" unless invite.max_uses.nil?
%td
diff --git a/app/views/admin/ip_blocks/index.html.haml b/app/views/admin/ip_blocks/index.html.haml
index a48e4791a36344..9eba6c68ffbd62 100644
--- a/app/views/admin/ip_blocks/index.html.haml
+++ b/app/views/admin/ip_blocks/index.html.haml
@@ -14,7 +14,11 @@
= check_box_tag :batch_checkbox_all, nil, false
.batch-table__toolbar__actions
- if can?(:destroy, :ip_block)
- = f.button safe_join([fa_icon('times'), t('admin.ip_blocks.delete')]), name: :delete, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+ = f.button safe_join([material_symbol('close'), t('admin.ip_blocks.delete')]),
+ class: 'table-action-link',
+ data: { confirm: t('admin.reports.are_you_sure') },
+ name: :delete,
+ type: :submit
.batch-table__body
- if @ip_blocks.empty?
= nothing_here 'nothing-here--under-tabs'
diff --git a/app/views/admin/ip_blocks/new.html.haml b/app/views/admin/ip_blocks/new.html.haml
index ecaf04315bc674..81493012c60405 100644
--- a/app/views/admin/ip_blocks/new.html.haml
+++ b/app/views/admin/ip_blocks/new.html.haml
@@ -5,16 +5,30 @@
= render 'shared/error_messages', object: @ip_block
.fields-group
- = f.input :ip, as: :string, wrapper: :with_block_label, input_html: { placeholder: '192.0.2.0/24' }
+ = f.input :ip,
+ as: :string,
+ input_html: { placeholder: '192.0.2.0/24' },
+ wrapper: :with_block_label
.fields-group
- = f.input :expires_in, wrapper: :with_block_label, collection: [1.day, 2.weeks, 1.month, 6.months, 1.year, 3.years].map(&:to_i), label_method: ->(i) { I18n.t("admin.ip_blocks.expires_in.#{i}") }, prompt: I18n.t('invites.expires_in_prompt')
+ = f.input :expires_in,
+ collection: [1.day, 2.weeks, 1.month, 6.months, 1.year, 3.years].map(&:to_i),
+ label_method: ->(i) { I18n.t("admin.ip_blocks.expires_in.#{i}") },
+ prompt: I18n.t('invites.expires_in_prompt'),
+ wrapper: :with_block_label
.fields-group
- = f.input :severity, as: :radio_buttons, collection: IpBlock.severities.keys, include_blank: false, wrapper: :with_block_label, label_method: ->(severity) { ip_blocks_severity_label(severity) }
+ = f.input :severity,
+ as: :radio_buttons,
+ collection: IpBlock.severities.keys,
+ include_blank: false,
+ label_method: ->(severity) { ip_blocks_severity_label(severity) },
+ wrapper: :with_block_label
.fields-group
- = f.input :comment, as: :string, wrapper: :with_block_label
+ = f.input :comment,
+ as: :string,
+ wrapper: :with_block_label
.actions
= f.button :button, t('admin.ip_blocks.add_new'), type: :submit
diff --git a/app/views/admin/relationships/index.html.haml b/app/views/admin/relationships/index.html.haml
index f82cf26a38e0cc..c2daefb4242962 100644
--- a/app/views/admin/relationships/index.html.haml
+++ b/app/views/admin/relationships/index.html.haml
@@ -19,7 +19,7 @@
.back-link
= link_to admin_account_path(@account.id) do
- = fa_icon 'chevron-left fw'
+ = material_symbol 'chevron_left'
= t('admin.statuses.back_to_account')
%hr.spacer/
@@ -30,7 +30,11 @@
%label.batch-table__toolbar__select.batch-checkbox-all
= check_box_tag :batch_checkbox_all, nil, false
.batch-table__toolbar__actions
- = f.button safe_join([fa_icon('lock'), t('admin.accounts.perform_full_suspension')]), name: :suspend, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+ = f.button safe_join([material_symbol('lock'), t('admin.accounts.perform_full_suspension')]),
+ class: 'table-action-link',
+ data: { confirm: t('admin.reports.are_you_sure') },
+ name: :suspend,
+ type: :submit
.batch-table__body
- if @accounts.empty?
= nothing_here 'nothing-here--under-tabs'
diff --git a/app/views/admin/relays/_relay.html.haml b/app/views/admin/relays/_relay.html.haml
index f1dd2b2dd14be3..0960124ccfae4e 100644
--- a/app/views/admin/relays/_relay.html.haml
+++ b/app/views/admin/relays/_relay.html.haml
@@ -4,7 +4,7 @@
%td
- if relay.accepted?
%span.positive-hint
- = fa_icon('check')
+ = material_symbol('check')
= t 'admin.relays.enabled'
- elsif relay.pending?
@@ -13,7 +13,7 @@
= t 'admin.relays.pending'
- else
%span.negative-hint
- = fa_icon('times')
+ = material_symbol('close')
= t 'admin.relays.disabled'
%td
diff --git a/app/views/admin/reports/_header_card.html.haml b/app/views/admin/reports/_header_card.html.haml
index 6fd8b4ecc8be98..52e62b44998f5d 100644
--- a/app/views/admin/reports/_header_card.html.haml
+++ b/app/views/admin/reports/_header_card.html.haml
@@ -1,5 +1,11 @@
.report-header__card
.account-card
+ - if report.target_account.suspended?
+ .account-card__warning-badge
+ - if report.target_account.suspension_origin_local?
+ = t('admin.reports.already_suspended_badges.local')
+ - else
+ = t('admin.reports.already_suspended_badges.remote')
.account-card__header
= image_tag report.target_account.header.url, alt: ''
.account-card__title
@@ -10,7 +16,7 @@
%strong.emojify.p-name= display_name(report.target_account, custom_emojify: true)
%span
= acct(report.target_account)
- = fa_icon('lock') if report.target_account.locked?
+ = material_symbol('lock') if report.target_account.locked?
- if report.target_account.note.present?
.account-card__bio.emojify
= prerender_custom_emojis(account_bio_format(report.target_account), report.target_account.emojis)
diff --git a/app/views/admin/reports/_media_attachments.html.haml b/app/views/admin/reports/_media_attachments.html.haml
index 3c52d691781efe..45cc4c5aa31078 100644
--- a/app/views/admin/reports/_media_attachments.html.haml
+++ b/app/views/admin/reports/_media_attachments.html.haml
@@ -12,6 +12,6 @@
= react_component :media_gallery,
height: 343,
lang: status.language,
- media: status.ordered_media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json },
+ media: serialized_media_attachments(status.ordered_media_attachments),
sensitive: status.sensitive?,
visible: false
diff --git a/app/views/admin/reports/_status.html.haml b/app/views/admin/reports/_status.html.haml
index b2982a42bf5107..66820f0a6e7fb2 100644
--- a/app/views/admin/reports/_status.html.haml
+++ b/app/views/admin/reports/_status.html.haml
@@ -22,7 +22,9 @@
%time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
- if status.edited?
·
- = link_to t('statuses.edited_at_html', date: content_tag(:time, l(status.edited_at), datetime: status.edited_at.iso8601, title: l(status.edited_at), class: 'formatted')), admin_account_status_path(status.account_id, status), class: 'detailed-status__datetime'
+ = link_to t('statuses.edited_at_html', date: content_tag(:time, l(status.edited_at), datetime: status.edited_at.iso8601, title: l(status.edited_at), class: 'formatted')),
+ admin_account_status_path(status.account_id, status),
+ class: 'detailed-status__datetime'
- if status.discarded?
·
%span.negative-hint= t('admin.statuses.deleted')
@@ -35,5 +37,5 @@
= t("statuses.visibilities.#{status.visibility}")
- if status.proper.sensitive?
·
- = fa_icon('eye-slash fw')
+ = material_symbol('visibility_off')
= t('stream_entries.sensitive_content')
diff --git a/app/views/admin/reports/actions/preview.html.haml b/app/views/admin/reports/actions/preview.html.haml
index 8634bb215c4e19..7a737d4f727f29 100644
--- a/app/views/admin/reports/actions/preview.html.haml
+++ b/app/views/admin/reports/actions/preview.html.haml
@@ -58,7 +58,7 @@
- status.ordered_media_attachments.each do |media_attachment|
%abbr{ title: media_attachment.description }
- = fa_icon 'link'
+ = material_symbol 'link'
= media_attachment.file_file_name
.strike-card__statuses-list__item__meta
= link_to ActivityPub::TagManager.instance.url_for(status), target: '_blank', rel: 'noopener noreferrer' do
diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml
index 4376e5af4d7a75..842aa51597023e 100644
--- a/app/views/admin/reports/show.html.haml
+++ b/app/views/admin/reports/show.html.haml
@@ -20,7 +20,11 @@
%p= t 'admin.reports.category_description_html'
-= react_admin_component :report_reason_selector, id: @report.id, category: @report.category, rule_ids: @report.rule_ids&.map(&:to_s), disabled: @report.action_taken?
+= react_admin_component :report_reason_selector,
+ category: @report.category,
+ disabled: @report.action_taken?,
+ id: @report.id,
+ rule_ids: @report.rule_ids&.map(&:to_s)
- if @report.comment.present?
= render 'admin/reports/comment', report: @report
@@ -37,7 +41,9 @@
%p
= t 'admin.reports.statuses_description_html'
—
- = link_to safe_join([fa_icon('plus'), t('admin.reports.add_to_report')]), admin_account_statuses_path(@report.target_account_id, report_id: @report.id), class: 'table-action-link'
+ = link_to safe_join([material_symbol('add'), t('admin.reports.add_to_report')]),
+ admin_account_statuses_path(@report.target_account_id, report_id: @report.id),
+ class: 'table-action-link'
= form_for(@form, url: batch_admin_account_statuses_path(@report.target_account_id, report_id: @report.id)) do |f|
.batch-table
@@ -46,7 +52,7 @@
= check_box_tag :batch_checkbox_all, nil, false
.batch-table__toolbar__actions
- if !@statuses.empty? && @report.unresolved?
- = f.button safe_join([fa_icon('times'), t('admin.statuses.batch.remove_from_report')]), name: :remove_from_report, class: 'table-action-link', type: :submit
+ = f.button safe_join([material_symbol('close'), t('admin.statuses.batch.remove_from_report')]), name: :remove_from_report, class: 'table-action-link', type: :submit
.batch-table__body
- if @statuses.empty?
= nothing_here 'nothing-here--under-tabs'
@@ -77,15 +83,17 @@
.report-notes
= render @report_notes
-= simple_form_for @report_note, url: admin_report_notes_path do |f|
- = f.input :report_id, as: :hidden
+= simple_form_for @report_note, url: admin_report_notes_path do |form|
+ = form.input :report_id, as: :hidden
+
+ = render 'shared/error_messages', object: @report_note
.field-group
- = f.input :content, placeholder: t('admin.reports.notes.placeholder'), rows: 6
+ = form.input :content, input_html: { placeholder: t('admin.reports.notes.placeholder'), maxlength: ReportNote::CONTENT_SIZE_LIMIT, rows: 6, autofocus: @report_note.errors.any? }
.actions
- if @report.unresolved?
- = f.button :button, t('admin.reports.notes.create_and_resolve'), name: :create_and_resolve, type: :submit
+ = form.button :button, t('admin.reports.notes.create_and_resolve'), name: :create_and_resolve, type: :submit
- else
- = f.button :button, t('admin.reports.notes.create_and_unresolve'), name: :create_and_unresolve, type: :submit
- = f.button :button, t('admin.reports.notes.create'), type: :submit
+ = form.button :button, t('admin.reports.notes.create_and_unresolve'), name: :create_and_unresolve, type: :submit
+ = form.button :button, t('admin.reports.notes.create'), type: :submit
diff --git a/app/views/admin/roles/_form.html.haml b/app/views/admin/roles/_form.html.haml
index 46a1c537a75a0f..0b1c3101624c30 100644
--- a/app/views/admin/roles/_form.html.haml
+++ b/app/views/admin/roles/_form.html.haml
@@ -5,19 +5,25 @@
= t('admin.roles.everyone_full_description_html')
- else
.fields-group
- = form.input :name, wrapper: :with_label
+ = form.input :name,
+ wrapper: :with_label
- unless current_user.role == form.object
.fields-group
- = form.input :position, wrapper: :with_label, input_html: { max: current_user.role.position - 1 }
+ = form.input :position,
+ input_html: { max: current_user.role.position - 1 },
+ wrapper: :with_label
.fields-group
- = form.input :color, wrapper: :with_label, input_html: { placeholder: '#000000', type: 'color' }
+ = form.input :color,
+ input_html: { placeholder: '#000000', type: 'color' },
+ wrapper: :with_label
%hr.spacer/
.fields-group
- = form.input :highlighted, wrapper: :with_label
+ = form.input :highlighted,
+ wrapper: :with_label
%hr.spacer/
@@ -31,6 +37,17 @@
- (form.object.everyone? ? UserRole::Flags::CATEGORIES.slice(:invites) : UserRole::Flags::CATEGORIES).each do |category, permissions|
%h4= t(category, scope: 'admin.roles.categories')
- = form.input :permissions_as_keys, collection: permissions, wrapper: :with_block_label, include_blank: false, label_method: ->(privilege) { privilege_label(privilege) }, required: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', label: false, hint: false, disabled: disable_permissions?(permissions)
+ = form.input :permissions_as_keys,
+ as: :check_boxes,
+ collection_wrapper_tag: 'ul',
+ collection: permissions,
+ disabled: disable_permissions?(permissions),
+ hint: false,
+ include_blank: false,
+ item_wrapper_tag: 'li',
+ label_method: ->(privilege) { privilege_label(privilege) },
+ label: false,
+ required: false,
+ wrapper: :with_block_label
%hr.spacer/
diff --git a/app/views/admin/roles/_role.html.haml b/app/views/admin/roles/_role.html.haml
index d6c6b62c81b667..fd37644c835f90 100644
--- a/app/views/admin/roles/_role.html.haml
+++ b/app/views/admin/roles/_role.html.haml
@@ -2,7 +2,7 @@
- if can?(:update, role)
= link_to edit_admin_role_path(role), class: 'announcements-list__item__title' do
%span.user-role{ class: "user-role-#{role.id}" }
- = fa_icon 'users fw'
+ = material_symbol 'group'
- if role.everyone?
= t('admin.roles.everyone')
@@ -11,7 +11,7 @@
- else
%span.announcements-list__item__title
%span.user-role{ class: "user-role-#{role.id}" }
- = fa_icon 'users fw'
+ = material_symbol 'group'
- if role.everyone?
= t('admin.roles.everyone')
diff --git a/app/views/admin/rules/_form.html.haml b/app/views/admin/rules/_form.html.haml
new file mode 100644
index 00000000000000..9fc54e28873ee3
--- /dev/null
+++ b/app/views/admin/rules/_form.html.haml
@@ -0,0 +1,7 @@
+.fields-group
+ = form.input :text,
+ wrapper: :with_block_label
+
+.fields-group
+ = form.input :hint,
+ wrapper: :with_block_label
diff --git a/app/views/admin/rules/_rule.html.haml b/app/views/admin/rules/_rule.html.haml
index a0896fe806e333..5f37f693543702 100644
--- a/app/views/admin/rules/_rule.html.haml
+++ b/app/views/admin/rules/_rule.html.haml
@@ -5,7 +5,7 @@
.announcements-list__item__action-bar
.announcements-list__item__meta
- = rule.text
+ = rule.hint
%div
= table_link_to 'trash', t('admin.rules.delete'), admin_rule_path(rule), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:destroy, rule)
diff --git a/app/views/admin/rules/edit.html.haml b/app/views/admin/rules/edit.html.haml
index ba7e6451a149b3..9e3c9158120c1e 100644
--- a/app/views/admin/rules/edit.html.haml
+++ b/app/views/admin/rules/edit.html.haml
@@ -1,11 +1,10 @@
- content_for :page_title do
= t('admin.rules.edit')
-= simple_form_for @rule, url: admin_rule_path(@rule) do |f|
+= simple_form_for @rule, url: admin_rule_path(@rule) do |form|
= render 'shared/error_messages', object: @rule
- .fields-group
- = f.input :text, wrapper: :with_block_label
+ = render form
.actions
- = f.button :button, t('generic.save_changes'), type: :submit
+ = form.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/rules/index.html.haml b/app/views/admin/rules/index.html.haml
index aa6a4c1b6a68a8..5a2789edcfce4c 100644
--- a/app/views/admin/rules/index.html.haml
+++ b/app/views/admin/rules/index.html.haml
@@ -6,14 +6,13 @@
%hr.spacer/
- if can? :create, :rule
- = simple_form_for @rule, url: admin_rules_path do |f|
+ = simple_form_for @rule, url: admin_rules_path do |form|
= render 'shared/error_messages', object: @rule
- .fields-group
- = f.input :text, wrapper: :with_block_label
+ = render form
.actions
- = f.button :button, t('admin.rules.add_new'), type: :submit
+ = form.button :button, t('admin.rules.add_new'), type: :submit
%hr.spacer/
diff --git a/app/views/admin/settings/about/show.html.haml b/app/views/admin/settings/about/show.html.haml
index 1237c20fa8e36b..1eb47a0b54e865 100644
--- a/app/views/admin/settings/about/show.html.haml
+++ b/app/views/admin/settings/about/show.html.haml
@@ -11,7 +11,10 @@
%p.lead= t('admin.settings.about.preamble')
.fields-group
- = f.input :site_extended_description, wrapper: :with_block_label, as: :text, input_html: { rows: 8 }
+ = f.input :site_extended_description,
+ as: :text,
+ input_html: { rows: 8 },
+ wrapper: :with_block_label
%p.hint
= t 'admin.settings.about.rules_hint'
@@ -19,15 +22,32 @@
.fields-row
.fields-row__column.fields-row__column-6.fields-group
- = f.input :show_domain_blocks, wrapper: :with_label, collection: %i(disabled users all), label_method: ->(value) { t("admin.settings.domain_blocks.#{value}") }, include_blank: false, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
+ = f.input :show_domain_blocks,
+ collection_wrapper_tag: 'ul',
+ collection: %i(disabled users all),
+ include_blank: false,
+ item_wrapper_tag: 'li',
+ label_method: ->(value) { t("admin.settings.domain_blocks.#{value}") },
+ wrapper: :with_label
.fields-row__column.fields-row__column-6.fields-group
- = f.input :show_domain_blocks_rationale, wrapper: :with_label, collection: %i(disabled users all), label_method: ->(value) { t("admin.settings.domain_blocks.#{value}") }, include_blank: false, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
+ = f.input :show_domain_blocks_rationale,
+ collection_wrapper_tag: 'ul',
+ collection: %i(disabled users all),
+ include_blank: false,
+ item_wrapper_tag: 'li',
+ label_method: ->(value) { t("admin.settings.domain_blocks.#{value}") },
+ wrapper: :with_label
.fields-group
- = f.input :status_page_url, wrapper: :with_block_label, input_html: { placeholder: "https://status.#{Rails.configuration.x.local_domain}" }
+ = f.input :status_page_url,
+ input_html: { placeholder: "https://status.#{Rails.configuration.x.local_domain}" },
+ wrapper: :with_block_label
.fields-group
- = f.input :site_terms, wrapper: :with_block_label, as: :text, input_html: { rows: 8 }
+ = f.input :site_terms,
+ as: :text,
+ input_html: { rows: 8 },
+ wrapper: :with_block_label
.actions
= f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/settings/appearance/show.html.haml b/app/views/admin/settings/appearance/show.html.haml
index 37a5d7e0c70aec..d5e6c13bc944f9 100644
--- a/app/views/admin/settings/appearance/show.html.haml
+++ b/app/views/admin/settings/appearance/show.html.haml
@@ -23,11 +23,16 @@
group_method: :last
.fields-group
- = f.input :custom_css, wrapper: :with_block_label, as: :text, input_html: { rows: 8 }
+ = f.input :custom_css,
+ as: :text,
+ input_html: { rows: 8 },
+ wrapper: :with_block_label
.fields-row
.fields-row__column.fields-row__column-6.fields-group
- = f.input :mascot, as: :file, wrapper: :with_block_label
+ = f.input :mascot,
+ as: :file,
+ wrapper: :with_block_label
.fields-row__column.fields-row__column-6.fields-group
- if @admin_settings.mascot.persisted?
diff --git a/app/views/admin/settings/branding/show.html.haml b/app/views/admin/settings/branding/show.html.haml
index aee730689227e9..71aac5ead1c1f0 100644
--- a/app/views/admin/settings/branding/show.html.haml
+++ b/app/views/admin/settings/branding/show.html.haml
@@ -11,20 +11,28 @@
%p.lead= t('admin.settings.branding.preamble')
.fields-group
- = f.input :site_title, wrapper: :with_label
+ = f.input :site_title,
+ wrapper: :with_label
.fields-row
.fields-row__column.fields-row__column-6.fields-group
- = f.input :site_contact_username, wrapper: :with_label
+ = f.input :site_contact_username,
+ wrapper: :with_label
.fields-row__column.fields-row__column-6.fields-group
- = f.input :site_contact_email, wrapper: :with_label
+ = f.input :site_contact_email,
+ wrapper: :with_label
.fields-group
- = f.input :site_short_description, wrapper: :with_block_label, as: :text, input_html: { rows: 2, maxlength: 200 }
+ = f.input :site_short_description,
+ as: :text,
+ input_html: { rows: 2, maxlength: 200 },
+ wrapper: :with_block_label
.fields-row
.fields-row__column.fields-row__column-6.fields-group
- = f.input :thumbnail, as: :file, wrapper: :with_block_label
+ = f.input :thumbnail,
+ as: :file,
+ wrapper: :with_block_label
.fields-row__column.fields-row__column-6.fields-group
- if @admin_settings.thumbnail.persisted?
= image_tag @admin_settings.thumbnail.file.url(:'@1x'), class: 'fields-group__thumbnail'
@@ -32,5 +40,33 @@
= fa_icon 'trash fw'
= t('admin.site_uploads.delete')
+ .fields-row
+ .fields-row__column.fields-row__column-6.fields-group
+ = f.input :favicon,
+ as: :file,
+ input_html: { accept: ['image/jpeg', 'image/png', 'image/gif', 'image/webp'].join(',') },
+ wrapper: :with_block_label
+
+ .fields-row__column.fields-row__column-6.fields-group
+ - if @admin_settings.favicon.persisted?
+ = image_tag @admin_settings.favicon.file.url('48'), class: 'fields-group__thumbnail'
+ = link_to admin_site_upload_path(@admin_settings.favicon), data: { method: :delete }, class: 'link-button link-button--destructive' do
+ = fa_icon 'trash fw'
+ = t('admin.site_uploads.delete')
+
+ .fields-row
+ .fields-row__column.fields-row__column-6.fields-group
+ = f.input :app_icon,
+ as: :file,
+ input_html: { accept: ['image/jpeg', 'image/png', 'image/gif', 'image/webp'].join(',') },
+ wrapper: :with_block_label
+
+ .fields-row__column.fields-row__column-6.fields-group
+ - if @admin_settings.app_icon.persisted?
+ = image_tag @admin_settings.app_icon.file.url('48'), class: 'fields-group__thumbnail'
+ = link_to admin_site_upload_path(@admin_settings.app_icon), data: { method: :delete }, class: 'link-button link-button--destructive' do
+ = fa_icon 'trash fw'
+ = t('admin.site_uploads.delete')
+
.actions
= f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/settings/content_retention/show.html.haml b/app/views/admin/settings/content_retention/show.html.haml
index 5a67016148d021..57485c1108ff3e 100644
--- a/app/views/admin/settings/content_retention/show.html.haml
+++ b/app/views/admin/settings/content_retention/show.html.haml
@@ -11,9 +11,21 @@
%p.lead= t('admin.settings.content_retention.preamble')
.fields-group
- = f.input :media_cache_retention_period, wrapper: :with_block_label, input_html: { pattern: '[0-9]+' }
- = f.input :content_cache_retention_period, wrapper: :with_block_label, input_html: { pattern: '[0-9]+' }, hint: false, warning_hint: t('simple_form.hints.form_admin_settings.content_cache_retention_period')
- = f.input :backups_retention_period, wrapper: :with_block_label, input_html: { pattern: '[0-9]+' }
+ = f.input :media_cache_retention_period,
+ input_html: { pattern: '[0-9]+' },
+ wrapper: :with_block_label
+ = f.input :backups_retention_period,
+ input_html: { pattern: '[0-9]+' },
+ wrapper: :with_block_label
+
+ %h4= t('admin.settings.content_retention.danger_zone')
+
+ .fields-group
+ = f.input :content_cache_retention_period,
+ hint: false,
+ input_html: { pattern: '[0-9]+' },
+ warning_hint: t('simple_form.hints.form_admin_settings.content_cache_retention_period'),
+ wrapper: :with_block_label
.actions
= f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/settings/discovery/show.html.haml b/app/views/admin/settings/discovery/show.html.haml
index 12c122393bced5..f95c6d22a37f4b 100644
--- a/app/views/admin/settings/discovery/show.html.haml
+++ b/app/views/admin/settings/discovery/show.html.haml
@@ -13,13 +13,20 @@
%h4= t('admin.settings.discovery.trends')
.fields-group
- = f.input :trends, as: :boolean, wrapper: :with_label
+ = f.input :trends,
+ as: :boolean,
+ wrapper: :with_label
.fields-group
- = f.input :trends_as_landing_page, as: :boolean, wrapper: :with_label
+ = f.input :trends_as_landing_page,
+ as: :boolean,
+ wrapper: :with_label
.fields-group
- = f.input :trendable_by_default, as: :boolean, wrapper: :with_label, recommended: :not_recommended
+ = f.input :trendable_by_default,
+ as: :boolean,
+ wrapper: :with_label,
+ recommended: :not_recommended
.fields-group
= f.input :trending_status_cw, as: :boolean, wrapper: :with_label, label: t('admin.settings.trending_status_cw.title'), hint: t('admin.settings.trending_status_cw.desc_html'), glitch_only: true
@@ -27,35 +34,57 @@
%h4= t('admin.settings.discovery.public_timelines')
.fields-group
- = f.input :timeline_preview, as: :boolean, wrapper: :with_label
+ = f.input :timeline_preview,
+ as: :boolean,
+ wrapper: :with_label
.fields-group
- = f.input :noindex, as: :boolean, wrapper: :with_label, label: t('admin.settings.default_noindex.title'), hint: t('admin.settings.default_noindex.desc_html')
+ = f.input :noindex,
+ as: :boolean,
+ hint: t('admin.settings.default_noindex.desc_html'),
+ label: t('admin.settings.default_noindex.title'),
+ wrapper: :with_label
%h4= t('admin.settings.discovery.publish_statistics')
.fields-group
- = f.input :activity_api_enabled, as: :boolean, wrapper: :with_label, recommended: :recommended
+ = f.input :activity_api_enabled,
+ as: :boolean,
+ wrapper: :with_label,
+ recommended: :recommended
%h4= t('admin.settings.discovery.publish_discovered_servers')
.fields-group
- = f.input :peers_api_enabled, as: :boolean, wrapper: :with_label, recommended: :recommended
+ = f.input :peers_api_enabled,
+ as: :boolean,
+ wrapper: :with_label,
+ recommended: :recommended
%h4= t('admin.settings.security.federation_authentication')
.fields-group
- = f.input :authorized_fetch, as: :boolean, wrapper: :with_label, label: t('admin.settings.security.authorized_fetch'), warning_hint: discovery_warning_hint_text, hint: discovery_hint_text, disabled: authorized_fetch_overridden?, recommended: discovery_recommended_value
+ = f.input :authorized_fetch,
+ as: :boolean,
+ disabled: authorized_fetch_overridden?,
+ hint: discovery_hint_text,
+ label: t('admin.settings.security.authorized_fetch'),
+ recommended: discovery_recommended_value,
+ warning_hint: discovery_warning_hint_text,
+ wrapper: :with_label
%h4= t('admin.settings.discovery.follow_recommendations')
.fields-group
- = f.input :bootstrap_timeline_accounts, wrapper: :with_block_label
+ = f.input :bootstrap_timeline_accounts,
+ wrapper: :with_block_label
%h4= t('admin.settings.discovery.profile_directory')
.fields-group
- = f.input :profile_directory, as: :boolean, wrapper: :with_label
+ = f.input :profile_directory,
+ as: :boolean,
+ wrapper: :with_label
.actions
= f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/settings/registrations/show.html.haml b/app/views/admin/settings/registrations/show.html.haml
index 168f1097570772..4dbc5fbecfc437 100644
--- a/app/views/admin/settings/registrations/show.html.haml
+++ b/app/views/admin/settings/registrations/show.html.haml
@@ -10,19 +10,36 @@
%p.lead= t('admin.settings.registrations.preamble')
+ .flash-message= t('admin.settings.registrations.moderation_recommandation')
+
.fields-row
.fields-row__column.fields-row__column-6.fields-group
- = f.input :registrations_mode, collection: %w(open approved none), wrapper: :with_label, include_blank: false, label_method: ->(mode) { I18n.t("admin.settings.registrations_mode.modes.#{mode}") }
+ = f.input :registrations_mode,
+ collection: %w(open approved none),
+ include_blank: false,
+ label_method: ->(mode) { I18n.t("admin.settings.registrations_mode.modes.#{mode}") },
+ warning_hint: I18n.t('admin.settings.registrations_mode.warning_hint'),
+ wrapper: :with_label
.fields-row__column.fields-row__column-6.fields-group
- = f.input :require_invite_text, as: :boolean, wrapper: :with_label, disabled: !approved_registrations?
+ = f.input :require_invite_text,
+ as: :boolean,
+ disabled: !approved_registrations?,
+ wrapper: :with_label
- if captcha_available?
.fields-group
- = f.input :captcha_enabled, as: :boolean, wrapper: :with_label, label: t('admin.settings.captcha_enabled.title'), hint: t('admin.settings.captcha_enabled.desc_html')
+ = f.input :captcha_enabled,
+ as: :boolean,
+ hint: t('admin.settings.captcha_enabled.desc_html'),
+ label: t('admin.settings.captcha_enabled.title'),
+ wrapper: :with_label
.fields-group
- = f.input :closed_registrations_message, as: :text, wrapper: :with_block_label, input_html: { rows: 2 }
+ = f.input :closed_registrations_message,
+ as: :text,
+ input_html: { rows: 2 },
+ wrapper: :with_block_label
.actions
= f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/settings/shared/_links.html.haml b/app/views/admin/settings/shared/_links.html.haml
index 86513e9aaf012f..f9b41b5814aadc 100644
--- a/app/views/admin/settings/shared/_links.html.haml
+++ b/app/views/admin/settings/shared/_links.html.haml
@@ -3,7 +3,7 @@
:ruby
primary.item :branding, safe_join([fa_icon('pencil fw'), t('admin.settings.branding.title')]), admin_settings_branding_path
primary.item :about, safe_join([fa_icon('file-text fw'), t('admin.settings.about.title')]), admin_settings_about_path
- primary.item :registrations, safe_join([fa_icon('users fw'), t('admin.settings.registrations.title')]), admin_settings_registrations_path
+ primary.item :registrations, safe_join([material_symbol('group'), t('admin.settings.registrations.title')]), admin_settings_registrations_path
primary.item :discovery, safe_join([fa_icon('search fw'), t('admin.settings.discovery.title')]), admin_settings_discovery_path
primary.item :content_retention, safe_join([fa_icon('history fw'), t('admin.settings.content_retention.title')]), admin_settings_content_retention_path
primary.item :appearance, safe_join([fa_icon('desktop fw'), t('admin.settings.appearance.title')]), admin_settings_appearance_path
diff --git a/app/views/admin/status_edits/_status_edit.html.haml b/app/views/admin/status_edits/_status_edit.html.haml
index 19a0e063dabf5e..0bec0159ee49f2 100644
--- a/app/views/admin/status_edits/_status_edit.html.haml
+++ b/app/views/admin/status_edits/_status_edit.html.haml
@@ -1,20 +1,30 @@
-.status
- .status__content><
- - if status_edit.spoiler_text.blank?
- = prerender_custom_emojis(status_content_format(status_edit), status_edit.emojis)
- - else
- %details<
- %summary><
- %strong> Content warning: #{prerender_custom_emojis(h(status_edit.spoiler_text), status_edit.emojis)}
- = prerender_custom_emojis(status_content_format(status_edit), status_edit.emojis)
+%li
+ .history__entry
+ %h5
+ - if status_edit_iteration.first?
+ = t('admin.statuses.original_status')
+ - else
+ = t('admin.statuses.status_changed')
+ ·
+ %time.formatted{ datetime: status_edit.created_at.iso8601, title: l(status_edit.created_at) }= l(status_edit.created_at)
- - unless status_edit.ordered_media_attachments.empty?
- = render partial: 'admin/reports/media_attachments', locals: { status: status_edit }
+ .status
+ .status__content><
+ - if status_edit.spoiler_text.blank?
+ = prerender_custom_emojis(status_content_format(status_edit), status_edit.emojis)
+ - else
+ %details<
+ %summary><
+ %strong> Content warning: #{prerender_custom_emojis(h(status_edit.spoiler_text), status_edit.emojis)}
+ = prerender_custom_emojis(status_content_format(status_edit), status_edit.emojis)
- .detailed-status__meta
- %time.formatted{ datetime: status_edit.created_at.iso8601, title: l(status_edit.created_at) }= l(status_edit.created_at)
+ - unless status_edit.ordered_media_attachments.empty?
+ = render partial: 'admin/reports/media_attachments', locals: { status: status_edit }
- - if status_edit.sensitive?
- ·
- = fa_icon('eye-slash fw')
- = t('stream_entries.sensitive_content')
+ .detailed-status__meta
+ %time.formatted{ datetime: status_edit.created_at.iso8601, title: l(status_edit.created_at) }= l(status_edit.created_at)
+
+ - if status_edit.sensitive?
+ ·
+ = material_symbol('visibility_off')
+ = t('stream_entries.sensitive_content')
diff --git a/app/views/admin/statuses/index.html.haml b/app/views/admin/statuses/index.html.haml
index a2e3cbc0daf09a..a41a6332dd1af0 100644
--- a/app/views/admin/statuses/index.html.haml
+++ b/app/views/admin/statuses/index.html.haml
@@ -12,11 +12,11 @@
.back-link
- if params[:report_id]
= link_to admin_report_path(params[:report_id].to_i) do
- = fa_icon 'chevron-left fw'
+ = material_symbol 'chevron_left'
= t('admin.statuses.back_to_report')
- else
= link_to admin_account_path(@account.id) do
- = fa_icon 'chevron-left fw'
+ = material_symbol 'chevron_left'
= t('admin.statuses.back_to_account')
%hr.spacer/
@@ -33,7 +33,11 @@
= check_box_tag :batch_checkbox_all, nil, false
.batch-table__toolbar__actions
- unless @statuses.empty?
- = f.button safe_join([fa_icon('flag'), t('admin.statuses.batch.report')]), name: :report, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+ = f.button safe_join([fa_icon('flag'), t('admin.statuses.batch.report')]),
+ class: 'table-action-link',
+ data: { confirm: t('admin.reports.are_you_sure') },
+ name: :report,
+ type: :submit
.batch-table__body
- if @statuses.empty?
= nothing_here 'nothing-here--under-tabs'
diff --git a/app/views/admin/statuses/show.html.haml b/app/views/admin/statuses/show.html.haml
index 0e88624def4359..9cadde2870c3e1 100644
--- a/app/views/admin/statuses/show.html.haml
+++ b/app/views/admin/statuses/show.html.haml
@@ -47,15 +47,4 @@
%h3= t('admin.statuses.history')
%ol.history
- - batched_ordered_status_edits.with_index do |status_edit, i|
- %li
- .history__entry
- %h5
- - if i.zero?
- = t('admin.statuses.original_status')
- - else
- = t('admin.statuses.status_changed')
- ·
- %time.formatted{ datetime: status_edit.created_at.iso8601, title: l(status_edit.created_at) }= l(status_edit.created_at)
-
- = render status_edit
+ = render partial: 'admin/status_edits/status_edit', collection: batched_ordered_status_edits
diff --git a/app/views/admin/tags/show.html.haml b/app/views/admin/tags/show.html.haml
index e4c985c19e2afb..f2d87b54b04378 100644
--- a/app/views/admin/tags/show.html.haml
+++ b/app/views/admin/tags/show.html.haml
@@ -9,39 +9,69 @@
.dashboard
.dashboard__item
- = react_admin_component :counter, measure: 'tag_accounts', start_at: @time_period.first, end_at: @time_period.last, params: { id: @tag.id }, label: t('admin.trends.tags.dashboard.tag_accounts_measure'), href: tag_url(@tag), target: '_blank', rel: 'noopener noreferrer'
+ = react_admin_component :counter,
+ end_at: @time_period.last,
+ href: tag_url(@tag),
+ label: t('admin.trends.tags.dashboard.tag_accounts_measure'),
+ measure: 'tag_accounts',
+ params: { id: @tag.id },
+ rel: 'noopener noreferrer',
+ start_at: @time_period.first,
+ target: '_blank'
.dashboard__item
- = react_admin_component :counter, measure: 'tag_uses', start_at: @time_period.first, end_at: @time_period.last, params: { id: @tag.id }, label: t('admin.trends.tags.dashboard.tag_uses_measure')
+ = react_admin_component :counter,
+ end_at: @time_period.last,
+ label: t('admin.trends.tags.dashboard.tag_uses_measure'),
+ measure: 'tag_uses',
+ params: { id: @tag.id },
+ start_at: @time_period.first
.dashboard__item
- = react_admin_component :counter, measure: 'tag_servers', start_at: @time_period.first, end_at: @time_period.last, params: { id: @tag.id }, label: t('admin.trends.tags.dashboard.tag_servers_measure')
+ = react_admin_component :counter,
+ end_at: @time_period.last,
+ label: t('admin.trends.tags.dashboard.tag_servers_measure'),
+ measure: 'tag_servers',
+ params: { id: @tag.id },
+ start_at: @time_period.first
.dashboard__item
- = react_admin_component :dimension, dimension: 'tag_servers', start_at: @time_period.first, end_at: @time_period.last, params: { id: @tag.id }, limit: 8, label: t('admin.trends.tags.dashboard.tag_servers_dimension')
+ = react_admin_component :dimension,
+ dimension: 'tag_servers',
+ end_at: @time_period.last,
+ label: t('admin.trends.tags.dashboard.tag_servers_dimension'),
+ limit: 8,
+ params: { id: @tag.id },
+ start_at: @time_period.first
.dashboard__item
- = react_admin_component :dimension, dimension: 'tag_languages', start_at: @time_period.first, end_at: @time_period.last, params: { id: @tag.id }, limit: 8, label: t('admin.trends.tags.dashboard.tag_languages_dimension')
+ = react_admin_component :dimension,
+ dimension: 'tag_languages',
+ end_at: @time_period.last,
+ label: t('admin.trends.tags.dashboard.tag_languages_dimension'),
+ limit: 8,
+ params: { id: @tag.id },
+ start_at: @time_period.first
.dashboard__item
= link_to admin_tag_path(@tag.id), class: ['dashboard__quick-access', @tag.usable? ? 'positive' : 'negative'] do
- if @tag.usable?
%span= t('admin.trends.tags.usable')
- = fa_icon 'check fw'
+ = material_symbol 'check'
- else
%span= t('admin.trends.tags.not_usable')
- = fa_icon 'lock fw'
+ = material_symbol 'lock'
= link_to admin_tag_path(@tag.id), class: ['dashboard__quick-access', @tag.trendable? ? 'positive' : 'negative'] do
- if @tag.trendable?
%span= t('admin.trends.tags.trendable')
- = fa_icon 'check fw'
+ = material_symbol 'check'
- else
%span= t('admin.trends.tags.not_trendable')
- = fa_icon 'lock fw'
+ = material_symbol 'lock'
= link_to admin_tag_path(@tag.id), class: ['dashboard__quick-access', @tag.listable? ? 'positive' : 'negative'] do
- if @tag.listable?
%span= t('admin.trends.tags.listable')
- = fa_icon 'check fw'
+ = material_symbol 'check'
- else
%span= t('admin.trends.tags.not_listable')
- = fa_icon 'lock fw'
+ = material_symbol 'lock'
%hr.spacer/
diff --git a/app/views/admin/trends/links/index.html.haml b/app/views/admin/trends/links/index.html.haml
index e6ed9d95f6601b..c503b2d39675ab 100644
--- a/app/views/admin/trends/links/index.html.haml
+++ b/app/views/admin/trends/links/index.html.haml
@@ -13,7 +13,9 @@
.filter-subset.filter-subset--with-select
%strong= t('admin.follow_recommendations.language')
.input.select.optional
- = select_tag :locale, options_for_select(@locales.map { |key| [standard_locale_name(key), key] }, params[:locale]), include_blank: true
+ = select_tag :locale,
+ options_for_select(@locales.map { |key| [standard_locale_name(key), key] }, params[:locale]),
+ include_blank: true
.filter-subset
%strong= t('admin.trends.trending')
%ul
@@ -22,7 +24,7 @@
.back-link
= link_to admin_trends_links_preview_card_providers_path do
= t('admin.trends.preview_card_providers.title')
- = fa_icon 'chevron-right fw'
+ = material_symbol 'chevron_right'
= form_for(@form, url: batch_admin_trends_links_path) do |f|
= hidden_field_tag :page, params[:page] || 1
@@ -35,10 +37,26 @@
%label.batch-table__toolbar__select.batch-checkbox-all
= check_box_tag :batch_checkbox_all, nil, false
.batch-table__toolbar__actions
- = f.button safe_join([fa_icon('check'), t('admin.trends.links.allow')]), name: :approve, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
- = f.button safe_join([fa_icon('check'), t('admin.trends.links.allow_provider')]), name: :approve_providers, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
- = f.button safe_join([fa_icon('times'), t('admin.trends.links.disallow')]), name: :reject, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
- = f.button safe_join([fa_icon('times'), t('admin.trends.links.disallow_provider')]), name: :reject_providers, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+ = f.button safe_join([material_symbol('check'), t('admin.trends.links.allow')]),
+ class: 'table-action-link',
+ data: { confirm: t('admin.reports.are_you_sure') },
+ name: :approve,
+ type: :submit
+ = f.button safe_join([material_symbol('check'), t('admin.trends.links.allow_provider')]),
+ class: 'table-action-link',
+ data: { confirm: t('admin.reports.are_you_sure') },
+ name: :approve_providers,
+ type: :submit
+ = f.button safe_join([material_symbol('close'), t('admin.trends.links.disallow')]),
+ class: 'table-action-link',
+ data: { confirm: t('admin.reports.are_you_sure') },
+ name: :reject,
+ type: :submit
+ = f.button safe_join([material_symbol('close'), t('admin.trends.links.disallow_provider')]),
+ class: 'table-action-link',
+ data: { confirm: t('admin.reports.are_you_sure') },
+ name: :reject_providers,
+ type: :submit
.batch-table__body
- if @preview_cards.empty?
= nothing_here 'nothing-here--under-tabs'
diff --git a/app/views/admin/trends/links/preview_card_providers/index.html.haml b/app/views/admin/trends/links/preview_card_providers/index.html.haml
index d9ad12fc966ac4..706c6070100727 100644
--- a/app/views/admin/trends/links/preview_card_providers/index.html.haml
+++ b/app/views/admin/trends/links/preview_card_providers/index.html.haml
@@ -15,7 +15,7 @@
%li= filter_link_to safe_join([t('admin.accounts.moderation.pending'), "(#{PreviewCardProvider.pending_review.count})"], ' '), status: 'pending_review'
.back-link
= link_to admin_trends_links_path do
- = fa_icon 'chevron-left fw'
+ = material_symbol 'chevron_left'
= t('admin.trends.links.title')
%hr.spacer/
@@ -31,8 +31,16 @@
%label.batch-table__toolbar__select.batch-checkbox-all
= check_box_tag :batch_checkbox_all, nil, false
.batch-table__toolbar__actions
- = f.button safe_join([fa_icon('check'), t('admin.trends.allow')]), name: :approve, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
- = f.button safe_join([fa_icon('times'), t('admin.trends.disallow')]), name: :reject, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+ = f.button safe_join([material_symbol('check'), t('admin.trends.allow')]),
+ class: 'table-action-link',
+ data: { confirm: t('admin.reports.are_you_sure') },
+ name: :approve,
+ type: :submit
+ = f.button safe_join([material_symbol('close'), t('admin.trends.disallow')]),
+ class: 'table-action-link',
+ data: { confirm: t('admin.reports.are_you_sure') },
+ name: :reject,
+ type: :submit
.batch-table__body
- if @preview_card_providers.empty?
diff --git a/app/views/admin/trends/statuses/_status.html.haml b/app/views/admin/trends/statuses/_status.html.haml
index 98f2e770908ea9..09547ff0369a8b 100644
--- a/app/views/admin/trends/statuses/_status.html.haml
+++ b/app/views/admin/trends/statuses/_status.html.haml
@@ -11,10 +11,12 @@
- status.ordered_media_attachments.each do |media_attachment|
%abbr{ title: media_attachment.description }
- = fa_icon 'link'
+ = material_symbol 'link'
= media_attachment.file_file_name
- = t('admin.trends.statuses.shared_by', count: status.reblogs_count + status.favourites_count, friendly_count: friendly_number_to_human(status.reblogs_count + status.favourites_count))
+ = t 'admin.trends.statuses.shared_by',
+ count: status.reblogs_count + status.favourites_count,
+ friendly_count: friendly_number_to_human(status.reblogs_count + status.favourites_count)
- if status.account.domain.present?
·
diff --git a/app/views/admin/trends/statuses/index.html.haml b/app/views/admin/trends/statuses/index.html.haml
index bf04772f2280c2..66151ad31e0695 100644
--- a/app/views/admin/trends/statuses/index.html.haml
+++ b/app/views/admin/trends/statuses/index.html.haml
@@ -31,10 +31,26 @@
%label.batch-table__toolbar__select.batch-checkbox-all
= check_box_tag :batch_checkbox_all, nil, false
.batch-table__toolbar__actions
- = f.button safe_join([fa_icon('check'), t('admin.trends.statuses.allow')]), name: :approve, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
- = f.button safe_join([fa_icon('check'), t('admin.trends.statuses.allow_account')]), name: :approve_accounts, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
- = f.button safe_join([fa_icon('times'), t('admin.trends.statuses.disallow')]), name: :reject, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
- = f.button safe_join([fa_icon('times'), t('admin.trends.statuses.disallow_account')]), name: :reject_accounts, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+ = f.button safe_join([material_symbol('check'), t('admin.trends.statuses.allow')]),
+ class: 'table-action-link',
+ data: { confirm: t('admin.reports.are_you_sure') },
+ name: :approve,
+ type: :submit
+ = f.button safe_join([material_symbol('check'), t('admin.trends.statuses.allow_account')]),
+ class: 'table-action-link',
+ data: { confirm: t('admin.reports.are_you_sure') },
+ name: :approve_accounts,
+ type: :submit
+ = f.button safe_join([material_symbol('close'), t('admin.trends.statuses.disallow')]),
+ class: 'table-action-link',
+ data: { confirm: t('admin.reports.are_you_sure') },
+ name: :reject,
+ type: :submit
+ = f.button safe_join([material_symbol('close'), t('admin.trends.statuses.disallow_account')]),
+ class: 'table-action-link',
+ data: { confirm: t('admin.reports.are_you_sure') },
+ name: :reject_accounts,
+ type: :submit
.batch-table__body
- if @statuses.empty?
= nothing_here 'nothing-here--under-tabs'
diff --git a/app/views/admin/trends/tags/_tag.html.haml b/app/views/admin/trends/tags/_tag.html.haml
index 70c7d8dbd42cd7..8cc0d713b9e178 100644
--- a/app/views/admin/trends/tags/_tag.html.haml
+++ b/app/views/admin/trends/tags/_tag.html.haml
@@ -5,7 +5,7 @@
.batch-table__row__content.pending-account
.pending-account__header
= link_to admin_tag_path(tag.id) do
- = fa_icon 'hashtag'
+ = material_symbol 'tag'
= tag.display_name
%br/
diff --git a/app/views/admin/trends/tags/index.html.haml b/app/views/admin/trends/tags/index.html.haml
index 4730d20c180af0..655955f7f63bfe 100644
--- a/app/views/admin/trends/tags/index.html.haml
+++ b/app/views/admin/trends/tags/index.html.haml
@@ -25,8 +25,16 @@
%label.batch-table__toolbar__select.batch-checkbox-all
= check_box_tag :batch_checkbox_all, nil, false
.batch-table__toolbar__actions
- = f.button safe_join([fa_icon('check'), t('admin.trends.allow')]), name: :approve, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
- = f.button safe_join([fa_icon('times'), t('admin.trends.disallow')]), name: :reject, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+ = f.button safe_join([material_symbol('check'), t('admin.trends.allow')]),
+ class: 'table-action-link',
+ data: { confirm: t('admin.reports.are_you_sure') },
+ name: :approve,
+ type: :submit
+ = f.button safe_join([material_symbol('close'), t('admin.trends.disallow')]),
+ class: 'table-action-link',
+ data: { confirm: t('admin.reports.are_you_sure') },
+ name: :reject,
+ type: :submit
.batch-table__body
- if @tags.empty?
diff --git a/app/views/admin/users/roles/show.html.haml b/app/views/admin/users/roles/show.html.haml
index 8216180607b909..f26640f2a1af8f 100644
--- a/app/views/admin/users/roles/show.html.haml
+++ b/app/views/admin/users/roles/show.html.haml
@@ -3,7 +3,13 @@
= simple_form_for @user, url: admin_user_role_path(@user) do |f|
.fields-group
- = f.association :role, wrapper: :with_block_label, collection: UserRole.assignable, label_method: :name, include_blank: I18n.t('admin.accounts.change_role.no_role')
+ = f.association :role,
+ collection: UserRole.assignable,
+ include_blank: I18n.t('admin.accounts.change_role.no_role'),
+ label_method: :name,
+ wrapper: :with_block_label
.actions
- = f.button :button, t('generic.save_changes'), type: :submit
+ = f.button :button,
+ t('generic.save_changes'),
+ type: :submit
diff --git a/app/views/admin/warning_presets/_form.html.haml b/app/views/admin/warning_presets/_form.html.haml
new file mode 100644
index 00000000000000..cba74163c5f455
--- /dev/null
+++ b/app/views/admin/warning_presets/_form.html.haml
@@ -0,0 +1,7 @@
+.fields-group
+ = form.input :title,
+ wrapper: :with_block_label
+
+.fields-group
+ = form.input :text,
+ wrapper: :with_block_label
diff --git a/app/views/admin/warning_presets/edit.html.haml b/app/views/admin/warning_presets/edit.html.haml
index b5c5107ef4a658..f0bd9c12ece44c 100644
--- a/app/views/admin/warning_presets/edit.html.haml
+++ b/app/views/admin/warning_presets/edit.html.haml
@@ -1,14 +1,10 @@
- content_for :page_title do
= t('admin.warning_presets.edit_preset')
-= simple_form_for @warning_preset, url: admin_warning_preset_path(@warning_preset) do |f|
+= simple_form_for @warning_preset, url: admin_warning_preset_path(@warning_preset) do |form|
= render 'shared/error_messages', object: @warning_preset
- .fields-group
- = f.input :title, wrapper: :with_block_label
-
- .fields-group
- = f.input :text, wrapper: :with_block_label
+ = render form
.actions
- = f.button :button, t('generic.save_changes'), type: :submit
+ = form.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/warning_presets/index.html.haml b/app/views/admin/warning_presets/index.html.haml
index b26a13d9668dc9..22fee21050782f 100644
--- a/app/views/admin/warning_presets/index.html.haml
+++ b/app/views/admin/warning_presets/index.html.haml
@@ -2,17 +2,13 @@
= t('admin.warning_presets.title')
- if can? :create, :account_warning_preset
- = simple_form_for @warning_preset, url: admin_warning_presets_path do |f|
+ = simple_form_for @warning_preset, url: admin_warning_presets_path do |form|
= render 'shared/error_messages', object: @warning_preset
- .fields-group
- = f.input :title, wrapper: :with_block_label
-
- .fields-group
- = f.input :text, wrapper: :with_block_label
+ = render form
.actions
- = f.button :button, t('admin.warning_presets.add_new'), type: :submit
+ = form.button :button, t('admin.warning_presets.add_new'), type: :submit
%hr.spacer/
diff --git a/app/views/admin/webhooks/_form.html.haml b/app/views/admin/webhooks/_form.html.haml
index 6c4574fd3bc087..2b948b9a6aa210 100644
--- a/app/views/admin/webhooks/_form.html.haml
+++ b/app/views/admin/webhooks/_form.html.haml
@@ -1,10 +1,21 @@
= render 'shared/error_messages', object: form.object
.fields-group
- = form.input :url, wrapper: :with_block_label, input_html: { placeholder: 'https://' }
+ = form.input :url,
+ wrapper: :with_block_label,
+ input_html: { placeholder: 'https://' }
.fields-group
- = form.input :events, collection: Webhook::EVENTS, wrapper: :with_block_label, include_blank: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', disabled: Webhook::EVENTS.filter { |event| !current_user.role.can?(Webhook.permission_for_event(event)) }
+ = form.input :events,
+ collection: Webhook::EVENTS,
+ wrapper: :with_block_label,
+ include_blank: false,
+ as: :check_boxes,
+ collection_wrapper_tag: 'ul',
+ item_wrapper_tag: 'li',
+ disabled: Webhook::EVENTS.filter { |event| !current_user.role.can?(Webhook.permission_for_event(event)) }
.fields-group
- = form.input :template, wrapper: :with_block_label, input_html: { placeholder: '{ "content": "Hello {{object.username}}" }' }
+ = form.input :template,
+ wrapper: :with_block_label,
+ input_html: { placeholder: '{ "content": "Hello {{object.username}}" }' }
diff --git a/app/views/admin/webhooks/edit.html.haml b/app/views/admin/webhooks/edit.html.haml
index 2c2a7aa0342153..abc9bdfabc4aa3 100644
--- a/app/views/admin/webhooks/edit.html.haml
+++ b/app/views/admin/webhooks/edit.html.haml
@@ -2,6 +2,6 @@
= t('admin.webhooks.edit')
= simple_form_for @webhook, url: admin_webhook_path(@webhook) do |form|
- = render partial: 'form', object: form
+ = render form
.actions
= form.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/webhooks/new.html.haml b/app/views/admin/webhooks/new.html.haml
index f51b039ce8e888..50fcdc2be7f954 100644
--- a/app/views/admin/webhooks/new.html.haml
+++ b/app/views/admin/webhooks/new.html.haml
@@ -2,6 +2,6 @@
= t('admin.webhooks.new')
= simple_form_for @webhook, url: admin_webhooks_path do |form|
- = render partial: 'form', object: form
+ = render form
.actions
= form.button :button, t('admin.webhooks.add_new'), type: :submit
diff --git a/app/views/admin_mailer/auto_close_registrations.text.erb b/app/views/admin_mailer/auto_close_registrations.text.erb
new file mode 100644
index 00000000000000..c0f848692965b9
--- /dev/null
+++ b/app/views/admin_mailer/auto_close_registrations.text.erb
@@ -0,0 +1,3 @@
+<%= raw t('admin_mailer.auto_close_registrations.body', instance: @instance) %>
+
+<%= raw t('application_mailer.view')%> <%= admin_settings_registrations_url %>
diff --git a/app/views/admin_mailer/new_critical_software_updates.text.erb b/app/views/admin_mailer/new_critical_software_updates.text.erb
index 63c170dc0d6c83..a3f031bdad21a4 100644
--- a/app/views/admin_mailer/new_critical_software_updates.text.erb
+++ b/app/views/admin_mailer/new_critical_software_updates.text.erb
@@ -1,3 +1,7 @@
<%= raw t('admin_mailer.new_critical_software_updates.body') %>
+<% @software_updates.each do |update| %>
+- Mastodon <%= update.version %>: <%= update.release_notes %>
+<% end %>
+
<%= raw t('application_mailer.view')%> <%= admin_software_updates_url %>
diff --git a/app/views/admin_mailer/new_software_updates.text.erb b/app/views/admin_mailer/new_software_updates.text.erb
index 96808f3cb3deba..0eccbbf9efa575 100644
--- a/app/views/admin_mailer/new_software_updates.text.erb
+++ b/app/views/admin_mailer/new_software_updates.text.erb
@@ -1,3 +1,7 @@
<%= raw t('admin_mailer.new_software_updates.body') %>
+<% @software_updates.each do |update| %>
+- Mastodon <%= update.version %>: <%= update.release_notes %>
+<% end %>
+
<%= raw t('application_mailer.view')%> <%= admin_software_updates_url %>
diff --git a/app/views/application/mailer/_button.html.haml b/app/views/application/mailer/_button.html.haml
index 61430732eb3ed3..0bf80b505aa307 100644
--- a/app/views/application/mailer/_button.html.haml
+++ b/app/views/application/mailer/_button.html.haml
@@ -1,4 +1,7 @@
%table.email-btn-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
%tr
%td.email-btn-td
- = link_to "#{text} ➜", url, class: 'email-btn-a email-btn-hover'
+ - if defined?(has_arrow) && !has_arrow
+ = link_to text, url, class: 'email-btn-a email-btn-hover'
+ - else
+ = link_to "#{text} ➜", url, class: 'email-btn-a email-btn-hover'
diff --git a/app/views/application/mailer/_checklist.html.haml b/app/views/application/mailer/_checklist.html.haml
index 83072bd36b04e2..91c7c98f26e90f 100644
--- a/app/views/application/mailer/_checklist.html.haml
+++ b/app/views/application/mailer/_checklist.html.haml
@@ -1,7 +1,7 @@
%table.email-w-full.email-checklist-wrapper-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
%tr
%td.email-checklist-wrapper-td
- %table.email-w-full.email-checklist-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+ %table.email-w-full.email-checklist-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation', class: ('email-checklist-checked' if defined?(checked) && checked) }
%tr
%td.email-checklist-td
%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
@@ -15,15 +15,23 @@
- else
= image_tag frontend_asset_url('images/mailer-new/welcome/checkbox-off.png'), alt: '', width: 20, height: 20
%td.email-checklist-icons-step-td
- - if defined?(step_image_url)
- = image_tag step_image_url, alt: '', width: 40, height: 40
+ - if defined?(key)
+ = image_tag frontend_asset_url("images/mailer-new/welcome-icons/#{key}_step-#{checked ? 'on' : 'off'}.png"), alt: '', width: 40, height: 40
%td.email-checklist-text-td
.email-desktop-flex
+ /[if mso]
+ |
%div
- - if defined?(title)
- %h3= title
- - if defined?(text)
- %p= text
+ %h3= t("user_mailer.welcome.#{key}_title")
+ %p= t("user_mailer.welcome.#{key}_step")
+ /[if mso]
+ |
%div
- - if defined?(button_text) && defined?(button_url) && defined?(checked) && !checked
- = render 'application/mailer/button', text: button_text, url: button_url
+ - if defined?(show_apps_buttons) && show_apps_buttons
+ .email-welcome-apps-btns
+ = link_to image_tag(frontend_asset_url('images/mailer-new/store-icons/btn-app-store.png'), alt: t('user_mailer.welcome.apps_ios_action'), width: 120, height: 40), 'https://apps.apple.com/app/mastodon-for-iphone-and-ipad/id1571998974'
+ = link_to image_tag(frontend_asset_url('images/mailer-new/store-icons/btn-google-play.png'), alt: t('user_mailer.welcome.apps_android_action'), width: 120, height: 40), 'https://play.google.com/store/apps/details?id=org.joinmastodon.android'
+ - elsif defined?(button_text) && defined?(button_url) && defined?(checked) && !checked
+ = render 'application/mailer/button', text: button_text, url: button_url, has_arrow: false
+ /[if mso]
+ |
diff --git a/app/views/application/mailer/_feature.html.haml b/app/views/application/mailer/_feature.html.haml
new file mode 100644
index 00000000000000..94dd4b9cffdf3a
--- /dev/null
+++ b/app/views/application/mailer/_feature.html.haml
@@ -0,0 +1,30 @@
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+ %tr
+ %td.email-feature-wrapper-td
+ %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+ %tr
+ %td.email-feature-td
+ .email-desktop-flex{ class: ('email-dir-rtl' if feature_iteration.index.odd?) }
+ /[if mso]
+ |
+ .email-desktop-column
+ %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+ %tr
+ %td.email-column-td
+ %h2.email-h2= t("user_mailer.welcome.feature_#{feature}_title")
+ %p.email-p= t("user_mailer.welcome.feature_#{feature}")
+ - if defined?(feature_btn_url)
+ = link_to '', href: feature_btn_url, class: 'email-link-with-arrow' do
+ #{t('user_mailer.welcome.feature_action')}
+ %span= '❯'
+ /[if mso]
+ |
+ .email-desktop-column
+ %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+ %tr
+ %td.email-column-td
+ - if defined?(feature)
+ %p{ class: ('email-desktop-text-right' if feature_iteration.index.even?) }
+ = image_tag frontend_asset_url("images/mailer-new/welcome/feature_#{feature}.png"), alt: '', width: 240, height: 230
+ /[if mso]
+ |
diff --git a/app/views/application/mailer/_follow.html.haml b/app/views/application/mailer/_follow.html.haml
new file mode 100644
index 00000000000000..382151a2347656
--- /dev/null
+++ b/app/views/application/mailer/_follow.html.haml
@@ -0,0 +1,15 @@
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+ %tr
+ %td.email-mini-wrapper-td
+ %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+ %tr
+ %td.email-mini-td
+ %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+ %tr
+ %td.email-mini-follow-img-td
+ = image_tag full_asset_url(follow.account.avatar.url), alt: '', width: 40, height: 40
+ %td.email-mini-follow-text-td
+ %h3= follow.account.display_name.presence || follow.account.username
+ %p @#{follow.account.pretty_acct}
+ %td.email-mini-follow-btn-td
+ = render 'application/mailer/button', text: t('user_mailer.welcome.follow_action'), url: web_url("@#{follow.account.acct}"), has_arrow: false
diff --git a/app/views/application/mailer/_hashtag.html.haml b/app/views/application/mailer/_hashtag.html.haml
new file mode 100644
index 00000000000000..b740ba31b99437
--- /dev/null
+++ b/app/views/application/mailer/_hashtag.html.haml
@@ -0,0 +1,21 @@
+- accounts = hashtag.statuses.public_visibility.joins(:account).merge(Account.without_suspended.without_silenced).includes(:account).limit(3).map(&:account)
+
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+ %tr
+ %td.email-mini-wrapper-td
+ %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+ %tr
+ %td.email-mini-td
+ %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+ %tr
+ %td.email-mini-hashtag-td{ height: 40 }
+ %h3 ##{hashtag.display_name}
+ %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+ %tr
+ %td.email-mini-hashtag-img-td
+ - accounts.each do |account|
+ %span.email-mini-hashtag-img-span
+ = image_tag full_asset_url(account.avatar.url), alt: '', width: 16, height: 16
+ %td
+ - people = hashtag.history.aggregate(2.days.ago.to_date..Time.zone.today).accounts
+ %p= t('user_mailer.welcome.hashtags_recent_count', people: number_with_delimiter(people), count: people)
diff --git a/app/views/auth/registrations/rules.html.haml b/app/views/auth/registrations/rules.html.haml
index 234f4a601da6d2..3a05ed54f06c35 100644
--- a/app/views/auth/registrations/rules.html.haml
+++ b/app/views/auth/registrations/rules.html.haml
@@ -20,6 +20,7 @@
- @rules.each do |rule|
%li
.rules-list__text= rule.text
+ .rules-list__hint= rule.hint
.stacked-actions
- accept_path = @invite_code.present? ? public_invite_url(invite_code: @invite_code, accept: @accept_token) : new_user_registration_path(accept: @accept_token)
diff --git a/app/views/auth/sessions/two_factor.html.haml b/app/views/auth/sessions/two_factor.html.haml
index 0892101b57cc67..63c8b0a2cb86e7 100644
--- a/app/views/auth/sessions/two_factor.html.haml
+++ b/app/views/auth/sessions/two_factor.html.haml
@@ -1,6 +1,8 @@
- content_for :page_title do
= t('auth.login')
+= flavoured_javascript_pack_tag 'two_factor_authentication', crossorigin: 'anonymous'
+
- if webauthn_enabled?
= render partial: 'auth/sessions/two_factor/webauthn_form', locals: { hidden: @scheme_type != 'webauthn' }
diff --git a/app/views/auth/setup/show.html.haml b/app/views/auth/setup/show.html.haml
index 097e3416e2cd12..6ba219e729a603 100644
--- a/app/views/auth/setup/show.html.haml
+++ b/app/views/auth/setup/show.html.haml
@@ -1,6 +1,8 @@
- content_for :page_title do
= t('auth.setup.title')
+= flavoured_javascript_pack_tag 'sign_up', crossorigin: 'anonymous'
+
= simple_form_for(@user, url: auth_setup_path) do |f|
= render 'auth/shared/progress', stage: 'confirm'
diff --git a/app/views/filters/_filter_fields.html.haml b/app/views/filters/_filter_fields.html.haml
index a3260816ed9c0c..0f4049ffb61979 100644
--- a/app/views/filters/_filter_fields.html.haml
+++ b/app/views/filters/_filter_fields.html.haml
@@ -1,16 +1,37 @@
.fields-row
.fields-row__column.fields-row__column-6.fields-group
- = f.input :title, as: :string, wrapper: :with_label, hint: false
+ = f.input :title,
+ as: :string,
+ hint: false,
+ wrapper: :with_label
.fields-row__column.fields-row__column-6.fields-group
- = f.input :expires_in, wrapper: :with_label, collection: [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week].map(&:to_i), label_method: ->(i) { I18n.t("invites.expires_in.#{i}") }, include_blank: I18n.t('invites.expires_in_prompt')
+ = f.input :expires_in,
+ collection: CustomFilter::EXPIRATION_DURATIONS.map(&:to_i),
+ include_blank: I18n.t('invites.expires_in_prompt'),
+ label_method: ->(i) { I18n.t("invites.expires_in.#{i}") },
+ wrapper: :with_label
.fields-group
- = f.input :context, wrapper: :with_block_label, collection: CustomFilter::VALID_CONTEXTS, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', label_method: ->(context) { I18n.t("filters.contexts.#{context}") }, include_blank: false
+ = f.input :context,
+ as: :check_boxes,
+ collection_wrapper_tag: 'ul',
+ collection: CustomFilter::VALID_CONTEXTS,
+ include_blank: false,
+ item_wrapper_tag: 'li',
+ label_method: ->(context) { I18n.t("filters.contexts.#{context}") },
+ wrapper: :with_block_label
%hr.spacer/
.fields-group
- = f.input :filter_action, as: :radio_buttons, collection: %i(warn hide), include_blank: false, wrapper: :with_block_label, label_method: ->(action) { filter_action_label(action) }, hint: t('simple_form.hints.filters.action'), required: true
+ = f.input :filter_action,
+ as: :radio_buttons,
+ collection: %i(warn hide),
+ hint: t('simple_form.hints.filters.action'),
+ include_blank: false,
+ label_method: ->(action) { filter_action_label(action) },
+ required: true,
+ wrapper: :with_block_label
%hr.spacer/
diff --git a/app/views/layouts/_theme.html.haml b/app/views/layouts/_theme.html.haml
deleted file mode 100644
index 2b40d408f25ae8..00000000000000
--- a/app/views/layouts/_theme.html.haml
+++ /dev/null
@@ -1,12 +0,0 @@
-- if theme
- = render partial: 'layouts/theme', object: theme[:common] if theme[:pack] != 'common' && theme[:common]
- - if theme[:pack]
- - pack_path = theme[:flavour] ? "flavours/#{theme[:flavour]}/#{theme[:pack]}" : "core/#{theme[:pack]}"
- = javascript_pack_tag pack_path, crossorigin: 'anonymous'
- - if theme[:skin]
- - if !theme[:flavour] || theme[:skin] == 'default'
- = stylesheet_pack_tag pack_path, media: 'all', crossorigin: 'anonymous'
- - else
- = stylesheet_pack_tag "skins/#{theme[:flavour]}/#{theme[:skin]}/#{theme[:pack]}", media: 'all', crossorigin: 'anonymous'
- - theme[:preload]&.each do |link|
- %link{ href: asset_pack_path("#{link}.js"), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index 3048e0e6adbf41..a95d5caef54217 100644
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -1,5 +1,7 @@
- content_for :header_tags do
= render_initial_state
+ = flavoured_javascript_pack_tag 'public', crossorigin: 'anonymous'
+ = flavoured_javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
- content_for :content do
.admin-wrapper
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 619928d27044ca..4a0f90053657c9 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -11,31 +11,29 @@
- if storage_host?
%link{ rel: 'dns-prefetch', href: storage_host }/
- %link{ rel: 'icon', href: '/favicon.ico', type: 'image/x-icon' }/
+ %link{ rel: 'icon', href: favicon_path('ico') || '/favicon.ico', type: 'image/x-icon' }/
- - %w(16 32 48).each do |size|
- %link{ rel: 'icon', sizes: "#{size}x#{size}", href: frontend_asset_path("icons/favicon-#{size}x#{size}.png"), type: 'image/png' }/
+ - SiteUpload::FAVICON_SIZES.each do |size|
+ %link{ rel: 'icon', sizes: "#{size}x#{size}", href: favicon_path(size.to_i) || frontend_asset_path("icons/favicon-#{size}x#{size}.png"), type: 'image/png' }/
- - %w(57 60 72 76 114 120 144 152 167 180 1024).each do |size|
- %link{ rel: 'apple-touch-icon', sizes: "#{size}x#{size}", href: frontend_asset_path("icons/apple-touch-icon-#{size}x#{size}.png") }/
+ - SiteUpload::APPLE_ICON_SIZES.each do |size|
+ %link{ rel: 'apple-touch-icon', sizes: "#{size}x#{size}", href: app_icon_path(size.to_i) || frontend_asset_path("icons/apple-touch-icon-#{size}x#{size}.png") }/
%link{ rel: 'mask-icon', href: frontend_asset_path('images/logo-symbol-icon.svg'), color: '#6364FF' }/
%link{ rel: 'manifest', href: manifest_path(format: :json) }/
- %meta{ name: 'theme-color', content: '#191b22' }/
+ = theme_color_tags current_theme
%meta{ name: 'apple-mobile-web-app-capable', content: 'yes' }/
%title= html_title
- = javascript_pack_tag 'common', crossorigin: 'anonymous'
+ = flavoured_stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous' # upstream uses `common` but that's implicitly defined
+ = theme_style_tags current_theme
-# Needed for the wicg-inert polyfill. It needs to be on it's own
+
+
+### No vendor lock-in: Fully interoperable with any conforming platform
+
+It doesn't have to be Mastodon; whatever implements ActivityPub is part of the social network! [Learn more](https://blog.joinmastodon.org/2018/06/why-activitypub-is-the-future/)
+
+### Real-time, chronological timeline updates
+
+Updates of people you're following appear in real-time in the UI via WebSockets. There's a firehose view as well!
+
+### Media attachments like images and short videos
+
+Upload and view images and WebM/MP4 videos attached to the updates. Videos with no audio track are treated like GIFs; normal videos loop continuously!
+
+### Safety and moderation tools
+
+Mastodon includes private posts, locked accounts, phrase filtering, muting, blocking, and all sorts of other features, along with a reporting and moderation system. [Learn more](https://blog.joinmastodon.org/2018/07/cage-the-mastodon/)
+
+### OAuth2 and a straightforward REST API
+
+Mastodon acts as an OAuth2 provider, so 3rd party apps can use the REST and Streaming APIs. This results in a rich app ecosystem with a lot of choices!
+
+## Deployment
+
+### Tech stack
+
+- **Ruby on Rails** powers the REST API and other web pages
+- **React.js** and Redux are used for the dynamic parts of the interface
+- **Node.js** powers the streaming API
+
+### Requirements
+
+- **PostgreSQL** 12+
+- **Redis** 4+
+- **Ruby** 3.1+
+- **Node.js** 18+
+
+The repository includes deployment configurations for **Docker and docker-compose** as well as specific platforms like **Heroku**, **Scalingo**, and **Nanobox**. For Helm charts, reference the [mastodon/chart repository](https://github.com/mastodon/chart). The [**standalone** installation guide](https://docs.joinmastodon.org/admin/install/) is available in the documentation.
+
+## Development
+
+### Vagrant
+
+A **Vagrant** configuration is included for development purposes. To use it, complete the following steps:
+
+- Install Vagrant and Virtualbox
+- Install the `vagrant-hostsupdater` plugin: `vagrant plugin install vagrant-hostsupdater`
+- Run `vagrant up`
+- Run `vagrant ssh -c "cd /vagrant && bin/dev"`
+- Open `http://mastodon.local` in your browser
+
+### MacOS
+
+To set up **MacOS** for native development, complete the following steps:
+
+- Use a Ruby version manager to install the specified version from `.ruby-version`
+- Run `bundle` to install required gems
+- Run `brew install postgresql@14 redis imagemagick libidn` to install required dependencies
+- Navigate to Mastodon's root directory and run `brew install nvm` then `nvm use` to use the version from `.nvmrc`
+- Run `yarn` to install required packages
+- Run `corepack enable && corepack prepare`
+- Run `RAILS_ENV=development bundle exec rails db:setup`
+- Finally, run `bin/dev` which will launch the local services via `overmind` (if installed) or `foreman`
+
+### Docker
+
+For development with **Docker**, complete the following steps:
+
+- Install Docker Desktop
+- Run `docker compose -f .devcontainer/docker-compose.yml up -d`
+- Run `docker compose -f .devcontainer/docker-compose.yml exec app .devcontainer/post-create.sh`
+- Finally, run `docker compose -f .devcontainer/docker-compose.yml exec app bin/dev`
+
+If you are using an IDE with [support for the Development Container specification](https://containers.dev/supporting), it will run the above `docker compose` commands automatically. For **Visual Studio Code** this requires the [Dev Container extension](https://containers.dev/supporting#dev-containers).
+
+### GitHub Codespaces
+
+To get you coding in just a few minutes, GitHub Codespaces provides a web-based version of Visual Studio Code and a cloud-hosted development environment fully configured with the software needed for this project..
+
+- Click this button to create a new codespace: