diff --git a/CHANGELOG.md b/CHANGELOG.md index e07121d947..ed5127a84e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,11 @@ All notable changes to this project will be documented in this file. -## [4.6.0] - UNRELEASED +## [4.6.0] - 2026-06-17 ### Added -- **Add collections** (#37992, #37005, #37049, #37020, #37053, #37110, #37117, #37122, #37154, #37157, #37176, #37192, #37222, #37225, #37254, #37277, #37298, #37322, #37434, #37468, #37514, #37512, #37549, #37556, #37560, #37580, #37591, #37552, #37618, #37643, #37658, #37731, #37678, #37741, #37762, #37790, #37805, #37823, #37837, #37842, #37850, #37848, #37812, #37950, #37898, #37916, #37920, #37927, #37928, #37961, #37967, #37974, #37989, #37986, #38004, #38026, #38027, #38030, #38038, #38065, #38081, #38082, #38096, #38106, #38113, #38124, #38133, #38144, #38153, #38166, #38167, #38169, #38170, #38177, #38193, #38213, #38251, #38255, #38256, #38282, #38298, #38292, #38307, #38306, #38316, #38115, #38329, #38334, #38337, #38351, #38368, #38370, #38356, #38383, #38386, #38385, #38394, #38393, #38399, #38402, #38409, #38414, #38413, #38424, #38425, #38450, #38508, #38528, #38534, #38536, #38540, #38543, #38491, #38586, #38611, #38588, #38612, #38628, #38626, #38630, #38633, #38629, #38638, #38645, #38644, #38636, #38660, #38657, #38688, #38690, #38672, #38698, #38697, #38708, #38712, #38713, #38709, #38719, #38728, #38730, #38732, #38739, #38749, #38751, #38750, #38767, #38769, #38783, #38785, #38959, #38786, #38794, #38776, #38817, #38792, #38822, #38827, #38831, #38830, #38844, #38843, #38852, #38850, #38847, #38865, #38897, #38900, #38919, #38933, #38934, #38935, #38942, #38941, #38954, #38961, #38957, #38962, #38991, #39009, #39062, #39029, #39069, #39020, #39073, #39082, #39096, #39080, #39182, #39143, #39127, #37929, #38029, #39194, #39198, #39210, #39211, #39202, #39214, #39215, #39220, #39234, #39260, #39251, #39361, #39357, #39349, #39287, #39376, #39289, #39342, #38711, #39379, #39282, #39286, #39296, #39047, #39346, #39373, #39372, and #39429 by @ChaosExAnima, @ClearlyClaire, @Gargron, @arte7, @diondiondion, @mjankowski, @oneiros, and @shleeable) +- **Add collections** (#37992, #37005, #37049, #37020, #37053, #37110, #37117, #37122, #37154, #37157, #37176, #37192, #37222, #37225, #37254, #37277, #37298, #37322, #37434, #37468, #37514, #37512, #37549, #37556, #37560, #37580, #37591, #37552, #37618, #37643, #37658, #37731, #37678, #37741, #37762, #37790, #37805, #37823, #37837, #37842, #37850, #37848, #37812, #37950, #37898, #37916, #37920, #37927, #37928, #37961, #37967, #37974, #37989, #37986, #38004, #38026, #38027, #38030, #38038, #38065, #38081, #38082, #38096, #38106, #38113, #38124, #38133, #38144, #38153, #38166, #38167, #38169, #38170, #38177, #38193, #38213, #38251, #38255, #38256, #38282, #38298, #38292, #38307, #38306, #38316, #38115, #38329, #38334, #38337, #38351, #38368, #38370, #38356, #38383, #38386, #38385, #38394, #38393, #38399, #38402, #38409, #38414, #38413, #38424, #38425, #38450, #38508, #38528, #38534, #38536, #38540, #38543, #38491, #38586, #38611, #38588, #38612, #38628, #38626, #38630, #38633, #38629, #38638, #38645, #38644, #38636, #38660, #38657, #38688, #38690, #38672, #38698, #38697, #38708, #38712, #38713, #38709, #38719, #38728, #38730, #38732, #38739, #38749, #38751, #38750, #38767, #38769, #38783, #38785, #38959, #38786, #38794, #38776, #38817, #38792, #38822, #38827, #38831, #38830, #38844, #38843, #38852, #38850, #38847, #38865, #38897, #38900, #38919, #38933, #38934, #38935, #38942, #38941, #38954, #38961, #38957, #38962, #38991, #39009, #39062, #39029, #39069, #39020, #39073, #39082, #39096, #39080, #39182, #39143, #39127, #37929, #38029, #39194, #39198, #39210, #39211, #39202, #39214, #39215, #39220, #39234, #39260, #39251, #39361, #39357, #39349, #39287, #39376, #39289, #39342, #38711, #39379, #39282, #39286, #39296, #39047, #39346, #39373, #39372, #39429, and #39457 by @ChaosExAnima, @ClearlyClaire, @Gargron, @arte7, @diondiondion, @mjankowski, @oneiros, and @shleeable) - Create collections with up to 25 accounts each, then share them with others. You can read more about this feature [on our blog](https://blog.joinmastodon.org/2026/04/designing-collections/). This is based on FEP-7aa9 (Featured Collections) to be interoperable with the wider Fediverse. All the new API methods [are documented here](https://docs.joinmastodon.org/client/collections/). - **Add email subscriptions** (#38163, #38507, #38502, #38487, #38527, #38582, #38741, #38907, #39162, #39271 by @ClearlyClaire and @Gargron) - Admins can allow specific roles to enable email subscriptions on their profile, allowing anonymous visitors to subscribe to their posts via email. @@ -47,7 +47,7 @@ All notable changes to this project will be documented in this file. ### Changed -- **Change design of profiles in web UI** (#37472, #37490, #37479, #37513, #37527, #37550, #37538, #37632, #37627, #37593, #37638, #37626, #37645, #37653, #37683, #37707, #37682, #37742, #37747, #37760, #37761, #37831, #37766, #37811, #37813, #37825, #37854, #37851, #37876, #37885, #37892, #37890, #37907, #37922, #37952, #37958, #37996, #37990, #37994, #38005, #38012, #38040, #38052, #38066, #38083, #38147, #38148, #38152, #38168, #38156, #38175, #38191, #38189, #38235, #38283, #38310, #38309, #38315, #38314, #38365, #38366, #38363, #38346, #38382, #38384, #38400, #38404, #38417, #38426, #38440, #38442, #38443, #38445, #38446, #38451, #38456, #38509, #38510, #38512, #38513, #38517, #38529, #38531, #38535, #38532, #38544, #38549, #38575, #38579, #38580, #38581, #38585, #38584, #38604, #38605, #38606, #38607, #38622, #38616, #38625, #38632, #38640, #38663, #38667, #38646, #38691, #38692, #38766, #38791, #38687, #38826, #38828, #38863, #38845, #38870, #38872, #38932, #38945, #38963, #38964, #39055, #39042, #38893, #39079, #39084, #39160, #39070, #39217, #39309, #39354, #39324, #39387 by @ChaosExAnima, @ClearlyClaire, @Coro365, @diondiondion, and @shleeable) +- **Change design of profiles in web UI** (#37472, #37490, #37479, #37513, #37527, #37550, #37538, #37632, #37627, #37593, #37638, #37626, #37645, #37653, #37683, #37707, #37682, #37742, #37747, #37760, #37761, #37831, #37766, #37811, #37813, #37825, #37854, #37851, #37876, #37885, #37892, #37890, #37907, #37922, #37952, #37958, #37996, #37990, #37994, #38005, #38012, #38040, #38052, #38066, #38083, #38147, #38148, #38152, #38168, #38156, #38175, #38191, #38189, #38235, #38283, #38310, #38309, #38315, #38314, #38365, #38366, #38363, #38346, #38382, #38384, #38400, #38404, #38417, #38426, #38440, #38442, #38443, #38445, #38446, #38451, #38456, #38509, #38510, #38512, #38513, #38517, #38529, #38531, #38535, #38532, #38544, #38549, #38575, #38579, #38580, #38581, #38585, #38584, #38604, #38605, #38606, #38607, #38622, #38616, #38625, #38632, #38640, #38663, #38667, #38646, #38691, #38692, #38766, #38791, #38687, #38826, #38828, #38863, #38845, #38870, #38872, #38932, #38945, #38963, #38964, #39055, #39042, #38893, #39079, #39084, #39160, #39070, #39217, #39309, #39354, #39324, #39387, #39452, #39467 by @ChaosExAnima, @ClearlyClaire, @Coro365, @diondiondion, and @shleeable) - The profile screen has been entirely redesigned, has new features, and allows you to update your own profile directly without going into the preferences panel. You can read more about it [on our blog](https://blog.joinmastodon.org/2026/03/a-redesign-for-profiles/). - **Change how #Wrapstodon reports are generated and displayed** (#37033, #37045, #37093, #37055, #37096, #37047, #37103, #37104, #37106, #37109, #37121, #37138, #37134, #37177, #37182, #37169, #37186, #37187, #37188, #37189, #37190, #37193, #37198, #37201, #37203, #37205, #37206, #37207, #37209, #37202, #37216, #37219, #37224, #37226, #37229, #37249, #37251, #37256, #37261, #37269, #37270, #37273, and #37289 by @ChaosExAnima, @ClearlyClaire, @channyeintun, and @diondiondion) - This finishes up work started in 2024 by completely revamping how Wrapstodon reports are generated and displayed, reducing the amount of data collected and generating reports when active users ask for them. @@ -55,6 +55,7 @@ All notable changes to this project will be documented in this file. - The design of the Wrapstodon report has also been fully reworked to be more delightful and easier to share! - The relevant API endpoints are documented at https://docs.joinmastodon.org/methods/annual_reports/ - Change limitation to allow posts with both media and a poll to be created (#39203, #39368, #39388 by @ClearlyClaire and @Gargron) +- Change account display name length limit from 30 to 40 characters (#39458 by @mjankowski) - Change alt text limit for media attachments to 10,000 characters (#39306 by @ClearlyClaire) - Change pending user notification email to link directly to the pending account (#39206 by @vmstan) - Changed emoji processing in web UI to make it less resource intensive and more robust (#39077, #39008, #39088, #38892, #38885, #38965, #38854, #38825, #38784, #38541, #37442, #37300, #37306, #37271, #37255, #37284, #37272, #37178, #37084, #37080, #37418, #39167, #39126, #39353, #39378, #39382, #39402, and #39421 by @ChaosExAnima, @ClearlyClaire, @diondiondion, @gomasy, and @Hanage999) @@ -103,6 +104,8 @@ All notable changes to this project will be documented in this file. ### Fixed - Fix accessibility issues in web UI (#37250, #38006, #38033, #38188, #38230, #38252, #38257, #38285, #38293, #38362, #38387, #38459, #38796, #38801, #39098, #39111, #39120, #39129, #39133, #39134, #39144, #39145, #39149, #39164, #39165, #39169, #39181, #39335, #39305, #39331, #39356, #39350, #39358, #39360, #39325, #39270, #39439, #39400, and #39408 by @ChaosExAnima and @diondiondion) +- Fix report modal heading being impossible to translate properly in some languages (#39457 by @diondiondion) +- Fix being unable to edit an attachment twice without submitting (#39453 by @ClearlyClaire) - Fix error with audio player in Safari Lockdown Mode (#39397 by @Federicorao) - Fix tiny checkboxes and radio buttons in Safari (#39332 by @diondiondion) - Fix handling of offset in timezone list in settings (#39334 by @mjankowski) diff --git a/SECURITY.md b/SECURITY.md index bde737dc23..8e35943307 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -13,8 +13,9 @@ A "vulnerability in Mastodon" is a vulnerability in the code distributed through ## Supported Versions -| Version | Supported | -| ------- | --------- | -| 4.5.x | Yes | -| 4.4.x | Yes | -| < 4.4 | No | +| Version | Supported | +| ------- | ---------------- | +| 4.6.0 | Yes | +| 4.5.x | Yes | +| 4.4.x | Until 2026-12-17 | +| < 4.4 | No | diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js index f09db1327e..03cd2dec64 100644 --- a/app/javascript/mastodon/actions/compose.js +++ b/app/javascript/mastodon/actions/compose.js @@ -61,10 +61,6 @@ export const COMPOSE_LANGUAGE_CHANGE = 'COMPOSE_LANGUAGE_CHANGE'; export const COMPOSE_EMOJI_INSERT = 'COMPOSE_EMOJI_INSERT'; -export const COMPOSE_UPLOAD_CHANGE_REQUEST = 'COMPOSE_UPLOAD_UPDATE_REQUEST'; -export const COMPOSE_UPLOAD_CHANGE_SUCCESS = 'COMPOSE_UPLOAD_UPDATE_SUCCESS'; -export const COMPOSE_UPLOAD_CHANGE_FAIL = 'COMPOSE_UPLOAD_UPDATE_FAIL'; - export const COMPOSE_POLL_ADD = 'COMPOSE_POLL_ADD'; export const COMPOSE_POLL_REMOVE = 'COMPOSE_POLL_REMOVE'; export const COMPOSE_POLL_OPTION_ADD = 'COMPOSE_POLL_OPTION_ADD'; @@ -463,58 +459,6 @@ export function onChangeMediaFocus(focusX, focusY) { }; } -export function changeUploadCompose(id, params) { - return (dispatch, getState) => { - dispatch(changeUploadComposeRequest()); - - let media = getState().getIn(['compose', 'media_attachments']).find((item) => item.get('id') === id); - - // Editing already-attached media is deferred to editing the post itself. - // For simplicity's sake, fake an API reply. - if (media && !media.get('unattached')) { - const { focus, ...other } = params; - const data = { ...media.toJS(), ...other }; - - if (focus) { - const [x, y] = focus.split(','); - data.meta = { focus: { x: parseFloat(x), y: parseFloat(y) } }; - } - - dispatch(changeUploadComposeSuccess(data, true)); - } else { - api().put(`/api/v1/media/${id}`, params).then(response => { - dispatch(changeUploadComposeSuccess(response.data, false)); - }).catch(error => { - dispatch(changeUploadComposeFail(id, error)); - }); - } - }; -} - -export function changeUploadComposeRequest() { - return { - type: COMPOSE_UPLOAD_CHANGE_REQUEST, - skipLoading: true, - }; -} - -export function changeUploadComposeSuccess(media, attached) { - return { - type: COMPOSE_UPLOAD_CHANGE_SUCCESS, - media: media, - attached: attached, - skipLoading: true, - }; -} - -export function changeUploadComposeFail(error) { - return { - type: COMPOSE_UPLOAD_CHANGE_FAIL, - error: error, - skipLoading: true, - }; -} - export function uploadComposeRequest() { return { type: COMPOSE_UPLOAD_REQUEST, diff --git a/app/javascript/mastodon/actions/compose_typed.ts b/app/javascript/mastodon/actions/compose_typed.ts index 6bf193ba92..310ac5f84d 100644 --- a/app/javascript/mastodon/actions/compose_typed.ts +++ b/app/javascript/mastodon/actions/compose_typed.ts @@ -49,7 +49,7 @@ const messages = defineMessages({ }); type SimulatedMediaAttachmentJSON = ApiMediaAttachmentJSON & { - unattached?: boolean; + attached?: boolean; }; const simulateModifiedApiResponse = ( @@ -67,7 +67,8 @@ const simulateModifiedApiResponse = ( y: parseFloat(y ?? '0'), }, }, - } as unknown as SimulatedMediaAttachmentJSON; + attached: true, + } as SimulatedMediaAttachmentJSON; return data; }; @@ -137,7 +138,7 @@ export const changeUploadCompose = createDataLoadingThunk( (media: SimulatedMediaAttachmentJSON) => { return { media, - attached: typeof media.unattached !== 'undefined' && !media.unattached, + attached: typeof media.attached !== 'undefined' && media.attached, }; }, { diff --git a/app/javascript/mastodon/components/account_bio.tsx b/app/javascript/mastodon/components/account_bio/index.tsx similarity index 79% rename from app/javascript/mastodon/components/account_bio.tsx rename to app/javascript/mastodon/components/account_bio/index.tsx index 75067530c9..a5d8f7aaa7 100644 --- a/app/javascript/mastodon/components/account_bio.tsx +++ b/app/javascript/mastodon/components/account_bio/index.tsx @@ -1,9 +1,10 @@ import classNames from 'classnames'; -import { useAppSelector } from '../store'; +import { useAppSelector } from '../../store'; +import { EmojiHTML } from '../emoji/html'; +import { useElementHandledLink } from '../status/handled_link'; -import { EmojiHTML } from './emoji/html'; -import { useElementHandledLink } from './status/handled_link'; +import classes from './styles.module.scss'; interface AccountBioProps { className?: string; @@ -12,7 +13,7 @@ interface AccountBioProps { } export const AccountBio: React.FC = ({ - className, + className = classes.bio, accountId, showDropdown = false, }) => { diff --git a/app/javascript/mastodon/components/account_bio/styles.module.scss b/app/javascript/mastodon/components/account_bio/styles.module.scss new file mode 100644 index 0000000000..62e64a219a --- /dev/null +++ b/app/javascript/mastodon/components/account_bio/styles.module.scss @@ -0,0 +1,22 @@ +.bio { + font-size: 15px; + color: var(--color-text-primary); + unicode-bidi: plaintext; + overflow-wrap: anywhere; + + p { + margin-bottom: 20px; + + &:last-child { + margin-bottom: 0; + } + } + + :any-link { + color: var(--color-text-status-links); + + &:hover { + text-decoration: none; + } + } +} diff --git a/app/javascript/mastodon/components/account_header/index.tsx b/app/javascript/mastodon/components/account_header/index.tsx index df2493c7e9..f63672464c 100644 --- a/app/javascript/mastodon/components/account_header/index.tsx +++ b/app/javascript/mastodon/components/account_header/index.tsx @@ -148,11 +148,7 @@ export const AccountHeader: React.FC<{
{me && account.id !== me && } - + diff --git a/app/javascript/mastodon/components/account_header/styles.module.scss b/app/javascript/mastodon/components/account_header/styles.module.scss index 48320a6ea4..5e3ae14dbe 100644 --- a/app/javascript/mastodon/components/account_header/styles.module.scss +++ b/app/javascript/mastodon/components/account_header/styles.module.scss @@ -274,29 +274,6 @@ $button-fallback-breakpoint: $button-breakpoint + 55px; } } -.bio { - font-size: 15px; - color: var(--color-text-primary); - unicode-bidi: plaintext; - overflow-wrap: anywhere; - - p { - margin-bottom: 20px; - - &:last-child { - margin-bottom: 0; - } - } - - :any-link { - color: var(--color-text-status-links); - - &:hover { - text-decoration: none; - } - } -} - .familiarFollowers { margin-top: 16px; } diff --git a/app/javascript/mastodon/components/character_counter/styles.module.scss b/app/javascript/mastodon/components/character_counter/styles.module.scss index 05c9446545..ae77be1554 100644 --- a/app/javascript/mastodon/components/character_counter/styles.module.scss +++ b/app/javascript/mastodon/components/character_counter/styles.module.scss @@ -1,4 +1,5 @@ .counter { + display: block; margin-top: 4px; font-size: 13px; } diff --git a/app/javascript/mastodon/features/report/category.jsx b/app/javascript/mastodon/features/report/category.jsx index b97347279b..a6b042ccd6 100644 --- a/app/javascript/mastodon/features/report/category.jsx +++ b/app/javascript/mastodon/features/report/category.jsx @@ -22,8 +22,9 @@ const messages = defineMessages({ violation_description: { id: 'report.reasons.violation_description', defaultMessage: 'You are aware that it breaks specific rules' }, other: { id: 'report.reasons.other', defaultMessage: 'It\'s something else' }, other_description: { id: 'report.reasons.other_description', defaultMessage: 'The issue does not fit into other categories' }, - status: { id: 'report.category.title_status', defaultMessage: 'post' }, - account: { id: 'report.category.title_account', defaultMessage: 'profile' }, + status: { id: 'report.category.title_status', defaultMessage: "Tell us what's going on with this post" }, + account: { id: 'report.category.title_account', defaultMessage: "Tell us what's going on with this profile" }, + collection: { id: 'report.category.title_collection', defaultMessage: "Tell us what's going on with this collection"} }); const mapStateToProps = state => ({ @@ -68,7 +69,7 @@ class Category extends PureComponent { render () { const { category, startedFrom, rules, intl } = this.props; - const options = rules.length > 0 ? [ + let options = rules.length > 0 ? [ 'dislike', 'spam', 'legal', @@ -81,10 +82,14 @@ class Category extends PureComponent { 'other', ]; + if (startedFrom === 'collection') { + options = options.filter(item => item !== 'dislike'); + } + return ( <> - + {intl.formatMessage(messages[startedFrom])}

diff --git a/app/javascript/mastodon/features/ui/components/report_collection_modal.tsx b/app/javascript/mastodon/features/ui/components/report_collection_modal.tsx index 9113491a5a..8c700bc898 100644 --- a/app/javascript/mastodon/features/ui/components/report_collection_modal.tsx +++ b/app/javascript/mastodon/features/ui/components/report_collection_modal.tsx @@ -13,7 +13,9 @@ import { NavigationFocusTarget } from 'mastodon/components/navigation_focus_targ import { useAccount } from 'mastodon/hooks/useAccount'; import { useAppDispatch } from 'mastodon/store'; +import Category from '../../report/category'; import Comment from '../../report/comment'; +import Rules from '../../report/rules'; const messages = defineMessages({ close: { id: 'lightbox.close', defaultMessage: 'Close' }, @@ -60,8 +62,14 @@ export const ReportCollectionModal: React.FC<{ 'idle' | 'submitting' | 'submitted' | 'error' >('idle'); - const [step, setStep] = useState<'comment' | 'thanks'>('comment'); + const [step, setStep] = useState<'category' | 'rules' | 'comment' | 'thanks'>( + 'category', + ); + const [category, setCategory] = useState< + 'spam' | 'legal' | 'violation' | 'other' | null + >(null); + const [selectedRuleIds, setSelectedRuleIds] = useState([]); const [comment, setComment] = useState(''); const [selectedDomains, setSelectedDomains] = useState([]); @@ -73,6 +81,22 @@ export const ReportCollectionModal: React.FC<{ } }, []); + const handleRuleToggle = useCallback((ruleId: string) => { + setSelectedRuleIds((ruleIds) => + ruleIds.includes(ruleId) + ? ruleIds.filter((id) => ruleId !== id) + : [...ruleIds, ruleId], + ); + }, []); + + const handleNextStep = useCallback(() => { + if (step === 'category' && category === 'violation') { + setStep('rules'); + } else { + setStep('comment'); + } + }, [category, step]); + const handleSubmit = useCallback(() => { setSubmitState('submitting'); @@ -85,7 +109,8 @@ export const ReportCollectionModal: React.FC<{ forward_to_domains: selectedDomains, comment, forward: selectedDomains.length > 0, - category: 'spam', + category: category ?? 'other', + rule_ids: selectedRuleIds, }, () => { setSubmitState('submitted'); @@ -96,7 +121,15 @@ export const ReportCollectionModal: React.FC<{ }, ), ); - }, [account_id, comment, dispatch, collectionId, selectedDomains]); + }, [ + account_id, + category, + selectedRuleIds, + comment, + dispatch, + collectionId, + selectedDomains, + ]); if (!account) { return null; @@ -108,15 +141,28 @@ export const ReportCollectionModal: React.FC<{ let stepComponent; switch (step) { + case 'category': + stepComponent = ( + + ); + break; + case 'rules': + stepComponent = ( + + ); + break; case 'comment': stepComponent = ( - } submitError={ submitState === 'error' && ( Preferences > Privacy and reach", + "empty_column.collections_self": "You have not created any collections yet.", "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!", "empty_column.direct": "You don't have any private mentions yet. When you send or receive one, it will show up here.", "empty_column.disabled_feed": "This feed has been disabled by your server administrators.", @@ -780,6 +781,7 @@ "home.pending_critical_update.link": "See updates", "home.pending_critical_update.title": "Critical security update available!", "home.show_announcements": "Show announcements", + "ignore_notifications_modal.bots_title": "Ignore notifications from bots?", "ignore_notifications_modal.disclaimer": "Mastodon cannot inform users that you've ignored their notifications. Ignoring notifications will not stop the messages themselves from being sent.", "ignore_notifications_modal.filter_instead": "Filter instead", "ignore_notifications_modal.filter_to_act_users": "You'll still be able to accept, reject, or report users", @@ -846,6 +848,7 @@ "keyboard_shortcuts.toggle_sensitivity": "Show/hide media", "keyboard_shortcuts.toot": "to start a brand new post", "keyboard_shortcuts.top": "Move to top of list", + "keyboard_shortcuts.translate": "Translate a post", "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search", "keyboard_shortcuts.up": "Move up in the list", "learn_more_link.got_it": "Got it", @@ -1041,6 +1044,8 @@ "notifications.policy.drop": "Ignore", "notifications.policy.drop_hint": "Send to the void, never to be seen again", "notifications.policy.filter": "Filter", + "notifications.policy.filter_bots_hint": "Accounts marked as automated", + "notifications.policy.filter_bots_title": "Bots", "notifications.policy.filter_hint": "Send to filtered notifications inbox", "notifications.policy.filter_limited_accounts_hint": "Limited by server moderators", "notifications.policy.filter_limited_accounts_title": "Moderated accounts", @@ -1133,11 +1138,7 @@ "report.categories.spam": "Spam", "report.categories.violation": "Content violates one or more server rules", "report.category.subtitle": "Choose the best match", - "report.category.title": "Tell us what's going on with this {type}", - "report.category.title_account": "profile", - "report.category.title_status": "post", "report.close": "Done", - "report.collection_comment": "Why do you want to report this collection?", "report.comment.title": "Is there anything else you think we should know?", "report.forward": "Forward to {target}", "report.forward_hint": "The account is from another server. Send an anonymised copy of the report there as well?", diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 505f0fc6b6..27012a495d 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -1138,11 +1138,10 @@ "report.categories.spam": "Spam", "report.categories.violation": "Content violates one or more server rules", "report.category.subtitle": "Choose the best match", - "report.category.title": "Tell us what's going on with this {type}", - "report.category.title_account": "profile", - "report.category.title_status": "post", + "report.category.title_account": "Tell us what's going on with this profile", + "report.category.title_collection": "Tell us what's going on with this collection", + "report.category.title_status": "Tell us what's going on with this post", "report.close": "Done", - "report.collection_comment": "Why do you want to report this collection?", "report.comment.title": "Is there anything else you think we should know?", "report.forward": "Forward to {target}", "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?", diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json index dcd95629ad..4bac092362 100644 --- a/app/javascript/mastodon/locales/eo.json +++ b/app/javascript/mastodon/locales/eo.json @@ -734,9 +734,6 @@ "report.categories.spam": "Trudmesaĝo", "report.categories.violation": "Enhavo malobservas unu aŭ plurajn servilajn regulojn", "report.category.subtitle": "Elektu la plej bonan kongruon", - "report.category.title": "Diru al ni kio okazas pri ĉi tiu {type}", - "report.category.title_account": "profilo", - "report.category.title_status": "afiŝo", "report.close": "Farita", "report.comment.title": "Ĉu estas ajn ion alian kiun vi pensas ke ni devus scii?", "report.forward": "Plusendi al {target}", diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json index 156137efed..1968af02a5 100644 --- a/app/javascript/mastodon/locales/es-AR.json +++ b/app/javascript/mastodon/locales/es-AR.json @@ -561,7 +561,7 @@ "confirmations.remove_from_followers.message": "{name} dejará de seguirte. ¿De verdad querés continuar?", "confirmations.remove_from_followers.title": "¿Quitar seguidor?", "confirmations.revoke_collection_inclusion.confirm": "Quitarme", - "confirmations.revoke_collection_inclusion.message": "Esta acción es permanente, y el autor no podrá volver a agregarte a la colección más adelante.", + "confirmations.revoke_collection_inclusion.message": "El coleccionista no podrá volver a agregarte a esta colección durante 24 horas. Para evitar que te agreguen a colecciones de forma permanente, podés bloquearlos.", "confirmations.revoke_collection_inclusion.title": "¿Querés quitarte de esta colección?", "confirmations.revoke_quote.confirm": "Eliminar mensaje", "confirmations.revoke_quote.message": "Esta acción no se puede deshacer.", @@ -649,7 +649,7 @@ "empty_column.collections": "{acct} todavía no creó ninguna colección.", "empty_column.collections.featured_in": "Todavía no te agregaron a ninguna colección.", "empty_column.collections.featured_in_undiscoverable": "Para que la gente pueda agregarte a colecciones, tenés que permitir que te destacen en las experiencias de descubrimiento en Configuración > Privacidad y alcance", - "empty_column.collections_self": "Aún no has creado ninguna colección.", + "empty_column.collections_self": "Todavía no creaste ninguna colección.", "empty_column.community": "La línea temporal local está vacía. ¡Escribí algo en modo público para que se empiece a correr la bola!", "empty_column.direct": "Todavía no tenés ninguna mención privada. Cuando enviés o recibás una, se mostrará acá.", "empty_column.disabled_feed": "Esta línea temporal fue deshabilitada por los administradores de tu servidor.", @@ -1090,18 +1090,18 @@ "poll_button.add_poll": "Agregar encuesta", "poll_button.remove_poll": "Quitar encuesta", "privacy.change": "Configurar privacidad del mensaje", - "privacy.direct.long": "Todas las cuentas mencionadas en el mensaje", - "privacy.direct.short": "Mención privada", - "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.direct.long": "Visible solo para todas las cuentas mencionadas en el mensaje", + "privacy.direct.short": "Visibilidad de mención privada", + "privacy.private.long": "Visible solo para tus seguidores", + "privacy.private.short": "Visibilidad solo para seguidores", + "privacy.public.long": "Visible en Mastodon en los resultados de búsqueda, tendencias y líneas temporales públicas", + "privacy.public.short": "Visibilidad pública", "privacy.quote.anyone": "{visibility}, citas permitidas", "privacy.quote.disabled": "{visibility}, citas deshabilitadas", "privacy.quote.limited": "{visibility}, citas limitadas", "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 las 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": "Oculto de los resultados de búsqueda, tendencias y líneas temporales públicas de Mastodon", - "privacy.unlisted.short": "Público pero silencioso", + "privacy.unlisted.long": "Oculto en Mastodon de los resultados de búsqueda, tendencias y líneas temporales públicas", + "privacy.unlisted.short": "Visibilidad pública pero silenciosa", "privacy_policy.last_updated": "Última actualización: {date}", "privacy_policy.title": "Política de privacidad", "quote_error.edit": "Las citas no se pueden agregar al editar un mensaje.", @@ -1138,11 +1138,7 @@ "report.categories.spam": "Spam", "report.categories.violation": "El contenido viola una o más reglas del servidor", "report.category.subtitle": "Elegí la mejor coincidencia", - "report.category.title": "Contanos lo que pasa con este {type}", - "report.category.title_account": "perfil", - "report.category.title_status": "mensaje", "report.close": "Listo", - "report.collection_comment": "¿Por qué querés denunciar esta colección?", "report.comment.title": "¿Hay algo más que creés que deberíamos saber?", "report.forward": "Reenviar a {target}", "report.forward_hint": "La cuenta es de otro servidor. ¿Querés enviar una copia anonimizada del informe también ahí?", diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json index 6231f53ac6..b6e71ba581 100644 --- a/app/javascript/mastodon/locales/es-MX.json +++ b/app/javascript/mastodon/locales/es-MX.json @@ -561,7 +561,7 @@ "confirmations.remove_from_followers.message": "{name} dejará de seguirte. ¿Estás seguro de que quieres continuar?", "confirmations.remove_from_followers.title": "¿Eliminar seguidor?", "confirmations.revoke_collection_inclusion.confirm": "Excluirme", - "confirmations.revoke_collection_inclusion.message": "Esta acción es permanente y el autor no podrá volver a agregarte a la colección más adelante.", + "confirmations.revoke_collection_inclusion.message": "El editor no podrá volver a añadirte a esta colección hasta dentro de 24 horas. Para evitar que te añada a colecciones de forma permanente, puedes bloquearlo.", "confirmations.revoke_collection_inclusion.title": "¿Deseas excluirte de esta colección?", "confirmations.revoke_quote.confirm": "Eliminar publicación", "confirmations.revoke_quote.message": "Esta acción no se puede deshacer.", @@ -1138,11 +1138,7 @@ "report.categories.spam": "Spam", "report.categories.violation": "El contenido viola una o más reglas del servidor", "report.category.subtitle": "Selecciona la mejor coincidencia", - "report.category.title": "Cuéntanos lo que sucede con este {type}", - "report.category.title_account": "perfil", - "report.category.title_status": "publicación", "report.close": "Realizado", - "report.collection_comment": "¿Por qué quieres reportar esta colección?", "report.comment.title": "¿Hay algo más que creas que deberíamos saber?", "report.forward": "Reenviar a {target}", "report.forward_hint": "La cuenta es de otro servidor. ¿Enviar también una copia anónima del informe allí?", diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json index 0c598472b3..72814f971e 100644 --- a/app/javascript/mastodon/locales/es.json +++ b/app/javascript/mastodon/locales/es.json @@ -561,7 +561,7 @@ "confirmations.remove_from_followers.message": "{name} dejará de seguirte. ¿Estás seguro de que quieres continuar?", "confirmations.remove_from_followers.title": "¿Eliminar seguidor?", "confirmations.revoke_collection_inclusion.confirm": "Sácame", - "confirmations.revoke_collection_inclusion.message": "Esta acción es permanente, y el curador no podrá volver a añadirle a la colección más adelante.", + "confirmations.revoke_collection_inclusion.message": "El editor no podrá volver a añadirte a esta colección durante 24 horas. Para evitar que te añada a colecciones de forma permanente, puedes bloquearle.", "confirmations.revoke_collection_inclusion.title": "¿Salirse de esta colección?", "confirmations.revoke_quote.confirm": "Eliminar publicación", "confirmations.revoke_quote.message": "Esta acción no tiene vuelta atrás.", @@ -1138,11 +1138,7 @@ "report.categories.spam": "Spam", "report.categories.violation": "El contenido viola una o más reglas del servidor", "report.category.subtitle": "Elige la mejor coincidencia", - "report.category.title": "Cuéntanos lo que está pasando con este {type}", - "report.category.title_account": "perfil", - "report.category.title_status": "publicación", "report.close": "Hecho", - "report.collection_comment": "¿Por qué quieres informar de esta colección?", "report.comment.title": "¿Hay algo más que creas que deberíamos saber?", "report.forward": "Reenviar a {target}", "report.forward_hint": "Esta cuenta es de otro servidor. ¿Enviar una copia anonimizada del informe allí también?", diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json index 9d5e833803..97b10e48e5 100644 --- a/app/javascript/mastodon/locales/et.json +++ b/app/javascript/mastodon/locales/et.json @@ -2,6 +2,7 @@ "about.blocks": "Modereeritavad serverid", "about.contact": "Kontakt:", "about.default_locale": "Vaikimisi", + "about.disclaimer": "Mastodon on vaba, tasuta ja avatud lähtekoodiga tarkvara ning Mastodon gGmbH kaubamärk.", "about.domain_blocks.no_reason_available": "Põhjus on teadmata", "about.domain_blocks.preamble": "Mastodon lubab üldiselt vaadata sisu ning suhelda kasutajatega ükskõik millisest teisest födiversumi serverist. Need on erandid, mis kehtivad selles kindlas serveris.", "about.domain_blocks.silenced.explanation": "Sa üldjuhul ei näe profiile ja sisu sellest serverist, kui sa just tahtlikult neid ei otsi või jälgimise moel nõusolekut ei anna.", @@ -380,7 +381,7 @@ "collections.collection_language_none": "Pole", "collections.collection_name": "Nimi", "collections.collection_topic": "Teema", - "collections.confirm_account_removal": "Kas oled kindel, et soovid selle konto kogumikust eemaldada?", + "collections.confirm_account_removal": "Kas oled kindel, et soovid selle kasutajakonto kogumikust eemaldada?", "collections.content_warning": "Sisuhoiatus", "collections.continue": "Jätka", "collections.copy_link": "Kopeeri link", @@ -392,7 +393,7 @@ "collections.delete_collection": "Kustuta kogumik", "collections.description_length_hint": "Kuni 100 tähemärki", "collections.detail.author_added_you_on_date": "{author} lisas sind {date}", - "collections.detail.loading": "Kogumiku laadimine…", + "collections.detail.loading": "Laadin kogumikku…", "collections.detail.revoke_inclusion": "Eemalda mind", "collections.detail.sensitive_content": "Delikaatne sisu", "collections.detail.sensitive_note": "Kirjeldus ja kontod ei pruugi kõigi vaatajate jaoks sobivad olla.", @@ -560,7 +561,7 @@ "confirmations.remove_from_followers.message": "{name} lõpetab sellega sinu jälgimise. Kas oled kindel, et soovid jätkata?", "confirmations.remove_from_followers.title": "Kas eemaldame jälgija?", "confirmations.revoke_collection_inclusion.confirm": "Eemalda mind", - "confirmations.revoke_collection_inclusion.message": "See toiming on lõplik ja kuraator ei saa sind hiljem kogumikku uuesti lisada.", + "confirmations.revoke_collection_inclusion.message": "Koostaja ei saa sind uuesti lisada sellesse kogumikku 24 tunni jooksul. Kui tahad, et seda ei saaks üldse teha, võid ta blokeerida.", "confirmations.revoke_collection_inclusion.title": "Kas eemaldad ennast sellest kogumikust?", "confirmations.revoke_quote.confirm": "Eemalda postitus", "confirmations.revoke_quote.message": "Seda tegevust ei saa tagasi pöörata.", @@ -645,8 +646,10 @@ "empty_column.account_unavailable": "Profiil pole saadaval", "empty_column.blocks": "Blokeeritud kasutajaid pole.", "empty_column.bookmarked_statuses": "Järjehoidjatesse pole veel lisatud postitusi. Kui lisad mõne, näed neid siin.", + "empty_column.collections": "{acct} pole veel koostanud ühtegi kogumikku.", "empty_column.collections.featured_in": "Sind pole lisatud veel ühtegi kogumikku.", "empty_column.collections.featured_in_undiscoverable": "Selleks, et kasutajad saaks sind lisada kogumikesse, pead sa seadistustest lubama tuvastamise ja esiletõstmise siit: Eelistused > Privaatsus ja ulatus", + "empty_column.collections_self": "Sina pole veel koostanud ühtegi kogumikku.", "empty_column.community": "Kohalik ajajoon on tühi. Kirjuta midagi avalikult, et pall veerema ajada!", "empty_column.direct": "Sul pole veel ühtegi privaatset mainimist. Kui saadad või saad mõne, ilmuvad need siin.", "empty_column.disabled_feed": "See infovoog on serveri peakasutajate poolt välja lülitatud.", @@ -778,6 +781,7 @@ "home.pending_critical_update.link": "Vaata uuendusi", "home.pending_critical_update.title": "Saadaval kriitiline turvauuendus!", "home.show_announcements": "Kuva teadaandeid", + "ignore_notifications_modal.bots_title": "Kas eirad robotkontode teavitusi?", "ignore_notifications_modal.disclaimer": "Mastodon ei saa teavitada kasutajaid, et eirasid nende teavitusi. Teavituste eiramine ei peata sõnumite endi saatmist.", "ignore_notifications_modal.filter_instead": "Selle asemel filtreeri", "ignore_notifications_modal.filter_to_act_users": "Saad endiselt kasutajaid vastu võtta, tagasi lükata või neist teatada", @@ -818,6 +822,12 @@ "keyboard_shortcuts.heading": "Kiirklahvid", "keyboard_shortcuts.home": "Ava kodu ajajoon", "keyboard_shortcuts.hotkey": "Kiirklahv", + "keyboard_shortcuts.keys.alt": "Alt", + "keyboard_shortcuts.keys.backspace": "Tagasivõtuklahv", + "keyboard_shortcuts.keys.enter": "Sisestusklahv", + "keyboard_shortcuts.keys.esc": "Esc", + "keyboard_shortcuts.keys.page_down": "Lehekülje võrra alla", + "keyboard_shortcuts.keys.page_up": "Lehekülje võrra üles", "keyboard_shortcuts.legend": "Kuva see legend", "keyboard_shortcuts.load_more": "Fookus „Laadi veel“ nupule", "keyboard_shortcuts.local": "Ava kohalik ajajoon", @@ -838,6 +848,7 @@ "keyboard_shortcuts.toggle_sensitivity": "Näita/peida meediat", "keyboard_shortcuts.toot": "Alusta uut postitust", "keyboard_shortcuts.top": "Tõsta loendi algusesse", + "keyboard_shortcuts.translate": "Tõlgi postitus", "keyboard_shortcuts.unfocus": "Fookus tekstialalt/otsingult ära", "keyboard_shortcuts.up": "Liigu loetelus üles", "learn_more_link.got_it": "Sain aru", @@ -1033,6 +1044,8 @@ "notifications.policy.drop": "Ignoreeri", "notifications.policy.drop_hint": "Saada tühjusse, mitte kunagi seda enam näha", "notifications.policy.filter": "Filter", + "notifications.policy.filter_bots_hint": "Kasutajakontod, millele on lisatud automatiseeritud töö tunnus", + "notifications.policy.filter_bots_title": "Robotid", "notifications.policy.filter_hint": "Saadetud filtreeritud teavituste sisendkasti", "notifications.policy.filter_limited_accounts_hint": "Piiratud serveri moderaatorite poolt", "notifications.policy.filter_limited_accounts_title": "Modereeritud kontod", @@ -1125,11 +1138,7 @@ "report.categories.spam": "Rämpspost", "report.categories.violation": "Sisu, mis rikub ühte või enamat serveri reeglit", "report.category.subtitle": "Vali parim vaste", - "report.category.title": "Selgita, mis on selle {type} valesti", - "report.category.title_account": "kontoga", - "report.category.title_status": "postitusega", "report.close": "Valmis", - "report.collection_comment": "Miks soovid sellest kogumikust raporteerida?", "report.comment.title": "Kas arvad, et on veel midagi, mida me peaks teadma?", "report.forward": "Edasta ka {target} domeeni", "report.forward_hint": "See kasutaja on teisest serverist. Kas saadan anonümiseeritud koopia sellest teatest sinna ka?", @@ -1190,6 +1199,7 @@ "search_popout.user": "kasutaja", "search_results.accounts": "Profiilid", "search_results.all": "Kõik", + "search_results.collections": "Kogumikud", "search_results.hashtags": "Teemaviited", "search_results.no_results": "Tulemusi pole.", "search_results.no_search_yet": "Proovi otsida postitusi, profiile või teemaviiteid.", diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json index 7a8b23ed4d..f3565215fb 100644 --- a/app/javascript/mastodon/locales/eu.json +++ b/app/javascript/mastodon/locales/eu.json @@ -792,9 +792,6 @@ "report.categories.spam": "Spam", "report.categories.violation": "Edukiak zerbitzariko arau bat edo gehiago urratzen ditu", "report.category.subtitle": "Aukeratu egokiena", - "report.category.title": "Kontaiguzu zer gertatzen den {type} honekin", - "report.category.title_account": "profil", - "report.category.title_status": "bidalketa", "report.close": "Egina", "report.comment.title": "Beste zerbait jakin beharko genuke?", "report.forward": "Birbidali hona: {target}", diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json index c341c05d32..42c4880d9e 100644 --- a/app/javascript/mastodon/locales/fa.json +++ b/app/javascript/mastodon/locales/fa.json @@ -550,7 +550,6 @@ "confirmations.remove_from_followers.message": "دیگر {name} پیتان نخواهد گرفت. مطمئنید که می‌خواهید ادامه دهید؟", "confirmations.remove_from_followers.title": "برداشتن پی‌گیرنده؟", "confirmations.revoke_collection_inclusion.confirm": "حذفم کن", - "confirmations.revoke_collection_inclusion.message": "این کنش همیشگی است و سازنده نخواهد توانست دوباره به مجموعه بیفزایدتان.", "confirmations.revoke_collection_inclusion.title": "برداشتن خودتان از این مجموعه؟", "confirmations.revoke_quote.confirm": "حذف فرسته", "confirmations.revoke_quote.message": "این اقدام قابل بازگشت نیست.", @@ -892,6 +891,7 @@ "navigation_bar.live_feed_local": "خوراک زنده (محلی)", "navigation_bar.live_feed_public": "خوراک زنده (عمومی)", "navigation_bar.logout": "خروج", + "navigation_bar.main": "اصلی", "navigation_bar.moderation": "نظارت", "navigation_bar.more": "بیشتر", "navigation_bar.mutes": "کاربران خموشانده", @@ -1104,11 +1104,7 @@ "report.categories.spam": "هرزنامه", "report.categories.violation": "محتوا یک یا چند قانون کارساز را نقض می‌کند", "report.category.subtitle": "منطبق‌ترین را انتخاب کنید", - "report.category.title": "به ما بگویید با این {type} چه مشکلی دارید", - "report.category.title_account": "نمایه", - "report.category.title_status": "فرسته", "report.close": "انجام شد", - "report.collection_comment": "چرا می‌خواهید این مجموعه را گزارش دهید؟", "report.comment.title": "آیا چیز دیگری هست که فکر می‌کنید باید بدانیم؟", "report.forward": "فرستادن به {target}", "report.forward_hint": "این حساب در کارساز دیگری ثبت شده. آیا می‌خواهید رونوشتی ناشناس از این گزارش به آن‌جا هم فرستاده شود؟", diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json index 8b39c8aad3..b8292d24fe 100644 --- a/app/javascript/mastodon/locales/fi.json +++ b/app/javascript/mastodon/locales/fi.json @@ -561,7 +561,7 @@ "confirmations.remove_from_followers.message": "{name} lakkaa seuraamasta sinua. Haluatko varmasti jatkaa?", "confirmations.remove_from_followers.title": "Poistetaanko seuraaja?", "confirmations.revoke_collection_inclusion.confirm": "Poista minut", - "confirmations.revoke_collection_inclusion.message": "Tämä toimi on pysyvä, eikä kokoaja pysty lisäämään sinua kokoelmaan myöhemmin uudelleen.", + "confirmations.revoke_collection_inclusion.message": "Kokoaja ei voi lisätä sinua uudelleen tähän kokoelmaan seuraavan 24 tunnin aikana. Estämällä hänet voit pysyvästi estää häntä lisäämästä sinua kokoelmiin.", "confirmations.revoke_collection_inclusion.title": "Poistetaanko itsesi tästä kokoelmasta?", "confirmations.revoke_quote.confirm": "Poista julkaisu", "confirmations.revoke_quote.message": "Tätä toimea ei voi peruuttaa.", @@ -1138,11 +1138,7 @@ "report.categories.spam": "Roskaposti", "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.close": "Valmis", - "report.collection_comment": "Miksi haluat raportoida tämän kokoelman?", "report.comment.title": "Onko vielä jotain muuta, mitä meidän pitäisi tietää?", "report.forward": "Välitä palvelimelle {target}", "report.forward_hint": "Tämä tili on toisella palvelimella. Haluatko lähettää nimettömän raportin myös sinne?", diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json index fd7506baaa..22c4a3e56e 100644 --- a/app/javascript/mastodon/locales/fil.json +++ b/app/javascript/mastodon/locales/fil.json @@ -328,7 +328,6 @@ "report.categories.other": "Iba pa", "report.categories.violation": "Lumalabag ang nilalaman sa isa o higit pang mga patakaran ng serbiro", "report.category.subtitle": "Piliin ang pinakamahusay na tugma", - "report.category.title": "Sabihin mo sa amin kung anong nangyari sa {type} na ito", "report.close": "Tapos na", "report.comment.title": "Mayroon pa bang dapat naming malaman?", "report.next": "Sunod", diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json index 561ff6259b..8b69cc88bb 100644 --- a/app/javascript/mastodon/locales/fo.json +++ b/app/javascript/mastodon/locales/fo.json @@ -928,11 +928,7 @@ "report.categories.spam": "Ruskpostur", "report.categories.violation": "Innihaldið brýtur eina ella fleiri ambætarareglur", "report.category.subtitle": "Vel besta boðið", - "report.category.title": "Fortel okkum, hvat hendir við hesum {type}", - "report.category.title_account": "vangi", - "report.category.title_status": "postinum", "report.close": "Liðugt", - "report.collection_comment": "Hví vilt tú melda hetta savnið?", "report.comment.title": "Er nakað annað, sum tú heldur, at vit áttu at vitað?", "report.forward": "Víðarisend til {target}", "report.forward_hint": "Kontan er frá einum øðrum ambætara. Send eitt dulnevnt avrit av meldingini hagar eisini?", diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json index f7f1258929..05dbd4ec05 100644 --- a/app/javascript/mastodon/locales/fr-CA.json +++ b/app/javascript/mastodon/locales/fr-CA.json @@ -561,7 +561,7 @@ "confirmations.remove_from_followers.message": "{name} cessera de vous suivre. Voulez-vous vraiment continuer ?", "confirmations.remove_from_followers.title": "Supprimer l'abonné·e ?", "confirmations.revoke_collection_inclusion.confirm": "Me retirer", - "confirmations.revoke_collection_inclusion.message": "Cette action est permanente, la personne qui gère la collection ne pourra plus vous y rajouter plus tard.", + "confirmations.revoke_collection_inclusion.message": "Le compte gérant la collection ne pourra plus vous y ajouter pendant 24 heures. Pour l'empêcher définitivement de vous ajouter à des collections vous pouvez le bloquer.", "confirmations.revoke_collection_inclusion.title": "Vous retirer de cette collection ?", "confirmations.revoke_quote.confirm": "Retirer le message", "confirmations.revoke_quote.message": "Cette action ne peut pas être annulée.", @@ -1138,11 +1138,7 @@ "report.categories.spam": "Spam", "report.categories.violation": "Le contenu enfreint une ou plusieurs règles du serveur", "report.category.subtitle": "Sélctionnez ce qui correspond le mieux", - "report.category.title": "Dites-nous ce qui se passe avec ce {type}", - "report.category.title_account": "ce profil", - "report.category.title_status": "ce message", "report.close": "Terminé", - "report.collection_comment": "Pourquoi voulez-vous signaler cette collection ?", "report.comment.title": "Y a-t-il autre chose que nous devrions savoir?", "report.forward": "Transférer à {target}", "report.forward_hint": "Le compte provient d’un autre serveur. Envoyer une copie anonyme du rapport là-bas également?", diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json index 08115c62e2..e9c144f1e3 100644 --- a/app/javascript/mastodon/locales/fr.json +++ b/app/javascript/mastodon/locales/fr.json @@ -561,7 +561,7 @@ "confirmations.remove_from_followers.message": "{name} cessera de vous suivre. Voulez-vous vraiment continuer ?", "confirmations.remove_from_followers.title": "Supprimer l'abonné·e ?", "confirmations.revoke_collection_inclusion.confirm": "Me retirer", - "confirmations.revoke_collection_inclusion.message": "Cette action est permanente, la personne qui gère la collection ne pourra plus vous y rajouter plus tard.", + "confirmations.revoke_collection_inclusion.message": "Le compte gérant la collection ne pourra plus vous y ajouter pendant 24 heures. Pour l'empêcher définitivement de vous ajouter à des collections vous pouvez le bloquer.", "confirmations.revoke_collection_inclusion.title": "Vous retirer de cette collection ?", "confirmations.revoke_quote.confirm": "Retirer le message", "confirmations.revoke_quote.message": "Cette action ne peut pas être annulée.", @@ -658,13 +658,13 @@ "empty_column.favourited_statuses": "Vous n’avez pas encore de message en favori. Lorsque vous en ajouterez un, il apparaîtra ici.", "empty_column.favourites": "Personne n’a encore ajouté ce message à ses favoris. Lorsque quelqu’un le fera, il apparaîtra ici.", "empty_column.follow_requests": "Vous n’avez pas encore de demande de suivi. Lorsque vous en recevrez une, elle apparaîtra ici.", - "empty_column.followed_tags": "Vous n'avez pas encore suivi d'hashtags. Lorsque vous le ferez, ils apparaîtront ici.", + "empty_column.followed_tags": "Vous n'avez pas encore suivi de hashtags. Lorsque vous le ferez, ils apparaîtront ici.", "empty_column.hashtag": "Il n’y a encore aucun contenu associé à ce hashtag.", "empty_column.home": "Votre fil principal est vide ! Suivez plus de personnes pour le remplir.", "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.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.notifications": "Vous n’avez pas encore de notification. Interagissez avec d’autres personnes pour commencer 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", "empty_state.no_results": "Aucun résultat", "error.no_hashtag_feed_access": "Rejoindre ou se connecter pour voir et suivre cet hashtag.", @@ -1138,11 +1138,7 @@ "report.categories.spam": "Spam", "report.categories.violation": "Le contenu enfreint une ou plusieurs règles du serveur", "report.category.subtitle": "Sélctionnez ce qui correspond le mieux", - "report.category.title": "Dites-nous ce qu'il se passe avec {type}", - "report.category.title_account": "ce profil", - "report.category.title_status": "ce message", "report.close": "Terminé", - "report.collection_comment": "Pourquoi voulez-vous signaler cette collection ?", "report.comment.title": "Y a-t-il autre chose que nous devrions savoir ?", "report.forward": "Transférer à {target}", "report.forward_hint": "Le compte provient d’un autre serveur. Envoyer également une copie anonyme du rapport ?", diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json index f1f9be4754..d8a5067eb9 100644 --- a/app/javascript/mastodon/locales/fy.json +++ b/app/javascript/mastodon/locales/fy.json @@ -693,9 +693,6 @@ "report.categories.spam": "Spam", "report.categories.violation": "De ynhâld oertrêdet ien of mear serverrigels", "report.category.subtitle": "Selektearje wat it bêste past", - "report.category.title": "Fertel ús wat der mei dit {type} oan de hân is", - "report.category.title_account": "profyl", - "report.category.title_status": "berjocht", "report.close": "Klear", "report.comment.title": "Tinksto dat wy noch mear witte moatte?", "report.forward": "Nei {target} trochstjoere", diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json index f331aa0ffb..b67c43e615 100644 --- a/app/javascript/mastodon/locales/ga.json +++ b/app/javascript/mastodon/locales/ga.json @@ -561,7 +561,7 @@ "confirmations.remove_from_followers.message": "Scoirfidh {name} de bheith ag leanúint leat. An bhfuil tú cinnte gur mian leat leanúint ar aghaidh?", "confirmations.remove_from_followers.title": "Bain an leantóir?", "confirmations.revoke_collection_inclusion.confirm": "Bain mé", - "confirmations.revoke_collection_inclusion.message": "Is gníomh buan é seo, agus ní bheidh an coimeádaí in ann tú a chur leis an mbailiúchán arís níos déanaí.", + "confirmations.revoke_collection_inclusion.message": "Ní bheidh an coimeádaí in ann tú a chur leis an mbailiúchán seo arís ar feadh 24 uair an chloig. Chun cosc ​​a chur orthu tú a chur le bailiúcháin go buan, is féidir leat iad a bhlocáil.", "confirmations.revoke_collection_inclusion.title": "Bain tú féin den bhailiúchán seo?", "confirmations.revoke_quote.confirm": "Bain postáil", "confirmations.revoke_quote.message": "Ní féidir an gníomh seo a chealú.", @@ -1138,11 +1138,7 @@ "report.categories.spam": "Turscar", "report.categories.violation": "Sáraíonn ábhar riail freastalaí amháin nó níos mó", "report.category.subtitle": "Roghnaigh an toradh is fearr", - "report.category.title": "Inis dúinn cad atá ar siúl leis an {type} seo", - "report.category.title_account": "próifíl", - "report.category.title_status": "postáil", "report.close": "Déanta", - "report.collection_comment": "Cén fáth ar mhaith leat an bailiúchán seo a thuairisciú?", "report.comment.title": "An bhfuil aon rud eile ba chóir dúinn a fhios agat, dar leat?", "report.forward": "Seol ar aghaidh chun {target}", "report.forward_hint": "Is ó fhreastalaí eile an cuntas. Cuir cóip gan ainm den tuarascáil ansin freisin?", diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json index c1cfd0a2cf..455fc326d6 100644 --- a/app/javascript/mastodon/locales/gd.json +++ b/app/javascript/mastodon/locales/gd.json @@ -2,6 +2,7 @@ "about.blocks": "Frithealaichean fo mhaorsainneachd", "about.contact": "Fios thugainn:", "about.default_locale": "Bun-roghainn", + "about.disclaimer": "’S e bathar-bog saor le bun-tùs fosgailte a th’ ann am Mastodon agus ’na chomharra-mhalairt aig Mastodon GmbH.", "about.domain_blocks.no_reason_available": "Chan eil an t-adhbhar ga thoirt seachad", "about.domain_blocks.preamble": "San fharsaingeachd, leigidh Mastodon leat susbaint o fhrithealaiche sam bith sa cho-shaoghal a shealltainn agus eadar-ghìomh a ghabhail leis na cleachdaichean uapa-san. Seo na h-easgaidhean a tha an sàs air an fhrithealaiche shònraichte seo.", "about.domain_blocks.silenced.explanation": "San fharsaingeachd, chan fhaic thu pròifilean agus susbaint an fhrithealaiche seo ach ma nì thu lorg no ma tha thu ga leantainn.", @@ -85,6 +86,7 @@ "account.locked_info": "Tha prìobhaideachd ghlaiste aig a’ chunntais seo. Nì an sealbhadair lèirmheas a làimh air cò dh’fhaodas a leantainn.", "account.media": "Meadhanan", "account.mention": "Thoir iomradh air @{name}", + "account.menu.add_to_collection": "Cuir ri cruinneachadh…", "account.menu.add_to_list": "Cuir ri liosta…", "account.menu.block": "Bac an cunntas", "account.menu.block_domain": "Bac {domain}", @@ -326,11 +328,15 @@ "annual_report.summary.share_on_mastodon": "Co-roinn air Mastodon", "attachments_list.unprocessed": "(gun phròiseasadh)", "audio.hide": "Falaich an fhuaim", + "block_modal.no_collections": "Chan urrainn do gin agaibh càch a chèile a chur ri cruinneachadh. Thèid ur toirt air falbh o chruinneachaidhean an neach eile a tha ann mu thràth nan robh sibh annta.", "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 do gin agaibh iomradh no luaidh a thoirt air càch a chèile no a leantainn càch a chèile.", + "block_modal.they_cant_see_posts": "Chan fhaic iad an t-susbaint agad ’s chan fhaic thu an t-susbaint 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 o chàch a bheir iomradh orra.", "boost_modal.combo": "Brùth air {combo} nam b’ fheàrr leat leum a ghearradh thar seo an ath-thuras", "boost_modal.reblog": "A bheil thu airson am post a bhrosnachadh?", "boost_modal.undo_reblog": "A bheil thu airson sgur de bhrosnachadh a’ phuist?", @@ -360,9 +366,12 @@ "collection.share_modal.share_via_system": "Co-roinn gu…", "collection.share_modal.title": "Co-roinn an cruinneachadh", "collection.share_modal.title_new": "Co-roinn an cruinneachadh ùr agad!", + "collection.share_template_other": "Thoir sùil air an deagh-chruinneachadh seo:", + "collection.share_template_own": "Thoir sùil air a’ chruinneachadh ùr agam:", "collections.account_count": "{count, plural, one {# chunntas} two {# chunntas} few {# cunntasan} other {# cunntas}}", "collections.accounts.empty_editor_title": "Chan eil neach sam bith sa chruinneachadh seo fhathast", "collections.accounts.empty_title": "Tha an an cruinneachadh seo falamh", + "collections.add_to_collection": "Cuir {name} ri cruinneachaidhean", "collections.block_collection_owner": "Bac an cunntas", "collections.by_account": "le {account_handle}", "collections.collection_description": "Tuairisgeul", @@ -385,6 +394,7 @@ "collections.detail.loading": "A’ luchdadh a’ chruinneachaidh…", "collections.detail.revoke_inclusion": "Thoir air falbh mi", "collections.detail.sensitive_content": "Susbaint fhrionasach", + "collections.detail.sensitive_note": "Dh’fhaoidte nach eil an tuairisgeul ’s na cunntasan iomchaidh dhan a h-uile neach-ammhairc.", "collections.detail.share": "Co-roinn an cruinneachadh seo", "collections.detail.you_are_in_this_collection": "Thathar do bhrosnachadh sa chruinneachadh seo", "collections.edit_details": "Deasaich am fiosrachadh", @@ -413,6 +423,11 @@ "collections.search_accounts_max_reached": "Chuir thu na tha ceadaichte de chunntasan ris", "collections.sensitive": "Frionasach", "collections.share_short": "Co-roinn", + "collections.sort_alphabetical": "A-rèir na h-aibidil", + "collections.sort_by": "Seòrsaich a-rèir:", + "collections.sort_date_added": "Cuin a chaidh a chur ris", + "collections.sort_last_active": "Gnìomhach an turas mu dheireadh", + "collections.sort_most_followers": "An luchd-leantainn as motha", "collections.suggestions.can_not_add": "Cha ghabh a chur ris", "collections.suggestions.can_not_add_desc": "Chuir na cunntasan seo romhpa nach nochd iad ann an àrainneachdan rùrachaidh no tha iad air frithealaiche nach cuir taic ri cruinneachaidhean.", "collections.suggestions.must_follow": "Feumaidh tu leantainn an toiseach", @@ -542,7 +557,6 @@ "confirmations.remove_from_followers.message": "Cha lean {name} thu tuilleadh. A bheil thu cinnteach gu bheil thu airson leantainn air adhart?", "confirmations.remove_from_followers.title": "A bheil thu airson an neach-leantainn a thoirt air falbh?", "confirmations.revoke_collection_inclusion.confirm": "Thoir air falbh mi", - "confirmations.revoke_collection_inclusion.message": "Tha an gnìomh seo buan agus chan urrainn dhan neach-tasgaidh do chur ris a’ chruinneachadh a-rithist an uair sin.", "confirmations.revoke_collection_inclusion.title": "A bheil tu airson do thoirt air falbh on chruinneachadh seo?", "confirmations.revoke_quote.confirm": "Thoir am post air falbh", "confirmations.revoke_quote.message": "Cha ghabh seo a neo-dhèanamh.", @@ -565,6 +579,11 @@ "copy_icon_button.copy_this_text": "Cuir lethbhreac dhen cheangal 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", + "custom_homepage.about": "Mu dhèidhinn", + "custom_homepage.about_this_server": "Mun fhrithealaiche seo", + "custom_homepage.administered_by": "Rianachd le", + "custom_homepage.contact": "Fios thugainn:", + "custom_homepage.latest_activity": "A’ ghnìomhachd mu dheireadh", "directory.federated": "On cho-shaoghal aithnichte", "directory.local": "O {domain} a-mhàin", "directory.new_arrivals": "Feadhainn ùra", @@ -621,7 +640,10 @@ "empty_column.account_unavailable": "Chan eil a’ phròifil ri làimh", "empty_column.blocks": "Cha do bhac thu cleachdaiche sam bith fhathast.", "empty_column.bookmarked_statuses": "Chan eil comharra-lìn ri post agad fhathast. Nuair a nì thu comharra-lìn de dh’fhear, nochdaidh e an-seo.", + "empty_column.collections": "Cha do chruthaich {acct} cruinneachadh sam bith fhathast.", "empty_column.collections.featured_in": "Cha deach do chur ri cruinneachadh sam bith fhathast.", + "empty_column.collections.featured_in_undiscoverable": "Mus dèid do chur ri cruinneachadh sam bith, feumaidh tu cead a thoirt gun dèid do bhrosnachadh ann an àrainneachdan rùrachaidh o Roghainnean > Prìobhaideachd ’s ruigse", + "empty_column.collections_self": "Cha do chruthaich thu cruinneachadh sam bith fhathast.", "empty_column.community": "Tha an loidhne-ama ionadail falamh. Sgrìobh rudeigin gu poblach airson toiseach-tòiseachaidh a dhèanamh!", "empty_column.direct": "Chan eil iomradh prìobhaideach agad fhathast. Nuair a chuireas no a gheibh thu tè, nochdaidh i an-seo.", "empty_column.disabled_feed": "Chaidh an loidhne-ama seo a chur à comas le rianairean an fhrithealaiche agad.", @@ -753,6 +775,7 @@ "home.pending_critical_update.link": "Faic na h-ùrachaidhean", "home.pending_critical_update.title": "Tha ùrachadh tèarainteachd èiginneach ri fhaighinn!", "home.show_announcements": "Seall na brathan-fios", + "ignore_notifications_modal.bots_title": "A bheil thu airson brathan o bhotaichean a leigeil seachad?", "ignore_notifications_modal.disclaimer": "Chan urrainn do Mhastodon innse do cheachdaichean gun do leig thu seachad na brathan uapa. Cha bhac leigeil seachad nam brathan gun dèid na teachdaireachdan fhèin a chur.", "ignore_notifications_modal.filter_instead": "Criathraich ’na àite", "ignore_notifications_modal.filter_to_act_users": "’S urrainn dhut gabhail ri cleachdaichean, an diùltadh no gearan a dhèanamh mun dèidhinn fhathast", @@ -767,6 +790,7 @@ "info_button.label": "Cobhair", "info_button.what_is_alt_text": "

Dè a th’ ann an roghainn teacsa?

Bheir roghainn teacsa tuairisgeulan dhealbhan dhan fheadhainn air a bheil cion lèirsinne, aig a bheil ceangal air leud-banna cumhang no a tha a’ sireadh barrachd co-theacsa.

’S urrainn dhut piseach a thoirt air an t-so-ruigsinneachd is an tuigse dhan a h-uile duine ma sgrìobhas tu roghainn teacsa a tha soilleir, goirid is cuspaireach.

  • Gabh a-steach na nithean cudromach
  • Dèan geàrr-chunntas dhen teacsa sna dealbhan
  • Cleachd structar sheantansan àbhaisteach
  • \\nSeachainn fiosrachadh anabarrach
  • Cùm an aire air treandaichean is puingean cudromach ann an dealbhan iom-fhillte (mar diagram no mapa)
", "interaction_modal.action": "Mus eadar-ghabh thu leis a’ phost le {name}, feumaidh tu clàradh a-steach dhan chunntas agad air ge b’ e dè am frithealaiche Mastodon a chleachdas tu.", + "interaction_modal.action_follow": "Mus lean thu {name}, feumaidh tu clàradh a-steach dhan chunntas agad air ge b’ e dè am frithealaiche Mastodon a chleachdas tu.", "interaction_modal.go": "Siuthad", "interaction_modal.no_account_yet": "Nach eil cunntas agad fhathast?", "interaction_modal.on_another_server": "Air frithealaiche eile", @@ -792,6 +816,12 @@ "keyboard_shortcuts.heading": "Ath-ghoiridean a’ mheur-chlàir", "keyboard_shortcuts.home": "Fosgail loidhne-ama na dachaigh", "keyboard_shortcuts.hotkey": "Grad-iuchair", + "keyboard_shortcuts.keys.alt": "Alt", + "keyboard_shortcuts.keys.backspace": "Backspace", + "keyboard_shortcuts.keys.enter": "Enter", + "keyboard_shortcuts.keys.esc": "Esc", + "keyboard_shortcuts.keys.page_down": "Page Down", + "keyboard_shortcuts.keys.page_up": "Page Up", "keyboard_shortcuts.legend": "Seall an clàr-mìneachaidh seo", "keyboard_shortcuts.load_more": "Cuir am fòcas air a’ phutan “Luchdaich barrachd dheth”", "keyboard_shortcuts.local": "Fosgail an loidhne-ama ionadail", @@ -812,6 +842,7 @@ "keyboard_shortcuts.toggle_sensitivity": "Seall/Falaich na meadhanan", "keyboard_shortcuts.toot": "Tòisich air post ùr", "keyboard_shortcuts.top": "Gluais gu bàrr na liosta", + "keyboard_shortcuts.translate": "Eadar-theangaich post", "keyboard_shortcuts.unfocus": "Thoir am fòcas far raon teacsa an sgrìobhaidh/an luirg", "keyboard_shortcuts.up": "Gluais suas air an liosta", "learn_more_link.got_it": "Tha mi agaibh", @@ -822,6 +853,7 @@ "lightbox.zoom_in": "Sùm dhan fhìor-mheud", "lightbox.zoom_out": "Sùm fèin-obrachail", "limited_account_hint.action": "Seall a’ phròifil co-dhiù", + "limited_account_hint.title": "Chaidh a’ phròifil no am frithealaiche seo fhalach le maoir {domain}.", "link_preview.author": "Le {name}", "link_preview.more_from_author": "Barrachd le {name}", "link_preview.shares": "{count, plural, one {{counter} phost} two {{counter} phost} few {{counter} postaichean} other {{counter} post}}", @@ -883,6 +915,7 @@ "navigation_bar.live_feed_local": "An saoghal beò (ionadail)", "navigation_bar.live_feed_public": "An saoghal beò (poblach)", "navigation_bar.logout": "Clàraich a-mach", + "navigation_bar.main": "Prìomh-sheòladaireachd", "navigation_bar.moderation": "Maorsainneachd", "navigation_bar.more": "Barrachd", "navigation_bar.mutes": "Cleachdaichean mùchte", @@ -968,6 +1001,7 @@ "notifications.column_settings.admin.report": "Gearanan ùra:", "notifications.column_settings.admin.sign_up": "Clàraidhean ùra:", "notifications.column_settings.alert": "Brathan deasga", + "notifications.column_settings.collections": "Cruinneachaidhean:", "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", @@ -987,6 +1021,7 @@ "notifications.column_settings.update": "Deasachaidhean:", "notifications.filter.all": "Na h-uile", "notifications.filter.boosts": "Brosnachaidhean", + "notifications.filter.collections": "Cruinneachaidhean", "notifications.filter.favourites": "Annsachdan", "notifications.filter.follows": "A’ leantainn", "notifications.filter.mentions": "Iomraidhean", @@ -1003,6 +1038,8 @@ "notifications.policy.drop": "Leig seachad", "notifications.policy.drop_hint": "Cuir a-mach à sealladh gu buan", "notifications.policy.filter": "Criathraich", + "notifications.policy.filter_bots_hint": "Cunntasan ris a bheil comharra gu bheil iad fèin-obrachail", + "notifications.policy.filter_bots_title": "Botaichean", "notifications.policy.filter_hint": "Cuir gu bogsa a-steach nam brathan criathraichte", "notifications.policy.filter_limited_accounts_hint": "Cuingichte le maoir an fhrithealaiche", "notifications.policy.filter_limited_accounts_title": "Cunntasan fo mhaorsainneachd", @@ -1095,11 +1132,7 @@ "report.categories.spam": "Spama", "report.categories.violation": "Tha an t-susbaint a’ briseadh riaghailt no dhà an fhrithealaiche", "report.category.subtitle": "Tagh an roghainn as iomchaidhe", - "report.category.title": "Innis dhuinn dè tha a’ dol leis a’ {type}", - "report.category.title_account": "phròifil", - "report.category.title_status": "phost", "report.close": "Deiseil", - "report.collection_comment": "Carson a tha thu airson gearan a dhèanamh mun chruinneachadh seo?", "report.comment.title": "A bheil rud sam bith eile a bu toigh leat innse dhuinn?", "report.forward": "Sìn air adhart gu {target}", "report.forward_hint": "Chaidh an cunntas a chlàradh air frithealaiche eile. A bheil thu airson lethbhreac dhen ghearan a chur dha-san gun ainm cuideachd?", @@ -1160,6 +1193,7 @@ "search_popout.user": "cleachdaiche", "search_results.accounts": "Pròifilean", "search_results.all": "Na h-uile", + "search_results.collections": "Cruinneachaidhean", "search_results.hashtags": "Tagaichean hais", "search_results.no_results": "Gun toradh.", "search_results.no_search_yet": "Feuch an lorg thu postaichean, pròifilean no tagaichean hais.", @@ -1280,6 +1314,7 @@ "tabs_bar.menu": "Clàr-taice", "tabs_bar.notifications": "Brathan", "tabs_bar.publish": "Post ùr", + "tabs_bar.quick_links": "Grad-cheanglaichean", "tabs_bar.search": "Lorg", "tag.remove": "Thoir air falbh", "terms_of_service.effective_as_of": "Èifeachdach on {date}", diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json index 7982e694ca..2eb8803ba7 100644 --- a/app/javascript/mastodon/locales/gl.json +++ b/app/javascript/mastodon/locales/gl.json @@ -561,7 +561,7 @@ "confirmations.remove_from_followers.message": "{name} vai deixar de seguirte. É isto o que queres?", "confirmations.remove_from_followers.title": "Quitar seguidora?", "confirmations.revoke_collection_inclusion.confirm": "Quítame", - "confirmations.revoke_collection_inclusion.message": "A acción é definitiva, a creadora da colección non poderá volver a engadirte máis adiante.", + "confirmations.revoke_collection_inclusion.message": "Non vai poder engadirte a esta colección durante 24 horas. Para evitar de xeito permanente que te volva a engadir podes bloquear a conta que a creou.", "confirmations.revoke_collection_inclusion.title": "Queres que non te inclúan nesta colección?", "confirmations.revoke_quote.confirm": "Eliminar publicación", "confirmations.revoke_quote.message": "Esta acción non se pode desfacer.", @@ -649,6 +649,7 @@ "empty_column.collections": "{acct} aínda non creou ningunha colección.", "empty_column.collections.featured_in": "Non te engadiron a ningunha colección.", "empty_column.collections.featured_in_undiscoverable": "Para que outras persoas poidan engadirte ás súas coleccións ter que conceder permiso para descubrimento da conta en Preferencias > Privacidade e alcance", + "empty_column.collections_self": "Aínda non creaches ningunha colección.", "empty_column.community": "A cronoloxía local está baleira. Escribe algo de xeito público para espallalo!", "empty_column.direct": "Aínda non tes mencións privadas. Cando envíes ou recibas unha, aparecerá aquí.", "empty_column.disabled_feed": "A administración do teu servidor desactivou esta canle.", @@ -1137,11 +1138,7 @@ "report.categories.spam": "Spam", "report.categories.violation": "O contido viola unha ou máis regras do servidor", "report.category.subtitle": "Elixe a mellor coincidencia", - "report.category.title": "Cóntanos o problema con {type}", - "report.category.title_account": "perfil", - "report.category.title_status": "publicación", "report.close": "Feito", - "report.collection_comment": "Por que queres denunciar esta colección?", "report.comment.title": "Hai algo máis que creas debamos saber?", "report.forward": "Reenviar a {target}", "report.forward_hint": "A conta é doutro servidor. Enviar unha copia anónima da denuncia aló tamén?", diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json index e26b6e5f46..4eb135a7ce 100644 --- a/app/javascript/mastodon/locales/he.json +++ b/app/javascript/mastodon/locales/he.json @@ -561,7 +561,7 @@ "confirmations.remove_from_followers.message": "{name} יוסר/תוסר ממעקב אחריך. האם להמשיך?", "confirmations.remove_from_followers.title": "להסיר עוקב/עוקבת?", "confirmations.revoke_collection_inclusion.confirm": "הסירוני", - "confirmations.revoke_collection_inclusion.message": "פעולה זו היא סופית, והאוצרים לא יוכלו להוסיף אותך יותר לאוסף בעתיד.", + "confirmations.revoke_collection_inclusion.message": "אוצרי האוסף לא יוכלו להוסיפך חזרה לאוסף זה למשך 24 שעות. כדי למנוע מהם להוסיפך לאוספים באופן קבוע, ניתן לחסום אותם.", "confirmations.revoke_collection_inclusion.title": "להסירך מאוסף זה?", "confirmations.revoke_quote.confirm": "הסרת הודעה", "confirmations.revoke_quote.message": "פעולה זו אינה הפיכה.", @@ -649,6 +649,7 @@ "empty_column.collections": "{acct} עוד לא יצרו אוספים.", "empty_column.collections.featured_in": "עוד לא הוסיפו אותך לאף אוסף.", "empty_column.collections.featured_in_undiscoverable": "כדי שאחרים יוכלו להוסיפך לאוספים, עליך לאפשר להופיע ב\"תגליות\" תחת העדפות > פרטיות ומידת חשיפה", + "empty_column.collections_self": "עוד לא יצרת אוספים.", "empty_column.community": "פיד השרת המקומי ריק. יש לפרסם משהו כדי שדברים יתרחילו להתגלגל!", "empty_column.direct": "אין לך שום הודעות פרטיות עדיין. כשתשלחו או תקבלו אחת, היא תופיע כאן.", "empty_column.disabled_feed": "פיד זה נחסם לשימוש על ידי מנהלי השרת שלך.", @@ -689,12 +690,12 @@ "filter_modal.added.context_mismatch_explanation": "קטגוריית הסנן הזאת לא חלה על ההקשר שממנו הגעת אל ההודעה הזו. אם תרצה/י שההודעה תסונן גם בהקשר זה, תצטרך/י לערוך את הסנן.", "filter_modal.added.context_mismatch_title": "אין התאמה להקשר!", "filter_modal.added.expired_explanation": "פג תוקפה של קטגוריית הסינון הזו, יש צורך לשנות את תאריך התפוגה כדי שהסינון יוחל.", - "filter_modal.added.expired_title": "פג תוקף המסנן!", + "filter_modal.added.expired_title": "פג תוקף הסנן!", "filter_modal.added.review_and_configure": "לסקירה והתאמה מתקדמת של קטגוריית הסינון הזו, לכו ל{settings_link}.", "filter_modal.added.review_and_configure_title": "אפשרויות סינון", "filter_modal.added.settings_link": "דף הגדרות", "filter_modal.added.short_explanation": "ההודעה הזו הוספה לקטגוריית הסינון הזו: {title}.", - "filter_modal.added.title": "המסנן הוסף!", + "filter_modal.added.title": "הסנן הוסף!", "filter_modal.select_filter.context_mismatch": "לא חל בהקשר זה", "filter_modal.select_filter.expired": "פג התוקף", "filter_modal.select_filter.prompt_new": "קטגוריה חדשה {name}", @@ -1137,11 +1138,7 @@ "report.categories.spam": "ספאם", "report.categories.violation": "התוכן מפר אחד או יותר מחוקי השרת", "report.category.subtitle": "בחר/י את המתאים ביותר", - "report.category.title": "ספר/י לנו מה קורה עם ה-{type} הזה", - "report.category.title_account": "פרופיל", - "report.category.title_status": "הודעה", "report.close": "בוצע", - "report.collection_comment": "מדוע ברצונכם לדווח על האוסף הזה?", "report.comment.title": "האם יש דבר נוסף שלדעתך חשוב שנדע?", "report.forward": "קדם ל-{target}", "report.forward_hint": "חשבון זה הוא משרת אחר. האם לשלוח בנוסף עותק אנונימי לשם?", diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json index c2784a769a..ad92a1034f 100644 --- a/app/javascript/mastodon/locales/hi.json +++ b/app/javascript/mastodon/locales/hi.json @@ -397,7 +397,6 @@ "report.block_explanation": "आपको उनकी पोस्टें नहीं दिखेंगे। वे आपकी पोस्टें को देख नहीं पाएंगे और आपको फ़ॉलो नहीं कर पाएंगे। उन्हे पता लगेगा कि वे blocked हैं।", "report.categories.other": "अन्य", "report.categories.spam": "अवांछित", - "report.category.title_account": "रूपरेखा", "report.close": "स्वीकार करें", "report.comment.title": "क्या और कुछ है जिसके बारे में आपको लगता है कि हमें सूचित होना चाहिए?", "report.next": "आगे", diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json index a8d3c0e781..2aae385951 100644 --- a/app/javascript/mastodon/locales/hr.json +++ b/app/javascript/mastodon/locales/hr.json @@ -372,9 +372,6 @@ "report.categories.other": "Drugo", "report.categories.spam": "Spam", "report.categories.violation": "Sadržaj krši jedno ili više pravila poslužitelja", - "report.category.title": "Recite nam što nije u redu s {type}", - "report.category.title_account": "profilom", - "report.category.title_status": "objavom", "report.close": "Gotovo", "report.comment.title": "Postoji li još nešto što bismo trebali znati?", "report.forward": "Proslijedi {target}", diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json index 5bed9715ec..245dd9774e 100644 --- a/app/javascript/mastodon/locales/hu.json +++ b/app/javascript/mastodon/locales/hu.json @@ -561,7 +561,7 @@ "confirmations.remove_from_followers.message": "{name} követ téged. Biztos, hogy folytatod?", "confirmations.remove_from_followers.title": "Követő eltávolítása?", "confirmations.revoke_collection_inclusion.confirm": "Saját magam eltávolítása", - "confirmations.revoke_collection_inclusion.message": "Ez a művelet végleges, és a kurátor nem fog tudni újra hozzáadni ehhez a gyűjteményhez.", + "confirmations.revoke_collection_inclusion.message": "A kurátor 24 óráig nem fog tudni hozzáadni ehhez a gyűjteményhez. Hogy véglegesen megakadályozd, hogy gyűjteményekhez adjon, letilthatod.", "confirmations.revoke_collection_inclusion.title": "Eltávolítod magadat ebből a gyűjteményből?", "confirmations.revoke_quote.confirm": "Bejegyzés eltávolítása", "confirmations.revoke_quote.message": "Ez a művelet nem vonható vissza.", @@ -649,6 +649,7 @@ "empty_column.collections": "{acct} még nem hozott létre gyűjteményt.", "empty_column.collections.featured_in": "Még nem adtak hozzá egyetlen gyűjteményhez sem.", "empty_column.collections.featured_in_undiscoverable": "Hogy mások hozzáadhassanak gyűjteményekhez, engedélyezned kell a kiemelést a felfedezési élményekben a Beállítások > Adatvédelem és elérés alatt", + "empty_column.collections_self": "Még nem hoztál létre gyűjteményt.", "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.disabled_feed": "A kiszolgálód rendszergazdái letiltották ezt a hírfolyamot.", @@ -780,6 +781,7 @@ "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", + "ignore_notifications_modal.bots_title": "Botok értesítéseinek figyelmen kívül hagyása?", "ignore_notifications_modal.disclaimer": "A Mastodon nem tudja értesíteni azokat a felhasználókat, akiknek figyelmen kívül hagytad az értesítéseit. Az értesítések figyelmen kívül hagyása nem állítja meg az üzenetek elküldését.", "ignore_notifications_modal.filter_instead": "Inkább szűrés", "ignore_notifications_modal.filter_to_act_users": "Továbbra is el tudod fogadni, el tudod utasítani vagy tudod jelenteni a felhasználókat", @@ -1042,6 +1044,8 @@ "notifications.policy.drop": "Figyelmen kívül hagyás", "notifications.policy.drop_hint": "Küldés a semmibe, többé ne jelenjen meg", "notifications.policy.filter": "Szűrő", + "notifications.policy.filter_bots_hint": "Automatizáltnak jelölt fiókok", + "notifications.policy.filter_bots_title": "Botok", "notifications.policy.filter_hint": "Küldés a szűrt értesítések közé", "notifications.policy.filter_limited_accounts_hint": "A szerver moderátorai által korlátozott", "notifications.policy.filter_limited_accounts_title": "Moderált fiókok", @@ -1134,11 +1138,10 @@ "report.categories.spam": "Kéretlen üzenet", "report.categories.violation": "A tartalom a kiszolgáló egy vagy több szabályát sérti", "report.category.subtitle": "Válaszd ki a legjobb találatot", - "report.category.title": "Mondd el, hogy mi van ezzel a {type}", - "report.category.title_account": "profillal", - "report.category.title_status": "bejegyzéssel", + "report.category.title_account": "Mondd el, hogy mi van ezzel a profillal", + "report.category.title_collection": "Mondd el, hogy mi van ezzel a gyűjteménnyel", + "report.category.title_status": "Mondd el, hogy mi van ezzel a bejegyzéssel", "report.close": "Kész", - "report.collection_comment": "Miért jelented ezt a gyűjteményt?", "report.comment.title": "Van valami, amiről tudnunk kellene?", "report.forward": "Továbbítás: {target}", "report.forward_hint": "Ez a fiók egy másik kiszolgálóról van. Oda is elküldésre kerüljön a jelentés egy anonimizált másolata?", diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json index 01fb6bb5f3..6992e1adc6 100644 --- a/app/javascript/mastodon/locales/hy.json +++ b/app/javascript/mastodon/locales/hy.json @@ -339,8 +339,6 @@ "report.block": "Արգելափակել", "report.categories.other": "Այլ", "report.categories.spam": "Սպամ", - "report.category.title_account": "հաշիւ", - "report.category.title_status": "գրառում", "report.close": "Աւարտել", "report.forward": "Փոխանցել {target}֊ին", "report.forward_hint": "Այս հաշիւ այլ հանգոյցից է։ Ուղարկե՞մ այնտեղ էլ այս բողոքի անոնիմ պատճէնը։", diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json index 3604a44c60..1343086aef 100644 --- a/app/javascript/mastodon/locales/ia.json +++ b/app/javascript/mastodon/locales/ia.json @@ -748,9 +748,6 @@ "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": "Facite", "report.comment.title": "Ha il altere cosas que nos deberea saper?", "report.forward": "Reinviar a {target}", diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json index 36885c906f..6acea2936d 100644 --- a/app/javascript/mastodon/locales/id.json +++ b/app/javascript/mastodon/locales/id.json @@ -445,9 +445,6 @@ "report.categories.spam": "Spam", "report.categories.violation": "Konten melanggar satu atau lebih peraturan server", "report.category.subtitle": "Pilih pasangan terbaik", - "report.category.title": "Beritahu kami apa yang terjadi dengan {type} ini", - "report.category.title_account": "profil", - "report.category.title_status": "kiriman", "report.close": "Selesai", "report.comment.title": "Adakah hal lain yang perlu kami ketahui?", "report.forward": "Teruskan ke {target}", diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json index 516604acca..2d6ed5dd66 100644 --- a/app/javascript/mastodon/locales/ie.json +++ b/app/javascript/mastodon/locales/ie.json @@ -504,9 +504,6 @@ "report.categories.spam": "Spam", "report.categories.violation": "Contenete violant un o pluri regules del servitor", "report.category.subtitle": "Selecte li max bon option", - "report.category.title": "Di nos quo passa con ti-ci {type}", - "report.category.title_account": "profil", - "report.category.title_status": "posta", "report.close": "Finit", "report.comment.title": "Hay alquo plu quel tu pensa que noi deve saver?", "report.forward": "Misser anc a {target}", diff --git a/app/javascript/mastodon/locales/ig.json b/app/javascript/mastodon/locales/ig.json index e079a752a8..284f2526c2 100644 --- a/app/javascript/mastodon/locales/ig.json +++ b/app/javascript/mastodon/locales/ig.json @@ -115,7 +115,6 @@ "reply_indicator.cancel": "Kagbuo", "report.categories.other": "Ọzọ", "report.categories.spam": "Nzipụ Ozièlètrọniìk Nkeāchọghị", - "report.category.title_account": "profaịlụ", "report.mute": "Mee ogbi", "report.placeholder": "Type or paste additional comments", "report.submit": "Submit report", diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json index 748530ceb8..8af0811f16 100644 --- a/app/javascript/mastodon/locales/io.json +++ b/app/javascript/mastodon/locales/io.json @@ -783,9 +783,6 @@ "report.categories.spam": "Spamo", "report.categories.violation": "Kontenaj nesequas servilregulo", "report.category.subtitle": "Selektez maxim bona parigato", - "report.category.title": "Savigez ni pri quo eventas kun ca {type}", - "report.category.title_account": "profilo", - "report.category.title_status": "posto", "report.close": "Fina", "report.comment.title": "Ka altra irgo quon vu pensas ke ni debas savar?", "report.forward": "Sendez a {target}", diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json index a5fbd1b845..047c702aa9 100644 --- a/app/javascript/mastodon/locales/is.json +++ b/app/javascript/mastodon/locales/is.json @@ -561,7 +561,6 @@ "confirmations.remove_from_followers.message": "{name} mun hætta að fylgja þér. Ertu viss um að þú viljir halda áfram?", "confirmations.remove_from_followers.title": "Fjarlægja fylgjanda?", "confirmations.revoke_collection_inclusion.confirm": "Fjarlægja mig", - "confirmations.revoke_collection_inclusion.message": "Þessi aðgerð er varanleg og umsjónaraðili safnsins mun ekki geta bætt þér aftur við síðar.", "confirmations.revoke_collection_inclusion.title": "Á að fjarlægja þig úr þessu safni?", "confirmations.revoke_quote.confirm": "Fjarlægja færslu", "confirmations.revoke_quote.message": "Þessa aðgerð er ekki hægt að afturkalla.", @@ -649,6 +648,7 @@ "empty_column.collections": "{acct} hefur enn ekki útbúið nein söfn.", "empty_column.collections.featured_in": "Þér hefur enn ekki verið bætt við nein söfn.", "empty_column.collections.featured_in_undiscoverable": "Til þess að fólk geti bætt þér í söfn þá þarftu að leyfa að þú komir upp í leitum, en það er gert í Kjörstillingar > Gagnaleynd og útbreiðsla", + "empty_column.collections_self": "Þú hefur enn ekki útbúið nein söfn.", "empty_column.community": "Staðværa tímalínan er tóm. Skrifaðu eitthvað opinberlega til að láta boltann fara að rúlla!", "empty_column.direct": "Þú ert ekki ennþá með neitt einkaspjall við neinn. Þegar þú sendir eða tekur við slíku, mun það birtast hér.", "empty_column.disabled_feed": "Þetta streymi hefur verið gert óvirkt af stjórnendum netþjónis þíns.", @@ -1137,11 +1137,7 @@ "report.categories.spam": "Ruslpóstur", "report.categories.violation": "Efnið brýtur gegn einni eða fleiri reglum netþjónsins", "report.category.subtitle": "Veldu hvað samsvarar best", - "report.category.title": "Segðu okkur hvað er í gangi með þetta {type}-atriði", - "report.category.title_account": "notandasnið", - "report.category.title_status": "færsla", "report.close": "Lokið", - "report.collection_comment": "Afhverju viltu tilkynna þetta safn?", "report.comment.title": "Er eitthvað annað sem þú heldur að við ættum að vita?", "report.forward": "Áframsenda til {target}", "report.forward_hint": "Notandaaðgangurinn er af öðrum vefþjóni. Á einnig að senda nafnlaust afrit af kærunni þangað?", diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json index bd42e96cb3..c7c6eee53c 100644 --- a/app/javascript/mastodon/locales/it.json +++ b/app/javascript/mastodon/locales/it.json @@ -561,7 +561,7 @@ "confirmations.remove_from_followers.message": "{name} smetterà di seguirti. Si è sicuri di voler procedere?", "confirmations.remove_from_followers.title": "Rimuovere il follower?", "confirmations.revoke_collection_inclusion.confirm": "Rimuovimi", - "confirmations.revoke_collection_inclusion.message": "Questa azione è permanente e l'utente responsabile della collezione non sarà in grado di aggiungerti nuovamente ad essa in seguito.", + "confirmations.revoke_collection_inclusion.message": "L'account che gestisce la collezione non potrà aggiungerti nuovamente per 24 ore. Per impedirgli definitivamente di aggiungerti alle collezioni, puoi bloccarlo.", "confirmations.revoke_collection_inclusion.title": "Rimuovere te stesso/a da questa collezione?", "confirmations.revoke_quote.confirm": "Elimina il post", "confirmations.revoke_quote.message": "Questa azione non può essere annullata.", @@ -1138,11 +1138,10 @@ "report.categories.spam": "Spam", "report.categories.violation": "Il contenuto viola una o più regole del server", "report.category.subtitle": "Scegli la corrispondenza migliore", - "report.category.title": "Dicci cosa sta succedendo con questo {type}", - "report.category.title_account": "profilo", - "report.category.title_status": "post", + "report.category.title_account": "Dicci cosa sta succedendo con questo profilo", + "report.category.title_collection": "Dicci cosa sta succedendo con questa collezione", + "report.category.title_status": "Dicci cosa sta succedendo con questo post", "report.close": "Fatto", - "report.collection_comment": "Perché vuoi segnalare questa collezione?", "report.comment.title": "C'è altro che pensi che dovremmo sapere?", "report.forward": "Inoltra a {target}", "report.forward_hint": "Il profilo proviene da un altro server. Inviare anche lì una copia anonima del rapporto?", diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index febbe810f8..f622e3935d 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -804,9 +804,6 @@ "report.categories.spam": "スパム", "report.categories.violation": "サーバーのルールに違反", "report.category.subtitle": "近いものを選択してください", - "report.category.title": "この{type}について教えてください", - "report.category.title_account": "プロフィール", - "report.category.title_status": "投稿", "report.close": "完了", "report.comment.title": "その他に私たちに伝えておくべき事はありますか？", "report.forward": "{target}に転送する", diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json index f0233d4011..c60bf90625 100644 --- a/app/javascript/mastodon/locales/kab.json +++ b/app/javascript/mastodon/locales/kab.json @@ -800,9 +800,6 @@ "report.categories.other": "Tiyyaḍ", "report.categories.spam": "Aspam", "report.category.subtitle": "Fren amṣada akk ufrin", - "report.category.title": "Ini-aɣ-d d acu i yuɣen {type}-a", - "report.category.title_account": "ameɣnu", - "report.category.title_status": "tasuffeɣt", "report.close": "Immed", "report.forward": "Bren-it ɣeṛ {target}", "report.mute": "Sgugem", diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json index 559ef06f47..19315a17b3 100644 --- a/app/javascript/mastodon/locales/ko.json +++ b/app/javascript/mastodon/locales/ko.json @@ -218,14 +218,15 @@ "account_edit.name_modal.edit_title": "표시되는 이름 수정", "account_edit.profile_tab.button_label": "사용자 지정", "account_edit.profile_tab.hint.description": "이 설정은 공식 앱을 사용하는 {server} 사용자가 보는 내용을 설정하지만 다른 서버나 서드파티 앱 사용자에게는 다르게 나타날 수 있습니다.", - "account_edit.profile_tab.hint.title": "환경에 따라 다르게 보일 수 있습니다", + "account_edit.profile_tab.hint.title": "서로 다르게 표시됨", "account_edit.profile_tab.show_featured.description": "'추천'은 다른 계정을 소개할 수 있는 선택적인 탭입니다.", - "account_edit.profile_tab.show_featured.title": "'추천' 탭 표시", + "account_edit.profile_tab.show_featured.title": "'추천' 탭 보이기", "account_edit.profile_tab.show_media.description": "'미디어' 탭은 이미지나 비디오가 들어간 게시물을 보여주는 선택적인 탭입니다.", - "account_edit.profile_tab.show_media.title": "'미디어' 탭 표시", + "account_edit.profile_tab.show_media.title": "'미디어' 탭 보이기", "account_edit.profile_tab.show_media_replies.description": "활성화 하면 미디어 탭은 내 게시물과 다른 사람에게 한 답글을 모두 보여줍니다.", "account_edit.profile_tab.show_media_replies.title": "'미디어' 탭에 답글 포함", - "account_edit.profile_tab.show_relations.title": "팔로워와 팔로잉 표시", + "account_edit.profile_tab.show_relations.description": "내가 팔로우 하거나 나를 팔로우 하는 계정을 내 프로필에 보여줍니다. 내가 팔로우하는 당사자는 여전히 그 사실을 볼 수 있습니다.", + "account_edit.profile_tab.show_relations.title": "팔로워와 팔로잉 보여주기", "account_edit.profile_tab.subtitle": "내 프로필이 어떻게 보여질지를 원하는대로 꾸며보세요.", "account_edit.profile_tab.title": "프로필 표시 설정", "account_edit.save": "저장", @@ -250,6 +251,7 @@ "account_edit.verified_modal.title": "인증된 링크 추가하는 방법", "account_edit_tags.add_tag": "#{tagName} 추가", "account_edit_tags.column_title": "태그 편집", + "account_edit_tags.help_text": "추천 해시태그는 사용자들이 내 프로필에서 발견하고 상호작용하는데 도움을 줍니다. 프로필 페이지의 활동 뷰에 필터로 나타납니다.", "account_edit_tags.max_tags_reached": "추천 해시태그 최대 개수를 초과합니다.", "account_edit_tags.search_placeholder": "해시태그를 입력하세요…", "account_edit_tags.suggestions": "제안:", @@ -404,9 +406,9 @@ "collections.hints.accounts_counter": "계정 {count}/{max}개", "collections.last_updated_at": "마지막 업데이트: {date}", "collections.list.collections_with_count": "{count, plural, other {컬렉션 #개}}", - "collections.list.created_by_author": "{name} 님이 생성함", - "collections.list.created_by_you": "내가 생성함", - "collections.list.featuring_you": "나를 추천", + "collections.list.created_by_author": "{name} 님이 만듦", + "collections.list.created_by_you": "내가 만듦", + "collections.list.featuring_you": "나를 추천함", "collections.manage_accounts": "계정 관리하기", "collections.mark_as_sensitive": "민감함으로 설정", "collections.mark_as_sensitive_hint": "열람 주의문구 뒤에 이 컬렉션의 설명과 계정을 숨깁니다. 컬렉션의 이름은 항상 보여집니다.", @@ -431,7 +433,9 @@ "collections.sort_last_active": "최근 활동", "collections.sort_most_followers": "팔로워 많은순", "collections.suggestions.can_not_add": "추가할 수 없음", + "collections.suggestions.can_not_add_desc": "이 계정들은 디스커버리에 참여하지 않았거나 컬렉션을 지원하지 않는 서버에 있습니다.", "collections.suggestions.must_follow": "먼저 팔로우해야합니다", + "collections.suggestions.must_follow_desc": "이 계정들은 팔로우 요청을 리뷰합니다. 팔로워들은 컬렉션에 이들을 넣을 수 있습니다.", "collections.topic_hint": "이 컬렉션의 주제가 무엇인지 다른 사용자들이 이해할 수 있도록 해시태그를 추가하세요.", "collections.topic_special_chars_hint": "특수문자는 저장할 때 삭제됩니다", "collections.unlisted_collections_description": "내 프로필에 나타나지 않습니다. 링크를 가진 누구나 볼 수 있습니다.", @@ -557,7 +561,7 @@ "confirmations.remove_from_followers.message": "{name} 님이 나를 팔로우하지 않게 됩니다. 계속할까요?", "confirmations.remove_from_followers.title": "팔로워를 제거할까요?", "confirmations.revoke_collection_inclusion.confirm": "나를 제거하기", - "confirmations.revoke_collection_inclusion.message": "이 작업은 영구적이며 큐레이터는 나를 앞으로 다시 추가할 수 없습니다.", + "confirmations.revoke_collection_inclusion.message": "큐레이터는 앞으로 24시간동안 나를 다시 컬렉션에 추가할 수 없습니다. 나를 추가하는 것을 영구적으로 막으려면 큐레이터를 차단할 수 있습니다.", "confirmations.revoke_collection_inclusion.title": "나를 이 컬렉션에서 제거할까요?", "confirmations.revoke_quote.confirm": "게시물 삭제", "confirmations.revoke_quote.message": "이 작업은 되돌릴 수 없습니다.", @@ -607,6 +611,7 @@ "dropdown.empty": "옵션 선택", "email_subscriptions.email": "이메일", "email_subscriptions.form.action": "구독", + "email_subscriptions.form.bottom": "마스토돈 계정을 만들지 않고 게시물을 수신하세요. 언제든지 구독을 해지할 수 있습니다. 더 알아보려면 개인정보처리방침을 참고하세요.", "email_subscriptions.submitted.title": "한 단계 더", "email_subscriptions.validation.email.blocked": "차단된 이메일 공급자", "email_subscriptions.validation.email.invalid": "이메일 주소가 올바르지 않습니다", @@ -631,7 +636,7 @@ "empty_column.account_featured_self.no_collections_button": "컬렉션 생성", "empty_column.account_featured_self.no_collections_hide_tab": "대신 탭 숨기기", "empty_column.account_featured_self.showcase_accounts": "좋아하는 계정을 남들에게 소개하세요", - "empty_column.account_featured_self.showcase_accounts_desc": "컬렉션은 다른 사람들이 페디버스에서 더 많은 것을 발견할 수 있도록 선별된 계정 목록입니다.", + "empty_column.account_featured_self.showcase_accounts_desc": "컬렉션은 남들이 페디버스에서 더 많은 것을 발견할 수 있도록 선별한 계정 목록입니다.", "empty_column.account_featured_unknown.other": "이 계정은 아직 아무 것도 추천하지 않았습니다.", "empty_column.account_hides_collections": "이 사용자는 이 정보를 사용할 수 없도록 설정했습니다", "empty_column.account_suspended": "계정 정지됨", @@ -642,6 +647,7 @@ "empty_column.collections": "{acct} 님은 아직 컬렉션을 생성하지 않았습니다.", "empty_column.collections.featured_in": "아직 어떤 컬렉션에도 추가되지 않았습니다.", "empty_column.collections.featured_in_undiscoverable": "사람들이 나를 컬렉션에 추가하려면 그 전에 설정 > 개인정보와 도달에서 나를 발견하기 기능에서 추천하도록 허용해야 합니다", + "empty_column.collections_self": "아직 컬렉션을 만들지 않았습니다.", "empty_column.community": "로컬 타임라인에 아무것도 없습니다. 아무거나 적어 보세요!", "empty_column.direct": "개인 멘션이 없습니다. 보내거나 받으면 여기에 표시됩니다.", "empty_column.disabled_feed": "이 피드는 서버 관리자에 의해 비활성화되었습니다.", @@ -720,8 +726,9 @@ "follow_suggestions.view_all": "모두 보기", "follow_suggestions.who_to_follow": "팔로우할 만한 사람", "followed_tags": "팔로우 중인 해시태그", + "followers.hide_other_followers": "이 사용자는 다른 팔로워 목록을 보여주지 않도록 하였습니다", "followers.title": "{name} 님을 팔로우합니다", - "following.hide_other_following": "이 사용자는 팔로우 중인 다른 사용자 목록을 보여주지 않기로 했습니다", + "following.hide_other_following": "이 사용자는 나머지 팔로우 목록을 보여주지 않도록 하였습니다", "following.title": "{name} 님이 팔로우", "footer.about": "정보", "footer.about_mastodon": "마스토돈 정보", @@ -772,6 +779,7 @@ "home.pending_critical_update.link": "업데이트 보기", "home.pending_critical_update.title": "긴급 보안 업데이트가 있습니다!", "home.show_announcements": "공지사항 보기", + "ignore_notifications_modal.bots_title": "봇 계정의 알림을 무시할까요?", "ignore_notifications_modal.disclaimer": "사용자들은 그들의 알림이 무시되었다는 사실을 알 수 없습니다. 알림을 무시하더라도 해당 사용자가 보내는 메세지는 전송됩니다.", "ignore_notifications_modal.filter_instead": "대신 필터로 거르기", "ignore_notifications_modal.filter_to_act_users": "여전히 사용자를 수락, 거절, 신고할 수 있습니다", @@ -838,6 +846,7 @@ "keyboard_shortcuts.toggle_sensitivity": "미디어 보이기/숨기기", "keyboard_shortcuts.toot": "새 게시물 작성", "keyboard_shortcuts.top": "목록의 최상단으로 이동", + "keyboard_shortcuts.translate": "게시물 번역", "keyboard_shortcuts.unfocus": "작성창에서 포커스 해제", "keyboard_shortcuts.up": "리스트에서 위로 이동", "learn_more_link.got_it": "확인", @@ -855,7 +864,7 @@ "lists.add_member": "추가", "lists.add_to_list": "리스트에 추가", "lists.add_to_lists": "리스트에 {name} 추가", - "lists.create": "생성", + "lists.create": "만들기", "lists.create_a_list_to_organize": "새 리스트를 만들어 홈 피드를 정리하세요", "lists.create_list": "리스트 만들기", "lists.delete": "리스트 삭제", @@ -1033,6 +1042,8 @@ "notifications.policy.drop": "무시", "notifications.policy.drop_hint": "공허로 보내고, 다시는 보지 않습니다", "notifications.policy.filter": "필터", + "notifications.policy.filter_bots_hint": "자동화된 것으로 표시된 계정", + "notifications.policy.filter_bots_title": "봇", "notifications.policy.filter_hint": "걸러진 알림 목록으로 보내기", "notifications.policy.filter_limited_accounts_hint": "서버 중재자에 의해 제한된 계정들", "notifications.policy.filter_limited_accounts_title": "중재된 계정", @@ -1125,11 +1136,7 @@ "report.categories.spam": "스팸", "report.categories.violation": "콘텐츠가 한 개 이상의 서버 규칙을 위반합니다", "report.category.subtitle": "가장 알맞은 것을 선택", - "report.category.title": "이 {type}에 무슨 문제가 있는지 알려주세요", - "report.category.title_account": "프로필", - "report.category.title_status": "게시물", "report.close": "완료", - "report.collection_comment": "이 컬렉션을 신고하려는 이유가 무엇인가요?", "report.comment.title": "우리가 더 알아야 할 내용이 있나요?", "report.forward": "{target}에 전달", "report.forward_hint": "이 계정은 다른 서버에 있습니다. 익명화 된 사본을 해당 서버에도 전송할까요?", @@ -1210,6 +1217,7 @@ "sign_in_banner.sso_redirect": "로그인 또는 가입하기", "skip_links.hotkey": "단축키 {hotkey}", "skip_links.skip_to_content": "주 내용으로 건너뛰기", + "skip_links.skip_to_navigation": "주 내비게이션으로 이동", "status.admin_account": "@{name}에 대한 중재 화면 열기", "status.admin_domain": "{domain}에 대한 중재 화면 열기", "status.admin_status": "중재 화면에서 이 게시물 열기", @@ -1240,7 +1248,7 @@ "status.favourite": "좋아요", "status.favourites_count": "{count, plural, other {{counter}}} 마음에 들어함", "status.filter": "이 게시물을 필터", - "status.history.created": "{name} 님이 {date}에 게시함", + "status.history.created": "{name} 님이 {date}에 만듦", "status.history.edited": "{name} 님이 {date}에 수정함", "status.load_more": "더보기", "status.media.open": "클릭하여 열기", diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json index 020ab0f82b..d8def91c7a 100644 --- a/app/javascript/mastodon/locales/ku.json +++ b/app/javascript/mastodon/locales/ku.json @@ -423,9 +423,6 @@ "report.categories.spam": "Nexwestî (Spam)", "report.categories.violation": "Naverok yek an çend rêbazên rajekar binpê dike", "report.category.subtitle": "Baştirîn lihevhatin hilbijêre", - "report.category.title": "Ji me re bêje ka çi diqewime bi vê {type} re", - "report.category.title_account": "profîl", - "report.category.title_status": "şandî", "report.close": "Qediya", "report.comment.title": "Tiştek din heye ku tu difikirî ku divê em zanibin?", "report.forward": "Biçe bo {target}", diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json index 09098f089d..9a9878c95d 100644 --- a/app/javascript/mastodon/locales/la.json +++ b/app/javascript/mastodon/locales/la.json @@ -202,8 +202,6 @@ "report.block": "Impedimentum", "report.block_explanation": "Non videbis eorum nuntios. Non poterunt vidēre tuōs nuntios aut tē sequī. Intelligere poterunt sē obstrūctōs esse.", "report.categories.other": "Altera", - "report.category.title_account": "notio", - "report.category.title_status": "contributum", "report.close": "Confectum", "report.mute": "Confutare", "report.mute_explanation": "Non videbis eōrum nuntiōs. Possunt adhuc tē sequī et tuōs nuntiōs vidēre, nec sciēbunt sē tacitōs esse.", diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json index d654559c3f..db07afc8bf 100644 --- a/app/javascript/mastodon/locales/lad.json +++ b/app/javascript/mastodon/locales/lad.json @@ -695,9 +695,6 @@ "report.categories.spam": "Spam", "report.categories.violation": "El kontenido viola una o mas reglas del sirvidor", "report.category.subtitle": "Eskoje la mijor koensidensya", - "report.category.title": "Deskrive el problem kon {type}", - "report.category.title_account": "profil", - "report.category.title_status": "publikasyon", "report.close": "Fecho", "report.comment.title": "Ay algo mas ke deveriamos saver?", "report.forward": "Reembia a {target}", diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json index 20b857e247..ccfb19e85d 100644 --- a/app/javascript/mastodon/locales/lt.json +++ b/app/javascript/mastodon/locales/lt.json @@ -786,9 +786,6 @@ "report.categories.spam": "Šlamštas", "report.categories.violation": "Turinys pažeidžia vieną ar daugiau serverio taisyklių", "report.category.subtitle": "Pasirink geriausią atitikmenį.", - "report.category.title": "Papasakok mums, kas vyksta su šiuo {type}", - "report.category.title_account": "profiliu", - "report.category.title_status": "įrašas", "report.close": "Atlikta", "report.comment.title": "Ar yra dar kas nors, ką, tavo manymu, turėtume žinoti?", "report.forward": "Persiųsti į {target}", diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json index ca75a984bf..9ae5d5be12 100644 --- a/app/javascript/mastodon/locales/lv.json +++ b/app/javascript/mastodon/locales/lv.json @@ -71,6 +71,9 @@ "account.in_memoriam": "Piemiņai.", "account.join_modal.day": "Diena", "account.join_modal.me": "Tu pievienojies {server}", + "account.join_modal.me_today": "Šī ir Tava pirmā diena {server}.", + "account.join_modal.other": "{name} pievienojās {server}", + "account.join_modal.other_today": "Šī ir {name} pirmā diena {server}.", "account.joined_short": "Pievienojās", "account.languages": "Mainīt abonētās valodas", "account.link_verified_on": "Šīs saites piederība tika pārbaudīta {date}", @@ -722,9 +725,6 @@ "report.categories.spam": "Mēstule", "report.categories.violation": "Saturs pārkāpj vienu vai vairākus servera noteikumus", "report.category.subtitle": "Izvēlieties labāko atbilstību", - "report.category.title": "Pastāsti mums, kas notiek ar šo {type}", - "report.category.title_account": "profilu", - "report.category.title_status": "ierakstu", "report.close": "Darīts", "report.comment.title": "Vai, tavuprāt, mums vēl būtu kas jāzina?", "report.forward": "Pārsūtīt {target}", diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json index 27cd28d077..81cf105961 100644 --- a/app/javascript/mastodon/locales/ml.json +++ b/app/javascript/mastodon/locales/ml.json @@ -323,7 +323,6 @@ "relative_time.today": "ഇന്ന്", "reply_indicator.cancel": "റദ്ദാക്കുക", "report.block": "തടസ്സപെടുത്തുക", - "report.category.title_account": "രൂപരേഖ", "report.close": "ചെയ്തു", "report.forward_hint": "ഈ അക്കൗണ്ട് മറ്റൊരു സെർവറിൽ നിന്നാണ്. റിപ്പോർട്ടിന്റെ അജ്ഞാത പകർപ്പ് അവിടെ അയയ്ക്കണോ?", "report.next": "അടുത്തതു്", diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json index cd34aae576..9a8f82793a 100644 --- a/app/javascript/mastodon/locales/ms.json +++ b/app/javascript/mastodon/locales/ms.json @@ -507,9 +507,6 @@ "report.categories.spam": "Spam", "report.categories.violation": "Kandungan melanggar satu atau lebih peraturan pelayan", "report.category.subtitle": "Pilih yang terdekat", - "report.category.title": "Beritahu kami apa yang berlaku dengan {type} ini", - "report.category.title_account": "profil", - "report.category.title_status": "siaran", "report.close": "Selesai", "report.comment.title": "Adakah ada hal-hal lain yang perlu kita ketahui?", "report.forward": "Panjangkan ke {target}", diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json index 4a89b6dc4f..75717c3d64 100644 --- a/app/javascript/mastodon/locales/my.json +++ b/app/javascript/mastodon/locales/my.json @@ -418,9 +418,6 @@ "report.categories.spam": "ပြင်ပစာများ", "report.categories.violation": "ဤစာတွင် သတ်မှတ်ထားသောစည်းကမ်းများကို ဖောက်ဖျက်သောအကြောင်းအရာပါဝင်နေသည်", "report.category.subtitle": "အကိုက်ညီဆုံးကိုရွေးချယ်ပါ", - "report.category.title": "ဤ {type} တွင် ဘာဖြစ်နေသည်ကို ပြောပြပါ", - "report.category.title_account": "ကိုယ်ရေးမှတ်တမ်း", - "report.category.title_status": "ပို့စ်", "report.close": "ပြီးပြီ", "report.comment.title": "မိမိထင်မြင်ယူဆချက်များကိုဖော်ပြပေးပါ", "report.forward": "{target} သို့တစ်ဆင့်ပို့ပေးမည်", diff --git a/app/javascript/mastodon/locales/nan-TW.json b/app/javascript/mastodon/locales/nan-TW.json index a894af522b..42c084dec0 100644 --- a/app/javascript/mastodon/locales/nan-TW.json +++ b/app/javascript/mastodon/locales/nan-TW.json @@ -561,7 +561,7 @@ "confirmations.remove_from_followers.message": "{name} ē停止跟tuè lí。Lí kám確定beh繼續？", "confirmations.remove_from_followers.title": "Kám beh suá掉跟tuè lí ê?", "confirmations.revoke_collection_inclusion.confirm": "Kā我suá掉", - "confirmations.revoke_collection_inclusion.message": "Tsit ê行動永永有效，了後建立收藏ê bē當kā lí重加kàu收藏內底。", + "confirmations.revoke_collection_inclusion.message": "建立收藏列單ê bē當佇24點鐘內底kā lí重加kàu tsit ê收藏內底。Beh永永避免in kā lí加kàu收藏，lí通封鎖in。", "confirmations.revoke_collection_inclusion.title": "敢beh kā家kī對收藏內底suá掉？", "confirmations.revoke_quote.confirm": "Thâi掉PO文", "confirmations.revoke_quote.message": "Tsit ê動作bē當復原。", @@ -649,6 +649,7 @@ "empty_column.collections": "{acct} iáu bē建立任何收藏。", "empty_column.collections.featured_in": "Lí iáu buē加添kàu任何收藏。", "empty_column.collections.featured_in_undiscoverable": "若beh予lâng kā lí加入去收藏，lí需要kàu偏愛ê設定 > 隱私kap資訊ê及至佇探索經驗允准推薦", + "empty_column.collections_self": "Lí iáu bē建立任何收藏。", "empty_column.community": "本站時間線是空ê。緊來公開PO文oh！", "empty_column.direct": "Lí iáu無任何ê私人訊息。Nā是lí送á是收著私人訊息，ē佇tsia顯示。.", "empty_column.disabled_feed": "Tsit ê feed已經hōo lí ê服侍器ê管理員停用。", @@ -780,6 +781,7 @@ "home.pending_critical_update.link": "看更新內容", "home.pending_critical_update.title": "有重要ê安全更新！", "home.show_announcements": "顯示公告", + "ignore_notifications_modal.bots_title": "Kám beh忽略機器lâng送ê通知？", "ignore_notifications_modal.disclaimer": "Lí所忽略in ê通知ê用者，Mastodonbē當kā lí通知。忽略通知bē當阻擋訊息ê寄送。", "ignore_notifications_modal.filter_instead": "改做過濾", "ignore_notifications_modal.filter_to_act_users": "Lí猶原ē當接受、拒絕猶是檢舉用者", @@ -846,6 +848,7 @@ "keyboard_shortcuts.toggle_sensitivity": "顯示／tshàng媒體", "keyboard_shortcuts.toot": "PO新PO文", "keyboard_shortcuts.top": "Súa kàu列單ê頭", + "keyboard_shortcuts.translate": "Kā PO文翻譯", "keyboard_shortcuts.unfocus": "離開輸入框仔／tshiau-tshuē格仔", "keyboard_shortcuts.up": "佇列單內kā suá khah面頂", "learn_more_link.got_it": "知矣", @@ -1041,6 +1044,8 @@ "notifications.policy.drop": "忽略", "notifications.policy.drop_hint": "送去虛空，bē koh看見", "notifications.policy.filter": "過濾器", + "notifications.policy.filter_bots_hint": "標做自動化ê口座", + "notifications.policy.filter_bots_title": "機器lâng", "notifications.policy.filter_hint": "送kàu受過濾ê通知ê收件kheh-á", "notifications.policy.filter_limited_accounts_hint": "Hōo服侍器ê管理員限制", "notifications.policy.filter_limited_accounts_title": "受管制ê口座", @@ -1133,11 +1138,7 @@ "report.categories.spam": "Pùn-sò訊息", "report.categories.violation": "內容違反tsi̍t ê以上服侍器ê規則", "report.category.subtitle": "揀上合ê選項", - "report.category.title": "Kā guán講tsit ê {type} 有siánn-mih代誌", - "report.category.title_account": "個人資料", - "report.category.title_status": "PO文", "report.close": "完成", - "report.collection_comment": "Lí是án-tsuánn beh檢舉tsit ê收藏？", "report.comment.title": "Lí敢有別ê想beh hōo guán知ê？", "report.forward": "轉送kàu {target}", "report.forward_hint": "Tsit ê口座是別ê服侍器ê。Kám iā beh送bô落名ê檢舉ê khóo-pih？", diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json index 211991ce03..ccc538186f 100644 --- a/app/javascript/mastodon/locales/nl.json +++ b/app/javascript/mastodon/locales/nl.json @@ -408,7 +408,7 @@ "collections.list.collections_with_count": "{count, plural, one {# Verzameling} other {# Verzamelingen}}", "collections.list.created_by_author": "Aangemaakt door {name}", "collections.list.created_by_you": "Aangemaakt door jou", - "collections.list.featuring_you": "Uitgelicht door jou", + "collections.list.featuring_you": "Met jou", "collections.manage_accounts": "Accounts beheren", "collections.mark_as_sensitive": "Als gevoelig markeren", "collections.mark_as_sensitive_hint": "Verbergt de omschrijving en de accounts van de verzameling achter een waarschuwing. De naam van de verzameling blijft zichtbaar.", @@ -561,7 +561,7 @@ "confirmations.remove_from_followers.message": "{name} zal je niet meer volgen. Weet je zeker dat je wilt doorgaan?", "confirmations.remove_from_followers.title": "Volger verwijderen?", "confirmations.revoke_collection_inclusion.confirm": "Verwijder mij", - "confirmations.revoke_collection_inclusion.message": "Deze actie is definitief en de curator kan je later niet opnieuw aan de verzameling toevoegen.", + "confirmations.revoke_collection_inclusion.message": "De komende 24 uur is het voor de maker van de verzameling niet mogelijk om je opnieuw aan de verzameling toe te voegen. Om dit definitief te voorkomen dien je de maker te blokkeren.", "confirmations.revoke_collection_inclusion.title": "Jezelf uit deze collectie verwijderen?", "confirmations.revoke_quote.confirm": "Bericht verwijderen", "confirmations.revoke_quote.message": "Deze actie kan niet ongedaan worden gemaakt.", @@ -649,6 +649,7 @@ "empty_column.collections": "{acct} heeft nog geen verzamelingen aangemaakt.", "empty_column.collections.featured_in": "Je bent aan nog geen enkele verzameling toegevoegd.", "empty_column.collections.featured_in_undiscoverable": "Om ervoor te zorgen dat mensen je aan verzamelingen kunnen toevoegen, moet je jouw account en berichten laten uitlichten door Mastodon onder Instellingen > Privacy en bereik", + "empty_column.collections_self": "Je hebt nog geen enkele verzameling aangemaakt.", "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, komen deze hier te staan.", "empty_column.disabled_feed": "Deze tijdlijn is uitgeschakeld door je serverbeheerders.", @@ -1137,11 +1138,7 @@ "report.categories.spam": "Spam", "report.categories.violation": "De inhoud overtreedt een of meerdere serverregels", "report.category.subtitle": "Kies wat het beste overeenkomt", - "report.category.title": "Vertel ons wat er met dit {type} aan de hand is", - "report.category.title_account": "account", - "report.category.title_status": "bericht", "report.close": "Klaar", - "report.collection_comment": "Waarom wil je deze verzameling rapporteren?", "report.comment.title": "Zijn er nog andere dingen waarvan je denkt dat wij dat moeten weten?", "report.forward": "Naar {target} doorsturen", "report.forward_hint": "Het account bevindt zich op een andere server. Wil je daar eveneens een geanonimiseerde kopie van deze rapportage naar toe sturen?", diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json index fb3cff77c3..5f508bd4a3 100644 --- a/app/javascript/mastodon/locales/nn.json +++ b/app/javascript/mastodon/locales/nn.json @@ -561,7 +561,6 @@ "confirmations.remove_from_followers.message": "{name} vil ikkje fylgja deg meir. Vil du halda fram?", "confirmations.remove_from_followers.title": "Fjern fylgjar?", "confirmations.revoke_collection_inclusion.confirm": "Fjern meg", - "confirmations.revoke_collection_inclusion.message": "Denne handlinga er endeleg, og kuratoren kan ikkje leggja deg til samlinga på nytt seinare.", "confirmations.revoke_collection_inclusion.title": "Vil du fjerna deg sjølv frå denne samlinga?", "confirmations.revoke_quote.confirm": "Fjern innlegget", "confirmations.revoke_quote.message": "Du kan ikkje angra denne handlinga.", @@ -1133,11 +1132,7 @@ "report.categories.spam": "Søppelpost", "report.categories.violation": "Innhaldet bryt med ein eller fleire reglar for tenaren", "report.category.subtitle": "Vel det som passar best", - "report.category.title": "Fortel oss kva som skjer med denne {type}", - "report.category.title_account": "profil", - "report.category.title_status": "innlegg", "report.close": "Ferdig", - "report.collection_comment": "Kvifor vil du rapportera denne samlinga?", "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?", diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json index 9a8f9528c1..a947af5720 100644 --- a/app/javascript/mastodon/locales/no.json +++ b/app/javascript/mastodon/locales/no.json @@ -759,9 +759,6 @@ "report.categories.spam": "Søppelpost", "report.categories.violation": "Innholdet bryter en eller flere serverregler", "report.category.subtitle": "Velg det som passer best", - "report.category.title": "Fortell oss hva som skjer med denne {type}", - "report.category.title_account": "profil", - "report.category.title_status": "innlegg", "report.close": "Utført", "report.comment.title": "Er det noe annet du mener vi burde vite?", "report.forward": "Videresend til {target}", diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json index deb5d44962..4e0a6793f1 100644 --- a/app/javascript/mastodon/locales/oc.json +++ b/app/javascript/mastodon/locales/oc.json @@ -475,8 +475,6 @@ "report.categories.other": "Autre", "report.categories.spam": "Messatge indesirable", "report.category.subtitle": "Causissètz çò que correspond mai", - "report.category.title_account": "perfil", - "report.category.title_status": "publicacion", "report.close": "Acabat", "report.forward": "Far sègre a {target}", "report.forward_hint": "Lo compte ven d’un autre servidor. Volètz mandar una còpia anonima del rapòrt enlai tanben ?", diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json index 614e5b570c..d7f3003303 100644 --- a/app/javascript/mastodon/locales/pa.json +++ b/app/javascript/mastodon/locales/pa.json @@ -1,6 +1,7 @@ { "about.contact": "ਸੰਪਰਕ:", "about.default_locale": "ਮੂਲ", + "about.disclaimer": "Mastodon ਇੱਕ ਆਜ਼ਾਦ, ਖੁੱਲ੍ਹੇ ਸਰੋਤ ਵਾਲਾ ਸਾਫਟਵੇਅਰ ਹੈ ਅਤੇ Mastodon GmbH ਦਾ ਮਾਰਕਾ ਹੈ।", "about.domain_blocks.no_reason_available": "ਕਾਰਨ ਮੌਜੂਦ ਨਹੀਂ ਹੈ", "about.domain_blocks.silenced.title": "ਸੀਮਿਤ", "about.domain_blocks.suspended.title": "ਸਸਪੈਂਡ ਕੀਤਾ", @@ -35,7 +36,12 @@ "account.familiar_followers_two": "{name1} ਅਤੇ {name2} ਵਲੋਂ ਫ਼ਾਲੋ ਕੀਤਾ", "account.featured": "ਫ਼ੀਚਰ", "account.featured.accounts": "ਪਰੋਫਾਈਲ", + "account.featured.collections": "ਭੰਡਾਰ", + "account.featured.new_collection": "ਨਵਾਂ ਭੰਡਾਰ", + "account.field_overflow": "ਪੂਰਾ ਪ੍ਰਸੰਗ ਵੇਖਾਓ", "account.filters.all": "ਸਾਰੀਆਂ ਸਰਗਰਮੀਆਂ", + "account.filters.boosts_toggle": "ਬੂਸਟ ਵੇਖਾਓ", + "account.filters.posts_boosts": "ਪੋਸਟਾਂ ਅਤੇ ਬੂਸਟ", "account.filters.posts_only": "ਪੋਸਟਾਂ", "account.filters.posts_replies": "ਪੋਸਟਾਂ ਅਤੇ ਜਵਾਬ", "account.filters.replies_toggle": "ਜਵਾਬਾਂ ਨੂੰ ਵੇਖੋ", @@ -57,8 +63,11 @@ "account.hide_reblogs": "{name} ਵਲੋਂ ਬੂਸਟ ਨੂੰ ਲੁਕਾਓ", "account.join_modal.day": "ਦਿਨ", "account.joined_short": "ਜੁਆਇਨ ਕੀਤਾ", + "account.last_active": "ਪਿਛਲੀ ਸਰਗਰਮੀ", "account.media": "ਮੀਡੀਆ", "account.mention": "@{name} ਦਾ ਜ਼ਿਕਰ", + "account.menu.add_to_collection": "ਭੰਡਾਰ ਵਿੱਚ ਜੋੜੋ…", + "account.menu.add_to_list": "ਸੂਚੀ ਵਿੱਚ ਜੋੜੋ…", "account.menu.block": "ਖਾਤੇ ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਓ", "account.menu.block_domain": "{domain} ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਓ", "account.menu.copied": "ਖਾਤਾ ਲਿੰਕ ਨੂੰ ਕਲਿੱਪਬੋਰਡ ਨੂੰ ਕਾਪੀ ਕੀਤਾ", @@ -77,6 +86,7 @@ "account.mute_short": "ਮੌਨ ਕਰੋ", "account.muted": "ਮੌਨ ਕੀਤੀਆਂ", "account.mutual": "ਤੁਸੀਂ ਇੱਕ ਦੂਜੇ ਨੂੰ ਫ਼ਾਲੋ ਕਰਦੇ ਹੋ", + "account.name.copy": "ਹੈਂਡਲ ਨੂੰ ਕਾਪੀ ਕਰੋ", "account.no_bio": "ਕੋਈ ਵਰਣਨ ਨਹੀਂ ਦਿੱਤਾ।", "account.node_modal.edit_title": "ਨਿੱਜੀ ਨੋਟ ਨੂੰ ਸੋਧੋ", "account.node_modal.field_label": "ਨਿੱਜੀ ਨੋਟ", @@ -103,13 +113,44 @@ "account.unmute": "@{name} ਲਈ ਮੌਨ ਹਟਾਓ", "account.unmute_notifications_short": "ਨੋਟਫਿਕੇਸ਼ਨਾਂ ਨੂੰ ਅਣ-ਮੌਨ ਕਰੋ", "account.unmute_short": "ਮੌਨ-ਰਹਿਤ ਕਰੋ", + "account_edit.advanced_settings.title": "ਤਕਨੀਕੀ ਸੈਟਿੰਗਾਂ", + "account_edit.bio.add_label": "ਜਾਣਕਾਰੀ ਨੂੰ ਜੋੜੋ", + "account_edit.bio.edit_label": "ਜਾਣਕਾਰੀ ਨੂੰ ਸੋਧੋ", "account_edit.bio.title": "ਜਾਣਕਾਰੀ", "account_edit.bio_modal.add_title": "ਜਾਣਕਾਰੀ ਨੂੰ ਜੋੜੋ", "account_edit.bio_modal.edit_title": "ਜਾਣਕਾਰੀ ਨੂੰ ਸੋਧੋ", "account_edit.column_button": "ਮੁਕੰਮਲ", "account_edit.column_title": "ਪਰੋਫਾਈਲ ਨੂੰ ਸੋਧੋ", + "account_edit.custom_fields.add_label": "ਖੇਤਰ ਨੂੰ ਜੋੜੋ", + "account_edit.custom_fields.edit_label": "ਖੇਤਰ ਨੂੰ ਸੋਧੋ", + "account_edit.display_name.add_label": "ਡਿਸਪਲੇਅ ਨਾਂ ਨੂੰ ਜੋੜੋ", + "account_edit.display_name.title": "ਦਿਖਾਇਆ ਜਾਣ ਵਾਲਾ ਨਾਂ", + "account_edit.field_actions.delete": "ਖੇਤਰ ਨੂੰ ਹਟਾਓ", + "account_edit.field_actions.edit": "ਖੇਤਰ ਨੂੰ ਸੋਧੋ", "account_edit.field_delete_modal.delete_button": "ਹਟਾਓ", "account_edit.field_edit_modal.discard_confirm": "ਖਾਰਜ ਕਰੋ", + "account_edit.field_edit_modal.value_label": "ਮੁੱਲ", + "account_edit.image_delete_modal.delete_button": "ਹਟਾਓ", + "account_edit.image_delete_modal.title": "ਚਿੱਤਰ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?", + "account_edit.image_edit.add_button": "ਚਿੱਤਰ ਨੂੰ ਜੋੜੋ", + "account_edit.image_edit.remove_button": "ਚਿੱਤਰ ਨੂੰ ਹਟਾਓ", + "account_edit.image_edit.replace_button": "ਚਿੱਤਰ ਨੂੰ ਬਦਲੋ", + "account_edit.item_list.delete": "{name} ਨੂੰ ਹਟਾਓ", + "account_edit.item_list.edit": "{name} ਨੂੰ ਸੋਧੋ", + "account_edit.name_modal.add_title": "ਡਿਸਪਲੇਅ ਨਾਂ ਨੂੰ ਜੋੜੋ", + "account_edit.name_modal.edit_title": "ਡਿਸਪਲੇਅ ਨਾਂ ਨੂੰ ਸੋਧੋ", + "account_edit.profile_tab.button_label": "ਕਸਟਮਾਈਜ਼", + "account_edit.profile_tab.title": "ਪਰੋਫ਼ਾਇਲ ਡਿਸਪਲੇਅ ਸੈਟਿੰਗਾਂ", + "account_edit.save": "ਸੰਭਾਲੋ", + "account_edit.upload_modal.back": "ਪਿੱਛੇ", + "account_edit.upload_modal.done": "ਮੁਕੰਮਲ", + "account_edit.upload_modal.next": "ਅੱਗੇ", + "account_edit.upload_modal.step_crop.zoom": "ਜ਼ੂਮ", + "account_edit.upload_modal.step_upload.button": "ਫ਼ਾਇਲਾਂ ਦੀ ਝਲਕ", + "account_edit.upload_modal.step_upload.dragging": "ਅੱਪਲੋਡ ਲਈ ਡਰੌਪ ਕਰੋ", + "account_edit.upload_modal.step_upload.header": "ਚਿੱਤਰ ਨੂੰ ਚੁਣੋ", + "account_edit.upload_modal.title_add.avatar": "ਪਰੋਫ਼ਾਇਲ ਫ਼ੋਟੋ ਜੋੜੋ", + "account_edit.upload_modal.title_add.header": "ਕਵਰ ਫ਼ੋਟੋ ਜੋੜੋ", "admin.dashboard.retention.average": "ਔਸਤ", "admin.dashboard.retention.cohort_size": "ਨਵੇਂ ਵਰਤੋਂਕਾਰ", "alert.unexpected.title": "ਓਹੋ!", @@ -128,6 +169,7 @@ "annual_report.summary.highlighted_post.title": "ਸਭ ਤੋਂ ਵੱਧ ਹਰਮਨਪਿਆਰੀ ਪੋਸਟ", "annual_report.summary.most_used_app.most_used_app": "ਸਭ ਤੋਂ ਵੱਧ ਵਰਤੀ ਐਪ", "annual_report.summary.new_posts.new_posts": "ਨਵੀਆਂ ਪੋਸਟਾਂ", + "annual_report.summary.share_on_mastodon": "Mastodon ਉੱਤੇ ਸਾਂਝਾ ਕਰੋ", "audio.hide": "ਆਡੀਓ ਨੂੰ ਲੁਕਾਓ", "block_modal.show_less": "ਘੱਟ ਦਿਖਾਓ", "block_modal.show_more": "ਵੱਧ ਦਿਖਾਓ", @@ -146,13 +188,27 @@ "carousel.slide": "{max, number} ਵਿੱਚੋਂ {current, number} ਸਲਾਈਡ", "closed_registrations_modal.find_another_server": "ਹੋਰ ਸਰਵਰ ਲੱਭੋ", "closed_registrations_modal.title": "Mastodon ਲਈ ਸਾਈਨ ਅੱਪ ਕਰੋ", + "collection.share_modal.share_link_label": "ਲਿੰਕ ਸਾਂਝਾ ਕਰੋ", + "collection.share_modal.share_via_post": "Mastodon ਉੱਤੇ ਪੋਸਟ ਕਰੋ", + "collections.block_collection_owner": "…ਰਾਹੀਂ ਸਾਂਝਾ ਕਰੋ", + "collections.by_account": "{account_handle} ਵਲੋਂ", "collections.collection_description": "ਵਰਣਨ", + "collections.collection_language": "ਭਾਸ਼ਾ", + "collections.collection_language_none": "ਕੋਈ ਨਹੀਂ", "collections.collection_name": "ਨਾਂ", "collections.collection_topic": "ਵਿਸ਼ਾ", "collections.content_warning": "ਸਮੱਗਰੀ ਬਾਰੇ ਚੇਤਾਵਨੀ", "collections.continue": "ਜਾਰੀ ਰੱਖੋ", + "collections.copy_link": "ਲਿੰਕ ਨੂੰ ਕਾਪੀ ਕਰੋ", + "collections.copy_link_confirmation": "ਭੰਡਾਰ ਲਿੰਕ ਨੂੰ ਕਲਿੱਪਬੋਰਡ ਨੂੰ ਕਾਪੀ ਕੀਤਾ", "collections.create.basic_details_title": "ਮੁ਼ੱਢਲੇ ਵੇਰਵੇ", "collections.create.steps": "ਪੜਾਅ {step}/{total}", + "collections.detail.revoke_inclusion": "ਮੈਨੂੰ ਹਟਾਓ", + "collections.detail.sensitive_content": "ਸੰਵੇਦਨਸ਼ੀਲ ਸਮੱਗਰੀ", + "collections.edit_details": "ਵੇਰਵਿਆਂ ਨੂੰ ਸੋਧੋ", + "collections.remove_account": "ਹਟਾਓ", + "collections.sensitive": "ਸੰਵੇਦਨਸ਼ੀਲ", + "collections.share_short": "ਸਾਂਝਾ ਕਰੋ", "collections.view_collection": "ਭੰਡਾਰ ਨੂੰ ਵੇਖੋ", "collections.visibility_public": "ਜਨਤਕ", "collections.visibility_title": "ਦਿੱਖ", @@ -245,6 +301,7 @@ "confirmations.redraft.title": "ਪੋਸਟ ਨੂੰ ਹਟਾ ਕੇ ਮੁੜ-ਡਰਾਫਟ ਕਰਨਾ ਹੈ?", "confirmations.remove_from_followers.confirm": "ਫ਼ਾਲੋਅਰ ਨੂੰ ਹਟਾਓ", "confirmations.remove_from_followers.title": "ਫ਼ਾਲੋਅਰ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?", + "confirmations.revoke_collection_inclusion.confirm": "ਮੈਨੂੰ ਹਟਾਓ", "confirmations.revoke_quote.confirm": "ਪੋਸਟ ਨੂੰ ਹਟਾਓ", "confirmations.revoke_quote.message": "ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਵਾਪਸ ਨਹੀਂ ਪਰਤਾਇਆ ਜਾ ਸਕਦਾ ਹੈ।", "confirmations.revoke_quote.title": "ਪੋਸਟ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?", @@ -256,13 +313,17 @@ "content_warning.hide": "ਪੋਸਟ ਨੂੰ ਲੁਕਾਓ", "content_warning.show": "ਕਿਵੇਂ ਵੀ ਵੇਖਾਓ", "content_warning.show_more": "ਹੋਰ ਵੇਖਾਓ", + "content_warning.show_short": "ਵੇਖਾਓ", "conversation.delete": "ਗੱਲਬਾਤ ਨੂੰ ਹਟਾਓ", "conversation.mark_as_read": "ਪੜ੍ਹੇ ਵਜੋਂ ਨਿਸ਼ਾਨੀ ਲਾਓ", "conversation.open": "ਗੱਲਬਾਤ ਨੂੰ ਵੇਖੋ", "conversation.with": "{names} ਨਾਲ", "copy_icon_button.copied": "ਕਲਿੱਪਬੋਰਡ 'ਤੇ ਕਾਪੀ ਕਰੋ", + "copy_icon_button.copy_this_text": "ਲਿੰਕ ਨੂੰ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਕਾਪੀ ਕਰੋ", "copypaste.copied": "ਕਾਪੀ ਕੀਤਾ", "copypaste.copy_to_clipboard": "ਕਲਿੱਪਬੋਰਡ 'ਤੇ ਕਾਪੀ ਕਰੋ", + "custom_homepage.about": "ਇਸ ਬਾਰੇ", + "custom_homepage.about_this_server": "ਇਸ ਸਰਵਰ ਬਾਰੇ", "directory.local": "ਸਿਰਫ਼ {domain} ਤੋਂ", "directory.new_arrivals": "ਨਵੇਂ ਆਉਣ ਵਾਲੇ", "directory.recently_active": "ਸੱਜਰੇ ਸਰਗਰਮ", @@ -273,6 +334,7 @@ "domain_block_modal.block_account_instead": "ਇਸ ਦੀ ਬਜਾਏ @{name} ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਓ", "domain_block_modal.title": "ਡੋਮੇਨ ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਉਣੀ ਹੈ?", "dropdown.empty": "ਕੋਈ ਚੋਣ ਕਰੋ", + "email_subscriptions.email": "ਈਮੇਲ", "embed.instructions": "ਹੇਠਲੇ ਕੋਡ ਨੂੰ ਕਾਪੀ ਕਰਕੇ ਆਪਣੀ ਵੈੱਬਸਾਈਟ ਉੱਤੇ ਇਸ ਪੋਸਟ ਨੂੰ ਇੰਬੈੱਡ ਕਰੋ।", "emoji_button.activity": "ਗਤੀਵਿਧੀ", "emoji_button.clear": "ਮਿਟਾਓ", @@ -305,6 +367,8 @@ "featured_carousel.header": "{count, plural, one {ਟੰਗੀ ਹੋਈ ਪੋਸਟ} other {ਟੰਗੀਆਂ ਹੋਈਆਂ ਪੋਸਟਾਂ}}", "featured_carousel.slide": "{max, number} ਵਿੱਚੋਂ {current, number} ਪੋਸਟ", "featured_tags.more_items": "+{count}", + "featured_tags.suggestions.add": "ਜੋੜੋ", + "featured_tags.suggestions.dismiss": "ਨਹੀਂ, ਧੰਨਵਾਦ", "filter_modal.added.expired_title": "ਫਿਲਟਰ ਦੀ ਮਿਆਦ ਪੁੱਗੀ!", "filter_modal.added.review_and_configure_title": "ਫਿਲਟਰ ਸੈਟਿੰਗਾਂ", "filter_modal.added.settings_link": "ਸੈਟਿੰਗਾਂ ਸਫ਼ਾ", @@ -327,6 +391,8 @@ "follow_suggestions.view_all": "ਸਭ ਵੇਖੋ", "follow_suggestions.who_to_follow": "ਕਿਸ ਨੂੰ ਫ਼ਾਲੋ ਕਰੀਏ", "followed_tags": "ਫ਼ਾਲੋ ਕੀਤੇ ਹੈਸ਼ਟੈਗ", + "followers.title": "{name} ਨੂੰ ਫ਼ਾਲੋ ਕਰਦੇ", + "following.title": "{name} ਵਲੋਂ ਫ਼ਾਲੋ ਕੀਤਾ", "footer.about": "ਸਾਡੇ ਬਾਰੇ", "footer.about_mastodon": "Mastodon ਬਾਰੇ", "footer.about_server": "{domain} ਬਾਰੇ", @@ -451,6 +517,7 @@ "navigation_bar.automated_deletion": "ਆਪਣੇ-ਆਪ ਹਟਾਈ ਪੋਸਟ", "navigation_bar.blocks": "ਪਾਬੰਦੀ ਲਾਏ ਵਰਤੋਂਕਾਰ", "navigation_bar.bookmarks": "ਬੁੱਕਮਾਰਕ", + "navigation_bar.collections": "ਭੰਡਾਰ", "navigation_bar.direct": "ਨਿੱਜੀ ਜ਼ਿਕਰ", "navigation_bar.domain_blocks": "ਪਾਬੰਦੀ ਲਾਏ ਡੋਮੇਨ", "navigation_bar.favourites": "ਮਨਪਸੰਦ", @@ -462,6 +529,7 @@ "navigation_bar.live_feed_local": "ਲਾਈਵ ਫੀਡ (ਲੋਕਲ)", "navigation_bar.live_feed_public": "ਲਾਈਵ ਫੀਡ (ਪਬਲਿਕ)", "navigation_bar.logout": "ਲਾਗ ਆਉਟ", + "navigation_bar.main": "ਮੁੱਖ", "navigation_bar.more": "ਹੋਰ", "navigation_bar.mutes": "ਮੌਨ ਕੀਤੇ ਵਰਤੋਂਕਾਰ", "navigation_bar.preferences": "ਪਸੰਦਾਂ", @@ -580,8 +648,6 @@ "report.categories.legal": "ਕਨੂੰਨੀ", "report.categories.other": "ਬਾਕੀ", "report.categories.spam": "ਸਪੈਮ", - "report.category.title_account": "ਪਰੋਫਾਈਲ", - "report.category.title_status": "ਪੋਸਟ", "report.close": "ਮੁਕੰਮਲ", "report.forward": "{target} ਨੂੰ ਅੱਗੇ ਭੇਜੋ", "report.mute": "ਮੌਨ ਕਰੋ", diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json index 7bd4c308ff..27bd41c3d8 100644 --- a/app/javascript/mastodon/locales/pl.json +++ b/app/javascript/mastodon/locales/pl.json @@ -1000,11 +1000,7 @@ "report.categories.spam": "Spam", "report.categories.violation": "Zawartość narusza co najmniej jedną zasadę serwera", "report.category.subtitle": "Wybierz najbardziej pasującą opcję", - "report.category.title": "Powiedz, co się dzieje z tym {type}", - "report.category.title_account": "profilem", - "report.category.title_status": "wpisem", "report.close": "Gotowe", - "report.collection_comment": "Dlaczego chcesz zgłosić tę kolekcję?", "report.comment.title": "Czy jest coś jeszcze, co powinniśmy wiedzieć?", "report.forward": "Prześlij do {target}", "report.forward_hint": "Konto pochodzi z innego serwera. Czy chcesz również tam wysłać kopię zgłoszenia anonimowo?", diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json index 5a9167d467..6410647594 100644 --- a/app/javascript/mastodon/locales/pt-BR.json +++ b/app/javascript/mastodon/locales/pt-BR.json @@ -561,7 +561,7 @@ "confirmations.remove_from_followers.message": "{name} vai parar de te seguir. Tem certeza de que deseja continuar?", "confirmations.remove_from_followers.title": "Remover seguidor?", "confirmations.revoke_collection_inclusion.confirm": "Remover-me", - "confirmations.revoke_collection_inclusion.message": "Esta ação é permanente e o curador não poderá lhe adicionar de volta à coleção mais tarde.", + "confirmations.revoke_collection_inclusion.message": "Este curador não poderá re-adicioná-lo a esta coleção por 24 horas. Para impedir permanentemente que adicionem você às coleções, você pode bloqueá-los.", "confirmations.revoke_collection_inclusion.title": "Remover-se desta coleção?", "confirmations.revoke_quote.confirm": "Remover publicação", "confirmations.revoke_quote.message": "Esta ação não pode ser desfeita.", @@ -1138,11 +1138,7 @@ "report.categories.spam": "Spam", "report.categories.violation": "O conteúdo viola uma ou mais regras do servidor", "report.category.subtitle": "Escolha a alternativa de melhor correspondência", - "report.category.title": "Conte-nos o que está acontecendo com esse {type}", - "report.category.title_account": "perfil", - "report.category.title_status": "publicação", "report.close": "Concluir", - "report.collection_comment": "Por que você quer denunciar esta coleção?", "report.comment.title": "Há algo mais que você acredita que devemos saber?", "report.forward": "Encaminhar para {target}", "report.forward_hint": "A conta está em outra instância. Enviar uma cópia anônima da denúncia para lá?", diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json index 63da90f799..bc415b1e2e 100644 --- a/app/javascript/mastodon/locales/pt-PT.json +++ b/app/javascript/mastodon/locales/pt-PT.json @@ -519,7 +519,6 @@ "confirmations.remove_from_followers.message": "{name} vai parar de seguir-te. Tens a certeza que prentedes continuar?", "confirmations.remove_from_followers.title": "Remover seguidor?", "confirmations.revoke_collection_inclusion.confirm": "Remover-me", - "confirmations.revoke_collection_inclusion.message": "Esta ação é permanente, e o curador não poderá adicioná-lo novamente à coleção mais tarde.", "confirmations.revoke_collection_inclusion.title": "Remover-se desta coleção?", "confirmations.revoke_quote.confirm": "Remover publicação", "confirmations.revoke_quote.message": "Esta ação é irreversível.", @@ -1071,11 +1070,7 @@ "report.categories.spam": "Spam", "report.categories.violation": "O conteúdo viola uma ou mais regras do servidor", "report.category.subtitle": "Escolhe o mais adequado", - "report.category.title": "Diz-nos o que se passa com este(a) {type}", - "report.category.title_account": "perfil", - "report.category.title_status": "publicação", "report.close": "Concluído", - "report.collection_comment": "Porque quer denunciar esta coleção?", "report.comment.title": "Há mais alguma coisa que devamos saber?", "report.forward": "Reencaminhar para {target}", "report.forward_hint": "A conta pertence a outro servidor. Enviar uma cópia anónima da denúncia para esse servidor também?", diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json index f1424f7d88..8b355f0228 100644 --- a/app/javascript/mastodon/locales/ro.json +++ b/app/javascript/mastodon/locales/ro.json @@ -424,9 +424,6 @@ "report.categories.spam": "Mesaje nedorite", "report.categories.violation": "Conținutul încalcă una sau mai multe dintre regulile serverului", "report.category.subtitle": "Alege varianta care se potrivește cel mai bine", - "report.category.title": "Spune-ne care este problema cu acest {type}", - "report.category.title_account": "profil", - "report.category.title_status": "mesaj", "report.close": "Gata", "report.comment.title": "Mai este ceva important pe care ai vrea să ni-l spui?", "report.forward": "Redirecționează către {target}", diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json index 972df5bd6b..7b4a1dbc3f 100644 --- a/app/javascript/mastodon/locales/ru.json +++ b/app/javascript/mastodon/locales/ru.json @@ -499,7 +499,6 @@ "confirmations.remove_from_followers.message": "Пользователь {name} перестанет быть подписан на вас. Продолжить?", "confirmations.remove_from_followers.title": "Убрать подписчика?", "confirmations.revoke_collection_inclusion.confirm": "Исключить меня", - "confirmations.revoke_collection_inclusion.message": "Это действие необратимо, и куратор подборки не сможет добавить вас в неё заново.", "confirmations.revoke_collection_inclusion.title": "Исключить вас из подборки?", "confirmations.revoke_quote.confirm": "Убрать пост", "confirmations.revoke_quote.message": "Это действие невозможно отменить.", @@ -1038,11 +1037,7 @@ "report.categories.spam": "Спам", "report.categories.violation": "Содержимое нарушает одно или несколько правил сервера", "report.category.subtitle": "Выберите наиболее подходящий вариант", - "report.category.title": "Расскажите нам, что не так с {type}", - "report.category.title_account": "этим профилем", - "report.category.title_status": "этим постом", "report.close": "Готово", - "report.collection_comment": "Почему вы хотите пожаловаться на эту подборку?", "report.comment.title": "Есть ли ещё подробности, о которых нам стоит знать?", "report.forward": "Переслать в {target}", "report.forward_hint": "Эта учётная запись расположена на другом сервере. Отправить туда обезличенную копию вашей жалобы?", diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json index 7d2b25c2c6..dd0fe213dd 100644 --- a/app/javascript/mastodon/locales/sa.json +++ b/app/javascript/mastodon/locales/sa.json @@ -368,9 +368,6 @@ "report.categories.spam": "फल्गुसन्देशाः", "report.categories.violation": "पूरकः एकं वा एकाधिकान्सर्वरो नियमानुल्लङ्घयति", "report.category.subtitle": "उत्तमं मेलनं चिनु", - "report.category.title": "अनेन {type} इत्यनेन किम्भवतीति ब्रूहि नः", - "report.category.title_account": "प्रोफैल्", - "report.category.title_status": "पत्रम्", "report.close": "कृतम्", "report.comment.title": "अन्य किमपि नो ज्ञापयितुमिच्छसि वा?", "report.forward": "{target} प्रत्यग्रे प्रेषय", diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json index eed637b237..fc479c8506 100644 --- a/app/javascript/mastodon/locales/sc.json +++ b/app/javascript/mastodon/locales/sc.json @@ -582,9 +582,6 @@ "report.categories.other": "Àteru", "report.categories.spam": "Àliga", "report.category.subtitle": "Sèbera sa currispondèntzia prus arta", - "report.category.title": "Nara·nos ite sutzedet cun custu {type}", - "report.category.title_account": "profilu", - "report.category.title_status": "publicatzione", "report.close": "Fatu", "report.comment.title": "Nch'at àteru chi depamus ischire?", "report.forward": "Torra a imbiare a {target}", diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json index 7c0c888456..2711bca9dc 100644 --- a/app/javascript/mastodon/locales/sco.json +++ b/app/javascript/mastodon/locales/sco.json @@ -358,9 +358,6 @@ "report.categories.spam": "Guff", "report.categories.violation": "Content breks ae or mair server rules", "report.category.subtitle": "Pick the best match", - "report.category.title": "Tell us whit's gaun on wi this {type}", - "report.category.title_account": "profile", - "report.category.title_status": "post", "report.close": "Duin", "report.comment.title": "There ocht else thit ye hink we shuid ken?", "report.forward": "Forret tae {target}", diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json index 99ba5457b1..5638fea35b 100644 --- a/app/javascript/mastodon/locales/si.json +++ b/app/javascript/mastodon/locales/si.json @@ -667,9 +667,6 @@ "report.categories.spam": "ආයාචිත", "report.categories.violation": "අන්තර්ගතය නිසා සේවාදායකයේ නීතියක් හෝ කිහිපයක් කඩ වේ", "report.category.subtitle": "හොඳම ගැලපීම තෝරන්න", - "report.category.title": "මෙම {type}සමඟ සිදුවන්නේ කුමක්දැයි අපට කියන්න", - "report.category.title_account": "පැතිකඩ", - "report.category.title_status": "ලිපිය", "report.close": "අහවරයි", "report.comment.title": "අප දැනගත යුතු යැයි ඔබ සිතන තවත් යමක් තිබේද?", "report.forward": "{target} වෙත හරවන්න", diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json index be8ff1dbf3..4e01a2c777 100644 --- a/app/javascript/mastodon/locales/sk.json +++ b/app/javascript/mastodon/locales/sk.json @@ -682,9 +682,6 @@ "report.categories.spam": "Spam", "report.categories.violation": "Obsah porušuje jedno alebo viacero pravidiel servera", "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": "Preposlať na {target}", diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json index 0f368c592a..1d94ddfb01 100644 --- a/app/javascript/mastodon/locales/sl.json +++ b/app/javascript/mastodon/locales/sl.json @@ -737,9 +737,6 @@ "report.categories.spam": "Neželeno", "report.categories.violation": "Vsebina krši eno ali več pravil strežnika", "report.category.subtitle": "Izberite najustreznejši zadetek", - "report.category.title": "Povejte nam, kaj se dogaja s to/tem {type}", - "report.category.title_account": "profil", - "report.category.title_status": "objava", "report.close": "Opravljeno", "report.comment.title": "Je še kaj, za kar menite, da bi morali vedeti?", "report.forward": "Posreduj k {target}", diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json index 68dda1dce3..acb3acb70e 100644 --- a/app/javascript/mastodon/locales/sq.json +++ b/app/javascript/mastodon/locales/sq.json @@ -556,7 +556,7 @@ "confirmations.remove_from_followers.message": "{name} do të reshtë së ndjekuri ju. Jeni i sigurt se doni të vazhdohet?", "confirmations.remove_from_followers.title": "Të hiqet ndjekësi?", "confirmations.revoke_collection_inclusion.confirm": "Hiqmëni", - "confirmations.revoke_collection_inclusion.message": "Ky veprim është i përhershëm dhe mirëmbajtësi s’do të jetë në gjendje t’ju rishtojë te koleksioni më vonë.", + "confirmations.revoke_collection_inclusion.message": "Mirëmbajtësit s’do të jenë në gjendje t’ju rishtojnë te ky koleksion për 24 orë. Për ta penguar shtimin përgjithnjë tuaj prej tyre në koleksione, mund t’i bllokoni.", "confirmations.revoke_collection_inclusion.title": "Të hiqeni nga ky koleksion?", "confirmations.revoke_quote.confirm": "Hiqe postimin", "confirmations.revoke_quote.message": "Ky veprim s’mund të zhbëhet.", @@ -1133,11 +1133,7 @@ "report.categories.spam": "I padëshiruar", "report.categories.violation": "Lënda shkel një ose disa rregulla shërbyesi", "report.category.subtitle": "Zgjidhni përputhjen më të mirë", - "report.category.title": "Tregonani se ç’po ndodh me këtë {type}", - "report.category.title_account": "profil", - "report.category.title_status": "postim", "report.close": "U bë", - "report.collection_comment": "Pse doni ta raportoni këtë koleksion?", "report.comment.title": "Ka ndonjë gjë tjetër që do të duhej ta dinim?", "report.forward": "Përcillja {target}", "report.forward_hint": "Llogaria është nga një shërbyes tjetër. Të dërgohet edhe një kopje e anonimizuar e raportimit?", diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json index defab5c34d..98d3d7cfc4 100644 --- a/app/javascript/mastodon/locales/sr-Latn.json +++ b/app/javascript/mastodon/locales/sr-Latn.json @@ -532,9 +532,6 @@ "report.categories.spam": "Spam", "report.categories.violation": "Sadržaj krši jedno ili više pravila servera", "report.category.subtitle": "Odaberite najpribližnije", - "report.category.title": "Recite nam šta je problem sa {type}", - "report.category.title_account": "ovim profilom", - "report.category.title_status": "objavom", "report.close": "Gotovo", "report.comment.title": "Da li ima još nešto što biste hteli da nam date do znanja?", "report.forward": "Proslediti {target}", diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json index 87b50a6ecc..6336d0fdce 100644 --- a/app/javascript/mastodon/locales/sr.json +++ b/app/javascript/mastodon/locales/sr.json @@ -509,9 +509,6 @@ "report.categories.spam": "Спам", "report.categories.violation": "Садржај крши једно или више правила сервера", "report.category.subtitle": "Одаберите најприближније", - "report.category.title": "Реците нам шта је проблем са {type}", - "report.category.title_account": "овим профилом", - "report.category.title_status": "објавом", "report.close": "Готово", "report.comment.title": "Да ли има још нешто што бисте хтели да нам дате до знања?", "report.forward": "Проследити {target}", diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json index 6c2f6dea83..86349ef4d4 100644 --- a/app/javascript/mastodon/locales/sv.json +++ b/app/javascript/mastodon/locales/sv.json @@ -561,7 +561,7 @@ "confirmations.remove_from_followers.message": "{name} kommer att sluta följa dig. Är du säker på att du vill fortsätta?", "confirmations.remove_from_followers.title": "Ta bort följare?", "confirmations.revoke_collection_inclusion.confirm": "Ta bort mig", - "confirmations.revoke_collection_inclusion.message": "Denna åtgärd är permanent, och kuratorn kommer inte att kunna lägga till dig till samlingen senare.", + "confirmations.revoke_collection_inclusion.message": "Kuratorn kommer inte att kunna lägga till dig igen i denna samling i 24 timmar. För att hindra dem från att lägga till dig till samlingar permanent, kan du blockera dem.", "confirmations.revoke_collection_inclusion.title": "Ta bort dig själv från denna samling?", "confirmations.revoke_quote.confirm": "Ta bort inlägg", "confirmations.revoke_quote.message": "Denna åtgärd kan inte ångras.", @@ -1138,11 +1138,7 @@ "report.categories.spam": "Skräppost", "report.categories.violation": "Innehåll bryter mot en eller flera serverregler", "report.category.subtitle": "Välj den bästa träffen", - "report.category.title": "Berätta för oss vad som händer med den här {type}", - "report.category.title_account": "profil", - "report.category.title_status": "inlägg", "report.close": "Färdig", - "report.collection_comment": "Varför vill du rapportera denna samling?", "report.comment.title": "Finns det något annat vi borde veta?", "report.forward": "Vidarebefordra till {target}", "report.forward_hint": "Kontot är från en annan server. Skicka även en anonymiserad kopia av anmälan dit?", diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json index 600d158685..eda9616031 100644 --- a/app/javascript/mastodon/locales/th.json +++ b/app/javascript/mastodon/locales/th.json @@ -732,9 +732,6 @@ "report.categories.spam": "สแปม", "report.categories.violation": "เนื้อหาละเมิดกฎของเซิร์ฟเวอร์จำนวนหนึ่งหรือมากกว่า", "report.category.subtitle": "เลือกที่ตรงกันที่สุด", - "report.category.title": "บอกเราถึงสิ่งที่กำลังเกิดขึ้นกับ{type}นี้", - "report.category.title_account": "โปรไฟล์", - "report.category.title_status": "โพสต์", "report.close": "เสร็จสิ้น", "report.comment.title": "มีสิ่งอื่นใดที่คุณคิดว่าเราควรทราบหรือไม่?", "report.forward": "ส่งต่อไปยัง {target}", diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json index fa31738f38..493a8f9860 100644 --- a/app/javascript/mastodon/locales/tok.json +++ b/app/javascript/mastodon/locales/tok.json @@ -491,9 +491,6 @@ "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": "ale li pona", "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.", diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json index 91e8ad30cb..5536da899b 100644 --- a/app/javascript/mastodon/locales/tr.json +++ b/app/javascript/mastodon/locales/tr.json @@ -561,7 +561,7 @@ "confirmations.remove_from_followers.message": "{name} sizi takip etmeyi bırakacaktır. Devam etmek istediğinize emin misiniz?", "confirmations.remove_from_followers.title": "Takipçiyi kaldır?", "confirmations.revoke_collection_inclusion.confirm": "Beni çıkar", - "confirmations.revoke_collection_inclusion.message": "Bu eylem kalıcıdır ve koleksiyonu derleyen kişi daha sonra sizi koleksiyona tekrar ekleyemeyecektir.", + "confirmations.revoke_collection_inclusion.message": "Küratör, 24 saat boyunca sizi bu koleksiyona tekrar ekleyemeyecek. Sizi koleksiyonlara kalıcı olarak eklemesini engellemek için onu engelleyebilirsiniz.", "confirmations.revoke_collection_inclusion.title": "Kendini bu koleksiyondan çıkar?", "confirmations.revoke_quote.confirm": "Gönderiyi kaldır", "confirmations.revoke_quote.message": "Bu işlem geri alınamaz.", @@ -1138,11 +1138,10 @@ "report.categories.spam": "İstenmeyen", "report.categories.violation": "İçerik bir veya daha fazla sunucu kuralını ihlal ediyor", "report.category.subtitle": "En uygun eşleşmeyi seçin", - "report.category.title": "Bu {type} ile ilgili neler oluyor bize söyleyin", - "report.category.title_account": "profil", - "report.category.title_status": "gönderi", + "report.category.title_account": "Bu profilde neler olduğunu bizimle paylaşın", + "report.category.title_collection": "Bu koleksiyonda neler olduğunu bizimle paylaşın", + "report.category.title_status": "Bu gönderide neler olduğunu bizimle paylaşın", "report.close": "Tamam", - "report.collection_comment": "Bu koleksiyonu neden bildirmek istiyorsunuz?", "report.comment.title": "Bilmemizi istediğiniz başka bir şey var mı?", "report.forward": "{target} ilet", "report.forward_hint": "Hesap başka bir sunucudan. Raporun anonim bir kopyası da oraya gönderilsin mi?", diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json index a1afa508ec..6dd88e6a20 100644 --- a/app/javascript/mastodon/locales/tt.json +++ b/app/javascript/mastodon/locales/tt.json @@ -332,8 +332,6 @@ "report.block": "Блоклау", "report.categories.other": "Башка", "report.categories.spam": "Спам", - "report.category.title_account": "профиль", - "report.category.title_status": "язма", "report.close": "Булды", "report.forward": "{target}-га тапшыру", "report.mute": "Тавышны ябу", diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json index 0cb94e1fc8..36a36f77fa 100644 --- a/app/javascript/mastodon/locales/uk.json +++ b/app/javascript/mastodon/locales/uk.json @@ -782,9 +782,6 @@ "report.categories.spam": "Спам", "report.categories.violation": "Контент порушує одне або кілька правил сервера", "report.category.subtitle": "Оберіть найкращий збіг", - "report.category.title": "Розкажіть нам, що не так з цим {type}", - "report.category.title_account": "профіль", - "report.category.title_status": "допис", "report.close": "Готово", "report.comment.title": "Чи є щось, що нам потрібно знати?", "report.forward": "Надіслати до {target}", diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json index a89219ff1f..a81701ff43 100644 --- a/app/javascript/mastodon/locales/vi.json +++ b/app/javascript/mastodon/locales/vi.json @@ -561,7 +561,7 @@ "confirmations.remove_from_followers.message": "{name} sẽ không còn theo dõi bạn.Bạn có chắc tiếp tục?", "confirmations.remove_from_followers.title": "Xóa người theo dõi?", "confirmations.revoke_collection_inclusion.confirm": "Xóa tôi", - "confirmations.revoke_collection_inclusion.message": "Thao tác này là vĩnh viễn, người tuyển chọn sẽ không thể thêm lại bạn về sau này.", + "confirmations.revoke_collection_inclusion.message": "Người tuyển chọn sẽ không thể thêm bạn vào gói khởi đầu này trong vòng 24 giờ. Để ngăn họ thêm bạn vào gói khởi đầu vĩnh viễn, bạn có thể chặn họ.", "confirmations.revoke_collection_inclusion.title": "Xóa bạn khỏi gói khởi đầu này?", "confirmations.revoke_quote.confirm": "Gỡ tút", "confirmations.revoke_quote.message": "Hành động này không thể hoàn tác.", @@ -1138,11 +1138,7 @@ "report.categories.spam": "Spam", "report.categories.violation": "Vi phạm nội quy máy chủ", "report.category.subtitle": "Chọn lý do phù hợp nhất:", - "report.category.title": "{type} này có vấn đề gì?", - "report.category.title_account": "Người", - "report.category.title_status": "Tút", "report.close": "Xong", - "report.collection_comment": "Vì sao bạn muốn báo cáo gói khởi đầu này?", "report.comment.title": "Có điều gì mà chúng tôi cần biết không?", "report.forward": "Chuyển đến {target}", "report.forward_hint": "Người này thuộc máy chủ khác. Gửi một báo cáo ẩn danh tới máy chủ đó?", diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json index 8abc9cc622..14e39918e2 100644 --- a/app/javascript/mastodon/locales/zh-CN.json +++ b/app/javascript/mastodon/locales/zh-CN.json @@ -45,7 +45,7 @@ "account.featured.collections": "收藏列表", "account.featured.new_collection": "新建收藏列表", "account.field_overflow": "显示完整内容", - "account.filters.all": "全部活动", + "account.filters.all": "所有活动", "account.filters.boosts_toggle": "显示转嘟", "account.filters.posts_boosts": "嘟文与转嘟", "account.filters.posts_only": "嘟文", @@ -57,7 +57,7 @@ "account.follow_request": "请求关注", "account.follow_request_cancel": "取消请求", "account.follow_request_cancel_short": "取消", - "account.follow_request_short": "请求", + "account.follow_request_short": "关注请求", "account.followers": "关注者", "account.followers.empty": "目前无人关注此用户。", "account.followers_counter": "{count, plural, other {{counter} 关注者}}", @@ -68,10 +68,10 @@ "account.follows_you": "关注了你", "account.go_to_profile": "前往个人资料页", "account.hide_reblogs": "隐藏来自 @{name} 的转嘟", - "account.in_memoriam": "谨此悼念。", + "account.in_memoriam": "谨此纪念。", "account.join_modal.day": "天", "account.join_modal.me": "你加入 {server} 的时间为", - "account.join_modal.me_anniversary": "加入 Mastodon 一周年快乐！你加入 {server} 的时间为", + "account.join_modal.me_anniversary": "联邦宇宙周年快乐！你加入 {server} 的时间为", "account.join_modal.me_today": "这是你加入 {server} 的第一天！", "account.join_modal.other": "{name} 加入 {server} 的时间为", "account.join_modal.other_today": "这是 {name} 加入 {server} 的第一天！", @@ -96,7 +96,7 @@ "account.menu.hide_reblogs": "在时间线中隐藏转嘟", "account.menu.mention": "提及", "account.menu.mute": "停止提醒账号", - "account.menu.note.description": "仅对你可见", + "account.menu.note.description": "仅自己可见", "account.menu.open_original_page": "在 {domain} 上查看", "account.menu.remove_follower": "移除关注者", "account.menu.report": "举报账号", @@ -120,14 +120,14 @@ "account.name.help.username_self": "{username} 是你在此服务器上的用户名。另一个服务器上的其他人可能拥有相同的用户名。", "account.name_info": "这是什么？", "account.no_bio": "未提供描述。", - "account.node_modal.callout": "个人备注仅对你个人可见。", + "account.node_modal.callout": "个人备注仅自己可见。", "account.node_modal.edit_title": "编辑个人备注", "account.node_modal.error_unknown": "无法保存备注", "account.node_modal.field_label": "个人备注", "account.node_modal.save": "保存", "account.node_modal.title": "添加个人备注", "account.note.edit_button": "编辑", - "account.note.title": "个人备注（仅对你可见）", + "account.note.title": "个人备注（仅自己可见）", "account.open_original_page": "打开原始页面", "account.pending": "待定", "account.posts": "嘟文", @@ -154,7 +154,7 @@ "account_edit.bio.add_label": "添加个人简介", "account_edit.bio.edit_label": "编辑个人简介", "account_edit.bio.placeholder": "添加一段简短介绍，帮助其他人认识你。", - "account_edit.bio.title": "简介", + "account_edit.bio.title": "个人简介", "account_edit.bio_modal.add_title": "添加个人简介", "account_edit.bio_modal.edit_title": "编辑个人简介", "account_edit.column_button": "完成", @@ -245,7 +245,7 @@ "account_edit.verified_modal.details": "要增加 Mastodon 个人资料的可信度，可以验证指向个人网站的链接。运作方式如下：", "account_edit.verified_modal.invisible_link.details": "将链接添加到标头（header）中。其中很重要的部分是 rel=\"me\"，可以防止他人通过用户生成内容模仿。你甚至可以在页面标头中使用 link 标签而不是 {tag}，但包含该部分的 HTML 必须在没有 JavaScript 执行环境下访问时依然存在。", "account_edit.verified_modal.invisible_link.summary": "如何隐藏此链接？", - "account_edit.verified_modal.step1.header": "复制下面的 HTML 代码并粘贴到你网站的标头（header）中", + "account_edit.verified_modal.step1.header": "复制下面的 HTML 代码并粘贴到你网站的标头中", "account_edit.verified_modal.step2.details": "如果已经将你的网站添加到自定义字段中，你需要删除并重新添加以触发验证。", "account_edit.verified_modal.step2.header": "将你的网站添加到自定义字段", "account_edit.verified_modal.title": "如何添加已验证的链接", @@ -256,7 +256,7 @@ "account_edit_tags.search_placeholder": "输入话题标签…", "account_edit_tags.suggestions": "建议：", "account_edit_tags.tag_status_count": "{count, plural, other {# 条嘟文}}", - "account_list.hidden_notice": "此内容仅对你可见。要让此列表对其他人可见，请前往{page} > {modal} > {field}。", + "account_list.hidden_notice": "此内容仅自己可见。如需向他人展示此列表，请前往{page} > {modal} > {field}。", "account_list.total": "{total, plural, other {# 个账号}}", "admin.dashboard.daily_retention": "注册后用户留存率（按日计算）", "admin.dashboard.monthly_retention": "注册后用户留存率（按月计算）", @@ -561,7 +561,7 @@ "confirmations.remove_from_followers.message": "{name} 将停止关注你。你确定要继续吗？", "confirmations.remove_from_followers.title": "移除关注者？", "confirmations.revoke_collection_inclusion.confirm": "移除我", - "confirmations.revoke_collection_inclusion.message": "此操作是永久的，且此收藏列表的制作者之后将无法再将你添加到其中。", + "confirmations.revoke_collection_inclusion.message": "收藏列表的创建者在24小时内将无法再将你重新添加到此收藏列表中。要永久阻止此列表的创建者将你加入其收藏列表，你可以屏蔽此用户。", "confirmations.revoke_collection_inclusion.title": "将自己从此收藏列表中移除吗？", "confirmations.revoke_quote.confirm": "移除嘟文", "confirmations.revoke_quote.message": "此操作无法撤销。", @@ -1138,11 +1138,7 @@ "report.categories.spam": "垃圾信息", "report.categories.violation": "内容违反一条或多条服务器规则", "report.category.subtitle": "选择最佳匹配", - "report.category.title": "告诉我们此 {type} 存在的问题", - "report.category.title_account": "账号", - "report.category.title_status": "嘟文", "report.close": "完成", - "report.collection_comment": "举报此收藏列表的原因是什么？", "report.comment.title": "还有什么你认为我们应该知道的吗？", "report.forward": "转发举报至 {target}", "report.forward_hint": "这名用户来自另一个服务器。是否要向那个服务器发送一条匿名的举报？", diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json index 0232b867bf..4e81228a25 100644 --- a/app/javascript/mastodon/locales/zh-HK.json +++ b/app/javascript/mastodon/locales/zh-HK.json @@ -649,9 +649,6 @@ "report.categories.spam": "垃圾訊息", "report.categories.violation": "內容違犯一項或多項伺服器規則", "report.category.subtitle": "選擇最佳選項", - "report.category.title": "告訴我們這個 {type} 發生了甚麼事", - "report.category.title_account": "個人檔案", - "report.category.title_status": "帖文", "report.close": "完成", "report.comment.title": "還有甚麼你想讓我們知道的嗎？", "report.forward": "轉寄到 {target}", diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json index 89ea322d2b..c658742028 100644 --- a/app/javascript/mastodon/locales/zh-TW.json +++ b/app/javascript/mastodon/locales/zh-TW.json @@ -394,7 +394,7 @@ "collections.description_length_hint": "100 字限制", "collections.detail.author_added_you_on_date": "{author} 於 {date} 將您加入", "collections.detail.loading": "讀取收藏名單中...", - "collections.detail.revoke_inclusion": "移除我", + "collections.detail.revoke_inclusion": "將我移除", "collections.detail.sensitive_content": "敏感內容", "collections.detail.sensitive_note": "內容說明與帳號也許不適合所有瀏覽者。", "collections.detail.share": "分享此收藏名單", @@ -560,8 +560,8 @@ "confirmations.remove_from_followers.confirm": "移除跟隨者", "confirmations.remove_from_followers.message": "{name} 將停止跟隨您。您確定要繼續嗎？", "confirmations.remove_from_followers.title": "是否移除該跟隨者？", - "confirmations.revoke_collection_inclusion.confirm": "移除我", - "confirmations.revoke_collection_inclusion.message": "此操作永久有效，且該收藏名單之擁有者無法稍候將您再次加入至此收藏名單。", + "confirmations.revoke_collection_inclusion.confirm": "將我移除", + "confirmations.revoke_collection_inclusion.message": "內容編輯者於 24 小時內無法將您重新加入至此收藏名單。如欲永久防止他們將您加入收藏名單，您可以封鎖他們。", "confirmations.revoke_collection_inclusion.title": "是否將您自此收藏名單中移除？", "confirmations.revoke_quote.confirm": "移除嘟文", "confirmations.revoke_quote.message": "此動作無法復原。", @@ -1138,11 +1138,7 @@ "report.categories.spam": "垃圾訊息", "report.categories.violation": "內容違反一項或多項伺服器條款", "report.category.subtitle": "選擇最佳條件符合", - "report.category.title": "告訴我們這個 {type} 發生了什麼事", - "report.category.title_account": "個人檔案", - "report.category.title_status": "嘟文", "report.close": "已完成", - "report.collection_comment": "您檢舉此收藏名單的原因是？", "report.comment.title": "有什麼其他您想讓我們知道的嗎？", "report.forward": "轉寄到 {target}", "report.forward_hint": "這個帳號屬於其他伺服器。要向該伺服器發送匿名的檢舉訊息嗎？", diff --git a/app/models/account.rb b/app/models/account.rb index 2af9cfc398..7440b8b5ce 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -76,7 +76,7 @@ class Account < ApplicationRecord URL_PREFIX_RE = %r{\Ahttp(s?)://[^/]+} USERNAME_ONLY_RE = /\A#{USERNAME_RE}\z/i USERNAME_LENGTH_LIMIT = 30 - DISPLAY_NAME_LENGTH_LIMIT = (ENV['MAX_DISPLAY_NAME_CHARS'] || 30).to_i + DISPLAY_NAME_LENGTH_LIMIT = (ENV['MAX_DISPLAY_NAME_CHARS'] || 40).to_i NOTE_LENGTH_LIMIT = (ENV['MAX_BIO_CHARS'] || 500).to_i # Hard limits for federated content diff --git a/config/locales/be.yml b/config/locales/be.yml index f095291fdd..9ec635b4bd 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -4,6 +4,7 @@ be: about_mastodon_html: 'Сацыяльная сетка будучыні: без рэкламы, без карпаратыўнага назірання, этычны дызайн і дэцэнтралізацыя! Валодайце сваімі данымі з Mastodon!' contact_missing: Не зададзены contact_unavailable: Недаступна + default_thumbnail_description: Два намаляваныя мастадонты з усмешкамі (якія выглядаюць як слонікі) перакідваюцца паміж сабой папяровым самалёцікам. Іх акружае блакітнае неба і планеты з дрэвамі і іншымі мастадонтамі на іх. hosted_on: Mastodon месціцца на %{domain} title: Пра нас accounts: @@ -1831,6 +1832,7 @@ be: types: blocking: Спіс заблакіраваных bookmarks: Закладкі + custom_filters: Фільтры domain_blocking: Спіс заблакіраваных даменаў following: Падпіскі lists: Спісы diff --git a/config/locales/da.yml b/config/locales/da.yml index 4f9b450a20..6fa6b51ca5 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -4,6 +4,7 @@ da: about_mastodon_html: 'Fremtidens sociale netværk: Ingen annoncer, ingen virksomhedsovervågning, etisk design og decentralisering! Vær ejer af egne data med Mastodon!' contact_missing: Ikke angivet contact_unavailable: Utilgængelig + default_thumbnail_description: To smilende tegneseriemastodonter (der ligner elefanter) kaster en papirflyver frem og tilbage. De er omgivet af en klar, blå himmel og svævende planeter med træer og flere mastodonter på. hosted_on: Mastodon hostet på %{domain} title: Om accounts: @@ -1745,6 +1746,7 @@ da: types: blocking: Blokeringsliste bookmarks: Bogmærker + custom_filters: Filtre domain_blocking: Domæneblokeringsliste following: Liste over fulgte lists: Lister diff --git a/config/locales/de.yml b/config/locales/de.yml index 9865293ac5..6e0c1b05d8 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -4,6 +4,7 @@ de: about_mastodon_html: 'Das soziale Netzwerk der Zukunft: Keine Werbung, keine Überwachung durch Unternehmen – dafür dezentral und mit Anstand! Behalte mit Mastodon die Kontrolle über deine Daten!' contact_missing: Nicht festgelegt contact_unavailable: Nicht verfügbar + default_thumbnail_description: Zwei lächelnde Mastodonten, die wie Elefanten aussehen, werfen sich in einem Cartoon-Zeichenstil ein Papierflugzeug zu. Sie sind von einem hellblauen Himmel und anderen Planeten umgeben. Auf den Planeten befinden sich Bäume und weitere Mastodonten. hosted_on: Mastodon, eingerichtet auf %{domain} title: Über accounts: @@ -1728,6 +1729,7 @@ de: types: blocking: Blockierte Profile bookmarks: Lesezeichen + custom_filters: Filter domain_blocking: Blockierte Domains following: Folge ich lists: Listen diff --git a/config/locales/doorkeeper.be.yml b/config/locales/doorkeeper.be.yml index ef130993b2..77bdf587fe 100644 --- a/config/locales/doorkeeper.be.yml +++ b/config/locales/doorkeeper.be.yml @@ -84,9 +84,10 @@ be: credential_flow_not_configured: Resource Owner Password Credentials flow не прайшоў з-за таго, што ўласцівасць Doorkeeper.configure.resource_owner_from_credentials была не вызначана. invalid_client: Збой аўтэнтыфікацыі кліента з-за невядомага кліента, адсутнасці аўтэнтыфікацыі кліента або метаду аўтэнтыфікацыі, які не падтрымліваецца. invalid_code_challenge_method: + few: code_challenge_method павінен быць адным з %{challenge_methods}. + many: code_challenge_method павінен быць адным з %{challenge_methods}. one: code_challenge_method павінен быць %{challenge_methods}. other: code_challenge_method павінен быць адным з %{challenge_methods}. - zero: Сервер аўтарызацыі не падтрымлівае PKCE, паколькі няма прынятых значэнняў у code_challenge_method. invalid_grant: Прадастаўлены дазвол на аўтарызацыю несапраўдны, пратэрмінованы, быў адкліканы, не адпавядае URI перанакіравання, які выкарыстоўваецца ў запыце аўтарызацыі або быў выдадзены іншаму кліенту. invalid_redirect_uri: Прадстаўлены URI перанакіравання не сапраўдны. invalid_request: diff --git a/config/locales/doorkeeper.cs.yml b/config/locales/doorkeeper.cs.yml index 79ef5174e5..ff8d942120 100644 --- a/config/locales/doorkeeper.cs.yml +++ b/config/locales/doorkeeper.cs.yml @@ -83,10 +83,6 @@ cs: access_denied: Vlastník zdroje či autorizační server žádost zamítl. credential_flow_not_configured: Proud Resource Owner Password Credentials selhal, protože Doorkeeper.configure.resource_owner_from_credentials nebylo nakonfigurováno. invalid_client: Ověření klienta selhalo kvůli neznámému klientovi, chybějící klientské autentizaci či nepodporované autentizační metodě. - invalid_code_challenge_method: - one: code_challenge_method musí být %{challenge_methods}. - other: code_challenge_method musí být jedna z %{challenge_methods}. - zero: Autorizační server nepodporuje PKCE, protože neexistují žádné akceptované hodnoty kode_challenge_method. invalid_grant: Poskytnuté oprávnění je neplatné, vypršela jeho platnost, bylo odvoláno, neshoduje se s URI přesměrování použitým v požadavku o autorizaci, nebo bylo uděleno jinému klientu. invalid_redirect_uri: Zahrnutá přesměrovací URI není platná. invalid_request: diff --git a/config/locales/doorkeeper.cy.yml b/config/locales/doorkeeper.cy.yml index 5a48fde6d2..bfdb77e7f0 100644 --- a/config/locales/doorkeeper.cy.yml +++ b/config/locales/doorkeeper.cy.yml @@ -83,10 +83,6 @@ cy: access_denied: Mae perchennog yr adnodd neu'r gweinydd awdurdodi wedi atal y cais. credential_flow_not_configured: Llif meini prawf cyfrinair perchennog yr adnodd wedi methu achos fod Doorkeeper.configure.resource_owner_from_credentials heb ei ffurfweddu. invalid_client: Methodd dilysu cleient oherwydd cleient anhysbys, dim dilysiad cleient wedi'i gynnwys, neu ddull dilysu heb ei gefnogi. - invalid_code_challenge_method: - one: Rhaid i'r code_challenge_method fod yn %{challenge_methods}. - other: Rhaid i'r code_challenge_method fod yn un o %{challenge_methods}. - zero: Nid yw'r gweinydd awdurdodi yn cefnogi PKCE gan nad oes unrhyw werthoedd code_challenge_method wedi'u derbyn. invalid_grant: Mae'r grant awdurdodi ar yr amod yn annilys, wedi dod i ben, wedi'i ddirymu, nid yw'n cyfateb i'r URI ailgyfeirio a ddefnyddiwyd yn y cais am awdurdodiad, neu wedi'i roi i gleient arall. invalid_redirect_uri: Nid yw'r uri ailgyfeirio a gynhwysir yn ddilys. invalid_request: diff --git a/config/locales/doorkeeper.da.yml b/config/locales/doorkeeper.da.yml index 14c116f733..f45e8b5e81 100644 --- a/config/locales/doorkeeper.da.yml +++ b/config/locales/doorkeeper.da.yml @@ -86,7 +86,6 @@ da: invalid_code_challenge_method: one: code_challenge_method skal være %{challenge_methods}. other: code_challenge_method skal være en af %{challenge_methods}. - zero: Autorisationsserveren understøtter ikke PKCE, da der ikke er nogen accepterede code_challenge_method-værdier. invalid_grant: Den leverede godkendelse er ugyldig, udløbet, ophævet, matcher ikke omdirigerings-URI'en brugt i godkendelsesanmodningen eller er udstedt til en anden klient. invalid_redirect_uri: Inkluderede ormdirigerings-URI er ugyldig. invalid_request: diff --git a/config/locales/doorkeeper.de.yml b/config/locales/doorkeeper.de.yml index 2faa5bd64b..7350345bec 100644 --- a/config/locales/doorkeeper.de.yml +++ b/config/locales/doorkeeper.de.yml @@ -86,7 +86,6 @@ de: invalid_code_challenge_method: one: Die code_challenge_method muss %{challenge_methods} sein. other: Die code_challenge_method muss eine von %{challenge_methods} sein. - zero: Der Berechtigungsserver unterstützt PKCE nicht, da keine akzeptierten code_challenge_method Werte vorhanden sind. invalid_grant: Die beigefügte Autorisierung ist ungültig, abgelaufen, wurde widerrufen oder einem anderen Client ausgestellt, oder der Weiterleitungs-URI stimmt nicht mit der Autorisierungs-Anfrage überein. invalid_redirect_uri: Der beigefügte Weiterleitungs-URI ist ungültig. invalid_request: diff --git a/config/locales/doorkeeper.el.yml b/config/locales/doorkeeper.el.yml index 8a3bf42807..1baa6600e4 100644 --- a/config/locales/doorkeeper.el.yml +++ b/config/locales/doorkeeper.el.yml @@ -86,7 +86,6 @@ el: invalid_code_challenge_method: one: Το code_challenge_method πρέπει να είναι %{challenge_methods}. other: Το code_challenge_method πρέπει να είναι ένα από %{challenge_methods}. - zero: Ο διακομιστής εξουσιοδότησης δεν υποστηρίζει PKCE καθώς δεν υπάρχουν αποδεκτές τιμές code_challenge_method. invalid_grant: Η άδεια πιστοποίησης που δόθηκε είναι άκυρη, ληγμένη, έχει ανακληθεί, δεν συμφωνεί με το URI ανακατεύθυνσης που δόθηκε στο αίτημα πιστοποίησης ή εκδόθηκε προς άλλο πελάτη. invalid_redirect_uri: Το uri ανακατεύθυνσης που δόθηκε δεν είναι έγκυρο. invalid_request: diff --git a/config/locales/doorkeeper.en-GB.yml b/config/locales/doorkeeper.en-GB.yml index e9e54501bc..4eaa965bab 100644 --- a/config/locales/doorkeeper.en-GB.yml +++ b/config/locales/doorkeeper.en-GB.yml @@ -83,10 +83,6 @@ en-GB: access_denied: The resource owner or authorisation server denied the request. credential_flow_not_configured: Resource Owner Password Credentials flow failed due to Doorkeeper.configure.resource_owner_from_credentials being unconfigured. invalid_client: Client authentication failed due to unknown client, no client authentication included, or unsupported authentication method. - invalid_code_challenge_method: - one: The code_challenge_method must be %{challenge_methods}. - other: The code_challenge_method must be one of %{challenge_methods}. - zero: The authorisation server does not support PKCE as there are no accepted code_challenge_method values. invalid_grant: The provided authorisation grant is invalid, expired, revoked, does not match the redirection URI used in the authorisation request, or was issued to another client. invalid_redirect_uri: The redirect URI included is not valid. invalid_request: diff --git a/config/locales/doorkeeper.es-AR.yml b/config/locales/doorkeeper.es-AR.yml index d9a6f1df5e..6b4fcdba11 100644 --- a/config/locales/doorkeeper.es-AR.yml +++ b/config/locales/doorkeeper.es-AR.yml @@ -86,7 +86,6 @@ es-AR: invalid_code_challenge_method: one: "«code_challenge_method» debe ser %{challenge_methods}." other: "«code_challenge_method» debe ser uno de %{challenge_methods}." - zero: El servidor de autorización no es compatible con PKCE, ya que no hay valores aceptados de «code_challenge_method». invalid_grant: La concesión de autorización ofrecida no es válida, venció, se revocó, no coincide con la dirección web de redireccionamiento usada en la petición de autorización, o fue emitida para otro cliente. invalid_redirect_uri: La dirección web de redireccionamiento incluida no es válida. invalid_request: diff --git a/config/locales/doorkeeper.es-MX.yml b/config/locales/doorkeeper.es-MX.yml index bee17cc6a4..38953ba699 100644 --- a/config/locales/doorkeeper.es-MX.yml +++ b/config/locales/doorkeeper.es-MX.yml @@ -86,7 +86,6 @@ es-MX: invalid_code_challenge_method: one: El code_challenge_method debe ser %{challenge_methods}. other: El code_challenge_method debe ser uno de %{challenge_methods}. - zero: El servidor de autorización no admite PKCE, ya que no hay valores code_challenge_method aceptados. invalid_grant: La concesión de autorización ofrecida es inválida, venció, se revocó, no coincide con la URI de redirección utilizada en la petición de autorización, o fue emitida para otro cliente. invalid_redirect_uri: La URI de redirección incluida no es válida. invalid_request: diff --git a/config/locales/doorkeeper.es.yml b/config/locales/doorkeeper.es.yml index 2c0a726c29..57b8078e44 100644 --- a/config/locales/doorkeeper.es.yml +++ b/config/locales/doorkeeper.es.yml @@ -83,10 +83,6 @@ es: access_denied: El propietario del recurso o servidor de autorización denegó la petición. credential_flow_not_configured: Las credenciales de contraseña del propietario del recurso falló debido a que Doorkeeper.configure.resource_owner_from_credentials está sin configurar. invalid_client: La autentificación del cliente falló debido o a que es un cliente desconocido o no está incluída la autentificación del cliente o el método de autentificación no está confirmado. - invalid_code_challenge_method: - one: El code_challenge_method debe ser %{challenge_methods}. - other: El code_challenge_method debe ser uno de %{challenge_methods}. - zero: El servidor de autorización no soporta PKCE, ya que no hay valores aceptados de code_challenge_method. invalid_grant: La concesión de autorización ofrecida es inválida, venció, se revocó, no coincide con la URI de redirección utilizada en la petición de autorización, o fue emitida para otro cliente. invalid_redirect_uri: La URI de redirección incluida no es válida. invalid_request: diff --git a/config/locales/doorkeeper.et.yml b/config/locales/doorkeeper.et.yml index 786b896402..fb1cf2a614 100644 --- a/config/locales/doorkeeper.et.yml +++ b/config/locales/doorkeeper.et.yml @@ -83,10 +83,6 @@ et: access_denied: Ressursi omanik või autoriseerimisserver lükkas taotluse tagasi. credential_flow_not_configured: Resource Owner Password Credentials vool ebaõnnestus, kuna Doorkeeper.configure.resource_owner_from_credentials ei ole seadistatud. invalid_client: Kliendi autentimine ebaõnnestus. Põhjus kas tundmatu klient, puudulik autentimine või toetamata autentimismeetod. - invalid_code_challenge_method: - one: "„code_challenge_method“ meetod peab olema selline: %{challenge_methods}." - other: "„code_challenge_method“ meetod peab olema üks neist: %{challenge_methods}." - zero: Kuna sobilikke „code_challenge_method“ meetodi väärtusi ei leidu, siis autentimisserver ei toeta PKCE-d. invalid_grant: Antud autoriseerimisluba on vale, aegunud, tagasi võetud, ei kattu kasutatud ümbersuunamise URLid või oli antud teisele kliendile. invalid_redirect_uri: Antud ümbersuunamise URL ei ole õige. invalid_request: diff --git a/config/locales/doorkeeper.fa.yml b/config/locales/doorkeeper.fa.yml index 1f38d9cdb6..8076819d46 100644 --- a/config/locales/doorkeeper.fa.yml +++ b/config/locales/doorkeeper.fa.yml @@ -83,10 +83,6 @@ fa: access_denied: صاحب منبع یا کارساز تأیید هویت، درخواست را رد کردند. credential_flow_not_configured: جریان اعتبارنامهٔ گذرواژهٔ مالک منبع به دلیل پیکربندی نشده بودن Doorkeeper.configure.resource_owner_from_credentials شکست خورد. invalid_client: تأیید هویت کارخواه به دلیل کارخواه ناشناخته، عدم وجود تأیید هویت کاره یا روش تأیید هویت پشتیبانی‌نشده شکست خورد. - invalid_code_challenge_method: - one: مقدار code_challenge_method باید %{challenge_methods} باشد. - other: مقدار code_challenge_method باید یکی از %{challenge_methods} باشد. - zero: کارساز تأیید از PKCE پشتیبانی نمی‌کند و مقدار code_challenge_method پذیرفته‌ای وجود ندارد. invalid_grant: اعطای دسترسی فراهم ‌شده نامعتبر، منقضی یا نامطابق با نشانی بازگشت استفاده‌شده در درخواست تأیید هویت بوده و یا برای کارخواهی دیگر صادر شده است. invalid_redirect_uri: نشانی بازگشت موجود، معتبر نیست. invalid_request: diff --git a/config/locales/doorkeeper.fi.yml b/config/locales/doorkeeper.fi.yml index f28b42bd1e..ef34565f3f 100644 --- a/config/locales/doorkeeper.fi.yml +++ b/config/locales/doorkeeper.fi.yml @@ -86,7 +86,6 @@ fi: invalid_code_challenge_method: one: Muuttujan code_challenge_method arvon on oltava %{challenge_methods}. other: 'Muuttujan code_challenge_method arvon on oltava jokin seuraavista: %{challenge_methods}.' - zero: Valtuutuspalvelin ei tue PKCE:tä, koska hyväksyttäviä code_challenge_method-arvoja ei ole. invalid_grant: Valtuutuslupa on virheellinen, vanhentunut, peruttu, valtuutuspyynnössä käytettyä uudelleenohjaus-URI:tä vastaamaton tai myönnetty toiselle asiakkaalle. invalid_redirect_uri: Uudelleenohjaus-URI on virheellinen. invalid_request: diff --git a/config/locales/doorkeeper.fo.yml b/config/locales/doorkeeper.fo.yml index bf6f74841f..c2aee1f67f 100644 --- a/config/locales/doorkeeper.fo.yml +++ b/config/locales/doorkeeper.fo.yml @@ -83,10 +83,6 @@ fo: access_denied: Tilfarseigarin ella váttanarambætarin noktaðu umbønina. credential_flow_not_configured: Resource Owner Password Credentials floymurin eydnaðist ikki. Orsøkin var, at Doorkeeper.configure.resource_owner_from_credentials var ikki sett upp. invalid_client: Viðskiftaraváttan miseydnaðist. Orsøkin var ein ókendur viðskiftari, at eingin viðskiftaraváttan var við ella at váttanarmannagongdin er ókend. - invalid_code_challenge_method: - one: Code_challenge_method má vera %{challenge_methods}. - other: Code_challenge_method má vera ein av %{challenge_methods}. - zero: Váttanarambætarin stuðlar ikki uppundir PKCE av tí at tað eru eingi góðkend code_challenge_method virði. invalid_grant: Veitta váttanarheimildin er antin ógildug, útgingin, tikin aftur, samsvarar ikki við endursendingar-URI'ið, sum bleiv brúkt í váttanarumbønini ella var flýggjað øðrum viðskiftara. invalid_redirect_uri: Endursendingar-URI'ið, sum var viðheft, er ógyldugt. invalid_request: diff --git a/config/locales/doorkeeper.fr-CA.yml b/config/locales/doorkeeper.fr-CA.yml index 2c11dbf6c0..988f68b2f3 100644 --- a/config/locales/doorkeeper.fr-CA.yml +++ b/config/locales/doorkeeper.fr-CA.yml @@ -86,7 +86,6 @@ fr-CA: invalid_code_challenge_method: one: Le code de la méthode de défi doit être %{challenge_methods}. other: 'Le code de la méthode de défi doit être l''une de ces valeurs : %{challenge_methods}.' - zero: Le serveur d'autorisation ne supporte pas PKCE car il n'y a aucune valeur de code de méthode de défi acceptée. invalid_grant: L’autorisation accordée est invalide, expirée, révoquée, ne concorde pas avec l’URI de redirection utilisée dans la requête d’autorisation, ou a été délivrée à un autre client. invalid_redirect_uri: L’URI de redirection n’est pas valide. invalid_request: diff --git a/config/locales/doorkeeper.fr.yml b/config/locales/doorkeeper.fr.yml index f33ac9e0ad..506bc7b41c 100644 --- a/config/locales/doorkeeper.fr.yml +++ b/config/locales/doorkeeper.fr.yml @@ -86,7 +86,6 @@ fr: invalid_code_challenge_method: one: Le code de la méthode de défi doit être %{challenge_methods}. other: 'Le code de la méthode de défi doit être l''une de ces valeurs : %{challenge_methods}.' - zero: Le serveur d'autorisation ne supporte pas PKCE car il n'y a aucune valeur de code de méthode de défi acceptée. invalid_grant: L’autorisation accordée est invalide, expirée, annulée, ne concorde pas avec l’URL de redirection utilisée dans la requête d’autorisation, ou a été délivrée à un autre client. invalid_redirect_uri: L’URL de redirection n’est pas valide. invalid_request: diff --git a/config/locales/doorkeeper.ga.yml b/config/locales/doorkeeper.ga.yml index ecc7ea9648..6bfa64bd9c 100644 --- a/config/locales/doorkeeper.ga.yml +++ b/config/locales/doorkeeper.ga.yml @@ -84,9 +84,11 @@ ga: credential_flow_not_configured: Theip ar shreabhadh Dintiúir Pasfhocal Úinéir Acmhainne toisc go raibh Doorkeeper.configure.resource_owner_from_credentials díchumraithe. invalid_client: Theip ar fhíordheimhniú cliant de bharr cliant anaithnid, níl fíordheimhniú cliant san áireamh, nó modh fíordheimhnithe nach dtacaítear leis. invalid_code_challenge_method: + few: Ní mór don code_challenge_method a bheith ar cheann de %{challenge_methods}. + many: Ní mór don code_challenge_method a bheith ar cheann de %{challenge_methods}. one: Ní mór don code_challenge_method a bheith %{challenge_methods}. other: Ní mór don code_challenge_method a bheith ar cheann de %{challenge_methods}. - zero: Ní thacaíonn an freastalaí údaraithe le PKCE mar nach bhfuil aon luachanna code_challenge_method glactha ann. + two: Ní mór don code_challenge_method a bheith ar cheann de %{challenge_methods}. invalid_grant: Tá an deonú údaraithe ar choinníoll neamhbhailí, imithe in éag, cúlghairthe, nach ionann é agus an URI atreoraithe a úsáideadh san iarratas ar údarú, nó gur eisíodh é chuig cliant eile. invalid_redirect_uri: Níl an uri atreoraithe atá san áireamh bailí. invalid_request: diff --git a/config/locales/doorkeeper.gd.yml b/config/locales/doorkeeper.gd.yml index 2696672e65..6487669c28 100644 --- a/config/locales/doorkeeper.gd.yml +++ b/config/locales/doorkeeper.gd.yml @@ -83,10 +83,6 @@ gd: access_denied: Dhiùlt sealbhadair a’ ghoireis no am frithealaiche ùghdarrachaidh an t-iarrtas. credential_flow_not_configured: Dh’fhàillig le sruth cruthachadh teisteas facail-fhaire do shealbhadair a’ ghoireis ri linn Doorkeeper.configure.resource_owner_from_credentials gun rèiteachadh. invalid_client: Dh’fhàillig le dearbhadh a’ chliant ri linn cliant nach aithne dhuinn, dearbhadh cliant nach deach gabhail a-staigh no dòigh dearbhaidh ris nach cuirear taic. - invalid_code_challenge_method: - one: Feumaidh an code_challenge_method a bhith ’na %{challenge_methods}. - other: Feumaidh an code_challenge_method a bhith aon de %{challenge_methods}. - zero: Cha chuir frithealaiche an ùghdarrachaidh taic ri PKCE air sgàth ’s nach eil luach code_challenge_method ann ris an gabhar. invalid_grant: Chan eil an t-ùghdarrachadh a chaidh a thoirt seachad dligheach, dh’fhalbh an ùine air, chaidh a chùl-ghairm no chan eil e a-rèir URI an ath-stiùiridh a chaidh a chleachdadh san iarrtas ùghdarrachaidh no chaidh fhoillseachadh le cliant eile. invalid_redirect_uri: Chan eil an URI ath-stiùiridh a chaidh a ghabhail a-staigh dligheach. invalid_request: diff --git a/config/locales/doorkeeper.gl.yml b/config/locales/doorkeeper.gl.yml index fc2d4aa9ec..86e91022fe 100644 --- a/config/locales/doorkeeper.gl.yml +++ b/config/locales/doorkeeper.gl.yml @@ -86,7 +86,6 @@ gl: invalid_code_challenge_method: one: O code_challenge_method ten que ser %{challenge_methods}. other: O code_challenge_method ten que ser un de entre %{challenge_methods}. - zero: O servidor de autorización non é compatible con PKCE xa que non se aceptaron valores code_challenge_method invalid_grant: A validación da autorización proporcionada non é valida, caducou, foi rexeitada, non coincide a redirección URI utilizada na petición de autorización, ou foi proporcionada para outro cliente. invalid_redirect_uri: A uri de redirección incluída non é válida. invalid_request: diff --git a/config/locales/doorkeeper.he.yml b/config/locales/doorkeeper.he.yml index 3b7622651e..8145c4e1c7 100644 --- a/config/locales/doorkeeper.he.yml +++ b/config/locales/doorkeeper.he.yml @@ -84,9 +84,10 @@ he: credential_flow_not_configured: התהליך "Resource Owner Password Credentials" נכשל בשל חוסר בתצורת Doorkeeper.configure.resource_owner_from_credentials. invalid_client: הרשאת הלקוח נכשלה עקב לקוח שאינו ידוע, חוסר בהרשאת לקוח או שיטת הרשאה שאינה נתמכת. invalid_code_challenge_method: + many: 'הערך של code_challenge_method חייב להיות אחד מאלו: %{challenge_methods}.' one: הערך של code_challenge_method חייב להיות %{challenge_methods}. other: 'הערך של code_challenge_method חייב להיות אחד מאלו: %{challenge_methods}.' - zero: שרת ההרשאה לא תומך PKCE שכן אין ערכי code_challenge_method נתמכים. + two: 'הערך של code_challenge_method חייב להיות אחד מאלו: %{challenge_methods}.' invalid_grant: חוזה ההרשאה המצורף אינו חוקי, אינו תקף, מבוטל, או שאינו מתאים לקישורית ההפניה שבשימוש על ידי בקשת ההרשאה, או שהופק על ידי לקוח אחר. invalid_redirect_uri: קישורית ההפניה המצורפת אינה חוקית. invalid_request: diff --git a/config/locales/doorkeeper.hu.yml b/config/locales/doorkeeper.hu.yml index 58a3f96233..17569a6598 100644 --- a/config/locales/doorkeeper.hu.yml +++ b/config/locales/doorkeeper.hu.yml @@ -83,10 +83,6 @@ hu: access_denied: Az erőforrás tulajdonosa vagy az engedélyező kiszolgáló elutasította a kérést. credential_flow_not_configured: Az erőforrás tulajdonos jelszóadatainak átadása megszakadt, mert a Doorkeeper.configure.resource_owner_from_credentials beállítatlan. invalid_client: A kliens hitelesítése megszakadt, mert ismeretlen a kliens, a kliens nem küldött hitelesítést, vagy a hitelesítés módja nem támogatott. - invalid_code_challenge_method: - one: 'A code_challange_method értékének ennek kell lennie: %{challenge_methods}.' - other: 'A code_challange_method értékének ennek egyikének kell lennie: %{challenge_methods}.' - zero: A hitelesítési kiszolgáló nem támogatja a PKCE-t, mivel nincs elfogadott code_challange_method érték. invalid_grant: A biztosított hitelesítés érvénytelen, lejárt, visszavont, vagy nem egyezik a hitelesítési kérésben használt URI-val, vagy más kliensnek címezték. invalid_redirect_uri: Az átirányító URI nem valós. invalid_request: diff --git a/config/locales/doorkeeper.io.yml b/config/locales/doorkeeper.io.yml index 1eebd1ac1a..2f8adf8ce3 100644 --- a/config/locales/doorkeeper.io.yml +++ b/config/locales/doorkeeper.io.yml @@ -83,10 +83,6 @@ io: access_denied: Moyenproprietanto o yurizservilo refuzis la demando. credential_flow_not_configured: Moyenproprietantpasvortidentesesofluo faliis pro ke Doorkeeper.configure.resource_owner_from_credentials ne ajustesis. invalid_client: Klientpermiso falias pro nesavita kliento, neinkluzita klientpermiso o nesuportita permismetodo. - invalid_code_challenge_method: - one: La code_challenge_method mustas esar %{challenge_methods}. - other: La code_challenge_method mustas esar un de %{challenge_methods}. - zero: La yurizservilo ne subtenas PKCE pro ke ne havas aceptita valori di code_challenge_method. invalid_grant: Provizita yurizo esis nevalida, expiris, deaprobesis, ne parigas uzita ridirektoligilo dum yurizdemando o facesis a altra kliento. invalid_redirect_uri: La inkluzita ridirektoligilo esas nevalida. invalid_request: diff --git a/config/locales/doorkeeper.is.yml b/config/locales/doorkeeper.is.yml index bd806d07e1..dc5ef2f6a8 100644 --- a/config/locales/doorkeeper.is.yml +++ b/config/locales/doorkeeper.is.yml @@ -83,10 +83,6 @@ is: access_denied: Eigandi tilfangs eða auðkenningarþjónn höfnuðu beininni. credential_flow_not_configured: Flæði á lykilorðsauðkennum eiganda tilfangs (Resource Owner) brást vegna þess að Doorkeeper.configure.resource_owner_from_credentials er óskilgreint. invalid_client: Auðkenning á biðlara brást vegna þess að biðlarinn er óþekktur, að auðkenning biðlarans fylgdi ekki með, eða að notuð var óstudd auðkenningaraðferð. - invalid_code_challenge_method: - one: code_challenge_method verður að vera %{challenge_methods}. - other: code_challenge_method verður að vera eitt af %{challenge_methods}. - zero: Auðkenningarþjónninn styður ekki PKCE þar sem það eru engin samþykkt gildi fyrir code_challenge_method. invalid_grant: Uppgefin auðkenningarheimild er ógild, útrunnin, afturkölluð, samsvarar ekki endurbirtingarslóðinni í auðkenningarbeiðninni, eða var gefin út til annars biðlara. invalid_redirect_uri: Endurbeiningarslóðin sem fylgdi er ekki gild. invalid_request: diff --git a/config/locales/doorkeeper.it.yml b/config/locales/doorkeeper.it.yml index 6aa6624c05..14b0004122 100644 --- a/config/locales/doorkeeper.it.yml +++ b/config/locales/doorkeeper.it.yml @@ -86,7 +86,6 @@ it: invalid_code_challenge_method: one: Il code_challenge_method deve essere %{challenge_methods}. other: Il code_challenge_method deve essere uno dei %{challenge_methods}. - zero: Il server di autorizzazione non supporta PKCE poiché non sono presenti valori code_challenge_method accettati. invalid_grant: L'autorizzazione fornita non è valida, è scaduta, è stata revocata, non corrisponde all'URI di reindirizzamento utilizzato nella richiesta d'autorizzazione o è stata emessa a un altro client. invalid_redirect_uri: L'uri di reindirizzamento incluso non è valido. invalid_request: diff --git a/config/locales/doorkeeper.ja.yml b/config/locales/doorkeeper.ja.yml index 08f4112c7e..a788b5bf42 100644 --- a/config/locales/doorkeeper.ja.yml +++ b/config/locales/doorkeeper.ja.yml @@ -83,10 +83,6 @@ ja: access_denied: リソースの所有者または認証サーバーが要求を拒否しました。 credential_flow_not_configured: リソース所有者のパスワード Doorkeeper.configure.resource_owner_from_credentials が設定されていないためクレデンシャルフローに失敗しました。 invalid_client: 不明なクライアントであるか、クライアント情報が含まれていない、またはサポートされていない認証方法のため、クライアントの認証に失敗しました。 - invalid_code_challenge_method: - one: code_challenge_methodは %{challenge_methods} でなければなりません。 - other: code_challenge_methodは %{challenge_methods} のいずれかでなければなりません。 - zero: 認証サーバーが受け入れる code_challenge_method 値がないため、PKCE をサポートしません。 invalid_grant: 指定された認証許可は無効であるか、期限切れ、取り消されている、リダイレクトURIの不一致、または別のクライアントに発行されています。 invalid_redirect_uri: 無効なリダイレクトURIが含まれています。 invalid_request: diff --git a/config/locales/doorkeeper.lv.yml b/config/locales/doorkeeper.lv.yml index d8023202c3..3b3667c373 100644 --- a/config/locales/doorkeeper.lv.yml +++ b/config/locales/doorkeeper.lv.yml @@ -120,7 +120,7 @@ lv: title: accounts: Konti admin/accounts: Kontu pārvaldīšana - admin/all: Visas administrēšanas funkcijas + admin/all: Visas pārvaldīšanas iespējas admin/reports: Ziņojumu pārvaldīšana all: Pilna piekļuve Tavam Mastodon kontam blocks: Liegtie diff --git a/config/locales/doorkeeper.nl.yml b/config/locales/doorkeeper.nl.yml index dab7746b4f..ff3a610376 100644 --- a/config/locales/doorkeeper.nl.yml +++ b/config/locales/doorkeeper.nl.yml @@ -85,8 +85,7 @@ nl: invalid_client: Clientverificatie is mislukt door een onbekende client, ontbrekende client-authenticatie of een niet ondersteunde authenticatie-methode. invalid_code_challenge_method: one: De code_challenge_method moet %{challenge_methods} zijn. - other: De code_challenge_method moet een van %{challenge_methods} zijn. - zero: De autorisatieserver ondersteunt PKCE niet, aangezien er geen geaccepteerde code_challenge_method waarden zijn. + other: De code_challenge_method moet een van de %{challenge_methods} zijn. invalid_grant: De verstrekte autorisatie is ongeldig, verlopen, ingetrokken, komt niet overeen met de redirect-URI die is opgegeven of werd uitgegeven aan een andere client. invalid_redirect_uri: De opgegeven redirect-URI is ongeldig. invalid_request: diff --git a/config/locales/doorkeeper.nn.yml b/config/locales/doorkeeper.nn.yml index fb62a29a3c..3b8a9b0663 100644 --- a/config/locales/doorkeeper.nn.yml +++ b/config/locales/doorkeeper.nn.yml @@ -83,10 +83,6 @@ nn: access_denied: Ressurseigaren eller autorisasjonstenaren avviste førespurnaden. credential_flow_not_configured: Flyten «Resource Owner Password Credentials» kunne ikkje fullførast sidan «Doorkeeper.configure.resource_owner_from_credentials» ikkje er konfigurert. invalid_client: Klientautentisering feila på grunn av ukjent klient, ingen inkludert autentisering, eller ikkje støtta autentiseringsmetode. - invalid_code_challenge_method: - one: code_challenge_method må vera %{challenge_methods}. - other: code_challenge_method må vera ein av %{challenge_methods}. - zero: Godkjenningstenaren støttar ikkje PKCE fordi det ikkje er nokon aksepterte verdiar av code_challenge_method. invalid_grant: Autoriseringa er ugyldig, utløpt, oppheva, stemmer ikkje med omdirigerings-URIen eller var tildelt ein annan klient. invalid_redirect_uri: Omdirigerings-URLen er ikkje gyldig. invalid_request: diff --git a/config/locales/doorkeeper.pl.yml b/config/locales/doorkeeper.pl.yml index 67a0d62464..b11528aeee 100644 --- a/config/locales/doorkeeper.pl.yml +++ b/config/locales/doorkeeper.pl.yml @@ -83,10 +83,6 @@ pl: access_denied: Właściciel zasobu lub serwer autoryzujący odrzuciły żądanie. credential_flow_not_configured: Ścieżka "Resource Owner Password Credentials" zakończyła się błędem, ponieważ Doorkeeper.configure.resource_owner_from_credentials nie został skonfigurowany. invalid_client: Autoryzacja klienta nie powiodła się z powodu nieznanego klienta, braku uwierzytelnienia klienta, lub niewspieranej metody uwierzytelniania. - invalid_code_challenge_method: - one: Parametr code_challenge_method musi mieć wartość %{challenge_methods}. - other: Parametr code_challenge_method musi być jednym z %{challenge_methods}. - zero: Serwer autoryzacji nie obsługuje PKCE — brak akceptowanych wartości code_challenge_method. invalid_grant: Grant uwierzytelnienia jest niepoprawny, przeterminowany, unieważniony, nie pasuje do URI przekierowwania użytego w żądaniu uwierzytelnienia, lub został wystawiony przez innego klienta. invalid_redirect_uri: URI przekierowania jest nieprawidłowy. invalid_request: diff --git a/config/locales/doorkeeper.pt-BR.yml b/config/locales/doorkeeper.pt-BR.yml index 3ade537870..2f6b2c3faa 100644 --- a/config/locales/doorkeeper.pt-BR.yml +++ b/config/locales/doorkeeper.pt-BR.yml @@ -86,7 +86,6 @@ pt-BR: invalid_code_challenge_method: one: O code_challenge_method deve ser %{challenge_methods}. other: O code_challenge_method deve ser um de %{challenge_methods}. - zero: O servidor de autorização não suporta PKCE por não haver valores aceitos de code_challenge_method. invalid_grant: A garantia de autorização está inválida, expirou ou foi revogada, não é equivalente ao link de redirecionamento usado na solicitação de autorização ou foi emitido por outro cliente. invalid_redirect_uri: O link de redirecionamento é inválido. invalid_request: diff --git a/config/locales/doorkeeper.pt-PT.yml b/config/locales/doorkeeper.pt-PT.yml index f83ad52804..572a6ff1a4 100644 --- a/config/locales/doorkeeper.pt-PT.yml +++ b/config/locales/doorkeeper.pt-PT.yml @@ -83,10 +83,6 @@ pt-PT: access_denied: O proprietário do recurso ou servidor de autorização negou o pedido. credential_flow_not_configured: Falha no fluxo de credenciais da palavra-passe do proprietário do recurso porque Doorkeeper.configure.resource_owner_from_credentials não está configurado. invalid_client: A autenticação do cliente falhou devido a cliente desconhecido, sem autenticação de cliente incluída ou método de autenticação não suportado. - invalid_code_challenge_method: - one: O code_challenge_method deve ser %{challenge_methods}. - other: O code_challenge_method deve ser um de %{challenge_methods}. - zero: O servidor de autorização não suporta PKCE pois não há valores aceites para code_challenge_method. invalid_grant: A concessão de autorização fornecida é inválida, expirou, foi revogada, não corresponde à URI de redirecionamento usada no pedido de autorização ou foi emitida para outro cliente. invalid_redirect_uri: A URI de redirecionamento incluída não é válida. invalid_request: diff --git a/config/locales/doorkeeper.sq.yml b/config/locales/doorkeeper.sq.yml index bdf292ebec..64519bc678 100644 --- a/config/locales/doorkeeper.sq.yml +++ b/config/locales/doorkeeper.sq.yml @@ -86,7 +86,6 @@ sq: invalid_code_challenge_method: one: code_challenge_method duhet të jetë %{challenge_methods}. other: code_challenge_method duhet të jetë një nga %{challenge_methods}. - zero: Shërbyesi i autorizimeve s’mbulon PKCE, ngaqë s’ka vlera code_challenge_method të pranuara. invalid_grant: Autorizimi i dhënë është i pavlefshëm, ka skaduar, është shfuqizuar, s’përputhet me URI-n e ridrejtimit të përdorur te kërkesa e autorizimit, ose është emetuar për klient tjetër. invalid_redirect_uri: URI e ridrejtimit s’është e vlefshme. invalid_request: diff --git a/config/locales/doorkeeper.sv.yml b/config/locales/doorkeeper.sv.yml index 9b8d428b39..68b425e764 100644 --- a/config/locales/doorkeeper.sv.yml +++ b/config/locales/doorkeeper.sv.yml @@ -84,9 +84,8 @@ sv: credential_flow_not_configured: Resurs Ägare Lösenord Credentials flöde misslyckades på grund av att Doorkeeper.configure.resource_owner_from_credentials är okonfigurerad. invalid_client: Klientautentisering misslyckades på grund av okänd klient, ingen klientautentisering inkluderad eller icke godkänd autentiseringsmetod. invalid_code_challenge_method: - one: code_challenge_method måste vara %{challenge_methods}. - other: code_challenge_method måste vara en av %{challenge_methods}. - zero: Auktoriseringsservern stöder inte PKCE eftersom det inte finns några accepterade code_challenge_metod-värden. + one: Code_challenge_method måste vara %{challenge_methods}. + other: Code_challenge_method måste vara ett av %{challenge_methods}. invalid_grant: Det beviljade godkännandetillskottet är ogiltigt, upphört, återkallat, matchar inte den omdirigering URI som användes i auktorisationsförfrågan eller har utfärdats till en annan klient. invalid_redirect_uri: Den omdirigerade uri är inte giltig. invalid_request: diff --git a/config/locales/doorkeeper.tr.yml b/config/locales/doorkeeper.tr.yml index b51e49f32a..e94bb91501 100644 --- a/config/locales/doorkeeper.tr.yml +++ b/config/locales/doorkeeper.tr.yml @@ -84,9 +84,8 @@ tr: credential_flow_not_configured: Kaynak Sahibi Parolası Kimlik Bilgileri akışı Doorkeeper.configure.resource_owner_from_credentials 'ın yapılandırılmamış olması nedeniyle başarısız oldu. invalid_client: İstemcinin kimlik doğrulaması bilinmeyen istemci, istemci kimlik doğrulamasının dahil olmaması veya desteklenmeyen kimlik doğrulama yöntemi nedeniyle başarısız oldu. invalid_code_challenge_method: - one: code_challenge_method %{challenge_methods} olmalıdır. - other: code_challenge_method %{challenge_methods} seçeneklerinden biri olmalıdır. - zero: Yetkilendirme sunucusu kabul edilen code_challenge_method değerleri olmadığı için PKCE'yi desteklemiyor. + one: code_challenge_method değeri %{challenge_methods} olmalıdır. + other: code_challenge_method değeri %{challenge_methods} olmalıdır. invalid_grant: Sağlanan yetkilendirme izni geçersiz, süresi dolmuş, iptal edilmiş, yetkilendirme isteğinde kullanılan yönlendirme URL'siyle eşleşmiyor veya başka bir istemciye verilmiş. invalid_redirect_uri: Dahil edilmiş yönlendirme uri'si geçersiz. invalid_request: diff --git a/config/locales/doorkeeper.vi.yml b/config/locales/doorkeeper.vi.yml index 5f980c8591..557eadb45e 100644 --- a/config/locales/doorkeeper.vi.yml +++ b/config/locales/doorkeeper.vi.yml @@ -84,9 +84,7 @@ vi: credential_flow_not_configured: Resource Owner Password Credentials không thành công do Doorkeeper.configure.resource_owner_from_credentials không được định cấu hình. invalid_client: Xác minh ứng dụng khách không thành công do máy khách mơ hồ, không bao gồm xác thực ứng dụng khách hoặc phương thức xác thực không được hỗ trợ. invalid_code_challenge_method: - one: Code_challenge_method phải là %{challenge_methods}. other: Code_challenge_method phải là một trong %{challenge_methods}. - zero: Máy chủ xác thực không hỗ trợ PKCE vì không chấp nhận giá trị code_challenge_method. invalid_grant: Yêu cầu không hợp lệ, hết hạn, bị gỡ hoặc không khớp với tài khoản đã cấp phép. Hoặc xung đột với ứng dụng khác. invalid_redirect_uri: URL chuyển hướng không hợp lệ. invalid_request: diff --git a/config/locales/doorkeeper.zh-CN.yml b/config/locales/doorkeeper.zh-CN.yml index fcba0f9c56..cfb6334552 100644 --- a/config/locales/doorkeeper.zh-CN.yml +++ b/config/locales/doorkeeper.zh-CN.yml @@ -84,9 +84,7 @@ zh-CN: credential_flow_not_configured: 由于 Doorkeeper.configure.resource_owner_from_credentials 尚未配置，应用验证授权流程失败。 invalid_client: 由于应用信息未知、未提交认证信息或使用了不支持的认证方式，认证失败 invalid_code_challenge_method: - one: code_challenge_method 必须是 %{challenge_methods}。 - other: code_challenge_method 必须是 %{challenge_methods} 的其中之一。 - zero: 授权服务器不支持 PKCE，因为没有被接受的 code_challenge_method 值。 + other: code_challenge_method 必须是 %{challenge_methods}。 invalid_grant: 授权方式无效、过期或已被撤销、与授权请求中的回调地址不一致，或使用了其他应用的回调地址 invalid_redirect_uri: 登录回调地址无效。 invalid_request: diff --git a/config/locales/doorkeeper.zh-TW.yml b/config/locales/doorkeeper.zh-TW.yml index 6e0950fdda..89f97ed090 100644 --- a/config/locales/doorkeeper.zh-TW.yml +++ b/config/locales/doorkeeper.zh-TW.yml @@ -84,9 +84,7 @@ zh-TW: credential_flow_not_configured: 因為 Doorkeeper.configure.resource_owner_from_credentials 未設定，所以資源持有者密碼認證程序失敗。 invalid_client: 用戶端驗證失敗，可能是因為未知的用戶端程式、未包含用戶端驗證、或使用了不支援的認證方法。 invalid_code_challenge_method: - one: code_challenge_method 必須是 %{challenge_methods}。 other: code_challenge_method 必須是 %{challenge_methods} 其中之一。 - zero: 授權伺服器不支援 PKCE ，因為沒有被接受的 code_challenge_method 值。 invalid_grant: 授權申請不正確、逾期、已被註銷、與授權請求內的重新導向 URI 不符、或屬於別的用戶端程式。 invalid_redirect_uri: 包含的重新導向 URI 是不正確的。 invalid_request: diff --git a/config/locales/el.yml b/config/locales/el.yml index fa09182f6f..2263b97dbe 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -4,6 +4,7 @@ el: about_mastodon_html: 'Το κοινωνικό δίκτυο του μέλλοντος: Χωρίς διαφημίσεις, χωρίς εταιρίες να σε κατασκοπεύουν, ηθικά σχεδιασμένο και αποκεντρωμένο! Με το Mastodon τα δεδομένα σου είναι πραγματικά δικά σου!' contact_missing: Δεν έχει οριστεί contact_unavailable: Μη διαθέσιμο + default_thumbnail_description: Δύο χαμογελαστοί καρτουνίστικοι μαστόδοντες (που μοιάζουν με ελέφαντες) πετάνε ένα χάρτινο αεροπλάνο μεταξύ τους. Περιβάλλονται από έναν φωτεινό μπλε ουρανό και αιωρούμενους πλανήτες με δέντρα και περισσότερους μαστόδοντες πάνω τους. hosted_on: Το Mastodon φιλοξενείται στο %{domain} title: Σχετικά accounts: @@ -1745,6 +1746,7 @@ el: types: blocking: Λίστα αποκλεισμού bookmarks: Σελιδοδείκτες + custom_filters: Φίλτρα domain_blocking: Λίστα αποκλεισμένων τομέων following: Λίστα λογαριασμών που ακολουθείτε lists: Λίστες diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml index 11586aac66..c417fd9e05 100644 --- a/config/locales/es-AR.yml +++ b/config/locales/es-AR.yml @@ -4,6 +4,7 @@ es-AR: about_mastodon_html: 'La red social del futuro: ¡sin publicidad, sin vigilancia corporativa, con diseño ético y descentralización! ¡Con Mastodon vos sos el dueño de tus datos!' contact_missing: No establecido contact_unavailable: No disponible + default_thumbnail_description: Dos dibujos de mastodontes sonrientes (que se parecen a elefantes) se lanzan un avión de papel el uno al otro. A su alrededor, un cielo azul claro y planetas flotando con árboles y más mastodontes en ellos. hosted_on: Mastodon alojado en %{domain} title: Información accounts: @@ -1745,6 +1746,7 @@ es-AR: types: blocking: Lista de bloqueados bookmarks: Marcadores + custom_filters: Filtros domain_blocking: Lista de dominios bloqueados following: Lista de seguidos lists: Listas diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml index 2cca9a809f..be6db66355 100644 --- a/config/locales/es-MX.yml +++ b/config/locales/es-MX.yml @@ -4,6 +4,7 @@ es-MX: about_mastodon_html: 'La red social del futuro: ¡Sin anuncios, sin vigilancia corporativa, con un diseño ético y descentralizada! ¡Sé dueño de tus datos con Mastodon!' contact_missing: No establecido contact_unavailable: No disponible + default_thumbnail_description: Dos dibujos de mastodontes sonrientes (que parecen elefantes) se lanzan un avión de papel el uno al otro. Están rodeados por un cielo azul brillante y planetas flotantes con árboles y más mastodontes en ellos. hosted_on: Mastodon alojado en %{domain} title: Acerca de accounts: @@ -1665,7 +1666,9 @@ es-MX: empty: Archivo CSV vacío incompatible_type: Incompatible con el tipo de importación seleccionado invalid_csv_file: 'Archivo CSV no válido. Error: %{error}' + invalid_json_file: 'Fichero JSON no válido. Error: %{error}' over_rows_processing_limit: contiene más de %{count} filas + status_not_found_warning: Algunos de tus filtros ocultan publicaciones específicas que este servidor no conoce. Estas publicaciones no se filtrarán automáticamente si el servidor las detecta más adelante. too_large: El archivo es demasiado grande failures: Fallos imported: Importado @@ -1682,6 +1685,9 @@ es-MX: bookmarks_html: one: Estás a punto de reemplazar tus marcadores por %{count} publicación proveniente de %{filename}. other: Estás a punto de reemplazar tus marcadores por hasta %{count} publicaciones provenientes de %{filename}. + custom_filters_html: + one: Estás a punto de reemplazar tus filtros por el contenido de %{filename}. Se añadirán hasta %{count} filtro a los nuevos filtros. + other: Estás a punto de reemplazar tus filtros por el contenido de %{filename}. Se añadirán hasta %{count} filtros a los nuevos filtros. domain_blocking_html: one: Estás a punto de reemplazar tu lista de dominios bloqueados con %{count} dominio de %{filename}. other: Estás a punto de reemplazar tu lista de dominios bloqueados con hasta %{count} dominios de %{filename}. @@ -1701,6 +1707,9 @@ es-MX: bookmarks_html: one: Estás a punto de agregar %{count} publicación de %{filename} a tus marcadores. other: Estás a punto de agregar %{count} publicaciones de %{filename} a tus marcadores. + custom_filters_html: + one: Estás a punto de añadir %{count} filtro de %{filename} a tus filtros. + other: Estás a punto de añadir hasta %{count} filtros de %{filename} a tus filtros. domain_blocking_html: one: Estás a punto de bloquear %{count} dominio de %{filename}. other: Estás a punto de bloquear hasta %{count} dominios de %{filename}. @@ -1737,6 +1746,7 @@ es-MX: types: blocking: Lista de bloqueados bookmarks: Marcadores + custom_filters: Filtros domain_blocking: Lista de dominios bloqueados following: Lista de seguidos lists: Listas diff --git a/config/locales/es.yml b/config/locales/es.yml index 2dba7af9a3..75299cdd71 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -4,6 +4,7 @@ es: about_mastodon_html: 'La red social del futuro: ¡Sin anuncios, sin vigilancia corporativa, diseño ético, y descentralización! ¡Sé dueño de tu información con Mastodon!' contact_missing: No establecido contact_unavailable: N/D + default_thumbnail_description: Dos dibujos de mastodontes sonrientes (que se parecen a elefantes) se lanzan un avión de papel el uno al otro. A su alrededor, un cielo azul claro y planetas flotando con árboles y más mastodontes en ellos. hosted_on: Mastodon alojado en %{domain} title: Acerca de accounts: @@ -1667,7 +1668,9 @@ es: empty: Archivo CSV vacío incompatible_type: Incompatible con el tipo de importación seleccionado invalid_csv_file: 'Archivo CSV no válido. Error: %{error}' + invalid_json_file: 'Fichero JSON no válido. Error: %{error}' over_rows_processing_limit: contiene más de %{count} filas + status_not_found_warning: Algunos de tus filtros ocultan publicaciones específicas que no son conocidas por este servidor. Estas publicaciones no se filtrarán automáticamente si más tarde son descubiertas por el servidor. too_large: El archivo es demasiado grande failures: Fallos imported: Importado @@ -1703,6 +1706,9 @@ es: bookmarks_html: one: Está a punto de añadir %{count} publicación proveniente de %{filename} a tus marcadores. other: Está a punto de añadir hasta %{count} publicaciones provenientes de %{filename} a tus marcadores. + custom_filters_html: + one: Estás a punto de añadir hasta %{count} filtro desde %{filename} a tus filtros. + other: Estás a punto de añadir hasta %{count} filtros desde %{filename} a tus filtros. domain_blocking_html: one: Estás a punto de bloquear %{count} dominio proveniente de %{filename}. other: Estás a punto de bloquear hasta %{count} dominios provenientes de %{filename}. @@ -1739,6 +1745,7 @@ es: types: blocking: Lista de bloqueados bookmarks: Marcadores + custom_filters: Filtros domain_blocking: Lista de dominios bloqueados following: Lista de seguidos lists: Listas diff --git a/config/locales/et.yml b/config/locales/et.yml index c5654dce02..cdd55f881b 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -505,6 +505,15 @@ et: no_lists_yet: Veel pole loetelusid last_email: Viimane e-post lead: Allpool kuvatakse kontod, kus see funktsioon on aktiveeritud ja millel on tellijaid. + show: + date: Liitumise kuupäev + disable_feature: Lülita funktsionaalsus välja + disabled: See funktsionaalsus on lülitatud välja ja e-kirju enam seda loendisse ei saadeta. + email: E-posti aadress + empty: + hint: Mitte keegi pole seda kontot veel tellinud. + no_subscribers_yet: Tellijaid veel pole + enable_feature: Lülita funktsionaalsus sisse status: Olek subscribers: Tellijad title: Meililistid @@ -662,7 +671,7 @@ et: stop: Peata edastus unavailable: Pole saadaval delivery_available: Üleandmine on saadaval - delivery_error_days: Edastustõrgete päevad + delivery_error_days: Päevad, millal tekkis edastusvigu delivery_error_hint: Kui edastus pole võimalik %{count} päeva, märgitakse automaatselt edastamatuks. destroyed_msg: Domeeni %{domain} andmed on märgitud lõplikuks kustutamiseks. empty: Domeene ei leidu. @@ -1531,7 +1540,9 @@ et: success_html: Nüüdsest hakkad saama e-kirju, kui %{name} avaldab uusi postitusi. Lisa %{sender} oma kontaktide hulka, et need postitused ei satuks rämpsposti kausta. title: Oled registreeritud unsubscribe: Lõpeta tellimus + disabled: Väljalülitatud inactive: Mitteaktiivne + no_access: Ligipääs puudub status: Olek subscribers: Tellijad emoji_styles: @@ -1646,7 +1657,8 @@ et: errors: empty: Tühi CSV-fail incompatible_type: Ei sobi kokku valitud importimistüübiga - invalid_csv_file: 'Vigane CSV-fail. Tõrge: %{error}' + invalid_csv_file: 'Vigane CSV-fail. Veateade: %{error}' + invalid_json_file: 'Vigane JSON-fail. Viga: %{error}' over_rows_processing_limit: sisaldab rohkem, kui %{count} rida too_large: Fail on liiga suur failures: Ebaõnnestumised @@ -1683,6 +1695,9 @@ et: bookmarks_html: one: Oled lisamas kuni %{count} postituse failist %{filename} oma järjehoidjatesse. other: Oled lisamas kuni %{count} postitust failist %{filename} oma järjehoidjatesse. + custom_filters_html: + one: Sa oled %{filename} failist lisamas oma filtrite hulka %{count} filtri. + other: Sa oled %{filename} failist lisamas oma filtrite hulka %{count} filtrit. domain_blocking_html: one: Oled blokeerimas kuni %{count} domeeni failist %{filename}. other: Oled blokeerimas kuni %{count} domeeni failist %{filename}. @@ -1719,6 +1734,7 @@ et: types: blocking: Blokeeringute nimekiri bookmarks: Järjehoidjad + custom_filters: Filtrid domain_blocking: Domeeniblokeeringute nimekiri following: Jälgimiste nimekiri lists: Loetelud @@ -2348,13 +2364,13 @@ et: webauthn_credentials: add: Uue turvavõtme lisamine create: - error: Turvavõtme lisamisel tekkis tõrge. Proovi palun uuesti. + error: Turvavõtme lisamisel tekkis viga või probleem. Proovi palun uuesti. success: Turvavõti edukalt lisatud. delete: Kustuta delete_confirmation: Kindel, et kustutada see turvavõti? description_html: Lubades turvavõtmega autentimise on sisenemisel tarvis ühte turvavõtmetest. destroy: - error: Turvavõtme kustutamisel tekkis tõrge. Palun proovi uuesti. + error: Turvavõtme kustutamisel tekkis viga või probleem. Palun proovi uuesti. success: Turvavõtmed edukalt kustutatud. invalid_credential: Vigane turvavõti nickname: Hüüdnimi diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 9c933c1c16..41056d21f0 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -4,6 +4,7 @@ fi: about_mastodon_html: 'Tulevaisuuden sosiaalinen verkosto: ei mainoksia, ei valvontaa, toteutettu avoimilla protokollilla ja hajautettu rakenne! Pidä tietosi ominasi Mastodonin avulla!' contact_missing: Ei asetettu contact_unavailable: Ei saatavilla + default_thumbnail_description: Kaksi hymyilevää sarjakuvamastodonttia (jotka näyttävät norsuilta) heittelee paperilennokkia toisilleen. Taustalla on kirkkaansininen taivas ja kelluvia planeettoja, joilla on puita ja lisää mastodontteja. hosted_on: Mastodon palvelimella %{domain} title: Tietoja accounts: @@ -1732,6 +1733,7 @@ fi: types: blocking: Estoluettelo bookmarks: Kirjanmerkit + custom_filters: Suodattimet domain_blocking: Verkkotunnusten estoluettelo following: Seurattavien luettelo lists: Listat diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml index 14aa6424cb..57f3f5c4d0 100644 --- a/config/locales/fr-CA.yml +++ b/config/locales/fr-CA.yml @@ -4,6 +4,7 @@ fr-CA: about_mastodon_html: 'Le réseau social de l''avenir : pas de publicité, pas de surveillance institutionnelle, conception éthique et décentralisation ! Gardez le contrôle de vos données avec Mastodon !' contact_missing: Non défini contact_unavailable: Non disponible + default_thumbnail_description: Un dessin représentant deux mastodontes (qui ressemblent à des éléphants) souriants qui se lancent un avion en papier. Derrière eux flottent des planètes avec des arbres et d'autres mastodontes, et en fond un ciel bleu vif. hosted_on: Serveur Mastodon hébergé sur %{domain} title: À propos accounts: @@ -1665,7 +1666,9 @@ fr-CA: empty: Fichier CSV vide incompatible_type: Incompatible avec le type d’import sélectionné invalid_csv_file: 'Fichier CSV non valide. Erreur : %{error}' + invalid_json_file: 'Fichier JSON non valide. Erreur : %{error}' over_rows_processing_limit: contient plus de %{count} lignes + status_not_found_warning: Certains de vos filtres masquent des messages spécifiques qui ne sont pas connus par ce serveur. Ces messages ne seront pas filtrés automatiquement s'ils sont découverts plus tard par le serveur. too_large: Fichier trop lourd failures: Échecs imported: Importé @@ -1677,42 +1680,48 @@ fr-CA: overwrite_long: Remplacer les enregistrements actuels par les nouveaux overwrite_preambles: blocking_html: - one: Vous allez remplacer votre liste de blocage par près de %{count} compte tiré de %{filename}. - other: Vous allez remplacer votre liste de blocage par près de %{count} comptes tirés de %{filename}. + one: Vous allez remplacer votre liste de blocage par au maximum %{count} compte issu de %{filename}. + other: Vous allez remplacer votre liste de blocage par au maximum %{count} comptes issus de %{filename}. bookmarks_html: - one: Vous allez remplacer vos signets par près de %{count} post tiré de %{filename}. - other: Vous allez remplacer vos signets par près de %{count} posts tirés de %{filename}. + one: Vous allez remplacer vos marque-pages par au maximum %{count} message issu de %{filename}. + other: Vous allez remplacer vos marque-pages par au maximum %{count} messages issus de %{filename}. + custom_filters_html: + one: Vous allez remplacer vos filtres par le contenu de %{filename}. Au maximum %{count} filtre sera ajouté aux nouveaux filtres. + other: Vous allez remplacer vos filtres par le contenu de %{filename}. Au maximum %{count} filtres seront ajoutés aux nouveaux filtres. domain_blocking_html: - one: Vous allez remplacer votre liste de blocage de domaines par près de %{count} domaine tiré de %{filename}. - other: Vous allez remplacer votre liste de blocage de domaines par près de %{count} domaines tirés de %{filename}. + one: Vous allez remplacer votre liste de domaines bloqués par au maximum %{count} domaine issu de %{filename}. + other: Vous allez remplacer votre liste de domaines bloqués par au maximum %{count} domaines issus de %{filename}. following_html: - one: Vous allez suivre jusqu’à %{count} compte depuis %{filename} et arrêter de suivre n’importe qui d’autre. - other: Vous allez suivre jusqu’à %{count} comptes depuis %{filename} et arrêter de suivre n’importe qui d’autre. + one: Vous allez suivre jusqu’à %{count} compte issu de %{filename} et arrêter de suivre n’importe qui d’autre. + other: Vous allez suivre jusqu’à %{count} comptes issus de %{filename} et arrêter de suivre n’importe qui d’autre. lists_html: - one: Vous allez remplacer vos listes par le contenu de %{filename}. Près de %{count} compte sera ajouté à de nouvelles listes. - other: Vous allez remplacer vos listes par le contenu de %{filename}. Près de %{count} comptes seront ajoutés à de nouvelles listes. + one: Vous allez remplacer vos listes par le contenu de %{filename}. Au maximum %{count} compte sera ajouté aux nouvelles listes. + other: Vous allez remplacer vos listes par le contenu de %{filename}. Au maximum %{count} comptes seront ajoutés aux nouvelles listes. muting_html: - one: Vous allez remplacer votre liste de comptes masqués par près de %{count} compte tiré de %{filename}. - other: Vous allez remplacer votre liste de comptes masqués par près de %{count} comptes tirés de %{filename}. + one: Vous allez remplacer votre liste de comptes masqués par au maximum %{count} compte issu de %{filename}. + other: Vous allez remplacer votre liste de comptes masqués par au maximum %{count} comptes issus de %{filename}. preambles: blocking_html: - one: Vous allez bloquer près de %{count} compte tiré de %{filename}. - other: Vous allez bloquer près de %{count} comptes tirés de %{filename}. + one: Vous allez bloquer jusqu'à %{count} compte issu de %{filename}. + other: Vous allez bloquer jusqu'à %{count} comptes issus de %{filename}. bookmarks_html: - one: Vous allez ajouter près de %{count} message de %{filename} à vos signets. - other: Vous allez ajouter près de %{count} messages de %{filename} à vos signets. + one: Vous allez ajouter jusqu'à %{count} message de %{filename} à vos marque-pages. + other: Vous allez ajouter jusqu'à %{count} messages de %{filename} à vos marque-pages. + custom_filters_html: + one: Vous allez ajouter jusqu'à %{count} filtre de %{filename} à vos filtres. + other: Vous allez ajouter jusqu'à %{count} filtres de %{filename} à vos filtres. domain_blocking_html: - one: Vous allez bloquer près de %{count} domaine tiré de %{filename}. - other: Vous allez bloquer près de %{count} domaines tirés de %{filename}. + one: Vous allez bloquer jusqu'à %{count} domaine issu de %{filename}. + other: Vous allez bloquer jusqu'à %{count} domaines issus de %{filename}. following_html: - one: Vous allez suivre près de %{count} compte tiré de %{filename}. - other: Vous allez suivre près de %{count} comptes tirés de %{filename}. + one: Vous allez suivre jusqu'à %{count} compte issu de %{filename}. + other: Vous allez suivre jusqu'à %{count} comptes issus de %{filename}. lists_html: - one: Vous allez ajouter près de %{count} compte depuis %{filename} à vos listes. De nouvelles listes seront créées si besoin. - other: Vous allez ajouter près de %{count} comptes depuis %{filename} à vos listes. De nouvelles listes seront créées si besoin. + one: Vous allez ajouter jusqu'à %{count} compte issu de %{filename} à vos listes. De nouvelles listes seront créées si besoin. + other: Vous allez ajouter jusqu'à %{count} comptes issus de %{filename} à vos listes. De nouvelles listes seront créées si besoin. muting_html: - one: Vous allez masquer près de %{count} compte tiré de %{filename}. - other: Vous allez masquer près de %{count} comptes tirés de %{filename}. + one: Vous allez masquer jusqu'à %{count} compte issu de %{filename}. + other: Vous allez masquer jusqu'à %{count} comptes issus de %{filename}. preface: Vous pouvez importer certaines données que vous avez exporté d’un autre serveur, comme une liste des personnes que vous suivez ou bloquez sur votre compte. recent_imports: Importations récentes states: @@ -1737,6 +1746,7 @@ fr-CA: types: blocking: Liste de comptes bloqués bookmarks: Marque-pages + custom_filters: Filtres domain_blocking: Liste des serveurs bloqués following: Liste d’utilisateur·rice·s suivi·e·s lists: Listes diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 7f5deae4d4..710facd5b6 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -4,6 +4,7 @@ fr: about_mastodon_html: 'Le réseau social de l''avenir : pas de publicité, pas de surveillance institutionnelle, conception éthique et décentralisation ! Gardez le contrôle de vos données avec Mastodon !' contact_missing: Non défini contact_unavailable: Non disponible + default_thumbnail_description: Un dessin représentant deux mastodontes (qui ressemblent à des éléphants) souriants qui se lancent un avion en papier. Derrière eux flottent des planètes avec des arbres et d'autres mastodontes, et en fond un ciel bleu vif. hosted_on: Serveur Mastodon hébergé sur %{domain} title: À propos accounts: @@ -1658,18 +1659,20 @@ fr: other: Sélectionnez tous l'ensemble des %{count} éléments correspondant à votre recherche. today: aujourd’hui validation_errors: - one: Quelque chose ne va pas ! Veuillez vérifiez l’erreur ci-dessous + one: Quelque chose ne va pas ! Veuillez vérifier l’erreur ci-dessous other: Certaines choses ne vont pas ! Veuillez vérifier les %{count} erreurs ci-dessous imports: errors: empty: Fichier CSV vide incompatible_type: Incompatible avec le type d’import sélectionné invalid_csv_file: 'Fichier CSV non valide. Erreur : %{error}' + invalid_json_file: 'Fichier JSON non valide. Erreur : %{error}' over_rows_processing_limit: contient plus de %{count} lignes + status_not_found_warning: Certains de vos filtres masquent des messages spécifiques qui ne sont pas connus par ce serveur. Ces messages ne seront pas filtrés automatiquement s'ils sont découverts plus tard par le serveur. too_large: Le fichier est trop lourd failures: Échecs imported: Importé - mismatched_types_warning: Il semblerait que vous avez sélectionné le mauvais type pour cet import, veuillez vérifier attentivement. + mismatched_types_warning: Il semblerait que vous avez sélectionné le mauvais type pour cet import, veuillez vérifier. modes: merge: Fusionner merge_long: Garder les enregistrements existants et ajouter les nouveaux @@ -1677,43 +1680,49 @@ fr: overwrite_long: Remplacer les enregistrements actuels par les nouveaux overwrite_preambles: blocking_html: - one: Vous allez remplacer votre liste de blocage par près de %{count} compte tiré de %{filename}. - other: Vous allez remplacer votre liste de blocage par près de %{count} comptes tirés de %{filename}. + one: Vous allez remplacer votre liste de blocage par au maximum %{count} compte issu de %{filename}. + other: Vous allez remplacer votre liste de blocage par au maximum %{count} comptes issus de %{filename}. bookmarks_html: - one: Vous allez remplacer vos signets par près de %{count} post tiré de %{filename}. - other: Vous allez remplacer vos signets par près de %{count} posts tirés de %{filename}. + one: Vous allez remplacer vos marque-pages par au maximum %{count} message issu de %{filename}. + other: Vous allez remplacer vos marque-pages par au maximum %{count} messages issus de %{filename}. + custom_filters_html: + one: Vous allez remplacer vos filtres par le contenu de %{filename}. Au maximum %{count} filtre sera ajouté aux nouveaux filtres. + other: Vous allez remplacer vos filtres par le contenu de %{filename}. Au maximum %{count} filtres seront ajoutés aux nouveaux filtres. domain_blocking_html: - one: Vous allez remplacer votre liste de blocage de domaines par près de %{count} domaine tiré de %{filename}. - other: Vous allez remplacer votre liste de blocage de domaines par près de %{count} domaines tirés de %{filename}. + one: Vous allez remplacer votre liste de domaines bloqués par au maximum %{count} domaine issu de %{filename}. + other: Vous allez remplacer votre liste de domaines bloqués par au maximum %{count} domaines issus de %{filename}. following_html: - one: Vous allez suivre jusqu’à %{count} compte depuis %{filename} et arrêter de suivre n’importe qui d’autre. - other: Vous allez suivre jusqu’à %{count} comptes depuis %{filename} et arrêter de suivre n’importe qui d’autre. + one: Vous allez suivre jusqu’à %{count} compte issu de %{filename} et arrêter de suivre n’importe qui d’autre. + other: Vous allez suivre jusqu’à %{count} comptes issus de %{filename} et arrêter de suivre n’importe qui d’autre. lists_html: - one: Vous allez remplacer vos listes par le contenu de %{filename}. Près de %{count} compte sera ajouté à de nouvelles listes. - other: Vous allez remplacer vos listes par le contenu de %{filename}. Près de %{count} comptes seront ajoutés à de nouvelles listes. + one: Vous allez remplacer vos listes par le contenu de %{filename}. Au maximum %{count} compte sera ajouté aux nouvelles listes. + other: Vous allez remplacer vos listes par le contenu de %{filename}. Au maximum %{count} comptes seront ajoutés aux nouvelles listes. muting_html: - one: Vous allez remplacer votre liste de comptes masqués par près de %{count} compte tiré de %{filename}. - other: Vous allez remplacer votre liste de comptes masqués par près de %{count} comptes tirés de %{filename}. + one: Vous allez remplacer votre liste de comptes masqués par au maximum %{count} compte issu de %{filename}. + other: Vous allez remplacer votre liste de comptes masqués par au maximum %{count} comptes issus de %{filename}. preambles: blocking_html: - one: Vous allez bloquer près de %{count} compte tiré de %{filename}. - other: Vous allez bloquer près de %{count} comptes tirés de %{filename}. + one: Vous allez bloquer jusqu'à %{count} compte issu de %{filename}. + other: Vous allez bloquer jusqu'à %{count} comptes issus de %{filename}. bookmarks_html: - one: Vous allez ajouter près de %{count} message de %{filename} à vos signets. - other: Vous allez ajouter près de %{count} messages de %{filename} à vos signets. + one: Vous allez ajouter jusqu'à %{count} message de %{filename} à vos marque-pages. + other: Vous allez ajouter jusqu'à %{count} messages de %{filename} à vos marque-pages. + custom_filters_html: + one: Vous allez ajouter jusqu'à %{count} filtre de %{filename} à vos filtres. + other: Vous allez ajouter jusqu'à %{count} filtres de %{filename} à vos filtres. domain_blocking_html: - one: Vous allez bloquer près de %{count} domaine tiré de %{filename}. - other: Vous allez bloquer près de %{count} domaines tirés de %{filename}. + one: Vous allez bloquer jusqu'à %{count} domaine issu de %{filename}. + other: Vous allez bloquer jusqu'à %{count} domaines issus de %{filename}. following_html: - one: Vous allez suivre près de %{count} compte tiré de %{filename}. - other: Vous allez suivre près de %{count} comptes tirés de %{filename}. + one: Vous allez suivre jusqu'à %{count} compte issu de %{filename}. + other: Vous allez suivre jusqu'à %{count} comptes issus de %{filename}. lists_html: - one: Vous allez ajouter près de %{count} compte depuis %{filename} à vos listes. De nouvelles listes seront créées si besoin. - other: Vous allez ajouter près de %{count} comptes depuis %{filename} à vos listes. De nouvelles listes seront créées si besoin. + one: Vous allez ajouter jusqu'à %{count} compte issu de %{filename} à vos listes. De nouvelles listes seront créées si besoin. + other: Vous allez ajouter jusqu'à %{count} comptes issus de %{filename} à vos listes. De nouvelles listes seront créées si besoin. muting_html: - one: Vous allez masquer près de %{count} compte tiré de %{filename}. - other: Vous allez masquer près de %{count} comptes tirés de %{filename}. - preface: Vous pouvez importer certaines données que vous avez exporté d’un autre serveur, comme une liste des personnes que vous suivez ou bloquez sur votre compte. + one: Vous allez masquer jusqu'à %{count} compte issu de %{filename}. + other: Vous allez masquer jusqu'à %{count} comptes issus de %{filename}. + preface: Vous pouvez importer certaines données que vous avez exportées d’un autre serveur, comme une liste des personnes que vous suivez ou bloquez sur votre compte. recent_imports: Récents imports states: finished: Terminé @@ -1732,15 +1741,16 @@ fr: muting: En cours d’importation des comptes masqués type: Type d’import type_groups: - constructive: Abonnements et signets - destructive: Blocages et masquages + constructive: Abonnements et marque-pages + destructive: Comptes bloqués et masqués types: blocking: Liste de comptes bloqués bookmarks: Marque-pages + custom_filters: Filtres domain_blocking: Liste des serveurs bloqués following: Liste de comptes suivis lists: Listes - muting: Liste de comptes que vous masquez + muting: Liste de comptes masqués upload: Importer invites: delete: Désactiver diff --git a/config/locales/ga.yml b/config/locales/ga.yml index 88791e38ad..7f34eb1401 100644 --- a/config/locales/ga.yml +++ b/config/locales/ga.yml @@ -4,6 +4,7 @@ ga: about_mastodon_html: 'Líonra sóisialta a sheasfaidh an aimsir: Gan fógraíocht, gan faire chorparáideach, le leagan amach eiticiúil agus dílárú. Bíodh do chuid sonraí agatsa féin le Mastodon!' contact_missing: Gan socrú contact_unavailable: N/A + default_thumbnail_description: Beirt mhastodón cartúin (atá cosúil le heilifintí) ag aoibh gháire agus ag caitheamh eitleáin páipéir eatarthu. Tá spéir ghorm gheal agus pláinéid ar snámh timpeall orthu, crainn agus níos mó mhastodón orthu. hosted_on: Mastodon arna óstáil ar %{domain} title: Maidir le accounts: @@ -1754,7 +1755,9 @@ ga: empty: Comhad CSV folamh incompatible_type: Neamh-chomhoiriúnach leis an gcineál iompórtála roghnaithe invalid_csv_file: 'Comhad CSV neamhbhailí. Earráid: %{error}' + invalid_json_file: 'Comhad JSON neamhbhailí. Earráid: %{error}' over_rows_processing_limit: níos mó ná %{count} sraitheanna + status_not_found_warning: Cuireann cuid de do scagairí poist shonracha i bhfolach nach bhfuil ar eolas ag an bhfreastalaí seo. Ní scagfar na poist seo go huathoibríoch má aimsíonn an freastalaí iad níos déanaí. too_large: Tá an comhad ró-mhór failures: Teipeanna imported: Iompórtáilte @@ -1777,6 +1780,12 @@ ga: one: Tá tú ar tí do leabharmharcanna a chur in ionad suas le %{count} postáil ó %{filename}. other: Tá tú ar tí do leabharmharcanna a chur in ionad suas le %{count} postáil ó %{filename}. two: Tá tú ar tí do leabharmharcanna a chur in ionad suas le %{count} postáil ó %{filename}. + custom_filters_html: + few: Tá tú ar tí do scagairí a athsholáthar le hábhar %{filename}. Cuirfear suas le %{count} scagairí leis na scagairí nua. + many: Tá tú ar tí do scagairí a athsholáthar le hábhar %{filename}. Cuirfear suas le %{count} scagairí leis na scagairí nua. + one: Tá tú ar tí do scagairí a athsholáthar le hábhar %{filename}. Cuirfear suas le %{count} scagaire leis na scagairí nua. + other: Tá tú ar tí do scagairí a athsholáthar le hábhar %{filename}. Cuirfear suas le %{count} scagairí leis na scagairí nua. + two: Tá tú ar tí do scagairí a athsholáthar le hábhar %{filename}. Cuirfear suas le %{count} scagairí leis na scagairí nua. domain_blocking_html: few: Tá tú ar tí do liosta bloc fearainn a chur in ionad suas le %{count} fearainn ó %{filename}. many: Tá tú ar tí do liosta bloc fearainn a chur in ionad suas le %{count} fearainn ó %{filename}. @@ -1814,6 +1823,12 @@ ga: one: Tá tú ar tí %{count} postáil ó %{filename} a chur le do leabharmharcanna. other: Tá tú ar tí %{count} postáil ó %{filename} a chur le do leabharmharcanna. two: Tá tú ar tí %{count} postáil ó %{filename} a chur le do leabharmharcanna. + custom_filters_html: + few: Tá tú ar tí suas le %{count} scagairí ó %{filename} a chur le do scagairí. + many: Tá tú ar tí suas le %{count} scagairí ó %{filename} a chur le do scagairí. + one: Tá tú ar tí suas le %{count} scagaire ó %{filename} a chur le do scagairí. + other: Tá tú ar tí suas le %{count} scagairí ó %{filename} a chur le do scagairí. + two: Tá tú ar tí suas le %{count} scagairí ó %{filename} a chur le do scagairí. domain_blocking_html: few: Tá tú ar tí bhac suas le %{count} bhfearainn ó %{filename}. many: Tá tú ar tí bhac suas le %{count} bhfearainn ó %{filename}. @@ -1862,6 +1877,7 @@ ga: types: blocking: Liosta blocála bookmarks: Leabharmharcanna + custom_filters: Scagairí domain_blocking: Liosta blocála fearainn following: Liosta ina dhiaidh sin lists: Liostaí diff --git a/config/locales/gd.yml b/config/locales/gd.yml index c231da24a7..a77c55885a 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -353,14 +353,22 @@ gd: updated_msg: Chaidh am brath-fios ùrachadh! collections: accounts: Cunntasan + back_to_account: Till gu duilleag a’ chunntais + back_to_report: Till gu duilleag a’ ghearain + batch: + add_to_report: 'Cuir ris a’ ghearan #%{id}' + remove_from_report: Thoir air falbh on ghearan + report: Dèan gearan collection_title: Cruinneachadh le %{name} contents: Susbaint + no_collection_selected: Cha deach cruinneachadh sam bith atharrachadh o nach deach gin dhiubh a thaghadh number_of_accounts: few: "%{count} cunntasan" one: "%{count} chunntas" other: "%{count} cunntas" two: "%{count} chunntas" open: Fosgail + title: Cruinneachaidhean a’ chunntais – @%{name} view_publicly: Seall gu poblach critical_update_pending: Ùrachadh èiginneach ri dhèiligeadh custom_emojis: @@ -504,9 +512,78 @@ gd: title: Bac àrainn puist-d ùr no_email_domain_block_selected: Cha deach bacadh àrainn puist-d sam bith atharrachadh o nach deach gin dhiubh a thaghadh not_permitted: Chan eil seo ceadaichte + reset: Ath-shuidhich resolved_dns_records_hint_html: Thèid ainm na h-àrainne fhuasgladh nan àrainnean MX a leanas agus an urra riutha-san gun gabh iad ri post-d. Ma bhacas tu àrainn MX, bacaidh seo an clàradh o sheòladh puist-d sam bith a chleachdas an aon àrainn MX fiù ’s ma bhios ainm àrainne eadar-dhealaichte ’ga sealltainn. Thoir an aire nach bac thu solaraichean puist-d mòra. resolved_through_html: Chaidh fuasgladh slighe %{domain} + search: Lorg title: Bacadh àrainnean puist-d + email_subscriptions: + accounts: + account: Cunntas + empty: + hint: Chan eil fo-sgrìobhaiche aig cunntas sam bith fhathast. + no_lists_yet: Chan eil liosta ann fhathast + last_email: Am post-d mu dheireadh + lead: Thèid na cunntasan a chuir an gleus an comas agus aig a bheil fo-sgrìobhaichean a shealltainn gu h-ìosal. + show: + confirm_remove_subscriber: Chan fhaigh %{email} puist-d o %{name} tuilleadh. Cha ghabh an gnìomh seo a neo-dhèanamh. + consent: Cha do ghabh na fo-sgrìobhaichean ach ri faighinn nam post air a’ phost-d. Na cleachd an liosta seo air adhbhar sam bith eile. + date: Ceann-latha a’ chlàraidh + disable_feature: Cuir an gleus à comas + disabled: Chaidh an gleus a chur à comas ’s cha dèid puist-d a chur dhan liosta seo tuilleadh. + email: Seòladh puist-d + empty: + hint: Cha do dh’fho-sgrìobh neach sam bith dhan chunntas seo fhathast. + no_subscribers_yet: Chan eil fo-sgrìobhaiche ann fhathast + enable_feature: Cuir an gleus an comas + no_access_html: Chan eil cead aig a’ chunntas seo tuilleadh gus an gleus a chur an comas. Atharraich seo sna dreuchdan. + title: Cuairt-litrichean puist-d aig %{name} + view_account: Seall an cunntas + status: Staid + subscribers: Fo-sgrìobhaichean + title: Liostaichean-puist + additional_footer_texts: + show: + title: Teacsa banna-choise a bharrachd + compliance_settings: + additional_footer_text: + action: Stiùirich + hint: Roghainneil teacsa a nochdas sa bhann-choise aig cuairt-litrichean puist-d a-mhàin + title: Teacsa banna-choise a bharrachd + lead: Dh’fhaoidte gum beachdaichear air cuairt-litrichean mar puist-d margaidheachd a-rèir nan uachdranasan laghail far a bheil thu ag obair. + privacy_policy: + action: Stiùirich + hint: Thèid ceangal ris a’ phoileasaidh seo a chur ri bann-coise gach puist-d + title: Poileasaidh prìobhaideachd + danger_zone: + disable_feature: + action: Cuir à comas + hint: Cuir an gleus à comas dhan a h-uile cunntas + title: Cuir an gleus à comas + erase_all_data: + action: Suath bàn an dàta + hint: Sguabaidh seo às a h-uile post-d aig a h-uile liosta puist-d gu buan + title: Suath bàn an dàta air fad + title: Earrann chunnartach + disabled_msg: Chaidh na fo-sgrìobhaidhean puist-d a chur à comas. + index: + disabled: + cannot_be_enabled: Cha do chuir an solaraiche teicnigeach agad an gleus seo an comas air an fhrithealaiche agad. + get_started: Dèan toiseach-tòiseachaidh + title: Cuairt-litrichean puist-d + roles: + accounts: Cunntasan + edit_role: Deasaich an dreuchd + empty: + hint: Chan fhaod neach sam bith an gleus seo a chleachdadh. + no_roles_added: Cha deach dreuchd a chur ris + manage_roles: Stiùirich na dreuchdan + role_name: Ainm na dreuchd + title: Dreuchdan + setups: + show: + enable_feature: Cuir an gleus an comas + important_information: Fiosrachadh cudromach export_domain_allows: new: title: Ion-phortaich àrainnean ceadaichte @@ -699,6 +776,7 @@ gd: action_log: Sgrùd an loga action_taken_by: Chaidh an gnìomh a ghabhail le actions: + delete_description_html: Thèid na postaichean agus/no cruinneachaidhean le gearan orra a sguabadh às agus rabhadh a chlàradh gus do chuideachadh ach am bi thu nas teinne le droch-ghiùlan on aon chunntas sam àm ri teachd. mark_as_sensitive_description_html: Thèid comharra an fhrionasachd a chur ris na meadhanan sna postaichean le gearan orra agus rabhadh a chlàradh gus do chuideachadh ach am bi thu nas teinne le droch-ghiùlan on aon chunntas sam àm ri teachd. other_description_html: Seall barrachd roghainnean airson giùlan a’ chunntais a stiùireadh agus an conaltradh leis a’ chunntas a chaidh gearan a dhèanamh mu dhèidhinn a ghnàthachadh. resolve_description_html: Cha dèid gnìomh sam bith a ghabhail an aghaidh a’ chunntais le gearan air agus thèid an gearan a dhùnadh gun rabhadh a chlàradh. @@ -725,6 +803,7 @@ gd: confirm: Dearbh confirm_action: Dearbh gnìomh na maorsainneachd an aghaidh @%{acct} created_at: Chaidh an gearan a dhèanamh + delete_and_resolve: Sguab às an t-susbaint forwarded: Chaidh a shìneadh air adhart forwarded_replies_explanation: Tha an gearan seo o chleachdaiche cèin agus mu shusbaint chèin. Chaidh a shìneadh air adhart thugad on as e freagairt do neach-cleachdaidh agad-sa a tha san t-susbaint a tha na cois. forwarded_to: Chaidh a shìneadh air adhart gu %{domain} @@ -909,6 +988,10 @@ gd: authenticated: Cleachdaichean a chlàraich a-steach a-mhàin disabled: Iarr dreuchd shònraichte a’ chleachdaiche public: A h-uile duine + landing_page: + values: + overview: Foir-shealladh + trends: A’ treandadh registrations: moderation_recommandation: Dèan cinnteach gu bheil sgioba maoir deiseil is deònach agad mus fhosgail thu an clàradh dhan a h-uile duine! preamble: Stiùirich cò dh’fhaodas cunntas a chruthachadh air an fhrithealaiche agad. @@ -928,6 +1011,7 @@ gd: site_uploads: delete: Sguab às am faidhle a chaidh a luchdadh suas destroyed_msg: Chaidh an luchdadh suas dhan làrach a sguabadh às! + skip_to_content: Thoir leum dhan t-susbaint software_updates: critical_update: Èiginneach – ùraich cho luath ’s a ghabhas description: Mholamaid gun cùm thu an stàladh agad de Mhastodon ùraichte ach am faigh thu buannachd às na càraidhean ’s gleusan as ùire. A bharrachd air sin, bidh e èiginneach aig amannan gun ùraich thu Mastodon gun dàil airson duilgheadasan tèarainteachd a sheachnadh. Seo as adhbhar gun doir Mastodon sùil airson ùrachaidhean gach leth-uair a thìde ’s gun cuir e brath thugad a-rèir nan roghainnean puist-d agad. @@ -1453,6 +1537,7 @@ gd: your_appeal_rejected: Chaidh an t-ath-thagradh agad a dhiùltadh edit_profile: other: Eile + privacy_redesign_body: Taghaidh tu an seall thu an luchd-leantainn agad is cò leanas tu gus nach seall dìreach on phròifil agad. redesign_body: "’S urrainn dhut a’ phròifil agad a dheasachadh air duilleag na pròifile fhèin." redesign_button: Tadhail air redesign_title: Tha dòigh ùr air deasachadh na pròifil againn @@ -1487,7 +1572,9 @@ gd: success_html: Gheibh thu puist-d a-nis nuair a dh’fhoillsicheas %{name} postaichean ùra. Cuir %{sender} ris an luchd-aithne agad ach nach dèid na postaichean seo a chur do phasgan an spama agad. title: Tha thu air clàradh unsubscribe: Cuir crìoch air an fho-sgrìobhadh + disabled: À comas inactive: Neo-ghnìomhach + no_access: Gun inntrigeadh status: Staid subscribers: Fo-sgrìobhaichean emoji_styles: @@ -1523,7 +1610,9 @@ gd: blocks: Tha thu a’ bacadh bookmarks: Comharran-lìn csv: CSV + custom_filters: Criathragan domain_blocks: Bacaidhean àrainne + json: JSON lists: Liostaichean mutes: Tha thu a’ mùchadh storage: Stòras mheadhanan @@ -1615,7 +1704,9 @@ gd: empty: Faidhle CSV falamh incompatible_type: Chan eil e co-chòrdail le seòrsa an ion-phortaidh a thagh thu invalid_csv_file: 'Faidhle CSV mì-dhligheach. Mearachd: %{error}' + invalid_json_file: 'Faidhle JSON mì-dhligheach. Mearachd: %{error}' over_rows_processing_limit: tha còrr is %{count} ràgh(an) ann + status_not_found_warning: Falaichidh cuid dhe na criathragan agad postaichean sònraichte air nach eil am frithealaiche seo eòlach. Cha dèid na postaichean seo a chriathradh gu fèin-obrachail ma gheibh am frithealaiche lorg orra uaireigin sam àm ri teachd. too_large: Tha am faidhle ro mhòr failures: Fàilligidhean imported: Air ion-phortadh @@ -1636,6 +1727,11 @@ gd: one: Tha thu an impis suas ri %{count} phost o %{filename} a chur an àite nan comharra-lìn agad. other: Tha thu an impis suas ri %{count} post o %{filename} a chur an àite nan comharra-lìn agad. two: Tha thu an impis suas ri %{count} phost o %{filename} a chur an àite nan comharra-lìn agad. + custom_filters_html: + few: Tha thu an impis susbaint %{filename} a chur an àite nan criathragan agad. Thèid suas ri %{count} criathragan a chur ri criathragan ùra. + one: Tha thu an impis susbaint %{filename} a chur an àite nan criathragan agad. Thèid suas ri %{count} chriathrag a chur ri criathragan ùra. + other: Tha thu an impis susbaint %{filename} a chur an àite nan criathragan agad. Thèid suas ri %{count} criathrag a chur ri criathragan ùra. + two: Tha thu an impis susbaint %{filename} a chur an àite nan criathragan agad. Thèid suas ri %{count} chriathrag a chur ri criathragan ùra. domain_blocking_html: few: Tha thu an impis suas ri %{count} àrainnean o %{filename} a chur an àite liosta nam bacaidhean àrainne agad. one: Tha thu an impis suas ri %{count} àrainn o %{filename} a chur an àite liosta nam bacaidhean àrainne agad. @@ -1667,6 +1763,11 @@ gd: one: Tha thu an impis suas ri %{count} phost o %{filename} a chur ris na h-annsachdan agad. other: Tha thu an impis suas ri %{count} post o %{filename} a chur ris na h-annsachdan agad. two: Tha thu an impis suas ri %{count} phost o %{filename} a chur ris na h-annsachdan agad. + custom_filters_html: + few: Tha thu an impis suas ri %{count} criathragan o %{filename} a chur ris na criathragan agad. + one: Tha thu an impis suas ri %{count} chriathrag o %{filename} a chur ris na criathragan agad. + other: Tha thu an impis suas ri %{count} criathrag o %{filename} a chur ris na criathragan agad. + two: Tha thu an impis suas ri %{count} chriathrag o %{filename} a chur ris na criathragan agad. domain_blocking_html: few: Tha thu an impis suas ri %{count} àrainnean o %{filename} a bhacadh. one: Tha thu an impis suas ri %{count} àrainn o %{filename} a bhacadh. @@ -1711,6 +1812,7 @@ gd: types: blocking: Liosta-bhacaidh bookmarks: Comharran-lìn + custom_filters: Criathragan domain_blocking: Liosta-bhacaidh àrainnean following: Liosta dhen fheadhainn a leanas tu lists: Liostaichean diff --git a/config/locales/gl.yml b/config/locales/gl.yml index bcf6cdba8c..e74fd0257d 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -4,6 +4,7 @@ gl: about_mastodon_html: 'A rede social do futuro: Sen publicidade, sen seguimento por empresas, deseño ético e descentralización! En Mastodon ti posúes os teus datos!' contact_missing: Non establecido contact_unavailable: Non dispoñíbel + default_thumbnail_description: Dous mastodóns sorrintes debuxados (que semellan elefantes) tiran un avión de papel polo aire entre eles. De fondo vese o ceo azul con planetas flotando entre árbores e máis mastodóns neles. hosted_on: Mastodon aloxado en %{domain} title: Sobre accounts: @@ -1665,7 +1666,9 @@ gl: empty: Ficheiro CSV de baleiro incompatible_type: Non é compatible co tipo de importación seleccionado invalid_csv_file: 'Ficheiro CSV non válido. Erro: %{error}' + invalid_json_file: 'Ficheiro JSON non válido. Erro: %{error}' over_rows_processing_limit: contén máis de %{count} filas + status_not_found_warning: Algún dos teus filtros oculta publicacións concretas que non son coñecidas por este servidor. Estas publicacións non se van filtrar automaticamente se son descubertas máis tarde polo servidor. too_large: O ficheiro é demasiado grande failures: Erros imported: Importado @@ -1682,6 +1685,9 @@ gl: bookmarks_html: one: Vas substituír os marcadores por %{count} publicación desde %{filename}. other: Vas substituír os marcadores por %{count} publicacións desde %{filename}. + custom_filters_html: + one: Vas substituír os teus filtros co contido de %{filename}. Vaise engadir só %{count} filtro aos novos filtros. + other: Vas substituír os teus filtros co contido de %{filename}. Vaise engadir %{count} filtros aos novos filtros. domain_blocking_html: one: Vas substituír a lista de dominios bloqueados por %{count} dominio desde %{filename}. other: Vas substituír a lista de dominios bloqueados por %{count} dominios desde %{filename}. @@ -1701,6 +1707,9 @@ gl: bookmarks_html: one: Vas engadir %{count} publicación desde %{filename} aos teus marcadores. other: Vas engadir %{count} publicacións desde %{filename} aos teus marcadores. + custom_filters_html: + one: Vas a engadir %{count} filtro desde %{filename} aos teus filtros. + other: Vas a engadir %{count} filtros desde %{filename} aos teus filtros. domain_blocking_html: one: Vas bloquear a %{count} dominio desde %{filename}. other: Vas bloquear a %{count} dominios desde %{filename}. @@ -1737,6 +1746,7 @@ gl: types: blocking: Lista de bloqueo bookmarks: Marcadores + custom_filters: Filtros domain_blocking: Lista de bloqueo de dominios following: Lista de seguimento lists: Listas diff --git a/config/locales/he.yml b/config/locales/he.yml index cb0e3e7d42..84652f79e4 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -4,6 +4,7 @@ he: about_mastodon_html: מסטודון היא רשת חברתית חופשית, מבוססת תוכנה חופשית ("קוד פתוח"). כאלטרנטיבה בלתי ריכוזית לפלטפרומות המסחריות, מסטודון מאפשרת להמנע מהסיכונים הנלווים להפקדת התקשורת שלך בידי חברה יחידה. שמת את מבטחך בשרת אחד — לא משנה במי בחרת, תמיד אפשר לדבר עם כל שאר המשתמשים. לכל מי שרוצה יש את האפשרות להקים שרת מסטודון עצמאי, ולהשתתף ברשת החברתית באופן חלק. contact_missing: ללא הגדרה contact_unavailable: לא רלוונטי/חסר + default_thumbnail_description: שני מסטודונים מצויירים (הדומים לפילים) משחקים במטוס נייר. הם מוקפים בשמיים כחולים בהירים ופלנטות מרחפות עם עצים ומסטודונים נוספים עליהם. hosted_on: מסטודון שיושב בכתובת %{domain} title: אודות accounts: @@ -1655,7 +1656,7 @@ he: deprecated_api_multiple_keywords: לא ניתן לשנות פרמטרים אלו מהיישומון הזה בגלל שהם חלים על יותר ממילת מפתח אחת. ניתן להשתמש ביישומון מעודכן יותר או בממשק הוובי. invalid_context: לא סופק הקשר או הקשר לא תקין index: - contexts: פילטרים ב %{contexts} + contexts: סננים ב־%{contexts} delete: למחוק empty: אין לך מסננים. expires_in: פג תוקף ב %{distance} @@ -1680,9 +1681,9 @@ he: save: שמירת מסנן חדש title: הוספת מסנן חדש statuses: - back_to_filter: חזרה לפילטר + back_to_filter: חזרה לסנן batch: - remove: הסרה ממסנן + remove: הסרה מסנן index: hint: סנן זה חל באופן של בחירת הודעות בודדות ללא תלות בקריטריונים אחרים. תוכלו להוסיף עוד הודעות לסנן זה ממנשק הווב. title: הודעות שסוננו @@ -1723,7 +1724,9 @@ he: empty: קובץ CSV ריק incompatible_type: אין תאימות עם סוג היבוא שנבחר invalid_csv_file: 'קובץ CSV שבור. שגיאה: %{error}' + invalid_json_file: 'קובץ JSON שבור. שגיאה: %{error}' over_rows_processing_limit: מכיל יותר מ-%{count} עמודות + status_not_found_warning: חלק מהסננים שלך מסתירים הודעות ספציפיות שאינן מוכרות על ידי שרת זה. הודעות אלו לא יסוננו אוטומטית אם הן יתגלו על ידי השרת מאוחר יותר. too_large: קובץ גדול מדי failures: כשלים imported: יובא @@ -1744,6 +1747,11 @@ he: one: אתם עומדים להחליף את רשימת הסימניות בהודעה אחת מהקובץ %{filename}. other: אתם עומדים להחליף את רשימת הסימניות עד כדי %{count} הודעות מהקובץ %{filename}. two: אתם עומדים להחליף את רשימת הסימניות עד כדי שתי הודעות מהקובץ %{filename}. + custom_filters_html: + many: הפעולה הבאה תחליף את סנניך בתוכן של %{filename}. עד %{count} סננים יתווספו לסננים חדשים. + one: הפעולה הבאה תחליף את סנניך בתוכן של %{filename}. עד סנן אחד יתווסף לסננים חדשים. + other: הפעולה הבאה תחליף את סנניך בתוכן של %{filename}. עד %{count} סננים יתווספו לסננים חדשים. + two: הפעולה הבאה תחליף את סנניך בתוכן של %{filename}. עד %{count} סננים יתווספו לסננים חדשים. domain_blocking_html: many: אתם עומדים להחליף את רשימת חסימות השרתים עד כדי %{count} שרתים מהקובץ %{filename}. one: אתם עומדים להחליף את רשימת חסימות השרתים בשרת אחד מהקובץ %{filename}. @@ -1775,6 +1783,11 @@ he: one: אתם עומדים להוסיףהודעה אחת מהקובץ %{filename} לרשימת הסימניות שלכם. other: אתם עומדים להוסיף עד %{count} הודעות מהקובץ %{filename} לרשימת הסימניות שלכם. two: אתם עומדים להוסיף עד שתי הודעות מהקובץ %{filename} לרשימת הסימניות שלכם. + custom_filters_html: + many: אתם עומדים להוסיף עד %{count} סננים מהקובץ %{filename} לרשימת הסננים שלכם. + one: אתם עומדים להוסיף עד סנן אחד מהקובץ %{filename} לרשימת הסננים שלכם. + other: אתם עומדים להוסיף עד %{count} סננים מהקובץ %{filename} לרשימת הסננים שלכם. + two: אתם עומדים להוסיף עד %{count} סננים מהקובץ %{filename} לרשימת הסננים שלכם. domain_blocking_html: many: אתם עומדים לחסום עד כדי %{count} שרתים מהקובץ %{filename}. one: אתם עומדים לחסום עד שרת אחד מהקובץ %{filename}. @@ -1819,6 +1832,7 @@ he: types: blocking: רשימת חסימות bookmarks: סימניות + custom_filters: סננים domain_blocking: רשימת שמות מתחם חסומים following: רשימת נעקבים lists: רשימות diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 150893f94b..959e18949d 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -1665,7 +1665,9 @@ hu: empty: Üres CSV-fájl incompatible_type: Nem kompatibilis a kiválasztott importálási típussal invalid_csv_file: 'Érvénytelen CSV-fájl. Hiba: %{error}' + invalid_json_file: 'Érvénytelen JSON-fájl. Hiba: %{error}' over_rows_processing_limit: több mint %{count} sort tartalmaz + status_not_found_warning: A szűrőid olyan bejegyzéseket rejtenek el, melyeket ez a kiszolgáló nem ismer. Ezek a bejegyzések nem lesznek automatikusan kiszűrve, ha a kiszolgáló később felfedezi őket. too_large: A fájl túl nagy failures: Hibák imported: Importálva @@ -1682,6 +1684,9 @@ hu: bookmarks_html: one: 'Arra készülsz, hogy lecseréld a könyvjelzőket legfeljebb %{count} bejegyzésre a következőből: %{filename}.' other: 'Arra készülsz, hogy lecseréld a könyvjelzőket legfeljebb %{count} bejegyzésre a következőből: %{filename}.' + custom_filters_html: + one: Arra készülsz, hogy lecseréld a szűrőidet a %{filename} tartalmára. Legfeljebb %{count} szűrő lesz hozzáadva az új szűrőkhöz. + other: Arra készülsz, hogy lecserád a szűrőidet a %{filename} tartalmára. Legfeljebb %{count} szűrő lesz hozzáadva az új szűrőkhöz. domain_blocking_html: one: 'Arra készülsz, hogy lecseréld a domain letiltási listát legfeljebb %{count} domainre a következőből: %{filename}.' other: 'Arra készülsz, hogy lecseréld a domain letiltási listát legfeljebb %{count} domainre a következőből: %{filename}.' @@ -1701,6 +1706,9 @@ hu: bookmarks_html: one: 'Arra készülsz, hogy legfeljebb %{count} bejegyzést adj hozzá a könyvjelzőkhöz a következőből: %{filename}.' other: 'Arra készülsz, hogy legfeljebb %{count} bejegyzést adj hozzá a könyvjelzőkhöz a következőből: %{filename}.' + custom_filters_html: + one: Arra készülsz, hogy legfeljebb %{count} szűrőt adj hozzá a(z) %{filename} fájlból a szűrőidhöz. + other: Arra készülsz, hogy legfeljebb %{count} szűrőt adj hozzá a(z) %{filename} fájlból a szűrőidhöz. domain_blocking_html: one: 'Arra készülsz, hogy legfeljebb %{count} domaint letilts a következőből: %{filename}.' other: 'Arra készülsz, hogy legfeljebb %{count} domaint letilts a következőből: %{filename}.' @@ -1737,6 +1745,7 @@ hu: types: blocking: Letiltottak listája bookmarks: Könyvjelzők + custom_filters: Szűrők domain_blocking: Letiltott domainek listája following: Követettjeid listája lists: Listák diff --git a/config/locales/is.yml b/config/locales/is.yml index 887574ecdd..d327060a78 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -1669,6 +1669,7 @@ is: empty: Tóm CSV-skrá incompatible_type: Ekki samhæfanlegt valinni tegund innflutnings invalid_csv_file: 'Ógild CSV-skrá. Villa: %{error}' + invalid_json_file: 'Ógild JSON-skrá. Villa: %{error}' over_rows_processing_limit: inniheldur meira en %{count} raðir too_large: Skráin er of stór failures: Mistök @@ -1741,6 +1742,7 @@ is: types: blocking: Listi yfir útilokanir bookmarks: Bókamerki + custom_filters: Síur domain_blocking: Listi yfir útilokanir léna following: Listi yfir þá sem fylgst er með lists: Listar diff --git a/config/locales/it.yml b/config/locales/it.yml index 7324df4ea9..570daf28b0 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -4,6 +4,7 @@ it: about_mastodon_html: 'Il social network del futuro: Nessuna pubblicità, zero sorveglianza aziendale, design etico e decentralizzazione! Sii il proprietario dei tuoi dati, con Mastodonte!' contact_missing: Non impostato contact_unavailable: N/D + default_thumbnail_description: Due mastodonti sorridenti dei cartoni animati (che sembrano elefanti) si lanciano in mezzo un aeroplanino di carta. Sono circondati da un cielo azzurro brillante e da pianeti fluttuanti con alberi e altri mastodonti su di essi. hosted_on: Mastodon ospitato su %{domain} title: Info accounts: @@ -1745,6 +1746,7 @@ it: types: blocking: Lista dei bloccati bookmarks: Segnalibri + custom_filters: Filtri domain_blocking: Lista dei domini bloccati following: Lista dei seguiti lists: Elenchi diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 345c919034..a8fd6dd448 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -496,6 +496,16 @@ ko: hint: 구독자를 가진 계정이 없습니다. no_lists_yet: 리스트가 없습니다 last_email: 최근 이메일 + show: + date: 가입 날짜 + disable_feature: 기능 비활성화 + email: 이메일 주소 + empty: + hint: 이 계정은 아직 아무도 구독하지 않았습니다. + no_subscribers_yet: 구독자가 없습니다 + enable_feature: 기능 활성화 + title: "%{name}의 이메일 뉴스레터" + view_account: 계정 보기 status: 상태 subscribers: 구독자 title: 메일링 리스트 @@ -528,6 +538,7 @@ ko: cannot_be_enabled: 이 서버의 기술제공자가 이 기능을 활성화하지 않았습니다. description: 이 기능은 지정된 계정들이 프로필에 위젯을 추가해 마스토돈 계정 없이도 이메일을 통해 게시물을 받아볼 수 있도록 허용합니다. get_started: 시작하기 + lead: 방문자가 이 서버의 전용 계정을 통해 이메일로 게시물을 받을 수 있도록 허용합니다. title: 이메일 뉴스레터 roles: accounts: 계정 @@ -1478,6 +1489,7 @@ ko: confirmation: action: 이메일 주소 확인 subject: 이메일 주소 확인 + title: "%{name} 님으로부터 이메일 업데이트를 받겠습니까?" notification: create_account: 마스토돈 계정 생성 subject: @@ -1493,7 +1505,9 @@ ko: changed_your_mind: 마음이 바뀌었나요? title: 가입되었습니다 unsubscribe: 구독 해제 + disabled: 비활성화됨 inactive: 비활성 + no_access: 접근 불가 status: 상태 subscribers: 구독자 emoji_styles: @@ -1602,6 +1616,7 @@ ko: empty: 빈 CSV 파일 incompatible_type: 호환되지 않는 가져오기 유형을 선택함 invalid_csv_file: '올바르지 않은 CSV 파일입니다. 오류: %{error}' + invalid_json_file: '올바르지 않은 JSON 파일입니다. 오류: %{error}' over_rows_processing_limit: "%{count}개 이상의 열을 포함합니다" too_large: 파일이 너무 큼 failures: 실패 @@ -1630,6 +1645,8 @@ ko: other: "%{filename}에서 가져온 %{count}개의 계정을 차단하려고 합니다." bookmarks_html: other: "%{filename}에서 가져온 %{count}개의 게시물을 북마크에 추가하려고 합니다." + custom_filters_html: + other: "%{filename}에서 가져온 %{count}개의 필터를 필터에 추가하려고 합니다." domain_blocking_html: other: "%{filename}에서 가져온 %{count}개의 도메인을 차단하려고 합니다." following_html: @@ -1662,6 +1679,7 @@ ko: types: blocking: 차단한 계정 목록 bookmarks: 북마크 + custom_filters: 필터 domain_blocking: 도메인 차단 목록 following: 팔로잉 목록 lists: 리스트 @@ -1688,7 +1706,7 @@ ko: table: expires_at: 만료 uses: 이용 수 - title: 초대하기 + title: 초대 link_preview: author_html: "%{name} 작성" potentially_sensitive_content: @@ -1736,7 +1754,7 @@ ko: past_migrations: 과거 이주 proceed_with_move: 팔로워 이동 redirected_msg: 당신의 계정은 이제 %{acct} 로 리다이렉트됩니다. - redirecting_to: 당신의 계정은 %{acct} 로 리다이렉트됩니다. + redirecting_to: 내 계정이 %{acct}에 리디렉트됩니다. set_redirect: 리디렉션 설정 warning: backreference_required: 새 계정은 이 계정으로 역참조를 하도록 설정되어 있어야 합니다 @@ -1965,7 +1983,7 @@ ko: windows: 윈도우 windows_mobile: 윈도우 모바일 windows_phone: 윈도우 폰 - revoke: 취소 + revoke: 삭제 revoke_success: 세션을 성공적으로 취소하였습니다 title: 세션 view_authentication_history: 내 계정에 대한 인증 이력 보기 diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 5b8f78054d..2990e7d594 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -515,10 +515,10 @@ lv: description_html: "Sekošanas ieteikumi palīdz jauniem lietotājiem ātri arast saistošu saturu. Kad lietotājs nav pietiekami mijiedarbojies ar citiem, lai veidotos pielāgoti sekošanas iteikumi, tiek ieteikti šie konti. Tie tiek pārskaitļoti ik dienas, izmantojot kontu, kuriem ir augstākās nesenās iesaistīšanās un lielākais vietējo sekotāju skaits norādītajā valodā." language: Valodai status: Stāvoklis - suppress: Apspiest sekošanas rekomendāciju + suppress: Apspiest sekošanas ieteikumu suppressed: Apspiestie title: Sekošanas ieteikumi - unsuppress: Atjaunot sekošanas rekomendāciju + unsuppress: Atjaunot sekošanas ieteikumu instances: audit_log: title: Nesenie pārbaudes žurnāli @@ -738,9 +738,9 @@ lv: moderation: Satura pārraudzība special: Īpašās delete: Dzēst - description_html: Izmantojot lietotāju lomas, vari pielāgot, kurām Mastodon funkcijām un apgabaliem var piekļūt tavi lietotāji. + description_html: Ar lietotāju lomām, var pielāgot, kurām Mastodon iespējām un apgabaliem lietotāji var piekļūt. edit: Labot lomu '%{name}' - everyone: Noklusētās atļaujas + everyone: Noklusējuma atļaujas everyone_full_description_html: Šī ir pamata loma, kas ietekmē visus lietotājus, pat tos, kuriem nav piešķirta loma. Visas pārējās lomas manto atļaujas no šīs. permissions_count: one: "%{count} atļauja" @@ -827,7 +827,7 @@ lv: desc_html: Ietekmē visus lietotājus, kuri paši nav mainījuši šo iestatījumu title: Pēc noklusējuma lietotāji būs atteikušies no meklētājprogrammu indeksēšanas discovery: - follow_recommendations: Sekotšanas rekomendācijas + follow_recommendations: Sekošanas ieteikumi privacy: Konfidencialitāte profile_directory: Profila direktorija public_timelines: Publiskās ziņu lentas @@ -1611,7 +1611,7 @@ lv: incoming_migrations_html: Lai pārnāktu no cita konta uz šo, vispirms tev jāizveido konta aizstājvārds. moved_msg: Tavs konts tagad tiek novirzīts uz %{acct}, un tavi sekotāji tiek pārvietoti. not_redirecting: Tavs konts pašlaik netiek novirzīts uz jebkādu citu kontu. - on_cooldown: Tu nesen migrēji savu kontu. Šī funkcija atkal būs pieejama pēc %{count} dienām. + on_cooldown: Tu nesen pārcēli savu kontu. Šī iespēja bīs atkal pieejama pēc %{count} dienām. past_migrations: Pagātnes migrācijas proceed_with_move: Pārvietot sekotājus redirected_msg: Tavs konts tagad tiek novirzīts uz %{acct}. @@ -1714,7 +1714,7 @@ lv: posting_defaults: Ierakstu pievienošanas noklusējumi public_timelines: Publiskās ziņu lentas privacy: - hint_html: "Pielāgo, kā vēlies atrast savu profilu un ziņas. Dažādas Mastodon funkcijas var palīdzēt sasniegt plašāku auditoriju, ja tās ir iespējotas. Velti laiku, lai pārskatītu šos iestatījumus, lai pārliecinātos, ka tie atbilst tavam lietošanas gadījumam." + hint_html: "Pielāgo, kā vēlies, lai Tavs profils un ieraksti būtu atrodami. Dažādas Mastodon iespējas var palīdzēt sasniegt plašāku cilvēku loku, kad tās ir iespējotas. Velti laiku, lai pārskatītu šos iestatījumus, lai pārliecinātos, ka tie atbilst Tavām vajadībām." privacy: Privātums privacy_hint_html: Kontrolē, cik daudz vēlies izpaust citu labā. Cilvēki atklāj interesantus profilus un lieliskas lietotnes, pārlūkojot citu cilvēku sekotājus un redzot, no kurām lietotnēm viņi izliek ziņas, taču tu, iespējams, vēlēsies to slēpt. reach: Sasniedzamība diff --git a/config/locales/nan-TW.yml b/config/locales/nan-TW.yml index f47c462289..1adfea1299 100644 --- a/config/locales/nan-TW.yml +++ b/config/locales/nan-TW.yml @@ -495,6 +495,18 @@ nan-TW: no_lists_yet: Iáu無列單 last_email: 上新ê電子phue箱 lead: 有啟用tsit ê功能koh有訂ê lâng ê口座ē展示佇下kha。 + show: + confirm_disable_feature: Kám beh kā %{name} 停止電子報？電子phue更新ē buē koh對 tsit ê口座送出。Tsit ê用者猶原通佇in ê口座設定內底重啟用tsit ê功能。Beh永永禁止接近使用tsit ê功能，請佇角色內底編tsit ê口座ê權限。 + confirm_remove_subscriber: "%{email} 會無法度收著uì %{name} 來ê電子批。Tsit ê功能bē當復原。" + consent: 訂ê lâng kan-ta同意通過電子phue收著PO文。請毋通kā tsit ê列單用做別途。 + date: 註冊日 + disable_feature: Kā功能停止使用 + disabled: Tsit ê功能停用ah，而且電子phue buē當koh送kàu tsit ê列單。 + email: 電子phue地址 + empty: + hint: Iáu無半个lâng訂tsit ê口座。 + no_subscribers_yet: Iáu無訂ê lâng + enable_feature: 啟用功能 status: 狀態 subscribers: 訂ê lâng title: 電子phue列單 diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 91e61810c4..8a09ea8437 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -4,6 +4,7 @@ nl: about_mastodon_html: 'Het sociale netwerk van de toekomst: geen reclame, geen meekijkende bedrijven, ethisch ontwerp, en gedecentraliseerd! Met Mastodon ben je baas over je eigen gegevens!' contact_missing: Niet ingesteld contact_unavailable: n.v.t + default_thumbnail_description: Twee glimlachende getekende mastodonten (die op olifanten lijken) gooien een papieren vliegtuigje tussen elkaar in. Ze zijn omringd door een heldere blauwe lucht en zwevende planeten met bomen en meer mastodonten erop. hosted_on: Mastodon op %{domain} title: Over accounts: @@ -1665,7 +1666,9 @@ nl: empty: Leeg CSV-bestand incompatible_type: Incompatibel met het geselecteerde importtype invalid_csv_file: 'Ongeldig CSV-bestand. Fout: %{error}' + invalid_json_file: 'Ongeldig JSON-bestand. Foutmelding: %{error}' over_rows_processing_limit: bevat meer dan %{count} rijen + status_not_found_warning: Sommige van je filters verbergen specifieke berichten die niet bekend zijn bij deze server. Deze berichten worden niet automatisch gefilterd wanneer ze later alsnog door de server worden ontdekt. too_large: Bestand is te groot failures: Fouten imported: Geïmporteerd @@ -1682,6 +1685,9 @@ nl: bookmarks_html: one: Je staat op het punt om vanuit %{filename} je bladwijzers te vervangen met in het totaal %{count} bericht. other: Je staat op het punt om vanuit %{filename} je bladwijzers te vervangen met in het totaal %{count} berichten. + custom_filters_html: + one: Je staat op het punt om met de inhoud van %{filename} je filters te vervangen. In totaal wordt %{count} filter aan de nieuwe filters toegevoegd. + other: Je staat op het punt om met de inhoud van %{filename} je filters te vervangen. In totaal worden %{count} filters aan de nieuwe filters toegevoegd. domain_blocking_html: one: Je staat op het punt om vanuit %{filename} je lijst met geblokkeerde domeinen te vervangen met in het totaal %{count} domein. other: Je staat op het punt om vanuit %{filename} je lijst met geblokkeerde domeinen te vervangen met in het totaal %{count} domeinen. @@ -1701,6 +1707,9 @@ nl: bookmarks_html: one: Je staat op het punt om vanuit %{filename} in het totaal %{count} bericht aan je bladwijzers toe te voegen. other: Je staat op het punt om vanuit %{filename} in het totaal %{count} berichten aan je bladwijzers toe te voegen. + custom_filters_html: + one: Je staat op het punt om vanuit %{filename} in totaal %{count} filter aan je filters toe te voegen. + other: Je staat op het punt om vanuit %{filename} in het totaal %{count} filters aan je filters toe te voegen. domain_blocking_html: one: Je staat op het punt om vanuit %{filename} in het totaal %{count} domein te blokkeren. other: Je staat op het punt om vanuit %{filename} in het totaal %{count} domeinen te blokkeren. @@ -1737,6 +1746,7 @@ nl: types: blocking: Geblokkeerde accounts bookmarks: Bladwijzers + custom_filters: Filters domain_blocking: Geblokkeerde domeinen following: Gevolgde accounts lists: Lijsten diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 4e717d57ec..4c4c54238c 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -4,6 +4,7 @@ pt-BR: about_mastodon_html: 'A rede social do futuro: Sem anúncios, sem vigilância corporativa, com design ético e muita descentralização! Possua seus próprios dados com o Mastodon!' contact_missing: Não definido contact_unavailable: Não disponível + default_thumbnail_description: Dois mastodontes sorridentes de desenho (que parecem dois elefantes) lançam um avião de papel entre eles. Eles estão arrodeados por um céu azul brilhante e planetas flutuantes com árvores e mais mastodontes neles. hosted_on: Mastodon hospedado em %{domain} title: Sobre accounts: @@ -1745,6 +1746,7 @@ pt-BR: types: blocking: Lista de bloqueio bookmarks: Marcadores + custom_filters: Filtros domain_blocking: Lista de domínios bloqueados following: Pessoas que você segue lists: Listas diff --git a/config/locales/simple_form.gd.yml b/config/locales/simple_form.gd.yml index 21757feef1..b1b758be7c 100644 --- a/config/locales/simple_form.gd.yml +++ b/config/locales/simple_form.gd.yml @@ -91,6 +91,7 @@ gd: closed_registrations_message: Thèid seo a shealltainn nuair a bhios an clàradh dùinte content_cache_retention_period: Thèid a h-uile post o fhrithealaiche sam bith eile (a’ gabhail a-staigh brosnachaidhean is freagairtean) a sguabadh às às dèidh na h-àireimh de làithean a shònraich thu ’s gun diù a chon air eadar-ghabhail ionadail air na postaichean ud. Gabhaidh seo a-steach na postaichean a chuir cleachdaiche ionadail ris na h-annsachdan aca no comharran-lìn riutha. Thèid iomraidhean prìobhaideach eadar cleachdaichean o ionstansan diofraichte air chall cuideachd agus cha ghabh an aiseag idir. Tha an roghainn seo do dh’ionstansan sònraichte a-mhàin agus briseadh e dùilean an luchd-cleachdaidh nuair a rachadh a chleachdadh gu coitcheann. custom_css: "’S urrainn dhut stoidhlean gnàthaichte a chur an sàs air an tionndadh-lìn de Mhastodon." + email_footer_text: Roghainneil teacsa a nochdas sa bhann-choise aig cuairt-litrichean puist-d a-mhàin. favicon: WEBP, PNG, GIF no JPG. Tar-àithnidh seo favicon bunaiteach Mhastodon le ìomhaigheag ghnàthaichte. landing_page: Taghaidh seo an duilleag a chì aoighean ùra nuair a thadhlas air an fhrithealaiche agad a’ chiad turas. ma thaghas tu “Treandaichean”, feumaidh tu na treandaichean a chur an comas ann ann roghainnean an rùrachaidh. Ma thaghas tu “Loidhne-ama ionadail”, feumaidh tu “Inntrigeadh dhan t-saoghal bheò sa bheil postaichean ionadail” a shuidheachadh air “A h-uile duine” ann an roghainnean an rùrachaidh. mascot: Tar-àithnidh seo an sgead-dhealbh san eadar-aghaidh-lìn adhartach. @@ -295,6 +296,7 @@ gd: closed_registrations_message: Teachdaireachd ghnàthaichte nuair nach eil clàradh ri fhaighinn content_cache_retention_period: Ùine glèidhidh aig susbaint chèin custom_css: CSS gnàthaichte + email_footer_text: Teacsa banna-choise a bharrachd favicon: Favicon landing_page: An duilleag-laighe do dh’aoighean ùra local_live_feed_access: Inntrigeadh dhan t-saoghal bheò sa bheil postaichean ionadail diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml index ef6a3d5a96..76ab6346bd 100644 --- a/config/locales/simple_form.ko.yml +++ b/config/locales/simple_form.ko.yml @@ -64,7 +64,7 @@ ko: setting_display_media_default: 민감함으로 설정된 미디어를 보여주기 전에 경고하기 setting_display_media_hide_all: 모든 미디어를 보여주기 전 경고 setting_display_media_show_all: 민감함으로 표시된 미디어를 포함하여 모든 미디어를 경고 없이 보여줍니다 - setting_emoji_style: 에모지 표현 방식. "자동"은 시스템 기본 에모지를 적용하고 그렇지 못하는 오래된 브라우저의 경우 트웨모지를 사용합니다. + setting_emoji_style: 에모지 표현 방식. "자동"은 시스템 기본 에모지를 적용하고 오래된 브라우저의 경우 트웨모지를 사용합니다. setting_quick_boosting_html: 활성화하면 %{boost_icon}부스트 아이콘을 클릭했을 때 부스트/인용 드롭다운 메뉴가 뜨지 않고 바로 부스트하게 됩니다. 인용은 %{options_icon} (옵션) 메뉴 안으로 이동합니다. setting_use_blurhash: 그라디언트는 숨겨진 내용의 색상을 기반으로 하지만 상세 내용은 보이지 않게 합니다 setting_use_pending_items: 타임라인의 새 게시물을 자동으로 보여 주는 대신, 클릭해서 나타내도록 합니다 diff --git a/config/locales/simple_form.lv.yml b/config/locales/simple_form.lv.yml index 13699f7a99..1d7aabd31a 100644 --- a/config/locales/simple_form.lv.yml +++ b/config/locales/simple_form.lv.yml @@ -92,7 +92,7 @@ lv: site_short_description: Īss apraksts, kas palīdzēs unikāli identificēt tavu serveri. Kurš to darbina, kam tas paredzēts? site_terms: Izmanto pats savu konfidencialitātes politiku vai atstāj tukšu, lai izmantotu noklusējuma iestatījumu. Var strukturēt ar Markdown sintaksi. site_title: Kā cilvēki var atsaukties uz tavu serveri, izņemot tā domēna nosaukumu. - status_page_url: Tās lapas URL, kurā lietotāji var redzēt šī servera statusu pārtraukuma laikā + status_page_url: Lapas, kurā cilvēki var redzēt šī servera stāvokli darbības pārtraukumu laikā, URL theme: Tēma, kuru redz apmeklētāji, kuri ir atteikušies, un jaunie lietotāji. thumbnail: Aptuveni 2:1 attēls, kas tiek parādīts kopā ar tava servera informāciju. trendable_by_default: Izlaist aktuālā satura manuālu pārskatīšanu. Atsevišķas preces joprojām var noņemt no tendencēm pēc fakta. @@ -106,7 +106,7 @@ lv: ip_block: comment: Neobligāts. Atceries, kādēļ tu pievienoji šo nosacījumu. expires_in: IP adreses ir ierobežots resurss, tās dažreiz tiek koplietotas un bieži maina turētāju. Šī iemesla dēļ nedefinēti IP bloki nav ieteicami. - ip: Ievadi IPv4 vai IPv6 adresi. Izmantojot CIDR sintaksi, tu vari bloķēt visus diapazonus. Esi piesardzīgs un neizslēdz pats sevi! + ip: Jāievada IPv4 vai IPv6 adrese. Ar CIDR pierakstu var liegt veselus apgabalus. Esi piesardzīgs un neizslēdz pats sevi! severities: no_access: Bloķēt piekļuvi visiem resursiem sign_up_block: Jaunas pieteikšanās nebūs iespējamas @@ -247,7 +247,7 @@ lv: activity_api_enabled: Publicējiet apkopotu statistiku par lietotāju darbībām API app_icon: Lietotnes ikona backups_retention_period: Lietotāja arhīva glabāšanas periods - bootstrap_timeline_accounts: Vienmēr iesaki šos kontus jaunajiem lietotājiem + bootstrap_timeline_accounts: Vienmēr ieteikt šos kontus jaunajiem lietotājiem closed_registrations_message: Pielāgots ziņojums, ja reģistrēšanās nav pieejama content_cache_retention_period: Attālā satura paturēšanas laika posms custom_css: Pielāgots CSS @@ -267,8 +267,8 @@ lv: site_short_description: Servera apraksts site_terms: Privātuma Politika site_title: Servera nosaukums - status_page_url: Statusa lapas URL - theme: Noklusētā tēma + status_page_url: Stāvokļa lapas URL + theme: Noklusējuma izskats thumbnail: Servera sīkbilde trendable_by_default: Atļaut tendences bez iepriekšējas pārskatīšanas trends: Iespējot tendences @@ -303,7 +303,7 @@ lv: all: Paziņot par visiem atjauninājumiem critical: Paziņot tikai par kritiskajiem atjauninājumiem label: Ir pieejama jauna Mastodon versija - none: Nekad neziņot par atjauninājumiem (nerekomendēts) + none: Nekad neziņot par atjauninājumiem (nav ieteicams) patch: Paziņot par novērsto kļūdu atjauninājumiem trending_tag: Jaunā tendence ir jāpārskata rule: diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml index 83dd55aecd..40f285f522 100644 --- a/config/locales/simple_form.zh-CN.yml +++ b/config/locales/simple_form.zh-CN.yml @@ -155,7 +155,7 @@ zh-CN: jurisdiction: 请列出支付运营费用者所在的国家/地区。如果为公司或其他实体，请列出其注册的国家/地区以及相应的城市、地区、领地或州。 min_age: 不应低于你所在地法律管辖权要求的最低年龄。 user: - chosen_languages: 仅选中语言的嘟文会出现在公共时间线上。此设置不影响主页时间轴及列表。 + chosen_languages: 仅选中语言的嘟文会出现在公共时间线上。此设置不影响主页时间线及列表。 date_of_birth: other: 我们必须确保你至少年满 %{count} 岁才能使用 %{domain}。我们不会存储此信息。 role: 角色用于控制用户拥有的权限。 diff --git a/config/locales/sq.yml b/config/locales/sq.yml index 68dd813a21..dc199f0a0c 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -4,6 +4,7 @@ sq: about_mastodon_html: 'Rrjeti social i së ardhmes: Pa reklama, pa sy vëzhguese nga korporata, etik dhe i decentralizuar! Merrni sërisht zotësinë e të dhënave tuaja, me Mastodon!' contact_missing: E pacaktuar contact_unavailable: N/A + default_thumbnail_description: Dy mastodonë buzagas vizatim (që duken si elefantë) hedhin mes tyre një aeroplan prej letre. Janë të rrethuar nga qielli i ndritshëm i kaltër dhe planete pezull, me më tepër mastodonë mbi ta. hosted_on: Server Mastodon i strehuar në %{domain} title: Mbi accounts: @@ -1669,6 +1670,9 @@ sq: bookmarks_html: one: Ju ndan një hap nga zëvendësimi i faqerojtësve tuaj, me %{count} postim nga %{filename}. other: Ju ndan një hap nga zëvendësimi i faqerojtësve tuaj, me %{count} postime nga %{filename}. + custom_filters_html: + one: Ju ndan një hap nga zëvendësimi i filtrave tuaj me lëndën e %{filename}. Te filtrat e rinj mund të shtohet deri në %{count} filtër. + other: Ju ndan një hap nga zëvendësimi i filtrave tuaj me lëndën e %{filename}. Te filtrat e rinj mund të shtohen deri në %{count} filtra. domain_blocking_html: one: Ju ndan një hap nga zëvendësimi i listës tuaj të bllokimeve të përkatësive, me %{count} përkatësi nga %{filename}. other: Ju ndan një hap nga zëvendësimi i listës tuaj të bllokimeve të përkatësive, me %{count} përkatësi nga %{filename}. @@ -1688,6 +1692,9 @@ sq: bookmarks_html: one: Ju ndan një hap nga shtimi te faqerojtësit tuaj i deri %{count} postimi nga %{filename}. other: Ju ndan një hap nga shtimi te faqerojtësit tuaj i deri %{count} postimeve nga %{filename}. + custom_filters_html: + one: Ju ndan një hap nga shtimi te filtrat tuaj i deri në %{count} filtri nga %{filename}. + other: Ju ndan një hap nga shtimi te filtrat tuaj i deri në %{count} filtrave nga %{filename}. domain_blocking_html: one: Ju ndan një hap nga bllokimi i deri %{count} përkatësie nga %{filename}. other: Ju ndan një hap nga bllokimi i deri %{count} përkatësive nga %{filename}. @@ -1724,6 +1731,7 @@ sq: types: blocking: Listë bllokimesh bookmarks: Faqerojtës + custom_filters: Filtra domain_blocking: Listë bllokimesh përkatësish following: Listë ndjekjesh lists: Lista diff --git a/config/locales/sv.yml b/config/locales/sv.yml index de5220b9db..2e4dc3cc09 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -4,6 +4,7 @@ sv: about_mastodon_html: 'Framtidens sociala medium: Ingen reklam. Ingen övervakning. Etisk design och decentralisering! Äg din data med Mastodon!' contact_missing: Inte inställd contact_unavailable: Ej tillämplig + default_thumbnail_description: Två leende tecknade mastodonter (som ser ut som elefanter) kastar ett pappersplan mellan dem. De är omgivna av en klarblå himmel och svävande planeter med träd och fler mastodonter på dem. hosted_on: Mastodon-värd på %{domain} title: Om accounts: @@ -1665,7 +1666,9 @@ sv: empty: Tom CSV-fil incompatible_type: Inkompatibel med den valda importtypen invalid_csv_file: 'Ogiltig CSV-fil. Felmeddelande: %{error}' + invalid_json_file: 'Ogiltig JSON-fil. Fel: %{error}' over_rows_processing_limit: innehåller fler än %{count} rader + status_not_found_warning: Några av dina filter döljer specifika inlägg som inte är kända av denna server. Dessa inlägg filtreras inte automatiskt om de upptäcks senare av servern. too_large: Filen är för stor failures: Misslyckanden imported: Importerade @@ -1682,6 +1685,9 @@ sv: bookmarks_html: one: Du är på väg att ersätta din blockeringslista med upp till %{count} inlägg från %{filename}. other: Du är på väg att ersätta din blockeringslista med upp till %{count} inlägg från %{filename}. + custom_filters_html: + one: Du är på väg att ersätta dina filter med innehållet i %{filename}. Upp till %{count} filter kommer att läggas till nya filter. + other: Du är på väg att ersätta dina filter med innehållet i %{filename}. Upp till %{count} filter kommer att läggas till i nya filter. domain_blocking_html: one: Du är på väg att ersätta din blockeringslista med upp till %{count} domän från %{filename}. other: Du är på väg att ersätta din blockeringslista med upp till %{count} domäner från %{filename}. @@ -1701,6 +1707,9 @@ sv: bookmarks_html: one: Du håller på att lägga upp till %{count} inlägg från %{filename} till dina bokmärken. other: Du håller på att lägga upp till %{count} inlägg från %{filename} till dina bokmärken. + custom_filters_html: + one: Du är på väg att lägga till upp till %{count} filter från %{filename} till dina filter. + other: Du är på väg att lägga till upp till %{count} filter från %{filename} till dina filter. domain_blocking_html: one: Du är på väg att blockera upp till %{count} domän från %{filename}. other: Du är på väg att blockera upp till %{count} domäner från %{filename}. @@ -1737,6 +1746,7 @@ sv: types: blocking: Lista av blockerade bookmarks: Bokmärken + custom_filters: Filter domain_blocking: Domänblockeringslista following: Lista av följare lists: Listor diff --git a/config/locales/tr.yml b/config/locales/tr.yml index c2a8ca6dbc..a16d5647ad 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -4,6 +4,7 @@ tr: about_mastodon_html: 'Geleceğin sosyal ağı: Reklam yok, kurumsal gözetim yok, etik tasarım ve merkeziyetsizlik! Mastodon ile verilerinizin sahibi olun!' contact_missing: Ayarlanmadı contact_unavailable: Bulunamadı + default_thumbnail_description: İki gülümseyen (fil gibi görünen) çizgi film mastodonu aralarında bir kağıt uçak atıp tutuyorlar. Etraflarını parlak mavi bir gökyüzü ve üzerinde ağaçlar ile başka mastodonlar bulunan süzülen gezegenler çevreliyor. hosted_on: Mastodon %{domain} üzerinde barındırılıyor title: Hakkında accounts: @@ -1745,6 +1746,7 @@ tr: types: blocking: Engellenenler listesi bookmarks: Yer imleri + custom_filters: Filtreler domain_blocking: Alan adı engelleme listesi following: Takip edilenler listesi lists: Listeler diff --git a/config/locales/vi.yml b/config/locales/vi.yml index e9afa336b7..ff24b1bf39 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -4,6 +4,7 @@ vi: about_mastodon_html: 'Mạng xã hội của tương lai: Không quảng cáo, không bán thông tin người dùng và phi tập trung! Làm chủ dữ liệu của bạn với Mastodon!' contact_missing: Chưa thiết lập contact_unavailable: N/A + default_thumbnail_description: Hai chú voi ma mút hoạt hình đang mỉm cười và tung một chiếc máy bay giấy cho nhau. Chúng được bao quanh bởi bầu trời xanh tươi sáng và những hành tinh trôi nổi với cây cối và nhiều voi ma mút khác trên đó. hosted_on: "%{domain} vận hành nhờ Mastodon" title: Giới thiệu accounts: @@ -1702,6 +1703,7 @@ vi: types: blocking: Danh sách người đã chặn bookmarks: Tút đã lưu + custom_filters: Bộ lọc domain_blocking: Danh sách máy chủ đã chặn following: Danh sách người theo dõi lists: Danh sách diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 9937cc3a08..17029f3c2e 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -1,9 +1,10 @@ --- zh-CN: about: - about_mastodon_html: 来自未来的社交网络：无广告、无监视、去中心化、合乎道德！使用 Mastodon 夺回你的数据！ - contact_missing: 未设定 + about_mastodon_html: 迎接未来的社交网络：拒绝广告，告别商业监视，坚持伦理设计，拥抱去中心化！加入 Mastodon，夺回你的数据主权！ + contact_missing: 未设置 contact_unavailable: 未公开 + default_thumbnail_description: 两只微笑的卡通长毛象（看起来像大象）互相扔纸飞机。蔚蓝的穹顶之下，周遭环绕着林木葱郁的漂浮星球，成群的长毛象在其中伫立、繁衍生息。 hosted_on: 运行在 %{domain} 上的 Mastodon 实例 title: 关于本站 accounts: @@ -14,7 +15,7 @@ zh-CN: following: other: 正在关注 instance_actor_flash: 该账号用来代表虚拟角色，并不代表个人用户，仅代表服务器本身。该账号用于联合目的，不应该被停用。 - last_active: 上次活跃 + last_active: 上次活跃时间 link_verified_on: 此链接的所有权已在 %{date} 验证 nothing_here: 空空如也！ pin_errors: @@ -82,7 +83,7 @@ zh-CN: invite_request_text: 加入理由 invited_by: 邀请者为 ip: IP 地址 - joined: 加入于 + joined: 加入时间 location: all: 全部 local: 本站 @@ -90,9 +91,9 @@ zh-CN: title: 位置 login_status: 登录状态 media_attachments: 媒体文件 - memorialize: 设为追悼账号 - memorialized: 已设为追悼账号 - memorialized_msg: 成功将 %{username} 转换为追悼账号 + memorialize: 转为纪念账号 + memorialized: 已转为纪念账号 + memorialized_msg: 成功将 %{username} 转为纪念账号 moderation: active: 活跃 all: 全部 @@ -113,11 +114,11 @@ zh-CN: previous_strikes: 既往处罚 previous_strikes_description_html: other: 此账号已有%{count}次处罚。 - promote: 设为管理员 + promote: 提升权限 protocol: 协议 public: 公开页面 push_subscription_expires: PuSH 订阅过期时间 - redownload: 刷新账号信息 + redownload: 刷新个人资料 redownloaded_msg: 成功从来源站点刷新 %{username} 的账号信息 reject: 拒绝 rejected_msg: 已拒绝 %{username} 的注册申请 @@ -215,7 +216,7 @@ zh-CN: enable_relay: 启用中继站 enable_sign_in_token_auth_user: 为用户启用邮件令牌身份验证 enable_user: 启用用户 - memorialize_account: 设为追悼账号 + memorialize_account: 转为纪念账号 promote_user: 指派管理员 publish_terms_of_service: 发布服务条款 reject_appeal: 驳回申诉 @@ -284,7 +285,7 @@ zh-CN: enable_relay_html: "%{name} 启用了中继站 %{target}" enable_sign_in_token_auth_user_html: "%{name} 为 %{target} 启用了邮件令牌身份验证" enable_user_html: "%{name} 将用户 %{target} 设置为允许登录" - memorialize_account_html: "%{name} 将 %{target} 设置为追悼账号" + memorialize_account_html: "%{name} 将 %{target} 转为纪念账号" promote_user_html: "%{name} 将用户 %{target} 设为管理员" publish_terms_of_service_html: "%{name} 更新了服务条款" reject_appeal_html: "%{name} 驳回了 %{target} 对审核结果的申诉" @@ -608,7 +609,7 @@ zh-CN: select_capabilities: 选择能力 sign_in: 登录 status: 状态 - title: 联邦宇宙辅助服务提供商（Fediverse Auxiliary Service Providers） + title: 联邦宇宙辅助服务提供商 title: FASP follow_recommendations: description_html: "“关注推荐”可帮助新用户快速找到有趣的内容。 当用户与他人的互动不足以形成个性化的建议时，就会推荐关注这些账号。推荐会每日更新，基于选定语言的近期最高互动数和最多本站关注者数综合评估得出。" @@ -1638,7 +1639,7 @@ zh-CN: invalid_csv_file: 无效的 CSV 文件。错误：%{error} invalid_json_file: 无效的 JSON 文件。错误：%{error} over_rows_processing_limit: 包含行数超过了 %{count} - status_not_found_warning: 你的部分过滤器将会过滤此服务器尚未知晓的嘟文。如果这些嘟文之后被服务器发现，则将不会被自动过滤。 + status_not_found_warning: 你的部分过滤器将会隐藏此服务器暂时未知的特定嘟文。如果这些嘟文以后被服务器发现，则将不会被自动过滤。 too_large: 文件过大 failures: 失败 imported: 已导入 @@ -1702,6 +1703,7 @@ zh-CN: types: blocking: 屏蔽列表 bookmarks: 书签 + custom_filters: 过滤器 domain_blocking: 站点屏蔽列表 following: 关注列表 lists: 列表 diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index a1268fe26e..713ec33db9 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -6,6 +6,7 @@ zh-TW: 去中心化設計！加入 Mastodon，擁有您的資料！ contact_missing: 未設定 contact_unavailable: 未公開 + default_thumbnail_description: 兩隻正在微笑的卡通風格長毛象 (看起來像是大象) 正在互相拋接紙飛機。他們被明亮的藍天與有著樹木和更多長毛象的漂浮行星群所包圍。 hosted_on: 於 %{domain} 託管之 Mastodon 站點 title: 關於本站 accounts: @@ -194,7 +195,7 @@ zh-TW: create_unavailable_domain: 新增無法存取的網域 create_user_role: 新增角色 create_username_block: 新增使用者名稱規則 - demote_user: 將用戶降級 + demote_user: 將使用者降級 destroy_announcement: 刪除公告 destroy_canonical_email_block: 刪除電子郵件封鎖 destroy_custom_emoji: 刪除自訂 emoji 表情符號 @@ -218,7 +219,7 @@ zh-TW: enable_sign_in_token_auth_user: 啟用使用者電子郵件 token 驗證 enable_user: 啓用帳號 memorialize_account: 設定成追悼帳號 - promote_user: 將用戶升級 + promote_user: 將使用者升級 publish_terms_of_service: 發佈服務條款 reject_appeal: 駁回申訴 reject_user: 回絕使用者 @@ -1706,6 +1707,7 @@ zh-TW: types: blocking: 您封鎖的使用者列表 bookmarks: 書籤 + custom_filters: 過濾器 domain_blocking: 網域封鎖列表 following: 您跟隨的使用者列表 lists: 列表 diff --git a/docker-compose.yml b/docker-compose.yml index d05fc7b96a..ec5ca67dc6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -60,7 +60,7 @@ services: web: # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes # build: . - image: ghcr.io/glitch-soc/mastodon:v4.5.11 + image: ghcr.io/glitch-soc/mastodon:v4.6.0 restart: always env_file: .env.production command: bundle exec puma -C config/puma.rb @@ -84,7 +84,7 @@ services: # build: # dockerfile: ./streaming/Dockerfile # context: . - image: ghcr.io/glitch-soc/mastodon-streaming:v4.5.11 + image: ghcr.io/glitch-soc/mastodon-streaming:v4.6.0 restart: always env_file: .env.production command: node ./streaming/index.js @@ -103,7 +103,7 @@ services: sidekiq: # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes # build: . - image: ghcr.io/glitch-soc/mastodon:v4.5.11 + image: ghcr.io/glitch-soc/mastodon:v4.6.0 restart: always env_file: .env.production command: bundle exec sidekiq diff --git a/lib/mastodon/middleware/public_file_server.rb b/lib/mastodon/middleware/public_file_server.rb index ac2f8c52c4..eb06184d51 100644 --- a/lib/mastodon/middleware/public_file_server.rb +++ b/lib/mastodon/middleware/public_file_server.rb @@ -5,8 +5,9 @@ require 'action_dispatch/middleware/static' module Mastodon module Middleware class PublicFileServer + CACHE_TTL = 28.days.to_i + SERVICE_WORKER_PATH = '/sw.js' SERVICE_WORKER_TTL = 7.days.to_i - CACHE_TTL = 28.days.to_i def initialize(app) @app = app @@ -24,7 +25,7 @@ module Mastodon # Set cache headers on static files. Some paths require different cache headers request = Rack::Request.new env headers['cache-control'] = begin - if request.path.start_with?('/sw.js') + if request.path.start_with?(SERVICE_WORKER_PATH) "public, max-age=#{SERVICE_WORKER_TTL}, must-revalidate" elsif request.path.start_with?(paperclip_root_url) "public, max-age=#{CACHE_TTL}, immutable" diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index dd91302030..346e8efb2d 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -17,7 +17,7 @@ module Mastodon end def default_prerelease - 'rc.2' + '' end def prerelease diff --git a/spec/requests/public_files_spec.rb b/spec/requests/public_files_spec.rb index 512e069cf7..c8d6b176af 100644 --- a/spec/requests/public_files_spec.rb +++ b/spec/requests/public_files_spec.rb @@ -6,8 +6,10 @@ RSpec.describe 'Public files' do include RoutingHelper context 'when requesting service worker file' do + before { stub_const 'Mastodon::Middleware::PublicFileServer::SERVICE_WORKER_PATH', '/robots.txt' } + it 'returns the file with the expected headers' do - get '/sw.js' + get Mastodon::Middleware::PublicFileServer::SERVICE_WORKER_PATH expect(response) .to have_http_status(200) diff --git a/yarn.lock b/yarn.lock index 87dc73356d..90b2de8def 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5235,46 +5235,46 @@ __metadata: linkType: hard "@vitest/browser-playwright@npm:^4.1.7": - version: 4.1.7 - resolution: "@vitest/browser-playwright@npm:4.1.7" + version: 4.1.9 + resolution: "@vitest/browser-playwright@npm:4.1.9" dependencies: - "@vitest/browser": "npm:4.1.7" - "@vitest/mocker": "npm:4.1.7" + "@vitest/browser": "npm:4.1.9" + "@vitest/mocker": "npm:4.1.9" tinyrainbow: "npm:^3.1.0" peerDependencies: playwright: "*" - vitest: 4.1.7 + vitest: 4.1.9 peerDependenciesMeta: playwright: optional: false - checksum: 10c0/b5d5b843e4dac3ae622a2d5049160326205e52a74e314e06d7167162fe9bb5d71972d2b8c07d180b882a97b1af644cdeff1f3a97744a218ccddd440946c4b498 + checksum: 10c0/4c042c980bb0aa950646d4d1f0f131f44156141d86f54eb96f5f69863ed05720cac7ef1a0901ab71e18929a62c41e5d64a428b2612ea708905bf423ff961dcf4 languageName: node linkType: hard -"@vitest/browser@npm:4.1.7, @vitest/browser@npm:^4.1.0": - version: 4.1.7 - resolution: "@vitest/browser@npm:4.1.7" +"@vitest/browser@npm:4.1.9, @vitest/browser@npm:^4.1.0": + version: 4.1.9 + resolution: "@vitest/browser@npm:4.1.9" dependencies: "@blazediff/core": "npm:1.9.1" - "@vitest/mocker": "npm:4.1.7" - "@vitest/utils": "npm:4.1.7" + "@vitest/mocker": "npm:4.1.9" + "@vitest/utils": "npm:4.1.9" magic-string: "npm:^0.30.21" pngjs: "npm:^7.0.0" sirv: "npm:^3.0.2" tinyrainbow: "npm:^3.1.0" ws: "npm:^8.19.0" peerDependencies: - vitest: 4.1.7 - checksum: 10c0/7ba88939a899e763510661059a8c620f1f42cf8db05c9bfb955cfb8c3e096c22ab630b6e50150579988e1483acc99772feb3d4114dd651f14c0aa9a01aa60505 + vitest: 4.1.9 + checksum: 10c0/9ff634e56b0bd5a3727f2eec7666f97a089b92fb596d5b9e4fbe2a2e4fd988aa7a7bd2a7b98d7cf14790717db69db8f72bae6dc007f2fac613b9bb93d8e8edfb languageName: node linkType: hard "@vitest/coverage-v8@npm:^4.1.0": - version: 4.1.5 - resolution: "@vitest/coverage-v8@npm:4.1.5" + version: 4.1.9 + resolution: "@vitest/coverage-v8@npm:4.1.9" dependencies: "@bcoe/v8-coverage": "npm:^1.0.2" - "@vitest/utils": "npm:4.1.5" + "@vitest/utils": "npm:4.1.9" ast-v8-to-istanbul: "npm:^1.0.0" istanbul-lib-coverage: "npm:^3.2.2" istanbul-lib-report: "npm:^3.0.1" @@ -5284,12 +5284,12 @@ __metadata: std-env: "npm:^4.0.0-rc.1" tinyrainbow: "npm:^3.1.0" peerDependencies: - "@vitest/browser": 4.1.5 - vitest: 4.1.5 + "@vitest/browser": 4.1.9 + vitest: 4.1.9 peerDependenciesMeta: "@vitest/browser": optional: true - checksum: 10c0/71bf669cc1714611855caef5e89b4f3e405e410bdb34e4b2f6fbc9dc5e50dd9e09e73068c1750f6bfa03f0cd9209a2b6e03665c3bdbd34e0adff1ca65c482b7b + checksum: 10c0/02bc408d5d8d5188bb569ae1df1f56903e9e19a6a19ddeff07140e1b344b82662f0669c7ee87b6f4f82c9d1d63a0296fe40c023f923a500a707463c8c05ec133 languageName: node linkType: hard @@ -5306,25 +5306,25 @@ __metadata: languageName: node linkType: hard -"@vitest/expect@npm:4.1.7": - version: 4.1.7 - resolution: "@vitest/expect@npm:4.1.7" +"@vitest/expect@npm:4.1.9": + version: 4.1.9 + resolution: "@vitest/expect@npm:4.1.9" dependencies: "@standard-schema/spec": "npm:^1.1.0" "@types/chai": "npm:^5.2.2" - "@vitest/spy": "npm:4.1.7" - "@vitest/utils": "npm:4.1.7" + "@vitest/spy": "npm:4.1.9" + "@vitest/utils": "npm:4.1.9" chai: "npm:^6.2.2" tinyrainbow: "npm:^3.1.0" - checksum: 10c0/1a72387c6d3cac1e12cd4df382e666d96560b38001ea0133f1e0a22825f71ccf1640ccce13244296b0054c15cf04442f3adbd67dfc57fe542bd35a46cd805487 + checksum: 10c0/243bacaed2cba5e0ea4ec7465662fcec465a358a0e06381e337fac49426aa67a73b104fbb9d65d8bccadfba8f70e27f57ffb897aacfa140f579a556367357875 languageName: node linkType: hard -"@vitest/mocker@npm:4.1.7": - version: 4.1.7 - resolution: "@vitest/mocker@npm:4.1.7" +"@vitest/mocker@npm:4.1.9": + version: 4.1.9 + resolution: "@vitest/mocker@npm:4.1.9" dependencies: - "@vitest/spy": "npm:4.1.7" + "@vitest/spy": "npm:4.1.9" estree-walker: "npm:^3.0.3" magic-string: "npm:^0.30.21" peerDependencies: @@ -5335,7 +5335,7 @@ __metadata: optional: true vite: optional: true - checksum: 10c0/e03dbbba435543e3cfa5e034ba8ade371de5e398255f75366ebc370ff8dd78d45f7d7cc9daa76eb1d399b31e659e47d3cbb710566e64ceeeba3f99b418e4b955 + checksum: 10c0/707353b7435bbfd441cc754e4ee7bc5921b70d07b051c6e414b6bbe4ca369154702b0ddeb603389469fe87ca1983e002eb2d55044582661f54a1945dd27e5c82 languageName: node linkType: hard @@ -5348,43 +5348,34 @@ __metadata: languageName: node linkType: hard -"@vitest/pretty-format@npm:4.1.5": - version: 4.1.5 - resolution: "@vitest/pretty-format@npm:4.1.5" +"@vitest/pretty-format@npm:4.1.9": + version: 4.1.9 + resolution: "@vitest/pretty-format@npm:4.1.9" dependencies: tinyrainbow: "npm:^3.1.0" - checksum: 10c0/42b5e9b75e87c0a884d36bee364e2d07ee45e96f413377737a74993e077d90c3a12aa36743855aee5e4e28b78fae20e3e6de5eef8d5344b9aba2bc1e1d5537a1 + checksum: 10c0/5b96295f25ab885616230ad1355fc82f490bebb39cc707688d7c8969c08270d7e076ed8a10af4e762ed57145193c6061a1f549f136f0ded344f8db0c2b3fb3de languageName: node linkType: hard -"@vitest/pretty-format@npm:4.1.7": - version: 4.1.7 - resolution: "@vitest/pretty-format@npm:4.1.7" +"@vitest/runner@npm:4.1.9": + version: 4.1.9 + resolution: "@vitest/runner@npm:4.1.9" dependencies: - tinyrainbow: "npm:^3.1.0" - checksum: 10c0/49ef801171708e3a92214e8720efbedbd6e0e6baf17971aaf4feb7422e5c9eba82262c24a9e6dd4d41a31fae77bd31d5b37cf140d13e0ac4ce29a7457bdc692f - languageName: node - linkType: hard - -"@vitest/runner@npm:4.1.7": - version: 4.1.7 - resolution: "@vitest/runner@npm:4.1.7" - dependencies: - "@vitest/utils": "npm:4.1.7" + "@vitest/utils": "npm:4.1.9" pathe: "npm:^2.0.3" - checksum: 10c0/63474c6fc088d75b5d7fe735195504f923c694b83a22eb9caa53d6486c923974304c2e3ef4d5bcd808d88082174f38434be320fc4fe649a8cf33f0459a0576e3 + checksum: 10c0/d206b4891a64b1f55c346f832b0a7b489108094d8ae34438d3b53e78be7b45b139fa95ffa027c98c357bd532268ee573168de1943235b7eed32a9236ed5978bb languageName: node linkType: hard -"@vitest/snapshot@npm:4.1.7": - version: 4.1.7 - resolution: "@vitest/snapshot@npm:4.1.7" +"@vitest/snapshot@npm:4.1.9": + version: 4.1.9 + resolution: "@vitest/snapshot@npm:4.1.9" dependencies: - "@vitest/pretty-format": "npm:4.1.7" - "@vitest/utils": "npm:4.1.7" + "@vitest/pretty-format": "npm:4.1.9" + "@vitest/utils": "npm:4.1.9" magic-string: "npm:^0.30.21" pathe: "npm:^2.0.3" - checksum: 10c0/6fa49c4242a4acc0557ee6a20552db41f4f4c9d2d4c05993181c3f5f19e66579e08f63d34f792b79400547ab791ef500a9955b77390c381e45c3bb8e33717793 + checksum: 10c0/c3099df12ad1f9c1e180441856c9eb82f1990f87ff16aafedd6fa19978eaff20bc59220b692a99fcc822daef86eab256ba3dadb49544b7bd625b57c49cd9d995 languageName: node linkType: hard @@ -5397,18 +5388,18 @@ __metadata: languageName: node linkType: hard -"@vitest/spy@npm:4.1.7": - version: 4.1.7 - resolution: "@vitest/spy@npm:4.1.7" - checksum: 10c0/be2a95d5c5c438b57c9b33cef1289fb02659214754b5e946cb4b8183e2b5089e49e3fda6ca05981f3ea9872b207595db109e25072668c0a671203f69fddbbe99 +"@vitest/spy@npm:4.1.9": + version: 4.1.9 + resolution: "@vitest/spy@npm:4.1.9" + checksum: 10c0/e51f328f55b76e8ba66e5e18f183484a8dc0a092685b101112d3e9fb8e989ddca162c98ddf00254476502c25bc05c4ec1e277fd6ad8bfc702464c08f6b5dd115 languageName: node linkType: hard "@vitest/ui@npm:^4.1.0": - version: 4.1.5 - resolution: "@vitest/ui@npm:4.1.5" + version: 4.1.9 + resolution: "@vitest/ui@npm:4.1.9" dependencies: - "@vitest/utils": "npm:4.1.5" + "@vitest/utils": "npm:4.1.9" fflate: "npm:^0.8.2" flatted: "npm:^3.4.2" pathe: "npm:^2.0.3" @@ -5416,8 +5407,8 @@ __metadata: tinyglobby: "npm:^0.2.15" tinyrainbow: "npm:^3.1.0" peerDependencies: - vitest: 4.1.5 - checksum: 10c0/2109480d08516abe3350994ebfcb9adc8a2eb4bb1839c48a336d6ff3378eb49a520ad6490f177e60034ed4fcf579206d9ab14995e951cbf6d4c7c792c46fe202 + vitest: 4.1.9 + checksum: 10c0/9c480d79a61ebe40552ab4f1fa2a15dad0147d9c5e40186cb210f2199a0bfd886cd34e9ac11b1ef4ff0bf3436be46f5652c3f36200cdb278dfd2b3634996e50a languageName: node linkType: hard @@ -5432,25 +5423,14 @@ __metadata: languageName: node linkType: hard -"@vitest/utils@npm:4.1.5": - version: 4.1.5 - resolution: "@vitest/utils@npm:4.1.5" +"@vitest/utils@npm:4.1.9": + version: 4.1.9 + resolution: "@vitest/utils@npm:4.1.9" dependencies: - "@vitest/pretty-format": "npm:4.1.5" + "@vitest/pretty-format": "npm:4.1.9" convert-source-map: "npm:^2.0.0" tinyrainbow: "npm:^3.1.0" - checksum: 10c0/72409717e68018e5fe42fa173cc4eff6def8c35bd52013f86ddb414cd28d73fcc425ac62968e01a52371b3fd5a7a775536283d2f1d64432753f628712a6a4908 - languageName: node - linkType: hard - -"@vitest/utils@npm:4.1.7": - version: 4.1.7 - resolution: "@vitest/utils@npm:4.1.7" - dependencies: - "@vitest/pretty-format": "npm:4.1.7" - convert-source-map: "npm:^2.0.0" - tinyrainbow: "npm:^3.1.0" - checksum: 10c0/aa0079d8923506300527dc23ff68cf090ffcb2c6a9549e598ae22ba0eb8a6bb4448b10724b38bc6b077f9957333302a857d791ad2f7abd807bb6263c9a218833 + checksum: 10c0/d55506c077fd72c091eb66f02926f0abf72801c87a085f565698289562f47befa114ae2c680ab8736dfe46abab0cfd6b8031f2ac519bafeb37578aa6e5ad03c5 languageName: node linkType: hard @@ -14612,16 +14592,16 @@ __metadata: linkType: hard "vitest@npm:^4.1.7": - version: 4.1.7 - resolution: "vitest@npm:4.1.7" + version: 4.1.9 + resolution: "vitest@npm:4.1.9" dependencies: - "@vitest/expect": "npm:4.1.7" - "@vitest/mocker": "npm:4.1.7" - "@vitest/pretty-format": "npm:4.1.7" - "@vitest/runner": "npm:4.1.7" - "@vitest/snapshot": "npm:4.1.7" - "@vitest/spy": "npm:4.1.7" - "@vitest/utils": "npm:4.1.7" + "@vitest/expect": "npm:4.1.9" + "@vitest/mocker": "npm:4.1.9" + "@vitest/pretty-format": "npm:4.1.9" + "@vitest/runner": "npm:4.1.9" + "@vitest/snapshot": "npm:4.1.9" + "@vitest/spy": "npm:4.1.9" + "@vitest/utils": "npm:4.1.9" es-module-lexer: "npm:^2.0.0" expect-type: "npm:^1.3.0" magic-string: "npm:^0.30.21" @@ -14639,12 +14619,12 @@ __metadata: "@edge-runtime/vm": "*" "@opentelemetry/api": ^1.9.0 "@types/node": ^20.0.0 || ^22.0.0 || >=24.0.0 - "@vitest/browser-playwright": 4.1.7 - "@vitest/browser-preview": 4.1.7 - "@vitest/browser-webdriverio": 4.1.7 - "@vitest/coverage-istanbul": 4.1.7 - "@vitest/coverage-v8": 4.1.7 - "@vitest/ui": 4.1.7 + "@vitest/browser-playwright": 4.1.9 + "@vitest/browser-preview": 4.1.9 + "@vitest/browser-webdriverio": 4.1.9 + "@vitest/coverage-istanbul": 4.1.9 + "@vitest/coverage-v8": 4.1.9 + "@vitest/ui": 4.1.9 happy-dom: "*" jsdom: "*" vite: ^6.0.0 || ^7.0.0 || ^8.0.0 @@ -14674,8 +14654,8 @@ __metadata: vite: optional: false bin: - vitest: vitest.mjs - checksum: 10c0/5328eab211161bdb854159154b02d7b2beab0cf1e26a1c13f6a64b0f1402029d41f19987cf60684051c09a6925030285195ecbe57271c2033e1d4f7a666590d0 + vitest: ./vitest.mjs + checksum: 10c0/1ac80ef4991be82822a52aea48415f1bc64ddf8fd88ee24c172ec368f1d480fefacbde622c3c951982f7961a1d07313e18deaafc774d29e42ad6f6ffa63334a7 languageName: node linkType: hard