@@ -21,7 +23,7 @@ exports[`
diff --git a/app/javascript/mastodon/components/avatar.tsx b/app/javascript/mastodon/components/avatar.tsx
index 8b16296c2c..f61d9676de 100644
--- a/app/javascript/mastodon/components/avatar.tsx
+++ b/app/javascript/mastodon/components/avatar.tsx
@@ -1,10 +1,11 @@
+import { useState, useCallback } from 'react';
+
import classNames from 'classnames';
+import { useHovering } from 'mastodon/../hooks/useHovering';
+import { autoPlayGif } from 'mastodon/initial_state';
import type { Account } from 'mastodon/models/account';
-import { useHovering } from '../../hooks/useHovering';
-import { autoPlayGif } from '../initial_state';
-
interface Props {
account: Account | undefined; // FIXME: remove `undefined` once we know for sure its always there
size: number;
@@ -25,6 +26,8 @@ export const Avatar: React.FC
- {src && 
}
+ {src && !error && (
+
+ )}
+
{counter && (
diff --git a/app/javascript/mastodon/components/filter_warning.tsx b/app/javascript/mastodon/components/filter_warning.tsx
index 4305e43038..5eaaac4ba3 100644
--- a/app/javascript/mastodon/components/filter_warning.tsx
+++ b/app/javascript/mastodon/components/filter_warning.tsx
@@ -10,13 +10,16 @@ export const FilterWarning: React.FC<{
diff --git a/app/javascript/mastodon/components/media_gallery.jsx b/app/javascript/mastodon/components/media_gallery.jsx
index 671fd1a648..e0641f62e3 100644
--- a/app/javascript/mastodon/components/media_gallery.jsx
+++ b/app/javascript/mastodon/components/media_gallery.jsx
@@ -113,12 +113,12 @@ class Item extends PureComponent {
width = 25;
}
- if (attachment.get('description')?.length > 0) {
- badges.push(
@@ -212,7 +212,7 @@ class Item extends PureComponent {
{visible && thumbnail}
- {badges && (
+ {visible && badges && (
{
return (
+ seeMoreHref ? {chunks} : chunks,
}}
/>
);
@@ -37,8 +42,14 @@ const FollowerCount: React.FC<{ accountId: string }> = ({ accountId }) => {
if (!account) return null;
+ const isHide = account.other_settings.hide_followers_count;
+
return (
-
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
index 5c9be49e7a..ec6d52c8cd 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
+++ b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
@@ -14,6 +14,8 @@ import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
import StarIcon from '@/material-icons/400-24px/star.svg?react';
+import RepeatDisabledIcon from '@/svg-icons/repeat_disabled.svg?react';
+import RepeatPrivateIcon from '@/svg-icons/repeat_private.svg?react';
import { replyCompose } from 'mastodon/actions/compose';
import { toggleReblog, toggleFavourite } from 'mastodon/actions/interactions';
import { openModal } from 'mastodon/actions/modal';
@@ -159,22 +161,26 @@ class Footer extends ImmutablePureComponent {
replyTitle = intl.formatMessage(messages.replyAll);
}
- let reblogTitle = '';
+ let reblogTitle, reblogIconComponent;
if (status.get('reblogged')) {
reblogTitle = intl.formatMessage(messages.cancel_reblog_private);
+ reblogIconComponent = publicStatus ? RepeatIcon : RepeatPrivateIcon;
} else if (publicStatus) {
reblogTitle = intl.formatMessage(messages.reblog);
+ reblogIconComponent = RepeatIcon;
} else if (reblogPrivate) {
reblogTitle = intl.formatMessage(messages.reblog_private);
+ reblogIconComponent = RepeatPrivateIcon;
} else {
reblogTitle = intl.formatMessage(messages.cannot_reblog);
+ reblogIconComponent = RepeatDisabledIcon;
}
return (
();
const handleOpenVideo = useCallback(
@@ -90,6 +92,10 @@ export const DetailedStatus: React.FC<{
[onOpenVideo, status],
);
+ const handleFilterToggle = useCallback(() => {
+ setShowDespiteFilter(!showDespiteFilter);
+ }, [showDespiteFilter, setShowDespiteFilter]);
+
const handleExpandedToggle = useCallback(() => {
if (onToggleHidden) onToggleHidden(status);
}, [onToggleHidden, status]);
@@ -163,7 +169,7 @@ export const DetailedStatus: React.FC<{
media = {
});
const mapStateToProps = (state, props) => {
- const status = getStatus(state, { id: props.params.statusId });
+ const status = getStatus(state, { id: props.params.statusId, contextType: 'detailed' });
let ancestorsIds = Immutable.List();
let descendantsIds = Immutable.List();
diff --git a/app/javascript/mastodon/features/ui/components/mute_modal.jsx b/app/javascript/mastodon/features/ui/components/mute_modal.jsx
index 70d95b5931..90b88030a0 100644
--- a/app/javascript/mastodon/features/ui/components/mute_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/mute_modal.jsx
@@ -116,6 +116,7 @@ export const MuteModal = ({ accountId, acct }) => {
(accountDefaultValues);
@@ -181,5 +184,10 @@ export function createAccountFromServerJSON(serverJSON: ApiAccountJSON) {
),
note_emojified: emojify(accountJSON.note, emojiMap),
note_plain: unescapeHTML(accountJSON.note),
+ url:
+ accountJSON.url.startsWith('http://') ||
+ accountJSON.url.startsWith('https://')
+ ? accountJSON.url
+ : accountJSON.uri,
});
}
diff --git a/app/javascript/mastodon/models/notification_group.ts b/app/javascript/mastodon/models/notification_group.ts
index 28fa8f513d..62f4b83b79 100644
--- a/app/javascript/mastodon/models/notification_group.ts
+++ b/app/javascript/mastodon/models/notification_group.ts
@@ -18,6 +18,7 @@ export const NOTIFICATIONS_GROUP_MAX_AVATARS = 8;
interface BaseNotificationGroup
extends Omit {
sampleAccountIds: string[];
+ partial: boolean;
}
interface BaseNotificationWithStatus
@@ -173,6 +174,7 @@ export function createNotificationGroupFromJSON(
return {
statusId: statusId ?? undefined,
sampleAccountIds,
+ partial: false,
...groupWithoutStatus,
};
}
@@ -196,6 +198,7 @@ export function createNotificationGroupFromJSON(
statusId: statusId ?? undefined,
sampleAccountIds,
emojiReactionGroups: groups,
+ partial: false,
...groupWithoutStatus,
};
}
@@ -204,12 +207,14 @@ export function createNotificationGroupFromJSON(
return {
report: createReportFromJSON(report),
sampleAccountIds,
+ partial: false,
...groupWithoutTargetAccount,
};
}
case 'severed_relationships':
return {
...group,
+ partial: false,
event: createAccountRelationshipSeveranceEventFromJSON(group.event),
sampleAccountIds,
};
@@ -218,13 +223,16 @@ export function createNotificationGroupFromJSON(
const { moderation_warning, ...groupWithoutModerationWarning } = group;
return {
...groupWithoutModerationWarning,
+ partial: false,
moderationWarning: createAccountWarningFromJSON(moderation_warning),
sampleAccountIds,
};
}
+
default:
return {
sampleAccountIds,
+ partial: false,
...group,
};
}
@@ -232,17 +240,17 @@ export function createNotificationGroupFromJSON(
export function createNotificationGroupFromNotificationJSON(
notification: ApiNotificationJSON,
-) {
+): NotificationGroup {
const group = {
sampleAccountIds: [notification.account.id],
group_key: notification.group_key,
notifications_count: 1,
- type: notification.type,
most_recent_notification_id: notification.id,
page_min_id: notification.id,
page_max_id: notification.id,
latest_page_notification_at: notification.created_at,
- } as NotificationGroup;
+ partial: true,
+ };
switch (notification.type) {
case 'favourite':
@@ -252,16 +260,22 @@ export function createNotificationGroupFromNotificationJSON(
case 'status_reference':
case 'poll':
case 'update':
- return { ...group, statusId: notification.status?.id };
+ return {
+ ...group,
+ type: notification.type,
+ statusId: notification.status?.id,
+ };
case 'list_status':
return {
...group,
+ type: notification.type,
statusId: notification.status?.id,
list: notification.list,
};
case 'emoji_reaction':
return {
...group,
+ type: notification.type,
statusId: notification.status?.id,
emojiReactionGroups: createEmojiReactionGroupsFromJSON(
notification.emoji_reaction,
@@ -269,10 +283,15 @@ export function createNotificationGroupFromNotificationJSON(
),
};
case 'admin.report':
- return { ...group, report: createReportFromJSON(notification.report) };
+ return {
+ ...group,
+ type: notification.type,
+ report: createReportFromJSON(notification.report),
+ };
case 'severed_relationships':
return {
...group,
+ type: notification.type,
event: createAccountRelationshipSeveranceEventFromJSON(
notification.event,
),
@@ -280,11 +299,15 @@ export function createNotificationGroupFromNotificationJSON(
case 'moderation_warning':
return {
...group,
+ type: notification.type,
moderationWarning: createAccountWarningFromJSON(
notification.moderation_warning,
),
};
default:
- return group;
+ return {
+ ...group,
+ type: notification.type,
+ };
}
}
diff --git a/app/javascript/mastodon/reducers/accounts.ts b/app/javascript/mastodon/reducers/accounts.ts
index 5a9cc7220c..2001353b2e 100644
--- a/app/javascript/mastodon/reducers/accounts.ts
+++ b/app/javascript/mastodon/reducers/accounts.ts
@@ -57,7 +57,10 @@ export const accountsReducer: Reducer = (
return state.setIn([action.payload.id, 'hidden'], false);
else if (importAccounts.match(action))
return normalizeAccounts(state, action.payload.accounts);
- else if (followAccountSuccess.match(action)) {
+ else if (
+ followAccountSuccess.match(action) &&
+ !action.payload.alreadyFollowing
+ ) {
return state
.update(action.payload.relationship.id, (account) =>
account?.update('followers_count', (n) => n + 1),
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index 3f45552492..a5585ebad7 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -354,12 +354,26 @@ const expiresInFromExpiresAt = expires_at => {
const mergeLocalHashtagResults = (suggestions, prefix, tagHistory) => {
prefix = prefix.toLowerCase();
+
if (suggestions.length < 4) {
const localTags = tagHistory.filter(tag => tag.toLowerCase().startsWith(prefix) && !suggestions.some(suggestion => suggestion.type === 'hashtag' && suggestion.name.toLowerCase() === tag.toLowerCase()));
- return suggestions.concat(localTags.slice(0, 4 - suggestions.length).toJS().map(tag => ({ type: 'hashtag', name: tag })));
- } else {
- return suggestions;
+ suggestions = suggestions.concat(localTags.slice(0, 4 - suggestions.length).toJS().map(tag => ({ type: 'hashtag', name: tag })));
}
+
+ // Prefer capitalization from personal history, unless personal history is all lower-case
+ const fixSuggestionCapitalization = (suggestion) => {
+ if (suggestion.type !== 'hashtag')
+ return suggestion;
+
+ const tagFromHistory = tagHistory.find((tag) => tag.localeCompare(suggestion.name, undefined, { sensitivity: 'accent' }) === 0);
+
+ if (!tagFromHistory || tagFromHistory.toLowerCase() === tagFromHistory)
+ return suggestion;
+
+ return { ...suggestion, name: tagFromHistory };
+ };
+
+ return suggestions.map(fixSuggestionCapitalization);
};
const normalizeSuggestions = (state, { accounts, emojis, tags, token }) => {
@@ -520,7 +534,7 @@ export default function compose(state = initialState, action) {
.set('isUploadingThumbnail', false)
.update('media_attachments', list => list.map(item => {
if (item.get('id') === action.media.id) {
- return fromJS(action.media);
+ return fromJS(action.media).set('unattached', item.get('unattached'));
}
return item;
diff --git a/app/javascript/mastodon/reducers/notification_groups.ts b/app/javascript/mastodon/reducers/notification_groups.ts
index 728019b6ad..272d033154 100644
--- a/app/javascript/mastodon/reducers/notification_groups.ts
+++ b/app/javascript/mastodon/reducers/notification_groups.ts
@@ -29,6 +29,7 @@ import {
import type {
ApiNotificationJSON,
ApiNotificationGroupJSON,
+ NotificationType,
} from 'mastodon/api_types/notifications';
import { compareId } from 'mastodon/compare_id';
import { usePendingItems } from 'mastodon/initial_state';
@@ -204,7 +205,15 @@ function mergeGapsAround(
function processNewNotification(
groups: NotificationGroupsState['groups'],
notification: ApiNotificationJSON,
+ groupedTypes: NotificationType[],
) {
+ if (!groupedTypes.includes(notification.type)) {
+ notification = {
+ ...notification,
+ group_key: `ungrouped-${notification.id}`,
+ };
+ }
+
const existingGroupIndex = groups.findIndex(
(group) =>
group.type !== 'gap' && group.group_key === notification.group_key,
@@ -277,7 +286,7 @@ function processNewNotification(
groups.unshift(existingGroup);
}
} else {
- // Create a new group
+ // We have not found an existing group, create a new one
groups.unshift(createNotificationGroupFromNotificationJSON(notification));
}
}
@@ -503,11 +512,13 @@ export const notificationGroupsReducer = createReducer(
trimNotifications(state);
})
.addCase(processNewNotificationForGroups.fulfilled, (state, action) => {
- const notification = action.payload;
- if (notification) {
+ if (action.payload) {
+ const { notification, groupedTypes } = action.payload;
+
processNewNotification(
usePendingItems ? state.pendingGroups : state.groups,
notification,
+ groupedTypes,
);
updateLastReadId(state);
trimNotifications(state);
@@ -558,10 +569,13 @@ export const notificationGroupsReducer = createReducer(
if (existingGroupIndex > -1) {
const existingGroup = state.groups[existingGroupIndex];
if (existingGroup && existingGroup.type !== 'gap') {
- group.notifications_count += existingGroup.notifications_count;
- group.sampleAccountIds = group.sampleAccountIds
- .concat(existingGroup.sampleAccountIds)
- .slice(0, NOTIFICATIONS_GROUP_MAX_AVATARS);
+ if (group.partial) {
+ group.notifications_count +=
+ existingGroup.notifications_count;
+ group.sampleAccountIds = group.sampleAccountIds
+ .concat(existingGroup.sampleAccountIds)
+ .slice(0, NOTIFICATIONS_GROUP_MAX_AVATARS);
+ }
state.groups.splice(existingGroupIndex, 1);
}
}
@@ -586,7 +600,10 @@ export const notificationGroupsReducer = createReducer(
compareId(state.lastReadId, mostRecentGroup.page_max_id) < 0
)
state.lastReadId = mostRecentGroup.page_max_id;
- commitLastReadId(state);
+
+ // We don't call `commitLastReadId`, because that is conditional
+ // and we want to unconditionally update the state instead.
+ state.readMarkerId = state.lastReadId;
})
.addCase(fetchMarkers.fulfilled, (state, action) => {
if (
diff --git a/app/javascript/mastodon/reducers/settings.js b/app/javascript/mastodon/reducers/settings.js
index 71bb254607..891d6ac994 100644
--- a/app/javascript/mastodon/reducers/settings.js
+++ b/app/javascript/mastodon/reducers/settings.js
@@ -91,6 +91,10 @@ const initialState = ImmutableMap({
'admin.sign_up': true,
'admin.report': true,
}),
+
+ group: ImmutableMap({
+ follow: true
+ }),
}),
firehose: ImmutableMap({
diff --git a/app/javascript/mastodon/selectors/filters.ts b/app/javascript/mastodon/selectors/filters.ts
new file mode 100644
index 0000000000..f84d01216a
--- /dev/null
+++ b/app/javascript/mastodon/selectors/filters.ts
@@ -0,0 +1,50 @@
+import { createSelector } from '@reduxjs/toolkit';
+
+import type { RootState } from 'mastodon/store';
+import { toServerSideType } from 'mastodon/utils/filters';
+
+// TODO: move to `app/javascript/mastodon/models` and use more globally
+type Filter = Immutable.Map;
+
+// TODO: move to `app/javascript/mastodon/models` and use more globally
+type FilterResult = Immutable.Map;
+
+export const getFilters = createSelector(
+ [
+ (state: RootState) => state.filters as Immutable.Map,
+ (_, { contextType }: { contextType: string }) => contextType,
+ ],
+ (filters, contextType) => {
+ if (!contextType) {
+ return null;
+ }
+
+ const now = new Date();
+ const serverSideType = toServerSideType(contextType);
+
+ return filters.filter((filter) => {
+ const context = filter.get('context') as Immutable.List;
+ const expiration = filter.get('expires_at') as Date | null;
+ return (
+ context.includes(serverSideType) &&
+ (expiration === null || expiration > now)
+ );
+ });
+ },
+);
+
+export const getStatusHidden = (
+ state: RootState,
+ { id, contextType }: { id: string; contextType: string },
+) => {
+ const filters = getFilters(state, { contextType });
+ if (filters === null) return false;
+
+ const filtered = state.statuses.getIn([id, 'filtered']) as
+ | Immutable.List
+ | undefined;
+ return filtered?.some(
+ (result) =>
+ filters.getIn([result.get('filter'), 'filter_action']) === 'hide',
+ );
+};
diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index 45ecb98241..92a7021e52 100644
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -1,23 +1,12 @@
import { createSelector } from '@reduxjs/toolkit';
import { List as ImmutableList, Map as ImmutableMap } from 'immutable';
-import { toServerSideType } from 'mastodon/utils/filters';
-
import { me, isHideItem } from '../initial_state';
+import { getFilters } from './filters';
+
export { makeGetAccount } from "./accounts";
-const getFilters = createSelector([state => state.get('filters'), (_, { contextType }) => contextType], (filters, contextType) => {
- if (!contextType) {
- return null;
- }
-
- const now = new Date();
- const serverSideType = toServerSideType(contextType);
-
- return filters.filter(filter => filter.get('context').includes(serverSideType) && (filter.get('expires_at') === null || filter.get('expires_at') > now));
-});
-
export const makeGetStatus = () => {
return createSelector(
[
@@ -28,9 +17,10 @@ export const makeGetStatus = () => {
(state, { id }) => state.getIn(['accounts', state.getIn(['statuses', id, 'account'])]),
(state, { id }) => state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account'])]),
getFilters,
+ (_, { contextType }) => ['detailed', 'bookmarks', 'favourites'].includes(contextType),
],
- (statusBase, statusReblog, statusQuote, statusReblogQuote, accountBase, accountReblog, filters) => {
+ (statusBase, statusReblog, statusQuote, statusReblogQuote, accountBase, accountReblog, filters, warnInsteadOfHide) => {
if (!statusBase || statusBase.get('isLoading')) {
return null;
}
@@ -58,7 +48,7 @@ export const makeGetStatus = () => {
}
}
- if (filterResults.some((result) => filters.getIn([result.get('filter'), 'filter_action_ex']) === 'hide')) {
+ if (!warnInsteadOfHide && filterResults.some((result) => filters.getIn([result.get('filter'), 'filter_action_ex']) === 'hide')) {
return null;
}
filterResults = filterResults.filter(result => filters.has(result.get('filter')));
diff --git a/app/javascript/mastodon/selectors/settings.ts b/app/javascript/mastodon/selectors/settings.ts
index e722ad0911..ca34374167 100644
--- a/app/javascript/mastodon/selectors/settings.ts
+++ b/app/javascript/mastodon/selectors/settings.ts
@@ -52,4 +52,7 @@ export const selectSettingsNotificationsMinimizeFilteredBanner = (
) =>
state.settings.getIn(['notifications', 'minimizeFilteredBanner']) as boolean;
+export const selectSettingsNotificationsGroupFollows = (state: RootState) =>
+ state.settings.getIn(['notifications', 'group', 'follow']) as boolean;
+
/* eslint-enable @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */
diff --git a/app/javascript/mastodon/service_worker/web_push_locales.js b/app/javascript/mastodon/service_worker/web_push_locales.js
index 89ae20007b..3e39c9a4ed 100644
--- a/app/javascript/mastodon/service_worker/web_push_locales.js
+++ b/app/javascript/mastodon/service_worker/web_push_locales.js
@@ -6,6 +6,12 @@
const fs = require('fs');
const path = require('path');
+const { defineMessages } = require('react-intl');
+
+const messages = defineMessages({
+ mentioned_you: { id: 'notification.mentioned_you', defaultMessage: '{name} mentioned you' },
+});
+
const filtered = {};
const filenames = fs.readdirSync(path.resolve(__dirname, '../locales'));
@@ -20,7 +26,7 @@ filenames.forEach(filename => {
'notification.favourite': full['notification.favourite'] || '',
'notification.follow': full['notification.follow'] || '',
'notification.follow_request': full['notification.follow_request'] || '',
- 'notification.mention': full['notification.mention'] || '',
+ 'notification.mention': full[messages.mentioned_you.id] || '',
'notification.reblog': full['notification.reblog'] || '',
'notification.poll': full['notification.poll'] || '',
'notification.status': full['notification.status'] || '',
diff --git a/app/javascript/mastodon/utils/filters.ts b/app/javascript/mastodon/utils/filters.ts
index 5d334fe509..479e1f44ab 100644
--- a/app/javascript/mastodon/utils/filters.ts
+++ b/app/javascript/mastodon/utils/filters.ts
@@ -7,6 +7,11 @@ export const toServerSideType = (columnType: string) => {
case 'account':
case 'explore':
return columnType;
+ case 'detailed':
+ return 'thread';
+ case 'bookmarks':
+ case 'favourites':
+ return 'home';
default:
if (columnType.includes('list:') || columnType.includes('antenna:')) {
return 'home';
diff --git a/app/javascript/material-icons/400-24px/breaking_news-fill.svg b/app/javascript/material-icons/400-24px/breaking_news-fill.svg
new file mode 100644
index 0000000000..633ca48d57
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/breaking_news-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/breaking_news.svg b/app/javascript/material-icons/400-24px/breaking_news.svg
index d7dd0c12f4..c043f11a8b 100644
--- a/app/javascript/material-icons/400-24px/breaking_news.svg
+++ b/app/javascript/material-icons/400-24px/breaking_news.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/captive_portal-fill.svg b/app/javascript/material-icons/400-24px/captive_portal-fill.svg
new file mode 100644
index 0000000000..5c0b26fb64
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/captive_portal-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/captive_portal.svg b/app/javascript/material-icons/400-24px/captive_portal.svg
index 1f0f09c773..5c0b26fb64 100644
--- a/app/javascript/material-icons/400-24px/captive_portal.svg
+++ b/app/javascript/material-icons/400-24px/captive_portal.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/chat_bubble-fill.svg b/app/javascript/material-icons/400-24px/chat_bubble-fill.svg
new file mode 100644
index 0000000000..b47338a6c9
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/chat_bubble-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/chat_bubble.svg b/app/javascript/material-icons/400-24px/chat_bubble.svg
index 7d210b4608..05d976d242 100644
--- a/app/javascript/material-icons/400-24px/chat_bubble.svg
+++ b/app/javascript/material-icons/400-24px/chat_bubble.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/cloud.svg b/app/javascript/material-icons/400-24px/cloud.svg
index d6926fb717..1daef53baa 100644
--- a/app/javascript/material-icons/400-24px/cloud.svg
+++ b/app/javascript/material-icons/400-24px/cloud.svg
@@ -1 +1 @@
-
+
diff --git a/app/javascript/material-icons/400-24px/cloud_download-fill.svg b/app/javascript/material-icons/400-24px/cloud_download-fill.svg
new file mode 100644
index 0000000000..c55d49f7e5
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/cloud_download-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/cloud_download.svg b/app/javascript/material-icons/400-24px/cloud_download.svg
index 2fc3717ff9..8e9314800c 100644
--- a/app/javascript/material-icons/400-24px/cloud_download.svg
+++ b/app/javascript/material-icons/400-24px/cloud_download.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/cloud_sync-fill.svg b/app/javascript/material-icons/400-24px/cloud_sync-fill.svg
new file mode 100644
index 0000000000..0c648e19e4
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/cloud_sync-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/cloud_sync.svg b/app/javascript/material-icons/400-24px/cloud_sync.svg
index dbf6adc000..461796e323 100644
--- a/app/javascript/material-icons/400-24px/cloud_sync.svg
+++ b/app/javascript/material-icons/400-24px/cloud_sync.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/cloud_upload-fill.svg b/app/javascript/material-icons/400-24px/cloud_upload-fill.svg
new file mode 100644
index 0000000000..66a7bb22d3
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/cloud_upload-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/cloud_upload.svg b/app/javascript/material-icons/400-24px/cloud_upload.svg
index 5e1a4b9aef..94968cb947 100644
--- a/app/javascript/material-icons/400-24px/cloud_upload.svg
+++ b/app/javascript/material-icons/400-24px/cloud_upload.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/code-fill.svg b/app/javascript/material-icons/400-24px/code-fill.svg
new file mode 100644
index 0000000000..8ef5c55cd4
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/code-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/code.svg b/app/javascript/material-icons/400-24px/code.svg
index 5bdc338f7f..8ef5c55cd4 100644
--- a/app/javascript/material-icons/400-24px/code.svg
+++ b/app/javascript/material-icons/400-24px/code.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/computer-fill.svg b/app/javascript/material-icons/400-24px/computer-fill.svg
new file mode 100644
index 0000000000..91295d6846
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/computer-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/computer.svg b/app/javascript/material-icons/400-24px/computer.svg
index 8c5bd9110e..b8af5d4644 100644
--- a/app/javascript/material-icons/400-24px/computer.svg
+++ b/app/javascript/material-icons/400-24px/computer.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/contact_mail-fill.svg b/app/javascript/material-icons/400-24px/contact_mail-fill.svg
new file mode 100644
index 0000000000..c42c799955
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/contact_mail-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/contact_mail.svg b/app/javascript/material-icons/400-24px/contact_mail.svg
index 1ae26cc4d1..4547c48ec5 100644
--- a/app/javascript/material-icons/400-24px/contact_mail.svg
+++ b/app/javascript/material-icons/400-24px/contact_mail.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/database-fill.svg b/app/javascript/material-icons/400-24px/database-fill.svg
new file mode 100644
index 0000000000..3520f69614
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/database-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/database.svg b/app/javascript/material-icons/400-24px/database.svg
index 54ca2f4e56..a3bc2bfbc2 100644
--- a/app/javascript/material-icons/400-24px/database.svg
+++ b/app/javascript/material-icons/400-24px/database.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/diamond-fill.svg b/app/javascript/material-icons/400-24px/diamond-fill.svg
new file mode 100644
index 0000000000..474968ad6f
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/diamond-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/diamond.svg b/app/javascript/material-icons/400-24px/diamond.svg
index 26f4814b44..b604492fa8 100644
--- a/app/javascript/material-icons/400-24px/diamond.svg
+++ b/app/javascript/material-icons/400-24px/diamond.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/filter_alt-fill.svg b/app/javascript/material-icons/400-24px/filter_alt-fill.svg
new file mode 100644
index 0000000000..ec1d90bba6
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/filter_alt-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/filter_alt.svg b/app/javascript/material-icons/400-24px/filter_alt.svg
index 0294cf1da5..e4af9efd5d 100644
--- a/app/javascript/material-icons/400-24px/filter_alt.svg
+++ b/app/javascript/material-icons/400-24px/filter_alt.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/groups-fill.svg b/app/javascript/material-icons/400-24px/groups-fill.svg
new file mode 100644
index 0000000000..754eb0946c
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/groups-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/groups.svg b/app/javascript/material-icons/400-24px/groups.svg
index 0e795eb301..998ff03729 100644
--- a/app/javascript/material-icons/400-24px/groups.svg
+++ b/app/javascript/material-icons/400-24px/groups.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/hide_source-fill.svg b/app/javascript/material-icons/400-24px/hide_source-fill.svg
new file mode 100644
index 0000000000..959631bc1a
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/hide_source-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/hide_source.svg b/app/javascript/material-icons/400-24px/hide_source.svg
index d103ed770a..09633cef8c 100644
--- a/app/javascript/material-icons/400-24px/hide_source.svg
+++ b/app/javascript/material-icons/400-24px/hide_source.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/inbox-fill.svg b/app/javascript/material-icons/400-24px/inbox-fill.svg
new file mode 100644
index 0000000000..15ae2d8f3c
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/inbox-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/inbox.svg b/app/javascript/material-icons/400-24px/inbox.svg
index 427817958c..32c727e810 100644
--- a/app/javascript/material-icons/400-24px/inbox.svg
+++ b/app/javascript/material-icons/400-24px/inbox.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/list-fill.svg b/app/javascript/material-icons/400-24px/list-fill.svg
new file mode 100644
index 0000000000..c9cbe35eb5
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/list-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/list.svg b/app/javascript/material-icons/400-24px/list.svg
index 457a820ab1..c9cbe35eb5 100644
--- a/app/javascript/material-icons/400-24px/list.svg
+++ b/app/javascript/material-icons/400-24px/list.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/mail-fill.svg b/app/javascript/material-icons/400-24px/mail-fill.svg
new file mode 100644
index 0000000000..5e7e4a2fb2
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/mail-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/mail.svg b/app/javascript/material-icons/400-24px/mail.svg
index a92ea7b198..15e1d12d4e 100644
--- a/app/javascript/material-icons/400-24px/mail.svg
+++ b/app/javascript/material-icons/400-24px/mail.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/mood.svg b/app/javascript/material-icons/400-24px/mood.svg
index 9ea109ea9d..33a7d74db9 100644
--- a/app/javascript/material-icons/400-24px/mood.svg
+++ b/app/javascript/material-icons/400-24px/mood.svg
@@ -1 +1 @@
-
+
diff --git a/app/javascript/material-icons/400-24px/report-fill.svg b/app/javascript/material-icons/400-24px/report-fill.svg
new file mode 100644
index 0000000000..50c638869d
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/report-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/report.svg b/app/javascript/material-icons/400-24px/report.svg
index f281f0e1fa..b08b5a1c98 100644
--- a/app/javascript/material-icons/400-24px/report.svg
+++ b/app/javascript/material-icons/400-24px/report.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/safety_check-fill.svg b/app/javascript/material-icons/400-24px/safety_check-fill.svg
new file mode 100644
index 0000000000..b38091a8ec
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/safety_check-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/safety_check.svg b/app/javascript/material-icons/400-24px/safety_check.svg
index f4eab46fb7..87bdba21fe 100644
--- a/app/javascript/material-icons/400-24px/safety_check.svg
+++ b/app/javascript/material-icons/400-24px/safety_check.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/speed-fill.svg b/app/javascript/material-icons/400-24px/speed-fill.svg
new file mode 100644
index 0000000000..dca22ac521
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/speed-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/speed.svg b/app/javascript/material-icons/400-24px/speed.svg
index ceb855c684..0837877f42 100644
--- a/app/javascript/material-icons/400-24px/speed.svg
+++ b/app/javascript/material-icons/400-24px/speed.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/trending_up-fill.svg b/app/javascript/material-icons/400-24px/trending_up-fill.svg
new file mode 100644
index 0000000000..cd0e368964
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/trending_up-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/trending_up.svg b/app/javascript/material-icons/400-24px/trending_up.svg
index 06f9ba2063..cd0e368964 100644
--- a/app/javascript/material-icons/400-24px/trending_up.svg
+++ b/app/javascript/material-icons/400-24px/trending_up.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index f257286f53..5c108a2e6c 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -226,6 +226,10 @@ $content-width: 840px;
gap: 5px;
white-space: nowrap;
+ @media screen and (max-width: $mobile-breakpoint) {
+ flex: 1 0 50%;
+ }
+
&:hover,
&:focus,
&:active {
@@ -1025,6 +1029,12 @@ a.name-tag,
color: var(--user-role-accent);
}
+.applications-list {
+ .icon {
+ vertical-align: middle;
+ }
+}
+
.announcements-list,
.filters-list {
border: 1px solid var(--background-border-color);
@@ -1054,6 +1064,10 @@ a.name-tag,
}
}
+ .icon {
+ vertical-align: middle;
+ }
+
a.announcements-list__item__title {
&:hover,
&:focus,
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 0298402ad8..fc71ccb58a 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -2147,7 +2147,6 @@ body > [data-popper-placement] {
display: block;
position: relative;
border-radius: var(--avatar-border-radius);
- background-color: var(--surface-background-color);
img {
width: 100%;
@@ -2157,7 +2156,11 @@ body > [data-popper-placement] {
display: inline-block; // to not show broken images
}
- &-inline {
+ &--loading {
+ background-color: var(--surface-background-color);
+ }
+
+ &--inline {
display: inline-block;
vertical-align: middle;
margin-inline-end: 5px;
@@ -2836,6 +2839,7 @@ a.account__display-name {
flex: 0 1 auto;
display: flex;
flex-direction: column;
+ contain: inline-size layout paint style;
@media screen and (min-width: $no-gap-breakpoint) {
max-width: 600px;
@@ -2950,7 +2954,7 @@ $ui-header-logo-wordmark-width: 99px;
}
.column {
- width: 400px;
+ width: clamp(380px, calc((100% - 350px) / 4), 400px);
position: relative;
box-sizing: border-box;
display: flex;
@@ -3705,6 +3709,7 @@ $ui-header-logo-wordmark-width: 99px;
overflow-y: auto;
width: 100%;
height: 100%;
+ z-index: 0;
}
.drawer__inner__mastodon {
@@ -4172,6 +4177,7 @@ button.icon-button.active i.fa-retweet {
overflow: hidden;
border: 1px solid var(--background-border-color);
border-radius: 8px;
+ contain: inline-size layout paint style;
&.bottomless {
border-radius: 8px 8px 0 0;
@@ -6087,6 +6093,7 @@ a.status-card {
pointer-events: auto;
user-select: text;
display: flex;
+ max-width: 100vw;
@media screen and (width <= $mobile-breakpoint) {
margin-top: auto;
@@ -7433,6 +7440,8 @@ a.status-card {
}
&--layout-3 {
+ min-height: calc(64px * 2 + 8px);
+
& > .media-gallery__item:nth-child(1) {
border-end-end-radius: 0;
border-start-end-radius: 0;
@@ -7452,6 +7461,8 @@ a.status-card {
}
&--layout-4 {
+ min-height: calc(64px * 2 + 8px);
+
& > .media-gallery__item:nth-child(1) {
border-end-end-radius: 0;
border-start-end-radius: 0;
@@ -8288,79 +8299,23 @@ noscript {
background: rgba($base-overlay-background, 0.5);
}
+.list-adder,
.list-editor {
- background: $ui-base-color;
+ backdrop-filter: var(--background-filter);
+ background: var(--modal-background-color);
+ border: 1px solid var(--modal-border-color);
flex-direction: column;
border-radius: 8px;
- box-shadow: 2px 4px 15px rgba($base-shadow-color, 0.4);
width: 380px;
overflow: hidden;
@media screen and (width <= 420px) {
width: 90%;
}
-
- h4 {
- padding: 15px 0;
- background: lighten($ui-base-color, 13%);
- font-weight: 500;
- font-size: 16px;
- text-align: center;
- border-radius: 8px 8px 0 0;
- }
-
- .drawer__pager {
- height: 50vh;
- border-radius: 4px;
- }
-
- .drawer__inner {
- border-radius: 0 0 8px 8px;
-
- &.backdrop {
- width: calc(100% - 60px);
- box-shadow: 2px 4px 15px rgba($base-shadow-color, 0.4);
- border-radius: 0 0 0 8px;
- }
- }
-
- &__accounts {
- overflow-y: auto;
- }
-
- .account__display-name {
- &:hover strong {
- text-decoration: none;
- }
- }
-
- .account__avatar {
- cursor: default;
- }
-
- .search {
- margin-bottom: 0;
- }
}
.list-adder {
- background: $ui-base-color;
- flex-direction: column;
- border-radius: 8px;
- box-shadow: 2px 4px 15px rgba($base-shadow-color, 0.4);
- width: 380px;
- overflow: hidden;
-
- @media screen and (width <= 420px) {
- width: 90%;
- }
-
- &__account {
- background: lighten($ui-base-color, 13%);
- }
-
&__lists {
- background: lighten($ui-base-color, 13%);
height: 50vh;
border-radius: 0 0 8px 8px;
overflow-y: auto;
@@ -8381,6 +8336,52 @@ noscript {
text-decoration: none;
font-size: 16px;
padding: 10px;
+ display: flex;
+ align-items: center;
+ gap: 4px;
+ }
+}
+
+.list-editor {
+ h4 {
+ padding: 15px 0;
+ background: lighten($ui-base-color, 13%);
+ font-weight: 500;
+ font-size: 16px;
+ text-align: center;
+ border-radius: 8px 8px 0 0;
+ }
+
+ .drawer__pager {
+ height: 50vh;
+ border: 0;
+ }
+
+ .drawer__inner {
+ &.backdrop {
+ width: calc(100% - 60px);
+ box-shadow: 2px 4px 15px rgba($base-shadow-color, 0.4);
+ border-radius: 0 0 0 8px;
+ }
+ }
+
+ &__accounts {
+ background: unset;
+ overflow-y: auto;
+ }
+
+ .account__display-name {
+ &:hover strong {
+ text-decoration: none;
+ }
+ }
+
+ .account__avatar {
+ cursor: default;
+ }
+
+ .search {
+ margin-bottom: 0;
}
}
@@ -8401,6 +8402,7 @@ noscript {
.antenna-setting {
margin: 8px 16px 32px;
+ overflow: auto;
h2 {
font-size: 20px;
@@ -11060,6 +11062,7 @@ noscript {
gap: 8px;
.logo {
+ width: 16px;
height: 16px;
color: $darker-text-color;
}
@@ -11261,21 +11264,17 @@ noscript {
color: $darker-text-color;
-webkit-line-clamp: 4;
-webkit-box-orient: vertical;
- max-height: 4 * 22px;
+ max-height: none;
overflow: hidden;
- p {
- display: none;
-
- &:first-child {
- display: initial;
- }
- }
-
p,
a {
color: inherit;
}
+
+ p {
+ margin-bottom: 8px;
+ }
}
.reply-indicator__attachments {
@@ -11570,19 +11569,21 @@ noscript {
}
.content-warning {
+ display: block;
box-sizing: border-box;
background: rgba($ui-highlight-color, 0.05);
color: $secondary-text-color;
- border-top: 1px solid;
- border-bottom: 1px solid;
- border-color: rgba($ui-highlight-color, 0.15);
+ border: 1px solid rgba($ui-highlight-color, 0.15);
+ border-radius: 8px;
padding: 8px (5px + 8px);
position: relative;
font-size: 15px;
line-height: 22px;
+ cursor: pointer;
p {
margin-bottom: 8px;
+ font-weight: 500;
}
.link-button {
@@ -11591,32 +11592,17 @@ noscript {
font-weight: 500;
}
- &::before,
- &::after {
- content: '';
- display: block;
- position: absolute;
- height: 100%;
- background: url('../images/warning-stripes.svg') repeat-y;
- width: 5px;
- top: 0;
- }
+ &--filter {
+ color: $darker-text-color;
- &::before {
- border-start-start-radius: 4px;
- border-end-start-radius: 4px;
- inset-inline-start: 0;
- }
+ p {
+ font-weight: normal;
+ }
- &::after {
- border-start-end-radius: 4px;
- border-end-end-radius: 4px;
- inset-inline-end: 0;
- }
-
- &--filter::before,
- &--filter::after {
- background-image: url('../images/filter-stripes.svg');
+ .filter-name {
+ font-weight: 500;
+ color: $secondary-text-color;
+ }
}
&--compacted-status::before {
diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss
index 3a2c98a62d..b58e015872 100644
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -23,6 +23,8 @@ code {
position: relative;
overflow: hidden;
height: 160px;
+ max-width: 566px;
+ margin-inline: auto;
&::after {
content: '';
@@ -678,6 +680,10 @@ code {
}
}
}
+
+ .status-card {
+ contain: unset;
+ }
}
.block-icon {
diff --git a/app/javascript/styles/mastodon/rtl.scss b/app/javascript/styles/mastodon/rtl.scss
index e4e299ff82..0a05ce7c62 100644
--- a/app/javascript/styles/mastodon/rtl.scss
+++ b/app/javascript/styles/mastodon/rtl.scss
@@ -35,6 +35,10 @@ body.rtl {
direction: rtl;
}
+ .column-back-button__icon {
+ transform: scale(-1, 1);
+ }
+
.simple_form select {
background: $ui-base-color
url("data:image/svg+xml;utf8,")
diff --git a/app/javascript/styles/mastodon/tables.scss b/app/javascript/styles/mastodon/tables.scss
index f08b1eb250..cab96e1ac3 100644
--- a/app/javascript/styles/mastodon/tables.scss
+++ b/app/javascript/styles/mastodon/tables.scss
@@ -137,6 +137,7 @@ a.table-action-link {
padding: 0 10px;
color: $darker-text-color;
font-weight: 500;
+ white-space: nowrap;
&:hover {
color: $highlight-text-color;
diff --git a/app/javascript/styles/mastodon/widgets.scss b/app/javascript/styles/mastodon/widgets.scss
index d810ee4bfc..f467069052 100644
--- a/app/javascript/styles/mastodon/widgets.scss
+++ b/app/javascript/styles/mastodon/widgets.scss
@@ -84,6 +84,7 @@
width: 100%;
.account {
+ max-width: calc(56px + 30ch);
padding: 0;
border: 0;
}
diff --git a/app/lib/account_reach_finder.rb b/app/lib/account_reach_finder.rb
index 481e254396..4bf5c229a5 100644
--- a/app/lib/account_reach_finder.rb
+++ b/app/lib/account_reach_finder.rb
@@ -1,12 +1,16 @@
# frozen_string_literal: true
class AccountReachFinder
+ RECENT_LIMIT = 2_000
+ STATUS_LIMIT = 200
+ STATUS_SINCE = 2.days
+
def initialize(account)
@account = account
end
def inboxes
- (followers_inboxes + reporters_inboxes + recently_mentioned_inboxes + relay_inboxes).uniq
+ (followers_inboxes + reporters_inboxes + recently_mentioned_inboxes + recently_followed_inboxes + recently_requested_inboxes + relay_inboxes).uniq
end
private
@@ -20,13 +24,46 @@ class AccountReachFinder
end
def recently_mentioned_inboxes
- cutoff_id = Mastodon::Snowflake.id_at(2.days.ago, with_random: false)
- recent_statuses = @account.statuses.recent.where(id: cutoff_id...).limit(200)
+ Account
+ .joins(:mentions)
+ .where(mentions: { status: recent_statuses })
+ .inboxes
+ .take(RECENT_LIMIT)
+ end
- Account.joins(:mentions).where(mentions: { status: recent_statuses }).inboxes.take(2000)
+ def recently_followed_inboxes
+ @account
+ .following
+ .where(follows: { created_at: recent_date_cutoff... })
+ .inboxes
+ .take(RECENT_LIMIT)
+ end
+
+ def recently_requested_inboxes
+ Account
+ .where(id: @account.follow_requests.where({ created_at: recent_date_cutoff... }).select(:target_account_id))
+ .inboxes
+ .take(RECENT_LIMIT)
end
def relay_inboxes
Relay.enabled.pluck(:inbox_url)
end
+
+ def oldest_status_id
+ Mastodon::Snowflake
+ .id_at(recent_date_cutoff, with_random: false)
+ end
+
+ def recent_date_cutoff
+ @account.suspended? && @account.suspension_origin_local? ? @account.suspended_at - STATUS_SINCE : STATUS_SINCE.ago
+ end
+
+ def recent_statuses
+ @account
+ .statuses
+ .recent
+ .where(id: oldest_status_id...)
+ .limit(STATUS_LIMIT)
+ end
end
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 1de75e6fc7..56176383e1 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -48,6 +48,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
def process_status
@tags = []
@mentions = []
+ @unresolved_mentions = []
@silenced_account_ids = []
@params = {}
@raw_mention_uris = []
@@ -63,9 +64,11 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
ApplicationRecord.transaction do
@status = Status.create!(@params)
attach_tags(@status)
+ attach_mentions(@status)
end
resolve_thread(@status)
+ resolve_unresolved_mentions(@status)
fetch_replies(@status)
process_conversation! if @status.limited_visibility?
process_references!
@@ -225,6 +228,15 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
# not a big deal
Trends.tags.register(status)
+ # Update featured tags
+ return if @tags.empty? || !status.distributable?
+
+ @account.featured_tags.where(tag_id: @tags.pluck(:id)).find_each do |featured_tag|
+ featured_tag.increment(status.created_at)
+ end
+ end
+
+ def attach_mentions(status)
@mentions.each do |mention|
mention.status = status
mention.save
@@ -266,6 +278,8 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
return if account.nil?
@mentions << Mention.new(account: account, silent: false)
+ rescue Mastodon::UnexpectedResponseError, HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError
+ @unresolved_mentions << tag['href']
end
def process_emoji(tag)
@@ -396,6 +410,12 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
ThreadResolveWorker.perform_async(status.id, in_reply_to_uri, { 'request_id' => @options[:request_id] })
end
+ def resolve_unresolved_mentions(status)
+ @unresolved_mentions.uniq.each do |uri|
+ MentionResolveWorker.perform_in(rand(30...600).seconds, status.id, uri, { 'request_id' => @options[:request_id] })
+ end
+ end
+
def fetch_replies(status)
collection = @object['replies']
return if collection.blank?
diff --git a/app/lib/activitypub/activity/follow.rb b/app/lib/activitypub/activity/follow.rb
index 75c88d964e..256d72acb9 100644
--- a/app/lib/activitypub/activity/follow.rb
+++ b/app/lib/activitypub/activity/follow.rb
@@ -60,19 +60,13 @@ class ActivityPub::Activity::Follow < ActivityPub::Activity
already_accepted = friend.accepted?
friend.update!(passive_state: :pending, active_state: :idle, passive_follow_activity_id: @json['id'])
else
- @friend = FriendDomain.new(domain: @account.domain, passive_state: :pending, passive_follow_activity_id: @json['id'])
- @friend.inbox_url = @json['inboxUrl'].presence || @friend.default_inbox_url
- @friend.save!
+ @friend = FriendDomain.create!(domain: @account.domain, passive_state: :pending, passive_follow_activity_id: @json['id'], inbox_url: @account.preferred_inbox_url)
end
- if already_accepted || Setting.unlocked_friend
- friend.accept!
+ friend.accept! if already_accepted || Setting.unlocked_friend
- # Notify for admin even if unlocked
- notify_staff_about_pending_friend_server! unless already_accepted
- else
- notify_staff_about_pending_friend_server!
- end
+ # Notify for admin
+ notify_staff_about_pending_friend_server! unless already_accepted
end
def friend
diff --git a/app/lib/activitypub/parser/media_attachment_parser.rb b/app/lib/activitypub/parser/media_attachment_parser.rb
index 56b8b23f84..bcbf92214f 100644
--- a/app/lib/activitypub/parser/media_attachment_parser.rb
+++ b/app/lib/activitypub/parser/media_attachment_parser.rb
@@ -15,13 +15,15 @@ class ActivityPub::Parser::MediaAttachmentParser
end
def remote_url
- Addressable::URI.parse(@json['url'])&.normalize&.to_s
+ url = Addressable::URI.parse(@json['url'])&.normalize&.to_s
+ url unless unsupported_uri_scheme?(url)
rescue Addressable::URI::InvalidURIError
nil
end
def thumbnail_remote_url
- Addressable::URI.parse(@json['icon'].is_a?(Hash) ? @json['icon']['url'] : @json['icon'])&.normalize&.to_s
+ url = Addressable::URI.parse(@json['icon'].is_a?(Hash) ? @json['icon']['url'] : @json['icon'])&.normalize&.to_s
+ url unless unsupported_uri_scheme?(url)
rescue Addressable::URI::InvalidURIError
nil
end
diff --git a/app/lib/activitypub/parser/status_parser.rb b/app/lib/activitypub/parser/status_parser.rb
index 5867f07d86..0206b1756f 100644
--- a/app/lib/activitypub/parser/status_parser.rb
+++ b/app/lib/activitypub/parser/status_parser.rb
@@ -30,7 +30,10 @@ class ActivityPub::Parser::StatusParser
end
def url
- url_to_href(@object['url'], 'text/html') if @object['url'].present?
+ return if @object['url'].blank?
+
+ url = url_to_href(@object['url'], 'text/html')
+ url unless unsupported_uri_scheme?(url)
end
def text
diff --git a/app/lib/activitypub/tag_manager.rb b/app/lib/activitypub/tag_manager.rb
index d773e7e11a..8e23382c6a 100644
--- a/app/lib/activitypub/tag_manager.rb
+++ b/app/lib/activitypub/tag_manager.rb
@@ -4,6 +4,7 @@ require 'singleton'
class ActivityPub::TagManager
include Singleton
+ include JsonLdHelper
include RoutingHelper
CONTEXT = 'https://www.w3.org/ns/activitystreams'
@@ -17,7 +18,7 @@ class ActivityPub::TagManager
end
def url_for(target)
- return target.url if target.respond_to?(:local?) && !target.local?
+ return unsupported_uri_scheme?(target.url) ? nil : target.url if target.respond_to?(:local?) && !target.local?
return unless target.respond_to?(:object_type)
diff --git a/app/lib/attachment_batch.rb b/app/lib/attachment_batch.rb
index 32ccb0b13c..374abfac49 100644
--- a/app/lib/attachment_batch.rb
+++ b/app/lib/attachment_batch.rb
@@ -77,10 +77,22 @@ class AttachmentBatch
when :fog
logger.debug { "Deleting #{attachment.path(style)}" }
+ retries = 0
begin
attachment.send(:directory).files.new(key: attachment.path(style)).destroy
- rescue Fog::Storage::OpenStack::NotFound
- # Ignore failure to delete a file that has already been deleted
+ rescue Fog::OpenStack::Storage::NotFound
+ logger.debug "Will ignore because file is not found #{attachment.path(style)}"
+ rescue => e
+ retries += 1
+
+ if retries < MAX_RETRY
+ logger.debug "Retry #{retries}/#{MAX_RETRY} after #{e.message}"
+ sleep 2**retries
+ retry
+ else
+ logger.error "Batch deletion from fog failed after #{e.message}"
+ raise e
+ end
end
when :azure
logger.debug { "Deleting #{attachment.path(style)}" }
diff --git a/app/lib/content_security_policy.rb b/app/lib/content_security_policy.rb
index 0b60b0d98c..c764d1856d 100644
--- a/app/lib/content_security_policy.rb
+++ b/app/lib/content_security_policy.rb
@@ -36,7 +36,7 @@ class ContentSecurityPolicy
end
def cdn_host_value
- s3_alias_host || s3_cloudfront_host || azure_alias_host || s3_hostname_host
+ s3_alias_host || s3_cloudfront_host || azure_alias_host || s3_hostname_host || swift_object_url
end
def paperclip_root_url
@@ -72,6 +72,14 @@ class ContentSecurityPolicy
host_to_url ENV.fetch('S3_HOSTNAME', nil)
end
+ def swift_object_url
+ url = ENV.fetch('SWIFT_OBJECT_URL', nil)
+ return if url.blank? || !url.start_with?('https://')
+
+ url += '/' unless url.end_with?('/')
+ url
+ end
+
def uri_from_configuration_and_string(host_string)
Addressable::URI.parse("#{host_protocol}://#{host_string}").tap do |uri|
uri.path += '/' unless uri.path.blank? || uri.path.end_with?('/')
diff --git a/app/lib/delivery_failure_tracker.rb b/app/lib/delivery_failure_tracker.rb
index e17b45d667..96292923f4 100644
--- a/app/lib/delivery_failure_tracker.rb
+++ b/app/lib/delivery_failure_tracker.rb
@@ -46,6 +46,8 @@ class DeliveryFailureTracker
urls.reject do |url|
host = Addressable::URI.parse(url).normalized_host
unavailable_domains_map[host]
+ rescue Addressable::URI::InvalidURIError, IDN::Idna::IdnaError
+ true
end
end
diff --git a/app/lib/emoji_formatter.rb b/app/lib/emoji_formatter.rb
index c0302767ef..1574d4588d 100644
--- a/app/lib/emoji_formatter.rb
+++ b/app/lib/emoji_formatter.rb
@@ -24,7 +24,15 @@ class EmojiFormatter
def to_s
return html if custom_emojis.empty? || html.blank?
- tree = Nokogiri::HTML5.fragment(html)
+ begin
+ tree = Nokogiri::HTML5.fragment(html)
+ rescue ArgumentError
+ # This can happen if one of the Nokogumbo limits is encountered
+ # Unfortunately, it does not use a more precise error class
+ # nor allows more graceful handling
+ return ''
+ end
+
tree.xpath('./text()|.//text()[not(ancestor[@class="invisible"])]').to_a.each do |node|
i = -1
inside_shortname = false
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index 4ad166fcd3..1a558cacbe 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -32,24 +32,31 @@ class FeedManager
"feed:#{type}:#{id}:#{subtype}"
end
+ # The filter result of the status to a particular feed
+ # @param [Symbol] timeline_type
+ # @param [Status] status
+ # @param [Account|List] receiver
+ # @return [void|Symbol] nil, :filter, or :skip_home
+ def filter(timeline_type, status, receiver, stl_home: false)
+ case timeline_type
+ when :home
+ filter_from_home(status, receiver.id, build_crutches(receiver.id, [status]), :home)
+ when :list
+ (filter_from_list?(status, receiver) ? :filter : nil) || filter_from_home(status, receiver.account_id, build_crutches(receiver.account_id, [status], list: receiver), :list, stl_home: stl_home)
+ when :mentions
+ filter_from_mentions?(status, receiver.id) ? :filter : nil
+ when :tags
+ filter_from_tags?(status, receiver.id, build_crutches(receiver.id, [status])) ? :filter : nil
+ end
+ end
+
# Check if the status should not be added to a feed
# @param [Symbol] timeline_type
# @param [Status] status
# @param [Account|List] receiver
# @return [Boolean]
def filter?(timeline_type, status, receiver, stl_home: false)
- case timeline_type
- when :home
- filter_from_home?(status, receiver.id, build_crutches(receiver.id, [status]), :home)
- when :list
- filter_from_list?(status, receiver) || filter_from_home?(status, receiver.account_id, build_crutches(receiver.account_id, [status]), :list, stl_home: stl_home)
- when :mentions
- filter_from_mentions?(status, receiver.id)
- when :tags
- filter_from_tags?(status, receiver.id, build_crutches(receiver.id, [status]))
- else
- false
- end
+ !!filter(timeline_type, status, receiver, stl_home: stl_home)
end
# Add a status to a home feed and send a streaming API update
@@ -58,6 +65,7 @@ class FeedManager
# @param [Boolean] update
# @return [Boolean]
def push_to_home(account, status, update: false)
+ return false unless account.user&.signed_in_recently?
return false unless add_to_feed(:home, account.id, status, aggregate_reblogs: account.user&.aggregates_reblogs?, update: update)
trim(:home, account.id)
@@ -84,6 +92,8 @@ class FeedManager
# @return [Boolean]
def push_to_list(list, status, update: false)
return false if filter_from_list?(status, list) || !add_to_feed(:list, list.id, status, aggregate_reblogs: list.account.user&.aggregates_reblogs?, update: update)
+ return false unless list.account.user&.signed_in_recently?
+ return false unless add_to_feed(:list, list.id, status, aggregate_reblogs: list.account.user&.aggregates_reblogs?)
trim(:list, list.id)
PushUpdateWorker.perform_async(list.account_id, status.id, "timeline:list:#{list.id}", { 'update' => update }) if push_update_required?("timeline:list:#{list.id}")
@@ -122,9 +132,11 @@ class FeedManager
# @param [Account] into_account
# @return [void]
def merge_into_home(from_account, into_account)
+ return unless into_account.user&.signed_in_recently?
+
timeline_key = key(:home, into_account.id)
aggregate = into_account.user&.aggregates_reblogs?
- query = from_account.statuses.list_eligible_visibility.includes(:preloadable_poll, :media_attachments, reblog: :account).limit(FeedManager::MAX_ITEMS / 4)
+ query = from_account.statuses.list_eligible_visibility.includes(reblog: :account).limit(FeedManager::MAX_ITEMS / 4)
if redis.zcard(timeline_key) >= FeedManager::MAX_ITEMS / 4
oldest_home_score = redis.zrange(timeline_key, 0, 0, with_scores: true).first.last.to_i
@@ -135,7 +147,7 @@ class FeedManager
crutches = build_crutches(into_account.id, statuses)
statuses.each do |status|
- next if filter_from_home?(status, into_account.id, crutches)
+ next if filter_from_home(status, into_account.id, crutches)
add_to_feed(:home, into_account.id, status, aggregate_reblogs: aggregate)
end
@@ -148,9 +160,11 @@ class FeedManager
# @param [List] list
# @return [void]
def merge_into_list(from_account, list)
+ return unless list.account.user&.signed_in_recently?
+
timeline_key = key(:list, list.id)
aggregate = list.account.user&.aggregates_reblogs?
- query = from_account.statuses.list_eligible_visibility.includes(:preloadable_poll, :media_attachments, reblog: :account).limit(FeedManager::MAX_ITEMS / 4)
+ query = from_account.statuses.list_eligible_visibility.includes(reblog: :account).limit(FeedManager::MAX_ITEMS / 4)
if redis.zcard(timeline_key) >= FeedManager::MAX_ITEMS / 4
oldest_home_score = redis.zrange(timeline_key, 0, 0, with_scores: true).first.last.to_i
@@ -158,10 +172,10 @@ class FeedManager
end
statuses = query.to_a
- crutches = build_crutches(list.account_id, statuses)
+ crutches = build_crutches(list.account_id, statuses, list: list)
statuses.each do |status|
- next if filter_from_home?(status, list.account_id, crutches) || filter_from_list?(status, list)
+ next if filter_from_home(status, list.account_id, crutches, :list)
add_to_feed(:list, list.id, status, aggregate_reblogs: aggregate)
end
@@ -177,7 +191,7 @@ class FeedManager
timeline_key = key(:home, into_account.id)
timeline_status_ids = redis.zrange(timeline_key, 0, -1)
- from_account.statuses.select('id, reblog_of_id').where(id: timeline_status_ids).reorder(nil).find_each do |status|
+ from_account.statuses.select(:id, :reblog_of_id).where(id: timeline_status_ids).reorder(nil).find_each do |status|
remove_from_feed(:home, into_account.id, status, aggregate_reblogs: into_account.user&.aggregates_reblogs?)
end
end
@@ -190,7 +204,7 @@ class FeedManager
timeline_key = key(:list, list.id)
timeline_status_ids = redis.zrange(timeline_key, 0, -1)
- from_account.statuses.select('id, reblog_of_id').where(id: timeline_status_ids).reorder(nil).find_each do |status|
+ from_account.statuses.select(:id, :reblog_of_id).where(id: timeline_status_ids).reorder(nil).find_each do |status|
remove_from_feed(:list, list.id, status, aggregate_reblogs: list.account.user&.aggregates_reblogs?)
end
end
@@ -211,7 +225,7 @@ class FeedManager
.where.not(account: into_account.following)
.tagged_with_none(TagFollow.where(account: into_account).pluck(:tag_id))
- scope.select('id, reblog_of_id').reorder(nil).find_each do |status|
+ scope.select(:id, :reblog_of_id).reorder(nil).find_each do |status|
remove_from_feed(:home, into_account.id, status, aggregate_reblogs: into_account.user&.aggregates_reblogs?)
end
end
@@ -295,27 +309,36 @@ class FeedManager
limit = FeedManager::MAX_ITEMS / 2
aggregate = account.user&.aggregates_reblogs?
timeline_key = key(:home, account.id)
+ over_limit = false
account.statuses.limit(limit).each do |status|
add_to_feed(:home, account.id, status, aggregate_reblogs: aggregate)
end
account.following.includes(:account_stat).reorder(nil).find_each do |target_account|
- if redis.zcard(timeline_key) >= limit
+ query = target_account.statuses.list_eligible_visibility.includes(reblog: :account).limit(limit)
+
+ over_limit ||= redis.zcard(timeline_key) >= limit
+ if over_limit
oldest_home_score = redis.zrange(timeline_key, 0, 0, with_scores: true).first.last.to_i
- last_status_score = Mastodon::Snowflake.id_at(target_account.last_status_at)
+ last_status_score = Mastodon::Snowflake.id_at(target_account.last_status_at, with_random: false)
# If the feed is full and this account has not posted more recently
# than the last item on the feed, then we can skip the whole account
# because none of its statuses would stay on the feed anyway
next if last_status_score < oldest_home_score
+
+ # No need to get older statuses
+ query = query.where(id: oldest_home_score...)
end
- statuses = target_account.statuses.list_eligible_visibility.includes(:preloadable_poll, :media_attachments, :account, reblog: :account).limit(limit)
+ statuses = query.to_a
+ next if statuses.empty?
+
crutches = build_crutches(account.id, statuses)
statuses.each do |status|
- next if filter_from_home?(status, account.id, crutches)
+ next if filter_from_home(status, account.id, crutches)
add_to_feed(:home, account.id, status, aggregate_reblogs: aggregate)
end
@@ -324,6 +347,47 @@ class FeedManager
end
end
+ # Populate list feed of account from scratch
+ # @param [List] list
+ # @return [void]
+ def populate_list(list)
+ limit = FeedManager::MAX_ITEMS / 2
+ aggregate = list.account.user&.aggregates_reblogs?
+ timeline_key = key(:list, list.id)
+ over_limit = false
+
+ list.active_accounts.includes(:account_stat).reorder(nil).find_each do |target_account|
+ query = target_account.statuses.list_eligible_visibility.includes(reblog: :account).limit(limit)
+
+ over_limit ||= redis.zcard(timeline_key) >= limit
+ if over_limit
+ oldest_home_score = redis.zrange(timeline_key, 0, 0, with_scores: true).first.last.to_i
+ last_status_score = Mastodon::Snowflake.id_at(target_account.last_status_at, with_random: false)
+
+ # If the feed is full and this account has not posted more recently
+ # than the last item on the feed, then we can skip the whole account
+ # because none of its statuses would stay on the feed anyway
+ next if last_status_score < oldest_home_score
+
+ # No need to get older statuses
+ query = query.where(id: oldest_home_score...)
+ end
+
+ statuses = query.to_a
+ next if statuses.empty?
+
+ crutches = build_crutches(list.account_id, statuses, list: list)
+
+ statuses.each do |status|
+ next if filter_from_home(status, list.account_id, crutches, :list)
+
+ add_to_feed(:list, list.id, status, aggregate_reblogs: aggregate)
+ end
+
+ trim(:list, list.id)
+ end
+ end
+
# Completely clear multiple feeds at once
# @param [Symbol] type
# @param [Array] ids
@@ -408,12 +472,12 @@ class FeedManager
# @param [Status] status
# @param [Integer] receiver_id
# @param [Hash] crutches
- # @return [Boolean]
- def filter_from_home?(status, receiver_id, crutches, timeline_type = :home, stl_home: false) # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize
- return false if receiver_id == status.account_id
- return true if status.reply? && (status.in_reply_to_id.nil? || status.in_reply_to_account_id.nil?) && !(timeline_type == :home && status.limited_visibility?)
- return true if (timeline_type != :list || stl_home) && (crutches[:exclusive_list_users][status.account_id].present? || crutches[:exclusive_antenna_users][status.account_id].present?)
- return true if crutches[:languages][status.account_id].present? && status.language.present? && !crutches[:languages][status.account_id].include?(status.language)
+ # @return [void|Symbol] nil, :skip_home, or :filter
+ def filter_from_home(status, receiver_id, crutches, timeline_type = :home, stl_home: false) # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize
+ return if receiver_id == status.account_id
+ return :filter if status.reply? && (status.in_reply_to_id.nil? || status.in_reply_to_account_id.nil?) && !(timeline_type == :home && status.limited_visibility?)
+ return :skip_home if (timeline_type != :list || stl_home) && (crutches[:exclusive_list_users][status.account_id].present? || crutches[:exclusive_antenna_users][status.account_id].present?)
+ return :filter if crutches[:languages][status.account_id].present? && status.language.present? && !crutches[:languages][status.account_id].include?(status.language)
check_for_blocks = crutches[:active_mentions][status.id] || []
check_for_blocks.push(status.account_id)
@@ -423,25 +487,23 @@ class FeedManager
check_for_blocks.concat(crutches[:active_mentions][status.reblog_of_id] || [])
end
- return true if check_for_blocks.any? { |target_account_id| crutches[:blocking][target_account_id] || crutches[:muting][target_account_id] }
- return true if crutches[:blocked_by][status.account_id]
+ return :filter if check_for_blocks.any? { |target_account_id| crutches[:blocking][target_account_id] || crutches[:muting][target_account_id] }
+ return :filter if crutches[:blocked_by][status.account_id]
- if status.reply? && (!status.in_reply_to_account_id.nil? || (status.thread.present? && status.limited_visibility?)) # Filter out if it's a reply
+ if status.reply? && (!status.in_reply_to_account_id.nil? || (status.thread.present? && status.limited_visibility?)) # Filter out if it's a reply
account_id = status.in_reply_to_account_id || status.thread.account_id
- should_filter = !crutches[:following][account_id] # and I'm not following the person it's a reply to
- should_filter &&= receiver_id != account_id # and it's not a reply to me
- should_filter &&= status.account_id != account_id # and it's not a self-reply
-
- return !!should_filter
+ should_filter = !crutches[:following][account_id] # and I'm not following the person it's a reply to
+ should_filter &&= receiver_id != account_id # and it's not a reply to me
+ should_filter &&= status.account_id != account_id # and it's not a self-reply
elsif status.reblog? # Filter out a reblog
should_filter = crutches[:hiding_reblogs][status.account_id] # if the reblogger's reblogs are suppressed
should_filter ||= crutches[:blocked_by][status.reblog.account_id] # or if the author of the reblogged status is blocking me
should_filter ||= crutches[:domain_blocking][status.reblog.account.domain] # or the author's domain is blocked
-
- return !!should_filter
+ else
+ should_filter = false
end
- false
+ should_filter ? :filter : nil
end
# Check if status should not be added to the mentions feed
@@ -588,8 +650,9 @@ class FeedManager
# are going to be checked by the filtering methods
# @param [Integer] receiver_id
# @param [Array] statuses
+ # @param [List] list
# @return [Hash]
- def build_crutches(receiver_id, statuses) # rubocop:disable Metrics/AbcSize
+ def build_crutches(receiver_id, statuses, list: nil)
crutches = {}
crutches[:active_mentions] = crutches_active_mentions(statuses)
@@ -606,25 +669,43 @@ class FeedManager
arr
end
- lists = List.where(account_id: receiver_id, exclusive: true)
- antennas = Antenna.where(list: lists, insert_feeds: true)
-
- replied_accounts = statuses.filter_map(&:in_reply_to_account_id)
- replied_accounts += statuses.filter { |status| status.limited_visibility? && status.thread.present? }.map { |status| status.thread.account_id }
-
- crutches[:following] = Follow.where(account_id: receiver_id, target_account_id: replied_accounts).pluck(:target_account_id).index_with(true)
+ crutches[:following] = crutches_following(receiver_id, statuses, list)
crutches[:languages] = Follow.where(account_id: receiver_id, target_account_id: statuses.map(&:account_id)).pluck(:target_account_id, :languages).to_h
crutches[:hiding_reblogs] = Follow.where(account_id: receiver_id, target_account_id: statuses.filter_map { |s| s.account_id if s.reblog? }, show_reblogs: false).pluck(:target_account_id).index_with(true)
crutches[:blocking] = Block.where(account_id: receiver_id, target_account_id: check_for_blocks).pluck(:target_account_id).index_with(true)
crutches[:muting] = Mute.where(account_id: receiver_id, target_account_id: check_for_blocks).pluck(:target_account_id).index_with(true)
crutches[:domain_blocking] = AccountDomainBlock.where(account_id: receiver_id, domain: statuses.flat_map { |s| [s.account.domain, s.reblog&.account&.domain] }.compact).pluck(:domain).index_with(true)
crutches[:blocked_by] = Block.where(target_account_id: receiver_id, account_id: statuses.map { |s| [s.account_id, s.reblog&.account_id] }.flatten.compact).pluck(:account_id).index_with(true)
- crutches[:exclusive_list_users] = ListAccount.where(list: lists, account_id: statuses.map(&:account_id)).pluck(:account_id).index_with(true)
- crutches[:exclusive_antenna_users] = AntennaAccount.where(antenna: antennas, account_id: statuses.map(&:account_id)).pluck(:account_id).index_with(true)
+ crutches[:exclusive_list_users] = crutches_exclusive_list_users(receiver_id, statuses) if list.blank?
+ crutches[:exclusive_antenna_users] = crutches_exclusive_antenna_users(receiver_id, statuses)
crutches
end
+ def crutches_exclusive_list_users(recipient_id, statuses)
+ lists = List.where(account_id: recipient_id, exclusive: true)
+ ListAccount.where(list: lists, account_id: statuses.map(&:account_id)).pluck(:account_id).index_with(true)
+ end
+
+ def crutches_exclusive_antenna_users(recipient_id, statuses)
+ lists = List.where(account_id: recipient_id, exclusive: true)
+ antennas = Antenna.where(list: lists, insert_feeds: true)
+ AntennaAccount.where(antenna: antennas, account_id: statuses.map(&:account_id)).pluck(:account_id).index_with(true)
+ end
+
+ def crutches_following(recipient_id, statuses, list)
+ if list.blank? || list.show_followed?
+ replied_accounts = statuses.filter_map(&:in_reply_to_account_id)
+ replied_accounts += statuses.filter { |status| status.limited_visibility? && status.thread.present? }.map { |status| status.thread.account_id }
+
+ Follow.where(account_id: recipient_id, target_account_id: replied_accounts).pluck(:target_account_id).index_with(true)
+ elsif list.show_list?
+ ListAccount.where(list_id: list.id, account_id: statuses.filter_map(&:in_reply_to_account_id)).pluck(:account_id).index_with(true)
+ else
+ {}
+ end
+ end
+
def crutches_active_mentions(statuses)
Mention
.active
diff --git a/app/lib/http_signature_draft.rb b/app/lib/http_signature_draft.rb
new file mode 100644
index 0000000000..cb794b223a
--- /dev/null
+++ b/app/lib/http_signature_draft.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+# This implements an older draft of HTTP Signatures:
+# https://datatracker.ietf.org/doc/html/draft-cavage-http-signatures
+
+class HttpSignatureDraft
+ REQUEST_TARGET = '(request-target)'
+
+ def initialize(keypair, key_id)
+ @keypair = keypair
+ @key_id = key_id
+ end
+
+ def request_target(verb, url)
+ if url.query.nil?
+ "#{verb} #{url.path}"
+ else
+ "#{verb} #{url.path}?#{url.query}"
+ end
+ end
+
+ def sign(signed_headers, verb, url)
+ signed_headers = signed_headers.merge(REQUEST_TARGET => request_target(verb, url))
+ signed_string = signed_headers.map { |key, value| "#{key.downcase}: #{value}" }.join("\n")
+ algorithm = 'rsa-sha256'
+ signature = Base64.strict_encode64(@keypair.sign(OpenSSL::Digest.new('SHA256'), signed_string))
+
+ "keyId=\"#{@key_id}\",algorithm=\"#{algorithm}\",headers=\"#{signed_headers.keys.join(' ').downcase}\",signature=\"#{signature}\""
+ end
+end
diff --git a/app/lib/plain_text_formatter.rb b/app/lib/plain_text_formatter.rb
index f960ba7acc..e8ff79806f 100644
--- a/app/lib/plain_text_formatter.rb
+++ b/app/lib/plain_text_formatter.rb
@@ -16,7 +16,15 @@ class PlainTextFormatter
if local?
text
else
- node = Nokogiri::HTML5.fragment(insert_newlines)
+ begin
+ node = Nokogiri::HTML5.fragment(insert_newlines)
+ rescue ArgumentError
+ # This can happen if one of the Nokogumbo limits is encountered
+ # Unfortunately, it does not use a more precise error class
+ # nor allows more graceful handling
+ return ''
+ end
+
# Elements that are entirely removed with our Sanitize config
node.xpath('.//iframe|.//math|.//noembed|.//noframes|.//noscript|.//plaintext|.//script|.//style|.//svg|.//xmp').remove
node.text.chomp
diff --git a/app/lib/request.rb b/app/lib/request.rb
index d7da9fe63c..10a3680484 100644
--- a/app/lib/request.rb
+++ b/app/lib/request.rb
@@ -61,8 +61,6 @@ class PerOperationWithDeadline < HTTP::Timeout::PerOperation
end
class Request
- REQUEST_TARGET = '(request-target)'
-
# We enforce a 5s timeout on DNS resolving, 5s timeout on socket opening
# and 5s timeout on the TLS handshake, meaning the worst case should take
# about 15s in total
@@ -77,12 +75,21 @@ class Request
@url = Addressable::URI.parse(url).normalize
@http_client = options.delete(:http_client)
@allow_local = options.delete(:allow_local)
- @full_path = !options.delete(:omit_query_string)
- @options = options.merge(socket_class: use_proxy? || @allow_local ? ProxySocket : Socket)
- @options = @options.merge(timeout_class: PerOperationWithDeadline, timeout_options: TIMEOUT)
+ @options = {
+ follow: {
+ max_hops: 3,
+ on_redirect: ->(response, request) { re_sign_on_redirect(response, request) },
+ },
+ }.merge(options).merge(
+ socket_class: use_proxy? || @allow_local ? ProxySocket : Socket,
+ timeout_class: PerOperationWithDeadline,
+ timeout_options: TIMEOUT
+ )
@options = @options.merge(proxy_url) if use_proxy?
@headers = {}
+ @signing = nil
+
raise Mastodon::HostValidationError, 'Instance does not support hidden service connections' if block_hidden_service?
set_common_headers!
@@ -92,8 +99,9 @@ class Request
def on_behalf_of(actor, sign_with: nil)
raise ArgumentError, 'actor must not be nil' if actor.nil?
- @actor = actor
- @keypair = sign_with.present? ? OpenSSL::PKey::RSA.new(sign_with) : @actor.keypair
+ key_id = ActivityPub::TagManager.instance.key_uri_for(actor)
+ keypair = sign_with.present? ? OpenSSL::PKey::RSA.new(sign_with) : actor.keypair
+ @signing = HttpSignatureDraft.new(keypair, key_id)
self
end
@@ -125,7 +133,7 @@ class Request
end
def headers
- (@actor ? @headers.merge('Signature' => signature) : @headers).without(REQUEST_TARGET)
+ (@signing ? @headers.merge('Signature' => signature) : @headers)
end
class << self
@@ -140,14 +148,13 @@ class Request
end
def http_client
- HTTP.use(:auto_inflate).follow(max_hops: 3)
+ HTTP.use(:auto_inflate)
end
end
private
def set_common_headers!
- @headers[REQUEST_TARGET] = request_target
@headers['User-Agent'] = Mastodon::Version.user_agent
@headers['Host'] = @url.host
@headers['Date'] = Time.now.utc.httpdate
@@ -158,31 +165,28 @@ class Request
@headers['Digest'] = "SHA-256=#{Digest::SHA256.base64digest(@options[:body])}"
end
- def request_target
- if @url.query.nil? || !@full_path
- "#{@verb} #{@url.path}"
- else
- "#{@verb} #{@url.path}?#{@url.query}"
- end
- end
-
def signature
- algorithm = 'rsa-sha256'
- signature = Base64.strict_encode64(@keypair.sign(OpenSSL::Digest.new('SHA256'), signed_string))
-
- "keyId=\"#{key_id}\",algorithm=\"#{algorithm}\",headers=\"#{signed_headers.keys.join(' ').downcase}\",signature=\"#{signature}\""
+ @signing.sign(@headers.without('User-Agent', 'Accept-Encoding'), @verb, @url)
end
- def signed_string
- signed_headers.map { |key, value| "#{key.downcase}: #{value}" }.join("\n")
- end
+ def re_sign_on_redirect(_response, request)
+ # Delete existing signature if there is one, since it will be invalid
+ request.headers.delete('Signature')
- def signed_headers
- @headers.without('User-Agent', 'Accept-Encoding')
- end
+ return unless @signing.present? && @verb == :get
- def key_id
- ActivityPub::TagManager.instance.key_uri_for(@actor)
+ signed_headers = request.headers.to_h.slice(*@headers.keys)
+ unless @headers.keys.all? { |key| signed_headers.key?(key) }
+ # We have lost some headers in the process, so don't sign the new
+ # request, in order to avoid issuing a valid signature with fewer
+ # conditions than expected.
+
+ Rails.logger.warn { "Some headers (#{@headers.keys - signed_headers.keys}) have been lost on redirect from {@uri} to #{request.uri}, this should not happen. Skipping signatures" }
+ return
+ end
+
+ signature_value = @signing.sign(signed_headers.without('User-Agent', 'Accept-Encoding'), @verb, Addressable::URI.parse(request.uri))
+ request.headers['Signature'] = signature_value
end
def http_client
diff --git a/app/lib/search_query_transformer.rb b/app/lib/search_query_transformer.rb
index e6e4033c24..39a702e913 100644
--- a/app/lib/search_query_transformer.rb
+++ b/app/lib/search_query_transformer.rb
@@ -282,6 +282,8 @@ class SearchQueryTransformer < Parslet::Transform
end
class PrefixClause
+ EPOCH_RE = /\A\d+\z/
+
attr_reader :operator, :prefix, :term
def initialize(prefix, operator, term, options = {}) # rubocop:disable Metrics/CyclomaticComplexity
@@ -311,15 +313,15 @@ class SearchQueryTransformer < Parslet::Transform
when 'before'
@filter = :created_at
@type = :range
- @term = { lt: TermValidator.validate_date!(term), time_zone: @options[:current_account]&.user_time_zone.presence || 'UTC' }
+ @term = { lt: date_from_term(term), time_zone: @options[:current_account]&.user_time_zone.presence || 'UTC' }
when 'after'
@filter = :created_at
@type = :range
- @term = { gt: TermValidator.validate_date!(term), time_zone: @options[:current_account]&.user_time_zone.presence || 'UTC' }
+ @term = { gt: date_from_term(term), time_zone: @options[:current_account]&.user_time_zone.presence || 'UTC' }
when 'during'
@filter = :created_at
@type = :range
- @term = { gte: TermValidator.validate_date!(term), lte: TermValidator.validate_date!(term), time_zone: @options[:current_account]&.user_time_zone.presence || 'UTC' }
+ @term = { gte: date_from_term(term), lte: date_from_term(term), time_zone: @options[:current_account]&.user_time_zone.presence || 'UTC' }
when 'in'
@operator = :flag
@term = term
@@ -409,16 +411,10 @@ class SearchQueryTransformer < Parslet::Transform
term
end
- end
- class TermValidator
- STRICT_DATE_REGEX = /\A\d{4}-\d{2}-\d{2}\z/ # yyyy-MM-dd
- EPOCH_MILLIS_REGEX = /\A\d{1,19}\z/
-
- def self.validate_date!(value)
- return value if value.match?(STRICT_DATE_REGEX) || value.match?(EPOCH_MILLIS_REGEX)
-
- raise Mastodon::FilterValidationError, "Invalid date #{value}"
+ def date_from_term(term)
+ DateTime.iso8601(term) unless term.match?(EPOCH_RE) # This will raise Date::Error if the date is invalid
+ term
end
end
diff --git a/app/lib/vacuum/imports_vacuum.rb b/app/lib/vacuum/imports_vacuum.rb
index 700bd81847..b67865194f 100644
--- a/app/lib/vacuum/imports_vacuum.rb
+++ b/app/lib/vacuum/imports_vacuum.rb
@@ -9,10 +9,10 @@ class Vacuum::ImportsVacuum
private
def clean_unconfirmed_imports!
- BulkImport.state_unconfirmed.where(created_at: ..10.minutes.ago).reorder(nil).in_batches.delete_all
+ BulkImport.state_unconfirmed.where(created_at: ..10.minutes.ago).in_batches.delete_all
end
def clean_old_imports!
- BulkImport.where(created_at: ..1.week.ago).reorder(nil).in_batches.delete_all
+ BulkImport.where(created_at: ..1.week.ago).in_batches.delete_all
end
end
diff --git a/app/lib/web_push_request.rb b/app/lib/web_push_request.rb
new file mode 100644
index 0000000000..a43e22480e
--- /dev/null
+++ b/app/lib/web_push_request.rb
@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+class WebPushRequest
+ SIGNATURE_ALGORITHM = 'p256ecdsa'
+ AUTH_HEADER = 'WebPush'
+ PAYLOAD_EXPIRATION = 24.hours
+ JWT_ALGORITHM = 'ES256'
+ JWT_TYPE = 'JWT'
+
+ attr_reader :web_push_subscription
+
+ delegate(
+ :endpoint,
+ :key_auth,
+ :key_p256dh,
+ to: :web_push_subscription
+ )
+
+ def initialize(web_push_subscription)
+ @web_push_subscription = web_push_subscription
+ end
+
+ def audience
+ @audience ||= Addressable::URI.parse(endpoint).normalized_site
+ end
+
+ def authorization_header
+ [AUTH_HEADER, encoded_json_web_token].join(' ')
+ end
+
+ def crypto_key_header
+ [SIGNATURE_ALGORITHM, vapid_key.public_key_for_push_header].join('=')
+ end
+
+ def encrypt(payload)
+ Webpush::Encryption.encrypt(payload, key_p256dh, key_auth)
+ end
+
+ private
+
+ def encoded_json_web_token
+ JWT.encode(
+ web_token_payload,
+ vapid_key.curve,
+ JWT_ALGORITHM,
+ typ: JWT_TYPE
+ )
+ end
+
+ def web_token_payload
+ {
+ aud: audience,
+ exp: PAYLOAD_EXPIRATION.from_now.to_i,
+ sub: payload_subject,
+ }
+ end
+
+ def payload_subject
+ [:mailto, contact_email].join(':')
+ end
+
+ def vapid_key
+ @vapid_key ||= Webpush::VapidKey.from_keys(
+ Rails.configuration.x.vapid_public_key,
+ Rails.configuration.x.vapid_private_key
+ )
+ end
+
+ def contact_email
+ @contact_email ||= ::Setting.site_contact_email
+ end
+end
diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb
index 4c374f5d57..a20992dcb5 100644
--- a/app/mailers/notification_mailer.rb
+++ b/app/mailers/notification_mailer.rb
@@ -86,7 +86,7 @@ class NotificationMailer < ApplicationMailer
end
def thread_by_conversation!
- return if @status.conversation.nil?
+ return if @status&.conversation.nil?
conversation_message_id = ""
diff --git a/app/models/account.rb b/app/models/account.rb
index bc1d311852..3dd5642100 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -95,6 +95,7 @@ class Account < ApplicationRecord
include Account::StatusesSearch
include Account::OtherSettings
include Account::MasterSettings
+ include Account::Suspensions
include Account::AttributionDomains
include DomainMaterializable
include DomainNormalizable
@@ -134,10 +135,8 @@ class Account < ApplicationRecord
scope :local, -> { where(domain: nil) }
scope :partitioned, -> { order(Arel.sql('row_number() over (partition by domain)')) }
scope :silenced, -> { where.not(silenced_at: nil) }
- scope :suspended, -> { where.not(suspended_at: nil) }
scope :remote_pending, -> { where(remote_pending: true).where.not(suspended_at: nil) }
scope :sensitized, -> { where.not(sensitized_at: nil) }
- scope :without_suspended, -> { where(suspended_at: nil) }
scope :without_silenced, -> { where(silenced_at: nil) }
scope :without_instance_actor, -> { where.not(id: INSTANCE_ACTOR_ID) }
scope :recent, -> { reorder(id: :desc) }
@@ -158,7 +157,7 @@ class Account < ApplicationRecord
scope :not_excluded_by_account, ->(account) { where.not(id: account.excluded_from_timeline_account_ids) }
scope :not_domain_blocked_by_account, ->(account) { where(arel_table[:domain].eq(nil).or(arel_table[:domain].not_in(account.excluded_from_timeline_domains))) }
scope :dormant, -> { joins(:account_stat).merge(AccountStat.without_recent_activity) }
- scope :with_username, ->(value) { where arel_table[:username].lower.eq(value.to_s.downcase) }
+ scope :with_username, ->(value) { value.is_a?(Array) ? where(arel_table[:username].lower.in(value.map { |x| x.to_s.downcase })) : where(arel_table[:username].lower.eq(value.to_s.downcase)) }
scope :with_domain, ->(value) { where arel_table[:domain].lower.eq(value&.to_s&.downcase) }
scope :without_memorial, -> { where(memorial: false) }
scope :duplicate_uris, -> { select(:uri, Arel.star.count).group(:uri).having(Arel.star.count.gt(1)) }
@@ -283,41 +282,6 @@ class Account < ApplicationRecord
update!(silenced_at: nil)
end
- def suspended?
- suspended_at.present? && !instance_actor?
- end
-
- def suspended_locally?
- suspended? && suspension_origin_local?
- end
-
- def suspended_permanently?
- suspended? && deletion_request.nil?
- end
-
- def suspended_temporarily?
- suspended? && deletion_request.present?
- end
-
- alias unavailable? suspended?
- alias permanently_unavailable? suspended_permanently?
-
- def suspend!(date: Time.now.utc, origin: :local, block_email: true)
- transaction do
- create_deletion_request!
- update!(suspended_at: date, suspension_origin: origin)
- create_canonical_email_block! if block_email
- end
- end
-
- def unsuspend!
- transaction do
- deletion_request&.destroy!
- update!(suspended_at: nil, suspension_origin: nil)
- destroy_canonical_email_block!
- end
- end
-
def approve_remote!
return unless remote_pending
diff --git a/app/models/account/field.rb b/app/models/account/field.rb
index bcd89015de..4b3ccea9c4 100644
--- a/app/models/account/field.rb
+++ b/app/models/account/field.rb
@@ -73,7 +73,14 @@ class Account::Field < ActiveModelSerializers::Model
end
def extract_url_from_html
- doc = Nokogiri::HTML5.fragment(value)
+ begin
+ doc = Nokogiri::HTML5.fragment(value)
+ rescue ArgumentError
+ # This can happen if one of the Nokogumbo limits is encountered
+ # Unfortunately, it does not use a more precise error class
+ # nor allows more graceful handling
+ return
+ end
return if doc.nil?
return if doc.children.size != 1
diff --git a/app/models/account_filter.rb b/app/models/account_filter.rb
index 5edaa2e5b8..763ed3e46f 100644
--- a/app/models/account_filter.rb
+++ b/app/models/account_filter.rb
@@ -21,7 +21,7 @@ class AccountFilter
end
def results
- scope = Account.includes(:account_stat, user: [:ips, :invite_request]).without_instance_actor.reorder(nil)
+ scope = Account.includes(:account_stat, user: [:ips, :invite_request]).without_instance_actor
relevant_params.each do |key, value|
next if key.to_s == 'page'
diff --git a/app/models/admin/ng_rule.rb b/app/models/admin/ng_rule.rb
index 54ca39b4c9..3f25d8896e 100644
--- a/app/models/admin/ng_rule.rb
+++ b/app/models/admin/ng_rule.rb
@@ -62,9 +62,11 @@ class Admin::NgRule
return false if @ng_rule.reaction_allow_follower && (recipient.id == @account.id || (!recipient.local? && !@account.local?) || recipient.following?(@account))
if @options[:reaction_type] == 'emoji_reaction'
- enum_match?(:reaction_type, @options[:reaction_type], @ng_rule.reaction_type) &&
- text_match?(:emoji_reaction_name, @options[:emoji_reaction_name], @ng_rule.emoji_reaction_name) &&
- text_match?(:emoji_reaction_origin_domain, @options[:emoji_reaction_origin_domain], @ng_rule.emoji_reaction_origin_domain)
+ result = enum_match?(:reaction_type, @options[:reaction_type], @ng_rule.reaction_type) &&
+ text_match?(:emoji_reaction_name, @options[:emoji_reaction_name], @ng_rule.emoji_reaction_name)
+
+ emoji_reaction_origin_domain = @options[:emoji_reaction_origin_domain] || Rails.configuration.x.local_domain
+ result && text_match?(:emoji_reaction_origin_domain, emoji_reaction_origin_domain, @ng_rule.emoji_reaction_origin_domain)
else
enum_match?(:reaction_type, @options[:reaction_type], @ng_rule.reaction_type)
end
diff --git a/app/models/admin/tag_filter.rb b/app/models/admin/tag_filter.rb
index 6149c52175..5e75757b23 100644
--- a/app/models/admin/tag_filter.rb
+++ b/app/models/admin/tag_filter.rb
@@ -14,7 +14,7 @@ class Admin::TagFilter
end
def results
- scope = Tag.reorder(nil)
+ scope = Tag.all
params.each do |key, value|
next if key == :page
diff --git a/app/models/concerns/account/associations.rb b/app/models/concerns/account/associations.rb
index 3040da01de..ec8766f709 100644
--- a/app/models/concerns/account/associations.rb
+++ b/app/models/concerns/account/associations.rb
@@ -19,6 +19,7 @@ module Account::Associations
has_many :conversations, class_name: 'AccountConversation', dependent: :destroy, inverse_of: :account
has_many :scheduled_statuses, inverse_of: :account, dependent: :destroy
has_many :scheduled_expiration_statuses, inverse_of: :account, dependent: :destroy
+ has_many :ng_rule_histories, inverse_of: :account, dependent: :destroy
# Notifications
has_many :notifications, inverse_of: :account, dependent: :destroy
diff --git a/app/models/concerns/account/avatar.rb b/app/models/concerns/account/avatar.rb
index 39f599db18..5ca8fa862f 100644
--- a/app/models/concerns/account/avatar.rb
+++ b/app/models/concerns/account/avatar.rb
@@ -6,10 +6,13 @@ module Account::Avatar
IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif', 'image/webp'].freeze
LIMIT = 2.megabytes
+ AVATAR_DIMENSIONS = [400, 400].freeze
+ AVATAR_GEOMETRY = [AVATAR_DIMENSIONS.first, AVATAR_DIMENSIONS.last].join('x')
+
class_methods do
def avatar_styles(file)
- styles = { original: { geometry: '400x400#', file_geometry_parser: FastGeometryParser } }
- styles[:static] = { geometry: '400x400#', format: 'png', convert_options: '-coalesce', file_geometry_parser: FastGeometryParser } if file.content_type == 'image/gif'
+ styles = { original: { geometry: "#{AVATAR_GEOMETRY}#", file_geometry_parser: FastGeometryParser } }
+ styles[:static] = { geometry: "#{AVATAR_GEOMETRY}#", format: 'png', convert_options: '-coalesce', file_geometry_parser: FastGeometryParser } if file.content_type == 'image/gif'
styles
end
diff --git a/app/models/concerns/account/header.rb b/app/models/concerns/account/header.rb
index 44ae774e94..2a47097fcf 100644
--- a/app/models/concerns/account/header.rb
+++ b/app/models/concerns/account/header.rb
@@ -5,7 +5,10 @@ module Account::Header
IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif', 'image/webp'].freeze
LIMIT = 2.megabytes
- MAX_PIXELS = 750_000 # 1500x500px
+
+ HEADER_DIMENSIONS = [1500, 500].freeze
+ HEADER_GEOMETRY = [HEADER_DIMENSIONS.first, HEADER_DIMENSIONS.last].join('x')
+ MAX_PIXELS = HEADER_DIMENSIONS.first * HEADER_DIMENSIONS.last
class_methods do
def header_styles(file)
diff --git a/app/models/concerns/account/interactions.rb b/app/models/concerns/account/interactions.rb
index 979b2278dc..65224145c3 100644
--- a/app/models/concerns/account/interactions.rb
+++ b/app/models/concerns/account/interactions.rb
@@ -88,6 +88,9 @@ module Account::Interactions
has_many :remote_severed_relationships, foreign_key: 'remote_account_id', inverse_of: :remote_account
end
+ # Hashtag follows
+ has_many :tag_follows, inverse_of: :account, dependent: :destroy
+
# Account notes
has_many :account_notes, dependent: :destroy
diff --git a/app/models/concerns/account/merging.rb b/app/models/concerns/account/merging.rb
index bd8b162238..181061c37e 100644
--- a/app/models/concerns/account/merging.rb
+++ b/app/models/concerns/account/merging.rb
@@ -16,7 +16,7 @@ module Account::Merging
Follow, FollowRequest, Block, Mute,
AccountModerationNote, AccountPin, AccountStat, ListAccount,
PollVote, Mention, AccountDeletionRequest, AccountNote, FollowRecommendationSuppression,
- Appeal
+ Appeal, TagFollow
]
owned_classes.each do |klass|
diff --git a/app/models/concerns/account/suspensions.rb b/app/models/concerns/account/suspensions.rb
new file mode 100644
index 0000000000..c981fb5a29
--- /dev/null
+++ b/app/models/concerns/account/suspensions.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Account::Suspensions
+ extend ActiveSupport::Concern
+
+ included do
+ scope :suspended, -> { where.not(suspended_at: nil) }
+ scope :without_suspended, -> { where(suspended_at: nil) }
+ end
+
+ def suspended?
+ suspended_at.present? && !instance_actor?
+ end
+ alias unavailable? suspended?
+
+ def suspended_locally?
+ suspended? && suspension_origin_local?
+ end
+
+ def suspended_permanently?
+ suspended? && deletion_request.nil?
+ end
+ alias permanently_unavailable? suspended_permanently?
+
+ def suspended_temporarily?
+ suspended? && deletion_request.present?
+ end
+
+ def suspend!(date: Time.now.utc, origin: :local, block_email: true)
+ transaction do
+ create_deletion_request!
+ update!(suspended_at: date, suspension_origin: origin)
+ create_canonical_email_block! if block_email
+ end
+ end
+
+ def unsuspend!
+ transaction do
+ deletion_request&.destroy!
+ update!(suspended_at: nil, suspension_origin: nil)
+ destroy_canonical_email_block!
+ end
+ end
+end
diff --git a/app/models/featured_tag.rb b/app/models/featured_tag.rb
index a4e7b7cf6f..dfc700649c 100644
--- a/app/models/featured_tag.rb
+++ b/app/models/featured_tag.rb
@@ -44,8 +44,16 @@ class FeaturedTag < ApplicationRecord
update(statuses_count: statuses_count + 1, last_status_at: timestamp)
end
- def decrement(deleted_status_id)
- update(statuses_count: [0, statuses_count - 1].max, last_status_at: visible_tagged_account_statuses.where.not(id: deleted_status_id).pick(:created_at))
+ def decrement(deleted_status)
+ if statuses_count <= 1
+ update(statuses_count: 0, last_status_at: nil)
+ elsif last_status_at.present? && last_status_at > deleted_status.created_at
+ update(statuses_count: statuses_count - 1)
+ else
+ # Fetching the latest status creation time can be expensive, so only perform it
+ # if we know we are deleting the latest status using this tag
+ update(statuses_count: statuses_count - 1, last_status_at: visible_tagged_account_statuses.where(id: ...deleted_status.id).pick(:created_at))
+ end
end
private
diff --git a/app/models/follow_recommendation.rb b/app/models/follow_recommendation.rb
index 7ac9e6dfb9..0435437a81 100644
--- a/app/models/follow_recommendation.rb
+++ b/app/models/follow_recommendation.rb
@@ -18,5 +18,6 @@ class FollowRecommendation < ApplicationRecord
belongs_to :account_summary, foreign_key: :account_id, inverse_of: false
belongs_to :account
- scope :localized, ->(locale) { joins(:account_summary).merge(AccountSummary.localized(locale)) }
+ scope :unsupressed, -> { where.not(FollowRecommendationSuppression.where(FollowRecommendationSuppression.arel_table[:account_id].eq(arel_table[:account_id])).select(1).arel.exists) }
+ scope :localized, ->(locale) { unsupressed.joins(:account_summary).merge(AccountSummary.localized(locale)) }
end
diff --git a/app/models/follow_recommendation_filter.rb b/app/models/follow_recommendation_filter.rb
index 62a02eba5a..f3b0fd319b 100644
--- a/app/models/follow_recommendation_filter.rb
+++ b/app/models/follow_recommendation_filter.rb
@@ -11,7 +11,7 @@ class FollowRecommendationFilter
attr_reader :params, :language
def initialize(params)
- @language = params.delete('language') || I18n.locale
+ @language = usable_language(params.delete('language') || I18n.locale)
@params = params
end
@@ -22,4 +22,15 @@ class FollowRecommendationFilter
Account.includes(:account_stat).joins(:follow_recommendation).merge(FollowRecommendation.localized(@language).order(rank: :desc))
end
end
+
+ private
+
+ def usable_language(locale)
+ return locale if Trends.available_locales.include?(locale)
+
+ locale = locale.to_s.split(/[_-]/).first
+ return locale if Trends.available_locales.include?(locale)
+
+ nil
+ end
end
diff --git a/app/models/friend_domain.rb b/app/models/friend_domain.rb
index 88ebd9338b..2ca501e21d 100644
--- a/app/models/friend_domain.rb
+++ b/app/models/friend_domain.rb
@@ -116,6 +116,7 @@ class FriendDomain < ApplicationRecord
object: ActivityPub::TagManager::COLLECTIONS[:public],
# Cannot use inbox_url method because this model also has inbox_url column
+ # This is deprecated property. Newer version's kmyblue will ignore it.
inboxUrl: "https://#{Rails.configuration.x.web_domain}/inbox",
}
end
diff --git a/app/models/instance_info.rb b/app/models/instance_info.rb
index 99878b0aec..7b42c2df7e 100644
--- a/app/models/instance_info.rb
+++ b/app/models/instance_info.rb
@@ -23,12 +23,16 @@ class InstanceInfo < ApplicationRecord
cherrypick
fedibird
firefish
+ hollo
iceshrimp
+ Iceshrimp.NET
meisskey
misskey
+ mitra
pleroma
sharkey
tanukey
+ yojo-art
).freeze
QUOTE_AVAILABLE_SOFTWARES = EMOJI_REACTION_AVAILABLE_SOFTWARES + %w(bridgy-fed).freeze
diff --git a/app/models/link_feed.rb b/app/models/link_feed.rb
index 32efb331b6..29ea430cc0 100644
--- a/app/models/link_feed.rb
+++ b/app/models/link_feed.rb
@@ -19,6 +19,8 @@ class LinkFeed < PublicFeed
scope.merge!(discoverable)
scope.merge!(attached_to_preview_card)
+ scope.merge!(account_filters_scope) if account?
+ scope.merge!(language_scope) if account&.chosen_languages.present?
scope.to_a_paginated_by_id(limit, max_id: max_id, since_id: since_id, min_id: min_id)
end
diff --git a/app/models/list.rb b/app/models/list.rb
index 82b8b1e100..b87e37452e 100644
--- a/app/models/list.rb
+++ b/app/models/list.rb
@@ -28,6 +28,7 @@ class List < ApplicationRecord
has_many :antennas, inverse_of: :list, dependent: :destroy
has_many :list_statuses, inverse_of: :list, dependent: :destroy
has_many :statuses, through: :list_statuses
+ has_many :active_accounts, -> { merge(ListAccount.active) }, through: :list_accounts, source: :account
validates :title, presence: true
@@ -38,7 +39,7 @@ class List < ApplicationRecord
private
def validate_account_lists_limit
- errors.add(:base, I18n.t('lists.errors.limit')) if account.lists.count >= PER_ACCOUNT_LIMIT
+ errors.add(:base, I18n.t('lists.errors.limit')) if account.owned_lists.count >= PER_ACCOUNT_LIMIT
end
def clean_feed_manager
diff --git a/app/models/list_account.rb b/app/models/list_account.rb
index 2ff8605717..0169319761 100644
--- a/app/models/list_account.rb
+++ b/app/models/list_account.rb
@@ -20,6 +20,8 @@ class ListAccount < ApplicationRecord
validates :account_id, uniqueness: { scope: :list_id }
validate :validate_relationship
+ scope :active, -> { where.not(follow_id: nil) }
+
before_validation :set_follow, unless: :list_owner_account_is_account?
private
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index 49ff740884..3eaa978c27 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -425,8 +425,10 @@ class MediaAttachment < ApplicationRecord
@paths_to_cache_bust = MediaAttachment.attachment_definitions.keys.flat_map do |attachment_name|
attachment = public_send(attachment_name)
+ next if attachment.blank?
+
styles = DEFAULT_STYLES | attachment.styles.keys
- styles.map { |style| attachment.path(style) }
+ styles.map { |style| attachment.url(style) }
end.compact
rescue => e
# We really don't want any error here preventing media deletion
diff --git a/app/models/notification.rb b/app/models/notification.rb
index fe331a1164..cdce34c77b 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -129,6 +129,7 @@ class Notification < ApplicationRecord
validates :type, inclusion: { in: TYPES }
scope :without_suspended, -> { joins(:from_account).merge(Account.without_suspended) }
+ scope :by_group_key, ->(group_key) { group_key&.start_with?('ungrouped-') ? where(id: group_key.delete_prefix('ungrouped-')) : where(group_key: group_key) }
def type
@type ||= (super || LEGACY_TYPE_CLASS_MAP[activity_type]).to_sym
diff --git a/app/models/notification_group.rb b/app/models/notification_group.rb
index 7ebc87ddbc..74997f66b7 100644
--- a/app/models/notification_group.rb
+++ b/app/models/notification_group.rb
@@ -88,22 +88,32 @@ class NotificationGroup < ActiveModelSerializers::Model
binds = [
account_id,
SAMPLE_ACCOUNTS_SIZE,
- pagination_range.begin,
- pagination_range.end,
ActiveRecord::Relation::QueryAttribute.new('group_keys', group_keys, ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Array.new(ActiveModel::Type::String.new)),
+ pagination_range.begin || 0,
]
+ binds << pagination_range.end unless pagination_range.end.nil?
+
+ upper_bound_cond = begin
+ if pagination_range.end.nil?
+ ''
+ elsif pagination_range.exclude_end?
+ 'AND id < $5'
+ else
+ 'AND id <= $5'
+ end
+ end
ActiveRecord::Base.connection.select_all(<<~SQL.squish, 'grouped_notifications', binds).cast_values.to_h { |k, *values| [k, values] }
SELECT
groups.group_key,
- (SELECT id FROM notifications WHERE notifications.account_id = $1 AND notifications.group_key = groups.group_key AND id <= $4 ORDER BY id DESC LIMIT 1),
- array(SELECT from_account_id FROM notifications WHERE notifications.account_id = $1 AND notifications.group_key = groups.group_key AND id <= $4 ORDER BY id DESC LIMIT $2),
- (SELECT count(*) FROM notifications WHERE notifications.account_id = $1 AND notifications.group_key = groups.group_key AND id <= $4) AS notifications_count,
- array(SELECT activity_id FROM notifications WHERE notifications.account_id = $1 AND notifications.group_key = groups.group_key AND id <= $4 AND activity_type = 'EmojiReaction'),
- (SELECT id FROM notifications WHERE notifications.account_id = $1 AND notifications.group_key = groups.group_key AND id >= $3 ORDER BY id ASC LIMIT 1) AS min_id,
- (SELECT created_at FROM notifications WHERE notifications.account_id = $1 AND notifications.group_key = groups.group_key AND id <= $4 ORDER BY id DESC LIMIT 1)
+ (SELECT id FROM notifications WHERE notifications.account_id = $1 AND notifications.group_key = groups.group_key #{upper_bound_cond} ORDER BY id DESC LIMIT 1),
+ array(SELECT from_account_id FROM notifications WHERE notifications.account_id = $1 AND notifications.group_key = groups.group_key #{upper_bound_cond} ORDER BY id DESC LIMIT $2),
+ (SELECT count(*) FROM notifications WHERE notifications.account_id = $1 AND notifications.group_key = groups.group_key #{upper_bound_cond}) AS notifications_count,
+ array(SELECT activity_id FROM notifications WHERE notifications.account_id = $1 AND notifications.group_key = groups.group_key #{upper_bound_cond} AND activity_type = 'EmojiReaction'),
+ (SELECT id FROM notifications WHERE notifications.account_id = $1 AND notifications.group_key = groups.group_key AND id >= $4 ORDER BY id ASC LIMIT 1) AS min_id,
+ (SELECT created_at FROM notifications WHERE notifications.account_id = $1 AND notifications.group_key = groups.group_key #{upper_bound_cond} ORDER BY id DESC LIMIT 1)
FROM
- unnest($5::text[]) AS groups(group_key);
+ unnest($3::text[]) AS groups(group_key);
SQL
else
binds = [
diff --git a/app/models/notification_policy.rb b/app/models/notification_policy.rb
index 3b16f33d88..d22f871a37 100644
--- a/app/models/notification_policy.rb
+++ b/app/models/notification_policy.rb
@@ -62,6 +62,6 @@ class NotificationPolicy < ApplicationRecord
private
def pending_notification_requests
- @pending_notification_requests ||= notification_requests.limit(MAX_MEANINGFUL_COUNT).pick(Arel.sql('count(*), coalesce(sum(notifications_count), 0)::bigint'))
+ @pending_notification_requests ||= notification_requests.without_suspended.limit(MAX_MEANINGFUL_COUNT).pick(Arel.sql('count(*), coalesce(sum(notifications_count), 0)::bigint'))
end
end
diff --git a/app/models/notification_request.rb b/app/models/notification_request.rb
index f0778b3af3..eb9ff93ab7 100644
--- a/app/models/notification_request.rb
+++ b/app/models/notification_request.rb
@@ -26,6 +26,8 @@ class NotificationRequest < ApplicationRecord
before_save :prepare_notifications_count
+ scope :without_suspended, -> { joins(:from_account).merge(Account.without_suspended) }
+
def self.preload_cache_collection(requests)
cached_statuses_by_id = yield(requests.filter_map(&:last_status)).index_by(&:id) # Call cache_collection in block
diff --git a/app/models/poll.rb b/app/models/poll.rb
index cc4184f80a..baa0dbe539 100644
--- a/app/models/poll.rb
+++ b/app/models/poll.rb
@@ -37,7 +37,8 @@ class Poll < ApplicationRecord
validates :options, presence: true
validates :expires_at, presence: true, if: :local?
- validates_with PollValidator, on: :create, if: :local?
+ validates_with PollOptionsValidator, if: :local?
+ validates_with PollExpirationValidator, if: -> { local? && expires_at_changed? }
scope :attached, -> { where.not(status_id: nil) }
scope :unattached, -> { where(status_id: nil) }
diff --git a/app/models/preview_card.rb b/app/models/preview_card.rb
index 82b25d4649..bd248a7b7a 100644
--- a/app/models/preview_card.rb
+++ b/app/models/preview_card.rb
@@ -134,7 +134,7 @@ class PreviewCard < ApplicationRecord
end
def authors
- @authors ||= [PreviewCard::Author.new(self)]
+ @authors ||= Array(serialized_authors)
end
class Author < ActiveModelSerializers::Model
@@ -169,6 +169,13 @@ class PreviewCard < ApplicationRecord
private
+ def serialized_authors
+ if author_name? || author_url? || author_account_id?
+ PreviewCard::Author
+ .new(self)
+ end
+ end
+
def extract_dimensions
file = image.queued_for_write[:original]
diff --git a/app/models/remote_follow.rb b/app/models/remote_follow.rb
index 10715ac97d..fa0586f57e 100644
--- a/app/models/remote_follow.rb
+++ b/app/models/remote_follow.rb
@@ -3,7 +3,6 @@
class RemoteFollow
include ActiveModel::Validations
include RoutingHelper
- include WebfingerHelper
attr_accessor :acct, :addressable_template
@@ -66,7 +65,7 @@ class RemoteFollow
end
def acct_resource
- @acct_resource ||= webfinger!("acct:#{acct}")
+ @acct_resource ||= Webfinger.new("acct:#{acct}").perform
rescue Webfinger::Error, HTTP::ConnectionError
nil
end
diff --git a/app/models/report_filter.rb b/app/models/report_filter.rb
index fd0e23cb81..9d2b0fb374 100644
--- a/app/models/report_filter.rb
+++ b/app/models/report_filter.rb
@@ -18,13 +18,25 @@ class ReportFilter
def results
scope = Report.unresolved
- params.each do |key, value|
+ relevant_params.each do |key, value|
scope = scope.merge scope_for(key, value)
end
scope
end
+ private
+
+ def relevant_params
+ params.tap do |args|
+ args.delete(:target_origin) if origin_is_remote_and_domain_present?
+ end
+ end
+
+ def origin_is_remote_and_domain_present?
+ params[:target_origin] == 'remote' && params[:by_target_domain].present?
+ end
+
def scope_for(key, value)
case key.to_sym
when :by_target_domain
diff --git a/app/models/session_activation.rb b/app/models/session_activation.rb
index d0a77daf0a..8b8e533d30 100644
--- a/app/models/session_activation.rb
+++ b/app/models/session_activation.rb
@@ -28,6 +28,8 @@ class SessionActivation < ApplicationRecord
before_create :assign_access_token
+ DEFAULT_SCOPES = %w(read write follow).freeze
+
class << self
def active?(id)
id && exists?(session_id: id)
@@ -64,7 +66,7 @@ class SessionActivation < ApplicationRecord
{
application_id: Doorkeeper::Application.find_by(superapp: true)&.id,
resource_owner_id: user_id,
- scopes: 'read write follow',
+ scopes: DEFAULT_SCOPES.join(' '),
expires_in: Doorkeeper.configuration.access_token_expires_in,
use_refresh_token: Doorkeeper.configuration.refresh_token_enabled?,
}
diff --git a/app/models/tag_follow.rb b/app/models/tag_follow.rb
index abe36cd171..528616c450 100644
--- a/app/models/tag_follow.rb
+++ b/app/models/tag_follow.rb
@@ -21,4 +21,6 @@ class TagFollow < ApplicationRecord
accepts_nested_attributes_for :tag
rate_limit by: :account, family: :follows
+
+ scope :for_local_distribution, -> { joins(account: :user).merge(User.signed_in_recently) }
end
diff --git a/app/models/trends/statuses.rb b/app/models/trends/statuses.rb
index 87261beeb1..67a2d115bc 100644
--- a/app/models/trends/statuses.rb
+++ b/app/models/trends/statuses.rb
@@ -106,7 +106,8 @@ class Trends::Statuses < Trends::Base
private
def eligible?(status)
- (status.searchability.nil? || status.compute_searchability == 'public') &&
+ status.created_at.past? &&
+ (status.searchability.nil? || status.compute_searchability == 'public') &&
(status.public_visibility? || status.public_unlisted_visibility?) &&
status.account.discoverable? && !status.account.silenced? && !status.account.sensitized? &&
status.spoiler_text.blank? && (!status.sensitive? || status.media_attachments.none?) &&
diff --git a/app/models/user.rb b/app/models/user.rb
index ecdb60485a..9e0ca283a2 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -74,7 +74,8 @@ class User < ApplicationRecord
REACTION_DECK_MAX = 256
devise :two_factor_authenticatable,
- otp_secret_encryption_key: Rails.configuration.x.otp_secret
+ otp_secret_encryption_key: Rails.configuration.x.otp_secret,
+ otp_secret_length: 32
include LegacyOtpSecret # Must be after the above `devise` line in order to override the legacy method
@@ -169,6 +170,10 @@ class User < ApplicationRecord
end
end
+ def signed_in_recently?
+ current_sign_in_at.present? && current_sign_in_at >= ACTIVE_DURATION.ago
+ end
+
def confirmed?
confirmed_at.present?
end
diff --git a/app/models/user_role.rb b/app/models/user_role.rb
index 16d40d4a79..405050a385 100644
--- a/app/models/user_role.rb
+++ b/app/models/user_role.rb
@@ -147,6 +147,10 @@ class UserRole < ApplicationRecord
other_role.nil? || position > other_role.position
end
+ def bypass_block?(role)
+ overrides?(role) && highlighted? && can?(*Flags::CATEGORIES[:moderation])
+ end
+
def computed_permissions
# If called on the everyone role, no further computation needed
return permissions if everyone?
diff --git a/app/models/web/push_subscription.rb b/app/models/web/push_subscription.rb
index ddfd08146e..9d30881bf3 100644
--- a/app/models/web/push_subscription.rb
+++ b/app/models/web/push_subscription.rb
@@ -29,26 +29,6 @@ class Web::PushSubscription < ApplicationRecord
delegate :locale, to: :associated_user
- def encrypt(payload)
- Webpush::Encryption.encrypt(payload, key_p256dh, key_auth)
- end
-
- def audience
- @audience ||= Addressable::URI.parse(endpoint).normalized_site
- end
-
- def crypto_key_header
- p256ecdsa = vapid_key.public_key_for_push_header
-
- "p256ecdsa=#{p256ecdsa}"
- end
-
- def authorization_header
- jwt = JWT.encode({ aud: audience, exp: 24.hours.from_now.to_i, sub: "mailto:#{contact_email}" }, vapid_key.curve, 'ES256', typ: 'JWT')
-
- "WebPush #{jwt}"
- end
-
def pushable?(notification)
policy_allows_notification?(notification) && alert_enabled_for_notification_type?(notification)
end
@@ -92,14 +72,6 @@ class Web::PushSubscription < ApplicationRecord
)
end
- def vapid_key
- @vapid_key ||= Webpush::VapidKey.from_keys(Rails.configuration.x.vapid_public_key, Rails.configuration.x.vapid_private_key)
- end
-
- def contact_email
- @contact_email ||= ::Setting.site_contact_email
- end
-
def alert_enabled_for_notification_type?(notification)
truthy?(data&.dig('alerts', notification.type.to_s))
end
diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb
index 809e3bd303..d778440450 100644
--- a/app/serializers/activitypub/note_serializer.rb
+++ b/app/serializers/activitypub/note_serializer.rb
@@ -161,16 +161,27 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
object.active_mentions.to_a.sort_by(&:id) + object.tags + object.emojis + virtual_tags_of_quote
end
+ class NoteLink < ActiveModelSerializers::Model
+ attributes :href
+ end
+
+ class NoteLinkSerializer < ActivityPub::Serializer
+ attributes :type, :href
+ attribute :media_type, key: :mediaType
+
+ def type
+ 'Link'
+ end
+
+ def media_type
+ 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'
+ end
+ end
+
def virtual_tags_of_quote
return [] unless object.quote?
- [
- {
- type: 'Link',
- mediaType: 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
- href: quote_uri,
- },
- ]
+ [NoteLink.new(href: quote_uri)]
end
def atom_uri
diff --git a/app/serializers/rest/credential_application_serializer.rb b/app/serializers/rest/credential_application_serializer.rb
index bfec7d03e8..0532390c9a 100644
--- a/app/serializers/rest/credential_application_serializer.rb
+++ b/app/serializers/rest/credential_application_serializer.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
class REST::CredentialApplicationSerializer < REST::ApplicationSerializer
- attributes :client_id, :client_secret
+ attributes :client_id, :client_secret, :client_secret_expires_at
def client_id
object.uid
@@ -10,4 +10,10 @@ class REST::CredentialApplicationSerializer < REST::ApplicationSerializer
def client_secret
object.secret
end
+
+ # Added for future forwards compatibility when we may decide to expire OAuth
+ # Applications. Set to zero means that the client_secret never expires.
+ def client_secret_expires_at
+ 0
+ end
end
diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb
index 81d393ff57..4aee406d4c 100644
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@ -90,10 +90,10 @@ class REST::InstanceSerializer < ActiveModel::Serializer
},
polls: {
- max_options: PollValidator::MAX_OPTIONS,
- max_characters_per_option: PollValidator::MAX_OPTION_CHARS,
- min_expiration: PollValidator::MIN_EXPIRATION,
- max_expiration: PollValidator::MAX_EXPIRATION,
+ max_options: PollOptionsValidator::MAX_OPTIONS,
+ max_characters_per_option: PollOptionsValidator::MAX_OPTION_CHARS,
+ min_expiration: PollExpirationValidator::MIN_EXPIRATION,
+ max_expiration: PollExpirationValidator::MAX_EXPIRATION,
allow_image: true,
},
diff --git a/app/serializers/rest/privacy_policy_serializer.rb b/app/serializers/rest/privacy_policy_serializer.rb
index 57a67abf3c..b6cdecefae 100644
--- a/app/serializers/rest/privacy_policy_serializer.rb
+++ b/app/serializers/rest/privacy_policy_serializer.rb
@@ -8,7 +8,7 @@ class REST::PrivacyPolicySerializer < ActiveModel::Serializer
end
def content
- markdown.render(format(object.text, domain: Rails.configuration.x.local_domain))
+ markdown.render(object.text.gsub(/%{domain}/, Rails.configuration.x.local_domain))
end
private
diff --git a/app/serializers/rest/v1/instance_serializer.rb b/app/serializers/rest/v1/instance_serializer.rb
index 046d9e3548..d8c79d7018 100644
--- a/app/serializers/rest/v1/instance_serializer.rb
+++ b/app/serializers/rest/v1/instance_serializer.rb
@@ -82,10 +82,10 @@ class REST::V1::InstanceSerializer < ActiveModel::Serializer
},
polls: {
- max_options: PollValidator::MAX_OPTIONS,
- max_characters_per_option: PollValidator::MAX_OPTION_CHARS,
- min_expiration: PollValidator::MIN_EXPIRATION,
- max_expiration: PollValidator::MAX_EXPIRATION,
+ max_options: PollOptionsValidator::MAX_OPTIONS,
+ max_characters_per_option: PollOptionsValidator::MAX_OPTION_CHARS,
+ min_expiration: PollExpirationValidator::MIN_EXPIRATION,
+ max_expiration: PollExpirationValidator::MAX_EXPIRATION,
allow_image: true,
},
diff --git a/app/services/activitypub/fetch_remote_actor_service.rb b/app/services/activitypub/fetch_remote_actor_service.rb
index 2c372c2ec3..560cf424e1 100644
--- a/app/services/activitypub/fetch_remote_actor_service.rb
+++ b/app/services/activitypub/fetch_remote_actor_service.rb
@@ -3,7 +3,6 @@
class ActivityPub::FetchRemoteActorService < BaseService
include JsonLdHelper
include DomainControlHelper
- include WebfingerHelper
class Error < StandardError; end
@@ -45,7 +44,7 @@ class ActivityPub::FetchRemoteActorService < BaseService
private
def check_webfinger!
- webfinger = webfinger!("acct:#{@username}@#{@domain}")
+ webfinger = Webfinger.new("acct:#{@username}@#{@domain}").perform
confirmed_username, confirmed_domain = split_acct(webfinger.subject)
if @username.casecmp(confirmed_username).zero? && @domain.casecmp(confirmed_domain).zero?
@@ -54,7 +53,7 @@ class ActivityPub::FetchRemoteActorService < BaseService
return
end
- webfinger = webfinger!("acct:#{confirmed_username}@#{confirmed_domain}")
+ webfinger = Webfinger.new("acct:#{confirmed_username}@#{confirmed_domain}").perform
@username, @domain = split_acct(webfinger.subject)
raise Webfinger::RedirectError, "Too many webfinger redirects for URI #{@uri} (stopped at #{@username}@#{@domain})" unless confirmed_username.casecmp(@username).zero? && confirmed_domain.casecmp(@domain).zero?
diff --git a/app/services/activitypub/fetch_replies_service.rb b/app/services/activitypub/fetch_replies_service.rb
index 46cab6caf9..0e0ba673be 100644
--- a/app/services/activitypub/fetch_replies_service.rb
+++ b/app/services/activitypub/fetch_replies_service.rb
@@ -37,20 +37,7 @@ class ActivityPub::FetchRepliesService < BaseService
return unless @allow_synchronous_requests
return if non_matching_uri_hosts?(@account.uri, collection_or_uri)
- # NOTE: For backward compatibility reasons, Mastodon signs outgoing
- # queries incorrectly by default.
- #
- # While this is relevant for all URLs with query strings, this is
- # the only code path where this happens in practice.
- #
- # Therefore, retry with correct signatures if this fails.
- begin
- fetch_resource_without_id_validation(collection_or_uri, nil, true)
- rescue Mastodon::UnexpectedResponseError => e
- raise unless e.response && e.response.code == 401 && Addressable::URI.parse(collection_or_uri).query.present?
-
- fetch_resource_without_id_validation(collection_or_uri, nil, true, request_options: { omit_query_string: false })
- end
+ fetch_resource_without_id_validation(collection_or_uri, nil, true)
end
def filtered_replies
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb
index a7825594bd..c1d54264a6 100644
--- a/app/services/activitypub/process_account_service.rb
+++ b/app/services/activitypub/process_account_service.rb
@@ -11,6 +11,8 @@ class ActivityPub::ProcessAccountService < BaseService
SCAN_SEARCHABILITY_RE = /\[searchability:(public|followers|reactors|private)\]/
SCAN_SEARCHABILITY_FEDIBIRD_RE = /searchable_by_(all_users|followers_only|reacted_users_only|nobody)/
+ VALID_URI_SCHEMES = %w(http https).freeze
+
# Should be called with confirmed valid JSON
# and WebFinger-resolved username and domain
def call(username, domain, json, options = {}) # rubocop:disable Metrics/PerceivedComplexity
@@ -113,16 +115,28 @@ class ActivityPub::ProcessAccountService < BaseService
end
def set_immediate_protocol_attributes!
- @account.inbox_url = @json['inbox'] || ''
- @account.outbox_url = @json['outbox'] || ''
- @account.shared_inbox_url = (@json['endpoints'].is_a?(Hash) ? @json['endpoints']['sharedInbox'] : @json['sharedInbox']) || ''
- @account.followers_url = @json['followers'] || ''
+ @account.inbox_url = valid_collection_uri(@json['inbox'])
+ @account.outbox_url = valid_collection_uri(@json['outbox'])
+ @account.shared_inbox_url = valid_collection_uri(@json['endpoints'].is_a?(Hash) ? @json['endpoints']['sharedInbox'] : @json['sharedInbox'])
+ @account.followers_url = valid_collection_uri(@json['followers'])
@account.url = url || @uri
@account.uri = @uri
@account.actor_type = actor_type
@account.created_at = @json['published'] if @json['published'].present?
end
+ def valid_collection_uri(uri)
+ uri = uri.first if uri.is_a?(Array)
+ uri = uri['id'] if uri.is_a?(Hash)
+ return '' unless uri.is_a?(String)
+
+ parsed_uri = Addressable::URI.parse(uri)
+
+ VALID_URI_SCHEMES.include?(parsed_uri.scheme) && parsed_uri.host.present? ? parsed_uri : ''
+ rescue Addressable::URI::InvalidURIError
+ ''
+ end
+
def set_immediate_attributes!
@account.featured_collection_url = @json['featured'] || ''
@account.display_name = @json['name'] || ''
@@ -398,10 +412,11 @@ class ActivityPub::ProcessAccountService < BaseService
end
def collection_info(type)
- return [nil, nil] if @json[type].blank?
+ collection_uri = valid_collection_uri(@json[type])
+ return [nil, nil] if collection_uri.blank?
return @collections[type] if @collections.key?(type)
- collection = fetch_resource_without_id_validation(@json[type])
+ collection = fetch_resource_without_id_validation(collection_uri)
total_items = collection.is_a?(Hash) && collection['totalItems'].present? && collection['totalItems'].is_a?(Numeric) ? collection['totalItems'] : nil
has_first_page = collection.is_a?(Hash) && collection['first'].present?
diff --git a/app/services/activitypub/process_collection_service.rb b/app/services/activitypub/process_collection_service.rb
index 202a3640ef..e14e840b20 100644
--- a/app/services/activitypub/process_collection_service.rb
+++ b/app/services/activitypub/process_collection_service.rb
@@ -2,6 +2,7 @@
class ActivityPub::ProcessCollectionService < BaseService
include JsonLdHelper
+ include DomainControlHelper
def call(body, actor, **options)
@account = actor
@@ -29,6 +30,10 @@ class ActivityPub::ProcessCollectionService < BaseService
@json.delete('signature') unless safe_for_forwarding?(original_json, @json)
end
+ # any namespaces for general-original activity type
+ @json['type'] = 'EmojiReact' if original_json['type'] == 'EmojiReact'
+ @json['type'] = 'EmojiReaction' if original_json['type'] == 'EmojiReaction'
+
case @json['type']
when 'Collection', 'CollectionPage'
process_items @json['items']
@@ -73,6 +78,9 @@ class ActivityPub::ProcessCollectionService < BaseService
end
def verify_account!
+ return unless @json['signature'].is_a?(Hash)
+ return if domain_not_allowed?(@json['signature']['creator'])
+
@options[:relayed_through_actor] = @account
@account = ActivityPub::LinkedDataSignature.new(@json).verify_actor!
@account = nil unless @account.is_a?(Account)
diff --git a/app/services/activitypub/process_status_update_service.rb b/app/services/activitypub/process_status_update_service.rb
index a58a35b061..df0d77d0ed 100644
--- a/app/services/activitypub/process_status_update_service.rb
+++ b/app/services/activitypub/process_status_update_service.rb
@@ -253,37 +253,58 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
end
def update_tags!
- @status.tags = Tag.find_or_create_by_names(@raw_tags)
+ previous_tags = @status.tags.to_a
+ current_tags = @status.tags = Tag.find_or_create_by_names(@raw_tags)
+
+ return unless @status.distributable?
+
+ added_tags = current_tags - previous_tags
+
+ unless added_tags.empty?
+ @account.featured_tags.where(tag_id: added_tags.pluck(:id)).find_each do |featured_tag|
+ featured_tag.increment(@status.created_at)
+ end
+ end
+
+ removed_tags = previous_tags - current_tags
+
+ unless removed_tags.empty?
+ @account.featured_tags.where(tag_id: removed_tags.pluck(:id)).find_each do |featured_tag|
+ featured_tag.decrement(@status)
+ end
+ end
end
def update_mentions!
- previous_mentions = @status.active_mentions.includes(:account).to_a
- current_mentions = []
+ unresolved_mentions = []
- @raw_mentions.each do |href|
+ currently_mentioned_account_ids = @raw_mentions.filter_map do |href|
next if href.blank?
account = ActivityPub::TagManager.instance.uri_to_resource(href, Account)
account ||= ActivityPub::FetchRemoteAccountService.new.call(href, request_id: @request_id)
- next if account.nil?
-
- mention = previous_mentions.find { |x| x.account_id == account.id }
- mention ||= account.mentions.new(status: @status)
-
- current_mentions << mention
+ account&.id
+ rescue Mastodon::UnexpectedResponseError, HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError
+ # Since previous mentions are about already-known accounts,
+ # they don't try to resolve again and won't fall into this case.
+ # In other words, this failure case is only for new mentions and won't
+ # affect `removed_mentions` so they can safely be retried asynchronously
+ unresolved_mentions << href
+ nil
end
- current_mentions.each do |mention|
- mention.save if mention.new_record?
- end
+ @status.mentions.upsert_all(currently_mentioned_account_ids.uniq.map { |id| { account_id: id, silent: false } }, unique_by: %w(status_id account_id))
# If previous mentions are no longer contained in the text, convert them
# to silent mentions, since withdrawing access from someone who already
# received a notification might be more confusing
- removed_mentions = previous_mentions - current_mentions
+ @status.mentions.where.not(account_id: currently_mentioned_account_ids).update_all(silent: true)
- Mention.where(id: removed_mentions.map(&:id)).update_all(silent: true) unless removed_mentions.empty?
+ # Queue unresolved mentions for later
+ unresolved_mentions.uniq.each do |uri|
+ MentionResolveWorker.perform_in(rand(30...600).seconds, @status.id, uri, { 'request_id' => @request_id })
+ end
end
def update_emojis!
diff --git a/app/services/activitypub/synchronize_followers_service.rb b/app/services/activitypub/synchronize_followers_service.rb
index f51d671a00..82d84a2f21 100644
--- a/app/services/activitypub/synchronize_followers_service.rb
+++ b/app/services/activitypub/synchronize_followers_service.rb
@@ -4,32 +4,46 @@ class ActivityPub::SynchronizeFollowersService < BaseService
include JsonLdHelper
include Payloadable
+ MAX_COLLECTION_PAGES = 10
+
def call(account, partial_collection_url)
@account = account
+ @expected_followers_ids = []
- items = collection_items(partial_collection_url)
- return if items.nil?
-
- # There could be unresolved accounts (hence the call to .compact) but this
- # should never happen in practice, since in almost all cases we keep an
- # Account record, and should we not do that, we should have sent a Delete.
- # In any case there is not much we can do if that occurs.
- @expected_followers = items.filter_map { |uri| ActivityPub::TagManager.instance.uri_to_resource(uri, Account) }
+ return unless process_collection!(partial_collection_url)
remove_unexpected_local_followers!
- handle_unexpected_outgoing_follows!
end
private
+ def process_page!(items)
+ page_expected_followers = extract_local_followers(items)
+ @expected_followers_ids.concat(page_expected_followers.pluck(:id))
+
+ handle_unexpected_outgoing_follows!(page_expected_followers)
+ end
+
+ def extract_local_followers(items)
+ # There could be unresolved accounts (hence the call to .filter_map) but this
+ # should never happen in practice, since in almost all cases we keep an
+ # Account record, and should we not do that, we should have sent a Delete.
+ # In any case there is not much we can do if that occurs.
+
+ # TODO: this will need changes when switching to numeric IDs
+
+ usernames = items.filter_map { |uri| ActivityPub::TagManager.instance.uri_to_local_id(uri, :username)&.downcase }
+ Account.local.with_username(usernames)
+ end
+
def remove_unexpected_local_followers!
- @account.followers.local.where.not(id: @expected_followers.map(&:id)).reorder(nil).find_each do |unexpected_follower|
+ @account.followers.local.where.not(id: @expected_followers_ids).reorder(nil).find_each do |unexpected_follower|
UnfollowService.new.call(unexpected_follower, @account)
end
end
- def handle_unexpected_outgoing_follows!
- @expected_followers.each do |expected_follower|
+ def handle_unexpected_outgoing_follows!(expected_followers)
+ expected_followers.each do |expected_follower|
next if expected_follower.following?(@account)
if expected_follower.requested?(@account)
@@ -50,18 +64,33 @@ class ActivityPub::SynchronizeFollowersService < BaseService
Oj.dump(serialize_payload(follow, ActivityPub::UndoFollowSerializer))
end
- def collection_items(collection_or_uri)
- collection = fetch_collection(collection_or_uri)
- return unless collection.is_a?(Hash)
+ # Only returns true if the whole collection has been processed
+ def process_collection!(collection_uri, max_pages: MAX_COLLECTION_PAGES)
+ collection = fetch_collection(collection_uri)
+ return false unless collection.is_a?(Hash)
collection = fetch_collection(collection['first']) if collection['first'].present?
- return unless collection.is_a?(Hash)
+ while collection.is_a?(Hash)
+ process_page!(as_array(collection_page_items(collection)))
+
+ max_pages -= 1
+
+ return true if collection['next'].blank? # We reached the end of the collection
+ return false if max_pages <= 0 # We reached our pages limit
+
+ collection = fetch_collection(collection['next'])
+ end
+
+ false
+ end
+
+ def collection_page_items(collection)
case collection['type']
when 'Collection', 'CollectionPage'
- as_array(collection['items'])
+ collection['items']
when 'OrderedCollection', 'OrderedCollectionPage'
- as_array(collection['orderedItems'])
+ collection['orderedItems']
end
end
diff --git a/app/services/delete_account_service.rb b/app/services/delete_account_service.rb
index 0c90eeb82d..b8921a6fec 100644
--- a/app/services/delete_account_service.rb
+++ b/app/services/delete_account_service.rb
@@ -64,6 +64,7 @@ class DeleteAccountService < BaseService
scheduled_statuses
scheduled_expiration_statuses
status_pins
+ tag_follows
)
ASSOCIATIONS_ON_DESTROY = %w(
@@ -170,6 +171,7 @@ class DeleteAccountService < BaseService
purge_feeds!
purge_other_associations!
+ remove_ng_rule_history_relations! unless keep_account_record?
@account.destroy unless keep_account_record?
end
@@ -273,6 +275,10 @@ class DeleteAccountService < BaseService
@account.save!
end
+ def remove_ng_rule_history_relations!
+ @account.ng_rule_histories.update_all(account_id: nil)
+ end
+
def fulfill_deletion_request!
@account.deletion_request&.destroy
end
diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb
index 9b47674a24..f61fb60174 100644
--- a/app/services/fan_out_on_write_service.rb
+++ b/app/services/fan_out_on_write_service.rb
@@ -131,7 +131,7 @@ class FanOutOnWriteService < BaseService
end
def deliver_to_hashtag_followers!
- TagFollow.where(tag_id: @status.tags.map(&:id)).select(:id, :account_id).reorder(nil).find_in_batches do |follows|
+ TagFollow.for_local_distribution.where(tag_id: @status.tags.map(&:id)).select(:id, :account_id).reorder(nil).find_in_batches do |follows|
FeedInsertWorker.push_bulk(follows) do |follow|
[@status.id, follow.account_id, 'tags', { 'update' => update? }]
end
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index 23b42e19dc..473205ec57 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -35,6 +35,7 @@ class NotifyService < BaseService
@sender = notification.from_account
@notification = notification
@policy = NotificationPolicy.find_or_initialize_by(account: @recipient)
+ @from_staff = @sender.local? && @sender.user.present? && @sender.user_role&.bypass_block?(@recipient.user_role)
end
private
@@ -64,6 +65,14 @@ class NotifyService < BaseService
@sender.silenced? && not_following?
end
+ def message?
+ @notification.type == :mention
+ end
+
+ def from_staff?
+ @from_staff
+ end
+
def private_mention_not_in_response?
@notification.type == :mention && @notification.target_status.direct_visibility? && !response_to_recipient?
end
@@ -130,14 +139,6 @@ class NotifyService < BaseService
FeedManager.instance.filter?(:mentions, @notification.target_status, @recipient)
end
- def message?
- @notification.type == :mention
- end
-
- def from_staff?
- @sender.local? && @sender.user.present? && @sender.user_role&.overrides?(@recipient.user_role) && @sender.user_role&.highlighted? && @sender.user_role&.can?(*UserRole::Flags::CATEGORIES[:moderation])
- end
-
def from_self?
@recipient.id == @sender.id
end
@@ -175,6 +176,7 @@ class NotifyService < BaseService
def filter?
return false unless filterable_type?
return false if override_for_sender?
+ return false if message? && from_staff?
filtered_by_limited_accounts_policy? ||
filtered_by_not_following_policy? ||
diff --git a/app/services/precompute_feed_service.rb b/app/services/precompute_feed_service.rb
index f813f06b20..86aad50983 100644
--- a/app/services/precompute_feed_service.rb
+++ b/app/services/precompute_feed_service.rb
@@ -5,6 +5,10 @@ class PrecomputeFeedService < BaseService
def call(account)
FeedManager.instance.populate_home(account)
+
+ account.owned_lists.each do |list|
+ FeedManager.instance.populate_list(list)
+ end
ensure
redis.del("account:#{account.id}:regeneration")
end
diff --git a/app/services/process_hashtags_service.rb b/app/services/process_hashtags_service.rb
index 17c347b088..0baea0185c 100644
--- a/app/services/process_hashtags_service.rb
+++ b/app/services/process_hashtags_service.rb
@@ -33,7 +33,7 @@ class ProcessHashtagsService < BaseService
unless removed_tags.empty?
@account.featured_tags.where(tag_id: removed_tags.map(&:id)).find_each do |featured_tag|
- featured_tag.decrement(@status.id)
+ featured_tag.decrement(@status)
end
end
end
diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb
index ebd5d260f0..2332d1d8a2 100644
--- a/app/services/process_mentions_service.rb
+++ b/app/services/process_mentions_service.rb
@@ -15,7 +15,7 @@ class ProcessMentionsService < BaseService
return unless @status.local?
- @previous_mentions = @status.active_mentions.includes(:account).to_a
+ @previous_mentions = @status.mentions.includes(:account).to_a
@current_mentions = []
Status.transaction do
@@ -63,6 +63,8 @@ class ProcessMentionsService < BaseService
mention ||= @current_mentions.find { |x| x.account_id == mentioned_account.id }
mention ||= @status.mentions.new(account: mentioned_account)
+ mention.silent = false
+
@current_mentions << mention
"@#{mentioned_account.acct}"
@@ -87,7 +89,7 @@ class ProcessMentionsService < BaseService
end
@current_mentions.each do |mention|
- mention.save if mention.new_record? && @save_records
+ mention.save if (mention.new_record? || mention.silent_changed?) && @save_records
end
# If previous mentions are no longer contained in the text, convert them
@@ -95,7 +97,7 @@ class ProcessMentionsService < BaseService
# received a notification might be more confusing
removed_mentions = @previous_mentions - @current_mentions
- Mention.where(id: removed_mentions.map(&:id)).update_all(silent: true) unless removed_mentions.empty?
+ Mention.where(id: removed_mentions.map(&:id), silent: false).update_all(silent: true) unless removed_mentions.empty?
end
def mention_undeliverable?(mentioned_account)
diff --git a/app/services/purge_domain_service.rb b/app/services/purge_domain_service.rb
index ca0f0d441f..feab8aa1dd 100644
--- a/app/services/purge_domain_service.rb
+++ b/app/services/purge_domain_service.rb
@@ -16,12 +16,12 @@ class PurgeDomainService < BaseService
end
def purge_accounts!
- Account.remote.where(domain: @domain).reorder(nil).find_each do |account|
+ Account.remote.where(domain: @domain).find_each do |account|
DeleteAccountService.new.call(account, reserve_username: false, skip_side_effects: true)
end
end
def purge_emojis!
- CustomEmoji.remote.where(domain: @domain).reorder(nil).find_each(&:destroy)
+ CustomEmoji.remote.where(domain: @domain).find_each(&:destroy)
end
end
diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb
index d5ef41b19d..eb07152ff8 100644
--- a/app/services/remove_status_service.rb
+++ b/app/services/remove_status_service.rb
@@ -146,7 +146,7 @@ class RemoveStatusService < BaseService
def remove_from_hashtags
@account.featured_tags.where(tag_id: @status.tags.map(&:id)).find_each do |featured_tag|
- featured_tag.decrement(@status.id)
+ featured_tag.decrement(@status)
end
return unless %i(public public_unlisted login).include?(@visibility) || (@status.unlisted_visibility? && %i(public public_unlisted).include?(@searchability))
diff --git a/app/services/resolve_account_service.rb b/app/services/resolve_account_service.rb
index 8a5863baba..cd96b55c74 100644
--- a/app/services/resolve_account_service.rb
+++ b/app/services/resolve_account_service.rb
@@ -2,7 +2,6 @@
class ResolveAccountService < BaseService
include DomainControlHelper
- include WebfingerHelper
include Redisable
include Lockable
@@ -81,7 +80,7 @@ class ResolveAccountService < BaseService
end
def process_webfinger!(uri)
- @webfinger = webfinger!("acct:#{uri}")
+ @webfinger = Webfinger.new("acct:#{uri}").perform
confirmed_username, confirmed_domain = split_acct(@webfinger.subject)
if confirmed_username.casecmp(@username).zero? && confirmed_domain.casecmp(@domain).zero?
@@ -91,7 +90,7 @@ class ResolveAccountService < BaseService
end
# Account doesn't match, so it may have been redirected
- @webfinger = webfinger!("acct:#{confirmed_username}@#{confirmed_domain}")
+ @webfinger = Webfinger.new("acct:#{confirmed_username}@#{confirmed_domain}").perform
@username, @domain = split_acct(@webfinger.subject)
raise Webfinger::RedirectError, "Too many webfinger redirects for URI #{uri} (stopped at #{@username}@#{@domain})" unless confirmed_username.casecmp(@username).zero? && confirmed_domain.casecmp(@domain).zero?
diff --git a/app/services/suspend_account_service.rb b/app/services/suspend_account_service.rb
index 8d5446f1a8..561ac665cb 100644
--- a/app/services/suspend_account_service.rb
+++ b/app/services/suspend_account_service.rb
@@ -95,7 +95,7 @@ class SuspendAccountService < BaseService
end
end
- CacheBusterWorker.perform_async(attachment.path(style)) if Rails.configuration.x.cache_buster_enabled
+ CacheBusterWorker.perform_async(attachment.url(style)) if Rails.configuration.x.cache_buster_enabled
end
end
end
diff --git a/app/services/translate_status_service.rb b/app/services/translate_status_service.rb
index 94fe116095..792b12c746 100644
--- a/app/services/translate_status_service.rb
+++ b/app/services/translate_status_service.rb
@@ -9,6 +9,8 @@ class TranslateStatusService < BaseService
def call(status, target_language)
@status = status
@source_texts = source_texts
+
+ target_language = target_language.split(/[_-]/).first unless target_languages.include?(target_language)
@target_language = target_language
raise Mastodon::NotPermittedError unless permitted?
@@ -32,11 +34,15 @@ class TranslateStatusService < BaseService
def permitted?
return false unless (@status.distributable? || @status.account.translatable_private?) && TranslationService.configured?
- languages[@status.language]&.include?(@target_language)
+ target_languages.include?(@target_language)
end
def languages
- Rails.cache.fetch('translation_service/languages', expires_in: 7.days, race_condition_ttl: 1.hour) { TranslationService.configured.languages }
+ Rails.cache.fetch('translation_service/languages', expires_in: 7.days, race_condition_ttl: 1.hour) { translation_backend.languages }
+ end
+
+ def target_languages
+ languages[@status.language] || []
end
def content_hash
diff --git a/app/services/unsuspend_account_service.rb b/app/services/unsuspend_account_service.rb
index 652dd6a845..7d3bb806a6 100644
--- a/app/services/unsuspend_account_service.rb
+++ b/app/services/unsuspend_account_service.rb
@@ -91,7 +91,7 @@ class UnsuspendAccountService < BaseService
end
end
- CacheBusterWorker.perform_async(attachment.path(style)) if Rails.configuration.x.cache_buster_enabled
+ CacheBusterWorker.perform_async(attachment.url(style)) if Rails.configuration.x.cache_buster_enabled
end
end
end
diff --git a/app/validators/poll_expiration_validator.rb b/app/validators/poll_expiration_validator.rb
new file mode 100644
index 0000000000..ea8b08e186
--- /dev/null
+++ b/app/validators/poll_expiration_validator.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class PollExpirationValidator < ActiveModel::Validator
+ MAX_EXPIRATION = 1.month.freeze
+ MIN_EXPIRATION = 5.minutes.freeze
+
+ def validate(poll)
+ current_time = Time.now.utc
+
+ poll.errors.add(:expires_at, I18n.t('polls.errors.duration_too_long')) if poll.expires_at.nil? || poll.expires_at - current_time > MAX_EXPIRATION
+ poll.errors.add(:expires_at, I18n.t('polls.errors.duration_too_short')) if poll.expires_at.present? && (poll.expires_at - current_time).ceil < MIN_EXPIRATION
+ end
+end
diff --git a/app/validators/poll_validator.rb b/app/validators/poll_options_validator.rb
similarity index 57%
rename from app/validators/poll_validator.rb
rename to app/validators/poll_options_validator.rb
index bd913188f3..7ce16fe409 100644
--- a/app/validators/poll_validator.rb
+++ b/app/validators/poll_options_validator.rb
@@ -1,19 +1,13 @@
# frozen_string_literal: true
-class PollValidator < ActiveModel::Validator
+class PollOptionsValidator < ActiveModel::Validator
MAX_OPTIONS = 8
MAX_OPTION_CHARS = 50
- MAX_EXPIRATION = 1.month.freeze
- MIN_EXPIRATION = 5.minutes.freeze
def validate(poll)
- current_time = Time.now.utc
-
poll.errors.add(:options, I18n.t('polls.errors.too_few_options')) unless poll.options.size > 1
poll.errors.add(:options, I18n.t('polls.errors.too_many_options', max: MAX_OPTIONS)) if poll.options.size > MAX_OPTIONS
poll.errors.add(:options, I18n.t('polls.errors.over_character_limit', max: MAX_OPTION_CHARS)) if poll.options.any? { |option| option.mb_chars.grapheme_length > MAX_OPTION_CHARS }
poll.errors.add(:options, I18n.t('polls.errors.duplicate_options')) unless poll.options.uniq.size == poll.options.size
- poll.errors.add(:expires_at, I18n.t('polls.errors.duration_too_long')) if poll.expires_at.nil? || poll.expires_at - current_time > MAX_EXPIRATION
- poll.errors.add(:expires_at, I18n.t('polls.errors.duration_too_short')) if poll.expires_at.present? && (poll.expires_at - current_time).ceil < MIN_EXPIRATION
end
end
diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml
index 05d8989add..e8f7b43eaa 100644
--- a/app/views/about/show.html.haml
+++ b/app/views/about/show.html.haml
@@ -1,5 +1,4 @@
-- content_for :page_title do
- = t('about.title')
+- content_for :page_title, t('about.title')
- content_for :header_tags do
= render partial: 'shared/og'
diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml
index 6c76748585..9fe42a38e0 100644
--- a/app/views/accounts/show.html.haml
+++ b/app/views/accounts/show.html.haml
@@ -1,5 +1,4 @@
-- content_for :page_title do
- #{display_name(@account)} (#{acct(@account)})
+- content_for :page_title, "#{display_name(@account)} (#{acct(@account)})"
- content_for :header_tags do
- if @account.noindex?
diff --git a/app/views/admin/action_logs/index.html.haml b/app/views/admin/action_logs/index.html.haml
index c02c8f0ad4..a5d4188294 100644
--- a/app/views/admin/action_logs/index.html.haml
+++ b/app/views/admin/action_logs/index.html.haml
@@ -16,7 +16,7 @@
%strong= t('admin.action_logs.filter_by_action')
.input.select.optional
= form.select :action_type,
- options_for_select(Admin::ActionLogFilter::ACTION_TYPE_MAP.keys.map { |key| [I18n.t("admin.action_logs.action_types.#{key}"), key] }, params[:action_type]),
+ options_for_select(sorted_action_log_types, params[:action_type]),
prompt: I18n.t('admin.accounts.moderation.all')
- if @action_logs.empty?
diff --git a/app/views/admin/announcements/index.html.haml b/app/views/admin/announcements/index.html.haml
index 72227b0457..6a76c18776 100644
--- a/app/views/admin/announcements/index.html.haml
+++ b/app/views/admin/announcements/index.html.haml
@@ -9,7 +9,7 @@
%strong= t('admin.relays.status')
%ul
%li= filter_link_to t('generic.all'), published: nil, unpublished: nil
- %li= filter_link_to safe_join([t('admin.announcements.live'), "(#{number_with_delimiter(Announcement.published.count)})"], ' '), published: '1', unpublished: nil
+ %li= filter_link_to safe_join([t('admin.announcements.live'), "(#{number_with_delimiter(@published_announcements_count.value)})"], ' '), published: '1', unpublished: nil
- if @announcements.empty?
.muted-hint.center-text
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index 27d8f4790b..2b4d02fa67 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -2,9 +2,7 @@
= t('admin.dashboard.title')
- content_for :heading_actions do
- = l(@time_period.first)
- = ' - '
- = l(@time_period.last)
+ = date_range(@time_period)
- unless @system_checks.empty?
.flash-message-stack
diff --git a/app/views/admin/disputes/appeals/index.html.haml b/app/views/admin/disputes/appeals/index.html.haml
index 7f04dd40fb..e09e275e5d 100644
--- a/app/views/admin/disputes/appeals/index.html.haml
+++ b/app/views/admin/disputes/appeals/index.html.haml
@@ -5,7 +5,7 @@
.filter-subset
%strong= t('admin.tags.review')
%ul
- %li= filter_link_to safe_join([t('admin.accounts.moderation.pending'), "(#{Appeal.pending.count})"], ' '), status: 'pending'
+ %li= filter_link_to safe_join([t('admin.accounts.moderation.pending'), "(#{@pending_appeals_count.value})"], ' '), status: 'pending'
%li= filter_link_to t('admin.trends.approved'), status: 'approved'
%li= filter_link_to t('admin.trends.rejected'), status: 'rejected'
diff --git a/app/views/admin/email_domain_blocks/new.html.haml b/app/views/admin/email_domain_blocks/new.html.haml
index dd4b83ee3f..2dfdca9376 100644
--- a/app/views/admin/email_domain_blocks/new.html.haml
+++ b/app/views/admin/email_domain_blocks/new.html.haml
@@ -16,7 +16,7 @@
label: I18n.t('admin.email_domain_blocks.allow_registrations_with_approval'),
wrapper: :with_label
- - if defined?(@resolved_records)
+ - if defined?(@resolved_records) && @resolved_records.any?
%p.hint= t('admin.email_domain_blocks.resolved_dns_records_hint_html')
.batch-table
diff --git a/app/views/admin/instances/_dashboard.html.haml b/app/views/admin/instances/_dashboard.html.haml
new file mode 100644
index 0000000000..ef8500103b
--- /dev/null
+++ b/app/views/admin/instances/_dashboard.html.haml
@@ -0,0 +1,66 @@
+-# locals: (instance_domain:, period_end_at:, period_start_at:)
+%p
+ = material_symbol 'info'
+ = t('admin.instances.totals_time_period_hint_html')
+
+.dashboard
+ .dashboard__item
+ = react_admin_component :counter,
+ end_at: period_end_at,
+ href: admin_accounts_path(origin: 'remote', by_domain: instance_domain),
+ label: t('admin.instances.dashboard.instance_accounts_measure'),
+ measure: 'instance_accounts',
+ params: { domain: instance_domain },
+ start_at: period_start_at
+ .dashboard__item
+ = react_admin_component :counter,
+ end_at: period_end_at,
+ label: t('admin.instances.dashboard.instance_statuses_measure'),
+ measure: 'instance_statuses',
+ params: { domain: instance_domain },
+ start_at: period_start_at
+ .dashboard__item
+ = react_admin_component :counter,
+ end_at: period_end_at,
+ label: t('admin.instances.dashboard.instance_media_attachments_measure'),
+ measure: 'instance_media_attachments',
+ params: { domain: instance_domain },
+ start_at: period_start_at
+ .dashboard__item
+ = react_admin_component :counter,
+ end_at: period_end_at,
+ label: t('admin.instances.dashboard.instance_follows_measure'),
+ measure: 'instance_follows',
+ params: { domain: instance_domain },
+ start_at: period_start_at
+ .dashboard__item
+ = react_admin_component :counter,
+ end_at: period_end_at,
+ label: t('admin.instances.dashboard.instance_followers_measure'),
+ measure: 'instance_followers',
+ params: { domain: instance_domain },
+ start_at: period_start_at
+ .dashboard__item
+ = react_admin_component :counter,
+ end_at: period_end_at,
+ href: admin_reports_path(by_target_domain: instance_domain),
+ label: t('admin.instances.dashboard.instance_reports_measure'),
+ measure: 'instance_reports',
+ params: { domain: instance_domain },
+ start_at: period_start_at
+ .dashboard__item
+ = react_admin_component :dimension,
+ dimension: 'instance_accounts',
+ end_at: period_end_at,
+ label: t('admin.instances.dashboard.instance_accounts_dimension'),
+ limit: 8,
+ params: { domain: instance_domain },
+ start_at: period_start_at
+ .dashboard__item
+ = react_admin_component :dimension,
+ dimension: 'instance_languages',
+ end_at: period_end_at,
+ label: t('admin.instances.dashboard.instance_languages_dimension'),
+ limit: 8,
+ params: { domain: instance_domain },
+ start_at: period_start_at
diff --git a/app/views/admin/instances/show.html.haml b/app/views/admin/instances/show.html.haml
index 606d00e27c..f5f339e664 100644
--- a/app/views/admin/instances/show.html.haml
+++ b/app/views/admin/instances/show.html.haml
@@ -7,77 +7,10 @@
- if current_user.can?(:view_dashboard)
- content_for :heading_actions do
- = l(@time_period.first)
- = ' - '
- = l(@time_period.last)
+ = date_range(@time_period)
- if @instance.persisted?
- %p
- = material_symbol 'info'
- = t('admin.instances.totals_time_period_hint_html')
-
- .dashboard
- .dashboard__item
- = react_admin_component :counter,
- end_at: @time_period.last,
- href: admin_accounts_path(origin: 'remote', by_domain: @instance.domain),
- label: t('admin.instances.dashboard.instance_accounts_measure'),
- measure: 'instance_accounts',
- params: { domain: @instance.domain },
- start_at: @time_period.first
- .dashboard__item
- = react_admin_component :counter,
- end_at: @time_period.last,
- label: t('admin.instances.dashboard.instance_statuses_measure'),
- measure: 'instance_statuses',
- params: { domain: @instance.domain },
- start_at: @time_period.first
- .dashboard__item
- = react_admin_component :counter,
- end_at: @time_period.last,
- label: t('admin.instances.dashboard.instance_media_attachments_measure'),
- measure: 'instance_media_attachments',
- params: { domain: @instance.domain },
- start_at: @time_period.first
- .dashboard__item
- = react_admin_component :counter,
- end_at: @time_period.last,
- label: t('admin.instances.dashboard.instance_follows_measure'),
- measure: 'instance_follows',
- params: { domain: @instance.domain },
- start_at: @time_period.first
- .dashboard__item
- = react_admin_component :counter,
- end_at: @time_period.last,
- label: t('admin.instances.dashboard.instance_followers_measure'),
- measure: 'instance_followers',
- params: { domain: @instance.domain },
- start_at: @time_period.first
- .dashboard__item
- = react_admin_component :counter,
- end_at: @time_period.last,
- href: admin_reports_path(by_target_domain: @instance.domain),
- label: t('admin.instances.dashboard.instance_reports_measure'),
- measure: 'instance_reports',
- params: { domain: @instance.domain },
- start_at: @time_period.first
- .dashboard__item
- = react_admin_component :dimension,
- dimension: 'instance_accounts',
- end_at: @time_period.last,
- label: t('admin.instances.dashboard.instance_accounts_dimension'),
- limit: 8,
- params: { domain: @instance.domain },
- start_at: @time_period.first
- .dashboard__item
- = react_admin_component :dimension,
- dimension: 'instance_languages',
- end_at: @time_period.last,
- label: t('admin.instances.dashboard.instance_languages_dimension'),
- limit: 8,
- params: { domain: @instance.domain },
- start_at: @time_period.first
-
+ = render 'dashboard', instance_domain: @instance.domain, period_end_at: @time_period.last, period_start_at: @time_period.first
- else
%p
= t('admin.instances.unknown_instance')
diff --git a/app/views/admin/invites/_invite.html.haml b/app/views/admin/invites/_invite.html.haml
index 8bd5f10fee..e3e5d32542 100644
--- a/app/views/admin/invites/_invite.html.haml
+++ b/app/views/admin/invites/_invite.html.haml
@@ -1,8 +1,8 @@
-%tr
+%tr{ id: dom_id(invite) }
%td
.input-copy
.input-copy__wrapper
- %input{ type: :text, maxlength: '999', spellcheck: 'false', readonly: 'true', value: public_invite_url(invite_code: invite.code) }
+ = copyable_input value: public_invite_url(invite_code: invite.code)
%button{ type: :button }= t('generic.copy')
%td
diff --git a/app/views/admin/tags/show.html.haml b/app/views/admin/tags/show.html.haml
index 93387843b2..462ca312a0 100644
--- a/app/views/admin/tags/show.html.haml
+++ b/app/views/admin/tags/show.html.haml
@@ -4,9 +4,7 @@
- content_for :heading_actions do
- if current_user.can?(:view_dashboard)
.time-period
- = l(@time_period.first)
- = ' - '
- = l(@time_period.last)
+ = date_range(@time_period)
= link_to t('admin.tags.open'), tag_url(@tag), class: 'button', target: '_blank', rel: 'noopener noreferrer'
diff --git a/app/views/admin/trends/links/preview_card_providers/index.html.haml b/app/views/admin/trends/links/preview_card_providers/index.html.haml
index 93daf25f31..0770ac4b81 100644
--- a/app/views/admin/trends/links/preview_card_providers/index.html.haml
+++ b/app/views/admin/trends/links/preview_card_providers/index.html.haml
@@ -12,7 +12,7 @@
%li= filter_link_to t('generic.all'), status: nil
%li= filter_link_to t('admin.trends.approved'), status: 'approved'
%li= filter_link_to t('admin.trends.rejected'), status: 'rejected'
- %li= filter_link_to safe_join([t('admin.accounts.moderation.pending'), "(#{PreviewCardProvider.unreviewed.count})"], ' '), status: 'pending_review'
+ %li= filter_link_to safe_join([t('admin.accounts.moderation.pending'), "(#{@pending_preview_card_providers_count.value})"], ' '), status: 'pending_review'
.back-link
= link_to admin_trends_links_path do
= material_symbol 'chevron_left'
diff --git a/app/views/admin/trends/tags/index.html.haml b/app/views/admin/trends/tags/index.html.haml
index 480877456f..21f6c2947a 100644
--- a/app/views/admin/trends/tags/index.html.haml
+++ b/app/views/admin/trends/tags/index.html.haml
@@ -12,7 +12,7 @@
%li= filter_link_to t('generic.all'), status: nil
%li= filter_link_to t('admin.trends.approved'), status: 'approved'
%li= filter_link_to t('admin.trends.rejected'), status: 'rejected'
- %li= filter_link_to safe_join([t('admin.accounts.moderation.pending'), "(#{Tag.pending_review.count})"], ' '), status: 'pending_review'
+ %li= filter_link_to safe_join([t('admin.accounts.moderation.pending'), "(#{@pending_tags_count.value})"], ' '), status: 'pending_review'
= form_with model: @form, url: batch_admin_trends_tags_path do |f|
= hidden_field_tag :page, params[:page] || 1
diff --git a/app/views/application/mailer/_hashtag.html.haml b/app/views/application/mailer/_hashtag.html.haml
index b740ba31b9..0fe7117bc4 100644
--- a/app/views/application/mailer/_hashtag.html.haml
+++ b/app/views/application/mailer/_hashtag.html.haml
@@ -17,5 +17,4 @@
%span.email-mini-hashtag-img-span
= image_tag full_asset_url(account.avatar.url), alt: '', width: 16, height: 16
%td
- - people = hashtag.history.aggregate(2.days.ago.to_date..Time.zone.today).accounts
- %p= t('user_mailer.welcome.hashtags_recent_count', people: number_with_delimiter(people), count: people)
+ %p= recent_tag_usage(hashtag)
diff --git a/app/views/invites/_invite.html.haml b/app/views/invites/_invite.html.haml
index 892fdc5a0e..7c94062de4 100644
--- a/app/views/invites/_invite.html.haml
+++ b/app/views/invites/_invite.html.haml
@@ -2,7 +2,7 @@
%td
.input-copy
.input-copy__wrapper
- %input{ type: :text, maxlength: '999', spellcheck: 'false', readonly: 'true', value: public_invite_url(invite_code: invite.code) }
+ = copyable_input value: public_invite_url(invite_code: invite.code)
%button{ type: :button }= t('generic.copy')
- if invite.valid_for_use?
diff --git a/app/views/oauth/authorizations/show.html.haml b/app/views/oauth/authorizations/show.html.haml
index a5122a87fc..bdff336368 100644
--- a/app/views/oauth/authorizations/show.html.haml
+++ b/app/views/oauth/authorizations/show.html.haml
@@ -3,5 +3,5 @@
%p= t('doorkeeper.authorizations.show.title')
.input-copy
.input-copy__wrapper
- %input.oauth-code{ type: 'text', spellcheck: 'false', readonly: true, value: params[:code] }
+ = copyable_input value: params[:code], class: 'oauth-code'
%button{ type: :button }= t('generic.copy')
diff --git a/app/views/privacy/show.html.haml b/app/views/privacy/show.html.haml
index 95e506641b..9eb4f7a570 100644
--- a/app/views/privacy/show.html.haml
+++ b/app/views/privacy/show.html.haml
@@ -1,5 +1,4 @@
-- content_for :page_title do
- = t('privacy_policy.title')
+- content_for :page_title, t('privacy_policy.title')
- content_for :header_tags do
= render partial: 'shared/og'
diff --git a/app/views/settings/applications/_form.html.haml b/app/views/settings/applications/_form.html.haml
index 66ea8bc12b..85fdefa0fc 100644
--- a/app/views/settings/applications/_form.html.haml
+++ b/app/views/settings/applications/_form.html.haml
@@ -18,7 +18,7 @@
.field-group
.input.with_block_label
- %label= t('activerecord.attributes.doorkeeper/application.scopes')
+ = form.label t('activerecord.attributes.doorkeeper/application.scopes'), required: true
%span.hint= t('simple_form.hints.defaults.scopes')
- Doorkeeper.configuration.scopes.group_by { |s| s.split(':').first }.each_value do |value|
@@ -29,7 +29,7 @@
hint: false,
include_blank: false,
item_wrapper_tag: 'li',
- label_method: ->(scope) { safe_join([content_tag(:samp, scope, class: class_for_scope(scope)), content_tag(:span, t("doorkeeper.scopes.#{scope}"), class: 'hint')]) },
+ label_method: ->(scope) { label_for_scope(scope) },
label: false,
required: false,
selected: form.object.scopes.all,
diff --git a/app/views/settings/applications/index.html.haml b/app/views/settings/applications/index.html.haml
index 80eaed5c39..e3011947a6 100644
--- a/app/views/settings/applications/index.html.haml
+++ b/app/views/settings/applications/index.html.haml
@@ -18,7 +18,9 @@
- @applications.each do |application|
%tr
%td= link_to application.name, settings_application_path(application)
- %th= application.scopes
+ %th
+ - application.scopes.to_s.split.each do |scope|
+ = tag.samp(scope, class: 'information-badge', title: t("doorkeeper.scopes.#{scope}"))
%td
= table_link_to 'close', t('doorkeeper.applications.index.delete'), settings_application_path(application), method: :delete, data: { confirm: t('doorkeeper.applications.confirmations.destroy') }
diff --git a/app/views/settings/applications/show.html.haml b/app/views/settings/applications/show.html.haml
index 19630cf49b..bfde27daa9 100644
--- a/app/views/settings/applications/show.html.haml
+++ b/app/views/settings/applications/show.html.haml
@@ -15,15 +15,16 @@
%td
%code= @application.secret
%tr
- %th{ rowspan: 2 }= t('applications.your_token')
+ %th= t('applications.your_token')
%td
%code= current_user.token_for_app(@application).token
%tr
+ %th
%td= table_link_to 'refresh', t('applications.regenerate_token'), regenerate_settings_application_path(@application), method: :post
%hr/
-= simple_form_for @application, url: settings_application_path(@application), method: :put do |form|
+= simple_form_for @application, url: settings_application_path(@application) do |form|
= render form
.actions
diff --git a/app/views/settings/exports/show.html.haml b/app/views/settings/exports/show.html.haml
index 320bb0c7ce..273c5a4ba6 100644
--- a/app/views/settings/exports/show.html.haml
+++ b/app/views/settings/exports/show.html.haml
@@ -61,7 +61,8 @@
%tbody
- @backups.each do |backup|
%tr
- %td= l backup.created_at
+ %td
+ %time.formatted{ datetime: backup.created_at.iso8601, title: l(backup.created_at) }= l backup.created_at
- if backup.processed?
%td= number_to_human_size backup.dump_file_size
%td= table_link_to 'download', t('exports.archive_takeout.download'), download_backup_url(backup)
diff --git a/app/views/settings/imports/index.html.haml b/app/views/settings/imports/index.html.haml
index 634631b5aa..55421991e1 100644
--- a/app/views/settings/imports/index.html.haml
+++ b/app/views/settings/imports/index.html.haml
@@ -55,7 +55,10 @@
= t("imports.states.#{import.state}")
%td
#{import.imported_items} / #{import.total_items}
- %td= l(import.created_at)
+ %td
+ %time.formatted{ datetime: import.created_at.iso8601, title: l(import.created_at) }
+ = l(import.created_at)
+
%td
- num_failed = import.processed_items - import.imported_items
- if num_failed.positive?
diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml
index 759fe3de81..131d3bdb12 100644
--- a/app/views/settings/preferences/appearance/show.html.haml
+++ b/app/views/settings/preferences/appearance/show.html.haml
@@ -4,7 +4,7 @@
- content_for :heading_actions do
= button_tag t('generic.save_changes'), class: 'button', form: 'edit_user'
-= simple_form_for current_user, url: settings_preferences_appearance_path, html: { method: :put, id: 'edit_user' } do |f|
+= simple_form_for current_user, url: settings_preferences_appearance_path, html: { id: :edit_user } do |f|
.fields-row
.fields-group.fields-row__column.fields-row__column-6
= f.input :locale,
diff --git a/app/views/settings/preferences/notifications/show.html.haml b/app/views/settings/preferences/notifications/show.html.haml
index 26111374f9..d0adfd366c 100644
--- a/app/views/settings/preferences/notifications/show.html.haml
+++ b/app/views/settings/preferences/notifications/show.html.haml
@@ -4,7 +4,7 @@
- content_for :heading_actions do
= button_tag t('generic.save_changes'), class: 'button', form: 'edit_notification'
-= simple_form_for current_user, url: settings_preferences_notifications_path, html: { method: :put, id: 'edit_notification' } do |f|
+= simple_form_for current_user, url: settings_preferences_notifications_path, html: { id: :edit_notification } do |f|
= render 'shared/error_messages', object: current_user
%h4= t 'notifications.email_events'
diff --git a/app/views/settings/preferences/other/show.html.haml b/app/views/settings/preferences/other/show.html.haml
index e6a6db766f..1b03497c27 100644
--- a/app/views/settings/preferences/other/show.html.haml
+++ b/app/views/settings/preferences/other/show.html.haml
@@ -4,7 +4,7 @@
- content_for :heading_actions do
= button_tag t('generic.save_changes'), class: 'button', form: 'edit_preferences'
-= simple_form_for current_user, url: settings_preferences_other_path, html: { method: :put, id: 'edit_preferences' } do |f|
+= simple_form_for current_user, url: settings_preferences_other_path, html: { id: :edit_preferences } do |f|
= render 'shared/error_messages', object: current_user
= f.simple_fields_for :settings, current_user.settings do |ff|
diff --git a/app/views/settings/privacy/show.html.haml b/app/views/settings/privacy/show.html.haml
index eb02ee2f5c..c862d2601e 100644
--- a/app/views/settings/privacy/show.html.haml
+++ b/app/views/settings/privacy/show.html.haml
@@ -5,7 +5,7 @@
%h2= t('settings.profile')
= render partial: 'settings/shared/profile_navigation'
-= simple_form_for @account, url: settings_privacy_path, html: { method: :put } do |f|
+= simple_form_for @account, url: settings_privacy_path do |f|
= render 'shared/error_messages', object: @account
%p.lead= t('privacy.hint_html')
diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml
index 27af468336..b7c816d5b0 100644
--- a/app/views/settings/profiles/show.html.haml
+++ b/app/views/settings/profiles/show.html.haml
@@ -5,7 +5,7 @@
%h2= t('settings.profile')
= render partial: 'settings/shared/profile_navigation'
-= simple_form_for @account, url: settings_profile_path, html: { method: :put, id: 'edit_profile' } do |f|
+= simple_form_for @account, url: settings_profile_path, html: { id: :edit_profile } do |f|
= render 'shared/error_messages', object: @account
%p.lead= t('edit_profile.hint_html')
@@ -41,7 +41,7 @@
.fields-row__column.fields-row__column-6
.fields-group
= f.input :avatar,
- hint: t('simple_form.hints.defaults.avatar', dimensions: '400x400', size: number_to_human_size(Account::Avatar::LIMIT)),
+ hint: t('simple_form.hints.defaults.avatar', dimensions: Account::Avatar::AVATAR_GEOMETRY, size: number_to_human_size(Account::Avatar::LIMIT)),
input_html: { accept: Account::Avatar::IMAGE_MIME_TYPES.join(',') },
wrapper: :with_block_label
@@ -57,7 +57,7 @@
.fields-row__column.fields-row__column-6
.fields-group
= f.input :header,
- hint: t('simple_form.hints.defaults.header', dimensions: '1500x500', size: number_to_human_size(Account::Header::LIMIT)),
+ hint: t('simple_form.hints.defaults.header', dimensions: Account::Header::HEADER_GEOMETRY, size: number_to_human_size(Account::Header::LIMIT)),
input_html: { accept: Account::Header::IMAGE_MIME_TYPES.join(',') },
wrapper: :with_block_label
diff --git a/app/views/settings/shared/_profile_navigation.html.haml b/app/views/settings/shared/_profile_navigation.html.haml
index e64e7f8598..45a31f896c 100644
--- a/app/views/settings/shared/_profile_navigation.html.haml
+++ b/app/views/settings/shared/_profile_navigation.html.haml
@@ -1,8 +1,8 @@
.content__heading__tabs
= render_navigation renderer: :links do |primary|
:ruby
- primary.item :profile, safe_join([material_symbol('person'), t('settings.edit_profile')]), settings_profile_path
- primary.item :privacy, safe_join([material_symbol('lock'), t('privacy.title')]), settings_privacy_path
+ primary.item :edit_profile, safe_join([material_symbol('person'), t('settings.edit_profile')]), settings_profile_path
+ primary.item :privacy_reach, safe_join([material_symbol('lock'), t('privacy.title')]), settings_privacy_path
primary.item :privacy_extra, safe_join([material_symbol('lock'), t('privacy_extra.title')]), settings_privacy_extra_path
primary.item :verification, safe_join([material_symbol('check'), t('verification.verification')]), settings_verification_path
primary.item :featured_tags, safe_join([material_symbol('tag'), t('settings.featured_tags')]), settings_featured_tags_path
diff --git a/app/views/settings/two_factor_authentication/confirmations/new.html.haml b/app/views/settings/two_factor_authentication/confirmations/new.html.haml
index 0b8278a104..a35479b84e 100644
--- a/app/views/settings/two_factor_authentication/confirmations/new.html.haml
+++ b/app/views/settings/two_factor_authentication/confirmations/new.html.haml
@@ -5,7 +5,7 @@
%p.hint= t('otp_authentication.instructions_html')
.qr-wrapper
- .qr-code!= @qrcode.as_svg(padding: 0, module_size: 4)
+ .qr-code!= @qrcode.as_svg(padding: 0, module_size: 4, use_path: true)
.qr-alternative
%p.hint= t('otp_authentication.manual_instructions')
diff --git a/app/views/settings/verifications/show.html.haml b/app/views/settings/verifications/show.html.haml
index 5318b0767d..a93ffcebed 100644
--- a/app/views/settings/verifications/show.html.haml
+++ b/app/views/settings/verifications/show.html.haml
@@ -16,7 +16,7 @@
.input-copy.lead
.input-copy__wrapper
- %input{ type: :text, maxlength: '999', spellcheck: 'false', readonly: 'true', value: link_to('Mastodon', ActivityPub::TagManager.instance.url_for(@account), rel: 'me').to_str }
+ = copyable_input value: link_to('Mastodon', ActivityPub::TagManager.instance.url_for(@account), rel: :me)
%button{ type: :button }= t('generic.copy')
%p.lead= t('verification.extra_instructions_html')
@@ -31,32 +31,41 @@
= material_symbol 'check', class: 'verified-badge__mark'
%span= field.value
-= simple_form_for @account, url: settings_verification_path, html: { method: :put, class: 'form-section' } do |f|
+= simple_form_for @account, url: settings_verification_path, html: { class: 'form-section' } do |f|
= render 'shared/error_messages', object: @account
%h3= t('author_attribution.title')
%p.lead= t('author_attribution.hint_html')
- .fields-row
- .fields-row__column.fields-row__column-6
- .fields-group
- = f.input :attribution_domains_as_text, as: :text, wrapper: :with_block_label, input_html: { placeholder: "example1.com\nexample2.com\nexample3.com", rows: 4 }
- .fields-row__column.fields-row__column-6
- .fields-group.fade-out-top
- %div
- .status-card.expanded.bottomless
- .status-card__image
- = image_tag frontend_asset_url('images/preview.png'), alt: '', class: 'status-card__image-image'
- .status-card__content
- %span.status-card__host
- %span= t('author_attribution.s_blog', name: @account.username)
- ·
- %time.time-ago{ datetime: 1.year.ago.to_date.iso8601 }
- %strong.status-card__title= t('author_attribution.example_title')
- .more-from-author
- = logo_as_symbol(:icon)
- = t('author_attribution.more_from_html', name: link_to(root_url, class: 'story__details__shared__author-link') { image_tag(@account.avatar.url, class: 'account__avatar', width: 16, height: 16, alt: '') + content_tag(:bdi, display_name(@account)) })
+ .fields-group.fade-out-top
+ %div
+ .status-card.expanded.bottomless
+ .status-card__image
+ = image_tag frontend_asset_url('images/preview.png'), alt: '', class: 'status-card__image-image'
+ .status-card__content
+ %span.status-card__host
+ %span= t('author_attribution.s_blog', name: display_name(@account))
+ ·
+ %time.time-ago{ datetime: 1.year.ago.to_date.iso8601 }
+ %strong.status-card__title= t('author_attribution.example_title')
+ .more-from-author
+ = logo_as_symbol(:icon)
+ = t('author_attribution.more_from_html', name: link_to(root_url, class: 'story__details__shared__author-link') { image_tag(@account.avatar.url, class: 'account__avatar', width: 16, height: 16, alt: '') + tag.bdi(display_name(@account)) })
+
+ %h4= t('verification.here_is_how')
+
+ %p.lead= t('author_attribution.instructions')
+
+ .input-copy.lead
+ .input-copy__wrapper
+ = copyable_input value: tag.meta(name: 'fediverse:creator', content: "@#{@account.local_username_and_domain}")
+ %button{ type: :button }= t('generic.copy')
+
+ %p.lead= t('author_attribution.then_instructions')
+
+ .fields-group
+ = f.input :attribution_domains_as_text, as: :text, wrapper: :with_block_label, input_html: { placeholder: "example1.com\nexample2.com\nexample3.com", rows: 4, autocapitalize: 'none', autocorrect: 'off' }
.actions
= f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/severed_relationships/index.html.haml b/app/views/severed_relationships/index.html.haml
index 7c599e9c0e..cc9439b468 100644
--- a/app/views/severed_relationships/index.html.haml
+++ b/app/views/severed_relationships/index.html.haml
@@ -15,7 +15,9 @@
%tbody
- @events.each do |event|
%tr
- %td= l event.created_at
+ %td
+ %time.formatted{ datetime: event.created_at.iso8601, title: l(event.created_at) }
+ = l(event.created_at)
%td= t("severed_relationships.event_type.#{event.type}", target_name: event.target_name)
- if event.purged?
%td{ rowspan: 2 }= t('severed_relationships.purged')
diff --git a/app/views/statuses/show.html.haml b/app/views/statuses/show.html.haml
index f9dc1712cf..7751337cb0 100644
--- a/app/views/statuses/show.html.haml
+++ b/app/views/statuses/show.html.haml
@@ -1,5 +1,4 @@
-- content_for :page_title do
- = t('statuses.title', name: display_name(@account), quote: truncate(@status.spoiler_text.presence || @status.text, length: 50, omission: '…', escape: false))
+- content_for :page_title, t('statuses.title', name: display_name(@account), quote: truncate(@status.spoiler_text.presence || @status.text, length: 50, omission: '…', escape: false))
- content_for :header_tags do
- if @account.noindex?
diff --git a/app/views/user_mailer/welcome.text.erb b/app/views/user_mailer/welcome.text.erb
index d9da2997da..144d44b842 100644
--- a/app/views/user_mailer/welcome.text.erb
+++ b/app/views/user_mailer/welcome.text.erb
@@ -53,7 +53,7 @@
<%= t('user_mailer.welcome.hashtags_subtitle') %>
<%- @tags.each do |tag| %>
-* #<%= tag.display_name %> · <%= t('user_mailer.welcome.hashtags_recent_count', people: number_with_delimiter(tag.history.aggregate(2.days.ago.to_date..Time.zone.today).accounts)) %>
+* #<%= tag.display_name %> · <%= recent_tag_usage(tag) %>
<%= tag_url(tag) %>
<%- end %>
diff --git a/app/workers/activitypub/delivery_worker.rb b/app/workers/activitypub/delivery_worker.rb
index 0c6ca026bb..7a1440ed15 100644
--- a/app/workers/activitypub/delivery_worker.rb
+++ b/app/workers/activitypub/delivery_worker.rb
@@ -62,7 +62,7 @@ class ActivityPub::DeliveryWorker
stoplight_wrapper.run do
request_pool.with(@host) do |http_client|
build_request(http_client).perform do |response|
- raise Mastodon::UnexpectedResponseError, response unless response_successful?(response) || response_error_unsalvageable?(response)
+ raise Mastodon::UnexpectedResponseError, response unless response_successful?(response) || response_error_unsalvageable?(response) || unsalvageable_authorization_failure?(response)
@performed = true
end
@@ -70,6 +70,10 @@ class ActivityPub::DeliveryWorker
end
end
+ def unsalvageable_authorization_failure?(response)
+ @source_account.permanently_unavailable? && response.code == 401
+ end
+
def stoplight_wrapper
Stoplight(@inbox_url)
.with_threshold(STOPLIGHT_FAILURE_THRESHOLD)
diff --git a/app/workers/activitypub/update_distribution_worker.rb b/app/workers/activitypub/update_distribution_worker.rb
index a04ac621f3..9a418f0f3d 100644
--- a/app/workers/activitypub/update_distribution_worker.rb
+++ b/app/workers/activitypub/update_distribution_worker.rb
@@ -1,6 +1,8 @@
# frozen_string_literal: true
class ActivityPub::UpdateDistributionWorker < ActivityPub::RawDistributionWorker
+ DEBOUNCE_DELAY = 5.seconds
+
sidekiq_options queue: 'push', lock: :until_executed, lock_ttl: 1.day.to_i
# Distribute an profile update to servers that might have a copy
diff --git a/app/workers/feed_insert_worker.rb b/app/workers/feed_insert_worker.rb
index e6daee1617..b28afb99a7 100644
--- a/app/workers/feed_insert_worker.rb
+++ b/app/workers/feed_insert_worker.rb
@@ -28,7 +28,7 @@ class FeedInsertWorker
check_and_insert
end
- perform_notify_for_list if !feed_filtered? && notify_for_list?
+ perform_notify_for_list if !feed_filter && notify_for_list?
rescue ActiveRecord::RecordNotFound
true
end
@@ -36,27 +36,31 @@ class FeedInsertWorker
private
def check_and_insert
- if feed_filtered?
+ filter_result = feed_filter
+
+ if filter_result
perform_unpush if update?
else
perform_push
- perform_notify if notify?
end
+
+ perform_notify if notify?(filter_result)
end
- def feed_filtered?
+ def feed_filter
case @type
when :home, :antenna
- FeedManager.instance.filter?(:home, @status, @follower)
+ FeedManager.instance.filter(:home, @status, @follower)
when :tags
- FeedManager.instance.filter?(:tags, @status, @follower)
+ FeedManager.instance.filter(:tags, @status, @follower)
when :list
- FeedManager.instance.filter?(:list, @status, @list, stl_home: stl_home?)
+ FeedManager.instance.filter(:list, @status, @list, stl_home: stl_home?)
end
end
- def notify?
- return false if @type != :home || @status.reblog? || (@status.reply? && @status.in_reply_to_account_id != @status.account_id)
+ def notify?(filter_result)
+ return false if @type != :home || @status.reblog? || (@status.reply? && @status.in_reply_to_account_id != @status.account_id) ||
+ filter_result == :filter
Follow.find_by(account: @follower, target_account: @status.account)&.notify?
end
diff --git a/app/workers/filtered_notification_cleanup_worker.rb b/app/workers/filtered_notification_cleanup_worker.rb
index 2b955da3c0..87ff6a9eb5 100644
--- a/app/workers/filtered_notification_cleanup_worker.rb
+++ b/app/workers/filtered_notification_cleanup_worker.rb
@@ -4,6 +4,6 @@ class FilteredNotificationCleanupWorker
include Sidekiq::Worker
def perform(account_id, from_account_id)
- Notification.where(account_id: account_id, from_account_id: from_account_id, filtered: true).reorder(nil).in_batches(order: :desc).delete_all
+ Notification.where(account_id: account_id, from_account_id: from_account_id, filtered: true).in_batches(order: :desc).delete_all
end
end
diff --git a/app/workers/mention_resolve_worker.rb b/app/workers/mention_resolve_worker.rb
new file mode 100644
index 0000000000..8c5938aeaf
--- /dev/null
+++ b/app/workers/mention_resolve_worker.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+class MentionResolveWorker
+ include Sidekiq::Worker
+ include ExponentialBackoff
+ include JsonLdHelper
+
+ sidekiq_options queue: 'pull', retry: 7
+
+ def perform(status_id, uri, options = {})
+ status = Status.find_by(id: status_id)
+ return if status.nil?
+
+ account = account_from_uri(uri)
+ account = ActivityPub::FetchRemoteAccountService.new.call(uri, request_id: options[:request_id]) if account.nil?
+
+ return if account.nil?
+
+ status.mentions.upsert({ account_id: account.id, silent: false }, unique_by: %w(status_id account_id))
+ rescue ActiveRecord::RecordNotFound
+ # Do nothing
+ rescue Mastodon::UnexpectedResponseError => e
+ response = e.response
+
+ if response_error_unsalvageable?(response)
+ # Give up
+ else
+ raise e
+ end
+ end
+
+ private
+
+ def account_from_uri(uri)
+ ActivityPub::TagManager.instance.uri_to_resource(uri, Account)
+ end
+end
diff --git a/app/workers/scheduler/user_cleanup_scheduler.rb b/app/workers/scheduler/user_cleanup_scheduler.rb
index 9f58d9225b..03544e2e98 100644
--- a/app/workers/scheduler/user_cleanup_scheduler.rb
+++ b/app/workers/scheduler/user_cleanup_scheduler.rb
@@ -16,9 +16,10 @@ class Scheduler::UserCleanupScheduler
private
def clean_unconfirmed_accounts!
- User.unconfirmed.where(confirmation_sent_at: ..UNCONFIRMED_ACCOUNTS_MAX_AGE_DAYS.days.ago).reorder(nil).find_in_batches do |batch|
+ User.unconfirmed.where(confirmation_sent_at: ..UNCONFIRMED_ACCOUNTS_MAX_AGE_DAYS.days.ago).find_in_batches do |batch|
# We have to do it separately because of missing database constraints
AccountModerationNote.where(target_account_id: batch.map(&:account_id)).delete_all
+ WebauthnCredential.where(user_id: batch.map(&:id)).delete_all
Account.where(id: batch.map(&:account_id)).delete_all
User.where(id: batch.map(&:id)).delete_all
end
diff --git a/app/workers/web/push_notification_worker.rb b/app/workers/web/push_notification_worker.rb
index 7e9691aaba..e771928ef3 100644
--- a/app/workers/web/push_notification_worker.rb
+++ b/app/workers/web/push_notification_worker.rb
@@ -16,10 +16,10 @@ class Web::PushNotificationWorker
# in the meantime, so we have to double-check before proceeding
return unless @notification.activity.present? && @subscription.pushable?(@notification)
- payload = @subscription.encrypt(push_notification_json)
+ payload = web_push_request.encrypt(push_notification_json)
- request_pool.with(@subscription.audience) do |http_client|
- request = Request.new(:post, @subscription.endpoint, body: payload.fetch(:ciphertext), http_client: http_client)
+ request_pool.with(web_push_request.audience) do |http_client|
+ request = Request.new(:post, web_push_request.endpoint, body: payload.fetch(:ciphertext), http_client: http_client)
request.add_headers(
'Content-Type' => 'application/octet-stream',
@@ -27,8 +27,8 @@ class Web::PushNotificationWorker
'Urgency' => URGENCY,
'Content-Encoding' => 'aesgcm',
'Encryption' => "salt=#{Webpush.encode64(payload.fetch(:salt)).delete('=')}",
- 'Crypto-Key' => "dh=#{Webpush.encode64(payload.fetch(:server_public_key)).delete('=')};#{@subscription.crypto_key_header}",
- 'Authorization' => @subscription.authorization_header
+ 'Crypto-Key' => "dh=#{Webpush.encode64(payload.fetch(:server_public_key)).delete('=')};#{web_push_request.crypto_key_header}",
+ 'Authorization' => web_push_request.authorization_header
)
request.perform do |response|
@@ -50,17 +50,23 @@ class Web::PushNotificationWorker
private
- def push_notification_json
- json = I18n.with_locale(@subscription.locale.presence || I18n.default_locale) do
- ActiveModelSerializers::SerializableResource.new(
- @notification,
- serializer: Web::NotificationSerializer,
- scope: @subscription,
- scope_name: :current_push_subscription
- ).as_json
- end
+ def web_push_request
+ @web_push_request || WebPushRequest.new(@subscription)
+ end
- Oj.dump(json)
+ def push_notification_json
+ I18n.with_locale(@subscription.locale.presence || I18n.default_locale) do
+ Oj.dump(serialized_notification.as_json)
+ end
+ end
+
+ def serialized_notification
+ ActiveModelSerializers::SerializableResource.new(
+ @notification,
+ serializer: Web::NotificationSerializer,
+ scope: @subscription,
+ scope_name: :current_push_subscription
+ )
end
def request_pool
diff --git a/config/initializers/active_record_encryption.rb b/config/initializers/active_record_encryption.rb
index b7a874e404..9ae28e401b 100644
--- a/config/initializers/active_record_encryption.rb
+++ b/config/initializers/active_record_encryption.rb
@@ -10,7 +10,9 @@
ENV[key] = SecureRandom.hex(64)
end
- value = ENV.fetch(key) do
+ value = ENV.fetch(key, '')
+
+ if value.blank?
abort <<~MESSAGE
Mastodon now requires that these variables are set:
@@ -20,6 +22,7 @@
- ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY
Run `bin/rails db:encryption:init` to generate new secrets and then assign the environment variables.
+ Do not change the secrets once they are set, as doing so may cause data loss and other issues that will be difficult or impossible to recover from.
MESSAGE
end
diff --git a/config/initializers/deprecations.rb b/config/initializers/deprecations.rb
new file mode 100644
index 0000000000..e0ad54d8c3
--- /dev/null
+++ b/config/initializers/deprecations.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+if ENV['REDIS_NAMESPACE']
+ es_configured = ENV['ES_ENABLED'] == 'true' || ENV.fetch('ES_HOST', 'localhost') != 'localhost' || ENV.fetch('ES_PORT', '9200') != '9200' || ENV.fetch('ES_PASS', 'password') != 'password'
+
+ warn <<~MESSAGE
+ WARNING: the REDIS_NAMESPACE environment variable is deprecated and will be removed in Mastodon 4.4.0.
+
+ Please see documentation at https://github.com/mastodon/redis_namespace_migration
+ MESSAGE
+
+ warn <<~MESSAGE if es_configured && !ENV['ES_PREFIX']
+
+ In addition, as REDIS_NAMESPACE is being used as a prefix for Elasticsearch, please do not forget to set ES_PREFIX to "#{ENV.fetch('REDIS_NAMESPACE')}".
+ MESSAGE
+end
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index b4eaab1daa..f558ee5fe0 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -122,7 +122,7 @@ class Rack::Attack
end
throttle('throttle_email_confirmations/ip', limit: 25, period: 5.minutes) do |req|
- req.throttleable_remote_ip if req.post? && (req.path_matches?('/auth/confirmation') || req.path == '/api/v1/emails/confirmations')
+ req.throttleable_remote_ip if (req.post? && (req.path_matches?('/auth/confirmation') || req.path == '/api/v1/emails/confirmations')) || ((req.put? || req.patch?) && req.path_matches?('/auth/setup'))
end
throttle('throttle_email_confirmations/email', limit: 5, period: 30.minutes) do |req|
@@ -133,6 +133,14 @@ class Rack::Attack
end
end
+ throttle('throttle_auth_setup/email', limit: 5, period: 10.minutes) do |req|
+ req.params.dig('user', 'email').presence if (req.put? || req.patch?) && req.path_matches?('/auth/setup')
+ end
+
+ throttle('throttle_auth_setup/account', limit: 5, period: 10.minutes) do |req|
+ req.warden_user_id if (req.put? || req.patch?) && req.path_matches?('/auth/setup')
+ end
+
throttle('throttle_login_attempts/ip', limit: 25, period: 5.minutes) do |req|
req.throttleable_remote_ip if req.post? && req.path_matches?('/auth/sign_in')
end
diff --git a/config/locales/activerecord.ar.yml b/config/locales/activerecord.ar.yml
index cacbf0714f..7426e21e21 100644
--- a/config/locales/activerecord.ar.yml
+++ b/config/locales/activerecord.ar.yml
@@ -15,6 +15,9 @@ ar:
user/invite_request:
text: الغرض
errors:
+ attributes:
+ domain:
+ invalid: ليس بإسم نطاق صالح
models:
account:
attributes:
diff --git a/config/locales/activerecord.az.yml b/config/locales/activerecord.az.yml
new file mode 100644
index 0000000000..e9ba86bc79
--- /dev/null
+++ b/config/locales/activerecord.az.yml
@@ -0,0 +1 @@
+az:
diff --git a/config/locales/activerecord.cs.yml b/config/locales/activerecord.cs.yml
index 6f4fe86e3f..fa551e0f6e 100644
--- a/config/locales/activerecord.cs.yml
+++ b/config/locales/activerecord.cs.yml
@@ -15,6 +15,12 @@ cs:
user/invite_request:
text: Důvod
errors:
+ attributes:
+ domain:
+ invalid: není platný název domény
+ messages:
+ invalid_domain_on_line: "%{value} není platný název domény"
+ too_many_lines: překročil limit %{limit} řádků
models:
account:
attributes:
diff --git a/config/locales/activerecord.cy.yml b/config/locales/activerecord.cy.yml
index 0ad257db50..0337bc4f1e 100644
--- a/config/locales/activerecord.cy.yml
+++ b/config/locales/activerecord.cy.yml
@@ -3,7 +3,7 @@ cy:
activerecord:
attributes:
poll:
- expires_at: Terfyn amser
+ expires_at: Dyddiad cau
options: Dewisiadau
user:
agreement: Cytundeb gwasanaeth
@@ -53,7 +53,7 @@ cy:
user_role:
attributes:
permissions_as_keys:
- dangerous: yn cynnwys caniatâd nad ydynt yn ddiogel ar gyfer rôl sail
+ dangerous: yn cynnwys caniatâd nad ydyn nhw'n ddiogel ar gyfer rôl sail
elevated: yn methu a chynnwys caniatâd nad yw eich rôl cyfredol yn ei gynnwys
own_role: nid oes modd ei newid gyda'ch rôl cyfredol
position:
@@ -62,4 +62,4 @@ cy:
webhook:
attributes:
events:
- invalid_permissions: ni ellir cynnwys digwyddiadau nad oes gennych yr hawl iddynt
+ invalid_permissions: nid oes modd cynnwys digwyddiadau nad oes gennych yr hawl iddyn nhw
diff --git a/config/locales/activerecord.eo.yml b/config/locales/activerecord.eo.yml
index f99f726e23..45149cd117 100644
--- a/config/locales/activerecord.eo.yml
+++ b/config/locales/activerecord.eo.yml
@@ -25,7 +25,7 @@ eo:
account:
attributes:
username:
- invalid: nur literoj, ciferoj kaj substrekoj
+ invalid: devas enhavi nur literojn, ciferojn kaj substrekojn
reserved: rezervita
admin/webhook:
attributes:
diff --git a/config/locales/activerecord.es-MX.yml b/config/locales/activerecord.es-MX.yml
index 4d2cba3a27..999ac6859a 100644
--- a/config/locales/activerecord.es-MX.yml
+++ b/config/locales/activerecord.es-MX.yml
@@ -42,7 +42,7 @@ es-MX:
status:
attributes:
reblog:
- taken: del estado ya existe
+ taken: de la publicación ya existe
user:
attributes:
email:
diff --git a/config/locales/activerecord.eu.yml b/config/locales/activerecord.eu.yml
index a67c1403c5..e335196da9 100644
--- a/config/locales/activerecord.eu.yml
+++ b/config/locales/activerecord.eu.yml
@@ -15,6 +15,12 @@ eu:
user/invite_request:
text: Arrazoia
errors:
+ attributes:
+ domain:
+ invalid: ez da domeinu izen baliogarria
+ messages:
+ invalid_domain_on_line: "%{value} ez da domeinu izen baliogarria"
+ too_many_lines: "%{limit} lerroko muga gainditzen du"
models:
account:
attributes:
diff --git a/config/locales/activerecord.fa.yml b/config/locales/activerecord.fa.yml
index 3d1e8012bf..81e54ed3a9 100644
--- a/config/locales/activerecord.fa.yml
+++ b/config/locales/activerecord.fa.yml
@@ -15,6 +15,12 @@ fa:
user/invite_request:
text: دلیل
errors:
+ attributes:
+ domain:
+ invalid: نام دامنهٔ معتبری نیست
+ messages:
+ invalid_domain_on_line: "%{value} نام دامنهٔ معتبری نیست"
+ too_many_lines: بیش از کران %{limit} خط است
models:
account:
attributes:
diff --git a/config/locales/activerecord.fy.yml b/config/locales/activerecord.fy.yml
index b571ab60dc..69139eba1d 100644
--- a/config/locales/activerecord.fy.yml
+++ b/config/locales/activerecord.fy.yml
@@ -15,6 +15,12 @@ fy:
user/invite_request:
text: Reden
errors:
+ attributes:
+ domain:
+ invalid: is in ûnjildige domeinnamme
+ messages:
+ invalid_domain_on_line: "%{value} is in ûnjildige domeinnamme"
+ too_many_lines: giet oer de limyt fan %{limit} rigels
models:
account:
attributes:
diff --git a/config/locales/activerecord.gl.yml b/config/locales/activerecord.gl.yml
index 961c96edb4..11cae19c61 100644
--- a/config/locales/activerecord.gl.yml
+++ b/config/locales/activerecord.gl.yml
@@ -7,7 +7,7 @@ gl:
options: Opcións
user:
agreement: Acordo do Servizo
- email: Enderezo de email
+ email: Enderezo de correo
locale: Locale
password: Contrasinal
user/account:
diff --git a/config/locales/activerecord.ia.yml b/config/locales/activerecord.ia.yml
index bccfb96602..809b8fd582 100644
--- a/config/locales/activerecord.ia.yml
+++ b/config/locales/activerecord.ia.yml
@@ -20,6 +20,7 @@ ia:
invalid: non es un nomine de dominio valide
messages:
invalid_domain_on_line: "%{value} non es un nomine de dominio valide"
+ too_many_lines: il es ultra le limite de %{limit} lineas
models:
account:
attributes:
diff --git a/config/locales/activerecord.ja.yml b/config/locales/activerecord.ja.yml
index 468df9b12b..21be8aa345 100644
--- a/config/locales/activerecord.ja.yml
+++ b/config/locales/activerecord.ja.yml
@@ -15,6 +15,12 @@ ja:
user/invite_request:
text: 理由
errors:
+ attributes:
+ domain:
+ invalid: 有効なドメイン名ではありません
+ messages:
+ invalid_domain_on_line: "%{value} は有効なドメイン名ではありません"
+ too_many_lines: "%{limit} 行の制限を超えています。"
models:
account:
attributes:
diff --git a/config/locales/activerecord.lad.yml b/config/locales/activerecord.lad.yml
index 31e0223cca..8fd23b53fe 100644
--- a/config/locales/activerecord.lad.yml
+++ b/config/locales/activerecord.lad.yml
@@ -15,6 +15,11 @@ lad:
user/invite_request:
text: Razon
errors:
+ attributes:
+ domain:
+ invalid: no es un nombre de domeno valido
+ messages:
+ invalid_domain_on_line: "%{value} no es un nombre de domeno valido"
models:
account:
attributes:
diff --git a/config/locales/activerecord.ml.yml b/config/locales/activerecord.ml.yml
index 8b20ee34b3..90c5b38ad5 100644
--- a/config/locales/activerecord.ml.yml
+++ b/config/locales/activerecord.ml.yml
@@ -4,23 +4,37 @@ ml:
attributes:
poll:
expires_at: സമയപരിധി
- options: ചോയ്സുകൾ
+ options: തിരഞ്ഞെടുപ്പുകൾ
user:
agreement: സേവന ഉടമ്പടി
email: ഇ-മെയിൽ വിലാസം
locale: ഭാഷ
- password: രഹസ്യവാചകം
+ password: രഹസ്യവാക്കു്
user/account:
username: ഉപയോക്തൃനാമം
user/invite_request:
text: കാരണം
errors:
+ attributes:
+ domain:
+ invalid: ഇതൊരു തെറ്റിയ മേഖലപേരാണു്
+ messages:
+ invalid_domain_on_line: "%{value} ഒരു തെറ്റിയ മേഖലപേരാണു്"
+ too_many_lines: ഇതു് %{limit} വരിയതിരിന്റെ മേലെയാണു്
models:
account:
attributes:
username:
invalid: അക്ഷരങ്ങളും, അക്കങ്ങളും, പിന്നെ അടിവരയും മാത്രം
reserved: കരുതിവച്ചു
+ admin/webhook:
+ attributes:
+ url:
+ invalid: ഇതൊരു തെറ്റിയ വിലാസമാണു്
+ doorkeeper/application:
+ attributes:
+ website:
+ invalid: ഇതൊരു തെറ്റിയ വിലാസമാണു്
status:
attributes:
reblog:
diff --git a/config/locales/activerecord.ms.yml b/config/locales/activerecord.ms.yml
index 5f282702f1..02f836b356 100644
--- a/config/locales/activerecord.ms.yml
+++ b/config/locales/activerecord.ms.yml
@@ -15,6 +15,8 @@ ms:
user/invite_request:
text: Sebab
errors:
+ messages:
+ too_many_lines: melebihi had %{limit} baris
models:
account:
attributes:
diff --git a/config/locales/activerecord.nan.yml b/config/locales/activerecord.nan.yml
new file mode 100644
index 0000000000..b1e9dc67bf
--- /dev/null
+++ b/config/locales/activerecord.nan.yml
@@ -0,0 +1,16 @@
+---
+nan:
+ activerecord:
+ attributes:
+ poll:
+ expires_at: 期限
+ options: 選項
+ user:
+ agreement: 服務協議
+ email: 電子phue地址
+ locale: 在地化
+ password: 密碼
+ user/account:
+ username: 用者ê名
+ user/invite_request:
+ text: 原因
diff --git a/config/locales/activerecord.ne.yml b/config/locales/activerecord.ne.yml
index db03c5186b..f2b7b0ef80 100644
--- a/config/locales/activerecord.ne.yml
+++ b/config/locales/activerecord.ne.yml
@@ -1 +1,31 @@
+---
ne:
+ activerecord:
+ attributes:
+ user:
+ agreement: सेवा सम्झौता
+ email: ईमेल ठेगाना
+ password: पासवर्ड
+ user/account:
+ username: प्रयोगकर्ता नाम
+ user/invite_request:
+ text: कारण
+ errors:
+ attributes:
+ domain:
+ invalid: मान्य डोमेन नाम होइन
+ messages:
+ invalid_domain_on_line: "%{value} मान्य डोमेन नाम होइन"
+ models:
+ account:
+ attributes:
+ username:
+ invalid: अक्षर, संख्या र अन्डरस्कोर मात्र हुनु पर्छ
+ admin/webhook:
+ attributes:
+ url:
+ invalid: मान्य URL होइन
+ doorkeeper/application:
+ attributes:
+ website:
+ invalid: मान्य URL होइन
diff --git a/config/locales/activerecord.no.yml b/config/locales/activerecord.no.yml
index 5abe3fdc38..b79a5bcccb 100644
--- a/config/locales/activerecord.no.yml
+++ b/config/locales/activerecord.no.yml
@@ -15,6 +15,9 @@
user/invite_request:
text: Årsak
errors:
+ attributes:
+ domain:
+ invalid: er ikke et gyldig domenenavn
models:
account:
attributes:
diff --git a/config/locales/activerecord.pt-BR.yml b/config/locales/activerecord.pt-BR.yml
index 52f2b6ee87..2a36fd4905 100644
--- a/config/locales/activerecord.pt-BR.yml
+++ b/config/locales/activerecord.pt-BR.yml
@@ -49,7 +49,7 @@ pt-BR:
blocked: usa provedor de e-mail não permitido
unreachable: parece não existir
role_id:
- elevated: não pode maior que sua função atual
+ elevated: não pode ser maior que a sua função atual
user_role:
attributes:
permissions_as_keys:
diff --git a/config/locales/activerecord.pt-PT.yml b/config/locales/activerecord.pt-PT.yml
index 60f3def5d3..a06fba32c6 100644
--- a/config/locales/activerecord.pt-PT.yml
+++ b/config/locales/activerecord.pt-PT.yml
@@ -7,7 +7,7 @@ pt-PT:
options: Escolhas
user:
agreement: Contrato de prestação de serviço
- email: Endereço de correio electrónico
+ email: Endereço de e-mail
locale: Região
password: Palavra-passe
user/account:
@@ -15,11 +15,17 @@ pt-PT:
user/invite_request:
text: Motivo
errors:
+ attributes:
+ domain:
+ invalid: não é um nome de domínio válido
+ messages:
+ invalid_domain_on_line: "%{value} não é um nome de domínio válido"
+ too_many_lines: está acima do limite de %{limit} linhas
models:
account:
attributes:
username:
- invalid: deve conter apenas letras, números e traços inferiores
+ invalid: deve conter apenas letras, números e traços inferiores (_)
reserved: está reservado
admin/webhook:
attributes:
diff --git a/config/locales/activerecord.ru.yml b/config/locales/activerecord.ru.yml
index 203d8e2c34..b62bf45fc7 100644
--- a/config/locales/activerecord.ru.yml
+++ b/config/locales/activerecord.ru.yml
@@ -3,7 +3,7 @@ ru:
activerecord:
attributes:
poll:
- expires_at: Крайний срок
+ expires_at: Срок окончания голосования
options: Варианты
user:
agreement: Соглашение с условиями сервиса
diff --git a/config/locales/activerecord.sl.yml b/config/locales/activerecord.sl.yml
index 941b847090..299a936714 100644
--- a/config/locales/activerecord.sl.yml
+++ b/config/locales/activerecord.sl.yml
@@ -15,6 +15,12 @@ sl:
user/invite_request:
text: Razlog
errors:
+ attributes:
+ domain:
+ invalid: ni veljavno ime domene
+ messages:
+ invalid_domain_on_line: "%{value} ni veljavno ime domene"
+ too_many_lines: presega omejitev %{limit} vrstic
models:
account:
attributes:
diff --git a/config/locales/activerecord.tok.yml b/config/locales/activerecord.tok.yml
index 9862a7f953..14a0d3da08 100644
--- a/config/locales/activerecord.tok.yml
+++ b/config/locales/activerecord.tok.yml
@@ -4,11 +4,62 @@ tok:
attributes:
poll:
expires_at: pini tenpo
+ options: wile
+ user:
+ agreement: nasin lawa
+ email: nimi ilo pi pana lipu
+ locale: toki
+ password: nimi len sijelo
user/account:
username: nimi jan
+ user/invite_request:
+ text: tan
errors:
+ attributes:
+ domain:
+ invalid: li nimi ilo ike
+ messages:
+ invalid_domain_on_line: nimi "%{value}" li nimi ilo ike
+ too_many_lines: la %{limit} o mute nanpa wan pi linja sitelen
models:
account:
attributes:
username:
- reserved: jan ante li jo e nimi ni
+ invalid: 'la ni taso li ken lon: sitelen nimi, en sitelen nanpa, en sitelen pi linja anpa'
+ reserved: la jan ante li jo e nimi ni
+ admin/webhook:
+ attributes:
+ url:
+ invalid: li nimi ike pi lipu ilo
+ doorkeeper/application:
+ attributes:
+ website:
+ invalid: li nimi ike pi lipu ilo
+ import:
+ attributes:
+ data:
+ malformed: li nasin ike
+ status:
+ attributes:
+ reblog:
+ taken: pi toki ni li lon
+ user:
+ attributes:
+ email:
+ blocked: la kulupu ni pi nimi ilo li ike
+ unreachable: li lon ala tawa mi
+ role_id:
+ elevated: o anpa sina
+ user_role:
+ attributes:
+ permissions_as_keys:
+ dangerous: la jan pi wawa ala o jo ala e ken pi mute ni
+ elevated: la sina jo ala e ken la ken ni o lon ala
+ own_role: la sina wawa lili la sina ken ala ante e ona
+ position:
+ elevated: o anpa sina
+ own_role: la sina wawa lili la sina ken ala ante e ona
+ webhook:
+ attributes:
+ events:
+ invalid_permissions: la sina ken ala lon tenpo namako la tenpo ni li ken ala lon
diff --git a/config/locales/activerecord.tt.yml b/config/locales/activerecord.tt.yml
index e53c2341e4..8c69a7e1b6 100644
--- a/config/locales/activerecord.tt.yml
+++ b/config/locales/activerecord.tt.yml
@@ -5,10 +5,47 @@ tt:
poll:
options: Сайлаулар
user:
- email: Почта адресы
+ email: Эл. почта адресы
locale: Тел
password: Серсүз
user/account:
username: Кулланучы исеме
user/invite_request:
text: Сәбәп
+ errors:
+ attributes:
+ domain:
+ invalid: бу домен исеме гамәлдә түгел
+ messages:
+ invalid_domain_on_line: "%{value} дөрес домен исеме түгел"
+ models:
+ account:
+ attributes:
+ username:
+ invalid: хәрефләр, цифрлар һәм ассызыклау билгеләре генә ярый
+ admin/webhook:
+ attributes:
+ url:
+ invalid: рөхсәт ителгән URL түгел
+ doorkeeper/application:
+ attributes:
+ website:
+ invalid: рөхсәт ителгән URL түгел
+ import:
+ attributes:
+ data:
+ malformed: формат дөрес түгел
+ status:
+ attributes:
+ reblog:
+ taken: язма инде бар
+ user:
+ attributes:
+ email:
+ blocked: ярамаган эл. почта провайдерын куллана
+ role_id:
+ elevated: сезнең хәзерге ролегездән югарырак була алмый
+ user_role:
+ attributes:
+ position:
+ elevated: сезнең хәзерге ролегездән югарырак була алмый
diff --git a/config/locales/activerecord.zh-CN.yml b/config/locales/activerecord.zh-CN.yml
index a4edf294a3..476947ea4d 100644
--- a/config/locales/activerecord.zh-CN.yml
+++ b/config/locales/activerecord.zh-CN.yml
@@ -49,16 +49,16 @@ zh-CN:
blocked: 使用了被封禁的电子邮件提供商
unreachable: 似乎不存在
role_id:
- elevated: 不能高于您当前的身份
+ elevated: 不能高于你目前所处角色拥有的权限
user_role:
attributes:
permissions_as_keys:
dangerous: 包含对基本角色不安全的权限
- elevated: 不能包含您当前身份未有的权限
- own_role: 无法以您当前的身份更改
+ elevated: 不能包含你当前身份未有的权限
+ own_role: 你当前的角色无权执行此更改
position:
- elevated: 不能高于您当前的角色
- own_role: 无法以您当前的身份更改
+ elevated: 不能高于你当前的角色
+ own_role: 你当前的角色无权执行此更改
webhook:
attributes:
events:
diff --git a/config/locales/activerecord.zh-TW.yml b/config/locales/activerecord.zh-TW.yml
index 7422550660..113d881ae5 100644
--- a/config/locales/activerecord.zh-TW.yml
+++ b/config/locales/activerecord.zh-TW.yml
@@ -46,7 +46,7 @@ zh-TW:
user:
attributes:
email:
- blocked: 使用不被允許的電子郵件供應商
+ blocked: 使用不被允許的電子郵件提供商
unreachable: 該電子郵件地址似乎無法使用
role_id:
elevated: 不能高於您目前的角色
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 72c5d9d752..623ad830a3 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -9,8 +9,8 @@ ast:
last_active: última actividá
nothing_here: "¡Equí nun hai nada!"
posts:
- one: Artículu
- other: Artículos
+ one: Publicación
+ other: Publicaciones
posts_tab_heading: Artículos
admin:
account_actions:
@@ -76,7 +76,7 @@ ast:
destroy_announcement_html: "%{name} desanició l'anunciu «%{target}»"
destroy_custom_emoji_html: "%{name} desanició'l fustaxe %{target}"
destroy_domain_block_html: "%{name} desbloquió'l dominiu %{target}"
- destroy_status_html: "%{name} quitó l'artículu de: %{target}"
+ destroy_status_html: "%{name} quitó la publicación de: %{target}"
destroy_user_role_html: "%{name} desanició'l rol %{target}"
disable_custom_emoji_html: "%{name} desactivó'l fustaxe «%{target}»"
enable_custom_emoji_html: "%{name} activó'l fustaxe «%{target}»"
@@ -87,7 +87,7 @@ ast:
unblock_email_account_html: "%{name} desbloquió la direición de corréu electrónicu de: %{target}"
update_announcement_html: "%{name} anovó l'anunciu «%{target}»"
update_custom_emoji_html: "%{name} anovó'l fustaxe «%{target}»"
- update_status_html: "%{name} anovó l'artículu de: %{target}"
+ update_status_html: "%{name} anovó la publicación de: %{target}"
update_user_role_html: "%{name} camudó'l rol %{target}"
empty: Nun s'atopó nengún rexistru.
announcements:
@@ -100,7 +100,7 @@ ast:
create: Crear l'anunciu
title: Anunciu nuevu
publish: Espublizar
- published_msg: "¡L'anunciu espublizóse correutamente!"
+ published_msg: "¡L'anunciu publicóse correutamente!"
scheduled_msg: "¡Programóse l'espublizamientu del anunciu!"
title: Anuncios
unpublish: Dexar d'espublizar
@@ -347,14 +347,14 @@ ast:
back_to_account: Volver a la páxina de la cuenta
language: Llingua
metadata: Metadatos
- original_status: Artículu orixinal
+ original_status: Publicación orixinal
visibility: Visibilidá
with_media: Con elementos multimedia
strikes:
actions:
- delete_statuses: "%{name} desanició l'artículu de: %{target}"
+ delete_statuses: "%{name} desanició la publicación de: %{target}"
disable: "%{name} conxeló la cuenta de: %{target}"
- mark_statuses_as_sensitive: "%{name} marcó l'artículu de %{target} como sensible"
+ mark_statuses_as_sensitive: "%{name} marcó la publicación de %{target} como sensible"
none: "%{name} unvió una alvertencia a %{target}"
sensitive: "%{name} marcó la cuenta de %{target} como sensible"
suspend: "%{name} suspendió la cuenta de: %{target}"
@@ -375,8 +375,8 @@ ast:
preview_card_providers:
title: Espublizadores
statuses:
- allow: Permitir l'artículu
- disallow: Refugar l'artículu
+ allow: Permitir la publicación
+ disallow: Refugar la publicación
title: Artículos en tendencia
tags:
current_score: 'Puntuación total: %{score}'
@@ -449,7 +449,7 @@ ast:
your_token: El pase d'accesu
auth:
delete_account: Desaniciu de la cuenta
- delete_account_html: Si quies desaniciar la cuenta, pues facelo equí. Va pidísete que confirmes l'aición.
+ delete_account_html: Si quies desaniciar la cuenta, pues facelo equí. Vamos pidite que confirmes l'aición.
description:
prefix_sign_up: "¡Rexístrate güei en Mastodon!"
didnt_get_confirmation: "¿Nun recibiesti l'enllaz de confirmación?"
@@ -460,6 +460,10 @@ ast:
migrate_account: Cambéu de cuenta
migrate_account_html: Si quies redirixir esta cuenta a otra diferente, pues configurar esta opción equí.
privacy_policy_agreement_html: Lleí y acepto la política de privacidá
+ progress:
+ confirm: Confirmación del corréu electrónicu
+ details: Los tos detalles
+ rules: Aceptación de normes
providers:
cas: CAS
saml: SAML
@@ -471,6 +475,8 @@ ast:
security: Seguranza
setup:
link_not_received: "¿Nun consiguiesti l'enllaz?"
+ sign_in:
+ preamble_html: Anicia la sesión coles credenciales del dominiu %{domain}. Si la to cuenta ta agospiada n'otru sirvidor, nun vas ser a aniciar la sesión equí.
sign_up:
preamble: Con una cuenta nesti sirvidor de Mastodon vas ser a siguir a cualesquier perfil de la rede, independientemente del sirvidor onde s'agospie la so cuenta.
title: 'Creación d''una cuenta en: %{domain}.'
@@ -517,8 +523,8 @@ ast:
created_at: Data
recipient: Dirixóse a
reject_appeal: Refugar l'apellación
- status: 'Artículu #%{id}'
- status_removed: L'artículu yá se quitó del sistema
+ status: 'Publicación #%{id}'
+ status_removed: La publicación yá se quitó del sistema
your_appeal_approved: Aprobóse la to apellación
your_appeal_pending: Unviesti una apellación
your_appeal_rejected: Refugóse la to apellación
@@ -574,8 +580,8 @@ ast:
one: "%{count} pallabra clave"
other: "%{count} pallabres claves"
statuses:
- one: "%{count} artículu"
- other: "%{count} artículos"
+ one: "%{count} publicación"
+ other: "%{count} publicaciones"
title: Peñeres
new:
title: Amestar una peñera
@@ -639,12 +645,13 @@ ast:
successful_sign_in_html: Anicióse correutamente la sesión col métodu «%{method}» dende %{ip} (%{browser})
media_attachments:
validations:
- images_and_video: Nun se pue axuntar nengún videu a un artículu que yá contién imáxenes
+ images_and_video: Nun se pue axuntar nengún videu a una publicación que yá contién imáxenes
too_many: Nun se puen axuntar más de 4 ficheros
migrations:
errors:
missing_also_known_as: nun ye un nomatu d'esta cuenta
move_to_self: nun pue ser la cuenta actual
+ incoming_migrations: Migración d'otra cuenta
incoming_migrations_html: Pa migrar d'otra cuenta a esta, primero tienes de crear un nomatu de cuenta.
warning:
followers: Esta aición va mover tolos siguidores de la cuenta actual a la nueva
@@ -655,7 +662,7 @@ ast:
sign_up:
subject: "%{name} rexistróse"
favourite:
- subject: "%{name} marcó'l to artículu como favoritu"
+ subject: "%{name} marcó la to publicación como favorita"
follow:
body: "¡Agora %{name} siguete!"
subject: "%{name} ta siguiéndote"
@@ -667,10 +674,10 @@ ast:
subject: "%{name} mentóte"
title: Mención nueva
reblog:
- body: "%{name} compartió'l to artículu:"
- subject: "%{name} compartió'l to artículu"
+ body: "%{name} compartió la to publicación:"
+ subject: "%{name} compartió la to publicación"
update:
- subject: "%{name} editó un artículu"
+ subject: "%{name} editó una publicación"
notifications:
email_events_hint: 'Seleiciona los eventos de los que quies recibir avisos:'
number:
@@ -726,6 +733,7 @@ ast:
over_daily_limit: Superesti la llende de %{limit} artículos programaos pa güei
over_total_limit: Superesti la llende de %{limit} artículos programaos
sessions:
+ activity: Última actividá
browser: Restolador
browsers:
alipay: Alipay
@@ -778,6 +786,7 @@ ast:
import: Importación
import_and_export: Importación y esportación
migrate: Migración de la cuenta
+ notifications: Avisos per corréu electrónicu
preferences: Preferencies
profile: Perfil públicu
relationships: Perfiles que sigues y te siguen
@@ -797,12 +806,12 @@ ast:
other: "%{count} vídeos"
default_language: La mesma que la de la interfaz
errors:
- in_reply_not_found: L'artículu al que tentes de responder paez que nun esiste.
+ in_reply_not_found: La publicación a la que tentes de responder paez que nun esiste.
pin_errors:
direct: Nun se puen fixar los artículos que son visibles namás pa los usuarios mentaos
limit: Yá fixesti'l númberu máximu d'artículos
- ownership: Nun se pue fixar l'artículu d'otru perfil
- reblog: Nun se pue fixar un artículu compartíu
+ ownership: Nun se pue fixar la publicación d'otru perfil
+ reblog: Nun se pue fixar una publicación compartida
title: "%{name}: «%{quote}»"
visibilities:
direct: Mensaxe direutu
@@ -816,12 +825,12 @@ ast:
keep_direct: Caltener los mensaxes direutos
keep_direct_hint: Nun desanicia nengún mensaxe direutu
keep_media: Caltener los artículos con elementos multimedia
- keep_media_hint: Nun desanicia nengún artículu de to que contenta elementos multimedia
+ keep_media_hint: Nun desanicia nenguna publicación de to que contenta elementos multimedia
keep_pinned: Caltener los artículos fixaos
keep_polls: Caltener les encuestes
keep_polls_hint: Nun desanicia nenguna encuesta de to
keep_self_bookmark: Caltener los artículos que metieres en Marcadores
- keep_self_bookmark_hint: Nun desanicia nengún artículu que metieres en Marcadores
+ keep_self_bookmark_hint: Nun desanicia nenguna publicación que metieres en Marcadores
min_age:
'1209600': 2 selmanes
'15778476': 6 meses
diff --git a/config/locales/az.yml b/config/locales/az.yml
new file mode 100644
index 0000000000..e9ba86bc79
--- /dev/null
+++ b/config/locales/az.yml
@@ -0,0 +1 @@
+az:
diff --git a/config/locales/be.yml b/config/locales/be.yml
index d1d3e17679..b595e2cd3b 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -625,6 +625,7 @@ be:
suspend_description_html: Уліковы запіс і ўсё яго змесціва будзе недаступна і ў далейшым выдалены, узаемадзеянне з ім будзе немагчыма. Магчыма адмяніць на працягу 30 дзён. Закрывае ўсе скаргі на гэты ўліковы запіс.
actions_description_html: Вырашыце, якія дзеянні распачаць, каб вырашыць гэтую скаргу. Калі вы прымеце меры пакарання ў дачыненні да ўліковага запісу, пра які паведамляецца, ім будзе адпраўлена апавяшчэнне па электроннай пошце, за выключэннем выпадкаў, калі выбрана катэгорыя Спам.
actions_description_remote_html: Вырашыце як паступіць з гэтай скаргай. Гэта паўплывае толькі на тое як ваш сервер звязваецца з аддалёным уліковым запісам і апрацоўвае яго кантэнт.
+ actions_no_posts: У гэтай скаргі няма зьвязаных паведамленьняў для выдаленьня
add_to_report: Дадаць яшчэ дэталяў да скаргі
already_suspended_badges:
local: Ужо прыпынена на гэтым сэрвэры
@@ -899,6 +900,9 @@ be:
message_html: Вы не вызначылі ніякіх правілаў сервера.
sidekiq_process_check:
message_html: Не працуе працэс Sidekiq для %{value} чаргі. Калі ласка праверце вашу канфігурацыю Sidekiq
+ software_version_check:
+ action: Праверыць наяўнасьць абнаўленьняў
+ message_html: Даступна абнаўленьне Mastodon.
software_version_critical_check:
action: Прагледзець даступныя абнаўленні
message_html: Даступна крытычнае абнаўленне Mastodon, калі ласка, зрабіце абнаўленне як мага хутчэй.
@@ -925,6 +929,7 @@ be:
name: Назва
newest: Спачатку новыя
oldest: Спачатку старыя
+ open: Глядзець публічна
reset: Скінуць
review: Стан праверкі
search: Пошук
@@ -1083,7 +1088,7 @@ be:
localization:
body: Mastodon перакладаецца добраахвотнікамі.
guide_link: https://be.crowdin.com/project/mastodon/be
- guide_link_text: Кожны і кожная можа зрабіць унёсак.
+ guide_link_text: Кожны можа зрабіць унёсак.
sensitive_content: Далікатны змест
application_mailer:
notification_preferences: Змяніць налады эл. пошты
@@ -1722,6 +1727,7 @@ be:
delete: Выдаленне ўліковага запісу
development: Распрацоўка
edit_profile: Рэдагаваць профіль
+ export: Экспарт
featured_tags: Выбраныя хэштэгі
import: Імпарт
import_and_export: Імпарт і экспарт
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 00b3a41167..f84e62730a 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -21,9 +21,12 @@ bg:
one: Публикация
other: Публикации
posts_tab_heading: Публикации
+ self_follow_error: Не е позволено да следвате собствения си акаунт
admin:
account_actions:
action: Изпълняване на действие
+ already_silenced: Този акаунт вече е ограничен.
+ already_suspended: Този акаунт вече е спрян.
title: Извършване на модериращо действие за %{acct}
account_moderation_notes:
create: Оставяне на бележка
@@ -45,6 +48,7 @@ bg:
title: Промяна на имейл за %{username}
change_role:
changed_msg: Успешно променена роля!
+ edit_roles: Управление на потребителските роли
label: Промяна на ролята
no_role: Без роля
title: Промяна на ролята за %{username}
@@ -57,6 +61,7 @@ bg:
demote: Понижаване
destroyed_msg: Данните на %{username} вече са на опашка за незабавно изтриване
disable: Замразяване
+ disable_sign_in_token_auth: Изключване на удостоверяването с маркер по е-поща
disable_two_factor_authentication: Изключване на 2факт. удостов.
disabled: Замразено
display_name: Име на показ
@@ -65,6 +70,7 @@ bg:
email: Имейл
email_status: Състояние на имейл
enable: Размразяване
+ enable_sign_in_token_auth: Задействане на удостоверяването с маркер по е-поща
enabled: Включено
enabled_msg: Успешно размразяване на акаунта на %{username}
followers: Последователи
@@ -129,6 +135,7 @@ bg:
resubscribe: Абониране пак
role: Роля
search: Търсене
+ search_same_email_domain: Други потребители със същия домейн за е-поща
search_same_ip: Други потребители със същия IP
security: Сигурност
security_measures:
@@ -169,21 +176,26 @@ bg:
approve_appeal: Одобряване на обжалването
approve_user: Одобряване на потребител
assigned_to_self_report: Назначете доклад
+ change_email_user: Промяна на имейл за потребител
change_role_user: Промяна на роля за потребител
confirm_user: Потвърждаване на потребител
create_account_warning: Създаване на предупреждение
create_announcement: Създаване на оповестяване
+ create_canonical_email_block: Сътворяване на блоккиране за е-поща
create_custom_emoji: Създаване на персонализирано емоджи
create_domain_allow: Създаване на позволение за домейна
create_domain_block: Създаване на блокиране за домейна
+ create_email_domain_block: Създаване на блокиране на имейл домейн
create_ip_block: Създаване на правило за IP
create_unavailable_domain: Създаване на недостъпен домейн
create_user_role: Създаване на роля
demote_user: Понижаване на потребител
destroy_announcement: Изтриване на оповестяване
+ destroy_canonical_email_block: Изтриване на блокиране за е-поща
destroy_custom_emoji: Изтриване на персонализирано емоджи
destroy_domain_allow: Изтриване на позволението за домейн
destroy_domain_block: Изтриване на блокирането за домейна
+ destroy_email_domain_block: Изтриване на блокиране на домейн на е-поща
destroy_instance: Чистка на домейна
destroy_ip_block: Изтриване на правило за IP
destroy_status: Изтриване на публикация
@@ -191,8 +203,10 @@ bg:
destroy_user_role: Унищожаване на роля
disable_2fa_user: Изкл. на 2факт.удостов.
disable_custom_emoji: Деактивиране на персонализирано емоджи
+ disable_sign_in_token_auth_user: Изключване на удостоверяването с код по имейл за потребител
disable_user: Изключване на потребител
enable_custom_emoji: Включване на персонализирано емоджи
+ enable_sign_in_token_auth_user: Включване на аутентикацията на потребителя с имейл токен
enable_user: Активиране на потребител
memorialize_account: Възпоменаване на акаунта
promote_user: Повишаване на потребител
@@ -222,20 +236,26 @@ bg:
approve_appeal_html: "%{name} одобри обжалването на решение за модериране от %{target}"
approve_user_html: "%{name} одобри регистрирането от %{target}"
assigned_to_self_report_html: "%{name} възложи на себе си доклад %{target}"
+ change_email_user_html: "%{name} промени адреса на имейла на потребителя %{target}"
change_role_user_html: "%{name} промени ролята на %{target}"
+ confirm_user_html: "%{name} потвърди адреса на имейла на потребителя %{target}"
create_account_warning_html: "%{name} изпрати предупреждение до %{target}"
create_announcement_html: "%{name} създаде ново оповестяване %{target}"
+ create_canonical_email_block_html: "%{name} блокира имейл с хеш %{target}"
create_custom_emoji_html: "%{name} качи ново емоджи %{target}"
create_domain_allow_html: "%{name} позволи федерирането с домейн %{target}"
create_domain_block_html: "%{name} блокира домейн %{target}"
+ create_email_domain_block_html: "%{name} блокира домейн за е-поща %{target}"
create_ip_block_html: "%{name} създаде правило за IP %{target}"
create_unavailable_domain_html: "%{name} спря доставянето до домейн %{target}"
create_user_role_html: "%{name} създаде роля %{target}"
demote_user_html: "%{name} понижи потребителя %{target}"
destroy_announcement_html: "%{name} изтри оповестяване %{target}"
+ destroy_canonical_email_block_html: "%{name} отблокира имейла с хеш %{target}"
destroy_custom_emoji_html: "%{name} изтри емоджито %{target}"
destroy_domain_allow_html: "%{name} забрани федерирация с домейн %{target}"
destroy_domain_block_html: "%{name} отблокира домейн %{target}"
+ destroy_email_domain_block_html: "%{name} отблокира домейн за е-поща %{target}"
destroy_instance_html: "%{name} прочисти домейн %{target}"
destroy_ip_block_html: "%{name} изтри правило за IP %{target}"
destroy_status_html: "%{name} премахна публикация от %{target}"
@@ -243,8 +263,10 @@ bg:
destroy_user_role_html: "%{name} изтри роля %{target}"
disable_2fa_user_html: "%{name} изключи двуфакторното изискване за потребител %{target}"
disable_custom_emoji_html: "%{name} изключи емоджито %{target}"
+ disable_sign_in_token_auth_user_html: "%{name} изключва удостоверението с код по е-поща за %{target}"
disable_user_html: "%{name} изключи влизането за потребител %{target}"
enable_custom_emoji_html: "%{name} включи емоджито %{target}"
+ enable_sign_in_token_auth_user_html: "%{name} задейства удостоверението с код по е-поща за %{target}"
enable_user_html: "%{name} включи влизането за потребител %{target}"
memorialize_account_html: "%{name} превърна акаунта на %{target} във възпоменателна страница"
promote_user_html: "%{name} повиши потребителя %{target}"
@@ -252,6 +274,7 @@ bg:
reject_user_html: "%{name} отхвърли регистрирането от %{target}"
remove_avatar_user_html: "%{name} премахна аватара на %{target}"
reopen_report_html: "%{name} отвори пак доклада на %{target}"
+ resend_user_html: "%{name} изпрати пак е-писмо за потвърждение за %{target}"
reset_password_user_html: "%{name} нулира паролата на потребител %{target}"
resolve_report_html: "%{name} разреши случая с доклада от %{target}"
sensitive_account_html: "%{name} означи мултимедия на %{target} като деликатна"
@@ -412,6 +435,7 @@ bg:
attempts_over_week:
one: "%{count} опит за изминалата седмица"
other: "%{count} опита за регистрация през изминалата седмица"
+ created_msg: Успешно блокиран домейн на е-поща
delete: Изтриване
dns:
types:
@@ -420,8 +444,12 @@ bg:
new:
create: Добавяне на домейн
resolve: Преобразуване на домейна
+ title: Блокиране на нов домейн на имейл
+ no_email_domain_block_selected: Няма промяна, тъй като няма избрани блокирания на домейн на имейл
not_permitted: Няма позволение
+ resolved_dns_records_hint_html: Името на домейна се разрешава в следните MX домейни, които в крайна сметка са отговорни за приемането на е-писма. Блокирането на MX домейн блокира регистрациите от всеки имейл, използващ същия MX домейн, дори видимото име на домейна да е различно. Внимавайте и не блокирайте главните доставчици на е-поща.
resolved_through_html: Преобразувано чрез %{domain}
+ title: Блокирани домейни на имейл
export_domain_allows:
new:
title: Внасяне на позволенията на домейни
@@ -575,7 +603,9 @@ bg:
resolve_description_html: Няма да се предприеме действие срещу докладвания акаунт, няма да се записва нарушение и докладът ще се затвори.
silence_description_html: Профилът ще е видим само за последователите му или търсещите го ръчно, което драстично ограничава обсега му. Настройката може да бъде отменена по всяко време. Затваря всички доклади срещу акаунта.
suspend_description_html: Акаунтът и неговото съдържание ще бъдат недостъпни и евентуално изтрити и взаимодействието с него ще е невъзможно. Обрамотимо до 30 дни. Затваря всички доклади срещу този акаунт.
+ actions_description_html: Решете какво действие може да се предприеме, за да се отхвърли докладът. Ако предприемете наказателно действие срещу докладвания акаунт, към лицето ще се изпрати известие по имейл, освен ако не е била избрана категорията Спам.
actions_description_remote_html: Преценете с какво действие да решите този доклад. Това ще има ефекет върху това как вашият сървър комуникира с този отдалечен акаунт и се справя с неговото съдържание.
+ actions_no_posts: Този доклад няма никакви свързани публикации за изтриване
add_to_report: Добавяне на още към доклада
already_suspended_badges:
local: Вече е спряно на този сървър
@@ -639,6 +669,7 @@ bg:
delete_data_html: Изтриване на профила и съдържанието на @%{acct} за 30 дни от сега, освен ако междувременно не получи спиране
preview_preamble_html: "@%{acct} ще получи предупреждение със следното съдържание:"
record_strike_html: Запис на предупреждение против @%{acct}, за да ви помогне при изострянето на бъдещи нарушения от този акаунт
+ send_email_html: Изпращане на предупредително е-писмо на @%{acct}
warning_placeholder: Незадължителни допълнителни причини за модераторско действие.
target_origin: Произход на докладвания акаунт
title: Доклади
@@ -678,6 +709,7 @@ bg:
manage_appeals: Управление на жалбите
manage_appeals_description: Позволява на потребителите да разглеждат обжалвания срещу модераторски действия
manage_blocks: Управляване на блокиранията
+ manage_blocks_description: Позволява на потребителите да блокират доставчици на е-поща и IP адреси
manage_custom_emojis: Управляване на персонализирани емоджита
manage_custom_emojis_description: Позволява на потребителите да управляват персонализирани емоджита в сървъра
manage_federation: Управление на Федерацията
@@ -695,6 +727,7 @@ bg:
manage_taxonomies: Управление на класификации
manage_taxonomies_description: Позволяване на потребителите да преглеждат нашумяло съдържание и да обновяват настройките за хаштагове
manage_user_access: Управление на потребителския достъп
+ manage_user_access_description: Позволява потребителите да изключват за другите потребители двуфакторното удостоверяване, да променят имейл адресите и да си задават нови пароли
manage_users: Управление на потребителите
manage_users_description: Позволяване на потребителите да виждат подробностите за други потребители и да извършват модераторски действия срещу тях
manage_webhooks: Управление на уебкуките
@@ -769,6 +802,7 @@ bg:
destroyed_msg: Успешно изтриване на качването на сайта!
software_updates:
critical_update: Критично важно - обновете бързо
+ description: Препоръчва се да държите осъвременена инсталацията си на Mastodon, за да се възползвате от най-новите поправки и функции. Освен това, понякога е много важно да се осъвременява навреме Mastodon, за да се избегнат проблеми със сигурността. Заради тези причини Mastodon проверява за обновление на всеки 30 минути и ще ви извести според предпочитанията ви за известяване по имейл.
documentation_link: Научете повече
release_notes: Бележки към изданието
title: Налични обновявания
@@ -842,6 +876,9 @@ bg:
message_html: Не сте определили никакви правила на сървъра.
sidekiq_process_check:
message_html: Не работи процес Sidekiq за %{value} опашка/и. Прегледайте настройките си за Sidekiq
+ software_version_check:
+ action: Преглед на наличните обновявания
+ message_html: Налично е обновяване на Mastodon.
software_version_critical_check:
action: Преглед на наличните обновявания
message_html: Налично e критично обновяване на Mastodon. Обновете възможно най-бързо.
@@ -868,6 +905,7 @@ bg:
name: Име
newest: Най-нови
oldest: Най-стари
+ open: Преглед публично
reset: Нулиране
review: Преглед на състояние
search: Търсене
@@ -881,7 +919,10 @@ bg:
links:
allow: Позволяване на връзка
allow_provider: Позволяване на публикуващия
+ confirm_allow: Наистина ли искате да позволите избраните връзки?
confirm_allow_provider: Наистина ли искате да позволите избраните доставчици?
+ confirm_disallow: Наистина ли искате да забраните избраните връзки?
+ confirm_disallow_provider: Наистина ли искате да забраните избраните доставчици?
description_html: Това са връзки, които в момента са много пъти споделяни от акаунти, чиито публикации сървърът ви вижда. Може да помогне на потребителите ви да разберат какво се случва по света. Никоя връзка няма да се показва публично, докато не одобрите публикуващия. Може още и да одобрявате или отхвърляте отделни връзки.
disallow: Забранявам връзката
disallow_provider: Забраняване на публикуващия
@@ -905,13 +946,17 @@ bg:
statuses:
allow: Позволяване на публикацията
allow_account: Позволяване на автора
- description_html: Това са публикации, за които сървърът ви знае, че са често споделяни или харесвани в момента. Това може да помогне на вашите нови и завръщащи се потребители да открият повече хора за следване. Никоя от публикациите няма да бъде показана публично, докато не одобрите автора и докато авторът не позволи акаунтът му да бъде предлган на другите. Също така можете да позволявате или отхвърляте отделни публикации.
+ confirm_allow: Наистина ли искате да позволите избраните статуси?
+ confirm_allow_account: Наистина ли искате да позволите избраните акаунти?
+ confirm_disallow: Наистина ли искате да забраните избраните статуси?
+ confirm_disallow_account: Наистина ли искате да забраните избраните акаунти?
+ description_html: Има публикации, за които сървърът ви знае, че в момента са често споделяни или любими. Биха помогнали на вашите нови и завръщащи се потребители да открият повече хора за последване. Никоя от публикациите няма да се показва публично, докато не одобрите автора и докато авторът не позволи акаунтът му да се предлага на другите. Може също така да позволявате или отхвърляте отделни публикации.
disallow: Забраняване на публикацията
disallow_account: Забрана на автора
no_status_selected: Няма промяна, тъй като няма избрана нашумяла публикация
not_discoverable: Авторът не е избрал да е откриваем
shared_by:
- one: Споделено или харесано веднъж
+ one: Еднократно споделено или любимо
other: Споделено или харесано %{friendly_count} пъти
title: Налагащи се публикации
tags:
@@ -937,6 +982,7 @@ bg:
used_by_over_week:
one: Употребено от един човек през последната седмица
other: Използвано от %{count} души през последната седмица
+ title: Препоръки и насоки на развитие
trending: Изгряващи
warning_presets:
add_new: Добавяне на ново
@@ -1021,7 +1067,9 @@ bg:
guide_link_text: Всеки може да участва.
sensitive_content: Деликатно съдържание
application_mailer:
+ notification_preferences: Промяна на предпочитанията за е-поща
salutation: "%{name},"
+ settings: 'Промяна на предпочитанията за имейл: %{link}'
unsubscribe: Стоп на абонамента
view: 'Преглед:'
view_profile: Преглед на профила
@@ -1032,7 +1080,7 @@ bg:
logout: Излизане
regenerate_token: Регенериране на кода за достъп
token_regenerated: Успешно генериране на код за достъп
- warning: Бъдете внимателни с тези данни. Никога не ги споделяйте с никого!
+ warning: Много внимавайте с тези данни. Никога не ги споделяйте с никого!
your_token: Вашият код за достъп
auth:
apply_for_account: Заявка за акаунт
@@ -1041,6 +1089,7 @@ bg:
hint_html: Просто още едно нещо! Трябва да потвърдим, че сте човек (това е с цел предпазване на нежелани съобщения!). Разгадайте капчата долу и щракнете на "Продължаване".
title: Проверка за сигурност
confirmations:
+ awaiting_review: Вашият адрес на е-поща е потвърден! Служителите на %{domain} сега разглеждат регистрацията ви. Ще получите е-писмо, ако одобрят акаунта ви!
awaiting_review_title: Вашата регистрация се преглежда
clicking_this_link: щракване на тази връзка
login_link: влизане
@@ -1048,6 +1097,7 @@ bg:
redirect_to_app_html: Трябва да сте пренасочени към приложението %{app_name}. Ако не се случи това, то опитайте %{clicking_this_link} или ръчно се върнете към приложението.
registration_complete: Вашата регистрация на %{domain} вече завърши!
welcome_title: Добре дошли, %{name}!
+ wrong_email_hint: Ако този адрес на е-поща не е правилен, то може да го промените в настройките на акаунта.
delete_account: Изтриване на акаунта
delete_account_html: Ако желаете да изтриете акаунта си, може да сторите това тук. Ще ви се поиска потвърждение.
description:
@@ -1068,6 +1118,7 @@ bg:
or_log_in_with: Или влизане с помощта на
privacy_policy_agreement_html: Прочетох и има съгласието ми за политиката за поверителност
progress:
+ confirm: Потвърждаване на имейл
details: Вашите подробности
review: Нашият преглед
rules: Приемане на правилата
@@ -1089,8 +1140,10 @@ bg:
security: Сигурност
set_new_password: Задаване на нова парола
setup:
+ email_below_hint_html: Проверете папката си за спам или поискайте друго е-писмо. Може да поправите адреса на имейла си, ако е грешен.
email_settings_hint_html: Щракнете на връзката за потвърждаване, която ви изпратихме до %{email}. Ще ви почакаме тук.
link_not_received: Не получихте ли връзка?
+ new_confirmation_instructions_sent: До няколко минути ще получите друго е-писмо с връзка за потвърждаване!
title: Проверете входящата си поща
sign_in:
preamble_html: Влезте с идентификационните данни за %{domain}. Ако вашият акаунт е хостван на различен сървър, няма да можете да влезете в този.
@@ -1101,12 +1154,22 @@ bg:
title: Първоначални настройки за %{domain}.
status:
account_status: Състояние на акаунта
+ confirming: Чака се потвърждението на имейла да завърши.
functional: Вашият акаунт е в изправност.
+ pending: Вашето приложение чака преглед от персонала ни. Това може да отнеме време. Ще получите е-писмо, ако приложението ви се одобри.
redirecting_to: Вашият акаунт е бездеен, защото сега се пренасочва към %{acct}.
self_destruct: Затваряйки %{domain}, ще получите само ограничен достъп до акаунта си.
view_strikes: Преглед на предишните предупреждения против акаунта ви
too_fast: Образецът подаден пребързо, опитайте пак.
use_security_key: Употреба на ключ за сигурност
+ author_attribution:
+ example_title: Примерен текст
+ hint_html: Пишете ли новинарски статии или блогове извън Mastodon? Управлявайте как ви приписват авторството, когато са споделени в Mastodon.
+ instructions: 'Уверете се, че този код е в HTML на статията ви:'
+ more_from_html: Още от %{name}
+ s_blog: Блогът на %{name}
+ then_instructions: Тогава добавете име на домейна на публикацията в долното поле.
+ title: Приписване на авторството
challenge:
confirm: Продължаване
hint_html: "Съвет: няма да ви питаме пак за паролата през следващия час."
@@ -1143,6 +1206,9 @@ bg:
before: 'Прочетете внимателно тези бележки преди да продължите:'
caches: Съдържание, което може да е кеширано от други сървъри, може да се задържи
data_removal: Ваши публикации и други данни ще бъдат завинаги премахнати
+ email_change_html: Може да промените адреса на имейла си, без да изтривате акаунта си
+ email_contact_html: Ако още не сте го получили, то обърнете се за помощ към %{email}
+ email_reconfirmation_html: Ако не сте получили е-писмо за потвърждение, може да го заявите отново
irreversible: Няма да може да възстановите или да задействате пак акаунта си
more_details_html: За повече детайли прегледайте декларацията за поверителност.
username_available: Вашето потребителско име ще стане налично отново
@@ -1384,10 +1450,21 @@ bg:
unsubscribe:
action: Да, да се спре абонамента
complete: Спрян абонамент
+ confirmation_html: Наистина ли искате да спрете абонамента от получаването на %{type} за Mastodon в %{domain} към имейла си при %{email}? Може винаги пак да се абонирате от своите настройки за известяване по е-поща.
+ emails:
+ notification_emails:
+ favourite: е-писма за известия с любими
+ follow: е-писма с известия за последване
+ follow_request: е-писма със заявки за следване
+ mention: е-писма с известия за споменаване
+ reblog: е-писма с известия за подсилване
+ resubscribe_html: Ако погрешка сте спрели абонамента, то може пак да се абонирате от своите настройки за известия по е-поща.
+ success_html: Повече няма да получавате %{type} за Mastodon на %{domain} към имейла си при %{email}.
title: Спиране на абонамента
media_attachments:
validations:
images_and_video: Не мога да прикача видеоклип към публикация, която вече съдържа изображения
+ not_found: Мултимедията %{ids} не е намерена или вече е прикачена към друга публикация
not_ready: Не е възможно закачането на файлове, който все още се обработват. Опитайте отново след малко!
too_many: Не мога да прикача повече от 4 файла
migrations:
@@ -1436,8 +1513,8 @@ bg:
sign_up:
subject: "%{name} се регистрира"
favourite:
- body: 'Вашата публикация беше харесана от %{name}:'
- subject: "%{name} хареса вашата публикация"
+ body: 'Ваша публикация е любима за %{name}:'
+ subject: "%{name} означи като любима ваша публикация"
title: Нова харесана публикация
follow:
body: "%{name} те последва!"
@@ -1464,6 +1541,8 @@ bg:
update:
subject: "%{name} промени публикация"
notifications:
+ administration_emails: Известия за администратори по е-поща
+ email_events: Събития за известяване по имейл
email_events_hint: 'Изберете събития, за които искате да получавате известия:'
number:
human:
@@ -1617,10 +1696,12 @@ bg:
delete: Изтриване на акаунта
development: Разработка
edit_profile: Редактирай профила си
+ export: Изнасяне
featured_tags: Актуални хаштагове
import: Импортиране
import_and_export: Импортиране и експортиране
migrate: Миграция на акаунта
+ notifications: Известия по е-поща
preferences: Предпочитания
profile: Профил
relationships: Последвания и последователи
@@ -1695,8 +1776,8 @@ bg:
keep_polls_hint: Не изтрива запитвания
keep_self_bookmark: Запазване на публикации, добавени в отметки
keep_self_bookmark_hint: Не се изтриват ваши публикации, ако сте ги добавили към отметки
- keep_self_fav: Задържане на публикации, които сте харесали
- keep_self_fav_hint: Не се изтриват публикации, които сте харесали
+ keep_self_fav: Задържане на любимите ви публикации
+ keep_self_fav_hint: Да не се изтриват ваши публикации, ако са ви любими
min_age:
'1209600': 2 седмици
'15778476': 6 месеца
@@ -1707,7 +1788,7 @@ bg:
'63113904': 2 години
'7889238': 3 месеца
min_age_label: Възрастов праг
- min_favs: Запазване на харесани публикации поне
+ min_favs: Задържане поне на любимите публикации
min_favs_hint: Не се изтрива никоя от публикациите, които сте харесали поне толкова пъти. Оставете празно, за да изтриете публикациите независимо от броя харесвания
min_reblogs: Запазване на публикации с поне толкова раздувания
min_reblogs_hint: Не се изтриват ваши публикации, споделени поне толкова пъти. Оставете празно, за да изтриете публикациите независимо от броя на техния раздувания
@@ -1856,6 +1937,7 @@ bg:
invalid_otp_token: Невалиден код
otp_lost_help_html: Ако загубите достъп до двете, то може да се свържете с %{email}
rate_limited: Премного опити за удостоверяване. Опитайте пак по-късно.
+ seamless_external_login: Влезли сте чрез външна услуга, така че настройките за парола и имейл не са налични.
signed_in_as: 'Влезли като:'
verification:
extra_instructions_html: Съвет:Връзката в уебсайта ви може да е невидима. Важна част е [^']*)'\)/
+ file.each_line do |line|
+ match = pattern.match(line)
+ next if match.blank?
+
+ # navigation.rb only uses 400x24 icons, per material_symbol() in
+ # app/helpers/application_helper.rb
+ icons_by_weight_and_size[400] ||= {}
+ icons_by_weight_and_size[400][24] ||= Set.new
+ icons_by_weight_and_size[400][24] << match['icon']
+ end
+ end
+
icons_by_weight_and_size
end
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index b5d4861328..eac99321e7 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -8,16 +8,16 @@ namespace :mastodon do
prompt = TTY::Prompt.new
env = {}
- # When the application code gets loaded, it runs `lib/mastodon/redis_configuration.rb`.
- # This happens before application environment configuration and sets REDIS_URL etc.
- # These variables are then used even when REDIS_HOST etc. are changed, so clear them
- # out so they don't interfere with our new configuration.
- ENV.delete('REDIS_URL')
- ENV.delete('CACHE_REDIS_URL')
- ENV.delete('SIDEKIQ_REDIS_URL')
+ if ENV['LOCAL_DOMAIN']
+ prompt.warn "It looks like you already configured Mastodon for domain '#{ENV['LOCAL_DOMAIN']}'."
+ prompt.warn 'Never re-run this task on an already-configured running server.'
+ next prompt.warn 'Nothing saved. Bye!' if prompt.no?('Continue anyway?')
+ end
+
+ clear_environment!
begin
- errors = false
+ errors = []
prompt.say('Your instance is identified by its domain name. Changing it afterward will break things.')
env['LOCAL_DOMAIN'] = prompt.ask('Domain name:') do |q|
@@ -109,7 +109,7 @@ namespace :mastodon do
unless prompt.yes?('Try again?')
return prompt.warn 'Nothing saved. Bye!' unless prompt.yes?('Continue anyway?')
- errors = true
+ errors << 'Database connection could not be established.'
break
end
end
@@ -155,7 +155,7 @@ namespace :mastodon do
unless prompt.yes?('Try again?')
return prompt.warn 'Nothing saved. Bye!' unless prompt.yes?('Continue anyway?')
- errors = true
+ errors << 'Redis connection could not be established.'
break
end
end
@@ -450,7 +450,7 @@ namespace :mastodon do
unless prompt.yes?('Try again?')
return prompt.warn 'Nothing saved. Bye!' unless prompt.yes?('Continue anyway?')
- errors = true
+ errors << 'E-email was not sent successfully.'
break
end
end
@@ -498,7 +498,7 @@ namespace :mastodon do
prompt.ok 'Done!'
else
prompt.error 'That failed! Perhaps your configuration is not right'
- errors = true
+ errors << 'Preparing the database failed'
end
end
@@ -515,14 +515,15 @@ namespace :mastodon do
prompt.say 'Done!'
else
prompt.error 'That failed! Maybe you need swap space?'
- errors = true
+ errors << 'Compiling assets failed.'
end
end
end
prompt.say "\n"
- if errors
- prompt.warn 'Your Mastodon server is set up, but there were some errors along the way, you may have to fix them.'
+ if errors.any?
+ prompt.warn 'Your Mastodon server is set up, but there were some errors along the way, you may have to fix them:'
+ errors.each { |error| prompt.warn "- #{error}" }
else
prompt.ok 'All done! You can now power on the Mastodon server 🐘'
end
@@ -579,6 +580,17 @@ namespace :mastodon do
private
+ def clear_environment!
+ # When the application code gets loaded, it runs `lib/mastodon/redis_configuration.rb`.
+ # This happens before application environment configuration and sets REDIS_URL etc.
+ # These variables are then used even when REDIS_HOST etc. are changed, so clear them
+ # out so they don't interfere with our new configuration.
+
+ ENV.delete('REDIS_URL')
+ ENV.delete('CACHE_REDIS_URL')
+ ENV.delete('SIDEKIQ_REDIS_URL')
+ end
+
def generate_header(include_warning)
default_message = "# Generated with mastodon:setup on #{Time.now.utc}\n\n"
diff --git a/package.json b/package.json
index b6ab6f87ff..5fa2f9f4ad 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
"@gamestdio/websocket": "^0.3.2",
"@github/webauthn-json": "^2.1.1",
"@hello-pangea/dnd": "^17.0.0",
- "@rails/ujs": "7.1.400",
+ "@rails/ujs": "7.1.401",
"@reduxjs/toolkit": "^2.0.1",
"@svgr/webpack": "^5.5.0",
"arrow-key-navigation": "^1.2.0",
diff --git a/public/embed.js b/public/embed.js
index 53372a3890..bc1fac3864 100644
--- a/public/embed.js
+++ b/public/embed.js
@@ -1,8 +1,5 @@
// @ts-check
-
-const allowedPrefixes = (document.currentScript && document.currentScript.tagName.toUpperCase() === 'SCRIPT' && document.currentScript.dataset.allowedPrefixes) ? document.currentScript.dataset.allowedPrefixes.split(' ') : [];
-
-(function () {
+(function (allowedPrefixes) {
'use strict';
/**
@@ -127,4 +124,4 @@ const allowedPrefixes = (document.currentScript && document.currentScript.tagNam
container.appendChild(iframe);
});
});
-})();
+})((document.currentScript && document.currentScript.tagName.toUpperCase() === 'SCRIPT' && document.currentScript.dataset.allowedPrefixes) ? document.currentScript.dataset.allowedPrefixes.split(' ') : []);
diff --git a/spec/controllers/admin/invites_controller_spec.rb b/spec/controllers/admin/invites_controller_spec.rb
deleted file mode 100644
index b6471e80b2..0000000000
--- a/spec/controllers/admin/invites_controller_spec.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Admin::InvitesController do
- render_views
-
- let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
-
- before do
- sign_in user, scope: :user
- end
-
- describe 'GET #index' do
- subject { get :index, params: { available: true } }
-
- let!(:invite) { Fabricate(:invite) }
-
- it 'renders index page' do
- expect(subject).to render_template :index
- expect(response.body)
- .to include(invite.code)
- end
- end
-
- describe 'POST #create' do
- subject { post :create, params: { invite: { max_uses: '10', expires_in: 1800 } } }
-
- it 'succeeds to create a invite' do
- expect { subject }.to change(Invite, :count).by(1)
- expect(subject).to redirect_to admin_invites_path
- expect(Invite.last).to have_attributes(user_id: user.id, max_uses: 10)
- end
- end
-
- describe 'DELETE #destroy' do
- subject { delete :destroy, params: { id: invite.id } }
-
- let!(:invite) { Fabricate(:invite, expires_at: nil) }
-
- it 'expires invite' do
- expect(subject).to redirect_to admin_invites_path
- expect(invite.reload).to be_expired
- end
- end
-
- describe 'POST #deactivate_all' do
- before { Fabricate(:invite, expires_at: nil) }
-
- it 'expires all invites, then redirects to admin_invites_path' do
- expect { post :deactivate_all }
- .to change { Invite.exists?(expires_at: nil) }
- .from(true)
- .to(false)
-
- expect(response).to redirect_to admin_invites_path
- end
- end
-end
diff --git a/spec/controllers/admin/tags_controller_spec.rb b/spec/controllers/admin/tags_controller_spec.rb
deleted file mode 100644
index 1df2bc4003..0000000000
--- a/spec/controllers/admin/tags_controller_spec.rb
+++ /dev/null
@@ -1,82 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Admin::TagsController do
- render_views
-
- before do
- sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin'))
- end
-
- describe 'GET #index' do
- before do
- Fabricate(:tag)
-
- tag_filter = instance_double(Admin::TagFilter, results: Tag.all)
- allow(Admin::TagFilter).to receive(:new).and_return(tag_filter)
- end
-
- let(:params) { { order: 'newest' } }
-
- it 'returns http success' do
- get :index
-
- expect(response).to have_http_status(200)
- expect(response).to render_template(:index)
-
- expect(Admin::TagFilter)
- .to have_received(:new)
- .with(hash_including(params))
- end
-
- describe 'with filters' do
- let(:params) { { order: 'newest', name: 'test' } }
-
- it 'returns http success' do
- get :index, params: { name: 'test' }
-
- expect(response).to have_http_status(200)
- expect(response).to render_template(:index)
-
- expect(Admin::TagFilter)
- .to have_received(:new)
- .with(hash_including(params))
- end
- end
- end
-
- describe 'GET #show' do
- let!(:tag) { Fabricate(:tag) }
-
- before do
- get :show, params: { id: tag.id }
- end
-
- it 'returns status 200' do
- expect(response).to have_http_status(200)
- end
- end
-
- describe 'PUT #update' do
- let!(:tag) { Fabricate(:tag, listable: false) }
-
- context 'with valid params' do
- it 'updates the tag' do
- put :update, params: { id: tag.id, tag: { listable: '1' } }
-
- expect(response).to redirect_to(admin_tag_path(tag.id))
- expect(tag.reload).to be_listable
- end
- end
-
- context 'with invalid params' do
- it 'does not update the tag' do
- put :update, params: { id: tag.id, tag: { name: 'cant-change-name' } }
-
- expect(response).to have_http_status(200)
- expect(response).to render_template(:show)
- end
- end
- end
-end
diff --git a/spec/controllers/auth/registrations_controller_spec.rb b/spec/controllers/auth/registrations_controller_spec.rb
index eed13d10d4..cecfa7b5be 100644
--- a/spec/controllers/auth/registrations_controller_spec.rb
+++ b/spec/controllers/auth/registrations_controller_spec.rb
@@ -233,17 +233,7 @@ RSpec.describe Auth::RegistrationsController do
Setting.registrations_mode = 'open'
Fabricate(:email_domain_block, allow_with_approval: true, domain: 'mail.example.com')
allow(User).to receive(:skip_mx_check?).and_return(false)
-
- resolver = instance_double(Resolv::DNS, :timeouts= => nil)
-
- allow(resolver).to receive(:getresources)
- .with('example.com', Resolv::DNS::Resource::IN::MX)
- .and_return([instance_double(Resolv::DNS::Resource::MX, exchange: 'mail.example.com')])
- allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::A).and_return([])
- allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
- allow(resolver).to receive(:getresources).with('mail.example.com', Resolv::DNS::Resource::IN::A).and_return([instance_double(Resolv::DNS::Resource::IN::A, address: '2.3.4.5')])
- allow(resolver).to receive(:getresources).with('mail.example.com', Resolv::DNS::Resource::IN::AAAA).and_return([instance_double(Resolv::DNS::Resource::IN::AAAA, address: 'fd00::2')])
- allow(Resolv::DNS).to receive(:open).and_yield(resolver)
+ configure_mx(domain: 'example.com', exchange: 'mail.example.com')
end
it 'creates unapproved user and redirects to setup' do
diff --git a/spec/controllers/auth/sessions_controller_spec.rb b/spec/controllers/auth/sessions_controller_spec.rb
index ddb6f3633c..d4769a4722 100644
--- a/spec/controllers/auth/sessions_controller_spec.rb
+++ b/spec/controllers/auth/sessions_controller_spec.rb
@@ -247,7 +247,7 @@ RSpec.describe Auth::SessionsController do
context 'when using two-factor authentication' do
context 'with OTP enabled as second factor' do
let!(:user) do
- Fabricate(:user, email: 'x@y.com', password: 'abcdefgh', otp_required_for_login: true, otp_secret: User.generate_otp_secret(32))
+ Fabricate(:user, email: 'x@y.com', password: 'abcdefgh', otp_required_for_login: true, otp_secret: User.generate_otp_secret)
end
let!(:recovery_codes) do
@@ -269,7 +269,7 @@ RSpec.describe Auth::SessionsController do
context 'when using email and password after an unfinished log-in attempt to a 2FA-protected account' do
let!(:other_user) do
- Fabricate(:user, email: 'z@y.com', password: 'abcdefgh', otp_required_for_login: true, otp_secret: User.generate_otp_secret(32))
+ Fabricate(:user, email: 'z@y.com', password: 'abcdefgh', otp_required_for_login: true, otp_secret: User.generate_otp_secret)
end
before do
@@ -381,7 +381,7 @@ RSpec.describe Auth::SessionsController do
context 'with WebAuthn and OTP enabled as second factor' do
let!(:user) do
- Fabricate(:user, email: 'x@y.com', password: 'abcdefgh', otp_required_for_login: true, otp_secret: User.generate_otp_secret(32))
+ Fabricate(:user, email: 'x@y.com', password: 'abcdefgh', otp_required_for_login: true, otp_secret: User.generate_otp_secret)
end
let!(:webauthn_credential) do
diff --git a/spec/controllers/settings/privacy_controller_spec.rb b/spec/controllers/settings/privacy_controller_spec.rb
index 59fd342199..9dcabd1d54 100644
--- a/spec/controllers/settings/privacy_controller_spec.rb
+++ b/spec/controllers/settings/privacy_controller_spec.rb
@@ -31,7 +31,7 @@ RSpec.describe Settings::PrivacyController do
describe 'PUT #update' do
context 'when update succeeds' do
before do
- allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_async)
+ allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_in)
end
it 'updates the user profile' do
@@ -44,14 +44,14 @@ RSpec.describe Settings::PrivacyController do
.to redirect_to(settings_privacy_path)
expect(ActivityPub::UpdateDistributionWorker)
- .to have_received(:perform_async).with(account.id)
+ .to have_received(:perform_in).with(anything, account.id)
end
end
context 'when update fails' do
before do
allow(UpdateAccountService).to receive(:new).and_return(failing_update_service)
- allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_async)
+ allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_in)
end
it 'updates the user profile' do
@@ -61,7 +61,7 @@ RSpec.describe Settings::PrivacyController do
.to render_template(:show)
expect(ActivityPub::UpdateDistributionWorker)
- .to_not have_received(:perform_async)
+ .to_not have_received(:perform_in)
end
private
diff --git a/spec/controllers/settings/profiles_controller_spec.rb b/spec/controllers/settings/profiles_controller_spec.rb
index e3197f0a6d..7447049751 100644
--- a/spec/controllers/settings/profiles_controller_spec.rb
+++ b/spec/controllers/settings/profiles_controller_spec.rb
@@ -29,23 +29,23 @@ RSpec.describe Settings::ProfilesController do
end
it 'updates the user profile' do
- allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_async)
+ allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_in)
put :update, params: { account: { display_name: 'New name' } }
expect(account.reload.display_name).to eq 'New name'
expect(response).to redirect_to(settings_profile_path)
- expect(ActivityPub::UpdateDistributionWorker).to have_received(:perform_async).with(account.id)
+ expect(ActivityPub::UpdateDistributionWorker).to have_received(:perform_in).with(anything, account.id)
end
end
describe 'PUT #update with new profile image' do
it 'updates profile image' do
- allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_async)
+ allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_in)
expect(account.avatar.instance.avatar_file_name).to be_nil
put :update, params: { account: { avatar: fixture_file_upload('avatar.gif', 'image/gif') } }
expect(response).to redirect_to(settings_profile_path)
expect(account.reload.avatar.instance.avatar_file_name).to_not be_nil
- expect(ActivityPub::UpdateDistributionWorker).to have_received(:perform_async).with(account.id)
+ expect(ActivityPub::UpdateDistributionWorker).to have_received(:perform_in).with(anything, account.id)
end
end
end
diff --git a/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb b/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb
index 34eaacdf49..224310b7ef 100644
--- a/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb
+++ b/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb
@@ -18,7 +18,7 @@ RSpec.describe Settings::TwoFactorAuthentication::ConfirmationsController do
def qr_code_markup
RQRCode::QRCode.new(
'otpauth://totp/cb6e6126.ngrok.io:local-part%40domain?secret=thisisasecretforthespecofnewview&issuer=cb6e6126.ngrok.io'
- ).as_svg(padding: 0, module_size: 4)
+ ).as_svg(padding: 0, module_size: 4, use_path: true)
end
end
diff --git a/spec/controllers/statuses_controller_spec.rb b/spec/controllers/statuses_controller_spec.rb
index d9702251f4..121e4aa6c6 100644
--- a/spec/controllers/statuses_controller_spec.rb
+++ b/spec/controllers/statuses_controller_spec.rb
@@ -736,76 +736,4 @@ RSpec.describe StatusesController do
end
end
end
-
- describe 'GET #embed' do
- let(:account) { Fabricate(:account) }
- let(:status) { Fabricate(:status, account: account) }
-
- context 'when account is suspended' do
- let(:account) { Fabricate(:account, suspended: true) }
-
- before do
- get :embed, params: { account_username: account.username, id: status.id }
- end
-
- it 'returns http gone' do
- expect(response).to have_http_status(410)
- end
- end
-
- context 'when status is a reblog' do
- let(:original_account) { Fabricate(:account, domain: 'example.com') }
- let(:original_status) { Fabricate(:status, account: original_account, url: 'https://example.com/123') }
- let(:status) { Fabricate(:status, account: account, reblog: original_status) }
-
- before do
- get :embed, params: { account_username: status.account.username, id: status.id }
- end
-
- it 'returns http not found' do
- expect(response).to have_http_status(404)
- end
- end
-
- context 'when status is public' do
- before do
- get :embed, params: { account_username: status.account.username, id: status.id }
- end
-
- it 'renders status successfully', :aggregate_failures do
- expect(response)
- .to have_http_status(200)
- .and render_template(:embed)
- expect(response.headers).to include(
- 'Vary' => 'Accept, Accept-Language, Cookie',
- 'Cache-Control' => include('public'),
- 'Link' => include('activity+json')
- )
- end
- end
-
- context 'when status is private' do
- let(:status) { Fabricate(:status, account: account, visibility: :private) }
-
- before do
- get :embed, params: { account_username: status.account.username, id: status.id }
- end
-
- it 'returns http not found' do
- expect(response).to have_http_status(404)
- end
- end
-
- context 'when status is direct' do
- let(:status) { Fabricate(:status, account: account, visibility: :direct) }
-
- before do
- get :embed, params: { account_username: status.account.username, id: status.id }
- end
-
- it 'returns http not found' do
- expect(response).to have_http_status(404)
- end
- end
- end
end
diff --git a/spec/fabricators/account_domain_block_fabricator.rb b/spec/fabricators/account_domain_block_fabricator.rb
index 83df509da2..a211b7c666 100644
--- a/spec/fabricators/account_domain_block_fabricator.rb
+++ b/spec/fabricators/account_domain_block_fabricator.rb
@@ -2,5 +2,5 @@
Fabricator(:account_domain_block) do
account { Fabricate.build(:account) }
- domain 'example.com'
+ domain { sequence { |n| "host-#{n}.example" } }
end
diff --git a/spec/fabricators/ip_block_fabricator.rb b/spec/fabricators/ip_block_fabricator.rb
new file mode 100644
index 0000000000..30c48b90c6
--- /dev/null
+++ b/spec/fabricators/ip_block_fabricator.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+Fabricator(:ip_block) do
+ severity { :sign_up_requires_approval }
+ ip { sequence(:ip) { |n| "10.0.0.#{n}" } }
+end
diff --git a/spec/fixtures/files/avatar-high.gif b/spec/fixtures/files/avatar-high.gif
new file mode 100644
index 0000000000..7639f2c507
Binary files /dev/null and b/spec/fixtures/files/avatar-high.gif differ
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index fbc01e00cf..bf46c16c79 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -283,11 +283,11 @@ RSpec.describe ApplicationHelper do
expect(helper.html_title).to be_html_safe
end
- it 'removes extra new lines' do
+ it 'does not escape twice' do
Setting.site_title = 'Site Title'
- helper.content_for(:page_title, "Test Value\n")
+ helper.content_for(:page_title, '"Test Value"'.html_safe)
- expect(helper.html_title).to eq 'Test Value - Site Title'
+ expect(helper.html_title).to eq '"Test Value" - Site Title'
expect(helper.html_title).to be_html_safe
end
end
diff --git a/spec/lib/account_reach_finder_spec.rb b/spec/lib/account_reach_finder_spec.rb
index e5d85656a2..ed16c07c22 100644
--- a/spec/lib/account_reach_finder_spec.rb
+++ b/spec/lib/account_reach_finder_spec.rb
@@ -13,13 +13,28 @@ RSpec.describe AccountReachFinder do
let(:ap_mentioned_example_com) { Fabricate(:account, protocol: :activitypub, inbox_url: 'https://example.com/inbox-3', domain: 'example.com') }
let(:ap_mentioned_example_org) { Fabricate(:account, protocol: :activitypub, inbox_url: 'https://example.org/inbox-4', domain: 'example.org') }
+ let(:ap_followed_example_com) { Fabricate(:account, protocol: :activitypub, inbox_url: 'https://example.com/inbox-5', domain: 'example.com') }
+ let(:ap_followed_example_org) { Fabricate(:account, protocol: :activitypub, inbox_url: 'https://example.com/inbox-6', domain: 'example.org') }
+
+ let(:ap_requested_example_com) { Fabricate(:account, protocol: :activitypub, inbox_url: 'https://example.com/inbox-7', domain: 'example.com') }
+ let(:ap_requested_example_org) { Fabricate(:account, protocol: :activitypub, inbox_url: 'https://example.com/inbox-8', domain: 'example.org') }
+
let(:unrelated_account) { Fabricate(:account, protocol: :activitypub, inbox_url: 'https://example.com/unrelated-inbox', domain: 'example.com') }
+ let(:old_followed_account) { Fabricate(:account, protocol: :activitypub, inbox_url: 'https://example.com/old-followed-inbox', domain: 'example.com') }
before do
+ travel_to(2.months.ago) { account.follow!(old_followed_account) }
+
ap_follower_example_com.follow!(account)
ap_follower_example_org.follow!(account)
ap_follower_with_shared.follow!(account)
+ account.follow!(ap_followed_example_com)
+ account.follow!(ap_followed_example_org)
+
+ account.request_follow!(ap_requested_example_com)
+ account.request_follow!(ap_requested_example_org)
+
Fabricate(:status, account: account).tap do |status|
status.mentions << Mention.new(account: ap_follower_example_com)
status.mentions << Mention.new(account: ap_mentioned_with_shared)
@@ -38,16 +53,36 @@ RSpec.describe AccountReachFinder do
end
describe '#inboxes' do
- it 'includes the preferred inbox URL of followers' do
- expect(described_class.new(account).inboxes).to include(*[ap_follower_example_com, ap_follower_example_org, ap_follower_with_shared].map(&:preferred_inbox_url))
+ subject { described_class.new(account).inboxes }
+
+ it 'includes the preferred inbox URL of followers and recently mentioned accounts but not unrelated users' do
+ expect(subject)
+ .to include(*follower_inbox_urls)
+ .and include(*mentioned_account_inbox_urls)
+ .and include(*recently_followed_inbox_urls)
+ .and include(*recently_requested_inbox_urls)
+ .and not_include(unrelated_account.preferred_inbox_url)
+ .and not_include(old_followed_account.preferred_inbox_url)
end
- it 'includes the preferred inbox URL of recently-mentioned accounts' do
- expect(described_class.new(account).inboxes).to include(*[ap_mentioned_with_shared, ap_mentioned_example_com, ap_mentioned_example_org].map(&:preferred_inbox_url))
+ def follower_inbox_urls
+ [ap_follower_example_com, ap_follower_example_org, ap_follower_with_shared]
+ .map(&:preferred_inbox_url)
end
- it 'does not include the inbox of unrelated users' do
- expect(described_class.new(account).inboxes).to_not include(unrelated_account.preferred_inbox_url)
+ def mentioned_account_inbox_urls
+ [ap_mentioned_with_shared, ap_mentioned_example_com, ap_mentioned_example_org]
+ .map(&:preferred_inbox_url)
+ end
+
+ def recently_followed_inbox_urls
+ [ap_followed_example_com, ap_followed_example_org]
+ .map(&:preferred_inbox_url)
+ end
+
+ def recently_requested_inbox_urls
+ [ap_requested_example_com, ap_requested_example_org]
+ .map(&:preferred_inbox_url)
end
end
end
diff --git a/spec/lib/activitypub/activity/block_spec.rb b/spec/lib/activitypub/activity/block_spec.rb
index 6f68984018..385628852b 100644
--- a/spec/lib/activitypub/activity/block_spec.rb
+++ b/spec/lib/activitypub/activity/block_spec.rb
@@ -3,6 +3,8 @@
require 'rails_helper'
RSpec.describe ActivityPub::Activity::Block do
+ subject { described_class.new(json, sender) }
+
let(:sender) { Fabricate(:account) }
let(:recipient) { Fabricate(:account) }
@@ -16,93 +18,65 @@ RSpec.describe ActivityPub::Activity::Block do
}.with_indifferent_access
end
- context 'when the recipient does not follow the sender' do
- describe '#perform' do
- subject { described_class.new(json, sender) }
-
- before do
- subject.perform
- end
-
+ describe '#perform' do
+ context 'when the recipient does not follow the sender' do
it 'creates a block from sender to recipient' do
- expect(sender.blocking?(recipient)).to be true
+ subject.perform
+
+ expect(sender)
+ .to be_blocking(recipient)
end
end
- end
- context 'when the recipient is already blocked' do
- before do
- sender.block!(recipient, uri: 'old')
+ context 'when the recipient is already blocked' do
+ before { sender.block!(recipient, uri: 'old') }
+
+ it 'creates a block from sender to recipient and sets uri to last received block activity' do
+ subject.perform
+
+ expect(sender)
+ .to be_blocking(recipient)
+ expect(sender.block_relationships.find_by(target_account: recipient).uri)
+ .to eq 'foo'
+ end
end
- describe '#perform' do
- subject { described_class.new(json, sender) }
+ context 'when the recipient follows the sender' do
+ before { recipient.follow!(sender) }
+
+ it 'creates a block from sender to recipient and ensures recipient not following sender' do
+ subject.perform
+
+ expect(sender)
+ .to be_blocking(recipient)
+ expect(recipient)
+ .to_not be_following(sender)
+ end
+ end
+
+ context 'when a matching undo has been received first' do
+ let(:undo_json) do
+ {
+ '@context': 'https://www.w3.org/ns/activitystreams',
+ id: 'bar',
+ type: 'Undo',
+ actor: ActivityPub::TagManager.instance.uri_for(sender),
+ object: json,
+ }.with_indifferent_access
+ end
before do
+ recipient.follow!(sender)
+ ActivityPub::Activity::Undo.new(undo_json, sender).perform
+ end
+
+ it 'does not create a block from sender to recipient and ensures recipient not following sender' do
subject.perform
- end
- it 'creates a block from sender to recipient' do
- expect(sender.blocking?(recipient)).to be true
- end
-
- it 'sets the uri to that of last received block activity' do
- expect(sender.block_relationships.find_by(target_account: recipient).uri).to eq 'foo'
- end
- end
- end
-
- context 'when the recipient follows the sender' do
- before do
- recipient.follow!(sender)
- end
-
- describe '#perform' do
- subject { described_class.new(json, sender) }
-
- before do
- subject.perform
- end
-
- it 'creates a block from sender to recipient' do
- expect(sender.blocking?(recipient)).to be true
- end
-
- it 'ensures recipient is not following sender' do
- expect(recipient.following?(sender)).to be false
- end
- end
- end
-
- context 'when a matching undo has been received first' do
- let(:undo_json) do
- {
- '@context': 'https://www.w3.org/ns/activitystreams',
- id: 'bar',
- type: 'Undo',
- actor: ActivityPub::TagManager.instance.uri_for(sender),
- object: json,
- }.with_indifferent_access
- end
-
- before do
- recipient.follow!(sender)
- ActivityPub::Activity::Undo.new(undo_json, sender).perform
- end
-
- describe '#perform' do
- subject { described_class.new(json, sender) }
-
- before do
- subject.perform
- end
-
- it 'does not create a block from sender to recipient' do
- expect(sender.blocking?(recipient)).to be false
- end
-
- it 'ensures recipient is not following sender' do
- expect(recipient.following?(sender)).to be false
+ expect(sender)
+ .to_not be_blocking(recipient)
+ expect(recipient)
+ .to_not be_following(sender)
end
end
end
diff --git a/spec/lib/activitypub/activity/create_spec.rb b/spec/lib/activitypub/activity/create_spec.rb
index fad45d3cb7..a2067357fa 100644
--- a/spec/lib/activitypub/activity/create_spec.rb
+++ b/spec/lib/activitypub/activity/create_spec.rb
@@ -48,10 +48,16 @@ RSpec.describe ActivityPub::Activity::Create do
content: '@bob lorem ipsum',
published: 1.hour.ago.utc.iso8601,
updated: 1.hour.ago.utc.iso8601,
- tag: {
- type: 'Mention',
- href: ActivityPub::TagManager.instance.uri_for(follower),
- },
+ tag: [
+ {
+ type: 'Mention',
+ href: ActivityPub::TagManager.instance.uri_for(follower),
+ },
+ {
+ type: 'Mention',
+ href: ActivityPub::TagManager.instance.uri_for(follower),
+ },
+ ],
}
end
@@ -74,6 +80,24 @@ RSpec.describe ActivityPub::Activity::Create do
}
end
+ let(:invalid_mention_json) do
+ {
+ id: [ActivityPub::TagManager.instance.uri_for(sender), 'post2'].join('/'),
+ type: 'Note',
+ to: [
+ 'https://www.w3.org/ns/activitystreams#Public',
+ ActivityPub::TagManager.instance.uri_for(follower),
+ ],
+ content: '@bob lorem ipsum',
+ published: 1.hour.ago.utc.iso8601,
+ updated: 1.hour.ago.utc.iso8601,
+ tag: {
+ type: 'Mention',
+ href: 'http://notexisting.dontexistingtld/actor',
+ },
+ }
+ end
+
def activity_for_object(json)
{
'@context': 'https://www.w3.org/ns/activitystreams',
@@ -128,6 +152,25 @@ RSpec.describe ActivityPub::Activity::Create do
# Creates two notifications
expect(Notification.count).to eq 2
end
+
+ it 'ignores unprocessable mention', :aggregate_failures do
+ stub_request(:get, invalid_mention_json[:tag][:href]).to_raise(HTTP::ConnectionError)
+ # When receiving the post that contains an invalid mention…
+ described_class.new(activity_for_object(invalid_mention_json), sender, delivery: true).perform
+
+ # NOTE: Refering explicitly to the workers is a bit awkward
+ DistributionWorker.drain
+ FeedInsertWorker.drain
+
+ # …it creates a status
+ status = Status.find_by(uri: invalid_mention_json[:id])
+
+ # Check the process did not crash
+ expect(status.nil?).to be false
+
+ # It has queued a mention resolve job
+ expect(MentionResolveWorker).to have_enqueued_sidekiq_job(status.id, invalid_mention_json[:tag][:href], anything)
+ end
end
describe '#perform' do
@@ -135,27 +178,24 @@ RSpec.describe ActivityPub::Activity::Create do
subject { delivered_to_account_id ? described_class.new(json, sender, delivered_to_account_id: delivered_to_account_id) : described_class.new(json, sender) }
let(:sender_software) { 'mastodon' }
- let(:custom_before) { false }
let(:active_friend) { false }
let(:delivered_to_account_id) { nil }
before do
Fabricate(:instance_info, domain: 'example.com', software: sender_software)
Fabricate(:friend_domain, domain: 'example.com', active_state: :accepted) if active_friend
- subject.perform unless custom_before
end
context 'when object publication date is below ISO8601 range' do
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
- published: '-0977-11-03T08:31:22Z',
- }
+ build_object(
+ published: '-0977-11-03T08:31:22Z'
+ )
end
it 'creates status with a valid creation date', :aggregate_failures do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -167,15 +207,14 @@ RSpec.describe ActivityPub::Activity::Create do
context 'when object publication date is above ISO8601 range' do
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
- published: '10000-11-03T08:31:22Z',
- }
+ build_object(
+ published: '10000-11-03T08:31:22Z'
+ )
end
it 'creates status with a valid creation date', :aggregate_failures do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -187,16 +226,15 @@ RSpec.describe ActivityPub::Activity::Create do
context 'when object has been edited' do
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
+ build_object(
published: '2022-01-22T15:00:00Z',
- updated: '2022-01-22T16:00:00Z',
- }
+ updated: '2022-01-22T16:00:00Z'
+ )
end
it 'creates status with appropriate creation and edition dates', :aggregate_failures do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -211,54 +249,41 @@ RSpec.describe ActivityPub::Activity::Create do
context 'when object has update date equal to creation date' do
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
+ build_object(
published: '2022-01-22T15:00:00Z',
- updated: '2022-01-22T15:00:00Z',
- }
+ updated: '2022-01-22T15:00:00Z'
+ )
end
- it 'creates status' do
+ it 'creates status and does not mark it as edited' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
expect(status.text).to eq 'Lorem ipsum'
- end
-
- it 'does not mark status as edited' do
- status = sender.statuses.first
-
- expect(status).to_not be_nil
expect(status.edited?).to be false
end
end
context 'with an unknown object type' do
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Banana',
- content: 'Lorem ipsum',
- }
+ build_object(
+ type: 'Banana'
+ )
end
it 'does not create a status' do
- expect(sender.statuses.count).to be_zero
+ expect { subject.perform }.to_not change(sender.statuses, :count)
end
end
context 'with a standalone' do
- let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
- }
- end
+ let(:object_json) { build_object }
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -266,6 +291,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'missing to/cc defaults to direct privacy' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -275,15 +302,14 @@ RSpec.describe ActivityPub::Activity::Create do
context 'when public with explicit public address' do
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
- to: 'https://www.w3.org/ns/activitystreams#Public',
- }
+ build_object(
+ to: 'https://www.w3.org/ns/activitystreams#Public'
+ )
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -293,15 +319,14 @@ RSpec.describe ActivityPub::Activity::Create do
context 'when public with as:Public' do
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
- to: 'as:Public',
- }
+ build_object(
+ to: 'as:Public'
+ )
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -311,15 +336,14 @@ RSpec.describe ActivityPub::Activity::Create do
context 'when public with Public' do
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
- to: 'Public',
- }
+ build_object(
+ to: 'Public'
+ )
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -329,15 +353,14 @@ RSpec.describe ActivityPub::Activity::Create do
context 'when unlisted with explicit public address' do
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
- cc: 'https://www.w3.org/ns/activitystreams#Public',
- }
+ build_object(
+ cc: 'https://www.w3.org/ns/activitystreams#Public'
+ )
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -347,15 +370,14 @@ RSpec.describe ActivityPub::Activity::Create do
context 'when unlisted with as:Public' do
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
- cc: 'as:Public',
- }
+ build_object(
+ cc: 'as:Public'
+ )
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -365,15 +387,14 @@ RSpec.describe ActivityPub::Activity::Create do
context 'when unlisted with Public' do
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
- cc: 'Public',
- }
+ build_object(
+ cc: 'Public'
+ )
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -393,6 +414,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -413,6 +436,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:active_friend) { true }
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -422,15 +447,14 @@ RSpec.describe ActivityPub::Activity::Create do
context 'when private' do
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
- to: 'http://example.com/followers',
- }
+ build_object(
+ to: 'http://example.com/followers'
+ )
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -440,19 +464,18 @@ RSpec.describe ActivityPub::Activity::Create do
context 'when private with inlined Collection in audience' do
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
+ build_object(
to: {
type: 'OrderedCollection',
id: 'http://example.com/followers',
first: 'http://example.com/followers?page=true',
- },
- }
+ }
+ )
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -464,24 +487,19 @@ RSpec.describe ActivityPub::Activity::Create do
let(:recipient) { Fabricate(:account) }
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
- to: ActivityPub::TagManager.instance.uri_for(recipient),
- }
+ build_object(
+ to: ActivityPub::TagManager.instance.uri_for(recipient)
+ )
end
- it 'creates status' do
+ it 'creates status with a silent mention' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
expect(status.visibility).to eq 'limited'
expect(status.limited_scope).to eq 'none'
- end
-
- it 'creates silent mention' do
- status = sender.statuses.first
expect(status.mentions.first).to be_silent
end
end
@@ -500,6 +518,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -522,6 +542,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -534,19 +556,18 @@ RSpec.describe ActivityPub::Activity::Create do
let(:recipient) { Fabricate(:account) }
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
+ build_object(
to: ActivityPub::TagManager.instance.uri_for(recipient),
tag: {
type: 'Mention',
href: ActivityPub::TagManager.instance.uri_for(recipient),
- },
- }
+ }
+ )
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -568,6 +589,8 @@ RSpec.describe ActivityPub::Activity::Create do
context 'with explicit public address' do
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -579,6 +602,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:searchable_by) { 'as:Public' }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -590,6 +615,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:searchable_by) { 'Public' }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -601,6 +628,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:searchable_by) { ['http://example.com/followers', 'kmyblue:LocalPublic'] }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -613,6 +642,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:active_friend) { true }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -624,6 +655,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:searchable_by) { 'http://example.com/followers' }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -635,6 +668,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:searchable_by) { 'https://example.com/actor' }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -646,6 +681,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:searchable_by) { '' }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -657,6 +694,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:searchable_by) { 'ohagi' }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -668,6 +707,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:searchable_by) { nil }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -679,6 +720,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:searchable_by) { 'kmyblue:Limited' }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -693,6 +736,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:sender_bio) { '#searchable_by_all_users' }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -704,6 +749,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:sender_bio) { '#searchable_by_followers_only' }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -715,6 +762,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:sender_bio) { '#searchable_by_reacted_users_only' }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -726,6 +775,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:sender_bio) { '#searchable_by_nobody' }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -737,6 +788,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:sender_bio) { '' }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -760,6 +813,8 @@ RSpec.describe ActivityPub::Activity::Create do
context 'without specify searchability from misskey' do
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -771,6 +826,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:to) { 'http://example.com/followers' }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -793,6 +850,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -804,6 +863,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:searchable_by) { 'kmyblue:Limited' }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -816,15 +877,14 @@ RSpec.describe ActivityPub::Activity::Create do
let(:original_status) { Fabricate(:status) }
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
- inReplyTo: ActivityPub::TagManager.instance.uri_for(original_status),
- }
+ build_object(
+ inReplyTo: ActivityPub::TagManager.instance.uri_for(original_status)
+ )
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -839,20 +899,19 @@ RSpec.describe ActivityPub::Activity::Create do
let(:recipient) { Fabricate(:account) }
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
+ build_object(
tag: [
{
type: 'Mention',
href: ActivityPub::TagManager.instance.uri_for(recipient),
},
- ],
- }
+ ]
+ )
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -862,19 +921,18 @@ RSpec.describe ActivityPub::Activity::Create do
context 'with mentions missing href' do
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
+ build_object(
tag: [
{
type: 'Mention',
},
- ],
- }
+ ]
+ )
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
end
@@ -884,10 +942,8 @@ RSpec.describe ActivityPub::Activity::Create do
before do
Fabricate(:domain_block, domain: 'example.com', severity: :noop, reject_reply_exclude_followers: true)
recipient.follow!(sender) if follow
- subject.perform
end
- let(:custom_before) { true }
let(:follow) { false }
let(:recipient) { Fabricate(:account) }
@@ -909,6 +965,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:follow) { true }
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -917,6 +975,8 @@ RSpec.describe ActivityPub::Activity::Create do
context 'when not follower' do
it 'creates status' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
status = sender.statuses.first
expect(status).to be_nil
@@ -935,6 +995,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -944,14 +1006,11 @@ RSpec.describe ActivityPub::Activity::Create do
end
context 'when existing' do
- let(:custom_before) { true }
let!(:existing) { Fabricate(:conversation, uri: 'http://example.com/conversation', inbox_url: 'http://example.com/actor/invalid') }
- before do
- subject.perform
- end
-
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -973,6 +1032,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -995,6 +1056,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:existing) { Fabricate(:conversation, id: 3500) }
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1005,8 +1068,6 @@ RSpec.describe ActivityPub::Activity::Create do
end
context 'with a context as a reply' do
- let(:custom_before) { true }
- let(:custom_before_sub) { false }
let(:ancestor_account) { Fabricate(:account, domain: 'or.example.com', inbox_url: 'http://or.example.com/actor/inbox') }
let(:mentioned_account) { Fabricate(:account, domain: 'example.com', uri: 'http://example.com/bob', inbox_url: 'http://example.com/bob/inbox', shared_inbox_url: 'http://exmaple.com/inbox') }
let(:local_mentioned_account) { Fabricate(:account, domain: nil) }
@@ -1044,11 +1105,11 @@ RSpec.describe ActivityPub::Activity::Create do
stub_request(:post, 'http://or.example.com/actor/inbox').to_return(status: 200)
stub_request(:post, 'http://example.com/bob/inbox').to_return(status: 200)
-
- subject.perform unless custom_before_sub
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1058,13 +1119,13 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'forwards to observers', :inline_jobs do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
expect(a_request(:post, 'http://or.example.com/actor/inbox')).to have_been_made.once
expect(a_request(:post, 'http://example.com/bob/inbox')).to have_been_made.once
end
context 'when new mention is added' do
- let(:custom_before_sub) { true }
-
let(:new_mentioned_account) { Fabricate(:account, domain: 'example.com', uri: 'http://example.com/alice', inbox_url: 'http://example.com/alice/inbox', shared_inbox_url: 'http://exmaple.com/inbox') }
let(:new_local_mentioned_account) { Fabricate(:account, domain: nil) }
@@ -1090,10 +1151,11 @@ RSpec.describe ActivityPub::Activity::Create do
before do
stub_request(:post, 'http://example.com/alice/inbox').to_return(status: 200)
- subject.perform
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1101,6 +1163,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'forwards to observers', :inline_jobs do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
expect(a_request(:post, 'http://or.example.com/actor/inbox')).to have_been_made.once
expect(a_request(:post, 'http://example.com/bob/inbox')).to have_been_made.once
expect(a_request(:post, 'http://example.com/alice/inbox')).to have_been_made.once
@@ -1108,8 +1172,6 @@ RSpec.describe ActivityPub::Activity::Create do
end
context 'when unknown mentioned account' do
- let(:custom_before_sub) { true }
-
let(:actor_json) do
{
'@context': 'https://www.w3.org/ns/activitystreams',
@@ -1143,10 +1205,11 @@ RSpec.describe ActivityPub::Activity::Create do
stub_request(:get, 'https://foo.test/.well-known/webfinger?resource=acct:actor@foo.test').to_return(status: 200, body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
stub_request(:post, 'https://foo.test/inbox').to_return(status: 200)
stub_request(:get, 'https://foo.test/.well-known/nodeinfo').to_return(status: 200, headers: { 'Content-Type': 'application/activity+json' })
- subject.perform
end
it 'creates status', :inline_jobs do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1154,6 +1217,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'forwards to observers', :inline_jobs do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
expect(a_request(:post, 'https://foo.test/inbox')).to have_been_made.once
end
end
@@ -1162,6 +1227,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:conversation) { Fabricate(:conversation, uri: 'http://example.com/conversation', inbox_url: 'http://example.com/actor/inbox') }
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1171,6 +1238,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'do not forward to observers', :inline_jobs do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
expect(a_request(:post, 'http://or.example.com/actor/inbox')).to_not have_been_made
expect(a_request(:post, 'http://example.com/bob/inbox')).to_not have_been_made
end
@@ -1179,10 +1248,7 @@ RSpec.describe ActivityPub::Activity::Create do
context 'with media attachments' do
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
+ build_object(
attachment: [
{
type: 'Document',
@@ -1194,11 +1260,13 @@ RSpec.describe ActivityPub::Activity::Create do
mediaType: 'image/png',
url: 'http://example.com/emoji.png',
},
- ],
- }
+ ]
+ )
end
it 'creates status with correctly-ordered media attachments' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1209,60 +1277,55 @@ RSpec.describe ActivityPub::Activity::Create do
context 'with media attachments with long description' do
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
+ build_object(
attachment: [
{
type: 'Document',
mediaType: 'image/png',
url: 'http://example.com/attachment.png',
- name: '*' * 1500,
+ name: '*' * MediaAttachment::MAX_DESCRIPTION_LENGTH,
},
- ],
- }
+ ]
+ )
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
- expect(status.media_attachments.map(&:description)).to include('*' * 1500)
+ expect(status.media_attachments.map(&:description)).to include('*' * MediaAttachment::MAX_DESCRIPTION_LENGTH)
end
end
context 'with media attachments with long description as summary' do
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
+ build_object(
attachment: [
{
type: 'Document',
mediaType: 'image/png',
url: 'http://example.com/attachment.png',
- summary: '*' * 1500,
+ summary: '*' * MediaAttachment::MAX_DESCRIPTION_LENGTH,
},
- ],
- }
+ ]
+ )
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
- expect(status.media_attachments.map(&:description)).to include('*' * 1500)
+ expect(status.media_attachments.map(&:description)).to include('*' * MediaAttachment::MAX_DESCRIPTION_LENGTH)
end
end
context 'with media attachments with focal points' do
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
+ build_object(
attachment: [
{
type: 'Document',
@@ -1270,11 +1333,13 @@ RSpec.describe ActivityPub::Activity::Create do
url: 'http://example.com/attachment.png',
focalPoint: [0.5, -0.7],
},
- ],
- }
+ ]
+ )
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1284,20 +1349,19 @@ RSpec.describe ActivityPub::Activity::Create do
context 'with media attachments missing url' do
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
+ build_object(
attachment: [
{
type: 'Document',
mediaType: 'image/png',
},
- ],
- }
+ ]
+ )
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
end
@@ -1305,21 +1369,51 @@ RSpec.describe ActivityPub::Activity::Create do
context 'with hashtags' do
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
+ build_object(
tag: [
{
type: 'Hashtag',
href: 'http://example.com/blah',
name: '#test',
},
- ],
- }
+ ]
+ )
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
+ status = sender.statuses.first
+
+ expect(status).to_not be_nil
+ expect(status.tags.map(&:name)).to include('test')
+ end
+ end
+
+ context 'with featured hashtags' do
+ let(:object_json) do
+ build_object(
+ to: 'https://www.w3.org/ns/activitystreams#Public',
+ tag: [
+ {
+ type: 'Hashtag',
+ href: 'http://example.com/blah',
+ name: '#test',
+ },
+ ]
+ )
+ end
+
+ before do
+ sender.featured_tags.create!(name: 'test')
+ end
+
+ it 'creates status and updates featured tag' do
+ expect { subject.perform }
+ .to change(sender.statuses, :count).by(1)
+ .and change { sender.featured_tags.first.reload.statuses_count }.by(1)
+ .and change { sender.featured_tags.first.reload.last_status_at }.from(nil).to(be_present)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1327,14 +1421,13 @@ RSpec.describe ActivityPub::Activity::Create do
end
context 'with domain-block' do
- let(:custom_before) { true }
-
before do
Fabricate(:domain_block, domain: 'example.com', severity: :noop, reject_hashtag: true)
- subject.perform
end
it 'does not create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1345,20 +1438,19 @@ RSpec.describe ActivityPub::Activity::Create do
context 'with hashtags missing name' do
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
+ build_object(
tag: [
{
type: 'Hashtag',
href: 'http://example.com/blah',
},
- ],
- }
+ ]
+ )
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
end
@@ -1366,21 +1458,20 @@ RSpec.describe ActivityPub::Activity::Create do
context 'with hashtags invalid name' do
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
+ build_object(
tag: [
{
type: 'Hashtag',
href: 'http://example.com/blah',
name: 'foo, #eh !',
},
- ],
- }
+ ]
+ )
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
end
@@ -1388,9 +1479,7 @@ RSpec.describe ActivityPub::Activity::Create do
context 'with emojis' do
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
+ build_object(
content: 'Lorem ipsum :tinking:',
tag: [
{
@@ -1400,11 +1489,13 @@ RSpec.describe ActivityPub::Activity::Create do
},
name: 'tinking',
},
- ],
- }
+ ]
+ )
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1414,9 +1505,7 @@ RSpec.describe ActivityPub::Activity::Create do
context 'with emojis served with invalid content-type' do
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
+ build_object(
content: 'Lorem ipsum :tinkong:',
tag: [
{
@@ -1426,11 +1515,13 @@ RSpec.describe ActivityPub::Activity::Create do
},
name: 'tinkong',
},
- ],
- }
+ ]
+ )
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1440,9 +1531,7 @@ RSpec.describe ActivityPub::Activity::Create do
context 'with emojis missing name' do
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
+ build_object(
content: 'Lorem ipsum :tinking:',
tag: [
{
@@ -1451,11 +1540,13 @@ RSpec.describe ActivityPub::Activity::Create do
url: 'http://example.com/emoji.png',
},
},
- ],
- }
+ ]
+ )
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
end
@@ -1463,20 +1554,20 @@ RSpec.describe ActivityPub::Activity::Create do
context 'with emojis missing icon' do
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
+ build_object(
content: 'Lorem ipsum :tinking:',
tag: [
{
type: 'Emoji',
name: 'tinking',
},
- ],
- }
+ ]
+ )
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
end
@@ -1484,8 +1575,7 @@ RSpec.describe ActivityPub::Activity::Create do
context 'with poll' do
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+ build_object(
type: 'Question',
content: 'Which color was the submarine?',
oneOf: [
@@ -1503,17 +1593,17 @@ RSpec.describe ActivityPub::Activity::Create do
totalItems: 3,
},
},
- ],
- }
+ ]
+ )
end
- it 'creates status' do
+ it 'creates status with a poll' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
expect(status.poll).to_not be_nil
- end
- it 'creates a poll' do
poll = sender.polls.first
expect(poll).to_not be_nil
expect(poll.status).to_not be_nil
@@ -1527,15 +1617,15 @@ RSpec.describe ActivityPub::Activity::Create do
let!(:local_status) { Fabricate(:status, poll: poll) }
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
+ build_object(
name: 'Yellow',
- inReplyTo: ActivityPub::TagManager.instance.uri_for(local_status),
- }
+ inReplyTo: ActivityPub::TagManager.instance.uri_for(local_status)
+ ).except(:content)
end
it 'adds a vote to the poll with correct uri' do
+ expect { subject.perform }.to change(poll.votes, :count).by(1)
+
vote = poll.votes.first
expect(vote).to_not be_nil
expect(vote.uri).to eq object_json[:id]
@@ -1543,15 +1633,14 @@ RSpec.describe ActivityPub::Activity::Create do
end
context 'when ng rule is existing' do
- let(:custom_before) { true }
-
context 'when ng rule is match' do
before do
Fabricate(:ng_rule, account_domain: 'example.com', reaction_type: ['vote'])
- subject.perform
end
it 'does not create a reblog by sender of status' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
expect(poll.votes.first).to be_nil
end
end
@@ -1559,10 +1648,11 @@ RSpec.describe ActivityPub::Activity::Create do
context 'when ng rule is not match' do
before do
Fabricate(:ng_rule, account_domain: 'foo.bar', reaction_type: ['vote'])
- subject.perform
end
it 'creates a reblog by sender of status' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
expect(poll.votes.first).to_not be_nil
end
end
@@ -1571,22 +1661,22 @@ RSpec.describe ActivityPub::Activity::Create do
context 'when a vote to an expired local poll' do
let(:poll) do
- poll = Fabricate.build(:poll, options: %w(Yellow Blue), expires_at: 1.day.ago)
- poll.save(validate: false)
- poll
+ travel_to 2.days.ago do
+ Fabricate(:poll, options: %w(Yellow Blue), expires_at: 1.day.from_now)
+ end
end
let!(:local_status) { Fabricate(:status, poll: poll) }
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
+ build_object(
name: 'Yellow',
- inReplyTo: ActivityPub::TagManager.instance.uri_for(local_status),
- }
+ inReplyTo: ActivityPub::TagManager.instance.uri_for(local_status)
+ ).except(:content)
end
it 'does not add a vote to the poll' do
+ expect { subject.perform }.to_not change(poll.votes, :count)
+
expect(poll.votes.first).to be_nil
end
end
@@ -1616,6 +1706,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1638,6 +1730,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1667,6 +1761,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1702,6 +1798,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1724,6 +1822,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1743,6 +1843,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1763,6 +1865,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1784,6 +1888,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1792,8 +1898,6 @@ RSpec.describe ActivityPub::Activity::Create do
end
context 'when ng word is set' do
- let(:custom_before) { true }
- let(:custom_before_sub) { false }
let(:content) { 'Lorem ipsum' }
let(:ng_word) { 'hello' }
let(:ng_word_for_stranger_mention) { 'ohagi' }
@@ -1809,13 +1913,14 @@ RSpec.describe ActivityPub::Activity::Create do
before do
Fabricate(:ng_word, keyword: ng_word, stranger: false)
Fabricate(:ng_word, keyword: ng_word_for_stranger_mention, stranger: true)
- subject.perform unless custom_before_sub
end
context 'when not contains ng words' do
let(:content) { 'ohagi, world! OH GOOD' }
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
expect(sender.statuses.first).to_not be_nil
end
end
@@ -1824,10 +1929,14 @@ RSpec.describe ActivityPub::Activity::Create do
let(:content) { 'hello, world!' }
it 'creates status' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
expect(sender.statuses.first).to be_nil
end
it 'records history' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
history = NgwordHistory.find_by(uri: object_json[:id])
expect(history).to_not be_nil
expect(history.status_blocked?).to be true
@@ -1847,6 +1956,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
expect(sender.statuses.first).to be_nil
end
end
@@ -1873,6 +1984,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:content) { 'among us' }
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
expect(sender.statuses.first).to_not be_nil
end
end
@@ -1881,27 +1994,28 @@ RSpec.describe ActivityPub::Activity::Create do
let(:content) { 'oh, ohagi!' }
it 'creates status' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
expect(sender.statuses.first).to be_nil
end
end
context 'with using ng words for stranger but receiver is following him' do
let(:content) { 'oh, ohagi!' }
- let(:custom_before_sub) { true }
before do
recipient.follow!(sender)
- subject.perform
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
expect(sender.statuses.first).to_not be_nil
end
end
context 'with using ng words for stranger but multiple receivers are partically following him' do
let(:content) { 'oh, ohagi' }
- let(:custom_before_sub) { true }
let(:object_json) do
{
@@ -1924,10 +2038,11 @@ RSpec.describe ActivityPub::Activity::Create do
before do
recipient.follow!(sender)
- subject.perform
end
it 'creates status' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
expect(sender.statuses.first).to be_nil
end
end
@@ -1949,19 +2064,20 @@ RSpec.describe ActivityPub::Activity::Create do
context 'with a simple case' do
it 'creates status' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
expect(sender.statuses.first).to be_nil
end
end
context 'with following' do
- let(:custom_before_sub) { true }
-
before do
recipient.follow!(sender)
- subject.perform
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
expect(sender.statuses.first).to_not be_nil
end
end
@@ -1993,19 +2109,20 @@ RSpec.describe ActivityPub::Activity::Create do
context 'with a simple case' do
it 'creates status' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
expect(sender.statuses.first).to be_nil
end
end
context 'with following' do
- let(:custom_before_sub) { true }
-
before do
recipient.follow!(sender)
- subject.perform
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
expect(sender.statuses.first).to_not be_nil
end
end
@@ -2013,7 +2130,6 @@ RSpec.describe ActivityPub::Activity::Create do
end
context 'when ng rule is set' do
- let(:custom_before) { true }
let(:content) { 'Lorem ipsum GOOD LINK' }
let(:object_json) do
{
@@ -2027,10 +2143,11 @@ RSpec.describe ActivityPub::Activity::Create do
context 'when rule hits' do
before do
Fabricate(:ng_rule, status_text: 'ipsum', status_allow_follower_mention: false)
- subject.perform
end
it 'creates status' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
status = sender.statuses.first
expect(status).to be_nil
end
@@ -2039,10 +2156,11 @@ RSpec.describe ActivityPub::Activity::Create do
context 'when rule does not hit' do
before do
Fabricate(:ng_rule, status_text: 'amely', status_allow_follower_mention: false)
- subject.perform
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
end
@@ -2050,7 +2168,6 @@ RSpec.describe ActivityPub::Activity::Create do
end
context 'when sensitive word is set' do
- let(:custom_before) { true }
let(:content) { 'Lorem ipsum' }
let(:sensitive_words_all) { 'hello' }
let(:object_json) do
@@ -2065,11 +2182,12 @@ RSpec.describe ActivityPub::Activity::Create do
before do
Fabricate(:sensitive_word, keyword: sensitive_words_all, remote: true, spoiler: false) if sensitive_words_all.present?
Fabricate(:sensitive_word, keyword: 'ipsum')
- subject.perform
end
context 'when not contains sensitive words' do
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -2081,6 +2199,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:content) { 'hello world' }
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -2091,7 +2211,6 @@ RSpec.describe ActivityPub::Activity::Create do
context 'when hashtags limit is set' do
let(:post_hash_tags_max) { 2 }
- let(:custom_before) { true }
let(:object_json) do
{
id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
@@ -2115,11 +2234,12 @@ RSpec.describe ActivityPub::Activity::Create do
before do
Form::AdminSettings.new(post_hash_tags_max: post_hash_tags_max).save
- subject.perform
end
context 'when limit is enough' do
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
expect(sender.statuses.first).to_not be_nil
history = NgwordHistory.find_by(uri: object_json[:id])
@@ -2131,6 +2251,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:post_hash_tags_max) { 1 }
it 'creates status' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
expect(sender.statuses.first).to be_nil
history = NgwordHistory.find_by(uri: object_json[:id])
@@ -2146,7 +2268,6 @@ RSpec.describe ActivityPub::Activity::Create do
context 'when mentions limit is set' do
let(:post_mentions_max) { 3 }
let(:post_stranger_mentions_max) { 0 }
- let(:custom_before) { true }
let(:mention_recipient_alice) { Fabricate(:account) }
let(:mention_recipient_bob) { Fabricate(:account) }
let(:mention_recipient_ohagi) { Fabricate(:account) }
@@ -2180,12 +2301,12 @@ RSpec.describe ActivityPub::Activity::Create do
mention_recipient_alice.follow!(sender)
mention_recipient_bob.follow!(sender)
mention_recipient_ohagi.follow!(sender) if mention_recipient_ohagi_follow
-
- subject.perform
end
context 'when limit is enough' do
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
expect(sender.statuses.first).to_not be_nil
history = NgwordHistory.find_by(uri: object_json[:id])
@@ -2197,6 +2318,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:post_mentions_max) { 1 }
it 'creates status' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
expect(sender.statuses.first).to be_nil
history = NgwordHistory.find_by(uri: object_json[:id])
@@ -2211,6 +2334,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:post_stranger_mentions_max) { 1 }
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
expect(sender.statuses.first).to_not be_nil
history = NgwordHistory.find_by(uri: object_json[:id])
@@ -2223,6 +2348,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:mention_recipient_ohagi_follow) { false }
it 'creates status' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
expect(sender.statuses.first).to be_nil
history = NgwordHistory.find_by(uri: object_json[:id])
@@ -2236,7 +2363,6 @@ RSpec.describe ActivityPub::Activity::Create do
context 'when mentions limit for stranger is set' do
let(:post_stranger_mentions_max) { 2 }
- let(:custom_before) { true }
let(:object_json) do
{
id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
@@ -2258,11 +2384,12 @@ RSpec.describe ActivityPub::Activity::Create do
before do
Form::AdminSettings.new(post_stranger_mentions_max: post_stranger_mentions_max).save
- subject.perform
end
context 'when limit is enough' do
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
expect(sender.statuses.first).to_not be_nil
history = NgwordHistory.find_by(uri: object_json[:id])
@@ -2274,6 +2401,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:post_stranger_mentions_max) { 1 }
it 'creates status' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
expect(sender.statuses.first).to be_nil
history = NgwordHistory.find_by(uri: object_json[:id])
@@ -2302,12 +2431,9 @@ RSpec.describe ActivityPub::Activity::Create do
end
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
- to: 'https://www.w3.org/ns/activitystreams#Public',
- }
+ build_object(
+ to: 'https://www.w3.org/ns/activitystreams#Public'
+ )
end
before do
@@ -2344,16 +2470,18 @@ RSpec.describe ActivityPub::Activity::Create do
before do
sender.update(suspended_at: Time.now.utc, suspension_origin: :local, remote_pending: true)
- subject.perform
end
it 'does not create a status' do
- status = sender.statuses.first
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+ status = sender.statuses.first
expect(status).to be_nil
end
it 'pending data is created' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
pending = PendingStatus.find_by(account: sender)
expect(pending).to_not be_nil
@@ -2371,13 +2499,7 @@ RSpec.describe ActivityPub::Activity::Create do
subject.perform
end
- let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
- }
- end
+ let(:object_json) { build_object }
it 'creates status' do
status = sender.statuses.first
@@ -2392,12 +2514,9 @@ RSpec.describe ActivityPub::Activity::Create do
let!(:local_status) { Fabricate(:status) }
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
- inReplyTo: ActivityPub::TagManager.instance.uri_for(local_status),
- }
+ build_object(
+ inReplyTo: ActivityPub::TagManager.instance.uri_for(local_status)
+ )
end
before do
@@ -2463,13 +2582,11 @@ RSpec.describe ActivityPub::Activity::Create do
subject { described_class.new(json, sender, delivery: true) }
let!(:local_account) { Fabricate(:account) }
+
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
- to: ActivityPub::TagManager.instance.uri_for(local_account),
- }
+ build_object(
+ to: ActivityPub::TagManager.instance.uri_for(local_account)
+ )
end
before do
@@ -2489,12 +2606,9 @@ RSpec.describe ActivityPub::Activity::Create do
let!(:local_account) { Fabricate(:account) }
let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
- cc: ActivityPub::TagManager.instance.uri_for(local_account),
- }
+ build_object(
+ cc: ActivityPub::TagManager.instance.uri_for(local_account)
+ )
end
before do
@@ -2545,17 +2659,19 @@ RSpec.describe ActivityPub::Activity::Create do
subject.perform
end
- let(:object_json) do
- {
- id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
- type: 'Note',
- content: 'Lorem ipsum',
- }
- end
+ let(:object_json) { build_object }
it 'does not create anything' do
expect(sender.statuses.count).to eq 0
end
end
+
+ def build_object(options = {})
+ {
+ id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+ type: 'Note',
+ content: 'Lorem ipsum',
+ }.merge(options)
+ end
end
end
diff --git a/spec/lib/activitypub/activity/follow_spec.rb b/spec/lib/activitypub/activity/follow_spec.rb
index ec0e5e4eef..12c30feb28 100644
--- a/spec/lib/activitypub/activity/follow_spec.rb
+++ b/spec/lib/activitypub/activity/follow_spec.rb
@@ -380,11 +380,10 @@ RSpec.describe ActivityPub::Activity::Follow do
context 'when given a friend server' do
subject { described_class.new(json, sender) }
- let(:sender) { Fabricate(:account, domain: 'abc.com', url: 'https://abc.com/#actor') }
+ let(:sender) { Fabricate(:account, domain: 'abc.com', url: 'https://abc.com/#actor', shared_inbox_url: 'https://abc.com/shared_inbox') }
let!(:friend) { Fabricate(:friend_domain, domain: 'abc.com', inbox_url: 'https://example.com/inbox', passive_state: :idle) }
let!(:owner_user) { Fabricate(:user, role: UserRole.find_by(name: 'Owner')) }
let!(:patch_user) { Fabricate(:user, role: Fabricate(:user_role, name: 'OhagiOps', permissions: UserRole::FLAGS[:manage_federation])) }
- let(:inbox_url) { nil }
let(:json) do
{
@@ -393,7 +392,6 @@ RSpec.describe ActivityPub::Activity::Follow do
type: 'Follow',
actor: ActivityPub::TagManager.instance.uri_for(sender),
object: 'https://www.w3.org/ns/activitystreams#Public',
- inboxUrl: inbox_url,
}.with_indifferent_access
end
@@ -415,25 +413,34 @@ RSpec.describe ActivityPub::Activity::Follow do
expect(friend).to_not be_nil
expect(friend.they_are_pending?).to be true
expect(friend.passive_follow_activity_id).to eq 'foo'
- expect(friend.inbox_url).to eq 'https://abc.com/inbox'
+ expect(friend.inbox_url).to eq 'https://abc.com/shared_inbox'
end
end
- context 'when no record and inbox_url is specified' do
- let(:inbox_url) { 'https://ohagi.com/inbox' }
+ context 'when old spec which no record and inbox_url is specified' do
+ let(:json) do
+ {
+ '@context': 'https://www.w3.org/ns/activitystreams',
+ id: 'foo',
+ type: 'Follow',
+ actor: ActivityPub::TagManager.instance.uri_for(sender),
+ object: 'https://www.w3.org/ns/activitystreams#Public',
+ inboxUrl: 'https://evil.org/bad_inbox',
+ }.with_indifferent_access
+ end
before do
friend.destroy!
end
- it 'marks the friend as pending' do
+ it 'marks the friend as pending but inboxUrl is not working' do
subject.perform
friend = FriendDomain.find_by(domain: 'abc.com')
expect(friend).to_not be_nil
expect(friend.they_are_pending?).to be true
expect(friend.passive_follow_activity_id).to eq 'foo'
- expect(friend.inbox_url).to eq 'https://ohagi.com/inbox'
+ expect(friend.inbox_url).to eq 'https://abc.com/shared_inbox'
end
end
diff --git a/spec/lib/activitypub/linked_data_signature_spec.rb b/spec/lib/activitypub/linked_data_signature_spec.rb
index b1a8dc5c49..8128fdd070 100644
--- a/spec/lib/activitypub/linked_data_signature_spec.rb
+++ b/spec/lib/activitypub/linked_data_signature_spec.rb
@@ -13,10 +13,13 @@ RSpec.describe ActivityPub::LinkedDataSignature do
{
'@context' => 'https://www.w3.org/ns/activitystreams',
'id' => 'http://example.com/hello-world',
+ 'type' => 'Note',
+ 'content' => 'Hello world',
}
end
- let(:json) { raw_json.merge('signature' => signature) }
+ let(:signed_json) { raw_json.merge('signature' => signature) }
+ let(:json) { signed_json }
describe '#verify_actor!' do
context 'when signature matches' do
@@ -90,6 +93,54 @@ RSpec.describe ActivityPub::LinkedDataSignature do
expect(subject.verify_actor!).to be_nil
end
end
+
+ context 'when an attribute has been removed from the document' do
+ let(:signature) { raw_signature.merge('type' => 'RsaSignature2017', 'signatureValue' => sign(sender, raw_signature, raw_json)) }
+ let(:json) { signed_json.without('content') }
+
+ let(:raw_signature) do
+ {
+ 'creator' => 'http://example.com/alice',
+ 'created' => '2017-09-23T20:21:34Z',
+ }
+ end
+
+ it 'returns nil' do
+ expect(subject.verify_actor!).to be_nil
+ end
+ end
+
+ context 'when an attribute has been added to the document' do
+ let(:signature) { raw_signature.merge('type' => 'RsaSignature2017', 'signatureValue' => sign(sender, raw_signature, raw_json)) }
+ let(:json) { signed_json.merge('attributedTo' => 'http://example.com/bob') }
+
+ let(:raw_signature) do
+ {
+ 'creator' => 'http://example.com/alice',
+ 'created' => '2017-09-23T20:21:34Z',
+ }
+ end
+
+ it 'returns nil' do
+ expect(subject.verify_actor!).to be_nil
+ end
+ end
+
+ context 'when an existing attribute has been changed' do
+ let(:signature) { raw_signature.merge('type' => 'RsaSignature2017', 'signatureValue' => sign(sender, raw_signature, raw_json)) }
+ let(:json) { signed_json.merge('content' => 'oops') }
+
+ let(:raw_signature) do
+ {
+ 'creator' => 'http://example.com/alice',
+ 'created' => '2017-09-23T20:21:34Z',
+ }
+ end
+
+ it 'returns nil' do
+ expect(subject.verify_actor!).to be_nil
+ end
+ end
end
describe '#sign!' do
diff --git a/spec/lib/delivery_failure_tracker_spec.rb b/spec/lib/delivery_failure_tracker_spec.rb
index 40c8adc4c8..34912c8133 100644
--- a/spec/lib/delivery_failure_tracker_spec.rb
+++ b/spec/lib/delivery_failure_tracker_spec.rb
@@ -42,8 +42,8 @@ RSpec.describe DeliveryFailureTracker do
Fabricate(:unavailable_domain, domain: 'foo.bar')
end
- it 'removes URLs that are unavailable' do
- results = described_class.without_unavailable(['http://example.com/good/inbox', 'http://foo.bar/unavailable/inbox'])
+ it 'removes URLs that are bogus or unavailable' do
+ results = described_class.without_unavailable(['http://example.com/good/inbox', 'http://foo.bar/unavailable/inbox', '{foo:'])
expect(results).to include('http://example.com/good/inbox')
expect(results).to_not include('http://foo.bar/unavailable/inbox')
diff --git a/spec/lib/feed_manager_spec.rb b/spec/lib/feed_manager_spec.rb
index da6d416bf4..5ea0ba29a9 100644
--- a/spec/lib/feed_manager_spec.rb
+++ b/spec/lib/feed_manager_spec.rb
@@ -163,6 +163,7 @@ RSpec.describe FeedManager do
allow(List).to receive(:where).and_return(list)
status = Fabricate(:status, text: 'I post a lot', account: bob)
expect(described_class.instance.filter?(:home, status, alice)).to be true
+ expect(described_class.instance.filter(:home, status, alice)).to be :skip_home
end
it 'returns true for reblog from followee on exclusive list' do
@@ -173,6 +174,7 @@ RSpec.describe FeedManager do
status = Fabricate(:status, text: 'I post a lot', account: bob)
reblog = Fabricate(:status, reblog: status, account: jeff)
expect(described_class.instance.filter?(:home, reblog, alice)).to be true
+ expect(described_class.instance.filter(:home, reblog, alice)).to be :skip_home
end
it 'returns false for post from followee on non-exclusive list' do
@@ -229,6 +231,28 @@ RSpec.describe FeedManager do
end
end
+ context 'with list feed' do
+ let(:list) { Fabricate(:list, account: bob) }
+
+ before do
+ bob.follow!(alice)
+ list.list_accounts.create!(account: alice)
+ end
+
+ it "returns false for followee's status" do
+ status = Fabricate(:status, text: 'Hello world', account: alice)
+
+ expect(described_class.instance.filter?(:list, status, list)).to be false
+ end
+
+ it 'returns false for reblog by followee' do
+ status = Fabricate(:status, text: 'Hello world', account: jeff)
+ reblog = Fabricate(:status, reblog: status, account: alice)
+
+ expect(described_class.instance.filter?(:list, reblog, list)).to be false
+ end
+ end
+
context 'with mentions feed' do
it 'returns true for status that mentions blocked account' do
bob.block!(jeff)
diff --git a/spec/lib/mastodon/cli/email_domain_blocks_spec.rb b/spec/lib/mastodon/cli/email_domain_blocks_spec.rb
index a5fbd23e65..6ce1a7c5f3 100644
--- a/spec/lib/mastodon/cli/email_domain_blocks_spec.rb
+++ b/spec/lib/mastodon/cli/email_domain_blocks_spec.rb
@@ -63,6 +63,22 @@ RSpec.describe Mastodon::CLI::EmailDomainBlocks do
.and(change(EmailDomainBlock, :count).by(1))
end
end
+
+ context 'with --with-dns-records true' do
+ let(:domain) { 'host.example' }
+ let(:arguments) { [domain] }
+ let(:options) { { with_dns_records: true } }
+
+ before do
+ configure_mx(domain: domain, exchange: 'other.host')
+ end
+
+ it 'adds a new block for parent and children' do
+ expect { subject }
+ .to output_results('Added 2')
+ .and(change(EmailDomainBlock, :count).by(2))
+ end
+ end
end
describe '#remove' do
diff --git a/spec/lib/request_spec.rb b/spec/lib/request_spec.rb
index c600a48ee2..549362d1bf 100644
--- a/spec/lib/request_spec.rb
+++ b/spec/lib/request_spec.rb
@@ -58,16 +58,12 @@ RSpec.describe Request do
expect(a_request(:get, 'http://example.com')).to have_been_made.once
end
- it 'sets headers' do
- expect { |block| subject.perform(&block) }.to yield_control
- expect(a_request(:get, 'http://example.com').with(headers: subject.headers)).to have_been_made
- end
-
- it 'closes underlying connection' do
+ it 'makes a request with expected headers, yields, and closes the underlying connection' do
allow(subject.send(:http_client)).to receive(:close)
expect { |block| subject.perform(&block) }.to yield_control
+ expect(a_request(:get, 'http://example.com').with(headers: subject.headers)).to have_been_made
expect(subject.send(:http_client)).to have_received(:close)
end
@@ -78,6 +74,29 @@ RSpec.describe Request do
end
end
+ context 'with a redirect and HTTP signatures' do
+ let(:account) { Fabricate(:account) }
+
+ before do
+ stub_request(:get, 'http://example.com').to_return(status: 301, headers: { Location: 'http://redirected.example.com/foo' })
+ stub_request(:get, 'http://redirected.example.com/foo').to_return(body: 'lorem ipsum')
+ end
+
+ it 'makes a request with expected headers and follows redirects' do
+ expect { |block| subject.on_behalf_of(account).perform(&block) }.to yield_control
+
+ # request.headers includes the `Signature` sent for the first request
+ expect(a_request(:get, 'http://example.com').with(headers: subject.headers)).to have_been_made.once
+
+ # request.headers includes the `Signature`, but it has changed
+ expect(a_request(:get, 'http://redirected.example.com/foo').with(headers: subject.headers.merge({ 'Host' => 'redirected.example.com' }))).to_not have_been_made
+
+ # `with(headers: )` matching tests for inclusion, so strip `Signature`
+ # This doesn't actually test that there is a signature, but it tests that the original signature is not passed
+ expect(a_request(:get, 'http://redirected.example.com/foo').with(headers: subject.headers.without('Signature').merge({ 'Host' => 'redirected.example.com' }))).to have_been_made.once
+ end
+ end
+
context 'with private host' do
around do |example|
WebMock.disable!
diff --git a/spec/lib/search_query_transformer_spec.rb b/spec/lib/search_query_transformer_spec.rb
index 843577179a..cfc3ad14be 100644
--- a/spec/lib/search_query_transformer_spec.rb
+++ b/spec/lib/search_query_transformer_spec.rb
@@ -34,7 +34,7 @@ RSpec.describe SearchQueryTransformer do
let(:query) { "#{operator}:\"abc\"" }
it 'raises an exception' do
- expect { subject }.to raise_error(Mastodon::FilterValidationError, 'Invalid date abc')
+ expect { subject }.to raise_error(Date::Error)
end
end
end
diff --git a/spec/lib/vacuum/access_tokens_vacuum_spec.rb b/spec/lib/vacuum/access_tokens_vacuum_spec.rb
index 54760c41bd..8768f6b2dc 100644
--- a/spec/lib/vacuum/access_tokens_vacuum_spec.rb
+++ b/spec/lib/vacuum/access_tokens_vacuum_spec.rb
@@ -14,32 +14,24 @@ RSpec.describe Vacuum::AccessTokensVacuum do
let!(:expired_access_grant) { Fabricate(:access_grant, expires_in: 59.minutes.to_i, created_at: 1.hour.ago) }
let!(:active_access_grant) { Fabricate(:access_grant) }
- before do
+ it 'deletes revoked/expired access tokens and revoked/expired grants, but preserves active tokens/grants' do
subject.perform
- end
- it 'deletes revoked access tokens' do
- expect { revoked_access_token.reload }.to raise_error ActiveRecord::RecordNotFound
- end
+ expect { revoked_access_token.reload }
+ .to raise_error ActiveRecord::RecordNotFound
+ expect { expired_access_token.reload }
+ .to raise_error ActiveRecord::RecordNotFound
- it 'deletes expired access tokens' do
- expect { expired_access_token.reload }.to raise_error ActiveRecord::RecordNotFound
- end
+ expect { revoked_access_grant.reload }
+ .to raise_error ActiveRecord::RecordNotFound
+ expect { expired_access_grant.reload }
+ .to raise_error ActiveRecord::RecordNotFound
- it 'deletes revoked access grants' do
- expect { revoked_access_grant.reload }.to raise_error ActiveRecord::RecordNotFound
- end
+ expect { active_access_token.reload }
+ .to_not raise_error
- it 'deletes expired access grants' do
- expect { expired_access_grant.reload }.to raise_error ActiveRecord::RecordNotFound
- end
-
- it 'does not delete active access tokens' do
- expect { active_access_token.reload }.to_not raise_error
- end
-
- it 'does not delete active access grants' do
- expect { active_access_grant.reload }.to_not raise_error
+ expect { active_access_grant.reload }
+ .to_not raise_error
end
end
end
diff --git a/spec/lib/vacuum/backups_vacuum_spec.rb b/spec/lib/vacuum/backups_vacuum_spec.rb
index 867dbe4020..4a025352cb 100644
--- a/spec/lib/vacuum/backups_vacuum_spec.rb
+++ b/spec/lib/vacuum/backups_vacuum_spec.rb
@@ -11,16 +11,13 @@ RSpec.describe Vacuum::BackupsVacuum do
let!(:expired_backup) { Fabricate(:backup, created_at: (retention_period + 1.day).ago) }
let!(:current_backup) { Fabricate(:backup) }
- before do
+ it 'deletes backups past the retention period but preserves those within the period' do
subject.perform
- end
- it 'deletes backups past the retention period' do
- expect { expired_backup.reload }.to raise_error ActiveRecord::RecordNotFound
- end
-
- it 'does not delete backups within the retention period' do
- expect { current_backup.reload }.to_not raise_error
+ expect { expired_backup.reload }
+ .to raise_error ActiveRecord::RecordNotFound
+ expect { current_backup.reload }
+ .to_not raise_error
end
end
end
diff --git a/spec/lib/vacuum/feeds_vacuum_spec.rb b/spec/lib/vacuum/feeds_vacuum_spec.rb
index fa5381c8ae..66c43bec5f 100644
--- a/spec/lib/vacuum/feeds_vacuum_spec.rb
+++ b/spec/lib/vacuum/feeds_vacuum_spec.rb
@@ -18,11 +18,11 @@ RSpec.describe Vacuum::FeedsVacuum do
redis.sadd(feed_key_for(inactive_user, 'reblogs:2'), 3)
redis.zadd(list_key_for(list), 1, 1)
redis.zadd(antenna_key_for(antenna), 1, 1)
-
- subject.perform
end
it 'clears feeds of inactive users and lists' do
+ subject.perform
+
expect(redis.zcard(feed_key_for(inactive_user))).to eq 0
expect(redis.zcard(feed_key_for(active_user))).to eq 1
expect(redis.exists?(feed_key_for(inactive_user, 'reblogs'))).to be false
diff --git a/spec/lib/vacuum/media_attachments_vacuum_spec.rb b/spec/lib/vacuum/media_attachments_vacuum_spec.rb
index 1039c36cea..f7749038cb 100644
--- a/spec/lib/vacuum/media_attachments_vacuum_spec.rb
+++ b/spec/lib/vacuum/media_attachments_vacuum_spec.rb
@@ -17,9 +17,9 @@ RSpec.describe Vacuum::MediaAttachmentsVacuum do
let!(:old_unattached_media) { Fabricate(:media_attachment, account_id: nil, created_at: 10.days.ago) }
let!(:new_unattached_media) { Fabricate(:media_attachment, account_id: nil, created_at: 1.hour.ago) }
- before { subject.perform }
-
it 'handles attachments based on metadata details' do
+ subject.perform
+
expect(old_remote_media.reload.file) # Remote and past retention period
.to be_blank
expect(old_local_media.reload.file) # Local and past retention
diff --git a/spec/lib/vacuum/preview_cards_vacuum_spec.rb b/spec/lib/vacuum/preview_cards_vacuum_spec.rb
index 9dbdf0bc2f..caeedd3269 100644
--- a/spec/lib/vacuum/preview_cards_vacuum_spec.rb
+++ b/spec/lib/vacuum/preview_cards_vacuum_spec.rb
@@ -15,24 +15,22 @@ RSpec.describe Vacuum::PreviewCardsVacuum do
before do
old_preview_card.statuses << Fabricate(:status)
new_preview_card.statuses << Fabricate(:status)
+ end
+ it 'handles preview card cleanup' do
subject.perform
- end
- it 'deletes cache of preview cards last updated before the retention period' do
- expect(old_preview_card.reload.image).to be_blank
- end
+ expect(old_preview_card.reload.image) # last updated before retention period
+ .to be_blank
- it 'does not delete cache of preview cards last updated within the retention period' do
- expect(new_preview_card.reload.image).to_not be_blank
- end
+ expect(new_preview_card.reload.image) # last updated within the retention period
+ .to_not be_blank
- it 'does not delete attached preview cards' do
- expect(new_preview_card.reload).to be_persisted
- end
+ expect(new_preview_card.reload) # Keep attached preview cards
+ .to be_persisted
- it 'does not delete orphaned preview cards in the retention period' do
- expect(orphaned_preview_card.reload).to be_persisted
+ expect(orphaned_preview_card.reload) # keep orphaned cards in the retention period
+ .to be_persisted
end
end
end
diff --git a/spec/lib/vacuum/statuses_vacuum_spec.rb b/spec/lib/vacuum/statuses_vacuum_spec.rb
index 5bdf9fecb0..2e9f13c435 100644
--- a/spec/lib/vacuum/statuses_vacuum_spec.rb
+++ b/spec/lib/vacuum/statuses_vacuum_spec.rb
@@ -16,24 +16,20 @@ RSpec.describe Vacuum::StatusesVacuum do
let!(:local_status_old) { Fabricate(:status, created_at: (retention_period + 2.days).ago) }
let!(:local_status_recent) { Fabricate(:status, created_at: (retention_period - 2.days).ago) }
- before do
+ it 'deletes remote statuses past the retention period and keeps others' do
subject.perform
- end
- it 'deletes remote statuses past the retention period' do
- expect { remote_status_old.reload }.to raise_error ActiveRecord::RecordNotFound
- end
+ expect { remote_status_old.reload }
+ .to raise_error ActiveRecord::RecordNotFound
- it 'does not delete local statuses past the retention period' do
- expect { local_status_old.reload }.to_not raise_error
- end
+ expect { local_status_old.reload }
+ .to_not raise_error
- it 'does not delete remote statuses within the retention period' do
- expect { remote_status_recent.reload }.to_not raise_error
- end
+ expect { remote_status_recent.reload }
+ .to_not raise_error
- it 'does not delete local statuses within the retention period' do
- expect { local_status_recent.reload }.to_not raise_error
+ expect { local_status_recent.reload }
+ .to_not raise_error
end
end
diff --git a/spec/mailers/notification_mailer_spec.rb b/spec/mailers/notification_mailer_spec.rb
index 4c6107d9f7..d97c01858d 100644
--- a/spec/mailers/notification_mailer_spec.rb
+++ b/spec/mailers/notification_mailer_spec.rb
@@ -14,6 +14,17 @@ RSpec.describe NotificationMailer do
end
end
+ shared_examples 'delivery without status' do
+ context 'when notification target_status is missing' do
+ before { allow(notification).to receive(:target_status).and_return(nil) }
+
+ it 'does not deliver mail' do
+ emails = capture_emails { mail.deliver_now }
+ expect(emails).to be_empty
+ end
+ end
+ end
+
let(:receiver) { Fabricate(:user, account_attributes: { username: 'alice' }) }
let(:sender) { Fabricate(:account, username: 'bob') }
let(:foreign_status) { Fabricate(:status, account: sender, text: 'The body of the foreign status') }
@@ -37,6 +48,7 @@ RSpec.describe NotificationMailer do
end
include_examples 'delivery to non functional user'
+ include_examples 'delivery without status'
end
describe 'follow' do
@@ -75,6 +87,7 @@ RSpec.describe NotificationMailer do
end
include_examples 'delivery to non functional user'
+ include_examples 'delivery without status'
end
describe 'reblog' do
@@ -95,6 +108,7 @@ RSpec.describe NotificationMailer do
end
include_examples 'delivery to non functional user'
+ include_examples 'delivery without status'
end
describe 'follow_request' do
diff --git a/spec/models/account_statuses_cleanup_policy_spec.rb b/spec/models/account_statuses_cleanup_policy_spec.rb
index a08fd723a4..c142a0359a 100644
--- a/spec/models/account_statuses_cleanup_policy_spec.rb
+++ b/spec/models/account_statuses_cleanup_policy_spec.rb
@@ -16,6 +16,8 @@ RSpec.describe AccountStatusesCleanupPolicy do
describe 'save hooks' do
context 'when widening a policy' do
+ subject { account_statuses_cleanup_policy.last_inspected }
+
let!(:account_statuses_cleanup_policy) do
Fabricate(:account_statuses_cleanup_policy,
account: account,
@@ -33,64 +35,64 @@ RSpec.describe AccountStatusesCleanupPolicy do
account_statuses_cleanup_policy.record_last_inspected(42)
end
- it 'invalidates last_inspected when widened because of keep_direct' do
- account_statuses_cleanup_policy.keep_direct = false
- account_statuses_cleanup_policy.save
- expect(account_statuses_cleanup_policy.last_inspected).to be_nil
+ context 'when widened because of keep_direct' do
+ before { account_statuses_cleanup_policy.update(keep_direct: false) }
+
+ it { is_expected.to be_nil }
end
- it 'invalidates last_inspected when widened because of keep_pinned' do
- account_statuses_cleanup_policy.keep_pinned = false
- account_statuses_cleanup_policy.save
- expect(account_statuses_cleanup_policy.last_inspected).to be_nil
+ context 'when widened because of keep_pinned' do
+ before { account_statuses_cleanup_policy.update(keep_pinned: false) }
+
+ it { is_expected.to be_nil }
end
- it 'invalidates last_inspected when widened because of keep_polls' do
- account_statuses_cleanup_policy.keep_polls = false
- account_statuses_cleanup_policy.save
- expect(account_statuses_cleanup_policy.last_inspected).to be_nil
+ context 'when widened because of keep_polls' do
+ before { account_statuses_cleanup_policy.update(keep_polls: false) }
+
+ it { is_expected.to be_nil }
end
- it 'invalidates last_inspected when widened because of keep_media' do
- account_statuses_cleanup_policy.keep_media = false
- account_statuses_cleanup_policy.save
- expect(account_statuses_cleanup_policy.last_inspected).to be_nil
+ context 'when widened because of keep_media' do
+ before { account_statuses_cleanup_policy.update(keep_media: false) }
+
+ it { is_expected.to be_nil }
end
- it 'invalidates last_inspected when widened because of keep_self_fav' do
- account_statuses_cleanup_policy.keep_self_fav = false
- account_statuses_cleanup_policy.save
- expect(account_statuses_cleanup_policy.last_inspected).to be_nil
+ context 'when widened because of keep_self_fav' do
+ before { account_statuses_cleanup_policy.update(keep_self_fav: false) }
+
+ it { is_expected.to be_nil }
end
- it 'invalidates last_inspected when widened because of keep_self_bookmark' do
- account_statuses_cleanup_policy.keep_self_bookmark = false
- account_statuses_cleanup_policy.save
- expect(account_statuses_cleanup_policy.last_inspected).to be_nil
+ context 'when widened because of keep_self_bookmark' do
+ before { account_statuses_cleanup_policy.update(keep_self_bookmark: false) }
+
+ it { is_expected.to be_nil }
end
- it 'invalidates last_inspected when widened because of higher min_favs' do
- account_statuses_cleanup_policy.min_favs = 5
- account_statuses_cleanup_policy.save
- expect(account_statuses_cleanup_policy.last_inspected).to be_nil
+ context 'when widened because of higher min_favs' do
+ before { account_statuses_cleanup_policy.update(min_favs: 5) }
+
+ it { is_expected.to be_nil }
end
- it 'invalidates last_inspected when widened because of disabled min_favs' do
- account_statuses_cleanup_policy.min_favs = nil
- account_statuses_cleanup_policy.save
- expect(account_statuses_cleanup_policy.last_inspected).to be_nil
+ context 'when widened because of disabled min_favs' do
+ before { account_statuses_cleanup_policy.update(min_favs: nil) }
+
+ it { is_expected.to be_nil }
end
- it 'invalidates last_inspected when widened because of higher min_reblogs' do
- account_statuses_cleanup_policy.min_reblogs = 5
- account_statuses_cleanup_policy.save
- expect(account_statuses_cleanup_policy.last_inspected).to be_nil
+ context 'when widened because of higher min_reblogs' do
+ before { account_statuses_cleanup_policy.update(min_reblogs: 5) }
+
+ it { is_expected.to be_nil }
end
- it 'invalidates last_inspected when widened because of disable min_reblogs' do
- account_statuses_cleanup_policy.min_reblogs = nil
- account_statuses_cleanup_policy.save
- expect(account_statuses_cleanup_policy.last_inspected).to be_nil
+ context 'when widened because of disable min_reblogs' do
+ before { account_statuses_cleanup_policy.update(min_reblogs: nil) }
+
+ it { is_expected.to be_nil }
end
end
diff --git a/spec/models/admin/ng_rule_spec.rb b/spec/models/admin/ng_rule_spec.rb
index fb85e6e9bb..ccae8403b4 100644
--- a/spec/models/admin/ng_rule_spec.rb
+++ b/spec/models/admin/ng_rule_spec.rb
@@ -278,5 +278,35 @@ RSpec.describe Admin::NgRule do
it_behaves_like 'matches rule', 'reaction'
end
+
+ context 'with emoji reaction origin domain' do
+ let(:account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/actor') }
+ let(:ng_rule) { Fabricate(:ng_rule, reaction_type: ['emoji_reaction'], emoji_reaction_origin_domain: 'ohagi.com') }
+
+ context 'when remote emoji matches domain' do
+ let(:options) { { uri: uri, recipient: Fabricate(:account), reaction_type: 'emoji_reaction', emoji_reaction_origin_domain: 'ohagi.com' } }
+
+ it_behaves_like 'matches rule', 'reaction'
+ end
+
+ context 'when remote emoji does not match domain' do
+ let(:options) { { uri: uri, recipient: Fabricate(:account), reaction_type: 'emoji_reaction', emoji_reaction_origin_domain: 'test.com' } }
+
+ it_behaves_like 'does not match rule'
+ end
+
+ context 'when local emoji' do
+ let(:options) { { uri: uri, recipient: Fabricate(:account), reaction_type: 'emoji_reaction', emoji_reaction_origin_domain: nil } }
+
+ it_behaves_like 'does not match rule'
+ end
+
+ context 'when local emoji but all options match' do
+ let(:ng_rule) { Fabricate(:ng_rule, reaction_type: ['emoji_reaction']) }
+ let(:options) { { uri: uri, recipient: Fabricate(:account), reaction_type: 'emoji_reaction', emoji_reaction_origin_domain: nil } }
+
+ it_behaves_like 'matches rule', 'reaction'
+ end
+ end
end
end
diff --git a/spec/models/block_spec.rb b/spec/models/block_spec.rb
index 84f0f318f4..62d7e40e28 100644
--- a/spec/models/block_spec.rb
+++ b/spec/models/block_spec.rb
@@ -3,11 +3,37 @@
require 'rails_helper'
RSpec.describe Block do
- describe 'validations' do
+ describe 'Associations' do
it { is_expected.to belong_to(:account).required }
it { is_expected.to belong_to(:target_account).required }
end
+ describe '#local?' do
+ it { is_expected.to_not be_local }
+ end
+
+ describe 'Callbacks' do
+ describe 'Setting a URI' do
+ context 'when URI exists' do
+ subject { Fabricate.build :block, uri: 'https://uri/value' }
+
+ it 'does not change' do
+ expect { subject.save }
+ .to not_change(subject, :uri)
+ end
+ end
+
+ context 'when URI is blank' do
+ subject { Fabricate.build :follow, uri: nil }
+
+ it 'populates the value' do
+ expect { subject.save }
+ .to change(subject, :uri).to(be_present)
+ end
+ end
+ end
+ end
+
it 'removes blocking cache after creation' do
account = Fabricate(:account)
target_account = Fabricate(:account)
diff --git a/spec/models/export_spec.rb b/spec/models/export_spec.rb
index 06bf07ed78..48e78830dd 100644
--- a/spec/models/export_spec.rb
+++ b/spec/models/export_spec.rb
@@ -3,66 +3,175 @@
require 'rails_helper'
RSpec.describe Export do
+ subject { described_class.new(account) }
+
let(:account) { Fabricate(:account) }
let(:target_accounts) do
- [{}, { username: 'one', domain: 'local.host' }].map(&method(:Fabricate).curry(2).call(:account))
+ [
+ Fabricate(:account),
+ Fabricate(:account, username: 'one', domain: 'local.host'),
+ ]
end
- describe 'to_csv' do
- it 'returns a csv of the blocked accounts' do
- target_accounts.each { |target_account| account.block!(target_account) }
+ describe '#to_bookmarks_csv' do
+ before { Fabricate.times(2, :bookmark, account: account) }
- export = described_class.new(account).to_blocked_accounts_csv
- results = export.strip.split
+ let(:export) { CSV.parse(subject.to_bookmarks_csv) }
- expect(results.size).to eq 2
- expect(results.first).to eq 'one@local.host'
+ it 'returns a csv of bookmarks' do
+ expect(export)
+ .to contain_exactly(
+ include(/statuses/),
+ include(/statuses/)
+ )
end
+ end
+
+ describe '#to_blocked_accounts_csv' do
+ before { target_accounts.each { |target_account| account.block!(target_account) } }
+
+ let(:export) { CSV.parse(subject.to_blocked_accounts_csv) }
+
+ it 'returns a csv of the blocked accounts' do
+ expect(export)
+ .to contain_exactly(
+ include('one@local.host'),
+ include(be_present)
+ )
+ end
+ end
+
+ describe '#to_muted_accounts_csv' do
+ before { target_accounts.each { |target_account| account.mute!(target_account) } }
+
+ let(:export) { CSV.parse(subject.to_muted_accounts_csv) }
it 'returns a csv of the muted accounts' do
- target_accounts.each { |target_account| account.mute!(target_account) }
-
- export = described_class.new(account).to_muted_accounts_csv
- results = export.strip.split("\n")
-
- expect(results.size).to eq 3
- expect(results.first).to eq 'Account address,Hide notifications'
- expect(results.second).to eq 'one@local.host,true'
+ expect(export)
+ .to contain_exactly(
+ contain_exactly('Account address', 'Hide notifications'),
+ include('one@local.host', 'true'),
+ include(be_present)
+ )
end
+ end
+
+ describe '#to_following_accounts_csv' do
+ before { target_accounts.each { |target_account| account.follow!(target_account) } }
+
+ let(:export) { CSV.parse(subject.to_following_accounts_csv) }
it 'returns a csv of the following accounts' do
- target_accounts.each { |target_account| account.follow!(target_account) }
-
- export = described_class.new(account).to_following_accounts_csv
- results = export.strip.split("\n")
-
- expect(results.size).to eq 3
- expect(results.first).to eq 'Account address,Show boosts,Notify on new posts,Languages'
- expect(results.second).to eq 'one@local.host,true,false,'
+ expect(export)
+ .to contain_exactly(
+ contain_exactly('Account address', 'Show boosts', 'Notify on new posts', 'Languages'),
+ include('one@local.host', 'true', 'false', be_blank),
+ include(be_present)
+ )
end
end
- describe 'total_storage' do
+ describe '#to_lists_csv' do
+ before do
+ target_accounts.each do |target_account|
+ account.follow!(target_account)
+ Fabricate(:list, account: account).accounts << target_account
+ end
+ end
+
+ let(:export) { CSV.parse(subject.to_lists_csv) }
+
+ it 'returns a csv of the lists' do
+ expect(export)
+ .to contain_exactly(
+ include('one@local.host'),
+ include(be_present)
+ )
+ end
+ end
+
+ describe '#to_blocked_domains_csv' do
+ before { Fabricate.times(2, :account_domain_block, account: account) }
+
+ let(:export) { CSV.parse(subject.to_blocked_domains_csv) }
+
+ it 'returns a csv of the blocked domains' do
+ expect(export)
+ .to contain_exactly(
+ include(/example/),
+ include(/example/)
+ )
+ end
+ end
+
+ describe '#total_storage' do
it 'returns the total size of the media attachments' do
media_attachment = Fabricate(:media_attachment, account: account)
- expect(described_class.new(account).total_storage).to eq media_attachment.file_file_size || 0
+ expect(subject.total_storage).to eq media_attachment.file_file_size || 0
end
end
- describe 'total_follows' do
- it 'returns the total number of the followed accounts' do
- target_accounts.each { |target_account| account.follow!(target_account) }
- expect(described_class.new(account.reload).total_follows).to eq 2
+ describe '#total_statuses' do
+ before { Fabricate.times(2, :status, account: account) }
+
+ it 'returns the total number of statuses' do
+ expect(subject.total_statuses).to eq(2)
end
+ end
+
+ describe '#total_bookmarks' do
+ before { Fabricate.times(2, :bookmark, account: account) }
+
+ it 'returns the total number of bookmarks' do
+ expect(subject.total_bookmarks).to eq(2)
+ end
+ end
+
+ describe '#total_follows' do
+ before { target_accounts.each { |target_account| account.follow!(target_account) } }
+
+ it 'returns the total number of the followed accounts' do
+ expect(subject.total_follows).to eq(2)
+ end
+ end
+
+ describe '#total_lists' do
+ before { Fabricate.times(2, :list, account: account) }
+
+ it 'returns the total number of lists' do
+ expect(subject.total_lists).to eq(2)
+ end
+ end
+
+ describe '#total_followers' do
+ before { target_accounts.each { |target_account| target_account.follow!(account) } }
+
+ it 'returns the total number of the follower accounts' do
+ expect(subject.total_followers).to eq(2)
+ end
+ end
+
+ describe '#total_blocks' do
+ before { target_accounts.each { |target_account| account.block!(target_account) } }
it 'returns the total number of the blocked accounts' do
- target_accounts.each { |target_account| account.block!(target_account) }
- expect(described_class.new(account.reload).total_blocks).to eq 2
+ expect(subject.total_blocks).to eq(2)
end
+ end
+
+ describe '#total_mutes' do
+ before { target_accounts.each { |target_account| account.mute!(target_account) } }
it 'returns the total number of the muted accounts' do
- target_accounts.each { |target_account| account.mute!(target_account) }
- expect(described_class.new(account.reload).total_mutes).to eq 2
+ expect(subject.total_mutes).to eq(2)
+ end
+ end
+
+ describe '#total_domain_blocks' do
+ before { Fabricate.times(2, :account_domain_block, account: account) }
+
+ it 'returns the total number of account domain blocks' do
+ expect(subject.total_domain_blocks).to eq(2)
end
end
end
diff --git a/spec/models/featured_tag_spec.rb b/spec/models/featured_tag_spec.rb
index 0f5ead8f97..20059cfba4 100644
--- a/spec/models/featured_tag_spec.rb
+++ b/spec/models/featured_tag_spec.rb
@@ -126,16 +126,54 @@ RSpec.describe FeaturedTag do
end
describe '#decrement' do
- it 'decreases the count and updates the last_status_at timestamp' do
- tag = Fabricate :tag, name: 'test'
- status = Fabricate :status, visibility: :public, created_at: 10.days.ago
- status.tags << tag
+ let(:tag) { Fabricate(:tag, name: 'test') }
+ let(:account) { Fabricate(:account) }
+ let(:featured_tag) { Fabricate(:featured_tag, name: 'test', account: account) }
- featured_tag = Fabricate :featured_tag, name: 'test', account: status.account
+ context 'when removing the last status using the tag' do
+ let(:status) { Fabricate(:status, visibility: :public, account: account, created_at: 10.days.ago) }
- expect { featured_tag.decrement(status.id) }
- .to change(featured_tag, :statuses_count).from(1).to(0)
- .and change(featured_tag, :last_status_at).to(nil)
+ before do
+ status.tags << tag
+ end
+
+ it 'decreases the count and updates the last_status_at timestamp' do
+ expect { featured_tag.decrement(status) }
+ .to change(featured_tag, :statuses_count).from(1).to(0)
+ .and change(featured_tag, :last_status_at).to(nil)
+ end
+ end
+
+ context 'when removing a previous status using the tag' do
+ let(:previous_status) { Fabricate(:status, visibility: :public, account: account, created_at: 1.month.ago) }
+ let(:status) { Fabricate(:status, visibility: :public, account: account, created_at: 10.days.ago) }
+
+ before do
+ previous_status.tags << tag
+ status.tags << tag
+ end
+
+ it 'decreases the count and updates the last_status_at timestamp' do
+ expect { featured_tag.decrement(previous_status) }
+ .to change(featured_tag, :statuses_count).from(2).to(1)
+ .and not_change(featured_tag, :last_status_at)
+ end
+ end
+
+ context 'when removing the most recent use of the tag' do
+ let(:previous_status) { Fabricate(:status, visibility: :public, account: account, created_at: 1.month.ago) }
+ let(:status) { Fabricate(:status, visibility: :public, account: account, created_at: 10.days.ago) }
+
+ before do
+ previous_status.tags << tag
+ status.tags << tag
+ end
+
+ it 'decreases the count and updates the last_status_at timestamp' do
+ expect { featured_tag.decrement(status) }
+ .to change(featured_tag, :statuses_count).from(2).to(1)
+ .and change(featured_tag, :last_status_at)
+ end
end
end
end
diff --git a/spec/models/friend_domain_spec.rb b/spec/models/friend_domain_spec.rb
index 336f921ebd..d3992ed149 100644
--- a/spec/models/friend_domain_spec.rb
+++ b/spec/models/friend_domain_spec.rb
@@ -21,7 +21,6 @@ RSpec.describe FriendDomain do
type: 'Follow',
actor: 'https://cb6e6126.ngrok.io/actor',
object: 'https://www.w3.org/ns/activitystreams#Public',
- inboxUrl: 'https://cb6e6126.ngrok.io/inbox',
}))).to have_been_made.once
end
end
diff --git a/spec/models/list_spec.rb b/spec/models/list_spec.rb
index 62a84dfebf..48c273d3ec 100644
--- a/spec/models/list_spec.rb
+++ b/spec/models/list_spec.rb
@@ -11,7 +11,11 @@ RSpec.describe List do
context 'when account has hit max list limit' do
let(:account) { Fabricate :account }
- before { stub_const 'List::PER_ACCOUNT_LIMIT', 0 }
+ before do
+ stub_const 'List::PER_ACCOUNT_LIMIT', 1
+
+ Fabricate(:list, account: account)
+ end
context 'when creating a new list' do
it { is_expected.to_not allow_value(account).for(:account).against(:base).with_message(I18n.t('lists.errors.limit')) }
diff --git a/spec/models/media_attachment_spec.rb b/spec/models/media_attachment_spec.rb
index 5f91ae0967..43e9ed087b 100644
--- a/spec/models/media_attachment_spec.rb
+++ b/spec/models/media_attachment_spec.rb
@@ -295,12 +295,21 @@ RSpec.describe MediaAttachment, :attachment_processing do
end
it 'queues CacheBusterWorker jobs' do
- original_path = media.file.path(:original)
- small_path = media.file.path(:small)
+ original_url = media.file.url(:original)
+ small_url = media.file.url(:small)
expect { media.destroy }
- .to enqueue_sidekiq_job(CacheBusterWorker).with(original_path)
- .and enqueue_sidekiq_job(CacheBusterWorker).with(small_path)
+ .to enqueue_sidekiq_job(CacheBusterWorker).with(original_url)
+ .and enqueue_sidekiq_job(CacheBusterWorker).with(small_url)
+ end
+
+ context 'with a missing remote attachment' do
+ let(:media) { Fabricate(:media_attachment, remote_url: 'https://example.com/foo.png', file: nil) }
+
+ it 'does not queue CacheBusterWorker jobs' do
+ expect { media.destroy }
+ .to_not enqueue_sidekiq_job(CacheBusterWorker)
+ end
end
end
diff --git a/spec/models/notification_policy_spec.rb b/spec/models/notification_policy_spec.rb
index 02a582bb08..7d1b494dd5 100644
--- a/spec/models/notification_policy_spec.rb
+++ b/spec/models/notification_policy_spec.rb
@@ -7,19 +7,25 @@ RSpec.describe NotificationPolicy do
subject { Fabricate(:notification_policy) }
let(:sender) { Fabricate(:account) }
+ let(:suspended_sender) { Fabricate(:account) }
before do
Fabricate.times(2, :notification, account: subject.account, activity: Fabricate(:status, account: sender), filtered: true, type: :mention)
Fabricate(:notification_request, account: subject.account, from_account: sender)
+
+ Fabricate(:notification, account: subject.account, activity: Fabricate(:status, account: suspended_sender), filtered: true, type: :mention)
+ Fabricate(:notification_request, account: subject.account, from_account: suspended_sender)
+
+ suspended_sender.suspend!
+
subject.summarize!
end
- it 'sets pending_requests_count' do
- expect(subject.pending_requests_count).to eq 1
- end
-
- it 'sets pending_notifications_count' do
- expect(subject.pending_notifications_count).to eq 2
+ it 'sets pending_requests_count and pending_notifications_count' do
+ expect(subject).to have_attributes(
+ pending_requests_count: 1,
+ pending_notifications_count: 2
+ )
end
end
end
diff --git a/spec/models/poll_spec.rb b/spec/models/poll_spec.rb
index 736f3615d0..66f521ab3f 100644
--- a/spec/models/poll_spec.rb
+++ b/spec/models/poll_spec.rb
@@ -3,7 +3,7 @@
require 'rails_helper'
RSpec.describe Poll do
- describe 'scopes' do
+ describe 'Scopes' do
let(:status) { Fabricate(:status) }
let(:attached_poll) { Fabricate(:poll, status: status) }
let(:not_attached_poll) do
@@ -13,7 +13,7 @@ RSpec.describe Poll do
end
end
- describe 'attached' do
+ describe '.attached' do
it 'finds the correct records' do
results = described_class.attached
@@ -21,7 +21,7 @@ RSpec.describe Poll do
end
end
- describe 'unattached' do
+ describe '.unattached' do
it 'finds the correct records' do
results = described_class.unattached
@@ -30,11 +30,23 @@ RSpec.describe Poll do
end
end
- describe 'validations' do
- context 'when not valid' do
- subject { Fabricate.build(:poll) }
+ describe '#reset_votes!' do
+ let(:poll) { Fabricate :poll, cached_tallies: [2, 3], votes_count: 5, voters_count: 5 }
+ let!(:vote) { Fabricate :poll_vote, poll: }
- it { is_expected.to validate_presence_of(:expires_at) }
+ it 'resets vote data and deletes votes' do
+ expect { poll.reset_votes! }
+ .to change(poll, :cached_tallies).to([0, 0])
+ .and change(poll, :votes_count).to(0)
+ .and(change(poll, :voters_count).to(0))
+ expect { vote.reload }
+ .to raise_error(ActiveRecord::RecordNotFound)
end
end
+
+ describe 'Validations' do
+ subject { Fabricate.build(:poll) }
+
+ it { is_expected.to validate_presence_of(:expires_at) }
+ end
end
diff --git a/spec/models/public_feed_spec.rb b/spec/models/public_feed_spec.rb
index d948b958d6..63878d563e 100644
--- a/spec/models/public_feed_spec.rb
+++ b/spec/models/public_feed_spec.rb
@@ -80,12 +80,10 @@ RSpec.describe PublicFeed do
context 'without a viewer' do
let(:viewer) { nil }
- it 'includes remote instances statuses' do
- expect(subject).to include(remote_status.id)
- end
-
- it 'includes local statuses' do
- expect(subject).to include(local_status.id)
+ it 'includes remote instances statuses and local statuses' do
+ expect(subject)
+ .to include(remote_status.id)
+ .and include(local_status.id)
end
it 'includes public_unlisted statuses' do
@@ -108,12 +106,10 @@ RSpec.describe PublicFeed do
context 'with a viewer' do
let(:viewer) { Fabricate(:account, username: 'viewer') }
- it 'includes remote instances statuses' do
- expect(subject).to include(remote_status.id)
- end
-
- it 'includes local statuses' do
- expect(subject).to include(local_status.id)
+ it 'includes remote instances statuses and local statuses' do
+ expect(subject)
+ .to include(remote_status.id)
+ .and include(local_status.id)
end
it 'excludes public_unlisted statuses' do
diff --git a/spec/models/report_filter_spec.rb b/spec/models/report_filter_spec.rb
index 8668eb3d10..51933e475a 100644
--- a/spec/models/report_filter_spec.rb
+++ b/spec/models/report_filter_spec.rb
@@ -30,4 +30,17 @@ RSpec.describe ReportFilter do
expect(Report).to have_received(:resolved)
end
end
+
+ context 'when given remote target_origin and also by_target_domain' do
+ let!(:matching_report) { Fabricate :report, target_account: Fabricate(:account, domain: 'match.example') }
+ let!(:non_matching_report) { Fabricate :report, target_account: Fabricate(:account, domain: 'other.example') }
+
+ it 'preserves the domain value' do
+ filter = described_class.new(by_target_domain: 'match.example', target_origin: 'remote')
+
+ expect(filter.results)
+ .to include(matching_report)
+ .and not_include(non_matching_report)
+ end
+ end
end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 7a29e51d08..be9a5a76eb 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -419,23 +419,43 @@ RSpec.describe User do
end
end
- describe 'token_for_app' do
+ describe '#token_for_app' do
let(:user) { Fabricate(:user) }
- let(:app) { Fabricate(:application, owner: user) }
- it 'returns a token' do
- expect(user.token_for_app(app)).to be_a(Doorkeeper::AccessToken)
+ context 'when user owns app but does not have tokens' do
+ let(:app) { Fabricate(:application, owner: user) }
+
+ it 'creates and returns a persisted token' do
+ expect { user.token_for_app(app) }
+ .to change(Doorkeeper::AccessToken.where(resource_owner_id: user.id, application: app), :count).by(1)
+ end
end
- it 'persists a token' do
- t = user.token_for_app(app)
- expect(user.token_for_app(app)).to eql(t)
+ context 'when user owns app and already has tokens' do
+ let(:app) { Fabricate(:application, owner: user) }
+ let!(:token) { Fabricate :access_token, application: app, resource_owner_id: user.id }
+
+ it 'returns a persisted token' do
+ expect(user.token_for_app(app))
+ .to be_a(Doorkeeper::AccessToken)
+ .and eq(token)
+ end
end
- it 'is nil if user does not own app' do
- app.update!(owner: nil)
+ context 'when user does not own app' do
+ let(:app) { Fabricate(:application) }
- expect(user.token_for_app(app)).to be_nil
+ it 'returns nil' do
+ expect(user.token_for_app(app))
+ .to be_nil
+ end
+ end
+
+ context 'when app is nil' do
+ it 'returns nil' do
+ expect(user.token_for_app(nil))
+ .to be_nil
+ end
end
end
diff --git a/spec/policies/account_moderation_note_policy_spec.rb b/spec/policies/account_moderation_note_policy_spec.rb
index 8c37acc39f..8b33a71012 100644
--- a/spec/policies/account_moderation_note_policy_spec.rb
+++ b/spec/policies/account_moderation_note_policy_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'rails_helper'
-require 'pundit/rspec'
RSpec.describe AccountModerationNotePolicy do
subject { described_class }
@@ -12,13 +11,13 @@ RSpec.describe AccountModerationNotePolicy do
permissions :create? do
context 'when staff' do
it 'grants to create' do
- expect(subject).to permit(admin, described_class)
+ expect(subject).to permit(admin, AccountModerationNote)
end
end
context 'when not staff' do
it 'denies to create' do
- expect(subject).to_not permit(john, described_class)
+ expect(subject).to_not permit(john, AccountModerationNote)
end
end
end
diff --git a/spec/policies/account_policy_spec.rb b/spec/policies/account_policy_spec.rb
index d7a21d8e39..75724e831b 100644
--- a/spec/policies/account_policy_spec.rb
+++ b/spec/policies/account_policy_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'rails_helper'
-require 'pundit/rspec'
RSpec.describe AccountPolicy do
subject { described_class }
@@ -24,7 +23,7 @@ RSpec.describe AccountPolicy do
end
end
- permissions :show?, :unsilence?, :unsensitive?, :remove_avatar?, :remove_header? do
+ permissions :show?, :unsilence?, :unsensitive?, :remove_avatar?, :remove_header?, :sensitive?, :warn? do
context 'when staff' do
it 'permits' do
expect(subject).to permit(admin, alice)
diff --git a/spec/policies/account_warning_policy_spec.rb b/spec/policies/account_warning_policy_spec.rb
new file mode 100644
index 0000000000..9abc9d35d6
--- /dev/null
+++ b/spec/policies/account_warning_policy_spec.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe AccountWarningPolicy do
+ subject { described_class }
+
+ let(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
+ let(:account) { Fabricate(:account) }
+
+ permissions :show? do
+ context 'with an admin' do
+ it { is_expected.to permit(admin, AccountWarning.new) }
+ end
+
+ context 'with a non-admin' do
+ context 'when account is not target' do
+ it { is_expected.to_not permit(account, AccountWarning.new) }
+ end
+
+ context 'when account is target' do
+ it { is_expected.to permit(account, AccountWarning.new(target_account_id: account.id)) }
+ end
+ end
+ end
+
+ permissions :appeal? do
+ context 'when account is not target' do
+ it { is_expected.to_not permit(account, AccountWarning.new) }
+ end
+
+ context 'when account is target' do
+ context 'when record is appealable' do
+ it { is_expected.to permit(account, AccountWarning.new(target_account_id: account.id, created_at: Appeal::MAX_STRIKE_AGE.ago + 1.hour)) }
+ end
+
+ context 'when record is not appealable' do
+ it { is_expected.to_not permit(account, AccountWarning.new(target_account_id: account.id, created_at: Appeal::MAX_STRIKE_AGE.ago - 1.hour)) }
+ end
+ end
+ end
+end
diff --git a/spec/policies/account_warning_preset_policy_spec.rb b/spec/policies/account_warning_preset_policy_spec.rb
index 53e224f19f..33f2fb1187 100644
--- a/spec/policies/account_warning_preset_policy_spec.rb
+++ b/spec/policies/account_warning_preset_policy_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'rails_helper'
-require 'pundit/rspec'
RSpec.describe AccountWarningPresetPolicy do
let(:policy) { described_class }
@@ -11,13 +10,13 @@ RSpec.describe AccountWarningPresetPolicy do
permissions :index?, :create?, :update?, :destroy? do
context 'with an admin' do
it 'permits' do
- expect(policy).to permit(admin, Tag)
+ expect(policy).to permit(admin, AccountWarningPreset)
end
end
context 'with a non-admin' do
it 'denies' do
- expect(policy).to_not permit(john, Tag)
+ expect(policy).to_not permit(john, AccountWarningPreset)
end
end
end
diff --git a/spec/policies/admin/status_policy_spec.rb b/spec/policies/admin/status_policy_spec.rb
index 07af425516..4df29393e3 100644
--- a/spec/policies/admin/status_policy_spec.rb
+++ b/spec/policies/admin/status_policy_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'rails_helper'
-require 'pundit/rspec'
RSpec.describe Admin::StatusPolicy do
let(:policy) { described_class }
@@ -13,13 +12,13 @@ RSpec.describe Admin::StatusPolicy do
permissions :index?, :update?, :review?, :destroy? do
context 'with an admin' do
it 'permits' do
- expect(policy).to permit(admin, Tag)
+ expect(policy).to permit(admin, Status)
end
end
context 'with a non-admin' do
it 'denies' do
- expect(policy).to_not permit(john, Tag)
+ expect(policy).to_not permit(john, Status)
end
end
end
diff --git a/spec/policies/announcement_policy_spec.rb b/spec/policies/announcement_policy_spec.rb
index 503ffca6dc..ab0c1dbaf5 100644
--- a/spec/policies/announcement_policy_spec.rb
+++ b/spec/policies/announcement_policy_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'rails_helper'
-require 'pundit/rspec'
RSpec.describe AnnouncementPolicy do
let(:policy) { described_class }
@@ -11,13 +10,13 @@ RSpec.describe AnnouncementPolicy do
permissions :index?, :create?, :update?, :destroy? do
context 'with an admin' do
it 'permits' do
- expect(policy).to permit(admin, Tag)
+ expect(policy).to permit(admin, Announcement)
end
end
context 'with a non-admin' do
it 'denies' do
- expect(policy).to_not permit(john, Tag)
+ expect(policy).to_not permit(john, Announcement)
end
end
end
diff --git a/spec/policies/appeal_policy_spec.rb b/spec/policies/appeal_policy_spec.rb
index 1bf8ce0a0d..cdb93bf56c 100644
--- a/spec/policies/appeal_policy_spec.rb
+++ b/spec/policies/appeal_policy_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'rails_helper'
-require 'pundit/rspec'
RSpec.describe AppealPolicy do
let(:policy) { described_class }
@@ -12,18 +11,18 @@ RSpec.describe AppealPolicy do
permissions :index? do
context 'with an admin' do
it 'permits' do
- expect(policy).to permit(admin, Tag)
+ expect(policy).to permit(admin, Appeal)
end
end
context 'with a non-admin' do
it 'denies' do
- expect(policy).to_not permit(john, Tag)
+ expect(policy).to_not permit(john, Appeal)
end
end
end
- permissions :reject? do
+ permissions :reject?, :approve? do
context 'with an admin' do
context 'with a pending appeal' do
before { allow(appeal).to receive(:pending?).and_return(true) }
diff --git a/spec/policies/audit_log_policy_spec.rb b/spec/policies/audit_log_policy_spec.rb
new file mode 100644
index 0000000000..d9d9359433
--- /dev/null
+++ b/spec/policies/audit_log_policy_spec.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe AuditLogPolicy do
+ subject { described_class }
+
+ let(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
+ let(:account) { Fabricate(:account) }
+
+ permissions :index? do
+ context 'with an admin' do
+ it { is_expected.to permit(admin, nil) }
+ end
+
+ context 'with a non-admin' do
+ it { is_expected.to_not permit(account, nil) }
+ end
+ end
+end
diff --git a/spec/policies/backup_policy_spec.rb b/spec/policies/backup_policy_spec.rb
index 28cb65d789..031021d91d 100644
--- a/spec/policies/backup_policy_spec.rb
+++ b/spec/policies/backup_policy_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'rails_helper'
-require 'pundit/rspec'
RSpec.describe BackupPolicy do
subject { described_class }
diff --git a/spec/policies/canonical_email_block_policy_spec.rb b/spec/policies/canonical_email_block_policy_spec.rb
index f5029d9e6b..b253b439a6 100644
--- a/spec/policies/canonical_email_block_policy_spec.rb
+++ b/spec/policies/canonical_email_block_policy_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'rails_helper'
-require 'pundit/rspec'
RSpec.describe CanonicalEmailBlockPolicy do
let(:policy) { described_class }
@@ -11,13 +10,13 @@ RSpec.describe CanonicalEmailBlockPolicy do
permissions :index?, :show?, :test?, :create?, :destroy? do
context 'with an admin' do
it 'permits' do
- expect(policy).to permit(admin, Tag)
+ expect(policy).to permit(admin, CanonicalEmailBlock)
end
end
context 'with a non-admin' do
it 'denies' do
- expect(policy).to_not permit(john, Tag)
+ expect(policy).to_not permit(john, CanonicalEmailBlock)
end
end
end
diff --git a/spec/policies/custom_emoji_policy_spec.rb b/spec/policies/custom_emoji_policy_spec.rb
index cb869c7d9a..189885938c 100644
--- a/spec/policies/custom_emoji_policy_spec.rb
+++ b/spec/policies/custom_emoji_policy_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'rails_helper'
-require 'pundit/rspec'
RSpec.describe CustomEmojiPolicy do
subject { described_class }
diff --git a/spec/policies/dashboard_policy_spec.rb b/spec/policies/dashboard_policy_spec.rb
new file mode 100644
index 0000000000..90c71db381
--- /dev/null
+++ b/spec/policies/dashboard_policy_spec.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe DashboardPolicy do
+ subject { described_class }
+
+ let(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
+ let(:account) { Fabricate(:account) }
+
+ permissions :index? do
+ context 'with an admin' do
+ it { is_expected.to permit(admin, nil) }
+ end
+
+ context 'with a non-admin' do
+ it { is_expected.to_not permit(account, nil) }
+ end
+ end
+end
diff --git a/spec/policies/delivery_policy_spec.rb b/spec/policies/delivery_policy_spec.rb
index bb82389eec..8bc200159a 100644
--- a/spec/policies/delivery_policy_spec.rb
+++ b/spec/policies/delivery_policy_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'rails_helper'
-require 'pundit/rspec'
RSpec.describe DeliveryPolicy do
let(:policy) { described_class }
@@ -11,13 +10,13 @@ RSpec.describe DeliveryPolicy do
permissions :clear_delivery_errors?, :restart_delivery?, :stop_delivery? do
context 'with an admin' do
it 'permits' do
- expect(policy).to permit(admin, Tag)
+ expect(policy).to permit(admin, nil)
end
end
context 'with a non-admin' do
it 'denies' do
- expect(policy).to_not permit(john, Tag)
+ expect(policy).to_not permit(john, nil)
end
end
end
diff --git a/spec/policies/domain_allow_policy_spec.rb b/spec/policies/domain_allow_policy_spec.rb
new file mode 100644
index 0000000000..1d285065b8
--- /dev/null
+++ b/spec/policies/domain_allow_policy_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe DomainAllowPolicy do
+ subject { described_class }
+
+ let(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
+ let(:john) { Fabricate(:account) }
+
+ permissions :index?, :show?, :create?, :destroy? do
+ context 'when admin' do
+ it 'permits' do
+ expect(subject).to permit(admin, DomainAllow)
+ end
+ end
+
+ context 'when not admin' do
+ it 'denies' do
+ expect(subject).to_not permit(john, DomainAllow)
+ end
+ end
+ end
+end
diff --git a/spec/policies/domain_block_policy_spec.rb b/spec/policies/domain_block_policy_spec.rb
index 4c89f3f374..7c77d1870d 100644
--- a/spec/policies/domain_block_policy_spec.rb
+++ b/spec/policies/domain_block_policy_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'rails_helper'
-require 'pundit/rspec'
RSpec.describe DomainBlockPolicy do
subject { described_class }
@@ -9,7 +8,7 @@ RSpec.describe DomainBlockPolicy do
let(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
let(:john) { Fabricate(:account) }
- permissions :index?, :show?, :create?, :destroy? do
+ permissions :index?, :show?, :create?, :destroy?, :update? do
context 'when admin' do
it 'permits' do
expect(subject).to permit(admin, DomainBlock)
diff --git a/spec/policies/email_domain_block_policy_spec.rb b/spec/policies/email_domain_block_policy_spec.rb
index 7ecff4be49..e98d65a3c7 100644
--- a/spec/policies/email_domain_block_policy_spec.rb
+++ b/spec/policies/email_domain_block_policy_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'rails_helper'
-require 'pundit/rspec'
RSpec.describe EmailDomainBlockPolicy do
subject { described_class }
diff --git a/spec/policies/follow_recommendation_policy_spec.rb b/spec/policies/follow_recommendation_policy_spec.rb
index ae74d5c3a8..665ed9b059 100644
--- a/spec/policies/follow_recommendation_policy_spec.rb
+++ b/spec/policies/follow_recommendation_policy_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'rails_helper'
-require 'pundit/rspec'
RSpec.describe FollowRecommendationPolicy do
let(:policy) { described_class }
@@ -11,13 +10,13 @@ RSpec.describe FollowRecommendationPolicy do
permissions :show?, :suppress?, :unsuppress? do
context 'with an admin' do
it 'permits' do
- expect(policy).to permit(admin, Tag)
+ expect(policy).to permit(admin, FollowRecommendation)
end
end
context 'with a non-admin' do
it 'denies' do
- expect(policy).to_not permit(john, Tag)
+ expect(policy).to_not permit(john, FollowRecommendation)
end
end
end
diff --git a/spec/policies/instance_policy_spec.rb b/spec/policies/instance_policy_spec.rb
index a0d9a008b7..6cdc738022 100644
--- a/spec/policies/instance_policy_spec.rb
+++ b/spec/policies/instance_policy_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'rails_helper'
-require 'pundit/rspec'
RSpec.describe InstancePolicy do
subject { described_class }
diff --git a/spec/policies/invite_policy_spec.rb b/spec/policies/invite_policy_spec.rb
index cbe3735d80..3717a44999 100644
--- a/spec/policies/invite_policy_spec.rb
+++ b/spec/policies/invite_policy_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'rails_helper'
-require 'pundit/rspec'
RSpec.describe InvitePolicy do
subject { described_class }
diff --git a/spec/policies/ip_block_policy_spec.rb b/spec/policies/ip_block_policy_spec.rb
index 97bc239e9a..33ea342c10 100644
--- a/spec/policies/ip_block_policy_spec.rb
+++ b/spec/policies/ip_block_policy_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'rails_helper'
-require 'pundit/rspec'
RSpec.describe IpBlockPolicy do
let(:policy) { described_class }
@@ -11,13 +10,13 @@ RSpec.describe IpBlockPolicy do
permissions :index?, :show?, :create?, :update?, :destroy? do
context 'with an admin' do
it 'permits' do
- expect(policy).to permit(admin, Tag)
+ expect(policy).to permit(admin, IpBlock)
end
end
context 'with a non-admin' do
it 'denies' do
- expect(policy).to_not permit(john, Tag)
+ expect(policy).to_not permit(john, IpBlock)
end
end
end
diff --git a/spec/policies/poll_policy_spec.rb b/spec/policies/poll_policy_spec.rb
new file mode 100644
index 0000000000..aa1701cb06
--- /dev/null
+++ b/spec/policies/poll_policy_spec.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe PollPolicy do
+ subject { described_class }
+
+ let(:account) { Fabricate(:account) }
+ let(:poll) { Fabricate :poll }
+
+ permissions :vote? do
+ context 'when account cannot view status' do
+ before { poll.status.update(visibility: :private) }
+
+ it { is_expected.to_not permit(account, poll) }
+ end
+
+ context 'when account can view status' do
+ context 'when accounts do not block each other' do
+ it { is_expected.to permit(account, poll) }
+ end
+
+ context 'when view blocks poll creator' do
+ before { Fabricate :block, account: account, target_account: poll.account }
+
+ it { is_expected.to_not permit(account, poll) }
+ end
+
+ context 'when poll creator blocks viewer' do
+ before { Fabricate :block, account: poll.account, target_account: account }
+
+ it { is_expected.to_not permit(account, poll) }
+ end
+ end
+ end
+end
diff --git a/spec/policies/preview_card_policy_spec.rb b/spec/policies/preview_card_policy_spec.rb
index a1944303e1..d02a6016cd 100644
--- a/spec/policies/preview_card_policy_spec.rb
+++ b/spec/policies/preview_card_policy_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'rails_helper'
-require 'pundit/rspec'
RSpec.describe PreviewCardPolicy do
let(:policy) { described_class }
@@ -11,13 +10,13 @@ RSpec.describe PreviewCardPolicy do
permissions :index?, :review? do
context 'with an admin' do
it 'permits' do
- expect(policy).to permit(admin, Tag)
+ expect(policy).to permit(admin, PreviewCard)
end
end
context 'with a non-admin' do
it 'denies' do
- expect(policy).to_not permit(john, Tag)
+ expect(policy).to_not permit(john, PreviewCard)
end
end
end
diff --git a/spec/policies/preview_card_provider_policy_spec.rb b/spec/policies/preview_card_provider_policy_spec.rb
index 676039a1b7..5e25b364a4 100644
--- a/spec/policies/preview_card_provider_policy_spec.rb
+++ b/spec/policies/preview_card_provider_policy_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'rails_helper'
-require 'pundit/rspec'
RSpec.describe PreviewCardProviderPolicy do
let(:policy) { described_class }
@@ -11,13 +10,13 @@ RSpec.describe PreviewCardProviderPolicy do
permissions :index?, :review? do
context 'with an admin' do
it 'permits' do
- expect(policy).to permit(admin, Tag)
+ expect(policy).to permit(admin, PreviewCardProvider)
end
end
context 'with a non-admin' do
it 'denies' do
- expect(policy).to_not permit(john, Tag)
+ expect(policy).to_not permit(john, PreviewCardProvider)
end
end
end
diff --git a/spec/policies/relay_policy_spec.rb b/spec/policies/relay_policy_spec.rb
index 29ba02c26a..5983b2d2ff 100644
--- a/spec/policies/relay_policy_spec.rb
+++ b/spec/policies/relay_policy_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'rails_helper'
-require 'pundit/rspec'
RSpec.describe RelayPolicy do
subject { described_class }
diff --git a/spec/policies/report_note_policy_spec.rb b/spec/policies/report_note_policy_spec.rb
index b40a878887..02317f763a 100644
--- a/spec/policies/report_note_policy_spec.rb
+++ b/spec/policies/report_note_policy_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'rails_helper'
-require 'pundit/rspec'
RSpec.describe ReportNotePolicy do
subject { described_class }
diff --git a/spec/policies/report_policy_spec.rb b/spec/policies/report_policy_spec.rb
index 4fc4178075..67f40b5188 100644
--- a/spec/policies/report_policy_spec.rb
+++ b/spec/policies/report_policy_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'rails_helper'
-require 'pundit/rspec'
RSpec.describe ReportPolicy do
subject { described_class }
diff --git a/spec/policies/rule_policy_spec.rb b/spec/policies/rule_policy_spec.rb
index 5d435e38c1..3086f30446 100644
--- a/spec/policies/rule_policy_spec.rb
+++ b/spec/policies/rule_policy_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'rails_helper'
-require 'pundit/rspec'
RSpec.describe RulePolicy do
let(:policy) { described_class }
@@ -11,13 +10,13 @@ RSpec.describe RulePolicy do
permissions :index?, :create?, :update?, :destroy? do
context 'with an admin' do
it 'permits' do
- expect(policy).to permit(admin, Tag)
+ expect(policy).to permit(admin, Rule)
end
end
context 'with a non-admin' do
it 'denies' do
- expect(policy).to_not permit(john, Tag)
+ expect(policy).to_not permit(john, Rule)
end
end
end
diff --git a/spec/policies/settings_policy_spec.rb b/spec/policies/settings_policy_spec.rb
index 4a99314905..48821c706a 100644
--- a/spec/policies/settings_policy_spec.rb
+++ b/spec/policies/settings_policy_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'rails_helper'
-require 'pundit/rspec'
RSpec.describe SettingsPolicy do
subject { described_class }
diff --git a/spec/policies/software_update_policy_spec.rb b/spec/policies/software_update_policy_spec.rb
index e19ba61612..2bda84cce9 100644
--- a/spec/policies/software_update_policy_spec.rb
+++ b/spec/policies/software_update_policy_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'rails_helper'
-require 'pundit/rspec'
RSpec.describe SoftwareUpdatePolicy do
subject { described_class }
diff --git a/spec/policies/status_policy_spec.rb b/spec/policies/status_policy_spec.rb
index a6c71e0cb0..2d386e829f 100644
--- a/spec/policies/status_policy_spec.rb
+++ b/spec/policies/status_policy_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'rails_helper'
-require 'pundit/rspec'
RSpec.describe StatusPolicy, type: :model do
subject { described_class }
diff --git a/spec/policies/tag_policy_spec.rb b/spec/policies/tag_policy_spec.rb
index 35da3cc62a..23166e4669 100644
--- a/spec/policies/tag_policy_spec.rb
+++ b/spec/policies/tag_policy_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'rails_helper'
-require 'pundit/rspec'
RSpec.describe TagPolicy do
subject { described_class }
diff --git a/spec/policies/user_policy_spec.rb b/spec/policies/user_policy_spec.rb
index 7854547d26..11a166a24e 100644
--- a/spec/policies/user_policy_spec.rb
+++ b/spec/policies/user_policy_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'rails_helper'
-require 'pundit/rspec'
RSpec.describe UserPolicy do
subject { described_class }
@@ -112,4 +111,42 @@ RSpec.describe UserPolicy do
end
end
end
+
+ permissions :approve?, :reject? do
+ context 'when admin' do
+ context 'when user is approved' do
+ it { is_expected.to_not permit(admin, User.new(approved: true)) }
+ end
+
+ context 'when user is not approved' do
+ it { is_expected.to permit(admin, User.new(approved: false)) }
+ end
+ end
+
+ context 'when not admin' do
+ it { is_expected.to_not permit(john, User.new) }
+ end
+ end
+
+ permissions :change_role? do
+ context 'when not admin' do
+ it { is_expected.to_not permit(john, User.new) }
+ end
+
+ context 'when admin' do
+ let(:user) { User.new(role: role) }
+
+ context 'when role of admin overrides user role' do
+ let(:role) { UserRole.new(position: admin.user.role.position - 10, id: 123) }
+
+ it { is_expected.to permit(admin, user) }
+ end
+
+ context 'when role of admin does not override user role' do
+ let(:role) { UserRole.new(position: admin.user.role.position + 10, id: 123) }
+
+ it { is_expected.to_not permit(admin, user) }
+ end
+ end
+ end
end
diff --git a/spec/policies/user_role_policy_spec.rb b/spec/policies/user_role_policy_spec.rb
new file mode 100644
index 0000000000..c48b345d68
--- /dev/null
+++ b/spec/policies/user_role_policy_spec.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe UserRolePolicy do
+ subject { described_class }
+
+ let(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
+ let(:account) { Fabricate(:account) }
+
+ permissions :index?, :create? do
+ context 'when admin' do
+ it { is_expected.to permit(admin, UserRole.new) }
+ end
+
+ context 'when not admin' do
+ it { is_expected.to_not permit(account, UserRole.new) }
+ end
+ end
+
+ permissions :update? do
+ context 'when admin' do
+ context 'when role of admin overrides relevant role' do
+ it { is_expected.to permit(admin, UserRole.new(position: admin.user.role.position - 10, id: 123)) }
+ end
+
+ context 'when role of admin does not override relevant role' do
+ it { is_expected.to_not permit(admin, UserRole.new(position: admin.user.role.position + 10, id: 123)) }
+ end
+ end
+
+ context 'when not admin' do
+ it { is_expected.to_not permit(account, UserRole.new) }
+ end
+ end
+
+ permissions :destroy? do
+ context 'when admin' do
+ context 'when role of admin overrides relevant role' do
+ it { is_expected.to permit(admin, UserRole.new(position: admin.user.role.position - 10)) }
+ end
+
+ context 'when role of admin does not override relevant role' do
+ it { is_expected.to_not permit(admin, UserRole.new(position: admin.user.role.position + 10)) }
+ end
+
+ context 'when everyone role' do
+ it { is_expected.to_not permit(admin, UserRole.everyone) }
+ end
+ end
+
+ context 'when not admin' do
+ it { is_expected.to_not permit(account, UserRole.new) }
+ end
+ end
+end
diff --git a/spec/policies/webhook_policy_spec.rb b/spec/policies/webhook_policy_spec.rb
index 96aaae2c30..9899235d83 100644
--- a/spec/policies/webhook_policy_spec.rb
+++ b/spec/policies/webhook_policy_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'rails_helper'
-require 'pundit/rspec'
RSpec.describe WebhookPolicy do
let(:policy) { described_class }
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index ee03b49bc6..d2ad40be73 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -43,6 +43,7 @@ require 'paperclip/matchers'
require 'capybara/rspec'
require 'chewy/rspec'
require 'email_spec/rspec'
+require 'pundit/rspec'
require 'test_prof/recipes/rspec/before_all'
Rails.root.glob('spec/support/**/*.rb').each { |f| require f }
@@ -112,6 +113,7 @@ RSpec.configure do |config|
config.include ActiveSupport::Testing::TimeHelpers
config.include Chewy::Rspec::Helpers
config.include Redisable
+ config.include DomainHelpers
config.include ThreadingHelpers
config.include SignedRequestHelpers, type: :request
config.include CommandLineHelpers, type: :cli
@@ -161,6 +163,11 @@ RSpec.configure do |config|
host! Rails.configuration.x.local_domain
end
+ config.before :each, type: :system do
+ # Align with capybara config so that rails helpers called from rspec use matching host
+ host! 'localhost:3000'
+ end
+
config.after do
Rails.cache.clear
redis.del(redis.keys)
diff --git a/spec/requests/api/v1/accounts/credentials_spec.rb b/spec/requests/api/v1/accounts/credentials_spec.rb
index 0bd3ace132..91a4721eca 100644
--- a/spec/requests/api/v1/accounts/credentials_spec.rb
+++ b/spec/requests/api/v1/accounts/credentials_spec.rb
@@ -53,8 +53,6 @@ RSpec.describe 'credentials API' do
patch '/api/v1/accounts/update_credentials', headers: headers, params: params
end
- before { allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_async) }
-
let(:params) do
{
avatar: fixture_file_upload('avatar.gif', 'image/gif'),
@@ -112,7 +110,7 @@ RSpec.describe 'credentials API' do
})
expect(ActivityPub::UpdateDistributionWorker)
- .to have_received(:perform_async).with(user.account_id)
+ .to have_enqueued_sidekiq_job(user.account_id)
end
def expect_account_updates
diff --git a/spec/requests/api/v1/accounts_spec.rb b/spec/requests/api/v1/accounts_spec.rb
index b4e6a07973..d423a08f12 100644
--- a/spec/requests/api/v1/accounts_spec.rb
+++ b/spec/requests/api/v1/accounts_spec.rb
@@ -200,6 +200,26 @@ RSpec.describe '/api/v1/accounts' do
end
end
+ context 'when user tries to follow their own account' do
+ subject do
+ post "/api/v1/accounts/#{other_account.id}/follow", headers: headers
+ end
+
+ let(:locked) { false }
+ let(:other_account) { user.account }
+
+ it 'returns http forbidden and error message' do
+ subject
+
+ error_msg = I18n.t('accounts.self_follow_error')
+
+ expect(response).to have_http_status(403)
+ expect(response.parsed_body[:error]).to eq(error_msg)
+ end
+
+ it_behaves_like 'forbidden for wrong scope', 'read:accounts'
+ end
+
context 'when modifying follow options' do
let(:locked) { false }
diff --git a/spec/requests/api/v1/antennas_spec.rb b/spec/requests/api/v1/antennas_spec.rb
index 3b4846bf06..913789fe99 100644
--- a/spec/requests/api/v1/antennas_spec.rb
+++ b/spec/requests/api/v1/antennas_spec.rb
@@ -120,6 +120,20 @@ RSpec.describe 'Antennas' do
expect(Antenna.where(account: user.account).count).to eq(1)
end
+ context 'when specify a list when create new' do
+ let(:list) { Fabricate(:list, account: user.account, title: 'ohagi') }
+ let(:params) { { title: 'my antenna', list_id: list.id.to_s, insert_feeds: 'true' } }
+
+ it 'returns the new antenna with list', :aggregate_failures do
+ subject
+
+ expect(response).to have_http_status(200)
+ expect(response.parsed_body).to match(a_hash_including(title: 'my antenna', insert_feeds: true))
+ expect(response.parsed_body['list']).to match(a_hash_including(id: list.id.to_s, title: list.title))
+ expect(Antenna.where(account: user.account).count).to eq(1)
+ end
+ end
+
context 'when a title is not given' do
let(:params) { { title: '' } }
diff --git a/spec/requests/api/v1/apps/credentials_spec.rb b/spec/requests/api/v1/apps/credentials_spec.rb
index 8e5fa14b7e..3aca53ed0a 100644
--- a/spec/requests/api/v1/apps/credentials_spec.rb
+++ b/spec/requests/api/v1/apps/credentials_spec.rb
@@ -44,6 +44,7 @@ RSpec.describe 'Credentials' do
expect(response.parsed_body)
.to not_include(client_id: be_present)
.and not_include(client_secret: be_present)
+ .and not_include(client_secret_expires_at: be_present)
end
end
diff --git a/spec/requests/api/v1/apps_spec.rb b/spec/requests/api/v1/apps_spec.rb
index cf43e14d62..4e9147ba32 100644
--- a/spec/requests/api/v1/apps_spec.rb
+++ b/spec/requests/api/v1/apps_spec.rb
@@ -42,6 +42,7 @@ RSpec.describe 'Apps' do
id: app.id.to_s,
client_id: app.uid,
client_secret: app.secret,
+ client_secret_expires_at: 0,
name: client_name,
website: website,
scopes: ['read', 'write'],
diff --git a/spec/requests/api/v1/instances/domain_blocks_spec.rb b/spec/requests/api/v1/instances/domain_blocks_spec.rb
index d0707d784c..40b79c9691 100644
--- a/spec/requests/api/v1/instances/domain_blocks_spec.rb
+++ b/spec/requests/api/v1/instances/domain_blocks_spec.rb
@@ -4,14 +4,15 @@ require 'rails_helper'
RSpec.describe 'Domain Blocks' do
let(:user) { Fabricate(:user) }
- let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+ let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes).token }
let(:scopes) { 'read' }
- let(:headers) { { Authorization: "Bearer #{token.token}" } }
+ let(:headers) { { Authorization: "Bearer #{token}" } }
describe 'GET /api/v1/instance/domain_blocks' do
- before do
- Fabricate(:domain_block)
- end
+ let(:user) { Fabricate(:user) }
+ let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id).token }
+
+ before { Fabricate(:domain_block) }
context 'with domain blocks set to all' do
before { Setting.show_domain_blocks = 'all' }
@@ -45,11 +46,95 @@ RSpec.describe 'Domain Blocks' do
context 'with domain blocks set to users' do
before { Setting.show_domain_blocks = 'users' }
- it 'returns http not found' do
- get api_v1_instance_domain_blocks_path
+ context 'without authentication token' do
+ it 'returns http not found' do
+ get api_v1_instance_domain_blocks_path
- expect(response)
- .to have_http_status(404)
+ expect(response)
+ .to have_http_status(404)
+ end
+ end
+
+ context 'with authentication token' do
+ context 'with unapproved user' do
+ before { user.update(approved: false) }
+
+ it 'returns http not found' do
+ get api_v1_instance_domain_blocks_path, headers: { 'Authorization' => "Bearer #{token}" }
+
+ expect(response)
+ .to have_http_status(404)
+ end
+ end
+
+ context 'with unconfirmed user' do
+ before { user.update(confirmed_at: nil) }
+
+ it 'returns http not found' do
+ get api_v1_instance_domain_blocks_path, headers: { 'Authorization' => "Bearer #{token}" }
+
+ expect(response)
+ .to have_http_status(404)
+ end
+ end
+
+ context 'with disabled user' do
+ before { user.update(disabled: true) }
+
+ it 'returns http not found' do
+ get api_v1_instance_domain_blocks_path, headers: { 'Authorization' => "Bearer #{token}" }
+
+ expect(response)
+ .to have_http_status(404)
+ end
+ end
+
+ context 'with suspended user' do
+ before { user.account.update(suspended_at: Time.zone.now) }
+
+ it 'returns http not found' do
+ get api_v1_instance_domain_blocks_path, headers: { 'Authorization' => "Bearer #{token}" }
+
+ expect(response)
+ .to have_http_status(403)
+ end
+ end
+
+ context 'with moved user' do
+ before { user.account.update(moved_to_account_id: Fabricate(:account).id) }
+
+ it 'returns http success' do
+ get api_v1_instance_domain_blocks_path, headers: { 'Authorization' => "Bearer #{token}" }
+
+ expect(response)
+ .to have_http_status(200)
+
+ expect(response.content_type)
+ .to start_with('application/json')
+
+ expect(response.parsed_body)
+ .to be_present
+ .and(be_an(Array))
+ .and(have_attributes(size: 1))
+ end
+ end
+
+ context 'with normal user' do
+ it 'returns http success' do
+ get api_v1_instance_domain_blocks_path, headers: { 'Authorization' => "Bearer #{token}" }
+
+ expect(response)
+ .to have_http_status(200)
+
+ expect(response.content_type)
+ .to start_with('application/json')
+
+ expect(response.parsed_body)
+ .to be_present
+ .and(be_an(Array))
+ .and(have_attributes(size: 1))
+ end
+ end
end
end
diff --git a/spec/requests/api/v1/profiles_spec.rb b/spec/requests/api/v1/profiles_spec.rb
index fd3ab4bf58..de7a20b133 100644
--- a/spec/requests/api/v1/profiles_spec.rb
+++ b/spec/requests/api/v1/profiles_spec.rb
@@ -15,10 +15,6 @@ RSpec.describe 'Deleting profile images' do
let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
describe 'DELETE /api/v1/profile' do
- before do
- allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_async)
- end
-
context 'when deleting an avatar' do
context 'with wrong scope' do
before do
@@ -38,7 +34,8 @@ RSpec.describe 'Deleting profile images' do
account.reload
expect(account.avatar).to_not exist
expect(account.header).to exist
- expect(ActivityPub::UpdateDistributionWorker).to have_received(:perform_async).with(account.id)
+ expect(ActivityPub::UpdateDistributionWorker)
+ .to have_enqueued_sidekiq_job(account.id)
end
end
@@ -61,7 +58,8 @@ RSpec.describe 'Deleting profile images' do
account.reload
expect(account.avatar).to exist
expect(account.header).to_not exist
- expect(ActivityPub::UpdateDistributionWorker).to have_received(:perform_async).with(account.id)
+ expect(ActivityPub::UpdateDistributionWorker)
+ .to have_enqueued_sidekiq_job(account.id)
end
end
end
diff --git a/spec/requests/api/v2/instance_spec.rb b/spec/requests/api/v2/instance_spec.rb
index fae92b7391..f6a670cc24 100644
--- a/spec/requests/api/v2/instance_spec.rb
+++ b/spec/requests/api/v2/instance_spec.rb
@@ -56,7 +56,7 @@ RSpec.describe 'Instances' do
max_media_attachments: Status::MEDIA_ATTACHMENTS_LIMIT
),
polls: include(
- max_options: PollValidator::MAX_OPTIONS
+ max_options: PollOptionsValidator::MAX_OPTIONS
)
)
)
diff --git a/spec/requests/api/v2/notifications_spec.rb b/spec/requests/api/v2/notifications_spec.rb
index ffa0a71c77..72df063d49 100644
--- a/spec/requests/api/v2/notifications_spec.rb
+++ b/spec/requests/api/v2/notifications_spec.rb
@@ -143,6 +143,55 @@ RSpec.describe 'Notifications' do
end
end
+ context 'when there are numerous notifications for the same final group' do
+ before do
+ user.account.notifications.destroy_all
+ 5.times.each { FavouriteService.new.call(Fabricate(:account), user.account.statuses.first) }
+ end
+
+ context 'with no options' do
+ it 'returns a notification group covering all notifications' do
+ subject
+
+ notification_ids = user.account.notifications.order(id: :asc).pluck(:id)
+
+ expect(response).to have_http_status(200)
+ expect(response.content_type)
+ .to start_with('application/json')
+ expect(response.parsed_body[:notification_groups]).to contain_exactly(
+ a_hash_including(
+ type: 'favourite',
+ sample_account_ids: have_attributes(size: 5),
+ page_min_id: notification_ids.first.to_s,
+ page_max_id: notification_ids.last.to_s
+ )
+ )
+ end
+ end
+
+ context 'with min_id param' do
+ let(:params) { { min_id: user.account.notifications.order(id: :asc).first.id - 1 } }
+
+ it 'returns a notification group covering all notifications' do
+ subject
+
+ notification_ids = user.account.notifications.order(id: :asc).pluck(:id)
+
+ expect(response).to have_http_status(200)
+ expect(response.content_type)
+ .to start_with('application/json')
+ expect(response.parsed_body[:notification_groups]).to contain_exactly(
+ a_hash_including(
+ type: 'favourite',
+ sample_account_ids: have_attributes(size: 5),
+ page_min_id: notification_ids.first.to_s,
+ page_max_id: notification_ids.last.to_s
+ )
+ )
+ end
+ end
+ end
+
context 'with no options' do
it 'returns expected notification types', :aggregate_failures do
subject
@@ -316,6 +365,18 @@ RSpec.describe 'Notifications' do
.to start_with('application/json')
end
+ context 'with an ungrouped notification' do
+ let(:notification) { Fabricate(:notification, account: user.account, type: :favourite) }
+
+ it 'returns http success' do
+ get "/api/v2/notifications/ungrouped-#{notification.id}", headers: headers
+
+ expect(response).to have_http_status(200)
+ expect(response.content_type)
+ .to start_with('application/json')
+ end
+ end
+
context 'when notification belongs to someone else' do
let(:notification) { Fabricate(:notification, group_key: 'foobar') }
@@ -347,6 +408,19 @@ RSpec.describe 'Notifications' do
expect { notification.reload }.to raise_error(ActiveRecord::RecordNotFound)
end
+ context 'with an ungrouped notification' do
+ let(:notification) { Fabricate(:notification, account: user.account, type: :favourite) }
+
+ it 'destroys the notification' do
+ post "/api/v2/notifications/ungrouped-#{notification.id}/dismiss", headers: headers
+
+ expect(response).to have_http_status(200)
+ expect(response.content_type)
+ .to start_with('application/json')
+ expect { notification.reload }.to raise_error(ActiveRecord::RecordNotFound)
+ end
+ end
+
context 'when notification belongs to someone else' do
let(:notification) { Fabricate(:notification, group_key: 'foobar') }
diff --git a/spec/requests/auth/sessions/security_key_options_spec.rb b/spec/requests/auth/sessions/security_key_options_spec.rb
index 6246e4beb3..e53b9802b4 100644
--- a/spec/requests/auth/sessions/security_key_options_spec.rb
+++ b/spec/requests/auth/sessions/security_key_options_spec.rb
@@ -6,7 +6,7 @@ require 'webauthn/fake_client'
RSpec.describe 'Security Key Options' do
describe 'GET /auth/sessions/security_key_options' do
let!(:user) do
- Fabricate(:user, email: 'x@y.com', password: 'abcdefgh', otp_required_for_login: true, otp_secret: User.generate_otp_secret(32))
+ Fabricate(:user, email: 'x@y.com', password: 'abcdefgh', otp_required_for_login: true, otp_secret: User.generate_otp_secret)
end
context 'with WebAuthn and OTP enabled as second factor' do
diff --git a/spec/requests/statuses/embed_spec.rb b/spec/requests/statuses/embed_spec.rb
new file mode 100644
index 0000000000..33c7ea192c
--- /dev/null
+++ b/spec/requests/statuses/embed_spec.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Status embed' do
+ describe 'GET /users/:account_username/statuses/:id/embed' do
+ subject { get "/users/#{account.username}/statuses/#{status.id}/embed" }
+
+ let(:account) { Fabricate(:account) }
+ let(:status) { Fabricate(:status, account: account) }
+
+ context 'when account is suspended' do
+ let(:account) { Fabricate(:account, suspended: true) }
+
+ it 'returns http gone' do
+ subject
+
+ expect(response)
+ .to have_http_status(410)
+ end
+ end
+
+ context 'when status is a reblog' do
+ let(:original_account) { Fabricate(:account, domain: 'example.com') }
+ let(:original_status) { Fabricate(:status, account: original_account, url: 'https://example.com/123') }
+ let(:status) { Fabricate(:status, account: account, reblog: original_status) }
+
+ it 'returns http not found' do
+ subject
+
+ expect(response)
+ .to have_http_status(404)
+ end
+ end
+
+ context 'when status is public' do
+ it 'renders status successfully', :aggregate_failures do
+ subject
+
+ expect(response)
+ .to have_http_status(200)
+ expect(response.parsed_body.at('body.embed'))
+ .to be_present
+ expect(response.headers).to include(
+ 'Vary' => 'Accept, Accept-Language, Cookie',
+ 'Cache-Control' => include('public'),
+ 'Link' => include('activity+json')
+ )
+ end
+ end
+
+ context 'when status is private' do
+ let(:status) { Fabricate(:status, account: account, visibility: :private) }
+
+ it 'returns http not found' do
+ subject
+
+ expect(response)
+ .to have_http_status(404)
+ end
+ end
+
+ context 'when status is direct' do
+ let(:status) { Fabricate(:status, account: account, visibility: :direct) }
+
+ it 'returns http not found' do
+ subject
+
+ expect(response)
+ .to have_http_status(404)
+ end
+ end
+ end
+end
diff --git a/spec/requests/well_known/host_meta_spec.rb b/spec/requests/well_known/host_meta_spec.rb
index 09f17baa89..726911dda1 100644
--- a/spec/requests/well_known/host_meta_spec.rb
+++ b/spec/requests/well_known/host_meta_spec.rb
@@ -9,19 +9,39 @@ RSpec.describe 'The /.well-known/host-meta request' do
expect(response)
.to have_http_status(200)
.and have_attributes(
- media_type: 'application/xrd+xml',
- body: host_meta_xml_template
+ media_type: 'application/xrd+xml'
+ )
+
+ doc = Nokogiri::XML(response.parsed_body)
+ expect(doc.at_xpath('/xrd:XRD/xrd:Link[@rel="lrdd"]/@template', 'xrd' => 'http://docs.oasis-open.org/ns/xri/xrd-1.0').value)
+ .to eq 'https://cb6e6126.ngrok.io/.well-known/webfinger?resource={uri}'
+ end
+
+ it 'returns http success with valid JSON response with .json extension' do
+ get '/.well-known/host-meta.json'
+
+ expect(response)
+ .to have_http_status(200)
+ .and have_attributes(
+ media_type: 'application/json'
+ )
+
+ expect(response.parsed_body)
+ .to include(
+ links: [
+ 'rel' => 'lrdd',
+ 'template' => 'https://cb6e6126.ngrok.io/.well-known/webfinger?resource={uri}',
+ ]
)
end
- private
+ it 'returns http success with valid JSON response with Accept header' do
+ get '/.well-known/host-meta', headers: { 'Accept' => 'application/json' }
- def host_meta_xml_template
- <<~XML
-
-
-
-
- XML
+ expect(response)
+ .to have_http_status(200)
+ .and have_attributes(
+ media_type: 'application/json'
+ )
end
end
diff --git a/spec/routing/well_known_routes_spec.rb b/spec/routing/well_known_routes_spec.rb
index 6578e939ae..84081059bb 100644
--- a/spec/routing/well_known_routes_spec.rb
+++ b/spec/routing/well_known_routes_spec.rb
@@ -4,9 +4,14 @@ require 'rails_helper'
RSpec.describe 'Well Known routes' do
describe 'the host-meta route' do
- it 'routes to correct place with xml format' do
+ it 'routes to correct place' do
expect(get('/.well-known/host-meta'))
- .to route_to('well_known/host_meta#show', format: 'xml')
+ .to route_to('well_known/host_meta#show')
+ end
+
+ it 'routes to correct place with json format' do
+ expect(get('/.well-known/host-meta.json'))
+ .to route_to('well_known/host_meta#show', format: 'json')
end
end
diff --git a/spec/serializers/activitypub/note_serializer_spec.rb b/spec/serializers/activitypub/note_serializer_spec.rb
index 963dd6afb5..c89bb47af6 100644
--- a/spec/serializers/activitypub/note_serializer_spec.rb
+++ b/spec/serializers/activitypub/note_serializer_spec.rb
@@ -26,7 +26,7 @@ RSpec.describe ActivityPub::NoteSerializer do
end
end
- it 'has the expected shape' do
+ it 'has the expected shape and replies collection' do
expect(subject).to include({
'@context' => include('https://www.w3.org/ns/activitystreams'),
'type' => 'Note',
@@ -34,27 +34,24 @@ RSpec.describe ActivityPub::NoteSerializer do
'contentMap' => include({
'zh-TW' => a_kind_of(String),
}),
+ 'replies' => replies_collection_values,
})
end
- it 'has a replies collection' do
- expect(subject['replies']['type']).to eql('Collection')
+ def replies_collection_values
+ include(
+ 'type' => eql('Collection'),
+ 'first' => include(
+ 'type' => eql('CollectionPage'),
+ 'items' => reply_items
+ )
+ )
end
- it 'has a replies collection with a first Page' do
- expect(subject['replies']['first']['type']).to eql('CollectionPage')
- end
-
- it 'includes public self-replies in its replies collection' do
- expect(subject['replies']['first']['items']).to include(reply_by_account_first.uri, reply_by_account_next.uri, reply_by_account_third.uri)
- end
-
- it 'does not include replies from others in its replies collection' do
- expect(subject['replies']['first']['items']).to_not include(reply_by_other_first.uri)
- end
-
- it 'does not include replies with direct visibility in its replies collection' do
- expect(subject['replies']['first']['items']).to_not include(reply_by_account_visibility_direct.uri)
+ def reply_items
+ include(reply_by_account_first.uri, reply_by_account_next.uri, reply_by_account_third.uri) # Public self replies
+ .and(not_include(reply_by_other_first.uri)) # Replies from others
+ .and(not_include(reply_by_account_visibility_direct.uri)) # Replies with direct visibility
end
it 'send as public visibility' do
diff --git a/spec/serializers/rest/preview_card_serializer_spec.rb b/spec/serializers/rest/preview_card_serializer_spec.rb
new file mode 100644
index 0000000000..41ba305b7c
--- /dev/null
+++ b/spec/serializers/rest/preview_card_serializer_spec.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe REST::PreviewCardSerializer do
+ subject do
+ serialized_record_json(
+ preview_card,
+ described_class
+ )
+ end
+
+ context 'when preview card does not have author data' do
+ let(:preview_card) { Fabricate.build :preview_card }
+
+ it 'includes empty authors array' do
+ expect(subject.deep_symbolize_keys)
+ .to include(
+ authors: be_an(Array).and(be_empty)
+ )
+ end
+ end
+
+ context 'when preview card has fediverse author data' do
+ let(:preview_card) { Fabricate.build :preview_card, author_account: Fabricate(:account) }
+
+ it 'includes populated authors array' do
+ expect(subject.deep_symbolize_keys)
+ .to include(
+ authors: be_an(Array).and(
+ contain_exactly(
+ include(
+ account: be_present
+ )
+ )
+ )
+ )
+ end
+ end
+
+ context 'when preview card has non-fediverse author data' do
+ let(:preview_card) { Fabricate.build :preview_card, author_name: 'Name', author_url: 'https://host.example/123' }
+
+ it 'includes populated authors array' do
+ expect(subject.deep_symbolize_keys)
+ .to include(
+ authors: be_an(Array).and(
+ contain_exactly(
+ include(
+ name: 'Name',
+ url: 'https://host.example/123'
+ )
+ )
+ )
+ )
+ end
+ end
+end
diff --git a/spec/services/account_statuses_cleanup_service_spec.rb b/spec/services/account_statuses_cleanup_service_spec.rb
index 857bd4fda4..553d20029a 100644
--- a/spec/services/account_statuses_cleanup_service_spec.rb
+++ b/spec/services/account_statuses_cleanup_service_spec.rb
@@ -27,39 +27,35 @@ RSpec.describe AccountStatusesCleanupService do
end
context 'when given a normal budget of 10' do
- it 'reports 3 deleted statuses' do
- expect(subject.call(account_policy, 10)).to eq 3
- end
+ it 'reports 3 deleted statuses and records last deleted id, deletes statuses, preserves recent unrelated statuses' do
+ expect(subject.call(account_policy, 10))
+ .to eq(3)
- it 'records the last deleted id' do
- subject.call(account_policy, 10)
- expect(account_policy.last_inspected).to eq [old_status.id, another_old_status.id].max
- end
+ expect(account_policy.last_inspected)
+ .to eq [old_status.id, another_old_status.id].max
- it 'actually deletes the statuses' do
- subject.call(account_policy, 10)
- expect(Status.find_by(id: [very_old_status.id, old_status.id, another_old_status.id])).to be_nil
- expect { recent_status.reload }.to_not raise_error
- end
-
- it 'preserves recent and unrelated statuses' do
- subject.call(account_policy, 10)
- expect { unrelated_status.reload }.to_not raise_error
- expect { recent_status.reload }.to_not raise_error
+ expect(Status.find_by(id: [very_old_status.id, old_status.id, another_old_status.id]))
+ .to be_nil
+ expect { recent_status.reload }
+ .to_not raise_error
+ expect { unrelated_status.reload }
+ .to_not raise_error
+ expect { recent_status.reload }
+ .to_not raise_error
end
end
context 'when called repeatedly with a budget of 2' do
- it 'reports 2 then 1 deleted statuses' do
- expect(subject.call(account_policy, 2)).to eq 2
- expect(subject.call(account_policy, 2)).to eq 1
- end
+ it 'reports 2 then 1 deleted statuses and deletes in expected order' do
+ expect(subject.call(account_policy, 2))
+ .to eq(2)
+ expect(Status.find_by(id: very_old_status.id))
+ .to be_nil
- it 'actually deletes the statuses in the expected order' do
- subject.call(account_policy, 2)
- expect(Status.find_by(id: very_old_status.id)).to be_nil
- subject.call(account_policy, 2)
- expect(Status.find_by(id: [very_old_status.id, old_status.id, another_old_status.id])).to be_nil
+ expect(subject.call(account_policy, 2))
+ .to eq(1)
+ expect(Status.find_by(id: [very_old_status.id, old_status.id, another_old_status.id]))
+ .to be_nil
end
end
@@ -90,19 +86,24 @@ RSpec.describe AccountStatusesCleanupService do
end
end
- it 'reports 0 deleted statuses then 0 then 3 then 0 again' do
- expect(subject.call(account_policy, 10)).to eq 0
- expect(subject.call(account_policy, 10)).to eq 0
- expect(subject.call(account_policy, 10)).to eq 3
- expect(subject.call(account_policy, 10)).to eq 0
+ it 'reports 0 deleted statuses then 0 then 3 then 0 again, and keeps id under oldest deletable record' do
+ expect(subject.call(account_policy, 10))
+ .to eq(0)
+ expect(subject.call(account_policy, 10))
+ .to eq(0)
+ expect(subject.call(account_policy, 10))
+ .to eq(3)
+ expect(subject.call(account_policy, 10))
+ .to eq(0)
+ expect(account_policy.last_inspected)
+ .to be < oldest_deletable_record_id
end
- it 'never causes the recorded id to get higher than oldest deletable toot' do
- subject.call(account_policy, 10)
- subject.call(account_policy, 10)
- subject.call(account_policy, 10)
- subject.call(account_policy, 10)
- expect(account_policy.last_inspected).to be < Mastodon::Snowflake.id_at(account_policy.min_status_age.seconds.ago, with_random: false)
+ def oldest_deletable_record_id
+ Mastodon::Snowflake.id_at(
+ account_policy.min_status_age.seconds.ago,
+ with_random: false
+ )
end
end
end
diff --git a/spec/services/activitypub/process_status_update_service_spec.rb b/spec/services/activitypub/process_status_update_service_spec.rb
index 37be11e662..b55483b016 100644
--- a/spec/services/activitypub/process_status_update_service_spec.rb
+++ b/spec/services/activitypub/process_status_update_service_spec.rb
@@ -2,10 +2,6 @@
require 'rails_helper'
-def poll_option_json(name, votes)
- { type: 'Note', name: name, replies: { type: 'Collection', totalItems: votes } }
-end
-
RSpec.describe ActivityPub::ProcessStatusUpdateService do
subject { described_class.new }
@@ -15,9 +11,12 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
[
{ type: 'Hashtag', name: 'hoge' },
{ type: 'Mention', href: ActivityPub::TagManager.instance.uri_for(alice) },
+ { type: 'Mention', href: ActivityPub::TagManager.instance.uri_for(alice) },
+ { type: 'Mention', href: bogus_mention },
]
end
let(:content) { 'Hello universe' }
+ let(:bogus_mention) { 'https://example.com/users/erroringuser' }
let(:payload) do
{
'@context': 'https://www.w3.org/ns/activitystreams',
@@ -40,19 +39,21 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
let(:media_attachments) { [] }
before do
- mentions.each { |a| Fabricate(:mention, status: status, account: a) }
+ mentions.each { |(account, silent)| Fabricate(:mention, status: status, account: account, silent: silent) }
tags.each { |t| status.tags << t }
media_attachments.each { |m| status.media_attachments << m }
+ stub_request(:get, bogus_mention).to_raise(HTTP::ConnectionError)
end
describe '#call' do
- it 'updates text and content warning' do
+ it 'updates text and content warning, and schedules re-fetching broken mention' do
subject.call(status, json, json)
expect(status.reload)
.to have_attributes(
text: eq('Hello universe'),
spoiler_text: eq('Show more')
)
+ expect(MentionResolveWorker).to have_enqueued_sidekiq_job(status.id, bogus_mention, anything)
end
context 'when the changes are only in sanitized-out HTML' do
@@ -262,16 +263,22 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
updated: '2021-09-08T22:39:25Z',
tag: [
{ type: 'Hashtag', name: 'foo' },
+ { type: 'Hashtag', name: 'bar' },
],
}
end
before do
- subject.call(status, json, json)
+ status.account.featured_tags.create!(name: 'bar')
+ status.account.featured_tags.create!(name: 'test')
end
- it 'updates tags' do
- expect(status.tags.reload.map(&:name)).to eq %w(foo)
+ it 'updates tags and featured tags' do
+ expect { subject.call(status, json, json) }
+ .to change { status.tags.reload.pluck(:name) }.from(%w(test foo)).to(%w(foo bar))
+ .and change { status.account.featured_tags.find_by(name: 'test').statuses_count }.by(-1)
+ .and change { status.account.featured_tags.find_by(name: 'bar').statuses_count }.by(1)
+ .and change { status.account.featured_tags.find_by(name: 'bar').last_status_at }.from(nil).to(be_present)
end
end
@@ -324,7 +331,19 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
end
context 'when originally with mentions' do
- let(:mentions) { [alice, bob] }
+ let(:mentions) { [[alice, false], [bob, false]] }
+
+ before do
+ subject.call(status, json, json)
+ end
+
+ it 'updates mentions' do
+ expect(status.active_mentions.reload.map(&:account_id)).to eq [alice.id]
+ end
+ end
+
+ context 'when originally with silent mentions' do
+ let(:mentions) { [[alice, true], [bob, true]] }
before do
subject.call(status, json, json)
@@ -338,7 +357,6 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
context 'when originally without media attachments' do
before do
stub_request(:get, 'https://example.com/foo.png').to_return(body: attachment_fixture('emojo.png'))
- subject.call(status, json, json)
end
let(:payload) do
@@ -354,19 +372,18 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
}
end
- it 'updates media attachments' do
- media_attachment = status.reload.ordered_media_attachments.first
+ it 'updates media attachments, fetches attachment, records media change in edit' do
+ subject.call(status, json, json)
- expect(media_attachment).to_not be_nil
- expect(media_attachment.remote_url).to eq 'https://example.com/foo.png'
- end
+ expect(status.reload.ordered_media_attachments.first)
+ .to be_present
+ .and(have_attributes(remote_url: 'https://example.com/foo.png'))
- it 'fetches the attachment' do
- expect(a_request(:get, 'https://example.com/foo.png')).to have_been_made
- end
+ expect(a_request(:get, 'https://example.com/foo.png'))
+ .to have_been_made
- it 'records media change in edit' do
- expect(status.edits.reload.last.ordered_media_attachment_ids).to_not be_empty
+ expect(status.edits.reload.last.ordered_media_attachment_ids)
+ .to_not be_empty
end
end
@@ -388,27 +405,26 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
before do
allow(RedownloadMediaWorker).to receive(:perform_async)
+ end
+
+ it 'updates the existing media attachment in-place, does not queue redownload, updates media, records media change' do
subject.call(status, json, json)
- end
- it 'updates the existing media attachment in-place' do
- media_attachment = status.media_attachments.ordered.reload.first
+ expect(status.media_attachments.ordered.reload.first)
+ .to be_present
+ .and have_attributes(
+ remote_url: 'https://example.com/foo.png',
+ description: 'A picture'
+ )
- expect(media_attachment).to_not be_nil
- expect(media_attachment.remote_url).to eq 'https://example.com/foo.png'
- expect(media_attachment.description).to eq 'A picture'
- end
+ expect(RedownloadMediaWorker)
+ .to_not have_received(:perform_async)
- it 'does not queue redownload for the existing media attachment' do
- expect(RedownloadMediaWorker).to_not have_received(:perform_async)
- end
+ expect(status.ordered_media_attachments.map(&:remote_url))
+ .to eq %w(https://example.com/foo.png)
- it 'updates media attachments' do
- expect(status.ordered_media_attachments.map(&:remote_url)).to eq %w(https://example.com/foo.png)
- end
-
- it 'records media change in edit' do
- expect(status.edits.reload.last.ordered_media_attachment_ids).to_not be_empty
+ expect(status.edits.reload.last.ordered_media_attachment_ids)
+ .to_not be_empty
end
end
@@ -416,10 +432,11 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
before do
poll = Fabricate(:poll, status: status)
status.update(preloadable_poll: poll)
- subject.call(status, json, json)
end
it 'removes poll and records media change in edit' do
+ subject.call(status, json, json)
+
expect(status.reload.poll).to be_nil
expect(status.edits.reload.last.poll_options).to be_nil
end
@@ -442,15 +459,13 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
}
end
- before do
- subject.call(status, json, json)
- end
-
it 'creates a poll and records media change in edit' do
- poll = status.reload.poll
+ subject.call(status, json, json)
+
+ expect(status.reload.poll)
+ .to be_present
+ .and have_attributes(options: %w(Foo Bar Baz))
- expect(poll).to_not be_nil
- expect(poll.options).to eq %w(Foo Bar Baz)
expect(status.edits.reload.last.poll_options).to eq %w(Foo Bar Baz)
end
end
@@ -738,4 +753,8 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
end
end
end
+
+ def poll_option_json(name, votes)
+ { type: 'Note', name: name, replies: { type: 'Collection', totalItems: votes } }
+ end
end
diff --git a/spec/services/activitypub/synchronize_followers_service_spec.rb b/spec/services/activitypub/synchronize_followers_service_spec.rb
index 974368b7d7..70f27627e1 100644
--- a/spec/services/activitypub/synchronize_followers_service_spec.rb
+++ b/spec/services/activitypub/synchronize_followers_service_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe ActivityPub::SynchronizeFollowersService do
let(:bob) { Fabricate(:account, username: 'bob') }
let(:eve) { Fabricate(:account, username: 'eve') }
let(:mallory) { Fabricate(:account, username: 'mallory') }
- let(:collection_uri) { 'http://example.com/partial-followers' }
+ let(:collection_uri) { 'https://example.com/partial-followers' }
let(:items) do
[alice, eve, mallory].map do |account|
@@ -27,14 +27,14 @@ RSpec.describe ActivityPub::SynchronizeFollowersService do
}.with_indifferent_access
end
+ before do
+ alice.follow!(actor)
+ bob.follow!(actor)
+ mallory.request_follow!(actor)
+ end
+
shared_examples 'synchronizes followers' do
before do
- alice.follow!(actor)
- bob.follow!(actor)
- mallory.request_follow!(actor)
-
- allow(ActivityPub::DeliveryWorker).to receive(:perform_async)
-
subject.call(actor, collection_uri)
end
@@ -46,7 +46,7 @@ RSpec.describe ActivityPub::SynchronizeFollowersService do
expect(mallory)
.to be_following(actor) # Convert follow request to follow when accepted
expect(ActivityPub::DeliveryWorker)
- .to have_received(:perform_async).with(anything, eve.id, actor.inbox_url) # Send Undo Follow to actor
+ .to have_enqueued_sidekiq_job(anything, eve.id, actor.inbox_url) # Send Undo Follow to actor
end
end
@@ -76,7 +76,7 @@ RSpec.describe ActivityPub::SynchronizeFollowersService do
it_behaves_like 'synchronizes followers'
end
- context 'when the endpoint is a paginated Collection of actor URIs' do
+ context 'when the endpoint is a single-page paginated Collection of actor URIs' do
let(:payload) do
{
'@context': 'https://www.w3.org/ns/activitystreams',
@@ -96,5 +96,106 @@ RSpec.describe ActivityPub::SynchronizeFollowersService do
it_behaves_like 'synchronizes followers'
end
+
+ context 'when the endpoint is a paginated Collection of actor URIs split across multiple pages' do
+ before do
+ stub_request(:get, 'https://example.com/partial-followers')
+ .to_return(status: 200, headers: { 'Content-Type': 'application/activity+json' }, body: Oj.dump({
+ '@context': 'https://www.w3.org/ns/activitystreams',
+ type: 'Collection',
+ id: 'https://example.com/partial-followers',
+ first: 'https://example.com/partial-followers/1',
+ }))
+
+ stub_request(:get, 'https://example.com/partial-followers/1')
+ .to_return(status: 200, headers: { 'Content-Type': 'application/activity+json' }, body: Oj.dump({
+ '@context': 'https://www.w3.org/ns/activitystreams',
+ type: 'CollectionPage',
+ id: 'https://example.com/partial-followers/1',
+ partOf: 'https://example.com/partial-followers',
+ next: 'https://example.com/partial-followers/2',
+ items: [alice, eve].map { |account| ActivityPub::TagManager.instance.uri_for(account) },
+ }))
+
+ stub_request(:get, 'https://example.com/partial-followers/2')
+ .to_return(status: 200, headers: { 'Content-Type': 'application/activity+json' }, body: Oj.dump({
+ '@context': 'https://www.w3.org/ns/activitystreams',
+ type: 'CollectionPage',
+ id: 'https://example.com/partial-followers/2',
+ partOf: 'https://example.com/partial-followers',
+ items: ActivityPub::TagManager.instance.uri_for(mallory),
+ }))
+ end
+
+ it_behaves_like 'synchronizes followers'
+ end
+
+ context 'when the endpoint is a paginated Collection of actor URIs split across, but one page errors out' do
+ before do
+ stub_request(:get, 'https://example.com/partial-followers')
+ .to_return(status: 200, headers: { 'Content-Type': 'application/activity+json' }, body: Oj.dump({
+ '@context': 'https://www.w3.org/ns/activitystreams',
+ type: 'Collection',
+ id: 'https://example.com/partial-followers',
+ first: 'https://example.com/partial-followers/1',
+ }))
+
+ stub_request(:get, 'https://example.com/partial-followers/1')
+ .to_return(status: 200, headers: { 'Content-Type': 'application/activity+json' }, body: Oj.dump({
+ '@context': 'https://www.w3.org/ns/activitystreams',
+ type: 'CollectionPage',
+ id: 'https://example.com/partial-followers/1',
+ partOf: 'https://example.com/partial-followers',
+ next: 'https://example.com/partial-followers/2',
+ items: [mallory].map { |account| ActivityPub::TagManager.instance.uri_for(account) },
+ }))
+
+ stub_request(:get, 'https://example.com/partial-followers/2')
+ .to_return(status: 404)
+ end
+
+ it 'confirms pending follow request but does not remove extra followers' do
+ previous_follower_ids = actor.followers.pluck(:id)
+
+ subject.call(actor, collection_uri)
+
+ expect(previous_follower_ids - actor.followers.reload.pluck(:id))
+ .to be_empty
+ expect(mallory)
+ .to be_following(actor)
+ end
+ end
+
+ context 'when the endpoint is a paginated Collection of actor URIs with more pages than we allow' do
+ let(:payload) do
+ {
+ '@context': 'https://www.w3.org/ns/activitystreams',
+ type: 'Collection',
+ id: collection_uri,
+ first: {
+ type: 'CollectionPage',
+ partOf: collection_uri,
+ items: items,
+ next: "#{collection_uri}/page2",
+ },
+ }.with_indifferent_access
+ end
+
+ before do
+ stub_const('ActivityPub::SynchronizeFollowersService::MAX_COLLECTION_PAGES', 1)
+ stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
+ end
+
+ it 'confirms pending follow request but does not remove extra followers' do
+ previous_follower_ids = actor.followers.pluck(:id)
+
+ subject.call(actor, collection_uri)
+
+ expect(previous_follower_ids - actor.followers.reload.pluck(:id))
+ .to be_empty
+ expect(mallory)
+ .to be_following(actor)
+ end
+ end
end
end
diff --git a/spec/services/app_sign_up_service_spec.rb b/spec/services/app_sign_up_service_spec.rb
index ec7b7516f9..b78868db49 100644
--- a/spec/services/app_sign_up_service_spec.rb
+++ b/spec/services/app_sign_up_service_spec.rb
@@ -53,17 +53,7 @@ RSpec.describe AppSignUpService do
Setting.registrations_mode = 'open'
Fabricate(:email_domain_block, allow_with_approval: true, domain: 'smtp.email.com')
allow(User).to receive(:skip_mx_check?).and_return(false)
-
- resolver = instance_double(Resolv::DNS, :timeouts= => nil)
-
- allow(resolver).to receive(:getresources)
- .with('email.com', Resolv::DNS::Resource::IN::MX)
- .and_return([instance_double(Resolv::DNS::Resource::MX, exchange: 'smtp.email.com')])
- allow(resolver).to receive(:getresources).with('email.com', Resolv::DNS::Resource::IN::A).and_return([])
- allow(resolver).to receive(:getresources).with('email.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
- allow(resolver).to receive(:getresources).with('smtp.email.com', Resolv::DNS::Resource::IN::A).and_return([instance_double(Resolv::DNS::Resource::IN::A, address: '2.3.4.5')])
- allow(resolver).to receive(:getresources).with('smtp.email.com', Resolv::DNS::Resource::IN::AAAA).and_return([instance_double(Resolv::DNS::Resource::IN::AAAA, address: 'fd00::2')])
- allow(Resolv::DNS).to receive(:open).and_yield(resolver)
+ configure_mx(domain: 'email.com', exchange: 'smtp.email.com')
end
it 'creates an unapproved user', :aggregate_failures do
diff --git a/spec/services/authorize_follow_service_spec.rb b/spec/services/authorize_follow_service_spec.rb
index 533b791fb7..de28572802 100644
--- a/spec/services/authorize_follow_service_spec.rb
+++ b/spec/services/authorize_follow_service_spec.rb
@@ -12,15 +12,15 @@ RSpec.describe AuthorizeFollowService do
before do
FollowRequest.create(account: bob, target_account: sender)
+ end
+
+ it 'removes follow request and creates follow relation' do
subject.call(bob, sender)
- end
- it 'removes follow request' do
- expect(bob.requested?(sender)).to be false
- end
-
- it 'creates follow relation' do
- expect(bob.following?(sender)).to be true
+ expect(bob)
+ .to_not be_requested(sender)
+ expect(bob)
+ .to be_following(sender)
end
end
@@ -30,19 +30,17 @@ RSpec.describe AuthorizeFollowService do
before do
FollowRequest.create(account: bob, target_account: sender)
stub_request(:post, bob.inbox_url).to_return(status: 200)
+ end
+
+ it 'removes follow request, creates follow relation, send accept activity', :inline_jobs do
subject.call(bob, sender)
- end
- it 'removes follow request' do
- expect(bob.requested?(sender)).to be false
- end
-
- it 'creates follow relation' do
- expect(bob.following?(sender)).to be true
- end
-
- it 'sends an accept activity', :inline_jobs do
- expect(a_request(:post, bob.inbox_url)).to have_been_made.once
+ expect(bob)
+ .to_not be_requested(sender)
+ expect(bob)
+ .to be_following(sender)
+ expect(a_request(:post, bob.inbox_url))
+ .to have_been_made.once
end
end
end
diff --git a/spec/services/batched_remove_status_service_spec.rb b/spec/services/batched_remove_status_service_spec.rb
index 628bb198ef..1ff73a633b 100644
--- a/spec/services/batched_remove_status_service_spec.rb
+++ b/spec/services/batched_remove_status_service_spec.rb
@@ -24,32 +24,38 @@ RSpec.describe BatchedRemoveStatusService, :inline_jobs do
status_alice_hello
status_alice_other
+ end
+ it 'removes status records, removes from author and local follower feeds, notifies stream, sends delete' do
subject.call([status_alice_hello, status_alice_other])
+
+ expect { Status.find(status_alice_hello.id) }
+ .to raise_error ActiveRecord::RecordNotFound
+ expect { Status.find(status_alice_other.id) }
+ .to raise_error ActiveRecord::RecordNotFound
+
+ expect(feed_ids_for(alice))
+ .to_not include(status_alice_hello.id, status_alice_other.id)
+
+ expect(feed_ids_for(jeff))
+ .to_not include(status_alice_hello.id, status_alice_other.id)
+
+ expect(redis)
+ .to have_received(:publish)
+ .with("timeline:#{jeff.id}", any_args).at_least(:once)
+
+ expect(redis)
+ .to have_received(:publish)
+ .with('timeline:public', any_args).at_least(:once)
+
+ expect(a_request(:post, 'http://example.com/inbox'))
+ .to have_been_made.at_least_once
end
- it 'removes statuses' do
- expect { Status.find(status_alice_hello.id) }.to raise_error ActiveRecord::RecordNotFound
- expect { Status.find(status_alice_other.id) }.to raise_error ActiveRecord::RecordNotFound
- end
-
- it 'removes statuses from author\'s home feed' do
- expect(HomeFeed.new(alice).get(10).pluck(:id)).to_not include(status_alice_hello.id, status_alice_other.id)
- end
-
- it 'removes statuses from local follower\'s home feed' do
- expect(HomeFeed.new(jeff).get(10).pluck(:id)).to_not include(status_alice_hello.id, status_alice_other.id)
- end
-
- it 'notifies streaming API of followers' do
- expect(redis).to have_received(:publish).with("timeline:#{jeff.id}", any_args).at_least(:once)
- end
-
- it 'notifies streaming API of public timeline' do
- expect(redis).to have_received(:publish).with('timeline:public', any_args).at_least(:once)
- end
-
- it 'sends delete activity to followers' do
- expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.at_least_once
+ def feed_ids_for(account)
+ HomeFeed
+ .new(account)
+ .get(10)
+ .pluck(:id)
end
end
diff --git a/spec/services/block_service_spec.rb b/spec/services/block_service_spec.rb
index 46dd691986..d9687a5404 100644
--- a/spec/services/block_service_spec.rb
+++ b/spec/services/block_service_spec.rb
@@ -26,15 +26,16 @@ RSpec.describe BlockService do
before do
stub_request(:post, 'http://example.com/inbox').to_return(status: 200)
+ end
+
+ it 'creates a blocking relation and send block activity', :inline_jobs do
subject.call(sender, bob)
- end
- it 'creates a blocking relation' do
- expect(sender.blocking?(bob)).to be true
- end
+ expect(sender)
+ .to be_blocking(bob)
- it 'sends a block activity', :inline_jobs do
- expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.once
+ expect(a_request(:post, 'http://example.com/inbox'))
+ .to have_been_made.once
end
end
end
diff --git a/spec/services/bulk_import_service_spec.rb b/spec/services/bulk_import_service_spec.rb
index 0197f81a44..f52fc4d7d5 100644
--- a/spec/services/bulk_import_service_spec.rb
+++ b/spec/services/bulk_import_service_spec.rb
@@ -24,30 +24,19 @@ RSpec.describe BulkImportService do
].map { |data| import.rows.create!(data: data) }
end
- before do
- account.follow!(Fabricate(:account))
- end
+ before { account.follow!(Fabricate(:account)) }
- it 'does not immediately change who the account follows' do
- expect { subject.call(import) }.to_not(change { account.reload.active_relationships.to_a })
- end
+ it 'does not immediately change who the account follows, enqueues workers, sends follow requests after worker run' do
+ expect { subject.call(import) }
+ .to_not(change { account.reload.active_relationships.to_a })
- it 'enqueues workers for the expected rows' do
- subject.call(import)
- expect(Import::RowWorker.jobs.pluck('args').flatten).to match_array(rows.map(&:id))
- end
+ expect(row_worker_job_args)
+ .to match_array(rows.map(&:id))
- it 'requests to follow all the listed users once the workers have run' do
- subject.call(import)
+ stub_resolve_account_and_drain_workers
- resolve_account_service_double = instance_double(ResolveAccountService)
- allow(ResolveAccountService).to receive(:new).and_return(resolve_account_service_double)
- allow(resolve_account_service_double).to receive(:call).with('user@foo.bar', any_args) { Fabricate(:account, username: 'user', domain: 'foo.bar', protocol: :activitypub) }
- allow(resolve_account_service_double).to receive(:call).with('unknown@unknown.bar', any_args) { Fabricate(:account, username: 'unknown', domain: 'unknown.bar', protocol: :activitypub) }
-
- Import::RowWorker.drain
-
- expect(FollowRequest.includes(:target_account).where(account: account).map { |follow_request| follow_request.target_account.acct }).to contain_exactly('user@foo.bar', 'unknown@unknown.bar')
+ expect(FollowRequest.includes(:target_account).where(account: account).map { |follow_request| follow_request.target_account.acct })
+ .to contain_exactly('user@foo.bar', 'unknown@unknown.bar')
end
end
@@ -71,31 +60,20 @@ RSpec.describe BulkImportService do
account.follow!(to_be_unfollowed)
end
- it 'unfollows user not present on list' do
- subject.call(import)
- expect(account.following?(to_be_unfollowed)).to be false
- end
+ it 'updates the existing follow relationship as expected and unfollows user not on list, enqueues workers, sends follow reqs after worker run' do
+ expect { subject.call(import) }
+ .to change { Follow.where(account: account, target_account: followed).pick(:show_reblogs, :notify, :languages) }.from([true, false, nil]).to([false, true, ['en']])
- it 'updates the existing follow relationship as expected' do
- expect { subject.call(import) }.to change { Follow.where(account: account, target_account: followed).pick(:show_reblogs, :notify, :languages) }.from([true, false, nil]).to([false, true, ['en']])
- end
+ expect(account)
+ .to_not be_following(to_be_unfollowed)
- it 'enqueues workers for the expected rows' do
- subject.call(import)
- expect(Import::RowWorker.jobs.pluck('args').flatten).to match_array(rows[1..].map(&:id))
- end
+ expect(row_worker_job_args)
+ .to match_array(rows[1..].map(&:id))
- it 'requests to follow all the expected users once the workers have run' do
- subject.call(import)
+ stub_resolve_account_and_drain_workers
- resolve_account_service_double = instance_double(ResolveAccountService)
- allow(ResolveAccountService).to receive(:new).and_return(resolve_account_service_double)
- allow(resolve_account_service_double).to receive(:call).with('user@foo.bar', any_args) { Fabricate(:account, username: 'user', domain: 'foo.bar', protocol: :activitypub) }
- allow(resolve_account_service_double).to receive(:call).with('unknown@unknown.bar', any_args) { Fabricate(:account, username: 'unknown', domain: 'unknown.bar', protocol: :activitypub) }
-
- Import::RowWorker.drain
-
- expect(FollowRequest.includes(:target_account).where(account: account).map { |follow_request| follow_request.target_account.acct }).to contain_exactly('user@foo.bar', 'unknown@unknown.bar')
+ expect(FollowRequest.includes(:target_account).where(account: account).map { |follow_request| follow_request.target_account.acct })
+ .to contain_exactly('user@foo.bar', 'unknown@unknown.bar')
end
end
@@ -110,30 +88,19 @@ RSpec.describe BulkImportService do
].map { |data| import.rows.create!(data: data) }
end
- before do
- account.block!(Fabricate(:account, username: 'already_blocked', domain: 'remote.org'))
- end
+ before { account.block!(Fabricate(:account, username: 'already_blocked', domain: 'remote.org')) }
- it 'does not immediately change who the account blocks' do
- expect { subject.call(import) }.to_not(change { account.reload.blocking.to_a })
- end
+ it 'does not immediately change who the account blocks, enqueues worker, blocks after run' do
+ expect { subject.call(import) }
+ .to_not(change { account.reload.blocking.to_a })
- it 'enqueues workers for the expected rows' do
- subject.call(import)
- expect(Import::RowWorker.jobs.pluck('args').flatten).to match_array(rows.map(&:id))
- end
+ expect(row_worker_job_args)
+ .to match_array(rows.map(&:id))
- it 'blocks all the listed users once the workers have run' do
- subject.call(import)
+ stub_resolve_account_and_drain_workers
- resolve_account_service_double = instance_double(ResolveAccountService)
- allow(ResolveAccountService).to receive(:new).and_return(resolve_account_service_double)
- allow(resolve_account_service_double).to receive(:call).with('user@foo.bar', any_args) { Fabricate(:account, username: 'user', domain: 'foo.bar', protocol: :activitypub) }
- allow(resolve_account_service_double).to receive(:call).with('unknown@unknown.bar', any_args) { Fabricate(:account, username: 'unknown', domain: 'unknown.bar', protocol: :activitypub) }
-
- Import::RowWorker.drain
-
- expect(account.blocking.map(&:acct)).to contain_exactly('already_blocked@remote.org', 'user@foo.bar', 'unknown@unknown.bar')
+ expect(account.reload.blocking.map(&:acct))
+ .to contain_exactly('already_blocked@remote.org', 'user@foo.bar', 'unknown@unknown.bar')
end
end
@@ -157,27 +124,18 @@ RSpec.describe BulkImportService do
account.block!(to_be_unblocked)
end
- it 'unblocks user not present on list' do
+ it 'unblocks user not present on list, enqueues worker, requests follow after run' do
subject.call(import)
+
expect(account.blocking?(to_be_unblocked)).to be false
- end
- it 'enqueues workers for the expected rows' do
- subject.call(import)
- expect(Import::RowWorker.jobs.pluck('args').flatten).to match_array(rows[1..].map(&:id))
- end
+ expect(row_worker_job_args)
+ .to match_array(rows[1..].map(&:id))
- it 'requests to follow all the expected users once the workers have run' do
- subject.call(import)
+ stub_resolve_account_and_drain_workers
- resolve_account_service_double = instance_double(ResolveAccountService)
- allow(ResolveAccountService).to receive(:new).and_return(resolve_account_service_double)
- allow(resolve_account_service_double).to receive(:call).with('user@foo.bar', any_args) { Fabricate(:account, username: 'user', domain: 'foo.bar', protocol: :activitypub) }
- allow(resolve_account_service_double).to receive(:call).with('unknown@unknown.bar', any_args) { Fabricate(:account, username: 'unknown', domain: 'unknown.bar', protocol: :activitypub) }
-
- Import::RowWorker.drain
-
- expect(account.blocking.map(&:acct)).to contain_exactly('blocked@foo.bar', 'user@foo.bar', 'unknown@unknown.bar')
+ expect(account.blocking.map(&:acct))
+ .to contain_exactly('blocked@foo.bar', 'user@foo.bar', 'unknown@unknown.bar')
end
end
@@ -192,30 +150,19 @@ RSpec.describe BulkImportService do
].map { |data| import.rows.create!(data: data) }
end
- before do
- account.mute!(Fabricate(:account, username: 'already_muted', domain: 'remote.org'))
- end
+ before { account.mute!(Fabricate(:account, username: 'already_muted', domain: 'remote.org')) }
- it 'does not immediately change who the account blocks' do
- expect { subject.call(import) }.to_not(change { account.reload.muting.to_a })
- end
+ it 'does not immediately change who the account blocks, enqueures worker, mutes users after worker run' do
+ expect { subject.call(import) }
+ .to_not(change { account.reload.muting.to_a })
- it 'enqueues workers for the expected rows' do
- subject.call(import)
- expect(Import::RowWorker.jobs.pluck('args').flatten).to match_array(rows.map(&:id))
- end
+ expect(row_worker_job_args)
+ .to match_array(rows.map(&:id))
- it 'mutes all the listed users once the workers have run' do
- subject.call(import)
+ stub_resolve_account_and_drain_workers
- resolve_account_service_double = instance_double(ResolveAccountService)
- allow(ResolveAccountService).to receive(:new).and_return(resolve_account_service_double)
- allow(resolve_account_service_double).to receive(:call).with('user@foo.bar', any_args) { Fabricate(:account, username: 'user', domain: 'foo.bar', protocol: :activitypub) }
- allow(resolve_account_service_double).to receive(:call).with('unknown@unknown.bar', any_args) { Fabricate(:account, username: 'unknown', domain: 'unknown.bar', protocol: :activitypub) }
-
- Import::RowWorker.drain
-
- expect(account.muting.map(&:acct)).to contain_exactly('already_muted@remote.org', 'user@foo.bar', 'unknown@unknown.bar')
+ expect(account.reload.muting.map(&:acct))
+ .to contain_exactly('already_muted@remote.org', 'user@foo.bar', 'unknown@unknown.bar')
end
end
@@ -239,31 +186,19 @@ RSpec.describe BulkImportService do
account.mute!(to_be_unmuted)
end
- it 'updates the existing mute as expected' do
- expect { subject.call(import) }.to change { Mute.where(account: account, target_account: muted).pick(:hide_notifications) }.from(false).to(true)
- end
+ it 'updates the existing mute as expected and unblocks user not on list, and enqueues worker, and requests follow after worker run' do
+ expect { subject.call(import) }
+ .to change { Mute.where(account: account, target_account: muted).pick(:hide_notifications) }.from(false).to(true)
- it 'unblocks user not present on list' do
- subject.call(import)
expect(account.muting?(to_be_unmuted)).to be false
- end
- it 'enqueues workers for the expected rows' do
- subject.call(import)
- expect(Import::RowWorker.jobs.pluck('args').flatten).to match_array(rows[1..].map(&:id))
- end
+ expect(row_worker_job_args)
+ .to match_array(rows[1..].map(&:id))
- it 'requests to follow all the expected users once the workers have run' do
- subject.call(import)
+ stub_resolve_account_and_drain_workers
- resolve_account_service_double = instance_double(ResolveAccountService)
- allow(ResolveAccountService).to receive(:new).and_return(resolve_account_service_double)
- allow(resolve_account_service_double).to receive(:call).with('user@foo.bar', any_args) { Fabricate(:account, username: 'user', domain: 'foo.bar', protocol: :activitypub) }
- allow(resolve_account_service_double).to receive(:call).with('unknown@unknown.bar', any_args) { Fabricate(:account, username: 'unknown', domain: 'unknown.bar', protocol: :activitypub) }
-
- Import::RowWorker.drain
-
- expect(account.muting.map(&:acct)).to contain_exactly('muted@foo.bar', 'user@foo.bar', 'unknown@unknown.bar')
+ expect(account.muting.map(&:acct))
+ .to contain_exactly('muted@foo.bar', 'user@foo.bar', 'unknown@unknown.bar')
end
end
@@ -284,13 +219,11 @@ RSpec.describe BulkImportService do
account.block_domain!('blocked.com')
end
- it 'blocks all the new domains' do
+ it 'blocks all the new domains and marks import finished' do
subject.call(import)
- expect(account.domain_blocks.pluck(:domain)).to contain_exactly('alreadyblocked.com', 'blocked.com', 'to-block.com')
- end
- it 'marks the import as finished' do
- subject.call(import)
+ expect(account.domain_blocks.pluck(:domain))
+ .to contain_exactly('alreadyblocked.com', 'blocked.com', 'to-block.com')
expect(import.reload.state_finished?).to be true
end
end
@@ -312,14 +245,13 @@ RSpec.describe BulkImportService do
account.block_domain!('blocked.com')
end
- it 'blocks all the new domains' do
+ it 'blocks all the new domains and marks import finished' do
subject.call(import)
- expect(account.domain_blocks.pluck(:domain)).to contain_exactly('blocked.com', 'to-block.com')
- end
- it 'marks the import as finished' do
- subject.call(import)
- expect(import.reload.state_finished?).to be true
+ expect(account.domain_blocks.pluck(:domain))
+ .to contain_exactly('blocked.com', 'to-block.com')
+ expect(import.reload.state_finished?)
+ .to be true
end
end
@@ -347,22 +279,16 @@ RSpec.describe BulkImportService do
account.bookmarks.create!(status: bookmarked)
end
- it 'enqueues workers for the expected rows' do
- subject.call(import)
- expect(Import::RowWorker.jobs.pluck('args').flatten).to match_array(rows.map(&:id))
- end
-
- it 'updates the bookmarks as expected once the workers have run' do
+ it 'enqueues workers for the expected rows and updates bookmarks after worker run' do
subject.call(import)
- service_double = instance_double(ActivityPub::FetchRemoteStatusService)
- allow(ActivityPub::FetchRemoteStatusService).to receive(:new).and_return(service_double)
- allow(service_double).to receive(:call).with('https://domain.unknown/foo') { Fabricate(:status, uri: 'https://domain.unknown/foo') }
- allow(service_double).to receive(:call).with('https://domain.unknown/private') { Fabricate(:status, uri: 'https://domain.unknown/private', visibility: :direct) }
+ expect(row_worker_job_args)
+ .to match_array(rows.map(&:id))
- Import::RowWorker.drain
+ stub_fetch_remote_and_drain_workers
- expect(account.bookmarks.map { |bookmark| bookmark.status.uri }).to contain_exactly(already_bookmarked.uri, status.uri, bookmarked.uri, 'https://domain.unknown/foo')
+ expect(account.bookmarks.map { |bookmark| bookmark.status.uri })
+ .to contain_exactly(already_bookmarked.uri, status.uri, bookmarked.uri, 'https://domain.unknown/foo')
end
end
@@ -390,23 +316,48 @@ RSpec.describe BulkImportService do
account.bookmarks.create!(status: bookmarked)
end
- it 'enqueues workers for the expected rows' do
- subject.call(import)
- expect(Import::RowWorker.jobs.pluck('args').flatten).to match_array(rows.map(&:id))
- end
-
- it 'updates the bookmarks as expected once the workers have run' do
+ it 'enqueues workers for the expected rows and updates bookmarks' do
subject.call(import)
- service_double = instance_double(ActivityPub::FetchRemoteStatusService)
- allow(ActivityPub::FetchRemoteStatusService).to receive(:new).and_return(service_double)
- allow(service_double).to receive(:call).with('https://domain.unknown/foo') { Fabricate(:status, uri: 'https://domain.unknown/foo') }
- allow(service_double).to receive(:call).with('https://domain.unknown/private') { Fabricate(:status, uri: 'https://domain.unknown/private', visibility: :direct) }
+ expect(row_worker_job_args)
+ .to match_array(rows.map(&:id))
- Import::RowWorker.drain
+ stub_fetch_remote_and_drain_workers
- expect(account.bookmarks.map { |bookmark| bookmark.status.uri }).to contain_exactly(status.uri, bookmarked.uri, 'https://domain.unknown/foo')
+ expect(account.bookmarks.map { |bookmark| bookmark.status.uri })
+ .to contain_exactly(status.uri, bookmarked.uri, 'https://domain.unknown/foo')
end
end
+
+ def row_worker_job_args
+ Import::RowWorker
+ .jobs
+ .pluck('args')
+ .flatten
+ end
+
+ def stub_resolve_account_and_drain_workers
+ resolve_account_service_double = instance_double(ResolveAccountService)
+ allow(ResolveAccountService)
+ .to receive(:new)
+ .and_return(resolve_account_service_double)
+ allow(resolve_account_service_double)
+ .to receive(:call)
+ .with('user@foo.bar', any_args) { Fabricate(:account, username: 'user', domain: 'foo.bar', protocol: :activitypub) }
+ allow(resolve_account_service_double)
+ .to receive(:call)
+ .with('unknown@unknown.bar', any_args) { Fabricate(:account, username: 'unknown', domain: 'unknown.bar', protocol: :activitypub) }
+
+ Import::RowWorker.drain
+ end
+
+ def stub_fetch_remote_and_drain_workers
+ service_double = instance_double(ActivityPub::FetchRemoteStatusService)
+ allow(ActivityPub::FetchRemoteStatusService).to receive(:new).and_return(service_double)
+ allow(service_double).to receive(:call).with('https://domain.unknown/foo') { Fabricate(:status, uri: 'https://domain.unknown/foo') }
+ allow(service_double).to receive(:call).with('https://domain.unknown/private') { Fabricate(:status, uri: 'https://domain.unknown/private', visibility: :direct) }
+
+ Import::RowWorker.drain
+ end
end
end
diff --git a/spec/services/favourite_service_spec.rb b/spec/services/favourite_service_spec.rb
index fb27494de5..6a9a5a810a 100644
--- a/spec/services/favourite_service_spec.rb
+++ b/spec/services/favourite_service_spec.rb
@@ -11,11 +11,9 @@ RSpec.describe FavouriteService do
let(:bob) { Fabricate(:account) }
let(:status) { Fabricate(:status, account: bob) }
- before do
- subject.call(sender, status)
- end
-
it 'creates a favourite' do
+ subject.call(sender, status)
+
expect(status.favourites.first).to_not be_nil
end
end
@@ -26,15 +24,16 @@ RSpec.describe FavouriteService do
before do
stub_request(:post, 'http://example.com/inbox').to_return(status: 200, body: '', headers: {})
+ end
+
+ it 'creates a favourite and sends like activity', :inline_jobs do
subject.call(sender, status)
- end
- it 'creates a favourite' do
- expect(status.favourites.first).to_not be_nil
- end
+ expect(status.favourites.first)
+ .to_not be_nil
- it 'sends a like activity', :inline_jobs do
- expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.once
+ expect(a_request(:post, 'http://example.com/inbox'))
+ .to have_been_made.once
end
end
diff --git a/spec/services/follow_service_spec.rb b/spec/services/follow_service_spec.rb
index a0b3b7fec4..b7643ccc7c 100644
--- a/spec/services/follow_service_spec.rb
+++ b/spec/services/follow_service_spec.rb
@@ -143,15 +143,16 @@ RSpec.describe FollowService do
before do
stub_request(:post, 'http://example.com/inbox').to_return(status: 200, body: '', headers: {})
+ end
+
+ it 'creates follow request and sends an activity to inbox', :inline_jobs do
subject.call(sender, bob)
- end
- it 'creates follow request' do
- expect(FollowRequest.find_by(account: sender, target_account: bob)).to_not be_nil
- end
+ expect(FollowRequest.find_by(account: sender, target_account: bob))
+ .to_not be_nil
- it 'sends a follow activity to the inbox', :inline_jobs do
- expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.once
+ expect(a_request(:post, 'http://example.com/inbox'))
+ .to have_been_made.once
end
end
diff --git a/spec/services/notify_service_spec.rb b/spec/services/notify_service_spec.rb
index 935b94c709..9d9d4eed3d 100644
--- a/spec/services/notify_service_spec.rb
+++ b/spec/services/notify_service_spec.rb
@@ -319,6 +319,16 @@ RSpec.describe NotifyService do
end
end
+ context 'when sender is a moderator' do
+ let(:sender_role) { Fabricate(:user_role, highlighted: true, permissions: UserRole::FLAGS[:manage_users]) }
+ let(:sender) { Fabricate(:user, role: sender_role).account }
+ let(:activity) { Fabricate(:mention, status: Fabricate(:status, account: sender)) }
+
+ it 'returns false' do
+ expect(subject.filter?).to be false
+ end
+ end
+
context 'when sender is followed by recipient' do
before do
notification.account.follow!(notification.from_account)
diff --git a/spec/services/precompute_feed_service_spec.rb b/spec/services/precompute_feed_service_spec.rb
index 9b2c6c280f..858c0c2d3c 100644
--- a/spec/services/precompute_feed_service_spec.rb
+++ b/spec/services/precompute_feed_service_spec.rb
@@ -7,31 +7,69 @@ RSpec.describe PrecomputeFeedService do
describe 'call' do
let(:account) { Fabricate(:account) }
+ let!(:list) { Fabricate(:list, account: account, exclusive: false) }
- it 'fills a user timeline with statuses' do
- account = Fabricate(:account)
- status = Fabricate(:status, account: account)
+ context 'when no eligible status exist' do
+ it 'raises no error and results in an empty timeline' do
+ expect { subject.call(account) }.to_not raise_error
- subject.call(account)
-
- expect(redis.zscore(FeedManager.instance.key(:home, account.id), status.id)).to be_within(0.1).of(status.id.to_f)
+ expect(redis.zcard(FeedManager.instance.key(:home, account.id))).to eq(0)
+ end
end
- it 'does not raise an error even if it could not find any status' do
- account = Fabricate(:account)
- expect { subject.call(account) }.to_not raise_error
- end
+ context 'with eligible statuses' do
+ let(:muted_account) { Fabricate(:account) }
+ let!(:followed_account) { Fabricate(:account) }
+ let!(:requested_account) { Fabricate(:account) }
+ let!(:own_status) { Fabricate(:status, account: account) }
+ let!(:followed_status) { Fabricate(:status, account: followed_account) }
+ let!(:unreadable_dm_from_followed) { Fabricate(:status, account: followed_account, visibility: :direct) }
+ let!(:requested_status) { Fabricate(:status, account: requested_account) }
+ let!(:muted_status) { Fabricate(:status, account: muted_account) }
+ let!(:muted_reblog) { Fabricate(:status, account: followed_account, reblog: muted_status) }
+ let!(:known_reply) { Fabricate(:status, account: followed_account, in_reply_to_id: own_status.id) }
+ let!(:unknown_reply) { Fabricate(:status, account: followed_account, in_reply_to_id: requested_status.id) }
- it 'filters statuses' do
- account = Fabricate(:account)
- muted_account = Fabricate(:account)
- Fabricate(:mute, account: account, target_account: muted_account)
- reblog = Fabricate(:status, account: muted_account)
- Fabricate(:status, account: account, reblog: reblog)
+ before do
+ account.follow!(followed_account)
+ account.request_follow!(requested_account)
+ account.mute!(muted_account)
- subject.call(account)
+ list.accounts << followed_account
+ end
- expect(redis.zscore(FeedManager.instance.key(:home, account.id), reblog.id)).to be_nil
+ it "fills a user's home and list timelines with the expected posts" do
+ subject.call(account)
+
+ home_timeline_ids = redis.zrevrangebyscore(FeedManager.instance.key(:home, account.id), '(+inf', '(-inf', limit: [0, 30], with_scores: true).map { |id| id.first.to_i }
+ list_timeline_ids = redis.zrevrangebyscore(FeedManager.instance.key(:list, list.id), '(+inf', '(-inf', limit: [0, 30], with_scores: true).map { |id| id.first.to_i }
+
+ expect(home_timeline_ids).to include(
+ own_status.id,
+ followed_status.id,
+ known_reply.id
+ )
+
+ expect(list_timeline_ids).to include(
+ followed_status.id
+ )
+
+ expect(home_timeline_ids).to_not include(
+ requested_status.id,
+ unknown_reply.id,
+ unreadable_dm_from_followed.id,
+ muted_status.id,
+ muted_reblog.id
+ )
+
+ expect(list_timeline_ids).to_not include(
+ requested_status.id,
+ unknown_reply.id,
+ unreadable_dm_from_followed.id,
+ muted_status.id,
+ muted_reblog.id
+ )
+ end
end
end
end
diff --git a/spec/services/process_mentions_service_spec.rb b/spec/services/process_mentions_service_spec.rb
index 7a318faa1e..9add51523e 100644
--- a/spec/services/process_mentions_service_spec.rb
+++ b/spec/services/process_mentions_service_spec.rb
@@ -16,20 +16,25 @@ RSpec.describe ProcessMentionsService do
before do
account.block!(individually_blocked_account)
account.domain_blocks.create!(domain: domain_blocked_account.domain)
-
- subject.call(status)
end
- it 'creates a mention to the non-blocked account' do
- expect(non_blocked_account.mentions.where(status: status).count).to eq 1
+ it 'creates a mention to the non-blocked account but not the individually or domain blocked accounts' do
+ expect { subject.call(status) }
+ .to create_mention_for_non_blocked
+ .and skip_mention_for_individual
+ .and skip_mention_for_domain_blocked
end
- it 'does not create a mention to the individually blocked account' do
- expect(individually_blocked_account.mentions.where(status: status).count).to eq 0
+ def create_mention_for_non_blocked
+ change { non_blocked_account.mentions.where(status: status).count }.to(1)
end
- it 'does not create a mention to the domain-blocked account' do
- expect(domain_blocked_account.mentions.where(status: status).count).to eq 0
+ def skip_mention_for_individual
+ not_change { individually_blocked_account.mentions.where(status: status).count }.from(0)
+ end
+
+ def skip_mention_for_domain_blocked
+ not_change { domain_blocked_account.mentions.where(status: status).count }.from(0)
end
end
@@ -40,11 +45,9 @@ RSpec.describe ProcessMentionsService do
context 'with a valid remote user' do
let!(:remote_user) { Fabricate(:account, username: 'remote_user', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
- before do
- subject.call(status)
- end
-
it 'creates a mention' do
+ subject.call(status)
+
expect(remote_user.mentions.where(status: status).count).to eq 1
end
end
@@ -53,11 +56,9 @@ RSpec.describe ProcessMentionsService do
let!(:remote_user) { Fabricate(:account, username: 'remote_user', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
let(:status) { Fabricate(:status, account: account, text: "Hello @#{remote_user.acct} @#{remote_user.acct} @#{remote_user.acct}", visibility: :public) }
- before do
- subject.call(status, save_records: false)
- end
-
it 'creates exactly one mention' do
+ subject.call(status, save_records: false)
+
expect(status.mentions.size).to eq 1
end
end
@@ -66,11 +67,9 @@ RSpec.describe ProcessMentionsService do
let!(:remote_user) { Fabricate(:account, username: 'sneak', protocol: :activitypub, domain: 'xn--hresiar-mxa.ch', inbox_url: 'http://example.com/inbox') }
let!(:status) { Fabricate(:status, account: account, text: 'Hello @sneak@hæresiar.ch') }
- before do
- subject.call(status)
- end
-
it 'creates a mention' do
+ subject.call(status)
+
expect(remote_user.mentions.where(status: status).count).to eq 1
end
end
@@ -79,11 +78,9 @@ RSpec.describe ProcessMentionsService do
let!(:remote_user) { Fabricate(:account, username: 'foo', protocol: :activitypub, domain: 'xn--y9a3aq.xn--y9a3aq', inbox_url: 'http://example.com/inbox') }
let!(:status) { Fabricate(:status, account: account, text: 'Hello @foo@հայ.հայ') }
- before do
- subject.call(status)
- end
-
it 'creates a mention' do
+ subject.call(status)
+
expect(remote_user.mentions.where(status: status).count).to eq 1
end
end
@@ -95,10 +92,11 @@ RSpec.describe ProcessMentionsService do
before do
stub_request(:get, 'https://example.com/.well-known/host-meta').to_return(status: 404)
stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:remote_user@example.com').to_return(status: 500)
- subject.call(status)
end
it 'creates a mention' do
+ subject.call(status)
+
expect(remote_user.mentions.where(status: status).count).to eq 1
end
end
diff --git a/spec/services/reject_follow_service_spec.rb b/spec/services/reject_follow_service_spec.rb
index d2c7a00206..eec0d6c1e0 100644
--- a/spec/services/reject_follow_service_spec.rb
+++ b/spec/services/reject_follow_service_spec.rb
@@ -10,17 +10,15 @@ RSpec.describe RejectFollowService do
describe 'local' do
let(:bob) { Fabricate(:account) }
- before do
- FollowRequest.create(account: bob, target_account: sender)
+ before { FollowRequest.create(account: bob, target_account: sender) }
+
+ it 'removes follow request and does not create relation' do
subject.call(bob, sender)
- end
- it 'removes follow request' do
- expect(bob.requested?(sender)).to be false
- end
-
- it 'does not create follow relation' do
- expect(bob.following?(sender)).to be false
+ expect(bob)
+ .to_not be_requested(sender)
+ expect(bob)
+ .to_not be_following(sender)
end
end
@@ -30,19 +28,17 @@ RSpec.describe RejectFollowService do
before do
FollowRequest.create(account: bob, target_account: sender)
stub_request(:post, bob.inbox_url).to_return(status: 200)
+ end
+
+ it 'removes follow request, does not create relation, sends reject activity', :inline_jobs do
subject.call(bob, sender)
- end
- it 'removes follow request' do
- expect(bob.requested?(sender)).to be false
- end
-
- it 'does not create follow relation' do
- expect(bob.following?(sender)).to be false
- end
-
- it 'sends a reject activity', :inline_jobs do
- expect(a_request(:post, bob.inbox_url)).to have_been_made.once
+ expect(bob)
+ .to_not be_requested(sender)
+ expect(bob)
+ .to_not be_following(sender)
+ expect(a_request(:post, bob.inbox_url))
+ .to have_been_made.once
end
end
end
diff --git a/spec/services/remove_from_followers_service_spec.rb b/spec/services/remove_from_followers_service_spec.rb
index 515600096c..381daf1a59 100644
--- a/spec/services/remove_from_followers_service_spec.rb
+++ b/spec/services/remove_from_followers_service_spec.rb
@@ -10,13 +10,13 @@ RSpec.describe RemoveFromFollowersService do
describe 'local' do
let(:sender) { Fabricate(:account, username: 'alice') }
- before do
- Follow.create(account: sender, target_account: bob)
- subject.call(bob, sender)
- end
+ before { Follow.create(account: sender, target_account: bob) }
it 'does not create follow relation' do
- expect(bob.followed_by?(sender)).to be false
+ subject.call(bob, sender)
+
+ expect(bob)
+ .to_not be_followed_by(sender)
end
end
@@ -26,15 +26,16 @@ RSpec.describe RemoveFromFollowersService do
before do
Follow.create(account: sender, target_account: bob)
stub_request(:post, sender.inbox_url).to_return(status: 200)
+ end
+
+ it 'does not create follow relation and sends reject activity', :inline_jobs do
subject.call(bob, sender)
- end
- it 'does not create follow relation' do
- expect(bob.followed_by?(sender)).to be false
- end
+ expect(bob)
+ .to_not be_followed_by(sender)
- it 'sends a reject activity', :inline_jobs do
- expect(a_request(:post, sender.inbox_url)).to have_been_made.once
+ expect(a_request(:post, sender.inbox_url))
+ .to have_been_made.once
end
end
end
diff --git a/spec/services/remove_status_service_spec.rb b/spec/services/remove_status_service_spec.rb
index da77144458..48d45c1b9a 100644
--- a/spec/services/remove_status_service_spec.rb
+++ b/spec/services/remove_status_service_spec.rb
@@ -30,42 +30,38 @@ RSpec.describe RemoveStatusService, :inline_jobs do
Fabricate(:status, account: bill, reblog: status, uri: 'hoge')
end
- it 'removes status from author\'s home feed' do
- subject.call(status)
- expect(HomeFeed.new(alice).get(10).pluck(:id)).to_not include(status.id)
- end
-
- it 'removes status from local follower\'s home feed' do
- subject.call(status)
- expect(HomeFeed.new(jeff).get(10).pluck(:id)).to_not include(status.id)
- end
-
- it 'publishes to public media timeline' do
+ it 'removes status from notifications and from author and local follower home feeds, publishes to media timeline, sends delete activities' do
allow(redis).to receive(:publish).with(any_args)
- subject.call(status)
+ expect { subject.call(status) }
+ .to remove_status_from_notifications
- expect(redis).to have_received(:publish).with('timeline:public:media', Oj.dump(event: :delete, payload: status.id.to_s))
- end
+ expect(home_feed_ids(alice))
+ .to_not include(status.id)
+ expect(home_feed_ids(jeff))
+ .to_not include(status.id)
- it 'sends Delete activity to followers' do
- subject.call(status)
+ expect(redis)
+ .to have_received(:publish).with('timeline:public:media', Oj.dump(event: :delete, payload: status.id.to_s))
expect(delete_delivery(hank, status))
.to have_been_made.once
- end
-
- it 'sends Delete activity to rebloggers' do
- subject.call(status)
expect(delete_delivery(bill, status))
.to have_been_made.once
end
- it 'remove status from notifications' do
- expect { subject.call(status) }.to change {
- Notification.where(activity_type: 'Favourite', from_account: jeff, account: alice).count
- }.from(1).to(0)
+ def home_feed_ids(personage)
+ HomeFeed
+ .new(personage)
+ .get(10)
+ .pluck(:id)
+ end
+
+ def remove_status_from_notifications
+ change { Notification.where(activity_type: 'Favourite', from_account: jeff, account: alice).count }
+ .from(1)
+ .to(0)
end
def delete_delivery(target, status)
diff --git a/spec/services/report_service_spec.rb b/spec/services/report_service_spec.rb
index 24fffcce63..4e20c536a4 100644
--- a/spec/services/report_service_spec.rb
+++ b/spec/services/report_service_spec.rb
@@ -31,14 +31,13 @@ RSpec.describe ReportService do
context 'when forward is true', :inline_jobs do
let(:forward) { true }
- it 'sends ActivityPub payload when forward is true' do
- subject.call(source_account, remote_account, forward: forward)
- expect(a_request(:post, 'http://example.com/inbox')).to have_been_made
- end
-
- it 'has an uri' do
+ it 'has a URI and sends ActivityPub payload' do
report = subject.call(source_account, remote_account, forward: forward)
- expect(report.uri).to_not be_nil
+
+ expect(report.uri)
+ .to_not be_nil
+ expect(a_request(:post, 'http://example.com/inbox'))
+ .to have_been_made
end
context 'when reporting a reply on a different remote server' do
@@ -122,13 +121,12 @@ RSpec.describe ReportService do
status.mentions.create(account: source_account)
end
- it 'creates a report' do
- expect { subject.call }.to change { target_account.targeted_reports.count }.from(0).to(1)
- end
+ it 'creates a report and attaches the DM to the report' do
+ expect { subject.call }
+ .to change { target_account.targeted_reports.count }.from(0).to(1)
- it 'attaches the DM to the report' do
- subject.call
- expect(target_account.targeted_reports.pluck(:status_ids)).to eq [[status.id]]
+ expect(target_account.targeted_reports.pluck(:status_ids))
+ .to eq [[status.id]]
end
end
@@ -146,13 +144,12 @@ RSpec.describe ReportService do
status.mentions.create(account: source_account)
end
- it 'creates a report' do
- expect { subject.call }.to change { target_account.targeted_reports.count }.from(0).to(1)
- end
+ it 'creates a report and attaches DM to report' do
+ expect { subject.call }
+ .to change { target_account.targeted_reports.count }.from(0).to(1)
- it 'attaches the DM to the report' do
- subject.call
- expect(target_account.targeted_reports.pluck(:status_ids)).to eq [[status.id]]
+ expect(target_account.targeted_reports.pluck(:status_ids))
+ .to eq [[status.id]]
end
end
diff --git a/spec/services/resolve_account_service_spec.rb b/spec/services/resolve_account_service_spec.rb
index cbbbdf5ed8..a3fe2e8729 100644
--- a/spec/services/resolve_account_service_spec.rb
+++ b/spec/services/resolve_account_service_spec.rb
@@ -24,37 +24,38 @@ RSpec.describe ResolveAccountService do
context 'when domain is banned' do
before { Fabricate(:domain_block, domain: 'ap.example.com', severity: :suspend) }
- it 'does not return an account' do
- expect(subject.call('foo@ap.example.com', skip_webfinger: true)).to be_nil
- end
-
- it 'does not make a webfinger query' do
- subject.call('foo@ap.example.com', skip_webfinger: true)
- expect(a_request(:get, 'https://ap.example.com/.well-known/webfinger?resource=acct:foo@ap.example.com')).to_not have_been_made
+ it 'does not return an account or make a webfinger query' do
+ expect(subject.call('foo@ap.example.com', skip_webfinger: true))
+ .to be_nil
+ expect(webfinger_discovery_request)
+ .to_not have_been_made
end
end
context 'when domain is not banned' do
- it 'returns the expected account' do
- expect(subject.call('foo@ap.example.com', skip_webfinger: true)).to eq remote_account
- end
-
- it 'does not make a webfinger query' do
- subject.call('foo@ap.example.com', skip_webfinger: true)
- expect(a_request(:get, 'https://ap.example.com/.well-known/webfinger?resource=acct:foo@ap.example.com')).to_not have_been_made
+ it 'returns the expected account and does not make a webfinger query' do
+ expect(subject.call('foo@ap.example.com', skip_webfinger: true))
+ .to eq remote_account
+ expect(webfinger_discovery_request)
+ .to_not have_been_made
end
end
end
context 'when account is not known' do
- it 'does not return an account' do
- expect(subject.call('foo@ap.example.com', skip_webfinger: true)).to be_nil
+ it 'does not return an account and does not make webfinger query' do
+ expect(subject.call('foo@ap.example.com', skip_webfinger: true))
+ .to be_nil
+ expect(webfinger_discovery_request)
+ .to_not have_been_made
end
+ end
- it 'does not make a webfinger query' do
- subject.call('foo@ap.example.com', skip_webfinger: true)
- expect(a_request(:get, 'https://ap.example.com/.well-known/webfinger?resource=acct:foo@ap.example.com')).to_not have_been_made
- end
+ def webfinger_discovery_request
+ a_request(
+ :get,
+ 'https://ap.example.com/.well-known/webfinger?resource=acct:foo@ap.example.com'
+ )
end
end
@@ -86,13 +87,11 @@ RSpec.describe ResolveAccountService do
allow(AccountDeletionWorker).to receive(:perform_async)
end
- it 'returns nil' do
- expect(subject.call('hoge@example.com')).to be_nil
- end
-
- it 'queues account deletion worker' do
- subject.call('hoge@example.com')
- expect(AccountDeletionWorker).to have_received(:perform_async)
+ it 'returns nil and queues deletion worker' do
+ expect(subject.call('hoge@example.com'))
+ .to be_nil
+ expect(AccountDeletionWorker)
+ .to have_received(:perform_async)
end
end
@@ -112,9 +111,12 @@ RSpec.describe ResolveAccountService do
it 'returns new remote account' do
account = subject.call('Foo@redirected.example.com')
- expect(account.activitypub?).to be true
- expect(account.acct).to eq 'foo@ap.example.com'
- expect(account.inbox_url).to eq 'https://ap.example.com/users/foo/inbox'
+ expect(account)
+ .to have_attributes(
+ activitypub?: true,
+ acct: 'foo@ap.example.com',
+ inbox_url: 'https://ap.example.com/users/foo/inbox'
+ )
end
end
@@ -127,9 +129,12 @@ RSpec.describe ResolveAccountService do
it 'returns new remote account' do
account = subject.call('Foo@redirected.example.com')
- expect(account.activitypub?).to be true
- expect(account.acct).to eq 'foo@ap.example.com'
- expect(account.inbox_url).to eq 'https://ap.example.com/users/foo/inbox'
+ expect(account)
+ .to have_attributes(
+ activitypub?: true,
+ acct: 'foo@ap.example.com',
+ inbox_url: 'https://ap.example.com/users/foo/inbox'
+ )
end
end
@@ -165,9 +170,12 @@ RSpec.describe ResolveAccountService do
it 'returns new remote account' do
account = subject.call('foo@ap.example.com')
- expect(account.activitypub?).to be true
- expect(account.domain).to eq 'ap.example.com'
- expect(account.inbox_url).to eq 'https://ap.example.com/users/foo/inbox'
+ expect(account)
+ .to have_attributes(
+ activitypub?: true,
+ domain: 'ap.example.com',
+ inbox_url: 'https://ap.example.com/users/foo/inbox'
+ )
end
context 'with multiple types' do
@@ -178,10 +186,13 @@ RSpec.describe ResolveAccountService do
it 'returns new remote account' do
account = subject.call('foo@ap.example.com')
- expect(account.activitypub?).to be true
- expect(account.domain).to eq 'ap.example.com'
- expect(account.inbox_url).to eq 'https://ap.example.com/users/foo/inbox'
- expect(account.actor_type).to eq 'Person'
+ expect(account)
+ .to have_attributes(
+ activitypub?: true,
+ domain: 'ap.example.com',
+ inbox_url: 'https://ap.example.com/users/foo/inbox',
+ actor_type: 'Person'
+ )
end
end
end
@@ -190,20 +201,21 @@ RSpec.describe ResolveAccountService do
let!(:duplicate) { Fabricate(:account, username: 'foo', domain: 'old.example.com', uri: 'https://ap.example.com/users/foo') }
let!(:status) { Fabricate(:status, account: duplicate, text: 'foo') }
- it 'returns new remote account' do
+ it 'returns new remote account and merges accounts', :inline_jobs do
account = subject.call('foo@ap.example.com')
- expect(account.activitypub?).to be true
- expect(account.domain).to eq 'ap.example.com'
- expect(account.inbox_url).to eq 'https://ap.example.com/users/foo/inbox'
- expect(account.uri).to eq 'https://ap.example.com/users/foo'
- end
+ expect(account)
+ .to have_attributes(
+ activitypub?: true,
+ domain: 'ap.example.com',
+ inbox_url: 'https://ap.example.com/users/foo/inbox',
+ uri: 'https://ap.example.com/users/foo'
+ )
- it 'merges accounts', :inline_jobs do
- account = subject.call('foo@ap.example.com')
-
- expect(status.reload.account_id).to eq account.id
- expect(Account.where(uri: account.uri).count).to eq 1
+ expect(status.reload.account_id)
+ .to eq account.id
+ expect(Account.where(uri: account.uri).count)
+ .to eq 1
end
end
@@ -214,11 +226,15 @@ RSpec.describe ResolveAccountService do
it 'returns new remote account' do
account = subject.call('foo@ap.example.com')
- expect(account.activitypub?).to be true
- expect(account.domain).to eq 'ap.example.com'
- expect(account.inbox_url).to eq 'https://ap.example.com/users/foo/inbox'
- expect(account.uri).to eq 'https://ap.example.com/users/foo'
- expect(status.reload.account).to eq(account)
+ expect(account)
+ .to have_attributes(
+ activitypub?: true,
+ domain: 'ap.example.com',
+ inbox_url: 'https://ap.example.com/users/foo/inbox',
+ uri: 'https://ap.example.com/users/foo'
+ )
+ expect(status.reload.account)
+ .to eq(account)
end
end
diff --git a/spec/services/resolve_url_service_spec.rb b/spec/services/resolve_url_service_spec.rb
index 80f2a5a4ba..eaf00c1ed8 100644
--- a/spec/services/resolve_url_service_spec.rb
+++ b/spec/services/resolve_url_service_spec.rb
@@ -51,12 +51,11 @@ RSpec.describe ResolveURLService do
let(:url) { 'https://example.com/@foo/42' }
let(:uri) { 'https://example.com/users/foo/statuses/42' }
- it 'returns status by url' do
- expect(subject.call(url, on_behalf_of: account)).to eq(status)
- end
-
- it 'returns status by uri' do
- expect(subject.call(uri, on_behalf_of: account)).to eq(status)
+ it 'returns status by URL or URI' do
+ expect(subject.call(url, on_behalf_of: account))
+ .to eq(status)
+ expect(subject.call(uri, on_behalf_of: account))
+ .to eq(status)
end
end
@@ -75,12 +74,11 @@ RSpec.describe ResolveURLService do
let(:url) { 'https://example.com/@foo/42' }
let(:uri) { 'https://example.com/users/foo/statuses/42' }
- it 'does not return the status by url' do
- expect(subject.call(url, on_behalf_of: account)).to be_nil
- end
-
- it 'does not return the status by uri' do
- expect(subject.call(uri, on_behalf_of: account)).to be_nil
+ it 'does not return the status by URL or URI' do
+ expect(subject.call(url, on_behalf_of: account))
+ .to be_nil
+ expect(subject.call(uri, on_behalf_of: account))
+ .to be_nil
end
end
@@ -107,22 +105,20 @@ RSpec.describe ResolveURLService do
account.follow!(poster)
end
- it 'returns status by url' do
- expect(subject.call(url, on_behalf_of: account)).to eq(status)
- end
-
- it 'returns status by uri' do
- expect(subject.call(uri, on_behalf_of: account)).to eq(status)
+ it 'returns status by URL or URI' do
+ expect(subject.call(url, on_behalf_of: account))
+ .to eq(status)
+ expect(subject.call(uri, on_behalf_of: account))
+ .to eq(status)
end
end
context 'when the account does not follow the poster' do
- it 'does not return the status by url' do
- expect(subject.call(url, on_behalf_of: account)).to be_nil
- end
-
- it 'does not return the status by uri' do
- expect(subject.call(uri, on_behalf_of: account)).to be_nil
+ it 'does not return the status by URL or URI' do
+ expect(subject.call(url, on_behalf_of: account))
+ .to be_nil
+ expect(subject.call(uri, on_behalf_of: account))
+ .to be_nil
end
end
end
diff --git a/spec/services/suspend_account_service_spec.rb b/spec/services/suspend_account_service_spec.rb
index 4a2f494e0c..c15c23ca30 100644
--- a/spec/services/suspend_account_service_spec.rb
+++ b/spec/services/suspend_account_service_spec.rb
@@ -2,7 +2,7 @@
require 'rails_helper'
-RSpec.describe SuspendAccountService, :inline_jobs do
+RSpec.describe SuspendAccountService do
shared_examples 'common behavior' do
subject { described_class.new.call(account) }
@@ -11,6 +11,7 @@ RSpec.describe SuspendAccountService, :inline_jobs do
before do
allow(FeedManager.instance).to receive_messages(unmerge_from_home: nil, unmerge_from_list: nil)
+ allow(Rails.configuration.x).to receive(:cache_buster_enabled).and_return(true)
local_follower.follow!(account)
list.accounts << account
@@ -23,6 +24,7 @@ RSpec.describe SuspendAccountService, :inline_jobs do
it 'unmerges from feeds of local followers and changes file mode and preserves suspended flag' do
expect { subject }
.to change_file_mode
+ .and enqueue_sidekiq_job(CacheBusterWorker).with(account.media_attachments.first.file.url(:original))
.and not_change_suspended_flag
expect(FeedManager.instance).to have_received(:unmerge_from_home).with(account, local_follower)
expect(FeedManager.instance).to have_received(:unmerge_from_list).with(account, list)
@@ -38,17 +40,12 @@ RSpec.describe SuspendAccountService, :inline_jobs do
end
describe 'suspending a local account' do
- def match_update_actor_request(req, account)
- json = JSON.parse(req.body)
+ def match_update_actor_request(json, account)
+ json = JSON.parse(json)
actor_id = ActivityPub::TagManager.instance.uri_for(account)
json['type'] == 'Update' && json['actor'] == actor_id && json['object']['id'] == actor_id && json['object']['suspended']
end
- before do
- stub_request(:post, 'https://alice.com/inbox').to_return(status: 201)
- stub_request(:post, 'https://bob.com/inbox').to_return(status: 201)
- end
-
include_examples 'common behavior' do
let!(:account) { Fabricate(:account) }
let!(:remote_follower) { Fabricate(:account, uri: 'https://alice.com', inbox_url: 'https://alice.com/inbox', protocol: :activitypub, domain: 'alice.com') }
@@ -61,22 +58,20 @@ RSpec.describe SuspendAccountService, :inline_jobs do
it 'sends an Update actor activity to followers and reporters' do
subject
- expect(a_request(:post, remote_follower.inbox_url).with { |req| match_update_actor_request(req, account) }).to have_been_made.once
- expect(a_request(:post, remote_reporter.inbox_url).with { |req| match_update_actor_request(req, account) }).to have_been_made.once
+
+ expect(ActivityPub::DeliveryWorker)
+ .to have_enqueued_sidekiq_job(satisfying { |json| match_update_actor_request(json, account) }, account.id, remote_follower.inbox_url).once
+ .and have_enqueued_sidekiq_job(satisfying { |json| match_update_actor_request(json, account) }, account.id, remote_reporter.inbox_url).once
end
end
end
describe 'suspending a remote account' do
- def match_reject_follow_request(req, account, followee)
- json = JSON.parse(req.body)
+ def match_reject_follow_request(json, account, followee)
+ json = JSON.parse(json)
json['type'] == 'Reject' && json['actor'] == ActivityPub::TagManager.instance.uri_for(followee) && json['object']['actor'] == account.uri
end
- before do
- stub_request(:post, 'https://bob.com/inbox').to_return(status: 201)
- end
-
include_examples 'common behavior' do
let!(:account) { Fabricate(:account, domain: 'bob.com', uri: 'https://bob.com', inbox_url: 'https://bob.com/inbox', protocol: :activitypub) }
let!(:local_followee) { Fabricate(:account) }
@@ -88,7 +83,8 @@ RSpec.describe SuspendAccountService, :inline_jobs do
it 'sends a Reject Follow activity', :aggregate_failures do
subject
- expect(a_request(:post, account.inbox_url).with { |req| match_reject_follow_request(req, account, local_followee) }).to have_been_made.once
+ expect(ActivityPub::DeliveryWorker)
+ .to have_enqueued_sidekiq_job(satisfying { |json| match_reject_follow_request(json, account, local_followee) }, local_followee.id, account.inbox_url).once
end
end
end
diff --git a/spec/services/translate_status_service_spec.rb b/spec/services/translate_status_service_spec.rb
index 0779fbbe6c..ac7a43ff2a 100644
--- a/spec/services/translate_status_service_spec.rb
+++ b/spec/services/translate_status_service_spec.rb
@@ -18,7 +18,7 @@ RSpec.describe TranslateStatusService do
describe '#call' do
before do
translation_service = TranslationService.new
- allow(translation_service).to receive(:languages).and_return({ 'en' => ['es'] })
+ allow(translation_service).to receive(:languages).and_return({ 'en' => ['es', 'es-MX'] })
allow(translation_service).to receive(:translate) do |texts|
texts.map do |text|
TranslationService::Translation.new(
@@ -32,20 +32,15 @@ RSpec.describe TranslateStatusService do
allow(TranslationService).to receive_messages(configured?: true, configured: translation_service)
end
- it 'returns translated status content' do
- expect(service.call(status, 'es').content).to eq '
{badges}
@@ -366,14 +366,14 @@ class MediaGallery extends PureComponent {
return (
+ {children}
+
{(!visible || uncached) && (
diff --git a/app/javascript/mastodon/features/bookmarked_statuses/index.jsx b/app/javascript/mastodon/features/bookmarked_statuses/index.jsx
index 93be1c6b2e..284342d4ee 100644
--- a/app/javascript/mastodon/features/bookmarked_statuses/index.jsx
+++ b/app/javascript/mastodon/features/bookmarked_statuses/index.jsx
@@ -101,6 +101,7 @@ class Bookmarks extends ImmutablePureComponent {
onLoadMore={this.handleLoadMore}
emptyMessage={emptyMessage}
bindToDocument={!multiColumn}
+ timelineId='bookmarks'
/>
diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx
index 43795d030f..dac873c8e4 100644
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx
@@ -325,6 +325,7 @@ class EmojiPickerDropdown extends PureComponent {
onPickEmoji: PropTypes.func.isRequired,
onSkinTone: PropTypes.func.isRequired,
skinTone: PropTypes.number.isRequired,
+ inverted: PropTypes.bool,
};
state = {
@@ -387,7 +388,7 @@ class EmojiPickerDropdown extends PureComponent {
};
render () {
- const { intl, onPickEmoji, onSkinTone, skinTone, frequentlyUsedEmojis } = this.props;
+ const { intl, onPickEmoji, onSkinTone, skinTone, frequentlyUsedEmojis, inverted } = this.props;
const title = intl.formatMessage(messages.emoji);
const { active, loading, placement } = this.state;
@@ -399,7 +400,7 @@ class EmojiPickerDropdown extends PureComponent {
active={active}
iconComponent={MoodIcon}
onClick={this.onToggle}
- inverted
+ inverted={typeof(inverted) === 'undefined' || inverted}
/>
diff --git a/app/javascript/mastodon/features/emoji/__tests__/emoji-test.js b/app/javascript/mastodon/features/emoji/__tests__/emoji-test.js
index 9d6ff5226a..35804de82a 100644
--- a/app/javascript/mastodon/features/emoji/__tests__/emoji-test.js
+++ b/app/javascript/mastodon/features/emoji/__tests__/emoji-test.js
@@ -22,23 +22,23 @@ describe('emoji', () => {
it('does unicode', () => {
expect(emojify('\uD83D\uDC69\u200D\uD83D\uDC69\u200D\uD83D\uDC66\u200D\uD83D\uDC66')).toEqual(
- '
😴😇')) - .toEqual('😄
😴
😴');
});
it('does not emojify emojis with textual presentation VS15 character', () => {
@@ -81,17 +81,17 @@ describe('emoji', () => {
it('does a simple emoji properly', () => {
expect(emojify('♀♂'))
- .toEqual('
diff --git a/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.jsx b/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.jsx
index 1b8040e55b..3269b5a497 100644
--- a/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.jsx
+++ b/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.jsx
@@ -129,8 +129,13 @@ export const InlineFollowSuggestions = ({ hidden }) => {
return;
}
- setCanScrollLeft(bodyRef.current.scrollLeft > 0);
- setCanScrollRight((bodyRef.current.scrollLeft + bodyRef.current.clientWidth) < bodyRef.current.scrollWidth);
+ if (getComputedStyle(bodyRef.current).direction === 'rtl') {
+ setCanScrollLeft((bodyRef.current.clientWidth - bodyRef.current.scrollLeft) < bodyRef.current.scrollWidth);
+ setCanScrollRight(bodyRef.current.scrollLeft < 0);
+ } else {
+ setCanScrollLeft(bodyRef.current.scrollLeft > 0);
+ setCanScrollRight((bodyRef.current.scrollLeft + bodyRef.current.clientWidth) < bodyRef.current.scrollWidth);
+ }
}, [setCanScrollRight, setCanScrollLeft, bodyRef, suggestions]);
const handleLeftNav = useCallback(() => {
@@ -146,8 +151,13 @@ export const InlineFollowSuggestions = ({ hidden }) => {
return;
}
- setCanScrollLeft(bodyRef.current.scrollLeft > 0);
- setCanScrollRight((bodyRef.current.scrollLeft + bodyRef.current.clientWidth) < bodyRef.current.scrollWidth);
+ if (getComputedStyle(bodyRef.current).direction === 'rtl') {
+ setCanScrollLeft((bodyRef.current.clientWidth - bodyRef.current.scrollLeft) < bodyRef.current.scrollWidth);
+ setCanScrollRight(bodyRef.current.scrollLeft < 0);
+ } else {
+ setCanScrollLeft(bodyRef.current.scrollLeft > 0);
+ setCanScrollRight((bodyRef.current.scrollLeft + bodyRef.current.clientWidth) < bodyRef.current.scrollWidth);
+ }
}, [setCanScrollRight, setCanScrollLeft, bodyRef]);
const handleDismiss = useCallback(() => {
diff --git a/app/javascript/mastodon/features/notifications/components/column_settings.jsx b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
index d5185e2bc9..e8f02f1718 100644
--- a/app/javascript/mastodon/features/notifications/components/column_settings.jsx
+++ b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
@@ -44,6 +44,7 @@ class ColumnSettings extends PureComponent {
const alertStr =
diff --git a/app/javascript/mastodon/features/notifications/containers/column_settings_container.js b/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
index 8bcc7ab4ef..4ac6cfa629 100644
--- a/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
+++ b/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
@@ -56,11 +56,12 @@ const mapDispatchToProps = (dispatch) => ({
} else {
dispatch(changeSetting(['notifications', ...path], checked));
}
- } else if(path[0] === 'groupingBeta') {
- dispatch(changeSetting(['notifications', ...path], checked));
- dispatch(initializeNotifications());
} else {
dispatch(changeSetting(['notifications', ...path], checked));
+
+ if(path[0] === 'group' && path[1] === 'follow') {
+ dispatch(initializeNotifications());
+ }
}
},
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_follow.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_follow.tsx
index 6a9a45d242..a00f6267c5 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_follow.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_follow.tsx
@@ -1,16 +1,19 @@
import { FormattedMessage } from 'react-intl';
+import { Link } from 'react-router-dom';
+
import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
import { FollowersCounter } from 'mastodon/components/counters';
import { FollowButton } from 'mastodon/components/follow_button';
import { ShortNumber } from 'mastodon/components/short_number';
+import { me } from 'mastodon/initial_state';
import type { NotificationGroupFollow } from 'mastodon/models/notification_group';
import { useAppSelector } from 'mastodon/store';
import type { LabelRenderer } from './notification_group_with_status';
import { NotificationGroupWithStatus } from './notification_group_with_status';
-const labelRenderer: LabelRenderer = (displayedName, total) => {
+const labelRenderer: LabelRenderer = (displayedName, total, seeMoreHref) => {
if (total === 1)
return (
{spoilerButton}
)}
- {children}
-
{(visible && !uncached) && (
diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx
index 4d5e036a9b..893b93b484 100644
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@@ -340,7 +340,7 @@ class Status extends ImmutablePureComponent {
const { onToggleHidden } = this.props;
const status = this._properStatus();
- if (status.get('matched_filters')) {
+ if (this.props.status.get('matched_filters')) {
const expandedBecauseOfCW = !status.get('hidden') || status.get('spoiler_text').length === 0;
const expandedBecauseOfFilter = this.state.showDespiteFilter;
@@ -477,7 +477,7 @@ class Status extends ImmutablePureComponent {
media={status.get('media_attachments')}
/>
);
- } else if (['image', 'gifv'].includes(status.getIn(['media_attachments', 0, 'type'])) || status.get('media_attachments').size > 1) {
+ } else if (['image', 'gifv', 'unknown'].includes(status.getIn(['media_attachments', 0, 'type'])) || status.get('media_attachments').size > 1) {
media = (
{Component => (
diff --git a/app/javascript/mastodon/components/status_action_bar.jsx b/app/javascript/mastodon/components/status_action_bar.jsx
index ebc62bd651..2f636ddbd9 100644
--- a/app/javascript/mastodon/components/status_action_bar.jsx
+++ b/app/javascript/mastodon/components/status_action_bar.jsx
@@ -11,7 +11,6 @@ import { connect } from 'react-redux';
import BookmarkIcon from '@/material-icons/400-24px/bookmark-fill.svg';
import BookmarkBorderIcon from '@/material-icons/400-24px/bookmark.svg?react';
-import EmojiReactionIcon from '@/material-icons/400-24px/mood.svg?react';
import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
@@ -166,8 +165,6 @@ class StatusActionBar extends ImmutablePureComponent {
}
};
- handleEmojiPickInnerButton = () => {};
-
handleReblogClick = e => {
const { signedIn } = this.props.identity;
@@ -316,14 +313,14 @@ class StatusActionBar extends ImmutablePureComponent {
if (publicStatus && isRemote) {
menu.push({ text: intl.formatMessage(messages.openOriginalPage), href: status.get('url') });
}
-
+
menu.push({ text: intl.formatMessage(messages.copy), action: this.handleCopy });
-
+
if (publicStatus && 'share' in navigator) {
menu.push({ text: intl.formatMessage(messages.share), action: this.handleShareClick });
}
-
- if (anonymousStatus && (signedIn || !isRemote)) {
+
+ if (anonymousStatus && !isRemote) {
menu.push({ text: intl.formatMessage(messages.embed), action: this.handleEmbed });
}
}
@@ -485,9 +482,7 @@ class StatusActionBar extends ImmutablePureComponent {
const denyFromAll = emojiReactionPolicy !== 'block' && emojiReactionPolicy !== 'block';
const emojiPickerDropdown = (enableEmojiReaction && emojiReactionAvailableServer && denyFromAll && (writtenByMe || (following && followed && mutual && outside)) && (
+
);
diff --git a/app/javascript/mastodon/containers/compose_container.jsx b/app/javascript/mastodon/containers/compose_container.jsx
index 171f14d3b2..788c654316 100644
--- a/app/javascript/mastodon/containers/compose_container.jsx
+++ b/app/javascript/mastodon/containers/compose_container.jsx
@@ -1,5 +1,6 @@
import { Provider } from 'react-redux';
+import { fetchCircles } from 'mastodon/actions/circles';
import { fetchCustomEmojis } from 'mastodon/actions/custom_emojis';
import { hydrateStore } from 'mastodon/actions/store';
import { Router } from 'mastodon/components/router';
@@ -13,6 +14,7 @@ if (initialState) {
}
store.dispatch(fetchCustomEmojis());
+store.dispatch(fetchCircles());
const ComposeContainer = () => (
-
)) || (enableEmojiReaction && (
diff --git a/app/javascript/mastodon/components/status_banner.tsx b/app/javascript/mastodon/components/status_banner.tsx
index 8ff17a9b2e..d25c05d6db 100644
--- a/app/javascript/mastodon/components/status_banner.tsx
+++ b/app/javascript/mastodon/components/status_banner.tsx
@@ -1,8 +1,8 @@
import { FormattedMessage } from 'react-intl';
export enum BannerVariant {
- Yellow = 'yellow',
- Blue = 'blue',
+ Warning = 'warning',
+ Filter = 'filter',
}
export const StatusBanner: React.FC<{
@@ -11,9 +11,9 @@ export const StatusBanner: React.FC<{
expanded?: boolean;
onClick?: () => void;
}> = ({ children, variant, expanded, onClick }) => (
-
+ ) : variant === BannerVariant.Warning ? (
+ ');
expect(emojify('👨👩👧👧')).toEqual(
- '');
+ expect(emojify('👩👩👦')).toEqual('');
expect(emojify('\u2757')).toEqual(
- '');
});
it('does multiple unicode', () => {
expect(emojify('\u2757 #\uFE0F\u20E3')).toEqual(
- ' ');
expect(emojify('\u2757#\uFE0F\u20E3')).toEqual(
- '');
expect(emojify('\u2757 #\uFE0F\u20E3 \u2757')).toEqual(
- ' ');
expect(emojify('foo \u2757 #\uFE0F\u20E3 bar')).toEqual(
- 'foo bar');
});
it('ignores unicode inside of tags', () => {
@@ -46,16 +46,16 @@ describe('emoji', () => {
});
it('does multiple emoji properly (issue 5188)', () => {
- expect(emojify('👌🌈💕')).toEqual('');
+ expect(emojify('👌 🌈 💕')).toEqual(' ');
});
it('does an emoji that has no shortcode', () => {
- expect(emojify('👁🗨')).toEqual('');
});
it('does an emoji whose filename is irregular', () => {
- expect(emojify('↙️')).toEqual('');
});
it('avoid emojifying on invisible text', () => {
@@ -67,11 +67,11 @@ describe('emoji', () => {
it('avoid emojifying on invisible text with nested tags', () => {
expect(emojify('😄bar😴😇'))
- .toEqual('😄bar😴');
expect(emojify('😄😕😴😇'))
- .toEqual('😄😕😴');
expect(emojify('😄😴😇')) - .toEqual('😄
😴
😴
');
});
it('does not emojify emojis with textual presentation VS15 character', () => {
@@ -81,17 +81,17 @@ describe('emoji', () => {
it('does a simple emoji properly', () => {
expect(emojify('♀♂'))
- .toEqual('');
});
it('does an emoji containing ZWJ properly', () => {
expect(emojify('💂♀️💂♂️'))
- .toEqual('');
});
it('keeps ordering as expected (issue fixed by PR 20677)', () => {
- expect(emojify('💕 #foo test: foo.
')) - .toEqual('
💕 #foo test: foo.
')) + .toEqual(' #foo test: foo.
-
)) || (enableEmojiReaction && (
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.tsx b/app/javascript/mastodon/features/status/components/detailed_status.tsx
index 8d4505dc80..017fcaa17b 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.tsx
+++ b/app/javascript/mastodon/features/status/components/detailed_status.tsx
@@ -15,6 +15,7 @@ import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?re
import { AnimatedNumber } from 'mastodon/components/animated_number';
import { ContentWarning } from 'mastodon/components/content_warning';
import EditedTimestamp from 'mastodon/components/edited_timestamp';
+import { FilterWarning } from 'mastodon/components/filter_warning';
import type { StatusLike } from 'mastodon/components/hashtag_bar';
import { getHashtagBarForStatus } from 'mastodon/components/hashtag_bar';
import { Icon } from 'mastodon/components/icon';
@@ -78,6 +79,7 @@ export const DetailedStatus: React.FC<{
}) => {
const properStatus = status?.get('reblog') ?? status;
const [height, setHeight] = useState(0);
+ const [showDespiteFilter, setShowDespiteFilter] = useState(false);
const nodeRef = useRefrel="me", която предотврятява имитирането на уебсайтове с породено от потребителите съдържание. Може дори да употребите етикет за връзката в заглавката на странице вместо а, но HTML трябва да достъпен без изпълнение на JavaScript.
@@ -1864,6 +1946,7 @@ bg:
instructions_html: Копипейстнете кода долу в HTML на уебсайта си. Тогава добавете адреса на уебсайта си в едно от допълнителните полета на профила ви от раздела "Редактиране на профила" и запазане на промените.
verification: Проверка
verified_links: Вашите потвърдени връзки
+ website_verification: Потвърждаване на уебсайта
webauthn_credentials:
add: Добавяне на нов ключ за сигурност
create:
diff --git a/config/locales/br.yml b/config/locales/br.yml
index f9fbd34adb..a3ba0db887 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -47,6 +47,7 @@ br:
demote: Argilañ
disable: Skornañ
disabled: Skornet
+ display_name: Anv diskouezet
domain: Domani
edit: Kemmañ
email: Postel
@@ -66,6 +67,7 @@ br:
moderation:
active: Oberiant
all: Pep tra
+ disabled: Diweredekaet
pending: War ober
silenced: Bevennet
suspended: Astalet
@@ -98,6 +100,7 @@ br:
action_logs:
action_types:
destroy_status: Dilemel ar c'hannad
+ reset_password_user: Adderaouekaat ar ger-tremen
update_status: Hizivaat ar c'hannad
actions:
destroy_status_html: Dilamet eo bet toud %{target} gant %{name}
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 965f354a35..a0178ad195 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -21,6 +21,7 @@ ca:
one: Tut
other: Tuts
posts_tab_heading: Tuts
+ self_follow_error: No es permet seguir el compte propi
admin:
account_actions:
action: Realitza l'acció
@@ -446,6 +447,7 @@ ca:
title: Blocar el nou domini de correu-e
no_email_domain_block_selected: No s'han canviat els bloqueigs de domini perquè no se n'ha seleccionat cap
not_permitted: No permés
+ resolved_dns_records_hint_html: El nom del domini resol als següents dominis MX, que són els responsables finals per a acceptar els correus. Blocar un domini MX blocarà els registres des de qualsevol adreça de correu que utilitzi el mateix domini MX, encara que el nom visible sigui diferent. Vigileu de no blocar els grans proveïdors de correu.
resolved_through_html: Resolt mitjançant %{domain}
title: Dominis de correu-e blocats
export_domain_allows:
@@ -800,6 +802,7 @@ ca:
destroyed_msg: La càrrega al lloc s'ha suprimit correctament!
software_updates:
critical_update: Crítica - si us plau, actualitza ràpidament
+ description: Es recomana de mantenir actualizada la instal·lació de Mastodon per a beneficiar-se de les darreres correccions i característiques. A més, de vegades és fonamental actualitzar-la per a evitar problemes de seguretat. Per això Mastodon comprova si hi ha actualitzacions cada 30 minuts i us notificarà d'acord amb les preferències de notificacions de correu electrònic.
documentation_link: Més informació
release_notes: Notes de llançament
title: Actualitzacions disponibles
@@ -1155,6 +1158,7 @@ ca:
account_status: Estat del compte
confirming: Esperant que es completi la confirmació del correu-e.
functional: El teu compte està completament operatiu.
+ pending: La vostra sol·licitud està pendent de revisió pel nostre personal. Això pot trigar una mica. Rebreu un correu electrònic quan s'aprovi.
redirecting_to: El teu compte és inactiu perquè actualment està redirigint a %{acct}.
self_destruct: Com que %{domain} tanca, només tindreu accés limitat al vostre compte.
view_strikes: Veure accions del passat contra el teu compte
@@ -1162,9 +1166,11 @@ ca:
use_security_key: Usa clau de seguretat
author_attribution:
example_title: Text d'exemple
- hint_html: Controleu com se us acredita quan els enllaços es comparteixen a Mastodon.
+ hint_html: Escriviu notícies o un blog fora de Mastodon? Controleu quin crèdit rebeu quan es comparteixen aquí.
+ instructions: 'Assegureu-vos que aquest codi és a l''HTML de l''article:'
more_from_html: Més de %{name}
s_blog: Blog de %{name}
+ then_instructions: Després, afegiu el nom del domini de la publicació aquí sota.
title: Atribució d'autor
challenge:
confirm: Continua
@@ -1202,6 +1208,9 @@ ca:
before: 'Abans de procedir, llegiu amb cura aquestes notes:'
caches: El contingut que ha estat memoritzat en la memòria cau per altres servidors pot persistir
data_removal: Els teus tuts i altres dades seran permanentment eliminades
+ email_change_html: Podeu canviar l'adreça de correu sense eliminar el vostre compte
+ email_contact_html: Si encara no arriba, podeu enviar un correu-e a %{email} per a demanar ajuda
+ email_reconfirmation_html: Si no rebeu el correu electrònic de confirmació , podeu tornar-lo a demanar
irreversible: No seràs capaç de restaurar o reactivar el teu compte
more_details_html: Per a més detalls, llegeix la política de privadesa.
username_available: El teu nom d'usuari esdevindrà altre cop disponible
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 91fa517944..ed57b01ea8 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -25,15 +25,19 @@ cs:
one: Příspěvek
other: Příspěvků
posts_tab_heading: Příspěvky
+ self_follow_error: Sledování vašeho vlastního účtu není povoleno
admin:
account_actions:
action: Vykonat akci
+ already_silenced: Tento účet je již omezený.
+ already_suspended: Tento účet již byl pozastaven.
title: Vykonat moderátorskou akci pro účet %{acct}
account_moderation_notes:
create: Zanechat poznámku
created_msg: Moderátorská poznámka byla úspěšně vytvořena!
destroyed_msg: Moderátorská poznámka byla úspěšně zničena!
accounts:
+ add_email_domain_block: Blokovat e-mailovou doménu
approve: Schválit
approved_msg: Žádost o registraci uživatele %{username} úspěšně schválena
are_you_sure: Opravdu?
@@ -48,6 +52,7 @@ cs:
title: Změnit e-mail uživateli %{username}
change_role:
changed_msg: Role úspěšně změněna!
+ edit_roles: Správa uživatelských rolí
label: Změnit roli
no_role: Žádná role
title: Změnit roli pro %{username}
@@ -60,6 +65,7 @@ cs:
demote: Degradovat
destroyed_msg: Data účtu %{username} jsou nyní ve frontě k okamžitému smazání
disable: Zmrazit
+ disable_sign_in_token_auth: Zrušit ověřování e-mailovým tokenem
disable_two_factor_authentication: Vypnout 2FA
disabled: Zmrazen
display_name: Zobrazované jméno
@@ -68,13 +74,14 @@ cs:
email: E-mail
email_status: Stav e-mailu
enable: Rozmrazit
+ enable_sign_in_token_auth: Povolit ověřování e-mailovým tokenem
enabled: Povoleno
enabled_msg: Účet %{username} byl úspěšně rozmrazen
followers: Sledující
- follows: Sledované
+ follows: Sledovaní
header: Záhlaví
inbox_url: URL příchozí schránky
- invite_request_text: Důvody založení
+ invite_request_text: Důvody pro připojení
invited_by: Pozván uživatelem
ip: IP adresa
joined: Uživatelem od
@@ -92,7 +99,7 @@ cs:
active: Aktivní
all: Vše
disabled: Deaktivován
- pending: Čekající
+ pending: Nevyřízeno
silenced: Omezeno
suspended: Pozastavené
title: Moderování
@@ -134,6 +141,7 @@ cs:
resubscribe: Znovu odebírat
role: Role
search: Hledat
+ search_same_email_domain: Ostatní uživatelé se stejnou e-mailovou doménou
search_same_ip: Další uživatelé se stejnou IP adresou
security: Zabezpečení
security_measures:
@@ -174,21 +182,26 @@ cs:
approve_appeal: Schválit odvolání
approve_user: Schválit uživatele
assigned_to_self_report: Přiřadit hlášení
+ change_email_user: Změnit e-mail uživatele
change_role_user: Změnit roli uživatele
confirm_user: Potvrdit uživatele
create_account_warning: Vytvořit varování
create_announcement: Nové oznámení
+ create_canonical_email_block: Vytvořit blok e-mailu
create_custom_emoji: Vytvořit vlastní emoji
create_domain_allow: Vytvořit povolení domény
create_domain_block: Vytvořit blokaci domény
+ create_email_domain_block: Vytvořit blok e-mailové domény
create_ip_block: Vytvořit IP pravidlo
create_unavailable_domain: Vytvořit nedostupnou doménu
create_user_role: Vytvořit roli
demote_user: Snížit roli uživatele
destroy_announcement: Odstranit oznámení
+ destroy_canonical_email_block: Odblokovat email
destroy_custom_emoji: Odstranit vlastní emoji
destroy_domain_allow: Odstranit povolení domény
destroy_domain_block: Odstranit blokaci domény
+ destroy_email_domain_block: Smazat blokaci e-mailové domény
destroy_instance: Odmazat doménu
destroy_ip_block: Smazat IP pravidlo
destroy_status: Odstranit Příspěvek
@@ -196,8 +209,10 @@ cs:
destroy_user_role: Zničit roli
disable_2fa_user: Vypnout 2FA
disable_custom_emoji: Zakázat vlastní emoji
+ disable_sign_in_token_auth_user: Zrušit uživatelovo ověřování e-mailovým tokenem
disable_user: Deaktivovat uživatele
enable_custom_emoji: Povolit vlastní emoji
+ enable_sign_in_token_auth_user: Povolit uživatelovo ověřování e-mailovým tokenem
enable_user: Povolit uživatele
memorialize_account: Změna na „in memoriam“
promote_user: Povýšit uživatele
@@ -227,20 +242,26 @@ cs:
approve_appeal_html: Uživatel %{name} schválil odvolání proti rozhodnutí moderátora %{target}
approve_user_html: "%{name} schválil registraci od %{target}"
assigned_to_self_report_html: Uživatel %{name} si přidělil hlášení %{target}
+ change_email_user_html: "%{name} změnil*a e-mailovou adresu %{target}"
change_role_user_html: "%{name} změnil roli %{target}"
+ confirm_user_html: Uživatel %{name} potvrdil e-mailovou adresu uživatele %{target}
create_account_warning_html: Uživatel %{name} poslal %{target} varování
create_announcement_html: Uživatel %{name} vytvořil nové oznámení %{target}
+ create_canonical_email_block_html: "%{name} zablokoval e-mail s hashem %{target}"
create_custom_emoji_html: Uživatel %{name} nahrál nové emoji %{target}
create_domain_allow_html: Uživatel %{name} povolil federaci s doménou %{target}
create_domain_block_html: Uživatel %{name} zablokoval doménu %{target}
+ create_email_domain_block_html: Uživatel %{name} zablokoval e-mailovou doménu %{target}
create_ip_block_html: Uživatel %{name} vytvořil pravidlo pro IP %{target}
create_unavailable_domain_html: "%{name} zastavil doručování na doménu %{target}"
create_user_role_html: "%{name} vytvořil %{target} roli"
demote_user_html: Uživatel %{name} degradoval uživatele %{target}
destroy_announcement_html: Uživatel %{name} odstranil oznámení %{target}
+ destroy_canonical_email_block_html: "%{name} odblokoval*a e-mail s hashem %{target}"
destroy_custom_emoji_html: "%{name} odstranil emoji %{target}"
destroy_domain_allow_html: Uživatel %{name} zakázal federaci s doménou %{target}
destroy_domain_block_html: Uživatel %{name} odblokoval doménu %{target}
+ destroy_email_domain_block_html: "%{name} odblokoval*a e-mailovou doménu %{target}"
destroy_instance_html: Uživatel %{name} odmazal doménu %{target}
destroy_ip_block_html: Uživatel %{name} odstranil pravidlo pro IP %{target}
destroy_status_html: Uživatel %{name} odstranil příspěvek uživatele %{target}
@@ -248,8 +269,10 @@ cs:
destroy_user_role_html: "%{name} odstranil %{target} roli"
disable_2fa_user_html: Uživatel %{name} vypnul dvoufázové ověřování pro uživatele %{target}
disable_custom_emoji_html: Uživatel %{name} zakázal emoji %{target}
+ disable_sign_in_token_auth_user_html: "%{name} deaktivoval*a ověřování e-mailovým tokenem pro %{target}"
disable_user_html: Uživatel %{name} zakázal přihlašování pro uživatele %{target}
enable_custom_emoji_html: Uživatel %{name} povolil emoji %{target}
+ enable_sign_in_token_auth_user_html: "%{name} aktivoval*a ověřování e-mailovým tokenem pro %{target}"
enable_user_html: Uživatel %{name} povolil přihlašování pro uživatele %{target}
memorialize_account_html: Uživatel %{name} změnil účet %{target} na „in memoriam“ stránku
promote_user_html: Uživatel %{name} povýšil uživatele %{target}
@@ -257,6 +280,7 @@ cs:
reject_user_html: "%{name} odmítl registraci od %{target}"
remove_avatar_user_html: Uživatel %{name} odstranil avatar uživatele %{target}
reopen_report_html: Uživatel %{name} znovu otevřel hlášení %{target}
+ resend_user_html: "%{name} znovu odeslal*a potvrzovací e-mail pro %{target}"
reset_password_user_html: Uživatel %{name} obnovil heslo uživatele %{target}
resolve_report_html: Uživatel %{name} vyřešil hlášení %{target}
sensitive_account_html: "%{name} označil média účtu %{target} jako citlivá"
@@ -427,6 +451,7 @@ cs:
many: "%{count} pokusů o registraci za poslední týden"
one: "%{count} pokus o registraci za poslední týden"
other: "%{count} pokusů o registraci za poslední týden"
+ created_msg: E-mailová doména úspěšně zablokována
delete: Smazat
dns:
types:
@@ -435,8 +460,12 @@ cs:
new:
create: Přidat doménu
resolve: Přeložit doménu
+ title: Blokovat novou e-mailovou doménu
+ no_email_domain_block_selected: Žádné blokace e-mailové domény nebyly změněny, protože žádné nebyly vybrány
not_permitted: Nepovoleno
+ resolved_dns_records_hint_html: Doménové jméno vede na následující MX domény, které mají nakonec na starost přijímání e-mailů. Blokování MX domény zablokuje registrace z jakékoliv e-mailové adresy, která používá stejnou MX doménu, i když je viditelné doménové jméno jiné. Dejte si pozor, abyste nezablokovali velké e-mailové poskytovatele.
resolved_through_html: Přeložena přes %{domain}
+ title: Blokované e-mailové domény
export_domain_allows:
new:
title: Importovat povolené domény
@@ -598,7 +627,9 @@ cs:
resolve_description_html: Nebudou učiněny žádné kroky proti nahlášenému účtu, žádný prohřešek zaznamenán a hlášení bude uzavřeno.
silence_description_html: Účet bude viditelný pouze těm, kdo jej již sledují nebo si jej ručně vyhledají, což výrazně omezí jeho dosah. Vždy lze vrátit zpět. Uzavře všechna hlášení proti tomuto účtu.
suspend_description_html: Účet a veškerý jeho obsah se znepřístupní a bude nakonec smazán, interakce s ním nebude možná. Lze vrátit zpět do 30 dnů. Uzavře všechna hlášení proti tomuto účtu.
+ actions_description_html: Rozhodněte, který krok učinit pro vyřešení tohoto hlášení. Pokud podniknete kárný krok proti nahlášenému účtu, bude mu zasláno e-mailové oznámení, s výjimkou případu, kdy je zvolena kategorie Spam.
actions_description_remote_html: Rozhodněte, co podniknout pro vyřešení tohoto hlášení. Toto ovlivní pouze to, jak váš server komunikuje s tímto vzdáleným účtem, a zpracuje jeho obsah.
+ actions_no_posts: Toto hlášení nemá žádné související příspěvky k odstranění
add_to_report: Přidat do hlášení další
already_suspended_badges:
local: Již pozastaveno na tomto serveru
@@ -662,6 +693,7 @@ cs:
delete_data_html: Odstranit profil a obsah @%{acct} ode dneška po 30 dní, pokud mezitím nebude zrušeno jeho pozastavení
preview_preamble_html: "@%{acct} obdrží varování s následujícím obsahem:"
record_strike_html: Zaznamenat prohřešek @%{acct} pro pomoc s řešením budoucích přestupků z tohoto účtu
+ send_email_html: Poslat varovný e-mail pro @%{acct}
warning_placeholder: Volitelné další odůvodnění moderační akce.
target_origin: Původ nahlášeného účtu
title: Hlášení
@@ -705,6 +737,7 @@ cs:
manage_appeals: Spravovat odvolání
manage_appeals_description: Umožňuje uživatelům posuzovat odvolání proti moderátorským zásahům
manage_blocks: Spravovat blokace
+ manage_blocks_description: Umožňuje uživatelům blokovat poskytovatele e-mailů a IP adresy
manage_custom_emojis: Spravovat vlastní emoji
manage_custom_emojis_description: Umožňuje uživatelům spravovat vlastní emoji na serveru
manage_federation: Spravovat federaci
@@ -722,6 +755,7 @@ cs:
manage_taxonomies: Správa taxonomií
manage_taxonomies_description: Umožňuje uživatelům zkontrolovat populární obsah a aktualizovat nastavení hashtag
manage_user_access: Spravovat uživatelské přístupy
+ manage_user_access_description: Umožňuje uživatelům rušit jiným uživatelům dvoufázové ověřování, měnit jejich e-mailovou adresu a obnovovat jim hesla
manage_users: Spravovat uživatele
manage_users_description: Umožňuje uživatelům zobrazit podrobnosti ostatních uživatelů a provádět moderování proti nim
manage_webhooks: Spravovat webhooky
@@ -796,6 +830,7 @@ cs:
destroyed_msg: Upload stránky byl úspěšně smazán!
software_updates:
critical_update: Kritické — aktualizujte, prosím, co nejdříve
+ description: Doporučuje se udržovat vaši instalaci Mastodonu aktuální, aby se využily nejnovější opravy a funkce. Kromě toho je někdy velmi důležité včas aktualizovat Mastodon, aby se předešlo bezpečnostním problémům. Z těchto důvodů Mastodon kontroluje aktualizace každých 30 minut a bude vás informovat podle nastavení vašeho e-mailového oznámení.
documentation_link: Zjistit více
release_notes: Poznámky k vydání
title: Dostupné aktualizace
@@ -869,6 +904,9 @@ cs:
message_html: Nedefinovali jste žádná pravidla serveru.
sidekiq_process_check:
message_html: Pro %{value} frontu/fronty neběží žádný Sidekiq proces. Zkontrolujte prosím svou Sidekiq konfiguraci
+ software_version_check:
+ action: Zobrazit dostupné aktualizace
+ message_html: K dispozici je aktualizace Mastodonu.
software_version_critical_check:
action: Zobrazit dostupné aktualizace
message_html: K dispozici je kritická aktualizace Mastodonu, prosím aktualizujte co nejrychleji.
@@ -895,6 +933,7 @@ cs:
name: Název
newest: Nejnovější
oldest: Nejstarší
+ open: Zobrazit veřejně
reset: Resetovat
review: Stav posouzení
search: Hledat
@@ -904,10 +943,16 @@ cs:
trends:
allow: Povolit
approved: Schválené
+ confirm_allow: Opravdu chcete povolit vybrané štítky?
+ confirm_disallow: Opravdu chcete zakázat vybrané štítky?
disallow: Zakázat
links:
allow: Povolit odkaz
allow_provider: Povolit vydavatele
+ confirm_allow: Jste si jist, že chcete povolit vybrané odkazy?
+ confirm_allow_provider: Opravdu chcete povolit vybrané poskytovatele?
+ confirm_disallow: Opravdu chcete zakázat vybrané odkazy?
+ confirm_disallow_provider: Opravdu chcete zakázat vybrané poskytovatele?
description_html: Toto jsou odkazy, které jsou momentálně hojně sdíleny účty, jejichž příspěvky váš server vidí. To může pomoct vašim uživatelům zjistit, co se děje ve světě. Žádné odkazy se nezobrazují veřejně, dokud neschválíte vydavatele. Můžete také povolit nebo zamítnout jednotlivé odkazy.
disallow: Zakázat odkaz
disallow_provider: Zakázat vydavatele
@@ -933,6 +978,10 @@ cs:
statuses:
allow: Povolit příspěvek
allow_account: Povolit autora
+ confirm_allow: Opravdu chcete povolit vybrané tooty?
+ confirm_allow_account: Opravdu chcete povolit vybrané účty?
+ confirm_disallow: Opravdu chcete zakázat vybrané tooty?
+ confirm_disallow_account: Opravdu chcete zakázat vybrané účty?
description_html: Toto jsou příspěvky, o kterých váš server ví, že jsou momentálně hodně sdíleny a oblibovány. To může pomoci vašim novým i vracejícím se uživatelům najít další lidi ke sledování. Žádné příspěvky se nezobrazují veřejně, dokud neschválíte autora a tento autor nepovolí navrhování svého účtu ostatním. Můžete také povolit či zamítnout jednotlivé příspěvky.
disallow: Zakázat příspěvek
disallow_account: Zakázat autora
@@ -969,6 +1018,7 @@ cs:
many: Použit %{count} lidmi za poslední týden
one: Použit jedním člověkem za poslední týden
other: Použit %{count} lidmi za poslední týden
+ title: Doporučení & Trendy
trending: Populární
warning_presets:
add_new: Přidat nové
@@ -1055,7 +1105,9 @@ cs:
guide_link_text: Zapojit se může každý.
sensitive_content: Citlivý obsah
application_mailer:
+ notification_preferences: Změnit předvolby e-mailu
salutation: "%{name},"
+ settings: 'Změnit předvolby e-mailu: %{link}'
unsubscribe: Přestat odebírat
view: 'Zobrazit:'
view_profile: Zobrazit profil
@@ -1075,6 +1127,7 @@ cs:
hint_html: Ještě jedna věc! Musíme potvrdit, že jste člověk (to proto, abychom drželi stranou spam!). Vyřešte CAPTCHA níže a klikněte na "Pokračovat".
title: Bezpečnostní kontrola
confirmations:
+ awaiting_review: Vaše e-mailová adresa je potvrzena! Personál %{domain} nyní kontrolují vaši registraci. Pokud váš účet schválí, obdržíte e-mail!
awaiting_review_title: Vaše registrace se ověřuje
clicking_this_link: kliknutím na tento odkaz
login_link: přihlásit se
@@ -1082,6 +1135,7 @@ cs:
redirect_to_app_html: Měli byste být přesměrováni do aplikace %{app_name}. Pokud se tak nestalo, zkuste %{clicking_this_link} nebo ručně se vrátit do aplikace.
registration_complete: Vaše registrace na %{domain} je hotová!
welcome_title: Vítám uživatele %{name}!
+ wrong_email_hint: Pokud není tento e-mail správný, můžete si ho změnit v nastavení účtu.
delete_account: Odstranit účet
delete_account_html: Chcete-li odstranit svůj účet, pokračujte zde. Budete požádáni o potvrzení.
description:
@@ -1102,6 +1156,7 @@ cs:
or_log_in_with: Nebo se přihlaste pomocí
privacy_policy_agreement_html: Četl jsem a souhlasím se zásadami ochrany osobních údajů
progress:
+ confirm: Potvrdit e-mail
details: Vaše údaje
review: Naše hodnocení
rules: Přijmout pravidla
@@ -1123,11 +1178,13 @@ cs:
security: Zabezpečení
set_new_password: Nastavit nové heslo
setup:
+ email_below_hint_html: Zkontrolujte složku se spamem, nebo požádejte o další. Svou e-mailovou adresu si můžete opravit, pokud je špatně.
email_settings_hint_html: Klikněte na odkaz, který jsme Vám poslali k ověření %{email}. Budeme zde čekat.
link_not_received: Nedostali jste odkaz?
+ new_confirmation_instructions_sent: Za několik minut obdržíte nový e-mail s potvrzovacím odkazem!
title: Zkontrolujte doručenou poštu
sign_in:
- preamble_html: Přihlaste se se svýma %{domain} údajema. Pokud je váš účet hostován na jiném serveru, nemůžete se zde přihlásit.
+ preamble_html: Přihlaste se svými %{domain} údaji. Pokud je váš účet hostován na jiném serveru, přihlásit se zde nemůžete.
title: Přihlásit se k %{domain}
sign_up:
manual_review: Registrace na %{domain} procházejí manuálním hodnocením od našich moderátorů. Abyste nám pomohli zpracovat Vaši registraci, napište trochu o sobě a proč chcete účet na %{domain}.
@@ -1135,12 +1192,22 @@ cs:
title: Pojďme vás nastavit na %{domain}.
status:
account_status: Stav účtu
+ confirming: Čekáme na dokončení potvrzení e-mailu.
functional: Váš účet je plně funkční.
+ pending: Vaše žádost čeká na posouzení naším personálem. To může nějakou dobu trvat. Pokud bude váš požadavek schválen, obdržíte e-mail.
redirecting_to: Váš účet je neaktivní, protože je právě přesměrován na účet %{acct}.
self_destruct: Protože %{domain} končí, budete mít k účtu jen omezený přístup.
view_strikes: Zobrazit minulé prohřešky vašeho účtu
too_fast: Formulář byl odeslán příliš rychle, zkuste to znovu.
use_security_key: Použít bezpečnostní klíč
+ author_attribution:
+ example_title: Ukázkový text
+ hint_html: Píšete novinové články nebo blog mimo Mastodon? Kontrolujte, jak Vám bude připisováno autorství, když jsou sdíleny na Mastodonu.
+ instructions: 'Ujistěte se, že tento kód je v HTML vašeho článku:'
+ more_from_html: Více od %{name}
+ s_blog: Blog %{name}
+ then_instructions: Poté přidejte název domény publikace do níže uvedeného pole.
+ title: Připisování autorství
challenge:
confirm: Pokračovat
hint_html: "Tip: Po dobu jedné hodiny vás o heslo nebudeme znovu žádat."
@@ -1177,6 +1244,9 @@ cs:
before: 'Před pokračováním si prosím pečlivě přečtěte tyto poznámky:'
caches: Obsah, který byl uložen do cache jiných serverů, nemusí být smazán
data_removal: Vaše příspěvky a další data budou trvale smazána
+ email_change_html: Můžete změnit svou e-mailovou adresu bez odstranění svého účtu
+ email_contact_html: Pokud stále nedorazí, můžete poslat e-mail %{email} pro pomoc
+ email_reconfirmation_html: Pokud neobdržíte potvrzovací e-mail, můžete si ho vyžádat znovu
irreversible: Váš účet nebude možné obnovit ani znovu aktivovat
more_details_html: Podrobnosti najdete v zásadách ochrany osobních údajů.
username_available: Vaše uživatelské jméno bude opět dostupné
@@ -1423,6 +1493,7 @@ cs:
authentication_methods:
otp: aplikací pro dvoufaktorové ověření
password: heslem
+ sign_in_token: bezpečnostní kód e-mailu
webauthn: bezpečnostními klíči
description_html: Pokud vidíte aktivitu, kterou nepoznáváte, zvažte změnu hesla a zapnutí dvoufaktorového ověřování.
empty: Není k dispozici žádná historie přihlášení
@@ -1433,10 +1504,21 @@ cs:
unsubscribe:
action: Ano, odeberte odběr
complete: Odběr byl odhlášen
+ confirmation_html: Jste si jisti, že chcete odhlásit odběr %{type} pro Mastodon na %{domain} na váš e-mail %{email}? Vždy se můžete znovu přihlásit ve svém nastavení e-mailových oznámení.
+ emails:
+ notification_emails:
+ favourite: e-mailové oznámení při oblíbení
+ follow: e-mailové oznámení při sledování
+ follow_request: e-mail při žádost o sledování
+ mention: e-mailové oznámení při zmínění
+ reblog: e-mailové oznámení při boostu
+ resubscribe_html: Pokud jste se odhlásili omylem, můžete se znovu přihlásit ve svých nastavení e-mailových oznámení.
+ success_html: Již nebudete dostávat %{type} pro Mastodon na %{domain} na vaši e-mailovou adresu %{email}.
title: Odhlásit odběr
media_attachments:
validations:
images_and_video: K příspěvku, který již obsahuje obrázky, nelze připojit video
+ not_found: Média %{ids} nebyla nalezena nebo již byla připojena k jinému příspěvku
not_ready: Nelze připojit soubory před jejich zpracováním. Zkuste to znovu za chvíli!
too_many: Nelze připojit více než 4 soubory
migrations:
@@ -1513,6 +1595,8 @@ cs:
update:
subject: Uživatel %{name} upravil příspěvek
notifications:
+ administration_emails: E-mailová oznámení administrátora
+ email_events: Události pro e-mailová oznámení
email_events_hint: 'Vyberte události, pro které chcete dostávat oznámení:'
number:
human:
@@ -1666,10 +1750,12 @@ cs:
delete: Smazání účtu
development: Vývoj
edit_profile: Upravit profil
+ export: Export
featured_tags: Zvýrazněné hashtagy
import: Import
import_and_export: Import a export
migrate: Přesun účtu
+ notifications: Emailové oznámení
preferences: Předvolby
profile: Profil
relationships: Sledovaní a sledující
@@ -1915,6 +2001,7 @@ cs:
invalid_otp_token: Neplatný kód pro dvoufázové ověřování
otp_lost_help_html: Pokud jste ztratili přístup k oběma, spojte se s %{email}
rate_limited: Příliš mnoho pokusů o ověření, zkuste to znovu později.
+ seamless_external_login: Jste přihlášeni přes externí službu, nastavení hesla a e-mailu proto nejsou dostupná.
signed_in_as: 'Přihlášeni jako:'
verification:
extra_instructions_html: Tip: Odkaz na vaší webové stránce může být neviditelný. Důležitou součástí je rel="me", která brání proti napodování vás na webových stránkách s obsahem vytvořeným uživatelem. Můžete dokonce použít odkaz v záhlaví stránky místo a, ale HTML musí být přístupné bez spuštění JavaScript.
@@ -1923,6 +2010,7 @@ cs:
instructions_html: Zkopírujte a vložte níže uvedený kód do HTML vašeho webu. Poté přidejte adresu vašeho webu do jednoho z extra políček na vašem profilu na záložce "Upravit profil" a uložte změny.
verification: Ověření
verified_links: Vaše ověřené odkazy
+ website_verification: Ověření webové stránky
webauthn_credentials:
add: Přidat nový bezpečnostní klíč
create:
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 1ae6aa08ff..b166709c28 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -29,6 +29,7 @@ cy:
two: Postiadau
zero: Postiadau
posts_tab_heading: Postiadau
+ self_follow_error: Chewch chi ddim dilyn eich cyfrif eich hun
admin:
account_actions:
action: Cyflawni gweithred
@@ -918,7 +919,7 @@ cy:
message_html: Mae gan eich clwstwr Elasticsearch fwy nag un nod, ond nid yw Mastodon wedi'i ffurfweddu i'w defnyddio.
elasticsearch_preset_single_node:
action: Darllenwch y ddogfennaeth
- message_html: Dim ond un nod sydd gan eich clwstwr Elasticsearch, mae angen gosod ES_PRESET i single_node_cluster .
+ message_html: Dim ond un nod sydd gan eich clwstwr Elasticsearch, mae angen gosod ES_PRESET i single_node_cluster.
elasticsearch_reset_chewy:
message_html: Mae eich mynegai system Elasticsearch wedi dyddio oherwydd newid gosodiad. Rhedwch chwiliad tootctl search deploy --reset-chewy i'w ddiweddaru.
elasticsearch_running_check:
@@ -931,6 +932,9 @@ cy:
message_html: Nid ydych wedi diffinio unrhyw reolau gweinydd.
sidekiq_process_check:
message_html: Does dim proses Sidekiq yn rhedeg ar gyfer y ciw(iau) %{value}. Adolygwch eich ffurfweddiad Sidekiq
+ software_version_check:
+ action: Gweld y diweddariadau sydd ar gael
+ message_html: Mae diweddariad Mastodon ar gael.
software_version_critical_check:
action: Gweld y diweddariadau sydd ar gael
message_html: Mae diweddariad hanfodol Mastodon ar gael, diweddarwch cyn gynted â phosibl.
@@ -1059,7 +1063,7 @@ cy:
webhooks:
add_new: Ychwanegu diweddbwynt
delete: Dileu
- description_html: Mae bachyn gwe yn galluogi Mastodon i wthio hysbysiadau amser real am ddigwyddiadau a ddewiswyd i'ch cais eich hun, fel y gall eich cais ysgogi ymatebion yn awtomatig .
+ description_html: Mae bachyn gwe yn galluogi Mastodon i wthio hysbysiadau amser real am ddigwyddiadau a ddewiswyd i'ch cais eich hun, fel y gall eich cais ysgogi ymatebion yn awtomatig.
disable: Analluogi
disabled: Wedi'i analluogi
edit: Golygu diweddbwynt
@@ -1123,7 +1127,7 @@ cy:
created_msg: Wedi creu enw arall yn llwyddiannus. Gallwch nawr ddechrau symud o'r hen gyfrif.
deleted_msg: Wedi tynnu enw arall yn llwyddiannus. Ni fydd symud o'r cyfrif hynny i'r cyfrif hon yn bosib.
empty: Nid oes gennych enwau eraill.
- hint_html: Os ydych chi am symud o gyfrif arall i'r un hwn, gallwch greu enw arall yma, sy'n ofynnol cyn y gallwch symud ymlaen i symud dilynwyr o'r hen gyfrif i'r un hwn. Mae'r weithred hon ynddo'i hun yn ddiniwed ac yn wrthdroadwy. Mae'r mudo cyfrif yn cael ei wneud o'r hen gyfrif .
+ hint_html: Os ydych chi am symud o gyfrif arall i'r un hwn, gallwch greu enw arall yma, sy'n ofynnol cyn y gallwch symud ymlaen i symud dilynwyr o'r hen gyfrif i'r un hwn. Mae'r weithred hon ynddo'i hun yn ddiniwed ac yn wrthdroadwy. Mae'r mudo cyfrif yn cael ei wneud o'r hen gyfrif.
remove: Dadgysylltu'r enw arall
appearance:
advanced_web_interface: Rhyngwyneb gwe uwch
@@ -1234,9 +1238,11 @@ cy:
use_security_key: Defnyddiwch allwedd diogelwch
author_attribution:
example_title: Testun enghreifftiol
- hint_html: Rheolwch sut rydych chi'n cael eich canmol pan fydd dolenni'n cael eu rhannu ar Mastodon.
+ hint_html: Ydych chi'n ysgrifennu erthyglau newyddion neu flog y tu allan i Mastodon? Rheolwch sut y byddwch yn cael eich cydnabod pan fyddan nhw'n cael eu rhannu ar Mastodon.
+ instructions: 'Gwnewch yn siŵr fod y cod hwn yn HTML eich erthygl:'
more_from_html: Mwy gan %{name}
s_blog: Blog %{name}
+ then_instructions: Yna, ychwanegwch enw parth y cyhoeddiad yn y maes isod.
title: Priodoliad awdur
challenge:
confirm: Parhau
@@ -1356,7 +1362,7 @@ cy:
filters:
contexts:
account: Proffilau
- home: Cartref a rhestrau
+ home: Ffrwd gartref
notifications: Hysbysiadau
public: Ffrydiau cyhoeddus
thread: Sgyrsiau
@@ -1364,7 +1370,7 @@ cy:
add_keyword: Ychwanegu allweddair
keywords: Allweddeiriau
statuses: Postiadau unigol
- statuses_hint_html: Mae'r hidlydd hwn yn berthnasol i ddewis postiadau unigol pa un ai a ydynt yn cyfateb i'r allweddeiriau isod. Adolygu neu ddileu postiadau o'r hidlydd .
+ statuses_hint_html: Mae'r hidlydd hwn yn berthnasol i ddewis postiadau unigol pa un ai a ydynt yn cyfateb i'r allweddeiriau isod. Adolygu neu ddileu postiadau o'r hidlydd.
title: Golygu hidlydd
errors:
deprecated_api_multiple_keywords: Nid oes modd newid y paramedrau hyn o'r cais hwn oherwydd eu bod yn berthnasol i fwy nag un allweddair hidlo. Defnyddiwch raglen fwy diweddar neu'r rhyngwyneb gwe.
@@ -1558,7 +1564,7 @@ cy:
follow_request: e-byst ceisiadau dilyn
mention: e-byst hysbysu crybwylliadau
reblog: e-byst hysbysiadau hybu
- resubscribe_html: Os ydych wedi dad-danysgrifio trwy gamgymeriad, gallwch ail-danysgrifio drwy'ch gosodiadau hysbysu e-bost .
+ resubscribe_html: Os ydych wedi dad-danysgrifio trwy gamgymeriad, gallwch ail-danysgrifio drwy'ch gosodiadau hysbysu e-bost.
success_html: Ni fyddwch bellach yn derbyn %{type} ar gyfer Mastodon ar %{domain} i'ch e-bost am %{email}.
title: Dad-danysgrifio
media_attachments:
@@ -1580,7 +1586,7 @@ cy:
on_cooldown: Rydych ar amser allan
followers_count: Dilynwyr ar adeg y symud
incoming_migrations: Symud o gyfrif wahanol
- incoming_migrations_html: I symud o gyfrif arall i'r un hwn, yn gyntaf mae angen i chi greu enwarall (alias) cyfrif .
+ incoming_migrations_html: I symud o gyfrif arall i'r un hwn, yn gyntaf mae angen i chi greu enwarall (alias) cyfrif.
moved_msg: Mae eich cyfrif bellach yn ailgyfeirio i %{acct} ac mae eich dilynwyr yn cael eu symud drosodd.
not_redirecting: Nid yw eich cyfrif yn ailgyfeirio i unrhyw gyfrif arall ar hyn o bryd.
on_cooldown: Rydych chi wedi mudo'ch cyfrif yn ddiweddar. Bydd y swyddogaeth hon ar gael eto ymhen %{count} diwrnod.
@@ -1595,7 +1601,7 @@ cy:
cooldown: Ar ôl symud, bydd yna cyfnod aros na fydd modd i chi symud eto
disabled_account: Ni fydd modd defnyddio'ch cyfrif cyfredol yn llawn wedyn. Fodd bynnag, bydd gennych fynediad i allforio data yn ogystal ag ail agor.
followers: Bydd y weithred hon yn symud yr holl ddilynwyr o'r cyfrif cyfredol i'r cyfrif newydd
- only_redirect_html: Fel arall, dim ond ailgyfeiriad y gallwch chi ei osod ar eich proffil .
+ only_redirect_html: Fel arall, dim ond ailgyfeiriad y gallwch chi ei osod ar eich proffil.
other_data: Ni fydd unrhyw data arall yn cael ei symud yn awtomatig
redirect: Bydd proffil eich cyfrif presennol yn cael ei diweddaru gyda hysbysiad ailgyfeirio ac yn cael ei eithrio o chwiliadau
moderation:
@@ -1796,6 +1802,7 @@ cy:
delete: Dileu cyfrif
development: Datblygu
edit_profile: Golygu proffil
+ export: Allforio
featured_tags: Prif hashnodau
import: Mewnforio
import_and_export: Mewnforio ac allforio
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 0da901d4a8..ec7e2da4fb 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -9,18 +9,19 @@ da:
accounts:
followers:
one: Følger
- other: tilhængere
+ other: Følgere
following: Følger
instance_actor_flash: Denne konto er en virtuel aktør repræsenterende selve serveren og ikke en individuel bruger. Den anvendes til fællesformål og bør ikke suspenderes.
last_active: senest aktiv
link_verified_on: Ejerskab af dette link blev tjekket %{date}
- nothing_here: Der er intet hér!
+ nothing_here: Der er intet her!
pin_errors:
following: Man skal allerede følge den person, man ønsker at støtte
posts:
one: Indlæg
other: Indlæg
posts_tab_heading: Indlæg
+ self_follow_error: Det er ikke tilladt at følge sin egen konto
admin:
account_actions:
action: Udfør handling
@@ -107,11 +108,11 @@ da:
not_subscribed: Abonnerer ikke
pending: Afventende vurdering
perform_full_suspension: Suspendér
- previous_strikes: Tidligere anmeldelser (strikes)
+ previous_strikes: Tidligere anmeldelser
previous_strikes_description_html:
one: Denne konto har en anmeldelse.
other: Denne konto har %{count} anmeldelser.
- promote: Fremhæv
+ promote: Forfrem
protocol: Protokol
public: Offentlig
push_subscription_expires: PuSH-abonnement udløber
@@ -122,9 +123,9 @@ da:
remote_suspension_irreversible: Denne kontos data er slettet permanent.
remote_suspension_reversible_hint_html: Kontoen er suspenderet på den pågældende server, og kontodata fjernes fuldstændig pr. %{date}. Indtil da vil fjernserveren kunne foretage en komplet reetablering af kontoen. Ønskes alle kontodata fjernet straks, kan dette gøres nedenfor.
remove_avatar: Fjern profilbillede
- remove_header: Fjern overskrift
+ remove_header: Fjern banner
removed_avatar_msg: "%{username}s profilbillede fjernet"
- removed_header_msg: "%{username}s overskriftsbillede fjernet"
+ removed_header_msg: "%{username}s banner fjernet"
resend_confirmation:
already_confirmed: Denne bruger er allerede bekræftet
send: Gensend bekræftelseslink
@@ -140,8 +141,8 @@ da:
security_measures:
only_password: Kun adgangskode
password_and_2fa: Adgangskode og 2FA
- sensitive: Gennemtving sensitiv
- sensitized: Markeret som sensitiv
+ sensitive: Gennemtving følsom
+ sensitized: Markeret som følsom
shared_inbox_url: Delt indbakke-URL
show:
created_reports: Indsendte anmeldelser
@@ -159,7 +160,7 @@ da:
unblock_email: Afblokér e-mailadresse
unblocked_email_msg: "%{username}s e-mail-adresse afblokeret"
unconfirmed_email: Ubekræftet e-mail
- undo_sensitized: Fortryd gennemtving sensitiv
+ undo_sensitized: Fortryd gennemtving-følsom
undo_silenced: Fortryd begrænsning
undo_suspension: Fortryd suspendering
unsilenced_msg: "%{username}s kontobegrænsning er fjernet"
@@ -168,8 +169,8 @@ da:
username: Brugernavn
view_domain: Vis domæneoversigt
warn: Advar
- web: Web
- whitelisted: Tilladt for federering
+ web: Net
+ whitelisted: Tilladt for føderation
action_logs:
action_types:
approve_appeal: Godkend appel
@@ -219,8 +220,8 @@ da:
sensitive_account: Gennemtving sensitiv konto
silence_account: Begræns konto
suspend_account: Suspendér konto
- unassigned_report: Fjer anmeldelsestildeling
- unblock_email_account: Afblokér e-mailadresse
+ unassigned_report: Fjern anmeldelsestildeling
+ unblock_email_account: Fjern blokering af e-mailadresse
unsensitive_account: Fjern Gennemtving sensitiv konto
unsilence_account: Fjern kontobegrænselse
unsuspend_account: Afsuspendér konto
@@ -363,7 +364,7 @@ da:
other: "%{count} verserende anmeldelser"
pending_tags_html:
one: "%{count} afventende hashtag"
- other: "%{count} afventende hashtags"
+ other: "%{count} afventende etiketter"
pending_users_html:
one: "%{count} afventende bruger"
other: "%{count} afventende brugere"
@@ -724,7 +725,7 @@ da:
manage_settings: Håndtere indstillinger
manage_settings_description: Tillader brugere at ændre webstedsindstillinger
manage_taxonomies: Håndtere taksonomier
- manage_taxonomies_description: Tillader brugere at gennemse tenderende indhold og opdatere hashtag-indstillinger
+ manage_taxonomies_description: Tillader brugere at gennemse tenderende indhold og opdatere etiket-indstillinger
manage_user_access: Håndtere brugeradgang
manage_user_access_description: Tillader brugere at deaktivere andre brugeres tofaktorgodkendelse, skifte deres e-mailadresse og nulstille deres adgangskode
manage_users: Håndtere brugere
@@ -908,7 +909,7 @@ da:
reset: Nulstil
review: Gennmgangsstatus
search: Søg
- title: Hashtags
+ title: Etiketter
updated_msg: Hashtag-indstillinger opdateret
title: Administration
trends:
@@ -968,14 +969,14 @@ da:
tag_servers_dimension: Topservere
tag_servers_measure: forskellige servere
tag_uses_measure: anvendelser i alt
- description_html: Disse er hashtags, som pt. vises i en masse indlæg, som serveren ser. Det kan hjælpe brugerne til at finde ud af, hvad folk taler mest om pt. Ingen hashtags vises offentligt, før man godkender dem.
+ description_html: Disse er etiketter, som pt. vises i en masse indlæg, som serveren ser. Det kan hjælpe brugerne til at finde ud af, hvad folk taler mest om pt. Ingen etiketter vises offentligt, før man godkender dem.
listable: Kan foreslås
no_tag_selected: Intet tag ændret (da intet var valgt)
not_listable: Foreslås ikke
not_trendable: Vises ikke under tendenser
not_usable: Kan ikke anvendes
peaked_on_and_decaying: Toppede pr. %{date}, nu for nedadgående
- title: Populære hashtags
+ title: Populære etiketter
trendable: Kan vises under tendenser
trending_rank: 'Populær #%{rank}'
usable: Kan anvendes
@@ -1047,7 +1048,7 @@ da:
new_trending_statuses:
title: Populære opslag
new_trending_tags:
- title: Populære hashtags
+ title: Populære etiketter
subject: Nye tendenser klar til gennemgang på %{instance}
aliases:
add_new: Opret alias
@@ -1058,7 +1059,7 @@ da:
remove: Fjern aliaslinkning
appearance:
advanced_web_interface: Avanceret webgrænseflade
- advanced_web_interface_hint: 'Ønsker du udnytte hele skærmbredden, lader den avancerede webgrænseflade dig opsætte mange forskellige kolonner for at se så meget information på samme tid som ønsket: Hjem, notifikationer, federeret tidslinje, et hvilket som helst antal lister og hashtags.'
+ advanced_web_interface_hint: 'Ønsker du udnytte hele skærmbredden, lader den avancerede netgrænseflade dig opsætte mange forskellige kolonner for at se så meget information på samme tid som ønsket: Hjem, notifikationer, fødereret tidslinje, et hvilket som helst antal lister og etiketter.'
animations_and_accessibility: Animationer og tilgængelighed
confirmation_dialogs: Bekræftelsesdialoger
discovery: Opdagelse
@@ -1165,9 +1166,11 @@ da:
use_security_key: Brug sikkerhedsnøgle
author_attribution:
example_title: Eksempeltekst
- hint_html: Styrer, hvordan man krediteres, når links deles på Mastodon.
+ hint_html: Skriver du nyheder eller blogartikler uden for Mastodon? Styr, hvordan man bliver krediteret, når disse deles på Mastodon.
+ instructions: 'Sørg for, at denne kode er i artikelens HTML:'
more_from_html: Flere fra %{name}
s_blog: "%{name}s blog"
+ then_instructions: Tilføj dernæst publikationsdomænenavnet i feltet nedenfor.
title: Forfattertilskrivning
challenge:
confirm: Fortsæt
@@ -1277,13 +1280,13 @@ da:
csv: CSV
domain_blocks: Domæneblokeringer
lists: Lister
- mutes: Du tavsgør
+ mutes: Du skjuler
storage: Medielagerplads
featured_tags:
add_new: Tilføj nyt
errors:
- limit: Det maksimale antal hashtags er allerede fremhævet
- hint_html: "Hvad er fremhævede hashtags? De vises i en fremtrædende position på din offentlige profil og giver folk mulighed for at gennemse dine offentlige indlæg specifikt under disse hashtags. De er et fantastisk værktøj til at holde styr på kreative værker eller langsigtede projekter."
+ limit: Det maksimale antal etiketter er allerede fremhævet
+ hint_html: "Hvad er fremhævede etiketter? De vises i en fremtrædende position på din offentlige profil og giver folk mulighed for at gennemse dine offentlige indlæg specifikt under disse etiketter. De er et fantastisk værktøj til at holde styr på kreative værker eller langsigtede projekter."
filters:
contexts:
account: Profiler
@@ -1371,14 +1374,14 @@ da:
domain_blocking_html: Du er ved at erstatte domæneblokeringslisten med op til %{total_items} domæner fra %{filename}.
following_html: Du er ved at følge op til %{total_items} konti fra %{filename} og stoppe med at følge alle andre.
lists_html: Du er ved at erstatte dine lister med indholdet af %{filename}. Op til %{total_items} konti tilføjes nye lister.
- muting_html: Du er ved at erstatte listen over tavsgjorte konti med op til %{total_items} konti fra %{filename}.
+ muting_html: Du er ved at erstatte din liste over skjulte konti med op til %{total_items} konti fra %{filename}.
preambles:
blocking_html: Du er ved at blokere op til %{total_items} konti fra %{filename}.
bookmarks_html: Du er ved at føje op til %{total_items} indlæg fra %{filename} til bogmærkelisten.
domain_blocking_html: Du er ved at blokere op til %{total_items} domæner fra %{filename}.
following_html: Du er ved at følge op til %{total_items} konti fra %{filename}.
lists_html: Du er ved at tilføje op til %{total_items} konti fra %{filename} til dine lister. Nye lister oprettes, hvis der ikke er nogen liste at føje konti til.
- muting_html: Du er ved at tavsgøre op til %{total_items} konti fra %{filename}.
+ muting_html: Du er ved at skjule op til %{total_items} konti fra %{filename}.
preface: Du kan importere data, du har eksporteret fra en anden server, såsom en liste over folk du følger eller blokerer.
recent_imports: Seneste importer
states:
@@ -1395,11 +1398,11 @@ da:
domain_blocking: Importerer blokerede konti
following: Importerer fulgte konti
lists: Import af lister
- muting: Importerer tavsgjorte konti
+ muting: Importerer skjulte kontoer
type: Importtype
type_groups:
constructive: Følger og Bogmærker
- destructive: Blokeringer og tavsgjorte
+ destructive: Blokerede og skjulte kontoer
types:
blocking: Blokeringsliste
bookmarks: Bogmærker
@@ -1456,7 +1459,7 @@ da:
follow: e-mailnotifikationer om nye følgere
follow_request: e-mailnotifikationer om følgeanmodninger
mention: e-mailnotifikationer om omtaler
- reblog: e-mailnotifikationer om boosts
+ reblog: e-mailnotifikationer om fremhævelser
resubscribe_html: Har man afmeldt sig ved en fejl, kan man gentilmelde sig via indstillingerne E-mailnotifikationer.
success_html: Man vil ikke længere modtage %{type} for Mastodon på %{domain} til e-mailen %{email}.
title: Opsig abonnement
@@ -1501,7 +1504,7 @@ da:
title: Moderation
move_handler:
carry_blocks_over_text: Denne bruger er flyttet fra %{acct}, som du har haft blokeret.
- carry_mutes_over_text: Denne bruger er flyttet fra %{acct}, som du har haft tavsgjort.
+ carry_mutes_over_text: Denne bruger er flyttet fra %{acct}, som du har haft skjult.
copy_account_note_text: 'Denne bruger er flyttet fra %{acct}, hvor dine tidligere noter om dem var:'
navigation:
toggle_menu: Åbn/luk menu
@@ -1532,9 +1535,9 @@ da:
poll:
subject: En afstemning fra %{name} er afsluttet
reblog:
- body: 'Dit indlæg blev boostet af %{name}:'
- subject: "%{name} boostede dit indlæg"
- title: Nyt boost
+ body: 'Dit indlæg blev fremhævet af %{name}:'
+ subject: "%{name} fremhævede dit indlæg"
+ title: Ny fremhævelse
status:
subject: "%{name} har netop postet"
update:
@@ -1631,7 +1634,7 @@ da:
content_warning: 'Indholdsadvarsel:'
descriptions:
account: Offentlige indlæg fra @%{acct}
- tag: 'Offentlige indlæg tagget #%{hashtag}'
+ tag: 'Offentlige indlæg etiketteret #%{hashtag}'
scheduled_statuses:
over_daily_limit: Den daglige grænse på %{limit} planlagte indlæg er nået
over_total_limit: Grænsen på %{limit} planlagte indlæg er nået
@@ -1696,7 +1699,7 @@ da:
development: Udvikling
edit_profile: Redigér profil
export: Eksport
- featured_tags: Udvalgte hashtags
+ featured_tags: Udvalgte etiketter
import: Import
import_and_export: Import og eksport
migrate: Kontomigrering
@@ -1732,12 +1735,12 @@ da:
video:
one: "%{count} video"
other: "%{count} videoer"
- boosted_from_html: Boostet fra %{acct_link}
+ boosted_from_html: Fremhævet fra %{acct_link}
content_warning: 'Indholdsadvarsel: %{warning}'
default_language: Samme som UI-sproget
disallowed_hashtags:
- one: 'indeholdte et ikke tilladt hashtag: %{tags}'
- other: 'indeholdte de ikke tilladte hashtags: %{tags}'
+ one: 'indeholdte en ikke tilladt etiket: %{tags}'
+ other: 'indeholdte de ikke tilladte etiketter: %{tags}'
edited_at_html: Redigeret %{date}
errors:
in_reply_not_found: Indlægget, der forsøges besvaret, ser ikke ud til at eksistere.
@@ -1746,7 +1749,7 @@ da:
direct: Indlæg, som kun kan ses af omtalte brugere, kan ikke fastgøres
limit: Maksimalt antal indlæg allerede fastgjort
ownership: Andres indlæg kan ikke fastgøres
- reblog: Et boost kan ikke fastgøres
+ reblog: En fremhævelse kan ikke fastgøres
title: '%{name}: "%{quote}"'
visibilities:
direct: Direkte
@@ -1762,9 +1765,9 @@ da:
exceptions: Undtagelser
explanation: Sletning af indlæg er en ressourcekrævende operation, hvorfor dette sker gradvist over tid, når serveren ellers ikke er optaget. Indlæg kan derfor blive slettet efter, at de reelt har passeret aldersgrænsen.
ignore_favs: Ignorér favoritter
- ignore_reblogs: Ignorér boosts
+ ignore_reblogs: Ignorér fremhævelser
interaction_exceptions: Undtagelser baseret på interaktioner
- interaction_exceptions_explanation: Bemærk, at det ikke garanteres, at indlæg slettes, hvis de når under favorit- eller boost-tærsklerne efter én gang at været nået over dem.
+ interaction_exceptions_explanation: Bemærk, at det ikke garanteres, at indlæg slettes, hvis de når under favorit- eller fremhævelses-tærsklerne efter én gang at været nået over dem.
keep_direct: Behold direkte besked
keep_direct_hint: Sletter ingen af dine direkte beskeder
keep_media: Behold indlæg med medievedhæftninger
@@ -1789,8 +1792,8 @@ da:
min_age_label: Alderstærskel
min_favs: Behold indlæg favoritmarkeret mindst
min_favs_hint: Sletter ingen egne indlæg, som har modtaget minimum dette antal favoritmarkeringer. Lad stå tomt for at slette indlæg uanset favoritmarkeringer
- min_reblogs: Behold indlæg boostet mindst
- min_reblogs_hint: Sletter ingen egne indlæg, som er boostet flere end dette antal gange. Lad stå tomt for at ignorere denne tærskel under sletning
+ min_reblogs: Behold indlæg fremhævet mindst
+ min_reblogs_hint: Sletter ingen af egne indlæg, som er fremhævet flere end dette antal gange. Lad stå tomt for at ignorere denne tærskel under sletning
stream_entries:
sensitive_content: Sensitivt indhold
strikes:
@@ -1919,8 +1922,8 @@ da:
one: "%{people} person de seneste 2 dage"
other: "%{people} personer de seneste 2 dage"
hashtags_subtitle: Udforsk de seneste 2 dages tendenser
- hashtags_title: Populære hashtags
- hashtags_view_more: Se flere populære hashtags
+ hashtags_title: Populære etiketter
+ hashtags_view_more: Se flere populære etiketter
post_action: Skriv
post_step: Sig hej til verden med tekst, fotos, videoer eller afstemninger.
post_title: Opret det første indlæg
diff --git a/config/locales/de.yml b/config/locales/de.yml
index c82e65282f..152aacc0cc 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -21,6 +21,7 @@ de:
one: Beitrag
other: Beiträge
posts_tab_heading: Beiträge
+ self_follow_error: Es ist nicht erlaubt, deinem eigenen Konto zu folgen
admin:
account_actions:
action: Aktion ausführen
@@ -79,7 +80,7 @@ de:
invite_request_text: Begründung für das Beitreten
invited_by: Eingeladen von
ip: IP-Adresse
- joined: Beigetreten
+ joined: Mitglied seit
location:
all: Alle
local: Lokal
@@ -418,9 +419,9 @@ de:
not_permitted: Du bist nicht berechtigt, diese Aktion durchzuführen
obfuscate: Domain-Name verschleiern
obfuscate_hint: Den Domain-Namen öffentlich nur teilweise bekannt geben, sofern die Liste der Domain-Beschränkungen aktiviert ist
- private_comment: Interne bzw. nicht-öffentliche Notiz
+ private_comment: Nicht-öffentliche Notiz
private_comment_hint: Kommentar zu dieser Domain-Beschränkung für die interne Nutzung durch die Moderator*innen.
- public_comment: Öffentliche Notiz
+ public_comment: Öffentliche Begründung
public_comment_hint: Öffentlicher Hinweis zu dieser Domain-Beschränkung, sofern das Veröffentlichen von Sperrlisten grundsätzlich aktiviert ist.
reject_media: Mediendateien ablehnen
reject_media_hint: Entfernt lokal gespeicherte Mediendateien und verhindert deren künftiges Herunterladen. Für Sperren irrelevant
@@ -493,7 +494,7 @@ de:
by_domain: Domain
confirm_purge: Möchtest du die Daten von dieser Domain wirklich für immer löschen?
content_policies:
- comment: Interne Notiz
+ comment: Nicht-öffentliche Notiz
description_html: Du kannst Inhaltsrichtlinien definieren, die auf alle Konten dieser Domain und einer ihrer Subdomains angewendet werden.
limited_federation_mode_description_html: Du kannst auswählen, ob du eine Föderation mit dieser Domain erlaubst.
policies:
@@ -708,7 +709,7 @@ de:
manage_appeals: Einsprüche verwalten
manage_appeals_description: Erlaubt es Benutzer*innen, Entscheidungen der Moderator*innen zu widersprechen
manage_blocks: Sperrungen verwalten
- manage_blocks_description: Erlaubt Nutzer*innen das Sperren von E-Mail-Providern und IP-Adressen
+ manage_blocks_description: Erlaubt Nutzer*innen das Sperren von E-Mail-Anbietern und IP-Adressen
manage_custom_emojis: Eigene Emojis verwalten
manage_custom_emojis_description: Erlaubt es Benutzer*innen, eigene Emojis auf dem Server zu verwalten
manage_federation: Föderation verwalten
@@ -921,9 +922,9 @@ de:
allow: Link erlauben
allow_provider: Herausgeber*in erlauben
confirm_allow: Möchtest du die ausgewählten Links wirklich erlauben?
- confirm_allow_provider: Möchtest du die ausgewählten Provider wirklich erlauben?
+ confirm_allow_provider: Möchtest du die ausgewählten Anbieter wirklich erlauben?
confirm_disallow: Möchtest du die ausgewählten Links wirklich verbieten?
- confirm_disallow_provider: Möchtest du die ausgewählten Provider wirklich verbieten?
+ confirm_disallow_provider: Möchtest du die ausgewählten Anbieter wirklich verbieten?
description_html: Dies sind Links, die derzeit von zahlreichen Konten geteilt werden und die deinem Server aufgefallen sind. Die Benutzer*innen können darüber herausfinden, was in der Welt vor sich geht. Die Links werden allerdings erst dann öffentlich vorgeschlagen, wenn du die Herausgeber*innen genehmigt hast. Du kannst alternativ aber auch nur einzelne URLs zulassen oder ablehnen.
disallow: Link verbieten
disallow_provider: Herausgeber*in verbieten
@@ -1165,10 +1166,12 @@ de:
use_security_key: Sicherheitsschlüssel verwenden
author_attribution:
example_title: Beispieltext
- hint_html: Bestimme, wie du Anerkennungen durch geteilte Links auf Mastodon handhaben möchtest.
+ hint_html: Schreibst du außerhalb von Mastodon journalistische Artikel oder andere Texte, beispielsweise in einem Blog? Lege hier fest, wann auf dein Profil verwiesen werden soll, wenn Links zu deinen Werken auf Mastodon geteilt werden.
+ instructions: 'Der nachfolgende Code muss im HTML-Header deines zu verlinkenden Textes stehen:'
more_from_html: Mehr von %{name}
s_blog: Blog von %{name}
- title: Anerkennung als Autor*in
+ then_instructions: Ergänze anschließend im unteren Feld die Domain, auf der sich deine Inhalte befinden.
+ title: Verifizierung als Autor*in
challenge:
confirm: Fortfahren
hint_html: "Hinweis: Wir werden dich für die nächste Stunde nicht erneut nach deinem Passwort fragen."
@@ -1522,7 +1525,7 @@ de:
follow_request:
action: Follower-Anfragen verwalten
body: "%{name} möchte dir folgen"
- subject: 'Ausstehende Folgeanfragen: %{name}'
+ subject: 'Ausstehende Follower-Anfragen: %{name}'
title: Neue Follower-Anfrage
mention:
action: Antworten
@@ -1584,7 +1587,7 @@ de:
posting_defaults: Standardeinstellungen für Beiträge
public_timelines: Öffentliche Timelines
privacy:
- hint_html: "Bestimme, wie dein Profil und deine Beiträge gefunden werden sollen. Eine Vielzahl von Funktionen in Mastodon können dir helfen, eine größere Reichweite zu erlangen, wenn sie aktiviert sind. Nimm dir einen Moment Zeit, um diese Einstellungen zu überprüfen und sicherzustellen, dass sie für deinen Anwendungsfall geeignet sind."
+ hint_html: "Bestimme selbst, wie dein Profil und deine Beiträge gefunden werden sollen. Zahlreiche Mastodon-Funktionen können dir für eine größere Reichweite behilflich sein. Nimm dir einen Moment Zeit, um diese Einstellungen zu überprüfen."
privacy: Datenschutz
privacy_hint_html: Bestimme, wie viele Informationen du für andere preisgeben möchtest. Viele Menschen entdecken interessante Profile und coole Apps, indem sie die Follower anderer Profile durchstöbern und die Apps sehen, über die Beiträge veröffentlicht wurden – möglicherweise möchtest du diese Informationen ausblenden.
reach: Reichweite
@@ -1760,7 +1763,7 @@ de:
enabled: Alte Beiträge automatisch entfernen
enabled_hint: Löscht automatisch deine Beiträge, sobald sie die angegebene Altersgrenze erreicht haben, es sei denn, sie entsprechen einer der unten angegebenen Ausnahmen
exceptions: Ausnahmen
- explanation: Damit Mastodon nicht durch das Löschen von Beiträgen ausgebremst wird, wartet der Server damit, bis wenig los ist. Aus diesem Grund werden deine Beiträge ggf. erst einige Zeit nach Erreichen der Altersgrenze gelöscht.
+ explanation: Damit der Server nicht durch das Löschen von Beiträgen ausgebremst wird, wartet die Mastodon-Software, bis wenig(er) los ist. Deshalb könnten deine Beiträge ggf. erst einige Zeit nach Erreichen der Altersgrenze gelöscht werden.
ignore_favs: Favoriten ignorieren
ignore_reblogs: Geteilte Beiträge ignorieren
interaction_exceptions: Ausnahmen basierend auf Interaktionen
@@ -1939,13 +1942,13 @@ de:
seamless_external_login: Du bist über einen externen Dienst angemeldet, daher sind Passwort- und E-Mail-Einstellungen nicht verfügbar.
signed_in_as: 'Angemeldet als:'
verification:
- extra_instructions_html: Hinweis: Der Link auf deiner Website kann unsichtbar sein. Der wichtige Teil ist rel="me", wodurch das Nachahmen von Personen auf Websites mit nutzergenerierten Inhalten verhindert wird. Du kannst auch ein link-Tag statt a im Header auf der Seite verwenden, jedoch muss der HTML-Code ohne das Ausführen von JavaScript zugänglich sein.
+ extra_instructions_html: Hinweis: Der Link auf deiner Website kann unsichtbar sein. Der wichtige Teil ist rel="me". Du kannst auch den Tag link im head (statt a im body) verwenden, jedoch muss die Internetseite ohne JavaScript abrufbar sein.
here_is_how: So funktioniert’s
hint_html: "Alle können ihre Identität auf Mastodon verifizieren. Basierend auf offenen Standards – jetzt und für immer kostenlos. Alles, was du brauchst, ist eine eigene Website. Wenn du von deinem Profil auf diese Website verlinkst, überprüfen wir, ob die Website zu deinem Profil zurückverlinkt, und zeigen einen visuellen Hinweis an."
- instructions_html: Kopiere den unten stehenden Code und füge ihn in das HTML deiner Website ein. Trage anschließend die Adresse deiner Website in ein Zusatzfeld auf deinem Profil ein und speichere die Änderungen. Die Zusatzfelder befinden sich im Reiter „Profil bearbeiten“.
+ instructions_html: Kopiere den unten stehenden Code und füge ihn in den HTML-Code deiner Website ein. Trage anschließend die Adresse deiner Website in ein Zusatzfeld auf deinem Profil ein und speichere die Änderungen. Die Zusatzfelder befinden sich im Reiter „Profil bearbeiten“.
verification: Verifizierung
- verified_links: Deine verifizierten Links
- website_verification: Website-Verifizierung
+ verified_links: Deine verifizierten Domains
+ website_verification: Verifizierung einer Website
webauthn_credentials:
add: Sicherheitsschlüssel hinzufügen
create:
diff --git a/config/locales/devise.az.yml b/config/locales/devise.az.yml
new file mode 100644
index 0000000000..6a02cd7e49
--- /dev/null
+++ b/config/locales/devise.az.yml
@@ -0,0 +1,46 @@
+---
+az:
+ devise:
+ confirmations:
+ confirmed: E-poçt ünvanınız uğurla təsdiqləndi.
+ send_instructions: Bir neçə dəqiqə ərzində e-poçt ünvanınızı necə təsdiqləyəcəyinizə dair təlimatları olan bir e-məktub alacaqsınız. Bu e-məktubu almamısınızsa, spam qovluğunuzu yoxlayın.
+ send_paranoid_instructions: E-poçt ünvanınız verilənlər bazamızda varsa, bir neçə dəqiqədən sonra e-poçt ünvanınızı necə təsdiqləyəcəyinizə dair təlimatları olan bir e-məktub alacaqsınız. Bu e-məktubu almamısınızsa, spam qovluğunuzu yoxlayın.
+ failure:
+ already_authenticated: Siz artıq daxil olmusunuz.
+ inactive: Hesabınız hələ aktivləşdirilməyib.
+ invalid: Səhv %{authentication_keys} və ya parol.
+ last_attempt: Hesabınız blok olmamışdan əvvəl bir dəfə də cəhdiniz var.
+ locked: Hesabınız bloklandı.
+ not_found_in_database: Səhv %{authentication_keys} və ya parol.
+ omniauth_user_creation_failure: Bu kimlik üçün hesab yaradarkən xəta.
+ pending: Hesabınız hələ yoxlanışdadır.
+ timeout: Sessiyanın vaxtı bitdi. Xahiş edirik davam etmək üçün yenidən daxil olun.
+ unauthenticated: Davam etmək üçün daxil olmaq və ya qeydiyyatdan keçmək lazımdır.
+ unconfirmed: Davam etmək üçün e-poçt ünvanınızı təsdiqləməlisiniz.
+ mailer:
+ confirmation_instructions:
+ action: E-poçt ünvanını təsdiqlə
+ action_with_app: Təsdiqlə və %{app}-a geri qayıt
+ explanation: Siz %{host} saytında bu e-poçt ilə hesab yaratmısınız. Onu aktivləşdirməkdən bir klik uzaqlıqdasınız. Əgər bu siz olmamısınızsa, zəhmət olmasa, bu e-məktuba məhəl qoymayın.
+ explanation_when_pending: Bu e-poçt ünvanı ilə %{host} saytına dəvət üçün müraciət etmisiniz. Siz e-poçt ünvanınızı təsdiqlədikdən sonra müraciətinizi nəzərdən keçirəcəyik. Siz məlumatlarınızı dəyişdirmək və ya hesabınızı silmək üçün daxil ola bilərsiniz, lakin hesabınız təsdiqlənənə qədər əksər funksiyaları istifadə edə bilməzsiniz. Müraciətiniz rədd edilərsə, məlumatlarınız silinəcək, buna görə də sizdən heç bir tədbir tələb olunmayacaq. Əgər bu siz deyildinizsə, zəhmət, bu e-məktuba məhəl qoymayın.
+ extra_html: Həmçinin zəhmət olmasa, serverin qaydalarını və istifadə şərtlərini oxuyun.
+ subject: 'Mastodon: %{instance} üçün təsdiqlənmə təlimatları'
+ title: E-poçt ünvanını təsdiqlə
+ email_changed:
+ explanation: 'Hesabınız üçün e-poçt ünvanı buna dəyişdirilir:'
+ extra: E-poçtunuzu dəyişməmisinizsə, çox güman ki, kimsə hesabınıza giriş əldə edib. Zəhmət olmasa, parolunuzu dərhal dəyişdirin və ya hesabınıza daxil ola bilməyəcəksinizsə, server admini ilə əlaqə saxlayın.
+ subject: 'Mastodon: E-poçt dəyişdirildi'
+ title: Yeni e-poçt ünvanı
+ password_change:
+ explanation: Hesabınızın parolu dəyişdirilib.
+ extra: Parolunuzu dəyişməmisinizsə, çox güman ki, kimsə hesabınıza giriş əldə edib. Zəhmət olmasa, parolunuzu dərhal dəyişdirin və ya hesabınıza daxil ola bilməyəcəksinizsə, server admini ilə əlaqə saxlayın.
+ subject: 'Mastodon: Parol dəyişdirildi'
+ title: Parol dəyişdirildi
+ reconfirmation_instructions:
+ explanation: E-poçtunuzu dəyişdirmək üçün yeni ünvanı təsdiqləyin.
+ extra: Əgər bu dəyişiklik sizin tərəfinizdən deyilsə, zəhmət olmasa, bu e-məktuba məhəl qoymayın. Siz yuxarıdakı linkə daxil olana qədər Mastodon hesabının e-poçt ünvanı dəyişməyəcək.
+ subject: 'Mastodon: %{instance} üçün e-poçtu təsdiqlə'
+ title: E-poçt ünvanını təsdiqlə
+ reset_password_instructions:
+ action: Parolu dəyiş
+ explanation: Siz hesabınız üçün yeni parol tələb etmisiniz.
diff --git a/config/locales/devise.eo.yml b/config/locales/devise.eo.yml
index 9d946967e9..754fa01550 100644
--- a/config/locales/devise.eo.yml
+++ b/config/locales/devise.eo.yml
@@ -6,7 +6,7 @@ eo:
send_instructions: Vi ricevos retmesaĝon kun instrukcioj por konfirmi vian retadreson ene de kelkaj minutoj. Bonvolu kontroli vian spamujon se vi ne ricevis ĉi tiun retmesaĝon.
send_paranoid_instructions: Se via retadreso ekzistas en nia datumbazo, vi ricevos retmesaĝon kun instrukcioj por konfirmi vian retadreson ene de kelkaj minutoj. Bonvolu kontroli vian spamujon se vi ne ricevis ĉi tiun retmesaĝon.
failure:
- already_authenticated: Vi jam salutis.
+ already_authenticated: Vi jam ensalutis.
inactive: Via konto ankoraŭ ne estas konfirmita.
invalid: Nevalida %{authentication_keys} aŭ pasvorto.
last_attempt: Vi ankoraŭ povas provi unufoje antaŭ ol via konto estos ŝlosita.
@@ -53,12 +53,14 @@ eo:
subtitle: Dupaŝa aŭtentigo por via konto estas malŝaltita.
title: 2FA estas malŝaltita
two_factor_enabled:
+ explanation: Tokeno generita de la parigita TOTP-aplikaĵo estos necesa por ensaluti.
subject: 'Mastodon: Dufaktora aŭtentigo ebligita'
subtitle: Dupaŝa aŭtentigo por via konto estas ŝaltita.
title: 2FA aktivigita
two_factor_recovery_codes_changed:
explanation: La antaŭaj reakiraj kodoj estis nuligitaj kaj novaj estis generitaj.
subject: 'Mastodon: Reakiraj kodoj de dufaktora aŭtentigo rekreitaj'
+ subtitle: La antaŭaj restarigaj kodoj estis malvalidigitaj kaj novaj estis generitaj.
title: Reakiraj kodoj de 2FA estas ŝanĝitaj
unlock_instructions:
subject: 'Mastodon: Instrukcioj por malŝlosi'
@@ -73,9 +75,11 @@ eo:
title: Unu el viaj sekurecaj ŝlosiloj estis forigita
webauthn_disabled:
explanation: Aŭtentigo per sekurecaj ŝlosiloj estas malŝaltita por via konto.
+ extra: Ensaluto nun eblas uzante nur la ĵetonon generitan de la parigita tempbazita unufoja pasvorta aplikaĵo.
subject: 'Mastodon: sekureca-ŝlosila aŭtentigo malebligita'
title: Sekurecaj ŝlosiloj malaktivigitaj
webauthn_enabled:
+ explanation: Sekurecŝlosila aŭtentigo estas ebligita por via konto.
extra: Via sekureca ŝlosilo nun povas esti uzata por ensaluto.
subject: 'Mastodon: sekureca-ŝlosila aŭtentigo ebligita'
title: Sekurecaj ŝlosiloj aktivigitaj
diff --git a/config/locales/devise.fa.yml b/config/locales/devise.fa.yml
index c441e346a2..bc5242e3c2 100644
--- a/config/locales/devise.fa.yml
+++ b/config/locales/devise.fa.yml
@@ -16,13 +16,13 @@ fa:
pending: حساب شما همچنان در دست بررسی است.
timeout: مهلت این ورود شما به سر رسید. برای ادامه، دوباره وارد شوید.
unauthenticated: برای ادامه باید وارد شوید یا ثبت نام کنید.
- unconfirmed: برای ادامه باید نشانی ایمیل خود را تأیید کنید.
+ unconfirmed: پیش از ادامه باید نشانی رایانامهتان را تأیید کنید.
mailer:
confirmation_instructions:
- action: تأیید نشانی ایمیل
+ action: تأیید نشانی رایانامه
action_with_app: پذیرش و بازگشت به %{app}
- explanation: شما با این نشانی ایمیل حسابی در %{host} باز کردهاید. با یک کلیک میتوانید این حساب را فعال کنید. اگر شما چنین کاری نکردید، لطفاً این ایمیل را نادیده بگیرید.
- explanation_when_pending: شما با این نشانی ایمیل برای %{host} درخواست دعوتنامه دادهاید. اگر ایمیل خود را تأیید کنید، ما درخواست شما را بررسی خواهیم کرد. تا وقتی بررسی تمام نشده، شما نمیتوانید به حساب خود وارد شوید. اگر درخواست شما رد شود، ما اطلاعاتی را که از شما داریم پاک خواهیم کرد پس نیازی به کاری از سمت شما نخواهد بود. اگر شما چنین درخواستی ندادهاید، لطفاً این ایمیل را نادیده بگیرید.
+ explanation: حسابی با این نشانی رایانامه روی %{host} ساختهاید. یک کلیک با فعّال کردنش فاصله دارید. اگر شما نبودید از این رایانامه چشم بپوشید.
+ explanation_when_pending: درخواستی برای دعوت به %{host} با این نشانی رایانامه دادهاید. درخواستتان را پس از تأیید نشانی رایانامهتان بررسی خواهیم کرد. میتوانید برای تغییر جزییات یا حذف حسابتان وارد شوید؛ ولی تا پیش از تأیید حساب نمیتوانید به بیشتر قابلیتها دسترسی داشته باشید. دادههایتان در صورت رد شدن درخواست برداشته خواهد شد و نیازی به اقدامی از سوی شما نیست. اگر شما نبودید از این رایانامه چشم بپوشید.
extra_html: لطفاً همچنین قوانین کارساز و شرایط خدمتمان را بررسی کنید.
subject: 'ماستودون: دستورالعمل تأیید برای %{instance}'
title: تأیید نشانی رایانامه
@@ -87,9 +87,9 @@ fa:
failure: تآیید هویتتان از %{kind} نتوانست انجام شود چرا که «%{reason}».
success: تأیید هویت از حساب %{kind} با موفقیت انجام شد.
passwords:
- no_token: این صفحه را تنها از راه یک ایمیل بازنشانی گذرواژه میشود دید. اگر از چنین ایمیلی میآیید، لطفاً مطمئن شوید که نشانی موجود در ایمیل را کامل به کار بردهاید.
- send_instructions: اگر ایمیل شما در پایگاه دادهٔ ما موجود باشد، تا دقایقی دیگر یک ایمیل بازیابی گذرواژه دریافت خواهید کرد. اگر این ایمیل نیامد، لطفاً پوشهٔ هرزنامههایتان را بررسی کنید.
- send_paranoid_instructions: اگر ایمیل شما در پایگاه دادهٔ ما موجود باشد، تا دقایقی دیگر یک ایمیل بازیابی گذرواژه دریافت خواهید کرد. اگر این ایمیل نیامد، لطفاً پوشهٔ هرزنامههایتان را بررسی کنید.
+ no_token: بدون آمدن از رایانامهٔ بازنشانی گذرواژه نمیتوان به این صفحه دسترسی داشت. اگر از چنین رایانامهای آمدهاید لطفاً از استفادهٔ نشانی کامل مطمئن شوید.
+ send_instructions: اگر نشانی رایانامهتان در پایگاه دادهمان باشد تا چند دقیقهٔ دیگر پیوند بازیابی گذرواژهای در آن خواهید گرفت. بررسی شاخهٔ هرزنامه در صورت نگرفتن این رایانامه.
+ send_paranoid_instructions: اگر نشانی رایانامهتان در پایگاه دادهمان باشد تا چند دقیقهٔ دیگر پیوند بازیابی گذرواژهای در آن خواهید گرفت. بررسی شاخهٔ هرزنامه در صورت نگرفتن این رایانامه.
updated: گذرواژه شما با موفقیت تغییر کرد. شما الان وارد سیستم هستید.
updated_not_active: گذرواژه شما با موفقیت تغییر کرد.
registrations:
@@ -99,15 +99,15 @@ fa:
signed_up_but_locked: با موفّقیت ثبتنام کردهاید. با این حال نمیتوان واردتان کرد؛ چرا که حسابتان قفل است.
signed_up_but_pending: پیامی با پیوند تأیید به نشانی رایانامهتان فرستاده شده. پس از زدن پیوند درخواستتان را بازبینی خواهیم کرد. در صورت پذیرش آگاه خواهید شد.
signed_up_but_unconfirmed: پیامی با پیوند تأیید به نشانی رایانامهتان فرستاده شده. لطفاً برای فعّال کردن حسابتان پیوند را بزنید. اگر این رایانامه را نگرفتهاید شاخهٔ هرزنامهها را بررسی کنید.
- update_needs_confirmation: حسابتان را با موفّقیت بهروز کردید؛ ولی باید نشانی رایانامهٔ جدیتان را تأیید کنیم. لطفاً رایانامهتان را بررسی کرده و برای تأیید نشانی رایانهٔ جدیدتان پیوند را بزنید. اگر این رایانامه را نگرفتهاید شاخهٔ هرزنامهها را بررسی کنید.
+ update_needs_confirmation: حسابتان را با موفّقیت بهروز کردید؛ ولی نشانی رایانامهٔ جدیدتان باید تأیید شود. بررسی رایانامه و پیروی از پیوند تأییدیه برای تأیید نشانی رایانهٔ جدیدتان. بررسی شاخهٔ هرزنامه در صورت نگرفتن این رایانامه.
updated: حسابتان با موفّقیت بهروز شد.
sessions:
already_signed_out: با موفّقیت خارج شدید.
signed_in: با موفّقیت وارد شدید.
signed_out: با موفّقیت خارج شدید.
unlocks:
- send_instructions: تا دقایقی دیگر رایانامهای با دستورالعمل قفلگشایی حسابتان دریافت خواهید کرد. اگر این رایانامه را نگرفتید، لطفاً پوشهٔ هرزنامههایتان را بررسی کنید.
- send_paranoid_instructions: اگر حسابتان وجود داشته باشد تا دقایقی دیگر رایانامهای با دستورالعمل قفلگشاییش دریافت خواهید کرد. اگر این رایانامه را نگرفتید، لطفاً پوشهٔ هرزنامههایتان را بررسی کنید.
+ send_instructions: تا دقایقی دیگر رایانامهای با دستورالعمل قفلگشایی حسابتان دریافت خواهید کرد. بررسی شاخهٔ هرزنامه در صورت نگرفتن این رایانامه.
+ send_paranoid_instructions: اگر حسابتان وجود داشته باشد تا دقایقی دیگر رایانامهای با دستورالعمل قفلگشاییش دریافت خواهید کرد. بررسی شاخهٔ هرزنامه در صورت نگرفتن این رایانامه.
unlocked: حسابتان با موفّقیت قفلگشایی شد. لطفاً برای ادامه وارد شوید.
errors:
messages:
diff --git a/config/locales/devise.fil.yml b/config/locales/devise.fil.yml
index 4084bf2f90..ad9a917cdf 100644
--- a/config/locales/devise.fil.yml
+++ b/config/locales/devise.fil.yml
@@ -1 +1,110 @@
+---
fil:
+ devise:
+ confirmations:
+ confirmed: Matagumpay na nakumpirma ang email address mo.
+ send_instructions: Makakatanggap ka ng email na may instruksiyon kung paano kumpirmahin ang email address mo sa ilang minuto. Paki-check ang spam folder mo kung hindi mo natanggap ang email na ito.
+ send_paranoid_instructions: Kung nasa database namin ang email address mo, makakatanggap ka ng email na may instruksiyon kung paano kumpirmahin ang email address mo sa ilang minuto. Paki-check ang spam folder mo kung hindi mo natanggap ang email na ito.
+ failure:
+ already_authenticated: Naka-sign in ka na.
+ inactive: Hindi pa naa-activate ang account mo.
+ invalid: Invalid na %{authentication_keys} o password.
+ last_attempt: May isa ka pang attempt bago ma-lock ang account mo.
+ locked: Na-lock ang account mo.
+ not_found_in_database: Invalid na %{authentication_keys} o password.
+ omniauth_user_creation_failure: May error sa paggawa ng account para sa identidad na ito.
+ pending: Nire-review pa ang account mo.
+ timeout: Natapos na ang sesyon mo. Mag-login ulit para magpatuloy.
+ unauthenticated: Kailangan mong mag-login o mag-sign up bago magpatuloy.
+ unconfirmed: Kailangan mong kumpirmahin ang email address mo bago ka magpatuloy.
+ mailer:
+ confirmation_instructions:
+ action: Beripikahin ang email address
+ action_with_app: Kumpirmahin at bumalik sa %{app}
+ explanation: Nakagawa ka ng account sa %{host} gamit ang email address na ito. Isang click na lang para ma-activate ito. Kung hindi ikaw ito, balewalain ang email na ito.
+ explanation_when_pending: Nag-apply ka para sa imbitasyon sa %{host} gamit ang email address na ito. Kapag nakumpirma mo ang email address mo, rerebyuhin namin ang aplikasyon mo. Maaari kang mag-login para baguhin ang mga detalye mo o tanggalin ang iyong account, pero hindi mo maaakses ang karamihan sa mga function hanggang hindi naaaprubahan ang account mo. Kung tinanggihan ang aplikasyon mo, aalisin ang data mo, kaya wala ka nang ibang kailangang gawing aksiyon. Kung hindi ikaw ito, balewalain ang email na ito.
+ extra_html: Paki-check din ang mga tuntunin ng server at ang aming mga tuntunin sa serbisyo.
+ subject: 'Mastodon: Instruksiyon sa kumpirmasyon para sa %{instance}'
+ title: Beripikahin ang email address
+ email_changed:
+ explanation: 'Ang email address para sa account mo ay binabago sa:'
+ extra: Kung hindi mo binago ang email mo, malamang ay may nagkaroon ng akses sa account mo. Pakipalitan agad ang password mo o kontakin ang server admin kung na-lock out ka sa account mo.
+ subject: 'Mastodon: Napalitan ang email'
+ title: Bagong email address
+ password_change:
+ explanation: Nabago na ang password ng account mo.
+ extra: Kung hindi mo binago ang email mo, malamang ay may nagkaroon ng akses sa account mo. Pakipalitan agad ang password mo o kontakin ang server admin kung na-lock out ka sa account mo.
+ subject: 'Mastodon: Napalitan ang password'
+ title: Napalitan ang password
+ reconfirmation_instructions:
+ explanation: Kumpirmahin ang bagong address para baguhin ang email mo.
+ extra: Kung hindi ikaw ang gumawa ng pagbabagong ito, balewalain ang email na ito. Hindi mapapalitan ang email address para sa account sa Mastodon hanggang hindi mo napupuntahan ang link sa itaas.
+ subject: 'Mastodon: Kumpirmahin ang email para sa %{instance}'
+ title: Beripikahin ang email address
+ reset_password_instructions:
+ action: Palitan ang password
+ explanation: Humiling ka ng bagong passwird para sa account mo.
+ extra: Kung hindi mo hiniling ito, balewalain ang email na ito. Hindi mababago ang password mo hanggang hindi mo napupuntahan ang link sa itaas at nakakagawa ng bago.
+ subject: 'Mastodon: Instruksiyon sa pag-reset ng password'
+ title: Ang pasword nay nareset
+ two_factor_disabled:
+ explanation: Puwede nang mag-login gamit lang ang email address at password.
+ subject: 'Mastodon: Naka-disable ang two-factor authentication'
+ subtitle: Naka-disable ang two-factor authentication para sa account mo.
+ title: Naka-disable ang 2FA
+ two_factor_enabled:
+ explanation: Kakailanganin ang token na na-generate ng paired TOTP app para maka-login.
+ subject: 'Mastodon: Naka-enable ang two-factor authentication'
+ subtitle: Naka-enable ang two-factor authentication para sa account mo.
+ title: Naka-enable ang 2FA
+ two_factor_recovery_codes_changed:
+ explanation: Na-invalidate ang naunang mga recovery code at nakagawa na ng bago.
+ subject: 'Mastodon: Nakagawa ulit ng mga two-factor reecover code'
+ subtitle: Na-invalidate ang naunang mga recovery code at nakagawa na ng bago.
+ title: Nabago ang 2FA recovery codes
+ unlock_instructions:
+ subject: 'Mastodon: Buksan ang instruksiyon'
+ webauthn_credential:
+ added:
+ explanation: Naidagdag na sa account mo ang sumusunod na security key
+ subject: 'Mastodon: Bagong security key'
+ title: May naidagdag nang bagong security key
+ deleted:
+ explanation: Natanggal na sa account mo ang sumusunod na security key
+ subject: 'Mastodon: Na-delete ang security key'
+ title: Na-delete ang isa sa mga security key mo
+ webauthn_disabled:
+ explanation: Naka-disable ang authentication sa mga security key para sa account mo.
+ extra: Puwede nang mag-login gamit lang ang token na na-gennerate ng paired TOTP app.
+ subject: 'Mastodon: Naka-disable ang authentication sa mga security key'
+ title: Naka-disable ang mga security key
+ webauthn_enabled:
+ explanation: Naka-enable ang two-factor authentication para sa account mo.
+ extra: Magagamit na ngayon ang security key para maka-login.
+ subject: 'Mastodon: Naka-enable ang security key authentication'
+ title: Naka-enable ang mga security key
+ omniauth_callbacks:
+ failure: Hindi ka ma-authenticate mula sa %{kind} dahil “%{reason}”.
+ success: Matagumpay na na-aurthenticate mula sa %{kind} account.
+ passwords:
+ no_token: Hindi mo maaakses ang page na ito nang hindi nangaggaling sa password reset na email. Kung nangggaling ka sa password reset na email, siguruhin mong ginamit mo ang binigay na URL.
+ send_instructions: Kung nasa database namin ang email address mo, makakatanggap ka ng password recovery link ilang minuto. Paki-check ang spam folder mo kung hindi mo natanggap ang email na ito.
+ send_paranoid_instructions: Kung nasa database namin ang email address mo, makakatanggap ka ng password recovery link sa email address mo sa ilang minuto. Paki-check ang spam folder mo kung hindi mo natanggap ang email na ito.
+ updated: Matagumpay na napalitan ang password mo. Naka-sign in ka na.
+ updated_not_active: Matagumpay na napalitan ang password mo.
+ registrations:
+ destroyed: Paalam! Matagumpay na nakansela ang account mo. Sana ay magkita ulit tayo sa hinaharap.
+ signed_up: Maligayang pagdating! Nakapag-sign up ka na.
+ signed_up_but_inactive: Nakapag-sign up ka na. Pero ka namin ma-sign in dahil hindi pa naa-activate ang account mo.
+ signed_up_but_locked: Nakapag-sign up ka na. Pero ka namin ma-sign in dahil naka-lock ang account mo.
+ signed_up_but_pending: Naipadala na sa email address mo ang mensaheng may confirmation link. Pagka-click ng link, ire-review namin ang application. Aabisuhan ka kapag naaprobahan ito.
+ signed_up_but_unconfirmed: Naipadala na sa email address mo ang mensaheng may confirmation link. Pakisundan ang link para ma-activate ang account mo. Pakitingnan ang spam folder mo kung hindi mo natanggap ang email na ito.
+ update_needs_confirmation: Na-update mo na ang account mo, pero kailangan naming beripikahin ang bago mong email address. Pakitingnan ang email mo at sundan ang confirm link para makumpirma ang bagong email address mo. Pakitingnan ang spam folder mo kung hindi mo natanggap ang email na ito.
+ updated: Matagumpay na na-update ang account mo.
+ sessions:
+ already_signed_out: Matagumpay na naka-sign out.
+ signed_in: Matagumpay na naka-sign in.
+ signed_out: Matagumpay na naka-sign out.
+ unlocks:
+ send_instructions: Makakatanggap ka ng email na may instruksiyon kung paano i-unlock ang account mo sa ilang minuto. Pakitingnan ang spam folder mo kung hindi mo natanggap ang email na ito.
+ send_paranoid_instructions: Kung may account ka, makakatanggap ka ng email na may instruksiyon kung paano ito i-unlock sa ilang minuto. Pakitingnan ang spam folder mo kung hindi mo natanggap ang email na ito.
diff --git a/config/locales/devise.gl.yml b/config/locales/devise.gl.yml
index 00b1824808..d04afe8e2a 100644
--- a/config/locales/devise.gl.yml
+++ b/config/locales/devise.gl.yml
@@ -2,8 +2,8 @@
gl:
devise:
confirmations:
- confirmed: O teu enderezo de email foi confirmado.
- send_instructions: Vas recibir un email coas instrucións para confirmar o teu enderezo de email dentro dalgúns minutos. Por favor, comproba o cartafol de spam se non recibiches o correo.
+ confirmed: Confirmouse correctamente o teu enderezo de correo.
+ send_instructions: Nuns minutos vas recibir un correo coas instrucións para confirmar o teu enderezo de correo. Por favor, comproba o cartafol de spam se non recibiches o correo.
send_paranoid_instructions: Se o teu enderezo de email xa existira na nosa base de datos, vas recibir un correo coas instrucións de confirmación dentro dalgúns minutos. Por favor, comproba o cartafol de spam se non recibiches o correo.
failure:
already_authenticated: Xa estás conectada.
@@ -16,31 +16,31 @@ gl:
pending: A túa conta aínda está baixo revisión.
timeout: A túa sesión caducou. Accede outra vez para continuar.
unauthenticated: Precisas iniciar sesión ou rexistrarte antes de continuar.
- unconfirmed: Tes que confirmar o teu enderezo de email antes de continuar.
+ unconfirmed: Tes que confirmar o teu enderezo de correo antes de continuar.
mailer:
confirmation_instructions:
- action: Verificar o enderezo de email
+ action: Verificar o enderezo de correo
action_with_app: Confirmar e volver a %{app}
- explanation: Creaches unha conta en %{host} con este enderezo de email. Estás a un clic de activala. Se non foches ti o que fixeches este rexisto, por favor ignora esta mensaxe.
- explanation_when_pending: Solicitaches un convite para %{host} con este enderezo de email. Logo de que confirmes o teu enderezo de email, imos revisar a túa inscrición. Podes iniciar sesión para mudar os teus datos ou eliminar a túa conta, mais non poderás aceder á meirande parte das funcións até que a túa conta sexa aprobada. Se a túa inscrición for rexeitada, os teus datos serán eliminados, polo que non será necesaria calquera acción adicional da túa parte. Se non solicitaches este convite, por favor, ignora este correo.
+ explanation: Creaches unha conta en %{host} con este enderezo de correo. Estás a un clic de activala. Se non foches ti quen fixo esta solicitude, por favor ignora esta mensaxe.
+ explanation_when_pending: Solicitaches un convite para %{host} con este enderezo de correo. Logo confirmes o teu enderezo de correo, imos revisar a túa inscrición. Podes iniciar sesión para mudar os teus datos ou eliminar a túa conta, mais non poderás aceder á meirande parte das funcións até que a túa conta sexa aprobada. Se a túa inscrición for rexeitada, os teus datos serán eliminados, polo que non será necesaria calquera acción adicional da túa parte. Se non solicitaches este convite, por favor, ignora este correo.
extra_html: Por favor, le as regras do servidor e os nosos termos do servizo.
subject: 'Mastodon: Instrucións de confirmación para %{instance}'
- title: Verificar o enderezo de email
+ title: Verificar o enderezo de correo
email_changed:
explanation: 'O email asociado á túa conta será mudado a:'
extra: Se non mudaches o teu email é posíbel que alguén teña conseguido acceder á túa conta. Por favor muda o teu contrasinal de xeito imediato ou entra en contacto cun administrador do servidor se non podes acceder a túa conta.
subject: 'Mastodon: Email mudado'
- title: Novo enderezo de email
+ title: Novo enderezo de correo
password_change:
explanation: O contrasinal da túa conta foi mudado.
extra: Se non mudaches o teu contrasinal, é posíbel que alguén teña conseguido acceder á túa conta. Por favor muda o teu contrasinal de xeito imediato ou entra en contato cun administrador do servidor se non podes acceder a túa conta.
subject: 'Mastodon: Contrasinal mudado'
title: Contrasinal mudado
reconfirmation_instructions:
- explanation: Confirma o teu novo enderezo para mudar o email.
- extra: Se esta mudanza non foi comezada por ti, por favor ignora este email. O enderezo de email para a túa conta do Mastodon non mudará mentres non accedas á ligazón de enriba.
+ explanation: Confirma o teu novo enderezo para mudar o correo.
+ extra: Se esta mudanza non foi iniciada por ti, por favor ignora este correo. O enderezo de correo para a túa conta do Mastodon non mudará mentres non accedas á ligazón de enriba.
subject: 'Mastodon: Confirmar email para %{instance}'
- title: Verificar o enderezo de email
+ title: Verificar o enderezo de correo
reset_password_instructions:
action: Mudar contrasinal
explanation: Solicitaches un novo contrasinal para a túa conta.
@@ -87,9 +87,9 @@ gl:
failure: Non foi posible autenticarte desde %{kind} debido a "%{reason}".
success: Autenticado con éxito na conta %{kind}.
passwords:
- no_token: Non podes acceder a esta páxina se non vés a través da ligazón enviada por email para o mudado do teu contrasinal. Se empregaches esa ligazón para chegar aquí, por favor verifica que o enderezo URL actual é o mesmo do que foi enviado no email.
- send_instructions: Se o teu enderezo de email existe na nosa base de datos, vas recibir un email coas instrucións para mudar o contrasinal dentro duns minutos. Por favor, comproba o teu cartafol de correo lixo (spam) se ves que non recibiches o email.
- send_paranoid_instructions: Se o teu enderezo de email existe na nosa base de datos, vas recibir unha ligazón para recuperar o contrasinal dentro duns minutos. Por favor, comproba o teu cartafol de correo lixo (spam) se ves que non recibiches o email.
+ no_token: Non podes acceder a esta páxina se non vés a través da ligazón enviada por correo para o cambio do contrasinal. Se empregaches esa ligazón para chegar aquí, por favor verifica que o enderezo URL actual é o mesmo do que foi enviado no correo.
+ send_instructions: Se o teu enderezo de correo existe na nosa base de datos, vas recibir un email coas instrucións para mudar o contrasinal dentro duns minutos. Por favor, comproba o teu cartafol de correo lixo (spam) se ves que non recibiches o correo.
+ send_paranoid_instructions: Se o teu enderezo de correo existe na nosa base de datos, vas recibir un email coas instrucións para mudar o contrasinal dentro duns minutos. Por favor, comproba o teu cartafol de correo lixo (spam) se ves que non recibiches o correo.
updated: O teu contrasinal foi mudado. Estás xa autenticado na túa conta.
updated_not_active: O teu contrasinal foi mudado de xeito correcto.
registrations:
@@ -97,9 +97,9 @@ gl:
signed_up: Benvido! Rexistrácheste de xeito correcto.
signed_up_but_inactive: A túa conta foi rexistada. Porén aínda non está activada.
signed_up_but_locked: A túa conta foi rexistada. Porén está bloqueada.
- signed_up_but_pending: Acabamos de enviar unha mensaxe ao teu email cunha ligazón de confirmación. Após premer na ligazón, revisaremos a túa solicitude. Recibirás unha notificación se a túa conta é aprobada.
+ signed_up_but_pending: Acabamos de enviar unha mensaxe ao teu correo cunha ligazón de confirmación. Após premer na ligazón, revisaremos a túa solicitude. Recibirás unha notificación se a túa conta é aprobada.
signed_up_but_unconfirmed: Enviouse unha mensaxe cunha ligazón de confirmación ao teu email. Por favor, preme nesa ligazón para activar a túa conta. Comproba o teu cartafol de correo lixo (spam) se ves que non recibiches o correo.
- update_needs_confirmation: Actualizaches a túa conta de xeito correcto, pero precisamos verificar o teu novo enderezo de email. Por favor, revisa o teu email e segue a ligazón para confirmar o teu novo enderezo de email. Comproba o teu cartafol de correo lixo (spam) se ves que non recibiches o correo.
+ update_needs_confirmation: Actualizaches a túa conta de xeito correcto, pero precisamos verificar o teu novo enderezo de correo. Por favor, revisa o teu correo e segue a ligazón para confirmar o teu novo enderezo de correo. Comproba o cartafol de correo lixo (spam) se ves que non recibiches o correo.
updated: A túa conta foi actualizada de xeito correcto.
sessions:
already_signed_out: Pechouse a sesión de xeito correcto.
diff --git a/config/locales/devise.io.yml b/config/locales/devise.io.yml
index 49637579e4..c76f5fb9af 100644
--- a/config/locales/devise.io.yml
+++ b/config/locales/devise.io.yml
@@ -21,19 +21,19 @@ io:
confirmation_instructions:
action: Verifikez retpostadreso
action_with_app: Konfirmez e retrovenez a %{app}
- explanation: Vu kreis konto che %{host} per ca retpostadreso. Vu povas facile aktivigar lu. Se vu ne agis lu, ignorez ca retposto.
+ explanation: Vu kreis konto sur %{host} per ca retpostadreso. Se vu ne agis lu, ignorez ca retposto.
explanation_when_pending: Vu aplikis por ganar invito a %{host} per ca retpostkonto. Pos vu konfirmas vua retpostkonto, ni kontrolos vua apliko. Vu povas enirar por chanjar vua detali o efacar vua konto, ma vu ne povas acesar maxim de funcioni til vua konto aprobesas. Se vua apliko refuzesas, vua informi efacesos, do plusa ago ne bezonesos de vu. Se vu ne agis lu, ignorez ca retposto.
extra_html: Anke videz reguli di la servilo e nia servokondicioni.
subject: Instrucioni por konfirmar %{instance}
title: Verifikez retpostadreso
email_changed:
explanation: 'Retpostadreso di vua konto chanjesas a:'
- extra: Se vu ne chanjesis vua retpostadreso, nulu posible acesis vua konto. Chanjez vua pasvorto quik o kontaktez serviladministratero se vu ne povas enirar vua konto.
+ extra: Se vu ne chanjesis vua retpostadreso, eble ulu adiris vua konto.
subject: 'Mastodon: Retpostadreso chanjesis'
title: Nova retpostadreso
password_change:
explanation: La pasvorto di vua konto chanjesis.
- extra: Se vu ne chanjesis vua pasvorto, nulu posible acesis vua konto. Chanjez vua pasvorto quik o kontaktez serviladministratero se vu ne povas enirar vua konto.
+ extra: Se vu ne chanjesis vua pasvorto, eble ulu adiris vua konto.
subject: Tua pasvorto chanjesis senprobleme.
title: Pasvorto chanjesis
reconfirmation_instructions:
@@ -49,14 +49,14 @@ io:
title: Richanjo di pasvorto
two_factor_disabled:
explanation: Eniro esas nun posibla per nur retpostoadreso e pasvorto.
- subject: 'Mastodon: 2-faktorverifiko deaktivigesis'
- subtitle: 2-faktora verifiko por vua konto desaktivigesis.
- title: 2FA deaktivigesis
+ subject: 'Mastodon: Dufaktora yurizo desebligesis'
+ subtitle: Dufaktora yurizo por vua konto desebligesis.
+ title: 2FA desebligesis
two_factor_enabled:
explanation: Ficho facesis da parigita softwaro TOTP bezonesos por eniro.
- subject: 'Mastodon: 2-faktorverifiko aktivigesis'
- subtitle: 2-faktora verifiko aktivigesis por vua konto.
- title: 2FA aktivigesis
+ subject: 'Mastodon: Dufaktora yurizo ebligesis'
+ subtitle: Dufaktora yurizo ebligesis por vua konto.
+ title: 2FA ebligesis
two_factor_recovery_codes_changed:
explanation: Antea rigankodexi devalidesis e novo facesis.
subject: 'Mastodon: 2-faktorrigankodexi rifacesis'
@@ -66,23 +66,23 @@ io:
subject: Instructioni por riacendar la konto
webauthn_credential:
added:
- explanation: Ca sekurklefo insertesis a vua konto
+ explanation: Ca sekuresklefo adjuntesis ad vua konto
subject: 'Mastodon: Nova sekurklefo'
- title: Nova sekurklefo insertesis
+ title: Nova sekuresklefo adjuntesis
deleted:
explanation: Ca sekurklefo efacesis de vua konto
subject: 'Mastodon: Sekurklefo efacesis'
title: 1 de vua sekurklefi efacesis
webauthn_disabled:
- explanation: Verifiko per sekuresklefi desaktivigesis por vua konto.
+ explanation: Yurizo kun sekuresklefi desebligesis por vua konto.
extra: Eniro esas nun posibla per nur ficho qua facesis da parigita softwaro TOTP.
- subject: 'Mastodon: Verifiko per sekurklefi deaktivigesis'
- title: Sekurklefi deaktivigesis
+ subject: 'Mastodon: Yurizo per sekuresklefi desebligesis'
+ title: Sekuresklefi desebligesis
webauthn_enabled:
- explanation: Sekuresklefoa verifiko aktivigesis por vua konto.
+ explanation: Sekuresklefyurizo ebligesis por vua konto.
extra: Vua sekuresklefo povas nun uzesar por eniro.
- subject: 'Mastodon: Sekurklefverifiko aktivigesis'
- title: Sekurklefi aktivigesis
+ subject: 'Mastodon: Sekuresklefyurizo ebligesis'
+ title: Sekuresklefi ebligesis
omniauth_callbacks:
failure: 'Ni ne povis autentikigar tu per %{kind}: ''%{reason}''.'
success: Autentikigita senprobleme per %{kind}.
@@ -97,7 +97,7 @@ io:
signed_up: Bonveno! Tu membreskis senprobleme.
signed_up_but_inactive: Tu bone membreskis, ma tu ankore ne povas enirar pro ke tua konto ne konfirmesis.
signed_up_but_locked: Tu bone membreskis, ma tu ne povas enirar pro ke tua konto extingesis.
- signed_up_but_pending: Mesajo kun konfirmoligilo sendesis a vua retpostadreso. Pos vu kliktas la ligilo, ni kontrolos vua apliko. Vu notifikesos se ol aprobesas.
+ signed_up_but_pending: Mesajo kun konfirmligilo sendesis ad vua retpostadreso. Vu savigesos se ol aprobesas.
signed_up_but_unconfirmed: Retpost-mesajo kun tua ligilo por konfirmar tua konto sendesis a tua retpost-adreso. Voluntez uzar ta ligilo por konfirmar tua konto.
update_needs_confirmation: Tu vone aktualigis tua konto, ma ni bezonas kontrolar tua nova retpost-adreso. Voluntez kontrolar tua retpost-mesaji ed uzar la ligilo por konfirmar tua nova retpost-adreso.
updated: Tua konto aktualigesis senprobleme.
diff --git a/config/locales/devise.kab.yml b/config/locales/devise.kab.yml
index 32a98a37c3..95969fdfd0 100644
--- a/config/locales/devise.kab.yml
+++ b/config/locales/devise.kab.yml
@@ -88,8 +88,8 @@ kab:
success: Asesṭeb idda akken iwata seg umiḍan %{kind}.
passwords:
no_token: Ur tezmireḍ ara ad tkecmeḍ ɣer usebter-a war ma tusiḍ-d seg imayl n uwennez n wawal uffir. ma syin i d-tusiḍ, wali ma tesqedceḍ tansa URL i d ak·am-d-nuzen.
- send_instructions: Ma nufa tansa-inek imayl tella deg uzadur-nneγ n yisefka, ad n-teṭṭfeḍ izen deg kra n tesdatin, deg-s assaγ i uɛawed n wawal uffir. Ma ur k-in-yewwiḍ ara yizen, ttxil-k ẓer deg ukaram spam.
- send_paranoid_instructions: Ma nufa tansa-inek imayl tella deg uzadur-nneγ n yisefka, ad n-teṭṭfeḍ izen deg kra n tesdatin, deg-s assaγ i uɛawed n wawal uffir. Ma ur k-in-yewwiḍ ara yizen, ttxil-k ẓer deg ukaram spam.
+ send_instructions: Ma nufa tansa-inek·inem imayl tella deg uzadur-nneɣ n yisefka, ad n-teṭṭfeḍ izen deg kra n tesdatin, deg-s assaɣ i uɛawed n wawal uffir. Ma ur k-in-yewwiḍ ara yizen, ttxil-k·m ẓer deg ukaram yespamen.
+ send_paranoid_instructions: Ma nufa tansa-inek·inem imayl tella deg uzadur-nneɣ n yisefka, ad n-teṭṭfeḍ izen deg kra n tesdatin, deg-s assaɣ i uɛawed n wawal uffir. Ma ur k-in-yewwiḍ ara yizen, ttxil-k·m ẓer deg ukaram yespamen.
updated: Awal-ik uffir yettwabeddel mebla ugur. Aqla-k tura tjerrḍeḍ.
updated_not_active: Awal-ik uffir yettwabeddel mebla ugur.
registrations:
diff --git a/config/locales/devise.la.yml b/config/locales/devise.la.yml
index a6fe5e1e4b..e6d3cb1f78 100644
--- a/config/locales/devise.la.yml
+++ b/config/locales/devise.la.yml
@@ -5,4 +5,8 @@ la:
send_instructions: Sī adresa tua epistularis in nostra basi datōrum exstat, vinculum ad recuperandam clavem adresa tua epistulari adferētur pauca momenta post. Sī autem hanc epistulam nōn recēpistī, rogāmus ut scrūtināriōnem spurcāriī tuī faciās.
registrations:
destroyed: Vale! Ratio tua succēssu cancellāta est. Spērāmus tē mox iterum vidēre.
- signed_up_but_inactive: Te cōnscrīpsistī succēdāneē. At nōn potuimus tē introīre quod ratio* tua nōn adhūc est activāta.*
+ signed_up: Bene vēnistī! Tē adscrīpsistī fēlīciter.
+ signed_up_but_inactive: Tē adscrīpsistī fēlīciter. Tamen, tibi nōn licuit intrāre, quia ratiō tua adhūc nōn est ācta.
+ signed_up_but_locked: Tē adscrīpsistī fēlīciter. Tamen, tibi nōn licuit intrāre, quia ratiō tua clāusa est.
+ signed_up_but_pending: Nūntius cum nexū cōnfirmātiōnis ad tuam īnscrīptiōnem ēlectronicam missus est. Posteā, cum nexum premseris, rogātiōnem tuam recēnseāmus. Sī probāta erit, certior fēceris.
+ signed_up_but_unconfirmed: Nūntius cum nexū cōnfirmātiōnis ad tuam īnscrīptiōnem ēlectronicam missus est. Quaesō, nexum sequere ut ratiōnem tuam āctīvēs. Quaesō, scrīnium spammae īnspice sī hunc nūntium nōn accēpistī.
diff --git a/config/locales/devise.lt.yml b/config/locales/devise.lt.yml
index 7c72543574..4c54c50e4f 100644
--- a/config/locales/devise.lt.yml
+++ b/config/locales/devise.lt.yml
@@ -94,11 +94,11 @@ lt:
updated_not_active: Tavo slaptažodis buvo sėkmingai pakeistas.
registrations:
destroyed: Iki pasimatymo! Tavo paskyra sėkmingai atšaukta. Tikimės, kad netrukus vėl pamatysime tave.
- signed_up: Sveiki! Tu sėkmingai užsiregistravai.
- signed_up_but_inactive: Sėkmingai užsiregistravai. Tačiau negalėjome tavęs prijungti, nes tavo paskyra dar nėra aktyvuota.
- signed_up_but_locked: Sėkmingai užsiregistravai. Tačiau negalėjome tavęs prijungti, nes tavo paskyra dar užrakinta.
- signed_up_but_pending: Į tavo el. pašto adresą buvo išsiųstas laiškas su patvirtinimo nuoroda. Paspaudęs (-usi) nuorodą, peržiūrėsime tavo paraišką. Tau bus pranešta, jei ji patvirtinta.
- signed_up_but_unconfirmed: Į tavo el. pašto adresą buvo išsiųstas laiškas su patvirtinimo nuoroda. Sek nuorodą, kad aktyvuotum savo paskyrą. Jei negavai šio el. laiško, patikrink šlamšto aplanką.
+ signed_up: Sveiki atvykę! Sėkmingai užsiregistravote.
+ signed_up_but_inactive: Sėkmingai užsiregistravote. Tačiau negalėjome jūsų prijungti, nes jūsų paskyra dar nėra aktyvuota.
+ signed_up_but_locked: Sėkmingai užsiregistravote. Tačiau negalėjome jūsų prijungti, nes jūsų paskyra yra užrakinta.
+ signed_up_but_pending: Į jūsų el. pašto adresą buvo išsiųstas laiškas su patvirtinimo nuoroda. Paspaudę nuorodą, peržiūrėsime jūsų paraišką. Jums bus pranešta, jei ji bus patvirtinta.
+ signed_up_but_unconfirmed: Į jūsų el. pašto adresą buvo išsiųstas laiškas su patvirtinimo nuoroda. Sekite nuorodą, kad aktyvuotumėte savo paskyrą. Jei negavote šio el. laiško, patikrinkite brukalo (kartais vadinamo šlamšto) aplanką.
update_needs_confirmation: Sėkmingai atnaujinai savo paskyrą, bet mums reikia patvirtinti naująjį el. pašto adresą. Patikrink savo el. paštą ir sek patvirtinimo nuorodą, kad patvirtintum savo naują el. pašto adresą. Jei negavai šio el. laiško, patikrink šlamšto aplanką.
updated: Tavo paskyra buvo sėkmingai atnaujinta.
sessions:
diff --git a/config/locales/devise.lv.yml b/config/locales/devise.lv.yml
index 4470c8109e..7d1201c1ae 100644
--- a/config/locales/devise.lv.yml
+++ b/config/locales/devise.lv.yml
@@ -2,9 +2,9 @@
lv:
devise:
confirmations:
- confirmed: Tava e-pasta adrese ir veiksmīgi apstiprināta.
- send_instructions: Pēc dažām minūtēm saņemsi e-pastu ar norādījumiem, kā apstiprināt savu e-pasta adresi. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
- send_paranoid_instructions: Ja tava e-pasta adrese ir mūsu datu bāzē, pēc dažām minūtēm saņemsi e-pastu ar norādījumiem, kā apstiprināt savu e-pasta adresi. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
+ confirmed: Tava e-pasta adrese tika sekmīgi apstiprināta.
+ send_instructions: Pēc dažām minūtēm saņemsi e-pasta ziņojum ar norādēm, kā apstiprināt savu e-pasta adresi. Lūgums pārbaudīt mēstuļu mapi, ja nesaņēmi šo e-pasta ziņojumu.
+ send_paranoid_instructions: Ja Tava e-pasta adrese ir mūsu datubāzē, pēc dažām minūtēm saņemsi e-pasta ziņojumu ar norādēm, kā apstiprināt savu e-pasta adresi. Lūgums pārbaudīt mēstuļu mapi, ja nesaņēmi šo e-pasta ziņojumu.
failure:
already_authenticated: Tu jau esi pieteicies.
inactive: Tavs konts vēl nav aktivizēts.
@@ -14,7 +14,7 @@ lv:
not_found_in_database: Nederīga %{authentication_keys} vai parole.
omniauth_user_creation_failure: Kļūda šīs identitātes konta izveidošanā.
pending: Tavs konts joprojām tiek pārskatīts.
- timeout: Sesijair beigusies. Lūgums vēlreiz pieteikties, lai turpinātu.
+ timeout: Sesija ir beigusies. Lūgums vēlreiz pieteikties, lai turpinātu.
unauthenticated: Lai turpinātu, jāpiesakās vai jāreģistrējas.
unconfirmed: Lai turpinātu, jāapliecina sava e-pasta adrese.
mailer:
@@ -58,10 +58,10 @@ lv:
subtitle: Tavam kontam tika iespējota divpakāpju autentifikācija.
title: 2FA iespējota
two_factor_recovery_codes_changed:
- explanation: Iepriekšējie atkopšanas kodi ir atzīti par nederīgiem un ģenerēti jauni.
- subject: 'Mastodon: Divfaktoru atkopšanas kodi pārģenerēti'
- subtitle: Iepriekšējie atkopšanas kodi tika padarīti par nederīgiem, un tika izveidoti jauni.
- title: 2FA atkopšanas kodi mainīti
+ explanation: Iepriekšējie atkopes kodi ir padarīt nederīgi, un ir izveidoti jauni.
+ subject: 'Mastodon: atkārtoti izveidoti divpakāpju atkopes kodi'
+ subtitle: Iepriekšējie atkopes kodi tika padarīti par nederīgiem, un tika izveidoti jauni.
+ title: 2FA atkopes kodi nomainīti
unlock_instructions:
subject: 'Mastodon: Norādījumi atbloķēšanai'
webauthn_credential:
@@ -85,33 +85,33 @@ lv:
title: Drošības atslēgas iespējotas
omniauth_callbacks:
failure: Nevarēja autentificēt tevi no %{kind}, jo "%{reason}".
- success: Veiksmīgi autentificēts no %{kind} konta.
+ success: Sekmīgi autentificēts no %{kind} konta.
passwords:
no_token: Tu nevari piekļūt šai lapai, ja neesi saņēmis paroles atiestatīšanas e-pasta ziņojumu. Ja ienāci no paroles atiestatīšanas e-pasta, lūdzu, pārliecinies, vai izmanto visu norādīto URL.
- send_instructions: Ja tava e-pasta adrese ir mūsu datu bāzē, pēc dažām minūtēm uz savu e-pasta adresi saņemsi paroles atkopšanas saiti. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
- send_paranoid_instructions: Ja tava e-pasta adrese ir mūsu datu bāzē, pēc dažām minūtēm uz savu e-pasta adresi saņemsi paroles atkopšanas saiti. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
- updated: Tava parole tika veiksmīgi nomainīta. Tu tagad esi pieteicies.
- updated_not_active: Tava parole ir veiksmīgi nomainīta.
+ send_instructions: Ja Tava e-pasta adrese ir mūsu datubāzē, pēc dažām minūtēm savā e-pasta adresē saņemsi paroles atkopes saiti. Lūgums pārbaudīt mēstuļu mapi, ja nesaņēmi šo e-pasta ziņojumu.
+ send_paranoid_instructions: Ja Tava e-pasta adrese ir mūsu datubāzē, pēc dažām minūtēm savā e-pasta adresē saņemsi paroles atkopes saiti. Lūgums pārbaudīt mēstuļu mapi, ja nesaņēmi šo e-pasta ziņojumu.
+ updated: Tava parole tika sekmīgi nomainīta. Tagad esi pieteicies.
+ updated_not_active: Tava parole tika sekmīgi nomainīta.
registrations:
- destroyed: Visu labu! Tavs konts ir veiksmīgi atcelts. Mēs ceram tevi drīz atkal redzēt.
- signed_up: Laipni lūdzam! Tu esi veiksmīgi reģistrējies.
- signed_up_but_inactive: Tava reģistrācija bija veiksmīga. Tomēr mēs nevarējām tevi pierakstīt, jo tavs konts vēl nav aktivizēts.
- signed_up_but_locked: Tava reģistrācija bija veiksmīga. Tomēr mēs nevarējām tevi pierakstīt, jo tavs konts ir bloķēts.
- signed_up_but_pending: Uz tavu e-pasta adresi ir nosūtīts ziņojums ar apstiprinājuma saiti. Pēc noklikšķināšanas uz saites mēs izskatīsim tavu pieteikumu. Tu tiksi informēts, ja tas tiks apstiprināts.
- signed_up_but_unconfirmed: Uz tavu e-pasta adresi ir nosūtīts ziņojums ar apstiprinājuma saiti. Lūdzu, seko saitei, lai aktivizētu savu kontu. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
- update_needs_confirmation: Tu veiksmīgi atjaunināji savu kontu, taču mums ir jāverificē teva jaunā e-pasta adrese. Lūdzu, pārbaudi savu e-pastu un seko apstiprinājuma saitei, lai apstiprinātu savu jauno e-pasta adresi. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
- updated: Tavs konts ir veiksmīgi atjaunināts.
+ destroyed: Visu labu! Tavs konts ir sekmīgi atcelts. Mēs ceram Tevi drīz atkal redzēt.
+ signed_up: Laipni lūdzam! Reģistrēšanās bija sekmīga.
+ signed_up_but_inactive: Reģistrēšanās bija sekmīga. Tomēr mēs nevarējām Tevi pieteikt, jo Tavs konts vēl nav aktivēts.
+ signed_up_but_locked: Reģistrēšanās bija sekmīga. Tomēr mēs nevarējām Tevi pieteikt, jo Tavs konts ir slēgts.
+ signed_up_but_pending: Ziņojums ar apstiprinājuma saiti tika nosūtīts uz Tavu e-pasta adresi. Pēc tam, kad atvērsi saiti, mēs izskatīsim Tavu pieteikumu. Tev tiks paziņots, ja tas tiks apstiprināts.
+ signed_up_but_unconfirmed: Ziņojums ar apstiprinājuma saiti tika nosūtīts uz Tavu e-pasta adresi. Lūgums sekot saitei, lai aktivētu savu kontu. Lūgums pārbaudīt savu mēstuļu mapi, ja nesaņēmi šo e-pasta ziņojumu.
+ update_needs_confirmation: Tu sekmīgi atjaunināji savu kontu, taču mums ir jāapliecina Tava jaunā e-pasta adrese. Lūgums pārbaudīt savu e-pastu un sekot apstiprinājuma saitei, lai apstiprinātu savu jauno e-pasta adresi. Lūgums pārbaudīt mēstuļu mapi, ja nesaņēmi šo e-pasta ziņojumu.
+ updated: Tavs konts tika sekmīgi atjaunināts.
sessions:
- already_signed_out: Veiksmīgi izrakstījies.
- signed_in: Veiksmīgi pieteicies.
- signed_out: Veiksmīgi izrakstījies.
+ already_signed_out: Sekmīgi izrakstījies.
+ signed_in: Sekmīgi pierakstījies.
+ signed_out: Sekmīgi izrakstījies.
unlocks:
- send_instructions: Pēc dažām minūtēm tu saņemsi e-pastu ar norādījumiem, kā atbloķēt savu kontu. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
- send_paranoid_instructions: Ja tavs konts eksistē, dažu minūšu laikā tu saņemsi e-pastu ar norādījumiem, kā to atbloķēt. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
- unlocked: Konts tika veiksmīgi atbloķēts. Lūgums pieteikties, lai turpinātu.
+ send_instructions: Pēc dažām minūtēm Tu saņemsi e-pasta ziņojumu ar norādēm, kā atslēgt savu kontu. Lūgums pārbaudīt mēstuļu mapi, ja nesaņēmi šo e-pasta ziņojumu.
+ send_paranoid_instructions: Ja Tavs konts pastāv, dažu minūšu laikā saņemsi e-pasta ziņojumu ar norādēm, kā to atslēgt. Lūgums pārbaudīt mēstuļu mapi, ja nesaņēmi šo e-pasta ziņojumu.
+ unlocked: Konts tika sekmīgi atslēgts. Lūgums pieteikties, lai turpinātu.
errors:
messages:
- already_confirmed: jau tika apstiprināts, lūdzu, mēģini pierakstīties
+ already_confirmed: jau tika apstiprināts, lūgums mēģināt pieteikties
confirmation_period_expired: jāapstiprina %{period} laikā, lūdzu, pieprasi jaunu
expired: ir beidzies derīguma termiņš, lūdzu, pieprasi jaunu
not_found: nav atrasts
diff --git a/config/locales/devise.nan.yml b/config/locales/devise.nan.yml
new file mode 100644
index 0000000000..dce568bfcc
--- /dev/null
+++ b/config/locales/devise.nan.yml
@@ -0,0 +1,21 @@
+---
+nan:
+ devise:
+ failure:
+ locked: Lí ê口座hőng鎖定ah。
+ not_found_in_database: Bô ha̍p規定ê %{authentication_keys} á是密碼。
+ pending: Lí ê口座iáu teh審查。
+ timeout: Lí ê作業階段kàu期ah。請koh登入，繼續完成。
+ mailer:
+ two_factor_disabled:
+ title: 2FA關掉ah
+ two_factor_enabled:
+ title: 2FA啟用ah
+ two_factor_recovery_codes_changed:
+ title: 2FA驗證碼改ah
+ registrations:
+ signed_up: 歡迎！Lí成功註冊ah。
+ signed_up_but_inactive: Lí成功註冊ah。M̄-kú，你ê口座iáu-buē啟用，guán bē-tàng hōo lí登入。
+ signed_up_but_locked: Lí成功註冊ah。M̄-kú，你ê口座hőng鎖定，guán bē-tàng hōo lí登入。
+ signed_up_but_pending: 有確認連結ê訊息，已經寄kàu lí ê電子phue箱ah。Tshi̍h連結了後，guán ē審查你ê申請。Nā核准就通知lí。
+ signed_up_but_unconfirmed: 有確認連結ê訊息，已經寄kàu lí ê電子phue箱ah。請跟tuè連結來啟用口座。Nā無收著，請檢查lí ê pùn-sò批資料giap-á。
diff --git a/config/locales/devise.pt-BR.yml b/config/locales/devise.pt-BR.yml
index 8f504362de..3a1a2d90ca 100644
--- a/config/locales/devise.pt-BR.yml
+++ b/config/locales/devise.pt-BR.yml
@@ -14,7 +14,7 @@ pt-BR:
not_found_in_database: "%{authentication_keys} ou senha inválida."
omniauth_user_creation_failure: Erro ao criar uma conta para esta identidade.
pending: Sua conta está sendo revisada.
- timeout: Sua sessão expirou. Faça ‘login’ novamente para continuar.
+ timeout: Sua sessão expirou. Por favor, entre novamente para continuar.
unauthenticated: Você precisa entrar ou criar uma conta antes de continuar.
unconfirmed: Você precisa confirmar o seu endereço de e-mail antes de continuar.
mailer:
@@ -48,12 +48,12 @@ pt-BR:
subject: 'Mastodon: Instruções para alterar senha'
title: Redefinir senha
two_factor_disabled:
- explanation: O ‘login’ agora é possível usando apenas o endereço eletrônico e senha.
+ explanation: Agora você pode entrar usando apenas seu e-mail e senha.
subject: 'Mastodon: Autenticação de dois fatores desativada'
subtitle: A autenticação de dois fatores foi desativada.
title: 2FA desativada
two_factor_enabled:
- explanation: Será necessário um código gerado pelo aplicativo de autenticação TOTP para fazer login.
+ explanation: Um código de autenticação de dois fatores será necessário para entrar em sua conta.
subject: 'Mastodon: Autenticação de dois fatores ativada'
subtitle: A autenticação de dois fatores foi ativada para sua conta.
title: 2FA ativada
@@ -75,11 +75,11 @@ pt-BR:
title: Uma das suas chaves de segurança foi excluída
webauthn_disabled:
explanation: A autenticação por chaves de segurança foi desativada para sua conta.
- extra: Agora você pode fazer login usando apenas o código gerado pelo aplicativo de autenticação TOTP.
+ extra: Agora você pode entrar usando apenas o código de autenticação de dois fatores.
subject: 'Mastodon: Autenticação por chaves de segurança desativada'
title: Chaves de segurança desativadas
webauthn_enabled:
- explanation: A autenticação por chave de segurança foi ativada para sua conta.
+ explanation: A autenticação por chave de segurança foi ativada.
extra: Sua chave de segurança agora pode ser usada para ‘login’.
subject: 'Mastodon: Autenticação por chaves de segurança ativada'
title: Chaves de segurança ativadas
diff --git a/config/locales/devise.pt-PT.yml b/config/locales/devise.pt-PT.yml
index edfb798509..5a1defba3a 100644
--- a/config/locales/devise.pt-PT.yml
+++ b/config/locales/devise.pt-PT.yml
@@ -2,21 +2,21 @@
pt-PT:
devise:
confirmations:
- confirmed: O seu endereço de e-mail foi corretamente confirmado.
- send_instructions: Irá receber um e-mail com instruções sobre como confirmar o seu endereço de e-mail dentro de alguns minutos. Verifique a sua pasta de spam se não recebeu este e-mail.
- send_paranoid_instructions: Se o seu endereço de e-mail existir na nossa base de dados, receberá um e-mail com instruções sobre como confirmar o seu endereço de e-mail dentro de alguns minutos. Verifique a sua pasta de spam se não recebeu este e-mail.
+ confirmed: O teu endereço de e-mail foi confirmado com sucesso.
+ send_instructions: Vais receber um e-mail com as instruções para confirmar o teu endereço de e-mail dentro de alguns minutos. Verifica na caixa de spam se não recebeste o e-mail.
+ send_paranoid_instructions: Se o teu endereço de e-mail já existir na nossa base de dados, vais receber um e-mail com as instruções de confirmação dentro de alguns minutos. Verifica na caixa de spam se não recebeste o e-mail.
failure:
- already_authenticated: Já tem sessão iniciada.
- inactive: A sua conta ainda não está ativada.
+ already_authenticated: Já iniciaste a sessão.
+ inactive: A tua conta ainda não está ativada.
invalid: "%{authentication_keys} ou palavra-passe inválida."
- last_attempt: Tem só mais uma tentativa antes da sua conta ser bloqueada.
- locked: A sua conta está bloqueada.
+ last_attempt: Tens mais uma tentativa antes de a tua conta ser bloqueada.
+ locked: A tua conta está bloqueada.
not_found_in_database: "%{authentication_keys} ou palavra-passe inválida."
omniauth_user_creation_failure: Erro ao criar uma conta para esta identidade.
- pending: A sua conta está ainda a aguardar revisão.
- timeout: A sua sessão expirou. Inicie sessão novamente para continuar.
- unauthenticated: É necessário iniciar sessão ou registar-se antes de continuar.
- unconfirmed: Tem de confirmar o seu endereço de e-mail antes de continuar.
+ pending: A tua conta está ainda a aguardar revisão.
+ timeout: A tua sessão expirou. Inicia a sessão novamente para continuar.
+ unauthenticated: Precisas de entrar na tua conta ou de te registares antes de continuar.
+ unconfirmed: Tens de confirmar o teu endereço de e-mail antes de continuar.
mailer:
confirmation_instructions:
action: Verificar o endereço de e-mail
@@ -27,93 +27,93 @@ pt-PT:
subject: 'Mastodon: instruções de confirmação para %{instance}'
title: Verificar o endereço de e-mail
email_changed:
- explanation: 'O e-mail associado à sua conta será alterado para:'
- extra: Se não alterou o seu e-mail, é possível que alguém tenha conseguido aceder à sua conta. Por favor altere a sua palavra-passe imediatamente ou entre em contacto com um administrador do servidor se tiver ficado sem acesso à sua conta.
+ explanation: 'O e-mail associado à tua conta será alterado para:'
+ extra: Se não alteraste o seu e-mail, é possível que alguém tenha conseguido aceder à tua conta. Por favor altera a tua palavra-passe imediatamente ou entra em contacto com um administrador do servidor se tiveres ficado sem acesso à tua conta.
subject: 'Mastodon: e-mail alterado'
title: Novo endereço de e-mail
password_change:
- explanation: A palavra-passe da sua conta foi alterada.
- extra: Se não alterou a sua palavra-passe, é possível que alguém tenha conseguido aceder à sua conta. Por favor altere a sua palavra-passe imediatamente ou entre em contacto com um administrador do servidor se tiver ficado sem acesso à sua conta.
+ explanation: A palavra-passe da tua conta foi alterada.
+ extra: Se não alteraste a tua palavra-passe, é possível que alguém tenha conseguido aceder à tua conta. Por favor altera a tua palavra-passe imediatamente ou entra em contacto com um administrador do servidor se tiveres ficado sem acesso à tua conta.
subject: 'Mastodon: palavra-passe alterada'
title: Palavra-passe alterada
reconfirmation_instructions:
- explanation: Confirme o seu novo endereço para alterar o e-mail.
- extra: Se esta alteração não foi iniciada por si, ignore este e-mail. O endereço de e-mail da conta Mastodon não será alterado até aceder à hiperligação acima.
+ explanation: Confirma o teu novo endereço para alterar o e-mail.
+ extra: Se esta alteração não foi iniciada por ti, ignora este e-mail. O endereço de e-mail da conta Mastodon não será alterado até acederes à hiperligação acima.
subject: 'Mastodon: confirmação de e-mail para %{instance}'
title: Validar o endereço de e-mail
reset_password_instructions:
action: Alterar palavra-passe
- explanation: Solicitou uma nova palavra-passe para a sua conta.
- extra: Se não solicitou esta alteração, ignore este e-mail. A sua palavra-passe não será alterada até aceder à hiperligação acima e criar uma nova.
+ explanation: Pediste a alteração da palavra-passe da tua conta.
+ extra: Se não fizeste este pedido, por favor ignora este e-mail. A tua palavra-passe não irá mudar se não acederes à hiperligação acima e criares uma nova.
subject: 'Mastodon: instruções para redefinir a palavra-passe'
title: Solicitar nova palavra-passe
two_factor_disabled:
explanation: O início de sessão é agora possível utilizando apenas o endereço de e-mail e a palavra-passe.
- subject: 'Mastodon: autenticação de duas etapas desativada'
- subtitle: A autenticação de dois fatores foi desativada para a sua conta.
- title: 2FA desativado
+ subject: 'Mastodon: autenticação de dois fatores desativada'
+ subtitle: A autenticação de dois fatores foi desativada para a tua conta.
+ title: 2FA desativada
two_factor_enabled:
explanation: Para iniciar sessão, será necessário um token gerado pela aplicação TOTP emparelhada.
- subject: 'Mastodon: autenticação em duas etapas ativada'
- subtitle: A autenticação de dois fatores foi ativada para a sua conta.
+ subject: 'Mastodon: autenticação de dois fatores ativada'
+ subtitle: A autenticação de dois fatores foi ativada para a tua conta.
title: 2FA ativado
two_factor_recovery_codes_changed:
explanation: Os códigos de recuperação anteriores foram invalidados e foram gerados novos códigos.
- subject: 'Mastodon: gerados novos códigos de recuperação em duas etapas'
+ subject: 'Mastodon: foram gerados novos códigos de recuperação de dois fatores'
subtitle: Os códigos de recuperação anteriores foram invalidados e foram gerados novos códigos.
title: Códigos de recuperação 2FA alterados
unlock_instructions:
subject: 'Mastodon: instruções para desbloquear'
webauthn_credential:
added:
- explanation: A seguinte chave de segurança foi adicionada à sua conta
+ explanation: A seguinte chave de segurança foi adicionada à tua conta
subject: 'Mastodon: nova chave de segurança'
title: Foi adicionada uma nova chave de segurança
deleted:
explanation: A seguinte chave de segurança foi eliminada da sua conta
subject: 'Mastodon: chave de segurança eliminada'
- title: Uma das suas chaves de segurança foi eliminada
+ title: Uma das tuas chaves de segurança foi eliminada
webauthn_disabled:
- explanation: A autenticação com chaves de segurança foi desativada para sua conta.
+ explanation: A autenticação com chaves de segurança foi desativada para a tua conta.
extra: O início de sessão é agora possível utilizando apenas o token gerado pela aplicação TOTP emparelhada.
subject: 'Mastodon: autenticação com chave de segurança desativada'
title: Chaves de segurança desativadas
webauthn_enabled:
- explanation: A autenticação por chave de segurança foi ativada para a sua conta.
- extra: A sua chave de segurança pode agora ser utilizada para iniciar sessão.
+ explanation: A autenticação por chave de segurança foi ativada para a tua conta.
+ extra: A tua chave de segurança pode agora ser utilizada para iniciar a sessão.
subject: 'Mastodon: autenticação com chave de segurança ativada'
title: Chaves de segurança ativadas
omniauth_callbacks:
failure: Não foi possível autenticar %{kind} porque "%{reason}".
- success: Autenticado correctamente na conta %{kind}.
+ success: Autenticado corretamente na conta %{kind}.
passwords:
- no_token: Não pode aceder a esta página se não vier através da hiperligação enviada por e-mail para alteração da sua palavra-passe. Se de facto usou essa hiperligação para chegar até aqui, verifique se usou o endereço URL completo.
- send_instructions: Se o seu endereço de e-mail existir na nossa base de dados, receberá uma hiperligação de recuperação da palavra-passe no seu endereço de e-mail dentro de alguns minutos. Verifique a sua pasta de spam se não recebeu esta mensagem de correio eletrónico.
- send_paranoid_instructions: Se o seu endereço de e-mail existir na nossa base de dados, receberá uma hiperligação de recuperação da palavra-passe no seu endereço de e-mail dentro de alguns minutos. Verifique a sua pasta de spam se não recebeu esta mensagem de correio eletrónico.
- updated: A sua palavra-passe foi alterada com sucesso. Está agora autenticado.
+ no_token: Não podes aceder a esta página se não vieres através da hiperligação enviada por e-mail para alteração da tua palavra-passe. Se de facto usaste essa hiperligação para chegar até aqui, verifica se usaste o endereço URL completo.
+ send_instructions: Se o teu endereço de e-mail existir na nossa base de dados, receberás uma hiperligação de recuperação da palavra-passe no teu endereço de e-mail dentro de alguns minutos. Verifica a tua pasta de spam se não recebeste esta mensagem de correio eletrónico.
+ send_paranoid_instructions: Se o teu endereço de e-mail existir na nossa base de dados, receberás uma hiperligação de recuperação da palavra-passe no teu endereço de e-mail dentro de alguns minutos. Verifica a tua pasta de spam se não recebeste esta mensagem de correio eletrónico.
+ updated: A tua palavra-passe foi alterada. Estás agora autenticado na tua conta.
updated_not_active: A tua palavra-passe foi alterada.
registrations:
- destroyed: Adeus! A sua conta foi cancelada com sucesso. Esperamos voltar a vê-lo em breve.
+ destroyed: Adeus! A tua conta foi cancelada. Esperamos ver-te em breve.
signed_up: Bem-vindo! A sua conta foi registada com sucesso.
signed_up_but_inactive: Registou-se com sucesso. No entanto, não foi possível iniciar sessão porque a sua conta ainda não está ativada.
signed_up_but_locked: Registou-se com sucesso. No entanto, não foi possível iniciar sessão porque a sua conta está bloqueada.
signed_up_but_pending: Foi enviada uma mensagem com uma hiperligação de confirmação para o seu endereço de e-mail. Depois de clicar na hiperligação, analisaremos a sua candidatura. Será notificado se for aprovado.
signed_up_but_unconfirmed: Foi enviada para o seu endereço de e-mail uma mensagem com uma hiperligação de confirmação. Siga a hiperligação para ativar a sua conta. Verifique a sua pasta de spam se não recebeu esta mensagem de e-mail.
- update_needs_confirmation: Atualizou a sua conta com sucesso, mas temos de verificar o seu novo endereço de e-mail. Verifique o seu e-mail e siga a hiperligação de confirmação para confirmar o seu novo endereço de e-mail. Verifique a sua pasta de spam se não recebeu esta mensagem de correio eletrónico.
- updated: A sua conta foi corretamente atualizada.
+ update_needs_confirmation: Atualizaste a tua conta com sucesso, mas temos de verificar o teu novo endereço de e-mail. Verifica o teu e-mail e segue a hiperligação de confirmação para confirmares o teu novo endereço de e-mail. Verifica a tua pasta de spam se não recebeste esta mensagem de correio eletrónico.
+ updated: A tua conta foi corretamente atualizada.
sessions:
already_signed_out: Sessão encerrada.
signed_in: Sessão iniciada.
signed_out: Sessão encerrada.
unlocks:
- send_instructions: Receberá um e-mail com instruções sobre como desbloquear a sua conta dentro de alguns minutos. Verifique a sua pasta de spam se não recebeu este e-mail.
- send_paranoid_instructions: Se a sua conta existir, receberá um e-mail com instruções sobre como a desbloquear dentro de alguns minutos. Verifique a sua pasta de spam se não recebeu este e-mail.
- unlocked: A sua conta foi desbloqueada com sucesso. Inicie sessão para continuar.
+ send_instructions: Vais receber um email com instruções para desbloquear a tua conta dentro de alguns minutos.
+ send_paranoid_instructions: Se a sua conta existir, receberás um e-mail com instruções sobre como a desbloquear dentro de alguns minutos. Verifica a tua pasta de spam se não recebeste este e-mail.
+ unlocked: A tua conta foi desbloqueada com sucesso. Inicia a sessão para continuar.
errors:
messages:
- already_confirmed: já confirmado, por favor tente iniciar sessão
- confirmation_period_expired: tem de ser confirmado dentro de %{period}, por favor tente outra vez
- expired: expirou, por favor tente outra vez
+ already_confirmed: já foi confirmado, por favor tenta iniciar a sessão
+ confirmation_period_expired: tem de ser confirmado dentro de %{period}, por favor tenta outra vez
+ expired: expirou, por favor tenta outra vez
not_found: não encontrado
not_locked: não estava bloqueada
not_saved:
diff --git a/config/locales/devise.tok.yml b/config/locales/devise.tok.yml
index d15ecd21b2..0b21d839f5 100644
--- a/config/locales/devise.tok.yml
+++ b/config/locales/devise.tok.yml
@@ -1 +1,11 @@
+---
tok:
+ devise:
+ confirmations:
+ confirmed: sina lon e nimi ilo sina pi pana lipu.
+ failure:
+ already_authenticated: sina lon sijelo a.
+ inactive: sijelo sina li open ala ken.
+ locked: sijelo sina li pini ken.
+ pending: jan lawa li awen alasa sona e pona sina.
+ timeout: ilo li pini sona e sina. o kama sin lon sijelo.
diff --git a/config/locales/devise.tt.yml b/config/locales/devise.tt.yml
index 8757bcc033..4b47757112 100644
--- a/config/locales/devise.tt.yml
+++ b/config/locales/devise.tt.yml
@@ -3,7 +3,19 @@ tt:
devise:
confirmations:
confirmed: Сезнең э. почта адресыгыз уңышлы расланган.
+ failure:
+ already_authenticated: Сез кердегез инде.
+ inactive: Сезнең аккаунтыгыз әле активламаган.
+ invalid: "%{authentication_keys} яки серсүз дөрес кертелмәгән."
+ locked: Сезнең хисапъязмагыз блокланган.
+ not_found_in_database: "%{authentication_keys} яки серсүз дөрес кертелмәгән."
mailer:
+ confirmation_instructions:
+ action: Email адресын расла
+ action_with_app: Расла һәм %{app} эченә кайт
+ title: Email адресын раслагыз
+ email_changed:
+ explanation: 'Сезнең аккаунтыгызның email адресы моңа үзгәртеләчәк:'
reset_password_instructions:
action: Серсүзне үзгәртү
title: Серсүзне алыштыру
diff --git a/config/locales/devise.zh-CN.yml b/config/locales/devise.zh-CN.yml
index 86e78c1b18..5c14d3c571 100644
--- a/config/locales/devise.zh-CN.yml
+++ b/config/locales/devise.zh-CN.yml
@@ -7,12 +7,12 @@ zh-CN:
send_paranoid_instructions: 如果你的邮箱地址存在于我们的数据库中，你将在几分钟内收到一封邮件，内含如何验证邮箱地址的指引。如果你没有收到这封邮件，请检查你的垃圾邮件文件夹。
failure:
already_authenticated: 你已登录。
- inactive: 你还没有激活账户。
+ inactive: 你还没有激活账号。
invalid: "%{authentication_keys} 无效或密码错误。"
- last_attempt: 你只有最后一次尝试机会，若未通过，帐号将被锁定。
- locked: 你的账户已被锁定。
+ last_attempt: 你只有最后一次尝试机会，若未通过，账号将被锁定。
+ locked: 你的账号已被锁定。
not_found_in_database: "%{authentication_keys}或密码错误。"
- omniauth_user_creation_failure: 为此身份创建账户时出错。
+ omniauth_user_creation_failure: 为此身份创建账号时出错。
pending: 你的账号仍在审核中。
timeout: 你的会话已过期。请重新登录再继续操作。
unauthenticated: 继续操作前请注册或者登录。
@@ -23,39 +23,39 @@ zh-CN:
action_with_app: 确认并返回%{app}
explanation: 你在 %{host} 上使用此电子邮箱地址创建了一个账号。点击下面的链接即可激活账号。如果你没有创建账号，请忽略此邮件。
explanation_when_pending: 你用这个邮箱申请了在 %{host} 注册。在确认邮箱地址之后，我们会审核你的申请。在此之前，你不能登录。如果你的申请被驳回，你的数据会被移除，因此你无需再采取任何行动。如果申请人不是你，请忽略这封邮件。
- extra_html: 请记得阅读本实例的相关规定和我们的使用条款。
+ extra_html: 请记得阅读本实例的相关规定和我们的服务条款。
subject: Mastodon：来自 %{instance} 的确认指引
title: 验证邮箱地址
email_changed:
explanation: 你的账号的邮箱地址将变更为：
- extra: 如果你并没有请求更改你的邮箱地址，则他人很有可能已经入侵你的账户。请立即更改你的密码，或者，如果你已经无法访问你的账户，请联系服务器管理员请求协助。
+ extra: 如果你并没有请求更改你的邮箱地址，则他人很有可能已经入侵你的账号。请立即更改你的密码，或者，如果你已经无法访问你的账号，请联系服务器管理员请求协助。
subject: Mastodon：邮箱地址已被更改
title: 新邮箱地址
password_change:
- explanation: 你的账户密码已更改。
- extra: 如果你并没有申请更改密码，那似乎有人已经入侵你的帐户。请立即更改你的密码；如果你已经无法访问你的帐户，请联系服务器的管理员获取帮助。
+ explanation: 你的账号密码已更改。
+ extra: 如果你并没有申请更改密码，那似乎有人已经入侵你的账号。请立即更改你的密码；如果你已经无法访问你的账号，请联系服务器的管理员获取帮助。
subject: Mastodon：密码已被更改
title: 密码已被重置
reconfirmation_instructions:
explanation: 点击下面的链接来确认你的新邮箱地址。
- extra: 如果你并没有请求本次更改，请忽略此邮件。Mastodon 账户的邮箱地址只有在你点击上面的链接后才会更改。
+ extra: 如果你并没有请求本次更改，请忽略此邮件。Mastodon 账号的邮箱地址只有在你点击上面的链接后才会更改。
subject: Mastodon：确认 %{instance} 电子邮箱地址
title: 验证邮箱地址
reset_password_instructions:
action: 更改密码
- explanation: 点击下面的链接来更改账户的密码。
+ explanation: 点击下面的链接来更改账号的密码。
extra: 如果你并没有请求本次变更，请忽略此邮件。你的密码只有在你点击上面的链接并输入新密码后才会更改。
subject: Mastodon：重置密码说明
title: 重置密码
two_factor_disabled:
explanation: 目前只能通过邮箱地址和密码登录。
subject: Mastodon：双因素认证已禁用
- subtitle: 你账户的双因素认证已被停用。
+ subtitle: 你账号的双因素认证已被停用。
title: 双因素认证已停用
two_factor_enabled:
explanation: 登录时需要输入先前配对好的TOTP应用生成的令牌。
subject: Mastodon：双因素认证已启用
- subtitle: 你账户的双因素认证已被启用。
+ subtitle: 你账号的双因素认证已被启用。
title: 双因素认证已启用
two_factor_recovery_codes_changed:
explanation: 新恢复码已生成，同时旧恢复码已失效。
@@ -63,23 +63,23 @@ zh-CN:
subtitle: 新恢复码已生成，同时旧恢复码已失效。
title: 双因素认证恢复码已更改
unlock_instructions:
- subject: Mastodon：账户解锁信息
+ subject: Mastodon：账号解锁信息
webauthn_credential:
added:
- explanation: 以下安全密钥已添加到你的帐户
+ explanation: 以下安全密钥已添加到你的账号
subject: Mastodon：新的安全密钥
title: 已添加一个新的安全密钥
deleted:
- explanation: 以下安全密钥已从你的账户中删除
+ explanation: 以下安全密钥已从你的账号中删除
subject: Mastodon：安全密钥已删除
title: 你的安全密钥之一已被删除
webauthn_disabled:
- explanation: 你账户的安全密钥身份认证已被停用。
+ explanation: 你账号的安全密钥身份认证已被停用。
extra: 目前只能用先前配对的TOTP应用生成的令牌登录。
subject: Mastodon：安全密钥认证已禁用
title: 安全密钥已禁用
webauthn_enabled:
- explanation: 你账户的安全密钥身份认证已被启用。
+ explanation: 你账号的安全密钥身份认证已被启用。
extra: 你的安全密钥现在可用于登录。
subject: Mastodon：安全密钥认证已启用
title: 已启用安全密钥
@@ -93,22 +93,22 @@ zh-CN:
updated: 你的密码已成功修改，现在你已登录。
updated_not_active: 你的密码已修改成功。
registrations:
- destroyed: 再见！你的账户已成功注销。我们希望很快可以再见到你。
+ destroyed: 再见！你的账号已成功注销。我们希望很快可以再见到你。
signed_up: 欢迎！你已成功注册。
- signed_up_but_inactive: 你已成功注册，但我们无法让你登录，因为你的账户还没有激活。
- signed_up_but_locked: 你已成功注册，但我们无法让你登录，因为你的账户已被锁定。
+ signed_up_but_inactive: 你已成功注册，但我们无法让你登录，因为你的账号还没有激活。
+ signed_up_but_locked: 你已成功注册，但由于你的账户已被锁定，我们无法让你登录。
signed_up_but_pending: 一条带有确认链接的邮件已经发送到你的邮箱地址。在你点击该链接后，我们将会审核你的申请。如果申请被批准，你将收到通知。
- signed_up_but_unconfirmed: 一封带有确认链接的邮件已经发送至你的邮箱，请点击邮件中的链接以激活你的账户。如果没有，请检查你的垃圾邮件。
+ signed_up_but_unconfirmed: 一封带有确认链接的邮件已经发送至你的邮箱，请点击邮件中的链接以激活你的账号。如果没有，请检查你的垃圾邮件。
update_needs_confirmation: 账号信息更新成功，但我们需要验证你的新邮箱地址，请点击邮件中的链接以确认。如果没有收到邮件，请检查你的垃圾邮件文件夹。
- updated: 账户资料更新成功。
+ updated: 账号资料更新成功。
sessions:
already_signed_out: 已成功退出登录。
signed_in: 已成功登录。
signed_out: 已成功退出登录。
unlocks:
- send_instructions: 几分钟后，你将收到一封解锁账户的邮件。如果没有，请检查你的垃圾邮箱。
+ send_instructions: 几分钟后，你将收到一封解锁账号的邮件。如果没有，请检查你的垃圾邮箱。
send_paranoid_instructions: 如果你的账号存在，你将会在几分钟内收到一封指引你如何解锁账号的邮件。如果你没有收到这封邮件，请检查你邮箱的垃圾箱。
- unlocked: 你的账户已成功解锁。登录以继续。
+ unlocked: 你的账号已成功解锁。登录以继续。
errors:
messages:
already_confirmed: 已经成功确认，请尝试登录
diff --git a/config/locales/doorkeeper.ast.yml b/config/locales/doorkeeper.ast.yml
index c9c831f7f5..3df18d6f7a 100644
--- a/config/locales/doorkeeper.ast.yml
+++ b/config/locales/doorkeeper.ast.yml
@@ -50,7 +50,9 @@ ast:
confirmations:
revoke: "¿De xuru que quies facer esta aición?"
index:
+ authorized_at: 'Data d''autorización: %{date}'
description_html: Estes son les aplicaciones que puen acceder a la cuenta cola API. Si equí hai aplicaciones que nun conoces o hai dalguna aplicación que nun funciona correutamente, pues revocar el so accesu.
+ last_used_at: 'Últimu usu: %{date}'
never_used: Enxamás s'usó
scopes: Permisos
title: Les aplicaciones qu'autoricesti
diff --git a/config/locales/doorkeeper.az.yml b/config/locales/doorkeeper.az.yml
new file mode 100644
index 0000000000..e9ba86bc79
--- /dev/null
+++ b/config/locales/doorkeeper.az.yml
@@ -0,0 +1 @@
+az:
diff --git a/config/locales/doorkeeper.cs.yml b/config/locales/doorkeeper.cs.yml
index 882be66ee0..1ee73c2cb9 100644
--- a/config/locales/doorkeeper.cs.yml
+++ b/config/locales/doorkeeper.cs.yml
@@ -60,6 +60,7 @@ cs:
error:
title: Vyskytla se chyba
new:
+ prompt_html: "%{client_name} by chtěl oprávnění k přístupu k vašemu účtu. Schvalte tuto žádost pouze pokud rozpoznáte a důvěřujete tomuto zdroji."
review_permissions: Zkontrolujte oprávnění
title: Je vyžadována autorizace
show:
diff --git a/config/locales/doorkeeper.da.yml b/config/locales/doorkeeper.da.yml
index 7ac16e0012..a10bee34df 100644
--- a/config/locales/doorkeeper.da.yml
+++ b/config/locales/doorkeeper.da.yml
@@ -130,11 +130,11 @@ da:
crypto: Ende-til-ende kryptering
favourites: Favoritter
filters: Filtre
- follow: Følger, Tavsgør og Blokerer
+ follow: Fulgte, skjjulte og blokerede kontoer
follows: Følger
lists: Lister
media: Medievedhæftninger
- mutes: Tavsgørelser
+ mutes: Skjulte kontoer
notifications: Notifikationer
profile: Din Mastodon-profil
push: Push-notifikationer
@@ -177,7 +177,7 @@ da:
read:filters: se dine filtre
read:follows: se dine følger
read:lists: se dine lister
- read:mutes: se dine tavsgørelser
+ read:mutes: se dine skjulte kontoer
read:notifications: se dine notifikationer
read:reports: se dine anmeldelser
read:search: søg på dine vegne
@@ -186,13 +186,13 @@ da:
write:accounts: ændre din profil
write:blocks: blokere konti og domæner
write:bookmarks: bogmærke indlæg
- write:conversations: tavsgøre og slette konversationer
+ write:conversations: skjul og slet samtaler
write:favourites: favoritmarkere indlæg
write:filters: oprette filtre
write:follows: følge personer
write:lists: oprette lister
write:media: uploade mediefiler
- write:mutes: tavsgøre personer og konversationer
+ write:mutes: skjul personer og samtaler
write:notifications: rydde dine notifikationer
write:reports: anmelde personer
write:statuses: udgive indlæg
diff --git a/config/locales/doorkeeper.el.yml b/config/locales/doorkeeper.el.yml
index 59877b6bd0..984eff8871 100644
--- a/config/locales/doorkeeper.el.yml
+++ b/config/locales/doorkeeper.el.yml
@@ -60,6 +60,7 @@ el:
error:
title: Εμφανίστηκε σφάλμα
new:
+ prompt_html: Το %{client_name} επιθυμεί το δικαίωμα πρόσβασης στον λογαριασμό σας. Εγκρίνετε αυτό το αίτημα μόνο αν αναγνωρίζετε και εμπιστεύεστε αυτήν την πηγή.
review_permissions: Ανασκόπηση δικαιωμάτων
title: Απαιτείται έγκριση
show:
diff --git a/config/locales/doorkeeper.eo.yml b/config/locales/doorkeeper.eo.yml
index 12e120f8be..ede1ef815e 100644
--- a/config/locales/doorkeeper.eo.yml
+++ b/config/locales/doorkeeper.eo.yml
@@ -60,6 +60,7 @@ eo:
error:
title: Eraro okazis
new:
+ prompt_html: "%{client_name} ŝatus permeson aliri vian konton. Nur aprobu ĉi tiun peton se vi rekonas kaj fidas ĉi tiun fonton."
review_permissions: Revizu permesojn
title: Rajtigo bezonata
show:
@@ -82,6 +83,7 @@ eo:
access_denied: La posedanto de la rimedo aŭ de la rajtiga servilo rifuzis vian peton.
credential_flow_not_configured: La sendado de la identigiloj de la posedanto de la rimedo malsukcesis ĉar Doorkeeper.configure.resource_owner_from_credentials ne estis agordita.
invalid_client: Klienta aŭtentigo malsukcesa pro nekonata kliento, neniu klienta aŭtentigo inkluzivita, aŭ nesubtenata aŭtentiga metodo.
+ invalid_code_challenge_method: La koda defia metodo devas esti S256, ebenaĵo estas nesubtenata.
invalid_grant: La rajtiga konsento ne estas valida, ne plu estas valida, estis forigita, ne kongruas kun la plusenda URI uzita en la aŭtentiga peto, aŭ estis sendita al alia kliento.
invalid_redirect_uri: La plusenda URI uzita ne estas valida.
invalid_request:
@@ -134,6 +136,7 @@ eo:
media: Plurmediaj aldonaĵoj
mutes: Silentigitaj
notifications: Sciigoj
+ profile: Via Mastodon-profilo
push: Puŝsciigoj
reports: Raportoj
search: Serĉi
@@ -164,6 +167,7 @@ eo:
admin:write:reports: plenumi agojn de kontrolo sur signaloj
crypto: uzi fin-al-finan ĉifradon
follow: ŝanĝi rilatojn al aliaj kontoj
+ profile: legu nur la profilinformojn de via konto
push: ricevi viajn puŝ-sciigojn
read: legi ĉiujn datumojn de via konto
read:accounts: vidi la informojn de la kontoj
@@ -187,7 +191,7 @@ eo:
write:filters: krei filtrilojn
write:follows: sekvi homojn
write:lists: krei listojn
- write:media: alŝuti plurmediojn
+ write:media: alŝuti aŭdovidaĵojn
write:mutes: silentigi homojn kaj konversaciojn
write:notifications: forigi viajn sciigojn
write:reports: signali aliajn homojn
diff --git a/config/locales/doorkeeper.es-MX.yml b/config/locales/doorkeeper.es-MX.yml
index e119d71f4e..eaf1bf69fb 100644
--- a/config/locales/doorkeeper.es-MX.yml
+++ b/config/locales/doorkeeper.es-MX.yml
@@ -60,7 +60,7 @@ es-MX:
error:
title: Ha ocurrido un error
new:
- prompt_html: A %{client_name} le gustaría obtener permiso para acceder a tu cuenta. Aprueba esta solicitud solo si reconoces y confías en esta fuente.
+ prompt_html: "%{client_name} desea obtener permiso para acceder a tu cuenta. Aprueba esta solicitud solamente si reconoces y confías en esta fuente."
review_permissions: Revisar permisos
title: Se requiere autorización
show:
diff --git a/config/locales/doorkeeper.et.yml b/config/locales/doorkeeper.et.yml
index ebfaf5c710..b21afa9a79 100644
--- a/config/locales/doorkeeper.et.yml
+++ b/config/locales/doorkeeper.et.yml
@@ -60,6 +60,7 @@ et:
error:
title: Ilmnes viga
new:
+ prompt_html: "%{client_name} soovib saada ligipääsu su kontole. Kinnita see taotlus ainult siis, kui sa tunned ja usaldad seda allikat."
review_permissions: Lubade ülevaade
title: Autoriseerimine vajalik
show:
@@ -131,7 +132,7 @@ et:
filters: Filtrid
follow: Jälgitavad, Vaigistatud ja Blokeeritud
follows: Jälgimised
- lists: Nimekirjad
+ lists: Loetelud
media: Lisatud meedia
mutes: Vaigistused
notifications: Teavitused
@@ -175,7 +176,7 @@ et:
read:favourites: näha sinu lemmikuid
read:filters: näha su filtreid
read:follows: näha su jälgimisi
- read:lists: näha su nimekirju
+ read:lists: näha su loetelusid
read:mutes: näha su vaigistusi
read:notifications: näha teateid
read:reports: näha teavitusi
@@ -189,7 +190,7 @@ et:
write:favourites: lisada postitusi lemmikuks
write:filters: luua filtreid
write:follows: jälgida inimesi
- write:lists: luua nimekirju
+ write:lists: luua loetelusid
write:media: üles laadida meediafaile
write:mutes: vaigista inimesi ja vestluseid
write:notifications: tühjendada teateid
diff --git a/config/locales/doorkeeper.eu.yml b/config/locales/doorkeeper.eu.yml
index a09fe42f40..7b25004385 100644
--- a/config/locales/doorkeeper.eu.yml
+++ b/config/locales/doorkeeper.eu.yml
@@ -60,6 +60,7 @@ eu:
error:
title: Errore bat gertatu da
new:
+ prompt_html: "%{client_name}-(e)k zure kontura sartzeko baimena nahi du. Eskaera hau onartu, iturri hori ezagutu eta harengan konfiantza baduzu"
review_permissions: Berrikusi baimenak
title: Baimena behar da
show:
@@ -134,6 +135,7 @@ eu:
media: Multimedia eranskinak
mutes: Mututzeak
notifications: Jakinarazpenak
+ profile: Zure Mastodon profila
push: Push jakinarazpenak
reports: Salaketak
search: Bilaketak
@@ -164,6 +166,7 @@ eu:
admin:write:reports: salaketetan moderazio ekintzak burutu
crypto: erabili muturretik muturrerako zifraketa
follow: aldatu kontuaren erlazioak
+ profile: irakurri soilik zure kontuaren profileko informazioa
push: jaso push jakinarazpenak
read: irakurri zure kontuko datu guztiak
read:accounts: ikusi kontuaren informazioa
diff --git a/config/locales/doorkeeper.fa.yml b/config/locales/doorkeeper.fa.yml
index 4ff03950b5..e36694dbbb 100644
--- a/config/locales/doorkeeper.fa.yml
+++ b/config/locales/doorkeeper.fa.yml
@@ -60,6 +60,7 @@ fa:
error:
title: خطایی رخ داد
new:
+ prompt_html: "%{client_name} برای دسترسی به حساب شما اجازه میخواهد. فقط در صورتی این درخواست را تأیید کنید که این منبع را بشناسید و به آن اعتماد دارید."
review_permissions: بازبینی اجازهها
title: نیاز به اجازه دادن
show:
@@ -130,7 +131,7 @@ fa:
favourites: برگزیدهها
filters: پالایهها
follow: پیگیری، خموشی و مسدودیها
- follows: پیگرفتگان
+ follows: پیگرفتنها
lists: سیاههها
media: پیوستهای رسانهای
mutes: خموشها
diff --git a/config/locales/doorkeeper.fi.yml b/config/locales/doorkeeper.fi.yml
index 7d44a6a6b9..ddaff5b93a 100644
--- a/config/locales/doorkeeper.fi.yml
+++ b/config/locales/doorkeeper.fi.yml
@@ -130,8 +130,8 @@ fi:
crypto: Päästä päähän -salaus
favourites: Suosikit
filters: Suodattimet
- follow: Seuratut, mykistykset ja estot
- follows: Seuratut
+ follow: Seurattavat, mykistykset ja estot
+ follows: Seurattavat
lists: Listat
media: Medialiitteet
mutes: Mykistykset
@@ -139,7 +139,7 @@ fi:
profile: Mastodon-profiilisi
push: Puskuilmoitukset
reports: Raportit
- search: Hae
+ search: Haku
statuses: Julkaisut
layouts:
admin:
@@ -175,7 +175,7 @@ fi:
read:bookmarks: katso kirjanmerkkejäsi
read:favourites: katso suosikkejasi
read:filters: katso suodattimiasi
- read:follows: katso seurattujasi
+ read:follows: katso seurattaviasi
read:lists: katso listojasi
read:mutes: katso mykistyksiäsi
read:notifications: katso ilmoituksiasi
diff --git a/config/locales/doorkeeper.fr.yml b/config/locales/doorkeeper.fr.yml
index 71c9605d8a..d956225dba 100644
--- a/config/locales/doorkeeper.fr.yml
+++ b/config/locales/doorkeeper.fr.yml
@@ -25,7 +25,7 @@ fr:
edit: Modifier
submit: Envoyer
confirmations:
- destroy: En êtes-vous sûr ?
+ destroy: En êtes-vous certain ?
edit:
title: Modifier l’application
form:
diff --git a/config/locales/doorkeeper.fy.yml b/config/locales/doorkeeper.fy.yml
index 94e67d17a6..180c7e733f 100644
--- a/config/locales/doorkeeper.fy.yml
+++ b/config/locales/doorkeeper.fy.yml
@@ -60,6 +60,7 @@ fy:
error:
title: Der is in flater bard
new:
+ prompt_html: "%{client_name} freget om tagong ta jo account. Keur dit fersyk allinnich goed as jo dizze boarne werkenne en fertrouwe."
review_permissions: Tastimmingen beoardiele
title: Autorisaasje fereaske
show:
diff --git a/config/locales/doorkeeper.gl.yml b/config/locales/doorkeeper.gl.yml
index adee6bd3d3..5d7148b84b 100644
--- a/config/locales/doorkeeper.gl.yml
+++ b/config/locales/doorkeeper.gl.yml
@@ -69,7 +69,7 @@ gl:
buttons:
revoke: Retirar autorización
confirmations:
- revoke: Estás segura?
+ revoke: Tes certeza?
index:
authorized_at: Autorizada o %{date}
description_html: Estas aplicacións poden acceder á túa conta usando a API. Se ves aplicacións que non recoñeces, ou hai comportamentos non consentidos dalgunha delas, podes revogar o acceso.
diff --git a/config/locales/doorkeeper.ia.yml b/config/locales/doorkeeper.ia.yml
index 6bf5e38506..efde9be9c0 100644
--- a/config/locales/doorkeeper.ia.yml
+++ b/config/locales/doorkeeper.ia.yml
@@ -60,6 +60,7 @@ ia:
error:
title: Un error ha occurrite
new:
+ prompt_html: "%{client_name} vole haber le permission de acceder a tu conto. Solmente approba iste requesta si tu recognosce e confide in iste fonte."
review_permissions: Revider permissiones
title: Autorisation necessari
show:
@@ -82,6 +83,7 @@ ia:
access_denied: Le proprietario del ressource o servitor de autorisation ha refusate le requesta.
credential_flow_not_configured: Le processo de credentiales de contrasigno del proprietario del ressource ha fallite perque Doorkeeper.configure.resource_owner_from_credentials non es configurate.
invalid_client: Le authentication del cliente ha fallite perque le cliente es incognite, necun authentication de cliente es includite, o le methodo de authentication non es supportate.
+ invalid_code_challenge_method: Le methodo de defia de codice debe esser S256. Le methodo simple (plain) non es supportate.
invalid_grant: Le concession de autorisation fornite es invalide, expirate, revocate, non corresponde al URI de redirection usate in le requesta de autorisation, o ha essite emittite a un altere cliente.
invalid_redirect_uri: Le URI de redirection includite non es valide.
invalid_request:
diff --git a/config/locales/doorkeeper.ig.yml b/config/locales/doorkeeper.ig.yml
index 7c264f0d73..ef11972aed 100644
--- a/config/locales/doorkeeper.ig.yml
+++ b/config/locales/doorkeeper.ig.yml
@@ -1 +1,11 @@
+---
ig:
+ doorkeeper:
+ grouped_scopes:
+ title:
+ filters: Myọ
+ profile: Profaịlụ Mastọdọnụ gị
+ scopes:
+ read:filters: lelee myọ gị
+ write:accounts: dezie profaịlụ gị
+ write:filters: mepụta myọ
diff --git a/config/locales/doorkeeper.io.yml b/config/locales/doorkeeper.io.yml
index 0384d968be..94efbfc9d7 100644
--- a/config/locales/doorkeeper.io.yml
+++ b/config/locales/doorkeeper.io.yml
@@ -60,6 +60,7 @@ io:
error:
title: Eroro eventis
new:
+ prompt_html: "%{client_name} volas permiso por adirar vua konto."
review_permissions: Kontrolez permisi
title: Yurizo bezonesas
show:
@@ -82,6 +83,7 @@ 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: La kodexchalenjmetodo mustas esar S256.
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:
@@ -123,7 +125,7 @@ io:
admin/reports: Administro di raporti
all: Kompleta aceso a vua Mastodon-konto
blocks: Restriktita
- bookmarks: Libromarki
+ bookmarks: Lektosigni
conversations: Konversi
crypto: Intersequanta chifro
favourites: Favoriziti
@@ -131,9 +133,10 @@ io:
follow: Sequati, silencigati e blokusati
follows: Sequati
lists: Listi
- media: Mediatachaji
+ media: Audvidajaddonaji
mutes: Silencigati
notifications: Avizi
+ profile: Vua Mastodon-profilo
push: Pulsavizi
reports: Raporti
search: Trovez
@@ -148,17 +151,28 @@ io:
scopes:
admin:read: lektez omna informi di la servilo
admin:read:accounts: lektez privata informo di omna konti
+ admin:read:canonical_email_blocks: lektar trublema informo di omna retpostoblokusi
+ admin:read:domain_allows: lektar trublema informo di omna domenpermisi
+ admin:read:domain_blocks: lektar trublema informo di omna domenblokusi
+ admin:read:email_domain_blocks: lektar trublema informo di omna retpostodomenblokusi
+ admin:read:ip_blocks: lektar trublema informo di omna IP-blokusi
admin:read:reports: lektez privata informo di omna raporti e raportizita konti
- admin:write: modifikez omna informi di la servilo
+ admin:write: redaktar omna informi di la servilo
admin:write:accounts: jerez konti
+ admin:write:canonical_email_blocks: agar jeri ad retpostoblokusi
+ admin:write:domain_allows: agar jeri ad domenpermisi
+ admin:write:domain_blocks: agar jeri ad domenblokusi
+ admin:write:email_domain_blocks: agar jeri ad retpostodomenblokusi
+ admin:write:ip_blocks: agar jeri ad IP-blokusi
admin:write:reports: jerez raporti
crypto: uzas intersequanta chifro
follow: follow, block, unblock and unfollow accounts
+ profile: lektar nur profilinformo di vua konto
push: ganez vua pulsavizi
read: read your account's data
read:accounts: videz kontinformo
read:blocks: videz restrikti
- read:bookmarks: videz vua libromarki
+ read:bookmarks: vidar vua lektosigni
read:favourites: videz vua favoriziti
read:filters: videz vua filtrili
read:follows: videz vua sequinti
@@ -169,15 +183,15 @@ io:
read:search: trovez por vu
read:statuses: videz omna posti
write: post on your behalf
- write:accounts: modifikez vua porfilo
+ write:accounts: redaktar vua porfilo
write:blocks: restriktez konti e domeni
- write:bookmarks: libromarkez posti
+ write:bookmarks: lektosignar afishi
write:conversations: silencigez e efacez konversi
write:favourites: favorizita posti
write:filters: kreez filtrili
write:follows: sequez personi
write:lists: kreez listi
- write:media: adchargez mediifaili
+ write:media: adkargar audvidajdoseri
write:mutes: silencigez personi e konversi
write:notifications: efacez vua avizi
write:reports: raportizez altra omni
diff --git a/config/locales/doorkeeper.is.yml b/config/locales/doorkeeper.is.yml
index 05f2415eea..1fabd1b55f 100644
--- a/config/locales/doorkeeper.is.yml
+++ b/config/locales/doorkeeper.is.yml
@@ -60,6 +60,7 @@ is:
error:
title: Villa kom upp
new:
+ prompt_html: "%{client_name} vill fá heimild til að skoða aðganginn þinn. Ekki samþykkja þessa beiðni nema þú þekkir og treystir viðkomandi."
review_permissions: Yfirfara heimildir
title: Auðkenning er nauðsynleg
show:
diff --git a/config/locales/doorkeeper.ja.yml b/config/locales/doorkeeper.ja.yml
index 7cfddf50a1..d44451c746 100644
--- a/config/locales/doorkeeper.ja.yml
+++ b/config/locales/doorkeeper.ja.yml
@@ -60,6 +60,7 @@ ja:
error:
title: エラーが発生しました
new:
+ prompt_html: "%{client_name} があなたのアカウントにアクセスするための許可を求めています。このリクエストを承認するのは、信頼できる相手であると認識している場合のみです。"
review_permissions: アクセス許可を確認
title: 認証が必要です
show:
diff --git a/config/locales/doorkeeper.lv.yml b/config/locales/doorkeeper.lv.yml
index 55e288a9d6..15c1e7692a 100644
--- a/config/locales/doorkeeper.lv.yml
+++ b/config/locales/doorkeeper.lv.yml
@@ -60,6 +60,7 @@ lv:
error:
title: Radās kļūda
new:
+ prompt_html: "%{client_name} vēlas atļauju piekļūt Tavam kontam. Apstiprini šo pieprasījumu tikai tad, ja atpazīsti un uzticies šim avotam!"
review_permissions: Pārskatīt atļaujas
title: Nepieciešama autorizācija
show:
@@ -119,9 +120,9 @@ lv:
write: Tikai rakstīšanas piekļuve
title:
accounts: Konti
- admin/accounts: Kontu administrēšana
+ admin/accounts: Kontu pārvaldīšana
admin/all: Visas administrēšanas funkcijas
- admin/reports: Ziņojumu administrēšana
+ admin/reports: Ziņojumu pārvaldīšana
all: Pilna piekļuve tavam Mastodon kontam
blocks: Bloķētie
bookmarks: Grāmatzīmes
@@ -149,21 +150,21 @@ lv:
title: OAuth nepieciešama autorizācija
scopes:
admin:read: lasīt visus datus uz servera
- admin:read:accounts: lasīt sensitīvu informāciju no visiem kontiem
- admin:read:canonical_email_blocks: lasīt sensitīvu informāciju par visiem kanoniskajiem e-pasta blokiem
- admin:read:domain_allows: lasīt visu domēnu sensitīvo informāciju, ko atļauj
- admin:read:domain_blocks: lasīt sensitīvu informāciju par visiem domēna blokiem
- admin:read:email_domain_blocks: lasīt sensitīvu informāciju par visiem e-pasta domēna blokiem
- admin:read:ip_blocks: lasīt sensitīvu informāciju par visiem IP blokiem
- admin:read:reports: lasīt sensitīvu informāciju no visiem pārskatiem un kontiem, par kuriem ziņots
+ admin:read:accounts: lasīt jūtīgu informāciju no visiem kontiem
+ admin:read:canonical_email_blocks: lasīt jūtīgu informāciju par visiem kanoniskajiem e-pasta blokiem
+ admin:read:domain_allows: lasīt jūtīgu informāciju par visiem atļautajiem domēniem
+ admin:read:domain_blocks: lasīt jūtīgu informāciju par visiem domēna blokiem
+ admin:read:email_domain_blocks: lasīt jūtīgu informāciju par visiem e-pasta domēna blokiem
+ admin:read:ip_blocks: lasīt jūtīgu informāciju par visiem IP blokiem
+ admin:read:reports: lasīt jūtīgu informāciju no visiem pārskatiem un kontiem, par kuriem ziņots
admin:write: modificēt visus datus uz servera
- admin:write:accounts: veikt moderācijas darbības kontos
- admin:write:canonical_email_blocks: veikt regulēšanas darbības kanoniskajos e-pasta blokos
- admin:write:domain_allows: veikt moderēšanas darbības domēna atļaujā
- admin:write:domain_blocks: veikt moderēšanas darbības domēna blokos
- admin:write:email_domain_blocks: veikt moderēšanas darbības e-pasta domēna blokos
- admin:write:ip_blocks: veikt moderēšanas darbības IP blokos
- admin:write:reports: veikt moderācijas darbības pārskatos
+ admin:write:accounts: veikt satura pārraudzības darbības kontos
+ admin:write:canonical_email_blocks: veikt satura pārraudzības darbības kanoniskajos e-pasta blokos
+ admin:write:domain_allows: veikt satura pārraudzības darbības domēna atļaujā
+ admin:write:domain_blocks: veikt satura pārraudzības darbības domēna blokos
+ admin:write:email_domain_blocks: veikt satura pārraudzības darbības e-pasta domēna blokos
+ admin:write:ip_blocks: veikt satura pārraudzības darbības IP blokos
+ admin:write:reports: veikt satura pārraudzības darbības pārskatos
crypto: lieto pilnīgu šifrēšanu
follow: mainīt konta attiecības
profile: lasīt tikai Tava konta profila informāciju
diff --git a/config/locales/doorkeeper.ms.yml b/config/locales/doorkeeper.ms.yml
index b52824e8c3..f89def7b85 100644
--- a/config/locales/doorkeeper.ms.yml
+++ b/config/locales/doorkeeper.ms.yml
@@ -126,7 +126,7 @@ ms:
bookmarks: Penanda buku
conversations: Perbualan
crypto: Penyulitan hujung ke hujung
- favourites: Kegemaran
+ favourites: Sukaan
filters: Penapis
follow: Ikut, Senyap dan Blok
follows: Ikutan
@@ -169,7 +169,7 @@ ms:
read:accounts: lihat maklumat akaun
read:blocks: lihat blok anda
read:bookmarks: lihat penanda halaman anda
- read:favourites: lihat kegemaran anda
+ read:favourites: lihat sukaan anda
read:filters: lihat penapis anda
read:follows: lihat senarai yang anda ikuti
read:lists: lihat senarai anda
@@ -183,7 +183,7 @@ ms:
write:blocks: domain dan akaun blok
write:bookmarks: menandabuku hantaran
write:conversations: senyapkan dan padamkan perbualan
- write:favourites: pos kesukaan
+ write:favourites: hantaran disukai
write:filters: cipta penapis
write:follows: ikut orang
write:lists: cipta senarai
diff --git a/config/locales/doorkeeper.nan.yml b/config/locales/doorkeeper.nan.yml
new file mode 100644
index 0000000000..554d991641
--- /dev/null
+++ b/config/locales/doorkeeper.nan.yml
@@ -0,0 +1,17 @@
+---
+nan:
+ activerecord:
+ attributes:
+ doorkeeper/application:
+ name: 應用程式ê名
+ redirect_uri: 重轉ê URI
+ scopes: 範圍
+ website: 應用程式ê網站
+ errors:
+ models:
+ doorkeeper/application:
+ attributes:
+ redirect_uri:
+ invalid_uri: Tio̍h愛是合規定ê URI。
+ relative_uri: Tio̍h愛是絕對ê URI。
+ secured_uri: Tio̍h愛是HTTPS/SSL URI。
diff --git a/config/locales/doorkeeper.pt-BR.yml b/config/locales/doorkeeper.pt-BR.yml
index 85bf5d60c0..a92819bf68 100644
--- a/config/locales/doorkeeper.pt-BR.yml
+++ b/config/locales/doorkeeper.pt-BR.yml
@@ -61,7 +61,7 @@ pt-BR:
title: Ocorreu um erro
new:
prompt_html: "%{client_name} gostaria de permissão para acessar sua conta. Aprove esta solicitação apenas se você reconhecer e confiar nesta fonte."
- review_permissions: Rever permissões
+ review_permissions: Revisar permissões
title: Autorização necessária
show:
title: Copie este código de autorização e cole no aplicativo.
@@ -130,7 +130,7 @@ pt-BR:
crypto: Criptografia de ponta a ponta
favourites: Favoritos
filters: Filtros
- follow: Seguimentos, Silenciamentos e Bloqueios
+ follow: Seguidos, Silenciados e Bloqueados
follows: Seguidos
lists: Listas
media: Mídias anexadas
@@ -165,7 +165,7 @@ pt-BR:
admin:write:email_domain_blocks: executar ações de moderação em domínios de e-mail bloqueados
admin:write:ip_blocks: executar ações de moderação em IPs bloqueados
admin:write:reports: executar ações de moderação em denúncias
- crypto: usar criptografia de ponta-a-ponta
+ crypto: usar criptografia de ponta a ponta
follow: alterar o relacionamento das contas
profile: ler somente as informações do perfil da sua conta
push: receber notificações push
diff --git a/config/locales/doorkeeper.pt-PT.yml b/config/locales/doorkeeper.pt-PT.yml
index e2ac275335..6285794aa5 100644
--- a/config/locales/doorkeeper.pt-PT.yml
+++ b/config/locales/doorkeeper.pt-PT.yml
@@ -29,21 +29,21 @@ pt-PT:
edit:
title: Editar aplicação
form:
- error: Ups! Verifique que o formulário não tem erros
+ error: Oops! Verifica que o formulário não tem erros
help:
native_redirect_uri: Usar %{native_redirect_uri} para testes locais
redirect_uri: Usar uma linha por URI
- scopes: Separe os âmbitos de aplicação com espaços. Deixe em branco para utilizar os âmbitos de aplicação predefinidos.
+ scopes: Separa os âmbitos de aplicação com espaços. Deixa em branco para utilizar os âmbitos de aplicação predefinidos.
index:
application: Aplicação
callback_url: URL de retorno
delete: Eliminar
- empty: Não tem aplicações.
+ empty: Não tens aplicações.
name: Nome
new: Nova aplicação
scopes: Âmbitos
show: Mostrar
- title: As suas aplicações
+ title: As tuas aplicações
new:
title: Nova aplicação
show:
@@ -60,18 +60,19 @@ pt-PT:
error:
title: Ocorreu um erro
new:
+ prompt_html: "%{client_name} gostaria de obter autorização para aceder à tua conta. Só deves aprovar este pedido se reconheceres e confiares nesta fonte."
review_permissions: Rever permissões
title: Autorização necessária
show:
- title: Copie este código de autorização e cole-o na aplicação.
+ title: Copia este código de autorização e cola-o na aplicação.
authorized_applications:
buttons:
revoke: Revogar
confirmations:
- revoke: Tem a certeza?
+ revoke: Tens a certeza?
index:
authorized_at: Autorizado em %{date}
- description_html: Estas são as aplicações que podem aceder à sua conta utilizando a API. Se houver aplicações que não reconhece aqui, ou se uma aplicação estiver a comportar-se mal, pode revogar o seu acesso.
+ description_html: Estas são as aplicações que podem aceder à tua conta utilizando a API. Se houver aplicações que não reconheces aqui, ou se uma aplicação estiver a dar problemas, podes revogar o seu acesso.
last_used_at: Última utilização em %{date}
never_used: Nunca utilizado
scopes: Permissões
@@ -129,14 +130,14 @@ pt-PT:
crypto: Encriptação ponta a ponta
favourites: Favoritos
filters: Filtros
- follow: A seguir, a silenciar e a bloquear
+ follow: A seguir, a ocultar e a bloquear
follows: Seguidores
lists: Listas
- media: Anexos de media
- mutes: Silenciados
+ media: Anexos multimédia
+ mutes: Ocultados
notifications: Notificações
- profile: O seu perfil Mastodon
- push: Notificações push
+ profile: O teu perfil Mastodon
+ push: Notificações "push"
reports: Denúncias
search: Pesquisar
statuses: Publicações
@@ -150,15 +151,15 @@ pt-PT:
scopes:
admin:read: ler todos os dados no servidor
admin:read:accounts: ler informações sensíveis de todas as contas
- admin:read:canonical_email_blocks: ler informações sensíveis de todos os bloqueios de endereços de e-mail canônicos
- admin:read:domain_allows: ler informações sensíveis de todos os domínios permitios
+ admin:read:canonical_email_blocks: ler informações sensíveis de todos os bloqueios de endereços de e-mail canónicos
+ admin:read:domain_allows: ler informações sensíveis de todos os domínios permitidos
admin:read:domain_blocks: ler informações sensíveis de todos os bloqueios de domínio
admin:read:email_domain_blocks: ler informações sensíveis de todos os bloqueios de domínio de e-mail
admin:read:ip_blocks: ler informações sensíveis de todos os bloqueios de IPs
- admin:read:reports: ler informações sensíveis de todas as denúnicas e contas denunciadas
+ admin:read:reports: ler informações sensíveis de todas as denúncias e contas denunciadas
admin:write: modificar todos os dados no servidor
admin:write:accounts: executar ações de moderação em contas
- admin:write:canonical_email_blocks: executar ações de moderação no bloqueio de endereços de e-mail canônicos
+ admin:write:canonical_email_blocks: executar ações de moderação no bloqueio de endereços de e-mail canónicos
admin:write:domain_allows: executar ações de moderação na permissão de domínios
admin:write:domain_blocks: executar ações de moderação no bloqueio de domínios
admin:write:email_domain_blocks: executar ações de moderação no bloqueio de domínios de e-mail
@@ -166,32 +167,32 @@ pt-PT:
admin:write:reports: executar ações de moderação em denúncias
crypto: usar encriptação ponta a ponta
follow: alterar relações de conta
- profile: ler apenas as informações do perfil da sua conta
- push: receber as suas notificações push
- read: ler todos os dados da sua conta
+ profile: ler apenas as informações do perfil da tua conta
+ push: receber as tuas notificações "push"
+ read: ler todos os dados da tua conta
read:accounts: ver as informações da conta
- read:blocks: ver os seus bloqueios
- read:bookmarks: ver os seus marcadores
- read:favourites: ver os seus favoritos
- read:filters: ver os seus filtros
- read:follows: ver quem você segue
- read:lists: ver as suas listas
- read:mutes: ver os utilizadores que silenciou
- read:notifications: ver as suas notificações
- read:reports: ver as suas denúncias
- read:search: pesquisar em seu nome
+ read:blocks: ver os teus bloqueios
+ read:bookmarks: ver os teus marcadores
+ read:favourites: ver os teus favoritos
+ read:filters: ver os teus filtros
+ read:follows: ver quem segues
+ read:lists: ver as tuas listas
+ read:mutes: ver os utilizadores que ocultaste
+ read:notifications: ver as tuas notificações
+ read:reports: ver as tuas denúncias
+ read:search: pesquisar em teu nome
read:statuses: ver todas as publicações
- write: alterar todos os dados da sua conta
- write:accounts: alterar o seu perfil
+ write: alterar todos os dados da tua conta
+ write:accounts: alterar o teu perfil
write:blocks: bloquear contas e domínios
write:bookmarks: marcar publicações
- write:conversations: silenciar e eliminar conversas
- write:favourites: favoritar publicações
+ write:conversations: ocultar e eliminar conversas
+ write:favourites: assinalar como favoritas
write:filters: criar filtros
write:follows: seguir pessoas
write:lists: criar listas
- write:media: enviar ficheiros de media
- write:mutes: silenciar pessoas e conversas
- write:notifications: limpar as suas notificações
+ write:media: enviar ficheiros multimédia
+ write:mutes: ocultar pessoas e conversas
+ write:notifications: limpar as tuas notificações
write:reports: denunciar outras pessoas
write:statuses: publicar publicações
diff --git a/config/locales/doorkeeper.ro.yml b/config/locales/doorkeeper.ro.yml
index 9c02501eff..08b7c3fa8d 100644
--- a/config/locales/doorkeeper.ro.yml
+++ b/config/locales/doorkeeper.ro.yml
@@ -60,6 +60,7 @@ ro:
error:
title: A apărut o eroare
new:
+ prompt_html: "%{client_name} ar dori să vă acceseze contul. Aprobați această solicitare numai dacă recunoașteți și aveți încredere în această sursă."
review_permissions: Revizuiți permisiunile
title: Autorizare necesară
show:
@@ -82,6 +83,7 @@ ro:
access_denied: Proprietarul de resurse sau serverul de autorizare a refuzat cererea.
credential_flow_not_configured: Fluxul Resurselor de Acreditări Parole a eșuat din cauza faptului că Doorkeeper.configure.resource_owner_from_credentials nu este configurat.
invalid_client: Autentificarea clientului a eșuat din cauza unui client necunoscut, nici o autentificare client inclusă, sau metodă de autentificare nesuportată.
+ invalid_code_challenge_method: Metoda de provocare a codului trebuie să fie S256, simplu nu este acceptată.
invalid_grant: Acordarea autorizației furnizată este invalidă, expirată, revocată, nu corespunde URI-ului de redirecționare folosit în cererea de autorizare, sau a fost eliberat altui client.
invalid_redirect_uri: Uri-ul de redirecționare inclus nu este valid.
invalid_request:
@@ -134,6 +136,7 @@ ro:
media: Atașamente media
mutes: Pus pe silențios
notifications: Notificări
+ profile: Profilul tău Mastodon
push: Notificări push
reports: Rapoarte
search: Căutare
@@ -148,12 +151,23 @@ ro:
scopes:
admin:read: citește toate datele de pe server
admin:read:accounts: citește informații sensibile ale tuturor conturilor
+ admin:read:canonical_email_blocks: citește informații sensibile ale tuturor blocurilor de e-mail canonice
+ admin:read:domain_allows: citește informații sensibile ale tuturor domeniilor permise
+ admin:read:domain_blocks: citește informații sensibile ale tuturor blocurilor de domeniu
+ admin:read:email_domain_blocks: citește informații sensibile ale tuturor blocurilor de domeniu de e-mail
+ admin:read:ip_blocks: citește informații sensibile ale tuturor blocurilor IP
admin:read:reports: citește informații sensibile din toate rapoartele și conturile raportate
admin:write: modifică toate datele de pe server
admin:write:accounts: efectuează acțiuni de moderare pe conturi
+ admin:write:canonical_email_blocks: efectuează acțiuni de moderare pe blocurile de e-mail canonice
+ admin:write:domain_allows: efectuează acțiuni de moderare pe domeniile permise
+ admin:write:domain_blocks: efectuează acțiuni de moderare pe blocurile de domeniu
+ admin:write:email_domain_blocks: efectuează acțiuni de moderare pe blocurile de domeniu de e-mail
+ admin:write:ip_blocks: efectuează acțiuni de moderare pe blocurile IP
admin:write:reports: efectuează acțiuni de moderare pe rapoarte
crypto: utilizează criptare la ambele capete
follow: modifică relațiile contului
+ profile: citește doar informațiile de profil ale contului tău
push: primește notificările tale push
read: citește toate datele contului tău
read:accounts: vede informațiile privind conturile
diff --git a/config/locales/doorkeeper.ru.yml b/config/locales/doorkeeper.ru.yml
index 1dcb2093d5..c7ea94c2e3 100644
--- a/config/locales/doorkeeper.ru.yml
+++ b/config/locales/doorkeeper.ru.yml
@@ -60,6 +60,7 @@ ru:
error:
title: Произошла ошибка
new:
+ prompt_html: "%{client_name} хочет получить доступ к вашему аккаунту. Принимайте запрос только в том случае, если узнаёте, откуда он, и доверяете источнику."
review_permissions: Просмотр разрешений
title: Требуется авторизация
show:
diff --git a/config/locales/doorkeeper.sk.yml b/config/locales/doorkeeper.sk.yml
index 774a2648f9..ba9a440a11 100644
--- a/config/locales/doorkeeper.sk.yml
+++ b/config/locales/doorkeeper.sk.yml
@@ -134,6 +134,7 @@ sk:
media: Mediálne prílohy
mutes: Stíšenia
notifications: Upozornenia
+ profile: Váš Mastodon profil
push: Upozornenia push
reports: Hlásenia
search: Vyhľadávanie
diff --git a/config/locales/doorkeeper.sl.yml b/config/locales/doorkeeper.sl.yml
index 3f36c73756..8b28d1532a 100644
--- a/config/locales/doorkeeper.sl.yml
+++ b/config/locales/doorkeeper.sl.yml
@@ -60,6 +60,7 @@ sl:
error:
title: Prišlo je do napake
new:
+ prompt_html: "%{client_name} želi dostopati do vašega računa. To prošnjo odobrite le, če tega odjemalca prepoznate in mu zaupate."
review_permissions: Preglej dovoljenja
title: Potrebna je odobritev
show:
@@ -82,6 +83,7 @@ sl:
access_denied: Lastnik virov ali odobritveni strežnik je zavrnil zahtevo.
credential_flow_not_configured: Pretok geselskih pooblastil lastnika virov ni uspel, ker Doorkeeper.configure.resource_owner_from_credentials ni nastavljen.
invalid_client: Odobritev odjemalca ni uspela zaradi neznanega odjemalca, zaradi nevključitve odobritve odjemalca ali zaradi nepodprte metode odobritve.
+ invalid_code_challenge_method: Metoda za kodo mora biti S256, čistopis ni podprt.
invalid_grant: Predložena odobritev je neveljavna, je potekla, je preklicana, se ne ujema z URI-jem za preusmeritev uporabljenim v zahtevi za odobritev, ali pa je bila izdana drugemu odjemalcu.
invalid_redirect_uri: URI za preusmeritev ni veljaven.
invalid_request:
diff --git a/config/locales/doorkeeper.sv.yml b/config/locales/doorkeeper.sv.yml
index 9f646fd3e4..3c8b08ff26 100644
--- a/config/locales/doorkeeper.sv.yml
+++ b/config/locales/doorkeeper.sv.yml
@@ -60,6 +60,7 @@ sv:
error:
title: Ett fel har uppstått
new:
+ prompt_html: "%{client_name} vill ha behörighet att komma åt ditt konto. Godkänn bara denna begäran om du känner igen och litar på källan."
review_permissions: Granska behörigheter
title: Godkännande krävs
show:
@@ -71,7 +72,7 @@ sv:
revoke: Är du säker?
index:
authorized_at: Godkändes den %{date}
- description_html: Dessa applikationer har åtkomst till ditt konto genom API:et. Om det finns applikationer du inte känner igen här, eller om en applikation inte fungerar, kan du återkalla dess åtkomst.
+ description_html: Detta är program som kan komma åt ditt konto med hjälp av API. Om det finns program som du inte känner igen här, eller om ett program är inte fungerar kan du återkalla dess åtkomst.
last_used_at: Användes senast %{date}
never_used: Aldrig använd
scopes: Behörigheter
@@ -132,7 +133,7 @@ sv:
follow: Följare, mjutade och blockerade
follows: Följer
lists: Listor
- media: Mediabilagor
+ media: Mediebilagor
mutes: Tystade användare
notifications: Aviseringar
profile: Din Mastodon-profil
diff --git a/config/locales/doorkeeper.th.yml b/config/locales/doorkeeper.th.yml
index e7ed0ba8a3..3b52e170ea 100644
--- a/config/locales/doorkeeper.th.yml
+++ b/config/locales/doorkeeper.th.yml
@@ -60,6 +60,7 @@ th:
error:
title: เกิดข้อผิดพลาด
new:
+ prompt_html: "%{client_name} ต้องการสิทธิอนุญาตเพื่อเข้าถึงบัญชีของคุณ อนุมัติคำขอนี้เฉพาะหากคุณรู้จักและเชื่อถือแหล่งที่มานี้เท่านั้น"
review_permissions: ตรวจทานสิทธิอนุญาต
title: ต้องการการอนุญาต
show:
diff --git a/config/locales/doorkeeper.vi.yml b/config/locales/doorkeeper.vi.yml
index 6687c0339d..2219599c57 100644
--- a/config/locales/doorkeeper.vi.yml
+++ b/config/locales/doorkeeper.vi.yml
@@ -150,30 +150,30 @@ vi:
title: Đăng nhập bằng OAuth
scopes:
admin:read: đọc mọi dữ liệu trên máy chủ
- admin:read:accounts: đọc thông tin nhạy cảm của tất cả các tài khoản
- admin:read:canonical_email_blocks: đọc thông tin nhạy cảm của tất cả khối email chuẩn
- admin:read:domain_allows: đọc thông tin nhạy cảm của tất cả các tên miền cho phép
- admin:read:domain_blocks: đọc thông tin nhạy cảm của tất cả các tên miền chặn
- admin:read:email_domain_blocks: đọc thông tin nhạy cảm của tất cả các miền email chặn
- admin:read:ip_blocks: đọc thông tin nhạy cảm của tất cả các IP chặn
+ admin:read:accounts: đọc thông tin nhạy cảm của mọi tài khoản
+ admin:read:canonical_email_blocks: đọc thông tin nhạy cảm của mọi khối email biến thể
+ admin:read:domain_allows: đọc thông tin nhạy cảm của mọi máy chủ liên hợp
+ admin:read:domain_blocks: đọc thông tin nhạy cảm của mọi máy chủ chặn
+ admin:read:email_domain_blocks: đọc thông tin nhạy cảm của mọi tên miền email chặn
+ admin:read:ip_blocks: đọc thông tin nhạy cảm của mọi IP chặn
admin:read:reports: đọc thông tin của các báo cáo và các tài khoản bị báo cáo
admin:write: sửa đổi tất cả dữ liệu trên máy chủ
admin:write:accounts: áp đặt hành động kiểm duyệt trên tài khoản
- admin:write:canonical_email_blocks: áp đặt kiểm duyệt đối với chặn email
+ admin:write:canonical_email_blocks: áp đặt kiểm duyệt đối với chặn email biến thể
admin:write:domain_allows: áp đặt kiểm duyệt đối với các email cho phép
admin:write:domain_blocks: áp đặt kiểm duyệt đối với các tên miền chặn
admin:write:email_domain_blocks: áp đặt kiểm duyệt đối với các tên miền email chặn
admin:write:ip_blocks: áp đặt kiểm duyệt với các IP chặn
admin:write:reports: áp đặt kiểm duyệt với các báo cáo
crypto: dùng mã hóa đầu cuối
- follow: sửa đổi các mối quan hệ tài khoản
- profile: chỉ đọc thông tin tài khoản cơ bản
+ follow: sửa đổi các mối quan hệ
+ profile: chỉ xem thông tin tài khoản cơ bản
push: nhận thông báo đẩy
read: đọc mọi dữ liệu tài khoản
read:accounts: xem thông tin tài khoản
read:blocks: xem những người đã chặn
read:bookmarks: xem tút đã lưu
- read:favourites: xem lượt thích
+ read:favourites: xem tút đã thích
read:filters: xem bộ lọc
read:follows: xem những người theo dõi
read:lists: xem danh sách
@@ -182,7 +182,7 @@ vi:
read:reports: xem báo cáo của bạn
read:search: tìm kiếm
read:statuses: xem toàn bộ tút
- write: sửa đổi mọi dữ liệu tài khoản của bạn
+ write: sửa đổi mọi dữ liệu tài khoản
write:accounts: sửa đổi trang hồ sơ
write:blocks: chặn người và máy chủ
write:bookmarks: sửa đổi những tút lưu
@@ -194,5 +194,5 @@ vi:
write:media: tải lên tập tin
write:mutes: ẩn người và thảo luận
write:notifications: xóa thông báo
- write:reports: báo cáo người khác
+ write:reports: báo cáo
write:statuses: đăng tút
diff --git a/config/locales/doorkeeper.zh-CN.yml b/config/locales/doorkeeper.zh-CN.yml
index 46253d01b3..2c096720c2 100644
--- a/config/locales/doorkeeper.zh-CN.yml
+++ b/config/locales/doorkeeper.zh-CN.yml
@@ -60,7 +60,7 @@ zh-CN:
error:
title: 发生错误
new:
- prompt_html: "%{client_name} 请求获得访问您账户的权限。 请在确保自己了解并信任此来源后再批准该请求。"
+ prompt_html: "%{client_name} 请求获得访问你账号的权限。 请在确保自己了解并信任此来源后再批准该请求。"
review_permissions: 检查权限
title: 需要授权
show:
@@ -85,7 +85,7 @@ zh-CN:
invalid_client: 由于应用信息未知、未提交认证信息或使用了不支持的认证方式，认证失败
invalid_code_challenge_method: 代码验证方法必须是 S256，不支持明文。
invalid_grant: 授权方式无效、过期或已被撤销、与授权请求中的回调地址不一致，或使用了其他应用的回调地址
- invalid_redirect_uri: 无效的登录回调地址
+ invalid_redirect_uri: 登录回调地址无效。
invalid_request:
missing_param: 缺少必需的参数：%{value}
request_not_authorized: 请求需要被授权。授权请求所需的参数缺失或无效。
@@ -123,14 +123,14 @@ zh-CN:
admin/accounts: 账号管理
admin/all: 所有管理功能
admin/reports: 举报管理
- all: 完全访问您的Mastodon账户
+ all: 完全访问你的Mastodon账号
blocks: 屏蔽
- bookmarks: 书签
+ bookmarks: 收藏
conversations: 会话
crypto: 端到端加密
favourites: 喜欢
- filters: 过滤器
- follow: 关注者，隐藏与屏蔽
+ filters: 过滤规则
+ follow: 关注，隐藏与屏蔽
follows: 关注
lists: 列表
media: 媒体文件
@@ -152,29 +152,29 @@ zh-CN:
admin:read: 读取服务器上的所有数据
admin:read:accounts: 读取所有账号的敏感信息
admin:read:canonical_email_blocks: 读取所有已屏蔽邮箱的敏感信息
- admin:read:domain_allows: 读取所有域的敏感信息
- admin:read:domain_blocks: 读取所有域块的敏感信息
- admin:read:email_domain_blocks: 读取所有已屏蔽邮箱域名的敏感信息
+ admin:read:domain_allows: 读取敏感信息 - 站点允许列表
+ admin:read:domain_blocks: 读取敏感信息 - 站点屏蔽列表
+ admin:read:email_domain_blocks: 读取敏感信息 - 邮箱域名屏蔽列表
admin:read:ip_blocks: 读取所有IP块的敏感信息
admin:read:reports: 读取所有举报和被举报账号的敏感信息
admin:write: 修改服务器上的所有数据
admin:write:accounts: 对账号执行管理操作
admin:write:canonical_email_blocks: 对已屏蔽邮箱执行管理操作
- admin:write:domain_allows: 在域上执行管理操作
- admin:write:domain_blocks: 在域块上执行管理操作
- admin:write:email_domain_blocks: 对已屏蔽邮箱域名执行管理操作
- admin:write:ip_blocks: 在 IP 块上执行管理操作
+ admin:write:domain_allows: 修改站点允许列表
+ admin:write:domain_blocks: 修改站点屏蔽列表
+ admin:write:email_domain_blocks: 修改邮箱域名屏蔽列表
+ admin:write:ip_blocks: 针对 IP 段执行管理操作
admin:write:reports: 对举报执行管理操作
crypto: 使用端到端加密
follow: 关注或屏蔽用户
- profile: 仅读取你账户中的个人资料信息
- push: 接收你的账户的推送通知
- read: 读取你的账户数据
+ profile: 仅读取你账号的个人资料信息
+ push: 接收你的账号的推送通知
+ read: 读取你的账号数据
read:accounts: 查看账号信息
read:blocks: 查看你的屏蔽列表
read:bookmarks: 查看你的书签
read:favourites: 查看喜欢的嘟文
- read:filters: 查看你的过滤器
+ read:filters: 查看你的过滤规则
read:follows: 查看你的关注
read:lists: 查看你的列表
read:mutes: 查看你的隐藏列表
@@ -184,11 +184,11 @@ zh-CN:
read:statuses: 查看所有嘟文
write: 修改你的账号数据
write:accounts: 修改你的个人资料
- write:blocks: 屏蔽账号和域名
- write:bookmarks: 为嘟文添加书签
+ write:blocks: 屏蔽账号与站点
+ write:bookmarks: 将嘟文加入书签
write:conversations: 静音并删除会话
write:favourites: 喜欢嘟文
- write:filters: 创建过滤器
+ write:filters: 创建过滤规则
write:follows: 关注其他人
write:lists: 创建列表
write:media: 上传媒体文件
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 610ae40265..a842f78fb2 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -21,6 +21,7 @@ el:
one: Ανάρτηση
other: Αναρτήσεις
posts_tab_heading: Αναρτήσεις
+ self_follow_error: Δεν επιτρέπεται να ακολουθήσεις τον δικό σου λογαριασμό
admin:
account_actions:
action: Εκτέλεση ενέργειας
@@ -250,9 +251,11 @@ el:
create_user_role_html: Ο/Η %{name} δημιούργησε ρόλο %{target}
demote_user_html: Ο/Η %{name} υποβίβασε τον χρήστη %{target}
destroy_announcement_html: Ο/Η %{name} διέγραψε την ανακοίνωση %{target}
+ destroy_canonical_email_block_html: Ο χρήστης %{name} έκανε άρση αποκλεισμού email με το hash %{target}
destroy_custom_emoji_html: Ο/Η %{name} διέγραψε το emoji %{target}
destroy_domain_allow_html: Ο/Η %{name} αφαίρεσε τον τομέα %{target} από τη λίστα εγκρίσεων
destroy_domain_block_html: Ο/Η %{name} επέτρεψε τον τομέα %{target}
+ destroy_email_domain_block_html: Ο χρήστης %{name} έκανε άρση αποκλεισμού του τομέα email %{target}
destroy_instance_html: Ο/Η %{name} εκκαθάρισε τον τομέα %{target}
destroy_ip_block_html: Ο/Η %{name} διέγραψε τον κανόνα για την IP %{target}
destroy_status_html: Ο/Η %{name} αφαίρεσε την ανάρτηση του/της %{target}
@@ -260,8 +263,10 @@ el:
destroy_user_role_html: Ο/Η %{name} διέγραψε τον ρόλο του %{target}
disable_2fa_user_html: Ο/Η %{name} απενεργοποίησε την απαίτηση για ταυτοποίηση δύο παραγόντων για τον χρήστη %{target}
disable_custom_emoji_html: Ο/Η %{name} απενεργοποίησε το emoji %{target}
+ disable_sign_in_token_auth_user_html: Ο χρήστης %{name} απενεργοποίησε την ταυτοποίηση χαρακτηριστικού μέσω e-mail για %{target}
disable_user_html: Ο/Η %{name} απενεργοποίησε τη σύνδεση για τον χρήστη %{target}
enable_custom_emoji_html: Ο/Η %{name} ενεργοποίησε το emoji %{target}
+ enable_sign_in_token_auth_user_html: Ο χρήστης %{name} ενεργοποίησε την πιστοποίηση αναγνωριστικού email του %{target}
enable_user_html: Ο/Η %{name} ενεργοποίησε τη σύνδεση για τον χρήστη %{target}
memorialize_account_html: O/H %{name} μετέτρεψε τον λογαριασμό του %{target} σε σελίδα εις μνήμην
promote_user_html: Ο/Η %{name} προβίβασε το χρήστη %{target}
@@ -269,6 +274,7 @@ el:
reject_user_html: ο/η %{name} απέρριψε την εγγραφή από %{target}
remove_avatar_user_html: ο/η %{name} αφαίρεσε το άβαταρ του/της %{target}
reopen_report_html: Ο/Η %{name} ξανάνοιξε την αναφορά %{target}
+ resend_user_html: Ο χρήστης %{name} έστειλε ξανά email επιβεβαίωσης για τον χρήστη %{target}
reset_password_user_html: Ο/Η %{name} επανέφερε το συνθηματικό του χρήστη %{target}
resolve_report_html: Ο/Η %{name} επέλυσε την αναφορά %{target}
sensitive_account_html: Ο/Η %{name} επισήμανε τα πολυμέσα του/της %{target} ως ευαίσθητα
@@ -429,6 +435,7 @@ el:
attempts_over_week:
one: "%{count} προσπάθεια την τελευταία εβδομάδα"
other: "%{count} προσπάθειες εγγραφής την τελευταία εβδομάδα"
+ created_msg: Επιτυχής αποκλεισμός τομέα email
delete: Διαγραφή
dns:
types:
@@ -437,8 +444,12 @@ el:
new:
create: Προσθήκη τομέα
resolve: Επίλυση τομέα
+ title: Αποκλεισμός νέου τομέα email
+ no_email_domain_block_selected: Δεν άλλαξαν οι αποκλεισμοί τομέα email καθώς δεν επιλέχθηκε κανένας
not_permitted: Δεν επιτρέπεται
+ resolved_dns_records_hint_html: Το όνομα τομέα επιλύεται στους ακόλουθους τομείς MX, οι οποίοι είναι τελικά υπεύθυνοι για την αποδοχή των email. Αποκλείοντας έναν τομέα MX θα αποκλείει τις εγγραφές από οποιαδήποτε διεύθυνση email που χρησιμοποιεί τον ίδιο τομέα MX, ακόμη και αν το ορατό όνομα τομέα είναι διαφορετικό. Προσέξτε να μην αποκλείσετε τους μεγάλους παρόχους ηλεκτρονικού ταχυδρομείου.
resolved_through_html: Επιλύθηκε μέσω %{domain}
+ title: Αποκλεισμένοι τομείς email
export_domain_allows:
new:
title: Εισαγωγή επιτρεπόμενων τομέων
@@ -592,7 +603,9 @@ el:
resolve_description_html: Δεν θα ληφθούν μέτρα κατά του αναφερόμενου λογαριασμού, δεν θα καταγραφεί κανένα παράπτωμα, και η αναφορά θα κλείσει.
silence_description_html: Ο λογαριασμός θα είναι ορατός μόνο σε εκείνους που ήδη τον ακολουθούν ή τον αναζητούν χειροκίνητα, περιορίζοντας κατά πολύ την εμβέλειά του. Η ενέργεια αυτή είναι αναστρέψιμη. Κλείνει όλες τις αναφορές εναντίον αυτού του λογαριασμού.
suspend_description_html: Ο λογαριασμός και όλο το περιεχόμενό του θα είναι απρόσιτα και τελικά θα διαγραφούν και η αλληλεπίδραση με αυτόν θα είναι αδύνατη. Αναστρέψιμη εντός 30 ημερών. Κλείνει όλες τις αναφορές εναντίον αυτού του λογαριασμού.
+ actions_description_html: Αποφάσισε ποια μέτρα θα ληφθούν για την επίλυση αυτής της αναφοράς. Εάν προβείς σε τιμωρητική ενέργεια κατά του αναφερόμενου λογαριασμού, θα αποσταλεί ειδοποίηση μέσω ηλεκτρονικού ταχυδρομείου σε αυτόν, εκτός όταν η κατηγορία Spam είναι επιλεγμένη.
actions_description_remote_html: Αποφάσισε ποια μέτρα θα ληφθούν για την επίλυση αυτής της αναφοράς. Αυτό θα επηρεάσει μόνο το πώς ο δικός σας διακομιστής επικοινωνεί με αυτόν τον απομακρυσμένο λογαριασμό και χειρίζεται το περιεχόμενό του.
+ actions_no_posts: Αυτή η αναφορά δεν έχει συσχετισμένες αναρτήσεις για διαγραφή
add_to_report: Πρόσθεσε περισσότερα στην αναφορά
already_suspended_badges:
local: Ήδη σε αναστολή σε αυτόν τον διακομιστή
@@ -656,6 +669,7 @@ el:
delete_data_html: Διάγραψε το προφίλ και το περιεχόμενο του @%{acct} σε 30 ημέρες από τώρα εκτός αν, εν τω μεταξύ, ανακληθεί η αναστολή
preview_preamble_html: 'Ο @%{acct} θα λάβει μια προειδοποίηση με τα ακόλουθο περιεχόμενο:'
record_strike_html: Κατάγραψε ένα παράπτωμα εναντίον του @%{acct} για να σε βοηθήσει να αποφασίσεις σε μελλοντικές παραβιάσεις από αυτόν τον λογαριασμό
+ send_email_html: Στείλε στον λογαριασμό @%{acct} ένα προειδοποιητικό email
warning_placeholder: Προαιρετικές επιπλέον εξηγήσεις για αυτή την ενέργεια από την ομάδα συντονισμού.
target_origin: Προέλευση του αναφερόμενου λογαριασμού
title: Αναφορές
@@ -695,6 +709,7 @@ el:
manage_appeals: Διαχείριση Εφέσεων
manage_appeals_description: Επιτρέπει στους χρήστες να εξετάζουν τις εφέσεις κατά των ενεργειών της ομάδας συντονισμού
manage_blocks: Διαχείριση Αποκλεισμών
+ manage_blocks_description: Επιτρέπει στους χρήστες να αποκλείουν παρόχους email και διευθύνσεις IP
manage_custom_emojis: Διαχείριση Προσαρμοσμένων Emojis
manage_custom_emojis_description: Επιτρέπει στους χρήστες να διαχειρίζονται προσαρμοσμένα emojis στον διακομιστή
manage_federation: Διαχείριση Συναλλαγών
@@ -712,6 +727,7 @@ el:
manage_taxonomies: Διαχείριση Ταξινομιών
manage_taxonomies_description: Επιτρέπει στους χρήστες να εξετάζουν το δημοφιλές περιεχόμενο και να ενημερώνουν τις ρυθμίσεις ετικέτας
manage_user_access: Διαχείριση Πρόσβασης Χρήστη
+ manage_user_access_description: Επιτρέπει στους χρήστες να απενεργοποιούν την ταυτοποίηση δύο παραγόντων άλλων χρηστών, να αλλάξουν τη διεύθυνση ηλεκτρονικού ταχυδρομείου τους και να επαναφέρουν τον κωδικό πρόσβασής τους
manage_users: Διαχείριση Χρηστών
manage_users_description: Επιτρέπει στους χρήστες να βλέπουν τις λεπτομέρειες άλλων χρηστών και να εκτελούν ενέργειες συντονισμού εναντίον τους
manage_webhooks: Διαχείριση Webhooks
@@ -786,6 +802,7 @@ el:
destroyed_msg: Η μεταφόρτωση ιστότοπου διαγράφηκε επιτυχώς!
software_updates:
critical_update: Κρίσιμο - παρακαλώ ενημέρωσε γρήγορα
+ description: Συνιστάται να διατηρείς την εγκατάσταση του Mastodon ενημερωμένη για να επωφεληθείς από τις πιο πρόσφατες διορθώσεις και δυνατότητες. Επιπλέον, μερικές φορές είναι κρίσιμο να ενημερώσεις το Mastodon εγκαίρως για να αποφύγεις προβλήματα ασφαλείας. Για αυτούς τους λόγους, το Mastodon ελέγχει για ενημερώσεις κάθε 30 λεπτά και θα σε ειδοποιεί σύμφωνα με τις προτιμήσεις ειδοποίησης μέσω email.
documentation_link: Μάθε περισσότερα
release_notes: Σημειώσεις έκδοσης
title: Διαθέσιμες ενημερώσεις
@@ -859,6 +876,9 @@ el:
message_html: Δεν έχεις ορίσει κανέναν κανόνα διακομιστή.
sidekiq_process_check:
message_html: Καμία διεργασία Sidekiq δεν εκτελείται για την ουρά %{value}. Παρακαλώ έλεγξε τη διαμόρφωση του Sidekiq
+ software_version_check:
+ action: Δες τις διαθέσιμες ενημερώσεις
+ message_html: Μια ενημέρωση Mastodon είναι διαθέσιμη.
software_version_critical_check:
action: Δες τις διαθέσιμες ενημερώσεις
message_html: Μια κρίσιμη ενημέρωση του Mastodon είναι διαθέσιμη, παρακαλώ ενήμερωσε το συντομότερο δυνατόν.
@@ -885,6 +905,7 @@ el:
name: Όνομα
newest: Νεότερη όλων
oldest: Παλαιότερη όλων
+ open: Προβολή Δημόσια
reset: Επαναφορά
review: Κατάσταση αξιολόγησης
search: Αναζήτηση
@@ -894,10 +915,16 @@ el:
trends:
allow: Επιτρέπεται
approved: Εγκρίθηκε
+ confirm_allow: Σίγουρα θες να επιτρέψεις τις επιλεγμένες ετικέτες;
+ confirm_disallow: Σίγουρα θες να απορρίψεις τις επιλεγμένες ετικέτες;
disallow: Να μην επιτρέπεται
links:
allow: Να επιτρέπεται σύνδεσμος
allow_provider: Να επιτρέπεται ο εκδότης
+ confirm_allow: Σίγουρα θες να επιτρέψεις τουςεπιλεγμένους συνδέσμους;
+ confirm_allow_provider: Σίγουρα θες να επιτρέψεις τους επιλεγμένους παρόχους;
+ confirm_disallow: Σίγουρα θες να απορρίψεις τους επιλεγμένους συνδέσμους;
+ confirm_disallow_provider: Σίγουρα θες να απορρίψεις τους επιλεγμένους παρόχους;
description_html: Αυτοί οι σύνδεσμοι μοιράζονται αρκετά από λογαριασμούς των οποίων τις δημοσιεύσεις, βλέπει ο διακομιστής σας. Μπορεί να βοηθήσει τους χρήστες σας να μάθουν τί συμβαίνει στον κόσμο. Οι σύνδεσμοι δεν εμφανίζονται δημόσια μέχρι να εγκρίνετε τον εκδότη. Μπορείς επίσης να επιτρέψεις ή να απορρίψεις μεμονωμένους συνδέσμους.
disallow: Να μην επιτρέπεται ο σύνδεσμος
disallow_provider: Να μην επιτρέπεται ο εκδότης
@@ -921,6 +948,10 @@ el:
statuses:
allow: Να επιτρέπεται η ανάρτηση
allow_account: Να επιτρέπεται ο συγγραφέας
+ confirm_allow: Σίγουρα θες να επιτρέψεις τις επιλεγμένες καταστάσεις;
+ confirm_allow_account: Σίγουρα θες να επιτρέψεις τους επιλεγμένους λογαριασμούς;
+ confirm_disallow: Σίγουρα θες να απορρίψεις τις επιλεγμένες καταστάσεις;
+ confirm_disallow_account: Σίγουρα θες να απορρίψεις τους επιλεγμένους λογαριασμούς;
description_html: Αυτές είναι αναρτήσεις για τις οποίες ο διακομιστής σας γνωρίζει ότι κοινοποιούνται και αρέσουν πολύ αυτή τη περίοδο. Μπορεί να βοηθήσει νέους και χρήστες που επιστρέφουν, να βρουν περισσότερα άτομα να ακολουθήσουν. Καμία ανάρτηση δεν εμφανίζεται δημόσια μέχρι να εγκρίνεις τον συντάκτη και ο συντάκτης να επιτρέπει ο λογαριασμός του να προτείνεται και σε άλλους. Μπορείς επίσης να επιτρέψεις ή να απορρίψεις μεμονωμένες δημοσιεύσεις.
disallow: Να μην επιτρέπεται η δημοσίευση
disallow_account: Να μην επιτρέπεται ο συντάκτης
@@ -953,6 +984,7 @@ el:
used_by_over_week:
one: Χρησιμοποιήθηκε από ένα άτομο την τελευταία εβδομάδα
other: Χρησιμοποιήθηκε από %{count} άτομα την τελευταία εβδομάδα
+ title: Προτάσεις και τάσεις
trending: Τάσεις
warning_presets:
add_new: Πρόσθεση νέου
@@ -1037,7 +1069,9 @@ el:
guide_link_text: Μπορεί να συνεισφέρει ο οποιοσδήποτε.
sensitive_content: Ευαίσθητο περιεχόμενο
application_mailer:
+ notification_preferences: Αλλαγή προτιμήσεων email
salutation: "%{name},"
+ settings: 'Αλλαγή προτιμήσεων email: %{link}'
unsubscribe: Κατάργηση εγγραφής
view: 'Προβολή:'
view_profile: Προβολή προφίλ
@@ -1057,6 +1091,7 @@ el:
hint_html: Και κάτι ακόμα! Πρέπει να επιβεβαιώσουμε ότι είσαι άνθρωπος (αυτό γίνεται για να κρατήσουμε μακριά το σπαμ!). Λύσε το CAPTCHA παρακάτω και κάνε κλικ "Συνέχεια".
title: Ελεγχος ασφαλείας
confirmations:
+ awaiting_review: Η διεύθυνση email σου επιβεβαιώθηκε! Το προσωπικό του %{domain} εξετάζει τώρα την εγγραφή σου. Θα λάβεις ένα email εάν εγκρίνουν τον λογαριασμό σου!
awaiting_review_title: Η εγγραφή σου εξετάζεται
clicking_this_link: κάνοντας κλικ σε αυτόν τον σύνδεσμο
login_link: σύνδεση
@@ -1064,6 +1099,7 @@ el:
redirect_to_app_html: Θα πρέπει να μεταφέρθηκες στην εφαρμογή %{app_name}. Αν αυτό δεν συμβεί, δοκιμάσε το %{clicking_this_link} ή επέστρεψε χειροκίνητα στην εφαρμογή.
registration_complete: Η εγγραφή σου στο %{domain} έχει πλέον ολοκληρωθεί!
welcome_title: Καλώς ήρθες, %{name}!
+ wrong_email_hint: Εάν αυτή η διεύθυνση email δεν είναι σωστή, μπορείς να την αλλάξεις στις ρυθμίσεις λογαριασμού.
delete_account: Διαγραφή λογαριασμού
delete_account_html: Αν θέλεις να διαγράψεις το λογαριασμό σου, μπορείς να συνεχίσεις εδώ. Θα σου ζητηθεί επιβεβαίωση.
description:
@@ -1084,6 +1120,7 @@ el:
or_log_in_with: Ή συνδέσου με
privacy_policy_agreement_html: Έχω διαβάσει και συμφωνώ με την πολιτική απορρήτου
progress:
+ confirm: Επιβεβαίωση email
details: Τα στοιχεία σας
review: Η αξιολόγησή μας
rules: Αποδοχή κανόνων
@@ -1105,8 +1142,10 @@ el:
security: Ασφάλεια
set_new_password: Ορισμός νέου συνθηματικού
setup:
+ email_below_hint_html: Έλεγξε τον φάκελο ανεπιθύμητης αλληλογραφίας ή ζήτα καινούργιο. Μπορείς να διορθώσεις τη διεύθυνση email σου αν είναι λάθος.
email_settings_hint_html: Πάτησε το σύνδεσμο που σου στείλαμε για να επαληθεύσεις το %{email}. Θα σε περιμένουμε εδώ.
link_not_received: Δεν έλαβες τον σύνδεσμο;
+ new_confirmation_instructions_sent: Θα λάβεις ένα νέο email με το σύνδεσμο επιβεβαίωσης σε λίγα λεπτά!
title: Ελέγξτε τα εισερχόμενά σας
sign_in:
preamble_html: Συνδεθείτε με τα διαπιστευτήριά σας στον %{domain}. Αν ο λογαριασμός σας φιλοξενείται σε διαφορετικό διακομιστή, δε θα μπορείτε να συνδεθείτε εδώ.
@@ -1117,12 +1156,22 @@ el:
title: Ας ξεκινήσουμε τις ρυθμίσεις στο %{domain}.
status:
account_status: Κατάσταση λογαριασμού
+ confirming: Αναμονή για ολοκλήρωση επιβεβαίωσης του email.
functional: Ο λογαριασμός σας είναι πλήρως λειτουργικός.
+ pending: Η εφαρμογή σου εκκρεμεί έγκρισης. Ίσως θα διαρκέσει κάποιο χρόνο. Θα λάβεις email αν εγκριθεί.
redirecting_to: Ο λογαριασμός σου είναι ανενεργός γιατί επί του παρόντος ανακατευθύνει στον %{acct}.
self_destruct: Καθώς το %{domain} κλείνει, θα έχεις μόνο περιορισμένη πρόσβαση στον λογαριασμό σου.
view_strikes: Προβολή προηγούμενων ποινών εναντίον του λογαριασμού σας
too_fast: Η φόρμα υποβλήθηκε πολύ γρήγορα, προσπαθήστε ξανά.
use_security_key: Χρήση κλειδιού ασφαλείας
+ author_attribution:
+ example_title: Δείγμα κειμένου
+ hint_html: Γράφεις ειδήσεις ή blog άρθρα εκτός του Mastodon; Έλεγξε πώς μπορείς να πάρεις τα εύσημα όταν μοιράζονται στο Mastodon.
+ instructions: 'Βεβαιώσου ότι ο κώδικας αυτός είναι στο HTML του άρθρου σου:'
+ more_from_html: Περισσότερα από %{name}
+ s_blog: Ιστολόγιο του/της %{name}
+ then_instructions: Στη συνέχεια, πρόσθεσε το όνομα τομέα της δημοσίευσης στο παρακάτω πεδίο.
+ title: Αναφορά συγγραφέα
challenge:
confirm: Συνέχεια
hint_html: "Συμβουλή: Δεν θα σου ζητήσουμε τον κωδικό ασφαλείας σου ξανά για την επόμενη ώρα."
@@ -1159,6 +1208,9 @@ el:
before: 'Πριν συνεχίσεις, παρακαλούμε να διαβάσεις τις παρακάτω σημειώσεις προσεκτικά:'
caches: Περιεχόμενο που έχει αποθηκευτεί προσωρινά σε άλλους διακομιστές ίσως παραμείνει
data_removal: Οι αναρτήσεις σου και άλλα δεδομένα θα διαγραφούν οριστικά
+ email_change_html: Μπορείς να αλλάξεις τη διεύθυνση email σου χωρίς να διαγράψεις το λογαριασμό σου
+ email_contact_html: Αν και πάλι δεν εμφανιστεί, μπορείς να στείλεις email στο %{email} για βοήθεια
+ email_reconfirmation_html: Αν δεν έχεις λάβει το email επιβεβαίωσης, μπορείς να το ζητήσεις ξανά
irreversible: Δεν θα μπορείς να ανακτήσεις ή ενεργοποιήσεις ξανά το λογαριασμό σου
more_details_html: Για περισσότερες πληροφορίες, δες την πολιτική απορρήτου.
username_available: Το όνομα χρήστη σου θα γίνει ξανά διαθέσιμο
@@ -1342,15 +1394,21 @@ el:
time_started: Ξεκίνησε στις
titles:
blocking: Εισαγωγή αποκλεισμένων λογαριασμών
+ bookmarks: Εισαγωγή σελιδοδεικτών
+ domain_blocking: Εισαγωγή αποκλεισμένων τομέων
following: Εισαγωγή λογαριασμών που ακολουθείτε
+ lists: Εισαγωγή λιστών
+ muting: Εισαγωγή λογαριασμών σε σίγαση
type: Τύπος εισαγωγής
type_groups:
+ constructive: Ακολουθείς & Σελιδοδείκτες
destructive: Μπλοκ & σίγαση
types:
blocking: Λίστα αποκλεισμού
bookmarks: Σελιδοδείκτες
domain_blocking: Λίστα αποκλεισμένων τομέων
following: Λίστα ατόμων που ακολουθείτε
+ lists: Λίστες
muting: Λίστα αποσιωπήσεων
upload: Μεταμόρφωση
invites:
@@ -1365,6 +1423,7 @@ el:
'86400': 1 μέρα
expires_in_prompt: Ποτέ
generate: Δημιουργία συνδέσμου πρόσκλησης
+ invalid: Αυτή η πρόσκληση δεν είναι έγκυρη
invited_by: 'Σε προσκάλεσε ο/η:'
max_uses:
one: 1 χρήσης
@@ -1382,15 +1441,32 @@ el:
authentication_methods:
otp: εφαρμογή ταυτοποίησης δύο παραγόντων
password: συνθηματικό
+ sign_in_token: κωδικός ασφαλείας email
webauthn: κλειδιά ασφαλείας
description_html: Αν δεις δραστηριότητα που δεν αναγνωρίζεις, σκεφτείς να αλλάξεις τον κωδικό πρόσβασής σου και να ενεργοποιήσεις τον έλεγχο ταυτότητας δύο παραγόντων.
empty: Δεν υπάρχει διαθέσιμο ιστορικό ελέγχου ταυτότητας
failed_sign_in_html: Αποτυχημένη προσπάθεια σύνδεσης με %{method} από %{ip} (%{browser})
successful_sign_in_html: Επιτυχής σύνδεση με %{method} από %{ip} (%{browser})
title: Ιστορικό ελέγχου ταυτότητας
+ mail_subscriptions:
+ unsubscribe:
+ action: Ναι, κατάργηση συνδρομής
+ complete: Η συνδρομή καταργήθηκε
+ confirmation_html: Σίγουρα θες να καταργήσεις την εγγραφή σου για %{type} για το Mastodon στο %{domain} στο email σου %{email}; Μπορείς πάντα να εγγραφείς ξανά από τις ρυθμίσεις ειδοποιήσεων email.
+ emails:
+ notification_emails:
+ favourite: ειδοποιήσεις email για αγαπημένα
+ follow: ειδοποιήσεις email για ακολουθήσεις
+ follow_request: email για αιτήματα ακολούθησης
+ mention: ειδοποιήσεις email για επισημάνσεις
+ reblog: ειδοποιήσεις email για ενίσχυση
+ resubscribe_html: Αν έχεις καταργήσει την εγγραφή σου κατά λάθος, μπορείς να εγγραφείς εκ νέου από τις ρυθμίσεις ειδοποίησης email.
+ success_html: Δεν θα λαμβάνεις πλέον %{type} για το Mastodon στο %{domain} στο email σου στο %{email}.
+ title: Κατάργηση συνδρομής
media_attachments:
validations:
images_and_video: Δεν γίνεται να προσθέσεις βίντεο σε ανάρτηση που ήδη περιέχει εικόνες
+ not_found: Το πολυμέσο %{ids} δε βρέθηκε ή είναι ήδη συννημένο σε άλλη ανάρτηση
not_ready: Δεν μπορούν να επισυναφθούν αρχεία για τα οποία δεν έχει τελειώσει η επεξεργασία. Προσπαθήστε ξανά σε λίγο!
too_many: Δεν γίνεται να επισυνάψεις περισσότερα από 4 αρχεία
migrations:
@@ -1467,6 +1543,8 @@ el:
update:
subject: "%{name} επεξεργάστηκε μια ανάρτηση"
notifications:
+ administration_emails: Ειδοποιήσεις email διαχειριστή
+ email_events: Συμβάντα για ειδοποιήσεις μέσω email
email_events_hint: 'Επέλεξε συμβάντα για τα οποία θέλεις να λαμβάνεις ειδοποιήσεις μέσω email:'
number:
human:
@@ -1501,18 +1579,31 @@ el:
expired: Η δημοσκόπηση έχει ήδη λήξει
invalid_choice: Αυτή η επιλογή ψήφου δεν υπάρχει
over_character_limit: δε μπορεί να υπερβαίνει τους %{max} χαρακτήρες έκαστη
+ self_vote: Δεν μπορείς να ψηφίσεις στις δικές σου δημοσκοπήσεις
too_few_options: πρέπει να έχει περισσότερες από μια επιλογές
too_many_options: δεν μπορεί να έχει περισσότερες από %{max} επιλογές
preferences:
other: Άλλες
posting_defaults: Προεπιλογές ανάρτησης
public_timelines: Δημόσιες ροές
+ privacy:
+ hint_html: "Παραμετροποίησε πώς θες το προφίλ και οι αναρτήσεις σου να ανακαλύπτονται.. Μια ποικιλία δυνατοτήτων στο Mastodon μπορούν να σε βοηθήσουν να απευθυνθείς σε μεγαλύτερο κοινό όταν ενεργοποιηθούν. Αφιέρωσε μερικά λεπτά για να εξετάσεις τις ρυθμίσεις και να σιγουρευτείς ότι σου ταιριάζουν."
+ privacy: Απόρρητο
+ privacy_hint_html: "'Έλεγξε πόσο θες να αποκαλύπτεις προς όφελος των άλλων. Οι άνθρωποι ανακαλύπτουν ενδιαφέροντα προφίλ και εφαρμογές με την περιήγηση των ακολούθων άλλων ατόμων και βλέποντας από ποιες εφαρμογές δημοσιεύουν, αλλά μπορεί να προτιμάς να το κρατάς κρυφό."
+ reach: Προσιτότητα
+ reach_hint_html: Έλεγξε αν θες να ανακαλύπτεσαι και να ακολουθείσαι από καινούρια άτομα. Θες οι αναρτήσεις σου να εμφανίζονται στην οθόνη Εξερεύνηση; Θες άλλα άτομα να σε βλέπουν στις προτάσεις ακολούθησής τους; Θες να αποδέχεσαι όλους τους νέους ακολούθους αυτόματα ή να έχεις εξονυχιστικό έλεγχο στο καθένα;
+ search: Αναζήτηση
+ search_hint_html: Έλεγξε πώς θες να σε βρίσκουν. Θες οι χρήστες να σε βρουν από ό,τι έχεις αναρτήσει δημόσια; Θες άτομα εκτός Mastodon να βρουν το προφίλ σου κατά την αναζήτηση στο διαδίκτυο; Λάβε υπόψη ότι ο πλήρης αποκλεισμός από όλες τις μηχανές αναζήτησης δεν μπορεί να διασφαλιστεί για δημόσια ενημέρωση.
+ title: Ιδιωτικότητα και προσιτότητα
privacy_policy:
title: Πολιτική Απορρήτου
reactions:
errors:
limit_reached: Το όριο διαφορετικών αντιδράσεων ξεπεράστηκε
unrecognized_emoji: δεν είναι ένα αναγνωρισμένο emoji
+ redirects:
+ prompt: Αν εμπιστεύεστε αυτόν τον σύνδεσμο, κάντε κλικ σε αυτόν για να συνεχίσετε.
+ title: Αποχωρείτε από το %{instance}.
relationships:
activity: Δραστηριότητα λογαριασμού
confirm_follow_selected_followers: Είσαι βέβαιος ότι θες να ακολουθήσεις τους επιλεγμένους ακόλουθους;
@@ -1548,6 +1639,9 @@ el:
over_daily_limit: Έχεις υπερβεί το όριο των %{limit} προγραμματισμένων αναρτήσεων για εκείνη τη μέρα
over_total_limit: Έχεις υπερβεί το όριο των %{limit} προγραμματισμένων αναρτήσεων
too_soon: Η προγραμματισμένη ημερομηνία πρέπει να είναι στο μέλλον
+ self_destruct:
+ lead_html: Δυστυχώς, το %{domain} κλείνει οριστικά. Αν είχατε λογαριασμό εκεί, δεν θα μπορείτε να συνεχίσετε τη χρήση του, αλλά μπορείτε ακόμα να ζητήσετε ένα αντίγραφο ασφαλείας των δεδομένων σας.
+ title: Αυτός ο διακομιστής κλείνει οριστικά
sessions:
activity: Τελευταία δραστηριότητα
browser: Φυλλομετρητής
@@ -1604,17 +1698,31 @@ el:
delete: Διαγραφή λογαριασμού
development: Ανάπτυξη
edit_profile: Επεξεργασία προφίλ
+ export: Εξαγωγή
featured_tags: Παρεχόμενες ετικέτες
import: Εισαγωγή
import_and_export: Εισαγωγή και εξαγωγή
migrate: Μετακόμιση λογαριασμού
+ notifications: Ειδοποιήσεις μέσω email
preferences: Προτιμήσεις
profile: Προφίλ
relationships: Ακολουθείς και σε ακολουθούν
+ severed_relationships: Αποκομμένες σχέσεις
statuses_cleanup: Αυτοματοποιημένη διαγραφή αναρτήσεων
strikes: Παραπτώματα από ομάδα συντονισμού
two_factor_authentication: Πιστοποίηση 2 παραγόντων
webauthn_authentication: Κλειδιά ασφαλείας
+ severed_relationships:
+ download: Λήψη (%{count})
+ event_type:
+ account_suspension: Αναστολή λογαριασμού (%{target_name})
+ domain_block: Αναστολή διακομιστή (%{target_name})
+ user_domain_block: Απέκλεισες τον χρήστη %{target_name}
+ lost_followers: Χαμένοι ακόλουθοι
+ lost_follows: Χαμένες ακολουθήσεις
+ preamble: Μπορεί να χάσεις ακολουθήσεις και ακόλουθους όταν αποκλείεις έναν τομέα ή όταν οι συντονιστές σου αποφασίζουν να αναστείλουν έναν απομακρυσμένο διακομιστή. Όταν συμβεί αυτό, θα είσαι σε θέση να κατεβάσεις λίστες των αποκομμένων σχέσεων, για να επιθεωρούνται και ενδεχομένως να εισάγονται σε άλλο διακομιστή.
+ purged: Πληροφορίες σχετικά με αυτόν τον διακομιστή έχουν εκκαθαριστεί από τους διαχειριστές του διακομιστή σου.
+ type: Συμβάν
statuses:
attached:
audio:
@@ -1697,11 +1805,17 @@ el:
contrast: Mastodon (Υψηλή αντίθεση)
default: Mastodon (Σκοτεινό)
mastodon-light: Mastodon (Ανοιχτόχρωμο)
+ system: Αυτόματο (θέμα συστήματος)
time:
formats:
default: "%b %d, %Y, %H:%M"
month: "%b %Y"
time: "%H:%M"
+ with_time_zone: "%d %b %Y, %H:%M %Z"
+ translation:
+ errors:
+ quota_exceeded: Υπέρβαση του ορίου χρήσης για την υπηρεσία μετάφρασης για ολόκληρο τον διακομιστή.
+ too_many_requests: Υπήρξαν πάρα πολλά αιτήματα προς την υπηρεσία μετάφρασης τελευταία.
two_factor_authentication:
add: Προσθήκη
disable: Απενεργοποίηση 2FA
@@ -1735,6 +1849,9 @@ el:
subject: Το αρχείο σου είναι έτοιμο για λήψη
title: Λήψη εφεδρικού αρχείου
failed_2fa:
+ details: 'Εδώ είναι οι λεπτομέρειες της προσπάθειας σύνδεσης:'
+ explanation: Κάποιος έχει προσπαθήσει να εισέλθει στον λογαριασμό σου, αλλά παρείχε έναν μη έγκυρο δεύτερο παράγοντα ελέγχου ταυτότητας.
+ further_actions_html: Αν δεν ήσουν εσύ, σου συνιστούμε να %{action} αμέσως, καθώς μπορεί να έχει εκτεθεί.
subject: Αποτυχία ταυτοποίησης δεύτερου παράγοντα
title: Αποτυχία ελέγχου ταυτότητας δεύτερου παράγοντα
suspicious_sign_in:
@@ -1789,6 +1906,31 @@ el:
feature_action: Μάθε περισσότερα
feature_audience: Το Mastodon σού παρέχει μια μοναδική δυνατότητα διαχείρισης του κοινού σου χωρίς μεσάζοντες. Το Mastodon όταν αναπτύσσεται στη δική σου υποδομή σού επιτρέπει να ακολουθείς και να ακολουθείσαι από οποιονδήποτε άλλο συνδεδεμένο διακομιστή Mastodon και κανείς δεν τον ελέγχει, εκτός από σένα.
feature_audience_title: Χτίσε το κοινό σου με σιγουριά
+ feature_control: Εσύ ξέρεις καλύτερα τι θες να βλέπεις στην αρχική σου ροή. Δεν υπάρχουν αλγόριθμοι ή διαφημίσεις για να σπαταλάς το χρόνο σου. Ακολούθησε οποιονδήποτε σε οποιονδήποτε διακομιστή Mastodon από έναν λογαριασμό και δες τις αναρτήσεις τους με χρονολογική σειρά και κάνε τη δική σου γωνιά του ίντερνετ, λίγο πιο προσωπική.
+ feature_control_title: Διατήρησε τον έλεγχο της ροής σου
+ feature_creativity: Το Mastodon υποστηρίζει αναρτήσεις ήχου, βίντεο και εικόνας, περιγραφές για προσβασιμότητα, δημοσκοπήσεις, προειδοποιήσεις περιεχομένου, κινούμενα άβαταρ, προσαρμοσμένα εμότζι, έλεγχος περικοπής μικρογραφιών και πολλά άλλα, για να σε βοηθήσει να εκφραστείς στο διαδίκτυο. Είτε δημοσιεύεις την τέχνη σου, είτε τη μουσική σου, είτε το podcast σου, το Mastodon είναι εκεί για σένα.
+ feature_creativity_title: Ασύγκριτη δημιουργικότητα
+ feature_moderation: Το Mastodon δίνει την λήψη αποφάσεων πίσω σε σένα. Κάθε διακομιστής δημιουργεί τους δικούς του κανόνες και κανονισμούς, οι οποίοι επιβάλλονται τοπικά και όχι από πάνω προς τα κάτω όπως τα εταιρικά μέσα κοινωνικής δικτύωσης, καθιστώντας την πιο ευέλικτη στην ανταπόκριση στις ανάγκες των διαφορετικών ομάδων ανθρώπων. Γίνε μέλος σε έναν διακομιστή με τους κανόνες που συμφωνείς ή δημιούργησε τον δικό σου.
+ feature_moderation_title: Συντονισμός όπως θα έπρεπε
+ follow_action: Ακολούθησε
+ follow_step: Το να ακολουθείς ενδιαφέροντα άτομα είναι όλη η ουσία του Mastodon.
+ follow_title: Προσάρμοσε την αρχική ροή σου
+ follows_subtitle: Ακολουθήστε γνωστούς λογαριασμούς
+ follows_title: Ποιον να ακολουθήσεις
+ follows_view_more: Δες περισσότερα άτομα για να ακολουθήσεις
+ hashtags_recent_count:
+ one: "%{people} άτομο τις τελευταίες 2 ημέρες"
+ other: "%{people} άτομα τις τελευταίες 2 ημέρες"
+ hashtags_subtitle: Εξερεύνησε τις τάσεις των τελευταίων 2 ημερών
+ hashtags_title: Ετικέτες σε τάση
+ hashtags_view_more: Δες περισσότερες ετικέτες σε τάση
+ post_action: Σύνθεση
+ post_step: Πες γεια στον κόσμο με κείμενο, φωτογραφίες, βίντεο ή δημοσκοπήσεις.
+ post_title: Κάνε την πρώτη σου ανάρτηση
+ share_action: Κοινοποίηση
+ share_step: Πες στους φίλους σου πώς να σε βρουν στο Mastodon.
+ share_title: Μοιραστείτε το προφίλ σας στο Mastodon
+ sign_in_action: Σύνδεση
subject: Καλώς ήρθες στο Mastodon
title: Καλώς όρισες, %{name}!
users:
@@ -1796,9 +1938,17 @@ el:
go_to_sso_account_settings: Πήγαινε στις ρυθμίσεις λογαριασμού του παρόχου ταυτότητας σου
invalid_otp_token: Άκυρος κωδικός πιστοποίησης 2 παραγόντων
otp_lost_help_html: Αν χάσεις πρόσβαση και στα δύο, μπορείς να επικοινωνήσεις με %{email}
+ rate_limited: Πάρα πολλές προσπάθειες ελέγχου ταυτότητας, προσπάθησε ξανά αργότερα.
+ seamless_external_login: Επειδή έχεις συνδεθεί μέσω τρίτης υπηρεσίας, οι ρυθμίσεις συνθηματικού και email δεν είναι διαθέσιμες.
signed_in_as: 'Έχεις συνδεθεί ως:'
verification:
+ extra_instructions_html: Συμβουλή: Ο σύνδεσμος στην ιστοσελίδα σου μπορεί να είναι αόρατος. Το σημαντικό μέρος είναι το rel="me" που αποτρέπει την μίμηση σε ιστοσελίδες με περιεχόμενο παραγόμενο από χρήστες. Μπορείς ακόμη να χρησιμοποιήσεις μια ετικέτα συνδέσμου στην κεφαλίδα της σελίδας αντί για a, αλλά ο κώδικας HTML πρέπει να είναι προσβάσιμος χωρίς την εκτέλεση JavaScript.
+ here_is_how: Δείτε πώς
+ hint_html: Η επαλήθευση της ταυτότητας στο Mastodon είναι για όλους. Βασισμένο σε ανοιχτά πρότυπα ιστού, τώρα και για πάντα δωρεάν. Το μόνο που χρειάζεσαι είναι μια προσωπική ιστοσελίδα που ο κόσμος να σε αναγνωρίζει από αυτή. Όταν συνδέεσαι σε αυτήν την ιστοσελίδα από το προφίλ σου, θα ελέγξουμε ότι η ιστοσελίδα συνδέεται πίσω στο προφίλ σου και θα δείξει μια οπτική ένδειξη σε αυτό.
+ instructions_html: Αντέγραψε και επικόλλησε τον παρακάτω κώδικα στην HTML της ιστοσελίδας σου. Στη συνέχεια, πρόσθεσε τη διεύθυνση της ιστοσελίδας σου σε ένα από τα επιπλέον πεδία στο προφίλ σου από την καρτέλα "Επεξεργασία προφίλ" και αποθήκευσε τις αλλαγές.
verification: Πιστοποίηση
+ verified_links: Οι επαληθευμένοι σύνδεσμοι σας
+ website_verification: Επαλήθευση ιστοτόπου
webauthn_credentials:
add: Προσθήκη νέου κλειδιού ασφαλείας
create:
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index fbd48d1c31..42eae026fb 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -21,6 +21,7 @@ en-GB:
one: Post
other: Posts
posts_tab_heading: Posts
+ self_follow_error: Following your own account is not allowed
admin:
account_actions:
action: Perform action
@@ -875,6 +876,9 @@ en-GB:
message_html: You haven't defined any server rules.
sidekiq_process_check:
message_html: No Sidekiq process running for the %{value} queue(s). Please review your Sidekiq configuration
+ software_version_check:
+ action: See available updates
+ message_html: A Mastodon update is available.
software_version_critical_check:
action: See available updates
message_html: A critical Mastodon update is available, please update as quickly as possible.
@@ -1162,9 +1166,11 @@ en-GB:
use_security_key: Use security key
author_attribution:
example_title: Sample text
- hint_html: Control how you're credited when links are shared on Mastodon.
+ hint_html: Are you writing news or blog articles outside of Mastodon? Control how you get credited when they are shared on Mastodon.
+ instructions: 'Make sure this code is in your article''s HTML:'
more_from_html: More from %{name}
s_blog: "%{name}'s Blog"
+ then_instructions: Then, add the domain name of the publication in the field below.
title: Author attribution
challenge:
confirm: Continue
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fa57cd73f4..6d042c747e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -21,6 +21,7 @@ en:
one: Post
other: Posts
posts_tab_heading: Posts
+ self_follow_error: Following your own account is not allowed
admin:
account_actions:
action: Perform action
@@ -1488,9 +1489,11 @@ en:
with_login_options: Will you disable your custom css?
author_attribution:
example_title: Sample text
- hint_html: Control how you're credited when links are shared on Mastodon.
+ hint_html: Are you writing news or blog articles outside of Mastodon? Control how you get credited when they are shared on Mastodon.
+ instructions: 'Make sure this code is in your article''s HTML:'
more_from_html: More from %{name}
s_blog: "%{name}'s Blog"
+ then_instructions: Then, add the domain name of the publication in the field below.
title: Author attribution
bookmark_categories:
errors:
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index a3f968d139..35e96fe1c2 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -5,7 +5,7 @@ eo:
contact_missing: Ne elektita
contact_unavailable: Ne disponebla
hosted_on: "%{domain} estas nodo de Mastodon"
- title: Pri
+ title: Prio
accounts:
followers:
one: Sekvanto
@@ -19,8 +19,9 @@ eo:
following: Vi devas sekvi la homon, kiun vi volas proponi
posts:
one: Afiŝo
- other: Mesaĝoj
+ other: Afiŝoj
posts_tab_heading: Afiŝoj
+ self_follow_error: Sekvi vian propran konton ne estas permesita
admin:
account_actions:
action: Plenumi agon
@@ -40,7 +41,7 @@ eo:
by_domain: Domajno
change_email:
changed_msg: Retpoŝta adreso sukcese ŝanĝita!
- current_email: Nuna retadreso
+ current_email: Aktuala retadreso
label: Ŝanĝi retadreson
new_email: Nova retadreso
submit: Ŝanĝi retadreson
@@ -60,6 +61,7 @@ eo:
demote: Degradi
destroyed_msg: Datumoj de %{username} nun enviciĝis por esti forigita baldaǔ
disable: Frostigi
+ disable_sign_in_token_auth: Malebligu retpoŝtan ĵeton-aŭtentikigon
disable_two_factor_authentication: Malŝalti 2FA-n
disabled: Frostigita
display_name: Montrata nomo
@@ -68,9 +70,10 @@ eo:
email: Retpoŝto
email_status: Stato de retpoŝto
enable: Malfrostigi
+ enable_sign_in_token_auth: Ebligu retpoŝtan ĵeton-aŭtentikigon
enabled: Ebligita
enabled_msg: Sukcese malfrostigis konton de %{username}
- followers: Sekvantoj
+ followers: Sekvoj
follows: Sekvatoj
header: Kapa bildo
inbox_url: Enira URL
@@ -80,8 +83,8 @@ eo:
joined: Aliĝis
location:
all: Ĉiuj
- local: Lokaj
- remote: Foraj
+ local: Loka
+ remote: Fora
title: Loko
login_status: Ensaluta stato
media_attachments: Plurmediaj aldonaĵoj
@@ -99,7 +102,7 @@ eo:
moderation_notes: Notoj de moderigado
most_recent_activity: Lastaj afiŝoj
most_recent_ip: Lasta IP
- no_account_selected: Neniu konto estis ŝanĝita ĉar neniu estis selektita
+ no_account_selected: Neniu konto estis ŝanĝita kial neniu estis selektita
no_limits_imposed: Neniu limito trudita
no_role_assigned: Sen rolo
not_subscribed: Ne abonita
@@ -132,13 +135,14 @@ eo:
resubscribe: Reaboni
role: Rolo
search: Serĉi
+ search_same_email_domain: Aliaj uzantoj kun la sama retpoŝta domajno
search_same_ip: Aliaj uzantoj kun la sama IP
security: Sekureco
security_measures:
only_password: Nur pasvorto
password_and_2fa: Pasvorto kaj 2FA
sensitive: Tikla
- sensitized: markita tikla
+ sensitized: Markita kiel tikla
shared_inbox_url: URL de kunhavigita leterkesto
show:
created_reports: Faritaj raportoj
@@ -172,30 +176,37 @@ eo:
approve_appeal: Aprobis Apelacion
approve_user: Aprobi Uzanton
assigned_to_self_report: Atribui Raporton
+ change_email_user: Ŝanĝu retpoŝton por uzanto
change_role_user: Ŝanĝi Rolon de Uzanton
confirm_user: Konfirmi uzanton
create_account_warning: Krei averton
create_announcement: Krei Anoncon
+ create_canonical_email_block: Krei retpoŝtan blokon
create_custom_emoji: Krei Propran Emoĝion
create_domain_allow: Krei Domajnan Permeson
create_domain_block: Krei Blokadon De Domajno
+ create_email_domain_block: Krei retpoŝtan domajnan blokon
create_ip_block: Krei IP-regulon
create_unavailable_domain: Krei Nehaveblan Domajnon
create_user_role: Krei Rolon
demote_user: Malpromocii Uzanton
destroy_announcement: Forigi Anoncon
+ destroy_canonical_email_block: Forigi retpoŝtan blokon
destroy_custom_emoji: Forigi Propran Emoĝion
destroy_domain_allow: Forigi Domajnan Permeson
destroy_domain_block: Forigi blokadon de domajno
+ destroy_email_domain_block: Forigi retpoŝtan domajnan blokon
destroy_instance: Forigi Domajnon
destroy_ip_block: Forigi IP-regulon
destroy_status: Forigi Afiŝon
destroy_unavailable_domain: Forigi Nehaveblan Domajnon
destroy_user_role: Detrui Rolon
disable_2fa_user: Malebligi 2FA
- disable_custom_emoji: Malebligi proprajn emoĝiojn
+ disable_custom_emoji: Malŝalti Proprajn Bildosignojn
+ disable_sign_in_token_auth_user: Malebligi aŭtentigon per retpoŝta ĵetono por la uzanto
disable_user: Neebligi la uzanton
enable_custom_emoji: Ebligi Propran Emoĝion
+ enable_sign_in_token_auth_user: Ebligi aŭtentigon per retpoŝta ĵetono por la uzanto
enable_user: Ebligi uzanton
memorialize_account: Memorigu Konton
promote_user: Promocii Uzanton
@@ -204,49 +215,58 @@ eo:
remove_avatar_user: Forigi la profilbildon
reopen_report: Remalfermi signalon
resend_user: Resendi konfirman retmesaĝon
- reset_password_user: Restarigi pasvorton
+ reset_password_user: Restarigi Pasvorton
resolve_report: Solvitaj reporto
sensitive_account: Marki tikla la aŭdovidaĵojn de via konto
- silence_account: Silentigi konton
- suspend_account: Suspendi la konton
+ silence_account: Silentigi Konton
+ suspend_account: Suspendi Konton
unassigned_report: Malatribui Raporton
unblock_email_account: Malbloki retpoŝtadreson
- unsensitive_account: Malmarku la amaskomunikilojn en via konto kiel sentemaj
+ unsensitive_account: Malmarki Konton kiel Sentime Tikla
unsilence_account: Malsilentigi konton
unsuspend_account: Malsuspendi la konton
update_announcement: Ĝisdatigi anoncon
update_custom_emoji: Ĝisdatigi proprajn emoĝiojn
update_domain_block: Ĝigdatigi domajnan blokadon
update_ip_block: Krei IP-regulon
- update_status: Ĝisdatigi afiŝon
+ update_report: Ĝisdatigo de Raporto
+ update_status: Ĝisdatigi Afiŝon
update_user_role: Ĝisdatigi rolon
actions:
- approve_appeal_html: "%{name} aprobis apelacion kontraŭ moderiga decido de %{target}"
- approve_user_html: "%{name} aprobis registriĝon de %{target}"
+ approve_appeal_html: "%{name} aprobis apelacion kontraŭ reguliga decido de %{target}"
+ approve_user_html: "%{name} aprobis la registriĝon de %{target}"
assigned_to_self_report_html: "%{name} asignis signalon %{target} al si mem"
+ change_email_user_html: "%{name} ŝanĝis la retadreson de uzanto %{target}"
change_role_user_html: "%{name} ŝanĝis rolon de %{target}"
+ confirm_user_html: "%{name} konfirmis retadreson de uzanto %{target}"
create_account_warning_html: "%{name} sendis averton al %{target}"
create_announcement_html: "%{name} kreis novan anoncon %{target}"
- create_custom_emoji_html: "%{name} alŝutis novan emoĝion %{target}"
+ create_canonical_email_block_html: "%{name} blokis retpoŝtadreson per krado %{target}"
+ create_custom_emoji_html: "%{name} alŝutis novan bildosignon %{target}"
create_domain_allow_html: "%{name} aldonis domajnon %{target} al la blanka listo"
create_domain_block_html: "%{name} blokis domajnon %{target}"
+ create_email_domain_block_html: "%{name} blokis retpoŝtan domajnon %{target}"
create_ip_block_html: "%{name} kreis regulon por IP %{target}"
create_unavailable_domain_html: "%{name} ĉesis sendon al domajno %{target}"
create_user_role_html: "%{name} kreis rolon de %{target}"
demote_user_html: "%{name} degradis uzanton %{target}"
destroy_announcement_html: "%{name} forigis anoncon %{target}"
- destroy_custom_emoji_html: "%{name} forigis emoĝion %{target}"
+ destroy_canonical_email_block_html: "%{name} malblokis retpoŝtadreson per krado %{target}"
+ destroy_custom_emoji_html: "%{name} forigis la bildosignon %{target}"
destroy_domain_allow_html: "%{name} forigis domajnon %{target} el la blanka listo"
destroy_domain_block_html: "%{name} malblokis domajnon %{target}"
+ destroy_email_domain_block_html: "%{name} malblokis retpoŝtan domajnon %{target}"
destroy_instance_html: "%{name} forigis domajnon %{target}"
destroy_ip_block_html: "%{name} forigis regulon por IP %{target}"
destroy_status_html: "%{name} forigis mesaĝojn de %{target}"
destroy_unavailable_domain_html: "%{name} restartigis sendon al domajno %{target}"
destroy_user_role_html: "%{name} forigis rolon de %{target}"
disable_2fa_user_html: "%{name} malebligis dufaktoran aŭtentigon por uzanto %{target}"
- disable_custom_emoji_html: "%{name} malebligis la emoĝion %{target}"
+ disable_custom_emoji_html: "%{name} malebligis la bildosignon %{target}"
+ disable_sign_in_token_auth_user_html: "%{name} malebligis la aŭtentigon de retpoŝta ĵetono por %{target}"
disable_user_html: "%{name} malebligis ensaluton por uzanto %{target}"
- enable_custom_emoji_html: "%{name} ebligis la emoĝion %{target}"
+ enable_custom_emoji_html: "%{name} ebligis la bildosignon %{target}"
+ enable_sign_in_token_auth_user_html: "%{name} ebligis la aŭtentigon de retpoŝta ĵetono por %{target}"
enable_user_html: "%{name} ebligis ensaluton por uzanto %{target}"
memorialize_account_html: "%{name} ŝanĝis la konton de %{target} al memora paĝo"
promote_user_html: "%{name} plirangigis uzanton %{target}"
@@ -254,6 +274,7 @@ eo:
reject_user_html: "%{name} malakceptis registriĝon de %{target}"
remove_avatar_user_html: "%{name} forigis la profilbildon de %{target}"
reopen_report_html: "%{name} remalfermis signalon %{target}"
+ resend_user_html: "%{name} resendis konfirman retmesaĝon por %{target}"
reset_password_user_html: "%{name} restarigis la pasvorton de la uzanto %{target}"
resolve_report_html: "%{name} solvis raporton %{target}"
sensitive_account_html: "%{name} markis audovidaĵon de %{target} kiel tiklan"
@@ -265,9 +286,10 @@ eo:
unsilence_account_html: "%{name} malfaris limon al konto de %{target}"
unsuspend_account_html: "%{name} malsuspendis la konton de %{target}"
update_announcement_html: "%{name} ĝisdatigis la anoncon %{target}"
- update_custom_emoji_html: "%{name} ĝisdatigis la emoĝion %{target}"
+ update_custom_emoji_html: "%{name} ĝisdatigis la bildosignon %{target}"
update_domain_block_html: "%{name} ĝisdatigis domajnblokon por %{target}"
update_ip_block_html: "%{name} ŝanĝis regulon por IP %{target}"
+ update_report_html: "%{name} ĝisdatigis la raporton %{target}"
update_status_html: "%{name} ĝisdatigis afiŝon de %{target}"
update_user_role_html: "%{name} ŝanĝis la rolon %{target}"
deleted_account: forigita konto
@@ -277,17 +299,17 @@ eo:
title: Ĵurnalo de revizo
unavailable_instance: "(domajna nomo nedisponebla)"
announcements:
- destroyed_msg: Anonco sukcese forigita!
+ destroyed_msg: La anonco sukcese forigita!
edit:
title: Redakti anoncon
- empty: Neniu anonco trovita.
+ empty: Neniu anonco troviĝas.
live: Publikigita
new:
create: Krei anoncon
title: Nova anonco
publish: Publikigi
published_msg: Anonco sukcese publikigita!
- scheduled_for: Planigita je %{time}
+ scheduled_for: Planigota je %{time}
scheduled_msg: Anonco planigita por publikigo!
title: Anoncoj
unpublish: Malpublikigi
@@ -309,7 +331,7 @@ eo:
disabled_msg: Emoĝio sukcese malebligita
emoji: Emoĝio
enable: Ebligi
- enabled: Ebligita
+ enabled: Ŝaltita
enabled_msg: Emoĝio sukcese ebligita
image_hint: PNG aŭ GIF malpli granda ol %{size}
list: Listo
@@ -331,7 +353,7 @@ eo:
dashboard:
active_users: aktivaj uzantoj
interactions: interago
- media_storage: Konservo de plurmedioj
+ media_storage: Konservo de aŭdovidaĵoj
new_users: novaj uzantoj
opened_reports: raportoj malfermitaj
pending_appeals_html:
@@ -423,8 +445,11 @@ eo:
create: Aldoni domajnon
resolve: Solvi domajnon
title: Bloki novan retpoŝtan domajnon
+ no_email_domain_block_selected: Neniuj domajn blokoj ŝanĝiĝis ĉar nenio estis elektita
not_permitted: Ne permesita
+ resolved_dns_records_hint_html: La nomo de la domajno almontras la sekvajn MX-domajnojn, kiuj estas fine responsaj por akcepti retpoŝton. Blokas MX-domajnon blokus enskribadojn el retpoŝtadreso ajn, kiu uzas la saman MX-domajnon, eĉ se la videbla domajnnomo estas malsama. Gardemu ne bloki maĵorajn provizistojn de retpoŝto.
resolved_through_html: Solvis tra %{domain}
+ title: Blokis retpoŝtajn domajnojn
export_domain_allows:
new:
title: Importi domajnpermesojn
@@ -449,6 +474,9 @@ eo:
title: Rekomendoj de sekvado
unsuppress: Regajni sekvorekomendon
instances:
+ audit_log:
+ title: Novaj Protokoloj Pri Ekzamenoj
+ view_all: Vidu la tutan protokolon de revizio
availability:
description_html:
one: Se sendo la domajno malsukcesis por %{count} dio, ne estas sendprovo plu escepte de la dojmano.
@@ -470,7 +498,7 @@ eo:
description_html: Vi povas difini enhavopolitikojn al la ĉiuj kontoj.
limited_federation_mode_description_html: Vi povas elekti, ĉu permesi federacion kun tiu domajno.
policies:
- reject_media: Malakcepti plurmediojn
+ reject_media: Malakcepti la vidaŭdaĵojn
reject_reports: Malakcepti raportojn
silence: Kaŝu
suspend: Suspendi
@@ -516,6 +544,7 @@ eo:
total_reported: Signaloj pri ili
total_storage: Aŭdovidaj kunsendaĵoj
totals_time_period_hint_html: Sumo montritas malsupre inkluzivas datumo ekde komenco.
+ unknown_instance: Nuntempe ne ekzistas registro pri ĉi tiu domajno sur ĉi tiu servilo.
invites:
deactivate_all: Malaktivigi ĉion
filter:
@@ -574,9 +603,13 @@ eo:
resolve_description_html: Nenio okazotas al la raportita konto kaj la raporto fermotas.
silence_description_html: La konto estos videbla al nur personoj kiu jam sekvis ĝin au permane serĉo ĝin, ege limigante ĝian atingon. Malfermi ciujn raportojn kontra ĉi tiun konton.
suspend_description_html: La konto kaj ciuj ĝiaj enhavoj estos neatingebla kaj poŝte forigitas, kaj interagi per ĝi estos neebla. Malfermi ciujn raportojn kontra ĉi tiu konto.
+ actions_description_html: Elektu kiun agon fari por ripari ĉi tiun raporton. Se vi punus la raportitan uzanton, sciigon de retpoŝto sendos al ri, krom kiam la Spamo kategorio estas elektita.
actions_description_remote_html: Decidu kiun klopodon por solvi ĉi tiun raporton. Ĉi tiu efikas kiel nur via servilo komuniki per ĉi tiu fora konto kaj trakti ĝian enhavon.
actions_no_posts: Ĉi tiu raporto havas neniujn rilatajn afiŝojn por forigi
add_to_report: Aldoni pli al raporto
+ already_suspended_badges:
+ local: Jam malakceptita sur ĉi tiu servilo
+ remote: Jam malakceptita sur ilia servilo
are_you_sure: Ĉu vi certas?
assign_to_self: Asigni al mi
assigned: Asignita kontrolanto
@@ -592,6 +625,7 @@ eo:
created_at: Signalita
delete_and_resolve: Forigi afiŝojn
forwarded: Plusendita
+ forwarded_replies_explanation: Ĉi tiu raporto estas de malproksima uzanto kaj estas pri malproksima enhavo. Ĝi plusendis al vi ĉar la raportita enhavo estas rediraĵo je unu el viaj uzantoj.
forwarded_to: Plusendita al %{domain}
mark_as_resolved: Marki solvita
mark_as_sensitive: Marki kiel tiklan
@@ -635,6 +669,7 @@ eo:
delete_data_html: Forigi profilon kaj enhavojn de @%{acct} post 30 tagoj se ili ne malsuspenditas dum la dauro
preview_preamble_html: "@%{acct} akiros averton kun ĉi tiuj enhavoj:"
record_strike_html: Rekordu admonon kontra @%{acct} por helpi vi plikontroli estontajn malobservojn de ĉi tiu konto
+ send_email_html: Sendu @%{acct} retpoŝto de averto
warning_placeholder: Nedeviga aldona kialo por la moderigadago.
target_origin: Origino de raportita konto
title: Signaloj
@@ -674,6 +709,7 @@ eo:
manage_appeals: Administri Apelaciojn
manage_appeals_description: Rajtigas al uzantoj kontroli apelaciojn kontraǔ kontrolaj agoj
manage_blocks: Administri Blokojn
+ manage_blocks_description: Permesas uzantojn bloki provizistojn de retpoŝto kaj IP adresojn
manage_custom_emojis: Administri propajn emoĝiojn
manage_custom_emojis_description: Permesi uzantojn administri propajn emoĝiojn ĉe la servilo
manage_federation: Administri Federacion
@@ -691,6 +727,7 @@ eo:
manage_taxonomies: Administri kategoriarojn
manage_taxonomies_description: Permesi uzantojn kontroli popularan enhavon kaj ĝisdatigi kradvortopciojn
manage_user_access: Administri uzantoaliron
+ manage_user_access_description: Permesas uzantojn invalidi la du-faktoran aŭtentigon de aliaj uzantoj, ŝanĝi siajn retpoŝtadresojn, kaj restarigi siajn pasvorton
manage_users: Administri uzantojn
manage_users_description: Permesi uzantaojn vidi detalojn de aliaj uzantoj kaj administri ilin
manage_webhooks: Administri rethokojn
@@ -725,6 +762,7 @@ eo:
desc_html: Ĉi tio dependas de eksteraj hCaptcha-skriptoj, kiuj povas esti problemo pri sekureco kaj privateco. Ankaŭ, ĝi povas igi la registran procezon multe malpli alirebla por iuj homoj (precipe homoj kun handikapoj). Pro ĉi tiuj kialoj, bonvolu konsideri alternativajn rimedojn kiel registradon per aprobo aŭ per invito.
title: Postuli novajn uzantojn solvi CAPTCHA por konfirmi sian konton
content_retention:
+ danger_zone: Danĝera zono
preamble: Regi kiel uzantogenerita enhavo konservitis en Mastodon.
title: Enhavkonservo
default_noindex:
@@ -744,6 +782,7 @@ eo:
disabled: Al neniu
users: Al salutintaj lokaj uzantoj
registrations:
+ moderation_recommandation: Bonvolu certigi, ke vi havas taŭgan kaj reaktivan moderigan teamon antaŭ ol vi malfermas registriĝojn al ĉiuj!
preamble: Regi kiu povas krei konton ĉe via servilo.
title: Registriĝoj
registrations_mode:
@@ -751,14 +790,19 @@ eo:
approved: Bezonas aprobi por aliĝi
none: Neniu povas aliĝi
open: Iu povas aliĝi
+ warning_hint: Ni rekomendas uzi "Konsento neprigas por enskribiĝi" krom se vi memcertas, ke via teamo de moderistoj povas ellabori spamon kaj malignajn registradojn rapide.
security:
authorized_fetch: Devigi aŭtentigon de frataraj serviloj
+ authorized_fetch_hint: Neprigante aŭtentigon por federataj serviloj permesas pli striktan devigon de ambaŭ uzanto-nivelaj kaj servilo-nivelaj blokoj. Tamen, ĉi tiu uzas pli risurcojn, reduktas la ĝisiradon de viaj respondoj, kaj povas enkonduki aferoj, pri kongruoj. Plu, ĉi tiu ne preventos homojn el alporti viajn afiŝojn kaj uzantojn.
+ authorized_fetch_overridden_hint: Vi nuntempe ne povas ŝanĝi ĉi tiun agordon ĉar ĝi estas anstataŭita de mediovariablo.
+ federation_authentication: Devigado de la aŭtentigo de la federacio
title: Agordoj de la servilo
site_uploads:
delete: Forigi elŝutitan dosieron
destroyed_msg: Reteja alŝuto sukcese forigita!
software_updates:
critical_update: Kritika — bonvolu ĝisdatiĝi rapide
+ description: Ni rekomendas ĝisdatigadi vian instalaĵon de Mastodon por deutili la plej ĵusajn riparojn kaj trajtojn. Plu, estas kelkajfoje grava ĝisdati Mastodon rapide por eviti problemojn pri sekureco. Tial, Mastodon kontrolas por ĝisdataĵoj ĉiuj 30 minutoj, kaj sciigos vin laŭ viaj agordoj pri retpoŝtaj sciigoj.
documentation_link: Lerni pli
release_notes: Eldono-notoj
title: Disponeblaj ĝisdatigoj
@@ -766,6 +810,7 @@ eo:
types:
major: Ĉefa eldono
minor: Neĉefa eldono
+ patch: Eldono de flikaĵo — korektoj de eraroj kaj facile apliki ŝanĝojn
version: Versio
statuses:
account: Skribanto
@@ -807,10 +852,20 @@ eo:
system_checks:
database_schema_check:
message_html: Estas pritraktataj datumbazaj migradoj. Bonvolu ekzekuti ilin por certigi, ke la apliko kondutas kiel atendite
+ elasticsearch_health_red:
+ message_html: Elasticsearch peniko estas malsana (ruĝa statuso), trajtoj de serĉo malhaveblas
+ elasticsearch_health_yellow:
+ message_html: Peniko de Elasticsearch malsana (flava status), vi eble povas enketi la kialon
+ elasticsearch_index_mismatch:
+ message_html: Bildigoj de enhavtabelo de Elasticsearch posttempas. Bonvolu, rulu tootctl search deploy --only=%{value}
elasticsearch_preset:
action: Legi dokumentaron
+ message_html: Via peniko de Elasticsearch havas pli ol unu verticon, sed Mastodon ne estas agordita uzi ilin.
elasticsearch_preset_single_node:
action: Vidi dokumentadon
+ message_html: Via peniko de Elasticsearch havas nur unu verticon, ES_PRESET devus munti al single_node_cluster.
+ elasticsearch_reset_chewy:
+ message_html: Via enhavtabelo de la sistemo de Elasticsearch posttempas pro ŝanĝo de agordoj. Bonvolu, rulu tootctl search deploy --reset-chewy por ĝisdatigi ĝin.
elasticsearch_running_check:
message_html: Ne eblas konekti Elasticsearch. Bonvolu kontroli ke ĝi funkcias, aǔ malŝaltu plentekstan serĉon
elasticsearch_version_check:
@@ -822,11 +877,14 @@ eo:
sidekiq_process_check:
message_html: Neniu Sidekiq-procezo por la %{value} vico
software_version_check:
+ action: Vidi disponeblajn ĝisdatigojn
message_html: Mastodon-ĝisdatigo disponeblas.
software_version_critical_check:
action: Vidi disponeblajn ĝisdatigojn
+ message_html: Grava ĝisdatigo de Mastodon disponeblas, bonvolu ĝisdatigi kiel eble plej rapide.
software_version_patch_check:
action: Vidi disponeblajn ĝisdatigojn
+ message_html: Ĝisdataĵo de Mastodon pri cimriparo haveblas.
upload_check_privacy_error:
action: Klaku ĉi tie por pliaj informoj
message_html: "Via retservilo estas misagordita. La privateco de viaj uzantoj estas en risko."
@@ -835,10 +893,20 @@ eo:
message_html: "Via objektostokado estas misagordita. La privateco de viaj uzantoj estas en risko."
tags:
moderation:
+ not_trendable: Ne modebla
+ not_usable: Ne uzebla
+ pending_review: Pendata superrigardo
+ review_requested: Revizio petita
+ reviewed: Reviziita
title: Stato
+ trendable: Modebla
+ unreviewed: Nereviziita
+ usable: Uzebla
name: Nomo
newest: Plej novaj
oldest: Plej malnovaj
+ open: Vidu publike
+ reset: Restartigi
review: La statuso de la recenzo
search: Serĉi
title: Kradvortoj
@@ -854,7 +922,9 @@ eo:
allow: Permesi ligilon
allow_provider: Permesi publikiganto
confirm_allow: Ĉu vi certas, ke vi volas permesi elektitajn ligilojn?
+ confirm_allow_provider: Ĉu vi certas, ke vi volas permesi elektitajn provizantojn?
confirm_disallow: Ĉu vi certas, ke vi volas malpermesi elektitajn ligilojn?
+ confirm_disallow_provider: Ĉu vi certas, ke vi volas malpermesi elektitajn provizantojn?
description_html: Ĉioj estas ligiloj kiuj nun diskonitajs multe de kontoj kiujn via servilo vidas. Ligiloj ne montritas publike se vi ne aprobis la publikiganton.
disallow: Malpermesi ligilon
disallow_provider: Malpermesi publikiganton
@@ -878,7 +948,9 @@ eo:
statuses:
allow: Permesi afiŝon
allow_account: Permesi aŭtoron
+ confirm_allow: Ĉu vi certas, ke vi volas permesi elektitajn statusojn?
confirm_allow_account: Ĉu vi certas, ke vi volas permesi elektitajn kontojn?
+ confirm_disallow: Ĉu vi certas, ke vi volas malpermesi elektitajn statusojn?
confirm_disallow_account: Ĉu vi certas, ke vi volas malpermesi elektitajn kontojn?
description_html: Oni multe diskonigas kaj stelumas ĉi tiujn mesaĝojn nuntempe laŭ via servilo. Tio povas helpi novajn kaj revenantajn uzantojn trovi pli da homoj por sekvi. Mesaĝo estas montrita publike nur se vi aprobis la aŭtoron kaj se la aŭtoro aprobis ke ties konto estu proponita al aliaj. Vi ankaŭ povas permesi aŭ malakcepti specifajn mesaĝojn.
disallow: Malpermesi afiŝon
@@ -912,12 +984,14 @@ eo:
used_by_over_week:
one: Uzita de 1 persono ekde lasta semajno
other: Uzita de %{count} personoj ekde lasta semajno
+ title: Rekomendoj kaj Tendencoj
trending: Popularaĵoj
warning_presets:
add_new: Aldoni novan
delete: Forigi
edit_preset: Redakti avertan antaŭagordon
empty: Vi ankoraŭ ne difinis iun ajn antaŭagordon de averto.
+ title: Antaŭdifinoj de averto
webhooks:
add_new: Aldoni finpunkton
delete: Forigi
@@ -939,6 +1013,9 @@ eo:
title: Rethokoj
webhook: Rethoko
admin_mailer:
+ auto_close_registrations:
+ body: Pro seneco de ĵusaj aktivaĵoj de moderistoj, enskribadojn en %{instance} aŭtomate ŝanĝis al mana superrigardo, por eviti %{instance} estas uzita por eblaj fiuloj. Vi povas reŝanĝi ĝin al malfermaj enskribadoj iam ajn.
+ subject: Enskribadoj por %{instance} aŭtomate ŝanĝis al mana konsento
new_appeal:
actions:
delete_statuses: por forigi iliajn afiŝojn
@@ -951,6 +1028,9 @@ eo:
body: "%{target} apelacias kontroldecido de %{action_taken_by} de %{date}, kiu estas %{type}. Ĝi skribis:"
next_steps: Vi povas aprobi apelacion por malfari kontroldecidon au ignori.
subject: "%{username} apelacias kontroldecidon ĉe %{instance}"
+ new_critical_software_updates:
+ body: Novaj gravaj versioj de Mastodon estis publikigitaj, vi eble volas ĝisdatigi kiel eble plej baldaŭ!
+ subject: Sojlaj ĝisdataĵoj de Mastodon haveblas por %{instance}!
new_pending_account:
body: La detaloj de la nova konto estas ĉi-sube. Vi povas akcepti aŭ malakcepti tiun aliĝilon.
subject: Nova konto atendas por recenzo en %{instance} (%{username})
@@ -960,6 +1040,7 @@ eo:
subject: Nova signalo por %{instance} (#%{id})
new_software_updates:
body: Novaj versioj de Mastodon estis publikigitaj, vi eble volas ĝisdatigi!
+ subject: Novaj versioj de Mastodon disponeblas por %{instance}!
new_trends:
body: 'La eroj bezonas kontrolon antau ol ili povas montritas publike:'
new_trending_links:
@@ -1007,10 +1088,15 @@ eo:
apply_for_account: Peti konton
captcha_confirmation:
help_html: Se vi havas problemojn solvi la CAPTCHA, vi povas kontakti nin per %{email} kaj ni povas helpi vin.
+ hint_html: Nur unu plia afero! Ni devas konfirmi, ke vi estas homo (tio estas por ke ni povu konservi la spamon ekstere!). Solvu la CAPTCHA sube kaj alklaku "Daŭrigu".
title: Sekureckontrolo
confirmations:
+ awaiting_review: Via retpoŝtadreso estas konfirmita! La teamo de %{domain} nun superrigardas vian enskribiĝon. Vi ricevos retpoŝton, se ili aprobos vian konton!
+ awaiting_review_title: Via registriĝo estas reviziita
clicking_this_link: alklakante ĉi tiun ligilon
login_link: ensaluti
+ proceed_to_login_html: Vi nun povas iri al %{login_link}.
+ redirect_to_app_html: Vi devus sendigi al la %{app_name} aplikaĵo. Se tion ne okazis, provu %{clicking_this_link} aŭ mane reiras al la aplikaĵo.
registration_complete: Via registriĝo sur %{domain} nun finiĝis!
welcome_title: Bonvenon, %{name}!
wrong_email_hint: Se tiu retadreso ne estas ĝusta, vi povas ŝanĝi ĝin en kontagordoj.
@@ -1056,25 +1142,35 @@ eo:
security: Sekureco
set_new_password: Elekti novan pasvorton
setup:
+ email_below_hint_html: Kontrolu vian spam-dosierujon aŭ petu novan. Se necese, vi povas korekti vian retadreson.
+ email_settings_hint_html: Enklaku la ligilon, ke ni sendis al vi por kontroli %{email}. Ni estos tien.
link_not_received: Ĉu vi ne ricevis ligilon?
+ new_confirmation_instructions_sent: Vi ricevos novan retpoŝton kun la konfirma ligilo post kelkaj minutoj!
title: Kontrolu vian retpoŝta enirkesto
sign_in:
preamble_html: Ensalutu per via detaloj de %{domain}. Se via konto gastigantigas sur malsama servilo, vi ne povas ensaluti ĉi tie.
title: Saluti en %{domain}
sign_up:
+ manual_review: Enskriboj en %{domain} havas manan superrigardon, farita de niaj moderistoj. Por helpi nin por procezi vian enskribon, skribu ion pri vi mem, kaj kial vi volas konton en %{domain}.
preamble: Per konto ĉe ĉi tiu Mastodon-servilo, vi povas sekvi ajn personojn en la reto.
title: Ni pretigu vin ĉe %{domain}.
status:
account_status: Statuso de la konto
+ confirming: Atendante ke retpoŝta konfirmo estos kompletigita.
functional: Via konto estas tute funkcia.
+ pending: Via apliko estas superrigardata de niaj teamo. Ĉi tiu povas bezoni iom da tempo. Vi ricevos retpoŝton, se via apliko estas konsentita.
redirecting_to: Via konto estas neaktiva ĉar ĝi nun alidirektas al %{acct}.
+ self_destruct: Pro %{domain} ekfermas, vi povos nur havi malvastan atingon al via konto.
view_strikes: Vidi antauaj admonoj kontra via konto
too_fast: Formularo sendita tro rapide, klopodu denove.
use_security_key: Uzi sekurecan ŝlosilon
author_attribution:
example_title: Ekzempla teksto
+ hint_html: Ĉu vi skribas novaĵojn aŭ blogartikolojn ekster Mastodon? Kontrolu kiel vi estas kreditita kiam ili estas kunhavataj ĉe Mastodon.
+ instructions: 'Certigu, ke ĉi tiu kodo estas en la HTML de via artikolo:'
more_from_html: Pli de %{name}
s_blog: Blogo de %{name}
+ then_instructions: Poste, aldonu la domajnan nomon de la publikigado en la suba kampo.
title: Atribuo de aŭtoro
challenge:
confirm: Daŭrigi
@@ -1112,6 +1208,9 @@ eo:
before: 'Antau ol dauri, legu ĉi tiujn notojn zorgeme:'
caches: Enhavo kiu kaŝmemorigitas de aliaj serviloj eble restas
data_removal: Viaj afiŝoj kaj aliaj informoj estos forigita por eterne
+ email_change_html: Vi povas ŝanĝi vian retadreson sen forigi vian konton
+ email_contact_html: Se ĝi ankoraŭ ne alvenas, vi povas retpoŝti al %{email} por helpo
+ email_reconfirmation_html: Se vi ne ricevas la konfirmretpoŝton, vi povas denove peti
irreversible: Vi ne povas regajni au reaktivigi vian konton
more_details_html: Por pli da detaloj, vidi la privatecan politikon.
username_available: Via uzantnomo iĝos denove disponebla
@@ -1148,6 +1247,7 @@ eo:
your_appeal_rejected: Via apelacio malakceptitas
edit_profile:
basic_information: Baza informo
+ hint_html: "Personigi, kion homoj vidi en via publika profilo kaj apud viaj afiŝoj. Aliaj homoj estas pli probable resekvi vin kaj interagi kun vi se vi havus finigitan profilon kaj profilan foton."
other: Alia
errors:
'400': La peto kiun vi sendis estas nevalida au malformas.
@@ -1167,8 +1267,8 @@ eo:
Por uzi la retan aplikaĵon de Mastodon, bonvolu ebligi JavaScript. Alimaniere, provu unu el la
operaciumaj aplikaĵoj por Mastodon por via platformo.
existing_username_validator:
- not_found: Ne povas trovi lokaj uzanto kun tiu uzantnomo
- not_found_multiple: Ne povas trovi %{usernames}
+ not_found: ne povas trovi lokaj uzanto kun tiu uzantnomo
+ not_found_multiple: ne povas trovi %{usernames}
exports:
archive_takeout:
date: Dato
@@ -1270,15 +1370,34 @@ eo:
merge_long: Konservi ekzistajn registrojn kaj aldoni novajn
overwrite: Anstataŭigi
overwrite_long: Anstataŭigi la nunajn registrojn per la novaj
+ overwrite_preambles:
+ blocking_html: Vi estas anstataŭonta vian blokliston per ĝis %{total_items} kontoj de %{filename}.
+ bookmarks_html: Vi estas anstataŭonta viajn legosignojn per ĝis %{total_items} afiŝoj de %{filename}.
+ domain_blocking_html: Vi estas anstataŭonta vian domajnan blokliston per ĝis %{total_items} domajnoj de %{filename}.
+ following_html: Vi estas sekvonta ĝis %{total_items} kontoj de %{filename} kaj ĉesos sekvi iun alian.
+ lists_html: Vi estas anstataŭonta viajn listojn per enhavo de %{filename}. Ĝis %{total_items} kontoj estos aldonitaj al novaj listoj.
+ muting_html: Vi estas anstataŭonta viajn listojn de silentigitaj kontoj per ĝis%{total_items} kontoj de %{filename}.
+ preambles:
+ blocking_html: Vi estas blokonta ĝis %{total_items} kontoj de %{filename}.
+ bookmarks_html: Vi estas aldononta ĝis %{total_items} afiŝojn de %{filename} al viaj legosignoj.
+ domain_blocking_html: Vi estas blokonta ĝis %{total_items} domajnoj de %{filename}.
+ following_html: Vi estas sekvonta ĝis %{total_items} kontoj de %{filename}.
+ lists_html: Vi estas aldononta ĝis %{total_items} kontojn de %{filename} al viaj listoj. Novaj listoj estos kreitaj se ne estas listo por aldoni.
+ muting_html: Vi estas silentonta ĝis %{total_items} kontoj de %{filename}.
preface: Vi povas importi datumojn, kiujn vi eksportis el alia servilo, kiel liston de homoj, kiujn vi sekvas aŭ blokas.
recent_imports: Lastatempaj importoj
states:
finished: Finita
in_progress: Farata
+ scheduled: Planitaj
unconfirmed: Nekonfirmita
status: Stato
success: Viaj datumoj estis sukcese alŝutitaj kaj estos traktitaj kiel planite
+ time_started: Komencis je
titles:
+ blocking: Enportante blokitajn kontojn
+ bookmarks: Enportante legosignojn
+ domain_blocking: Enportante blokitajn domajnojn
following: Importado de sekvaj kontoj
lists: Importi listojn
muting: Importado de silentigitaj kontoj
@@ -1324,6 +1443,7 @@ eo:
authentication_methods:
otp: 2-faktora autentigprogramaro
password: pasvorto
+ sign_in_token: retpoŝta sekureca kodo
webauthn: sekurecaj ŝlosiloj
description_html: Se vi vidas nerekonitan agon, eble ŝanĝu vian pasvorton.
empty: Neniu autentighistorio disponebla
@@ -1334,11 +1454,22 @@ eo:
unsubscribe:
action: Jes, malabonu
complete: Malabonita
+ confirmation_html: Ĉu vi certas, ke vi volas malaboni je ricevi %{type} por Mastodon ĉe %{domain} al via retpoŝto ĉe %{email}? Vi ĉiam povas reaboni de viaj retpoŝtaj sciigaj agordoj.
+ emails:
+ notification_emails:
+ favourite: sciigoj retpoŝtaj de ŝatataj
+ follow: sciigoj retpoŝtaj de sekvoj
+ follow_request: retpoŝtajn petoj de sekvado
+ mention: sciigoj retpoŝtaj de mencioj
+ reblog: sciigoj retpoŝtaj de diskonigoj
+ resubscribe_html: Se vi malabonis erare, vi povas reaboni de viaj retpoŝtaj sciigaj agordoj.
+ success_html: Vi ne plu ricevos %{type} por Mastodon ĉe %{domain} al via retpoŝto ĉe %{email}.
title: Malaboni
media_attachments:
validations:
images_and_video: Aldoni videon al mesaĝo, kiu jam havas bildojn ne eblas
- not_ready: Ne povas aldoni dosieron kiu ne finas procezitis.
+ not_found: Dosiero %{ids} ne trovis aŭ jam alteniĝis al alia afiŝo
+ not_ready: Ne povas aldoni dosieron kiu ne finis procezitis.
too_many: Aldoni pli ol 4 dosierojn ne eblas
migrations:
acct: Movigita al
@@ -1414,6 +1545,8 @@ eo:
update:
subject: "%{name} redaktis afiŝon"
notifications:
+ administration_emails: Sciigoj retpoŝtaj de administacio
+ email_events: Eventoj por retpoŝtaj sciigoj
email_events_hint: 'Elekti la eventojn pri kioj vi volas ricevi sciigojn:'
number:
human:
@@ -1470,6 +1603,9 @@ eo:
errors:
limit_reached: Limito de malsamaj reagoj atinginta
unrecognized_emoji: ne estas rekonita emoĝio
+ redirects:
+ prompt: Se vi fidas ĉi tiun ligon, alklaku ĝin por daŭrigi.
+ title: Vi foriras %{instance}.
relationships:
activity: Konta aktiveco
confirm_follow_selected_followers: Ĉu vi certas ke vi volas sekvi la elektitajn sekvantojn?
@@ -1564,19 +1700,30 @@ eo:
delete: Konta forigo
development: Evoluigado
edit_profile: Redakti profilon
+ export: Eksporti
featured_tags: Elstarigitaj kradvortoj
import: Enporti
import_and_export: Importi kaj eksporti
migrate: Konta migrado
+ notifications: Retpoŝtaj sciigoj
preferences: Preferoj
- profile: Profilo
+ profile: Publika profilo
relationships: Sekvatoj kaj sekvantoj
+ severed_relationships: Finitaj rilatoj
statuses_cleanup: Automata mesaĝforigo
strikes: Kontroladmonoj
two_factor_authentication: Dufaktora aŭtentigo
webauthn_authentication: Sekurecaj ŝlosiloj
severed_relationships:
+ download: Elŝuti (%{count})
+ event_type:
+ account_suspension: Suspendado de konto (%{target_name})
+ domain_block: Suspendado de servilo (%{target_name})
+ user_domain_block: Vi blokis %{target_name}
lost_followers: Perditaj sekvantoj
+ lost_follows: Perditaj sekvantoj
+ preamble: Vi eble perdos sekvojn kaj sekvantojn, kiam vi blockus domajnon aŭ kiam viaj moderantoj elektus suspendi malproksiman servilon. Kiam tio okazas, vi povus elŝulti registrojn de finitaj rilatoj, por inspektiĝi kaj eble enporti en alia servilo.
+ purged: Informo pri ĉi tiu servilo foriĝis de la administracio de via servilo.
type: Evento
statuses:
attached:
@@ -1660,11 +1807,13 @@ eo:
contrast: Mastodon (Forta kontrasto)
default: Mastodon (Malhela)
mastodon-light: Mastodon (Hela)
+ system: Aŭtomata (uzu sisteman temon)
time:
formats:
default: "%Y.%b.%d, %H:%M"
month: "%b %Y"
time: "%H:%M"
+ with_time_zone: "%b %d, %Y, %H:%M %Z"
translation:
errors:
quota_exceeded: La tutservila uzkvoto por la tradukservo estas superita.
@@ -1689,15 +1838,24 @@ eo:
action: Konto-agordoj
explanation: La apelacio de la admono kontra via konto je %{strike_date} pri sendodato %{appeal_date} aprobitas.
subject: Via apelacio de %{date} aprobitas
+ subtitle: Via konto estas denove bone.
title: Apelacio estis aprobita
appeal_rejected:
explanation: La apelacio je %{strike_date} pri dato %{appeal_date} malakceptitas.
subject: Via apelacio de %{date} estis malaprobita
+ subtitle: Via revizio negiĝis.
title: Apelacio estis malaprobita
backup_ready:
+ explanation: Vi petis por tuta rezervo de via Mastodon-a konto.
extra: Estas nun preta por elŝuto!
subject: Via arkivo estas preta por elŝutado
title: Arkiva elŝuto
+ failed_2fa:
+ details: 'Jen detaloj de la provaĵo de ensaluti:'
+ explanation: Iu provis ensaluti al via konto sed provizis nevalidan duan aŭtentikigfaktoron.
+ further_actions_html: Se ĉi tio ne estis vi, ni rekomendas ke vi %{action} tuj ĉar ĝi povas esti endanĝerigita.
+ subject: Malsukceso dum la dua aŭtentikigfaktoro
+ title: Du-faktora aŭtentigo malsukcesis
suspicious_sign_in:
change_password: ŝanĝi vian pasvorton
details: 'Ĉi-sube estas detaloj pri la saluto:'
@@ -1737,18 +1895,43 @@ eo:
silence: Konto limigita
suspend: Konto suspendita
welcome:
+ apps_android_action: Akiru ĝin ĉe Google Play
+ apps_ios_action: Elŝutu ĉe la App Store
apps_step: Elŝutu niajn oficialajn aplikaĵojn.
apps_title: Aplikaĵoj de Mastodon
+ checklist_subtitle: 'Nin eku vin en ĉi tiu nova socia rando:'
+ checklist_title: Bonvenan Markolisto
edit_profile_action: Agordi
+ edit_profile_step: Plibonigi viajn interagojn per havas finitan profilon.
edit_profile_title: Agordi vian profilon
explanation: Jen kelkaj konsiloj por helpi vin komenci
feature_action: Lerni pli
+ feature_audience: Mastodon provizas vin per unika eblo por administri vian sekvantaron sen perantoj. Mastodon disponigita en via propra infrastrukturo ebligas al vi sekvi kaj esti sekvita de alia ajn Mastodon-servilo kaj estas tute sub via kontrolo nure.
+ feature_audience_title: Konstruu vian spektantaron memfide
+ feature_control: Vi scias plej bone, kion vi volas vidi en via hejmtemplinio. Neniaj algoritmoj nek reklamoj por malŝpari vian tempon. Sekvu iun ajn trans Mastodon-servilo ajn el unu konto kaj ricevu iliajn afiŝojn kronologie, kaj igu vian ejon de reto iom pli kiel vi.
+ feature_control_title: Havu la kontrolon de via propra templinio
+ feature_creativity: Mastodon subtenas aŭdaj, videajn kaj bildajn afiŝojn, priskribojn alireblecajn, enketojn, avertojn pri enhavo, animitajn bildetojn, personajn emoĝiojn, stucan kontrolon de bildetoj, kaj pli, por helpi al vi esprimi vin rete. Ĉu vi publikigas vian arton, vian muzikon, aŭ viajn podkastojn, Mastodon estas por vi.
+ feature_creativity_title: Senkompara kreemeco
+ feature_moderation: Mastodon denove donas al vi decidpovon. Ĉiu servilo kreas siajn proprajn regulojn kaj gvidliniojn, kiuj estas devigitaj loke kaj ne desupre kiel en firmaaj sociaj retejoj, igante ĝin la plej agordebla respondante al la bezonoj de malsamaj aroj de homoj. Aliĝu servilon kun la reguloj, kun kiuj vi konsentas, aŭ gastigu vian propran.
+ feature_moderation_title: Moderante kiel ĝi devus esti
follow_action: Sekvi
+ follow_step: Sekvi interesajn homojn estas pri kio Mastodon temas.
+ follow_title: Personigu vian hejmtemplinion
+ follows_subtitle: Sekvu konatajn kontojn
+ follows_title: Kiun sekvi
+ follows_view_more: Rigardu pli da homoj por sekvi
+ hashtags_recent_count:
+ one: "%{people} homo en la pasintaj 2 tagoj"
+ other: "%{people} homoj en la pasintaj 2 tagoj"
+ hashtags_subtitle: Esploru kio estas tendenco ekde la pasintaj 2 tagoj
hashtags_title: Popularaj kradvortoj
hashtags_view_more: Vidi pli da popularaj kradvortoj
+ post_action: Redakti
post_step: Salutu la mondon per teksto, fotoj, filmetoj aŭ balotenketoj.
post_title: Faru vian unuan afiŝon
+ share_action: Kundividi
share_step: Sciigu viajn amikojn kiel trovi vin sur Mastodon.
+ share_title: Kunhavigu vian Mastodon-profilon
sign_in_action: Ensaluti
subject: Bonvenon en Mastodon
title: Bonvenon, %{name}!
@@ -1758,6 +1941,7 @@ eo:
invalid_otp_token: Nevalida kodo de dufaktora aŭtentigo
otp_lost_help_html: Se vi perdas aliron al ambaŭ, vi povas kontakti %{email}
rate_limited: Estas tro multaj aŭtentigaj provoj, reprovu poste.
+ seamless_external_login: Vi estas ensalutinta per ekstera servo, do pasvortaj kaj retpoŝtaj agordoj ne estas disponeblaj.
signed_in_as: 'Salutinta kiel:'
verification:
extra_instructions_html: Konsilo: La ligilo en via retejo povas esti nevidebla. La grava parto estas rel="me", kiu evitas identoŝtelon en retejoj kun enhavo generita de uzantoj. Vi povas eĉ uzi link-etikedon en la header de la paĝo anstataŭ a, sed la HTML devas esti atingebla sen plenumado de JavaScript.
@@ -1766,6 +1950,7 @@ eo:
instructions_html: Kopiu kaj algluu la jenan kodon en la HTML de via retejo. Poste aldonu la adreson de via retejo en unu el la kromaj kampoj de via profilo en la langeto "Redakti profilon" kaj konservu la ŝanĝojn.
verification: Kontrolo
verified_links: Via kontrolitaj ligiloj
+ website_verification: Reteja konfirmo
webauthn_credentials:
add: Aldoni novan sekurecan ŝlosilon
create:
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 49b8f288fa..b3fe023417 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -21,6 +21,7 @@ es-AR:
one: Mensaje
other: Mensajes
posts_tab_heading: Mensajes
+ self_follow_error: No está permitido seguir tu propia cuenta
admin:
account_actions:
action: Ejecutar acción
@@ -1165,9 +1166,11 @@ es-AR:
use_security_key: Usar la llave de seguridad
author_attribution:
example_title: Texto de ejemplo
- hint_html: Controlá cómo se te da crédito cuando los enlaces son compartidos en Mastodon.
+ hint_html: "¿Escribís artículos de noticias o de blog fuera de Mastodon? Controlá cómo se te acredita cuando se comparten en Mastodon."
+ instructions: 'Asegurate de que este código está en el HTML de tu artículo:'
more_from_html: Más de %{name}
s_blog: Blog de %{name}
+ then_instructions: Luego, agregá el nombre de dominio de la publicación en el campo de abajo.
title: Atribución del autor
challenge:
confirm: Continuar
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 0f4c8452c0..5ed74a1c4b 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -18,9 +18,10 @@ es-MX:
pin_errors:
following: Debes estar siguiendo a la persona a la que quieres aprobar
posts:
- one: Toot
- other: Toots
- posts_tab_heading: Toots
+ one: Publicación
+ other: Publicaciones
+ posts_tab_heading: Publicaciones
+ self_follow_error: No se permite seguir tu propia cuenta
admin:
account_actions:
action: Realizar acción
@@ -56,18 +57,18 @@ es-MX:
confirming: Confirmando
custom: Personalizado
delete: Eliminar datos
- deleted: Borrado
+ deleted: Eliminado
demote: Degradar
destroyed_msg: Los datos de %{username} están ahora en cola para ser eliminados inminentemente
disable: Deshabilitar
disable_sign_in_token_auth: Deshabilitar la autenticación por token de correo electrónico
disable_two_factor_authentication: Desactivar autenticación de dos factores
disabled: Deshabilitada
- display_name: Nombre
+ display_name: Nombre para mostrar
domain: Dominio
edit: Editar
- email: E-mail
- email_status: E-mail Status
+ email: Correo electrónico
+ email_status: Estado del correo electrónico
enable: Habilitar
enable_sign_in_token_auth: Habilitar la autenticación por token de correo electrónico
enabled: Habilitada
@@ -85,8 +86,8 @@ es-MX:
local: Local
remote: Remoto
title: Localización
- login_status: Estado del login
- media_attachments: Multimedia
+ login_status: Estado de la sesión
+ media_attachments: Archivos multimedia
memorialize: Convertir en memorial
memorialized: Cuenta conmemorativa
memorialized_msg: "%{username} se convirtió con éxito en una cuenta conmemorativa"
@@ -148,7 +149,7 @@ es-MX:
targeted_reports: Reportes hechos sobre esta cuenta
silence: Silenciar
silenced: Silenciado
- statuses: Estados
+ statuses: Publicaciones
strikes: Amonestaciones previas
subscribe: Suscribir
suspend: Suspender
@@ -180,24 +181,24 @@ es-MX:
confirm_user: Confirmar Usuario
create_account_warning: Crear Advertencia
create_announcement: Crear Anuncio
- create_canonical_email_block: Crear Bloqueo de Correo Electrónico
+ create_canonical_email_block: Crear bloqueo de correo electrónico
create_custom_emoji: Crear Emoji Personalizado
create_domain_allow: Crear Permiso de Dominio
create_domain_block: Crear Bloqueo de Dominio
- create_email_domain_block: Crear Bloqueo de Dominio de Correo Electrónico
+ create_email_domain_block: Crear bloqueo de dominio de correo electrónico
create_ip_block: Crear regla IP
create_unavailable_domain: Crear Dominio No Disponible
create_user_role: Crear rol
demote_user: Degradar Usuario
destroy_announcement: Eliminar Anuncio
- destroy_canonical_email_block: Eliminar Bloqueo de Correo Electrónico
+ destroy_canonical_email_block: Eliminar bloqueo de correo electrónico
destroy_custom_emoji: Eliminar Emoji Personalizado
destroy_domain_allow: Eliminar Permiso de Dominio
destroy_domain_block: Eliminar Bloqueo de Dominio
- destroy_email_domain_block: Eliminar Bloqueo de Dominio de Correo Electrónico
+ destroy_email_domain_block: Eliminar bloqueo de dominio de correo electrónico
destroy_instance: Purgar dominio
destroy_ip_block: Eliminar regla IP
- destroy_status: Eliminar Estado
+ destroy_status: Eliminar Publicación
destroy_unavailable_domain: Eliminar Dominio No Disponible
destroy_user_role: Destruir Rol
disable_2fa_user: Deshabilitar 2FA
@@ -229,7 +230,7 @@ es-MX:
update_domain_block: Actualizar el Bloqueo de Dominio
update_ip_block: Actualizar regla IP
update_report: Actualizar informe
- update_status: Actualizar Estado
+ update_status: Actualizar Publicación
update_user_role: Actualizar Rol
actions:
approve_appeal_html: "%{name} aprobó la solicitud de moderación de %{target}"
@@ -240,7 +241,7 @@ es-MX:
confirm_user_html: "%{name} confirmó la dirección de correo electrónico del usuario %{target}"
create_account_warning_html: "%{name} envió una advertencia a %{target}"
create_announcement_html: "%{name} ha creado un nuevo anuncio %{target}"
- create_canonical_email_block_html: "%{name} bloqueó el correo electrónico con el hash %{target}"
+ create_canonical_email_block_html: "%{name} ha bloqueado el correo electrónico con el hash %{target}"
create_custom_emoji_html: "%{name} subió un nuevo emoji %{target}"
create_domain_allow_html: "%{name} permitió la federación con el dominio %{target}"
create_domain_block_html: "%{name} bloqueó el dominio %{target}"
@@ -250,22 +251,22 @@ es-MX:
create_user_role_html: "%{name} creó el rol %{target}"
demote_user_html: "%{name} degradó al usuario %{target}"
destroy_announcement_html: "%{name} eliminó el anuncio %{target}"
- destroy_canonical_email_block_html: "%{name} desbloqueó el correo electrónico con el hash %{target}"
+ destroy_canonical_email_block_html: "%{name} ha desbloqueado el correo electrónico con el hash %{target}"
destroy_custom_emoji_html: "%{name} eliminó el emoji %{target}"
destroy_domain_allow_html: "%{name} bloqueó la federación con el dominio %{target}"
destroy_domain_block_html: "%{name} desbloqueó el dominio %{target}"
destroy_email_domain_block_html: "%{name} desbloqueó el dominio de correo electrónico %{target}"
destroy_instance_html: "%{name} purgó el dominio %{target}"
destroy_ip_block_html: "%{name} eliminó una regla para la IP %{target}"
- destroy_status_html: "%{name} eliminó el estado por %{target}"
+ destroy_status_html: "%{name} eliminó la publicación por %{target}"
destroy_unavailable_domain_html: "%{name} reanudó las entregas al dominio %{target}"
destroy_user_role_html: "%{name} eliminó el rol %{target}"
disable_2fa_user_html: "%{name} desactivó el requisito de dos factores para el usuario %{target}"
disable_custom_emoji_html: "%{name} desactivó el emoji %{target}"
- disable_sign_in_token_auth_user_html: "%{name} ha deshabilitado la autenticación por token de correo electrónico para %{target}"
+ disable_sign_in_token_auth_user_html: "%{name} desactivó la autenticación por token de correo electrónico para %{target}"
disable_user_html: "%{name} deshabilitó el inicio de sesión para el usuario %{target}"
enable_custom_emoji_html: "%{name} activó el emoji %{target}"
- enable_sign_in_token_auth_user_html: "%{name} ha habilitado la autenticación por token de correo electrónico para %{target}"
+ enable_sign_in_token_auth_user_html: "%{name} activó autenticación por token de correo electrónico para %{target}"
enable_user_html: "%{name} habilitó el inicio de sesión para el usuario %{target}"
memorialize_account_html: "%{name} convirtió la cuenta de %{target} en una página in memoriam"
promote_user_html: "%{name} promoción al usuario %{target}"
@@ -273,7 +274,7 @@ es-MX:
reject_user_html: "%{name} rechazó el registro de %{target}"
remove_avatar_user_html: "%{name} eliminó el avatar de %{target}"
reopen_report_html: "%{name} reabrió el informe %{target}"
- resend_user_html: "%{name} ha reenviado el correo de confirmación para %{target}"
+ resend_user_html: "%{name} reenvió correo electrónico de confirmación para %{target}"
reset_password_user_html: "%{name} reinició la contraseña del usuario %{target}"
resolve_report_html: "%{name} resolvió el informe %{target}"
sensitive_account_html: "%{name} marcó la multimedia de %{target} como sensible"
@@ -289,7 +290,7 @@ es-MX:
update_domain_block_html: "%{name} actualizó el bloqueo de dominio para %{target}"
update_ip_block_html: "%{name} cambió la regla para la IP %{target}"
update_report_html: "%{name} actualizó el informe %{target}"
- update_status_html: "%{name} actualizó el estado de %{target}"
+ update_status_html: "%{name} actualizó la publicación de %{target}"
update_user_role_html: "%{name} cambió el rol %{target}"
deleted_account: cuenta eliminada
empty: No se encontraron registros.
@@ -572,11 +573,11 @@ es-MX:
relays:
add_new: Añadir un nuevo relés
delete: Borrar
- description_html: Un relés de federation es un servidor intermedio que intercambia grandes volúmenes de toots públicos entre servidores que se suscriben y publican en él. Puede ayudar a servidores pequeños y medianos a descubir contenido del fediverso, que de otra manera requeriría que los usuarios locales siguiesen manialmente a personas de servidores remotos.
+ description_html: Un relés de federación es un servidor intermedio que intercambia grandes volúmenes de publicaciones públicas entre servidores que se suscriben y publican en él. Puede ayudar a servidores pequeños y medianos a descubrir contenido del fediverso, que de otra manera requeriría que los usuarios locales siguiesen manualmente a personas de servidores remotos.
disable: Deshabilitar
disabled: Deshabilitado
enable: Hablitar
- enable_hint: Una vez conectado, tu servidor se suscribirá a todos los toots públicos de este relés, y comenzará a enviar los toots públicos de este servidor hacia él.
+ enable_hint: Una vez conectado, tu servidor se suscribirá a todas las publicaciones públicas de este relé, y comenzará a enviar las publicaciones públicas de este servidor hacia él.
enabled: Habilitado
inbox_url: URL del relés
pending: Esperando la aprobación del relés
@@ -596,15 +597,15 @@ es-MX:
action_log: Registro de auditoría
action_taken_by: Acción tomada por
actions:
- delete_description_html: Los mensajes denunciados serán eliminados y se registrará una amonestación para ayudarte a escalar en futuras infracciones por la misma cuenta.
- mark_as_sensitive_description_html: Los archivos multimedia en los mensajes informados se marcarán como sensibles y se aplicará una amonestación para ayudarte a escalar las futuras infracciones de la misma cuenta.
+ delete_description_html: Las publicaciones denunciadas serán eliminadas y se registrará una amonestación para ayudarte a escalar en futuras infracciones por la misma cuenta.
+ mark_as_sensitive_description_html: Los archivos multimedia en las publicaciones reportadas se marcarán como sensibles y se aplicará una amonestación para ayudarte a escalar las futuras infracciones de la misma cuenta.
other_description_html: Ver más opciones para controlar el comportamiento de la cuenta y personalizar la comunicación de la cuenta reportada.
resolve_description_html: No se tomarán medidas contra la cuenta denunciada, no se registrará la amonestación, y se cerrará el informe.
silence_description_html: La cuenta será visible sólo para aquellos que ya la sigan o la busquen manualmente, limitando severamente su visibilidad. Siempre puede ser revertido. Cierra todos los reportes contra esta cuenta.
suspend_description_html: La cuenta y todos sus contenidos serán inaccesibles y eventualmente eliminados, e interactuar con ella será imposible. Reversible durante 30 días. Cierra todos los reportes contra esta cuenta.
actions_description_html: Decide qué medidas tomar para resolver esta denuncia. Si tomas una acción punitiva contra la cuenta denunciada, se le enviará a dicha cuenta una notificación por correo electrónico, excepto cuando se seleccione la categoría Spam.
actions_description_remote_html: Decide qué medidas tomar para resolver este reporte. Esto solo afectará a la forma en que tu servidor se comunica con esta cuenta remota y gestiona su contenido.
- actions_no_posts: Este informe no tiene ningún mensaje asociado para eliminar
+ actions_no_posts: Este informe no tiene ninguna publicación asociada para eliminar
add_to_report: Añadir más al reporte
already_suspended_badges:
local: Ya suspendido en este servidor
@@ -801,7 +802,7 @@ es-MX:
destroyed_msg: "¡Carga del sitio eliminada con éxito!"
software_updates:
critical_update: Crítico — por favor actualiza rápidamente
- description: Se recomienda mantener actualizada tu instalación de Mastodon para beneficiarte de las últimas correcciones y características. Además, a veces es crítico actualizar Mastodon de manera oportuna para evitar problemas de seguridad. Por estas razones, Mastodon comprueba si hay actualizaciones cada 30 minutos, y te notificará de acuerdo a tus preferencias de notificación por correo electrónico.
+ description: Se recomienda mantener tu instalación de Mastodon actualizada para beneficiarte de las últimas correcciones y características. Además, a veces es crítico actualizar Mastodon a tiempo para evitar problemas de seguridad. Por estas razones, Mastodon busca actualizaciones cada 30 minutos, y le notificará de acuerdo a sus preferencias de notificación por correo electrónico.
documentation_link: Saber más
release_notes: Notas de la versión
title: Actualizaciones disponibles
@@ -827,7 +828,7 @@ es-MX:
media:
title: Multimedia
metadata: Metadatos
- no_status_selected: No se cambió ningún estado al no seleccionar ninguno
+ no_status_selected: No se cambió ninguna publicación al no seleccionar ninguna
open: Abrir publicación
original_status: Publicación original
reblogs: Impulsos
@@ -876,8 +877,8 @@ es-MX:
sidekiq_process_check:
message_html: No hay ningún proceso Sidekiq en ejecución para la(s) cola(s) %{value}. Por favor, revise su configuración de Sidekiq
software_version_check:
- action: Ver actualizaciones disponibles
- message_html: Hay disponible una actualización de Mastodon.
+ action: Ver las actualizaciones disponibles
+ message_html: Ya está disponible una actualización de Mastodon.
software_version_critical_check:
action: Ver actualizaciones disponibles
message_html: Una actualización crítica de Mastodon está disponible, por favor actualice lo antes posible.
@@ -909,7 +910,7 @@ es-MX:
review: Estado de revisión
search: Buscar
title: Etiquetas
- updated_msg: Hashtags actualizados exitosamente
+ updated_msg: Etiquetas actualizadas exitosamente
title: Administración
trends:
allow: Permitir
@@ -968,7 +969,7 @@ es-MX:
tag_servers_dimension: Servidores principales
tag_servers_measure: diferentes servidores
tag_uses_measure: usuarios totales
- description_html: Estos son etiquetas que están apareciendo en muchos posts que tu servidor ve. Pueden ayudar a tus usuarios a averiguar de qué habla más gente en estos momentos. No hay hashtags que se muestren públicamente hasta que los apruebes.
+ description_html: Estos son etiquetas que están apareciendo en muchas publicaciones que tu servidor ve. Pueden ayudar a tus usuarios a averiguar de qué habla más gente en estos momentos. No hay etiquetas que se muestren públicamente hasta que los apruebes.
listable: Pueden ser recomendadas
no_tag_selected: No se cambió ninguna etiqueta ya que no se seleccionó ninguna
not_listable: No serán recomendadas
@@ -1017,9 +1018,9 @@ es-MX:
subject: Los registros para %{instance} han sido cambiados automáticamente para requerir aprobación
new_appeal:
actions:
- delete_statuses: para eliminar sus mensajes
+ delete_statuses: para eliminar sus publicaciones
disable: para congelar su cuenta
- mark_statuses_as_sensitive: para marcar sus mensajes como sensibles
+ mark_statuses_as_sensitive: para marcar sus publicaciones como sensibles
none: una alvertencia
sensitive: para marcar su cuenta como sensible
silence: para limitar su cuenta
@@ -1054,11 +1055,11 @@ es-MX:
created_msg: El nuevo alias se ha creado correctamente. Ahora puedes empezar el traslado desde la cuenta antigua.
deleted_msg: Elimina el alias correctamente. El traslado de esa cuenta a esta ya no será posible.
empty: No tienes ningún alias.
- hint_html: Si quieres migrar de otra cuenta a esta, aquí puedes crear un alias, es necesario proceder antes de empezar a mover seguidores de la cuenta anterior a esta. Esta acción por sí misma es inofensiva y reversible. La migración de la cuenta se inicia desde la cuenta antigua.
+ hint_html: Si deseas migrar de otra cuenta a esta, aquí puedes crear un alias, que es necesario para poder mover seguidores de la cuenta anterior a esta. Esta acción por sí misma es inofensiva y reversible. La migración de la cuenta se inicia desde la cuenta anterior.
remove: Desvincular alias
appearance:
advanced_web_interface: Interfaz web avanzada
- advanced_web_interface_hint: 'Si desea utilizar todo el ancho de pantalla, la interfaz web avanzada le permite configurar varias columnas diferentes para ver tanta información al mismo tiempo como quiera: Inicio, notificaciones, línea de tiempo federada, cualquier número de listas y etiquetas.'
+ advanced_web_interface_hint: 'Si deseas aprovechar todo el ancho de tu pantalla, la interfaz web avanzada te permite configurar muchas columnas diferentes para ver toda la información que quieras al mismo tiempo: inicio, notificaciones, cronología federada, cualquier número de listas y etiquetas.'
animations_and_accessibility: Animaciones y accesibilidad
confirmation_dialogs: Diálogos de confirmación
discovery: Descubrir
@@ -1074,7 +1075,7 @@ es-MX:
unsubscribe: Cancelar suscripción
view: 'Vista:'
view_profile: Ver perfil
- view_status: Ver estado
+ view_status: Ver publicación
applications:
created: Aplicación creada exitosamente
destroyed: Apicación eliminada exitosamente
@@ -1100,7 +1101,7 @@ es-MX:
welcome_title: "¡Bienvenido, %{name}!"
wrong_email_hint: Si esa dirección de correo electrónico no es correcta, puedes cambiarla en la configuración de la cuenta.
delete_account: Borrar cuenta
- delete_account_html: Si desea eliminar su cuenta, puede proceder aquí. Será pedido de una confirmación.
+ delete_account_html: Si deseas eliminar tu cuenta, puedes proceder aquí. Se te pedirá una confirmación.
description:
prefix_invited_by_user: "¡@%{name} te invita a unirte a este servidor de Mastodon!"
prefix_sign_up: "¡Únete a Mastodon hoy!"
@@ -1165,9 +1166,11 @@ es-MX:
use_security_key: Usar la clave de seguridad
author_attribution:
example_title: Texto de ejemplo
- hint_html: Controla cómo se te dará atribución cuando se compartan enlaces en Mastodon.
+ hint_html: "¿Estás escribiendo artículos de noticias o blogs fuera de Mastodon? Controla cómo te acreditan cuando se comparten en Mastodon."
+ instructions: 'Asegúrate de que este código esté en el HTML de tu artículo:'
more_from_html: Más de %{name}
s_blog: Blog de %{name}
+ then_instructions: A continuación, añade el nombre de dominio de la publicación en el campo inferior.
title: Atribución del autor
challenge:
confirm: Continuar
@@ -1234,7 +1237,7 @@ es-MX:
title_actions:
delete_statuses: Eliminación de publicación
disable: Congelación de la cuenta
- mark_statuses_as_sensitive: Marcando los mensajes como sensibles
+ mark_statuses_as_sensitive: Marcando las publicaciones como sensibles
none: Advertencia
sensitive: Marcando la cuenta como sensible
silence: Limitación de cuenta
@@ -1268,7 +1271,7 @@ es-MX:
archive_takeout:
date: Fecha
download: Descargar tu archivo
- hint_html: Puedes solicitar un archivo de tus toots y archivos multimedia subidos. Los datos exportados estarán en formato ActivityPub, legibles por cualquier software compatible.
+ hint_html: Puedes solicitar un archivo de tus publicaciones y archivos multimedia subidos. Los datos exportados estarán en formato ActivityPub, legibles por cualquier software compatible. Puedes solicitar un archivo cada 7 días.
in_progress: Recopilando tu archivo...
request: Solicitar tu archivo
size: Tamaño
@@ -1282,7 +1285,7 @@ es-MX:
featured_tags:
add_new: Añadir nuevo
errors:
- limit: Ya has alcanzado la cantidad máxima de hashtags
+ limit: Ya has alcanzado la cantidad máxima de etiquetas
hint_html: "¿Qué son las etiquetas destacadas? Se muestran de forma prominente en tu perfil público y permiten a los usuarios navegar por tus publicaciones públicas específicamente bajo esas etiquetas. Son una gran herramienta para hacer un seguimiento de trabajos creativos o proyectos a largo plazo."
filters:
contexts:
@@ -1453,8 +1456,8 @@ es-MX:
emails:
notification_emails:
favourite: correos de notificación de favoritos
- follow: correos de notificación de nuevos seguidores
- follow_request: correos de notificación de solicitud de seguidor
+ follow: correos electrónicos de notificación de seguimiento
+ follow_request: correos electrónicos de solicitud de seguimiento
mention: correos de notificación de menciones
reblog: correos de notificación de impulsos
resubscribe_html: Si te has dado de baja por error, puedes volver a darte de alta desde tus ajustes de notificaciones por correo.
@@ -1462,7 +1465,7 @@ es-MX:
title: Cancelar suscripción
media_attachments:
validations:
- images_and_video: No se puede adjuntar un video a un estado que ya contenga imágenes
+ images_and_video: No se puede adjuntar un video a una publicación que ya contenga imágenes
not_found: Archivos multimedia %{ids} no encontrados, o ya se encuentran adjuntos a otra publicación
not_ready: No se pueden adjuntar archivos que no se han terminado de procesar. ¡Inténtalo de nuevo en un momento!
too_many: No se pueden adjuntar más de 4 archivos
@@ -1512,8 +1515,8 @@ es-MX:
sign_up:
subject: "%{name} se registró"
favourite:
- body: 'Tu estado fue marcado como favorito por %{name}:'
- subject: "%{name} marcó como favorito tu estado"
+ body: 'Tu publicación fue marcada como favorita por %{name}:'
+ subject: "%{name} marcó como favorita tu publicación"
title: Nuevo favorito
follow:
body: "¡%{name} te está siguiendo!"
@@ -1532,9 +1535,9 @@ es-MX:
poll:
subject: Una encuesta de %{name} ha terminado
reblog:
- body: "%{name} ha retooteado tu estado:"
- subject: "%{name} ha retooteado tu estado"
- title: Nueva difusión
+ body: 'Tu publicación fue impulsada por %{name}:'
+ subject: "%{name} ha impulsado tu publicación"
+ title: Nuevo impulso
status:
subject: "%{name} acaba de publicar"
update:
@@ -1633,8 +1636,8 @@ es-MX:
account: Publicaciones públicas de @%{acct}
tag: 'Publicaciones públicas etiquetadas con #%{hashtag}'
scheduled_statuses:
- over_daily_limit: Ha superado el límite de %{limit} toots programados para ese día
- over_total_limit: Ha superado el límite de %{limit} toots programados
+ over_daily_limit: Has superado el límite de %{limit} publicaciones programadas para ese día
+ over_total_limit: Has superado el límite de %{limit} publicaciones programadas
too_soon: La fecha programada debe estar en el futuro
self_destruct:
lead_html: Desafortunadamente, %{domain} está cerrando de manera permanente. Si tenías una cuenta ahí, no puedes continuar utilizándolo, pero puedes solicitar un respaldo de tus datos.
@@ -1696,7 +1699,7 @@ es-MX:
development: Desarrollo
edit_profile: Editar perfil
export: Exportar
- featured_tags: Hashtags destacados
+ featured_tags: Etiquetas destacadas
import: Importar
import_and_export: Importar y exportar
migrate: Migración de cuenta
@@ -1736,17 +1739,17 @@ es-MX:
content_warning: 'Alerta de contenido: %{warning}'
default_language: Igual que el idioma de la interfaz
disallowed_hashtags:
- one: 'contenía un hashtag no permitido: %{tags}'
- other: 'contenía los hashtags no permitidos: %{tags}'
+ one: 'contenía una etiqueta no permitida: %{tags}'
+ other: 'contenía las etiquetas no permitidas: %{tags}'
edited_at_html: Editado %{date}
errors:
- in_reply_not_found: El estado al que intentas responder no existe.
+ in_reply_not_found: La publicación a la que estás intentando responder no existe.
over_character_limit: Límite de caracteres de %{max} superado
pin_errors:
direct: Las publicaciones que son visibles solo para los usuarios mencionados no pueden fijarse
limit: Ya has fijado el número máximo de publicaciones
- ownership: El toot de alguien más no puede fijarse
- reblog: Un boost no puede fijarse
+ ownership: La publicación de alguien más no puede fijarse
+ reblog: No se puede fijar una publicación impulsada
title: "%{name}: «%{quote}»"
visibilities:
direct: Directa
@@ -1762,9 +1765,9 @@ es-MX:
exceptions: Excepciones
explanation: Debido a que la eliminación de mensajes es una operación costosa, esto se hace lentamente, a lo largo de un tiempo, cuando el servidor no está ocupado. Por este motivo, puede que tus publicaciones sean borradas algo después de que alcancen el umbral de tiempo especificado.
ignore_favs: Ignorar favoritos
- ignore_reblogs: Ignorar reblogueos
+ ignore_reblogs: Ignorar impulsos
interaction_exceptions: Excepciones basadas en interacciones
- interaction_exceptions_explanation: Ten en cuenta que no hay garantía de que se eliminen las publicaciones que están por debajo de los umbrales de favoritos o de reblogueos si los han superado en algún momento.
+ interaction_exceptions_explanation: Ten en cuenta que no se garantiza la eliminación de las publicaciones si bajan del umbral de favoritos o de impulso después de haberlos superado una vez.
keep_direct: Mantener mensajes directos
keep_direct_hint: No elimina ninguno de tus mensajes directos
keep_media: Mantener publicaciones con multimedia adjunto
@@ -1789,7 +1792,7 @@ es-MX:
min_age_label: Umbral de tiempo
min_favs: Mantener mensajes con un número de favoritos mayor que
min_favs_hint: No borra ninguna de las publicaciones que hayan recibido al menos esta cantidad de favoritos. Deja en blanco para eliminar publicaciones sin importar el número de favoritos
- min_reblogs: Mantener publicaciones reblogueadas más de
+ min_reblogs: Mantener publicaciones impulsadas más de
min_reblogs_hint: No borra ninguna de las publicaciones que hayan sido reblogueadas más de este número de veces. Deja en blanco para eliminar publicaciones sin importar el número de reblogueos
stream_entries:
sensitive_content: Contenido sensible
@@ -1865,9 +1868,9 @@ es-MX:
spam: Spam
violation: El contenido viola las siguientes directrices de la comunidad
explanation:
- delete_statuses: Se ha determinado que algunos de tus mensajes violan una o más directrices de la comunidad y han sido por tanto eliminados por los moderadores de %{instance}.
+ delete_statuses: Se ha determinado que algunas de tus publicaciones violan una o más directrices de la comunidad y han sido, por tanto, eliminados por los moderadores de %{instance}.
disable: Ya no puedes usar tu cuenta, pero tu perfil y el resto de datos permanecen intactos. Puedes solicitar una copia de seguridad de tus datos, cambiar la configuración de tu cuenta o eliminarla.
- mark_statuses_as_sensitive: Algunos de tus mensajes han sido marcados como sensibles por los moderadores de %{instance}. Esto significa que la gente tendrá que pulsar los archivos multimedia en las publicaciones antes de que se muestre una vista previa. Puedes marcar los archivos multimedia como sensibles tú mismo cuando publiques en el futuro.
+ mark_statuses_as_sensitive: Algunas de tus publicaciones han sido marcadas como sensibles por los moderadores de %{instance}. Esto significa que la gente tendrá que pulsar los archivos multimedia en las publicaciones antes de que se muestre una vista previa. Puedes marcar los archivos multimedia como sensibles tú mismo cuando publiques en el futuro.
sensitive: A partir de ahora, todos los archivos multimedia que subas serán marcados como sensibles y ocultos tras una advertencia que habrá que clicar.
silence: Aún puedes usar tu cuenta, pero solo las personas que te están siguiendo verán tus publicaciones en este servidor, y puedes ser excluido de varias funcionalidades de descubrimiento. Sin embargo, otras cuentas podrán empezar a seguirte manualmente.
suspend: Ya no puedes utilizar tu cuenta, y tu perfil y el resto de datos ya no son accesibles. Todavía puedes iniciar sesión para solicitar una copia de seguridad de tus datos, hasta que estos sean eliminados por completo en unos 30 días, aunque conservaremos algunos datos básicos para impedir que esquives la suspensión.
@@ -1897,7 +1900,7 @@ es-MX:
checklist_subtitle: 'Comencemos en esta nueva frontera social:'
checklist_title: Lista de bienvenida
edit_profile_action: Personalizar
- edit_profile_step: Aumenta tus interacciones con un perfil completo.
+ edit_profile_step: Aumenta tus interacciones completando tu perfil.
edit_profile_title: Personaliza tu perfil
explanation: Aquí hay algunos consejos para empezar
feature_action: Leer más
diff --git a/config/locales/es.yml b/config/locales/es.yml
index aa18e7b52e..bcad1bc3ef 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -2,7 +2,7 @@
es:
about:
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 especificado
+ contact_missing: No establecido
contact_unavailable: No disponible
hosted_on: Mastodon alojado en %{domain}
title: Acerca de
@@ -11,7 +11,7 @@ es:
one: Seguidor
other: Seguidores
following: Siguiendo
- instance_actor_flash: Esta cuenta es un actor virtual utilizado para representar al servidor en sí mismo y no a ningún usuario individual. Se utiliza para propósitos de la federación y no se debe suspender.
+ instance_actor_flash: Esta cuenta es un actor virtual utilizado para representar al propio servidor y no a ningún usuario individual. Se utiliza con fines de federación y no debe suspenderse.
last_active: última conexión
link_verified_on: La propiedad de este vínculo fue verificada el %{date}
nothing_here: "¡No hay nada aquí!"
@@ -21,6 +21,7 @@ es:
one: Publicación
other: Publicaciones
posts_tab_heading: Publicaciones
+ self_follow_error: No está permitido seguir tu propia cuenta
admin:
account_actions:
action: Realizar acción
@@ -39,7 +40,7 @@ es:
avatar: Avatar
by_domain: Dominio
change_email:
- changed_msg: "¡Email cambiado con éxito!"
+ changed_msg: "¡Correo electrónico cambiado con éxito!"
current_email: Correo electrónico actual
label: Cambiar el correo electrónico
new_email: Nuevo correo electrónico
@@ -56,18 +57,18 @@ es:
confirming: Confirmando
custom: Personalizado
delete: Eliminar datos
- deleted: Borrado
+ deleted: Eliminado
demote: Degradar
destroyed_msg: Los datos de %{username} están ahora en cola para ser eliminados inminentemente
disable: Deshabilitar
disable_sign_in_token_auth: Deshabilitar la autenticación por token de correo electrónico
disable_two_factor_authentication: Desactivar autenticación de dos factores
disabled: Deshabilitada
- display_name: Nombre
+ display_name: Nombre para mostrar
domain: Dominio
edit: Editar
- email: E-mail
- email_status: E-mail Status
+ email: Correo electrónico
+ email_status: Estado del correo electrónico
enable: Habilitar
enable_sign_in_token_auth: Habilitar la autenticación por token de correo electrónico
enabled: Habilitada
@@ -85,7 +86,7 @@ es:
local: Local
remote: Remoto
title: Localización
- login_status: Estado del login
+ login_status: Estado de inicio de sesión
media_attachments: Multimedia
memorialize: Convertir en memorial
memorialized: Cuenta conmemorativa
@@ -101,7 +102,7 @@ es:
moderation_notes: Notas de moderación
most_recent_activity: Actividad más reciente
most_recent_ip: IP más reciente
- no_account_selected: Ninguna cuenta se cambió como ninguna fue seleccionada
+ no_account_selected: No se ha modificado ninguna cuenta porque no se ha seleccionado ninguna
no_limits_imposed: Sin límites impuestos
no_role_assigned: Ningún rol asignado
not_subscribed: No se está suscrito
@@ -115,7 +116,7 @@ es:
protocol: Protocolo
public: Público
push_subscription_expires: Expiración de la suscripción PuSH
- redownload: Refrescar avatar
+ redownload: Refrescar perfil
redownloaded_msg: Se actualizó correctamente el perfil de %{username} desde el origen
reject: Rechazar
rejected_msg: La solicitud de registro de %{username} ha sido rechazada con éxito
@@ -131,17 +132,17 @@ es:
success: "¡Enlace de confirmación enviado con éxito!"
reset: Reiniciar
reset_password: Reiniciar contraseña
- resubscribe: Re-suscribir
+ resubscribe: Volver a suscribirse
role: Rol
search: Buscar
search_same_email_domain: Otros usuarios con el mismo dominio de correo
search_same_ip: Otros usuarios con la misma IP
security: Seguridad
security_measures:
- only_password: Sólo contraseña
+ only_password: Solo contraseña
password_and_2fa: Contraseña y 2FA
sensitive: Sensible
- sensitized: marcado como sensible
+ sensitized: Marcada como sensible
shared_inbox_url: URL de bandeja compartida
show:
created_reports: Reportes hechos por esta cuenta
@@ -160,10 +161,10 @@ es:
unblocked_email_msg: Se ha desbloqueado correctamente la dirección de correo de %{username}
unconfirmed_email: Correo electrónico sin confirmar
undo_sensitized: Desmarcar como sensible
- undo_silenced: Des-silenciar
- undo_suspension: Des-suspender
+ undo_silenced: Dejar de silenciar
+ undo_suspension: Deshacer suspensión
unsilenced_msg: Se quitó con éxito el límite de la cuenta %{username}
- unsubscribe: Desuscribir
+ unsubscribe: Cancelar suscripción
unsuspended_msg: Se quitó con éxito la suspensión de la cuenta de %{username}
username: Nombre de usuario
view_domain: Ver resumen del dominio
@@ -295,7 +296,7 @@ es:
empty: No se encontraron registros.
filter_by_action: Filtrar por acción
filter_by_user: Filtrar por usuario
- title: Log de auditoría
+ title: Registro de auditoría
unavailable_instance: "(nombre de dominio no disponible)"
announcements:
destroyed_msg: "¡Anuncio eliminado con éxito!"
@@ -337,7 +338,7 @@ es:
listed: Listados
new:
title: Añadir nuevo emoji personalizado
- no_emoji_selected: No se cambió ningún emoji ya que no se seleccionó ninguno
+ no_emoji_selected: No se cambió ningún emoji, ya que no se seleccionó ninguno
not_permitted: No tienes permiso para realizar esta acción
overwrite: Sobrescribir
shortcode: Código de atajo
@@ -565,7 +566,7 @@ es:
'94670856': 3 años
new:
title: Crear nueva regla IP
- no_ip_block_selected: No se han cambiado reglas IP ya que no se ha seleccionado ninguna
+ no_ip_block_selected: No se han cambiado reglas IP, ya que no se ha seleccionado ninguna
title: Reglas IP
relationships:
title: Relaciones de %{acct}
@@ -909,7 +910,7 @@ es:
review: Estado de revisión
search: Buscar
title: Etiquetas
- updated_msg: Hashtags actualizados exitosamente
+ updated_msg: La configuración de etiquetas se actualizó correctamente
title: Administración
trends:
allow: Permitir
@@ -1058,7 +1059,7 @@ es:
remove: Desvincular alias
appearance:
advanced_web_interface: Interfaz web avanzada
- advanced_web_interface_hint: 'Si desea utilizar todo el ancho de pantalla, la interfaz web avanzada le permite configurar varias columnas diferentes para ver tanta información al mismo tiempo como quiera: Inicio, notificaciones, línea de tiempo federada, cualquier número de listas y etiquetas.'
+ advanced_web_interface_hint: 'Si quieres aprovechar todo el ancho de tu pantalla, la interfaz web avanzada te permite configurar muchas columnas diferentes para ver toda la información que quieras al mismo tiempo: Inicio, notificaciones, cronología federada, cualquier número de listas y etiquetas.'
animations_and_accessibility: Animaciones y accesibilidad
confirmation_dialogs: Diálogos de confirmación
discovery: Descubrir
@@ -1100,7 +1101,7 @@ es:
welcome_title: "¡Te damos la bienvenida, %{name}!"
wrong_email_hint: Si esa dirección de correo electrónico no es correcta, puedes cambiarla en la configuración de la cuenta.
delete_account: Borrar cuenta
- delete_account_html: Si desea eliminar su cuenta, puede proceder aquí. Será pedido de una confirmación.
+ delete_account_html: Si deseas eliminar tu cuenta, puedes hacerlo aquí. Se te pedirá una confirmación.
description:
prefix_invited_by_user: "¡@%{name} te invita a unirte a este servidor de Mastodon!"
prefix_sign_up: "¡Únete a Mastodon hoy!"
@@ -1108,7 +1109,7 @@ es:
didnt_get_confirmation: "¿No recibiste un enlace de confirmación?"
dont_have_your_security_key: "¿No tienes tu clave de seguridad?"
forgot_password: "¿Olvidaste tu contraseña?"
- invalid_reset_password_token: El token de reinicio de contraseña es inválido o expiró. Por favor pide uno nuevo.
+ invalid_reset_password_token: El token de restablecimiento de contraseña no es válido o ha expirado. Por favor solicita uno nuevo.
link_to_otp: Introduce un código de dos factores desde tu teléfono o un código de recuperación
link_to_webauth: Utilice su dispositivo de clave de seguridad
log_in_with: Iniciar sesión con
@@ -1142,7 +1143,7 @@ es:
set_new_password: Establecer nueva contraseña
setup:
email_below_hint_html: Comprueba tu carpeta de correo no deseado o solicita otro enlace de confirmación. Puedes corregir tu dirección de correo electrónico si está mal.
- email_settings_hint_html: Pulsa el enlace que te hemos enviado para verificar %{email}. Esperaremos aquí mismo.
+ email_settings_hint_html: Haz clic en el enlace que te hemos enviado para verificar %{email}. Te esperamos aquí.
link_not_received: "¿No recibiste un enlace?"
new_confirmation_instructions_sent: "¡Recibirás un nuevo correo electrónico con el enlace de confirmación en unos minutos!"
title: Revisa tu bandeja de entrada
@@ -1165,9 +1166,11 @@ es:
use_security_key: Usar la clave de seguridad
author_attribution:
example_title: Texto de ejemplo
- hint_html: Controla cómo se te dará atribución cuando se compartan enlaces en Mastodon.
+ hint_html: "¿Escribes noticias o artículos de blog fuera de Mastodon? Controla cómo se te acredita cuando se comparten en Mastodon."
+ instructions: 'Asegúrate de que este código está en el HTML de tu artículo:'
more_from_html: Más de %{name}
s_blog: Blog de %{name}
+ then_instructions: A continuación, añade el nombre de dominio de la publicación en el campo inferior.
title: Atribución del autor
challenge:
confirm: Continuar
@@ -1255,7 +1258,7 @@ es:
'422':
content: Verificación de seguridad fallida. ¿Estás bloqueando algunas cookies?
title: Verificación de seguridad fallida
- '429': Asfixiado
+ '429': Demasiadas solicitudes
'500':
content: Lo sentimos, algo ha funcionado mal por nuestra parte.
title: Esta página no es correcta
@@ -1282,7 +1285,7 @@ es:
featured_tags:
add_new: Añadir nuevo
errors:
- limit: Ya has alcanzado la cantidad máxima de hashtags
+ limit: Ya has alcanzado la cantidad máxima de etiquetas
hint_html: "¿Qué son las etiquetas destacadas? Se muestran de forma prominente en tu perfil público y permiten a los usuarios navegar por tus publicaciones públicas específicamente bajo esas etiquetas. Son una gran herramienta para hacer un seguimiento de trabajos creativos o proyectos a largo plazo."
filters:
contexts:
@@ -1335,7 +1338,7 @@ es:
one: "%{count} elemento que coincide con su búsqueda está seleccionado."
other: Todos los %{count} elementos que coinciden con su búsqueda están seleccionados.
cancel: Cancelar
- changes_saved_msg: "¡Cambios guardados con éxito!"
+ changes_saved_msg: "¡Los cambios se han guardado correctamente!"
confirm: Confirmar
copy: Copiar
delete: Eliminar
@@ -1359,7 +1362,7 @@ es:
too_large: El archivo es demasiado grande
failures: Fallos
imported: Importado
- mismatched_types_warning: Parece que podrías haber seleccionado el tipo incorrecto para esta importación, por favor vuelve a verificarlo.
+ mismatched_types_warning: Parece que has seleccionado el tipo incorrecto para esta importación, vuelve a comprobarlo.
modes:
merge: Unir
merge_long: Mantener registros existentes y añadir nuevos
@@ -1419,7 +1422,7 @@ es:
'604800': 1 semana
'86400': 1 día
expires_in_prompt: Nunca
- generate: Generar
+ generate: Generar enlace de invitación
invalid: Esta invitación no es válida
invited_by: 'Fuiste invitado por:'
max_uses:
@@ -1462,12 +1465,12 @@ es:
title: Cancelar suscripición
media_attachments:
validations:
- images_and_video: No se puede adjuntar un video a unapublicación que ya contenga imágenes
+ images_and_video: No se puede adjuntar un video a una publicación que ya contenga imágenes
not_found: Archivos multimedia %{ids} no encontrados, o ya se encuentran adjuntos a otra publicación
not_ready: No se pueden adjuntar archivos que no se han terminado de procesar. ¡Inténtalo de nuevo en un momento!
too_many: No se pueden adjuntar más de 4 archivos
migrations:
- acct: username@domain de la nueva cuenta
+ acct: Movido a
cancel: Cancelar redireccionamiento
cancel_explanation: Al cancelar el redireccionamiento se reactivará tu cuenta actual, pero no recuperarás los seguidores que hayan sido trasladados a la otra cuenta.
cancelled_msg: El redireccionamiento se ha cancelado correctamente.
@@ -1696,13 +1699,13 @@ es:
development: Desarrollo
edit_profile: Editar perfil
export: Exportar
- featured_tags: Hashtags destacados
+ featured_tags: Etiquetas destacadas
import: Importar
import_and_export: Importar y exportar
migrate: Migración de cuenta
notifications: Notificaciones por correo electrónico
preferences: Preferencias
- profile: Perfil
+ profile: Perfil público
relationships: Siguiendo y seguidores
severed_relationships: Relaciones cortadas
statuses_cleanup: Eliminación automática de publicaciones
@@ -1736,8 +1739,8 @@ es:
content_warning: 'Alerta de contenido: %{warning}'
default_language: Igual que el idioma de la interfaz
disallowed_hashtags:
- one: 'contenía un hashtag no permitido: %{tags}'
- other: 'contenía los hashtags no permitidos: %{tags}'
+ one: 'contenía una etiqueta no permitida: %{tags}'
+ other: 'contenía las etiquetas no permitidas: %{tags}'
edited_at_html: Editado %{date}
errors:
in_reply_not_found: La publicación a la que intentas responder no existe.
@@ -1746,11 +1749,11 @@ es:
direct: Las publicaciones que son visibles solo para los usuarios mencionados no pueden fijarse
limit: Ya has fijado el número máximo de publicaciones
ownership: La publicación de otra persona no puede fijarse
- reblog: Un boost no puede fijarse
+ reblog: Una publicación impulsada no puede fijarse
title: "%{name}: «%{quote}»"
visibilities:
direct: Directa
- private: Sólo mostrar a seguidores
+ private: Solo seguidores
private_long: Solo mostrar a tus seguidores
public: Pública
public_long: Todos pueden ver
@@ -1762,9 +1765,9 @@ es:
exceptions: Excepciones
explanation: Debido a que la eliminación de mensajes es una operación costosa, esto se hace lentamente, a lo largo de un tiempo, cuando el servidor no está ocupado. Por este motivo, puede que tus publicaciones sean borradas algo después de que alcancen el umbral de tiempo especificado.
ignore_favs: Ignorar favoritos
- ignore_reblogs: Ignorar reblogueos
+ ignore_reblogs: Ignorar impulsos
interaction_exceptions: Excepciones basadas en interacciones
- interaction_exceptions_explanation: Ten en cuenta que no hay garantía de que se eliminen las publicaciones que están por debajo de los umbrales de favoritos o de reblogueos si los han superado en algún momento.
+ interaction_exceptions_explanation: Ten en cuenta que no hay garantía de que se eliminen las publicaciones que están por debajo de los umbrales de favoritos o de impulsos si los han superado en algún momento.
keep_direct: Mantener mensajes directos
keep_direct_hint: No elimina ninguno de tus mensajes directos
keep_media: Mantener publicaciones con multimedia adjunto
@@ -1790,7 +1793,7 @@ es:
min_favs: Mantener mensajes con un número de favoritos mayor que
min_favs_hint: No borra ninguna de las publicaciones que hayan recibido al menos esta cantidad de favoritos. Deja en blanco para eliminar publicaciones sin importar el número de favoritos
min_reblogs: Mantener publicaciones reblogueadas más de
- min_reblogs_hint: No borra ninguna de las publicaciones que hayan sido reblogueadas más de este número de veces. Deja en blanco para eliminar publicaciones sin importar el número de reblogueos
+ min_reblogs_hint: No borra ninguna de las publicaciones que hayan sido impulsadas más de este número de veces. Deja en blanco para eliminar publicaciones sin importar el número de impulsos
stream_entries:
sensitive_content: Contenido sensible
strikes:
@@ -1799,8 +1802,8 @@ es:
tags:
does_not_match_previous_name: no coincide con el nombre anterior
themes:
- contrast: Alto contraste
- default: Mastodon
+ contrast: Mastodon (alto contraste)
+ default: Mastodon (oscuro)
mastodon-light: Mastodon (claro)
system: Automático (usar tema del sistema)
time:
@@ -1820,7 +1823,7 @@ es:
edit: Editar
enabled: La autenticación de dos factores está activada
enabled_success: Verificación de dos factores activada exitosamente
- generate_recovery_codes: generar códigos de recuperación
+ generate_recovery_codes: Generar códigos de recuperación
lost_recovery_codes: Los códigos de recuperación te permiten obtener acceso a tu cuenta si pierdes tu teléfono. Si has perdido tus códigos de recuperación, puedes regenerarlos aquí. Tus viejos códigos de recuperación se harán inválidos.
methods: Métodos de autenticación de doble factor
otp: Aplicación de autenticación
@@ -1941,7 +1944,7 @@ es:
verification:
extra_instructions_html: Consejo: El enlace en tu web puede ser invisible. La parte importante es rel="me", que evita la suplantación de identidad en sitios con contenido generado por el usuario. Puedes incluso usar una etiqueta enlace en el encabezado de la página en vez de a, pero el HTML debe ser accesible sin ejecutar JavaScript.
here_is_how: Así es como se hace
- hint_html: "Verificar tu identidad en Mastodon es para todos. Basado en estándares web abiertos, ahora y para siempre. Todo lo que necesitas es un sitio web propio que la gente reconozca. Cuando enlaces a este sitio web desde tu perfil, comprobaremos que el sitio web se enlaza a tu perfil y mostraremos un indicador visual en él."
+ hint_html: "Verificar tu identidad en Mastodon es para todos. Basado en estándares web abiertos, ahora y siempre gratis. Todo lo que necesitas es un sitio web personal por el que la gente te reconozca. Cuando enlaces a este sitio web desde tu perfil, comprobaremos que el sitio web enlaza con tu perfil y mostraremos un indicador visual en él."
instructions_html: Copia y pega el siguiente código en el HTML de tu sitio web. A continuación, añade la dirección de su sitio web en uno de los campos extra de tu perfil desde la pestaña "Editar perfil" y guarda los cambios.
verification: Verificación
verified_links: Tus enlaces verificados
diff --git a/config/locales/et.yml b/config/locales/et.yml
index b71e3ccb68..19c7f8c799 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -21,6 +21,7 @@ et:
one: Postitus
other: Postitused
posts_tab_heading: Postitused
+ self_follow_error: Omaenda konto jälgimine ei ole lubatud
admin:
account_actions:
action: Täida tegevus
@@ -334,7 +335,7 @@ et:
enabled_msg: Selle emotikoni lubamine õnnestus
image_hint: PNG või GIF suurusega kuni %{size}
list: Loend
- listed: Nimekirjastatud
+ listed: Loetletud
new:
title: Lisa uus emotikon
no_emoji_selected: Emotikone ei muudetud, kuna ühtegi polnud valitud
@@ -344,8 +345,8 @@ et:
shortcode_hint: Vähemalt 2 tähemärki, ainult tähted, numbrid ja alakriipsud
title: Emotikonid
uncategorized: Kategoriseerimata
- unlist: Kirjendamata
- unlisted: Kirjendamata
+ unlist: Loetlemata
+ unlisted: Loetlemata
update_failed_msg: Ei saanud seda emotikoni uuendada
updated_msg: Emotikoni uuendamine õnnestus!
upload: Lae üles
@@ -875,6 +876,9 @@ et:
message_html: Serverireegleid pole defineeritud.
sidekiq_process_check:
message_html: Ühtegi Sidekiq protsessi pole %{value} järjekorra jaoks. Sidekiq seadistus vajab üle vaatamist
+ software_version_check:
+ action: Vaata saadaval uuendusi
+ message_html: Mastodoni uuendus on saadaval.
software_version_critical_check:
action: Vaata saadaolevaid uuendusi
message_html: Saadaval on Mastodoni kriitiline uuendus, uuenda nii kiiresti kui võimalik.
@@ -1162,9 +1166,11 @@ et:
use_security_key: Kasuta turvavõtit
author_attribution:
example_title: Näidistekst
- hint_html: Määra, kuidas sind krediteeritakse, kui linke Mastodonis jagatakse.
+ hint_html: Kirjutad uudiseid või blogisid Mastodonist väljapool? Määra, kuidas sinule viidatakse, kui neid lehti jagatakse Mastodonis.
+ instructions: 'Vaata, et artikli HTML sisus oleks see kood sees:'
more_from_html: Rohkem kasutajalt %{name}
s_blog: Kasutaja %{name} blogi
+ then_instructions: Siis lisa avaldaja domeeninimi allolevasse välja.
title: Autori tunnustamine
challenge:
confirm: Jätka
@@ -1273,7 +1279,7 @@ et:
bookmarks: Järjehoidjad
csv: CSV
domain_blocks: Domeeni blokeeringud
- lists: Nimekirjad
+ lists: Loetelud
mutes: Oled vaigistanud
storage: Meedia hoidla
featured_tags:
@@ -1692,6 +1698,7 @@ et:
delete: Konto kustutamine
development: Arendus
edit_profile: Muuda profiili
+ export: Eksport
featured_tags: Esile toodud sildid
import: Impordi
import_and_export: Import / eksport
@@ -1750,7 +1757,7 @@ et:
private_long: Näevad ainult jälgijad
public: Avalik
public_long: Postitused on kõigile näha
- unlisted: Kirjendamata
+ unlisted: Loetlemata
unlisted_long: Kõigile näha, kuid ei näidata avalikel ajajoontel
statuses_cleanup:
enabled: Vanade postituste automaatne kustutamine
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index e80207d46f..5720b3cc90 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -21,15 +21,19 @@ eu:
one: Bidalketa
other: Bidalketa
posts_tab_heading: Bidalketa
+ self_follow_error: Zure kontua bera jarraitzea ez dago onartuta
admin:
account_actions:
action: Burutu ekintza
+ already_silenced: Kontu hau dagoeneko mugatua izan da.
+ already_suspended: Kontu hau dagoeneko kanporatua izan da.
title: Burutu moderazio ekintza %{acct} kontuan
account_moderation_notes:
create: Sortu oharra
created_msg: Moderazio oharra ongi sortu da!
destroyed_msg: Moderazio ohara ongi suntsitu da!
accounts:
+ add_email_domain_block: Blokeatu email domeinua
approve: Onartu
approved_msg: "%{username} erabiltzailearen erregistratzeko eskaera behar bezala onartu da"
are_you_sure: Ziur zaude?
@@ -44,6 +48,7 @@ eu:
title: Aldatu %{username}(r)en eposta helbidea
change_role:
changed_msg: Rola ondo aldatu da!
+ edit_roles: Kudeatu erabiltzaile rolak
label: Aldatu rola
no_role: Rolik ez
title: Aldatu %{username} erabiltzailearen rola
@@ -56,6 +61,7 @@ eu:
demote: Jaitsi mailaz
destroyed_msg: "%{username} erabiltzailearen datuak behin betiko ezabatzeko ilaran daude"
disable: Desgaitu
+ disable_sign_in_token_auth: Desgaitu e-posta token autentifikazioa
disable_two_factor_authentication: Desgaitu 2FA
disabled: Desgaituta
display_name: Pantaila-izena
@@ -64,6 +70,7 @@ eu:
email: Eposta
email_status: Epostaren egoera
enable: Gaitu
+ enable_sign_in_token_auth: Gaitu e-posta token autentifikazioa
enabled: Gaituta
enabled_msg: "%{username} kontua behar bezala desblokeatu da"
followers: Jarraitzaileak
@@ -128,6 +135,7 @@ eu:
resubscribe: Berriro harpidetu
role: Rola
search: Bilatu
+ search_same_email_domain: E-mail domeinu bera duten beste erabiltzaileak
search_same_ip: IP bera duten beste erabiltzaileak
security: Segurtasuna
security_measures:
@@ -168,21 +176,26 @@ eu:
approve_appeal: Onartu apelazioa
approve_user: Onartu erabiltzailea
assigned_to_self_report: Esleitu salaketa
+ change_email_user: Aldatu erabiltzailearen emaila
change_role_user: Aldatu erabiltzailearen rola
confirm_user: Berretsi erabiltzailea
create_account_warning: Sortu abisua
create_announcement: Sortu iragarpena
+ create_canonical_email_block: Sortu email blokeoa
create_custom_emoji: Sortu emoji pertsonalizatua
create_domain_allow: Sortu domeinu baimena
create_domain_block: Sortu domeinu blokeoa
+ create_email_domain_block: Sortu email domeinu blokeoa
create_ip_block: Sortu IP araua
create_unavailable_domain: Sortu eskuragarri ez dagoen domeinua
create_user_role: Sortu rola
demote_user: Jaitsi erabiltzailearen maila
destroy_announcement: Ezabatu iragarpena
+ destroy_canonical_email_block: Ezabatu email blokeoa
destroy_custom_emoji: Ezabatu emoji pertsonalizatua
destroy_domain_allow: Ezabatu domeinu baimena
destroy_domain_block: Ezabatu domeinu blokeoa
+ destroy_email_domain_block: Ezabatu email domeinu blokeoa
destroy_instance: Ezabatu betiko domeinua
destroy_ip_block: Ezabatu IP araua
destroy_status: Ezabatu bidalketa
@@ -190,8 +203,10 @@ eu:
destroy_user_role: Ezabatu rola
disable_2fa_user: Desgaitu 2FA
disable_custom_emoji: Desgaitu emoji pertsonalizatua
+ disable_sign_in_token_auth_user: Desgaitu email token autentifikazioa erabiltzailearentzat
disable_user: Desgaitu erabiltzailea
enable_custom_emoji: Gaitu emoji pertsonalizatua
+ enable_sign_in_token_auth_user: Gaitu email token autentifikazioa erabiltzailearentzat
enable_user: Gaitu erabiltzailea
memorialize_account: Bihurtu kontua oroigarri
promote_user: Igo erabiltzailea mailaz
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index e7d932de11..0dbe955a18 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -21,6 +21,7 @@ fa:
one: فرسته
other: فرستهها
posts_tab_heading: فرستهها
+ self_follow_error: دنبال کردن حساب کاربری شما مجاز نیست
admin:
account_actions:
action: انجامِ کنش
@@ -100,7 +101,7 @@ fa:
title: مدیریت
moderation_notes: یادداشتهای مدیریتی
most_recent_activity: آخرین فعالیت
- most_recent_ip: آخرین IP
+ most_recent_ip: آخرین آی پی
no_account_selected: هیچ حسابی تغییر نکرد زیرا حسابی انتخاب نشده بود
no_limits_imposed: بدون محدودیت
no_role_assigned: هیچ نقشی اعطا نشده
@@ -135,7 +136,7 @@ fa:
role: نقش
search: جستوجو
search_same_email_domain: دیگر کاربران با دامنهٔ رایانامهٔ یکسان
- search_same_ip: دیگر کاربران با IP یکسان
+ search_same_ip: دیگر کاربران با آی پی یکسان
security: امنیت
security_measures:
only_password: فقط گذرواژه
@@ -190,9 +191,11 @@ fa:
create_user_role: ایجاد نقش
demote_user: تنزل کاربر
destroy_announcement: حذف اعلامیه
+ destroy_canonical_email_block: حذف انسداد رایانامه
destroy_custom_emoji: حذف اموجی سفارشی
destroy_domain_allow: حذف اجازهٔ دامنه
destroy_domain_block: حذف انسداد دامنه
+ destroy_email_domain_block: حذف انسداد دامنهٔ رایانامه
destroy_instance: پاکسازی دامنه
destroy_ip_block: حذف قاعدهٔ آیپی
destroy_status: حذف وضعیت
@@ -200,8 +203,10 @@ fa:
destroy_user_role: نابودی نقش
disable_2fa_user: از کار انداختن ورود دومرحلهای
disable_custom_emoji: از کار انداختن اموجی سفارشی
+ disable_sign_in_token_auth_user: از کار انداختن تأیید هویت ژتون رایانامهای برای کاربر
disable_user: از کار انداختن کاربر
enable_custom_emoji: به کار انداختن اموجی سفارشی
+ enable_sign_in_token_auth_user: به کار انداختن تأیید هویت ژتون رایانامهای برای کاربر
enable_user: به کار انداختن کاربر
memorialize_account: یادسپاری حساب
promote_user: ترفیع کاربر
@@ -231,20 +236,26 @@ fa:
approve_appeal_html: "%{name} درخواست تجدیدنظر تصمیم مدیر را از %{target} پذیرفت"
approve_user_html: "%{name} ثبت نام %{target} را تایید کرد"
assigned_to_self_report_html: "%{name} رسیدگی به گزارش %{target} را به عهده گرفت"
+ change_email_user_html: "%{name} نشانی رایانامهٔ کاربر %{target} را عوض کرد"
change_role_user_html: "%{name} نقش %{target} را تغییر داد"
+ confirm_user_html: "%{name} نشانی رایانامهٔ کاربر %{target} را تأیید کرد"
create_account_warning_html: "%{name} هشداری برای %{target} فرستاد"
create_announcement_html: "%{name} اعلامیهای جدید ایجاد کرد %{target}"
+ create_canonical_email_block_html: "%{name} رایانامه با درهمریزی %{target} را مسدود کرد"
create_custom_emoji_html: "%{name} اموجی تازهٔ %{target} را بارگذاشت"
create_domain_allow_html: "%{name} دامنهٔ %{target} را مجاز کرد"
create_domain_block_html: "%{name} دامنهٔ %{target} را مسدود کرد"
+ create_email_domain_block_html: "%{name} دامنهٔ رایانامهٔ %{target} را مسدود کرد"
create_ip_block_html: "%{name} برای آیپی %{target} قانونی ایجاد کرد"
create_unavailable_domain_html: "%{name} تحویل محتوا به دامنه %{target} را متوقف کرد"
create_user_role_html: "%{name} نقش %{target} را ایجاد کرد"
demote_user_html: "%{name} کاربر %{target} را تنزل داد"
destroy_announcement_html: "%{name} اعلامیهٔ %{target} را حذف کرد"
+ destroy_canonical_email_block_html: "%{name} رایانامه با درهمریزی %{target} را نامسدود کرد"
destroy_custom_emoji_html: "%{name} شکلک %{target} را حذف کرد"
destroy_domain_allow_html: "%{name} دامنهٔ %{target} را از فهرست مجاز برداشت"
destroy_domain_block_html: "%{name} انسداد دامنهٔ %{target} را رفع کرد"
+ destroy_email_domain_block_html: "%{name} انسداد دامنهٔ رایانامهٔ %{target} را برداشت"
destroy_instance_html: "%{name} دامنه %{target} را پاکسازی کرد"
destroy_ip_block_html: "%{name} قاعدهٔ آیپی %{target} را حذف کرد"
destroy_status_html: "%{name} وضعیت %{target} را برداشت"
@@ -252,8 +263,10 @@ fa:
destroy_user_role_html: "%{name} نقش %{target} را حذف کرد"
disable_2fa_user_html: "%{name} ضرورت ورود دو مرحلهای را برای کاربر %{target} غیر فعال کرد"
disable_custom_emoji_html: "%{name} شکلک %{target} را غیرفعال کرد"
+ disable_sign_in_token_auth_user_html: "%{name}، احراز هویت با توکن رایانامه را برای %{target} غیرفعال کرد"
disable_user_html: "%{name} ورود را برای کاربر %{target} غیرفعال کرد"
enable_custom_emoji_html: "%{name} شکلک %{target} را فعال کرد"
+ enable_sign_in_token_auth_user_html: "%{name}، احراز هویت با توکن رایانامه را برای %{target} فعال کرد"
enable_user_html: "%{name} ورود را برای کاربر %{target} فعال کرد"
memorialize_account_html: "%{name} حساب %{target} را تبدیل به صفحهٔ یادمان کرد"
promote_user_html: "%{name} کاربر %{target} را ترفیع داد"
@@ -268,7 +281,7 @@ fa:
silence_account_html: "%{name} حساب %{target} را محدود کرد"
suspend_account_html: "%{name} حساب %{target} را تعلیق کرد"
unassigned_report_html: "%{name} گزارش %{target} را از حالت محول شده خارج کرد"
- unblock_email_account_html: "%{name} نشانی رایانامهٔ %{target} را رفع مسدودیت کرد"
+ unblock_email_account_html: "%{name} مسدودی نشانی رایانامهٔ %{target} را رفع کرد"
unsensitive_account_html: "%{name} علامت حساس رسانهٔ %{target} را برداشت"
unsilence_account_html: "%{name} محدودیت حساب %{target} را برداشت"
unsuspend_account_html: "%{name} حساب %{target} را از تعلیق خارج کرد"
@@ -365,7 +378,7 @@ fa:
website: پایگاه وب
disputes:
appeals:
- empty: هیچ درخواست تجدیدنظری یافت نشد
+ empty: هیچ درخواست تجدیدنظری یافت نشد.
title: درخواستهای تجدیدنظر
domain_allows:
add_new: مجاز کردن دامنه
@@ -384,10 +397,12 @@ fa:
remove_all_data: این کار همهٔ دادههای نمایه، محتوا و رسانههای حسابهای این دامنه را از کارسازتان برمیدارد.
stop_communication: کارسازتان دیگر با این کارسازها ارتباط برقرار نخواهد کرد.
title: تأیید انسداد دامنه برای %{domain}
+ undo_relationships: با این کار هر رابطه فالو بین حساب های این سرورها و حساب های شما خنثی می شود.
created_msg: مسدودسازی دامنه در حال پردازش است
destroyed_msg: انسداد دامنه واگردانده شد
domain: دامنه
edit: ویرایش مسدودسازی دامنه
+ existing_domain_block: شما قبلاً محدودیت های سخت تری را برای %{name} اعمال کرده اید.
existing_domain_block_html: شما پیشتر محدودیتهای سختتری روی %{name} اعمال کردهاید، و باید نخست مسدودسازی را لغو کنید.
export: برونریزی
import: درونریزی
@@ -395,6 +410,7 @@ fa:
create: مسدودسازی
hint: مسدودسازی دامنه جلوی ایجاد ورودیهای حساب در پایگاه داده را نمیگیرد، بلکه به طور خودکار روشهای مدیریتی را روی فعالیتهای فعلی و گذشتهٔ آن حسابها اعمال میکند.
severity:
+ desc_html: "محدود کردن باعث میشود پستهای حسابهای موجود در این دامنه برای افرادی که آنها را دنبال نمیکنند نامرئی شوند. تعلیق همه محتوا، رسانه و دادههای نمایه حسابهای این دامنه را از سرور شما حذف میکند. اگر فقط میخواهید فایلهای رسانهای را رد کنید، از هیچکدام استفاده کنید."
noop: هیچ
silence: محدود
suspend: تعلیق
@@ -431,6 +447,8 @@ fa:
title: مسدودسازی دامنهٔ رایانامهٔ جدید
no_email_domain_block_selected: هیچ انسداد دامنهٔ رایانامهای تغییر نکرد زیرا هیچکدامشان انتخاب نشده بودند
not_permitted: مجاز نیست
+ resolved_dns_records_hint_html: نام دامنه به دامنههای MX زیر منتقل می شود که در نهایت مسئولیت پذیرش رایانامه را بر عهده دارند. انسداد دامنهٔ MX، ثبتنام از هر نشانی رایانامهای را که از همان دامنهٔ MX استفاده میکند را مسدود میکند؛ حتا اگر نام دامنهٔ نمایان متفاوت باشد. مراقب باشید ارائهدهندگان رایانامهٔ بزرگ را مسدود نکنید.
+ resolved_through_html: از طریق %{domain} حل شد
title: دامنههای رایانامهٔ مسدود شده
export_domain_allows:
new:
@@ -438,9 +456,12 @@ fa:
no_file: هیچ پروندهای گزیده نشده
export_domain_blocks:
import:
+ description_html: شما در حال وارد کردن لیستی از بلوک های دامنه هستید. لطفاً این فهرست را با دقت بررسی کنید، به خصوص اگر خودتان این فهرست را تهیه نکرده اید.
existing_relationships_warning: رابطههای پیگیری موجود
+ private_comment_description_html: 'برای کمک به ردیابی بلوکهای وارد شده از کجا آمدهاند، بلوکهای وارد شده با نظر خصوصی زیر ایجاد میشوند: %{comment}' private_comment_template: درونریخته از %{source} در %{date} title: درونریزی انسدادهای دامنه + invalid_domain_block: 'یک یا چند بلوک دامنه به دلیل خطا(های) زیر نادیده گرفته شد: %{error}' new: title: درونریزی انسدادهای دامنه no_file: هیچ پروندهای گزیده نشده @@ -453,10 +474,20 @@ fa: title: پیشنهادهای پیگیری unsuppress: بازگردانی پیشنهادهای پیگیری instances: + audit_log: + title: گزارش های حسابرسی اخیر + view_all: مشاهده گزارش های حسابرسی کامل availability: + description_html: + one: اگر تحویل به دامنه %{count} روز بدون موفقیت انجام نشد، هیچ تلاش دیگری برای تحویل انجام نخواهد شد مگر اینکه تحویل از دامنه دریافت شود. + other: اگر تحویل به دامنه در %{count} روزهای مختلف بدون موفقیت انجام نشد، هیچ تلاش دیگری برای تحویل انجام نخواهد شد مگر اینکه تحویل از دامنه دریافت شود. failure_threshold_reached: در %{date} به آستانهٔ شکست رسید. + failures_recorded: + one: تلاش ناموفق در %{count} روز. + other: تلاش ناموفق در %{count} روز مختلف. no_failures_recorded: هیچ شکستی در سابقه نیست. title: موجود بودن + warning: آخرین تلاش برای اتصال به این سرور ناموفق بوده است back_to_all: همه back_to_limited: محدود back_to_warning: هشدار @@ -464,6 +495,8 @@ fa: confirm_purge: آیا مطمئن هستید میخواهید داده را از این دامنه برای همیشه پاک کنید؟ content_policies: comment: یادداشت داخلی + description_html: میتوانید خطمشیهای محتوایی را تعریف کنید که برای همه حسابهای این دامنه و هر یک از زیر دامنههای آن اعمال شود. + limited_federation_mode_description_html: شما می توانید انتخاب کنید که آیا فدراسیون با این دامنه مجاز است یا خیر. policies: reject_media: رد کردن رسانه reject_reports: نپذیرفتن گزارشها @@ -478,6 +511,7 @@ fa: instance_followers_measure: پیگیرندگانمان در آنجا instance_follows_measure: پیگیرندگانشان در اینجا instance_languages_dimension: زبانهای برتر + instance_media_attachments_measure: پیوستهای رسانهای ذخیره شده instance_reports_measure: گزارشها دربارهشان instance_statuses_measure: فرستههای ذخیره شده delivery: @@ -502,12 +536,15 @@ fa: private_comment: یادداشت خصوصی public_comment: یادداشت عمومی purge: پاکسازی + purge_description_html: اگر فکر میکنید این دامنه برای همیشه آفلاین است، میتوانید تمام سوابق حساب و دادههای مرتبط با این دامنه را از فضای ذخیرهسازی خود حذف کنید. این ممکن است کمی طول بکشد. title: ارتباط همگانی total_blocked_by_us: مسدودشده از طرف ما total_followed_by_them: ما را پی میگیرند total_followed_by_us: ما پیگیرشان هستیم total_reported: گزارشها دربارهشان total_storage: عکسها و ویدیوها + totals_time_period_hint_html: مجموع نمایش داده شده در زیر شامل داده های تمام زمان است. + unknown_instance: در حال حاضر هیچ سابقه ای از این دامنه در این سرور وجود ندارد. invites: deactivate_all: غیرفعالکردن همه filter: @@ -518,7 +555,7 @@ fa: title: دعوتها ip_blocks: add_new: ایجاد قانون - created_msg: قانون IP جدید با موفقیت افزوده شد + created_msg: قانون آی پی جدید با موفقیت افزوده شد delete: پاک کردن expires_in: '1209600': ۲ هفته @@ -528,15 +565,15 @@ fa: '86400': ۱ روز '94670856': ۳ سال new: - title: ایجاد قانون جدید IP + title: ایجاد قانون جدید آی پی no_ip_block_selected: هیچ قاعدهٔ آیپیای تغییری نکرد زیرا هیچکدام گزیده نشده بودند - title: قوانین IP + title: قوانین آی پی relationships: title: روابط %{acct} relays: add_new: افزودن رلهٔ تازه delete: حذف - description_html: یک رلهٔ میانسروری (federation relay) یک سرور میانجی است که حجم زیادی از فرستههای عمومی را بین سرورهای گوناگونی که عضوش میشوند جابهجا میکند. رلهها به سرورهای کوچک و متوسط کمک میکنند تا مطالب عمومی بیشتری را بیابند. اگر رله نباشد، این مطالب عمومی تنها وقتی پیدا میشوند که کاربران محلی خودشان پیگیر کاربران روی سرورهای دیگر شوند. + description_html: "رله فدراسیون یک سرور واسطه است که حجم زیادی از پستهای عمومی را بین سرورهایی که مشترک و منتشر میکنند رد و بدل میکند. میتواند به سرورهای کوچک و متوسط کمک کند تا محتوایی را از طرف دیگر پیدا کنند، که در غیر این صورت از کاربران محلی میخواهد بهطور دستی افراد دیگر را در سرورهای راه دور دنبال کنند." disable: از کار انداختن disabled: از کار افتاده enable: به کار انداختن @@ -564,19 +601,31 @@ fa: mark_as_sensitive_description_html: رسانهٔ درون فرستهٔ گزارش شده به عنوان حسّاس علامت خورده و شکایتی ضبط خواهد شد تا بتوانید خلافهای آینده از همین حساب را بهتر مدیریت کنید. other_description_html: دیدن انتخاب های بیشتر برای کنترل رفتار حساب و سفارشی سازی ارتباط با حساب گزارش شده. resolve_description_html: هیچ کنشی علیه حساب گزارش شده انجام نخواهد شد. هیچ شکایتی ضبط نشده و گزارش بسته خواهد شد. + silence_description_html: این حساب فقط برای کسانی قابل مشاهده خواهد بود که قبلاً آن را دنبال می کنند یا به صورت دستی آن را جستجو می کنند و دسترسی آن را به شدت محدود می کند. همیشه می توان برگرداند. همه گزارشهای مربوط به این حساب را میبندد. + suspend_description_html: اکانت و تمامی محتویات آن غیرقابل دسترسی و در نهایت حذف خواهد شد و تعامل با آن غیر ممکن خواهد بود. قابل برگشت در عرض 30 روز همه گزارشهای مربوط به این حساب را میبندد. + actions_description_html: تصمیم گیری کنش اقدامی برای حل این گزارش. در صورت انجام کنش تنبیهی روی حساب گزارش شده، غیر از زمان یکه دستهٔ هرزنامه گزیده باشد، برایش آگاهی رایانامهای فرستاده خواهد شد. + actions_description_remote_html: تصمیم بگیرید که چه اقدامی برای حل این گزارش انجام دهید. این فقط بر نحوه ارتباط سرور شما با این حساب راه دور و مدیریت محتوای آن تأثیر می گذارد. + actions_no_posts: این گزارش هیچ پست مرتبطی برای حذف ندارد add_to_report: افزودن بیشتر به گزارش + already_suspended_badges: + local: از پیش روی این کارساز معلّق شده + remote: از پیش روی کارسازشان معلّق شده are_you_sure: مطمئنید؟ assign_to_self: به عهدهٔ من بگذار assigned: مدیر عهدهدار by_target_domain: دامنهٔ حساب گزارششده cancel: لغو category: دسته + category_description_html: دلیل گزارش این حساب و/یا محتوا در ارتباط با حساب گزارش شده ذکر خواهد شد comment: none: هیچ + comment_description_html: 'برای ارائه اطلاعات بیشتر، %{name} نوشت:' confirm: تأیید + confirm_action: تأیید کنش مدیریتی برای @%{acct} created_at: گزارششده delete_and_resolve: حذف فرستهها forwarded: هدایت شده + forwarded_replies_explanation: این گزارش از یک کاربر راه دور و در مورد محتوای راه دور است. برای شما ارسال شده است زیرا محتوای گزارش شده در پاسخ به یکی از کاربران شما است. forwarded_to: هدایت شده به %{domain} mark_as_resolved: علامتگذاری به عنوان حلشده mark_as_sensitive: علامت به حساس @@ -589,18 +638,39 @@ fa: delete: حذف placeholder: کارهایی را که در این باره انجام شده، یا هر بهروزرسانی دیگری را بنویسید... title: یادداشتها + notes_description_html: مشاهده کنید و یادداشت هایی را برای مدیران دیگر و خود آینده خود بگذارید + processed_msg: 'گزارش #%{id} با موفقیت پردازش شد' + quick_actions_description_html: 'یک اقدام سریع انجام دهید یا به پایین بروید تا محتوای گزارش شده را ببینید:' remote_user_placeholder: کاربر دوردست از %{instance} reopen: دوباره به جریان بیندازید report: 'گزارش #%{id}' reported_account: حساب گزارششده reported_by: گزارش از طرف + reported_with_application: گزارش شده با برنامه resolved: حلشده resolved_msg: گزارش با موفقیت حل شد! skip_to_actions: پرش به کنشها status: نوشته statuses: محتوای گزارش شده + statuses_description_html: محتوای توهین آمیز در ارتباط با حساب گزارش شده ذکر می شود summary: + action_preambles: + delete_html: 'شما در حال حذف برخی از پستهای @%{acct} هستید. این خواهد شد:' + mark_as_sensitive_html: 'شما در حال علامت گذاری برخی از پست های @%{acct} به عنوان حساس هستید. این خواهد شد:' + silence_html: 'شما در شرف محدود کردن @%{acct} هستید. این خواهد شد:' + suspend_html: 'شما در شرف تعلیق کردن @%{acct} هستید. این خواهد شد:' + actions: + delete_html: پست های توهین آمیز را حذف کنید + mark_as_sensitive_html: رسانه پست های توهین آمیز را به عنوان حساس علامت گذاری کنید + silence_html: دسترسی @%{acct} را به شدت محدود کنید و نمایه و محتویات آنها را فقط برای افرادی که قبلاً آنها را دنبال میکنند قابل مشاهده کنید یا به صورت دستی نمایه آن را جستجو کنید + suspend_html: تعلیق @%{acct}، غیرقابل دسترس کردن نمایه و محتوای آنها و تعامل با آنها غیر ممکن + close_report: 'علامت گذاری گزارش #%{id} به عنوان حل شده است' + close_reports_html: "همه گزارشها در برابر @%{acct} را بهعنوان حلوفصل علامتگذاری کنید" + delete_data_html: نمایه و محتویات @%{acct} را 30 روز بعد حذف کنید، مگر اینکه در این مدت معلق نشوند + preview_preamble_html: "@%{acct} اخطاری با محتوای زیر دریافت خواهد کرد:" record_strike_html: ضبط شکایتی علیه @%{acct} برای کمک به تصمیمگیری برای قانونشکنیهای آیندهٔ این حساب + send_email_html: فرستادن رایانامهٔ هشدار به @%{acct} + warning_placeholder: استدلال اضافی اختیاری برای اقدام تعدیل. target_origin: خاستگاه حساب گزارششده title: گزارشها unassign: پسگرفتن مسئولیت @@ -620,34 +690,54 @@ fa: moderation: نظارت special: ویژه delete: حذف + description_html: با نقشهای کاربر، میتوانید تنظیمات و مناطقی از ماستودون را که کاربران شما میتوانند به آن دسترسی داشته باشند، سفارشی کنید. edit: ویراش نقش %{name} everyone: اجازههای پیشگزیده + everyone_full_description_html: این نقش پایه است که بر همه کاربران تأثیر میگذارد، حتی آنهایی که نقش تعیینشده ندارند. همه نقش های دیگر مجوزها را از آن به ارث می برند. permissions_count: one: "%{count} اجازه" other: "%{count} اجازه" privileges: administrator: مدیر + administrator_description: کاربرانی که این مجوز را دارند از هر مجوزی عبور می کنند delete_user_data: حذف دادههای کاربر + delete_user_data_description: به کاربران این امکان را می دهد که بدون تاخیر داده های سایر کاربران را حذف کنند invite_users: دعوت کاربران + invite_users_description: به کاربران اجازه می دهد افراد جدیدی را به سرور دعوت کنند manage_announcements: مدیریت اعلامیهها + manage_announcements_description: به کاربران اجازه می دهد تا اعلان ها را روی سرور مدیریت کنند manage_appeals: مدیریت درخواستهای بازنگری + manage_appeals_description: به کاربران امکان میدهد درخواستهای تجدیدنظر علیه اقدامات تعدیل را بررسی کنند manage_blocks: مدیریت مسدودیها + manage_blocks_description: میگذارد کاربران فراهمکنندگان رایانامه و نشانیهای آیپی را مسدود کنند manage_custom_emojis: مدیریت ایموجیهای سفارشی + manage_custom_emojis_description: به کاربران اجازه می دهد تا ایموجی های سفارشی را روی سرور مدیریت کنند manage_federation: مدیریت خودگردانی + manage_federation_description: به کاربران اجازه میدهد تا اتحاد با دامنههای دیگر را مسدود یا اجازه دهند و تحویلپذیری را کنترل کنند manage_invites: مدیریت دعوتها + manage_invites_description: به کاربران امکان می دهد پیوندهای دعوت را مرور و غیرفعال کنند manage_reports: مدیریت گزارشها + manage_reports_description: به کاربران امکان میدهد گزارشها را بررسی کنند و اقدامات تعدیل را علیه آنها انجام دهند manage_roles: مدیریت نقشها + manage_roles_description: به کاربران امکان می دهد نقش های زیر نقش خود را مدیریت و اختصاص دهند manage_rules: مدیریت قوانین manage_rules_description: اجازه به کاربران برای تغییر قوانین کارساز manage_settings: مدیریت تنظیمات manage_settings_description: اجازه به کاربران برای تغییر تنظیمات پایگاه manage_taxonomies: مدیریت طیقهبندیها + manage_taxonomies_description: میگذارد کاربران محتوای داغ را بررسی و تنظیمات برچسب را بهروز کنند manage_user_access: مدیریت دسترسی کاربران + manage_user_access_description: میگذارد کاربران هویتسنجی دو مرحلهای دیگر کاربران را از کار انداخته، نشانی رایانامهشان را تغییر داده و گذرواژهشان را بازنشانی کنند manage_users: مدیریت کاربران + manage_users_description: به کاربران اجازه می دهد تا جزئیات سایر کاربران را مشاهده کنند و اقدامات تعدیل را علیه آنها انجام دهند manage_webhooks: مدیریت قلّابهای وب + manage_webhooks_description: به کاربران اجازه می دهد تا برای رویدادهای اداری، وب هوک ها را راهاندازی کنند + view_audit_log: مشاهده گزارش حسابرسی + view_audit_log_description: به کاربران اجازه می دهد تا تاریخچه ای از اقدامات مدیریتی روی سرور را مشاهده کنند view_dashboard: دیدن داشبورد view_dashboard_description: اجازه به کاربران برای دسترسی به داشتبورد و سنجههای مختلف view_devops: دواپس + view_devops_description: به کاربران امکان دسترسی به داشبورد Sidekiq و pgHero را می دهد title: نقشها rules: add_new: افزودن قانون @@ -659,16 +749,28 @@ fa: settings: about: manage_rules: مدیریت قانونهای کارساز + preamble: اطلاعات عمیقی در مورد نحوه کارکرد، تعدیل و تأمین مالی سرور ارائه دهید. + rules_hint: یک منطقه اختصاصی برای قوانینی وجود دارد که انتظار می رود کاربران شما به آن پایبند باشند. title: درباره appearance: preamble: سفارشیسازی رابطس وب ماستودون. title: ظاهر branding: + preamble: نام تجاری سرور شما آن را از سایر سرورهای شبکه متمایز می کند. این اطلاعات ممکن است در محیط های مختلفی مانند رابط وب ماستودون، برنامه های کاربردی بومی، در پیش نمایش پیوند در سایر وب سایت ها و در برنامه های پیام رسانی و غیره نمایش داده شود. به همین دلیل، بهتر است این اطلاعات واضح، کوتاه و مختصر باشد. title: ویژندگی + captcha_enabled: + desc_html: این متکی به اسکریپت های خارجی از hCaptcha است که ممکن است یک نگرانی امنیتی و حفظ حریم خصوصی باشد. علاوه بر این، این میتواند فرآیند ثبت نام را به میزان قابل توجهی برای برخی از افراد (به ویژه افراد ناتوان) کمتر در دسترس قرار دهد. به این دلایل، لطفاً اقدامات جایگزین مانند ثبت نام مبتنی بر تأیید یا دعوت را در نظر بگیرید. + title: کاربران جدید را ملزم به حل یک کپچا برای تأیید حساب خود کنید + content_retention: + danger_zone: منطقهٔ خطر + preamble: نحوه ذخیره محتوای تولید شده توسط کاربر در ماستودون را کنترل کنید. + title: حفظ محتوا default_noindex: + desc_html: بر همه کاربرانی که خودشان این تنظیم را تغییر نداده اند تأثیر می گذارد title: درخواست خروج از اندیسگذاری پیشگزیدهٔ موتور جستوجو discovery: follow_recommendations: پیروی از پیشنهادها + preamble: ارائه محتوای جالب در جذب کاربران جدیدی که ممکن است کسی ماستودون را نشناسند، مفید است. نحوه عملکرد ویژگیهای کشف مختلف روی سرور خود را کنترل کنید. profile_directory: شاخهٔ نمایه public_timelines: خط زمانیهای عمومی publish_discovered_servers: انتشار کارسازهای کشف شده @@ -680,18 +782,27 @@ fa: disabled: برای هیچکدام users: برای کاربران محلی واردشده registrations: + moderation_recommandation: لطفاً قبل از اینکه ثبت نام را برای همه باز کنید، مطمئن شوید که یک تیم نظارتی مناسب و واکنشی دارید! + preamble: کنترل کنید چه کسی می تواند در سرور شما یک حساب ایجاد کند. title: ثبتنامها registrations_mode: modes: approved: ثبت نام نیازمند تأیید مدیران است none: کسی نمیتواند ثبت نام کند open: همه میتوانند ثبت نام کنند + warning_hint: توصیه میکنیم از ”تأیید لازم برای ثبتنام” استفاده کنید، مگر اینکه مطمئن باشید تیم نظارتی شما میتواند هرزنامهها و ثبتهای مخرب را به موقع مدیریت کند. + security: + authorized_fetch: نیاز به احراز هویت از سرورهای فدرال + authorized_fetch_hint: نیاز به احراز هویت از سرورهای فدرال، اجرای دقیقتر بلوکهای سطح کاربر و سرور را ممکن میسازد. با این حال، این به قیمت جریمه عملکرد است، دسترسی به پاسخهای شما را کاهش میدهد و ممکن است مشکلات سازگاری با برخی از سرویسهای فدرال را ایجاد کند. علاوه بر این، این مانع از دریافت پستها و حسابهای عمومی شما توسط بازیگران اختصاصی نمیشود. + authorized_fetch_overridden_hint: شما در حال حاضر نمی توانید این تنظیم را تغییر دهید زیرا توسط یک متغیر محیطی لغو شده است. + federation_authentication: اجرای احراز هویت فدراسیون title: تنظیمات کارساز site_uploads: delete: پرونده بارگذاری شده را پاک کنید destroyed_msg: بارگذاری پایگاه با موفقیت حذف شد! software_updates: critical_update: بحرانی — لطفاً به سرعت بهروز کنید + description: توصیه میشود نصب ماستودونتان را بهروز نگه داشته تا از جدیدترین اصلاحات و ویژگیها بهرهمند شوید. همچنین گاهی بهروز رسانی بهموقع ماستودون برای پیشگیری از مشکلات امنیتی ضروریست. برای همین ماستودون هر ۳۰ دقیقه بهروز رسانیها را بررسی کرده و بنا به ترجیحات آگاهی رایانامهایتان آگاهتان خواهد کرد. documentation_link: بیشتر بیاموزید release_notes: یادداشتهای انتشار title: بهروز رسانیهای موجود @@ -699,6 +810,7 @@ fa: types: major: ارائه بزرگ minor: ارائه کوچک + patch: انتشار وصله - رفع اشکال و تغییرات آسان برای اعمال version: نگارش statuses: account: نگارنده @@ -740,10 +852,22 @@ fa: system_checks: database_schema_check: message_html: تعداد مهاجرت پایگاه داده در انتظار انجام هستند. لطفا آنها را اجرا کنید تا اطمینان یابید که برنامه مطابق انتظار رفتار خواهد کرد + elasticsearch_health_red: + message_html: خوشه Elasticsearch ناسالم است (وضعیت قرمز)، ویژگی های جستجو در دسترس نیستند + elasticsearch_health_yellow: + message_html: خوشه Elasticsearch ناسالم است (وضعیت زرد)، ممکن است بخواهید دلیل آن را بررسی کنید + elasticsearch_index_mismatch: + message_html: نگاشت فهرست Elasticsearch منسوخ شده است. لطفاً
tootctl search deploy --only=%{value} را اجرا کنید
elasticsearch_preset:
action: دیدن مستندات
+ message_html: خوشه Elasticsearch شما بیش از یک گره دارد، اما ماستودون برای استفاده از آنها پیکربندی نشده است.
elasticsearch_preset_single_node:
action: دیدن مستندات
+ message_html: خوشه Elasticsearch شما فقط یک گره دارد، ES_PRESET باید روی single_node_cluster تنظیم شود.
+ elasticsearch_reset_chewy:
+ message_html: فهرست سیستم Elasticsearch شما به دلیل تغییر تنظیمات قدیمی است. لطفاً برای به روز رسانی tootctl search deploy --reset-chewy را اجرا کنید.
+ elasticsearch_running_check:
+ message_html: به Elasticsearch متصل نشد. لطفاً بررسی کنید که در حال اجرا است یا جستجوی متن کامل را غیرفعال کنید
elasticsearch_version_check:
message_html: 'نگارش الستیکسرچ ناسازگار: %{value}'
version_comparison: الستیکسرچ %{running_version} در حال اجراست، حال که %{required_version} لازم است
@@ -752,6 +876,9 @@ fa:
message_html: هیچ قانون کارسازی تعریف نکردهاید.
sidekiq_process_check:
message_html: صف(های) %{value} فاقد هیچونه فرایند Sidekiq هستند. لطفا تنظیمات Sidekiq خود را بازبینی کنید
+ software_version_check:
+ action: دیدن بهروز رسانیهای موجود
+ message_html: بهروز رسانی ماستودون موجود است.
software_version_critical_check:
action: مشاهده بهروزرسانیهای موجود
message_html: یک بهروزرسانی حیاتی ماستودون موجود است، لطفا در اسرع وقت بهروزرسانی کنید.
@@ -775,35 +902,64 @@ fa:
trendable: قابل داغ شدن
unreviewed: بررسی نشده
usable: قابل استفاده
+ name: نام
+ newest: جدیدترین
+ oldest: قدیمیترین
+ open: دیدن عمومی
+ reset: بازنشانی
review: وضعیت بازبینی
+ search: جستوجو
+ title: برچسبها
updated_msg: تنظیمات برچسبها با موفقیت بهروز شد
title: مدیریت
trends:
allow: اجازه
approved: تأیید شده
+ confirm_allow: مطمئنید که میخواهید برچسبهای گزیده را مجاز کنید؟
+ confirm_disallow: مطمئنید که میخواهید برچسبهای گزیده را ممنوع کنید؟
disallow: اجازه ندادن
links:
allow: اجازه به پیوند
allow_provider: اجازه به ناشر
+ confirm_allow: مطمئنید که میخواهید پیوندهای گزیده را مجاز کنید؟
+ confirm_allow_provider: مطمئنید که میخواهید فراهمکنندههای گزیده را مجاز کنید؟
confirm_disallow: مطمئنید که می خواهید پیوندهای گزیده را ممنوع کنید؟
confirm_disallow_provider: مطمئنید که می خواهید فراهم کنندههای گزیده را ممنوع کنید؟
+ description_html: اینها پیوندهایی هستند که در حال حاضر توسط حساب هایی که سرور شما پست ها را از آنها می بیند به اشتراک گذاشته می شود. این می تواند به کاربران شما کمک کند تا بفهمند در جهان چه می گذرد. تا زمانی که ناشر را تأیید نکنید، هیچ پیوندی به صورت عمومی نمایش داده نمی شود. همچنین می توانید پیوندهای فردی را مجاز یا رد کنید.
disallow: اجازه ندادن به پیوند
disallow_provider: اجازه ندادن به ناشر
no_link_selected: هیچ پیوندی تغییر نکرد زیرا هیچکدام از آنها انتخاب نشده بودند
publishers:
no_publisher_selected: هیچ ناشری تغییر نکرد زیرا هیچکدام از آنها انتخاب نشده بودند
+ shared_by_over_week:
+ one: همرسانده به دست یک نفر در هفتهٔ گذشته
+ other: همرسانده به دست %{count} نفر در هفتهٔ گذشته
title: پیوندهای داغ
+ usage_comparison: امروز %{today} بار همرسانی شده. در مقایسه با %{yesterday} بار دیروز
not_allowed_to_trend: اجازهٔ داغ شدن ندارد
+ only_allowed: فقط مجازها
pending_review: بازبینی منتظر
preview_card_providers:
+ allowed: پیوندها از این ناشر میتوانند داغ شوند
+ description_html: اینها دامنه هایی هستند که پیوندهای آنها اغلب در سرور شما به اشتراک گذاشته می شود. پیوندها به صورت عمومی ترند نمی شوند مگر اینکه دامنه پیوند تأیید شود. تأیید (یا رد) شما به زیر دامنه ها نیز گسترش می یابد.
+ rejected: پیوندها از این ناشر داغ نخواهند شد
title: ناشران
rejected: رد شده
statuses:
allow: اجازه به فرسته
allow_account: اجازه به نگارنده
+ confirm_allow: مطمئنید که میخواهید وضعیتهای گزیده را مجاز کنید؟
+ confirm_allow_account: مطمئنید که میخواهید حسابهای گزیده را مجاز کنید؟
+ confirm_disallow: مطمئنید که میخواهید وضعیتهای گزیده را ممنوع کنید؟
+ confirm_disallow_account: مطمئنید که میخواهید حسابهای گزیده را ممنوع کنید؟
+ description_html: اینها پست هایی هستند که سرور شما در مورد آنها می داند و در حال حاضر در حال به اشتراک گذاری و محبوبیت زیادی هستند. می تواند به کاربران جدید و بازگشتی شما کمک کند تا افراد بیشتری را برای دنبال کردن پیدا کنند. تا زمانی که نویسنده را تأیید نکنید، هیچ پستی به صورت عمومی نمایش داده نمیشود و نویسنده اجازه میدهد حساب خود را به دیگران پیشنهاد دهد. همچنین می توانید پست های فردی را مجاز یا رد کنید.
disallow: ممنوع کردن فرسته
disallow_account: ممنوع کردن نگارنده
no_status_selected: هیچ فرستهٔ داغی تغییری نکرد زیرا هیچکدام از آنها انتخاب نشده بودند
+ not_discoverable: نویسنده امکان کشف بودن را انتخاب نکرده است
+ shared_by:
+ one: یک بار برگزیده یا همرسانی شده
+ other: "%{friendly_count} بار برگزیده یا همرسانی شده"
title: فرستههای داغ
tags:
current_score: امتیاز کنونی %{score}
@@ -812,25 +968,38 @@ fa:
tag_languages_dimension: زبانهای برتر
tag_servers_dimension: کارسازهای برتر
tag_servers_measure: کارسازهای گوناگون
- tag_uses_measure: کل استفادهّا
+ tag_uses_measure: کل استفادهها
+ description_html: اینها هشتگ هایی هستند که در حال حاضر در بسیاری از پست هایی که سرور شما می بیند ظاهر می شوند. این می تواند به کاربران شما کمک کند تا بفهمند مردم در حال حاضر بیشتر درباره چه چیزی صحبت می کنند. تا زمانی که شما آن ها را تایید نکنید، هیچ هشتگ به صورت عمومی نمایش داده نمی شود.
listable: میتواند پیشنهاد شود
+ no_tag_selected: هیچ برچسبی تغییر نکرد زیرا هیچکدام گزیده نبودند
not_listable: پیشنهاد نخواهد شد
+ not_trendable: تحت روندها ظاهر نمی شود
not_usable: غیر قابل استفاده
+ peaked_on_and_decaying: در %{date} به اوج خود رسید، اکنون در حال زوال است
title: برچسبهای پرطرفدار
+ trendable: می تواند در زیر روندها ظاهر شود
trending_rank: 'پرطرفدار #%{rank}'
usable: قابل استفاده
+ usage_comparison: "%{today} بار امروز در مقایسه با %{yesterday} دیروز استفاده شد"
+ used_by_over_week:
+ one: در هفته گذشته توسط یک نفر استفاده شده است
+ other: در هفته گذشته توسط %{count} نفر استفاده شده است
+ title: توصیه ها و روندها
trending: پرطرفدار
warning_presets:
add_new: افزودن تازه
delete: زدودن
edit_preset: ویرایش هشدار پیشفرض
empty: هنز هیچ پیشتنظیم هشداری را تعریف نکردهاید.
+ title: از پیش تنظیم های هشدار
webhooks:
add_new: افزودن نقطهٔ پایانی
delete: حذف
+ description_html: یک وب هوک ماستودون را قادر میسازد تا اعلانهای همزمان در مورد رویدادهای انتخابی را به برنامه خود ارسال کند، بنابراین برنامه شما میتواند بهطور خودکار واکنشها را تحریک کند.
disable: از کار انداختن
disabled: از کار افتاده
edit: ویرایش نقطهٔ پایانی
+ empty: شما هنوز هیچ نقطه پایانی وبی هوک را پیکربندی نکردهاید.
enable: به کار انداختن
enabled: فعّال
enabled_events:
@@ -844,6 +1013,9 @@ fa:
title: قلابهای وب
webhook: قلاب وب
admin_mailer:
+ auto_close_registrations:
+ body: به دلیل عدم فعالیت اخیر ناظر، ثبت نام در %{instance} به طور خودکار به نیاز به بازبینی دستی تغییر یافته است تا از استفاده %{instance} به عنوان بستری برای بازیگران بد احتمالی جلوگیری شود. در هر زمان می توانید آن را به ثبت نام های باز تغییر دهید.
+ subject: ثبت نام برای %{instance} به طور خودکار به نیاز به تأیید تغییر یافته است
new_appeal:
actions:
delete_statuses: برای حذف فرستههایشان
@@ -853,6 +1025,12 @@ fa:
sensitive: برای علامت زدن حسابشان به عنوان حسّاس
silence: برای محدود کردن حساب آنها
suspend: برای تعلیق حسابشان
+ body: "%{target} برای یک تصمیم نظارتی توسط %{action_taken_by} از %{date} که %{type} بود، درخواست تجدیدنظر میکند. آنها نوشتند:"
+ next_steps: میتوانید برای لغو تصمیم تعدیل، درخواست تجدیدنظر را تأیید کنید یا آن را نادیده بگیرید.
+ subject: "%{username} در حال درخواست تجدیدنظر برای تصمیم نظارت در %{instance}"
+ new_critical_software_updates:
+ body: نسخه های انتقادی جدید ماستودون منتشر شده است، ممکن است بخواهید در اسرع وقت به روز رسانی کنید!
+ subject: بهروزرسانیهای ماستودون بحرانی برای %{instance} در دسترس هستند!
new_pending_account:
body: جزئیات حساب تازه اینجاست. شما میتوانید آن را تأیید یا رد کنید.
subject: حساب تازهای در %{instance} نیازمند بررسی است (%{username})
@@ -860,7 +1038,11 @@ fa:
body: کاربر %{reporter} کاربر %{target} را گزارش داد
body_remote: کسی از %{domain} گزارش %{target} را فرستاده
subject: گزارش تازهای برای %{instance} (#%{id})
+ new_software_updates:
+ body: نسخه های جدید ماستودون منتشر شده است، ممکن است بخواهید به روز رسانی کنید!
+ subject: نسخه های جدید ماستودون برای %{instance} در دسترس هستند!
new_trends:
+ body: 'موارد زیر قبل از نمایش عمومی نیاز به بررسی دارند:'
new_trending_links:
title: پیوندهای داغ
new_trending_statuses:
@@ -905,11 +1087,19 @@ fa:
auth:
apply_for_account: درخواست یک حساب
captcha_confirmation:
+ help_html: اگر مشکلی در حل کپچا دارید، می توانید از طریق %{email} با ما در تماس باشید و ما می توانیم به شما کمک کنیم.
+ hint_html: فقط یک چیز دیگر! ما باید تأیید کنیم که شما یک انسان هستید (این برای جلوگیری از هرزنامه است!). کپچا زیر را حل کنید و روی "ادامه" کلیک کنید.
title: بررسی های امنیتی
confirmations:
+ awaiting_review: نشانی رایانامهتان تأیید شد! عوامل %{domain} دارند ثبتنامتان را بررسی میکنند. در صورت تأیید حسابتان رایانامهای خواهید گرفت!
awaiting_review_title: ثبتنامتان دارد بررسی میشود
+ clicking_this_link: زدن این پیوند
login_link: ورود
+ proceed_to_login_html: میتوانید به %{login_link} ادامه دهید.
+ redirect_to_app_html: باید به برنامه %{app_name} هدایت میشوید. اگر این اتفاق نیفتاد، %{clicking_this_link} را امتحان کنید یا به صورت دستی به برنامه برگردید.
+ registration_complete: ثبت نام شما در %{domain} اکنون کامل شده است!
welcome_title: خوش آمدید، %{name}!
+ wrong_email_hint: اگر نشانی رایانامه درست نیست میتوانید در تنظیمات حساب تغییرش دهید.
delete_account: پاککردن حساب
delete_account_html: اگر میخواهید حساب خود را پاک کنید، از اینجا پیش بروید. از شما درخواست تأیید خواهد شد.
description:
@@ -930,6 +1120,7 @@ fa:
or_log_in_with: یا ورود به وسیلهٔ
privacy_policy_agreement_html: سیاست محرمانگی را خوانده و پذیرفتهام
progress:
+ confirm: تأیید رایانامه
details: جزئیات شما
review: بررسی ما
rules: پذیرش قوانین
@@ -943,26 +1134,44 @@ fa:
rules:
accept: پذیرفتن
back: بازگشت
+ invited_by: 'با سپاس از دعوتی از این فرد دریافت کردهاید میتوانید به %{domain} بپیوندید:'
+ preamble: اینها توسط گردانندگان %{domain} تنظیم و اجرا می شوند.
+ preamble_invited: قبل از ادامه، لطفاً قوانین اساسی تنظیم شده توسط مدیران %{domain} را در نظر بگیرید.
+ title: برخی از قوانین اساسی.
title_invited: شما دعوت شده اید.
security: امنیت
set_new_password: تعین گذرواژه جدید
setup:
+ email_below_hint_html: بررسی شاخهٔ هرزنامه یا درخواست رایانامهای دیگر. در صورت اشتباه بودن نشانی رایانامه میتوانید تصحیحش کنید.
email_settings_hint_html: برای تأیید %{email}، روی پیوندی که برای شما ارسال کردیم ضربه بزنید. همین جا منتظر میمانیم.
link_not_received: پیوندی نگرفتید؟
+ new_confirmation_instructions_sent: تا چند دقیقهٔ دیگر رایانامهای جدید با پیوند تأییدیه خواهید گرفت!
title: صندوق ورودیتان را بررسی کنید
sign_in:
+ preamble_html: با اطلاعات کاربری %{domain} خود وارد شوید. اگر حساب شما روی سرور دیگری میزبانی شود، نمی توانید در اینجا وارد شوید.
title: ورود به %{domain}
+ sign_up:
+ manual_review: ثبتنامها در %{domain} از طریق بازبینی دستی توسط گردانندگان ما انجام میشود. برای کمک به ما در پردازش ثبت نام خود، کمی در مورد خودتان و اینکه چرا می خواهید یک حساب در %{domain} داشته باشید، بنویسید.
+ preamble: با داشتن یک حساب کاربری در این سرور ماستودون، میتوانید هر شخص دیگری را در شبکه دنبال کنید، صرف نظر از اینکه حساب او در کجا میزبانی میشود.
+ title: بیایید روی %{domain} برپایتان کنیم.
status:
account_status: وضعیت حساب
+ confirming: منتظر کامل شدن تأیید رایانامه.
functional: حسابتان کاملاً قابل استفاده است.
+ pending: درخواستتان منتظر بازبینی مسئولان است. ممکن است کمی طول بکشد. اگر درخواستتان پذیرفته شود رایانامهای خواهید گرفت.
redirecting_to: حساب شما غیرفعال است زیرا هماکنون به %{acct} منتقل شده است.
+ self_destruct: از آنجایی که %{domain} در حال بسته شدن است، شما فقط دسترسی محدودی به حساب خود خواهید داشت.
view_strikes: دیدن شکایتهای گذشته از حسابتان
too_fast: فرم با سرعت بسیار زیادی فرستاده شد، دوباره تلاش کنید.
use_security_key: استفاده از کلید امنیتی
author_attribution:
example_title: متن نمونه
+ hint_html: آیا در خارج از ماستودون اخبار یا مقالات وبلاگ می نویسید؟ نحوه دریافت اعتبار زمانی که آنها در ماستودون به اشتراک گذاشته می شوند را کنترل کنید.
+ instructions: 'مطمئن شوید این کد در HTML مقالهتان وجود دارد:'
more_from_html: بیشتر از %{name}
s_blog: بلاگ %{name}
+ then_instructions: سپس نام دامنهٔ مقاله را در زمینهٔ زیر بیفزایید.
+ title: اعتباردهی به نگارنده
challenge:
confirm: ادامه
hint_html: "نکته: ما در یک ساعت آینده گذرواژهتان را از شما نخواهیم پرسید."
@@ -999,6 +1208,9 @@ fa:
before: 'پیش از ادامه، لطفاً نکتههای زیر را به دقت بخوانید:'
caches: ممکن است محتواهایی که دیگر کارسازها ذخیره کردهاند، همچنان باقی بماند
data_removal: نوشتهها و دادههای شما برای همیشه پاک خواهند شد
+ email_change_html: میتوانید بدون حذف حسابتان نشانی رایانامهتان را تغییر دهید
+ email_contact_html: اگر هنوز نرسیده، میتوانید برای راهنمایی به %{email} رایانامه دهید
+ email_reconfirmation_html: اگر رایانامهٔ تأیید را نگرفتهاید، میتوانید دوباره درخواستش دهید
irreversible: شما نخواهید توانست حساب خود را بازیابی یا فعالسازی کنید
more_details_html: برای اطلاعات بیشتر سیاست رازداری را ببینید.
username_available: نام کاربری شما دوباره در دسترس خواهد بود
@@ -1086,13 +1298,16 @@ fa:
add_keyword: افزودن کلیدواژه
keywords: کلیدواژهها
statuses: فرستههای جدا
+ statuses_hint_html: این فیلتر برای انتخاب هر پست صرف نظر از مطابقت با کلمات کلیدی زیر اعمال می شود. پستها را از فیلتر بازبینی یا حذف کنید.
title: ویرایش پالایه
errors:
deprecated_api_multiple_keywords: این پارامترها نمیتوانند از این برنامه تغییر یابند؛ چرا که به بیش از یک کلیدواژهٔ پالایه اعمال میشود. از برنامهای جدیدتر یا میانای وب استفاده کنید.
invalid_context: زمینهای موجود نیست یا نامعتبر است
index:
+ contexts: پالایهها در %{contexts}
delete: پاککردن
empty: هیچ پالایهای ندارید.
+ expires_in: در %{distance} منقضی می شود
expires_on: در %{date} منقضی می شود
keywords:
one: "%{count} کلیدواژه"
@@ -1112,9 +1327,13 @@ fa:
batch:
remove: برداشتن از پالایه
index:
+ hint: این فیلتر برای انتخاب پست های فردی بدون توجه به معیارهای دیگر اعمال می شود. می توانید پست های بیشتری را از رابط وب به این فیلتر اضافه کنید.
title: فرستههای پالوده
generic:
all: همه
+ all_items_on_page_selected_html:
+ one: "%{count} مورد در این صفحه گزیده شده."
+ other: همهٔ %{count} مورد این صفحه گزیده شدهاند.
all_matching_items_selected_html:
one: "%{count} مورد مطابق با جستوجویتان گزیده شده."
other: "%{count} مورد مطابق با جستوجویتان گزیده شدند."
@@ -1136,15 +1355,33 @@ fa:
other: یک چیزی هنوز درست نیست! لطفاً %{count} خطای زیر را ببینید
imports:
errors:
+ empty: پروندهٔ خالی CSV
+ incompatible_type: ناسازگار با گونهٔ درونریزی گزیده
+ invalid_csv_file: 'پروندهٔ CSV نامعتبر. خطا: %{error}'
over_rows_processing_limit: دارای بیش از %{count} ردیف
too_large: حجم فایل خیلی بزرگ است
failures: شکستها
imported: وارد شد
+ mismatched_types_warning: به نظر می رسد ممکن است نوع اشتباهی را برای این درون ریزی انتخاب کرده باشید، لطفاً دوباره بررسی کنید.
modes:
merge: ادغام
merge_long: دادههای فعلی را داشته باشید و دادههای تازهای بیفزایید
overwrite: بازنویسی
overwrite_long: دادههای فعلی را پاک کنید و دادههای تازهای بیفزایید
+ overwrite_preambles:
+ blocking_html: شما میخواهید فهرست مسدود خود را با حداکثر %{total_items} حساب از %{filename} جایگزین کنید.
+ bookmarks_html: شما میخواهید نشانکهای خود را با حداکثر %{total_items} پست از %{filename} جایگزین کنید.
+ domain_blocking_html: شما میخواهید لیست مسدودی دامنه خود را با حداکثر %{total_items} دامنه از %{filename} جایگزین کنید.
+ following_html: شما در شرف دنبال کردن حداکثر %{total_items} حساب از %{filename} هستید و دنبال کردن افراد دیگری را متوقف میکنید.
+ lists_html: شما می خواهید لیست های خود را با محتوای %{filename} جایگزین کنید. حداکثر %{total_items} حساب به لیستهای جدید اضافه میشود.
+ muting_html: شما میخواهید لیست حسابهای بیصدا را جایگزین کنید با حداکثر %{total_items} حساب از %{filename}.
+ preambles:
+ blocking_html: شما در شرف مسدود کردن حداکثر %{total_items} حساب از %{filename} هستید.
+ bookmarks_html: شما میخواهید تا %{total_items} پست از %{filename} را به نشانکها خود اضافه کنید.
+ domain_blocking_html: شما در شرف مسدود کردن تا %{total_items} دامنه از %{filename} هستید.
+ following_html: شما در شرف دنبال کردن حداکثر %{total_items} حساب از %{filename} هستید.
+ lists_html: شما میخواهید تا %{total_items} حساب از %{filename} را به فهرستهای خود اضافه کنید. اگر لیستی برای افزودن وجود نداشته باشد، لیست های جدیدی ایجاد می شود.
+ muting_html: شما در شرف بی صدا کردن تا %{total_items} حساب از %{filename} هستید.
preface: میتوانید دادههایی را که از کارسازی دیگر برونریختهاید، چون سیاههای از افرادی که پی گرفته یا مسدود میکنید را درونریزی کنید.
recent_imports: واردشدههای اخیر
states:
@@ -1213,11 +1450,23 @@ fa:
title: تاریخچهٔ تأیید هویت
mail_subscriptions:
unsubscribe:
+ action: بله. لغو اشتراک
complete: لغو اشتراک شد
+ confirmation_html: مطمئنید که میخواهید اشتراک %{type} را از ماستودون روی %{domain} برای رایانامهٔ %{email} لغو کنید؟ همواره میتوانید از تنظیمات آگاهی رایانامهای دوباره مشترک شوید.
+ emails:
+ notification_emails:
+ favourite: رایانامههای آگاهی برگزیدن
+ follow: رایانامههای آگاهی پیگیری
+ follow_request: رایانامههای درخواست پیگیری
+ mention: رایانامههای آگاهی اشاره
+ reblog: رایانامههای آگاهی تقویت
+ resubscribe_html: اگر اشتراک را اشتباهی لغو کردید میتوانید از تنظیمات آگاهی رایانامهای دوباره مشترک شوید.
+ success_html: دیگر %{type} را از ماستودون روی %{domain} برای رایانامهٔ %{email} نخواهید گرفت.
title: لغو اشتراک
media_attachments:
validations:
images_and_video: نمیتوان برای نوشتهای که تصویر دارد ویدیو بارگذاری کرد
+ not_found: رسانه %{ids} یافت نشد یا قبلاً به پست دیگری پیوست شده است
not_ready: پروندههایی که پردازش را تمام نکردهاند نمیتوانند پیوست شوند. یکبار دیگر امتحان کنید!
too_many: نمیتوان بیشتر از ۴ تصویر بارگذاری کرد
migrations:
@@ -1294,6 +1543,8 @@ fa:
update:
subject: "%{name} فرستهای را ویرایست"
notifications:
+ administration_emails: آگاهیهای رایانامهای مدیر
+ email_events: رویدادها برای آگاهیهای رایانامهای
email_events_hint: 'گزینش رویدادهایی که میخواهید برایشان آگاهی دریافت کنید:'
number:
human:
@@ -1307,7 +1558,7 @@ fa:
trillion: ت
otp_authentication:
code_hint: برای تأیید، کدی را که برنامهٔ تأییدکننده ساخته است وارد کنید
- description_html: اگر ورود دومرحلهای را با استفاده از از یک کارهٔ تأییدکننده به کار بیندازید، لازم است برای ورود، به تلفن خود که برایتان یک ژتون خواهد ساخت دسترسی داشته باشید.
+ description_html: اگر تأیید هویت دو مرحلهای را با استفاده از برنامه احراز هویت فعال کنید، برای ورود به سیستم باید تلفن خود را در اختیار داشته باشید، که توکنهایی را برای ورود شما ایجاد میکند.
enable: به کار انداختن
instructions_html: "این کد QR را با برنامهٔ Google Authenticator یا برنامههای TOTP مشابه اسکن کنید. از این به بعد، آن برنامه کدهایی موقتی خواهد ساخت که برای ورود باید آنها را وارد کنید."
manual_instructions: 'اگر نمیتوانید رمز QR را بپویید و باید دستی وارد کنید، متن رمز اینجاست:'
@@ -1318,7 +1569,7 @@ fa:
next: بعدی
older: قدیمیتر
prev: قبلی
- truncate: "…"
+ truncate: "…"
polls:
errors:
already_voted: شما قبلاً در این نظرسنجی رأی دادهاید
@@ -1338,6 +1589,7 @@ fa:
privacy:
hint_html: "شخصیسازی چگونگی پیدا شدن فرستهها و نمایهتان. ویژگیهای متعدّدی در ماستودون میتوانند هنگام به کار افتادن در رسیدن به مخاطبینی گستردهتر یاریتان کنند. کمی وقت برای بازبینی این تنظیمات گذاشته تا مطمئن شوید برایتان مناسبند."
privacy: محرمانگی
+ privacy_hint_html: واپایش میزان باز شدن به نفع دیگران. افراد نمایههای جالب و کارههای باحال را با مرور پیگرفتگان دیگران و دیدن کارههایی که از آنها میفرستند پیدا میکنند. با این حال شاید بخواهید پنهان نگهشان دارید.
reach: دسترسی
reach_hint_html: واپایش این که میخواهید به دست افراد جدید قابل کشف و پیگیری باشید یا نه. میخواهید فرستههایتان روی صفحهٔ کشف ظاهر شوند؟ میخواهید دیگر افراد در پیشنهادهای پیگیریشان ببینندتان؟ میخواهید پیگیران جدید را به طور خودکار بپذیرید یا روی هرکدامشان واپایش داشته باشید؟
search: جستوجو
@@ -1349,12 +1601,16 @@ fa:
errors:
limit_reached: تجاوز از کران واکنشهای مختلف
unrecognized_emoji: شکلک شناختهشدهای نیست
+ redirects:
+ prompt: اگر به این پویند اطمینان دارید برای ادامه بزنید.
+ title: دارید %{instance} را ترک میکنید.
relationships:
activity: فعالیت حساب
confirm_follow_selected_followers: آیا مطمئنید که می خواهید دنبال کننده های انتخابی را دنبال کنید؟
confirm_remove_selected_followers: آیا شما واقعا می خواهید دنبال کننده های انتخابی را حذف کنید؟
confirm_remove_selected_follows: آیا شما واقعا می خواهید دنبال شده های انتخابی را حذف کنید؟
dormant: غیرفعال
+ follow_failure: نتوانست برخی از حسابهای گزیده را پی بگیرد.
follow_selected_followers: پیگیری پیگیران انتخاب شده
followers: پیگیران
following: پی میگیرد
@@ -1371,6 +1627,9 @@ fa:
status: وضعیت حساب
remote_follow:
missing_resource: نشانی اینترنتی برای رسیدن به حساب شما پیدا نشد
+ reports:
+ errors:
+ invalid_rules: به قوانین معتبر اشاره نمی کند
rss:
content_warning: 'هشدا محتوا:'
descriptions:
@@ -1381,6 +1640,7 @@ fa:
over_total_limit: شما از حد مجاز %{limit} فرسته زمانبندیشده فراتر رفتهاید
too_soon: زمان تعیینشده باید در آینده باشد
self_destruct:
+ lead_html: متأسفانه، %{domain} برای همیشه در حال بسته شدن است. اگر حسابی در آنجا داشتید، نمیتوانید به استفاده از آن ادامه دهید، اما همچنان میتوانید از دادههای خود نسخه پشتیبان درخواست کنید.
title: این کارساز دارد بسته میشود
sessions:
activity: آخرین فعالیت
@@ -1438,6 +1698,7 @@ fa:
delete: پاککردن حساب
development: فرابری
edit_profile: ویرایش نمایه
+ export: برونریزی
featured_tags: برچسبهای برگزیده
import: درونریزی
import_and_export: درونریزی و برونبری
@@ -1446,12 +1707,21 @@ fa:
preferences: ترجیحات
profile: نمایه
relationships: پیگیریها و پیگیران
+ severed_relationships: ارتباطهای قطع شده
statuses_cleanup: حذف فرستهٔ خودکار
strikes: شکایتهای مدیریتی
two_factor_authentication: ورود دومرحلهای
webauthn_authentication: کلیدهای امنیتی
severed_relationships:
download: بارگیری (%{count})
+ event_type:
+ account_suspension: تعلیق حساب (%{target_name})
+ domain_block: تعلیق کارساز (%{target_name})
+ user_domain_block: "%{target_name} را مسدود کردید"
+ lost_followers: پیگیرندگان از دست رفته
+ lost_follows: پیگرفتههای از دست رفته
+ preamble: وقتی دامنهای را مسدود کرده یا ناظرانتان تصمیم به تعلیق کارسازی دوردست میگیرند، ممکن است پیگیران و پیگرفتههایتان را از دست بدهید. با این حال قادرید سیاهههایی از ارتباطهای قطع شده را برای بررسی و درونریزی احتمالی روی کارسازی دیگر بار بگیرید.
+ purged: اطّلاعات دربارهٔ این کارساز به دست مدیران کارسازتان پاک سازی شده.
type: رویداد
statuses:
attached:
@@ -1535,11 +1805,17 @@ fa:
contrast: ماستودون (سایهروشن بالا)
default: ماستودون (تیره)
mastodon-light: ماستودون (روشن)
+ system: خودکار (استفاده از زمینهٔ سامانه)
time:
formats:
default: "%d %b %Y, %H:%M"
month: "%b %Y"
- time: "%OH:%OM"
+ time: "%H:%M"
+ with_time_zone: "%b %d, %Y, %H:%M %Z"
+ translation:
+ errors:
+ quota_exceeded: از سهمیه استفاده در سراسر سرور برای خدمات ترجمه فراتر رفته است.
+ too_many_requests: اخیراً درخواست های زیادی به خدمات ترجمه شده است.
two_factor_authentication:
add: افزودن
disable: غیرفعالکردن
@@ -1557,31 +1833,57 @@ fa:
webauthn: کلیدهای امنیتی
user_mailer:
appeal_approved:
+ action: تنظیمات حساب
explanation: درخواست تجدیدنظر اخطار علیه حساب شما در %{strike_date} که در %{appeal_date} ارسال کردهاید، پذیرفته شده است. حساب شما بار دیگر در وضعیت خوبی قرار دارد.
subject: درخواست تجدیدنظر شما در %{date} پذیرفته شد
+ subtitle: حسابتان دوباره در وضعیت مناسب است.
title: درخواست تجدیدنظر پذیرفته شد
appeal_rejected:
explanation: درخواست تجدیدنظر اخطار علیه حساب شما در %{strike_date} که در %{appeal_date} ارسال کردهاید، رد شده است.
subject: درخواست تجدیدنظر شما در %{date} رد شده است
+ subtitle: درخواست تجدیدنظرتان رد شد.
title: درخواست تجدیدنظر رد شد
backup_ready:
+ explanation: درخواست پشتیبانی کامل از حساب ماستودونتان کردید.
+ extra: اکنون آمادهٔ بارگیری است!
subject: بایگانی شما آمادهٔ دریافت است
title: گرفتن بایگانی
+ failed_2fa:
+ details: 'جزییات تلاشها برای ورد:'
+ explanation: شخصی سعی کرده است به حساب شما وارد شود اما یک عامل احراز هویت دوم نامعتبر ارائه کرده است.
+ further_actions_html: اگر این شما نبودید، توصیه می کنیم فورا %{action} را انجام دهید زیرا ممکن است به خطر بیفتد.
+ subject: عدم موفقیت در تأیید هویت عامل دوم
+ title: احراز هویت عامل دوم ناموفق بود
suspicious_sign_in:
change_password: تغییر گذرواژهتان
details: 'جزییات ورود:'
+ explanation: ما ورود به حساب شما را از یک آدرس آی پی جدید شناسایی کرده ایم.
+ further_actions_html: اگر این شما نبودید، توصیه می کنیم فورا %{action} را فعال کنید و برای ایمن نگه داشتن حساب خود، احراز هویت دو مرحله ای را فعال کنید.
+ subject: حساب شما از یک آدرس آی پی جدید قابل دسترسی است
title: یک ورود جدید
warning:
appeal: فرستادن یک درخواست تجدیدنظر
appeal_description: اگر فکر میکنید این یک خطا است، میتوانید یک درخواست تجدیدنظر به کارکنان %{instance} ارسال کنید.
categories:
spam: هرزنامه
+ violation: محتوا دستورالعملهای انجمن زیر را نقض میکند
+ explanation:
+ delete_statuses: برخی از پستهای شما یک یا چند دستورالعمل انجمن را نقض میکنند و متعاقباً توسط گردانندگان %{instance} حذف شدهاند.
+ disable: دیگر نمی توانید از حساب خود استفاده کنید، اما نمایه و سایر داده های شما دست نخورده باقی می مانند. می توانید از داده های خود نسخه پشتیبان درخواست کنید، تنظیمات حساب را تغییر دهید یا حساب خود را حذف کنید.
+ mark_statuses_as_sensitive: برخی از پستهای شما توسط گردانندگان %{instance} به عنوان حساس علامتگذاری شدهاند. این بدان معناست که افراد باید قبل از نمایش پیشنمایش، روی رسانه پستها ضربه بزنند. میتوانید هنگام ارسال پست در آینده، رسانهها را بهعنوان حساس علامتگذاری کنید.
+ sensitive: از این پس، تمام فایل های رسانه ای آپلود شده شما به عنوان حساس علامت گذاری می شوند و در پشت هشدار کلیک پنهان می شوند.
+ silence: همچنان میتوانید از حساب خود استفاده کنید، اما فقط افرادی که از قبل شما را دنبال میکنند، پستهای شما را در این سرور میبینند و ممکن است از ویژگیهای مختلف کشف مستثنی شوید. با این حال، دیگران ممکن است همچنان به صورت دستی شما را دنبال کنند.
+ suspend: دیگر نمی توانید از حساب خود استفاده کنید و نمایه و سایر داده های شما دیگر در دسترس نیستند. هنوز هم میتوانید برای درخواست پشتیبانگیری از دادههای خود وارد شوید تا زمانی که دادهها در حدود 30 روز به طور کامل حذف شوند، اما ما برخی از دادههای اولیه را حفظ میکنیم تا از تعلیق فرار نکنید.
reason: 'دلیل:'
+ statuses: 'پست های ذکر شده:'
subject:
+ delete_statuses: فرستههایتان روی %{acct} برداشته شدهاند
disable: حساب %{acct} شما متوقف شده است
+ mark_statuses_as_sensitive: فرستههایتان روی %{acct} به عنوان حسّاس علامت خوردهاند
none: هشدار برای %{acct}
+ sensitive: فرستههایتان روی %{acct} از اکنون به عنوان حسّاس علامت خواهند خورد
silence: حساب %{acct} شما محدود شده است
- suspend: حساب %{acct} شما معلق شده است
+ suspend: حساب %{acct} شما معلق شده است
title:
delete_statuses: فرستهها برداشته شدند
disable: حساب متوقف شده است
@@ -1595,11 +1897,39 @@ fa:
apps_ios_action: بارگیری روی فروشگاه کاره
apps_step: بارگیری کارهٔ رسمیمان.
apps_title: کارههای ماستودون
+ checklist_subtitle: 'بیایید روی این مرز اجتماعی جدید راهتان بیندازیم:'
+ checklist_title: سیاههٔ بررسی خوشآمد
edit_profile_action: شخصی سازی
+ edit_profile_step: تقویت تعاملهایتان با داشتن نمایهای جامع.
+ edit_profile_title: شخصی سازی نمایهتان
explanation: نکتههایی که برای آغاز کار به شما کمک میکنند
+ feature_action: دانشتن بیشتر
+ feature_audience: ماستودون بدون حضور فرد میانی، فرصتی منحصربهفرد برای مدیریت مخاطبان ارائه میکند. ماستودونی که روی زیرساخت خودتان استقرار یافته باشد، میگذارد بدون بودن زیر واپایش کسی غیر از خودتان، دیگر کارسازهای برخط ماستودون را دنبال کرده و به دست آنها دنبال شوید.
+ feature_audience_title: مخاطبانتان را با اطمینان بسازید
+ feature_control: شما بهتر از هر کسی دیگری میدونید که چه میخواهید ببینید. هیچ الگوریتم یا تبلیغی وقت شما را تلف نمیکند. تنها با یک حساب، هر کسی را روی هر کارساز ماستودون دیگری دنبال کرده و فرستههایشان را به ترتیب زمانی دریافت کنید. گوشهٔ دنج اینترنتی خودتان را بیشتر شبیه خودتان کنید.
+ feature_control_title: کنترل خط زمانیتان را به دست بگیرید
+ feature_creativity: ماستودون از فرستههای تصویری، ویدئویی و شنیداری، توضیحات دسترسپذیری، نظرسنجی، هشدار محتوا، تصاویر نمایهٔ پویا، شکلکهای سفارشی، کنترل برش تصاویر بندانگشتی و بسیاری موارد دیگر پشتیبانی میکند تا به شما برای ابزار کردن خود در فضای برخط کمک کند. چه بخواهید یک اثر هنری، موسیقی یا پادکست منتشر کنید، ماستودون در خدمت شماست.
+ feature_creativity_title: خلاقیت بیهمتا
+ feature_moderation: ماستودن، تصمیمگیری را به شما باز میگرداند. هر کارساز قوانین و شرایط استفاده خاص خودش را وضع میکند که فقط به صورت محلی اعمال میشود و نه به صورت از بالا به پایین در سکوهای اجتماعی شرکتی. این موضوع باعث افزایش انعطاف در پاسخگویی به نیازهای گروههای مختلف میشود. به کارسازی با قوانین مورد پسندتان بپیوندید، و یا نمونه خود را میزبانی کنید.
+ feature_moderation_title: نظارت به شکلی که باید باشد
follow_action: پیگیری
+ follow_step: You curate your own feed. Lets fill it with interesting people.
+ follow_title: شخصی سازی خوراک خانگیتان
+ follows_subtitle: پی گرفتن حسابهای شناخته شده
+ follows_title: افرادی برای پیگیری
+ follows_view_more: دیدن افرادی بیشتر برای پیگیری
+ hashtags_recent_count:
+ one: "%{people} نفر در ۲ روز اخیر"
+ other: "%{people} نفر در ۲ روز اخیر"
+ hashtags_subtitle: کشف گرایهها در ۲ روز گذشته
+ hashtags_title: برچسبهای داغ
+ hashtags_view_more: دیدن برچسبهای داغ بیشتر
post_action: ایجاد
+ post_step: سلام کردن به جهان با متن، عکس، ویدیو یا نظرسنجی.
+ post_title: ساخت نخستین نظرسنجیتان
share_action: همرسانی
+ share_step: بگذارید دوستانتان بدانند چگونه روی ماستودون بیابندتان.
+ share_title: همرسانی نمایهٔ ماستودونتان
sign_in_action: ورود
subject: به ماستودون خوش آمدید
title: خوش آمدید، کاربر %{name}!
@@ -1607,7 +1937,9 @@ fa:
follow_limit_reached: شما نمیتوانید بیش از %{limit} نفر را پی بگیرید
go_to_sso_account_settings: به تنظیمات حساب فراهمگر هوبتتان بروید
invalid_otp_token: کد ورود دومرحلهای نامعتبر است
- otp_lost_help_html: اگر شما دسترسی به هیچکدامشان ندارید، باید با ایمیل %{email} تماس بگیرید
+ otp_lost_help_html: اگر به هیچکدامشان دسترسی ندارید با %{email} تماس بگیرید
+ rate_limited: تلاش ّای هویتسنجی بیش از حد. لطفاً بعداً دوباره تلاش کنید.
+ seamless_external_login: با خدمتی خارجی وارد شدهاید، برای همین تنظیمات رایانامه و گذرواژه در دسترس نیستند.
signed_in_as: 'واردشده به نام:'
verification:
extra_instructions_html: نکته: پیوند روی پایگاه وبتان میتواند نامرئی باشد. بخش مهم rel="me" است که از جعل هویت روی پایگاههایی با محتوای تولید شده به دست کاربر جلوگیری میکند. حتا میتوانید به جای برچسب a از برچسب link در سرایند صفحه استفاده کنید؛ ولی HTML باید بدون اجرای جاوااسکریپت در دسترس باشد.
@@ -1616,6 +1948,7 @@ fa:
instructions_html: کد زیر را رونوشت کرده و در HTML پایگاه وبتان جایگذاری کنید. سپس نشانی پایگاه وبتان را از زبانهٔ «ویرایش نمایه» در یکی از زمینههای اضافی روی نمایهتان افزوده و تغییرات را ذخیره کنید.
verification: تأیید
verified_links: "پیوندهای تأییدشده شما"
+ website_verification: تأیید پایگاه وب
webauthn_credentials:
add: افزودن کلید امنیتی
create:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 22ccc71161..cc9ee0bd86 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -10,7 +10,7 @@ fi:
followers:
one: seuraaja
other: seuraajaa
- following: seurattu(a)
+ following: Seurattavat
instance_actor_flash: Tämä tili on virtuaalinen toimija, jota käytetään edustamaan itse palvelinta eikä yksittäistä käyttäjää. Sitä käytetään federointitarkoituksiin, eikä sitä tule jäädyttää.
last_active: viimeksi aktiivinen
link_verified_on: Tämän linkin omistus on tarkastettu %{date}
@@ -21,6 +21,7 @@ fi:
one: Julkaisu
other: viestiä
posts_tab_heading: Julkaisut
+ self_follow_error: Oman tilisi seuraaminen ei ole sallittua
admin:
account_actions:
action: Suorita toimi
@@ -73,7 +74,7 @@ fi:
enabled: Käytössä
enabled_msg: Käyttäjän %{username} tilin jäädytys kumottiin onnistuneesti
followers: Seuraajat
- follows: Seuratut
+ follows: Seurattavat
header: Otsakekuva
inbox_url: Postilaatikon osoite
invite_request_text: Syitä liittymiseen
@@ -215,7 +216,7 @@ fi:
reopen_report: Avaa raportti uudelleen
resend_user: Lähetä vahvistusviesti uudelleen
reset_password_user: Palauta salasana
- resolve_report: Selvitä raportti
+ resolve_report: Ratkaise raportti
sensitive_account: Pakota arkaluonteiseksi tiliksi
silence_account: Rajoita tiliä
suspend_account: Jäädytä tili
@@ -272,7 +273,7 @@ fi:
reject_appeal_html: "%{name} hylkäsi käyttäjän %{target} valituksen moderointipäätöksestä"
reject_user_html: "%{name} hylkäsi käyttäjän %{target} rekisteröitymisen"
remove_avatar_user_html: "%{name} poisti käyttäjän %{target} profiilikuvan"
- reopen_report_html: "%{name} avasi uudelleen raportin %{target}"
+ reopen_report_html: "%{name} avasi raportin %{target} uudelleen"
resend_user_html: "%{name} lähetti vahvistussähköpostiviestin uudelleen käyttäjälle %{target}"
reset_password_user_html: "%{name} palautti käyttäjän %{target} salasanan"
resolve_report_html: "%{name} ratkaisi raportin %{target}"
@@ -333,8 +334,8 @@ fi:
enabled: Käytössä
enabled_msg: Emoji otettiin käyttöön onnistuneesti
image_hint: PNG tai GIF, enintään %{size}
- list: Lisää listalle
- listed: Listalla
+ list: Lisää listaan
+ listed: Listassa
new:
title: Lisää uusi mukautettu emoji
no_emoji_selected: Emojeita ei muutettu, koska yhtään ei ollut valittuna
@@ -344,8 +345,8 @@ fi:
shortcode_hint: Vähintään 2 merkkiä, vain kirjaimia, numeroita ja alaviivoja
title: Mukautetut emojit
uncategorized: Luokittelematon
- unlist: Poista listalta
- unlisted: Ei listalla
+ unlist: Poista listasta
+ unlisted: Ei listassa
update_failed_msg: Emojin päivitys epäonnistui
updated_msg: Emojin päivitys onnistui!
upload: Lähetä
@@ -818,7 +819,7 @@ fi:
back_to_report: Takaisin raporttisivulle
batch:
remove_from_report: Poista raportista
- report: Raportti
+ report: Raportoi
deleted: Poistettu
favourites: Suosikit
history: Versiohistoria
@@ -832,7 +833,7 @@ fi:
original_status: Alkuperäinen julkaisu
reblogs: Edelleen jako
status_changed: Julkaisua muutettu
- title: Tilin tilat
+ title: Tilin julkaisut
trending: Suosituttua
visibility: Näkyvyys
with_media: Sisältää mediaa
@@ -1165,10 +1166,12 @@ fi:
use_security_key: Käytä suojausavainta
author_attribution:
example_title: Esimerkkiteksti
- hint_html: Määrää, kuinka tulet tunnustetuksi, kun Mastodonissa jaetaan linkkejä.
+ hint_html: Kirjoitatko uutisia tai blogitekstejä Mastodonin ulkopuolella? Määrää, kuinka tulet tunnustetuksi, kun niitä jaetaan Mastodonissa.
+ instructions: 'Varmista, että artikkelisi HTML:ssä on tämä koodi:'
more_from_html: Lisää tekijältä %{name}
s_blog: Käyttäjän %{name} blogi
- title: Tekijän tunnustus
+ then_instructions: Lisää sitten julkaisun verkkotunnus seuraavaan tekstikenttään.
+ title: Tekijän nimeäminen
challenge:
confirm: Jatka
hint_html: "Vihje: Emme pyydä sinulta salasanaa uudelleen seuraavan tunnin aikana."
@@ -1257,7 +1260,7 @@ fi:
title: Turvallisuusvahvistus epäonnistui
'429': Rajoitettu
'500':
- content: Valitettavasti jokin meni pieleen meidän päässämme.
+ content: Valitettavasti jotain meni pieleen meidän päässämme.
title: Sivu ei ole oikein
'503': Sivua ei voitu näyttää palvelimen väliaikaisen vian vuoksi.
noscript_html: Käyttääksesi Mastodonin verkkosovellusta, ota JavaScript käyttöön. Vaihtoehtoisesti voit kokeilla käyttämällesi alustalle kehitettyjä Mastodonin natiivisovelluksia.
@@ -1393,18 +1396,18 @@ fi:
blocking: Tuodaan estettyjä tilejä
bookmarks: Tuodaan kirjanmerkkejä
domain_blocking: Tuodaan estettyjä verkkotunnuksia
- following: Tuodaan seurattuja tilejä
+ following: Tuodaan seurattavia tilejä
lists: Tuodaan listoja
muting: Tuodaan mykistettyjä tilejä
type: Tuontityyppi
type_groups:
- constructive: Seuratut ja kirjanmerkit
+ constructive: Seurattavat ja kirjanmerkit
destructive: Estot ja mykistykset
types:
blocking: Estoluettelo
bookmarks: Kirjanmerkit
domain_blocking: Verkkotunnusten estoluettelo
- following: Seurattujen luettelo
+ following: Seurattavien luettelo
lists: Listat
muting: Mykistysluettelo
upload: Lähetä
@@ -1610,7 +1613,7 @@ fi:
follow_failure: Joitain valittuja tilejä ei voitu seurata.
follow_selected_followers: Seuraa valittuja seuraajia
followers: Seuraajat
- following: Seuratut
+ following: Seurattavat
invited: Kutsutut
last_active: Viimeksi aktiivinen
most_recent: Tuorein
@@ -1703,7 +1706,7 @@ fi:
notifications: Sähköposti-ilmoitukset
preferences: Asetukset
profile: Julkinen profiili
- relationships: Seuratut ja seuraajat
+ relationships: Seurattavat ja seuraajat
severed_relationships: Katkenneet suhteet
statuses_cleanup: Julkaisujen automaattipoisto
strikes: Moderointivaroitukset
@@ -1716,8 +1719,8 @@ fi:
domain_block: Palvelimen jäädytys (%{target_name})
user_domain_block: Estit käyttäjän %{target_name}
lost_followers: Menetetyt seuraajat
- lost_follows: Menetetyt seuratut
- preamble: Voit menettää seurattusi ja seuraajasi, kun estät verkkotunnuksen tai kun moderaattorisi päättävät jäädyttää etäpalvelimen. Kun näin tapahtuu, voit ladata luetteloita katkenneista seurantasuhteista, jotta voit tarkastella niitä ja mahdollisesti viedä ne toiselle palvelimelle.
+ lost_follows: Menetetyt seurattavat
+ preamble: Voit menettää seurattavasi ja seuraajasi, kun estät verkkotunnuksen tai kun moderaattorisi päättävät jäädyttää etäpalvelimen. Kun näin tapahtuu, voit ladata luetteloita katkenneista seurantasuhteista, jotta voit tarkastella niitä ja mahdollisesti viedä ne toiselle palvelimelle.
purged: Palvelimesi ylläpitäjät ovat tyhjentäneet tämän palvelimen tiedot.
type: Tapahtuma
statuses:
@@ -1940,7 +1943,7 @@ fi:
signed_in_as: 'Kirjautunut tilillä:'
verification:
extra_instructions_html: Vinkki: Verkkosivustollasi oleva linkki voi olla myös näkymätön. Olennainen osuus on rel="me", joka estää toiseksi henkilöksi tekeytymisen verkkosivustoilla, joilla on käyttäjien luomaa sisältöä. Voit käyttää jopa link-elementtiä sivun head-osassa elementin a sijaan, mutta HTML:n pitää olla käytettävissä ilman JavaScript-koodin suorittamista.
- here_is_how: Näin voit tehdä sen
+ here_is_how: Näin se onnistuu
hint_html: "Henkilöllisyyden vahvistaminen on Mastodonissa jokaisen käyttäjän ulottuvilla. Se perustuu avoimiin standardeihin ja on maksutonta nyt ja aina. Tarvitset vain henkilökohtaisen verkkosivuston, jonka perusteella sinut voidaan tunnistaa. Kun teet linkin tuolle verkkosivulle profiilistasi, tarkistamme, että verkkosivustolla on linkki takaisin profiiliisi, ja näytämme profiilissasi visuaalisen ilmaisimen."
instructions_html: Kopioi ja liitä seuraava koodi verkkosivustosi HTML-lähdekoodiin. Lisää sitten verkkosivustosi osoite johonkin profiilisi lisäkentistä ”Muokkaa profiilia” -välilehdellä ja tallenna muutokset.
verification: Vahvistus
diff --git a/config/locales/fil.yml b/config/locales/fil.yml
index 4084bf2f90..fc19d9fd31 100644
--- a/config/locales/fil.yml
+++ b/config/locales/fil.yml
@@ -1 +1,26 @@
+---
fil:
+ about:
+ about_mastodon_html: 'Ang social network ng hinaharap: Walang mga ad, walang corporate na pagmamanman, etikal na disenyo, at desentralisasyon! Sa iyo ang data mo sa Mastodon!'
+ contact_missing: Hindi naka-set
+ contact_unavailable: N/A
+ hosted_on: Mastodon hosted sa %{domain}
+ title: About
+ accounts:
+ following: Following
+ instance_actor_flash: Ang account na ito ay virtual actor na ginagamit para i-represent ang mismong server at hindi anumang indibidwal na user. Ginagamit ito para sa mga layunin ng pederasyon at hindi dapat i-suspend.
+ last_active: huling aktibo
+ link_verified_on: Ang pagmamay-ari ng link na ito ay huling na-check sa %{date}
+ nothing_here: Walang makikita rito!
+ pin_errors:
+ following: Dapat ay fina-follow mo na ang taong gusto mong i-endorse
+ posts_tab_heading: Mga Post
+ self_follow_error: Hindi puwede ang pag-follow sa sariling account
+ admin:
+ account_actions:
+ action: Gawin ang aksiyon
+ already_silenced: Nalimitahan na ang account na ito.
+ already_suspended: Nasuspinde na ang account na ito.
+ title: Gawin ang moderation na aksiyon sa %{acct}
+ account_moderation_notes:
+ create: Mag-iwan ng note
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 31eb67b3b0..638c2da9d3 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -21,6 +21,7 @@ fo:
one: Uppslag
other: Uppsløg
posts_tab_heading: Uppsløg
+ self_follow_error: Tað er ikki loyvt at fylgja tíni egnu kontu
admin:
account_actions:
action: Frem atgerð
@@ -1165,9 +1166,11 @@ fo:
use_security_key: Brúka trygdarlykil
author_attribution:
example_title: Tekstadømi
- hint_html: Kanna, hvussu tú verður viðurkend/ur, tá ið onnur deila slóðir á Mastodon.
+ hint_html: Skrivar tú tíðindi ella greinar til bloggin uttanfyri Mastodon? Her kanst tú stýra, hvussu tú verður tilsipað/ur, tá ið títt tilfar verður deilt á Mastodon.
+ instructions: 'Tryggja tær, at henda kota er í HTML''inum á tíni grein:'
more_from_html: Meiri frá %{name}
s_blog: Bloggurin hjá %{name}
+ then_instructions: Skriva síðani økisnavnið, har tað verður lagt út, í teigin niðanfyri.
title: Ískoyti høvundans
challenge:
confirm: Hald á
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index 16cdb79317..5093e5d733 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -21,6 +21,7 @@ fr-CA:
one: Message
other: Messages
posts_tab_heading: Messages
+ self_follow_error: Il n'est pas possible de suivre votre propre compte
admin:
account_actions:
action: Effectuer l'action
@@ -1168,9 +1169,11 @@ fr-CA:
use_security_key: Utiliser la clé de sécurité
author_attribution:
example_title: Exemple de texte
- hint_html: Déterminez la façon dont vous êtes crédité lorsque des liens sont partagés sur Mastodon.
+ hint_html: Vous écrivez des nouvelles ou des articles de blog en dehors de Mastodon ? Contrôlez la façon dont vous êtes crédité lorsqu'ils sont partagés sur Mastodon.
+ instructions: 'Assurez-vous que ce code se trouve dans le code HTML de votre article :'
more_from_html: Plus via %{name}
s_blog: Blog de %{name}
+ then_instructions: Ensuite, ajoutez le nom de domaine de la publication dans le champ ci-dessous.
title: Attribution de l'auteur·e
challenge:
confirm: Continuer
@@ -1906,7 +1909,7 @@ fr-CA:
feature_action: En savoir plus
feature_audience: Mastodon vous offre une possibilité unique de gérer votre audience sans intermédiaires. Mastodon peut être déployé sur votre propre infrastructure, ce qui vous permet de suivre et d'être suivi depuis n'importe quel autre serveur Mastodon et de n'être contrôlé par personne d'autre que vous.
feature_audience_title: Construisez votre audience en toute confiance
- feature_control: Vous savez mieux que quiconque ce que vous voulez voir sur votre fil principal. Personne ne veut d'un algorithme qui décide à vote place ou de publicité qui vous fera perdre votre temps. Suivez n'importe qui, sur n'importe quel serveur Mastodon, depuis votre compte. Recevez les publications du monde entier dans l'ordre chronologique et créez-vous votre chez-vous numérique qui vous ressemble.
+ feature_control: Vous savez mieux que quiconque ce que vous voulez voir sur votre fil principal. Pas d’algorithme ou de publicité qui vous fait perdre votre temps. Suivez n'importe qui sur n'importe quel serveur Mastodon depuis votre compte, recevez leurs messages dans l'ordre chronologique, et créez-vous un coin d’internet qui vous ressemble.
feature_control_title: Gardez le contrôle de votre fil
feature_creativity: Mastodon prend en charge les messages audio, vidéo et photo, les descriptions d'accessibilité, les sondages, les avertissements de contenu, les avatars animés, les émojis personnalisés, le contrôle des vignettes et bien plus encore pour vous aider à vous exprimer en ligne. Que vous publiiez votre art, votre musique ou votre podcast, Mastodon est là pour vous.
feature_creativity_title: Créativité inégalée
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index bc57d00e65..c348dc5f02 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -21,6 +21,7 @@ fr:
one: Message
other: Messages
posts_tab_heading: Messages
+ self_follow_error: Il n'est pas possible de suivre votre propre compte
admin:
account_actions:
action: Effectuer l'action
@@ -834,7 +835,7 @@ fr:
open: Ouvrir le message
original_status: Message original
reblogs: Partages
- status_changed: Publication modifiée
+ status_changed: Message modifié
title: Messages du compte
trending: Tendances
visibility: Visibilité
@@ -1168,9 +1169,11 @@ fr:
use_security_key: Utiliser la clé de sécurité
author_attribution:
example_title: Exemple de texte
- hint_html: Déterminez la façon dont vous êtes crédité lorsque des liens sont partagés sur Mastodon.
+ hint_html: Vous écrivez des nouvelles ou des articles de blog en dehors de Mastodon ? Contrôlez la façon dont vous êtes crédité lorsqu'ils sont partagés sur Mastodon.
+ instructions: 'Assurez-vous que ce code se trouve dans le code HTML de votre article :'
more_from_html: Plus via %{name}
s_blog: Blog de %{name}
+ then_instructions: Ensuite, ajoutez le nom de domaine de la publication dans le champ ci-dessous.
title: Attribution de l'auteur·e
challenge:
confirm: Continuer
@@ -1286,7 +1289,7 @@ fr:
add_new: Ajouter un nouveau hashtag
errors:
limit: Vous avez déjà mis en avant le nombre maximum de hashtags
- hint_html: "Mettez en évidence vos hashtags les plus importants sur votre profil. Un outil idéal pour suivre vos travaux créatifs et vos projets à long terme, les hashtags mis en avant sont affichés bien en évidence sur votre profil et permettent un accès rapide à vos propres publications."
+ hint_html: "Mettez en évidence vos hashtags les plus importants sur votre profil. Un outil idéal pour suivre vos travaux créatifs et vos projets à long terme, les hashtags mis en avant sont affichés bien en évidence sur votre profil et permettent un accès rapide à vos propres messages."
filters:
contexts:
account: Profils
@@ -1297,7 +1300,7 @@ fr:
edit:
add_keyword: Ajouter un mot-clé
keywords: Mots-clés
- statuses: Publications individuelles
+ statuses: Messages individuels
statuses_hint_html: Ce filtre s'applique à la sélection de messages individuels, qu'ils correspondent ou non aux mots-clés ci-dessous. Revoir ou supprimer des messages du filtre.
title: Modifier le filtre
errors:
@@ -1316,8 +1319,8 @@ fr:
one: "%{count} message"
other: "%{count} messages"
statuses_long:
- one: "%{count} publication individuelle cachée"
- other: "%{count} publications individuelles cachées"
+ one: "%{count} message individuel caché"
+ other: "%{count} messages individuels cachés"
title: Filtres
new:
save: Enregistrer le nouveau filtre
@@ -1736,7 +1739,7 @@ fr:
one: "%{count} vidéo"
other: "%{count} vidéos"
boosted_from_html: Partagé depuis %{acct_link}
- content_warning: 'Avertissement sur le contenu : %{warning}'
+ content_warning: 'Avertissement de contenu : %{warning}'
default_language: Même langue que celle de l’interface
disallowed_hashtags:
one: 'contient un hashtag désactivé : %{tags}'
@@ -1906,7 +1909,7 @@ fr:
feature_action: En savoir plus
feature_audience: Mastodon vous offre une possibilité unique de gérer votre audience sans intermédiaires. Mastodon peut être déployé sur votre propre infrastructure, ce qui vous permet de suivre et d'être suivi depuis n'importe quel autre serveur Mastodon et de n'être contrôlé par personne d'autre que vous.
feature_audience_title: Construisez votre audience en toute confiance
- feature_control: Vous savez mieux que quiconque ce que vous voulez voir sur votre fil principal. Personne ne veut d'un algorithme qui décide à vote place ou de publicité qui vous fera perdre votre temps. Suivez n'importe qui, sur n'importe quel serveur Mastodon, depuis votre compte. Recevez les publications du monde entier dans l'ordre chronologique et créez-vous votre chez-vous numérique qui vous ressemble.
+ feature_control: Vous savez mieux que quiconque ce que vous voulez voir sur votre fil principal. Pas d’algorithme ou de publicité qui vous fait perdre votre temps. Suivez n'importe qui sur n'importe quel serveur Mastodon depuis votre compte, recevez leurs messages dans l'ordre chronologique, et créez-vous un coin d’internet qui vous ressemble.
feature_control_title: Gardez le contrôle de votre fil
feature_creativity: Mastodon prend en charge les messages audio, vidéo et photo, les descriptions d'accessibilité, les sondages, les avertissements de contenu, les avatars animés, les émojis personnalisés, le contrôle des vignettes et bien plus encore pour vous aider à vous exprimer en ligne. Que vous publiiez votre art, votre musique ou votre podcast, Mastodon est là pour vous.
feature_creativity_title: Créativité inégalée
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 0379af34e9..a3c5aef606 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -21,9 +21,12 @@ fy:
one: Toot
other: Berjochten
posts_tab_heading: Berjochten
+ self_follow_error: It folgjen fan dyn eigen account is net tastien
admin:
account_actions:
action: Aksje útfiere
+ already_silenced: Dizze account is al beheind.
+ already_suspended: Dizze account is al opskort.
title: Moderaasjemaatregelen tsjin %{acct} nimme
account_moderation_notes:
create: Lit in opmerking efter
@@ -45,6 +48,7 @@ fy:
title: E-mailadres foar %{username} wizigje
change_role:
changed_msg: Rol mei sukses wizige!
+ edit_roles: Brûkersrollen beheare
label: Rol wizigje
no_role: Gjin rol
title: Rol fan %{username} wizigje
@@ -601,6 +605,7 @@ fy:
suspend_description_html: De account en alle ynhâld sil net tagonklik wêze en úteinlik fuortsmiten wurde, en ynteraksje hjirmei sil net mooglik wêze. Binnen 30 dagen werom te draaien. Dit slút alle rapportaazjes oer dizze account.
actions_description_html: Beslis hokker maatregel nommen wurde moat om dizze rapportaazje op te lossen. Wannear’t jo in (straf)maatregel tsjin it rapportearre account nimme, kriget de account in e-mailmelding, behalve wannear’t de spam-kategory keazen is.
actions_description_remote_html: Beslút hokker aksje nommen wurde moat om dizze rapportaazje ôf te hanneljen. Dit hat allinnich ynfloed op hoe’t jo server kommunisearret mei dizze eksterne account en omgiet mei de ynhâld.
+ actions_no_posts: Dit rapport hat gjin byhearrende berjochten om fuort te smiten
add_to_report: Mear oan de rapportaazje tafoegje
already_suspended_badges:
local: Al opskoarte op dizze server
@@ -871,6 +876,9 @@ fy:
message_html: Jo hawwe foar dizze server gjin regels opsteld.
sidekiq_process_check:
message_html: Der draait gjin Sidekiq-proses foar de wachtrige(n) %{value}. Kontrolearje jo Sidekiq-konfiguraasje
+ software_version_check:
+ action: Beskikbere fernijingen besjen
+ message_html: Der is in Mastodon-fernijing beskikber.
software_version_critical_check:
action: Beskikbere fernijingen besjen
message_html: Der is in kritike fernijing foar Mastodon beskikber. Wurkje sa gau as mooglik by.
@@ -1156,6 +1164,14 @@ fy:
view_strikes: Besjoch de earder troch moderatoaren fêststelde skeiningen dy’t jo makke hawwe
too_fast: Formulier is te fluch yntsjinne. Probearje it nochris.
use_security_key: Befeiligingskaai brûke
+ author_attribution:
+ example_title: Faorbyldtekst
+ hint_html: Skriuwe jo nijs- of blogartikelen bûten Mastodon? Bepaal hoe’t jo oahelle wurde as dizze dield wurde op Mastodon.
+ instructions: 'Soargj derfoar dat dizze koade yn de HTML fan jo artikel sit:'
+ more_from_html: Mear fan %{name}
+ s_blog: Weblog fan %{name}
+ then_instructions: Foegje dernei de domeinnamme fan de publikaasje yn it ûndersteande fjild ta.
+ title: Auteur-attribúsje
challenge:
confirm: Trochgean
hint_html: "Tip: Wy freegje jo it kommende oere net mear nei jo wachtwurd."
@@ -1682,6 +1698,7 @@ fy:
delete: Account fuortsmite
development: Untwikkelers
edit_profile: Profyl bewurkje
+ export: Eksportearje
featured_tags: Utljochte hashtags
import: Ymportearje
import_and_export: Ymportearje en eksportearje
@@ -1931,6 +1948,7 @@ fy:
instructions_html: Kopiearje en plak de ûndersteande koade yn de HTML fan jo website. Foegje dernei it adres fan jo website ta oan ien fan de ekstra fjilden op jo profyl op it ljepblêd ‘Profyl bewurkje’ en bewarje de wizigingen.
verification: Ferifikaasje
verified_links: Jo ferifiearre keppelingen
+ website_verification: Website-ferifikaasje
webauthn_credentials:
add: Nije befeiligingskaai tafoegje
create:
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index e25865903e..b9ff79a85b 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -27,6 +27,7 @@ ga:
other: Postálacha
two: Postálacha
posts_tab_heading: Postálacha
+ self_follow_error: Ní cheadaítear do chuntas féin a leanúint
admin:
account_actions:
action: Déan gníomh
@@ -1219,9 +1220,11 @@ ga:
use_security_key: Úsáid eochair shlándála
author_attribution:
example_title: Téacs samplach
- hint_html: Rialú conas a chuirtear chun sochair tú nuair a roinntear naisc ar Mastodon.
+ hint_html: An bhfuil tú ag scríobh altanna nuachta nó blag lasmuigh de Mastodon? Rialú conas a gheobhaidh tú creidmheas nuair a roinntear iad ar Mastodon.
+ instructions: 'Cinntigh go bhfuil an cód seo i HTML d''alt:'
more_from_html: Tuilleadh ó %{name}
s_blog: Blag %{name}
+ then_instructions: Ansin, cuir ainm fearainn an fhoilseacháin sa réimse thíos.
title: Leithdháil an údair
challenge:
confirm: Lean ar aghaidh
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 90d03c74e1..15cc5dbe27 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -25,6 +25,7 @@ gd:
other: Postaichean
two: Postaichean
posts_tab_heading: Postaichean
+ self_follow_error: Chan fhaod thu an cunntas agad fhèn a leantainn
admin:
account_actions:
action: Gabh an gnìomh
@@ -261,7 +262,7 @@ gd:
destroy_domain_allow_html: Dì-cheadaich %{name} co-nasgadh leis an àrainn %{target}
destroy_domain_block_html: Dì-bhac %{name} an àrainn %{target}
destroy_email_domain_block_html: Dì-bhac %{name} an àrainn puist-d %{target}
- destroy_instance_html: Purgaidich %{name} an àrainn %{target}
+ destroy_instance_html: Phurgaidich %{name} an àrainn %{target}
destroy_ip_block_html: Sguab %{name} às riaghailt dhan IP %{target}
destroy_status_html: Thug %{name} post aig %{target} air falbh
destroy_unavailable_domain_html: Lean %{name} air adhart leis an lìbhrigeadh dhan àrainn %{target}
@@ -903,6 +904,9 @@ gd:
message_html: Cha do mhìnich thu riaghailtean an fhrithealaiche fhathast.
sidekiq_process_check:
message_html: Chan eil pròiseas Sidekiq sam bith a ruith dhan chiutha/dha na ciuthan %{value}. Thoir sùil air an rèiteachadh Sidekiq agad
+ software_version_check:
+ action: Faic na h-ùrachaidhean a tha ri fhaighinn
+ message_html: Tha ùrachadh Mastodon ri fhaighinn.
software_version_critical_check:
action: Faic na h-ùrachaidhean a tha ri fhaighinn
message_html: Tha ùrachadh èiginneach air Mastodon ri fhaighinn, ùraich cho luath ’s a ghabhas.
@@ -1021,7 +1025,7 @@ gd:
delete: Sguab às
edit_preset: Deasaich rabhadh ro-shuidhichte
empty: Cha do mhìnich thu ro-sheataichean rabhaidhean fhathast.
- title: Ro-sheataichean rabhaidhean
+ title: Rabhaidhean ro-shocraichte
webhooks:
add_new: Cuir puing-dheiridh ris
delete: Sguab às
@@ -1198,9 +1202,11 @@ gd:
use_security_key: Cleachd iuchair tèarainteachd
author_attribution:
example_title: Ball-sampaill teacsa
- hint_html: Stùirich mar a thèid iomradh a thoirt ort nuair a thèid ceangal a cho-roinneadh air Mastodon.
+ hint_html: An sgrìobh thu naidheachdan no bloga taobh a-muigh Mhastodon? Stiùirich mar a thèid iomradh a thoirt ort nuair a bhios na h-artaigilean agad ’gan co-roinneadh air Mastodon.
+ instructions: 'Dèan cinnteach gu bheil an còd seo am broinn HTML an artaigil agad:'
more_from_html: Barrachd o %{name}
s_blog: Bloga aig %{name}
+ then_instructions: An uair sin, cuir ainm àrainn an fhoillseachaidh ris an raon gu h-ìosal.
title: Aithris air an ùghdar
challenge:
confirm: Lean air adhart
@@ -1744,6 +1750,7 @@ gd:
delete: Sguabadh às cunntais
development: Leasachadh
edit_profile: Deasaich a’ phròifil
+ export: Às-phortadh
featured_tags: Tagaichean hais brosnaichte
import: Ion-phortadh
import_and_export: Ion-phortadh ⁊ às-phortadh
@@ -1765,7 +1772,7 @@ gd:
user_domain_block: Bhac thu %{target_name}
lost_followers: An luchd-leantainn a chaill thu
lost_follows: Daoine nach lean thu tuilleadh
- preamble: Dh’fhaoidte gun chaill thu dàimhean leantainn nuair a bhacas tu àrainn no nuair a chuireas na maoir romhpa gun cuir iad frithealaiche cèin à rèim. Nuair a thachras sin, ’s urrainn dhut liosta de na dàimhean dealaichte a luchdadh a-nuas airson sùil a thoirt orra agus an ion-phortadh gu frithealaiche eile ’s dòcha.
+ preamble: Dh’fhaoidte gun caill thu dàimhean leantainn nuair a bhacas tu àrainn no nuair a chuireas na maoir romhpa gun cuir iad frithealaiche cèin à rèim. Nuair a thachras sin, ’s urrainn dhut liosta de na dàimhean dealaichte a luchdadh a-nuas airson sùil a thoirt orra agus an ion-phortadh gu frithealaiche eile ’s dòcha.
purged: Chaidh am fiosrachadh mun fhrithealaiche seo a phurgaideachadh le rianairean an fhrithealaiche agad.
type: Tachartas
statuses:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index e396761f7e..a2480370ef 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -21,6 +21,7 @@ gl:
one: Publicación
other: Publicacións
posts_tab_heading: Publicacións
+ self_follow_error: Non está permitido seguir a túa propia conta
admin:
account_actions:
action: Executar acción
@@ -175,7 +176,7 @@ gl:
approve_appeal: Aprobar apelación
approve_user: Aprobar Usuaria
assigned_to_self_report: Asignar denuncia
- change_email_user: Cambiar o correo da Usuaria
+ change_email_user: Cambiar o correo da usuaria
change_role_user: Cambiar Rol da Usuaria
confirm_user: Confirmar usuaria
create_account_warning: Crear aviso
@@ -262,10 +263,10 @@ gl:
destroy_user_role_html: "%{name} eliminou o rol %{target}"
disable_2fa_user_html: "%{name} desactivou o requerimento do segundo factor para a usuaria %{target}"
disable_custom_emoji_html: "%{name} desactivou o emoji %{target}"
- disable_sign_in_token_auth_user_html: "%{name} desactivou a autenticación por token no email para %{target}"
+ disable_sign_in_token_auth_user_html: "%{name} desactivou a autenticación por token no correo para %{target}"
disable_user_html: "%{name} desactivou as credenciais para a usuaria %{target}"
enable_custom_emoji_html: "%{name} activou o emoji %{target}"
- enable_sign_in_token_auth_user_html: "%{name} activou a autenticación con token no email para %{target}"
+ enable_sign_in_token_auth_user_html: "%{name} activou a autenticación con token no correo para %{target}"
enable_user_html: "%{name} activou as credenciais para a usuaria %{target}"
memorialize_account_html: "%{name} convertiu a conta de %{target} nunha páxina para o recordo"
promote_user_html: "%{name} promocionou a usuaria %{target}"
@@ -1165,9 +1166,11 @@ gl:
use_security_key: Usa chave de seguridade
author_attribution:
example_title: Texto de mostra
- hint_html: Controla o xeito en que te acreditan cando se comparten ligazóns en Mastodon.
+ hint_html: Escribes novas ou artigos nun blog alleos a Mastodon? Xestiona o xeito en que podes dar crédito da túa autoría cando os compartes en Mastodon.
+ instructions: 'Pon coidado en que este código apareza no HTML do teu artigo:'
more_from_html: Máis de %{name}
s_blog: Blog de %{name}
+ then_instructions: Despois engade o nome de dominio da publicación no campo inferior.
title: Atribución da autoría
challenge:
confirm: Continuar
@@ -1249,7 +1252,7 @@ gl:
errors:
'400': A solicitude que enviou non é válida ou ten formato incorrecto.
'403': Non ten permiso para ver esta páxina.
- '404': A páxina que está a buscar non está aquí.
+ '404': A páxina que buscas non está aquí.
'406': Esta páxina non está dispoñible no formato solicitado.
'410': A páxina que estaba a buscar xa non existe.
'422':
@@ -1430,7 +1433,7 @@ gl:
table:
expires_at: Caduca
uses: Usos
- title: Convidar xente
+ title: Convidar a persoas
lists:
errors:
limit: Xa acadaches o número máximo de listas
@@ -1760,11 +1763,11 @@ gl:
enabled: Borrar automáticamente publicacións antigas
enabled_hint: Borra automáticamente as túas publicacións unha vez acadan certa lonxevidade, a menos que cumpran algunha destas excepcións
exceptions: Excepcións
- explanation: Como o borrado de publicacións consume moitos recursos, esta faise aos poucos cando o servidor non ten moita carga de traballo. Así, a eliminación das túas publicacións podería ser lixeiramente posterior a cando lle correspondería por idade.
+ explanation: O borrado de publicacións vaise facendo aos poucos cando o servidor non ten moito traballo, é unha tarefa que consume moitos recursos. Así, a eliminación das túas publicacións podería ser lixeiramente posterior a cando lle correspondería por antigüidade.
ignore_favs: Ignorar favoritas
ignore_reblogs: Ignorar promocións
interaction_exceptions: Excepcións baseadas en interaccións
- interaction_exceptions_explanation: Ten en conta que non hai garantía de que se eliminen as túas publicacións se baixan do límite de promocións e favorecementos se nalgún momento o superaron.
+ interaction_exceptions_explanation: Ten en conta que non hai garantía de que se eliminen as túas publicacións se baixan do límite de promocións ou favorecementos se nalgún momento o tivesen superado.
keep_direct: Manter mensaxes directas
keep_direct_hint: Non borrar ningunha das túas mensaxes directas
keep_media: Manter publicacións que conteñen multimedia
@@ -1787,9 +1790,9 @@ gl:
'63113904': 2 anos
'7889238': 3 meses
min_age_label: Límite temporal
- min_favs: Manter as publicacións favorecidas polo menos
+ min_favs: Manter publicacións favorecidas polo menos
min_favs_hint: Non elimina ningunha das túas publicacións que recibiron alomenos esta cantidade de favorecementos. Deixa en branco para eliminar publicacións independentemente do número de favorecementos
- min_reblogs: Manter publicacións promovidas máis de
+ min_reblogs: Manter publicacións promovidas polo menos
min_reblogs_hint: Non elimina ningunha das túas publicacións se foron promovidas máis deste número de veces. Deixa en branco para eliminar publicacións independentemente do seu número de promocións
stream_entries:
sensitive_content: Contido sensible
diff --git a/config/locales/he.yml b/config/locales/he.yml
index c7af22660f..e27339cdee 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -25,6 +25,7 @@ he:
other: הודעות
two: הודעותיים
posts_tab_heading: הודעות
+ self_follow_error: בלתי אפשרי לך לעקוב אחרי חשבונך
admin:
account_actions:
action: בצע/י פעולה
@@ -101,8 +102,8 @@ he:
pending: בהמתנה
silenced: מוגבלים
suspended: מושהים
- title: ניהול קהילה
- moderation_notes: הודעות מנחה
+ title: ניהול דיון
+ moderation_notes: הודעות מנחה דיונים
most_recent_activity: פעילות עדכנית
most_recent_ip: כתובות אחרונות
no_account_selected: לא בוצעו שינויים בחשבונות ל שכן לא נבחרו חשבונות
@@ -553,7 +554,7 @@ he:
moderation:
all: הכל
limited: מוגבלים
- title: ניהול קהילה
+ title: ניהול דיון
private_comment: הערה פרטית
public_comment: תגובה פומבית
purge: טיהור
@@ -661,7 +662,7 @@ he:
delete: מחיקה
placeholder: תאר/י אילו פעולות ננקטו, או עדכונים קשורים אחרים...
title: הערות
- notes_description_html: צפייה והשארת הערות למנחים אחרים או לעצמך העתידי
+ notes_description_html: צפייה והשארת הערות למנחים אחרים או לעצמך לעתיד
processed_msg: דיווח %{id} עוּבָּד בהצלחה
quick_actions_description_html: 'נקוט/י פעולה מהירה או גלול/י למטה לצפייה בתוכן המדווח:'
remote_user_placeholder: המשתמש המרוחק מ-%{instance}
@@ -712,7 +713,7 @@ he:
administration: ניהול מערכת
devops: DevOps
invites: הזמנות
- moderation: פיקוח
+ moderation: ניהול דיון
special: מיוחדים
delete: מחיקה
description_html: באמצעות תפקידי משתמש, תוכלו להתאים אישית לאילו פונקציות ואזורים של מסטודון המשתמשים יוכלו לגשת
@@ -734,7 +735,7 @@ he:
manage_announcements: ניהול הכרזות
manage_announcements_description: מאפשר למשתמשים לנהל הכרזות של השרת
manage_appeals: ניהול ערעורים
- manage_appeals_description: מאפשר למשתמשים לסקור ערעורים כנגד פעולות מודרציה
+ manage_appeals_description: מאפשר למשתמשים לסקור ערעורים כנגד פעולות ניהול דיון
manage_blocks: ניהול חסימות
manage_blocks_description: מאפשר למשתמשים לחסום ספקי דוא"ל וכתובות IP
manage_custom_emojis: ניהול סמלונים בהתאמה אישית
@@ -744,7 +745,7 @@ he:
manage_invites: ניהול הזמנות
manage_invites_description: מאפשר למשתמשים לעלעל ב ולבטל קישורי הזמנה
manage_reports: ניהול דו"חות
- manage_reports_description: מאפשר למשתמשים לסקור דו"חות ולבצע פעולות מודרציה בהתבסס עליהם
+ manage_reports_description: מאפשר למשתמשים לסקור דו"חות ולבצע פעולות ניהול דיון בהתבסס עליהם
manage_roles: ניהול תפקידים
manage_roles_description: מאפשר למשתמשים לנהל ולמנות אחרים לתפקידים נמוכים יותר משלהם.
manage_rules: ניהול כללים
@@ -756,7 +757,7 @@ he:
manage_user_access: ניהול גישת משתמשים
manage_user_access_description: מאפשר למשתמשים לבטל אימות דו-שלבי של משתמשים אחרים, לשנות את כתובות הדוא"ל שלהם, ולאפס את סיסמתם
manage_users: ניהול משתמשים
- manage_users_description: מאפשר למשתמשים לצפות בפרטים של משתמשים אחרים ולבצע פעולות מודרציה לפיהם
+ manage_users_description: מאפשר למשתמשים לצפות בפרטים של משתמשים אחרים ולבצע פעולות ניהול דיון לפיהם
manage_webhooks: ניהול Webhooks
manage_webhooks_description: מאפשר למשתמשים להגדיר Webhooks לאירועים מנהלתיים
view_audit_log: צפייה בלוג ביקורת
@@ -903,6 +904,9 @@ he:
message_html: לא הוגדרו שום כללי שרת.
sidekiq_process_check:
message_html: שום הליכי Sidekiq לא רצים עבור %{value} תור(ות). בחנו בבקשה את הגדרות Sidekiq
+ software_version_check:
+ action: ראו עדכונים זמינים
+ message_html: עדכון מסטודון זמין כעת.
software_version_critical_check:
action: ראו עדכונים זמינים
message_html: יצא עדכון קריטי למסטודון, נא לעדכן את תוכנת מסטודון בהקדם האפשרי.
@@ -1198,9 +1202,11 @@ he:
use_security_key: שימוש במפתח אבטחה
author_attribution:
example_title: טקסט לדוגמה
- hint_html: בחירה איך תקבלו קרדיטציה כאשר קישורים משותפים דרך מסטודון.
+ hint_html: האם יש לך בלוג או טור חדשות שמתפרסם מחוץ למסטודון? ניתן לשלוט איך יוצג הקרדיט שלך כשמשתפים את הלינק במסטודון.
+ instructions: 'ודאו כי הקוד הזה נכלל בקוד ה־HTML של המאמרים שלכם:'
more_from_html: עוד מאת %{name}
s_blog: הבלוג של %{name}
+ then_instructions: לאחר מכן, הוסיפו את שם המתחם של האתר המפרסם בשדה למטה.
title: ייחוס למפרסם
challenge:
confirm: המשך
@@ -1744,6 +1750,7 @@ he:
delete: מחיקת חשבון
development: פיתוח
edit_profile: עריכת פרופיל
+ export: ייצוא
featured_tags: תגיות נבחרות
import: יבוא
import_and_export: יבוא ויצוא
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 5a00db9548..84fcc55354 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -21,6 +21,7 @@ hu:
one: Bejegyzés
other: Bejegyzés
posts_tab_heading: Bejegyzés
+ self_follow_error: A saját fiók nem követhető
admin:
account_actions:
action: Művelet végrehajtása
@@ -570,21 +571,21 @@ hu:
relationships:
title: "%{acct} kapcsolatai"
relays:
- add_new: Új relé hozzáadása
+ add_new: Új továbbító hozzáadása
delete: Törlés
- description_html: A föderációs relé egy olyan köztes szerver, mely nagy mennyiségű nyilvános bejegyzést cserél az erre feliratkozó vagy erre publikáló szerverek között. Ezzel segíthetsz kis és közepes szervereknek tartalmat megtalálni a föderációban, mely egyébként csak akkor válna lehetővé, ha a saját felhasználóik más szervereken lévő fiókokat követnének.
+ description_html: A föderációs továbbító egy olyan köztes kiszolgáló, mely nagy mennyiségű nyilvános bejegyzést cserél az erre feliratkozó vagy erre publikáló kiszolgálók között. Ezzel segíthetsz kis és közepes kiszolgálóknak megtalálni a tartalmakat a föderációban, melyek egyébként csak akkor válnának lehetővé, ha a saját felhasználóik más kiszolgálókon lévő fiókokat követnének.
disable: Kikapcsolás
disabled: Kikapcsolva
enable: Bekapcsolás
- enable_hint: Ha bekapcsolod, a szerver minden nyilvános bejegyzésre feliratkozik ezen a relén, valamint az összes nyilvános bejegyzést elküldi ennek.
+ enable_hint: Ha bekapcsolod, a kiszolgáló minden nyilvános bejegyzésre feliratkozik ezen a továbbítón, valamint az összes nyilvános bejegyzést elküldi ennek.
enabled: Bekapcsolva
- inbox_url: Relé URL
- pending: Várakozás a relé jóváhagyására
+ inbox_url: Továbbító URL
+ pending: Várakozás a továbbító jóváhagyására
save_and_enable: Mentés és engedélyezés
- setup: Relé kapcsolat felállítása
- signatures_not_enabled: A relék nem fognak megfelelően működni, amíg a biztonságos mód vagy a korlátozott föderációs mód engedélyezett
+ setup: Továbbító kapcsolat felállítása
+ signatures_not_enabled: A továbbítók nem fognak megfelelően működni, amíg a biztonságos mód vagy a korlátozott föderációs mód engedélyezett
status: Állapot
- title: Relék
+ title: Továbbítók
report_notes:
created_msg: Bejelentési feljegyzés létrehozva!
destroyed_msg: Bejelentési feljegyzés törölve!
@@ -1165,9 +1166,11 @@ hu:
use_security_key: Biztonsági kulcs használata
author_attribution:
example_title: Mintaszöveg
- hint_html: Szabályozd, hogyan hivatkoznak rád, amikor linket osztanak meg Mastodonon.
+ hint_html: Mastodonon kívül írsz híreket vagy blogbejegyzéseket? Szabályozd, hogyan tüntethetnek fel szerzőként, amikor Mastodonon osztják meg őket.
+ instructions: 'Győződj meg róla, hogy ez a kód a cikked HTML-jében van:'
more_from_html: 'Több tőle: %{name}'
s_blog: "%{name} blogja"
+ then_instructions: Aztán add meg a publikáció domain-nevét az alábbi mezőben.
title: Szerző forrásmegjelölése
challenge:
confirm: Folytatás
@@ -1911,7 +1914,7 @@ hu:
feature_moderation_title: Moderálás, ahogy annak lennie kell
follow_action: Követés
follow_step: A Mastodon az érdekes emberek követéséről szól.
- follow_title: Saját hírfolyam testreszabása
+ follow_title: Kezdőlapi hírfolyam testreszabása
follows_subtitle: Jól ismert fiókok követése
follows_title: Kit érdemes követni
follows_view_more: További követendő személyek megtekintése
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index a8bc48b306..f631d318a8 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -21,6 +21,7 @@ ia:
one: Message
other: Messages
posts_tab_heading: Messages
+ self_follow_error: Sequer tu proprie conto non es permittite
admin:
account_actions:
action: Exequer action
@@ -163,7 +164,7 @@ ia:
undo_silenced: Disfacer le limite
undo_suspension: Disfacer le suspension
unsilenced_msg: Le limite del conto de %{username} ha essite cancellate
- unsubscribe: Desubscriber
+ unsubscribe: Cancellar subscription
unsuspended_msg: Le suspension del conto %{username} ha essite annullate
username: Nomine de usator
view_domain: Vider summario de dominio
@@ -473,6 +474,9 @@ ia:
title: Recommendationes de contos a sequer
unsuppress: Restaurar recommendation de sequimento
instances:
+ audit_log:
+ title: Registros de controlo recente
+ view_all: Vider registros de controlo integre
availability:
description_html:
one: Si le livration al dominio falle %{count} die sin succeder, necun tentativa ulterior de livration essera facite, excepte si es recipite un livration ab le dominio.
@@ -599,7 +603,9 @@ ia:
resolve_description_html: Necun mesura essera prendite contra le conto denunciate, necun sanction registrate, e le reporto essera claudite.
silence_description_html: Iste conto essera visibile solmente a qui ja lo seque o manualmente lo cerca, limitante gravemente su portata. Pote sempre esser revertite. Claude tote le reportos contra iste conto.
suspend_description_html: Le conto e tote su contento essera inaccessibile e finalmente delite, e interager con illo essera impossibile. Reversibile intra 30 dies. Claude tote le reportos contra iste conto.
+ actions_description_html: Decider que mesuras prender pro resolver iste reporto. Si tu prende un mesura punitive contra le conto reportate, un aviso email les sera inviate, salvo quando le categoria Spam es seligite.
actions_description_remote_html: Decide qual mesura prender pro resolver iste reporto. Isto affectara solmente le maniera in que tu servitor communica con iste conto remote e gere su contento.
+ actions_no_posts: Iste reporto non ha alcun message associate a deler
add_to_report: Adder plus al reporto
already_suspended_badges:
local: Ja suspendite sur iste servitor
@@ -870,6 +876,9 @@ ia:
message_html: Tu non ha definite alcun regula de servitor.
sidekiq_process_check:
message_html: Necun processo Sidekiq es active pro le cauda(s) %{value}. Per favor verifica tu configuration de Sidekiq
+ software_version_check:
+ action: Vider le actualisationes disponibile
+ message_html: Un actualisation de Mastodon es disponibile.
software_version_critical_check:
action: Vider le actualisationes disponibile
message_html: Un actualisation critic de Mastodon es disponibile. Per favor actualisa lo le plus tosto possibile.
@@ -885,11 +894,18 @@ ia:
tags:
moderation:
not_trendable: Non pro tendentia
+ not_usable: Non usabile
pending_review: Attende revision
+ review_requested: Revision demandate
+ reviewed: Revidite
title: Stato
+ trendable: De tendentia
+ unreviewed: Non revidite
+ usable: Usabile
name: Nomine
newest: Le plus nove
oldest: Le plus ancian
+ open: Vider publicamente
reset: Reinitialisar
review: Revide le stato
search: Cercar
@@ -932,7 +948,9 @@ ia:
statuses:
allow: Permitter message
allow_account: Permitter autor
+ confirm_allow: Desira tu vermente permitter le statos seligite?
confirm_allow_account: Es tu secur que tu vole permitter le contos seligite?
+ confirm_disallow: Desira tu vermente impedir le statos seligite?
confirm_disallow_account: Es tu secur que tu vole cessar de permitter le contos seligite?
description_html: Istes es le messages cognoscite sur tu servitor que al momento es multo compartite e marcate como favorite. Illos pote adjutar tu usatores nove e reveniente a trovar plus personas a sequer. Necun message es monstrate publicamente usque tu approba le autor, a condition que le autor permitte que su conto es suggerite a alteres. Tu pote tamben permitter o rejectar messages singule.
disallow: Non permitter message
@@ -1054,7 +1072,7 @@ ia:
notification_preferences: Cambiar preferentias de e-mail
salutation: "%{name},"
settings: 'Cambiar preferentias de e-mail: %{link}'
- unsubscribe: Desubscriber
+ unsubscribe: Cancellar subscription
view: 'Visita:'
view_profile: Vider profilo
view_status: Vider message
@@ -1100,7 +1118,7 @@ ia:
migrate_account: Migrar a un altere conto
migrate_account_html: Si tu vole rediriger iste conto a un altere, tu pote configurar lo hic.
or_log_in_with: O aperi session con
- privacy_policy_agreement_html: Io ha legite e accepta le politica de confidentialitate
+ privacy_policy_agreement_html: Io ha legite e accepta le politica de confidentialitate
progress:
confirm: Confirmar e-mail
details: Tu detalios
@@ -1148,8 +1166,12 @@ ia:
use_security_key: Usar clave de securitate
author_attribution:
example_title: Texto de exemplo
+ hint_html: Scribe tu articulos de novas o de blog foras de Mastodon? Controla le maniera in que tu recipe attribution quando on los condivide sur Mastodon.
+ instructions: 'Assecura te que iste codice appare in le HTML de tu articulo:'
more_from_html: Plus de %{name}
s_blog: Blog de %{name}
+ then_instructions: Postea, adde le nomine de dominio del publication in le campo sequente.
+ title: Attribution de autor
challenge:
confirm: Continuar
hint_html: "Consilio: Nos non te demandara tu contrasigno de novo in le proxime hora."
@@ -1428,7 +1450,7 @@ ia:
title: Historia de authentication
mail_subscriptions:
unsubscribe:
- action: Si, desubscriber
+ action: Si, cancellar subscription
complete: Desubscribite
confirmation_html: Es tu secur de voler cancellar le subscription al %{type} de Mastodon sur %{domain} pro tu adresse de e-mail %{email}? Tu pote sempre resubscriber te a partir del parametros de notification in e-mail.
emails:
@@ -1444,6 +1466,7 @@ ia:
media_attachments:
validations:
images_and_video: Impossibile annexar un video a un message que jam contine imagines
+ not_found: Medios %{ids} non trovate o jam attachate a un altere message
not_ready: Impossibile annexar files que non ha ancora essite processate. Retenta post un momento!
too_many: Impossibile annexar plus de 4 files
migrations:
@@ -1564,7 +1587,7 @@ ia:
posting_defaults: Parametros de publication predefinite
public_timelines: Chronologias public
privacy:
- hint_html: "Personalisa como tu vole que tu profilo e tu messages es trovate. Un varietate de functiones in Mastodon pote adjutar te a attinger un plus grande publico quando activate. Prende un momento pro revider iste parametros pro assecurar te que illos se adapta a tu besonios."
+ hint_html: "Personalisa como tu vole que le gente trova tu profilo e tu messages. Un varietate de functiones in Mastodon pote adjutar te a attinger un plus grande publico si tu los activa. Prende un momento pro revider iste parametros pro assecurar te que illos se adapta a tu besonios."
privacy: Confidentialitate
privacy_hint_html: Controla quanto tu vole divulgar pro le beneficio de alteres. Le gente discoperi profilos e applicationes interessante percurrente le profilos sequite per altere personas e vidente a partir de qual applicationes illos publica lor messages, ma tu pote preferer de mantener tal information private.
reach: Portata
@@ -1675,6 +1698,7 @@ ia:
delete: Deletion de conto
development: Disveloppamento
edit_profile: Modificar profilo
+ export: Exportar
featured_tags: Hashtags in evidentia
import: Importar
import_and_export: Importar e exportar
diff --git a/config/locales/ig.yml b/config/locales/ig.yml
index 9db771fdcf..81d425916c 100644
--- a/config/locales/ig.yml
+++ b/config/locales/ig.yml
@@ -1,5 +1,28 @@
---
ig:
+ admin:
+ settings:
+ discovery:
+ profile_directory: Ndekọ profaịlụ
+ admin_mailer:
+ new_trends:
+ new_trending_statuses:
+ title: Edemede na-ewu ewu
+ application_mailer:
+ view_profile: Lelee profaịlụ
filters:
contexts:
+ account: Profaịlụ
home: Ụlọ na ndepụta
+ edit:
+ title: Dezie myọ
+ index:
+ delete: Hichapụ
+ empty: Ị nweghi myọ ọbụla.
+ title: Myọ
+ settings:
+ edit_profile: Dezie profaịlụ gị
+ profile: Profaịlụ ọha
+ user_mailer:
+ welcome:
+ share_title: Kekọrịta profaịlụ Mastọdọnụ gị
diff --git a/config/locales/io.yml b/config/locales/io.yml
index dfb583450a..1ccbb7d602 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -21,15 +21,19 @@ io:
one: Posto
other: Posti
posts_tab_heading: Posti
+ self_follow_error: Sequar vua sua konto es ne permisita
admin:
account_actions:
action: Agez
+ already_silenced: Ca konto ja limitigesis.
+ already_suspended: Ca konto ja blokusesis.
title: Agez jero a %{acct}
account_moderation_notes:
create: Pozez noto
created_msg: Jernoto sucesoze kreesis!
destroyed_msg: Jernoto sucesoze efacesis!
accounts:
+ add_email_domain_block: Blokusar retpostodomeno
approve: Aprobez
approved_msg: Sucesoze aprobis registroapliko di %{username}
are_you_sure: Ka tu esas certa?
@@ -44,6 +48,7 @@ io:
title: Chanjez retposto por %{username}
change_role:
changed_msg: Rolo sucesoze chanjesis!
+ edit_roles: Administrar uzantoroli
label: Chanjez rolo
no_role: Nula rolo
title: Chanjez rolo por %{username}
@@ -56,31 +61,33 @@ io:
demote: Despromocez
destroyed_msg: Informi di %{username} nun aranjesis por efacesar aparante
disable: Frostigez
- disable_two_factor_authentication: Desaktivigez 2FA
+ disable_sign_in_token_auth: Desebligar retpostofichyurizo
+ disable_two_factor_authentication: Desebligar 2FA
disabled: Desinterdiktita
display_name: Profilnomo
domain: Domeno
- edit: Modifikez
+ edit: Redaktar
email: E-mail
email_status: Retpostostando
enable: Defrostigez
- enabled: Aktivigita
+ enable_sign_in_token_auth: Ebligar retpostofichyurizo
+ enabled: Ebligita
enabled_msg: Sucesoze desfrostigas konto di %{username}
followers: Uzanti
follows: Uzati
- header: Kapimajo
+ header: Fundimajo
inbox_url: URL di mesajbuxo
- invite_request_text: Juntomotivo
+ invite_request_text: Adeskmotivi
invited_by: Invitesis da
ip: IP
- joined: Juntita
+ joined: Adeskis
location:
all: Omna
local: Lokala
remote: Nelokala
title: Loko
login_status: Enirstando
- media_attachments: Mediiatachaji
+ media_attachments: Audvidajaddonaji
memorialize: Memorializez
memorialized: Memorializita
memorialized_msg: Sucesoze chanjesis %{username} a memorialkonto
@@ -110,15 +117,15 @@ io:
public: Publika
push_subscription_expires: Abono PuSH expiras
redownload: Rifreshigez profilo
- redownloaded_msg: Sucesoze rifreshis profilo di %{username} de origino
+ redownloaded_msg: Sucese rifreshigis profilo di %{username} de origino
reject: Refuzez
rejected_msg: Sucesoze refuzis registroapliko di %{username}
remote_suspension_irreversible: La datumi di ca konto esas nerenversebla efacita.
remote_suspension_reversible_hint_html: Ca konto restriktesis che lua servilo, e la datumi tota efacesos ye %{date}. Ante ta tempo, la fora servilo povos restaurar ca konto sen irga mala efecti. Se vu volas efacar omna datumi dil konto quik, vu povas facar lo sube.
remove_avatar: Efacez profilimajo
- remove_header: Efacez kapimajo
+ remove_header: Forigar fundimajo
removed_avatar_msg: Sucesoze efacis profilimajo di %{username}
- removed_header_msg: Sucesoze efacis kapimajo di %{username}
+ removed_header_msg: Sucese forigis fundimajo di %{username}
resend_confirmation:
already_confirmed: Ca uzanto ja konfirmesis
send: Risendez konfirmligilo
@@ -128,6 +135,7 @@ io:
resubscribe: Riabonez
role: Rolo
search: Trovez
+ search_same_email_domain: Altra uzanti kun la sama retpostodomeno
search_same_ip: Altra uzanti kun sama IP
security: Sekureso
security_measures:
@@ -147,7 +155,7 @@ io:
suspend: Restriktez
suspended: Restriktita
suspension_irreversible: Ca informi di ca konto neinversigeble efacesis. Vu povas derestriktar konto por uzebligar lu ma ol ne riganos irga dati quon ol antee havis.
- suspension_reversible_hint_html: Ca konto restriktesis, e ca informi tota efacesos en %{date}. Ante ta tempo, konto povas riganesar sen irga mala efekti. Se vu volas efacar omna informi di konto quik, vu povas agar lu sube.
+ suspension_reversible_hint_html: Ca konto blokusesis, e ca informi tota forigesos ye %{date}. Se vu volas forigar omna informi di konto quik, vu povas agar lu dessupre.
title: Konti
unblock_email: Deobstruktez retpostoadreso
unblocked_email_msg: Sucesoze deobstruktis retpostoadreso di %{username}
@@ -168,30 +176,37 @@ io:
approve_appeal: Aprobez apelo
approve_user: Aprobez uzanto
assigned_to_self_report: Taskigez raporto
+ change_email_user: Chanjar retpostoadreso por Uzanto
change_role_user: Chanjez rolo di uzanto
confirm_user: Konfirmez uzanto
create_account_warning: Kreez averto
create_announcement: Kreez anunco
+ create_canonical_email_block: Krear retpostoblokuso
create_custom_emoji: Kreez kustumizita emocimajo
create_domain_allow: Kreez domenpermiso
create_domain_block: Kreez domenobstrukto
+ create_email_domain_block: Krear retpostodomenblokuso
create_ip_block: Kreez IP-regulo
create_unavailable_domain: Kreez nedisponebla domeno
create_user_role: Kreez rolo
demote_user: Despromocez uzanto
destroy_announcement: Efacez anunco
+ destroy_canonical_email_block: Forigar retpostoblokuso
destroy_custom_emoji: Efacez kustumizita emocimajo
destroy_domain_allow: Efacez domenpermiso
destroy_domain_block: Efacez domenobstrukto
+ destroy_email_domain_block: Forigar retpostodomenblokuso
destroy_instance: Efacez domeno
destroy_ip_block: Efacez IP-regulo
destroy_status: Efacez posto
destroy_unavailable_domain: Efacez nedisponebla domeno
destroy_user_role: Destruktez rolo
- disable_2fa_user: Desaktivigez 2FA
- disable_custom_emoji: Desaktivigez kustumizita emocimajo
- disable_user: Desaktivigez uzanto
- enable_custom_emoji: Aktivigez kustumizita emocimajo
+ disable_2fa_user: Desebligar 2FA
+ disable_custom_emoji: Desebligar personesigita emocimajo
+ disable_sign_in_token_auth_user: Desebligar retpostofichyurizo por uzanto
+ disable_user: Desaktivigar uzanto
+ enable_custom_emoji: Ebligar personesigita emocimajo
+ enable_sign_in_token_auth_user: Ebligar retpostofichyurizo por uzanto
enable_user: Aktivigez uzanto
memorialize_account: Memorializez konto
promote_user: Promocez uzanto
@@ -214,56 +229,67 @@ io:
update_custom_emoji: Novigez kustumizita emocimajo
update_domain_block: Novigez domenobstrukto
update_ip_block: Kreez IP-regulo
+ update_report: Tildatigar raporto
update_status: Novigez posto
update_user_role: Novigez rolo
actions:
approve_appeal_html: "%{name} aprobis jerdecidapelo de %{target}"
approve_user_html: "%{name} aprobis registro de %{target}"
assigned_to_self_report_html: "%{name} taskigis raporto %{target} a su"
+ change_email_user_html: "%{name} chanjis la retpostoadreso di uzanto %{target}"
change_role_user_html: "%{name} chanjis rolo di %{target}"
+ confirm_user_html: "%{name} konfirmis retpostoadreso di uzanto %{target}"
create_account_warning_html: "%{name} sendis averto a %{target}"
create_announcement_html: "%{name} kreis nova anunco %{target}"
- create_custom_emoji_html: "%{name} adchargis nova emocimajo %{target}"
+ create_canonical_email_block_html: "%{name} blokusis retposto kun la greto %{target}"
+ create_custom_emoji_html: "%{name} adkargis nova emocimajo %{target}"
create_domain_allow_html: "%{name} permisis federato kun domeno %{target}"
create_domain_block_html: "%{name} obstruktis domeno %{target}"
+ create_email_domain_block_html: "%{name} blokusis retpostodomeno %{target}"
create_ip_block_html: "%{name} kreis regulo por IP %{target}"
create_unavailable_domain_html: "%{name} cesis sendo a domeno %{target}"
create_user_role_html: "%{name} kreis rolo di %{target}"
demote_user_html: "%{name} despromocis uzanto %{target}"
destroy_announcement_html: "%{name} efacis anunco %{target}"
+ destroy_canonical_email_block_html: "%{name} desblokusis retposto kun greto %{target}"
destroy_custom_emoji_html: "%{name} efacis emocimajo %{target}"
destroy_domain_allow_html: "%{name} despermisis federato kun domeno %{target}"
destroy_domain_block_html: "%{name} deobstruktis domeno %{target}"
+ destroy_email_domain_block_html: "%{name} desblokusis retpostodomeno %{target}"
destroy_instance_html: "%{name} efacis domeno %{target}"
destroy_ip_block_html: "%{name} efacis regulo por IP %{target}"
destroy_status_html: "%{name} efacis posto da %{target}"
destroy_unavailable_domain_html: "%{name} durigis sendo a domeno %{target}"
destroy_user_role_html: "%{name} efacis rolo di %{target}"
- disable_2fa_user_html: "%{name} desaktivigis 2-faktorbezono por uzanto %{target}"
- disable_custom_emoji_html: "%{name} desaktivigis emocimajo %{target}"
- disable_user_html: "%{name} desaktivigis eniro por uzanto %{target}"
- enable_custom_emoji_html: "%{name} aktivigis emocimajo %{target}"
- enable_user_html: "%{name} aktivigis eniro por uzanto %{target}"
+ disable_2fa_user_html: "%{name} desebligis dufaktora bezono por uzanto %{target}"
+ disable_custom_emoji_html: "%{name} desebligis emocimajo %{target}"
+ disable_sign_in_token_auth_user_html: "%{name} desebligis retpostofichyurizo por %{target}"
+ disable_user_html: "%{name} desebligis eniro por uzanto %{target}"
+ enable_custom_emoji_html: "%{name} ebligis emocimajo %{target}"
+ enable_sign_in_token_auth_user_html: "%{name} ebligis retpostofishyurizo por %{target}"
+ enable_user_html: "%{name} ebligis eniro por uzanto %{target}"
memorialize_account_html: "%{name} kauzigis konto di %{target} divenar memorialpagino"
promote_user_html: "%{name} promocis uzanto %{target}"
reject_appeal_html: "%{name} refuzis jerdecidapelo de %{target}"
reject_user_html: "%{name} refuzis registro de %{target}"
remove_avatar_user_html: "%{name} efacis profilimajo de %{target}"
reopen_report_html: "%{name} riapertis raporto %{target}"
+ resend_user_html: "%{name} risendis konfirmretposto por %{target}"
reset_password_user_html: "%{name} richanjis pasvorto de uzanto %{target}"
resolve_report_html: "%{name} rezolvis raporto %{target}"
- sensitive_account_html: "%{name} markizis medii di %{target} quale sentoza"
+ sensitive_account_html: "%{name} markis audvidaji di %{target} quale trublema"
silence_account_html: "%{name} limitizis konto di %{target}"
suspend_account_html: "%{name} restriktis konto di %{target}"
unassigned_report_html: "%{name} detaskigis raporto %{target}"
unblock_email_account_html: "%{name} deobstruktis retpostoadreso di %{target}"
- unsensitive_account_html: "%{name} demarkizis medii di %{target} quale sentoza"
+ unsensitive_account_html: "%{name} desmarkizis audvidaji di %{target} quale trublema"
unsilence_account_html: "%{name} efacis limito di konto di %{target}"
unsuspend_account_html: "%{name} derestriktis konto di %{target}"
update_announcement_html: "%{name} novigis anunco %{target}"
update_custom_emoji_html: "%{name} novigis emocimajo %{target}"
update_domain_block_html: "%{name} novigis domenobstrukto por %{target}"
update_ip_block_html: "%{name} kreis regulo por IP %{target}"
+ update_report_html: "%{name} tildatigis raporto %{target}"
update_status_html: "%{name} novigis posto da %{target}"
update_user_role_html: "%{name} chanjis rolo di %{target}"
deleted_account: konto efacita
@@ -271,10 +297,11 @@ io:
filter_by_action: Filtrez segun ago
filter_by_user: Filtrez segun uzanto
title: Kontrollogo
+ unavailable_instance: "(domennomo nedisponebla)"
announcements:
destroyed_msg: Anunco sucesoze efacesas!
edit:
- title: Modifikez anunco
+ title: Redaktar anunco
empty: Nula anunci.
live: Samtempe
new:
@@ -290,7 +317,7 @@ io:
updated_msg: Anunco sucesoza novigesas!
critical_update_pending: Urjanta aktualigo vartesas
custom_emojis:
- assign_category: Insertez kategorio
+ assign_category: Juntar kategorio
by_domain: Domeno
copied_msg: Sucesoze kreis lokala kopiuro di emocimajo
copy: Kopiez
@@ -299,18 +326,18 @@ io:
created_msg: Emocimajo sucesoze kreesas!
delete: Efacez
destroyed_msg: Kustumizita emocimajo sucesoza destruktesas!
- disable: Desaktivigez
- disabled: Desaktivigita
- disabled_msg: Sucesoze desaktivigis ta emocimajo
+ disable: Desebligar
+ disabled: Desebligita
+ disabled_msg: Sucese desebligis ta emocimajo
emoji: Emocimajo
- enable: Aktivigez
- enabled: Aktivigita
- enabled_msg: Sucesoze aktivigis ta emocimajo
+ enable: Ebligar
+ enabled: Ebligita
+ enabled_msg: Sucese ebligis ta emocimajo
image_hint: Maximo grandeso di PNG o GIF esas %{size}
list: Listo
listed: Listita
new:
- title: Insertez nova kustumizita emocimajo
+ title: Adjuntar nova personesigita emocimajo
no_emoji_selected: Nula emocimaji chanjesis pro ke nulo selektesis
not_permitted: Vu ne permisesis agar co
overwrite: Remplasez
@@ -322,11 +349,11 @@ io:
unlisted: Delistigita
update_failed_msg: Ne povas novigar ta emocimajo
updated_msg: Emocimajo sucesoze novigesis!
- upload: Adchargez
+ upload: Adkargar
dashboard:
active_users: aktiva uzanti
interactions: interagi
- media_storage: Mediireteneso
+ media_storage: Audvidajkonservo
new_users: nova uzanti
opened_reports: raporti apertesis
pending_appeals_html:
@@ -374,7 +401,7 @@ io:
created_msg: Domenobstrukto nun procedesas
destroyed_msg: Domenobstrukto desagesis
domain: Domeno
- edit: Modifikez domenobstrukto
+ edit: Redaktar domenblokuso
existing_domain_block: Vu ja exekutis plu rigoroza limiti a %{name}.
existing_domain_block_html: Vu ja povis plu rigoroza limiti a %{name}, vu bezonas deobstruktar unesme.
export: Exportez
@@ -391,33 +418,41 @@ io:
no_domain_block_selected: Nula domenobstrukti ne chanjesis por ke nulo selektesis
not_permitted: Vu ne permisesis agar co
obfuscate: Nedicernebligez domennomo
- obfuscate_hint: Partala nedicernebligez domennomo en listo se reklamo di listo di domenlimito aktivigesas
+ obfuscate_hint: Parte celegez domennomo en la listo se reklamago di listo di domenlimito es ebligita
private_comment: Privata komento
private_comment_hint: Komento pri ca domenlimito esas por interna uzo da jereri.
public_comment: Publika komento
- public_comment_hint: Komentez pri ca domenlimito por la publiko, se reklamar listo di domenlimito aktivigesis.
- reject_media: Refusez mediifaili
- reject_media_hint: Efacas lokale retenita mediifaili e refuzas deschargar irgo en futuro. Nerelatata por restrikti
+ public_comment_hint: Komentez pri ca domenlimito por la publiko, se reklamago di listo di domenlimito es ebligita.
+ reject_media: Desaceptar audvidajdosieri
+ reject_media_hint: Forigas lokale konservita audvidajdosieri e desvolas deskargar irgo en la estonteso
reject_reports: Refuzez raporti
reject_reports_hint: Ignorez omna raporti quo venas de ca domeno. Nerelatata por restrikti
undo: Undo
view: Videz domenobstrukto
email_domain_blocks:
- add_new: Insertez novo
+ add_new: Adjuntar novo
+ allow_registrations_with_approval: Permisar registri kun aprobo
attempts_over_week:
one: "%{count} probo de pos 1 week"
other: "%{count} registroprobi de pos 1 week"
+ created_msg: Sucese blokusis retpostodomeno
delete: Efacez
dns:
types:
mx: Rekordo MX
domain: Domeno
new:
- create: Insertez domeno
+ create: Adjuntar domeno
resolve: Rezolvez domeno
+ title: Blokusar nova retpostodomeno
+ no_email_domain_block_selected: Nula retpostodomenblokusi chanjesis pro ke nulo selektesis
not_permitted: Ne permisata
+ resolved_dns_records_hint_html: La domennomo indikas ad la desantea MX-domeni kua chefe aceptas retposto. Zorgemez e ne blokusez ega retpostoprovizanti.
resolved_through_html: Rezolvesis tra %{domain}
+ title: Blokusita retpostodomeni
export_domain_allows:
+ new:
+ title: Importacar domenpermisi
no_file: Nula dosiero selektesas
export_domain_blocks:
import:
@@ -439,6 +474,9 @@ io:
title: Sequez rekomendi
unsuppress: Riganez sequorekomendo
instances:
+ audit_log:
+ title: Lastatempa kontrolnoti
+ view_all: Vidar plena kontrolnoti
availability:
description_html:
one: Se sendar a domeno falias %{count} dio sen sucesar, plusa sendoprobi ne agesos se sendo de la domeno ne ganesas.
@@ -460,7 +498,7 @@ io:
description_html: Vu povas fixar kontenajguidili quo aplikesos a omna konti de ca domeno e irga oli subdomeni.
limited_federation_mode_description_html: Vu povas selektar ka vu permisos federar kun ca domeno.
policies:
- reject_media: Refusez medii
+ reject_media: Desaceptar audvidaji
reject_reports: Refusez raporti
silence: Limito
suspend: Restriktez
@@ -473,7 +511,7 @@ io:
instance_followers_measure: nia sequanti ibe
instance_follows_measure: olia sequanti hike
instance_languages_dimension: Maxim uzata lingui
- instance_media_attachments_measure: retenata mediiatachaji
+ instance_media_attachments_measure: konservita audvidajaddonaji
instance_reports_measure: raporti pri oli
instance_statuses_measure: retenata posti
delivery:
@@ -504,11 +542,11 @@ io:
total_followed_by_them: Sequesis da oli
total_followed_by_us: Sequesis da ni
total_reported: Raporti pri oli
- total_storage: Mediiatachaji
+ total_storage: Audvidajaddonaji
totals_time_period_hint_html: Sumi quo montresas sube inkluzas informi de pos la komenco.
unknown_instance: Prezente ne esas registrago pri ta domeno che ca servilo.
invites:
- deactivate_all: Deaktivigez omno
+ deactivate_all: Desebligar omno
filter:
all: Omna
available: Disponebla
@@ -517,7 +555,7 @@ io:
title: Inviti
ip_blocks:
add_new: Kreez regulo
- created_msg: Sucesoze insertis nova regulo di IP
+ created_msg: Sucese adjuntis nova IP-regulo
delete: Efacez
expires_in:
'1209600': 2 semani
@@ -533,19 +571,19 @@ io:
relationships:
title: "%{acct} relatesi"
relays:
- add_new: Insertez nova relayo
+ add_new: Adjuntar nova relayo
delete: Efacez
- description_html: "Federatrelayo esas mediatajservilo quo interchanjas multa publika posti inter servili quo abonas e publikigas ibe. Ol povas helpar mikra e mezgranda servili deskovrar kontenajo de fediverso, quale ne bezonas lokala uzanti manuale sequar altra personi en nelokala servili."
- disable: Desaktivigez
- disabled: Desaktivigita
- enable: Aktivigez
- enable_hint: Pos aktivigesar, vua servilo abonos omna publika posti de ca relayo, e komencos sendar publika posti di ca servilo a ol.
- enabled: Aktivigita
+ description_html: "Fratarrelayo es intermedia servilo qua interchanjas multa publika afishi inter servili qua abonas e publikigas ibe."
+ disable: Desebligar
+ disabled: Desebligita
+ enable: Ebligar
+ enable_hint: Pos ebligita, vua servilo abonos omna publika afishi de ca relayo, e komencos sendar publika afishi di ca servilo ad ol.
+ enabled: Ebligita
inbox_url: URL di relayo
pending: Vartas aprobo di relayo
- save_and_enable: Sparez e aktivigez
+ save_and_enable: Konservar e ebligar
setup: Facez relayokonekto
- signatures_not_enabled: Relayi ne korekta funcionos dum ke sekurmodo o limigita federatmodo aktivigesis
+ signatures_not_enabled: Relayi eble ne korekta funcionos dum ke sekurmodo o limigita fratarmodo es ebligita
status: Stando
title: Relayi
report_notes:
@@ -560,13 +598,18 @@ io:
action_taken_by: Agesis da
actions:
delete_description_html: Raportizita posti efacesos e streko rekordigesos por helpar vu intensigar en nexta malagi da la sama konto.
- mark_as_sensitive_description_html: Medii en raportizita posti markizesos quale sentoza e streko rekordigesos por helpar vu intensigar en nexta malagi da la sama konto.
- other_description_html: Videz plu multa opcioni por dominacar konduto di konto e kustumizar komuniko a raportizita konto.
+ mark_as_sensitive_description_html: Audvidaji en raportita afishi markesos quale trublema e streko rekordesos por helpar vu intensigar en posa malagi da la sama konto.
+ other_description_html: Videz plu multa preferaji por regularar konduto di konto e personesigar komuniko ad raportita konto.
resolve_description_html: Nulo agesos kontre raportizita konto, streko ne rekordizesos e raporto klozesos.
silence_description_html: Konto esos videbla nur por personi qui ja sequas lo o manuale serchas lo, severe limitizante lua atingo. On sempre povas desfacar co. Klozas omna raporti kontra ca konto.
suspend_description_html: Ca konto e omna kontenaji esos neacesebla e efacota, e interagar kun ol esos neposibla. Desfacebla dum 30 dii. Klozas omna raporti kontra ca konto.
+ actions_description_html: Decidez quala ago por traktar ca raporto.
actions_description_remote_html: Selektez quo vu agos por solvar ca raporto. Co nur efektigos quale vua servilo komunikas kun ca fora konto e traktas lua kontenaji.
- add_to_report: Insertez pluse a raporto
+ actions_no_posts: Ca raporto ne havas irga relatita afishi por forigar
+ add_to_report: Adjuntar plu ad raporto
+ already_suspended_badges:
+ local: Ja blokusita sur ca servilo
+ remote: Ja blokusita sur lua servilo
are_you_sure: Ka vu esas certa?
assign_to_self: Taskigez me
assigned: Taskigita jerero
@@ -589,7 +632,7 @@ io:
mark_as_unresolved: Markizez quale nerezolvita
no_one_assigned: Nulu
notes:
- create: Insertez noto
+ create: Adjuntar noto
create_and_resolve: Rezolvez per noto
create_and_unresolve: Riapertez per noto
delete: Efacez
@@ -603,6 +646,7 @@ io:
report: 'Raporto #%{id}'
reported_account: Raportizita konto
reported_by: Raportizesis da
+ reported_with_application: Raportesis per apliko
resolved: Rezolvesis
resolved_msg: Raporto sucesoze rezolvesis!
skip_to_actions: Saltez a agi
@@ -625,6 +669,7 @@ io:
delete_data_html: Efacor la profilo e kontenaji di @%{acct} ye 30 dii de nun ecepte ke lu esus desrestrikita ante ta tempe
preview_preamble_html: "@%{acct} recevos averto kun la sequanta kontenajo:"
record_strike_html: Registrar punto kontra @%{acct} por helpar vu traktar futura reguloviolaci di ca konto
+ send_email_html: Sendar ad @%{acct} avertretposton
warning_placeholder: Neobligata plusa expliko por la jero-ago.
target_origin: Fonto di raportizita konto
title: Raporti
@@ -634,18 +679,19 @@ io:
updated_at: Novigesis
view_profile: Videz profilo
roles:
- add_new: Insertez rolo
+ add_new: Adjuntar rolo
assigned_users:
one: "%{count} uzanto"
other: "%{count} uzanti"
categories:
administration: Administro
+ devops: Developisto
invites: Inviti
moderation: Jero
special: Specala
delete: Efacez
description_html: Per uzantoroli, vu povas kustumizar funciono e siti di Mastodon quon vua uzanti povas uzar.
- edit: Modifikez rolo di '%{name}'
+ edit: Redaktar rolo di '%{name}'
everyone: Originala permisi
everyone_full_description_html: Co esas bazrolo quo efektigas omna uzanti, mem personi sen rolo. Omna altra roli ganas sama permisi de ol.
permissions_count:
@@ -663,23 +709,25 @@ io:
manage_appeals: Jerez apeli
manage_appeals_description: Permisez uzanti kontrolar apeli kontra jero
manage_blocks: Jerez obstrukti
+ manage_blocks_description: Permisar uzanti blokusar retpostoservili e IP-adresi
manage_custom_emojis: Jerez kustumizita emocimaji
manage_custom_emojis_description: Permisez uzanti jerar kustumizita emocimaji en la servilo
manage_federation: Jerez federo
manage_federation_description: Permisez uzanti obstruktar o permisez federo kun altra domeni, e dominacar sendebleso
manage_invites: Jerez inviti
- manage_invites_description: Permisez uzanti vidar e desaktivigar invitligili
+ manage_invites_description: Permisez uzanti vidar e desebligar invitligili
manage_reports: Jerez raporti
manage_reports_description: Permisez uzanti kontrolar raporti e jerez kontra oli
manage_roles: Jerez roli
manage_roles_description: Permisez uzanti jerar e ajustar plu basa roli di olia
manage_rules: Jerez reguli
manage_rules_description: Permisez uzanti chanjar servilreguli
- manage_settings: Jerez opcioni
- manage_settings_description: Permisez uzanti chanjar sitopcioni
+ manage_settings: Administrar preferaji
+ manage_settings_description: Permisez uzanti chanjar reteypreferaji
manage_taxonomies: Jerez nomkategorii
- manage_taxonomies_description: Permisez uzanti kontrolar tendencoza kontenajo e novigar hashtagopcioni
+ manage_taxonomies_description: Permisez uzanti kontrolar populareska enhavajo e tildatigar gretvortpreferaji
manage_user_access: Jerez uzantoeniro
+ manage_user_access_description: Permisar uzanti desebligar dufaktoryurizo di altra uzanti, chanjar retpostoadresi e richanjar pasvorto
manage_users: Jerez uzanti
manage_users_description: Permisez uzanti vidar detali di altra uzanti e jerar kontra oli
manage_webhooks: Jerez interrethoki
@@ -687,14 +735,15 @@ io:
view_audit_log: Videz kontrollogo
view_audit_log_description: Permisez uzanti vidar historio di administrala agi en la servilo
view_dashboard: Videz chefpanelo
- view_dashboard_description: Permisez uzanti uzar chefpanelo e diversa opcioni
+ view_dashboard_description: Permisez uzanti uzar chefpanelo e diversa mezuri
+ view_devops: Developisto
view_devops_description: Permisez uzanti uzar chefpaneli Sidekiq e pgHero
title: Roli
rules:
- add_new: Insertez regulo
+ add_new: Adjuntar regulo
delete: Efacez
description_html: Quankam maxim multa personi asertar ke lu ja lektis e konsentis serveskondicioni, frequente personi ne komplete lektas til problemo eventas. Faciligez on vidar vua reguli di servilo kurte per pozar puntostrukturlisto. Lasez singla reguli esar kurta e simpla, ma ne fendez a multa separata kozi anke.
- edit: Modifikez regulo
+ edit: Redaktar regulo
empty: Nula servilreguli fixesis til nun.
title: Servilreguli
settings:
@@ -710,9 +759,11 @@ io:
preamble: Fabrikmarko di ca servilo diferentigas lu de altra servili en la reto. Ca informi forsan montresas che diversa loki. Do, ca informi debas esar klara.
title: Fabrikmarkeso
captcha_enabled:
+ desc_html: Co dependas externa skripti de hCaptcha kua eble es sekureso e privatesdesquieto. Do, uzez alternativa metodi tala aprobala o invitala registro.
title: Postular ke nova uzanti solvos CAPTCHA por konfirmar lia konti
content_retention:
- preamble: Dominacez quale uzantigita kontenajo retenesar en Mastodon.
+ danger_zone: Danjerzono
+ preamble: Selektar quale uzantigita kontenajo retenesar en Mastodon.
title: Kontenajreteneso
default_noindex:
desc_html: Efektigas omna uzanti qui ne personale chanjis ca opciono
@@ -720,17 +771,18 @@ io:
discovery:
follow_recommendations: Sequez rekomendaji
preamble: Montrar interesanta kontenajo esas importanta ye voligar nova uzanti quo forsan ne savas irgu. Dominacez quale ca deskovrotraiti funcionar en ca servilo.
- profile_directory: Profilcheflisto
+ profile_directory: Profiluyo
public_timelines: Publika tempolinei
publish_discovered_servers: Publikar deskovrita servili
publish_statistics: Publikar statistiki
title: Deskovro
- trends: Tendenci
+ trends: Populari
domain_blocks:
all: A omnu
disabled: A nulu
users: A enirinta lokala uzanti
registrations:
+ moderation_recommandation: Certez ke vu havas sata e reaktiva jergrupo ante vu desklozar registri ad omnu!
preamble: Dominacez qua povas krear konto en ca servilo.
title: Registragi
registrations_mode:
@@ -738,6 +790,7 @@ io:
approved: Aprobo bezonesas por registro
none: Nulu povas registrar
open: Irgu povas registrar
+ warning_hint: Ni rekomendas uzar "Aprobo bezonita por registro" se vu ne kunfidas ke vua jergrupo povas traktar spamo e mala registri bontempe.
security:
authorized_fetch: Postular autentikigo de federata servili
authorized_fetch_hint: Postular autentikigo de federata servili kapabligar plu strikta enforcigo dil blokusi di uzanti e dil servilo. Tamen, co enduktos exekutado-lentigo, diminutos la atingebleso di via respondi, e forsan enduktos koncilieblesoproblemi kun kelka softwari federata. Pluse, co ne preventos aganti dedikita de acesar vua publika posti e konti.
@@ -745,10 +798,11 @@ io:
federation_authentication: Enforcigo di federado-autentikigo
title: Servilopcioni
site_uploads:
- delete: Efacez adchargita failo
- destroyed_msg: Sitadchargito sucesoze efacesis!
+ delete: Forigar adkargita dosiero
+ destroyed_msg: Reteyadkargo sucese forigesis!
software_updates:
critical_update: Urjanta — voluntez aktualigar rapide
+ description: On rekomendesis lasar Mastodon-instalo esar tildatigita por bone ganar maxim nova repari e traiti. Do, Mastodon kontrolas tildatigi ye singla 30 minuti, e savigos vu segun vua retpostosavigpreferi.
documentation_link: Lernez pluse
release_notes: Emiso-noti
title: Aktualigi disponebla
@@ -772,7 +826,7 @@ io:
in_reply_to: Respondante a
language: Linguo
media:
- title: Medii
+ title: Audvidaji
metadata: Metadatumi
no_status_selected: Nula posti chanjesis pro ke nulo selektesis
open: Apertez posto
@@ -782,7 +836,7 @@ io:
title: Kontoposti
trending: Populara
visibility: Videbleso
- with_media: Kun medii
+ with_media: Kun audvidaji
strikes:
actions:
delete_statuses: "%{name} efacis posti di %{target}"
@@ -798,12 +852,20 @@ io:
system_checks:
database_schema_check:
message_html: Existas vartanta datamaturmigri. Startez por certigar ke la softwaro kondutar quale expektita
+ elasticsearch_health_red:
+ message_html: Elastiksercharo es nekapabla, serchtraiti es nedisponebla
+ elasticsearch_health_yellow:
+ message_html: Elastiksercharo es nekapabla, vu darfas volar inquestar la motivo
elasticsearch_preset:
action: Videz la dokumentajo
+ message_html: Vua elastiksercharo havas plu kam un nodo, ma Mastodon ne povas uzar ili.
elasticsearch_preset_single_node:
action: Videz la dokumentajo
+ message_html: Vua elastiksercharo havas nur un nodo, ES_PRESET devas fixesesar ad single_node_cluster.
+ elasticsearch_reset_chewy:
+ message_html: Vua elastikserchsistemindexo esas destildatigita pro preferajchanjo.
elasticsearch_running_check:
- message_html: Ne povas konektas a Elasticsearch. Kontrolez ke ol functionas o desaktivigez textokompleta trovo
+ message_html: Ne povas konektas ad Elasticsearch.
elasticsearch_version_check:
message_html: 'Nekonciliebla versiono di Elasticsearch: %{value}'
version_comparison: Elasticsearch %{running_version} funcionas ma %{required_version} bezonesas
@@ -811,7 +873,10 @@ io:
action: Jerez servilreguli
message_html: Vu ne fixis irga servilreguli.
sidekiq_process_check:
- message_html: Sidekiq procedo ne funcionas ye %{value} fask(o). Kontrolez vua opciono di Sidekiq
+ message_html: Sidekiq procedo ne funcionas ye %{value} fask(o)
+ software_version_check:
+ action: Vidar disponebla tildatigi
+ message_html: Mastodon-tildatigo es disponebla.
software_version_critical_check:
action: Videz la aktualigi disponebla
message_html: Urjanta Mastodon-aktualigo es disponebla, voluntez aktualigar la servilo tam rapide kam es posibla.
@@ -825,16 +890,39 @@ io:
action: Konsultez hike por plu multa informo
message_html: "Vua dosierokonservo es misfigurizita. La privateso di vua uzanti es domajebla."
tags:
+ moderation:
+ not_trendable: Ne popularebla
+ not_usable: Ne uzebla
+ pending_review: Vartas kontrolo
+ review_requested: Kontrolo demandesis
+ reviewed: Kontrolesis
+ title: Stando
+ trendable: Popularebla
+ unreviewed: Nekontrolesis
+ usable: Neuzebla
+ name: Nomo
+ newest: Maxim nova
+ oldest: Maxim desnova
+ open: Vidar publike
+ reset: Richanjar
review: Kontrolez stando
- updated_msg: Hashtagopcioni novigesis sucesoze
+ search: Serchar
+ title: Gretvorti
+ updated_msg: Gretvortpreferaji tildatigesis sucese
title: Administro
trends:
allow: Permisez
approved: Aprobesis
+ confirm_allow: Ka vu es certa ke vu volas permisar selektita etiketi?
+ confirm_disallow: Ka vu es certa ke vu volas despermisar selektita etiketi?
disallow: Despermisez
links:
allow: Permisez ligilo
allow_provider: Permisez publikiganto
+ confirm_allow: Ka vu es certa ke vu volas permisar selektita ligili?
+ confirm_allow_provider: Ka vu es certa ke vu volas permisar selektita provizanti?
+ confirm_disallow: Ka vu es certa ke vu volas despermisar selektita ligili?
+ confirm_disallow_provider: Ka vu es certa ke vu volas despermisar selektita provizanti?
description_html: Co esas ligili quo nun multe partigesas da konti kun posti quon vua servilo vidas. Ol povas helpar vua uzanti lernar quo eventas en mondo. Ligili ne publike montresas til vu aprobar publikiganto. Vu povas anke permisar o refuzar individuala ligili.
disallow: Despermisez ligilo
disallow_provider: Despermisez publikiganto
@@ -844,29 +932,33 @@ io:
shared_by_over_week:
one: Partigesis da 1 persono de pos antea semano
other: Partigesis da %{count} personi de pos antea semano
- title: Tendencoza ligili
+ title: Populara ligili
usage_comparison: Partigesis %{today} foyi hodie, la nombro esas %{yesterday} hiere
not_allowed_to_trend: Ne permisita quale popularo
only_allowed: Nur permisato
pending_review: Vartas kontrolo
preview_card_providers:
- allowed: Ligili de ca publikiganto povas divenar tendenco
- description_html: Co esas domen quo havas ligili quo frequente partigesas en vua servilo. Ligili ne divenas tendenco publike se domeno di ligilo ne aprobesas. Vua aprobo (o refuzo) anke esas por subdomeni.
- rejected: Ligili de ca publikiganto ne divenos tendenco
+ allowed: Ligili de ca publikiganto povas populareskar
+ description_html: Co esas domeni quo havas ligili qua ofte kunhavigesis che vua servilo. Vua aprobo anke esas por domeneti.
+ rejected: Ligili de ca publikiganto ne populareskos
title: Publikiganti
rejected: Refuzesis
statuses:
allow: Permisez posto
allow_account: Permisez skribanto
- description_html: Co esas posti quon vua servilo savas quale nun partigesas e favorizesas multe nun. Ol povas helpar vua nova e retrovenanta uzanti trovar plu multa personi por sequar. Posti ne publike montresas til vu aprobar la skribanto, e la skribanto permisas sua konto sugestesas a altra personi. Vu povas anke permisar o refuzar individuala posti.
+ confirm_allow: Ka vu es certa ke vu volas permisar selektita standi?
+ confirm_allow_account: Ka vu es certa ke vu volas permisar selektita konti?
+ confirm_disallow: Ka vu es certa ke vu volas despermisar selektita standi?
+ confirm_disallow_account: Ka vu es certa ke vu volas despermisar selektita konti?
+ description_html: Co esas afishi quan vua servilo savas e nun partigesis e stelumesis multe nun. Afishi ne publike montresas til vu aprobar la verkanto, e la verkanto permisas lua konto sugestesas ad altra personi.
disallow: Despermisez posto
disallow_account: Despermisez skribanto
- no_status_selected: Nula tendencoza posti chanjesis pro ke nulo selektesis
+ no_status_selected: Nula populara afishi chanjesis pro ke nulo selektesis
not_discoverable: Skribanto ne konsentis pri esar deskovrebla
shared_by:
- one: Partigesis o favorizesis 1 foye
- other: Partigesis o favorizesis %{friendly_count} foye
- title: Tendencoza posti
+ one: Partigesis o stelumesis unfoye
+ other: Partigesis o stelumesis %{friendly_count} foye
+ title: Populara afishi
tags:
current_score: Nuna punto esas %{score}
dashboard:
@@ -879,36 +971,38 @@ io:
listable: Povas sugestesar
no_tag_selected: Nula tagi chanjesis pro ke nulo selektesis
not_listable: Ne sugestesar
- not_trendable: Ne aparas che tendenci
+ not_trendable: Ne aparos en populari
not_usable: Ne povas uzesar
peaked_on_and_decaying: Maxim uzita ye %{date}, nun diminutesas
- title: Tendencoza hashtagi
- trendable: Povas aparar che tendenci
- trending_rank: 'Tendencorango #%{rank}'
+ title: Populara gretvorti
+ trendable: Povas aparar en populari
+ trending_rank: 'Popularo #%{rank}'
usable: Povas uzesar
usage_comparison: Uzesis %{today} foyi hodie, la nombro esas %{yesterday} hiere
used_by_over_week:
one: Uzesis da 1 persono de pos 1 semano
other: Uzesis da %{count} personi de pos 1 semano
- trending: Tendenco
+ title: Rekomenditi & populari
+ trending: Populara
warning_presets:
- add_new: Insertez novo
+ add_new: Adjuntar novo
delete: Efacez
- edit_preset: Modifikez avertfixito
+ edit_preset: Redaktar avertdecido
empty: Vu ne fixis irga avertfixito til nun.
+ title: Avertpreferaji
webhooks:
- add_new: Insertez finpunto
+ add_new: Adjuntar finpunto
delete: Efacez
description_html: "Rethoko povigas Mastodon sendar samtempoavizi pri selektita eventi a vua sua apliko, por ke vua apliko povas automate kauzigar reakti."
- disable: Desaktivigez
- disabled: Desaktivigita
- edit: Modifikez finpunto
+ disable: Desebligar
+ disabled: Desebligita
+ edit: Redaktar finpunto
empty: Vu ne havas irga ajustita finpunti ankore.
- enable: Aktivigez
+ enable: Ebligar
enabled: Aktiva
enabled_events:
- one: 1 aktivigita evento
- other: "%{count} aktivigita eventi"
+ one: 1 ebligita evento
+ other: "%{count} ebligita eventi"
events: Eventi
new: Nova rethoko
rotate_secret: Rotacigez sekreto
@@ -917,6 +1011,8 @@ io:
title: Rethoki
webhook: Rethok
admin_mailer:
+ auto_close_registrations:
+ subject: Registri di %{instance} automate chanjesis ad bezonar aprobo
new_appeal:
actions:
delete_statuses: efacos ola posti
@@ -945,12 +1041,12 @@ io:
new_trends:
body: 'Ca kozi bezonas kontrol ante ol povas montresar publike:'
new_trending_links:
- title: Tendencoza ligili
+ title: Populara ligili
new_trending_statuses:
- title: Tendencoza posti
+ title: Populara afishi
new_trending_tags:
- title: Tendencoza hashtagi
- subject: Nova tendenci bezonas kontrolesar che %{instance}
+ title: Populara gretvorti
+ subject: Nova populari bezonas kontrolo sur %{instance}
aliases:
add_new: Kreez alternativa nomo
created_msg: Sucesoze kreis nova alternativa nomo. Vu povas nun komencar transfero de la olda konto.
@@ -959,9 +1055,9 @@ io:
hint_html: Se vu volas transferesar de altra konto a co, hike vu povas krear alternativnomo, quo bezonesas ante vu povas durigar transferar sequanti de la olda konto a co. Ca ago esas nedanjeroza e inversigebla. Kontomigro komencesas de la olda konto.
remove: Deligez alternative nomo
appearance:
- advanced_web_interface: Avancata retintervizajo
- advanced_web_interface_hint: 'Se vu volas uzar tota skrenlongeso, avancata retintervizajo povigas vu modifikar multa diferanta kolumni por vida multa informi en sama tempo quon vu volas: Hemo, avizi, federatata tempolineo, multa listi e hashtagi.'
- animations_and_accessibility: Animacii e aceseso
+ advanced_web_interface: Altnivela retintervizajo
+ advanced_web_interface_hint: 'Se vu volas uzar tota skrenlongeso, altnivela retintervizajo povigas vu modifikar multa dessama kolumni por vida multa informi en sama tempo quale vu volas: Hemo, savigi, fratara tempolineo, multa listi e gretvorti.'
+ animations_and_accessibility: Animi e adirebleso
confirmation_dialogs: Konfirmdialogi
discovery: Deskovro
localization:
@@ -970,7 +1066,9 @@ io:
guide_link_text: Omnu povas kontributar.
sensitive_content: Sentoza kontenajo
application_mailer:
+ notification_preferences: Chanjar retpostopreferaji
salutation: "%{name},"
+ settings: 'Chanjar retpostopreferaji: %{link}'
unsubscribe: Desabonez
view: 'Vidar:'
view_profile: Videz profilo
@@ -997,17 +1095,18 @@ io:
redirect_to_app_html: Vu devas sendesir al apliko %{app_name}. Se to ne evenis, probez %{clicking_this_link} o retroirez manuale al apliko.
registration_complete: Vua registrago che %{domain} nun es kompleta!
welcome_title: Bonvenez, %{name}!
+ wrong_email_hint: Se ta retpostoadreso ne es korekta, vu povas chanjar lu en la kontopreferaji.
delete_account: Efacez konto
delete_account_html: Se vu volas efacar vua konto, vu povas irar hike. Vu demandesos konfirmar.
description:
- prefix_invited_by_user: "@%{name} invitas vu juntar ca servilo di Mastodon!"
+ prefix_invited_by_user: "@%{name} invitas vu adeskar ca servilo di Mastodon!"
prefix_sign_up: Registrez che Mastodon hodie!
- suffix: Per konto, vu povos sequar personi, postigar novaji e interchanjar mesaji kun uzanti de irga servilo di Mastodon e pluse!
+ suffix: Per konto, vu povos sequar personi, postigar novaji e interchanjar mesaji kun uzanti de irga servilo di Mastodon e plu multo!
didnt_get_confirmation: Ka vu ne recevis konfirmoligilo?
dont_have_your_security_key: Ka vu ne havas sekuresklefo?
forgot_password: Pasvorto obliviita?
invalid_reset_password_token: Pasvorto richanjoficho esas nevalida o expirita. Demandez novo.
- link_to_otp: Insertez 2-faktorkodexo de vua fono o rigankodexo
+ link_to_otp: Insertez dufaktora kodexo de vua telefonilo o rigankodexo
link_to_webauth: Uzez vua sekuresklefaparato
log_in_with: Enirez per
login: Enirar
@@ -1017,6 +1116,7 @@ io:
or_log_in_with: O eniras per
privacy_policy_agreement_html: Me lektis e konsentis privatesguidilo
progress:
+ confirm: Konfirmar retpostoadreso
details: Vua detali
review: Nia revuo
rules: Aceptar reguli
@@ -1038,8 +1138,10 @@ io:
security: Chanjar pasvorto
set_new_password: Selektar nova pasvorto
setup:
+ email_below_hint_html: Kontrolez vua spamdosieruyo, o demandez altra ligilo.
email_settings_hint_html: Uzez la ligilo quan ni sendis a vu por verifikar %{email}. Ni vartos hike.
link_not_received: Ka vu ne recevis ligilo?
+ new_confirmation_instructions_sent: Vu recevos nova retposto kun la konfirmligilo pos kelka minuti!
title: Kontrolez vua retposti
sign_in:
preamble_html: Enirez per vua %{domain} detali. Se vua konto esas che altra servilo, vu ne povos enirar hike.
@@ -1050,12 +1152,22 @@ io:
title: Ni komencigez vu en %{domain}.
status:
account_status: Kontostando
+ confirming: Vartas retpostokonfirmo esar kompleta.
functional: Vua konto esas tote funcionoza.
+ pending: Vua apliko bezonas kontrolo da nia laborero. Vu ganos retposto se vua apliko aprobesis.
redirecting_to: Vua konto esas neaktiva pro ke ol nun ridirektesos a %{acct}.
self_destruct: Pro ke %{domain} balde klozos, vu havas nur aceso limitizata a vua konto.
view_strikes: Videz antea streki kontre vua konto
too_fast: Formulario sendesis tro rapide, probez itere.
use_security_key: Uzes sekuresklefo
+ author_attribution:
+ example_title: Exemplotexto
+ hint_html: Ka vu skribas novaji o blogartikli ne en Mastodon?
+ instructions: 'Certigez ke ca kodexo es en HTML di vua artiklo:'
+ more_from_html: Plu de %{name}
+ s_blog: Blogo di %{name}
+ then_instructions: Pose, adjuntez la domennomo di publikigo en la dessupra spaco.
+ title: Verkantoagnosko
challenge:
confirm: Avancez
hint_html: "Guidilo: Ni ne demandos vua pasvorto itere til 1 horo."
@@ -1083,7 +1195,7 @@ io:
x_months: "%{count}mo"
x_seconds: "%{count}s"
deletes:
- challenge_not_passed: Informo quon vu insertis ne esas korekta
+ challenge_not_passed: Informo quan vu insertis es nekorekta
confirm_password: Insertez nuna pasvorto por verifikar vua identeso
confirm_username: Insertez vua uzantonomo por konfirmar procedo
proceed: Efacez konto
@@ -1128,6 +1240,7 @@ io:
your_appeal_rejected: Vua apelo refuzesis
edit_profile:
basic_information: Fundamentala informo
+ hint_html: "Personesigez quon personi vidas sur vua publika profilo e apud vua afishi.."
other: Altra
errors:
'400': Demando quon vu sendis esas nevalida o malstrukturala.
@@ -1143,27 +1256,26 @@ io:
content: Regreto, ma evas nefuncionas che nia latero.
title: Ca pagino ne esas korekta
'503': La pagino ne povas montresas pro tempala servilfalio.
- noscript_html: Por uzar retsoftwaro di Mastodon, aktivigez JavaScript. Alternative, probez 1 de konciliebla softwari por Mastodon por vua platformo.
existing_username_validator:
not_found: ne povas trovar lokala uzanti kun ta uzantonomo
not_found_multiple: ne povas trovar %{usernames}
exports:
archive_takeout:
date: Dato
- download: Deschargez vua arkivo
- hint_html: Vu povas demandar arkivo di vua posti e adchargita medii. Exportacita informi esos kun ActivityPub format, e lektebla da irga konciliebla softwaro. Vu povas demandar arkivo pos singla 7 dii.
+ download: Deskargar vua arkivo
+ hint_html: Vu povas demandar arkivo di vua afishi e adkargita audvidaji. Vu povas demandar arkivo pos singla 7 dii.
in_progress: Kompilar vua arkivo...
request: Demandez vua arkivo
size: Grandeso
blocks: Tu blokusas
- bookmarks: Libromarki
+ bookmarks: Lektosigni
csv: CSV
domain_blocks: Domenobstrukti
lists: Listi
mutes: Vu silencigesas
- storage: Konservado di kontenajo
+ storage: Audvidajkonservo
featured_tags:
- add_new: Insertez novo
+ add_new: Adjuntar novo
errors:
limit: Vu ja pinglizis la maxima nombro de hastagi
hint_html: "Quo esas estelita hashtagi? Ol montresas eminente che vua publika profilo e povigas personi vidar vua publika posti partikulare kun ta hashtagi. Oli esas bona utensilo por jeretar kreiva agaji e longa projetaji."
@@ -1175,11 +1287,11 @@ io:
public: Publika tempolinei
thread: Konversi
edit:
- add_keyword: Insertez klefvorto
+ add_keyword: Adjuntar klefvorto
keywords: Klefvorti
statuses: Individuala posti
statuses_hint_html: Ca filtrilo aplikesas a selektita posti ne segun kad oli parigesas kun basa klefvorti. Kontrolez o efacez posti de la filtrilo.
- title: Modifikez filtrilo
+ title: Redaktar filtrilo
errors:
deprecated_api_multiple_keywords: Ca parametri ne povas chanjesar per ca softwaro pro quo oli efektigas plu kam 1 filtrilklefvorto. Uzez plu recenta softwaro o interretintervizajo.
invalid_context: Nula o nevalida kuntexto donesis
@@ -1201,7 +1313,7 @@ io:
title: Filtrili
new:
save: Salvez nova filtrilo
- title: Insertez nova filtrilo
+ title: Adjuntar nova filtrilo
statuses:
back_to_filter: Retrovenez a filtrilo
batch:
@@ -1244,7 +1356,7 @@ io:
mismatched_types_warning: Semblas ke vu forsan selektis la nekorekta tipo por ca importaco, voluntez kontrolar itere.
modes:
merge: Kombinez
- merge_long: Retenez displonebla rekordi e insertez novi
+ merge_long: Konservar existanta rekordi e adjuntar novi
overwrite: Remplasez
overwrite_long: Remplasez nuna rekordi per novi
overwrite_preambles:
@@ -1269,7 +1381,7 @@ io:
scheduled: Projetita
unconfirmed: Nekonfirmata
status: Stando
- success: Tua datumi esis senprobleme importacita ed esos traktita quale projetita
+ success: Vua datumi es senprobleme adkargita e esos traktita balde
time_started: Komencita ye
titles:
blocking: Importacante konti blokusata
@@ -1284,14 +1396,14 @@ io:
destructive: Blokusati e silencigati
types:
blocking: Listo de blokusiti
- bookmarks: Libromarki
+ bookmarks: Lektosigni
domain_blocking: Domenobstruktolisto
following: Listo de sequati
lists: Listi
muting: Silenciglisto
- upload: Kargar
+ upload: Adkargar
invites:
- delete: Deaktivigez
+ delete: Desebligar
expired: Expiris
expires_in:
'1800': 30 minuti
@@ -1333,13 +1445,14 @@ io:
title: Desabonez
media_attachments:
validations:
- images_and_video: Ne povas atachar video a posto quo ja kontenar imaji
- not_ready: Ne povas faili quo ankore procedigesas. Probez itere pose!
- too_many: Ne povas atachar plu kam 4 faili
+ images_and_video: Ne povas addonar video ad afisho qua ja enhavas imaji
+ not_found: Audvidaji %{ids} es ne trovesis o ja addonesis ad altra afisho
+ not_ready: Ne povas addonar dosieri qua ankore ne finigas procedar.
+ too_many: Ne povas addonar plu kam 4 dosieri
migrations:
acct: Transferesis a
cancel: Anulez ridirekto
- cancel_explanation: Anular ridirekto riaktivigos vua nuna konto, ma ne riganos sequanti quo transferesis a ta konto.
+ cancel_explanation: Nuligar ridirekto riaktivigos vua nuna konto, ma ne riganos sequanti qua movigesis ad ta konto.
cancelled_msg: Sucesoze anulis ridirekto.
errors:
already_moved: esas sama transferkonto
@@ -1362,7 +1475,7 @@ io:
backreference_required: Nova konto mustas unesme ajustesar por dopreferar co
before: 'Ante durar, lektez ca noti sorgeme:'
cooldown: Pos transferesar, existas varttempo kande vu ne povas transferesar itere
- disabled_account: Vua nuna konto ne divenos tote uzebla pose. Tamen, vu povas acesar informexportaco e anke riaktivigo.
+ disabled_account: Vua nuna konto ne esos tote uzebla pose.
followers: Ca ago transferos omna sequanti de nuna konto a nova konto
only_redirect_html: Alternative, vu povas nur pozar ridirekto che vua profilo.
other_data: Altra informi ne transferesos automate
@@ -1400,7 +1513,7 @@ io:
subject: "%{name} mencionis tu"
title: Nova menciono
poll:
- subject: Votposto di %{name} finis
+ subject: Votinquesto da %{name} fineskis
reblog:
body: "%{name} repetis vua posto:"
subject: "%{name} repetis vua posto"
@@ -1408,7 +1521,7 @@ io:
status:
subject: "%{name} nove postigis"
update:
- subject: "%{name} modifikis posto"
+ subject: "%{name} redaktis afisho"
notifications:
email_events_hint: 'Selektez eventi quon vu volas ganar avizi:'
number:
@@ -1422,13 +1535,13 @@ io:
thousand: K
trillion: T
otp_authentication:
- code_hint: Insertez kodexo quo facesis da vua yurizsoftwaro por konfirmar
- description_html: Se vu aktivigas 2-faktoryurizo per yurizsoftwaro, eniro bezonos vu havar vua smartfono, quale facas fichi por vu por enirar.
- enable: Aktivigez
- instructions_html: "Skanez ca QR-kodexo a Google Authenticator o simila TOTP-softwaro en vua smartfono. Pos co, ta softwaro facos fichi quon vu bezonos insertar kande enirar."
+ code_hint: Insertez kodexo qua igesis da vua yurizaplikajo por konfirmar
+ description_html: Se vu ebligas dufaktora yurizo per yurizaplikajo, eniro bezonos vu havar vua telefonilo, quo igos fichi por vu enirar.
+ enable: Ebligar
+ instructions_html: "Skanez ca QR-kodexo ad Google Authenticator o simila TOTP-aplikajo per vua telefonilo."
manual_instructions: 'Se vu ne povas skanar QR-kodexo e bezonas insertar manuala, subo esas textosekreto:'
setup: Facez
- wrong_code: Insertita kodexo esas nevalida! Ka serviltempo e aparattempo esas korekta?
+ wrong_code: Insertita kodexo es nevalida!
pagination:
newer: Nova
next: Sequanta
@@ -1437,24 +1550,28 @@ io:
truncate: "…"
polls:
errors:
- already_voted: Vu ja votis che ca votposto
- duplicate_options: havas duplikatkozi
- duration_too_long: esas tro distanta en futuro
+ already_voted: Vu ja votis sur ca votinquesto
+ duplicate_options: enhavas duopliga aji
+ duration_too_long: esas tro desproxima en la estonteso
duration_too_short: es tro balde
- expired: Votposto ja finis
+ expired: La votinquesto ja fineskis
invalid_choice: Selektita votselektajo ne existas
- over_character_limit: ne povas esar plu longa kam %{max} literi por sing
+ over_character_limit: ne povas esar plu longa kam %{max} literi por singlo
self_vote: On ne povas votar en sua propra inquesti
- too_few_options: mustas havar kozi
- too_many_options: ne povas havar plu kam %{max} kozi
+ too_few_options: mustas havar plu kam un ajo
+ too_many_options: ne povas enhavar plu kam %{max} aji
preferences:
other: Altra
- posting_defaults: Originala postoopcioni
+ posting_defaults: Originala afishago
public_timelines: Publika tempolinei
privacy:
+ hint_html: "Personesigez quale vu volas vua profilo e vua afishi trovesis. Instante kontrolez ca preferaji por certigar ke ili aptas segun vu."
privacy: Privateso
+ privacy_hint_html: Selektar quale vu volas montrar por altra personi.
reach: Atingo
+ reach_hint_html: Selektar ka vu volas deskovresar e sequesar da nova personi. Ka vu volas altra personi vidar vu en ilia sequrekomendi?
search: Sercho
+ search_hint_html: Selektar quale vu volas trovesar. Ka vu volas personi ne ek Mastodon trovar vua profilo kande serchar la interreto?
title: Privateso e atingo
privacy_policy:
title: Privatesguidilo
@@ -1547,7 +1664,7 @@ io:
view_authentication_history: Videz yurizeshistorio di vua konto
settings:
account: Konto
- account_settings: Kontoopcioni
+ account_settings: Kontopreferaji
aliases: Kontoaltnomi
appearance: Aspekto
authorized_apps: Yurizita apliki
@@ -1566,12 +1683,15 @@ io:
strikes: Jerstreki
two_factor_authentication: Dufaktora autentikigo
webauthn_authentication: Sekuresklefi
+ severed_relationships:
+ download: Deskargo (%{count})
+ preamble: On eble desganas sequati e sequanti kande on blokusas domeno o kande ona administranti decidas blokusar deslokala servilo.
statuses:
attached:
audio:
- one: "%{count} audio"
- other: "%{count} audii"
- description: 'Atachajo: %{attached}'
+ one: "%{count} sono"
+ other: "%{count} soni"
+ description: 'Addonajita: %{attached}'
image:
one: "%{count} imajo"
other: "%{count} imaji"
@@ -1584,14 +1704,14 @@ io:
disallowed_hashtags:
one: 'kontenas nepermisita hashtago: %{tags}'
other: 'kontenas nepermisita hashtagi: %{tags}'
- edited_at_html: Modifikesis ye %{date}
+ edited_at_html: Redaktesis ye %{date}
errors:
in_reply_not_found: Posto quon vu probas respondar semblas ne existas.
over_character_limit: limito de %{max} signi ecesita
pin_errors:
- direct: Posti quo povas videsar nur mencionita uzanti ne povas pinglagesar
- limit: Vu ja pinglagis maxima posti
- ownership: Posto di altra persono ne povas pinglagesar
+ direct: Afishi qua nur videsebla ad mencionita uzanti ne povas adpinglesar
+ limit: Vu ja adpinglis la maxima afishquanto
+ ownership: Afisho di altra persono ne povas adpinglesar
reblog: Repeto ne povas pinglizesar
title: '%{name}: "%{quote}"'
visibilities:
@@ -1613,16 +1733,16 @@ io:
interaction_exceptions_explanation: Notale, ne existas garantio ke posti efacesos se oli iras sub la favoratala o repetala solii pos iras super oli.
keep_direct: Retenez direta mesaji
keep_direct_hint: Ne efacas irga vua direta mesaji
- keep_media: Retenez posti kun mediiatachaji
- keep_media_hint: Ne efacas irga vua posti quo havas mediiatachaji
- keep_pinned: Retenez pinglagita posti
- keep_pinned_hint: Ne efacas irga vua pinglagita posti
- keep_polls: Retenez votposti
- keep_polls_hint: Ne efacas irga vua votposti
- keep_self_bookmark: Retenez posti quon vu libromarkizis
- keep_self_bookmark_hint: Ne efacas vua sua posti se vu libromarkizis li
- keep_self_fav: Retenez posti quon vu favorizis
- keep_self_fav_hint: Ne efacas vua sua posti se vu favorizis li
+ keep_media: Konservar afishi kun audvidajaddonaji
+ keep_media_hint: Ne forigas irga vua afishi qua havas audvidajaddonaji
+ keep_pinned: Konservar adpinglita afishi
+ keep_pinned_hint: Ne forigas irga vua adpinglita afishi
+ keep_polls: Konservar votinquesti
+ keep_polls_hint: Ne forigas irga vua votinquesti
+ keep_self_bookmark: Konservar afishi quan vu lektosignis
+ keep_self_bookmark_hint: Ne forigas vua sua afishi se vu lektosignis ili
+ keep_self_fav: Konservar afishi quan vu stelumis
+ keep_self_fav_hint: Ne forigas vua sua afishi se vu stelumis ili
min_age:
'1209600': 2 semani
'15778476': 6 monati
@@ -1633,7 +1753,7 @@ io:
'63113904': 2 yari
'7889238': 3 monati
min_age_label: Oldeslimito
- min_favs: Retenez favorizita posti mine
+ min_favs: Konservar stelumita afishi mine
min_favs_hint: Ne efacas irgo ek vua posti qua havas adminime ca quanto de favoriziti. Restez vakua por efacar posti senegarde la nombro de favoriziti
min_reblogs: Retenez posti repetita adminime
min_reblogs_hint: Ne efacas irgo ek vua posti qua havas adminime ca quanto de repeti. Restez vakua por efacar posti senegarde la nombro de repeti
@@ -1654,12 +1774,12 @@ io:
month: "%b %Y"
time: "%H:%M"
two_factor_authentication:
- add: Insertez
+ add: Adjuntar
disable: Extingar
- disabled_success: 2-faktoryurizeso sucesoze desaktivigesas
- edit: Modifikez
- enabled: 2-faktoryurizeso aktivigesas
- enabled_success: 2-faktoryurizeso sucesoze aktivigesas
+ disabled_success: Dufaktora yurizo sucese desebligesis
+ edit: Redaktar
+ enabled: Dufaktora yurizo es ebligita
+ enabled_success: Dufaktora yurizo sucese ebligesis
generate_recovery_codes: Generate Recovery Codes
lost_recovery_codes: Rigankodexi povigas vu riganas aceso a vua konto se vu perdas vua smartfono. Se vu perdas vua rigankodexi, vu povas rifacar hike. Vua olda rigankodexi nevalidigesos.
methods: 2-faktormetodi
@@ -1678,13 +1798,16 @@ io:
subject: Vua apelo de %{date} refuzesis
title: Apelo refuzesis
backup_ready:
- subject: Vua arkivo pronte deschargebla
+ extra: Ol es pronta por deskargo!
+ subject: Vua arkivo es pronta por deskargo
title: Arkivekpreno
+ failed_2fa:
+ further_actions_html: Se ol ne es vu, ni rekomendas ke vu %{action} quik pro ke ol eble maligita.
suspicious_sign_in:
change_password: chanjez vua pasvorto
details: 'Co esas detali di eniro:'
explanation: Ni deskovris eniro a vua konto de nova adreso IP.
- further_actions_html: Se co ne agesis da vu, ni rekomendas ke vu %{action} quik e aktivigas 2-faktoryurizo por sekurigar vua konto.
+ further_actions_html: Se ol ne es vu, ni rekomendas ke vu %{action} quik e ebligas dufaktoryurizo por sekurigar vua konto.
subject: Vua konto acesesis de nova adreso IP
title: Nova eniro
warning:
@@ -1695,11 +1818,11 @@ io:
violation: Kontenajo nesequas ca komunitatguidili
explanation:
delete_statuses: Ol trovesis ke kelka vua posti nesequas komunitatguidilo e do efacesis da jereri di %{instance}.
- disable: Vu ne povas uzar vua konto pluse, ma vua profilo e altra informi restas bone. Vu povas demandar kopiur di vua informi, chanjar kontoopcioni e efacar vua konto.
- mark_statuses_as_sensitive: Kelka vua posti markizesis quale sentoza da jereri di %{instance}. Do, personi bezonos kliktar medii en posti ante prevido montresas. Vu povas markizar medii quale sentoza per su kande postar en futuro.
- sensitive: Pos co, omna vua adchargita mediifaili markizesos quale sentoza e celesos dop kliktoaverto.
+ disable: Vu ne povas uzar vua konto plue, ma vua profilo e altra informi restas kune.
+ mark_statuses_as_sensitive: Kelka vua afishi markesis quale trublema da administranti di %{instance}. Vu povas markar audvidaji quale sentema per su kande afishar en la estonteso.
+ sensitive: Pos co, omna vua adkargita audvidajdosieri markesos quale trublema e celesos dop klikaverto.
silence: Vu povas ankore uzar vua konto ma nur personi quo ja sequis vu vidos vua posti en ca servilo, e vu forsan neinkluzesas de diversa deskovrotraiti. Tamen, altra personi povas ankore manuala sequar vu.
- suspend: Vu ne povas uzar vua konto pluse, e vua profilo e altra informi ne esas acesebla pluse. Vu povas ankore enirar por demandar kopiur di vua informi til informi komplete efacesas pos cirkum 30 dii, ma ni retenos kelka bazala informi por preventar vu evitar restrikto.
+ suspend: Vu ne povas uzar vua konto plue, e vua profilo e altra informi ne es adirebla plue.
reason: 'Motivo:'
statuses: 'Citita posti:'
subject:
@@ -1719,7 +1842,12 @@ io:
silence: Konto limitizesis
suspend: Konto restriktigesis
welcome:
+ apps_ios_action: Deskargez sur la aplikajbutiko
+ apps_step: Deskargez nia oficala aplikaji.
explanation: Subo esas guidilo por helpar vu komencar
+ feature_creativity: Mastodon subtenas sono, video e imajafishi, adirpriskribi, votinquesti, enhavajaverti, anima imaji, personesigita emocimaji, imajettranchregulado e plu multo por helpar on expresar su enrete.
+ feature_moderation: Mastodon adportas decidebleso ad on. Adeskez servilo kun reguli quan vu akordas o gastigas vua sua kozo.
+ post_step: Salutez per texto, fotografi, videi o votinquesti.
subject: Bonveno a Mastodon
title: Bonveno, %{name}!
users:
@@ -1733,19 +1861,19 @@ io:
verification: Verifikeso
verified_links: Vua ligili verifikata
webauthn_credentials:
- add: Insertez nova sekuresklefo
+ add: Adjuntar nova sekuresklefo
create:
- error: Existas problemo kande insertar vua sekuresklefo. Probez itere.
- success: Vua sekuresklefo sucesoze insertesas.
+ error: Esas problemo kande adjuntar vua sekuresklefo.
+ success: Vua sekuresklefo sucese adjuntesis.
delete: Efacez
delete_confirmation: Ka vu certe volas efacar ca sekuresklefo?
- description_html: Se vu aktivigas sekuresklefyurizo, eniro bezonos vu uzar 1 de vua sekuresklefi.
+ description_html: Se vu ebligas sekuresklefyurizo, eniro bezonos vu uzar un ek vua sekuresklefi.
destroy:
error: Existas problemo kande efacar vua sekuresklefo. Probez itere.
success: Vua sekuresklefo sucesoze efacesis.
invalid_credential: Nevalida sekuresklefo
nickname_hint: Insertez nometo di vua nova sekuresklefo
- not_enabled: Vu ne aktivigesas WebAuthn til nun
+ not_enabled: Vu ne ebligis WebAuthn til nun
not_supported: Ca vidilo ne suportas sekuresklefi
- otp_required: Por uzar sekuresklefi, aktivigez 2-faktoryurizeso unesme.
+ otp_required: Por uzar sekuresklefi, ebligez dufaktora yurizo unesme.
registered_on: Registris ye %{date}
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 4af26eea0b..be0d8277e3 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -21,6 +21,7 @@ is:
one: Færsla
other: Færslur
posts_tab_heading: Færslur
+ self_follow_error: Ekki er leyft að fylgjast með eigin aðgangi
admin:
account_actions:
action: Framkvæma aðgerð
@@ -877,6 +878,9 @@ is:
message_html: Þú hefur ekki skilgreint neinar reglur fyrir netþjón.
sidekiq_process_check:
message_html: Ekkert Sidekiq-ferli er í gangi fyrir %{value} biðröð/biðraðir. Endilega athugaðu Sidekiq-uppsetninguna þína
+ software_version_check:
+ action: Skoða tiltækar uppfærslur
+ message_html: Uppfærsla er tiltæk fyrir Mastodon.
software_version_critical_check:
action: Skoða tiltækar uppfærslur
message_html: Áríðandi uppfærsla Mastodon er tiltæk, uppfærðu eins fljótt og auðið er.
@@ -1166,9 +1170,11 @@ is:
use_security_key: Nota öryggislykil
author_attribution:
example_title: Sýnitexti
- hint_html: Stýrðu hvernig framlög þín birtast þegar tenglum er deilt á Mastodon.
+ hint_html: Ertu að skrifa fréttir eða bloggfærslur utan Mastodon? Stýrðu því hvernig vitnað er í þig þegar þeim er deilt á Mastodon.
+ instructions: 'Gakktu úr skugga um að þessi kóði sé í HTML greinarinnar þinnar:'
more_from_html: Meira frá %{name}
s_blog: Bloggsvæði hjá %{name}
+ then_instructions: Síðan skaltu bæta lénsheiti útgefandans í reitinn hér fyrir neðan.
title: Framlag höfundar
challenge:
confirm: Halda áfram
@@ -1696,6 +1702,7 @@ is:
delete: Eyðing notandaaðgangs
development: Þróun
edit_profile: Breyta notandasniði
+ export: Flytja út
featured_tags: Myllumerki með aukið vægi
import: Flytja inn
import_and_export: Inn- og útflutningur
@@ -1962,4 +1969,4 @@ is:
not_enabled: Þú hefur ennþá ekki virkjað WebAuthn
not_supported: Þessi vafri styður ekki öryggislykla
otp_required: Til að nota öryggislykla skaltu fyrst virkja tveggja-þátta auðkenningu.
- registered_on: Nýskráður %{date}
+ registered_on: Skráði sig %{date}
diff --git a/config/locales/it.yml b/config/locales/it.yml
index a89fa0a53e..554888abea 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1,7 +1,7 @@
---
it:
about:
- about_mastodon_html: 'Il social network del futuro: Nessuna pubblicità, zero sorveglianza azienale, design etico e decentralizzazione! Sii il proprietario dei tuoi dati, con Mastodon!'
+ 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
hosted_on: Mastodon ospitato su %{domain}
@@ -21,6 +21,7 @@ it:
one: Toot
other: Toot
posts_tab_heading: Toot
+ self_follow_error: Seguire il tuo stesso profilo non è consentito
admin:
account_actions:
action: Esegui azione
@@ -1167,9 +1168,11 @@ it:
use_security_key: Usa la chiave di sicurezza
author_attribution:
example_title: Testo di esempio
- hint_html: Controlla come sei viene accreditato quando i link sono condivisi su Mastodon.
+ hint_html: Stai scrivendo notizie o articoli di blog al di fuori di Mastodon? Controlla come vieni accreditato quando vengono condivisi su Mastodon.
+ instructions: 'Assicurati che questo codice sia presente nell''HTML del tuo articolo:'
more_from_html: Altro da %{name}
s_blog: Blog di %{name}
+ then_instructions: Quindi, aggiungi il nome di dominio della pubblicazione nel campo sottostante.
title: Attribuzione autore
challenge:
confirm: Continua
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index c488505d32..dc7612d404 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -19,6 +19,7 @@ ja:
posts:
other: 投稿
posts_tab_heading: 投稿
+ self_follow_error: 自分のアカウントをフォローすることはできません
admin:
account_actions:
action: アクションを実行
@@ -47,6 +48,7 @@ ja:
title: "%{username}さんのメールアドレスを変更"
change_role:
changed_msg: ロールを変更しました!
+ edit_roles: ユーザーのロールを管理
label: ロールを変更
no_role: ロールがありません
title: "%{username}さんのロールを変更"
@@ -241,26 +243,26 @@ ja:
approve_remote_account_html: "%{name}さんが%{target}さんの参加を承認しました"
approve_user_html: "%{name}さんが%{target}さんからの登録を承認しました"
assigned_to_self_report_html: "%{name}さんが通報 %{target}を自身の担当に割り当てました"
- change_email_user_html: "%{name}さんが%{target}さんのメールアドレスを変更しました"
+ change_email_user_html: "%{name} さんが %{target} さんのメールアドレスを変更しました"
change_role_user_html: "%{name}さんが%{target}さんのロールを変更しました"
- confirm_user_html: "%{name}さんが%{target}さんのメールアドレスを確認済みにしました"
+ confirm_user_html: "%{name} さんが %{target} さんのメールアドレスを確認済みにしました"
create_account_warning_html: "%{name}さんが%{target}さんに警告メールを送信しました"
create_announcement_html: "%{name}さんが新しいお知らせ %{target}を作成しました"
- create_canonical_email_block_html: "%{name}さんがメールアドレス (ハッシュ値: %{target}) をブロックしました"
+ create_canonical_email_block_html: "%{name} さんがメールアドレスのハッシュ値 %{target} をブロックしました"
create_custom_emoji_html: "%{name}さんがカスタム絵文字 %{target}を追加しました"
create_domain_allow_html: "%{name}さんが%{target}の連合を許可しました"
create_domain_block_html: "%{name}さんがドメイン %{target}をブロックしました"
- create_email_domain_block_html: "%{name}さんがメールドメイン %{target} をブロックしました"
+ create_email_domain_block_html: "%{name} さんがメールドメイン %{target} をブロックしました"
create_ip_block_html: "%{name}さんがIP %{target}のルールを作成しました"
create_unavailable_domain_html: "%{name}がドメイン %{target}への配送を停止しました"
create_user_role_html: "%{name}さんがロール『%{target}』を作成しました"
demote_user_html: "%{name}さんが%{target}さんを降格しました"
destroy_announcement_html: "%{name}さんがお知らせ %{target}を削除しました"
- destroy_canonical_email_block_html: "%{name}さんがメールアドレス (ハッシュ値: %{target}) のブロックを外しました"
+ destroy_canonical_email_block_html: "%{name} さんがメールアドレスのハッシュ値 %{target} のブロックを外しました"
destroy_custom_emoji_html: "%{name}さんがカスタム絵文字『%{target}』を削除しました"
destroy_domain_allow_html: "%{name}さんが%{target}の連合許可を外しました"
destroy_domain_block_html: "%{name}さんがドメイン %{target}のブロックを外しました"
- destroy_email_domain_block_html: "%{name} がメールドメイン %{target} のブロックを外しました"
+ destroy_email_domain_block_html: "%{name} さんがメールドメイン %{target} のブロックを外しました"
destroy_instance_html: "%{name}さんがドメイン %{target}をブロックしました"
destroy_ip_block_html: "%{name}さんが IP %{target}のルールを削除しました"
destroy_status_html: "%{name}さんが%{target}さんの投稿を削除しました"
@@ -285,7 +287,7 @@ ja:
remove_media_status_html: "%{name}さんが%{target}さんの投稿のメディアを削除しました"
remove_status_status_html: "%{name}さんが%{target}さんの投稿を削除しました"
reopen_report_html: "%{name}さんが通報 %{target}を未解決に戻しました"
- resend_user_html: "%{name}さんが %{target} の確認メールを再送信しました"
+ resend_user_html: "%{name} さんが %{target} の確認メールを再送信しました"
reset_password_user_html: "%{name}さんが%{target}さんのパスワードをリセットしました"
resolve_report_html: "%{name}さんが通報 %{target}を解決済みにしました"
sensitive_account_html: "%{name}さんが%{target}さんのメディアを閲覧注意にマークしました"
@@ -300,7 +302,7 @@ ja:
update_custom_emoji_html: "%{name}さんがカスタム絵文字 %{target}を更新しました"
update_domain_block_html: "%{name}さんが%{target}のドメインブロックを更新しました"
update_ip_block_html: "%{name} さんがIP %{target} のルールを更新しました"
- update_report_html: "%{name}さんが通報 %{target} を更新しました"
+ update_report_html: "%{name} さんが通報 %{target} を更新しました"
update_status_html: "%{name}さんが%{target}さんの投稿を更新しました"
update_user_role_html: "%{name}さんがロール『%{target}』を変更しました"
deleted_account: 削除されたアカウント
@@ -585,7 +587,7 @@ ja:
instance_accounts_dimension: 最もフォローされているアカウント
instance_accounts_measure: 保存されたアカウント
instance_followers_measure: そこでの我々のフォロワー
- instance_follows_measure: リモートフォローしているアカウント
+ instance_follows_measure: こちらからのフォロー数
instance_languages_dimension: 人気の言語
instance_media_attachments_measure: 保存されたメディア
instance_reports_measure: 通報
@@ -1122,6 +1124,9 @@ ja:
message_html: サーバーのルールを定義していません。
sidekiq_process_check:
message_html: "%{value}キューに対応するSidekiqプロセスがありません。Sidekiqの設定を確認してください。"
+ software_version_check:
+ action: 利用可能な更新を確認
+ message_html: Mastodonの更新が利用可能です。
software_version_critical_check:
action: 利用可能な更新を見る
message_html: 緊急のMastodonアップデートがあります。速やかに適用してください。
@@ -1458,6 +1463,14 @@ ja:
too_fast: フォームの送信が速すぎます。もう一度やり直してください。
use_security_key: セキュリティキーを使用
with_login_options: カスタムCSSを無効化しますか？
+ author_attribution:
+ example_title: サンプルテキスト
+ hint_html: Mastodonの外でニュースやブログなどを執筆しているユーザーは、Mastodonで自分の記事が共有されたときに著者情報を表示させることができます。
+ instructions: 以下のコードを自分の記事のHTMLに貼り付けます。
+ more_from_html: "%{name} のその他の情報"
+ s_blog: "%{name} のブログ"
+ then_instructions: その後、記事の公開に使用しているドメイン名を以下の入力欄に追加してください。
+ title: 著者の帰属
challenge:
confirm: 続ける
hint_html: 以後1時間はパスワードの再入力を求めません
@@ -2005,6 +2018,7 @@ ja:
delete: アカウントの削除
development: 開発
edit_profile: プロフィールを編集
+ export: エクスポート
featured_tags: 注目のハッシュタグ
import: データのインポート
import_and_export: インポート・エクスポート
@@ -2288,6 +2302,7 @@ ja:
instructions_html: 以下のコードをコピーしてwebサイトのHTMLに貼り付けます。次に「プロフィールを編集」タブから、「プロフィール補足情報」のいずれかの欄にwebサイトのURLを記入し、「変更を保存」をクリックしてください。
verification: 認証
verified_links: 確認済みリンク
+ website_verification: ウェブサイトの認証
webauthn_credentials:
add: セキュリティキーを追加
create:
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 12bda84d46..e1abf2ac00 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -71,7 +71,7 @@ kab:
active: Yermed
all: Akk
pending: Yettraǧu
- suspended: Yeḥbes
+ suspended: Yettwaḥbes
title: Aseɣyed
moderation_notes: Tamawin n useɣyed
most_recent_activity: Armud aneggaru
@@ -109,7 +109,7 @@ kab:
silenced: Yettwasgugem
statuses: Tisuffaɣ
subscribe: Jerred
- suspended: Yeḥbes
+ suspended: Yettwaḥbes
title: Imiḍanen
unconfirmed_email: Imayl ur yettwasentem ara
undo_silenced: Kkes asgugem
@@ -264,6 +264,8 @@ kab:
domain: Taɣult
new:
create: Rnu taɣult
+ export_domain_allows:
+ no_file: Ula d yiwen ufaylu ma yettwafran
export_domain_blocks:
no_file: Ulac afaylu yettwafernen
follow_recommendations:
@@ -484,7 +486,7 @@ kab:
delete_account: Kkes amiḍan
description:
prefix_invited_by_user: "@%{name} inced-ik·ikem ad ternuḍ ɣer uqeddac-a n Mastodon!"
- prefix_sign_up: Zeddi di Maṣṭudun assa!
+ prefix_sign_up: Zeddi di Maṣṭudun ass-a!
suffix: S umiḍan, tzemreḍ ad tḍefreḍ imdanen, ad d-tessufɣeḍ tisuffaɣ d wembadal n yiznan akked yiseqdacen n yal aqeddac Mastodon d wayen-nniḍen!
didnt_get_confirmation: Ur d-teṭṭifeḍ ara aseɣwen n usentem ?
dont_have_your_security_key: Ulac ɣur-k·m tasarut-ik·im n tɣellist?
@@ -529,6 +531,10 @@ kab:
account_status: Addad n umiḍan
functional: Amiḍan-inek·inem yetteddu s lekmal-is.
use_security_key: Seqdec tasarut n teɣlist
+ author_attribution:
+ example_title: Amedya n weḍris
+ more_from_html: Ugar s ɣur %{name}
+ s_blog: Ablug n %{name}
challenge:
confirm: Kemmel
invalid_password: Yir awal uffir
@@ -685,6 +691,9 @@ kab:
subject: Yuder-ik·ikem-id %{name}
reblog:
subject: "%{name} yesselha addad-ik·im"
+ title: Azuzer amaynut
+ status:
+ subject: "%{name} akken i d-y·t·essufeɣ"
number:
human:
decimal_units:
@@ -737,6 +746,7 @@ kab:
electron: Electron
firefox: Firefox
generic: Iminig arusin
+ huawei_browser: Iminig n Huawei
ie: Internet Explorer
micro_messenger: MicroMessenger
nokia: Iminig Nokia S40 Ovi
@@ -745,6 +755,7 @@ kab:
phantom_js: PhantomJS
qq: Iminig QQ
safari: Safari
+ uc_browser: UC Browser
unknown_browser: Iminig arussin
weibo: Weibo
current_session: Tiɣimit tamirant
@@ -776,6 +787,7 @@ kab:
delete: Tukksa n umiḍan
development: Taneflit
edit_profile: Ẓreg amaɣnu
+ export: Sifeḍ
import: Kter
import_and_export: Taktert d usifeḍ
migrate: Tunigin n umiḍan
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 3f6c4b39b8..d9a8406e51 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -19,6 +19,7 @@ ko:
posts:
other: 게시물
posts_tab_heading: 게시물
+ self_follow_error: 본인의 계정을 팔로우할 수는 없습니다
admin:
account_actions:
action: 조치 취하기
@@ -192,7 +193,7 @@ ko:
destroy_domain_allow: 도메인 허용 삭제
destroy_domain_block: 도메인 차단 삭제
destroy_email_domain_block: 이메일 도메인 차단 삭제
- destroy_instance: 도메인 제거
+ destroy_instance: 도메인 퍼지
destroy_ip_block: IP 규칙 삭제
destroy_status: 게시물 삭제
destroy_unavailable_domain: 사용 불가능한 도메인 제거
@@ -290,8 +291,8 @@ ko:
update_user_role_html: "%{name} 님이 %{target} 역할을 수정했습니다"
deleted_account: 계정을 삭제했습니다
empty: 로그를 찾을 수 없습니다
- filter_by_action: 행동으로 거르기
- filter_by_user: 사용자로 거르기
+ filter_by_action: 동작 별 필터
+ filter_by_user: 사용자 기준으로 필터
title: 감사 로그
unavailable_instance: "(도메인네임 사용불가)"
announcements:
@@ -525,7 +526,7 @@ ko:
title: 중재
private_comment: 비공개 주석
public_comment: 공개 주석
- purge: 제거
+ purge: 퍼지
purge_description_html: 이 도메인이 영구적으로 오프라인 상태라고 생각되면, 스토리지에서 이 도메인의 모든 계정 레코드와 관련 데이터를 삭제할 수 있습니다. 이 작업은 시간이 좀 걸릴 수 있습니다.
title: 연합
total_blocked_by_us: 우리에게 차단 됨
@@ -1149,9 +1150,11 @@ ko:
use_security_key: 보안 키 사용
author_attribution:
example_title: 예시 텍스트
- hint_html: 링크가 마스토돈에 공유될 때 내가 어떻게 표시될 지를 제어합니다.
+ hint_html: 마스토돈 밖에서 뉴스나 블로그 글을 쓰시나요? 마스토돈에 공유되었을 때 어떻게 표시될지를 제어하세요.
+ instructions: '이 코드가 글의 HTML 안에 포함되는지 확인하세요:'
more_from_html: "%{name}의 게시물 더 보기"
s_blog: "%{name}의 블로그"
+ then_instructions: 그리고 발행처의 도메인 네임을 아래 입력란에 추가하세요.
title: 작성자 기여
challenge:
confirm: 계속
@@ -1613,7 +1616,7 @@ ko:
over_total_limit: 예약 게시물 제한 %{limit}을 초과합니다
too_soon: 예약 날짜는 미래여야 합니다
self_destruct:
- lead_html: 안타깝게도, %{domain} 도메인을 영구히 폐쇄합니다. 이곳의 계정을 가졌다면, 이제 이용할 수 없으며, 당분간 백업 데이터를 요청할 수 있습니다.
+ lead_html: 안타깝게도, %{domain}은 영구적으로 폐쇄됩니다. 이곳의 계정을 가지고 있었다면, 이제 이용할 수 없지만 백업 데이터는 요청할 수 있습니다.
title: 이 서버는 폐쇄중입니다
sessions:
activity: 최근 활동
@@ -1694,7 +1697,7 @@ ko:
lost_followers: 잃은 팔로워
lost_follows: 잃은 팔로우
preamble: 내가 도메인을 차단하거나 중재진이 다른 서버를 정지하기로 결정했다면 내 팔로우와 팔로워를 잃게 됩니다. 그런 일이 일어났다면 그로 인해 단절된 관계들의 목록을 다운로드 받아 확인하고 다른 서버에서 불러올 수 있습니다.
- purged: 이 서버에 대한 정보는 관리자에 의해 삭제되었습니다.
+ purged: 이 서버에 대한 정보는 관리자에 의해 제거되었습니다.
type: 이벤트
statuses:
attached:
diff --git a/config/locales/la.yml b/config/locales/la.yml
index cc92bf6d28..edd99ac23d 100644
--- a/config/locales/la.yml
+++ b/config/locales/la.yml
@@ -31,3 +31,28 @@ la:
destroyed_msg: Nota moderationis feliciter deleta est!
accounts:
are_you_sure: Esne certus?
+ statuses:
+ title: Ratiōnis publicātiōnēs
+ auth:
+ privacy_policy_agreement_html: Lēgī et cōnsēnsī ad pōlīticam prīvātī tūtelam
+ setup:
+ email_settings_hint_html: Premī nexum quem tibi mīsimus ut %{email} comprobēs. Hīc manēbimus.
+ sign_up:
+ preamble: Cum ratiōne in hāc servēnce Mastodonī, quemlibet alium hominem in rēte sequī poteris, ubicumque ratiō eius administrētur.
+ imports:
+ overwrite_preambles:
+ blocking_html: Mox līstam blōcātiōnis tuam substituēbis cum usque ad %{total_items} ratiōnēs e %{filename}.
+ bookmarks_html: Mox signa tua substituēbis cum usque ad %{total_items} prōnūntiātiōnēs e %{filename}.
+ domain_blocking_html: Mox līstam blōcātiōnis dominī tuī substituēbis cum usque ad %{total_items} dominī e %{filename}.
+ following_html: Mox sequēris usque ad %{total_items} ratiōnēs e %{filename} et desinēs sequī quemquam alium.
+ lists_html: Mox līstās tuās substituēbis cum contentīs %{filename}. Usque ad %{total_items} ratiōnēs ad novās līstās addentur.
+ muting_html: Mox līstam ratiōnum sīlentiōrum tuārum substituēbis cum usque ad %{total_items} ratiōnēs e %{filename}.
+ preambles:
+ blocking_html: Mox blōcābis usque ad %{total_items} ratiōnēs e %{filename}.
+ bookmarks_html: '"Mox usque ad %{total_items} nūmēra e %{filename} adde in līstās tuās."'
+ domain_blocking_html: Mox blōcābis usque ad %{total_items} dōmina e %{filename}.
+ following_html: Mox sequēris usque ad %{total_items} ratiōnēs e %{filename}.
+ lists_html: Mox usque ad %{total_items} ratiōnēs e %{filename} adde in līstās tuās. Novae līstās creābuntur, sī līstā ad quam addere nōn est.
+ muting_html: Mox tacēbis usque ad %{total_items} ratiōnēs e %{filename}.
+ scheduled_statuses:
+ too_soon: Dāta dēfīnīta in futurō esse dēbēbit.
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index 275bdab861..10871b826b 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -24,6 +24,7 @@ lad:
admin:
account_actions:
action: Realiza aksion
+ already_silenced: Este kuento ya tiene sido limitado.
already_suspended: Este kuento ya tiene sido suspendido.
title: Modera %{acct}
account_moderation_notes:
@@ -46,6 +47,7 @@ lad:
title: Troka la posta elektronika de %{username}
change_role:
changed_msg: Rolo trokado kon sukseso!
+ edit_roles: Administra reglas de utilizadores
label: Troka rolo
no_role: Sin rolo
title: Troka rolo para %{username}
@@ -595,6 +597,7 @@ lad:
resolve_description_html: No se tomaran aksyones kontra el kuento denunsiado, no se enrejistrara el amonestamiento, i se serrara el raporto.
silence_description_html: El profil sera vizivle solo para akeyos ke ya lo sigan o lo bushken manualmente, limitando seriamente su alkanse. Siempre puede ser revertido.
suspend_description_html: El profil i todos sus kontenidos seran inaksesivles asta ke sean enfin supremidos. La enteraksion kon el kuento sera emposivle. Reversivle durante un tiempo de 30 diyas.
+ actions_description_html: Dechide kualas mizuras tomar para rezolver esta denunsia. Si tomas una aksion punitiva kontra el kuento denunsiada, se le embiara a dicho kuento un avizo por posta elektronika, ekseptado kuando se eskoja la kategoria Spam.
actions_description_remote_html: Dechide ke fazer para rezolver este raporto. Esto solo va afektar komo tu sirvidor komunike kon este kuento remoto i ke faze kon su kontenido.
add_to_report: Adjusta mas al raporto
already_suspended_badges:
@@ -636,6 +639,7 @@ lad:
report: 'Raporta #%{id}'
reported_account: Kuento raportado
reported_by: Raportado por
+ reported_with_application: Raportado kon aplikasyon
resolved: Rezolvido
resolved_msg: Tienes rezolvido la denunsia djustamente!
skip_to_actions: Va direktamente a las aksyones
@@ -697,6 +701,7 @@ lad:
manage_appeals: Administra apelasiones
manage_appeals_description: Permete a los utilizadores revizar apelasiones kontra aksyones de moderasyon
manage_blocks: Administra blokos
+ manage_blocks_description: Permete a los utilizadores blokar los prokuradores de posta elektronika i los adresos IP
manage_custom_emojis: Administra emojis personalizados
manage_custom_emojis_description: Permete a los utilizadores editar emojis personalizados en el sirvidor
manage_federation: Administra federasyon
@@ -714,6 +719,7 @@ lad:
manage_taxonomies: Administra etiketas
manage_taxonomies_description: Permete a los utilizadores revizar el kontenido en trend i aktualizar la konfigurasyon de las etiketas
manage_user_access: Administra akseso de utilizadores
+ manage_user_access_description: Permete a los utilizadores dezaktivar la autentifikasyon en dos pasos de otros utilizadores, trokar sus adreso de posta elektronika i restableser sus kod
manage_users: Administra utilizadores
manage_users_description: Permete a los utilizadores ver los peratim de otros utilizadores i realizar aksyones de moderasyon kontra eyos
manage_webhooks: Administrar webhooks
@@ -748,6 +754,7 @@ lad:
desc_html: Esto se baza en eskriptos eksternos de hCaptcha, ke pueden ser una influensya negra a la sigurita i privasita. Ademas, esto puede rezultar en un proseso de enrejistrasyon signifikativamente manko aksesivle para algunas personas (espesyalmente diskapasitadas). Por estas razones, por favor, konsidera otras alternativas komo rejistrasyon por aprovasyon manuala o kon envitasyon.
title: Solisita ke los muevos utilizadores rezolven un CAPTCHA para konfirmar su konto
content_retention:
+ danger_zone: Zona de perikolo
preamble: Kontrola komo el kontenido jenerado por el utilizador se magazina en Mastodon.
title: Retensyon de kontenido
default_noindex:
@@ -787,6 +794,7 @@ lad:
destroyed_msg: Dosya supremida kon sukseso!
software_updates:
critical_update: Kritiko – por favor aktualiza pishin
+ description: Rekomendamos ke mantengas aktualizada tu enstalasyon de Mastodon para benefisyar de las muevas koreksyones y funksyones. Ademas, a vezes es kritiko aktualizar Mastodon punktualmente para evitar problemas de sigurita. Por estas razones, Mastodon komprova si ay aktualizasyones kada 30 minutos, i te avizara de akodro a tus preferensyas de avizos por posta elektronika.
documentation_link: Ambezate mas
release_notes: Notas sovre la versyon
title: Aktualizasyones desponivles
@@ -860,6 +868,9 @@ lad:
message_html: No tienes definido dinguna regla del sirvidor.
sidekiq_process_check:
message_html: No ay dingun prosedura Sidekiq en egzekusion para la(s) kola(s) %{value}. Por favor, reviza tu konfigurasyon de Sidekiq
+ software_version_check:
+ action: Amostra aktualizasyones desponivles
+ message_html: Una aktualizasyon de Mastodon esta desponivle.
software_version_critical_check:
action: Amostra aktualizasyones desponivles
message_html: Una aktualizasyon kritika de Mastodon esta desponivle. Por favor aktualiza pishin.
@@ -874,12 +885,18 @@ lad:
message_html: "Tu magazinaje de objektos es mal konfigurado. La privasita de tus utilizadores esta en riziko."
tags:
moderation:
+ not_trendable: No trendavle
+ not_usable: No uzavle
pending_review: Revizion esta asperando
+ reviewed: Revizado
title: Estado
+ trendable: Trendavle
+ unreviewed: No revizado
usable: Uzavle
name: Nombre
newest: Mas muevos
oldest: Mas viejos
+ open: Ve puvlikamente
reset: Reinisya
review: Estado de revizion
search: Bushka
@@ -948,6 +965,7 @@ lad:
used_by_over_week:
one: Uzada por una persona durante la ultima semana
other: Uzada por %{count} personas durante la ultima semana
+ title: Rekomendasyones i trendes
trending: En trend
warning_presets:
add_new: Adjusta muevo
@@ -1118,6 +1136,7 @@ lad:
title: Kriya kuento de Mastodon en %{domain}.
status:
account_status: Estado del kuento
+ confirming: Bekleando konfirmasyon de posta elektronika.
functional: Tu kuento esta kompletamente funksyonal.
pending: Tu solisitasyon esta asperando la revizion por muestros administradores. Esto puede tadrar algun tiempo. Arisiviras una posta elektronika si la solisitasyon sea achetada.
redirecting_to: Tu kuento se topa inaktivo porke esta siendo readresado a %{acct}.
@@ -1126,7 +1145,9 @@ lad:
too_fast: Formulario enviado demaziado rapido, aprovalo de muevo.
use_security_key: Uza la yave de sigurita
author_attribution:
+ example_title: Teksto de enshemplo
more_from_html: Mas de %{name}
+ s_blog: Blog de %{name}
challenge:
confirm: Kontinua
hint_html: "Konsejo: No retornaremos a demandarte por el kod durante la sigiente ora."
@@ -1652,6 +1673,7 @@ lad:
delete: Efasa kuento
development: Dezvelopamiento
edit_profile: Edita profil
+ export: Eksporto
featured_tags: Etiketas avaliadas
import: Importo
import_and_export: Importo i eksporto
@@ -1890,6 +1912,7 @@ lad:
instructions_html: Kopia i apega este kodiche en el HTML de tu sitio web. Estonses, adjusta el adreso de tu sitio web en uno de los kutis adisyonales de tu profil dizde la seksyon "Edita profil" i guadra los trokamyentos.
verification: Verifikasyon
verified_links: Tus atadijos verifikados
+ website_verification: Verifikasyon de sityo web
webauthn_credentials:
add: Adjusta mueva yave de sigurita
create:
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 3b63ba6dcf..3f7c8d067b 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -4,7 +4,7 @@ lt:
about_mastodon_html: 'Ateities socialinis tinklas: jokių reklamų, jokių įmonių sekimo, etiškas dizainas ir decentralizacija! Turėk savo duomenis su Mastodon.'
contact_missing: Nenustatyta
contact_unavailable: Nėra
- hosted_on: Mastodon talpinamas %{domain}
+ hosted_on: "„Mastodon“ talpinamas domene %{domain}"
title: Apie
accounts:
followers:
@@ -343,7 +343,7 @@ lt:
opened_reports: atidaryti ataskaitos
pending_appeals_html:
few: "%{count} laukiantys apeliacijos"
- many: "%{count} laukiama apeliacija"
+ many: "%{count} laukiamos apeliacijos"
one: "%{count} laukiama apeliacija"
other: "%{count} laukiančių apeliacijų"
pending_reports_html:
@@ -446,8 +446,8 @@ lt:
availability:
title: Prieinamumas
warning: Paskutinis bandymas prisijungti prie šio serverio buvo nesėkmingas
- back_to_all: Visi
- back_to_limited: Apribotas
+ back_to_all: Viskas
+ back_to_limited: Apribota
back_to_warning: Įspėjimas
by_domain: Domenas
content_policies:
@@ -593,7 +593,7 @@ lt:
no_status_selected: Jokie įrašai nebuvo pakeisti, nes nė vienas buvo pasirinktas
open: Atidaryti įrašą
original_status: Originalus įrašas
- title: Paskyros statusai
+ title: Paskyros įrašai
trending: Tendencinga
with_media: Su medija
system_checks:
@@ -804,12 +804,14 @@ lt:
security: Apsauga
set_new_password: Nustatyti naują slaptažodį
setup:
- email_settings_hint_html: Spustelėk mūsų atsiųstą nuorodą, kad patikrintum %{email}. Mes lauksime čia.
+ email_settings_hint_html: Spustelėkite mūsų atsiųstą nuorodą, kad patvirtintumėte %{email}. Mes lauksime čia.
link_not_received: Negavai nuorodos?
title: Patikrinti pašto dėžutę
sign_in:
preamble_html: Prisijunk su savo %{domain} kredencialais. Jei tavo yra kitame serveryje, čia prisijungti negalėsi.
title: Prisijungti prie %{domain}
+ sign_up:
+ preamble: Su paskyra šiame „Mastodon“ serveryje galėsite sekti bet kurį kitą tinkle esantį asmenį, nepriklausomai nuo to, kur yra jų paskyra.
status:
account_status: Paskyros būsena
redirecting_to: Tavo paskyra yra neaktyvi, nes šiuo metu ji nukreipiama į %{acct}.
@@ -817,9 +819,11 @@ lt:
view_strikes: Peržiūrėti ankstesnius savo paskyros pažeidimus
author_attribution:
example_title: Teksto pavyzdys
- hint_html: Valdyk, kaip esi nurodomas (-a), kai nuorodos bendrinamos platformoje „Mastodon“.
+ hint_html: Ar rašote naujienas ar tinklaraščio straipsnius už „Mastodon“ ribų? Valdykite, kaip būsite nurodomi, kai jais bus bendrinama platformoje „Mastodon“.
+ instructions: 'Įsitikinkite, kad šis kodas yra jūsų straipsnio HTML:'
more_from_html: Daugiau iš %{name}
s_blog: "%{name} tinklaraštis"
+ then_instructions: Tada toliau esančiame lauke įrašykite leidinio domeno vardą.
title: Autoriaus (-ės) atribucija
challenge:
hint_html: "Patarimas: artimiausią valandą daugiau neprašysime tavo slaptažodžio."
@@ -919,6 +923,16 @@ lt:
merge_long: Išsaugoti esančius įrašus ir pridėti naujus
overwrite: Perrašyti
overwrite_long: Pakeisti senus įrašus naujais
+ overwrite_preambles:
+ blocking_html: Ketinate pakeisti savo blokavimo sąrašą iki %{total_items} paskyrų iš %{filename}.
+ bookmarks_html: Ketinate pakeisti savo žymes iki %{total_items} įrašų iš %{filename}.
+ domain_blocking_html: Ketinate pakeisti savo domeno blokavimo sąrašą iki %{total_items} domenų iš %{filename}.
+ following_html: Ketinate sekti iki %{total_items} paskyrų iš %{filename} ir nustoti sekti kitus.
+ preambles:
+ domain_blocking_html: Ketinate užblokuoti iki %{total_items} domenų iš %{filename}.
+ following_html: Ketinate sekti iki %{total_items} paskyrų iš %{filename}.
+ lists_html: Ketinate įtraukti iki %{total_items} paskyrų iš %{filename} į savo sąrašus. Nauji sąrašai bus sukurti, jei nėra sąrašo, į kurį būtų galima įtraukti.
+ muting_html: Ketinate nutildyti iki %{total_items} paskyrų iš %{filename}.
preface: Gali importuoti duomenis, kuriuos eksportavai iš kito serverio, pavyzdžiui, sekamų arba blokuojamų žmonių sąrašą.
success: Jūsų informacija sėkmingai įkelta ir bus apdorota kaip įmanoma greičiau
types:
@@ -1054,7 +1068,7 @@ lt:
scheduled_statuses:
over_daily_limit: Jūs pasieketė limitą (%{limit}) galimų toot'ų per dieną
over_total_limit: Jūs pasieketė %{limit} limitą galimų toot'ų
- too_soon: Planuota data privalo būti ateityje
+ too_soon: Suplanuota data turi būti ateityje.
sessions:
activity: Paskutinė veikla
browser: Naršyklė
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 16844a95c2..6123cc0618 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -23,31 +23,33 @@ lv:
other: Ziņas
zero: Ziņu
posts_tab_heading: Ziņas
+ self_follow_error: Nav ļauts sekot savam kontam
admin:
account_actions:
action: Veikt darbību
already_silenced: Šis konts jau ir ierobežots.
already_suspended: Šis konts jau ir aizturēts.
- title: Veikt moderācijas darbību %{acct}
+ title: Veikt satura pārraudzības darbību %{acct}
account_moderation_notes:
create: Atstāt piezīmi
- created_msg: Moderācijas piezīme ir veiksmīgi izveidota!
- destroyed_msg: Moderācijas piezīme ir veiksmīgi iznīcināta!
+ created_msg: Satura pārraudzības piezīme ir sekmīgi izveidota.
+ destroyed_msg: Satura pārraudzības piezīme ir sekmīgi iznīcināta.
accounts:
+ add_email_domain_block: Liegt e-pasta domēnu
approve: Apstiprināt
- approved_msg: Veiksmīgi apstiprināts %{username} reģistrēšanās pieteikums
+ approved_msg: "%{username} reģistrēšanās pieteikums sekmīgi apstiprināts"
are_you_sure: Vai esi pārliecināts?
avatar: Profila attēls
by_domain: Domēns
change_email:
- changed_msg: E-pasts veiksmīgi nomainīts!
+ changed_msg: E-pasta adrese sekmīgi nomainīta.
current_email: Pašreizējais e-pasts
label: Mainīt e-pastu
new_email: Jaunā e-pasta adrese
submit: Mainīt e-pastu
title: Mainīt e-pastu %{username}
change_role:
- changed_msg: Loma veiksmīgi nomainīta!
+ changed_msg: Loma sekmīgi nomainīta.
edit_roles: Pārvaldīt lietotāju lomas
label: Mainīt lomu
no_role: Nav lomas
@@ -61,6 +63,7 @@ lv:
demote: Pazemināt
destroyed_msg: Lietotāja %{username} dati tagad ievietoti rindā, lai tos nekavējoties izdzēstu
disable: Iesaldēt
+ disable_sign_in_token_auth: Atspējot autentificēšanos ar e-pasta pilnvaru
disable_two_factor_authentication: Atspējot 2FA
disabled: Iesaldēts
display_name: Parādāmais vārds
@@ -69,8 +72,9 @@ lv:
email: E-pasts
email_status: E-pasta statuss
enable: Atsaldēt
+ enable_sign_in_token_auth: Iespējot autentificēšanos ar e-pasta pilnvaru
enabled: Iespējots
- enabled_msg: Veiksmīgi atsaldēts %{username} konts
+ enabled_msg: "%{username} konts sekmīgi atsaldēts"
followers: Sekotāji
follows: Seko
header: Galvene
@@ -88,16 +92,16 @@ lv:
media_attachments: Multivides pielikumi
memorialize: Pārvērst atmiņās
memorialized: Piemiņa saglabāta
- memorialized_msg: "%{username} veiksmīgi pārvērsts par piemiņas kontu"
+ memorialized_msg: "%{username} sekmīgi pārveidots par piemiņas kontu"
moderation:
active: Aktīvie
all: Visi
- disabled: Atspējots
+ disabled: Atspējota
pending: Gaida
- silenced: Ierobežotie
- suspended: Apturētie
- title: Moderācija
- moderation_notes: Moderācijas piezīmes
+ silenced: Ierobežoti
+ suspended: Apturēti
+ title: Satura pārraudzība
+ moderation_notes: Satura pārraudzības piezīmes
most_recent_activity: Pati pēdējā darbība
most_recent_ip: Pati pēdējā IP
no_account_selected: Neviens konts netika mainīts, jo neviens netika atlasīts
@@ -116,19 +120,19 @@ lv:
public: Publisks
push_subscription_expires: PuSH abonements beidzas
redownload: Atsvaidzināt profilu
- redownloaded_msg: Veiksmīgi atsvaidzināts %{username} profils no izcelsmes
+ redownloaded_msg: "%{username} profils sekmīgi atsvaidzināts no izcelsmes"
reject: Noraidīt
- rejected_msg: Veiksmīgi noraidīts %{username} reģistrēšanās pieteikums
+ rejected_msg: "%{username} reģistrēšanās pieteikums sekmīgi noraidīts"
remote_suspension_irreversible: Šī konta dati ir neatgriezeniski dzēsti.
remote_suspension_reversible_hint_html: Konts ir apturēts viņu serverī, un dati tiks pilnībā noņemti %{date}. Līdz tam attālais serveris var atjaunot šo kontu bez jebkādām negatīvām sekām. Ja vēlaties nekavējoties noņemt visus konta datus, varat to izdarīt tālāk.
remove_avatar: Noņemt profila attēlu
remove_header: Noņemt galveni
- removed_avatar_msg: Veiksmīgi noņemts %{username} profila attēls
- removed_header_msg: Veiksmīgi noņemts %{username} galvenes attēls
+ removed_avatar_msg: "%{username} profila attēls sekmīgi noņemts"
+ removed_header_msg: "%{username} galvenes attēls sekmīgi noņemts"
resend_confirmation:
already_confirmed: Šis lietotājs jau ir apstiprināts
send: Atkārtoti nosūtīt apstiprinājuma saiti
- success: Apstiprinājuma saite veiksmīgi nosūtīta!
+ success: Apstiprinājuma saite sekmīgi nosūtīta.
reset: Atiestatīt
reset_password: Atiestatīt paroli
resubscribe: Pieteikties vēlreiz
@@ -140,8 +144,8 @@ lv:
security_measures:
only_password: Tikai parole
password_and_2fa: Parole un 2FA
- sensitive: Sensitīvs
- sensitized: Atzīmēts kā sensitīvs
+ sensitive: Uzspiest atzīmēšanu kā jūtīgu
+ sensitized: Atzīmēts kā jūtīgs
shared_inbox_url: Koplietotās iesūtnes URL
show:
created_reports: Sastādītie ziņojumi
@@ -157,14 +161,14 @@ lv:
suspension_reversible_hint_html: Konta darbība ir apturēta, un dati tiks pilnībā noņemti %{date}. Līdz tam kontu var atjaunot bez jebkādām nelabvēlīgām sekām. Ja vēlies nekavējoties noņemt visus konta datus, to vari izdarīt zemāk.
title: Konti
unblock_email: Atbloķēt e-pasta adresi
- unblocked_email_msg: Veiksmīgi atbloķēta %{username} e-pasta adrese
+ unblocked_email_msg: "%{username} e-pasta adreses liegšana sekmīgi atcelta"
unconfirmed_email: Neapstiprināts e-pasts
- undo_sensitized: Atcelt sensitivizēšanu
+ undo_sensitized: Atcelt uzspiestu atzīmēšanu kā jūtīgu
undo_silenced: Atsaukt ierobežojumu
undo_suspension: Atsaukt apturēšanu
- unsilenced_msg: Veiksmīgi atsaukts %{username} konta ierobežojums
+ unsilenced_msg: "%{username} konta ierobežojums sekmīgi atsaukts"
unsubscribe: Anulēt abonementu
- unsuspended_msg: Veiksmīgi neapturēts %{username} konts
+ unsuspended_msg: "%{username} konts apturēšana sekmīgi atcelta"
username: Lietotājvārds
view_domain: Skatīt domēna kopsavilkumu
warn: Brīdināt
@@ -180,17 +184,21 @@ lv:
confirm_user: Apstiprināt lietotāju
create_account_warning: Izveidot Brīdinājumu
create_announcement: Izveidot Paziņojumu
+ create_canonical_email_block: Izveidot e-pasta liegumu
create_custom_emoji: Izveidot pielāgotu emocijzīmi
create_domain_allow: Izveidot Domēna Atļauju
create_domain_block: Izveidot Domēna Bloku
+ create_email_domain_block: Izveidot e-pasta domēna liegumu
create_ip_block: Izveidot IP noteikumu
create_unavailable_domain: Izveidot Nepieejamu Domēnu
create_user_role: Izveidot lomu
demote_user: Pazemināt Lietotāju
destroy_announcement: Dzēst Paziņojumu
+ destroy_canonical_email_block: Izdzēst e-pasta liegumu
destroy_custom_emoji: Dzēst pielāgoto emocijzīmi
destroy_domain_allow: Dzēst Domēna Atļauju
destroy_domain_block: Dzēst Domēna Bloku
+ destroy_email_domain_block: Izdzēst e-pasta domēna liegumu
destroy_instance: Attīrīt domēnu
destroy_ip_block: Dzēst IP noteikumu
destroy_status: Izdzēst Rakstu
@@ -198,8 +206,10 @@ lv:
destroy_user_role: Iznīcināt lomu
disable_2fa_user: Atspējot 2FA
disable_custom_emoji: Atspējot pielāgotu emocijzīmi
+ disable_sign_in_token_auth_user: Atspējot autentificēšanos ar e-pasta pilnvaru lietotājam
disable_user: Atspējot Lietotāju
enable_custom_emoji: Iespējot pielāgotu emocijzīmi
+ enable_sign_in_token_auth_user: Iespējot autentificēšanos ar e-pasta pilnvaru lietotājam
enable_user: Ieslēgt Lietotāju
memorialize_account: Saglabāt Kontu Piemiņai
promote_user: Izceltt Lietotāju
@@ -210,12 +220,12 @@ lv:
resend_user: Atkārtoti nosūtīt Apstiprinājuma Pastu
reset_password_user: Atiestatīt Paroli
resolve_report: Atrisināt Ziņojumu
- sensitive_account: Piespiedu sensitīvizēt kontu
+ sensitive_account: Uzspiesti atzimēt kontu kā jūtīgu
silence_account: Ierobežot Kontu
suspend_account: Apturēt Kontu
unassigned_report: Atcelt Pārskata Piešķiršanu
unblock_email_account: Atbloķēt e-pasta adresi
- unsensitive_account: Atsaukt Konta Piespiedu Sensitivizēšanu
+ unsensitive_account: Atsaukt uzspiestu konta atzīmēšanu kā jūtīgu
unsilence_account: Atcelt Konta Ierobežošanu
unsuspend_account: Atcelt konta apturēšanu
update_announcement: Atjaunināt Paziņojumu
@@ -226,7 +236,7 @@ lv:
update_status: Atjaunināt ziņu
update_user_role: Atjaunināt lomu
actions:
- approve_appeal_html: "%{name} apstiprināja moderācijas lēmuma apelāciju no %{target}"
+ approve_appeal_html: "%{name} apstiprināja satura pārraudzības lēmuma iebildumu no %{target}"
approve_user_html: "%{name} apstiprināja reģistrēšanos no %{target}"
assigned_to_self_report_html: "%{name} piešķīra pārskatu %{target} sev"
change_email_user_html: "%{name} nomainīja lietotāja %{target} e-pasta adresi"
@@ -234,9 +244,11 @@ lv:
confirm_user_html: "%{name} apstiprināja lietotāja %{target} e-pasta adresi"
create_account_warning_html: "%{name} nosūtīja brīdinājumu %{target}"
create_announcement_html: "%{name} izveidoja jaunu paziņojumu %{target}"
+ create_canonical_email_block_html: "%{name} liedza e-pasta adresi ar jaucējkodu %{target}"
create_custom_emoji_html: "%{name} augšupielādēja jaunu emocijzīmi %{target}"
create_domain_allow_html: "%{name} atļāva federāciju ar domēnu %{target}"
create_domain_block_html: "%{name} bloķēja domēnu %{target}"
+ create_email_domain_block_html: "%{name} liedza e-pasta domēnu %{target}"
create_ip_block_html: "%{name} izveidoja nosacījumu priekš IP %{target}"
create_unavailable_domain_html: "%{name} apturēja piegādi uz domēnu %{target}"
create_user_role_html: "%{name} nomainīja %{target} lomu"
@@ -257,19 +269,19 @@ lv:
enable_user_html: "%{name} iespējoja pieteikšanos lietotājam %{target}"
memorialize_account_html: "%{name} pārvērta %{target} kontu par atmiņas lapu"
promote_user_html: "%{name} paaugstināja lietotāju %{target}"
- reject_appeal_html: "%{name} noraidīja moderācijas lēmuma apelāciju no %{target}"
+ reject_appeal_html: "%{name} noraidīja satura pārraudzības lēmuma iebildumu no %{target}"
reject_user_html: "%{name} noraidīja reģistrēšanos no %{target}"
remove_avatar_user_html: "%{name} noņēma %{target} profila attēlu"
reopen_report_html: "%{name} atkārtoti atvēra ziņojumu %{target}"
resend_user_html: "%{name} atkārtoti nosūtīja %{target} apstiprinājuma e-pasta ziņojumu"
reset_password_user_html: "%{name} atiestatīja paroli lietotājam %{target}"
resolve_report_html: "%{name} atrisināja ziņojumu %{target}"
- sensitive_account_html: "%{name} atzīmēja %{target} multividi kā sensitīvu"
+ sensitive_account_html: "%{name} atzīmēja %{target} informācijas nesēju kā jūtīgu"
silence_account_html: "%{name} ierobežoja %{target} kontu"
suspend_account_html: "%{name} apturēja %{target} kontu"
unassigned_report_html: "%{name} nepiešķīra ziņojumu %{target}"
unblock_email_account_html: "%{name} atbloķēja %{target} e-pasta adresi"
- unsensitive_account_html: "%{name} atmarķēja %{target} multividi kā sensitīvu"
+ unsensitive_account_html: "%{name} atcēla %{target} informācijas nesēja atzīmēšanu kā jūtīgu"
unsilence_account_html: "%{name} atcēla ierobežojumu %{target} kontam"
unsuspend_account_html: "%{name} neapturēja %{target} kontu"
update_announcement_html: "%{name} atjaunināja paziņojumu %{target}"
@@ -283,10 +295,10 @@ lv:
empty: Žurnāli nav atrasti.
filter_by_action: Filtrēt pēc darbības
filter_by_user: Filtrēt pēc lietotāja
- title: Auditācijas pieraksti
+ title: Audita žurnāls
unavailable_instance: "(domēna vārds nav pieejams)"
announcements:
- destroyed_msg: Paziņojums ir veiksmīgi izdzēsts!
+ destroyed_msg: Paziņojums sekmīgi izdzēsts.
edit:
title: Labot paziņojumu
empty: Neviens paziņojums netika atrasts.
@@ -295,31 +307,31 @@ lv:
create: Izveidot paziņojumu
title: Jauns paziņojums
publish: Publicēt
- published_msg: Paziņojums ir veiksmīgi publicēts!
+ published_msg: Paziņojums sekmīgi publicēts.
scheduled_for: Plānots uz %{time}
scheduled_msg: Paziņojums ieplānots publicēšanai!
title: Paziņojumi
unpublish: Atcelt publicēšanu
- unpublished_msg: Paziņojuma publicēšana veiksmīgi atcelta!
- updated_msg: Paziņojums ir veiksmīgi atjaunināts!
+ unpublished_msg: Paziņojuma publicēšana sekmīgi atcelta!
+ updated_msg: Paziņojums sekmīgi atjaunināts!
critical_update_pending: Gaida kritisko atjauninājumu
custom_emojis:
assign_category: Piešķirt kategoriju
by_domain: Domēns
- copied_msg: Emocijas vietējā kopija ir veiksmīgi izveidota
+ copied_msg: Emocijzīmes vietējā kopija ir sekmīgi izveidota
copy: Kopēt
copy_failed_msg: Nevarēja izveidot šīs emocijzīmes vietējo kopiju
create_new_category: Izveidot jaunu kategoriju
- created_msg: Emocijzīme veiksmīgi izveidota!
+ created_msg: Emocijzīme sekmīgi izveidota.
delete: Dzēst
- destroyed_msg: Emocijzīme ir veiksmīgi iznīcināta!
+ destroyed_msg: Emocijzīme sekmīgi iznīcināta!
disable: Atspējot
disabled: Atspējots
- disabled_msg: Šī emocijzīme ir veiksmīgi atspējota
+ disabled_msg: Šī emocijzīme sekmīgi atspējota
emoji: Emocijzīmes
enable: Iespējot
enabled: Iespējots
- enabled_msg: Šī emocijzīme ir veiksmīgi iespējota
+ enabled_msg: Šī emocijzīme ir sekmīgi iespējota
image_hint: PNG vai GIF līdz %{size}
list: Saraksts
listed: Uzrakstītas
@@ -335,7 +347,7 @@ lv:
unlist: Izslēgt
unlisted: Neminētie
update_failed_msg: Nevarēja atjaunināt šo emocijzīmi
- updated_msg: Emocijzīme veiksmīgi atjaunināta!
+ updated_msg: Emocijzīme sekmīgi atjaunināta.
upload: Augšupielādēt
dashboard:
active_users: aktīvie lietotāji
@@ -352,9 +364,9 @@ lv:
other: "%{count}ziņojumi gaida"
zero: "%{count}ziņojumi gaida"
pending_tags_html:
- one: "%{count}tēmturis gaida"
- other: "%{count}tēmturi gaida"
- zero: "%{count}tēmturi gaida"
+ one: "%{count} tēmturis rindā"
+ other: "%{count} tēmturi rindā"
+ zero: "%{count} tēmturu rindā"
pending_users_html:
one: "%{count}lietotājs gaida"
other: "%{count}lietotāji gaida"
@@ -373,7 +385,7 @@ lv:
title: Apelācijas
domain_allows:
add_new: Atļaut federāciju ar domēnu
- created_msg: Domēns ir veiksmīgi atļauts federācijai
+ created_msg: Domēns tika sekmīgi atļauts federācijai
destroyed_msg: Domēns ir aizliegts federācijai
export: Eksportēt
import: Importēt
@@ -399,7 +411,7 @@ lv:
import: Importēt
new:
create: Izveodot bloku
- hint: Domēna bloķēšana netraucēs izveidot kontu ierakstus datu bāzē, bet ar atpakaļejošu datumu un automātiski tiks piemērotas noteiktas moderēšanas metodes šajos kontos.
+ hint: Domēna aizturēšana netraucēs izveidot kontu ierakstus datubāzē, bet šajos kontos ar atpakaļejošu datumu un automātiski tiks piemērotas noteikti satura pārraudzības veidi.
severity:
desc_html: "Ierobežojums padarīs ziņas no šī domēna kontiem neredzamas ikvienam, kas tiem neseko. Apturēšana no tava servera noņems visu šī domēna kontu saturu, multividi un profila datus. Izmanto Nav, ja vēlies vienkārši noraidīt multivides failus."
noop: Neviens
@@ -411,9 +423,9 @@ lv:
obfuscate: Apslēpt domēna vārdu
obfuscate_hint: Daļēji apslēpt domēna nosaukumu sarakstā, ja ir iespējota domēna ierobežojumu saraksta reklamēšana
private_comment: Privāts komentārs
- private_comment_hint: Atstāj komentāru par šo domēna ierobežojumu moderatoru iekšējai lietošanai.
+ private_comment_hint: Atstāt piebildi par šo domēna ierobežojumu satura pārraudzītāju iekšējai lietošanai.
public_comment: Publisks komentārs
- public_comment_hint: Atstāj komentāru par šo domēna ierobežojumu plašai sabiedrībai, ja ir iespējota domēnu ierobežojumu saraksta reklamēšana.
+ public_comment_hint: Piebilde par šo domēna ierobežojumu vispārējai sabiedrībai, ja ir iespējota domēnu ierobežojumu saraksta reklamēšana.
reject_media: Noraidīt multivides failus
reject_media_hint: Noņem lokāli saglabātos multivides failus un atsaka tos lejupielādēt nākotnē. Nav nozīmes apturēšanai
reject_reports: Noraidīt ziņojumus
@@ -427,6 +439,7 @@ lv:
one: "%{count} mēģinājums pagājušajā nedēļā"
other: "%{count} reģistrēšanās mēģinājumi pagājušajā nedēļā"
zero: "%{count} mēģinājumu pagājušajā nedēļā"
+ created_msg: Sekmīgi liegts e-pasta domēns
delete: Dzēst
dns:
types:
@@ -435,8 +448,10 @@ lv:
new:
create: Pievienot domēnu
resolve: Atrisināt domēnu
+ title: Liegt jaunu e-pasta domēnu
not_permitted: Nav atļauta
resolved_through_html: Atrisināts, izmantojot %{domain}
+ title: Bloķētie e-pasta domēni
export_domain_allows:
new:
title: Importēt domēnu atļaujas
@@ -476,7 +491,7 @@ lv:
zero: Neizdevušies mēģinājumi %{count} dienās.
no_failures_recorded: Nav reģistrētu kļūdu.
title: Pieejamība
- warning: Pēdējais mēģinājums izveidot savienojumu ar šo serveri ir bijis neveiksmīgs
+ warning: Pēdējais mēģinājums izveidot savienojumu ar šo serveri ir bijis nesekmīgs
back_to_all: Visas
back_to_limited: Ierobežotās
back_to_warning: Brīdinājums
@@ -522,7 +537,7 @@ lv:
moderation:
all: Visas
limited: Ierobežotās
- title: Moderācija
+ title: Satura pārraudzība
private_comment: Privāts komentārs
public_comment: Publisks komentārs
purge: Iztīrīt
@@ -545,7 +560,7 @@ lv:
title: Uzaicinājumi
ip_blocks:
add_new: Izveidot noteikumu
- created_msg: Veiksmīgi pievienots jauns IP noteikums
+ created_msg: Sekmīgi pievienota jauna IP kārtula
delete: Dzēst
expires_in:
'1209600': 2 nedēļas
@@ -577,19 +592,19 @@ lv:
status: Statuss
title: Releji
report_notes:
- created_msg: Ziņojuma piezīme ir veiksmīgi izveidota!
- destroyed_msg: Ziņojuma piezīme ir veiksmīgi izdzēsta!
+ created_msg: Ziņojuma piezīme sekmīgi izveidota.
+ destroyed_msg: Ziņojuma piezīme sekmīgi izdzēsta.
reports:
account:
notes:
one: "%{count} piezīme"
other: "%{count} piezīmes"
zero: "%{count} piezīmju"
- action_log: Auditācijas pieraksti
+ action_log: Audita žurnāls
action_taken_by: Veiktā darbība
actions:
delete_description_html: Raksti, par kurām ziņots, tiks dzēsti, un tiks reģistrēts brīdinājums, lai palīdzētu tev izvērst turpmākos pārkāpumus saistībā ar to pašu kontu.
- mark_as_sensitive_description_html: Multividesu faili ziņojumos, par kuriem ziņots, tiks atzīmēti kā sensitīvi, un tiks reģistrēts brīdinājums, lai palīdzētu tev izvērst turpmākus pārkāpumus saistībā ar to pašu kontu.
+ mark_as_sensitive_description_html: Informācijas nesēji ierakstos, par kuriem ziņots, tiks atzīmēti kā jūtīgi, un tiks iegrāmatots brīdinājums, lai palīdzētu ziņot par turpmākiem tā paša konta pārkāpumiem.
other_description_html: Skatīt vairāk iespēju kontrolēt konta uzvedību un pielāgot saziņu ar paziņoto kontu.
resolve_description_html: Pret norādīto kontu netiks veiktas nekādas darbības, netiks reģistrēts brīdinājums, un ziņojums tiks slēgts.
silence_description_html: Konts būs redzams tikai tiem, kas tam jau seko vai meklē to manuāli, ievērojami ierobežojot tā sasniedzamību. To vienmēr var atgriezt. Tiek aizvērti visi šī konta pārskati.
@@ -600,7 +615,7 @@ lv:
add_to_report: Pievienot varāk paziņošanai
are_you_sure: Vai esi pārliecināts?
assign_to_self: Piešķirt man
- assigned: Piešķirtais moderators
+ assigned: Piešķirtais satura pārraudzītājs
by_target_domain: Ziņotā konta domēns
cancel: Atcelt
category: Kategorija
@@ -609,14 +624,14 @@ lv:
none: Neviens
comment_description_html: 'Lai sniegtu vairāk informācijas, %{name} rakstīja:'
confirm: Apstiprināt
- confirm_action: Apstipriniet regulēšanas darbību pret @%{acct}
+ confirm_action: Apstiprināt satura pārraudzības darbību pret @%{acct}
created_at: Ziņoti
delete_and_resolve: Izdzēst rakstus
forwarded: Pārsūtīti
forwarded_replies_explanation: Šis ziņojums ir no attāla lietotāja un par attālu saturu. Tas tika pārvirzīts šeit, jo saturs, par kuru tika ziņots, ir atbilde vienam no šī servera lietotājiem.
forwarded_to: Pārsūtīti %{domain}
mark_as_resolved: Atzīmēt kā atrisinātu
- mark_as_sensitive: Atzīmēt kā sensitīvu
+ mark_as_sensitive: Atzīmēt kā jūtīgu
mark_as_unresolved: Atzīmēt kā neatrisinātu
no_one_assigned: Neviena
notes:
@@ -624,10 +639,10 @@ lv:
create_and_resolve: Atrisināt ar piezīmi
create_and_unresolve: Atvērt atkārtoti ar piezīmi
delete: Dzēst
- placeholder: Apraksti veiktās darbības vai citus saistītus atjauninājumus...
+ placeholder: Jāapraksta veiktās darbības vai jebkuri citi saistītie atjauninājumi...
title: Piezīmes
- notes_description_html: Skati un atstāj piezīmes citiem moderatoriem un sev nākotnei
- processed_msg: 'Pārskats #%{id} veiksmīgi apstrādāts'
+ notes_description_html: Apskatīt un atstāt piezīmes citiem satura pārraudzītājiem un sev nākotnei
+ processed_msg: 'Ziņojums #%{id} sekmīgi apstrādāts'
quick_actions_description_html: 'Veic ātro darbību vai ritini uz leju, lai skatītu saturu, par kuru ziņots:'
remote_user_placeholder: attālais lietotājs no %{instance}
reopen: Atkārtoti atvērt ziņojumu
@@ -636,7 +651,7 @@ lv:
reported_by: Ziņoja
reported_with_application: Ziņots no lietotnes
resolved: Atrisināts
- resolved_msg: Ziņojums veiksmīgi atrisināts!
+ resolved_msg: Ziņojums sekmīgi atrisināts.
skip_to_actions: Pāriet uz darbībām
status: Statuss
statuses: Ziņotais saturs
@@ -644,12 +659,12 @@ lv:
summary:
action_preambles:
delete_html: 'Jūs gatavojaties noņemt dažas no lietotāja @%{acct} ziņām. Tas:'
- mark_as_sensitive_html: 'Jūs gatavojaties atzīmēt dažas no lietotāja @%{acct} ziņām kā sensitīvas. Tas:'
+ mark_as_sensitive_html: 'Tu gatavojies atzīmēt dažus no lietotāja @%{acct} ierakstiem kā jūtīgus. Tas:'
silence_html: 'Jūs gatavojaties ierobežot @%{acct} kontu. Tas:'
suspend_html: 'Jūs gatavojaties apturēt @%{acct} kontu. Tas:'
actions:
delete_html: Noņemt aizskarošās ziņas
- mark_as_sensitive_html: Atzīmēt aizskarošo ziņu multivides saturu kā sensitīvu
+ mark_as_sensitive_html: Atzīmēt aizskarošo ierakstu informācijas nesējus kā jūtīgus
silence_html: Ievērojami ierobežo @%{acct} sasniedzamību, padarot viņa profilu un saturu redzamu tikai cilvēkiem, kas jau seko tam vai pašrocīgi uzmeklē profilu
suspend_html: Apturēt @%{acct}, padarot viņu profilu un saturu nepieejamu un neiespējamu mijiedarbību ar
close_report: 'Atzīmēt ziņojumu #%{id} kā atrisinātu'
@@ -657,7 +672,7 @@ lv:
delete_data_html: Dzēsiet lietotāja @%{acct} profilu un saturu pēc 30 dienām, ja vien to darbība pa šo laiku netiks atcelta
preview_preamble_html: "@%{acct} saņems brīdinājumu ar šādu saturu:"
record_strike_html: Ierakstiet brīdinājumu pret @%{acct}, lai palīdzētu jums izvērst turpmākus pārkāpumus no šī konta
- warning_placeholder: Izvēles papildu pamatojums regulēšanas darbībai.
+ warning_placeholder: Izvēles papildu pamatojums satura pārraudzības darbībai.
target_origin: Ziņotā konta izcelsme
title: Ziņojumi
unassign: Atsaukt
@@ -672,10 +687,10 @@ lv:
other: "%{count} lietotāji"
zero: "%{count} lietotāju"
categories:
- administration: Administrēšana
+ administration: Pārvaldība
devops: DevOps
invites: Uzaicinājumi
- moderation: Moderācija
+ 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.
@@ -696,7 +711,7 @@ lv:
manage_announcements: Pārvaldīt Paziņojumus
manage_announcements_description: Ļauj lietotājiem pārvaldīt paziņojumus serverī
manage_appeals: Pārvaldīt Pārsūdzības
- manage_appeals_description: Ļauj lietotājiem izskatīt apelācijas pret regulēšanas darbībām
+ manage_appeals_description: Ļauj lietotājiem pārskatīt iebildumus pret satura pārraudzības darbībām
manage_blocks: Pārvaldīt Bloķus
manage_custom_emojis: Pārvaldīt Pielāgotās Emocijzīmes
manage_custom_emojis_description: Ļauj lietotājiem pārvaldīt pielāgotās emocijzīmes serverī
@@ -705,7 +720,7 @@ lv:
manage_invites: Pārvaldīt Uzaicinājumus
manage_invites_description: Ļauj lietotājiem pārlūkot un deaktivizēt uzaicinājuma saites
manage_reports: Pārvaldīt Pārskatus
- manage_reports_description: Ļauj lietotājiem pārskatīt pārskatus un veikt pret tiem regulēšanas darbības
+ manage_reports_description: Ļauj lietotājiem pārskatīt ziņojumus un veikt pret tiem satura pārraudzības darbības
manage_roles: Pārvaldīt Lomas
manage_roles_description: Ļauj lietotājiem pārvaldīt un piešķirt lomas, kas ir zemākas par viņu lomu
manage_rules: Pārvaldīt Noteikumus
@@ -713,10 +728,10 @@ lv:
manage_settings: Pārvaldīt Iestatījumus
manage_settings_description: Ļauj lietotājiem mainīt vietnes iestatījumus
manage_taxonomies: Pārvaldīt Taksonomijas
- manage_taxonomies_description: Ļauj lietotājiem pārskatīt aktuālāko saturu un atjaunināt atsauces iestatījumus
+ manage_taxonomies_description: Ļauj lietotājiem pārskatīt aktuālāko saturu un atjaunināt tēmturu iestatījumus
manage_user_access: Pārvaldīt Lietotāju Piekļuves
manage_users: Pārvaldīt Lietotājus
- manage_users_description: Ļauj lietotājiem skatīt citu lietotāju informāciju un veikt pret viņiem regulēšanas darbības
+ manage_users_description: Ļauj lietotājiem skatīt citu lietotāju informāciju un veikt pret viņiem satura pārraudzības darbības
manage_webhooks: Pārvaldīt Tīmekļa Aizķeres
manage_webhooks_description: Ļauj lietotājiem iestatīt tīmekļa aizķeres administratīviem pasākumiem
view_audit_log: Skatīt Audita Žurnālu
@@ -729,13 +744,13 @@ lv:
rules:
add_new: Pievienot noteikumu
delete: Dzēst
- description_html: Lai gan lielākā daļa apgalvo, ka ir izlasījuši pakalpojumu sniegšanas noteikumus un piekrīt tiem, parasti cilvēki to izlasa tikai pēc problēmas rašanās. Padariet vienkāršāku sava servera noteikumu uztveršanu, veidojot tos vienkāršā sarakstā pa punktiem. Centieties, lai atsevišķi noteikumi būtu īsi un vienkārši, taču arī nesadaliet tos daudzos atsevišķos vienumos.
+ description_html: Kaut arī lielākā daļa apgalvo, ka ir lasījuši un piekrīt pakalpojuma izmantošanas noteikumiem, parasti cilvēki tos neizlasa, līdz rodas sarežģījumi. Padari vienkāršāku sava servera noteikumu pārskatīšanu, sniedzot tos vienkāršā uzsvēruma punktu sarakstā! Jāmēģina atsevišķus noteikumus veidot īsus un vienkāršus, bet jāmēģina arī tos nesadalīt daudzos atsevišķos vienumos.
edit: Labot nosacījumu
- empty: Servera noteikumi vēl nav definēti.
+ empty: Vēl nav pievienots neviens servera noteikums.
title: Servera noteikumi
settings:
about:
- manage_rules: Pārvaldīt servera nosacījumus
+ manage_rules: Pārvaldīt servera noteikumus
preamble: Sniedz padziļinātu informāciju par to, kā serveris tiek darbināts, moderēts un finansēts.
rules_hint: Noteikumiem, kas taviem lietotājiem ir jāievēro, ir īpaša sadaļa.
title: Par
@@ -750,7 +765,7 @@ lv:
title: Pieprasīt jaunajiem lietotājiem atrisināt CAPTCHA, lai apstiprinātu savu kontu
content_retention:
danger_zone: Bīstama sadaļa
- preamble: Kontrolē, kā Mastodon tiek glabāts lietotāju ģenerēts saturs.
+ preamble: Pārraugi, kā Mastodon tiek glabāts lietotāju izveidots saturs!
title: Satura saglabāšana
default_noindex:
desc_html: Ietekmē visus lietotājus, kuri paši nav mainījuši šo iestatījumu
@@ -769,6 +784,7 @@ lv:
disabled: Nevienam
users: Vietējiem reģistrētiem lietotājiem
registrations:
+ moderation_recommandation: Lūgums nodrošināt, ka Tev ir pieņemama un atsaucīga satura pārraudzības komanda, pirms padari reģistrēšanos visiem pieejamu.
preamble: Kontrolē, kurš var izveidot kontu tavā serverī.
title: Reģistrācijas
registrations_mode:
@@ -776,6 +792,7 @@ lv:
approved: Reģistrācijai nepieciešams apstiprinājums
none: Neviens nevar reģistrēties
open: Jebkurš var reģistrēties
+ warning_hint: Mēs iesakām izmantot "Nepieciešams reģistrēšanās apstiprinājums", izņemot, ja esi pārliecināts, ka Tava satura pārraudzības komanda var laicīgi apstrādāt mēstules un ļaunprātīgas reģistrācijas.
security:
authorized_fetch: Pieprasīt autentifikāciju no federētajiem serveriem
authorized_fetch_hint: Pieprasot autentifikāciju no federētajiem serveriem, tiek nodrošināta stingrāka gan lietotāja līmeņa, gan servera līmeņa bloku izpilde. Tomēr tas ir saistīts ar izpildes sodu, samazina tavu atbilžu sasniedzamību un var radīt saderības problēmas ar dažiem federētajiem pakalpojumiem. Turklāt tas netraucēs īpašiem dalībniekiem ienest tavas publiskās ziņas un kontus.
@@ -784,7 +801,7 @@ lv:
title: Servera iestatījumi
site_uploads:
delete: Dzēst augšupielādēto failu
- destroyed_msg: Vietnes augšupielāde ir veiksmīgi izdzēsta!
+ destroyed_msg: Vietnes augšupielāde sekmīgi izdzēsta.
software_updates:
critical_update: Kritiski - lūdzu, ātri atjaunini
documentation_link: Uzzināt vairāk
@@ -817,7 +834,7 @@ lv:
original_status: Oriģinālā ziņa
reblogs: Reblogi
status_changed: Ziņa mainīta
- title: Konta ziņas
+ title: Konta ieraksti
trending: Aktuāli
visibility: Redzamība
with_media: Ar multividi
@@ -825,9 +842,9 @@ lv:
actions:
delete_statuses: "%{name} izdzēsa %{target} publikācijas"
disable: "%{name} iesaldēja %{target} kontu"
- mark_statuses_as_sensitive: "%{name} atzīmēja %{target} ziņu kā sensitīvu"
+ mark_statuses_as_sensitive: "%{name} atzīmēja %{target} ierakstu kā jūtīgu"
none: "%{name} nosūtīja brīdinājumu %{target}"
- sensitive: "%{name} atzīmēja %{target} kontu kā sensitīvu"
+ sensitive: "%{name} atzīmēja %{target} kontu kā jūtīgu"
silence: "%{name} ierobežoja %{target} kontu"
suspend: "%{name} apturēja %{target} kontu"
appeal_approved: Pārsūdzēts
@@ -835,7 +852,7 @@ lv:
appeal_rejected: Apelācija noraidīta
system_checks:
database_schema_check:
- message_html: Notiek datubāzu migrācijas. Lūdzu, palaid tās, lai nodrošinātu, ka lietojumprogramma darbojas, kā paredzēts
+ message_html: Ir nepabeigtas datubāzes migrācijas. Lūgums palaist tās, lai nodrošinātu, ka lietotne darbojas, kā paredzēts
elasticsearch_health_red:
message_html: Elasticsearch klasteris ir neveselīgs (sarkans statuss), meklēšanas līdzekļi nav pieejami
elasticsearch_health_yellow:
@@ -856,10 +873,13 @@ lv:
message_html: 'Nesaderīga Elasticsearch versija: %{value}'
version_comparison: Darbojas Elasticsearch %{running_version}, tomēr ir nepieciešama %{required_version}
rules_check:
- action: Pārvaldīt servera nosacījumus
- message_html: Tu neesi definējis nevienu servera nosacījumu.
+ action: Pārvaldīt servera noteikumus
+ message_html: Nav pievienots neviens servera noteikums.
sidekiq_process_check:
message_html: Rindā(s) %{value} nedarbojas neviens Sidekiq process. Lūdzu, pārskati savu Sidekiq konfigurāciju
+ software_version_check:
+ action: Skatīt pieejamos atjauninājumus
+ message_html: Pieejams Mastodon atjauninājums.
software_version_critical_check:
action: Skatīt pieejamos atjauninājumus
message_html: Ir pieejams kritisks Mastodon atjauninājums. Lūdzu, atjaunini to pēc iespējas ātrāk.
@@ -879,22 +899,31 @@ lv:
review_requested: Pieprasīta pārskatīšana
reviewed: Pārskatīts
title: Stāvoklis
+ unreviewed: Nepārskatīts
+ usable: Izmantojams
name: Nosaukums
newest: Jaunākie
oldest: Vecākie
+ open: Apskatīt publiski
reset: Atiestatīt
review: Pārskatīt stāvokli
search: Meklēt
title: Tēmturi
updated_msg: Tēmtura iestatījumi ir veiksmīgi atjaunināti
- title: Administrēšana
+ title: Pārvaldība
trends:
allow: Atļaut
approved: Apstiprināts
+ confirm_allow: Vai tiešām atļaut atlasītos tēmturus?
+ confirm_disallow: Vai tiešām neatļaut atlasītās birkas?
disallow: Neatļaut
links:
allow: Atļaut saiti
allow_provider: Atļaut publicētāju
+ confirm_allow: Vai tiešām atļaut atlasītās saites?
+ confirm_allow_provider: Vai tiešām atļaut atlasītos nodrošinātājus?
+ confirm_disallow: Vai tiešām neatļaut atlasītās saites?
+ confirm_disallow_provider: Vai tiešām neatļaut atlasītos nodrošinātājus?
description_html: Šīs ir saites, kuras pašlaik bieži koplieto konti, no kuriem Tavs serveris redz ziņas. Tas var palīdzēt Taviem lietotājiem uzzināt, kas notiek pasaulē. Neviena saite netiek publiski rādīta, līdz tu apstiprini izdevēju. Tu vari arī atļaut vai noraidīt atsevišķas saites.
disallow: Neatļaut saiti
disallow_provider: Neatļaut publicētāju
@@ -919,6 +948,10 @@ lv:
statuses:
allow: Ļaut veikt ierakstus
allow_account: Atļaut autoru
+ confirm_allow: Vai tiešām atļaut atlasītos stāvokļus?
+ confirm_allow_account: Vai tiešām atļaut atlasītos kontus?
+ confirm_disallow: Vai tiešām neatļaut atlasītos stāvokļus?
+ confirm_disallow_account: Vai tiešām neatļaut atlasītos kontus?
description_html: Šie ir ieraksti, par kuriem zina Tavs serveris un kuri pašlaik tiek daudz kopīgoti un pievienoti izlasēm. Tas var palīdzēt jaunajiem lietotājiem un tiem, kuri atgriežas, atrast vairāk cilvēku, kam sekot. Neviens ieraksts netiek publiski rādīts, līdz apstiprināsi autoru un ja autors ļauj savu kontu ieteikt citiem. Tu vari arī atļaut vai noraidīt atsevišķus ierakstus.
disallow: Neļaut veikt ierakstus
disallow_account: Neatļaut autoru
@@ -953,6 +986,7 @@ lv:
one: Pēdējās nedēļas laikā izmantoja viens cilvēks
other: Pēdējās nedēļas laikā izmantoja %{count} cilvēki
zero: Pēdējās nedēļas laikā izmantoja %{count} cilvēku
+ title: Ieteikumi un pašlaik populāri
trending: Populārākie
warning_presets:
add_new: Pievienot jaunu
@@ -963,7 +997,7 @@ lv:
webhooks:
add_new: Pievienot galapunktu
delete: Dzēst
- description_html: Izmantojot tīmekļa aizķeri, Mastodon var nosūtīt jūsu lietojumprogrammai reāllaika paziņojumus par izvēlētajiem notikumiem, lai tava lietojumprogramma varētu automātiski izraisīt reakcijas.
+ description_html: "Tīmekļa aizķere ļauj Mastodon nosūtīt reāllaika paziņojumus Tavai lietotnei par izvēlētajiem notikumiem, lai Tava lietotne varētu automātiski izraisīt atbildes darbības."
disable: Atspējot
disabled: Atspējots
edit: Labot galapunktu
@@ -982,18 +1016,20 @@ lv:
title: Tīmekļa āķi
webhook: Tīmekļa āķis
admin_mailer:
+ auto_close_registrations:
+ body: Nesenu satura pārraudzības darbību trūkuma dēļ reģistrācija %{instance} ir automātiski pārslēgta nepieciešamība pēc pašrocīgas izskatīšanas, lai novērstu %{instance} izmantošana kā platformu iespējami sliktiem dalībniekiem. Jebkurā brīdī var ieslēgt atpakaļ atvērtu reģistrēšanos.
new_appeal:
actions:
delete_statuses: lai izdzēstu viņu ierakstus
disable: lai iesaldētu viņu kontu
- mark_statuses_as_sensitive: lai atzīmētu viņu ziņas kā sensitīvas
+ mark_statuses_as_sensitive: lai atzīmētu viņu ierakstus kā jūtīgus
none: brīdinājums
- sensitive: lai atzīmētu viņu kontu kā sensitīvu
+ sensitive: lai atzīmētu viņu kontu kā jūtīgu
silence: lai ierobežotu viņu kontu
suspend: lai apturētu viņu kontu
- body: "%{target} pārsūdzēja %{action_taken_by} moderēšanas lēmumu no %{date}, kas bija %{type}. Viņi rakstīja:"
- next_steps: Varat apstiprināt apelāciju, lai atsauktu regulēšanas lēmumu, vai ignorēt to.
- subject: "%{username} pārsūdz moderēšanas lēmumu par %{instance}"
+ body: "%{target} iebilst %{action_taken_by} satura pārraudzības lēmumam no %{date}, kas bija %{type}. Viņi rakstīja:"
+ next_steps: Vari apstiprināt iebildumu, lai atsauktu satura pārraudzības lēmumu, vai neņemt to vērā.
+ subject: "%{username} iebilst satura pārraudzības lēmumam par %{instance}"
new_critical_software_updates:
body: Ir izlaistas jaunas Mastodon svarīgās versijas, iespējams, vēlēsies to atjaunināt pēc iespējas ātrāk!
subject: "%{instance} ir pieejami svarīgi Mastodon atjauninājumi!"
@@ -1018,8 +1054,8 @@ lv:
subject: Tiek pārskatītas jaunas tendences %{instance}
aliases:
add_new: Izveidot aizstājvārdu
- created_msg: Veiksmīgi izveidots jauns aizstājvārds. Tagad vari sākt pārvietošanu no vecā konta.
- deleted_msg: Aizstājvārds tika veiksmīgi noņemts. Pāreja no šī konta uz šo vairs nebūs iespējama.
+ created_msg: Sekmīgi izveidots jauns aizstājvārds. Tagad vari uzsākt pārvietošanu no vecā konta.
+ deleted_msg: Aizstājvārds tika sekmīgi noņemts. Pāreja no tā konta uz šo vairs nebūs iespējama.
empty: Tev nav aizstājvārdu.
hint_html: Ja vēlies pāriet no cita konta uz šo, šeit vari izveidot aizstājvārdu, kas ir nepieciešams, lai varētu turpināt sekotāju pārvietošanu no vecā konta uz šo. Šī darbība pati par sevi ir nekaitīga un atgriezeniska. Konta migrācija tiek sākta no vecā konta.
remove: Atsaistīt aizstājvārdu
@@ -1033,7 +1069,7 @@ lv:
body: Mastodon ir tulkojuši brīvprātīgie.
guide_link: https://crowdin.com/project/mastodon
guide_link_text: Ikviens var piedalīties.
- sensitive_content: Sensitīvs saturs
+ sensitive_content: Jūtīgs saturs
application_mailer:
notification_preferences: Mainīt e-pasta uztādījumus
salutation: "%{name},"
@@ -1043,11 +1079,11 @@ lv:
view_profile: Skatīt profilu
view_status: Skatīt ziņu
applications:
- created: Lietojumprogramma ir veiksmīgi izveidota
- destroyed: Lietojumprogramma ir veiksmīgi dzēsta
+ created: Lietotne sekmīgi izveidota
+ destroyed: Lietotnes sekmīgi izdzēsta
logout: Iziet
- regenerate_token: Atjaunot piekļuves marķieri
- token_regenerated: Piekļuves marķieris veiksmīgi atjaunots
+ regenerate_token: Atkārtoti izveidot piekļuves pilnvaru
+ token_regenerated: Piekļuves pilnvara sekmīgi izveidota no jauna
warning: Esi ļoti uzmanīgs ar šiem datiem. Nekad nedalies ne ar vienu ar tiem!
your_token: Tavs piekļuves marķieris
auth:
@@ -1076,7 +1112,7 @@ lv:
dont_have_your_security_key: Vai tev nav drošības atslēgas?
forgot_password: Aizmirsi paroli?
invalid_reset_password_token: Paroles atiestatīšanas pilnvara nav derīga, vai tai ir beidzies derīgums. Lūdzu, pieprasi jaunu.
- link_to_otp: Jāievada divpakāpju kods no tālruņa vai atkopšanas kods
+ link_to_otp: Jāievada divpakāpju kods no tālruņa vai atkpes kods
link_to_webauth: Lieto savu drošības atslēgas iekārtu
log_in_with: Pieslēgties ar
login: Pieteikties
@@ -1101,24 +1137,24 @@ lv:
accept: Pieņemt
back: Atpakaļ
invited_by: 'Tu vari pievienoties %{domain}, pateicoties uzaicinājumam, ko saņēmi no:'
- preamble: Tos iestata un ievieš %{domain} moderatori.
- preamble_invited: Pirms turpināt, lūdzu, apsver galvenos noteikumus, ko noteikuši %{domain} moderatori.
+ preamble: Tos iestata un ievieš %{domain} satura pārraudzītāji.
+ preamble_invited: Pirms turpināt, lūgums apsvērt pamatnoteikumus, kurus norādījuši %{domain} satura pārraudzītāji.
title: Daži pamatnoteikumi.
title_invited: Tu esi uzaicināts.
security: Drošība
set_new_password: Iestatīt jaunu paroli
setup:
email_below_hint_html: Jāpārbauda sava surogātpasta mape vai jāpieprasa vēl vienu! Savu e-pasta adresi var labot, ja tā ir nepareiza.
- email_settings_hint_html: Noklikšķini uz saites, kuru mēs tev nosūtījām, lai apstiprinātu %{email}. Mēs tepat pagaidīsim.
+ email_settings_hint_html: Jāatver saite, kuru mēs nosūtījām, lai apliecinātu %{email}. Mēs pagaidīsim tepat.
link_not_received: Vai nesaņēmi sati?
new_confirmation_instructions_sent: Pēc dažām minūtēm saņemsi jaunu e-pasta ziņojumu ar apstiprinājuma saiti.
title: Pārbaudi savu iesūtni
sign_in:
preamble_html: Jāpiesakās ar saviem %{domain} piekļuves datiem. Ja konts tiek mitināts citā serverī, šeit nevarēs pieteikties.
- title: Pierakstīties %{domain}
+ title: Pieteikties %{domain}
sign_up:
- manual_review: Reģistrācijas domēnā %{domain} manuāli pārbauda mūsu moderatori. Lai palīdzētu mums apstrādāt tavu reģistrāciju, uzraksti mazliet par sevi un to, kāpēc vēlies kontu %{domain}.
- preamble: Ar kontu šajā Mastodon serverī varēsi sekot jebkuram citam tīklā esošam cilvēkam neatkarīgi no tā, kur tiek mitināts viņa konts.
+ manual_review: Reģistrāciju %{domain} pašrocīgi izskata mūsu satura pārraudzītāji. Lai palīdzētu mums apstrādāt Tavu reģistrāciju, uzraksti mazliet par sevi un to, kāpēc vēlies kontu %{domain}!
+ preamble: Ar kontu šajā Mastodon serverī varēsi sekot jebkuram citam tīklā esošam cilvēkam neatkarīgi no tā, kur tiek mitināts tā konts.
title: Atļauj tevi iestatīt %{domain}.
status:
account_status: Konta statuss
@@ -1165,7 +1201,7 @@ lv:
confirm_password: Ievadi savu pašreizējo paroli, lai pārbaudītu savu identitāti
confirm_username: Ievadi savu lietotājvārdu, lai apstiprinātu procedūru
proceed: Dzēst kontu
- success_msg: Tavs konts tika veiksmīgi dzēsts
+ success_msg: Tavs konts tika sekmīgi izdzēsts
warning:
before: 'Pirms turpināšanas lūgums uzmanīgi izlasīt šīs piezīmes:'
caches: Citu serveru kešatmiņā saglabātais saturs var saglabāties
@@ -1181,7 +1217,7 @@ lv:
strikes:
action_taken: Veiktā darbība
appeal: Apelācija
- appeal_approved: Šis brīdinājums ir veiksmīgi pārsūdzēts un vairs nav spēkā
+ appeal_approved: Šis brīdinājums tika sekmīgi pārsūdzēts un vairs nav spēkā
appeal_rejected: Apelācija ir noraidīta
appeal_submitted_at: Apelācija iesniegta
appealed_msg: Jūsu apelācija ir iesniegta. Ja tā tiks apstiprināta, jums tiks paziņots.
@@ -1199,9 +1235,9 @@ lv:
title_actions:
delete_statuses: Ziņas noņemšana
disable: Konta iesaldēšana
- mark_statuses_as_sensitive: Ziņu atzīmēšana kā sensitīvas
+ mark_statuses_as_sensitive: Ierakstu atzīmēšana kā jūtīgus
none: Brīdinājums
- sensitive: Konta atzīmēšana kā sensitīvs
+ sensitive: Konta atzīmēšana kā jūtīgu
silence: Konta ierobežošana
suspend: Konta apturēšana
your_appeal_approved: Jūsu apelācija ir apstiprināta
@@ -1305,7 +1341,7 @@ lv:
other: Atlasīti visi %{count} vienumi, kas atbilst tavam meklēšanas vaicājumam.
zero: Atlasīts %{count} vienumu, kas atbilst tavam meklēšanas vaicājumam.
cancel: Atcelt
- changes_saved_msg: Izmaiņas veiksmīgi saglabātas!
+ changes_saved_msg: Izmaiņas sekmīgi saglabātas.
confirm: Apstiprināt
copy: Kopēt
delete: Dzēst
@@ -1338,19 +1374,19 @@ lv:
overwrite: Pārrakstīt
overwrite_long: Nomainīt pašreizējos ierakstus ar jauniem
overwrite_preambles:
- blocking_html: Tu gatavojies aizstāt savu bloķēto sarakstu ar līdz pat %{total_items} kontiem no %{filename}.
- bookmarks_html: Tu gatavojies aizstāt savas bloķētās izlases ar līdz pat %{total_items} ziņām no %{filename}.
- domain_blocking_html: Tu gatavojies aizstāt savu bloķēto domēnu sarakstu ar līdz pat %{total_items} domēniem no %{filename}.
+ blocking_html: Tu gatavojies aizstāt savu lieguma sarakstu ar līdz pat %{total_items} kontiem no %{filename}.
+ bookmarks_html: Tu gatavojies aizstāt savas grāmatzīmes ar līdz pat %{total_items} ierakstiem no %{filename}.
+ domain_blocking_html: Tu gatavojies aizstāt savu liegto domēnu sarakstu ar līdz pat %{total_items} domēniem no %{filename}.
following_html: Tu gatavojies sekot līdz pat %{total_items} kontiem no %{filename} un pārtrauksi sekot citiem.
- lists_html: Tu gatavojies aizstāt savus sarakstus ar %{filename} saturu. Līdz %{total_items} kontiem tiks pievienoti jauni saraksti.
- muting_html: Tu gatavojies aizstāt savu noklusināto kontu sarakstu ar līdz pat %{total_items} kontiem no %{filename}.
+ lists_html: Tu gatavojies aizstāt savus sarakstus ar %{filename} saturu. Līdz %{total_items} konti tiks pievienoti jaunajos sarakstos.
+ muting_html: Tu gatavojies aizstāt savu apklusināto kontu sarakstu ar līdz pat %{total_items} kontiem no %{filename}.
preambles:
- blocking_html: Tu gatavojies bloķēt līdz pat %{total_items} kontiem no %{filename}.
- bookmarks_html: Tu gatavojies pievienot līdz pat %{total_items} ziņām no %{filename} savām grāmatzīmēm.
- domain_blocking_html: Tu gatavojies bloķēt līdz pat %{total_items} domēniem no %{filename}.
+ blocking_html: Tu gatavojies liegt līdz pat %{total_items} kontus no %{filename}.
+ bookmarks_html: Tu gatavojies pievienot līdz pat %{total_items} ierakstus no %{filename} savām grāmatzīmēm.
+ domain_blocking_html: Tu gatavojies liegt līdz pat %{total_items} domēnus no %{filename}.
following_html: Tu gatavojies sekot līdz pat %{total_items} kontiem no %{filename}.
- lists_html: Tu gatavojies pievienot līdz pat %{total_items} kontiem no %{filename} saviem sarakstiem. Jauni saraksti tiks izveidoti, ja nav saraksta, ko pievienot.
- muting_html: Tu gatavojies noklusināt līdz pat %{total_items} kontiem no %{filename}.
+ lists_html: Tu gatavojies pievienot līdz pat %{total_items} kontus no %{filename} saviem sarakstiem. Jauni saraksti tiks izveidoti, ja nav saraksta, kurā pievienot.
+ muting_html: Tu gatavojies apklusināt līdz pat %{total_items} kontus no %{filename}.
preface: Tu vari ievietot datus, kurus esi izguvis no cita servera, kā, piemēram, cilvēku sarakstu, kuriem Tu seko vai kurus bloķē.
recent_imports: Nesen importēts
states:
@@ -1359,7 +1395,7 @@ lv:
scheduled: Ieplānots
unconfirmed: Neapstiprināti
status: Statuss
- success: Tavi dati tika veiksmīgi augšupielādēti un tiks apstrādāti noteiktajā laikā
+ success: Tavi dati tika sekmīgi augšupielādēti un tiks apstrādāti noteiktajā laikā
time_started: Sākuma laiks
titles:
blocking: Importē bloķētos kontus
@@ -1391,7 +1427,7 @@ lv:
'604800': 1 nedēļa
'86400': 1 diena
expires_in_prompt: Nekad
- generate: Ģenerēt uzaicinājuma saiti
+ generate: Izveidot uzaicinājuma saiti
invalid: Šis uzaicinājums nav derīgs
invited_by: 'Tevi uzaicināja:'
max_uses:
@@ -1399,7 +1435,7 @@ lv:
other: "%{count} lietojumi"
zero: "%{count} lietojumu"
max_uses_prompt: Nav ierobežojuma
- prompt: Izveido un kopīgo saites ar citiem, lai piešķirtu piekļuvi šim serverim
+ prompt: Jāizveido un jākopīgo saites ar citiem, lai nodrošinātu piekļuvi šim serverim
table:
expires_at: Beidzas
uses: Lieto
@@ -1415,13 +1451,20 @@ lv:
webauthn: drošības atslēgas
description_html: Ja pamani darbības, kuras neatpazīsti, jāapsver iespēja nomainīt savu paroli un iespējot divpakāpju autentifikāciju.
empty: Nav pieejama autentifikācijas vēsture
- failed_sign_in_html: Neizdevies pierakstīšanās mēģinājums ar %{method} no %{ip} (%{browser})
- successful_sign_in_html: Veiksmīga pierakstīšanās ar %{method} no %{ip} (%{browser})
+ failed_sign_in_html: Neizdevies pieteikšanās mēģinājums ar %{method} no %{ip} (%{browser})
+ successful_sign_in_html: Sekmīga pieteikšanās ar %{method} no %{ip} (%{browser})
title: Autentifikācijas vēsture
mail_subscriptions:
unsubscribe:
action: Jā, atcelt abonēšanu
complete: Anulēts
+ emails:
+ notification_emails:
+ favourite: izlases paziņojumu e-pasta ziņojumi
+ follow: sekošanas paziņojumu e-pasta ziņojumi
+ follow_request: sekošanas pieprasījumu e-pasta ziņojumi
+ mention: pieminēšanas paziņojumu e-pasta ziņojumi
+ reblog: pastiprinājumu paziņojumu e-pasta ziņojumi
title: Atcelt abonēšanu
media_attachments:
validations:
@@ -1460,7 +1503,7 @@ lv:
other_data: Nekādi citi dati netiks automātiski pārvietoti
redirect: Tava pašreizējā konta profils tiks atjaunināts ar novirzīšanas paziņojumu un tiks izslēgts no meklēšanas
moderation:
- title: Moderācija
+ title: Satura pārraudzība
move_handler:
carry_blocks_over_text: Šis lietotājs pārcēlās no %{acct}, kuru tu biji bloķējis.
carry_mutes_over_text: Šis lietotājs pārcēlās no %{acct}, kuru tu biji apklusinājis.
@@ -1502,6 +1545,7 @@ lv:
update:
subject: "%{name} laboja ierakstu"
notifications:
+ administration_emails: Pārvaldītāju e-pasta paziņojumi
email_events_hint: 'Atlasi notikumus, par kuriem vēlies saņemt paziņojumus:'
number:
human:
@@ -1514,10 +1558,10 @@ lv:
thousand: K
trillion: T
otp_authentication:
- code_hint: Lai apstiprinātu, ievadi autentifikācijas lietotnes ģenerēto kodu
- description_html: Jā iespējo divpakāpju autentifikāciju ar autentificēšanas lietotni, pieteikšanās laikā būs nepieciešams tālrunis, kurā tiks izveidoti ievadāmie kodi.
+ code_hint: Jāievada autentificētājlietotnes izveidotais kods, lai apstiprinātu
+ description_html: Jā iespējo divpakāpju autentifikāciju ar autentificētājlietotni, pieteikšanās laikā būs nepieciešams tālrunis, kurā tiks izveidoti ievadāmie kodi.
enable: Iespējot
- instructions_html: "Skenē šo QR kodu Google Authenticator vai līdzīgā TOTP lietotnē savā tālrunī. No šī brīža šī lietotne ģenerēs marķierus, kas tev būs jāievada, piesakoties."
+ instructions_html: "Šis kvadrātods savā tālrunī jānolasa ar Google Authenticator vai līdzīgu TOTP lietotni. No šī brīža šī lietotne veidos ciparvienības, kas būs jāievada piesakoties."
manual_instructions: 'Ja nevari noskenēt QR kodu un tas ir jāievada manuāli, šeit ir noslēpums vienkāršā tekstā:'
setup: Iestatīt
wrong_code: Ievadītais kods bija nederīgs. Vai servera un ierīces laiks ir pareizs?
@@ -1550,7 +1594,7 @@ lv:
reach: Sasniedzamība
reach_hint_html: Kontrolē, vai vēlies, lai tevi atklātu un sekotu jauni cilvēki. Vai vēlies, lai tavas ziņas tiktu parādītas ekrānā Izpēte? Vai vēlies, lai citi cilvēki tevi redzētu savos ieteikumos? Vai vēlies automātiski pieņemt visus jaunos sekotājus vai arī tev ir pilnīga kontrole pār katru?
search: Meklēt
- search_hint_html: Kontrolē, kā vēlies tikt atrasts. Vai vēlies, lai cilvēki tevi atrod pēc tā, ko esi publiski publicējis? Vai vēlies, lai cilvēki ārpus Mastodon atrastu tavu profilu, meklējot tīmeklī? Lūdzu, ņem vērā, ka nevar garantēt publiskas informācijas pilnīgu izslēgšanu no visām meklētājprogrammām.
+ search_hint_html: Nosaki, kā vēlies tikt atrasts! Vai vēlies, lai cilvēki Tevi atrod pēc tā, par ko esi veicis visiem redzamus ierakstus? Vai vēlies, lai cilvēki ārpus Mastodon atrastu Tavu profilu, meklējot tīmeklī? Lūdzu, ņem vērā, ka nevar nodrošināt visiem redzamas informācijas pilnīgu izslēgšanu no visām meklētājiem!
title: Privātums un sasniedzamība
privacy_policy:
title: Privātuma Politika
@@ -1587,8 +1631,8 @@ lv:
rss:
content_warning: 'Satura brīdinājums:'
descriptions:
- account: Publiskas ziņas no @%{acct}
- tag: 'Publiskas ziņas ar atzīmi #%{hashtag}'
+ account: Visiem redzami ieraksti no @%{acct}
+ tag: 'Visiem redzami ieraksti ar tēmturi #%{hashtag}'
scheduled_statuses:
over_daily_limit: Tu esi pārsniedzis šodien ieplānoto %{limit} ziņu ierobežojumu
over_total_limit: Tu esi pārsniedzis ieplānoto %{limit} ziņu ierobežojumu
@@ -1639,7 +1683,7 @@ lv:
windows_mobile: Windows Mobile
windows_phone: Windows Phone
revoke: Atsaukt
- revoke_success: Sesija veiksmīgi atsaukta
+ revoke_success: Sesija sekmīgi atsaukta
title: Sesijas
view_authentication_history: Skatīt sava konta autentifikācijas vēsturi
settings:
@@ -1652,6 +1696,7 @@ lv:
delete: Konta dzēšana
development: Izstrāde
edit_profile: Labot profilu
+ export: Izgūt
featured_tags: Piedāvātie tēmturi
import: Imports
import_and_export: Imports un eksports
@@ -1662,13 +1707,16 @@ lv:
relationships: Sekojamie un sekotāji
severed_relationships: Pārtrauktās attiecības
statuses_cleanup: Automātiska ziņu dzēšana
- strikes: Moderācijas aizrādījumi
+ strikes: Satura pārraudzības aizrādījumi
two_factor_authentication: Divpakāpju autentifikācija
webauthn_authentication: Drošības atslēgas
severed_relationships:
download: Lejupielādēt (%{count})
+ event_type:
+ user_domain_block: Jūs bloķējāt %{target_name}
lost_followers: Zaudētie sekotāji
lost_follows: Zaudētie sekojumi
+ preamble: Tu vari zaudēt sekojamos un sekotājus, kad liedz domēnu vai kad satura pārraudzītāji izlemj apturēt attālu serveri. Kad t as notiek, būs iespējams lejupielādēt sarakstus ar pārtrauktajām saiknēm, kurus tad var izpētīt un, iespējams, ievietot citā serverī.
type: Notikums
statuses:
attached:
@@ -1691,16 +1739,16 @@ lv:
disallowed_hashtags:
one: 'saturēja neatļautu tēmturi: %{tags}'
other: 'saturēja neatļautus tēmturus: %{tags}'
- zero: 'neatļauti tēmturi: %{tags}'
+ zero: 'saturēja neatļautus tēmturus: %{tags}'
edited_at_html: Labots %{date}
errors:
in_reply_not_found: Šķiet, ka ziņa, uz kuru tu mēģini atbildēt, nepastāv.
over_character_limit: pārsniegts %{max} rakstzīmju ierobežojums
pin_errors:
- direct: Ziņojumus, kas ir redzami tikai minētajiem lietotājiem, nevar piespraust
- limit: Tu jau esi piespraudis maksimālo ziņu skaitu
+ direct: Ierakstus, kas ir redzami tikai pieminētajiem lietotājiem, nevar piespraust
+ limit: Jau ir piesprausts lielākais iespējamais ierakstu skaits
ownership: Kāda cita ierakstu nevar piespraust
- reblog: Izceltu ierakstu nevar piespraust
+ reblog: Pastiprinātu ierakstu nevar piespraust
title: "%{name}: “%{quote}”"
visibilities:
direct: Tiešs
@@ -1709,7 +1757,7 @@ lv:
public: Publisks
public_long: Visi var redzēt
unlisted: Nerindota
- unlisted_long: Redzama visiem, bet nav iekļauta publiskajās ziņu lentās
+ unlisted_long: Redzams visiem, bet nav uzskaitīts visiem pieejamās laika joslās
statuses_cleanup:
enabled: Automātiski dzēst vecās ziņas
enabled_hint: Automātiski izdzēš tavas ziņas, tiklīdz tās sasniedz noteiktu vecuma slieksni, ja vien tās neatbilst kādam no tālāk norādītajiem izņēmumiem
@@ -1723,8 +1771,8 @@ lv:
keep_direct_hint: Nedzēš nevienu tavu tiešo ziņojumu
keep_media: Saglabāt ziņas ar multivides pielikumiem
keep_media_hint: Neizdzēš nevienu no tavām ziņām, kurām ir multivides pielikumi
- keep_pinned: Saglabāt piespraustās ziņas
- keep_pinned_hint: Nedzēš nevienu tavis piesprausto ziņu
+ keep_pinned: Paturēt piespraustos ierakstus
+ keep_pinned_hint: Neizdzēš nevienu no Tevis piespraustajiem ierakstiem
keep_polls: Saglabāt aptaujas
keep_polls_hint: Nedzēš nevienu tavu aptauju
keep_self_bookmark: Saglabāt ziņas, kuras esi pievienojis grāmatzīmēm
@@ -1746,7 +1794,7 @@ lv:
min_reblogs: Saglabāt ziņas izceltas vismaz
min_reblogs_hint: Neizdzēš nevienu no tavām ziņām, kas ir izceltas vismaz tik reižu. Atstāj tukšu, lai dzēstu ziņas neatkarīgi no to izcēlumu skaita
stream_entries:
- sensitive_content: Sensitīvs saturs
+ sensitive_content: Jūtīgs saturs
strikes:
errors:
too_late: Brīdinājuma apstrīdēšanas laiks ir nokavēts
@@ -1769,17 +1817,17 @@ lv:
two_factor_authentication:
add: Pievienot
disable: Atspējot 2FA
- disabled_success: Divpakāpju autentifikācija veiksmīgi atspējota
+ disabled_success: Divpakāpju autentificēšanās sekmīgi atspējota
edit: Labot
enabled: Divpakāpju autentifikācija ir iespējota
- enabled_success: Divpakāpju autentifikācija veiksmīgi iespējota
- generate_recovery_codes: Ģenerēt atkopšanas kodus
- lost_recovery_codes: Atkopšanas kodi ļauj atgūt piekļuvi tavam kontam, ja pazaudē tālruni. Ja esi pazaudējis atkopšanas kodus, tu vari tos ģenerēt šeit. Tavi vecie atkopšanas kodi tiks anulēti.
+ enabled_success: Divpakāpju autentificēšanās sekmīgi iespējota
+ generate_recovery_codes: Izveidot atkopes kodus
+ lost_recovery_codes: Atkopes kodi ļauj atgūt piekļuvi savam kontam, ja ir pazaudēts tālrunis. Ja ir pazaudēti atkopes kodi, tos var izveidot šeit. Iepriekšējie atkopšanas kodi kļūs nederīgi.
methods: Divpakāpju veidi
otp: Autentifikātora lietotne
- recovery_codes: Veidot atkopšanas kodu rezerves kopijas
- recovery_codes_regenerated: Atkopšanas kodi veiksmīgi atjaunoti
- recovery_instructions_html: Ja kādreiz zaudēsi piekļuvi savam tālrunim, vari izmantot kādu no tālāk norādītajiem atkopšanas kodiem, lai atgūtu piekļuvi savam kontam. Glabā atkopšanas kodus drošībā. Piemēram, tu vari tos izdrukāt un uzglabāt kopā ar citiem svarīgiem dokumentiem.
+ recovery_codes: Veidot atkopes kodu rezerves kopijas
+ recovery_codes_regenerated: Atkopes kodi sekmīgi izveidoti no jauna
+ recovery_instructions_html: Ja kādreiz zaudēsi piekļuvi savam tālrunim, vari izmantot kādu no zemāk norādītajiem atkopes kodiem, lai atgūtu piekļuvi savam kontam. Atkpes kodi jātur drošībā. Piemēram, tos var izdrukāt un glabāt kopā ar citiem svarīgiem dokumentiem.
webauthn: Drošības atslēgas
user_mailer:
appeal_approved:
@@ -1796,11 +1844,11 @@ lv:
title: Arhīva līdzņemšana
suspicious_sign_in:
change_password: mainīt paroli
- details: 'Šeit ir detalizēta informācija par pierakstīšanos:'
- explanation: Esam konstatējuši pierakstīšanos tavā kontā no jaunas IP adreses.
+ details: 'Šeit ir pieteikšanās izvērsums:'
+ explanation: Esam noteikuši pieteikšanos Tavā kontā no jaunas IP adreses.
further_actions_html: Ja tas nebiji tu, iesakām nekavējoties %{action} un iespējot divu faktoru autentifikāciju, lai tavs konts būtu drošībā.
subject: Tavam kontam ir piekļūts no jaunas IP adreses
- title: Jauna pierakstīšanās
+ title: Jauna pieteikšanās
warning:
appeal: Iesniegt apelāciju
appeal_description: Ja uzskatāt, ka tā ir kļūda, varat iesniegt apelāciju %{instance} darbiniekiem.
@@ -1808,10 +1856,10 @@ lv:
spam: Spams
violation: Saturs pārkāpj šādas kopienas pamatnostādnes
explanation:
- delete_statuses: Tika konstatēts, ka dažas no tavām ziņām pārkāpj vienu vai vairākas kopienas vadlīnijas, un rezultātā %{instance} moderatori tās noņēma.
+ delete_statuses: Tika noteikts, ka daži no Taviem ierakstiem pārkāpj vienu vai vairākas kopienas vadlīnijas, tādējādi tos noņēma %{instance} satura pārraudzītāji.
disable: Tu vairs nevari izmantot savu kontu, taču tavs profils un citi dati paliek neskarti. Tu vari pieprasīt savu datu dublējumu, mainīt konta iestatījumus vai dzēst kontu.
- mark_statuses_as_sensitive: "%{instance} moderatori dažus no Taviem ierakstiem ir atzīmējuši kā jutīgus. Tas nozīmē, ka cilvēkiem būs jāpiesit ierakstos esošajiem informāijas nesējiem, pirms tiek attēlots priekšskatījums. Tu arī pats vari atzīmēt informācijas nesēju kā jutīgu, kad nākotnē tādu ievietosi."
- sensitive: No šī brīža visi augšupielādētie multivides faili tiks atzīmēti kā sensitīvi un paslēpti aiz klikšķa brīdinājuma.
+ mark_statuses_as_sensitive: "%{instance} satura pārraudzītāji dažus no Taviem ierakstiem ir atzīmējuši kā jūtīgus. Tas nozīmē, ka cilvēkiem būs jāpiesit ierakstos esošajiem informāijas nesējiem, pirms tiek attēlots to priekšskatījums. Tu pats vari atzīmēt informācijas nesēju kā jūtīgu, kad nākotnē tādu ievietosi."
+ sensitive: Turpmāk visi augšupielādētās informācijas nesēju datnes tiks atzīmētas kā jūtīgas un paslēptas aiz klikšķināma brīdinājuma.
silence: Tu joprojām vari izmantot savu kontu, taču tikai tie cilvēki, kuri jau tev seko, redzēs tavas ziņas šajā serverī, un tev var tikt liegtas dažādas atklāšanas funkcijas. Tomēr citi joprojām var tev manuāli sekot.
suspend: Tu vairs nevari izmantot savu kontu, un tavs profils un citi dati vairs nav pieejami. Tu joprojām vari pieteikties, lai pieprasītu savu datu dublēšanu, līdz dati tiks pilnībā noņemti aptuveni 30 dienu laikā, taču mēs saglabāsim dažus pamata datus, lai neļautu tev izvairīties no apturēšanas.
reason: 'Iemesls:'
@@ -1819,17 +1867,17 @@ lv:
subject:
delete_statuses: Tavas ziņas %{acct} tika noņemtas
disable: Tavs konts %{acct} tika iesaldēts
- mark_statuses_as_sensitive: Tavas ziņas vietnē %{acct} ir atzīmētas kā sensitīvas
+ mark_statuses_as_sensitive: Tavi ieraksti %{acct} ir atzīmēti kā jūtīgi
none: Brīdinājums par %{acct}
- sensitive: Tavas ziņas vietnē %{acct} turpmāk tiks atzīmētas kā sensitīvas
+ sensitive: Tavi ieraksti %{acct} turpmāk tiks atzīmēti kā jūtīgi
silence: Tavs konts %{acct} tika ierobežots
suspend: Tava konta %{acct} darbība ir apturēta
title:
delete_statuses: Izdzēstās ziņas
disable: Konts iesaldēts
- mark_statuses_as_sensitive: Ziņas ir atzīmēts kā sensitīvas
+ mark_statuses_as_sensitive: Ieraksti atzīmēti kā jūtīgi
none: Brīdinājums
- sensitive: Konts ir atzīmēts kā sensitīvs
+ sensitive: Konts ir atzīmēts kā jūtīgs
silence: Konts ierobežots
suspend: Konts apturēts
welcome:
@@ -1842,7 +1890,8 @@ lv:
explanation: Šeit ir daži padomi, kā sākt darbu
feature_action: Uzzināt vairāk
feature_creativity: Mastodon nodrošina skaņas, video un attēlu ierakstus, pieejamības aprakstus, aptaujas, satura brīdinājumus, animētus profila attēlus, pielāgotas emocijzīmes, sīktēlu apgriešanas vadīklas un vēl, lai palīdzētu Tev sevi izpaust tiešsaistē. Vai Tu izplati savu mākslu, mūziku vai aplādes, Mastodon ir šeit ar Tevi.
- feature_moderation_title: Moderēšana, kādai tai būtu jābūt
+ feature_moderation: Mastodon nodod lēmumu pieņemšanu atpakaļ Tavās rokās. Katrs serveris izveido savus noteikumus un nosacījumus, kas tiek nodrošināti vietēji, ne kā lieliem uzņēmumiem piederošos sabiedriskajos medijiem, padarot katru serveri par vispielāgojamāko un visatsaucīgāko dažādu cilvēku kopu vajadzībām. Pievienojies serverim, kura noteikumiem Tu piekrīti, vai izvieto savu!
+ feature_moderation_title: Satura pārraudzība, kādai tai būtu jābūt
follow_action: Sekot
follow_step: Sekošana aizraujošiem cilvēkiem ir viss, par ko ir Mastodon.
follow_title: Pielāgo savu mājas barotni
@@ -1853,7 +1902,7 @@ lv:
one: "%{people} cilvēks pēdējās 2 dienās"
other: "%{people} cilvēki pēdējās 2 dienās"
zero: "%{people} cilvēku pēdējās divās dienās"
- hashtags_subtitle: Izpēti, kas pēdējās divās dienāš ir piesasitījis cilvēku uzmanību
+ hashtags_subtitle: Izpēti, kas pēdējās divās dienās ir piesasitījis cilvēku uzmanību
hashtags_title: Izplatīti tēmturi
hashtags_view_more: Skatīt vairāk izplatītu tēmturu
post_action: Rakstīt
@@ -1885,13 +1934,13 @@ lv:
add: Pievienot jaunu drošības atslēgu
create:
error: Pievienojot drošības atslēgu, radās problēma. Lūdzu mēģini vēlreiz.
- success: Tava drošības atslēga tika veiksmīgi pievienota.
+ success: Tava drošības atslēga tika sekmīgi pievienota.
delete: Dzēst
delete_confirmation: Vai tiešām vēlies dzēst šo drošības atslēgu?
description_html: Ja iespējosi drošības atslēgas autentifikāciju, piesakoties būs jāizmanto viena no tavām drošības atslēgām.
destroy:
error: Dzēšot tavu drošības atslēgu, radās problēma. Lūdzu mēģini vēlreiz.
- success: Tava drošības atslēga tika veiksmīgi izdēsta.
+ success: Tava drošības atslēga tika sekmīgi izdēsta.
invalid_credential: Nederīga drošības atslēga
nickname_hint: Ievadi savas jaunās drošības atslēgas segvārdu
not_enabled: Tu vel neesi iespējojis WebAuthn
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index bdc0475a6f..c27e5e5467 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -4,18 +4,25 @@ ml:
contact_missing: സജ്ജമാക്കിയിട്ടില്ല
contact_unavailable: ലഭ്യമല്ല
accounts:
+ followers:
+ one: പിന്തുടരാളി
+ other: പിന്തുടരുന്നവർ
following: പിന്തുടരുന്നു
last_active: അവസാനം സജീവമായിരുന്നത്
link_verified_on: സന്ധിയുടെ ഉടമസ്ഥാവസ്കാശം %{date} ൽ പരിശോധിക്കപ്പെട്ടു
nothing_here: ഇവിടെ ഒന്നുമില്ല!
posts_tab_heading: ടൂട്ടുകൾ
admin:
+ account_moderation_notes:
+ create: ഒരു കുറിപ്പു് വിടുക
accounts:
+ add_email_domain_block: ഈ ഇ-തപാൽ മേഖല തടസ്സപെടുത്തുക
approve: അംഗീകരിക്കുക
are_you_sure: നിങ്ങൾക്ക് ഉറപ്പാണോ?
avatar: അവതാർ
by_domain: മേഖല
change_email:
+ changed_msg: ഇ-തപാൽ ശരിയായിട്ടു് മാറ്റീ!
current_email: ഇപ്പോഴത്തെ ഇലക്ട്രോണിക് കത്തിന്റെ മേൽവിലാസം
label: മാറിയ ഇലക്ട്രോണിക് കത്തിന്റെ മേൽവിലാസം
new_email: പുതിയ ഇലക്ട്രോണിക് കത്ത്
@@ -24,6 +31,7 @@ ml:
confirm: നിജപ്പെടുത്തുക
confirmed: നിജപ്പെടുത്തി
confirming: സ്ഥിരീകരിക്കുന്നു
+ custom: സ്വന്തമായ ഭേദഗതി
delete: ഡാറ്റ ഇല്ലാതാക്കുക
deleted: മായിച്ചു
demote: തരം താഴ്ത്തുക
@@ -34,7 +42,9 @@ ml:
domain: മേഖല
edit: തിരുത്തുക
email: ഇമെയിൽ
+ email_status: ഇ-തപാൽ അവസ്ഥ
header: തലക്കെട്ട്
+ inbox_url: ഇ-തപാല്പെട്ടി വിലാസം
joined: ജോയിൻ ചെയ്തിരിക്കുന്നു
location:
all: എല്ലാം
@@ -46,9 +56,18 @@ ml:
all: എല്ലാം
suspended: താൽക്കാലികമായി നിർത്തി
title: മധ്യസ്ഥന്
+ protocol: പെരുമാറ്റച്ചട്ടം
+ public: പൊതുവു്
+ remove_header: തലക്കെട്ടു് മാറ്റുക
+ resend_confirmation:
+ send: ഉറപ്പിക്കൽ-വിലാസം വീണ്ടും അയക്കുക
reset: പുനഃക്രമീകരിക്കുക
reset_password: പാസ്വേഡ് പുനഃക്രമീകരിക്കുക
search: തിരയുക
+ security: സുരക്ഷ
+ security_measures:
+ only_password: രഹസ്യവാക്ക് മാത്രം
+ silence: അതിർ
title: അക്കൗണ്ടുകൾ
unconfirmed_email: സ്ഥിരീകരിക്കാത്ത ഇമെയിൽ
username: ഉപയോക്തൃനാമം
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 9994a34bb5..e0ebc2b175 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -756,7 +756,7 @@ ms:
remove_from_report: Alih keluar daripada laporan
report: Laporan
deleted: Dipadamkan
- favourites: Gemaran
+ favourites: Sukaan
history: Sejarah versi
in_reply_to: Membalas kepada
language: Bahasa
@@ -862,7 +862,7 @@ ms:
no_status_selected: Tiada pos sohor kini ditukar kerana tiada yang dipilih
not_discoverable: Pengarang tidak mengikut serta untuk dapat ditemui
shared_by:
- other: Dikongsi dan digemari %{friendly_count} kali
+ other: Dikongsi atau disukai %{friendly_count} kali
title: Hantaran hangat
tags:
current_score: Markah semasa %{score}
@@ -1301,6 +1301,9 @@ ms:
unsubscribe:
action: Ya, nyahlanggan
complete: Menyahlanggan
+ emails:
+ notification_emails:
+ favourite: emel pemberitahuan sukaan
title: Hentikan langganan
media_attachments:
validations:
@@ -1352,9 +1355,9 @@ ms:
sign_up:
subject: "%{name} telah mendaftar"
favourite:
- body: 'Pos anda telah digemari oleh %{name}:'
- subject: "%{name} menggemari siaran anda"
- title: Kegemaran baru
+ body: 'Hantaran anda disukai oleh %{name}:'
+ subject: "%{name} menyukai hantaran anda"
+ title: Sukaan baharu
follow:
body: "%{name} kini mengikuti anda!"
subject: "%{name} kini mengikuti anda"
@@ -1577,7 +1580,7 @@ ms:
enabled_hint: Memadamkan pos anda secara automatik setelah mereka mencapai ambang umur yang ditentukan, melainkan ia sepadan dengan salah satu pengecualian di bawah
exceptions: Pengecualian
explanation: Oleh kerana pemadaman pos adalah operasi yang mahal, ini dilakukan perlahan-lahan dari semasa ke semasa apabila server tidak sibuk. Atas sebab ini, pos anda mungkin dipadamkan seketika selepas ia mencapai ambang umur.
- ignore_favs: Abaikan kegemaran
+ ignore_favs: Abaikan sukaan
ignore_reblogs: Abaikan rangsangan
interaction_exceptions: Pengecualian berdasarkan interaksi
interaction_exceptions_explanation: Sila ambil perhatian bahawa tiada jaminan untuk pos dipadamkan jika ia berada di bawah ambang kegemaran atau tingkatkan selepas sekali melepasinya.
diff --git a/config/locales/nan.yml b/config/locales/nan.yml
new file mode 100644
index 0000000000..452824b984
--- /dev/null
+++ b/config/locales/nan.yml
@@ -0,0 +1,69 @@
+---
+nan:
+ about:
+ about_mastodon_html: 社交網路ê未來：Bô廣告、bô企業監控、設計有道德，兼非中心化！加入Mastodon，保有lí ê資料！
+ contact_missing: Iáu bē設定
+ contact_unavailable: 無開放
+ hosted_on: 佇 %{domain} 運作 ê Mastodon站
+ title: 關係本站
+ accounts:
+ followers:
+ other: 跟tuè ê
+ following: Leh跟tuè
+ last_active: 頂kái活動ê時間
+ link_verified_on: Tsit ê連結ê所有權佇 %{date} 受檢查
+ posts:
+ other: PO文
+ posts_tab_heading: PO文
+ admin:
+ account_moderation_notes:
+ create: 留記錄
+ created_msg: 管理記錄成功建立！
+ destroyed_msg: 管理記錄成功thâi掉！
+ accounts:
+ deleted: Thâi掉ah
+ demote: 降級
+ destroyed_msg: Teh-beh thâi掉 %{username} ê資料
+ disable: 冷凍
+ disable_sign_in_token_auth: 停止用電子phue ê token認證
+ disable_two_factor_authentication: 停止用2FA
+ disabled: 冷凍起來ah
+ display_name: 顯示ê名
+ domain: 域名
+ edit: 編輯
+ email: 電子phue箱
+ email_status: 電子phue ê狀態
+ enable: 取消冷凍
+ location:
+ all: Kui ê
+ local: 本地
+ remote: 別ê站
+ title: 位置
+ instances:
+ dashboard:
+ instance_languages_dimension: Tsia̍p用ê語言
+ statuses:
+ language: 語言
+ title: 口座ê PO文
+ trends:
+ tags:
+ dashboard:
+ tag_languages_dimension: Tsia̍p用ê語言
+ auth:
+ privacy_policy_agreement_html: 我有讀，同意隱私權政策
+ setup:
+ email_settings_hint_html: 請點gún所送ê連結來驗證 %{email}。Gún tī tsia等lí。
+ sign_up:
+ preamble: 用tī tsit臺Mastodon服侍器ê口座，lí thang跟tuè其他佇tsit ê網路ê lâng，無論in ê口座khǹg tī tueh。
+ imports:
+ overwrite_preambles:
+ blocking_html: Lí teh-beh用%{filename} 內底ê %{total_items} ê口座，替換lí ê封鎖列單。
+ preambles:
+ muting_html: Lí teh-beh kā %{filename}內底ê%{total_items} ê口座消音。
+ scheduled_statuses:
+ too_soon: 預定PO文ê時間kan-ta tī未來
+ statuses:
+ default_language: Kap界面ê語言sio kâng
+ user_mailer:
+ welcome:
+ sign_in_action: 登入
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 7681a04eae..f1de8265bf 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -21,6 +21,7 @@ nl:
one: Toot
other: Berichten
posts_tab_heading: Berichten
+ self_follow_error: Het volgen van je eigen account is niet toegestaan
admin:
account_actions:
action: Actie uitvoeren
@@ -1165,9 +1166,11 @@ nl:
use_security_key: Beveiligingssleutel gebruiken
author_attribution:
example_title: Voorbeeldtekst
- hint_html: Bepaal hoe we je vermelden, wanneer jouw links op Mastodon worden gedeeld.
+ hint_html: Schrijf je nieuws- of blogartikelen buiten Mastodon? Bepaal hoe je geattribueerd wordt als deze gedeeld worden op Mastodon.
+ instructions: 'Zorg ervoor dat deze code in de HTML van je artikel zit:'
more_from_html: Meer van %{name}
s_blog: De weblog van %{name}
+ then_instructions: Voeg vervolgens de domeinnaam van de publicatie toe in het onderstaande veld.
title: Auteur-attributie
challenge:
confirm: Doorgaan
@@ -1526,8 +1529,8 @@ nl:
title: Nieuw volgverzoek
mention:
action: Reageren
- body: 'Jij bent door %{name} vermeld in:'
- subject: Jij bent vermeld door %{name}
+ body: 'Je bent door %{name} vermeld in:'
+ subject: Je bent vermeld door %{name}
title: Nieuwe vermelding
poll:
subject: Een peiling van %{name} is beëindigd
@@ -1903,9 +1906,9 @@ nl:
feature_action: Meer informatie
feature_audience: Mastodon biedt je een unieke mogelijkheid om je publiek te beheren zonder tussenpersonen. Mastodon, geïmplementeerd in jouw eigen infrastructuur, stelt je in staat om elke andere Mastodon-server online te volgen en door hen gevolgd te worden, en staat onder controle van niemand, behalve die van jou.
feature_audience_title: Bouw jouw publiek in vertrouwen op
- feature_control: Je weet zelf het beste wat je op jouw tijdlijn wilt zien. Geen algoritmen of advertenties om je tijd te verspillen. Volg iedereen op elke Mastodon-server vanaf één account en ontvang hun berichten in chronologische volgorde, en maak jouw hoekje op het internet een beetje meer zoals jezelf.
+ feature_control: Je weet zelf het beste wat je op jouw starttijdlijn wilt zien. Geen algoritmen of advertenties om je tijd te verspillen. Volg iedereen op elke Mastodon-server vanaf één account en ontvang hun berichten in chronologische volgorde, en maak jouw hoekje op het internet een beetje meer zoals jezelf.
feature_control_title: Houd controle over je eigen tijdlijn
- feature_creativity: Mastodon ondersteunt audio-, video- en fotoberichten, toegankelijkheidsbeschrijvingen, peilingen, inhoudswaarschuwingen, geanimeerde profielfoto's, aangepaste lokale emoji's, controle over het bijwerken van thumbnails en meer, om je te helpen jezelf online uit te drukken. Of je nu jouw kunst, jouw muziek of jouw podcast publiceert, Mastodon staat voor je klaar.
+ feature_creativity: Mastodon ondersteunt audio-, video- en fotoberichten, toegankelijkheidsbeschrijvingen, peilingen, inhoudswaarschuwingen, geanimeerde profielfoto's, aangepaste lokale emoji's, controle over het bijwerken van miniaturen en meer, om je te helpen jezelf online uit te drukken. Of je nu jouw kunst, jouw muziek of jouw podcast publiceert, Mastodon staat voor je klaar.
feature_creativity_title: Ongeëvenaarde creativiteit
feature_moderation: Mastodon legt de besluitvorming weer in jouw handen. Elke server creëert diens eigen regels en voorschriften, die lokaal worden gehandhaafd en niet van bovenaf zoals sociale media van bedrijven, waardoor het het meest flexibel is in het reageren op de behoeften van verschillende groepen mensen. Word lid van een server met de regels waarmee je akkoord gaat, of host jouw eigen.
feature_moderation_title: Moderatie zoals het hoort
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 8f6afc2426..f316628f6d 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1,7 +1,7 @@
---
nn:
about:
- about_mastodon_html: 'Framtidas sosiale nettverk: Ingen annonsar, ingen verksemder som overvaker deg, etisk design og desentralisering! Eig idéane dine med Mastodon!'
+ about_mastodon_html: 'Framtidas sosiale nettverk: Ingen annonsar, ingen verksemder som overvaker deg, etisk design og desentralisering! Eig dataene dine med Mastodon!'
contact_missing: Ikkje sett
contact_unavailable: I/T
hosted_on: "%{domain} er vert for Mastodon"
@@ -21,6 +21,7 @@ nn:
one: Tut
other: Tut
posts_tab_heading: Tut
+ self_follow_error: Det er ikkje tillate å følgje din eigen konto
admin:
account_actions:
action: Utfør
@@ -39,7 +40,7 @@ nn:
avatar: Bilete
by_domain: Domene
change_email:
- changed_msg: Konto-e-posten er endra!
+ changed_msg: E-post for konto er endra!
current_email: Noverande e-post
label: Byt e-post
new_email: Ny e-post
@@ -62,7 +63,7 @@ nn:
disable: Slå av
disable_sign_in_token_auth: Slå av e-post-token-autentisering
disable_two_factor_authentication: Slå av 2FA
- disabled: Slege av
+ disabled: Inaktiv
display_name: Synleg namn
domain: Domene
edit: Rediger
@@ -689,10 +690,10 @@ nn:
moderation: Moderering
special: Særskild
delete: Slett
- description_html: Med brukarrollar kan du kontrollera kva funksjonar og område av Mastodon brukarane dine har tilgong til.
+ description_html: Med brukarroller kan du kontrollera kva funksjonar og område av Mastodon brukarane dine har tilgang til.
edit: Endr rollen '%{name}'
everyone: Standard-tillatelser
- everyone_full_description_html: Dette er grunnrollen som påverkar alle brukarar, jamvel dei utan ei tilsett rolle. Alle andre rollar arvar tillatingar frå denne.
+ everyone_full_description_html: Dette er grunnrolla som påverkar alle brukarar, jamvel dei utan ei tildelt rolle. Alle andre rollar arvar tilgangsløve frå denne.
permissions_count:
one: "%{count} tillatelse"
other: "%{count} tillatelser"
@@ -718,7 +719,7 @@ nn:
manage_reports: Handtere rapporteringar
manage_reports_description: Let brukarar gjennomgå rapportar og utføre modereringshandlingar i samsvar med desse
manage_roles: Handsam roller
- manage_roles_description: Tillet at brukarar handsamar og tilset rollar under deira eiga
+ manage_roles_description: Tillet at brukarar handsamar og tildeler roller som er lågare enn dera eiga
manage_rules: Handtere reglar
manage_rules_description: Let brukarar endre reglane for tenaren
manage_settings: Handtere innstillingar
@@ -737,7 +738,7 @@ nn:
view_dashboard_description: Gir brukere tilgang til dashbordet og ulike metrikker
view_devops: DevOps
view_devops_description: Gir brukere tilgang til Sidekiq og pgHero-dashbord
- title: Rollar
+ title: Roller
rules:
add_new: Legg til regel
delete: Slett
@@ -1165,9 +1166,11 @@ nn:
use_security_key: Bruk sikkerhetsnøkkel
author_attribution:
example_title: Eksempeltekst
- hint_html: Kontroller korleis du blir kreditert når nokon deler lenker på Mastodon.
+ hint_html: Skriv du nyhende eller blogginnlegg utanfor Mastodon? Her kan du kontrollera korleis du blir kreditert når artiklane dine blir delte på Mastodon.
+ instructions: 'Sjå til at denne koden er i HTML-koden i artikkelen din:'
more_from_html: Meir frå %{name}
s_blog: Bloggen til %{name}
+ then_instructions: Så legg du til domenenamnet for publikasjonen i feltet under.
title: Forfattarkreditering
challenge:
confirm: Hald fram
@@ -1426,7 +1429,7 @@ nn:
one: 1 bruk
other: "%{count} bruk"
max_uses_prompt: Inga grense
- prompt: Generer og del lenkjer med andre for å gje tilgong til denne tenaren
+ prompt: Generer og del lenkjer med andre for å gje tilgang til denne tenaren
table:
expires_at: Vert ugyldig
uses: Bruk
diff --git a/config/locales/no.yml b/config/locales/no.yml
index ec0b14d5a3..567775998a 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -842,7 +842,17 @@
action: Sjekk her for mer informasjon
message_html: "Objektlagringen din er feilkonfigurert. Personvernet til brukerne dine er i fare."
tags:
+ moderation:
+ pending_review: Avventer gjennomgang
+ reviewed: Gjennomgått
+ title: Status
+ name: Navn
+ newest: Nyeste
+ oldest: Eldst
+ reset: Tilbakestill
review: Gjennomgangsstatus
+ search: Søk
+ title: Emneknagger
updated_msg: Emneknagg innstillinger vellykket oppdatert
title: Administrasjon
trends:
@@ -1036,6 +1046,7 @@
or_log_in_with: Eller logg inn med
privacy_policy_agreement_html: Jeg har lest og godtar retningslinjer for personvern
progress:
+ confirm: Bekreft E-postadressen
details: Dine opplysninger
review: Vår gjennomgang
rules: Godta regler
@@ -1588,6 +1599,7 @@
import: Importér
import_and_export: Importer og eksporter
migrate: Kontomigrering
+ notifications: E-postbeskjeder
preferences: Innstillinger
profile: Profil
relationships: Følginger og følgere
@@ -1595,6 +1607,8 @@
strikes: Modereringsadvarsler
two_factor_authentication: Tofaktorautentisering
webauthn_authentication: Sikkerhetsnøkler
+ severed_relationships:
+ type: Hendelse
statuses:
attached:
audio:
@@ -1781,6 +1795,7 @@
follows_view_more: Vis flere personer å følge
hashtags_title: Populære emneknagger
hashtags_view_more: Vis flere populære emneknagger
+ post_action: Sett sammen
post_step: Si hallo til verdenen med tekst, bilder, videoer, eller meningsmålinger.
post_title: Lag ditt første innlegg
share_action: Del
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 3aaf7a5a57..0187ed68be 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -25,6 +25,7 @@ pl:
one: wpis
other: Wpisów
posts_tab_heading: Wpisy
+ self_follow_error: Nie możesz obserwować swojego konta
admin:
account_actions:
action: Wykonaj działanie
@@ -1201,9 +1202,11 @@ pl:
use_security_key: Użyj klucza bezpieczeństwa
author_attribution:
example_title: Przykładowy tekst
- hint_html: Kontroluj przypisy do twoich wpisów widoczne na Mastodonie.
+ hint_html: Piszesz wiadomości albo bloga poza Mastodonem? Kontroluj jak będą ci przypisywane podczas dizielenia się nimi na Mastodonie.
+ instructions: 'Upewnij się, że ten kod jest w HTMLu twojego artykułu:'
more_from_html: Więcej od %{name}
s_blog: Blog %{name}
+ then_instructions: Potem, dodaj domenę publikacji do pola poniżej.
title: Przypis do autora
challenge:
confirm: Kontynuuj
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 5e7317c5fb..d3880142cd 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -21,6 +21,7 @@ pt-BR:
one: Publicação
other: Publicações
posts_tab_heading: Publicações
+ self_follow_error: Seguir sua conta não é permitido
admin:
account_actions:
action: Tomar uma atitude
@@ -34,12 +35,12 @@ pt-BR:
accounts:
add_email_domain_block: Bloquear domínio de email
approve: Aprovar
- approved_msg: O registro de %{username} foi aprovado
+ approved_msg: Aprovado com sucesso o pedido de registro de %{username}
are_you_sure: Você tem certeza?
avatar: Imagem de perfil
by_domain: Domínio
change_email:
- changed_msg: E-mail alterado!
+ changed_msg: E-mail alterado com sucesso!
current_email: E-mail atual
label: Alterar e-mail
new_email: Novo e-mail
@@ -141,7 +142,7 @@ pt-BR:
only_password: Apenas senha
password_and_2fa: Senha e autenticação de dois fatores
sensitive: Sensíveis
- sensitized: marcadas como sensíveis
+ sensitized: Marcadas como sensíveis
shared_inbox_url: Link da caixa de entrada compartilhada
show:
created_reports: Denúncias criadas
@@ -1165,9 +1166,11 @@ pt-BR:
use_security_key: Usar chave de segurança
author_attribution:
example_title: Texto de amostra
- hint_html: Controle como você é creditado quando links são compartilhados no Mastodon.
+ hint_html: Você está escrevendo notícias ou artigos de blogs fora do Mastodon? Controle como você é credenciado quando eles forem compartilhados no Mastodon.
+ instructions: 'Certifique-se que este código esteja no HTML do artigo:'
more_from_html: Mais de %{name}
s_blog: Blog do %{name}
+ then_instructions: Então, adicione o nome de domínio da publicação no campo abaixo.
title: Atribuição de autoria
challenge:
confirm: Continuar
@@ -1888,7 +1891,7 @@ pt-BR:
none: Aviso
sensitive: Conta marcada como sensível
silence: Conta silenciada
- suspend: Conta banida
+ suspend: Conta suspensa
welcome:
apps_android_action: Disponível no Google Play
apps_ios_action: Disponível na App Store
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 6b48e8de26..2f8bd2da8f 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -1,7 +1,7 @@
---
pt-PT:
about:
- about_mastodon_html: 'A rede social do futuro: sem publicidade, e sem vigilância empresarial; desenho ético, e descentralizado! Tome posse dos seus dados com o Mastodon!'
+ about_mastodon_html: 'A rede social do futuro: sem publicidade e sem vigilância empresarial; desenho ético e descentralizado! Toma posse dos teus dados com o Mastodon!'
contact_missing: Por definir
contact_unavailable: n.d.
hosted_on: Mastodon alojado em %{domain}
@@ -10,20 +10,21 @@ pt-PT:
followers:
one: Seguidor
other: Seguidores
- following: A seguir
+ following: Seguindo
instance_actor_flash: Esta conta é um ator virtual utilizado para representar o servidor em si e não um utilizador individual. É utilizada para efeitos de federação e não deve ser suspensa.
last_active: última atividade
link_verified_on: A posse desta hiperligação foi verificada em %{date}
nothing_here: Não há nada aqui!
pin_errors:
- following: Tem de estar a seguir a pessoa que pretende apoiar
+ following: Tens de estar a seguir a pessoa que pretendes apoiar
posts:
one: Publicação
other: Publicações
posts_tab_heading: Publicações
+ self_follow_error: Não é permitido seguir a tua própria conta
admin:
account_actions:
- action: Executar acção
+ action: Executar ação
already_silenced: Esta conta já foi limitada.
already_suspended: Esta conta já foi suspensa.
title: Executar ação de moderação em %{acct}
@@ -35,7 +36,7 @@ pt-PT:
add_email_domain_block: Bloquear domínio de e-mail
approve: Aprovar
approved_msg: Inscrição de %{username} aprovada com sucesso
- are_you_sure: Tem a certeza?
+ are_you_sure: Tens a certeza?
avatar: Imagem de perfil
by_domain: Domínio
change_email:
@@ -76,7 +77,7 @@ pt-PT:
follows: A seguir
header: Cabeçalho
inbox_url: URL da caixa de entrada
- invite_request_text: Razões para se juntar a nós
+ invite_request_text: Razões para te juntares a nós
invited_by: Convidado(a) por
ip: IP
joined: Aderiu
@@ -86,7 +87,7 @@ pt-PT:
remote: Remoto
title: Local
login_status: Estado de início de sessão
- media_attachments: Anexos de media
+ media_attachments: Anexos multimédia
memorialize: Converter num memorial
memorialized: Em memória
memorialized_msg: Conta %{username} transformada com sucesso em memorial
@@ -120,7 +121,7 @@ pt-PT:
reject: Rejeitar
rejected_msg: Inscrição de %{username} rejeitada com sucesso
remote_suspension_irreversible: Os dados desta conta foram eliminados irreversivelmente.
- remote_suspension_reversible_hint_html: A conta foi suspensa no servidor de origem e os seus dados serão totalmente eliminados em %{date}. Até lá, o servidor de origem poderá recuperar esta conta sem quaisquer efeitos negativos. Se desejar eliminar todos os dados desta conta imediatamente, pode fazê-lo em baixo.
+ remote_suspension_reversible_hint_html: A conta foi suspensa no servidor de origem e os seus dados serão totalmente eliminados em %{date}. Até lá, o servidor de origem poderá recuperar esta conta sem quaisquer efeitos negativos. Se desejares eliminar todos os dados desta conta imediatamente, podes fazê-lo em baixo.
remove_avatar: Remover a imagem de perfil
remove_header: Remover o cabeçalho
removed_avatar_msg: Imagem de perfil de %{username} removida
@@ -140,31 +141,31 @@ pt-PT:
security_measures:
only_password: Apenas palavra-passe
password_and_2fa: Palavra-passe e 2FA
- sensitive: Marcar como problemático
- sensitized: Marcada como problemática
+ sensitive: Marcar como sensível
+ sensitized: Marcada como sensível
shared_inbox_url: URL da caixa de entrada partilhada
show:
created_reports: Denúncias realizadas
targeted_reports: Denunciada por outros
silence: Limitar
- silenced: Limitado
+ silenced: Limitada
statuses: Publicações
strikes: Reprimendas anteriores
- subscribe: Inscrever-se
+ subscribe: Inscrever-me
suspend: Suspender
suspended: Suspensa
- suspension_irreversible: Os dados desta conta foram eliminados irreversivelmente. Pode cancelar a suspensão da conta para torná-la utilizável, mas não irá recuperar os dados que possuía anteriormente.
- suspension_reversible_hint_html: A conta foi suspensa e os dados serão totalmente eliminados em %{date}. Até lá, a conta poderá ser recuperada sem quaisquer efeitos negativos. Se deseja eliminar todos os dados desta conta imediatamente, pode fazê-lo em baixo.
+ suspension_irreversible: Os dados desta conta foram eliminados irreversivelmente. Podes cancelar a suspensão da conta para torná-la utilizável, mas não irás recuperar os dados que possuías anteriormente.
+ suspension_reversible_hint_html: A conta foi suspensa e os dados serão totalmente eliminados em %{date}. Até lá, a conta poderá ser recuperada sem quaisquer efeitos negativos. Se desejas eliminar todos os dados desta conta imediatamente, podes fazê-lo em baixo.
title: Contas
unblock_email: Desbloquear endereço de e-mail
unblocked_email_msg: Endereço de e-mail de %{username} desbloqueado com sucesso
unconfirmed_email: E-mail por confirmar
- undo_sensitized: Desmarcar como problemático
- undo_silenced: Desfazer silenciar
+ undo_sensitized: Desmarcar como sensível
+ undo_silenced: Desfazer limitação
undo_suspension: Desfazer supensão
unsilenced_msg: Limitações da conta %{username} removidas com sucesso
unsubscribe: Cancelar inscrição
- unsuspended_msg: Removeu a suspensão da conta %{username}
+ unsuspended_msg: Foi cancelada a suspensão da conta %{username}
username: Nome de utilizador
view_domain: Ver resumo do domínio
warn: Advertir
@@ -172,14 +173,14 @@ pt-PT:
whitelisted: Permitido para a federação
action_logs:
action_types:
- approve_appeal: Aprovar recurso
+ approve_appeal: Aprovar contestação
approve_user: Aprovar utilizador
assigned_to_self_report: Atribuir denúncia
change_email_user: Alterar e-mail do utilizador
change_role_user: Alterar função do utilizador
confirm_user: Confirmar utilizador
create_account_warning: Criar aviso
- create_announcement: Criar comunicado
+ create_announcement: Criar mensagem de manutenção
create_canonical_email_block: Criar bloqueio de e-mail
create_custom_emoji: Criar emoji personalizado
create_domain_allow: Criar permissão de domínio
@@ -189,7 +190,7 @@ pt-PT:
create_unavailable_domain: Criar domínio indisponível
create_user_role: Criar função
demote_user: Despromover utilizador
- destroy_announcement: Eliminar comunicado
+ destroy_announcement: Eliminar mensagem de manutenção
destroy_canonical_email_block: Eliminar bloqueio de e-mail
destroy_custom_emoji: Eliminar emoji personalizado
destroy_domain_allow: Eliminar permissão de domínio
@@ -209,22 +210,22 @@ pt-PT:
enable_user: Ativar utilizador
memorialize_account: Transformar conta num memorial
promote_user: Promover utilizador
- reject_appeal: Rejeitar recurso
+ reject_appeal: Rejeitar contestação
reject_user: Rejeitar utilizador
remove_avatar_user: Remover imagem de perfil
reopen_report: Reabrir denúncia
resend_user: Reenviar e-mail de confirmação
reset_password_user: Repor palavra-passe
resolve_report: Resolver denúncia
- sensitive_account: Marcar a media na sua conta como problemática
+ sensitive_account: Marcar conta com conteúdo sensível
silence_account: Limitar conta
suspend_account: Suspender conta
unassigned_report: Anular atribuição desta denúncia
unblock_email_account: Desbloquear endereço de e-mail
- unsensitive_account: Desmarcar a conta como problemática
- unsilence_account: Deixar de silenciar conta
+ unsensitive_account: Desmarcar conta com conteúdo sensível
+ unsilence_account: Deixar de limitar a conta
unsuspend_account: Retirar suspensão da conta
- update_announcement: Atualizar comunicado
+ update_announcement: Atualizar mensagem de manutenção
update_custom_emoji: Atualizar emoji personalizado
update_domain_block: Atualizar bloqueio de domínio
update_ip_block: Atualizar regra de IP
@@ -232,14 +233,14 @@ pt-PT:
update_status: Atualizar publicação
update_user_role: Atualizar função
actions:
- approve_appeal_html: "%{name} aprovou recurso da decisão de moderação de %{target}"
+ approve_appeal_html: "%{name} aprovou a contestação da decisão de moderação de %{target}"
approve_user_html: "%{name} aprovou a inscrição de %{target}"
assigned_to_self_report_html: "%{name} atribuiu a denúncia %{target} a si próprio"
change_email_user_html: "%{name} alterou o endereço de e-mail do utilizador %{target}"
change_role_user_html: "%{name} alterou a função de %{target}"
confirm_user_html: "%{name} confirmou o endereço de e-mail do utilizador %{target}"
create_account_warning_html: "%{name} enviou um aviso para %{target}"
- create_announcement_html: "%{name} criou o novo anúncio %{target}"
+ create_announcement_html: "%{name} criou a nova mensagem de manutenção %{target}"
create_canonical_email_block_html: "%{name} bloqueou o e-mail com a hash %{target}"
create_custom_emoji_html: "%{name} enviou o novo emoji %{target}"
create_domain_allow_html: "%{name} permitiu a federação com o domínio %{target}"
@@ -249,7 +250,7 @@ pt-PT:
create_unavailable_domain_html: "%{name} parou as entregas ao domínio %{target}"
create_user_role_html: "%{name} criou a função %{target}"
demote_user_html: "%{name} despromoveu o utilizador %{target}"
- destroy_announcement_html: "%{name} eliminou o anúncio %{target}"
+ destroy_announcement_html: "%{name} eliminou a mensagem de manutenção %{target}"
destroy_canonical_email_block_html: "%{name} desbloqueou o e-mail com a hash %{target}"
destroy_custom_emoji_html: "%{name} eliminou o emoji %{target}"
destroy_domain_allow_html: "%{name} bloqueou a federação com o domínio %{target}"
@@ -267,53 +268,53 @@ pt-PT:
enable_custom_emoji_html: "%{name} ativou o emoji %{target}"
enable_sign_in_token_auth_user_html: "%{name} ativou o token de autenticação por e-mail para %{target}"
enable_user_html: "%{name} ativou o início de sessão para o utilizador %{target}"
- memorialize_account_html: "%{name} transformou a conta de %{target} em um memorial"
+ memorialize_account_html: "%{name} transformou a conta de %{target} num memorial"
promote_user_html: "%{name} promoveu o utilizador %{target}"
- reject_appeal_html: "%{name} rejeitou recurso da decisão de moderação de %{target}"
+ reject_appeal_html: "%{name} rejeitou a contestação da decisão de moderação de %{target}"
reject_user_html: "%{name} rejeitou a inscrição de %{target}"
remove_avatar_user_html: "%{name} removeu a imagem de perfil de %{target}"
reopen_report_html: "%{name} reabriu a denúncia %{target}"
- resend_user_html: "%{name} reenviou e-mail de confirmação para %{target}"
+ resend_user_html: "%{name} reenviou o e-mail de confirmação para %{target}"
reset_password_user_html: "%{name} restabeleceu a palavra-passe do utilizador %{target}"
resolve_report_html: "%{name} resolveu a denúncia %{target}"
- sensitive_account_html: "%{name} marcou a media de %{target} como sensível"
- silence_account_html: "%{name} silenciou a conta de %{target}"
+ sensitive_account_html: "%{name} marcou a multimédia de %{target} como sensível"
+ silence_account_html: "%{name} limitou a conta de %{target}"
suspend_account_html: "%{name} suspendeu a conta de %{target}"
- unassigned_report_html: "%{name} desatribuiu a denúncia %{target}"
+ unassigned_report_html: "%{name} deixou de atribuir a denúncia %{target}"
unblock_email_account_html: "%{name} desbloqueou o endereço de e-mail de %{target}"
- unsensitive_account_html: "%{name} desmarcou a media de %{target} como sensível"
- unsilence_account_html: "%{name} desativou o silêncio de %{target}"
+ unsensitive_account_html: "%{name} desmarcou a multimédia de %{target} como sensível"
+ unsilence_account_html: "%{name} deixou de limitar a conta de %{target}"
unsuspend_account_html: "%{name} desativou a suspensão de %{target}"
- update_announcement_html: "%{name} atualizou o anúncio %{target}"
+ update_announcement_html: "%{name} atualizou a mensagem de manutenção %{target}"
update_custom_emoji_html: "%{name} atualizou o emoji %{target}"
update_domain_block_html: "%{name} atualizou o bloqueio de domínio para %{target}"
- update_ip_block_html: "%{name} alterou regra para IP %{target}"
+ update_ip_block_html: "%{name} alterou regra para o IP %{target}"
update_report_html: "%{name} atualizou a denúncia %{target}"
- update_status_html: "%{name} atualizou o estado de %{target}"
+ update_status_html: "%{name} atualizou a publicação de %{target}"
update_user_role_html: "%{name} alterou a função %{target}"
- deleted_account: conta apagada
+ deleted_account: conta eliminada
empty: Não foram encontrados registos.
filter_by_action: Filtrar por ação
filter_by_user: Filtrar por utilizador
title: Registo de auditoria
unavailable_instance: "(nome de domínio indisponível)"
announcements:
- destroyed_msg: Comunicado eliminado com sucesso!
+ destroyed_msg: Mensagem de manutenção eliminada com sucesso!
edit:
- title: Editar comunicado
- empty: Nenhum comunicado encontrado.
- live: Em direto
+ title: Editar mensagem de manutenção
+ empty: Nenhuma mensagem de manutenção encontrada.
+ live: Em tempo real
new:
- create: Criar comunicado
- title: Novo comunicado
+ create: Criar mensagem de manutenção
+ title: Nova mensagem de manutenção
publish: Publicar
- published_msg: Comunicado publicado com sucesso!
+ published_msg: Mensagem de manutenção publicada com sucesso!
scheduled_for: Agendado para %{time}
- scheduled_msg: Comunicado agendado para publicação!
- title: Comunicados
+ scheduled_msg: Mensagem de manutenção agendada para publicação!
+ title: Mensagens de manutenção
unpublish: Anular publicação
- unpublished_msg: Comunicado corretamente retirado de publicação!
- updated_msg: Comunicado atualizado com sucesso!
+ unpublished_msg: Mensagem de manutenção corretamente retirada de publicação!
+ updated_msg: Mensagem de manutenção atualizada com sucesso!
critical_update_pending: Atualização crítica pendente
custom_emojis:
assign_category: Atribuir categoria
@@ -327,39 +328,39 @@ pt-PT:
destroyed_msg: Emoji destruído com sucesso!
disable: Desativar
disabled: Desativado
- disabled_msg: Desativado com sucesso este emoji
+ disabled_msg: Emoji desativado com sucesso
emoji: Emoji
enable: Ativar
enabled: Ativado
- enabled_msg: Ativado com sucesso este emoji
+ enabled_msg: Emoji ativado com sucesso
image_hint: PNG ou GIF até %{size}
list: Lista
- listed: Inventariado
+ listed: Na lista
new:
title: Adicionar novo emoji personalizado
- no_emoji_selected: Nenhum emojis foi alterado, pois nenhum foi selecionado
- not_permitted: Não está autorizado a executar esta ação
- overwrite: Escrever por cima
+ no_emoji_selected: Nenhum emoji foi alterado, pois nenhum foi selecionado
+ not_permitted: Não estás autorizado a executar esta ação
+ overwrite: Substituir
shortcode: Código de atalho
- shortcode_hint: Pelo menos 2 caracteres, apenas caracteres alfanuméricos e traços inferiores
+ shortcode_hint: Pelo menos 2 caracteres, apenas caracteres alfanuméricos e traços inferiores (_)
title: Emojis personalizados
uncategorized: Não categorizados
unlist: Não listar
- unlisted: Não inventariado
+ unlisted: Não listado
update_failed_msg: Não foi possível atualizar esse emoji
updated_msg: Emoji atualizado com sucesso!
upload: Enviar
dashboard:
active_users: utilizadores ativos
interactions: interações
- media_storage: Armazenamento de media
+ media_storage: Armazenamento de multimédia
new_users: novos utilizadores
opened_reports: denúncias abertas
pending_appeals_html:
- one: "%{count} recurso pendente"
- other: "%{count} recursos pendentes"
+ one: "%{count} contestação pendente"
+ other: "%{count} contestações pendentes"
pending_reports_html:
- one: "%{count} denuncia pendente"
+ one: "%{count} denúncia pendente"
other: "%{count} denuncias pendentes"
pending_tags_html:
one: "%{count} etiqueta pendente"
@@ -369,7 +370,7 @@ pt-PT:
other: "%{count} utilizadores pendentes"
resolved_reports: denúncias resolvidas
software: Software
- sources: Origem de inscrições
+ sources: Origem das inscrições
space: Utilização do espaço
title: Painel de controlo
top_languages: Principais idiomas ativos
@@ -377,12 +378,12 @@ pt-PT:
website: Website
disputes:
appeals:
- empty: Nenhum recurso encontrado.
- title: Recursos
+ empty: Nenhuma contestação encontrada.
+ title: Contestação
domain_allows:
add_new: Permitir federação com o domínio
created_msg: O domínio foi autorizado com êxito para a federação
- destroyed_msg: Revogada a permissão de federação para o domínio
+ destroyed_msg: Foi revogada a permissão de federação para o domínio
export: Exportar
import: Importar
undo: Revogar federação com o domínio
@@ -392,38 +393,38 @@ pt-PT:
cancel: Cancelar
confirm: Suspender
permanent_action: Desfazer a suspensão não restaurará nenhum dado ou relacionamento.
- preamble_html: Está prestes a suspender %{domain} e seus subdomínios.
- remove_all_data: Isto irá remover todo o conteúdo, media e dados de perfil para este domínio do seu servidor.
- stop_communication: O seu servidor irá parar de comunicar com esses servidores.
+ preamble_html: Estás prestes a suspender %{domain} e os seus subdomínios.
+ remove_all_data: Isto irá remover todo o conteúdo, multimédias e dados de perfil para este domínio do teu servidor.
+ stop_communication: O teu servidor irá parar de comunicar com estes servidores.
title: Confirmar o bloqueio de domínio para %{domain}
- undo_relationships: Isto irá desfazer qualquer relação entre as contas desses servidores e as suas.
- created_msg: Bloqueio do domínio está a ser processado
- destroyed_msg: Retirado o bloqueio de domínio
+ undo_relationships: Isto irá desfazer qualquer relação entre as contas desses servidores e as tuas.
+ created_msg: O bloqueio do domínio está a ser processado
+ destroyed_msg: Foi retirado o bloqueio de domínio
domain: Domínio
edit: Editar bloqueio de domínio
- existing_domain_block: Já tinha imposto limites mais rigorosos a %{name}.
- existing_domain_block_html: Já tinha imposto limites mais restritivos a %{name}. Primeiro, precisa de o desbloquear.
+ existing_domain_block: Já tinhas imposto limites mais restritivos a %{name}.
+ existing_domain_block_html: Já tinhas imposto limites mais restritivos a %{name}. Primeiro, precisas de o desbloquear.
export: Exportar
import: Importar
new:
create: Criar bloqueio
hint: O bloqueio do domínio não impedirá a criação de registos de contas na base de dados, mas aplicará retroativamente e automaticamente métodos de moderação específicos a essas contas.
severity:
- desc_html: "Limitar tornará as mensagens das contas neste domínio invisíveis a qualquer pessoa que não as esteja a seguir. Suspender removerá do seu servidor todo o conteúdo, media, e dados de perfil das contas deste domínio. Utilize Nenhum se apenas quiser rejeitar ficheiros media."
+ desc_html: "Limitar tornará as mensagens das contas neste domínio invisíveis a qualquer pessoa que não as esteja a seguir. Suspender removerá do teu servidor todo o conteúdo, multimédias e dados de perfil das contas deste domínio. Utiliza Nenhum se apenas quiseres rejeitar ficheiros multimédia."
noop: Nenhum
silence: Limitar
suspend: Suspender
title: Novo bloqueio de domínio
no_domain_block_selected: Nenhum bloqueio de domínio foi alterado pois nenhum foi selecionado
- not_permitted: Não está autorizado a executar esta ação
+ not_permitted: Não estás autorizado a executar esta ação
obfuscate: Ofuscar nome de domínio
obfuscate_hint: Ofuscar parcialmente o nome de domínio na lista, caso estejam definidas limitações na publicação da lista de domínios
private_comment: Comentário privado
private_comment_hint: Comentário sobre essa limitação de domínio para uso interno pelos moderadores.
public_comment: Comentário público
- public_comment_hint: Comentário sobre essa limitação de domínio para o público geral, se ativada a divulgação da lista de limitações de domínio.
- reject_media: Rejeitar ficheiros de media
- reject_media_hint: Remove ficheiros de media armazenados localmente, e rejeita a descarga de novos ficheiros no futuro. Sem pertinência para suspensões
+ public_comment_hint: Comentário sobre esta limitação de domínio para o público geral, se estiver ativada a divulgação da lista de limitações de domínio.
+ reject_media: Rejeitar ficheiros multimédia
+ reject_media_hint: Remove ficheiros multimédia armazenados localmente e rejeita a descarga de novos ficheiros no futuro. Sem pertinência para suspensões
reject_reports: Rejeitar denúncias
reject_reports_hint: Ignorar todas as denúncias provenientes deste domínio. Sem pertinência para suspensões
undo: Anular o bloqueio por domínio
@@ -446,7 +447,7 @@ pt-PT:
title: Bloquear novo domínio de e-mail
no_email_domain_block_selected: Não foram alterados quaisquer bloqueios de domínios de e-mail, uma vez que nenhum foi selecionado
not_permitted: Não permitido
- resolved_dns_records_hint_html: O nome de domínio resolve para os seguintes domínios MX, que são, em última análise, responsáveis por aceitar o e-mail. Bloquear um domínio MX irá bloquear as inscrições de qualquer endereço de e-mail que use o mesmo domínio MX, mesmo quando o nome de domínio visível é diferente. Cuidado para não bloquear os principais provedores de e-mail.
+ resolved_dns_records_hint_html: O nome de domínio resolve para os seguintes domínios MX, que são, em última análise, responsáveis por aceitar o e-mail. Bloquear um domínio MX irá bloquear as inscrições de qualquer endereço de e-mail que use o mesmo domínio MX, mesmo quando o nome de domínio visível é diferente. Cuidado para não bloquear os principais fornecedores de e-mail.
resolved_through_html: Resolvido através de %{domain}
title: Domínios de e-mail bloqueados
export_domain_allows:
@@ -455,12 +456,12 @@ pt-PT:
no_file: Nenhum ficheiro selecionado
export_domain_blocks:
import:
- description_html: Está prestes a importar uma lista de bloqueios de domínio. Por favor, reveja esta lista com muito cuidado, especialmente se não tiver sido o autor desta lista.
+ description_html: Estás prestes a importar uma lista de bloqueios de domínio. Por favor, revê esta lista com muito cuidado, especialmente se não tiveres sido o autor desta lista.
existing_relationships_warning: Relações de seguimento existentes
- private_comment_description_html: 'Para o ajudar a rastrear a origem dos bloqueios importados, estes serão criados com o seguinte comentário privado: %{comment}' + private_comment_description_html: 'Para te ajudar a rastrear a origem dos bloqueios importados, estes serão criados com o seguinte comentário privado:
%{comment}' private_comment_template: Importado de %{source} em %{date} title: Importar bloqueios de domínio - invalid_domain_block: 'Um ou mais blocos de domínio foram ignorados devido o(s) seguinte(s) erro(s): %{error}' + invalid_domain_block: 'Um ou mais blocos de domínio foram ignorados devido ao(s) seguinte(s) erro(s): %{error}' new: title: Importar bloqueios de domínio no_file: Nenhum ficheiro selecionado @@ -478,12 +479,12 @@ pt-PT: view_all: Ver registos de auditoria completos availability: description_html: - one: Se a transmissão ao domínio falhar ao final de %{count} dia(s), não será feita mais nenhuma tentativa de transmissão a menos que seja recebida uma transmissão proveniente desse domínio. - other: Se a transmissão ao domínio falhar em %{count} dias diferentes sem sucesso, nenhuma tentativa de transmissão será feita a menos que uma transmissão proveniente do domínio seja recebida. + one: Se a entrega ao domínio falhar %{count} dia sem sucesso, não serão efetuadas mais tentativas de entrega, a não ser que seja recebida uma entrega do domínio. + other: Se a entrega ao domínio falhar %{count} dias diferentes sem sucesso, não serão efetuadas mais tentativas de entrega, a não ser que seja recebida uma entrega do domínio. failure_threshold_reached: Limite de falhas atingido em %{date}. failures_recorded: one: Tentativa falhada em %{count} dia. - other: Tentativas em %{count} dias diferentes. + other: Tentativas falhadas em %{count} dias diferentes. no_failures_recorded: Sem falhas registadas. title: Disponibilidade warning: A última tentativa de conectar a este servidor não foi bem sucedida @@ -497,7 +498,7 @@ pt-PT: description_html: Pode definir políticas de conteúdo que serão aplicadas a todas as contas deste domínio e a qualquer um dos seus subdomínios. limited_federation_mode_description_html: Pode escolher se deseja permitir a federação com este domínio. policies: - reject_media: Rejeitar media + reject_media: Rejeitar multimédia reject_reports: Rejeitar denúncias silence: Limitar suspend: Suspender @@ -508,9 +509,9 @@ pt-PT: instance_accounts_dimension: Contas mais seguidas instance_accounts_measure: contas armazenadas instance_followers_measure: nossos seguidores lá - instance_follows_measure: os seus seguidores aqui + instance_follows_measure: os seguidores deles aqui instance_languages_dimension: Idiomas mais populares - instance_media_attachments_measure: anexos de media armazenados + instance_media_attachments_measure: anexos multimédia armazenados instance_reports_measure: denúncias sobre eles instance_statuses_measure: publicações armazenadas delivery: @@ -523,7 +524,7 @@ pt-PT: delivery_available: Entrega disponível delivery_error_days: Dias de erro de entrega delivery_error_hint: Se a entrega não for possível durante %{count} dias, será automaticamente marcada como não realizável. - destroyed_msg: Dados de %{domain} estão agora na fila para iminente eliminação. + destroyed_msg: Os dados de %{domain} estão agora na fila para iminente eliminação. empty: Não foram encontrados domínios. known_accounts: one: "%{count} conta conhecida" @@ -532,17 +533,17 @@ pt-PT: all: Todas limited: Limitadas title: Moderação - private_comment: Comentários privados - public_comment: Comentários públicos + private_comment: Comentário privado + public_comment: Comentário público purge: Purgar - purge_description_html: Se crê que este domínio está definitivamente fora de linha, pode apagar todos os seus registos de contas e dados associados do seu armazenamento. Isso pode demorar algum tempo. + purge_description_html: Se crês que este domínio está definitivamente desativado, podes eliminar todos os seus registos de contas e dados associados do seu armazenamento. Isso pode demorar algum tempo. title: Federação total_blocked_by_us: Bloqueado(s) por nós total_followed_by_them: Seguido(s) por eles total_followed_by_us: Seguido(s) por nós total_reported: Denúncias sobre eles - total_storage: Anexos de media - totals_time_period_hint_html: Os totais exibidos abaixo incluem dados referentes ao tempo total. + total_storage: Anexos multimédia + totals_time_period_hint_html: Os totais mostrados abaixo incluem dados referentes ao tempo total. unknown_instance: Atualmente não há registo deste domínio neste servidor. invites: deactivate_all: Desativar todos @@ -581,7 +582,7 @@ pt-PT: inbox_url: URL do repetidor pending: À espera da aprovação do repetidor save_and_enable: Guardar e ativar - setup: Configurar uma ligação ao repetidor + setup: Configurar uma conexão ao repetidor signatures_not_enabled: Os repetidores não funcionarão corretamente enquanto o modo seguro ou o modo de lista branca estiverem ativados status: Estado title: Retransmissores @@ -596,15 +597,15 @@ pt-PT: action_log: Registo de auditoria action_taken_by: Ação tomada por actions: - delete_description_html: As publicações denunciadas serão eliminadas, e será registada uma reprimenda para ajudá-lo a tomar medidas em futuras infrações pela mesma conta. - mark_as_sensitive_description_html: A media nas publicações denunciadas será marcada como problemática, e uma reprimenda será registada para ajudá-lo a tomar medidas em futuras infrações pela mesma conta. - other_description_html: Ver mais opções para controlar o comportamento da conta e personalizar a comunicação para a conta denunciada. - resolve_description_html: Nenhuma ação será tomada contra a conta denunciada, não será registada nenhuma reprimenda, e a denúncia será fechada. - silence_description_html: O perfil será visível apenas para aqueles que já o seguem ou o procurem manualmente, limitando fortemente o seu alcance. Pode sempre ser revertido. Encerrar todas as denúncias contra esta conta. + delete_description_html: As publicações denunciadas serão eliminadas e será registada uma reprimenda para ajudar-te a tomar medidas em futuras infrações pela mesma conta. + mark_as_sensitive_description_html: A multimédia nas publicações denunciadas será marcada como sensível e será registada uma reprimenda para ajudar-te a tomar medidas em futuras infrações pela mesma conta. + other_description_html: Veja mais opções para controlar o comportamento da conta e personalizar a comunicação para a conta denunciada. + resolve_description_html: Nenhuma ação será tomada contra a conta denunciada, não será registada nenhuma reprimenda e a denúncia será fechada. + silence_description_html: O perfil será visível apenas para aqueles que já o seguem ou o procurem manualmente, limitando fortemente o seu alcance. Pode sempre ser revertido. Encerra todas as denúncias contra esta conta. suspend_description_html: A conta e todo o seu conteúdo ficará inacessível e, eventualmente apagado, pelo que interagir com ela será impossível. Reversível durante 30 dias. Encerra todas as denúncias contra esta conta. actions_description_html: Decida a ação a tomar para resolver esta denúncia. Se decidir por uma ação punitiva contra a conta denunciada, um e-mail de notificação será enviado, excetuando quando selecionada a categoria Spam. actions_description_remote_html: Decida quais as medidas a tomar para resolver esta denúncia. Isso apenas afetará como o seu servido comunica com esta conta remota e gere o seu conteúdo. - actions_no_posts: Este relatório não tem nenhuma publicação associada para eliminar + actions_no_posts: Esta denúncia não tem nenhuma publicação associada para ser eliminada add_to_report: Adicionar mais à denúncia already_suspended_badges: local: Já suspenso neste servidor @@ -614,7 +615,7 @@ pt-PT: assigned: Atribuída ao moderador by_target_domain: Domínio da conta denunciada cancel: Cancelar - category: Categorização + category: Categoria category_description_html: A razão pela qual esta conta e/ou conteúdo foi denunciado será citada na comunicação com a conta denunciada comment: none: Nenhum @@ -627,8 +628,8 @@ pt-PT: forwarded_replies_explanation: Esta denúncia é de um utilizador remoto e sobre conteúdo remoto. Foi encaminhada para si porque o conteúdo denunciado é em resposta a um dos seus utilizadores. forwarded_to: Encaminhado para %{domain} mark_as_resolved: Marcar como resolvido - mark_as_sensitive: Marcar como problemático - mark_as_unresolved: Marcar como por resolver + mark_as_sensitive: Marcar como sensível + mark_as_unresolved: Marcar como não resolvido no_one_assigned: Ninguém notes: create: Adicionar nota @@ -637,15 +638,15 @@ pt-PT: delete: Eliminar placeholder: Descreve as ações que foram tomadas ou quaisquer outras atualizações relacionadas... title: Notas - notes_description_html: Visualize e deixe anotações para outros moderadores e para si próprio no futuro - processed_msg: 'Relatório #%{id} processado com sucesso' - quick_actions_description_html: 'Tome uma ação rápida ou deslize para baixo para ver o conteúdo denunciado:' + notes_description_html: Visualiza e deixa anotações para outros moderadores e para ti próprio no futuro + processed_msg: 'Denúncia #%{id} processada com sucesso' + quick_actions_description_html: 'Toma uma ação rápida ou desliza para baixo para ver o conteúdo denunciado:' remote_user_placeholder: o utilizador remoto de %{instance} reopen: Reabrir denúncia report: 'Denúncia #%{id}' reported_account: Conta denunciada reported_by: Denunciado por - reported_with_application: Reportado com a aplicação + reported_with_application: Denunciado com a aplicação resolved: Resolvido resolved_msg: Denúncia resolvida com sucesso! skip_to_actions: Passar para as ações @@ -654,22 +655,22 @@ pt-PT: statuses_description_html: O conteúdo ofensivo será citado na comunicação com a conta denunciada summary: action_preambles: - delete_html: 'Está prestes a remover algumas das publicações de @%{acct}. Isto irá:' - mark_as_sensitive_html: 'Está prestes a marcar algumas das publicações de @%{acct}como sensível. Isto irá:' - silence_html: 'Está prestes a limitar a conta de @%{acct}. Isto irá:' - suspend_html: 'Está prestes a suspender a conta de @%{acct}. Isto irá:' + delete_html: 'Estás prestes a remover algumas das publicações de @%{acct}. Isto irá:' + mark_as_sensitive_html: 'Estás prestes a marcar algumas das publicações de @%{acct}como sensíveis. Isto irá:' + silence_html: 'Estás prestes a limitar a conta de @%{acct}. Isto irá:' + suspend_html: 'Estás prestes a suspender a conta de @%{acct}. Isto irá:' actions: - delete_html: Excluir as publicações ofensivas - mark_as_sensitive_html: Marcar a mídia dos posts ofensivos como sensível - silence_html: Limitar firmemente o alcance de @%{acct}, tornando seus perfis e conteúdos apenas visíveis para pessoas que já os estão seguindo ou olhando manualmente no perfil - suspend_html: Suspender @%{acct}, tornando seu perfil e conteúdo inacessíveis e impossível de interagir - close_report: 'Marcar relatório #%{id} como resolvido' + delete_html: Eliminar as publicações ofensivas + mark_as_sensitive_html: Marcar a multimédia das publicações ofensivas como sensível + silence_html: Limita fortemente o alcance de @%{acct}, tornando o seu perfil e conteúdo apenas visíveis para pessoas que já o está a seguir ou a procurar manualmente o perfil + suspend_html: Suspender @%{acct}, tornando o seu perfil e conteúdo inacessíveis e impossível de interagir + close_report: 'Marcar denúncia #%{id} como resolvida' close_reports_html: Marcar todas as denúncias contra @%{acct} como resolvidas - delete_data_html: Eliminar o perfil de @%{acct} e conteúdos daqui a 30 dias, a menos que entretanto sejam suspensos + delete_data_html: Eliminar o perfil de @%{acct} e conteúdos daqui a 30 dias, a não ser que entretanto seja suspenso preview_preamble_html: "@%{acct} receberá um aviso com o seguinte conteúdo:" - record_strike_html: Registar um ataque contra @%{acct} para ajudar a escalar futuras violações desta conta + record_strike_html: Registar uma reprimenda a @%{acct} para te ajudar a agravar futuras violações desta conta send_email_html: Enviar um e-mail de aviso a @%{acct} - warning_placeholder: Argumentos adicionais opcionais para a acção de moderação. + warning_placeholder: Argumentos adicionais opcionais para a ação de moderação. target_origin: Origem da conta denunciada title: Denúncias unassign: Não atribuir @@ -689,7 +690,7 @@ pt-PT: moderation: Moderação special: Especiais delete: Eliminar - description_html: Com as funções de utilizador, pode personalizar quais as funções e áreas do Mastodon a que os seus utilizadores podem aceder. + description_html: Com as funções de utilizador, podes personalizar quais as funções e áreas do Mastodon a que os teus utilizadores podem aceder. edit: Editar função '%{name}' everyone: Permissões padrão everyone_full_description_html: Esta é a função base que afeta todos os utilizadores, mesmo aqueles sem uma função atribuída. Todas as outras funções herdam as permissões desta. @@ -700,23 +701,23 @@ pt-PT: administrator: Administrador administrator_description: Utilizadores com esta permissão irão contornar todas as permissões delete_user_data: Eliminar dados de utilizador - delete_user_data_description: Permite que os utilizadores eliminem os dados doutros utilizadores sem tempo de espera + delete_user_data_description: Permite que os utilizadores eliminem os dados de outros utilizadores sem tempo de espera invite_users: Convidar utilizadores invite_users_description: Permite aos utilizadores convidar pessoas novas para o servidor - manage_announcements: Gerir comunicados - manage_announcements_description: Permite aos utilizadores gerirem os comunicados no servidor - manage_appeals: Gerir apelos - manage_appeals_description: Permite aos utilizadores rever recursos de moderação + manage_announcements: Gerir mensagens de manutenção + manage_announcements_description: Permite aos utilizadores gerirem as mensagem de manutenção no servidor + manage_appeals: Gerir contestações + manage_appeals_description: Permite aos utilizadores analisarem contestações contra ações de moderação manage_blocks: Gerir bloqueios - manage_blocks_description: Permite aos utilizadores bloquear fornecedores de e-mail e endereços IP + manage_blocks_description: Permite aos utilizadores bloquearem fornecedores de e-mail e endereços IP manage_custom_emojis: Gerir emojis personalizados manage_custom_emojis_description: Permite aos utilizadores gerirem os emojis personalizados do servidor manage_federation: Gerir federação - manage_federation_description: Permite aos utilizadores bloquear ou permitir federação com outros domínios e controlar a entregabilidade + manage_federation_description: Permite aos utilizadores bloquearem ou permitirem a federação com outros domínios e controlar a entregabilidade manage_invites: Gerir convites - manage_invites_description: Permite aos utilizadores pesquisarem e desativarem ligações de convite + manage_invites_description: Permite aos utilizadores pesquisarem e desativarem hiperligações de convite manage_reports: Gerir denúncias - manage_reports_description: Permite aos utilizadores rever denúncias e executar ações de moderação contra eles + manage_reports_description: Permite aos utilizadores reverem denúncias e executarem ações de moderação contra eles manage_roles: Gerir funções manage_roles_description: Permite aos utilizadores a gestão e atribuição de funções abaixo dos seus manage_rules: Gerir regras @@ -726,7 +727,7 @@ pt-PT: manage_taxonomies: Gerir taxonomias manage_taxonomies_description: Permite aos utilizadores rever o conteúdo em tendência e atualizar as configurações de hashtag manage_user_access: Gerir acesso de utilizador - manage_user_access_description: Permite aos utilizadores desativar a autenticação de dois factores de outros utilizadores, alterar o seu e-mail e reiniciar a sua palavra-passe + manage_user_access_description: Permite aos utilizadores desativarem a autenticação de dois fatores de outros utilizadores, alterarem os seus endereços de correio eletrónico e redefinirem as suas palavras-passe manage_users: Gerir utilizadores manage_users_description: Permite aos utilizadores ver os detalhes de outros utilizadores e executar ações de moderação contra eles manage_webhooks: Gerir webhooks @@ -743,33 +744,33 @@ pt-PT: delete: Eliminar description_html: Embora a maioria afirme ter lido e concordado com os termos de serviço, geralmente as pessoas só os leem depois de lhes surgir um problema. Torne fácil a leitura rápida das regras do seu servidor, apresentando-as numa lista de tópicos. Tente que cada regra seja sucinta e simples, mas tente também não dividi-las num número excessivo de tópicos separados. edit: Editar regra - empty: Nenhuma regra de instância foi ainda definida. - title: Regras da instância + empty: Ainda não foi definida nenhuma regra do servidor. + title: Regras do servidor settings: about: manage_rules: Gerir regras do servidor preamble: Forneça informações aprofundadas sobre como o servidor é operado, moderado, financiado. - rules_hint: Existe uma área dedicada às regras a que os seus utilizadores devem aderir. - title: Acerca de + rules_hint: Existe uma área dedicada às regras a que os teus utilizadores devem aderir. + title: Sobre appearance: - preamble: Personalize a interface web do Mastodon. - title: Aspeto + preamble: Personaliza a interface web do Mastodon. + title: Aparência branding: - preamble: A marca do seu servidor diferencia-a de outros servidores na rede. Essa informação pode ser mostrada em vários ambientes, como a interface web do Mastodon, aplicações nativas, visualizações de hiperligações em outros sites e dentro de aplicações de mensagens, etc. Por esta razão, é melhor manter esta informação clara, curta e concisa. + preamble: A marca do teu servidor diferencia-a de outros servidores na rede. Essa informação pode ser mostrada em vários ambientes, como a interface web do Mastodon, aplicações nativas, visualizações de hiperligações em outros sites e dentro de aplicações de mensagens, etc. Por esta razão, é melhor manter esta informação clara, curta e concisa. title: Marca captcha_enabled: - desc_html: Isto depende de scripts externos da hCaptcha, o que pode ser uma preocupação de segurança e privacidade. Além disso, isto pode tornar o processo de registo menos acessível para algumas pessoas (especialmente as com limitações físicas). Por isso, considere medidas alternativas tais como registo mediante aprovação ou sob convite. - title: Requerer que novos utilizadores resolvam um CAPTCHA para confirmar a sua conta + desc_html: Isto depende de scripts externos da hCaptcha, o que pode ser uma preocupação de segurança e privacidade. Além disso, isto pode tornar o processo de registo menos acessível para algumas pessoas (especialmente as com limitações físicas). Por isso, considera medidas alternativas tais como registo mediante aprovação ou sob convite. + title: Requerer que novos utilizadores resolvam um CAPTCHA para confirmar a conta content_retention: danger_zone: Zona de perigo - preamble: Controle a forma como o conteúdo gerado pelo utilizador é armazenado no Mastodon. + preamble: Controla a forma como o conteúdo gerado pelo utilizador é armazenado no Mastodon. title: Retenção de conteúdo default_noindex: - desc_html: Afeta todos os utilizadores que não alteraram esta configuração + desc_html: Afeta todos os utilizadores que não tenham alterado esta configuração title: Desativar, por omissão, a indexação de utilizadores por parte dos motores de pesquisa discovery: - follow_recommendations: Recomendações para seguir - preamble: Revelar conteúdos interessantes é fundamental para a entrada de novos utilizadores que podem não conhecer ninguém no Mastodon. Controle como os vários recursos de descoberta funcionam no seu servidor. + follow_recommendations: Recomendações de contas + preamble: Revelar conteúdos interessantes é fundamental para a entrada de novos utilizadores que podem não conhecer ninguém no Mastodon. Controla como os vários recursos de descoberta funcionam no teu servidor. profile_directory: Diretório de perfis public_timelines: Cronologias públicas publish_discovered_servers: Publicar servidores descobertos @@ -797,11 +798,11 @@ pt-PT: federation_authentication: Imposição de autenticação da federação title: Definições do servidor site_uploads: - delete: Eliminar arquivo carregado + delete: Eliminar ficheiro enviado destroyed_msg: Envio do site eliminado com sucesso! software_updates: critical_update: Crítico — por favor, atualize rapidamente - description: Recomenda-se que mantenha a sua instalação do Mastodon atualizada para beneficiar das últimas correções e funcionalidades. Além disso, é por vezes crítico atualizar o Mastodon de forma atempada para evitar problemas de segurança. Por estas razões, o Mastodon verifica se há actualizações a cada 30 minutos e notifica-o de acordo com as suas preferências de notificação por e-mail. + description: Recomenda-se que mantenha a sua instalação do Mastodon atualizada para beneficiar das últimas correções e funcionalidades. Além disso, é por vezes crítico atualizar o Mastodon de forma atempada para evitar problemas de segurança. Por estas razões, o Mastodon verifica as atualizações a cada 30 minutos e irá notificá-lo de acordo com as suas preferências de notificação por e-mail. documentation_link: Saber mais release_notes: Notas de lançamento title: Atualizações disponíveis @@ -814,43 +815,43 @@ pt-PT: statuses: account: Autor application: Aplicação - back_to_account: Voltar para página da conta + back_to_account: Voltar à página da conta back_to_report: Voltar à página da denúncia batch: remove_from_report: Remover da denúncia report: Denúncia deleted: Eliminado - favourites: Marcadores + favourites: Favoritos history: Histórico de versões - in_reply_to: A responder a + in_reply_to: Em resposta a language: Idioma media: - title: Media + title: Multimédia metadata: Metadados no_status_selected: Nenhum estado foi alterado porque nenhum foi selecionado open: Abrir publicação original_status: Publicação original - reblogs: Re-publicacões + reblogs: Impulsos status_changed: Publicação alterada - title: Estado das contas + title: Publicações da conta trending: Em tendência visibility: Visibilidade - with_media: Com media + with_media: Com multimédia strikes: actions: - delete_statuses: "%{name} eliminou a publicação de %{target}" + delete_statuses: "%{name} eliminou as publicações de %{target}" disable: "%{name} congelou a conta de %{target}" - mark_statuses_as_sensitive: "%{name} marcou as publicações de %{target} como problemáticas" + mark_statuses_as_sensitive: "%{name} marcou as publicações de %{target} como sensíveis" none: "%{name} enviou uma advertência a %{target}" - sensitive: "%{name} marcou a conta de %{target} como problemática" + sensitive: "%{name} marcou a conta de %{target} como sensível" silence: "%{name} limitou a conta de %{target}" suspend: "%{name} suspendeu a conta de %{target}" - appeal_approved: Recorrido - appeal_pending: Recurso pendente - appeal_rejected: Recurso rejeitado + appeal_approved: Contestado + appeal_pending: Contestação pendente + appeal_rejected: Contestação rejeitada system_checks: database_schema_check: - message_html: Há migrações de base de dados pendentes. Queira executá-las, para garantir que a aplicação se comporta como o esperado + message_html: Existem migrações de bases de dados pendentes. Execute-as para garantir que a aplicação se comporta como esperado elasticsearch_health_red: message_html: O cluster elasticsearch não está de boa saúde (estado vermelho), as funcionalidades de pesquisa não estão disponíveis elasticsearch_health_yellow: @@ -871,10 +872,13 @@ pt-PT: message_html: 'Versão de Elasticsearch incompatível: %{value}' version_comparison: A versão de Elasticsearch %{running_version} está em execução. No entanto, é obrigatória a versão %{required_version} rules_check: - action: Gerir regras da instância - message_html: Não definiu nenhuma regra para a instância. + action: Gerir regras do servidor + message_html: Não definiu nenhuma regra para o servidor. sidekiq_process_check: message_html: Nenhum processo Sidekiq em execução para a(s) fila(s) %{value}. Reveja a configuração do seu Sidekiq + software_version_check: + action: Ver atualizações disponíveis + message_html: Está disponível uma atualização do Mastodon. software_version_critical_check: action: Ver atualizações disponíveis message_html: Está disponível uma atualização crítica do Mastodon. Por favor, atualize assim que possível. @@ -891,7 +895,7 @@ pt-PT: moderation: not_trendable: Não pode ser tendência not_usable: Não utilizável - pending_review: Pendente de revisão + pending_review: Revisão pendente review_requested: Revisão solicitada reviewed: Revista title: Estado @@ -901,11 +905,11 @@ pt-PT: name: Nome newest: Mais recente oldest: Mais antiga - open: Visualizar Publicamente + open: Ver publicamente reset: Repor review: Estado da revisão search: Pesquisar - title: Hashtags + title: Etiquetas updated_msg: 'Definições de #etiquetas atualizadas com sucesso' title: Administração trends: @@ -921,10 +925,10 @@ pt-PT: confirm_allow_provider: Tem a certeza que pretende permitir os fornecedores selecionados? confirm_disallow: Tem a certeza que pretende rejeitar as hiperligações selecionadas? confirm_disallow_provider: Tem a certeza que pretende rejeitar os fornecedores selecionados? - description_html: Estas são as ligações que presentemente estão a ser muito partilhadas por contas visíveis pelo seu servidor. Estas podem ajudar os seus utilizador a descobrir o que está a acontecer no mundo. Nenhuma ligação é exibida publicamente até que o editor a aprove. Também pode permitir ou rejeitar ligações em avulso. - disallow: Não permitir ligação + description_html: Estas são as hiperligações que presentemente estão a ser muito partilhadas por contas visíveis pelo seu servidor. Estas podem ajudar os seus utilizador a descobrir o que está a acontecer no mundo. Nenhuma hiperligação é mostrada publicamente até que o editor a aprove. Também pode permitir ou rejeitar hiperligações individuais. + disallow: Não permitir hiperligação disallow_provider: Não permitir editor - no_link_selected: Nenhuma ligação foi alterada, pois nenhuma foi selecionada + no_link_selected: Nenhuma hiperligação foi alterada, pois nenhuma foi selecionada publishers: no_publisher_selected: Nenhum editor foi alterado, pois nenhum foi selecionado shared_by_over_week: @@ -937,7 +941,7 @@ pt-PT: pending_review: Pendente de revisão preview_card_providers: allowed: As hiperligações deste editor podem ser tendência - description_html: Estes são os domínios a partir dos quais ligações são frequentemente partilhadas no seu servidor. As suas ligações não serão colocadas em alta a menos que o seu domínio de origem seja aprovado. A sua aprovação (ou rejeição) estende-se a subdomínios. + description_html: Estes são os domínios a partir dos quais hiperligações são frequentemente partilhadas no seu servidor. As suas hiperligações não serão colocadas em alta a menos que o seu domínio de origem seja aprovado. A sua aprovação (ou rejeição) estende-se a subdomínios. rejected: As hiperligações deste editor não podem ser tendência title: Editores rejected: Rejeitado @@ -948,14 +952,14 @@ pt-PT: confirm_allow_account: Tem a certeza que pretende aceitar as contas selecionadas? confirm_disallow: Tem a certeza que pretende rejeitar os estados selecionados? confirm_disallow_account: Tem a certeza que pretende rejeitar as contas selecionadas? - description_html: Estas são publicações que o seu servidor conhece e que atualmente estão a ser frequentemente partilhadas e adicionadas aos favoritos. Isto pode ajudar os seus utilizadores, novos e retornados, a encontrar mais pessoas para seguir. Nenhuma publicação será exibida publicamente até que aprove o autor, e o autor permita que a sua conta seja sugerida a outros. Você também pode permitir ou rejeitar publicações individualmente. + description_html: Estas são publicações que o seu servidor conhece e que estão a ser muito partilhadas e adicionadas aos favoritos neste momento. Pode ajudar os seus utilizadores novos e antigos a encontrar mais pessoas para seguir. Nenhuma publicação é apresentada publicamente até que o autor seja aprovado e o autor permita que a sua conta seja sugerida a outros. Também pode permitir ou rejeitar mensagens individuais. disallow: Não permitir publicação disallow_account: Não permitir autor no_status_selected: Não foram alteradas quaisquer publicações de tendências, uma vez que nenhuma foi selecionada not_discoverable: O autor optou por não permitir que a sua conta seja sugerida a outros shared_by: - one: Partilhado ou adicionado aos marcadores uma vez - other: Partilhado e adicionado aos marcadores %{friendly_count} vezes + one: Partilhada ou adicionada aos favoritos uma vez + other: Partilhada ou adicionada aos favoritos %{friendly_count} vezes title: Publicações em tendência tags: current_score: Pontuação atual %{score} @@ -965,13 +969,13 @@ pt-PT: tag_servers_dimension: Servidores mais populares tag_servers_measure: servidores diferentes tag_uses_measure: utilizações totais - description_html: 'Estas são as #etiquetas que aparecem atualmente com frequência em publicações visíveis pelo seu servidor. Isto pode ajudar os seus utilizadores a descobrir o que está ser mais falado no momento. Nenhuma #etiqueta será exibida publicamente até que a aprove.' + description_html: 'Estas são as #etiquetas que aparecem atualmente com frequência em publicações visíveis pelo seu servidor. Isto pode ajudar os seus utilizadores a descobrirem o que está ser mais falado no momento. Nenhuma #etiqueta será mostrada publicamente até que a aprove.' listable: Pode ser sugerida no_tag_selected: Nenhuma etiqueta foi alterada, pois nenhuma foi selecionada not_listable: Não será sugerida not_trendable: Não aparecerá nas tendências not_usable: Não pode ser utilizada - peaked_on_and_decaying: Máximo em %{date}, agora a decair + peaked_on_and_decaying: No auge em %{date}, agora em declínio title: Etiquetas em tendência trendable: Pode aparecer nas tendências trending_rank: 'Tendência #%{rank}' @@ -1010,20 +1014,20 @@ pt-PT: webhook: Webhook admin_mailer: auto_close_registrations: - body: Devido à falta de atividade recente dos moderadores, as inscrições em %{instance} foram automaticamente alteradas para requererem revisão manual, para evitar que %{instance} seja utilizada como plataforma para potenciais maus atores. Pode voltar a alterar para inscrições abertas em qualquer altura. - subject: As incrições em %{instance} foram automaticamente alteradas para requererem aprovação + body: Devido à falta de atividade recente dos moderadores, as inscrições em %{instance} foram automaticamente alteradas para requererem revisão manual, para evitar que %{instance} seja utilizada como plataforma para potenciais más intenções. Pode voltar a alterar para inscrições abertas em qualquer altura. + subject: As inscrições em %{instance} foram automaticamente alteradas para requererem aprovação new_appeal: actions: - delete_statuses: para eliminar as suas publicações - disable: para congelar a sua conta - mark_statuses_as_sensitive: para marcar as suas publicações como problemáticas + delete_statuses: para eliminar as publicações dele + disable: para congelar a conta dele + mark_statuses_as_sensitive: marcar as publicações dele como sensíveis none: uma advertência - sensitive: para marcar a sua conta como problemática - silence: para limitar a sua conta - suspend: para suspender a sua conta - body: "%{target} está a recorrer de uma decisão de moderação de %{action_taken_by} a %{date}, que consistiu em %{type}. Escreveu:" - next_steps: Pode aprovar o recurso para reverter a decisão de moderação, ou ignorá-lo. - subject: "%{username} está a recorrer da decisão de moderação em %{instance}" + sensitive: para marcar a conta dele como sensível + silence: para limitar a conta dele + suspend: para suspender a conta dele + body: "%{target} está a contestar uma decisão de moderação de %{action_taken_by} a %{date}, que consistiu em %{type}. Ele escreveu:" + next_steps: Podes aprovar a contestação para reverter a decisão de moderação ou ignorá-la. + subject: "%{username} está a contestar a decisão de moderação em %{instance}" new_critical_software_updates: body: Foram lançadas novas versões críticas do Mastodon. Pode querer atualizar assim que possível! subject: Estão disponíveis atualizações críticas do Mastodon para %{instance}! @@ -1045,17 +1049,17 @@ pt-PT: title: Publicações em tendência new_trending_tags: title: Etiquetas em tendência - subject: Novas tendências para revisão em %{instance} + subject: Novas tendências para serem revistas em %{instance} aliases: add_new: Criar pseudónimo - created_msg: Criou com sucesso um novo pseudónimo. Pode agora iniciar a migração da conta antiga. + created_msg: Criaste com sucesso um novo pseudónimo. Podes agora iniciar a migração da conta antiga. deleted_msg: O pseudónimo foi removido com êxito. Deixará de ser possível passar dessa conta para esta. - empty: Não tem pseudónimos. - hint_html: Se quiser mudar de outra conta para esta, pode criar aqui um pseudónimo, que é necessário antes de poder prosseguir com a migração de seguidores da conta antiga para esta. Esta ação por si só é inofensiva e reversível. A migração da conta é iniciada a partir da conta antiga. + empty: Não tens pseudónimos. + hint_html: Se quiseres mudar de outra conta para esta, podes criar aqui um pseudónimo, que é necessário antes de poderes prosseguir com a migração de seguidores da conta antiga para esta. Esta ação por si só é inofensiva e reversível. A migração da conta é iniciada a partir da conta antiga. remove: Desvincular pseudónimo appearance: advanced_web_interface: Interface web avançada - advanced_web_interface_hint: 'Se quiser utilizar toda a largura do seu ecrã, a interface web avançada permite-lhe configurar várias colunas diferentes para ver tanta informação ao mesmo tempo quanto quiser: Página inicial, notificações, cronologia federada, qualquer número de listas e etiquetas.' + advanced_web_interface_hint: 'Se quiseres utilizar toda a largura do teu ecrã, a interface web avançada permite configurar várias colunas diferentes para veres tanta informação ao mesmo tempo quanto quiseres: página inicial, notificações, cronologia federada, qualquer número de listas e etiquetas.' animations_and_accessibility: Animações e acessibilidade confirmation_dialogs: Caixas de confirmação discovery: Descobrir @@ -1063,7 +1067,7 @@ pt-PT: body: O Mastodon é traduzido por voluntários. guide_link: https://pt.crowdin.com/project/mastodon/ guide_link_text: Todos podem contribuir. - sensitive_content: Conteúdo problemático + sensitive_content: Conteúdo sensível application_mailer: notification_preferences: Alterar preferências de e-mail salutation: "%{name}," @@ -1078,46 +1082,46 @@ pt-PT: logout: Sair regenerate_token: Regenerar token de acesso token_regenerated: Token de acesso regenerado com sucesso - warning: Cuidado com estes dados. Não partilhar com ninguém! + warning: Cuidado com estes dados. Não partilhes com ninguém! your_token: O teu token de acesso auth: apply_for_account: Solicitar uma conta captcha_confirmation: - help_html: Se tiver problemas a resolver o CAPTCHA, pode entrar em contacto connosco através de %{email} e poderemos ajudá-lo. - hint_html: Só mais uma coisa! Precisamos confirmar que você é um humano (isto para que possamos evitar spam!). Resolva o CAPTCHA abaixo e clique em "Continuar". + help_html: Se tiveres problemas a resolver o CAPTCHA, podes entrar em contacto connosco através de %{email} e poderemos ajudar-te. + hint_html: Só mais uma coisa! Precisamos confirmar que és um humano (isto para que possamos evitar spam!). Resolve o CAPTCHA abaixo e clica em "Continuar". title: Verificação de segurança confirmations: - awaiting_review: O seu endereço de e-mail está confirmado! A equipa de %{domain} está agora a analisar a sua inscrição. Receberá um e-mail se a sua conta for aprovada! - awaiting_review_title: A sua inscrição está a ser revista + awaiting_review: O teu endereço de e-mail está confirmado! A equipa de %{domain} está agora a analisar a tua inscrição. Receberás um e-mail se a tua conta for aprovada! + awaiting_review_title: A tua inscrição está a ser revista clicking_this_link: clicar nesta hiperligação login_link: iniciar sessão - proceed_to_login_html: Pode agora prosseguir para %{login_link}. - redirect_to_app_html: Devia ter sido reencaminhado para a aplicação %{app_name}. Se isso não aconteceu, tente %{clicking_this_link} ou volte manualmente para a aplicação. - registration_complete: O seu registo sem %{domain} está agora concluído! + proceed_to_login_html: Podes agora prosseguir para %{login_link}. + redirect_to_app_html: Devias ter sido reencaminhado para a aplicação %{app_name}. Se isso não aconteceu, tenta %{clicking_this_link} ou regressa manualmente para a aplicação. + registration_complete: O teu registo sem %{domain} está agora concluído! welcome_title: Bem-vindo(a), %{name}! - wrong_email_hint: Se este endereço de correio eletrónico não estiver correto, pode alterá-lo nas definições de conta. + wrong_email_hint: Se este endereço de correio eletrónico não estiver correto, podes alterá-lo nas definições de conta. delete_account: Eliminar conta - delete_account_html: Se deseja eliminar a sua conta, pode continuar aqui. Uma confirmação será solicitada. + delete_account_html: Se pretenderes eliminar a tua conta, podes fazê-lo aqui. Será pedida uma confirmação. description: prefix_invited_by_user: "@%{name} convidou-o a juntar-se a esta instância do Mastodon!" prefix_sign_up: Inscreva-se hoje no Mastodon! suffix: Com uma conta, poderá seguir pessoas, publicar atualizações e trocar mensagens com utilizadores de qualquer instância Mastodon e muito mais! - didnt_get_confirmation: Não recebeu um link de confirmação? + didnt_get_confirmation: Não recebeu uma hiperligação de confirmação? dont_have_your_security_key: Não tem a sua chave de segurança? forgot_password: Esqueceu-se da palavra-passe? invalid_reset_password_token: Token de modificação da palavra-passe é inválido ou expirou. Por favor, solicita um novo. - link_to_otp: Insira um código de autenticação em duas etapas do seu telemóvel, ou um código de recuperação - link_to_webauth: Usa o teu dispositivo de chave de segurança + link_to_otp: Introduza um código de dois fatores do seu telemóvel ou um código de recuperação + link_to_webauth: Utilize o seu dispositivo de chave de segurança log_in_with: Iniciar sessão com login: Entrar logout: Sair migrate_account: Mudar para uma conta diferente - migrate_account_html: Se deseja redirecionar esta conta para uma outra pode configurar isso aqui. + migrate_account_html: Se desejas redirecionar esta conta para uma outra podes configurar isso aqui. or_log_in_with: Ou iniciar sessão com privacy_policy_agreement_html: Eu li e concordo com a política de privacidade progress: confirm: Confirmar e-mail - details: Os seus dados + details: Os teus dados review: A nossa avaliação rules: Aceitar regras providers: @@ -1125,11 +1129,11 @@ pt-PT: saml: SAML register: Registar registration_closed: "%{instance} não está a aceitar novos membros" - resend_confirmation: Reenviar link de confirmação + resend_confirmation: Reenviar hiperligação de confirmação reset_password: Criar nova palavra-passe rules: accept: Aceitar - back: Retroceder + back: Voltar invited_by: 'Pode inscrever-se em %{domain} graças ao convite que recebeu de:' preamble: Estas são definidas e aplicadas pelos moderadores de %{domain}. preamble_invited: Antes de prosseguir, por favor, considere as regras base definidas pelos moderadores de %{domain}. @@ -1139,38 +1143,40 @@ pt-PT: set_new_password: Editar palavra-passe setup: email_below_hint_html: Verifique a sua pasta de spam ou solicite outra. Pode corrigir o seu endereço de e-mail se estiver errado. - email_settings_hint_html: Clique no link que enviamos para verificar %{email}. Esperaremos aqui. - link_not_received: Não recebeu um link? - new_confirmation_instructions_sent: Irá receber uma nova mensagem de e-mail com a ligação de confirmação dentro de alguns minutos! + email_settings_hint_html: Clica na hiperligação que enviamos para verificar %{email}. Esperaremos aqui. + link_not_received: Não recebeu uma hiperligação? + new_confirmation_instructions_sent: Irá receber uma nova mensagem de e-mail com a hiperligação de confirmação dentro de alguns minutos! title: Verifique a caixa de entrada do seu e-mail sign_in: preamble_html: Iniciar sessão com as suas credenciais de %{domain}. Se a sua conta estiver hospedada noutro servidor, não poderá iniciar sessão aqui. title: Iniciar sessão em %{domain} sign_up: - manual_review: Inscrições no %{domain} passam por uma revisão manual pelos nossos moderadores. Para nos ajudar a processar o seu pedido de inscrição, escreva um pouco sobre si e o porquê de quer uma conta no %{domain}. - preamble: Com uma conta neste servidor Mastodon, poderá seguir qualquer outra pessoa na rede, independentemente do servidor onde a conta esteja hospedada. - title: Vamos lá inscrevê-lo em %{domain}. + manual_review: As inscrições em %{domain} passam por uma revisão manual pelos nossos moderadores. Para nos ajudar a processar o teu pedido de inscrição, escreve um pouco sobre ti e o motivo para quereres uma conta em %{domain}. + preamble: Com uma conta neste servidor Mastodon, poderás seguir qualquer outra pessoa na rede, independentemente do servidor onde a conta esteja hospedada. + title: Vamos lá inscrever-te em %{domain}. status: account_status: Estado da conta confirming: A aguardar a confirmação do e-mail para ser concluída. - functional: A sua conta está totalmente operacional. - pending: A sua inscrição está a ser analisada pela nossa equipa. Este processo pode demorar algum tempo. Receberá um e-mail se a sua inscrição for aprovada. - redirecting_to: A sua conta está inativa porque está atualmente a ser redirecionada para %{acct}. - self_destruct: Como %{domain} vai fechar, só terá acesso limitado à sua conta. - view_strikes: Veja as reprimendas anteriores sobre a sua conta - too_fast: Formulário enviado demasiado rapidamente, tente novamente. + functional: A tua conta está totalmente operacional. + pending: A tua inscrição está a ser analisada pela nossa equipa. Este processo pode demorar algum tempo. Receberás um e-mail se a tua inscrição for aprovada. + redirecting_to: A tua conta está inativa porque está atualmente a ser redirecionada para %{acct}. + self_destruct: Como %{domain} vai fechar, só terás acesso limitado à tua conta. + view_strikes: Ver as reprimendas anteriores sobre a tua conta + too_fast: Formulário enviado demasiado rapidamente, tenta novamente. use_security_key: Usar chave de segurança author_attribution: example_title: Texto de exemplo - hint_html: Controle a forma como é creditado quando as hiperligações são partilhadas no Mastodon. + hint_html: Estás a escrever notícias ou artigos de blogue fora do Mastodon? Controla a forma como és creditados quando estes são partilhados no Mastodon. + instructions: 'Certifica-te que este código está no HTML do teu artigo:' more_from_html: Mais de %{name} - s_blog: Blog de %{name} - title: Atribuição de autor + s_blog: Blogue de %{name} + then_instructions: Em seguida, adiciona o nome de domínio da publicação no campo abaixo. + title: Atribuição do autor challenge: confirm: Continuar - hint_html: "Dica: Não vamos pedir novamente a sua palavra-passe durante a próxima hora." + hint_html: "Dica: Não vamos pedir novamente a tua palavra-passe durante a próxima hora." invalid_password: Palavra-passe inválida - prompt: Confirmar a sua palavra-passe para continuar + prompt: Confirma a palavra-passe para continuar crypto: errors: invalid_key: não é uma chave Ed25519 ou Curve25519 válida @@ -1185,102 +1191,102 @@ pt-PT: about_x_years: "%{count} anos" almost_x_years: "%{count} anos" half_a_minute: Agora mesmo - less_than_x_minutes: "%{count} meses" + less_than_x_minutes: "%{count}m" less_than_x_seconds: Agora mesmo over_x_years: "%{count} anos" x_days: "%{count} dias" - x_minutes: "%{count} minutos" + x_minutes: "%{count}m" x_months: "%{count} meses" - x_seconds: "%{count} segundos" + x_seconds: "%{count}s" deletes: - challenge_not_passed: A informação que inseriu não estava correcta - confirm_password: Insira sua palavra-passe atual para verificar a sua identidade - confirm_username: Insira seu nome de utilizador para confirmar o procedimento + challenge_not_passed: A informação que inseriste não estava correta + confirm_password: Introduz a palavra-passe atual para verificar a tua identidade + confirm_username: Introduz o teu nome de utilizador para confirmar o procedimento proceed: Eliminar conta - success_msg: A sua conta foi eliminada com sucesso + success_msg: A tua conta foi eliminada com sucesso warning: - before: 'Antes de continuar, por favor leia cuidadosamente estas notas:' + before: 'Antes de continuares, por favor lê cuidadosamente estas notas:' caches: O conteúdo que foi armazenado em cache por outras instâncias pode perdurar - data_removal: As suas publicações e outros dados serão eliminados permanentemente - email_change_html: Pode alterar o seu e-mail sem eliminar a sua conta - email_contact_html: Se ainda assim não o recebeu, pode enviar um e-mail para %{email} para obter ajuda - email_reconfirmation_html: Se não recebeu a mensagem de e-mail de confirmação, pode solicitá-la novamente - irreversible: Não será possível restaurar ou reativar sua conta - more_details_html: Para mais pormenores, leia a política de privacidade. - username_available: O seu nome de utilizador ficará novamente disponível - username_unavailable: O seu nome de utilizador permanecerá indisponível + data_removal: As tuas publicações e outros dados serão eliminados permanentemente + email_change_html: Podes alterar o teu e-mail sem eliminar a tua conta + email_contact_html: Se ainda assim não o recebeste, podes enviar um e-mail para %{email} para obter ajuda + email_reconfirmation_html: Se não recebeste a mensagem de e-mail de confirmação, podes solicitá-la novamente + irreversible: Não será possível restaurar ou reativar a tua conta + more_details_html: Para mais pormenores, lê a política de privacidade. + username_available: O teu nome de utilizador ficará novamente disponível + username_unavailable: O teu nome de utilizador permanecerá indisponível disputes: strikes: action_taken: Ação tomada - appeal: Recorrer - appeal_approved: Esta reprimenda foi alvo dum recurso entretanto deferido, pelo que já não é válida - appeal_rejected: O recurso foi rejeitado - appeal_submitted_at: Recurso submetido - appealed_msg: O seu recurso foi submetido. Se ele for aprovado, será notificado. + appeal: Contestar + appeal_approved: Esta reprimenda foi alvo de uma contestação aceite, pelo que já não é válida + appeal_rejected: A contestação foi rejeitada + appeal_submitted_at: Contestação submetida + appealed_msg: A tua contestação foi submetida. Se for aprovada, receberás uma notificação. appeals: - submit: Submeter recurso - approve_appeal: Deferir recurso + submit: Submeter contestação + approve_appeal: Aprovar contestação associated_report: Denúncia associada created_at: Data - description_html: Estas são ações tomadas contra a sua conta e avisos que lhe foram enviados pela equipa de %{instance}. + description_html: Estas são as ações tomadas contra a tua conta e avisos que te foram enviados pela equipa de %{instance}. recipient: Endereçado a - reject_appeal: Indeferir recurso + reject_appeal: Rejeitar contestação status: 'Publicação #%{id}' status_removed: Publicação já eliminada do sistema title: "%{action} de %{date}" title_actions: - delete_statuses: Remoção de publicação + delete_statuses: Eliminação da publicação disable: Congelamento da conta - mark_statuses_as_sensitive: Marcação das publicações como problemáticas + mark_statuses_as_sensitive: Marcação das publicações como sensíveis none: Advertência - sensitive: Marcação da conta como problemática + sensitive: Marcação da conta como sensível silence: Limitação da conta suspend: Suspensão da conta - your_appeal_approved: O seu recurso foi deferido - your_appeal_pending: Submeteu um recurso - your_appeal_rejected: O seu recurso foi indeferido + your_appeal_approved: A tua contestação foi aprovada + your_appeal_pending: Submeteste uma contestação + your_appeal_rejected: A tua contestação foi rejeitada edit_profile: basic_information: Informação básica - hint_html: "Personalize o que as pessoas veem no seu perfil público e junto das suas publicações. É mais provável que as outras pessoas o sigam de volta ou interajam consigo se tiver um perfil preenchido e uma imagem de perfil." + hint_html: "Personalizq o que as pessoas veem no teu perfil público e junto das tuas publicações. É mais provável que as outras pessoas te sigam de volta ou interajam contigo se tiveres um perfil preenchido e uma imagem de perfil." other: Outro errors: - '400': O pedido que submeteu foi inválido ou mal formulado. + '400': O pedido que submeteste foi inválido ou mal formulado. '403': Não tens a permissão necessária para ver esta página. - '404': A página que procura não existe. + '404': A página que procuras não existe. '406': Esta página não está disponível no formato solicitado. - '410': A página que procura já não existe. + '410': A página que procuras já não existe. '422': content: "A verificação de segurança falhou. \nDesativaste o uso de cookies?" title: A verificação de segurança falhou '429': Demasiados pedidos '500': - content: Desculpe, mas algo correu mal da nossa parte. + content: Pedimos desculpa, mas algo correu mal da nossa parte. title: Esta página não está correta '503': A página não pôde ser apresentada devido a uma falha temporária do servidor. - noscript_html: Para usar a aplicação web do Mastodon, ative o JavaScript. Alternativamente, experimente uma das aplicações nativas para o Mastodon na sua plataforma. + noscript_html: Para usar a aplicação web do Mastodon, ativa o JavaScript. Alternativamente, experimenta uma das aplicações nativas para o Mastodon na tua plataforma. existing_username_validator: not_found: não foi possível encontrar um utilizador local com esse nome not_found_multiple: não foi possível encontrar %{usernames} exports: archive_takeout: date: Data - download: Descarregar o seu arquivo - hint_html: Pode pedir um arquivo das suas publicações e ficheiros de media carregados. Os dados no ficheiro exportado estarão no formato ActivityPub, que pode ser lido com qualquer programa compatível. Pode solicitar um arquivo a cada 7 dias. - in_progress: A compilar o seu arquivo... - request: Peça o seu arquivo + download: Descarregar o teu arquivo + hint_html: Podes pedir um arquivo das tuas publicações e ficheiros multimédia enviados. Os dados no ficheiro exportado estarão no formato ActivityPub, que pode ser lido com qualquer programa compatível. Podes solicitar um arquivo a cada 7 dias. + in_progress: A compilar o teu arquivo... + request: Pedir o teu arquivo size: Tamanho blocks: Bloqueaste bookmarks: Marcadores csv: CSV domain_blocks: Bloqueios de domínio lists: Listas - mutes: Tens em silêncio - storage: Armazenamento de media + mutes: Que ocultaste + storage: Armazenamento de multimédia featured_tags: add_new: Adicionar nova errors: - limit: Já destacou o número máximo de hashtags permitido - hint_html: "O que são etiquetas em destaque? Exibidas de forma bem visível no seu perfil público, permitem que as pessoas consultem as suas publicações públicas especificamente sob essas etiquetas. São uma óptima ferramenta para dar seguimento a trabalhos criativos ou projectos de longo prazo." + limit: Já destacaste o número máximo de etiquetas permitido + hint_html: "Coloca as etiquetas mais importantes no teu perfil. Uma excelente ferramenta para acompanhar os teus trabalhos criativos e projetos a longo prazo, as etiquetas em destaque são apresentadas de forma proeminente no teu perfil e permitem um acesso rápido às tuas próprias publicações." filters: contexts: account: Perfis @@ -1292,15 +1298,15 @@ pt-PT: add_keyword: Adicionar palavra-chave keywords: Palavras-chave statuses: Publicações individuais - statuses_hint_html: Este filtro aplica-se a publicações individuais selecionadas independentemente de estas corresponderem às palavras-chave abaixo. Reveja ou remova publicações do filtro. + statuses_hint_html: Este filtro aplica-se a publicações individuais selecionadas independentemente de estas corresponderem às palavras-chave abaixo. Revê ou remove publicações do filtro. title: Editar filtros errors: - deprecated_api_multiple_keywords: Estes parâmetros não podem ser alterados a partir desta aplicação porque se aplicam a mais de um filtro de palavra-chave. Use uma aplicação mais recente ou a interface web. + deprecated_api_multiple_keywords: Estes parâmetros não podem ser alterados a partir desta aplicação porque se aplicam a mais de um filtro de palavra-chave. Usa uma aplicação mais recente ou a interface web. invalid_context: Inválido ou nenhum contexto fornecido index: contexts: Filtros em %{contexts} delete: Eliminar - empty: Não tem filtros. + empty: Não tens filtros. expires_in: Expira em %{distance} expires_on: Expira em %{date} keywords: @@ -1321,16 +1327,16 @@ pt-PT: batch: remove: Retirar do filtro index: - hint: Este filtro aplica-se a publicações individuais selecionadas independentemente de outros critérios. Pode adicionar mais publicações a este filtro através da interface web. + hint: Este filtro aplica-se a publicações individuais selecionadas independentemente de outros critérios. Podes adicionar mais publicações a este filtro através da interface web. title: Publicações filtradas generic: all: Tudo all_items_on_page_selected_html: one: "%{count} item nesta página está selecionado." - other: Todo os %{count} items nesta página estão selecionados. + other: Todo os %{count} itens nesta página estão selecionados. all_matching_items_selected_html: - one: "%{count} item que corresponde à sua pesquisa está selecionado." - other: Todos os %{count} items que correspondem à sua pesquisa estão selecionados. + one: "%{count} item que corresponde à pesquisa está selecionado." + other: Todos os %{count} itens que correspondem à pesquisa estão selecionados. cancel: Cancelar changes_saved_msg: Alterações guardadas! confirm: Confirmar @@ -1341,12 +1347,12 @@ pt-PT: order_by: Ordenar por save_changes: Guardar alterações select_all_matching_items: - one: Selecione %{count} item que corresponde à sua pesquisa. - other: Selecione todos os %{count} items que correspondem à sua pesquisa. + one: Selecionar %{count} item que corresponde à pesquisa. + other: Selecionar todos os %{count} itens que correspondem à pesquisa. today: hoje validation_errors: - one: Algo não está correcto. Por favor analise o erro abaixo - other: Algo não está bem. Queira analisar os %{count} erros abaixo + one: Algo ainda não está correto! Revê o erro abaixo + other: Algo ainda não está correto! Revê os %{count} erros abaixo imports: errors: empty: Ficheiro CSV vazio @@ -1356,26 +1362,26 @@ pt-PT: too_large: O ficheiro é demasiado grande failures: Falhas imported: Importado - mismatched_types_warning: Parece que selecionou o tipo errado para esta importação, por favor verifique novamente. + mismatched_types_warning: Parece que selecionaste o tipo errado para esta importação, por favor verifica novamente. modes: merge: Juntar merge_long: Manter os registos existentes e adicionar novos registos - overwrite: Escrever por cima + overwrite: Substituir overwrite_long: Substituir os registos atuais pelos novos overwrite_preambles: - blocking_html: Está prestes a substituir a sua lista de bloqueios com até %{total_items} contas de %{filename}. - bookmarks_html: Está prestes a substituir os seus marcadores com até %{total_items} publicações de %{filename}. - domain_blocking_html: Está prestes a substituir a sua lista de bloqueios de domínio com até %{total_items} domínios de %{filename}. - following_html: Está prestes a seguir até %{total_items} contas de %{filename} e parar de seguir quaisquer outras contas. - lists_html: Está prestes a substituir as suas listas pelo conteúdo de %{filename}. Até %{total_items} contas serão adicionadas a novas listas. - muting_html: Está prestes a substituir a sua lista de contas silenciadas com até %{total_items} contas de %{filename}. + blocking_html: Estás prestes a substituir a tua lista de bloqueios com até %{total_items} contas de %{filename}. + bookmarks_html: Estás prestes a substituir os teus marcadores com até %{total_items} publicações de %{filename}. + domain_blocking_html: Estás prestes a substituir a tua lista de bloqueios de domínio com até %{total_items} domínios de %{filename}. + following_html: Estás prestes a seguir até %{total_items} contas de %{filename} e parar de seguir quaisquer outras contas. + lists_html: Estás prestes a substituir as tuas listas pelo conteúdo de %{filename}. Até %{total_items} contas serão adicionadas a novas listas. + muting_html: Estás prestes a substituir a tua lista de contas ocultadas com até %{total_items} contas de %{filename}. preambles: - blocking_html: Está prestes a bloquear até %{total_items} contas de %{filename}. - bookmarks_html: Está prestes a adicionar até %{total_items} publicações de %{filename} aos seus marcadores. - domain_blocking_html: Está prestes a bloquear até %{total_items} domínios de %{filename}. - following_html: Está prestes a seguir até %{total_items} contas de %{filename}. - lists_html: Está prestes a adicionar até %{total_items} contas do ficheiro %{filename} para as suas listas. Novas listas serão criadas se não existir uma lista onde as adicionar. - muting_html: Está prestes a silenciar até %{total_items} contas de %{filename}. + blocking_html: Estás prestes a bloquear até %{total_items} contas de %{filename}. + bookmarks_html: Estás prestes a adicionar até %{total_items} publicações de %{filename} aos teus marcadores. + domain_blocking_html: Estás prestes a bloquear até %{total_items} domínios de %{filename}. + following_html: Estás prestes a seguir até %{total_items} contas de %{filename}. + lists_html: Estás prestes a adicionar até %{total_items} contas do ficheiro %{filename} para as tuas listas. Novas listas serão criadas se não existir uma lista onde as adicionar. + muting_html: Estás prestes a ocultar até %{total_items} contas de %{filename}. preface: Podes importar dados que tenhas exportado de outra instância, como a lista de pessoas que segues ou bloqueadas. recent_imports: Importações recentes states: @@ -1384,27 +1390,27 @@ pt-PT: scheduled: Agendado unconfirmed: Não confirmado status: Estado - success: Os teus dados foram enviados correctamente e serão processados em breve + success: Os teus dados foram enviados corretamente e serão processados em breve time_started: Iniciado em titles: - blocking: Importando contas bloqueadas - bookmarks: Importando marcadores - domain_blocking: Importando domínios bloqueados - following: Importando contas seguidas - lists: A importar listas - muting: Importando contas silenciadas + blocking: Importar contas bloqueadas + bookmarks: Importar marcadores + domain_blocking: Importar domínios bloqueados + following: Importar contas seguidas + lists: Importar listas + muting: Importar contas ocultadas type: Tipo de importação type_groups: constructive: Seguidores e marcadores - destructive: Bloqueios e silenciamentos + destructive: Bloqueios e ocultados types: - blocking: Lista de bloqueio + blocking: Lista de bloqueios bookmarks: Marcadores domain_blocking: Lista de domínios bloqueados following: Lista de pessoas que estás a seguir lists: Listas muting: Lista de utilizadores silenciados - upload: Carregar + upload: Enviar invites: delete: Desativar expired: Expirados @@ -1418,77 +1424,88 @@ pt-PT: expires_in_prompt: Nunca generate: Gerar hiperligação de convite invalid: Este convite não é válido - invited_by: 'Foi convidado por:' + invited_by: 'Foste convidado por:' max_uses: - one: 1 uso - other: "%{count} usos" + one: 1 utilização + other: "%{count} utilizações" max_uses_prompt: Sem limite - prompt: Gerar e partilhar ligações com outras pessoas para permitir acesso a essa instância + prompt: Gerar e partilhar hiperligações com outras pessoas para permitir acesso a essa instância table: expires_at: Expira - uses: Usos + uses: Utilizações title: Convidar pessoas lists: errors: - limit: Atingiu o número máximo de listas permitido + limit: Atingiste o número máximo de listas permitido login_activities: authentication_methods: - otp: aplicação de autenticação em duas etapas + otp: aplicação de autenticação de dois fatores password: palavra-passe sign_in_token: código de segurança de e-mail webauthn: chaves de segurança - description_html: Se vê atividade que não reconhece, considere alterar a sua palavra-passe e ativar a autenticação em duas etapas. + description_html: Se vires atividade que não reconheces, considera alterar a tua palavra-passe e ativar a autenticação de dois fatores. empty: Sem histórico de autenticação disponível failed_sign_in_html: Tentativa falhada de início de sessão com %{method} de %{ip} (%{browser}) - successful_sign_in_html: Sessão correctamente iniciada com %{method} de %{ip} (%{browser}) + successful_sign_in_html: Sessão corretamente iniciada com %{method} de %{ip} (%{browser}) title: Histórico de autenticação mail_subscriptions: unsubscribe: action: Sim, cancelar subscrição - complete: Subscrição Cancelada + complete: Subscrição cancelada + confirmation_html: Tens a certeza que desejas cancelar a subscrição para receber %{type} pelo Mastodon em %{domain} no teu e-mail em %{email}? Podes sempre subscrever novamente nas tuas definições de notificação por e-mail. + emails: + notification_emails: + favourite: e-mails de notificação de favoritos + follow: e-mails de notificação de seguidor + follow_request: e-mails de pedido de seguidor + mention: e-mails de notificação de menção + reblog: e-mails de notificação de impulsos + resubscribe_html: Se tiveres anulado a subscrição por engano, podes voltar a subscrevê-la nas definições de notificação por e-mail. + success_html: Não receberás novamente %{type} do Mastodon em %{domain} para o teu e-mail em %{email}. title: Cancelar subscrição media_attachments: validations: images_and_video: Não é possível anexar um vídeo a uma publicação que já contém imagens - not_ready: Não é possível anexar ficheiros que ainda não acabaram de ser processados. Tente outra vez daqui a pouco! + not_found: Multimédia %{ids} não encontrada ou já anexada a outra publicação + not_ready: Não é possível anexar ficheiros que ainda não acabaram de ser processados. Tenta outra vez daqui a pouco! too_many: Não é possível anexar mais de 4 ficheiros migrations: acct: Mudou-se para cancel: Cancelar redirecionamento - cancel_explanation: Cancelar o redirecionamento irá reativar a sua conta atual, mas não trará de volta os seguidores que foram migrados para essa conta. - cancelled_msg: Cancelou corretamente o redirecionamento. + cancel_explanation: Se cancelares o redirecionamento irás reativar a tua conta atual, mas não trará de volta os seguidores que foram migrados para essa conta. + cancelled_msg: Redirecionamento cancelado corretamente. errors: - already_moved: é a mesma conta para a qual já migrou - missing_also_known_as: não é um pseudónimo dessa conta - move_to_self: não pode ser conta atual + already_moved: é a mesma conta para a qual já migraste + missing_also_known_as: não é um pseudónimo desta conta + move_to_self: não pode ser a conta atual not_found: não foi encontrado - on_cooldown: Você está no período de espera + on_cooldown: Estás no período de espera followers_count: Seguidores no momento da migração incoming_migrations: A migrar de uma conta diferente - incoming_migrations_html: Para migrar de outra conta para esta, primeiro você precisa criar um pseudónimo. - moved_msg: A sua conta está agora a ser redirecionada para %{acct} e os seus seguidores estão a ser transferidos. - not_redirecting: A sua conta não está atualmente a ser redirecionada para nenhuma outra conta. - on_cooldown: Migrou recentemente a sua conta. Esta função ficará disponível novamente em %{count} dias. + incoming_migrations_html: Para passar de outra conta para esta, primeiro é necessário criar um pseudónimo de conta. + moved_msg: A tua conta está agora a ser redirecionada para %{acct} e os teus seguidores estão a ser transferidos. + not_redirecting: A rua conta não está atualmente a ser redirecionada para nenhuma outra conta. + on_cooldown: Migraste recentemente a tua conta. Esta função ficará disponível novamente em %{count} dias. past_migrations: Migrações anteriores proceed_with_move: Migrar seguidores - redirected_msg: A sua conta está agora a ser redirecionada para %{acct}. - redirecting_to: A sua conta está a ser redirecionada para %{acct}. + redirected_msg: A tua conta está agora a redirecionar para %{acct}. + redirecting_to: A tua conta está a redirecionar para %{acct}. set_redirect: Definir redirecionamento warning: backreference_required: A nova conta deve primeiro ser configurada para que esta seja referenciada - before: 'Antes de continuar, leia cuidadosamente estas notas:' - cooldown: Após a migração, há um período de tempo de espera durante o qual não poderá voltar a migrar - disabled_account: Posteriormente, a sua conta atual não será totalmente utilizável. No entanto, continuará a ter acesso à exportação de dados, bem como à reativação. + before: 'Antes de continuares, lê cuidadosamente estas notas:' + cooldown: Após a migração, há um período de tempo de espera durante o qual não poderás voltar a migrar + disabled_account: Posteriormente, a tua conta atual não será totalmente utilizável. No entanto, continuarás a ter acesso à exportação de dados, bem como à reativação. followers: Esta ação irá migrar todos os seguidores da conta atual para a nova conta - only_redirect_html: Em alternativa, pode apenas colocar um redirecionamento no seu perfil. + only_redirect_html: Em alternativa, podes apenas colocar um redirecionamento no teu perfil. other_data: Nenhum outro dado será migrado automaticamente - redirect: O perfil da sua conta atual será atualizado com um aviso de redirecionamento e será excluído das pesquisas + redirect: O perfil da tua conta atual será atualizado com um aviso de redirecionamento e será excluído das pesquisas moderation: title: Moderação move_handler: - carry_blocks_over_text: Este utilizador migrou de %{acct}, que você tinha bloqueado. - carry_mutes_over_text: Este utilizador migrou de %{acct}, que você tinha silenciado. - copy_account_note_text: 'Este utilizador migrou de %{acct}, aqui estão as suas notas anteriores sobre ele:' + carry_blocks_over_text: Este utilizador migrou de %{acct}, que tinhas bloqueado. + carry_mutes_over_text: Este utilizador migrou de %{acct}, que tinhas ocultado. + copy_account_note_text: 'Este utilizador migrou de %{acct}, aqui estão as tuas notas anteriores sobre ele:' navigation: toggle_menu: Alternar o menu notification_mailer: @@ -1498,11 +1515,11 @@ pt-PT: sign_up: subject: "%{name} inscreveu-se" favourite: - body: 'A sua publicação foi adicionada aos marcadores por %{name}:' - subject: "%{name} adicionou a sua publicação aos marcadores" - title: Novo marcador + body: 'A tua publicação foi adicionada aos favoritos por %{name}:' + subject: "%{name} adicionou a tua publicação aos favoritos" + title: Novo favorito follow: - body: "%{name} é teu seguidor!" + body: "%{name} está a seguir-te!" subject: "%{name} começou a seguir-te" title: Novo seguidor follow_request: @@ -1516,17 +1533,19 @@ pt-PT: subject: "%{name} mencionou-te" title: Nova menção poll: - subject: A sondagem de %{name} encerrou + subject: A sondagem de %{name} terminou reblog: - body: 'A sua publicação foi reforçada por %{name}:' - subject: "%{name} reforçou a sua publicação" - title: Novo reforço + body: 'A tua publicação foi impulsionada por %{name}:' + subject: "%{name} impulsionou a tua publicação" + title: Novo impulso status: subject: "%{name} acabou de publicar" update: subject: "%{name} editou uma publicação" notifications: - email_events_hint: 'Selecione os casos para os quais deseja receber notificações:' + administration_emails: Notificações por e-mail do administrador + email_events: Eventos para notificações por e-mail + email_events_hint: 'Seleciona os casos para os quais desejas receber notificações:' number: human: decimal_units: @@ -1539,28 +1558,28 @@ pt-PT: trillion: T otp_authentication: code_hint: Introduz o código gerado pela tua aplicação de autenticação para confirmar - description_html: Se ativar a autenticação em duas etapas, para entrar na sua conta terá de ter consigo o seu telefone, que vai gerar os tokens necessários à validação do seu acesso. + description_html: Se ativares a autenticação de dois fatores utilizando uma aplicação de autenticação, para iniciar sessão terás de estar na posse do seu telemóvel, que gerará tokens para introduzires. enable: Ativar - instructions_html: "Digitalize este código QR no Google Authenticator ou numa aplicação TOTP semelhante a partir do seu telemóvel. A partir desse momento, essa aplicação irá gerar tokens que terá que inserir para aceder à sua conta." - manual_instructions: 'Se não conseguir digitalizar o código QR e precisar de o inserir manualmente, eis o código por extenso:' + instructions_html: "Digitaliza este código QR no Google Authenticator ou numa aplicação TOTP semelhante a partir do teu telemóvel. A partir desse momento, essa aplicação irá gerar tokens que terás que inserir para acederes à tua conta." + manual_instructions: 'Se não conseguires digitalizar o código QR e precisares de o inserir manualmente, eis o código por extenso:' setup: Configurar wrong_code: O código introduzido é inválido! A hora do servidor e a hora do dispositivo estão corretos? pagination: newer: Mais nova next: Seguinte - older: Mais velha + older: Mais antiga prev: Anterior truncate: "…" polls: errors: - already_voted: Tu já votaste nesta sondagem + already_voted: Já votaste nesta sondagem duplicate_options: contém itens duplicados duration_too_long: está demasiado à frente no futuro - duration_too_short: é demasiado em cima da hora + duration_too_short: é demasiado cedo expired: A sondagem já terminou invalid_choice: A opção de voto escolhida não existe over_character_limit: não pode ter mais do que %{max} caracteres cada um - self_vote: Não pode votar numa sondagem criada por si + self_vote: Não podes votar numa sondagem criada por ti too_few_options: tem de ter mais do que um item too_many_options: não pode conter mais do que %{max} itens preferences: @@ -1568,33 +1587,33 @@ pt-PT: posting_defaults: Padrões de publicação public_timelines: Cronologias públicas privacy: - hint_html: "Defina como quer que o seu perfil e as suas publicações sejam encontrados. Várias funcionalidades no Mastodon podem ajudar a alcançar um público mais amplo quando ativadas. Tire um momento para rever estas definições para garantir que se aplicam ao seu caso de uso." + hint_html: "Define como queres que o teu perfil e as tuas publicações são encontradas. Várias funcionalidades no Mastodon podem ajudar a alcançar um público mais amplo quando ativadas. Tira um momento para rever estas definições para garantir que se aplicam ao teu caso de utilização." privacy: Privacidade - privacy_hint_html: Controle quanto pretende partilhar para o benefício de outros. As pessoas descobrem perfis e aplicações interessantes navegando pelos seguidores de outras pessoas e vendo que aplicações eles usam para publicar, mas pode preferir não revelar essa informação. + privacy_hint_html: Controla quanto pretendes partilhar para o benefício de outros. As pessoas descobrem perfis e aplicações interessantes navegando pelos seguidores de outras pessoas e vendo que aplicações eles usam para publicar, mas podes preferir não revelar essa informação. reach: Alcance - reach_hint_html: Controle se quer ser descoberto e seguido por novas pessoas. Quer que as suas publicações apareçam no ecrã Explorar? Pretende que outras pessoas o vejam nas suas recomendações? Quer aceitar todos os novos seguidores automaticamente, ou ter um controlo individual sobre cada um? + reach_hint_html: Controla se queres ser descoberto e seguido por novas pessoas. Queres que as tuas publicações apareçam no ecrã Explorar? Pretendes que outras pessoas te vejam nas recomendações deles? Queres aceitar todos os novos seguidores automaticamente ou ter um controlo individual sobre cada um? search: Pesquisa - search_hint_html: Controle como deseja ser encontrado. Quer que as pessoas o encontrem com base nas suas publicações? Que pessoas fora do Mastodon encontrem o seu perfil quando pesquisarem na web? Note que a exclusão total de todos os motores de busca não pode ser garantida para informação pública. + search_hint_html: Controla como desejas ser encontrado. Queres que as pessoas te encontrem com base nas tuas publicações? Que pessoas fora do Mastodon encontrem o teu perfil quando pesquisarem na web? Nota que a exclusão total de todos os motores de busca não pode ser garantida para informação pública. title: Privacidade e alcance privacy_policy: title: Política de Privacidade reactions: errors: - limit_reached: Alcançado limite de reações diferentes + limit_reached: Foi atingido o limite de diferentes reações unrecognized_emoji: não é um emoji reconhecido redirects: - prompt: Se confia nesta hiperligação, clique nela para continuar. - title: Está a deixar %{instance}. + prompt: Se confias nesta hiperligação, clica nela para continuar. + title: Estás a deixar %{instance}. relationships: activity: Atividade da conta - confirm_follow_selected_followers: Tem a certeza que deseja seguir os seguidores selecionados? - confirm_remove_selected_followers: Tem a certeza que deseja seguir os seguidores selecionados? - confirm_remove_selected_follows: Tem certeza que deseja remover os seguidores selecionados? + confirm_follow_selected_followers: Tens a certeza que desejas seguir os seguidores selecionados? + confirm_remove_selected_followers: Tens a certeza que desejas seguir os seguidores selecionados? + confirm_remove_selected_follows: Tens certeza que desejas remover os seguidores selecionados? dormant: Inativo follow_failure: Não foi possível seguir algumas das contas selecionadas. follow_selected_followers: Seguir seguidores selecionados followers: Seguidores - following: A seguir + following: Seguindo invited: Convidado last_active: Última atividade most_recent: Mais recente @@ -1607,7 +1626,7 @@ pt-PT: remove_selected_follows: Deixar de seguir os utilizadores selecionados status: Estado da conta remote_follow: - missing_resource: Não foi possível encontrar o URL de redirecionamento para a sua conta + missing_resource: Não foi possível encontrar o URL de redirecionamento para a tua conta reports: errors: invalid_rules: não faz referência a regras válidas @@ -1617,11 +1636,11 @@ pt-PT: account: Publicações públicas de @%{acct} tag: 'Publicações públicas marcadas com #%{hashtag}' scheduled_statuses: - over_daily_limit: Excedeste o limite de %{limit} publicações agendadas para esse dia - over_total_limit: Tu excedeste o limite de %{limit} publicações agendadas + over_daily_limit: Excedeste o limite de %{limit} publicações agendadas para hoje + over_total_limit: Excedeste o limite de %{limit} publicações agendadas too_soon: A data de agendamento tem de ser futura self_destruct: - lead_html: Infelizmente, %{domain} vai fechar definitivamente. Se lá tinha conta, não pode continuar a usá-la, mas ainda pode pedir uma cópia dos seus dados. + lead_html: Infelizmente, %{domain} vai fechar definitivamente. Se tinhas conta nele, não podes continuar a usá-lo, mas ainda podes pedir uma cópia dos teus dados. title: Este servidor vai fechar sessions: activity: Última atividade @@ -1644,7 +1663,7 @@ pt-PT: qq: QQ Browser safari: Safari uc_browser: Navegador UC - unknown_browser: Navegador Desconhecido + unknown_browser: Navegador desconhecido weibo: Weibo current_session: Sessão atual date: Data @@ -1661,46 +1680,48 @@ pt-PT: kai_os: KaiOS linux: Linux mac: macOS - unknown_platform: Plataforma Desconhecida + unknown_platform: Plataforma desconhecida windows: Windows windows_mobile: Windows Mobile windows_phone: Windows Phone revoke: Revogar - revoke_success: Sessão correctamente revogada + revoke_success: Sessão corretamente revogada title: Sessões - view_authentication_history: Ver histórico de autenticação da sua conta + view_authentication_history: Ver histórico de autenticação da tua conta settings: account: Conta account_settings: Definições da conta aliases: Pseudónimos da conta - appearance: Aspecto + appearance: Aparência authorized_apps: Aplicações autorizadas back: Voltar ao Mastodon delete: Eliminação da conta development: Desenvolvimento edit_profile: Editar perfil + export: Exportar featured_tags: Etiquetas destacadas import: Importar import_and_export: Importar e exportar migrate: Migração de conta + notifications: Notificações por e-mail preferences: Preferências profile: Perfil relationships: Seguindo e seguidores - severed_relationships: Relações cessadas - statuses_cleanup: Remoção automática da publicação - strikes: Punições de moderação - two_factor_authentication: Autenticação em duas etapas + severed_relationships: Relações cortadas + statuses_cleanup: Eliminação automática da publicação + strikes: Reprimendas de moderação + two_factor_authentication: Autenticação de dois fatores webauthn_authentication: Chaves de segurança severed_relationships: - download: Transferir (%{count}) + download: Descarregar (%{count}) event_type: account_suspension: Suspensão de conta (%{target_name}) domain_block: Suspensão de servidor (%{target_name}) user_domain_block: Bloqueou %{target_name} lost_followers: Seguidores perdidos - lost_follows: Pessoas que segue perdidas - preamble: Pode perder seguidores e pessoas que segue quando bloqueia um domínio ou quando os seus moderadores decidem suspender um servidor remoto. Quando isso acontecer, poderá descarregar listas de relações cortadas, para serem inspecionadas e possivelmente importadas para outro servidor. - purged: Informações sobre este servidor foram purgadas pelos administradores do seu servidor. + lost_follows: Contas seguidas perdidas + preamble: Podes perder seguidores e pessoas que segues quando bloqueias um domínio ou quando os teus moderadores decidem suspender um servidor remoto. Quando isso acontecer, poderás descarregar as listas de relações cortadas, para serem inspecionadas e possivelmente importadas para outro servidor. + purged: As informações sobre este servidor foram purgadas pelos administradores do servidor. type: Evento statuses: attached: @@ -1714,21 +1735,21 @@ pt-PT: video: one: "%{count} vídeo" other: "%{count} vídeos" - boosted_from_html: Reforçado por %{acct_link} + boosted_from_html: Impulsionado por %{acct_link} content_warning: 'Aviso de conteúdo: %{warning}' default_language: Igual ao idioma da interface disallowed_hashtags: one: 'continha uma #etiqueta proibida: %{tags}' - other: 'continha as hashtags proibidas: %{tags}' + other: 'continha as #etiquetas proibidas: %{tags}' edited_at_html: Editado em %{date} errors: - in_reply_not_found: A publicação a que está a tentar responder parece não existir. - over_character_limit: limite de caracter excedeu %{max} + in_reply_not_found: A publicação a que estás a tentar responder parece não existir. + over_character_limit: limite de caracteres %{max} excedido pin_errors: - direct: Publicações visíveis apenas para utilizadores mencionados não podem ser afixadas - limit: Já afixaste a quantidade máxima de publicações - ownership: Não podem ser afixadas publicações doutras pessoas - reblog: Não pode afixar um reforço + direct: As publicações que só são visíveis para os utilizadores mencionados não podem ser fixadas + limit: Já fixaste a quantidade máxima de publicações + ownership: Não podem ser fixadas publicações de outras pessoas + reblog: Não é possível fixar um impulso title: '%{name}: "%{quote}"' visibilities: direct: Direto @@ -1736,29 +1757,29 @@ pt-PT: private_long: Mostrar só aos seguidores public: Público public_long: Todos podem ver - unlisted: Não inventariado - unlisted_long: Todos podem ver, mas não será inventariado nas cronologias públicas + unlisted: Não listado + unlisted_long: Todos podem ver, mas não aparecerá nas cronologias públicas statuses_cleanup: - enabled: Apagar publicações antigas automaticamente - enabled_hint: Apaga automaticamente as suas publicações assim que atingirem um certo limite de tempo, a não ser que correspondam a uma das seguintes excepções + enabled: Eliminar publicações antigas automaticamente + enabled_hint: Elimina automaticamente as tuas publicações assim que atingirem um certo limite de tempo, a não ser que correspondam a uma das seguintes exceções exceptions: Exceções - explanation: Como apagar publicações é uma operação custosa, isto é feito lentamente ao longo do tempo, quando o servidor não está ocupado. Por esta razão, as suas publicações podem ser apagadas um pouco depois de atingirem o limite de idade definido. - ignore_favs: Ignorar marcadores - ignore_reblogs: Ignorar reforços + explanation: Como eliminar publicações é uma operação custosa, isto é feito lentamente ao longo do tempo, quando o servidor não está ocupado. Por esta razão, as tuas publicações podem ser eliminadas um pouco depois de atingirem o limite de idade definido. + ignore_favs: Ignorar favoritos + ignore_reblogs: Ignorar os impulsos interaction_exceptions: Exceções baseadas em interações - interaction_exceptions_explanation: Note que não há garantia de que as publicações sejam excluídas se ficarem abaixo do limite de favoritos ou partilhas após as ter verificado uma vez. + interaction_exceptions_explanation: Tem em atenção que não há garantia de que as mensagens sejam eliminadas se ficarem abaixo do limite de favoritos ou de impulsionamento depois de os terem ultrapassado. keep_direct: Manter mensagens diretas - keep_direct_hint: Não apaga nenhuma das suas mensagens diretas + keep_direct_hint: Não elimina nenhuma das tuas mensagens diretas keep_media: Manter publicações com anexos de multimédia - keep_media_hint: Não apaga nenhuma das suas publicações com multimédia anexada + keep_media_hint: Não elimina nenhuma das tuas publicações com multimédia anexada keep_pinned: Manter publicações afixadas - keep_pinned_hint: Não apagar nenhuma das suas publicações afixadas + keep_pinned_hint: Não elimina nenhuma das tuas publicações afixadas keep_polls: Manter sondagens - keep_polls_hint: Não apaga nenhuma das suas sondagens - keep_self_bookmark: Manter as publicações que marcou - keep_self_bookmark_hint: Não elimina as suas próprias publicações se as tiver nos marcadores - keep_self_fav: Manter as publicações que marcou - keep_self_fav_hint: Não apaga as suas próprias publicações se as tiver marcado + keep_polls_hint: Não elimina nenhuma das tuas sondagens + keep_self_bookmark: Manter as publicações que marquei + keep_self_bookmark_hint: Não elimina as tuas próprias publicações se as tiveres nos marcadores + keep_self_fav: Manter as publicações que adicionei aos favoritos + keep_self_fav_hint: Não elimina as tuas próprias publicações se as tiveres adicionado aos favoritos min_age: '1209600': 2 semanas '15778476': 6 meses @@ -1769,21 +1790,21 @@ pt-PT: '63113904': 2 anos '7889238': 3 meses min_age_label: Limite de idade - min_favs: Manter pelo menos as publicações dos marcadores - min_favs_hint: Não elimina nenhuma das suas publicações que tenha recebido pelo menos este número de favoritos. Deixe em branco para eliminar publicações, independentemente do seu número de favoritos - min_reblogs: Manter as publicações reforçadas mais de - min_reblogs_hint: Não apaga nenhuma das suas publicações que tenha sido partilhada mais do que este número de vezes. Deixe em branco para apagar as publicações, independentemente do número de partilhas + min_favs: Manter publicações adicionadas aos favoritos pelos menos + min_favs_hint: Não elimina nenhuma das tuas publicações que tenham sido adicionadas aos favoritos este número de vezes. Deixa em branco para eliminar publicações, independentemente do número de vezes que tenham sido adicionadas aos favoritos + min_reblogs: Manter as publicações impulsionadas, pelo menos + min_reblogs_hint: Não elimina nenhuma das tuas mensagens que tenham sido impulsionada pelo menos este número de vezes. Deixa em branco para eliminar as mensagens independentemente do número de impulsionamentos stream_entries: - sensitive_content: Conteúdo problemático + sensitive_content: Conteúdo sensível strikes: errors: - too_late: É tarde demais para recorrer desta reprimenda + too_late: É tarde demais para contestar esta reprimenda tags: does_not_match_previous_name: não coincide com o nome anterior themes: - contrast: Mastodon (Elevado contraste) - default: Mastodon (Escuro) - mastodon-light: Mastodon (Claro) + contrast: Mastodon (alto contraste) + default: Mastodon (escuro) + mastodon-light: Mastodon (claro) system: Automático (usar tema do sistema) time: formats: @@ -1798,105 +1819,105 @@ pt-PT: two_factor_authentication: add: Adicionar disable: Desactivar autenticação por dois factores (2FA) - disabled_success: Autenticação em duas etapas correctamente desactivada + disabled_success: Autenticação de dois fatores desativada com sucesso edit: Editar - enabled: A autenticação em duas etapas está ativada - enabled_success: Autenticação em duas etapas correctamente activada + enabled: A autenticação de dois fatores está ativada + enabled_success: Autenticação de dois fatores ativada com sucesso generate_recovery_codes: Gerar códigos para recuperar conta - lost_recovery_codes: Os códigos de recuperação permitem que recupere o acesso à sua conta caso perca o seu telemóvel. Se perder os códigos de recuperação, pode criar uns novos aqui. Os seus códigos antigos serão revogados. - methods: Métodos de autenticação em duas etapas + lost_recovery_codes: Os códigos de recuperação permitem que recupere o acesso à tua conta caso percas o teu telemóvel. Se perderes os códigos de recuperação, podes criar uns novos aqui. Os teus códigos antigos serão revogados. + methods: Métodos de autenticação de dois fatores otp: Aplicação de autenticação recovery_codes: Cópia de segurança dos códigos de recuperação - recovery_codes_regenerated: Códigos de recuperação foram correctamente gerados - recovery_instructions_html: Se perder o seu telemóvel, poderá usar um dos códigos de recuperação para voltar a ter acesso à sua conta. Guarde os códigos de recuperação em lugar seguro. Por exemplo, pode imprimi-los e guardá-los junto doutros documentos importantes. + recovery_codes_regenerated: Os códigos de recuperação foram corretamente gerados + recovery_instructions_html: Se perderes o seu telemóvel, poderás usar um dos códigos de recuperação para voltares a ter acesso à tua conta. Guarda os códigos de recuperação em lugar seguro. Por exemplo, podes imprimi-los e guardá-los junto a outros documentos importantes. webauthn: Chaves de segurança user_mailer: appeal_approved: - action: Configurações de Conta - explanation: O recurso à reprimenda contra a sua conta de %{strike_date}, enviado a %{appeal_date}, foi deferido. A sua conta encontra-se novamente em situação regular. - subject: O seu recurso de %{date} foi deferido - subtitle: A sua conta está em situação regular novamente. - title: Recurso deferido + action: Configurações da conta + explanation: A contestação à reprimenda contra a tua conta em %{strike_date}, enviada a %{appeal_date}, foi aceite. A tua conta encontra-se novamente em situação regular. + subject: A tua contestação em %{date} foi aceite + subtitle: A tua conta está em situação regular novamente. + title: Contestação aceite appeal_rejected: - explanation: O recurso à punição contra a sua conta de %{strike_date}, submetido em %{appeal_date}, foi indeferido. - subject: O seu recurso de %{date} foi indeferido - subtitle: O seu recurso foi rejeitado. - title: Recurso indeferido + explanation: A contestação à reprimenda contra a tua conta em %{strike_date}, submetida em %{appeal_date}, foi rejeitada. + subject: A tua contestação a %{date} foi rejeitada + subtitle: A tua contestação foi rejeitada. + title: Contestação rejeitada backup_ready: - explanation: Pediu uma cópia completa da sua conta Mastodon. - extra: Está pronta para transferir! - subject: O seu arquivo está pronto para descarregar + explanation: Pediste uma cópia de segurança da tua conta Mastodon. + extra: Está pronta para ser descarregada! + subject: O teu arquivo está pronto para ser descarregado title: Arquivo de ficheiros failed_2fa: - details: 'Aqui estão os detalhes da tentativa de entrada:' - explanation: Alguém tentou entrar em sua conta mas forneceu um segundo fator de autenticação inválido. - further_actions_html: Se não foi você, recomendamos que %{action} imediatamente, pois pode ter sido comprometido. + details: 'Eis os pormenores da tentativa de início de sessão:' + explanation: Alguém tentou iniciar sessão na tua conta, mas forneceu um segundo fator de autenticação inválido. + further_actions_html: Se não foste tu, recomendamos %{action} imediatamente, pois a conta pode ter sido comprometida. subject: Falha na autenticação do segundo fator title: Falha na autenticação do segundo fator suspicious_sign_in: - change_password: alterar a sua palavra-passe + change_password: alterar a palavra-passe details: 'Eis os pormenores do início de sessão:' - explanation: Detectámos um início de sessão na sua conta a partir dum endereço IP novo. - further_actions_html: Se não foi você, recomendamos que %{action} imediatamente e ative a autenticação de dois fatores para manter a sua conta segura. - subject: A sua conta foi acedida a partir dum endereço IP novo + explanation: Detetámos um início de sessão na tua conta a partir dum endereço IP novo. + further_actions_html: Se não foste tu, recomendamos %{action} imediatamente e ativar a autenticação de dois fatores para manter a conta segura. + subject: A tua conta foi acedida a partir de um endereço IP novo title: Um início de sessão novo warning: - appeal: Submeter um recurso - appeal_description: Se acha que isso é um erro, pode submeter um recurso para a equipa de %{instance}. + appeal: Submeter uma contestação + appeal_description: Se achas que isto é um erro, podes submeter uma contestação para a equipa de %{instance}. categories: - spam: Spam + spam: Publicidade indesejada / spam violation: O conteúdo infringe as seguintes diretrizes da comunidade explanation: - delete_statuses: Algumas das suas publicações foram consideradas como infractoras duma ou mais diretrizes da comunidade, e subsequentemente removidas pelos moderadores de %{instance}. - disable: Já não pode utilizar a sua conta, mas o seu perfil e outros dados permanecem intactos. Pode solicitar uma cópia dos seus dados, alterar as definições da conta, ou que a sua conta seja apagada. - mark_statuses_as_sensitive: Algumas das suas publicações foram marcadas como problemáticos pelos moderadores de %{instance}. Isto significa que as pessoas terão de tocar nas publicações para que possa ser apresentada uma pré-visualização. No futuro, quando publicar, lembre-se que pode você próprio marcar os media como problemáticos. - sensitive: A partir de agora, todos os ficheiros de media que carregue serão marcados como problemáticos e escondidos sob um aviso pedido para tocar para os ver. - silence: Pode ainda utilizar a sua conta mas apenas as pessoas que já o seguem poderão ver as suas mensagens neste servidor, e poderá ser excluído de várias funcionalidades de divulgação. No entanto, outros poderão ainda segui-lo manualmente. - suspend: Não pode mais utilizar a sua conta, e o seu perfil e outros dados já não se encontram acessíveis. Poderá ainda iniciar sessão para solicitar uma cópia dos seus dados até os mesmos serem totalmente removidos em cerca de 30 dias, porém reteremos alguns dados básicos para o impedir evitar a suspensão. + delete_statuses: Algumas das tuas mensagens foram consideradas como violando uma ou mais diretrizes da comunidade e foram subsequentemente removidas pelos moderadores do %{instance}. + disable: Já não podes utilizar a tua conta, mas o teu perfil e outros dados permanecem intactos. Podes solicitar uma cópia de segurança dos teus dados, alterar as definições da conta ou eliminar a tua conta. + mark_statuses_as_sensitive: Algumas das tuas publicações foram marcadas como sensíveis pelos moderadores de %{instance}. Isto significa que as pessoas terão de tocar/clicar nas publicações para que possa ser apresentada uma pré-visualização. No futuro, quando publicares, lembra-te que podes marcar os elementos multimédia como problemáticos. + sensitive: A partir de agora, todos os ficheiros multimédia que enviares serão marcados como sensíveis e escondidos sob um aviso pedido para tocar/clicar para os ver. + silence: Podes ainda utilizar a tua conta, mas apenas as pessoas que já te seguem poderão ver as tuas mensagens neste servidor, e poderás ser excluído de várias funcionalidades de divulgação. No entanto, outros poderão ainda seguir-te manualmente. + suspend: Não podes mais utilizar a tua conta, e o teu perfil e outros dados já não se encontram acessíveis. Poderás ainda iniciar sessão para solicitar uma cópia dos teus dados até os mesmos serem totalmente removidos em cerca de 30 dias, porém reteremos alguns dados básicos para impedirmos que evites a suspensão. reason: 'Motivo:' statuses: 'Publicações citadas:' subject: - delete_statuses: As suas publicações em %{acct} foram removidas + delete_statuses: As tuas publicações em %{acct} foram removidas disable: A tua conta %{acct} foi congelada - mark_statuses_as_sensitive: As suas publicações em %{acct} foram marcadas como problemáticas + mark_statuses_as_sensitive: As tuas publicações em %{acct} foram marcadas como sensíveis none: Aviso para %{acct} - sensitive: A partir de agora, as suas publicações em %{acct} serão marcadas como problemáticas - silence: A sua conta %{acct} foi limitada - suspend: A sua conta %{acct} foi suspensa + sensitive: A partir de agora, as tuas publicações em %{acct} serão marcadas como sensíveis + silence: A tua conta %{acct} foi limitada + suspend: A tua conta %{acct} foi suspensa title: delete_statuses: Publicações removidas disable: Conta congelada - mark_statuses_as_sensitive: Publicações marcadas como problemáticas + mark_statuses_as_sensitive: Publicações marcadas como sensíveis none: Aviso - sensitive: Conta marcada como problemática + sensitive: Conta marcada como sensível silence: Conta limitada suspend: Conta suspensa welcome: - apps_android_action: Baixe no Google Play - apps_ios_action: Baixar na App Store - apps_step: Descarregue as nossas aplicações oficiais. - apps_title: Apps Mastodon + apps_android_action: Obter no Google Play + apps_ios_action: Obter na App Store + apps_step: Descarrega as nossas aplicações oficiais. + apps_title: Aplicações Mastodon checklist_subtitle: 'Vamos começar nesta nova fronteira social:' - checklist_title: Checklist de Boas-vindas + checklist_title: Passos de boas-vindas edit_profile_action: Personalizar - edit_profile_step: Aumente suas interações tendo um perfil completo. - edit_profile_title: Personalize seu perfil + edit_profile_step: Aumenta as tuas interações com um perfil completo. + edit_profile_title: Personaliza o teu perfil explanation: Aqui estão algumas dicas para começar feature_action: Mais informações - feature_audience: O Mastodon oferece-lhe uma possibilidade única de gerir a sua audiência sem intermediários. O Mastodon implantado na sua própria infraestrutura permite-lhe seguir e ser seguido a partir de qualquer outro servidor Mastodon online e não está sob o controlo de ninguém a não ser o seu. - feature_audience_title: Construa seu público em confiança - feature_control: Você sabe melhor o que quer ver no seu feed. Não há algoritmos ou anúncios que o façam perder tempo. Siga qualquer pessoa em qualquer servidor Mastodon a partir de uma única conta e receba as suas mensagens por ordem cronológica e torne o seu canto da Internet um pouco mais parecido consigo. - feature_control_title: Mantenha o controlo da sua própria cronologia - feature_creativity: O Mastodon suporta publicações de áudio, vídeo e imagens, descrições de acessibilidade, sondagens, avisos de conteúdo, avatares animados, emojis personalizados, controlo de corte de miniaturas e muito mais, para o ajudar a expressar-se online. Quer esteja a publicar a sua arte, a sua música ou o seu podcast, o Mastodon está lá para si. + feature_audience: O Mastodon oferece-te uma possibilidade única de gerir a tua audiência sem intermediários. O Mastodon implantado na sua própria infraestrutura permite seguires e seres seguido a partir de qualquer outro servidor Mastodon online e não está sob o controlo de ninguém a não ser o teu. + feature_audience_title: Conquista o teu público + feature_control: Sabes melhor o que queres ver na cronologia da tua página inicial. Não há algoritmos ou anúncios que te façam perder tempo. Segue qualquer pessoa em qualquer servidor Mastodon a partir de uma única conta e recebe as tuas mensagens por ordem cronológica, e torna o teu canto da Internet um pouco mais parecido contigo. + feature_control_title: Mantém o controlo da tua própria cronologia + feature_creativity: O Mastodon suporta publicações de áudio, vídeo e imagens, descrições de acessibilidade, sondagens, avisos de conteúdo, avatares animados, emojis personalizados, controlo de corte de miniaturas e muito mais, para te ajudar a expressares-te online. Quer estejas a publicar a tua arte, a tua música ou o teu podcast, o Mastodon está aqui para ti. feature_creativity_title: Criatividade inigualável - feature_moderation: Mastodon coloca a tomada de decisões de volta em suas mãos. Cada servidor cria as suas próprias regras e regulamentos, que são aplicados localmente e não de cima para baixo como as redes sociais corporativas, tornando-o mais flexível na resposta às necessidades de diferentes grupos de pessoas. Junte-se a um servidor com as regras com as quais você concorda ou hospede as suas próprias. + feature_moderation: O Mastodon coloca a tomada de decisões de volta nas tuas mãos. Cada servidor cria as suas próprias regras e regulamentos, que são aplicados localmente e não de cima para baixo como as redes sociais corporativas, tornando-o mais flexível para responder às necessidades de diferentes grupos de pessoas. Junta-te a um servidor com as regras com as quais concordas ou aloja o teu próprio servidor. feature_moderation_title: Moderando como deve ser follow_action: Seguir - follow_step: Seguir pessoas interessantes é do que trata Mastodon. - follow_title: Personalize seu feed residencial - follows_subtitle: Siga contas bem conhecidas + follow_step: Seguir pessoas interessantes é o objetivo do Mastodon. + follow_title: Personaliza a cronologia na tua página inicial + follows_subtitle: Segue contas conhecidas follows_title: Quem seguir - follows_view_more: Veja mais pessoas para seguir + follows_view_more: Ver mais pessoas para seguir hashtags_recent_count: one: "%{people} pessoa nos últimos 2 dias" other: "%{people} pessoas nos últimos 2 dias" @@ -1904,42 +1925,44 @@ pt-PT: hashtags_title: Etiquetas em tendência hashtags_view_more: Ver mais etiquetas em tendência post_action: Compor - post_step: Diga olá para o mundo com texto, fotos, vídeos ou sondagens. - post_title: Faça a sua primeira publicação - share_action: Compartilhar - share_step: Diga aos seus amigos como te encontrar no Mastodon. - share_title: Compartilhe seu perfil de Mastodon + post_step: Diz olá para o mundo com texto, fotos, vídeos ou sondagens. + post_title: Faz a tua primeira publicação + share_action: Partilhar + share_step: Diz aos teus amigos como te podem encontrar no Mastodon. + share_title: Partilha o teu perfil de Mastodon sign_in_action: Iniciar sessão subject: Bem-vindo ao Mastodon title: Bem-vindo a bordo, %{name}! users: - follow_limit_reached: Não pode seguir mais do que %{limit} pessoas + follow_limit_reached: Não podes seguir mais do que %{limit} pessoas go_to_sso_account_settings: Ir para as definições de conta do seu fornecedor de identidade - invalid_otp_token: Código de autenticação inválido - otp_lost_help_html: Se perdeu o acesso a ambos, pode entrar em contacto com %{email} - rate_limited: Demasiadas tentativas de autenticação, tente novamente mais tarde. + invalid_otp_token: Código de dois fatores inválido + otp_lost_help_html: Se perdeste o acesso a ambos, podes entrar em contacto com %{email} + rate_limited: Demasiadas tentativas de autenticação, tenta novamente mais tarde. + seamless_external_login: A sessão foi iniciada através de um serviço externo, pelo que as definições de palavra-passe e e-mail não estão disponíveis. signed_in_as: 'Registado como:' verification: - extra_instructions_html: Dica: A ligação no seu site pode ser invisível. A parte importante é
rel="me" que impede a personificação em sites com conteúdo gerado pelo utilizador. Pode até utilizar uma etiqueta link no cabeçalho da página ao invés de a, mas o HTML deve ser acessível sem executar JavaScript.
- here_is_how: Veja como
- hint_html: "Verificar a sua identidade no Mastodon é para todos. Baseado em normas públicas da web, agora e para sempre gratuitas. Tudo o que precisa é de um site pessoal pelo qual as pessoas o reconheçam. Quando coloca no seu perfil uma ligação para esse site, vamos verificar que o site tem uma ligação de volta para o seu perfil e mostrar um indicador visual."
- instructions_html: Copie e cole o código abaixo no HTML do seu site. Em seguida, adicione o endereço do seu site num dos campos extras no seu perfil, na aba "Editar perfil" e guarde as alterações.
+ extra_instructions_html: Dica: a hiperligação no teu site pode ser invisível. A parte importante é rel="me" que impede a falsificação de identidade em sítios na web com conteúdos gerados pelos utilizadores. Podes até utilizar uma etiqueta link no cabeçalho da página ao invés de a, mas o HTML deve ser acessível sem executar JavaScript.
+ here_is_how: Eis o que fazer
+ hint_html: "Verificar a sua identidade no Mastodon é para todos. Baseado em normas públicas da web, agora e para sempre gratuitas. Tudo o que precisas é de um site pessoal pelo qual as pessoas te reconheçam. Quando colocas no teu perfil uma hiperligação para esse site, vamos verificar que o site tem uma hiperligação de volta para o teu perfil e mostrar um indicador visual."
+ instructions_html: Copia e cola o código abaixo no HTML do teu site. Em seguida, adiciona o endereço do teu site num dos campos extras no teu perfil, na aba "Editar perfil" e guarda as alterações.
verification: Verificação
- verified_links: As suas ligações verificadas
+ verified_links: As tuas hiperligações verificadas
+ website_verification: Verificação do sítio web
webauthn_credentials:
add: Adicionar nova chave de segurança
create:
- error: Ocorreu um problema ao adicionar sua chave de segurança. Tente novamente.
- success: A sua chave de segurança foi correctamente adicionada.
+ error: Ocorreu um problema ao adicionar a chave de segurança. Tenta novamente.
+ success: A tua chave de segurança foi corretamente adicionada.
delete: Eliminar
- delete_confirmation: Tem a certeza de que pretende eliminar esta chave de segurança?
- description_html: Se activar a autenticação com chave de segurança, vai passar a precisar de usar uma das suas chaves de segurança para aceder à sua conta.
+ delete_confirmation: Tens a certeza de que pretendes eliminar esta chave de segurança?
+ description_html: Se ativares a autenticação com chave de segurança, vais passar a precisar de usar uma das suas chaves de segurança para aceder à tua conta.
destroy:
- error: Ocorreu um problema ao remover a sua chave de segurança. Tente novamente.
- success: A sua chave de segurança foi correctamente eliminada.
+ error: Ocorreu um problema ao remover a tua chave de segurança. Tenta novamente.
+ success: A tua chave de segurança foi corretamente eliminada.
invalid_credential: Chave de segurança inválida
- nickname_hint: Introduza a alcunha da sua nova chave de segurança
- not_enabled: Ainda não ativou o WebAuthn
+ nickname_hint: Introduz a alcunha da tua nova chave de segurança
+ not_enabled: Ainda não ativaste o WebAuthn
not_supported: Este navegador não funciona com chaves de segurança
- otp_required: Para usar chaves de segurança, por favor ative primeiro a autenticação em duas etapas.
+ otp_required: Para utilizares chaves de segurança, ativa primeiro a autenticação de dois fatores.
registered_on: Registado em %{date}
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index d4f202637b..faaf60c456 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -23,6 +23,7 @@ ro:
one: Postare
other: De Postări
posts_tab_heading: Postări
+ self_follow_error: Urmărirea propriului cont nu este permisă
admin:
account_actions:
action: Efectuează acțiunea
@@ -429,6 +430,8 @@ ro:
discovery:
follow_recommendations: Urmează recomandările
profile_directory: Catalogul de profiluri
+ statuses:
+ title: Postări cont
aliases:
add_new: Creează un alias
created_msg: A fost creat cu succes un alias nou. Acum puteţi iniţia mutarea din vechiul cont.
@@ -465,11 +468,16 @@ ro:
migrate_account: Transfer către un alt cont
migrate_account_html: Dacă dorești să redirecționezi acest cont către un altul, poți configura asta aici.
or_log_in_with: Sau conectează-te cu
+ privacy_policy_agreement_html: Am citit și sunt de acord cu Politica de confidențialitate
register: Înregistrare
registration_closed: "%{instance} nu acceptă membri noi"
reset_password: Resetare parolă
security: Securitate
set_new_password: Setează o nouă parolă
+ setup:
+ email_settings_hint_html: Faceți clic pe link-ul pe care vi l-am trimis pentru a verifica %{email}. Vom aștepta chiar aici.
+ sign_up:
+ preamble: Cu un cont pe acest server Mastodon, veți putea urmări orice altă persoană din rețea, indiferent de locul unde este găzduit contul lor.
status:
account_status: Starea contului
redirecting_to: Contul dvs. este inactiv deoarece în prezent se redirecționează către %{acct}.
@@ -546,6 +554,20 @@ ro:
modes:
overwrite: Suprascrie
overwrite_long: Înlocuiţi înregistrările curente cu cele noi
+ overwrite_preambles:
+ blocking_html: Sunteți pe cale să înlocuiți lista cu conturi blocate cu până la %{total_items} conturi din %{filename}.
+ bookmarks_html: Sunteți pe cale să înlocuiți marcajele cu până la %{total_items} postări din %{filename}.
+ domain_blocking_html: Sunteți pe cale să înlocuiți lista cu domenii blocate cu până la %{total_items} domenii din %{filename}.
+ following_html: Sunteți pe cale să urmăriți până la %{total_items} conturi din %{filename} și să nu mai urmăriți pe altcineva.
+ lists_html: Sunteți pe cale să înlocuiți listele cu conținut din %{filename}. Până la %{total_items} conturi vor fi adăugate la listele noi.
+ muting_html: Sunteți pe cale să înlocuiți lista cu conturi amuțite cu până la %{total_items} conturi din %{filename}.
+ preambles:
+ blocking_html: Sunteți pe cale să blocați până la %{total_items} conturi din %{filename}.
+ bookmarks_html: Sunteți pe cale să adăugați până la %{total_items} postări din %{filename} în marcajele dvs.
+ domain_blocking_html: Sunteți pe cale să blocați până la %{total_items} domenii din %{filename}.
+ following_html: Sunteți pe cale să urmăriți până la %{total_items} conturi din %{filename}.
+ lists_html: Sunteți pe cale să adăugați până la %{total_items} conturi din %{filename} în listele dvs. Vor fi create liste noi dacă nu există nicio listă la care să adăugați.
+ muting_html: Sunteți pe cale să amuțiți până la %{total_items} conturi din %{filename}.
preface: Puteți importa date pe care le-ați exportat de pe un alt server, cum ar fi o listă a persoanelor pe care le urmăriți sau blocați.
success: Datele dvs. au fost încărcate cu succes și vor fi procesate acum în timp util
types:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index c61c7f459f..a3aceca5ae 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -25,6 +25,7 @@ ru:
one: Пост
other: статусов
posts_tab_heading: Посты
+ self_follow_error: Нельзя подписаться на самого себя
admin:
account_actions:
action: Выполнить действие
@@ -64,7 +65,7 @@ ru:
demote: Разжаловать
destroyed_msg: Данные %{username} поставлены в очередь на удаление
disable: Заморозка
- disable_sign_in_token_auth: Отключите аутентификацию с помощью маркера электронной почты
+ disable_sign_in_token_auth: Отключить аутентификацию по e-mail кодам
disable_two_factor_authentication: Отключить 2FA
disabled: Отключено
display_name: Отображаемое имя
@@ -73,7 +74,7 @@ ru:
email: E-mail
email_status: Статус e-mail
enable: Включить
- enable_sign_in_token_auth: Включите аутентификацию с помощью маркера электронной почты
+ enable_sign_in_token_auth: Включить аутентификацию по e-mail кодам
enabled: Включен
enabled_msg: Учётная запись %{username} успешно разморожена
followers: Подписчики
@@ -146,8 +147,8 @@ ru:
security_measures:
only_password: Только пароль
password_and_2fa: Пароль и 2FA
- sensitive: Отметить как «деликатного содержания»
- sensitized: отмечено как «деликатного характера»
+ sensitive: Деликатный
+ sensitized: отмечено как деликатный контент
shared_inbox_url: URL общих входящих
show:
created_reports: Жалобы, отправленные с этой учётной записи
@@ -165,7 +166,7 @@ ru:
unblock_email: Разблокировать e-mail адрес
unblocked_email_msg: E-mail адрес %{username} разблокирован
unconfirmed_email: Неподтверждённый e-mail
- undo_sensitized: Убрать отметку «деликатного содержания»
+ undo_sensitized: Снять отметку "деликатный"
undo_silenced: Отменить скрытие
undo_suspension: Снять блокировку
unsilenced_msg: Ограничения с учётной записи %{username} сняты успешно
@@ -178,89 +179,89 @@ ru:
whitelisted: В белом списке
action_logs:
action_types:
- approve_appeal: Одобрить обжалование
- approve_user: Утвердить
+ approve_appeal: Одобрение обжалований
+ approve_user: Утверждение регистраций
assigned_to_self_report: Присвоение жалоб
- change_email_user: Сменить e-mail для пользователя
- change_role_user: Изменить роль пользователя
+ change_email_user: Смена e-mail пользователей
+ change_role_user: Смена ролей пользователей
confirm_user: Подтверждение пользователей
create_account_warning: Выдача предупреждения
create_announcement: Создание объявлений
- create_canonical_email_block: Создать блок электронной почты
+ create_canonical_email_block: Создание блокировок e-mail
create_custom_emoji: Добавление эмодзи
create_domain_allow: Разрешение доменов
create_domain_block: Блокировка доменов
- create_email_domain_block: Создать блок домена электронной почты
+ create_email_domain_block: Создание доменных блокировок e-mail
create_ip_block: Создание правил для IP-адресов
create_unavailable_domain: Добавление домена в список недоступных
- create_user_role: Создать роль
+ create_user_role: Создание ролей
demote_user: Разжалование пользователей
destroy_announcement: Удаление объявлений
- destroy_canonical_email_block: Удалить блок электронной почты
+ destroy_canonical_email_block: Удаление блокировок e-mail
destroy_custom_emoji: Удаление эмодзи
destroy_domain_allow: Отзыв разрешений для доменов
destroy_domain_block: Разблокировка доменов
- destroy_email_domain_block: Удалить блок домена электронной почты
+ destroy_email_domain_block: Удаление доменных блокировок e-mail
destroy_instance: Очистить домен
destroy_ip_block: Удаление правил для IP-адресов
destroy_status: Удаление постов
destroy_unavailable_domain: Исключение доменов из списка недоступных
- destroy_user_role: Удалить роль
+ destroy_user_role: Удаление ролей
disable_2fa_user: Отключение 2FA
disable_custom_emoji: Отключение эмодзи
- disable_sign_in_token_auth_user: Отключить аутентификацию пользователя с помощью токена электронной почты
+ disable_sign_in_token_auth_user: Отключение аутентификации по e-mail кодам
disable_user: Заморозка пользователей
enable_custom_emoji: Включение эмодзи
- enable_sign_in_token_auth_user: Включить аутентификацию пользователя с помощью токена электронной почты
+ enable_sign_in_token_auth_user: Включение аутентификации по e-mail кодам
enable_user: Разморозка пользователей
memorialize_account: Присвоение пользователям статуса «мемориала»
promote_user: Повышение пользователей
- reject_appeal: Отклонить обжалование
- reject_user: Отклонить
+ reject_appeal: Отклонение обжалований
+ reject_user: Отклонение регистраций
remove_avatar_user: Удаление аватаров
reopen_report: Возобновление жалоб
- resend_user: Повторно отправить письмо с подтверждением
+ resend_user: Повторная отправка писем с подтверждением
reset_password_user: Сброс пароля пользователей
resolve_report: Отметка жалоб «решёнными»
sensitive_account: Присвоение пользователям отметки «деликатного содержания»
silence_account: Скрытие пользователей
suspend_account: Блокировка пользователей
unassigned_report: Снятие жалоб
- unblock_email_account: Разблокировать e-mail адрес
+ unblock_email_account: Разблокировка e-mail адресов
unsensitive_account: Снятие с пользователей отметки «деликатного содержания»
unsilence_account: Отмена скрытия пользователей
unsuspend_account: Разблокировка пользователей
update_announcement: Обновление объявлений
update_custom_emoji: Обновление эмодзи
update_domain_block: Изменение блокировки домена
- update_ip_block: Обновить правило для IP-адреса
- update_report: Обновить рапорт
+ update_ip_block: Обновление правил для IP-адресов
+ update_report: Изменение жалоб
update_status: Изменение постов
- update_user_role: Обновить роль
+ update_user_role: Изменение ролей
actions:
- approve_appeal_html: "%{name} одобрил апелляцию на умеренное решение от %{target}"
+ approve_appeal_html: "%{name} одобрил(а) обжалование действий модерации от %{target}"
approve_user_html: "%{name} утвердил(а) регистрацию %{target}"
assigned_to_self_report_html: "%{name} назначил(а) себя для решения жалобы %{target}"
- change_email_user_html: "%{name} изменил адрес электронной почты пользователя %{target}"
+ change_email_user_html: "%{name} cменил(а) e-mail адрес пользователя %{target}"
change_role_user_html: "%{name} изменил(а) роль %{target}"
- confirm_user_html: "%{name} подтвержденный адрес электронной почты пользователя %{target}"
+ confirm_user_html: "%{name} подтвердил(а) e-mail адрес пользователя %{target}"
create_account_warning_html: "%{name} выдал(а) предупреждение %{target}"
create_announcement_html: "%{name} создал(а) новое объявление %{target}"
- create_canonical_email_block_html: "%{name} заблокировал письмо с хэшем %{target}"
+ create_canonical_email_block_html: "%{name} заблокировал(а) e-mail с хешем %{target}"
create_custom_emoji_html: "%{name} загрузил(а) новый эмодзи %{target}"
create_domain_allow_html: "%{name} разрешил(а) федерацию с доменом %{target}"
create_domain_block_html: "%{name} заблокировал(а) домен %{target}"
- create_email_domain_block_html: "%{name} заблокированный почтовый домен %{target}"
+ create_email_domain_block_html: "%{name} заблокировал(а) e-mail домен %{target}"
create_ip_block_html: "%{name} создал(а) правило для IP %{target}"
create_unavailable_domain_html: "%{name} приостановил доставку на узел %{target}"
create_user_role_html: "%{name} создал(а) роль %{target}"
demote_user_html: "%{name} разжаловал(а) пользователя %{target}"
destroy_announcement_html: "%{name} удалил(а) объявление %{target}"
- destroy_canonical_email_block_html: "%{name} разблокированное письмо с хэшем %{target}"
+ destroy_canonical_email_block_html: "%{name} снял(а) блокировку e-mail с хэшем %{target}"
destroy_custom_emoji_html: "%{name} удалил(а) эмодзи %{target}"
destroy_domain_allow_html: "%{name} запретил(а) федерацию с доменом %{target}"
destroy_domain_block_html: "%{name} снял(а) блокировку с домена %{target}"
- destroy_email_domain_block_html: "%{name} разблокированный почтовый домен %{target}"
+ destroy_email_domain_block_html: "%{name} снял(а) блокировку с e-mail домена %{target}"
destroy_instance_html: "%{name} очистил(а) данные для домена %{target}"
destroy_ip_block_html: "%{name} удалил(а) правило для IP %{target}"
destroy_status_html: "%{name} удалил(а) пост пользователя %{target}"
@@ -268,18 +269,18 @@ ru:
destroy_user_role_html: "%{name} удалил(а) роль %{target}"
disable_2fa_user_html: "%{name} отключил(а) требование двухэтапной авторизации для пользователя %{target}"
disable_custom_emoji_html: "%{name} отключил(а) эмодзи %{target}"
- disable_sign_in_token_auth_user_html: "%{name} отключил аутентификацию по маркеру электронной почты для %{target}"
+ disable_sign_in_token_auth_user_html: "%{name} отключил(а) аутентификацию по e-mail кодам для %{target}"
disable_user_html: "%{name} заморозил(а) пользователя %{target}"
enable_custom_emoji_html: "%{name} включил(а) эмодзи %{target}"
- enable_sign_in_token_auth_user_html: "%{name} включил аутентификацию с помощью маркера электронной почты для %{target}"
+ enable_sign_in_token_auth_user_html: "%{name} включил(а) аутентификацию по e-mail кодам для %{target}"
enable_user_html: "%{name} разморозил(а) пользователя %{target}"
memorialize_account_html: "%{name} перевел(а) учётную запись пользователя %{target} в статус памятника"
promote_user_html: "%{name} повысил(а) пользователя %{target}"
- reject_appeal_html: "%{name} отклонил апелляцию на модерацию от %{target}"
+ reject_appeal_html: "%{name} отклонил(а) обжалование действий модерации от %{target}"
reject_user_html: "%{name} отклонил(а) регистрацию %{target}"
remove_avatar_user_html: "%{name} убрал(а) аватарку пользователя %{target}"
reopen_report_html: "%{name} повторно открыл(а) жалобу %{target}"
- resend_user_html: "%{name} повторно отправил письмо с подтверждением для %{target}"
+ resend_user_html: "%{name} повторно отправил(а) письмо с подтверждением для %{target}"
reset_password_user_html: "%{name} сбросил(а) пароль пользователя %{target}"
resolve_report_html: "%{name} решил(а) жалобу %{target}"
sensitive_account_html: "%{name} установил(а) отметку файлов %{target} как «деликатного характера»"
@@ -294,7 +295,7 @@ ru:
update_custom_emoji_html: "%{name} обновил(а) эмодзи %{target}"
update_domain_block_html: "%{name} обновил(а) блокировку домена для %{target}"
update_ip_block_html: "%{name} изменил(а) правило для IP %{target}"
- update_report_html: "%{name} обновленный отчет %{target}"
+ update_report_html: "%{name} изменил(а) жалобу %{target}"
update_status_html: "%{name} изменил(а) пост пользователя %{target}"
update_user_role_html: "%{name} изменил(а) роль %{target}"
deleted_account: удалённая учётная запись
@@ -460,8 +461,9 @@ ru:
create: Создать блокировку
resolve: Проверить домен
title: Блокировка нового почтового домена
- no_email_domain_block_selected: Блоки почтовых доменов не были изменены, так как ни один из них не был выбран
+ no_email_domain_block_selected: Блокировки почтовых доменов не были изменены, так как ни один из них не был выбран
not_permitted: Не разрешено
+ resolved_dns_records_hint_html: Доменное имя указывает на следующие MX-домены, которые в конечном итоге отвечают за прием электронной почты. Блокировка MX-домена будет блокировать регистрации с любого адреса электронной почты, который использует тот же MX-домен, даже если видимое доменное имя отличается от него. Будьте осторожны, чтобы не заблокировать основных провайдеров электронной почты
resolved_through_html: Разрешено через %{domain}
title: Заблокированные e-mail домены
export_domain_allows:
@@ -625,8 +627,9 @@ ru:
resolve_description_html: Никаких действий не будет выполнено относительно доложенного содержимого. Жалоба будет закрыта.
silence_description_html: Учетная запись будет видна только тем пользователям, которые уже подписаны на неё, либо открыли его вручную. Это действие можно отменить в любой момент, и отменяет все жалобы против аккаунта.
suspend_description_html: Аккаунт и все его содержимое будут недоступны и в конечном итоге удалены, и взаимодействие с ним будет невозможно. Это действие можно отменить в течение 30 дней. Отменяет все жалобы против этого аккаунта.
+ actions_description_html: Выберите действие, чтобы разрешить данную жалобу. Если вы примете меры модерации против аккаунта, его владелец получит уведомление по электронной почте, кроме тех случаев, когда выбрана категория Спам.
actions_description_remote_html: Решите вопрос о том, какие меры необходимо принять для урегулирования этой жалобы. Это повлияет только на то, как ваш сервер взаимодействует с этим удаленным аккаунтом и обрабатывает его содержимое.
- actions_no_posts: У этого отчета нет связанных с ним сообщений для удаления
+ actions_no_posts: У этой жалобы нет связанных с ней постов для удаления
add_to_report: Прикрепить ещё
already_suspended_badges:
local: На этом сервере уже забанен
@@ -667,7 +670,7 @@ ru:
report: Жалоба №%{id}
reported_account: Учётная запись нарушителя
reported_by: Отправитель жалобы
- reported_with_application: Сообщается с приложением
+ reported_with_application: Использованное для отправки жалобы приложение
resolved: Решённые
resolved_msg: Жалоба обработана, спасибо!
skip_to_actions: Перейти к действиям
@@ -815,7 +818,7 @@ ru:
approved: Для регистрации требуется подтверждение
none: Никто не может регистрироваться
open: Все могут регистрироваться
- warning_hint: Мы рекомендуем использовать "Требуется одобрение для регистрации", если вы не уверены, что ваша команда модераторов сможет своевременно справиться со спамом и вредоносными регистрациями.
+ warning_hint: Мы рекомендуем использовать "Требуется одобрение для регистрации", если вы не уверены, что ваша команда модераторов сможет своевременно справиться со спамом и злоумышленными регистрациями.
security:
authorized_fetch: Требовать аутентификацию от федеративных серверов
authorized_fetch_hint: Требование аутентификации от федеративных серверов позволяет более строго соблюдать блокировки как на уровне пользователя, так и на уровне сервера. Однако при этом снижается производительность, уменьшается охват ваших ответов и могут возникнуть проблемы совместимости с некоторыми федеративными сервисами. Кроме того, это не помешает специальным исполнителям получать ваши публичные сообщения и учётные записи.
@@ -901,6 +904,9 @@ ru:
message_html: Вы не определили правила сервера.
sidekiq_process_check:
message_html: Ни один Sidekiq не запущен для %{value} очереди(-ей). Пожалуйста, просмотрите настройки Sidekiq
+ software_version_check:
+ action: Посмотреть доступные обновления
+ message_html: Доступно обновление для Mastodon.
software_version_critical_check:
action: Посмотреть доступные обновления
message_html: Доступно критическое обновление Mastodon, пожалуйста, обновитесь как можно скорее.
@@ -916,19 +922,19 @@ ru:
tags:
moderation:
not_trendable: Не в тренде
- not_usable: Невозможно использовать
- pending_review: В ожидании обзора
- review_requested: Обзор запрошен
- reviewed: Рассмотрено
+ not_usable: Недоступный
+ pending_review: На рассмотрении
+ review_requested: Запрошено рассмотрение
+ reviewed: Рассмотренный
title: Статус
- trendable: Трендовый
- unreviewed: Без рецензии
- usable: Полезное
+ trendable: В тренде
+ unreviewed: Нерассмотренный
+ usable: Доступный
name: Название
- newest: Новейший
- oldest: Старейший
+ newest: Сначала новые
+ oldest: Сначала старые
open: Посмотреть публично
- reset: Сброс
+ reset: Сбросить
review: Состояние проверки
search: Поиск
title: Хэштеги
@@ -946,7 +952,7 @@ ru:
confirm_allow: Вы уверены, что хотите разрешить выбранные ссылки?
confirm_allow_provider: Вы уверены, что хотите разрешить выбранных провайдеров?
confirm_disallow: Вы уверены, что хотите запретить выбранные ссылки?
- confirm_disallow_provider: Вы уверены, что хотите запретить выбранных поставщиков?
+ confirm_disallow_provider: Вы уверены, что хотите запретить выбранных провайдеров?
description_html: Это ссылки, которыми в настоящее время много пользуются аккаунты, с которых ваш сервер видит сообщения. Это может помочь вашим пользователям узнать, что происходит в мире. Никакие ссылки не отображаются публично, пока вы не одобрите издателя. Вы также можете разрешить или отклонить индивидуальные ссылки.
disallow: Запретить ссылку
disallow_provider: Отклонить издание
@@ -1012,14 +1018,14 @@ ru:
many: За последнюю неделю использовало %{count} человек
one: За последнюю неделю использовал один человек
other: За последнюю неделю использовал %{count} человек
- title: Рекомендации и тенденции
+ title: Рекомендации и тренды
trending: Популярное
warning_presets:
add_new: Добавить
delete: Удалить
edit_preset: Удалить шаблон предупреждения
empty: Вы еще не определили пресеты предупреждений.
- title: Предупреждающие пред установки
+ title: Шаблоны предупреждений
webhooks:
add_new: Добавить конечную точку
delete: Удалить
@@ -1196,9 +1202,11 @@ ru:
use_security_key: Использовать ключ безопасности
author_attribution:
example_title: Образец текста
- hint_html: Контролируйте, как вы будете отмечены при обмене ссылками на Mastodon.
+ hint_html: Публикуете ли вы свои статьи где-либо ещё кроме Mastodon? Если да, то ваше авторство может быть упомянуто, когда ими делятся в Mastodon.
+ instructions: 'Добавьте код ниже в HTML ваших статей:'
more_from_html: Больше от %{name}
s_blog: "%{name}'S Блог"
+ then_instructions: Затем добавьте доменное имя сайта, где вы публикуетесь, в поле ниже.
title: Авторская атрибуция
challenge:
confirm: Продолжить
@@ -1308,7 +1316,7 @@ ru:
csv: CSV
domain_blocks: Доменные блокировки
lists: Списки
- mutes: Ваши игнорируете
+ mutes: Ваши игнорируемые
storage: Ваши файлы
featured_tags:
add_new: Добавить
@@ -1325,7 +1333,7 @@ ru:
edit:
add_keyword: Добавить ключевое слово
keywords: Ключевые слова
- statuses: Отдельные сообщения
+ statuses: Отдельные посты
statuses_hint_html: Этот фильтр применяется для выбора отдельных постов, независимо от того, соответствуют ли они ключевым словам ниже. Просмотрите или удалите посты из фильтра.
title: Изменить фильтр
errors:
@@ -1496,6 +1504,7 @@ ru:
unsubscribe:
action: Да, отписаться
complete: Подписка отменена
+ confirmation_html: Вы точно желаете отписаться от всех уведомления типа «%{type}», доставляемых из сервера Mastodon %{domain} на ваш адрес электронной почты %{email}? Вы всегда сможете подписаться снова в настройках e-mail уведомлений.
emails:
notification_emails:
favourite: любимые электронные письма с уведомлениями
@@ -1741,6 +1750,7 @@ ru:
delete: Удаление учётной записи
development: Разработчикам
edit_profile: Изменить профиль
+ export: Экспорт
featured_tags: Избранные хэштеги
import: Импорт
import_and_export: Импорт и экспорт
@@ -1761,7 +1771,7 @@ ru:
domain_block: Приостановка сервера (%{target_name})
user_domain_block: Вы заблокировали %{target_name}
lost_followers: Потерянные подписчики
- lost_follows: Потерянный следует
+ lost_follows: Потерянные подписки
preamble: Вы можете потерять подписчиков и последователей, если заблокируете домен или, если ваши модераторы решат приостановить работу удаленного сервера. Когда это произойдет, вы сможете загрузить списки разорванных отношений, чтобы проверить их и, возможно, импортировать на другой сервер.
purged: Информация об этом сервере была удалена администраторами вашего сервера.
type: Событие
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 306e670b71..9ab62cea71 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -30,17 +30,25 @@ sc:
created_msg: As creadu una nota de moderatzione.
destroyed_msg: As cantzelladu una nota de moderatzione.
accounts:
+ add_email_domain_block: Bloca domìniu de posta eletrònica
approve: Aprova
approved_msg: Sa dimanda de registru de %{username} est istada aprovada
are_you_sure: Seguru?
avatar: Immàgine de profilu
by_domain: Domìniu
change_email:
+ changed_msg: Indiritzu eletrònicu de su contu modificadu!
current_email: Indiritzu eletrònicu atuale
label: Muda s'indiritzu eletrònicu
new_email: Indiritzu eletrònicu nou
submit: Muda s'indiritzu eletrònicu
title: Muda s'indiritzu eletrònicu de %{username}
+ change_role:
+ changed_msg: Ruolu modificadu.
+ edit_roles: Gesti is ruolos de utente
+ label: Modifica su ruolu
+ no_role: Nissunu ruolu
+ title: Modifica su ruolu de %{username}
confirm: Cunfirma
confirmed: Cunfirmadu
confirming: Cunfirmende
@@ -91,6 +99,7 @@ sc:
most_recent_ip: IP prus reghente
no_account_selected: Perunu contu est istadu mudadu, dae chi non nd'as seletzionadu
no_limits_imposed: Sena lìmites
+ no_role_assigned: Nissunu ruolu assignadu
not_subscribed: Sena sutiscritzione
pending: De revisionare
perform_full_suspension: Suspèndidu
@@ -108,12 +117,19 @@ sc:
removed_header_msg: S'immàgine de intestatzione de %{username} est istada bogada
resend_confirmation:
already_confirmed: Custa persone est giai cunfirmada
+ send: Torra a imbiare su ligòngiu de cunfirmatzione
+ success: Ligòngiu de cunfirmatzione imbiadu.
reset: Reseta
reset_password: Reseta sa crae
resubscribe: Torra a sutascrìere
+ role: Ruolu
search: Chirca
+ search_same_email_domain: Àteras persones cun su pròpiu domìniu de posta
search_same_ip: Àteras persones cun sa pròpiu IP
security: Seguresa
+ security_measures:
+ only_password: Crae isceti
+ password_and_2fa: Crae e 2FA
sensitive: Sensìbile
sensitized: Marcadu comente sensìbile
shared_inbox_url: URL de intrada cumpartzida
@@ -129,6 +145,8 @@ sc:
suspension_irreversible: Is datos de custu contu sunt istados cantzellados in manera irreversìbile. Podes bogare sa suspensione a su contu pro chi si potzat impreare, ma no at a recuperare datu perunu de is chi teniat in antis.
suspension_reversible_hint_html: Su contu est istadu suspèndidu, e is datos ant a èssere cantzelladu de su totu su %{date}. Finas a tando, su contu si podet ripristinare sena efetu malu perunu. Si boles cantzellare totu is datos de su contu immediatamente ddu podes fàghere inoghe in bassu.
title: Contos
+ unblock_email: Isbloca s'indiritzu de posta eletrònica
+ unblocked_email_msg: Posta eletrònica de %{username} isblocada
unconfirmed_email: Posta eletrònica sena cunfirmare
undo_sensitized: Boga sa marcadura comente sensìbile
undo_silenced: Non pòngias a sa muda
@@ -143,21 +161,31 @@ sc:
whitelisted: Federatzione permìtida
action_logs:
action_types:
+ approve_user: Aprova s'utente
assigned_to_self_report: Assigna s'informe
+ change_email_user: Muda s'indiritzu eletrònicu pro s'utente
+ change_role_user: Muda su ruolu de s'utente
confirm_user: Cunfirma s'utente
create_account_warning: Crea un'avisu
create_announcement: Crea un'annùntziu
+ create_canonical_email_block: Crea unu blocu de posta eletrònica
create_custom_emoji: Crea un'emoji personalizadu
create_domain_allow: Crea unu domìniu permìtidu
create_domain_block: Crea unu blocu de domìniu
+ create_email_domain_block: Crea unu blocu de domìniu de posta eletrònica
create_ip_block: Crea una règula IP
+ create_unavailable_domain: Crea unu domìniu no a disponimentu
+ create_user_role: Crea unu ruolu
demote_user: Degrada s'utente
destroy_announcement: Cantzella s'annùntziu
+ destroy_canonical_email_block: Cantzella su blocu de posta eletrònica
destroy_custom_emoji: Cantzella s'emoji personalizadu
destroy_domain_allow: Cantzella su domìniu permìtidu
destroy_domain_block: Cantzella su blocu de domìniu
+ destroy_email_domain_block: Cantzella su blocu de domìniu de posta eletrònica
destroy_ip_block: Cantzella sa règula IP
destroy_status: Cantzella s'istadu
+ destroy_unavailable_domain: Cantzella su domìniu no a disponimentu
disable_2fa_user: Disativa 2FA
disable_custom_emoji: Disativa s'emoji personalizadu
disable_user: Disativa utente
@@ -165,23 +193,33 @@ sc:
enable_user: Ativa utente
memorialize_account: Torra in unu contu de regordu
promote_user: Promove utente
+ reject_user: Refuda s'utente
remove_avatar_user: Cantzella immàgine de profilu
reopen_report: Torra a abèrrere s'informe
+ resend_user: Torra a imbiare messàgiu eletrònicu de cunfirmatzione
reset_password_user: Reseta sa crae
resolve_report: Isorve s'informe
sensitive_account: Marca is cuntenutos multimediales in su contu tuo comente sensìbiles
silence_account: Pone custu contu a sa muda
suspend_account: Suspende custu contu
unassigned_report: Boga s'assignatzione de custu informe
+ unblock_email_account: Isbloca s'indiritzu de posta eletrònica
unsensitive_account: Boga sa marcadura "sensìbiles" a is elementos multimediales in su contu tuo
unsilence_account: Boga custu contu de is contos a sa muda
unsuspend_account: Boga custu contu de is contos suspèndidos
update_announcement: Atualiza s'annùntziu
update_custom_emoji: Atualiza s'emoji personalizadu
update_domain_block: Atualiza blocu de domìniu
+ update_ip_block: Atualiza sa règula IP
+ update_report: Atualiza s'informe
update_status: Atualiza s'istadu
+ update_user_role: Atualiza su ruolu
actions:
+ approve_user_html: "%{name} at aprovadu su registru de %{target}"
assigned_to_self_report_html: "%{name} s'est auto-assignadu s'informe %{target}"
+ change_email_user_html: "%{name} at mudadu s'indiritzu de posta eletrònica de s'utente %{target}"
+ change_role_user_html: "%{name} at mudadu su ruolu de %{target}"
+ confirm_user_html: "%{name} at cunfirmadu s'indiritzu de posta eletrònica de s'utente %{target}"
create_account_warning_html: "%{name} at imbiadu un'avisu a %{target}"
create_announcement_html: "%{name} at creadu un'annùntziu nou %{target}"
create_custom_emoji_html: "%{name} at carrigadu un'emoji nou %{target}"
@@ -291,6 +329,8 @@ sc:
confirm_suspension:
cancel: Annulla
confirm: Suspende
+ remove_all_data: Custu at a cantzellare totu su cuntenutu, elementos multimediales e datos de profilu pro is contos de custu domìniu dae su serbidore tuo.
+ stop_communication: Su serbidore tuo at a tzessare sa comunicatzione cun custos serbidores.
title: Cunfirma su blocu de domìniu de %{domain}
created_msg: Protzessende su blocu de domìniu
destroyed_msg: Su blocu de domìniu est istadu iscontzadu
@@ -361,9 +401,12 @@ sc:
dashboard:
instance_accounts_dimension: Contos prus sighidos
instance_accounts_measure: contos sarvados
+ instance_languages_dimension: Limbas printzipales
instance_reports_measure: informes a subra de àtere
+ instance_statuses_measure: publicatziones sarvadas
delivery:
all: Totus
+ unavailable: No a disponimentu
delivery_available: Sa cunsigna est a disponimentu
empty: Perunu domìniu agatadu.
known_accounts:
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index b591cdca57..0a665fb784 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -3,7 +3,6 @@ ar:
simple_form:
hints:
account:
- attribution_domains_as_text: يحمي من الإسناد الزائف.
discoverable: يمكن عرض مشاركاتك العامة وملفك الشخصي أو التوصية به في مختلف مناطق ماستدون ويمكن اقتراح ملفك الشخصي على مستخدمين آخرين.
display_name: اسمك الكامل أو اسمك المرح.
fields: صفحتك الرئيسية، ضمائرك، عمرك، أي شيء تريده.
diff --git a/config/locales/simple_form.ast.yml b/config/locales/simple_form.ast.yml
index 5e3f1af89a..cca9f72df1 100644
--- a/config/locales/simple_form.ast.yml
+++ b/config/locales/simple_form.ast.yml
@@ -25,11 +25,11 @@ ast:
password: Usa polo menos 8 caráuteres
setting_aggregate_reblogs: Nun amuesa los artículos compartíos nuevos que yá se compartieren de recién (namás afeuta a los artículos compartíos d'agora)
setting_always_send_emails: Los avisos nun se suelen unviar per corréu electrónicu si uses activamente Mastodon
- setting_default_sensitive: El conteníu multimedia sensible anúbrese por defeutu y pue amosase al calcar nelli
- setting_display_media_default: Anubrilu cuando se marque como sensible
- setting_display_media_hide_all: Anubrilu siempres
- setting_display_media_show_all: Amosalu siempres
- setting_use_blurhash: Los dilíos básense nos colores del conteníu multimedia anubríu mas desenfonca los detalles
+ setting_default_sensitive: El conteníu multimedia sensible escuéndrese por defeutu y pue amosase al calcar nelli
+ setting_display_media_default: Escondelu cuando se marque como sensible
+ setting_display_media_hide_all: Escondelu siempre
+ setting_display_media_show_all: Amosalu siempre
+ setting_use_blurhash: Los dilíos básense nos colores del conteníu multimedia escondíu mas desenfonca los detalles
featured_tag:
name: 'Equí tán dalgunes de les etiquetes qu''usesti apocayá:'
form_admin_settings:
@@ -93,7 +93,7 @@ ast:
expires_in: Caduca dempués de
fields: Campos adicionales
header: Semeya de la testera
- irreversible: Escartar en cuentes d'anubrir
+ irreversible: Escartar en cuentes d'esconder
locale: Llingua de la interfaz
max_uses: Númberu máximu d'usos
new_password: Contraseña nueva
@@ -103,24 +103,24 @@ ast:
phrase: Pallabra clave o fras
setting_advanced_layout: Activar la interfaz web avanzada
setting_aggregate_reblogs: Agrupar los artículos compartíos nes llinies de tiempu
- setting_always_send_emails: Unviar siempres los avisos per corréu electrónicu
+ setting_always_send_emails: Unviar siempre los avisos per corréu electrónicu
setting_auto_play_gif: Reproducir automáticamente los GIFs
- setting_boost_modal: Amosar el diálogu de confirmación enantes de compartir un artículu
+ setting_boost_modal: Amosar el diálogu de confirmación enantes de compartir una publicación
setting_default_language: Llingua de los artículos
setting_default_privacy: Privacidá de los artículos
- setting_default_sensitive: Marcar siempres tol conteníu como sensible
- setting_delete_modal: Amosar el diálogu de confirmación enantes de desaniciar un artículu
+ setting_default_sensitive: Marcar siempre tol conteníu como sensible
+ setting_delete_modal: Amosar el diálogu de confirmación enantes de desaniciar una publicación
setting_disable_hover_cards: Desactivar la previsualización de perfiles al pasar el mur penriba
setting_disable_swiping: Desactivar el movimientu de desplazamientu
setting_display_media: Conteníu multimedia
- setting_expand_spoilers: Espander siempres los artículos marcaos con alvertencies de conteníu
- setting_hide_network: Anubrir les cuentes que sigas y te sigan
+ setting_expand_spoilers: Espander siempre los artículos marcaos con alvertencies de conteníu
+ setting_hide_network: Esconder les cuentes que sigas y te sigan
setting_reduce_motion: Amenorgar el movimientu de les animaciones
setting_system_font_ui: Usar la fonte predeterminada del sistema
setting_theme: Estilu del sitiu
setting_trends: Amosar les tendencies de güei
setting_unfollow_modal: Amosar el diálogu de confirmación enantes de dexar de siguir a daquién
- setting_use_blurhash: Facer que'l conteníu multimedia anubríu tenga dilíos coloríos
+ setting_use_blurhash: Facer que'l conteníu multimedia escondíu tenga dilíos coloríos
setting_use_pending_items: Mou lentu
severity: Gravedá
sign_in_token_attempt: Códigu de seguranza
@@ -161,12 +161,12 @@ ast:
sign_up_block: Bloquiar el rexistru de cuentes nueves
sign_up_requires_approval: Llendar les cuentes rexistraes nueves
notification_emails:
- favourite: Daquién marcó como favoritu'l to artículu
+ favourite: Daquién marcó como favorita la to publicación
follow: Daquién te sigue
follow_request: Daquién solicitó siguite
mention: Daquién te mentó
pending_account: Una cuenta nueva precisa una revisión
- reblog: Daquién compartió'l to artículu
+ reblog: Daquién compartió la to publicación
report: Unvióse un informe nuevu
software_updates:
label: Hai disponible un anovamientu de Mastodon
diff --git a/config/locales/simple_form.az.yml b/config/locales/simple_form.az.yml
new file mode 100644
index 0000000000..e9ba86bc79
--- /dev/null
+++ b/config/locales/simple_form.az.yml
@@ -0,0 +1 @@
+az:
diff --git a/config/locales/simple_form.bg.yml b/config/locales/simple_form.bg.yml
index 7b7d92995b..567c55eae8 100644
--- a/config/locales/simple_form.bg.yml
+++ b/config/locales/simple_form.bg.yml
@@ -3,7 +3,7 @@ bg:
simple_form:
hints:
account:
- attribution_domains_as_text: Защитава от фалшиви атрибути.
+ attribution_domains_as_text: Едно на ред. Защитава от фалшиви атрибути.
discoverable: Вашите публични публикации и профил може да се представят или препоръчват в различни области на Mastodon и вашия профил може да се предлага на други потребители.
display_name: Вашето пълно име или псевдоним.
fields: Вашата начална страница, местоимения, години, всичко що искате.
@@ -144,7 +144,7 @@ bg:
url: До къде ще се изпращат събитията
labels:
account:
- attribution_domains_as_text: Позволяване само на особени уебсайтове
+ attribution_domains_as_text: Уебсайтове, на които е позволено да приписват авторството ви
discoverable: Включване на профил и публикации в алгоритмите за откриване
fields:
name: Етикет
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index 7b651470bf..168ccc697f 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -3,7 +3,7 @@ ca:
simple_form:
hints:
account:
- attribution_domains_as_text: Protegeix de falses atribucions.
+ attribution_domains_as_text: Un per línia. Protegeix de falses atribucions.
discoverable: El teu perfil i els teus tuts públics poden aparèixer o ser recomanats en diverses àreas de Mastodon i el teu perfil pot ser suggerit a altres usuaris.
display_name: El teu nom complet o el teu nom divertit.
fields: La teva pàgina d'inici, pronoms, edat, el que vulguis.
@@ -144,7 +144,7 @@ ca:
url: On els esdeveniments seran enviats
labels:
account:
- attribution_domains_as_text: Permet només webs específics
+ attribution_domains_as_text: Webs que us poden donar crèdit
discoverable: Permet el perfil i el tuts en els algorismes de descobriment
fields:
name: Etiqueta
diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml
index 6242b1ca6e..1650502388 100644
--- a/config/locales/simple_form.cs.yml
+++ b/config/locales/simple_form.cs.yml
@@ -3,6 +3,7 @@ cs:
simple_form:
hints:
account:
+ attribution_domains_as_text: Jeden na řádek. Chrání před falešným připisování autorství.
discoverable: Vaše veřejné příspěvky a profil mohou být zobrazeny nebo doporučeny v různých oblastech Mastodonu a váš profil může být navrhován ostatním uživatelům.
display_name: Vaše celé jméno nebo přezdívka.
fields: Vaše domovská stránka, zájmena, věk, cokoliv chcete.
@@ -130,6 +131,7 @@ cs:
name: Můžete měnit pouze velikost písmen, například kvůli lepší čitelnosti
user:
chosen_languages: Po zaškrtnutí budou ve veřejných časových osách zobrazeny pouze příspěvky ve zvolených jazycích
+ role: Role určuje, která oprávnění uživatel má.
user_role:
color: Barva, která má být použita pro roli v celém UI, jako RGB v hex formátu
highlighted: Toto roli učiní veřejně viditelnou
@@ -142,6 +144,7 @@ cs:
url: Kam budou události odesílány
labels:
account:
+ attribution_domains_as_text: Webové stránky s povolením Vám připsat autorství
discoverable: Zobrazovat profil a příspěvky ve vyhledávacích algoritmech
fields:
name: Označení
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index 56d1f873dc..0af738712d 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -3,7 +3,7 @@ cy:
simple_form:
hints:
account:
- attribution_domains_as_text: Yn amddiffyn rhag priodoliadau ffug.
+ attribution_domains_as_text: Un i bob llinell. Yn amddiffyn rhag priodoli ffug.
discoverable: Mae'n bosibl y bydd eich postiadau cyhoeddus a'ch proffil yn cael sylw neu'n cael eu hargymell mewn gwahanol feysydd o Mastodon ac efallai y bydd eich proffil yn cael ei awgrymu i ddefnyddwyr eraill.
display_name: Eich enw llawn neu'ch enw hwyl.
fields: Eich tudalen cartref, rhagenwau, oed, neu unrhyw beth.
@@ -41,7 +41,7 @@ cy:
defaults:
autofollow: Bydd pobl sy'n cofrestru drwy'r gwahoddiad yn eich dilyn yn awtomatig
avatar: WEBP, PNG, GIF neu JPG. %{size} ar y mwyaf. Bydd yn cael ei leihau i %{dimensions}px
- bot: Mae'r cyfrif hwn yn perfformio gweithredoedd awtomatig yn bennaf ac mae'n bosib nad yw'n cael ei fonitro
+ bot: Rhoi gwybod i eraill bod y cyfrif hwn yn perfformio gweithredoedd awtomatig yn bennaf ac mae'n bosib nad yw'n cael ei fonitro
context: Un neu fwy cyd-destun lle dylai'r hidlydd weithio
current_password: At ddibenion diogelwch, nodwch gyfrinair y cyfrif cyfredol
current_username: I gadarnhau, nodwch enw defnyddiwr y cyfrif cyfredol
@@ -144,7 +144,7 @@ cy:
url: I ble bydd digwyddiadau'n cael eu hanfon
labels:
account:
- attribution_domains_as_text: Dim ond yn caniatáu gwefannau penodol
+ attribution_domains_as_text: Gwefannau sy'n cael caniatâd i'ch cydnabod chi
discoverable: Proffil nodwedd a phostiadau mewn algorithmau darganfod
fields:
name: Label
diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml
index e7b8fe337a..24cb95813f 100644
--- a/config/locales/simple_form.da.yml
+++ b/config/locales/simple_form.da.yml
@@ -3,12 +3,12 @@ da:
simple_form:
hints:
account:
- attribution_domains_as_text: Beskytter mod falske tilskrivninger.
+ attribution_domains_as_text: Ét pr. linje. Beskytter mod falske tilskrivninger.
discoverable: Dine offentlige indlæg og profil kan blive fremhævet eller anbefalet i forskellige områder af Mastodon, og profilen kan blive foreslået til andre brugere.
display_name: Dit fulde navn eller dit sjove navn.
fields: Din hjemmeside, dine pronominer, din alder, eller hvad du har lyst til.
indexable: Dine offentlige indlæg vil kunne vises i Mastodon-søgeresultater. Folk, som har interageret med dem, vil kunne finde dem uanset.
- note: 'Du kan @omtale andre personer eller #hashtags.'
+ note: 'Du kan @omtale andre personer eller #etiketter.'
show_collections: Folk vil ikke kunne tjekke dine Følger og Følgere. Folk, du selv følger, vil stadig kunne se dette.
unlocked: Folk vil kunne følge dig uden krav om godkendelse. Fjern markeringen, såfremt du ønsker at tjekke Følg-anmodninger og individuelt acceptere eller afvise nye Følgere.
account_alias:
@@ -16,7 +16,7 @@ da:
account_migration:
acct: Angiv brugernavn@domain for den konto, hvortil du vil flytte
account_warning_preset:
- text: Du kan bruge indlægssyntaks, såsom URL'er, hashtags og omtaler
+ text: Du kan bruge indlægssyntaks, såsom URL'er, etiketter og omtaler
title: Valgfri. Ikke synlig for modtageren
admin_account_action:
include_statuses: Brugeren vil se, hvilke indlæg, som har forårsaget modereringen/advarslen
@@ -54,7 +54,7 @@ da:
password: Brug mindst 8 tegn
phrase: Matches uanset uanset brug af store/små bogstaver i teksten eller indholdsadvarsel for et indlæg
scopes: De API'er, som applikationen vil kunne tilgå. Vælges en topniveaudstrækning, vil detailvalg være unødvendige.
- setting_aggregate_reblogs: Vis ikke nye boosts for nyligt boostede indlæg (påvirker kun nyligt modtagne boosts)
+ setting_aggregate_reblogs: Vis ikke nye fremhævelser for nyligt fremhævede indlæg (påvirker kun nyligt modtagne fremhævelser)
setting_always_send_emails: Normalt sendes ingen e-mailnotifikationer under aktivt brug af Mastodon
setting_default_sensitive: Sensitive medier er som standard skjult og kan vises med et klik
setting_display_media_default: Skjul medier med sensitiv-markering
@@ -70,7 +70,7 @@ da:
domain: Dette kan være domænenavnet vist i den benyttede i e-mailadresse eller MX-post. Begge tjekkes under tilmelding.
with_dns_records: Et forsøg på at opløse det givne domænes DNS-poster foretages, og resultaterne blokeres ligeledes
featured_tag:
- name: 'Her er nogle af dine hyppigst brugte hashtags:'
+ name: 'Her er nogle af dine hyppigst brugte etiketter:'
filters:
action: Vælg handlingen til eksekvering, når et indlæg matcher filteret
actions:
@@ -82,7 +82,7 @@ da:
backups_retention_period: Brugere har mulighed for at generere arkiver af deres indlæg til senere downloade. Når sat til positiv værdi, vil disse arkiver automatisk blive slettet fra lagerpladsen efter det angivne antal dage.
bootstrap_timeline_accounts: Disse konti fastgøres øverst på nye brugeres følg-anbefalinger.
closed_registrations_message: Vises, når tilmeldinger er lukket
- content_cache_retention_period: Alle indlæg fra andre servere (herunder boosts og besvarelser) slettes efter det angivne antal dage uden hensyn til lokal brugerinteraktion med disse indlæg. Dette omfatter indlæg, hvor en lokal bruger har markeret dem som bogmærker eller favoritter. Private omtaler mellem brugere fra forskellige instanser vil også være tabt og umulige at gendanne. Brugen af denne indstilling er beregnet til særlige formål instanser og bryder mange brugerforventninger ved implementering til almindelig brug.
+ content_cache_retention_period: Alle indlæg fra andre servere (herunder fremhævelser og besvarelser) slettes efter det angivne antal dage uden hensyn til lokal brugerinteraktion med disse indlæg. Dette omfatter indlæg, hvor en lokal bruger har markeret dem som bogmærker eller favoritter. Private omtaler mellem brugere fra forskellige instanser vil også være tabt og umulige at gendanne. Brugen af denne indstilling er beregnet til særlige formål instanser og bryder mange brugerforventninger ved implementering til almindelig brug.
custom_css: Man kan anvende tilpassede stilarter på Mastodon-webversionen.
favicon: WEBP, PNG, GIF eller JPG. Tilsidesætter standard Mastodon favikonet på mobilenheder med et tilpasset ikon.
mascot: Tilsidesætter illustrationen i den avancerede webgrænseflade.
@@ -101,7 +101,7 @@ da:
thumbnail: Et ca. 2:1 billede vist sammen med serveroplysningerne.
timeline_preview: Udloggede besøgende kan gennemse serverens seneste offentlige indlæg.
trendable_by_default: Spring manuel gennemgang af trendindhold over. Individuelle elementer kan stadig fjernes fra trends efter kendsgerningen.
- trends: Tendenser viser, hvilke indlæg, hashtags og nyheder opnår momentum på serveren.
+ trends: Tendenser viser, hvilke indlæg, etiketter og nyheder opnår momentum på serveren.
trends_as_landing_page: Vis tendensindhold til udloggede brugere og besøgende i stedet for en beskrivelse af denne server. Kræver, at tendenser er aktiveret.
form_challenge:
current_password: Du bevæger dig ind på et sikkert område
@@ -144,7 +144,7 @@ da:
url: Hvor begivenheder sendes til
labels:
account:
- attribution_domains_as_text: Tillad kun bestemte websteder
+ attribution_domains_as_text: Hjemmesider, der må kreditere dig
discoverable: Fremhæv profil og indlæg i opdagelsesalgoritmer
fields:
name: Etiket
@@ -205,10 +205,10 @@ da:
password: Adgangskode
phrase: Nøgleord/-sætning
setting_advanced_layout: Aktivér avanceret webgrænseflade
- setting_aggregate_reblogs: Gruppér boosts på tidslinjer
+ setting_aggregate_reblogs: Gruppér fremhævelser på tidslinjer
setting_always_send_emails: Send altid e-mailnotifikationer
setting_auto_play_gif: Autoafspil animerede GIF'er
- setting_boost_modal: Vis bekræftelsesdialog inden boosting
+ setting_boost_modal: Vis bekræftelsesdialog inden fremhævelse
setting_default_language: Sprog for indlæg
setting_default_privacy: Fortrolighed for indlæg
setting_default_sensitive: Markér altid medier som sensitive
@@ -297,7 +297,7 @@ da:
follow_request: Nogen anmodede om at følge dig
mention: Nogen omtalte dig
pending_account: Ny konto kræver gennemgang
- reblog: Nogen boostede dit indlæg
+ reblog: Nogen fremhævede dit indlæg
report: Ny anmeldelse indsendt
software_updates:
all: Notificér ved alle opdateringer
@@ -313,10 +313,10 @@ da:
indexable: Inkludér profilside i søgemaskiner
show_application: Vis, fra hvilken app et indlæg er sendt
tag:
- listable: Tillad visning af dette hashtag i søgninger og forslag
+ listable: Tillad visning af denne etiket i søgninger og forslag
name: Hashtag
- trendable: Tillad visning af dette hashtag under trends
- usable: Tillad indlæg at benytte dette hashtag lokalt
+ trendable: Tillad visning af denne etiket under tendenser
+ usable: Tillad indlæg at benytte denne etiket lokalt
user:
role: Rolle
time_zone: Tidszone
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index f7e55f1a7b..e181ecdd6f 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -3,7 +3,7 @@ de:
simple_form:
hints:
account:
- attribution_domains_as_text: Dadurch können falsche Zuschreibungen unterbunden werden.
+ attribution_domains_as_text: Eine Domain pro Zeile. Dadurch können falsche Zuschreibungen unterbunden werden.
discoverable: Deine öffentlichen Beiträge und dein Profil können in verschiedenen Bereichen auf Mastodon angezeigt oder empfohlen werden und dein Profil kann anderen vorgeschlagen werden.
display_name: Dein richtiger Name oder dein Fantasiename.
fields: Deine Website, Pronomen, dein Alter – alles, was du möchtest.
@@ -144,7 +144,7 @@ de:
url: Wohin Ereignisse gesendet werden
labels:
account:
- attribution_domains_as_text: Nur ausgewählte Websites zulassen
+ attribution_domains_as_text: Websites, die auf dich verweisen dürfen
discoverable: Profil und Beiträge in Suchalgorithmen berücksichtigen
fields:
name: Beschriftung
@@ -242,7 +242,7 @@ de:
filters:
actions:
hide: Vollständig ausblenden
- warn: Mit einer Inhaltswarnung ausblenden
+ warn: Mit einer Warnung ausblenden
form_admin_settings:
activity_api_enabled: Aggregierte Nutzungsdaten über die API veröffentlichen
app_icon: App-Symbol
diff --git a/config/locales/simple_form.el.yml b/config/locales/simple_form.el.yml
index d46e764a44..7c1d231665 100644
--- a/config/locales/simple_form.el.yml
+++ b/config/locales/simple_form.el.yml
@@ -3,7 +3,7 @@ el:
simple_form:
hints:
account:
- attribution_domains_as_text: Προστατεύει από ψευδείς ιδιότητες.
+ attribution_domains_as_text: Μία ανά γραμμή. Προστατεύει από ψευδείς ιδιότητες.
discoverable: Οι δημόσιες δημοσιεύσεις και το προφίλ σου μπορεί να εμφανίζονται ή να συνιστώνται σε διάφορους τομείς του Mastodon και το προφίλ σου μπορεί να προτείνεται σε άλλους χρήστες.
display_name: Το πλήρες ή το αστείο σου όνομα.
fields: Η αρχική σου σελίδα, αντωνυμίες, ηλικία, ό,τι θες.
@@ -144,7 +144,7 @@ el:
url: Πού θα σταλούν τα γεγονότα
labels:
account:
- attribution_domains_as_text: Να επιτρέπονται μόνο συγκεκριμένες ιστοσελίδες
+ attribution_domains_as_text: Ιστοσελίδες που επιτρέπεται να σου δώσουν εύσημα
discoverable: Παροχή προφίλ και αναρτήσεων σε αλγορίθμους ανακάλυψης
fields:
name: Περιγραφή
diff --git a/config/locales/simple_form.en-GB.yml b/config/locales/simple_form.en-GB.yml
index b802fd532f..039a69dba2 100644
--- a/config/locales/simple_form.en-GB.yml
+++ b/config/locales/simple_form.en-GB.yml
@@ -3,7 +3,7 @@ en-GB:
simple_form:
hints:
account:
- attribution_domains_as_text: Protects from false attributions.
+ attribution_domains_as_text: One per line. Protects from false attributions.
discoverable: Your public posts and profile may be featured or recommended in various areas of Mastodon and your profile may be suggested to other users.
display_name: Your full name or your fun name.
fields: Your homepage, pronouns, age, anything you want.
@@ -144,7 +144,7 @@ en-GB:
url: Where events will be sent to
labels:
account:
- attribution_domains_as_text: Only allow specific websites
+ attribution_domains_as_text: Websites allowed to credit you
discoverable: Feature profile and posts in discovery algorithms
fields:
name: Label
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 6d57adb831..1a60ca8206 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -3,7 +3,7 @@ en:
simple_form:
hints:
account:
- attribution_domains_as_text: Protects from false attributions.
+ attribution_domains_as_text: One per line. Protects from false attributions.
discoverable: Your public posts and profile may be featured or recommended in various areas of Mastodon and your profile may be suggested to other users.
display_name: Your full name or your fun name.
fields: Your homepage, pronouns, age, anything you want.
@@ -180,7 +180,7 @@ en:
kmyblue: kmyblue
labels:
account:
- attribution_domains_as_text: Only allow specific websites
+ attribution_domains_as_text: Websites allowed to credit you
discoverable: Feature profile and posts in discovery algorithms
fields:
examples:
diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml
index cb4a9041e8..dfc9935194 100644
--- a/config/locales/simple_form.eo.yml
+++ b/config/locales/simple_form.eo.yml
@@ -3,7 +3,7 @@ eo:
simple_form:
hints:
account:
- attribution_domains_as_text: Protektas kontraŭ falsaj atribuoj.
+ attribution_domains_as_text: Unu por linio. Protektas kontraŭ falsaj atribuoj.
discoverable: Viaj publikaj afiŝoj kaj profilo povas esti prezentitaj aŭ rekomenditaj en diversaj lokoj de Mastodon kaj via profilo povas esti proponita al aliaj uzantoj.
display_name: Via plena nomo aŭ via kromnomo.
fields: Via retpaĝo, pronomoj, aĝo, ĉio, kion vi volas.
@@ -40,12 +40,14 @@ eo:
text: Oni povas apelaci strikin nur unufoje
defaults:
autofollow: Homoj, kiuj registriĝos per la invito aŭtomate sekvos vin
+ avatar: WEBP, PNG, GIF aŭ JPG. Maksimume %{size}. Malgrandiĝos al %{dimensions}px
bot: Tiu konto ĉefe faras aŭtomatajn agojn, kaj povas esti ne kontrolata
context: Unu ol pluraj kuntekstoj kie la filtrilo devus agi
current_password: Pro sekuraj kialoj, bonvolu enigi la pasvorton de la nuna konto
current_username: Por konfirmi, bonvolu enigi la uzantnomon de la nuna konto
digest: Sendita nur post longa tempo de neaktiveco, kaj nur se vi ricevis personan mesaĝon en via foresto
email: Vi ricevos konfirman retpoŝton
+ header: WEBP, PNG, GIF aŭ JPG. Maksimume %{size}. Malgrandiĝos al %{dimensions}px
inbox_url: Kopiu la URL de la ĉefpaĝo de la ripetilo, kiun vi volas uzi
irreversible: La filtritaj mesaĝoj malaperos por eterne, eĉ se la filtrilo poste estas forigita
locale: La lingvo de la fasado, retpoŝtaĵoj, kaj sciigoj
@@ -54,10 +56,10 @@ eo:
scopes: Kiujn API-ojn la aplikaĵo permesiĝos atingi. Se vi elektas supran amplekson, vi ne bezonas elekti la individuajn.
setting_aggregate_reblogs: Ne montri novajn plusendojn de mesaĝoj lastatempe plusenditaj (nur efikas al nove ricevitaj plusendoj)
setting_always_send_emails: Normale, la sciigoj per retpoŝto ne estos senditaj kiam vi uzas Mastodon aktive
- setting_default_sensitive: Tiklaj plurmedioj estas kaŝitaj implicite, kaj povas esti montritaj per klako
+ setting_default_sensitive: Tiklaj vidaŭdaĵoj estas implicite kaŝitaj kaj povas esti montritaj per alklako
setting_display_media_default: Kaŝi plurmediojn markitajn kiel tiklaj
- setting_display_media_hide_all: Ĉiam kaŝi la plurmediojn
- setting_display_media_show_all: Ĉiam montri la plurmediojn
+ setting_display_media_hide_all: Ĉiam kaŝi la vidaŭdaĵojn
+ setting_display_media_show_all: Ĉiam montri la vidaŭdaĵojn
setting_use_blurhash: Transirojn estas bazita sur la koloroj de la kaŝitaj aŭdovidaĵoj sed ne montri iun ajn detalon
setting_use_pending_items: Kaŝi tempoliniajn ĝisdatigojn malantaŭ klako anstataŭ aŭtomate rulumi la fluon
username: Vi povas uzi literojn, ciferojn kaj substrekojn
@@ -76,11 +78,15 @@ eo:
warn: Kaŝi la enhavon filtritan malantaŭ averto mencianta la nomon de la filtro
form_admin_settings:
activity_api_enabled: Nombroj de loke publikigitaj afiŝoj, aktivaj uzantoj kaj novaj registradoj en semajnaj siteloj
+ app_icon: WEBP, PNG, GIF aŭ JPG. Anstataŭigas la defaŭltan aplikaĵan bildsimbolon sur porteblaj aparatoj kun propra bildsimbolo.
+ backups_retention_period: Uzantoj havas la kapablon generi arkivojn de siaj afiŝoj por elŝuti poste. Kiam estas agordita al pozitiva valoro, ĉi tiuj arkivoj estos aŭtomate forigitaj de via stokado post la specifita nombro da tagoj.
bootstrap_timeline_accounts: Ĉi tiuj kontoj pinglitas al la supro de sekvorekomendoj de novaj uzantoj.
closed_registrations_message: Montrita kiam registroj fermitas
+ content_cache_retention_period: Ĉiuj afiŝoj de aliaj serviloj (inkluzive de diskonigoj kaj respondoj) estos forigitaj post la specifita nombro da tagoj, sen konsidero al iu ajn loka uzantinterago kun tiuj afiŝoj. Ĉi tio inkluzivas afiŝojn, kie loka uzanto markis ĝin kiel legosignojn aŭ ŝatatajn. Privataj mencioj inter uzantoj de malsamaj nodoj ankaŭ estos perditaj kaj neeble restaŭreblaj. Uzo de ĉi tiu agordo estas celita por specialcelaj okazoj kaj rompas multajn uzantajn atendojn kiam efektivigita por ĝenerala uzo.
custom_css: Vi povas meti propajn stilojn en la retversio de Mastodon.
favicon: WEBP, PNG, GIF aŭ JPG. Anstataŭigas la defaŭltan Mastodon-favikono kun propra bildsimbolo.
mascot: Anstatauigi la ilustraĵon en la altnivela retinterfaco.
+ media_cache_retention_period: Amaskomunikilaj dosieroj de afiŝoj faritaj de foraj uzantoj estas konservitaj en kaŝmemoro en via servilo. Kiam agordita al pozitiva valoro, amaskomunikilaro estos forigita post la specifita nombro da tagoj. Se la amaskomunikilaro-datumoj estas petitaj post kiam ĝi estas forigita, ĝi estos re-elŝutita, se la fonta enhavo ankoraŭ disponeblas. Pro limigoj pri kiom ofte ligaj antaŭrigardaj kartoj enketas retejojn de ekstera liveranto, oni rekomendas agordi ĉi tiun valoron al almenaŭ 14 tagoj, aŭ ligaj antaŭrigardaj kartoj ne estos ĝisdatigitaj laŭpostule antaŭ tiu tempo.
peers_api_enabled: Listo de domajnaj nomoj kiujn ĉi tiu servilo renkontis en la fediverso. Neniuj datumoj estas inkluditaj ĉi tie pri ĉu vi federacias kun donita servilo, nur ke via servilo scias pri ĝi. Ĉi tio estas uzata de servoj kiuj kolektas statistikojn pri federacio en ĝenerala signifo.
profile_directory: La profilujo listigas ĉiujn uzantojn kiu volonte malkovrebli.
require_invite_text: Kiam registroj bezonas permanan aprobon, igi la "Kial vi volas aliĝi?" tekstoenigon deviga anstau nedeviga
@@ -138,7 +144,7 @@ eo:
url: Kien eventoj sendotas
labels:
account:
- attribution_domains_as_text: Permesi nur specifajn retejojn
+ attribution_domains_as_text: Retejoj permesitaj krediti vin
discoverable: Elstarigi profilon kaj afiŝojn en eltrovantaj algoritmoj
fields:
name: Etikedo
@@ -175,8 +181,8 @@ eo:
text: Klarigu kial ĉi tiu decido devas inversigitis
defaults:
autofollow: Inviti al sekvi vian konton
- avatar: Rolfiguro
- bot: Tio estas robota konto
+ avatar: Profilbildo
+ bot: Ĉi tio estas aŭtomata konto
chosen_languages: Filtri lingvojn
confirm_new_password: Konfirmi novan pasvorton
confirm_password: Konfirmi pasvorton
@@ -205,11 +211,11 @@ eo:
setting_boost_modal: Montri konfirman fenestron antaŭ ol diskonigi mesaĝon
setting_default_language: Publikada lingvo
setting_default_privacy: Privateco de afiŝado
- setting_default_sensitive: Ĉiam marki plurmediojn kiel tiklaj
+ setting_default_sensitive: Ĉiam marki la vidaŭdaĵojn kiel tiklaj
setting_delete_modal: Montri konfirman fenestron antaŭ ol forigi mesaĝon
setting_disable_hover_cards: Malebligi profilan antaŭmontron kiam oni musumas
setting_disable_swiping: Malebligi svingajn movojn
- setting_display_media: Montrado de plurmedioj
+ setting_display_media: Vidigo de vidaŭdaĵoj
setting_display_media_default: Implicita
setting_display_media_hide_all: Kaŝi ĉiujn
setting_display_media_show_all: Montri ĉiujn
@@ -243,6 +249,7 @@ eo:
backups_retention_period: Uzantoarkivretendauro
bootstrap_timeline_accounts: Ĉiam rekomendi ĉi tiujn kontojn al novaj uzantoj
closed_registrations_message: Kutima mesaĝo kiam registroj ne estas disponeblaj
+ content_cache_retention_period: Retenperiodo de fora enhavo
custom_css: Propa CSS
favicon: Favorikono
mascot: Propa maskoto
diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml
index d06d09761a..98254c5e99 100644
--- a/config/locales/simple_form.es-AR.yml
+++ b/config/locales/simple_form.es-AR.yml
@@ -3,7 +3,7 @@ es-AR:
simple_form:
hints:
account:
- attribution_domains_as_text: Protege de atribuciones falsas.
+ attribution_domains_as_text: Una por línea. Protege de falsas atribuciones.
discoverable: Tu perfil y publicaciones pueden ser destacadas o recomendadas en varias áreas de Mastodon, y tu perfil puede ser sugerido a otros usuarios.
display_name: Tu nombre completo o tu pseudónimo.
fields: Tu sitio web, pronombres, edad, o lo que quieras.
@@ -144,7 +144,7 @@ es-AR:
url: Adónde serán enviados los eventos
labels:
account:
- attribution_domains_as_text: Solo permitir sitios web específicos
+ attribution_domains_as_text: Sitios web autorizados a acreditarte
discoverable: Destacar perfil y mensajes en algoritmos de descubrimiento
fields:
name: Nombre de campo
diff --git a/config/locales/simple_form.es-MX.yml b/config/locales/simple_form.es-MX.yml
index 8c84e35a4d..135755bc7e 100644
--- a/config/locales/simple_form.es-MX.yml
+++ b/config/locales/simple_form.es-MX.yml
@@ -3,20 +3,20 @@ es-MX:
simple_form:
hints:
account:
- attribution_domains_as_text: Protege frente atribuciones fraudulentas.
+ attribution_domains_as_text: Uno por línea. Protege contra atribuciones falsas.
discoverable: Tu perfil y las publicaciones públicas pueden ser destacadas o recomendadas en varias áreas de Mastodon y tu perfil puede ser sugerido a otros usuarios.
- display_name: Tu nombre completo o tu nick.
- fields: Tu página de inicio, pronombres, edad, todo lo que quieras.
+ display_name: Tu nombre completo o tu apodo.
+ fields: Tu página de inicio, pronombres, edad, lo que quieras.
indexable: Tus publicaciones públicas pueden aparecer en los resultados de búsqueda en Mastodon. Las personas que han interactuado con tus publicaciones pueden buscarlas en cualquier momento.
- note: 'Puedes @mencionar a otra gente o #hashtags.'
+ note: 'Puedes @mencionar a otra gente o #etiquetas.'
show_collections: Las personas pueden navegar a través de tus seguidos y seguidores. Las personas que te siguen pueden ver que las sigues.
unlocked: Las personas pueden seguirte sin solicitar la aprobación. No lo selecciones si quieres revisar las solicitudes de seguimiento y elegir si aceptas o rechazas a nuevos seguidores.
account_alias:
acct: Especifique el nombre de usuario@dominio de la cuenta desde la cual se desea migrar
account_migration:
- acct: Especifique el nombre de usuario@dominio de la cuenta a la cual desea migrar
+ acct: Especifica el nombre de usuario@dominio de la cuenta a la cual desea migrar
account_warning_preset:
- text: Puede usar sintaxis de publicaciones, como URLs, etiquetas y menciones
+ text: Puedes usar sintaxis de publicaciones, como URLs, etiquetas y menciones
title: Opcional. No visible para el destinatario
admin_account_action:
include_statuses: El usuario verá qué publicaciones han causado la acción de moderación o advertencia
@@ -25,7 +25,7 @@ es-MX:
type_html: Elige qué hacer con %{acct}
types:
disable: Evitar que el usuario utilice su cuenta, pero no eliminar ni ocultar sus contenidos.
- none: Utilizar esto para enviar una advertencia al usuario, sin poner en marcha ninguna otra acción.
+ none: Usa esto para enviar una advertencia al usuario, sin desencadenar ninguna otra acción.
sensitive: Forzar que todos los archivos multimedia de este usuario sean marcados como sensibles.
silence: Evita que el usuario pueda publicar con visibilidad pública, y oculta sus publicaciones y notificaciones a personas que no lo siguen. Cierra todas las denuncias contra esta cuenta.
suspend: Evita cualquier interacción desde o hacia esta cuenta y elimina su contenido. Reversible en 30 días. Cierra todas las denuncias contra esta cuenta.
@@ -48,20 +48,20 @@ es-MX:
digest: Solo enviado tras un largo periodo de inactividad y solo si has recibido mensajes personales durante tu ausencia
email: Se le enviará un correo de confirmación
header: WEBP, PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
- inbox_url: Copia la URL de la página principal del relés que quieres utilizar
+ inbox_url: Copia la URL de la página principal del relé que deseas usar
irreversible: Las publicaciones filtradas desaparecerán irreversiblemente, incluso si este filtro es eliminado más adelante
locale: El idioma de la interfaz de usuario, correos y notificaciones push
- password: Utilice al menos 8 caracteres
+ password: Utiliza al menos 8 caracteres
phrase: Se aplicará sin importar las mayúsculas o los avisos de contenido de una publicación
scopes: Qué APIs de la aplicación tendrán acceso. Si seleccionas el alcance de nivel mas alto, no necesitas seleccionar las individuales.
setting_aggregate_reblogs: No mostrar nuevos impulsos para las publicaciones que han sido recientemente impulsadas (sólo afecta a las publicaciones recibidas recientemente)
setting_always_send_emails: Normalmente las notificaciones por correo electrónico no se enviarán cuando estés usando Mastodon activamente
- setting_default_sensitive: El contenido multimedia sensible está oculto por defecto y puede ser mostrado con un click
+ setting_default_sensitive: El contenido multimedia sensible está oculto por defecto y puede ser mostrado con un clic
setting_display_media_default: Ocultar contenido multimedia marcado como sensible
setting_display_media_hide_all: Siempre ocultar todo el contenido multimedia
setting_display_media_show_all: Mostrar siempre contenido multimedia marcado como sensible
- setting_use_blurhash: Los gradientes se basan en los colores de las imágenes ocultas pero haciendo borrosos los detalles
- setting_use_pending_items: Ocultar nuevos estados detrás de un clic en lugar de desplazar automáticamente el feed
+ setting_use_blurhash: Los degradados se basan en los colores de los elementos visuales ocultos, pero ocultan cualquier detalle
+ setting_use_pending_items: Ocultar las publicaciones de la línea de tiempo tras un clic en lugar de desplazar automáticamente el feed
username: Puedes usar letras, números y guiones bajos
whole_word: Cuando la palabra clave o frase es solo alfanumérica, solo será aplicado si concuerda con toda la palabra
domain_allow:
@@ -133,7 +133,7 @@ es-MX:
chosen_languages: Cuando se marca, solo se mostrarán las publicaciones en los idiomas seleccionados en las líneas de tiempo públicas
role: El rol controla qué permisos tiene el usuario.
user_role:
- color: Color que se utilizará para el rol a lo largo de la interfaz de usuario, como RGB en formato hexadecimal
+ color: Color que se usará para el rol en toda la interfaz de usuario, como RGB en formato hexadecimal
highlighted: Esto hace que el rol sea públicamente visible
name: Nombre público del rol, si el rol se establece para que se muestre como una insignia
permissions_as_keys: Los usuarios con este rol tendrán acceso a...
@@ -144,7 +144,7 @@ es-MX:
url: Donde los eventos serán enviados
labels:
account:
- attribution_domains_as_text: Solo permitir sitios web específicos
+ attribution_domains_as_text: Sitios web autorizados para acreditarte
discoverable: Destacar el perfil y las publicaciones en el algoritmo de descubrimiento
fields:
name: Etiqueta
@@ -193,7 +193,7 @@ es-MX:
email: Dirección de correo electrónico
expires_in: Expirar tras
fields: Metadatos de perfil
- header: Img. cabecera
+ header: Imagen de encabezado
honeypot: "%{label} (no rellenar)"
inbox_url: URL de la entrada de relés
irreversible: Dejar en lugar de ocultar
@@ -222,11 +222,11 @@ es-MX:
setting_expand_spoilers: Siempre expandir las publicaciones marcadas con advertencias de contenido
setting_hide_network: Ocultar tu red
setting_reduce_motion: Reducir el movimiento de las animaciones
- setting_system_font_ui: Utilizar la tipografía por defecto del sistema
+ setting_system_font_ui: Usar la fuente por defecto del sistema
setting_theme: Tema del sitio
setting_trends: Mostrar las tendencias de hoy
setting_unfollow_modal: Mostrar diálogo de confirmación antes de dejar de seguir a alguien
- setting_use_blurhash: Mostrar gradientes coloridos para contenido multimedia oculto
+ setting_use_blurhash: Mostrar degradados de colores para contenidos multimedia ocultos
setting_use_pending_items: Modo lento
severity: Severidad
sign_in_token_attempt: Código de seguridad
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index b22701aae7..1e80b9ce05 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -3,7 +3,7 @@ es:
simple_form:
hints:
account:
- attribution_domains_as_text: Protege frente atribuciones fraudulentas.
+ attribution_domains_as_text: Una por línea. Protege de falsas atribuciones.
discoverable: Tu perfil y publicaciones públicas pueden ser destacadas o recomendadas en varias áreas de Mastodon y tu perfil puede ser sugerido a otros usuarios.
display_name: Tu nombre completo o tu apodo.
fields: Tu carta de presentación, pronombres, edad, lo que quieras.
@@ -16,7 +16,7 @@ es:
account_migration:
acct: Especifica el nombre_de_usuario@dominio de la cuenta hacia la que quieres migrar
account_warning_preset:
- text: Puede usar sintaxis de publicaciones, como URLs, hashtags y menciones
+ text: Puede usar sintaxis de publicaciones, como URLs, etiquetas y menciones
title: Opcional. No es visible para el destinatario
admin_account_action:
include_statuses: El usuario verá qué publicaciones han causado la acción de moderación o advertencia
@@ -46,12 +46,12 @@ es:
current_password: Por razones de seguridad por favor ingrese la contraseña de la cuenta actual
current_username: Para confirmar, por favor ingrese el nombre de usuario de la cuenta actual
digest: Solo enviado tras un largo periodo de inactividad y solo si has recibido mensajes personales durante tu ausencia
- email: Se le enviará un correo de confirmación
+ email: Te enviaremos un correo electrónico de confirmación
header: WEBP, PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
inbox_url: Copia la URL de la página principal del relés que quieres utilizar
irreversible: Las publicaciones filtradas desaparecerán irreversiblemente, incluso si este filtro es eliminado más adelante
locale: El idioma de la interfaz de usuario, correos y notificaciones push
- password: Utilice al menos 8 caracteres
+ password: Utiliza al menos 8 caracteres
phrase: Se aplicará sin importar las mayúsculas o los avisos de contenido de una publicación
scopes: Qué APIs de la aplicación tendrán acceso. Si seleccionas el alcance de nivel mas alto, no necesitas seleccionar las individuales.
setting_aggregate_reblogs: No mostrar nuevos impulsos para las publicaciones que han sido recientemente impulsadas (sólo afecta a los impulsos recibidos recientemente)
@@ -101,7 +101,7 @@ es:
thumbnail: Una imagen de aproximadamente 2:1 se muestra junto a la información de tu servidor.
timeline_preview: Los visitantes no registrados podrán navegar por los mensajes públicos más recientes disponibles en el servidor.
trendable_by_default: Omitir la revisión manual del contenido en tendencia. Los elementos individuales aún podrán eliminarse de las tendencias.
- trends: Las tendencias muestran qué mensajes, etiquetas y noticias están ganando tracción en tu servidor.
+ trends: Las tendencias muestran qué publicaciones, etiquetas y noticias están ganando tracción en tu servidor.
trends_as_landing_page: Mostrar contenido en tendencia para usuarios y visitantes en lugar de una descripción de este servidor. Requiere que las tendencias estén habilitadas.
form_challenge:
current_password: Estás entrando en un área segura
@@ -144,7 +144,7 @@ es:
url: Donde los eventos serán enviados
labels:
account:
- attribution_domains_as_text: Solo permitir sitios web específicos
+ attribution_domains_as_text: Sitios web autorizados a acreditarte
discoverable: Destacar perfil y publicaciones en algoritmos de descubrimiento
fields:
name: Etiqueta
@@ -193,7 +193,7 @@ es:
email: Dirección de correo electrónico
expires_in: Expirar tras
fields: Metadatos de perfil
- header: Img. cabecera
+ header: Imagen de encabezado
honeypot: "%{label} (no rellenar)"
inbox_url: URL de la entrada de relés
irreversible: Rechazar en lugar de ocultar
@@ -208,7 +208,7 @@ es:
setting_aggregate_reblogs: Agrupar impulsos en las líneas de tiempo
setting_always_send_emails: Enviar siempre notificaciones por correo
setting_auto_play_gif: Reproducir automáticamente los GIFs animados
- setting_boost_modal: Mostrar ventana de confirmación antes de impulsar
+ setting_boost_modal: Mostrar diálogo de confirmación antes de impulsar una publicación
setting_default_language: Idioma de publicación
setting_default_privacy: Privacidad de publicaciones
setting_default_sensitive: Marcar siempre imágenes como sensibles
@@ -339,5 +339,5 @@ es:
text: necesario
title:
sessions:
- webauthn: Utilice una de sus claves de seguridad para iniciar sesión
+ webauthn: Utiliza una de sus claves de seguridad para iniciar sesión
'yes': Sí
diff --git a/config/locales/simple_form.et.yml b/config/locales/simple_form.et.yml
index 8d045cfcfe..a2ebf63b11 100644
--- a/config/locales/simple_form.et.yml
+++ b/config/locales/simple_form.et.yml
@@ -3,7 +3,7 @@ et:
simple_form:
hints:
account:
- attribution_domains_as_text: Kaitseb valede omistuste eest.
+ attribution_domains_as_text: Üks rea peal. See kaitseb pahatahtlike viidete eest.
discoverable: Su profiili ja avalikke postitusi võidakse Mastodoni erinevates piirkondades esile tõsta või soovitada ning su profiili soovitada teistele kasutajatele.
display_name: Su täisnimi või naljanimi.
fields: Su koduleht, sugu, vanus. Mistahes, mida soovid.
@@ -144,7 +144,7 @@ et:
url: Kuhu sündmused saadetakse
labels:
account:
- attribution_domains_as_text: Luba vaid kindlad veebilehed
+ attribution_domains_as_text: Sinule viidata lubatud veebilehed
discoverable: Tõsta postitused ja profiil avastamise algoritmides esile
fields:
name: Nimetus
diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml
index 7647e187ec..f9de2de93c 100644
--- a/config/locales/simple_form.eu.yml
+++ b/config/locales/simple_form.eu.yml
@@ -3,6 +3,7 @@ eu:
simple_form:
hints:
account:
+ attribution_domains_as_text: Lerroko bat. Atribuzio faltsuetatik babesten ditu.
discoverable: Zure bidalketa publikoak eta profila nabarmendu edo gomendatu egin daitezke Mastodon-go hainbat eremutan eta zure profila beste erabiltzaile batzuei iradoki dakieke.
display_name: Zure izena edo ezizena.
fields: Zure webgunea, izenordainak, adina, nahi duzun guztia.
@@ -142,6 +143,7 @@ eu:
url: Nora bidaliko diren gertaerak
labels:
account:
+ attribution_domains_as_text: Akreditatzeko baimendutako webguneak
discoverable: Ezagutarazi profila eta bidalketak bilaketa algoritmoetan
fields:
name: Etiketa
@@ -241,11 +243,13 @@ eu:
warn: Ezkutatu ohar batekin
form_admin_settings:
activity_api_enabled: Argitaratu erabiltzaile-jardueraren guztizko estatistikak APIan
+ app_icon: Aplikazio ikonoa
backups_retention_period: Erabiltzailearen artxiboa gordetzeko epea
bootstrap_timeline_accounts: Gomendatu beti kontu hauek erabiltzaile berriei
closed_registrations_message: Izen-emateak itxita daudenerako mezu pertsonalizatua
content_cache_retention_period: Urruneko edukiaren atxikipen-aldia
custom_css: CSS pertsonalizatua
+ favicon: Gune-ikurra
mascot: Maskota pertsonalizatua (zaharkitua)
media_cache_retention_period: Multimediaren cachea atxikitzeko epea
peers_api_enabled: Argitaratu aurkitutako zerbitzarien zerrenda APIan
@@ -310,6 +314,7 @@ eu:
listable: Baimendu traola hau bilaketetan agertzea eta profilen direktorioan
name: Traola
trendable: Baimendu traola hau joeretan agertzea
+ usable: Baimendu bidalketek traola lokal hau erabiltzea
user:
role: Rola
time_zone: Ordu zona
diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml
index bbb0523b17..36eba5fcca 100644
--- a/config/locales/simple_form.fa.yml
+++ b/config/locales/simple_form.fa.yml
@@ -3,6 +3,7 @@ fa:
simple_form:
hints:
account:
+ attribution_domains_as_text: یکی در هر خط. محافظت از اعتباردهیهای اشتباه.
discoverable: ممکن است نمایه و فرستههای عمومیتان در جاهای مختلف ماستودون نمایانده و توصیه شود و نمایهتان به دیگر کاربران پیشنهاد شود.
display_name: نام کامل یا باحالتان.
fields: صفحهٔ خانگی، تلفّظ، سن و هرچیزی که دوست دارید.
@@ -39,15 +40,17 @@ fa:
text: فقط یک بار میتوانید برای اخطار درخواست تجدیدنظر کنید
defaults:
autofollow: کسانی که از راه دعوتنامه عضو میشوند به طور خودکار پیگیر شما خواهند شد
+ avatar: یکی از قالبهای WEBP، PNG، GIF یا JPG. بیشترین اندازه %{size}. تصویر به اندازهٔ %{dimensions} پیکسل تبدیل خواهد شد
bot: این حساب بیشتر به طور خودکار فعالیت میکند و نظارت پیوستهای روی آن وجود ندارد
context: یک یا چند زمینه که پالایه باید در آنها اعمال شود
current_password: به دلایل امنیتی لطفاً گذرواژه این حساب را وارد کنید
current_username: برای تأیید، لطفاً نام کاربری حساب فعلی را وارد کنید
digest: تنها وقتی فرستاده میشود که مدتی طولانی فعالیتی نداشته باشید و در این مدت برای شما پیغام خصوصیای نوشته شده باشد
- email: به شما ایمیل تأییدی فرستاده خواهد شد
+ email: تأییدیهای برایتان رایانامه خواهد شد
+ header: یکی از قالبهای WEBP، PNG، GIF یا JPG. بیشترین اندازه %{size}. تصویر به اندازهٔ %{dimensions} پیکسل تبدیل خواهد شد
inbox_url: نشانی صفحهٔ اصلی رلهای را که میخواهید به کار ببرید کپی کنید
irreversible: فرستههای پالوده به طور برگشتناپذیری ناپدید میشوند، حتا اگر بعدها پالایه برداشته شود
- locale: زبان واسط کاربری، رایانامهها و آگاهیهای ارسالی
+ locale: زبان میانای کاربری، رایانامهها و آگاهیهای ارسالی
password: دستکم باید ۸ نویسه داشته باشد
phrase: مستقل از کوچکی و بزرگی حروف، با متن اصلی یا هشدار محتوای فرستهها مقایسه میشود
scopes: واسطهای برنامهنویسی که این برنامه به آن دسترسی دارد. اگر بالاترین سطح دسترسی را انتخاب کنید، دیگر نیازی به انتخاب سطحهای پایینی ندارید.
@@ -75,10 +78,15 @@ fa:
warn: نهفتن محتوای پالوده پشت هشداری که به عنوان پالایه اشاره میکند
form_admin_settings:
activity_api_enabled: تعداد بوقهای منتشرهٔ محلی، کاربران فعال، و کاربران تازه در هر هفته
+ app_icon: WEBP، PNG، GIF یا JPG. با یک نماد سفارشی، نماد برنامه پیشفرض را در دستگاههای تلفن همراه لغو میکند.
+ backups_retention_period: کاربران می توانند بایگانی هایی از پست های خود ایجاد کنند تا بعدا دانلود کنند. وقتی روی مقدار مثبت تنظیم شود، این بایگانیها پس از تعداد روزهای مشخص شده بهطور خودکار از فضای ذخیرهسازی شما حذف میشوند.
bootstrap_timeline_accounts: سنجاق کردنThese accounts will be pinned to the top of new users' follow recommendations.
closed_registrations_message: نمایش داده هنگام بسته بودن ثبتنامها
+ content_cache_retention_period: همه پستهای سرورهای دیگر (از جمله تقویتکنندهها و پاسخها) پس از چند روز مشخص شده، بدون توجه به هرگونه تعامل کاربر محلی با آن پستها، حذف خواهند شد. این شامل پست هایی می شود که یک کاربر محلی آن را به عنوان نشانک یا موارد دلخواه علامت گذاری کرده است. ذکر خصوصی بین کاربران از نمونه های مختلف نیز از بین خواهد رفت و بازیابی آنها غیرممکن است. استفاده از این تنظیم برای موارد با هدف خاص در نظر گرفته شده است و بسیاری از انتظارات کاربر را هنگامی که برای استفاده عمومی اجرا می شود، از بین می برد.
custom_css: میتوانیدروی نگارش وب ماستودون سبکهای سفارشی اعمال کنید.
+ favicon: WEBP، PNG، GIF یا JPG. فاویکون پیشفرض ماستودون را با یک نماد سفارشی لغو میکند.
mascot: نقش میانای وب پیشرفته را پایمال میکند.
+ media_cache_retention_period: فایل های رسانه ای از پست های ارسال شده توسط کاربران راه دور در سرور شما ذخیره می شوند. وقتی روی مقدار مثبت تنظیم شود، رسانه پس از تعداد روزهای مشخص حذف می شود. اگر دادههای رسانه پس از حذف درخواست شود، در صورتی که محتوای منبع هنوز در دسترس باشد، مجدداً بارگیری میشود. با توجه به محدودیتهایی که در مورد تعداد دفعات نظرسنجی کارتهای پیشنمایش پیوند از سایتهای شخص ثالث وجود دارد، توصیه میشود این مقدار را حداقل 14 روز تنظیم کنید، در غیر این صورت کارتهای پیشنمایش پیوند قبل از آن زمان بهروزرسانی نمیشوند.
peers_api_enabled: فهرستی از نامهای دامنهای که این کارساز در فدیورس با آن مواجه شده است. هیچ اطلاعاتی در مورد اینکه آیا شما با یک کارساز داده شده متعهد هستید، در اینجا گنجانده نشده است، فقط کارساز شما در مورد آن میداند. این توسط خدماتی استفاده میشود که آمار مربوط به فدراسیون را به معنای کلی جمعآوری میکنند.
profile_directory: شاخهٔ نمایه، همهٔ کاربرانی که کشفپذیری را برگزیدهاند سیاهه میکند.
require_invite_text: زمانی که نامنویسی ها نیازمند تایید دستی است، متن «چرا میخواهید بپیوندید؟» بخش درخواست دعوت را به جای اختیاری، اجباری کنید
@@ -88,6 +96,13 @@ fa:
site_short_description: شرحی کوتاه برای کمک به شناسایی یکتای کارسازتان. چهکسی میگرداندش و برای چه کسیست؟
site_terms: از سیاست محرمانگی خوتان استفاده کرده یا برای استفاده از سیاست پیشگزیده خالی بگذارید. میتواند در قالب مارکدون باشد.
site_title: چگونه مردم ممکن است به کارساز شما علاوه بر نام دامنه آن مراجعه کنند.
+ status_page_url: نشانی وب صفحهای که در آن افراد میتوانند وضعیت این سرور را در هنگام قطع شدن ببینند
+ theme: زمینهای که بینندگان خارج شده و کاربران جدید میبینند.
+ thumbnail: یک تصویر تقریباً 2:1 در کنار اطلاعات سرور شما نمایش داده می شود.
+ timeline_preview: بازدیدکنندگانی که از سیستم خارج شده اند می توانند جدیدترین پست های عمومی موجود در سرور را مرور کنند.
+ trendable_by_default: از بررسی دستی محتوای پرطرفدار صرف نظر کنید. آیتم های فردی هنوز هم می توانند پس از واقعیت از روند حذف شوند.
+ trends: روندها نشان میدهند که کدام پستها، هشتگها و داستانهای خبری در سرور شما مورد توجه قرار گرفتهاند.
+ trends_as_landing_page: به جای توضیح این سرور، محتوای پرطرفدار را به کاربران و بازدیدکنندگان از سیستم خارج شده نشان دهید. نیاز به فعال شدن روندها دارد.
form_challenge:
current_password: شما در حال ورود به یک منطقهٔ حفاظتشده هستید
imports:
@@ -104,6 +119,7 @@ fa:
sign_up_requires_approval: ثبتنامهای جدید، نیازمند تأییدتان خواهند بود
severity: بگزنید با درخواستها از این آیپی چه شود
rule:
+ hint: اختیاری. جزئیات بیشتری در مورد قانون ارائه دهید
text: قائده یا نیازمندیهایی را برای کاربران این کارساز تشریح کنید. سعی کنید آن را ساده و کوتاه نگاه دارید
sessions:
otp: 'کد تأیید دومرحلهای که کاره روی تلفن شما ساخته را وارد کنید یا یکی از کدهای بازیابی را به کار ببرید:'
@@ -115,12 +131,21 @@ fa:
name: شما تنها میتوانید بزرگی و کوچکی حروف را تغییر دهید تا مثلاً آن را خواناتر کنید
user:
chosen_languages: اگر انتخاب کنید، تنها نوشتههایی که به زبانهای برگزیدهٔ شما نوشته شدهاند در فهرست نوشتههای عمومی نشان داده میشوند
+ role: نقش کنترل می کند که کاربر چه مجوزهایی دارد.
+ user_role:
+ color: رنگی که برای نقش در سرتاسر UI استفاده می شود، به عنوان RGB در قالب هگز
+ highlighted: این باعث می شود که نقش به طور عمومی قابل مشاهده باشد
+ name: نام عمومی نقش، اگر قرار است نقش به عنوان یک نشان نمایش داده شود
+ permissions_as_keys: کاربرانی که این نقش را دارند به...
+ position: نقش بالاتر در موقعیتهای خاص حل تعارض را تعیین میکند. برخی اقدامات را فقط می توان روی نقش هایی با اولویت کمتر انجام داد
webhook:
events: گزینش رویدادها برای فرستادن
+ template: بار JSON خود را با استفاده از درون یابی متغیر بنویسید. JSON پیش فرض را خالی بگذارید.
url: جایی که رویدادها فرستاده میشوند
labels:
account:
- discoverable: معرّفی نمایه و فرستهها در الگوریتمهای کشف
+ attribution_domains_as_text: پابگاههای وبی که اجازهٔ اعتبار دهی به شما را دارند
+ discoverable: مشخص کردن مشخصات و فرستهها در الگوریتمهای اکتشاف
fields:
name: برچسب
value: محتوا
@@ -135,8 +160,8 @@ fa:
text: متن از پیش آمادهشده
title: عنوان
admin_account_action:
- include_statuses: فرستههای گزارششده را در ایمیل بگنجان
- send_email_notification: اطلاعرسانی به کاربر از راه ایمیل
+ include_statuses: قرار دادن فرستههای گزارش شده در رایانامه
+ send_email_notification: آگاهی کاربر به ازای هر رایانامه
text: هشدار موردی
type: کنش
types:
@@ -165,7 +190,7 @@ fa:
current_password: گذرواژه کنونی
data: دادهها
display_name: نمایش به نام
- email: نشانی ایمیل
+ email: نشانی رایانامه
expires_in: تاریخ انقضا
fields: اطلاعات تکمیلی نمایه
header: تصویر زمینه
@@ -207,8 +232,8 @@ fa:
sign_in_token_attempt: کد امنیتی
title: عنوان
type: نوع درونریزی
- username: نام کاربری (لاتین)
- username_or_email: نام کاربری یا ایمیل
+ username: نام کاربری
+ username_or_email: نام کاربری یا رایانامه
whole_word: تطابق واژهٔ کامل
email_domain_block:
with_dns_records: شامل رکوردهای MX وIPهای دامنه
@@ -224,7 +249,9 @@ fa:
backups_retention_period: دورهٔ نگهداری بایگانی کاربری
bootstrap_timeline_accounts: پیشنهاد همیشگی این حسابها به کاربران جدید
closed_registrations_message: پیام سفارشی هنگام در دسترس نبودن ثبتنامها
+ content_cache_retention_period: دوره نگهداری محتوا از راه دور
custom_css: سبک CSS سفارشی
+ favicon: نمادک
mascot: نشان سفارشی (قدیمی)
media_cache_retention_period: دورهٔ نگهداری انبارهٔ رسانه
peers_api_enabled: انتشار سیاههٔ کارسازهای کشف شده در API
@@ -265,12 +292,12 @@ fa:
notification_emails:
appeal: شخصی به تصمیم مدیر اعتراض کرد
digest: فرستادن رایانامههای خلاصه
- favourite: وقتی کسی نوشتهٔ شما را پسندید ایمیل بفرست
- follow: وقتی کسی پیگیر شما شد ایمیل بفرست
- follow_request: وقتی کسی درخواست پیگیری کرد ایمیل بفرست
- mention: وقتی کسی از شما نام برد ایمیل بفرست
- pending_account: وقتی حساب تازهای نیاز به بازبینی داشت ایمیل بفرست
- reblog: وقتی کسی فرستهٔ شما را تقویت کرد ایمیل بفرست
+ favourite: شخصی فرستهتان را برگزید
+ follow: شخصی پیتان گرفت
+ follow_request: شخصی خواست پیتان بگیرد
+ mention: شخصی از شما نام برد
+ pending_account: حساب تازهٔ نیازمند بررسی
+ reblog: شخصی فرستهتان را تقویت کرد
report: گزارش جدیدی فرستاده شد
software_updates:
all: آگاهی برای همهٔ بهروز رسانیها
@@ -301,6 +328,7 @@ fa:
position: اولویت
webhook:
events: رویدادهای به کار افتاده
+ template: قالب بار
url: نشانی نقطهٔ پایانی
'no': خیر
not_recommended: پیشنهاد نشده
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index 5c85367dbb..a9e77b6cac 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -3,13 +3,13 @@ fi:
simple_form:
hints:
account:
- attribution_domains_as_text: Suojaa vääriltä tunnustuksilta.
+ attribution_domains_as_text: Yksi riviä kohti. Suojaa vääriltä tekijän nimeämisiltä.
discoverable: Julkisia julkaisujasi ja profiiliasi voidaan pitää esillä tai suositella Mastodonin eri alueilla ja profiiliasi voidaan ehdottaa toisille käyttäjille.
display_name: Koko nimesi tai lempinimesi.
fields: Verkkosivustosi, pronominisi, ikäsi ja mitä ikinä haluatkaan ilmoittaa.
indexable: Julkiset julkaisusi voivat näkyä Mastodonin hakutuloksissa. Käyttäjät, jotka ovat olleet vuorovaikutuksessa julkaisujesi kanssa, voivat etsiä niitä asetuksesta riippumatta.
note: 'Voit @mainita muita käyttäjiä tai #aihetunnisteita.'
- show_collections: Käyttäjät voivat selata seurattujasi ja seuraajiasi. Käyttäjät, joita seuraat, näkevät joka tapauksessa, että seuraat heitä.
+ show_collections: Käyttäjät voivat selata seurattaviasi ja seuraajiasi. Käyttäjät, joita seuraat, näkevät joka tapauksessa, että seuraat heitä.
unlocked: Käyttäjät voivat seurata sinua pyytämättä hyväksyntääsi. Poista valinta, jos haluat tarkistaa sekä hyväksyä tai hylätä vastaanottamasi seurantapyynnöt.
account_alias:
acct: Määrittele sen tilin käyttäjänimi@verkkotunnus, josta haluat muuttaa
@@ -144,13 +144,13 @@ fi:
url: Mihin tapahtumat lähetetään
labels:
account:
- attribution_domains_as_text: Salli vain tietyt verkkosivustot
+ attribution_domains_as_text: Verkkosivustot, jotka voivat antaa sinulle tunnustusta
discoverable: Pidä profiiliasi ja julkaisujasi esillä löytämisalgoritmeissa
fields:
name: Nimike
value: Sisältö
indexable: Sisällytä julkiset julkaisut hakutuloksiin
- show_collections: Näytä seuratut ja seuraajat profiilissa
+ show_collections: Näytä seurattavat ja seuraajat profiilissa
unlocked: Hyväksy uudet seuraajat automaattisesti
account_alias:
acct: Vanhan tilin käyttäjätunnus
diff --git a/config/locales/simple_form.fo.yml b/config/locales/simple_form.fo.yml
index afcd3b39ac..e45183df99 100644
--- a/config/locales/simple_form.fo.yml
+++ b/config/locales/simple_form.fo.yml
@@ -3,7 +3,7 @@ fo:
simple_form:
hints:
account:
- attribution_domains_as_text: Verjir fyri følskum ískoytum.
+ attribution_domains_as_text: Eitt á hvørja reglu. Tað verjir fyri skeivum tilsipingum.
discoverable: Tínir almennu postar og tín vangi kunnu vera drigin fram og viðmæld ymsa staðni í Mastodon og vangin hjá tær kann vera viðmæltur øðrum brúkarum.
display_name: Títt fulla navn og títt stuttliga navn.
fields: Heimasíðan hjá tær, fornøvn, aldur ella hvat tú vil.
@@ -144,7 +144,7 @@ fo:
url: Hvar hendingar verða sendar til
labels:
account:
- attribution_domains_as_text: Loyv einans ávísum heimasíðum
+ attribution_domains_as_text: Heimasíður, sum hava loyvi at sipa til tín
discoverable: Framheva vanga og postar í uppdagingar-algoritmum
fields:
name: Spjaldur
diff --git a/config/locales/simple_form.fr-CA.yml b/config/locales/simple_form.fr-CA.yml
index 90a268f411..fe8043a64a 100644
--- a/config/locales/simple_form.fr-CA.yml
+++ b/config/locales/simple_form.fr-CA.yml
@@ -3,7 +3,7 @@ fr-CA:
simple_form:
hints:
account:
- attribution_domains_as_text: Protège contre les fausses attributions.
+ attribution_domains_as_text: Un par ligne. Protège contre les fausses attributions.
discoverable: Vos messages publics et votre profil peuvent être mis en avant ou recommandés dans diverses parties de Mastodon et votre profil peut être suggéré à d’autres utilisateurs.
display_name: Votre nom complet ou votre nom cool.
fields: Votre page d'accueil, pronoms, âge, tout ce que vous voulez.
@@ -144,7 +144,7 @@ fr-CA:
url: Là où les événements seront envoyés
labels:
account:
- attribution_domains_as_text: Autoriser uniquement des sites Web spécifiques
+ attribution_domains_as_text: Sites web autorisés à vous citer
discoverable: Autoriser des algorithmes de découverte à mettre en avant votre profil et vos messages
fields:
name: Étiquette
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index 370f5c1e46..f300f294e7 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -3,7 +3,7 @@ fr:
simple_form:
hints:
account:
- attribution_domains_as_text: Protège contre les fausses attributions.
+ attribution_domains_as_text: Un par ligne. Protège contre les fausses attributions.
discoverable: Vos messages publics et votre profil peuvent être mis en avant ou recommandés dans diverses parties de Mastodon et votre profil peut être suggéré à d’autres utilisateurs.
display_name: Votre nom complet ou votre nom rigolo.
fields: Votre page personnelle, vos pronoms, votre âge, ce que vous voulez.
@@ -21,7 +21,7 @@ fr:
admin_account_action:
include_statuses: L’utilisateur·rice verra quels messages sont la source de l’action de modération ou de l’avertissement
send_email_notification: L’utilisateur recevra une explication de ce qu’il s’est passé avec son compte
- text_html: Facultatif. Vous pouvez utiliser la syntaxe des publications. Vous pouvez ajouter des présélections d'attention pour gagner du temps
+ text_html: Facultatif. Vous pouvez utiliser la syntaxe des messages. Vous pouvez ajouter des avertissements préconfigurés pour gagner du temps
type_html: Choisir que faire avec %{acct}
types:
disable: Empêcher l’utilisateur·rice d’utiliser son compte, mais ne pas supprimer ou masquer son contenu.
@@ -43,7 +43,7 @@ fr:
avatar: WEBP, PNG, GIF ou JPG. Au plus %{size}. Sera réduit à %{dimensions}px
bot: Signale aux autres que ce compte exécute principalement des actions automatisées et pourrait ne pas être surveillé
context: Un ou plusieurs contextes où le filtre devrait s’appliquer
- current_password: Par mesure de sécurité, veuillez saisir le mot de passe de ce compte
+ current_password: Par mesure de sécurité, veuillez saisir le mot de passe du compte actuel
current_username: Pour confirmer, veuillez saisir l’identifiant de ce compte
digest: Uniquement envoyé après une longue période d’inactivité en cas de messages personnels reçus pendant votre absence
email: Vous recevrez un courriel de confirmation
@@ -101,7 +101,7 @@ fr:
thumbnail: Une image d'environ 2:1 affichée à côté des informations de votre serveur.
timeline_preview: Les utilisateur⋅rice⋅s déconnecté⋅e⋅s pourront parcourir les derniers messages publics disponibles sur le serveur.
trendable_by_default: Ignorer l'examen manuel du contenu tendance. Des éléments individuels peuvent toujours être supprimés des tendances après coup.
- trends: Les tendances montrent quelles publications, hashtags et actualités gagnent en ampleur sur votre serveur.
+ trends: Les tendances montrent quels messages, hashtags et actualités gagnent en popularité sur votre serveur.
trends_as_landing_page: Afficher le contenu tendance au lieu d'une description de ce serveur pour les comptes déconnectés et les non-inscrit⋅e⋅s. Nécessite que les tendances soient activées.
form_challenge:
current_password: Vous entrez une zone sécurisée
@@ -144,7 +144,7 @@ fr:
url: Là où les événements seront envoyés
labels:
account:
- attribution_domains_as_text: Autoriser uniquement des sites Web spécifiques
+ attribution_domains_as_text: Sites web autorisés à vous citer
discoverable: Autoriser des algorithmes de découverte à mettre en avant votre profil et vos messages
fields:
name: Étiquette
@@ -162,7 +162,7 @@ fr:
admin_account_action:
include_statuses: Inclure les messages signalés dans le courriel
send_email_notification: Notifier l’utilisateur par courriel
- text: Attention personnalisée
+ text: Avertissement personnalisé
type: Action
types:
disable: Désactiver
diff --git a/config/locales/simple_form.fy.yml b/config/locales/simple_form.fy.yml
index e7deca9460..c840342db5 100644
--- a/config/locales/simple_form.fy.yml
+++ b/config/locales/simple_form.fy.yml
@@ -3,6 +3,7 @@ fy:
simple_form:
hints:
account:
+ attribution_domains_as_text: Ien per rigel. Beskermet tsjin falske attribúsjes.
discoverable: Jo iepenbiere berjochten kinne útljochte wurde op ferskate plakken binnen Mastodon en jo account kin oanrekommandearre wurde oan oare brûkers.
display_name: Jo folsleine namme of in aardige bynamme.
fields: Jo website, persoanlike foarnammewurden, leeftiid, alles wat jo mar kwyt wolle.
@@ -130,6 +131,7 @@ fy:
name: Jo kinne elk wurd mei in haadletter begjinne, om sa bygelyks de tekst mear lêsber te meitsjen
user:
chosen_languages: Allinnich berjochten yn de selektearre talen wurde op de iepenbiere tiidline toand
+ role: De rol bepaalt hokker rjochten in brûker hat.
user_role:
color: Kleur dy’t brûkt wurdt foar de rol yn de UI, as RGB yn heksadesimaal formaat
highlighted: Dit makket de rol iepenbier sichtber
@@ -142,6 +144,7 @@ fy:
url: Wêr’t eveneminten nei ta stjoerd wurde
labels:
account:
+ attribution_domains_as_text: Websites dy’t jo wurdearring jaan meie
discoverable: Profyl en bydragen yn sykalgoritmen opnimme litte
fields:
name: Label
diff --git a/config/locales/simple_form.ga.yml b/config/locales/simple_form.ga.yml
index 772f996ca6..f8257a9da9 100644
--- a/config/locales/simple_form.ga.yml
+++ b/config/locales/simple_form.ga.yml
@@ -3,7 +3,7 @@ ga:
simple_form:
hints:
account:
- attribution_domains_as_text: Cosnaíonn sé ó sannadh bréagach.
+ attribution_domains_as_text: Ceann in aghaidh an líne. Cosnaíonn sé ó sannadh bréagach.
discoverable: Seans go mbeidh do phostálacha poiblí agus do phróifíl le feiceáil nó molta i réimsí éagsúla de Mastodon agus is féidir do phróifíl a mholadh d’úsáideoirí eile.
display_name: D'ainm iomlán nó d'ainm spraoi.
fields: Do leathanach baile, forainmneacha, aois, rud ar bith is mian leat.
@@ -144,7 +144,7 @@ ga:
url: An áit a seolfar imeachtaí chuig
labels:
account:
- attribution_domains_as_text: Ná ceadaigh ach láithreáin ghréasáin ar leith
+ attribution_domains_as_text: Tá cead ag suíomhanna Gréasáin creidmheas a thabhairt duit
discoverable: Próifíl gné agus postálacha in halgartaim fionnachtana
fields:
name: Lipéad
diff --git a/config/locales/simple_form.gd.yml b/config/locales/simple_form.gd.yml
index de585c7a21..af1f06a316 100644
--- a/config/locales/simple_form.gd.yml
+++ b/config/locales/simple_form.gd.yml
@@ -3,7 +3,7 @@ gd:
simple_form:
hints:
account:
- attribution_domains_as_text: Dìonadh seo o bhuaidh-aithrisean cearra.
+ attribution_domains_as_text: Loidhne fa leth do gach fear. Dìonaidh seo o iomraidhean meallta.
discoverable: Dh’fhaoidte gun dèid na postaichean poblach ’s a’ phròifil agad a bhrosnachadh no a mholadh ann an caochladh roinnean de Mhastodon agus gun dèid a’ phròifil agad a mholadh do chàch.
display_name: D’ ainm slàn no spòrsail.
fields: An duilleag-dhachaigh agad, roimhearan, aois, rud sam bith a thogras tu.
@@ -144,7 +144,7 @@ gd:
url: Far an dèid na tachartasan a chur
labels:
account:
- attribution_domains_as_text: Na ceadaich ach làraichean-lìnn sònraichte
+ attribution_domains_as_text: Na làraichean-lìn a dh’fhaodas iomradh a thoirt ort
discoverable: Brosnaich a’ phròifil is postaichean agad sna h-algairimean rùrachaidh
fields:
name: Leubail
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index cddeae5cee..c4f9bffa7a 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -3,7 +3,7 @@ gl:
simple_form:
hints:
account:
- attribution_domains_as_text: Protéxete de falsas atribucións.
+ attribution_domains_as_text: Un por liña. Protéxete das atribucións falsas.
discoverable: As túas publicacións públicas e perfil poden mostrarse ou recomendarse en varias zonas de Mastodon e o teu perfil ser suxerido a outras usuarias.
display_name: O teu nome completo ou un nome divertido.
fields: Páxina web, pronome, idade, o que ti queiras.
@@ -144,7 +144,7 @@ gl:
url: A onde se enviarán os eventos
labels:
account:
- attribution_domains_as_text: Permitir só os sitios web indicados
+ attribution_domains_as_text: Sitios web que poden acreditarte
discoverable: Perfil destacado e publicacións nos algoritmos de descubrimento
fields:
name: Etiqueta
@@ -190,7 +190,7 @@ gl:
current_password: Contrasinal actual
data: Datos
display_name: Nome mostrado
- email: Enderezo de email
+ email: Enderezo de correo
expires_in: Caduca tras
fields: Metadatos do perfil
header: Cabeceira
@@ -267,7 +267,7 @@ gl:
site_terms: Política de Privacidade
site_title: Nome do servidor
status_page_url: URL da páxina do estado
- theme: Decorado por defecto
+ theme: Decorado predeterminado
thumbnail: Icona do servidor
timeline_preview: Permitir acceso á cronoloxía pública sen autenticación
trendable_by_default: Permitir tendencias sen aprobación previa
diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml
index 1feebb0d69..d8d6af5e99 100644
--- a/config/locales/simple_form.he.yml
+++ b/config/locales/simple_form.he.yml
@@ -3,7 +3,7 @@ he:
simple_form:
hints:
account:
- attribution_domains_as_text: הגנה מייחוסים שקריים.
+ attribution_domains_as_text: אחד בכל שורה. יגן מפני יחוס מטעה.
discoverable: הפוסטים והפרופיל שלך עשויים להיות מוצגים או מומלצים באזורים שונים באתר וייתכן שהפרופיל שלך יוצע למשתמשים אחרים.
display_name: שמך המלא או שם הכיף שלך.
fields: עמוד הבית שלך, לשון הפנייה, גיל, וכל מידע אחר לפי העדפתך האישית.
@@ -144,7 +144,7 @@ he:
url: היעד שאליו יישלחו אירועים
labels:
account:
- attribution_domains_as_text: רק אתרים מסויימים יאושרו
+ attribution_domains_as_text: אתרים המורשים לייחס אליך מאמרים
discoverable: הצג משתמש ופוסטים בעמוד התגליות
fields:
name: תווית
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index 383bdd0760..60922b06b5 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -48,7 +48,7 @@ hu:
digest: Csak hosszú távollét esetén küldődik és csak ha személyes üzenetet kaptál távollétedben
email: Kapsz egy megerősítő e-mailt
header: WEBP, PNG, GIF vagy JPG. Legfeljebb %{size}. Át lesz méretezve %{dimensions} képpontosra.
- inbox_url: Másold ki a használandó relé szerver kezdőoldalának URL-jét
+ inbox_url: Másold ki a használandó továbbító kiszolgáló kezdőoldalának URL-jét
irreversible: A kiszűrt bejegyzések visszafordíthatatlanul eltűnnek, a szűrő későbbi törlése esetén is
locale: A felhasználói felület, e-mailek, push üzenetek nyelve
password: Legalább 8 karakter
@@ -144,7 +144,7 @@ hu:
url: Ahová az eseményket küldjük
labels:
account:
- attribution_domains_as_text: Csak meghatározott weboldalak engedélyezése
+ attribution_domains_as_text: Weboldalak, melyek szerzőként tüntethetnek fel
discoverable: Profil és bejegyzések szerepeltetése a felfedezési algoritmusokban
fields:
name: Címke
@@ -195,7 +195,7 @@ hu:
fields: Profil metaadatai
header: Fejléc
honeypot: "%{label} (ne töltsd ki)"
- inbox_url: Relé inbox-hoz tartozó URL
+ inbox_url: Továbbító inbox-hoz tartozó URL
irreversible: Eldobás elrejtés helyett
locale: Felhasználói felület nyelve
max_uses: Hányszor használható
diff --git a/config/locales/simple_form.ia.yml b/config/locales/simple_form.ia.yml
index dc5aad57ae..e7da9b1051 100644
--- a/config/locales/simple_form.ia.yml
+++ b/config/locales/simple_form.ia.yml
@@ -3,6 +3,7 @@ ia:
simple_form:
hints:
account:
+ attribution_domains_as_text: Un per linea. Protege contra false attributiones.
discoverable: Tu messages public e tu profilo pote esser mittite in evidentia o recommendate in varie areas de Mastodon e tu profilo pote esser suggerite a altere usatores.
display_name: Tu prenomine e nomine de familia o tu pseudonymo.
fields: Tu pagina principal, pronomines, etate, tote lo que tu vole.
@@ -39,35 +40,35 @@ ia:
text: Tu pote solo appellar contra un sanction un vice
defaults:
autofollow: Le personas qui se inscribe per medio del invitation te sequera automaticamente
- avatar: WEBP, PNG, GIF or JPG. Al maximo %{size}. Sera diminuite a %{dimensions}px
+ avatar: WEBP, PNG, GIF o JPG. Al maximo %{size}. Sera reducite a %{dimensions}px
bot: Signala a alteres que le conto principalmente exeque actiones automatisate e poterea non esser surveliate
context: Un o plure contextos ubi le filtro deberea applicar se
current_password: Pro propositos de securitate insere le contrasigno del conto actual
current_username: Pro confirmar, insere le nomine de usator del conto actual
digest: Solo inviate post un longe periodo de inactivitate e solo si tu ha recipite alcun messages personal in tu absentia
- email: Te sera inviate un email de confirmation
- header: WEBP, PNG, GIF or JPG. Al maximo %{size}. Sera diminuite a %{dimensions}px
+ email: Tu recipera un e-mail de confirmation
+ header: WEBP, PNG, GIF o JPG. Al maximo %{size}. Essera reducite a %{dimensions}px
inbox_url: Copia le URL ab le pagina principal del repetitor que tu vole usar
- irreversible: Le messages filtrate disparera irreversibilemente, mesmo si le filtro es plus tarde removite
+ irreversible: Le messages filtrate disparera irreversibilemente, mesmo si le filtro es removite plus tarde
locale: Le lingua del interfacie de usator, del emails e del notificationes pulsate
password: Usa al minus 8 characteres
- phrase: Sera concordate ignorante majuscule/minuscule in le texto o avisos de contento de un message
- scopes: A que APIs sera permittite acceder al application. Si tu selige un ambito de maxime nivello, tu non besonia de seliger los singulemente.
+ phrase: Se applicara independentemente de majusculas/minusculas in le texto o del aviso de contento de un message
+ scopes: Le APIs al quales le application habera accesso. Si tu selige un ambito de nivello superior, non es necessari seliger ambitos individual.
setting_aggregate_reblogs: Non monstrar nove impulsos pro messages que ha essite recentemente impulsate (affecta solmente le impulsos novemente recipite)
- setting_always_send_emails: Normalmente le avisos de email non sera inviate quando tu activemente usa Mastodon
+ setting_always_send_emails: Normalmente, le notificationes de e-mail non es inviate quando tu activemente usa Mastodon
setting_default_sensitive: Le medios sensibile es celate de ordinario e pote esser revelate con un clic
setting_display_media_default: Celar le medios marcate como sensibile
- setting_display_media_hide_all: Sempre celar le medios
- setting_display_media_show_all: Sempre monstrar le medios
- setting_use_blurhash: Le imagines degradate es basate sur le colores del medios visual celate, ma illos offusca qualcunque detalios
- setting_use_pending_items: Celar le classification temporal detra un clic in vice que automaticamente rolante le fluxo
+ setting_display_media_hide_all: Sempre celar contento multimedial
+ setting_display_media_show_all: Sempre monstrar contento multimedial
+ setting_use_blurhash: Le imagines degradate se basa sur le colores del visuales celate, ma illos offusca tote le detalios
+ setting_use_pending_items: Requirer un clic pro monstrar nove messages in vice de rolar automaticamente le fluxo
username: Tu pote usar litteras, numeros e tractos de sublineamento
- whole_word: Quando le parola o expression clave es solo alphanumeric, illo sera solo applicate si illo concorda con tote le parola
+ whole_word: Quando le parola-clave o phrase es alphanumeric, illo essera solmente applicate si illo corresponde a tote le parola
domain_allow:
domain: Iste dominio potera extraher datos de iste servitor e le datos entrante de illo essera processate e immagazinate
email_domain_block:
- domain: Isto pote esser le nomine de dominio que apparera in le adresse email o le registration MX que illo usa. Illos sera verificate durante le inscription.
- with_dns_records: Un tentativa sera facite pro resolver le registrationes de DNS del dominio date e le resultatos sera alsi blocate
+ domain: Isto pote esser le nomine de dominio que apparera in le adresse de e-mail o le registro MX que illo usa. Illos essera verificate durante le inscription.
+ with_dns_records: Un tentativa de resolver le registros DNS del dominio date essera facite e le resultatos essera equalmente blocate
featured_tag:
name: 'Ecce alcun del hashtags que tu usava le plus recentemente:'
filters:
@@ -78,16 +79,16 @@ ia:
form_admin_settings:
activity_api_enabled: Numeros de messages localmente publicate, usatores active, e nove registrationes in gruppos septimanal
app_icon: WEBP, PNG, GIF o JPG. Supplanta le icone predefinite sur apparatos mobile con un icone personalisate.
- backups_retention_period: Le usatores pote generar archivos de lor messages pro discargar los plus tarde. Quando predefinite a un valor positive, iste archivos sera automaticamente delite de tu immagazinage post le specificate numero de dies.
- bootstrap_timeline_accounts: Iste contos sera appunctate al summitate del recommendationes a sequer del nove usatores.
+ backups_retention_period: Le usatores pote generar archivos de lor messages pro discargar los plus tarde. Si iste option es definite a un valor positive, iste archivos essera automaticamente delite de tu immagazinage post le numero specificate de dies.
+ bootstrap_timeline_accounts: Iste contos essera fixate al initio del recommendationes de sequimento de nove usatores.
closed_registrations_message: Monstrate quando le inscriptiones es claudite
content_cache_retention_period: Tote le messages de altere servitores (includite impulsos e responsas) essera delite post le numero de dies specificate, independentemente de tote interaction de usatores local con ille messages. Isto include le messages addite al marcapaginas o marcate como favorite per un usator local. Le mentiones private inter usatores de differente instantias tamben essera irrecuperabilemente perdite. Le uso de iste parametro es intendite pro instantias con scopos specific e viola multe expectationes de usatores si es implementate pro uso general.
custom_css: Tu pote applicar stilos personalisate sur le version de web de Mastodon.
favicon: WEBP, PNG, GIF o JPG. Supplanta le favicone predefinite de Mastodon con un icone personalisate.
mascot: Illo substitue le illustration in le interfacie web avantiate.
- media_cache_retention_period: Le files multimedial de messages producite per usatores remote es in cache sur tu servitor. Quando predefinite a un valor positive, le medios sera delite post le numero de dies specificate. Le datos multimedial requirite post que illo es delite, sera re-discargate, si le contento original sera ancora disponibile. Per limitationes sur le frequentia con que le schedas de pre-visualisation de ligamine scruta le sitos de tertie partes, il es recommendate de predefinir iste valor a al minus 14 dies, o le schedas de pre-visualisation de ligamine non sera actualisate sur demanda ante ille tempore.
- peers_api_enabled: Un lista de nomines de dominio que iste servitor ha incontrate in le fediverso. Nulle datos es includite ci re tu federation con un date servitor, justo que tu servitor lo cognosce. Isto es usate per servicios que collige statistica re le federation in senso general.
- profile_directory: Le directorio de profilo lista tote le usatores qui ha optate pro esser detectabile.
+ media_cache_retention_period: Le files multimedial de messages producite per usatores distante se immagazina in cache sur tu servitor. Quando iste option es definite a un valor positive, tal files essera delite post le numero specificate de dies. Si alcuno requesta le datos multimedial post lor deletion, illos essera re-discargate si le contento original es ancora disponibile. Debite a limitationes sur le frequentia con que le cartas de previsualisation de ligamines se connecte al sitos de tertios, il es recommendate definir iste valor a al minus 14 dies, alteremente le previsualisationes de ligamines non essera actualisate sur demanda ante ille tempore.
+ peers_api_enabled: Un lista de nomines de dominio que iste servitor ha incontrate in le fediverso. Iste datos non indica si tu es in federation con un servitor date, ma solmente que tu servitor lo cognosce. Isto es usate per servicios que collige statisticas general sur le federation.
+ profile_directory: Le directorio de profilos lista tote le usatores que ha optate pro esser discoperibile.
require_invite_text: Quando le inscriptiones require approbation manual, rende obligatori, plus tosto que optional, le entrata de texto “Perque vole tu junger te?”
site_contact_email: Como pote contactar te le personas pro questiones legal o de supporto.
site_contact_username: Como pote contactar te le personas re Mastodon.
@@ -97,8 +98,8 @@ ia:
site_title: Como le personas pote referer se a tu servitor in addition su nomine de dominio.
status_page_url: URL de un pagina ubi le personas pote vider le stato de iste servitor durante un interruption
theme: Thema que le visitatores disconnexe e le nove usatores vide.
- thumbnail: Un imagine approximativemente 2:1 monstrate al latere del informationes de tu servitor.
- timeline_preview: Le visitatores disconnexe potera navigar per le plus recente messages public disponibile sur le servitor.
+ thumbnail: Un imagine de circa 2:1 monstrate al latere del informationes de tu servitor.
+ timeline_preview: Le visitatores foras de session potera percurrer le messages public le plus recente disponibile sur le servitor.
trendable_by_default: Saltar le revision manual del contento de tendentia. Elementos singule pote ancora esser removite de tendentias post le facto.
trends: Tendentias monstra que messages, hashtags e novas gania traction sur tu servitor.
trends_as_landing_page: Monstrar contento de tendentia a usatores disconnexe e visitatores in vice que un description de iste servitor. Require tendentias esser activate.
@@ -114,7 +115,7 @@ ia:
ip: Inserer un adresse IPv4 o IPv6. Tu pote blocar campos integre per le syntaxe CIDR. Sia attente pro non disconnecter te!
severities:
no_access: Blocar accesso a tote le ressources
- sign_up_block: Nove inscriptiones non sera possibile
+ sign_up_block: Nove inscriptiones non essera possibile
sign_up_requires_approval: Nove inscriptiones requirera tu approbation
severity: Seliger que evenira con requestas ab iste IP
rule:
@@ -129,7 +130,8 @@ ia:
tag:
name: Tu pote solmente cambiar le litteras inter majusculas e minusculas, per exemplo, pro render lo plus legibile
user:
- chosen_languages: Si marcate, solo le messages in le linguas seligite sera monstrate in chronologias public
+ chosen_languages: Si marcate, solmente le messages in le linguas seligite apparera in chronologias public
+ role: Le rolo controla qual permissos le usator ha.
user_role:
color: Color a esser usate pro le rolo in omne parte del UI, como RGB in formato hexadecimal
highlighted: Iste rende le rolo publicamente visibile
@@ -139,10 +141,10 @@ ia:
webhook:
events: Selige le eventos a inviar
template: Compone tu proprie carga utile JSON per interpolation de variabile. Lassar blanc pro JSON predefinite.
- url: Ubi le eventos essera inviate
+ url: A ubi le eventos essera inviate
labels:
account:
- attribution_domains_as_text: Solmente permitter sitos web specific
+ attribution_domains_as_text: Sitos web autorisate a accreditar te
discoverable: Evidentiar le profilo e messages in le algorithmos de discoperta
fields:
name: Etiquetta
@@ -179,7 +181,7 @@ ia:
text: Explicar perque iste decision deberea esser revertite
defaults:
autofollow: Invitar a sequer tu conto
- avatar: Pictura de profilo
+ avatar: Imagine de profilo
bot: Isto es un conto automatisate
chosen_languages: Filtrar linguas
confirm_new_password: Confirmar nove contrasigno
@@ -191,14 +193,14 @@ ia:
email: Adresse de e-mail
expires_in: Expira post
fields: Campos extra
- header: Imagine titulo
+ header: Imagine de titulo
honeypot: "%{label} (non compilar)"
inbox_url: URL del cassa de ingresso de repetitor
irreversible: Declinar in vice que celar
locale: Lingua de interfacie
max_uses: Numero max de usos
new_password: Nove contrasigno
- note: Bio
+ note: Biographia
otp_attempt: Codice a duo factores
password: Contrasigno
phrase: Parola o phrase clave
@@ -211,6 +213,7 @@ ia:
setting_default_privacy: Confidentialitate del messages
setting_default_sensitive: Sempre marcar le medios cmo sensbile
setting_delete_modal: Monstrar le dialogo de confirmation ante deler un message
+ setting_disable_hover_cards: Disactivar le previsualisation de profilos al passar del mus
setting_disable_swiping: Disactivar le movimentos per glissamento
setting_display_media: Visualisation de medios
setting_display_media_default: Predefinite
@@ -256,7 +259,7 @@ ia:
registrations_mode: Qui pote inscriber se
require_invite_text: Requirer un ration pro junger se
show_domain_blocks: Monstrar le blocadas de dominio
- show_domain_blocks_rationale: Monstrar perque le dominios era blocate
+ show_domain_blocks_rationale: Monstrar proque le dominios ha essite blocate
site_contact_email: Adresse de e-mail de contacto
site_contact_username: Nomine de usator de contacto
site_extended_description: Description extense
@@ -272,8 +275,8 @@ ia:
trends_as_landing_page: Usar tendentias como pagina de destination
interactions:
must_be_follower: Blocar notificationes de personas qui non te seque
- must_be_following: Blocar notificationes de gente que tu non sequer
- must_be_following_dm: Blocar messages directe de gente que tu non seque
+ must_be_following: Blocar notificationes de personas que tu non seque
+ must_be_following_dm: Blocar messages directe de personas que tu non seque
invite:
comment: Commento
invite_request:
@@ -287,12 +290,12 @@ ia:
sign_up_requires_approval: Limitar inscriptiones
severity: Regula
notification_emails:
- appeal: Alcuno appella un decision de moderator
+ appeal: Alcuno appella contra un decision de moderator
digest: Inviar emails compendio
- favourite: Alcuno appreciava tu message
- follow: Alcuno te sequeva
- follow_request: Alcuno requireva de sequer te
- mention: Alcuno te mentionava
+ favourite: Alcuno ha appreciate tu message
+ follow: Alcuno ha comenciate a sequer te
+ follow_request: Alcuno ha demandate de sequer te
+ mention: Alcuno te ha mentionate
pending_account: Nove conto besonia de revision
reblog: Alcuno ha impulsate tu message
report: Un nove reporto es inviate
@@ -308,7 +311,7 @@ ia:
text: Regula
settings:
indexable: Includer pagina de profilo in le motores de recerca
- show_application: Monstrar ab que app tu ha inviate un message
+ show_application: Monstrar desde qual app tu ha inviate un message
tag:
listable: Permitter a iste hashtag apparer in le recercas e suggestiones
name: Hashtag
diff --git a/config/locales/simple_form.ig.yml b/config/locales/simple_form.ig.yml
index 7c264f0d73..e88d195b8a 100644
--- a/config/locales/simple_form.ig.yml
+++ b/config/locales/simple_form.ig.yml
@@ -1 +1,8 @@
+---
ig:
+ simple_form:
+ labels:
+ defaults:
+ avatar: Foto profaịlụ
+ chosen_languages: Myọcha asụsụ
+ context: Myọcha ọnọdụ
diff --git a/config/locales/simple_form.io.yml b/config/locales/simple_form.io.yml
index 5cbbd9d06e..2caa1a6349 100644
--- a/config/locales/simple_form.io.yml
+++ b/config/locales/simple_form.io.yml
@@ -3,7 +3,7 @@ io:
simple_form:
hints:
account:
- attribution_domains_as_text: Protektas de falsa akreditaji.
+ attribution_domains_as_text: Un en singla lineo.
discoverable: Vua publika posti e profilo povas remarkesar o rekomendesar en diferanta parti di Mastodon e vua profilo povas sugestesar ad altra uzanti.
display_name: Vua tota nomo o vua gaya nomo.
fields: Vua retsituo, pronomi, evo, irgo quan vu volas.
@@ -21,15 +21,15 @@ io:
admin_account_action:
include_statuses: Uzanto vidos quala posti quo kauzigas jero o averto
send_email_notification: Uzanto ganos expliko pri quo eventas a olia konto
- text_html: Neobligata. Vu povas uzar postosintaxo. Vu povas insertar avertofixiti por sparar tempo
+ text_html: Nemustiga. Vu povas adjuntar avertselektaji por sparar tempo
type_html: Selektez ago per %{acct}
types:
disable: Preventez uzanto de uzar olia konto ma ne efacez o celez olia kontenaji.
none: Uzez co por sendar averto a la uzanto sen eventigar irga altra ago.
- sensitive: Koaktez omna mediiatachaji da ca uzanto markizesar quale sentoza.
+ sensitive: Igar omna audvidajaddonaji da ca uzanto markesar quale trublema.
silence: Preventez la uzanto de povar postar per publika videbleso, celez lua posti e avizi de personi qui ne sequas lu. Co klozas omna raporto kontra ca konto.
suspend: Preventez irga interago de o a ca konto e efacez lua kontenaji. Inversebla til 30 dii. Co klozas omna raporti kontra ca konto.
- warning_preset_id: Neobligata. Vu povas ankore insertar kustume texto a extremajo di fixito
+ warning_preset_id: Nemustiga
announcement:
all_day: Kande kontrolesas, nur tempoporteodato montresos
ends_at: Neobligata. Anunco automatika depublikigesos dum ta tempo
@@ -56,12 +56,12 @@ io:
scopes: Quala API quon softwaro permisesas acesar. Se vu selektas alta skopo, vu ne mustas selektar individui.
setting_aggregate_reblogs: Ne montrez nova repeti di posti qui ja repetesis recente (nur efektigas repeti recevata nove)
setting_always_send_emails: Normale retpostoavizi ne sendesas kande vu aktiva uzas Mastodon
- setting_default_sensitive: Sentoza medii originala celesas e povas revelesar per klikto
- setting_display_media_default: Celez medii quo markizesis quale sentoza
- setting_display_media_hide_all: Sempre celez medii
- setting_display_media_show_all: Sempre montrez medii
+ setting_default_sensitive: Trublema audvidaji originala celesas e povas descelesar per kliko
+ setting_display_media_default: Celez audvidaji qua markesis quale trublema
+ setting_display_media_hide_all: Omnatempe celas audvidaji
+ setting_display_media_show_all: Omnatempe montras audvidaji
setting_use_blurhash: Inklini esas segun kolori di celesis vidaji ma kovras irga detali
- setting_use_pending_items: Celez tempolineonovi dop kliktar e ne automatike movigar niuzeto
+ setting_use_pending_items: Celez tempolinetildatigo dop kliko vice automatike ruligar la fluo
username: Vu darfas uzar literi, nombri, e sublinei
whole_word: Kande klefvorto o fraz esas nur litera e nombra, ol nur aplikesos se ol parigesas la tota vorto
domain_allow:
@@ -79,17 +79,17 @@ io:
form_admin_settings:
activity_api_enabled: Quanto de lokale publikigita posti, aktiva uzanti e nova registri, donita semanope
app_icon: WEBP, PNG, GIF o JPG. Ol remplas la originala imajeto di softwaro sur poshaparati kun personaligita imajeto.
- backups_retention_period: Uzanto povas facar arkivi di sua posti por deskargar pose. Se ol esas positiva nombro, ca arkivi automate efacesis de vua konserveyo pos la decidita quanto di dii.
- bootstrap_timeline_accounts: Ca konti pinglagesos a super sequorekomendi di nova uzanti.
+ backups_retention_period: Uzanto povas igar arkivi di sua afishi por deskargar pose.
+ bootstrap_timeline_accounts: Ca konti adpinglesos ad super sequorekomendi di nova uzanti.
closed_registrations_message: Montresas kande registradi klozesas
content_cache_retention_period: Omna posti de altra servili efacesos (anke repeti e respondi) pos decidita quanto di dii, sen ye irga lokala uzantointerago kun ti posti. Privata mencioni inter uzanto de dessanta servili anke desganos e neposible riganesos.
custom_css: Vu povas pozar kustumizita staili en retverso di Mastodon.
favicon: WEBP, PNG, GIF o JPG. Ol remplas la originala imajeto di Mastodon kun personaligita imajeto.
mascot: Remplas montreso en avanca retintervizajo.
- media_cache_retention_period: Medidoseri de posti quan posti da deslokala uzanti retummemoresis sur vua servilo. Se medidatumo demandesas pos ol efacesas, ol rideskargesos.
+ media_cache_retention_period: Audvidajdosieri di afishi da deslokala uzanti retmemoresis sur vua servilo. Se audvidajdatumo demandesas pos ol forigesis, ol rideskargesos.
peers_api_enabled: Listo di domeni quin ca servilo trovis en la fediverso. Nula informo inkluzesas hike pri ka vu federas kun partikulara servilo, nur ke vua servilo savas pri lo. Co es uzata da enti qui kolektas statistiki pri federeso generale.
- profile_directory: La profilcheflisto montras omna uzanti quo voluntale volas esar deskovrebla.
- require_invite_text: Kande registradi bezonas manuala aprobo, ol kauzigas "Por quo vu volas juntas?" textoenpozo esar obliganta
+ profile_directory: La profiluyo listigas omna uzanti qua volunte esar deskovrebla.
+ require_invite_text: Kande registragi bezonas manuala aprobo, "Por quo vu volas adeskar?" textoenpoza esos mustiga
site_contact_email: Quale personi povas kontaktar vu por legala o suportquestioni.
site_contact_username: Quale personi povas kontaktar vu en Mastodon.
site_extended_description: Irga plusa informi quo forsan esar utila por vizitanti e uzanti. Povas strukturigesar per sintaxo di Markdown.
@@ -100,8 +100,8 @@ io:
theme: Temo quo videsas da ekirita vizitanti e nova uzanti.
thumbnail: Cirkum 2:1 imajo montresar kun informo di ca servilo.
timeline_preview: Ekirita vizitanti videsos maxim recenta publika posti quo esas displonebla en la servilo.
- trendable_by_default: Ignorez manuala kontrolar di tendencoza kontenajo. Singla kozi povas ankore efacesar de tendenci pose.
- trends: Tendenci montras quala posti, hashtagi e niuzrakonti famozeskas en ca servilo.
+ trendable_by_default: Ignorez manuala kontrolar di populara enhavajo.
+ trends: Populari montras quala afishi, gretvorti e novaji populareskas en vua servilo.
trends_as_landing_page: Montrez populara posti a uzanti neeniriti e vizitanti vice deskriptajo pri ca servilo. Bezonas ke populari es aktivita.
form_challenge:
current_password: Vu eniras sekura areo
@@ -110,7 +110,7 @@ io:
invite_request:
text: Co helpos ni kontrolar vua apliko
ip_block:
- comment: Neobligata. Memorez por quo vu insertas ca regulo.
+ comment: Nemustiga.
expires_in: IP-Adresi esas finita moyeno, oli kelkafoye partigesas e frequenta uzesas da multa personi. Do, nedefinita IP-restrikti ne rekomendesas.
ip: Tipez adreso di IPv4 o IPv6. Vu povas restrikar tota porteo per sintaxo CIDR. Sorgemez por ke vu ne klefklozas su!
severities:
@@ -123,7 +123,7 @@ io:
text: Deskriptez regulo o bezonaj por uzanti en ca servilo. Vu debas lasar lu esar korta e simpla
sessions:
otp: Enter the Two-factor code from your phone or use one of your recovery codes.
- webauthn: Se ol esas klefo di USB, certigar ke vu insertas e se bezonesas, tushetez.
+ webauthn: Se ol es USB-klefo, certigar ke vu enpozas e se bezonesas, tushetez ol.
settings:
indexable: Vua profilpagino povas aparar en serchorezultaji che Google, Bing, e altri.
show_application: Vu sempre povos vidar qua apliko publikigis vua posto irgakaze.
@@ -144,7 +144,7 @@ io:
url: Ibe eventi sendesos
labels:
account:
- attribution_domains_as_text: Nur permisas specifika retsitui
+ attribution_domains_as_text: Reteyi kua permisesis agnoskar vu
discoverable: Inkluzar profilo e posti en trovado-algoritmi
fields:
name: Etiketo
@@ -193,7 +193,7 @@ io:
email: Retpost-adreso
expires_in: Expiras pos
fields: Profilmetadato
- header: Kapimajo
+ header: Fundimajo
honeypot: "%{label} (ne plenigez)"
inbox_url: URL di relayomesajbuxo
irreversible: Deslevez e ne celez
@@ -204,29 +204,29 @@ io:
otp_attempt: Dufaktora identigilo
password: Pasvorto
phrase: Klefvorto o frazo
- setting_advanced_layout: Aktivigez avancata retintervizajo
+ setting_advanced_layout: Ebligar altnivela retintervizajo
setting_aggregate_reblogs: Grupigar repeti en tempolinei
setting_always_send_emails: Sempre sendez retpostoavizi
- setting_auto_play_gif: Automate pleez animigita GIFi
+ setting_auto_play_gif: Autoplear anima GIFi
setting_boost_modal: Montrez konfirmdialogo ante repetar
setting_default_language: Postolinguo
setting_default_privacy: Videbleso di la mesaji
- setting_default_sensitive: Sempre markizez medii quale sentoza
+ setting_default_sensitive: Omnatempe markas audvidaji quale trublema
setting_delete_modal: Montrez konfirmdialogo ante efacar posto
- setting_disable_hover_cards: Desaktivigez profilprevido dum klikpaso
- setting_disable_swiping: Desaktivigez fingromovi
- setting_display_media: Mediomontrajo
+ setting_disable_hover_cards: Desebligar profilprevido dum paso
+ setting_disable_swiping: Desebligar fingromovi
+ setting_display_media: Audvidajmontrajo
setting_display_media_default: Originalo
setting_display_media_hide_all: Celez omno
setting_display_media_show_all: Montrez omno
setting_expand_spoilers: Sempre expansigez posti quo markizesis kun kontenajaverti
setting_hide_network: Celez vua sociala grafiko
- setting_reduce_motion: Diminutez moveso di animacii
+ setting_reduce_motion: Despluigar movo di animi
setting_system_font_ui: Uzez originala literfonto di sistemo
- setting_theme: Sittemo
- setting_trends: Montrez tendenco di hodie
+ setting_theme: Reteytemo
+ setting_trends: Montrar hodia populari
setting_unfollow_modal: Montrez konfirmdialogo ante desequar ulu
- setting_use_blurhash: Montrez koloroza inklini por celata medii
+ setting_use_blurhash: Montrez koloroza inklini por celata audvidaji
setting_use_pending_items: Modo lenta
severity: Severeso
sign_in_token_attempt: Sekureskodexo
@@ -253,11 +253,11 @@ io:
custom_css: Kustumizita CSS
favicon: Imajeto
mascot: Kustumizita reprezentimajo (oldo)
- media_cache_retention_period: Mediimemorajretendurtempo
+ media_cache_retention_period: Audvidajretmemorretendurtempo
peers_api_enabled: Publikigez listo di deskovrita servili en API
- profile_directory: Aktivigez profilcheflisto
+ profile_directory: Ebligar profiluyo
registrations_mode: Qua povas registragar
- require_invite_text: Mustez pozar motivo por juntar
+ require_invite_text: Bezonas motivo por adeskar
show_domain_blocks: Montrez domenobstrukti
show_domain_blocks_rationale: Montrez por quo domeni obstruktesir
site_contact_email: Kontaktoretposto
@@ -270,8 +270,8 @@ io:
theme: Originala temo
thumbnail: Servilimajeto
timeline_preview: Permisez neyurizita aceso a publika tempolineo
- trendable_by_default: Permisez tendenci sen bezonar kontrolo
- trends: Aktivigez tendenci
+ trendable_by_default: Permisez populari sen kontrolo
+ trends: Ebligar populari
trends_as_landing_page: Uzar populari quale la iniciala pagino
interactions:
must_be_follower: Celar la savigi da homi, qui ne sequas tu
@@ -280,7 +280,7 @@ io:
invite:
comment: Komento
invite_request:
- text: Por quo vu volas juntar?
+ text: Por quo vu volas adeskar?
ip_block:
comment: Komento
ip: IP
@@ -305,7 +305,7 @@ io:
label: Nova Mastodon-versiono es disponebla
none: Nultempe notifikar pri aktualigi (ne rekomendata)
patch: Notifikar pri problemosolvanta aktualigi
- trending_tag: Nova tendenco bezonas kontrolo
+ trending_tag: Nova popularo bezonas kontrolo
rule:
hint: Plusa informo
text: Regulo
@@ -315,7 +315,7 @@ io:
tag:
listable: Permisez ca hashtago aparar en trovaji e sugestaji
name: Hashtago
- trendable: Permisez ca hashtago aparar che tendenci
+ trendable: Permisez ca gretvorto aparar en populari
usable: Permisez posti uzar ca gretiketo lokale
user:
role: Rolo
@@ -327,7 +327,7 @@ io:
permissions_as_keys: Permisi
position: Prioreso
webhook:
- events: Aktivigita eventi
+ events: Ebligita eventi
template: Pagkargshablono
url: URL di finpunto
'no': Ne
diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml
index 6f3a4fe8a5..40ae267a06 100644
--- a/config/locales/simple_form.is.yml
+++ b/config/locales/simple_form.is.yml
@@ -3,7 +3,7 @@ is:
simple_form:
hints:
account:
- attribution_domains_as_text: Ver fyrir fölskum tilvísunum í höfunda.
+ attribution_domains_as_text: Eitt á hverja línu. Ver fyrir röngum tilvísunum.
discoverable: Opinberar færslur og notandasnið þitt geta birst eða verið mælt með á hinum ýmsu svæðum í Mastodon auk þess sem hægt er að mæla með þér við aðra notendur.
display_name: Fullt nafn þitt eða eitthvað til gamans.
fields: Heimasíðan þín, fornöfn, aldur eða eitthvað sem þú vilt koma á framfæri.
@@ -144,7 +144,7 @@ is:
url: Hvert atburðir verða sendir
labels:
account:
- attribution_domains_as_text: Einungis leyfa tiltekin vefsvæði
+ attribution_domains_as_text: Vefsvæði sem mega vitna í þig
discoverable: Hafa notandasnið og færslur með í reikniritum leitar
fields:
name: Skýring
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index 7ed4c0d004..c36fce36f7 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -3,7 +3,7 @@ it:
simple_form:
hints:
account:
- attribution_domains_as_text: Protegge da false attribuzioni.
+ attribution_domains_as_text: Uno per riga. Protegge da false attribuzioni.
discoverable: I tuoi post pubblici e il tuo profilo potrebbero essere presenti o consigliati in varie aree di Mastodon e il tuo profilo potrebbe essere suggerito ad altri utenti.
display_name: Il tuo nome completo o il tuo soprannome.
fields: La tua homepage, i pronomi, l'età, tutto quello che vuoi.
@@ -144,7 +144,7 @@ it:
url: Dove gli eventi saranno inviati
labels:
account:
- attribution_domains_as_text: Consenti solo siti web specifici
+ attribution_domains_as_text: Siti web autorizzati ad accreditarti
discoverable: Include il profilo e i post negli algoritmi di scoperta
fields:
name: Etichetta
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index 1f3a52c0fd..bd8cb11415 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -3,6 +3,7 @@ ja:
simple_form:
hints:
account:
+ attribution_domains_as_text: 1行につき1つずつ入力してください。この設定は関わりのないwebサイトに対して虚偽の帰属表示が行われることを防止する役割があります。
discoverable: プロフィールと公開投稿をMastodonのおすすめやハイライトとしてほかのユーザーに表示することを許可します。
display_name: フルネーム、ハンドルネームなど
fields: ホームページ、代名詞、年齢など何でも構いません。
@@ -165,6 +166,7 @@ ja:
name: 視認性向上などのためにアルファベット大文字小文字の変更のみ行うことができます
user:
chosen_languages: 選択すると、選択した言語の投稿のみが公開タイムラインに表示されるようになります
+ role: そのロールは、ユーザーが持つ権限を制御します。
user_role:
color: UI 全体でロールの表示に使用される色（16進数RGB形式）
highlighted: これによりロールが公開されます。
@@ -178,6 +180,7 @@ ja:
kmyblue: kmyblue
labels:
account:
+ attribution_domains_as_text: あなたの著者表示を許可するwebサイト
discoverable: アカウントを見つけやすくする
fields:
examples:
diff --git a/config/locales/simple_form.kab.yml b/config/locales/simple_form.kab.yml
index f390d42132..ff041b257b 100644
--- a/config/locales/simple_form.kab.yml
+++ b/config/locales/simple_form.kab.yml
@@ -104,6 +104,7 @@ kab:
featured_tag:
name: Ahacṭag
form_admin_settings:
+ app_icon: Tignit n usnas
custom_css: CSS udmawan
profile_directory: Rmed akaram n imaγnuten
site_contact_email: Imayl n unermas
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index a649b4ec5a..ddac920e2f 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -3,7 +3,7 @@ ko:
simple_form:
hints:
account:
- attribution_domains_as_text: 가짜 기여로부터 보호합니다.
+ attribution_domains_as_text: 한 줄에 하나씩. 가짜 기여로부터 보호합니다.
discoverable: 내 공개 게시물과 프로필이 마스토돈의 다양한 추천 기능에 나타날 수 있고 프로필이 다른 사용자에게 제안될 수 있습니다
display_name: 진짜 이름 또는 재미난 이름.
fields: 홈페이지, 호칭, 나이, 뭐든지 적고 싶은 것들.
@@ -32,9 +32,9 @@ ko:
warning_preset_id: 선택사항. 틀의 마지막에 임의의 텍스트를 추가 할 수 있습니다
announcement:
all_day: 체크 되었을 경우, 그 시간에 속한 날짜들에만 표시됩니다
- ends_at: 옵션입니다. 공지사항이 이 시간에 자동으로 발행 중지 됩니다
+ ends_at: 선택사항. 공지사항이 이 시간에 자동으로 발행 중지 됩니다
scheduled_at: 공백으로 두면 공지사항이 곧바로 발행 됩니다
- starts_at: 공지사항이 특정한 시간에 종속 될 때를 위한 옵션입니다
+ starts_at: 선택사항. 공지사항이 특정한 시간에 종속 될 때를 위한 옵션입니다
text: 게시물 문법을 사용할 수 있습니다. 공지사항은 사용자의 화면 상단 공간을 차지한다는 것을 명심하세요
appeal:
text: 처벌에 대해 단 한 번만 이의제기를 할 수 있습니다
@@ -46,7 +46,7 @@ ko:
current_password: 보안을 위해 현재 계정의 암호를 입력해주세요
current_username: 확인을 위해, 현재 계정의 사용자명을 입력해주세요
digest: 오랫동안 활동하지 않았을 때 받은 멘션들에 대한 요약 받기
- email: 확인용 이메일을 보냈습니다.
+ email: 확인용 이메일을 보내게 됩니다
header: WEBP, PNG, GIF 혹은 JPG. 최대 %{size}. %{dimensions}px로 축소됨
inbox_url: 사용 할 릴레이 서버의 프론트페이지에서 URL을 복사합니다
irreversible: 필터링 된 게시물은 나중에 필터가 사라지더라도 돌아오지 않게 됩니다
@@ -110,7 +110,7 @@ ko:
invite_request:
text: 이 정보는 신청을 검토하는데 도움을 줄 수 있습니다.
ip_block:
- comment: 필수 아님. 왜 이 규칙을 추가했는지 기억하세요.
+ comment: 선택사항. 왜 이 규칙을 추가했는지 기억하세요.
expires_in: IP 주소는 한정된 자원입니다, 이것들은 가끔 공유 되거나 자주 소유자가 바뀌기도 합니다. 이런 이유로 인해, IP 차단을 영구히 유지하는 것은 추천하지 않습니다.
ip: IPv4 또는 IPv6 주소를 입력하세요. CIDR 문법을 사용해서 모든 범위를 차단할 수도 있습니다. 자기 자신을 잠가버리지 않도록 주의하세요!
severities:
@@ -119,7 +119,7 @@ ko:
sign_up_requires_approval: 새 가입이 승인을 필요로 하도록 합니다
severity: 해당 IP로부터의 요청에 대해 무엇이 일어나게 할 지 고르세요
rule:
- hint: 옵션사항. 규칙에 대한 더 상세한 정보를 제공하세요
+ hint: 선택사항. 규칙에 대한 더 상세한 정보를 제공하세요
text: 이 서버 사용자들이 지켜야 할 규칙과 요구사항을 설명해주세요. 짧고 간단하게 작성해주세요
sessions:
otp: '휴대전화에서 생성된 이중 인증 코드를 입력하거나, 복구 코드 중 하나를 사용하세요:'
@@ -140,11 +140,11 @@ ko:
position: 특정 상황에서 충돌이 발생할 경우 더 높은 역할이 충돌을 해결합니다. 특정 작업은 우선순위가 낮은 역할에 대해서만 수행될 수 있습니다
webhook:
events: 전송할 이벤트를 선택하세요
- template: 원하는 JSON 페이로드를 변수와 함께 작성하거나, 그냥 냅둬서 기본 JSON을 사용할 수 있습니다.
+ template: 원하는 JSON 페이로드를 변수와 함께 작성하거나, 그대로 두어 기본 JSON을 사용할 수 있습니다.
url: 이벤트가 어디로 전송될 지
labels:
account:
- attribution_domains_as_text: 특정 웹사이트만 허용하기
+ attribution_domains_as_text: 나를 기여자로 올릴 수 있도록 허용된 웹사이트들
discoverable: 발견하기 알고리즘에 프로필과 게시물을 추천하기
fields:
name: 라벨
@@ -208,11 +208,11 @@ ko:
setting_aggregate_reblogs: 타임라인의 부스트를 그룹화
setting_always_send_emails: 항상 이메일 알림 보내기
setting_auto_play_gif: 애니메이션 GIF를 자동 재생
- setting_boost_modal: 부스트 전 확인 창을 표시
+ setting_boost_modal: 부스트 전 확인창을 띄웁니다
setting_default_language: 게시물 언어
setting_default_privacy: 게시물 프라이버시
setting_default_sensitive: 미디어를 언제나 민감한 콘텐츠로 설정
- setting_delete_modal: 게시물 삭제 전 확인 창을 표시
+ setting_delete_modal: 게시물 삭제 전 확인창을 띄웁니다
setting_disable_hover_cards: 호버시 프로필 미리보기를 비활성화
setting_disable_swiping: 스와이프 모션 비활성화
setting_display_media: 미디어 표시
diff --git a/config/locales/simple_form.la.yml b/config/locales/simple_form.la.yml
index 3a7ba0d445..0ad29b408a 100644
--- a/config/locales/simple_form.la.yml
+++ b/config/locales/simple_form.la.yml
@@ -1 +1,6 @@
+---
la:
+ simple_form:
+ hints:
+ account:
+ unlocked: Homines tibi sine approbātiōnis postulātiōne sequī poterunt. Dēlēgās, sī rogātiōnēs sequendī recēnseāre vīs et utrum novōs sectātōrēs accipere an repudiāre mālīs.
diff --git a/config/locales/simple_form.lad.yml b/config/locales/simple_form.lad.yml
index 94e387107a..de37005312 100644
--- a/config/locales/simple_form.lad.yml
+++ b/config/locales/simple_form.lad.yml
@@ -307,6 +307,7 @@ lad:
listable: Permite ke esta etiketa apareska en bushkedas i sujestyones
name: Etiketa
trendable: Permite ke esta etiketa apareska en trendes
+ usable: Permite ke publikasyones uzen esta etiketa lokalmente
user:
role: Rolo
time_zone: Zona de tiempo
diff --git a/config/locales/simple_form.lt.yml b/config/locales/simple_form.lt.yml
index 5d3a02993b..6c4b6b3632 100644
--- a/config/locales/simple_form.lt.yml
+++ b/config/locales/simple_form.lt.yml
@@ -3,14 +3,14 @@ lt:
simple_form:
hints:
account:
- attribution_domains_as_text: Apsaugo nuo klaidingų atributų.
+ attribution_domains_as_text: Po vieną eilutėje. Apsaugo nuo klaidingų atributų.
discoverable: Tavo vieši įrašai ir profilis gali būti rodomi arba rekomenduojami įvairiose Mastodon vietose, o profilis gali būti siūlomas kitiems naudotojams.
display_name: Tavo pilnas vardas arba smagus vardas.
fields: Tavo pagrindinis puslapis, įvardžiai, amžius, bet kas, ko tik nori.
indexable: Tavo vieši įrašai gali būti rodomi Mastodon paieškos rezultatuose. Žmonės, kurie bendravo su tavo įrašais, gali jų ieškoti nepriklausomai nuo to.
note: 'Gali @paminėti kitus žmones arba #saitažodžius.'
show_collections: Žmonės galės peržiūrėti tavo sekimus ir sekėjus. Žmonės, kuriuos seki, matys, kad juos seki, nepaisant to.
- unlocked: Žmonės galės tave sekti nepaprašę patvirtinimo. Panaikink žymėjimą, jei nori peržiūrėti sekimo prašymus ir pasirinkti, ar priimti, ar atmesti naujus sekėjus.
+ unlocked: Asmenys galės jus sekti nepaprašę patvirtinimo. Panaikinkite žymėjimą, jei norite peržiūrėti sekimo prašymus, ir pasirinkti, ar priimti, ar atmesti naujus sekėjus.
account_alias:
acct: Nurodyk paskyros, iš kurios nori perkelti, naudotojo vardą@domeną
account_migration:
@@ -107,7 +107,7 @@ lt:
role: Vaidmuo valdo, kokius leidimus naudotojas turi.
labels:
account:
- attribution_domains_as_text: Leisti tik konkrečias svetaines
+ attribution_domains_as_text: Svetainės, kuriuose leidžiama jus nurodyti
discoverable: Rekomenduoti profilį ir įrašus į atradimo algoritmus
indexable: Įtraukti viešus įrašus į paieškos rezultatus
show_collections: Rodyti sekimus ir sekėjus profilyje
diff --git a/config/locales/simple_form.lv.yml b/config/locales/simple_form.lv.yml
index 9cc32457f7..6c71aa9cf1 100644
--- a/config/locales/simple_form.lv.yml
+++ b/config/locales/simple_form.lv.yml
@@ -3,14 +3,14 @@ lv:
simple_form:
hints:
account:
- attribution_domains_as_text: Aizsargā no nepatiesa attiecinājuma.
+ attribution_domains_as_text: Viens katrā līnijā. Aizsargā no nepatiesa attiecinājuma.
discoverable: Tavas publiskās ziņas un profils var tikt piedāvāti vai ieteikti dažādās Mastodon vietās, un tavs profils var tikt ieteikts citiem lietotājiem.
display_name: Tavs pilnais vārds vai tavs joku vārds.
fields: Tava mājas lapa, vietniekvārdi, vecums, viss, ko vēlies.
indexable: Tavi publiskie ieraksti var tikt parādīti Mastodon meklēšanas iznākumā. Cilvēki, kuri ir mijiedarbojušies ar Taviem ierakstiem, var tos meklēt neatkarīgi no tā.
note: 'Tu vari @minēt citus cilvēkus vai #mirkļbirkas.'
show_collections: Cilvēki varēs pārlūkot Tavus sekotājus un sekojamos. Cilvēki, kuriem Tu seko, redzēs, ka Tu seko viņiem neatkarīgi no tā.
- unlocked: Cilvēki varēs tev sekot, neprasot apstiprinājumu. Noņem atzīmi, ja vēlies pārskatīt sekošanas pieprasījumus un izvēlēties, pieņemt vai noraidīt jaunus sekotājus.
+ unlocked: Cilvēki varēs Tev sekot bez apstiprinājuma pieprasīšanas. Jānoņem atzīme, ja vēlies pārskatīt sekošanas pieprasījumus un izvēlēties, vai apstiprināt vai noraidīt jaunus sekotājus.
account_alias:
acct: Norādi konta lietotājvārdu@domēnu, no kura vēlies pārvākties
account_migration:
@@ -19,14 +19,14 @@ lv:
text: Vari izmantot ziņu sintaksi, piemēram, URL, atsauces un pieminējumus
title: Neobligāts. Saņēmējam nav redzams
admin_account_action:
- include_statuses: Lietotājs redzēs, kuras ziņas izraisījušas moderācijas darbību vai brīdinājumu
+ include_statuses: Lietotājs redzēs, kuras ziņas izraisījušas satura pārraudzības darbību vai brīdinājumu
send_email_notification: Lietotājs saņems paskaidrojumu par to, kas notika ar viņa kontu
text_html: Neobligāts. Tu vari lietot ziņu sintaksi. Lai ietaupītu laiku, tu vari pievienot brīdinājuma sākotnējos iestatījumus
type_html: Izvēlies, ko darīt ar %{acct}
types:
disable: Neļauj lietotājam izmantot savu kontu, bet neizdzēs vai neslēp tā saturu.
none: Izmanto šo, lai nosūtītu lietotājam brīdinājumu, neradot nekādas citas darbības.
- sensitive: Piespiest visus šī lietotāja multivides pielikumus atzīmēt kā sensitīvus.
+ sensitive: Visus šī lietotāja informācijas nesēju pielikumus uzspiesti atzīmēt kā jūtīgus.
silence: Neļaut lietotājam veikt ierakstus ar publisku redzamību, paslēpt viņa ierakstus un paziņojumus no cilvēkiem, kas tam neseko. Tiek aizvērti visi ziņojumi par šo kontu.
suspend: Novērs jebkādu mijiedarbību no šī konta vai uz to un dzēs tā saturu. Atgriežams 30 dienu laikā. Tiek aizvērti visi šī konta pārskati.
warning_preset_id: Neobligāts. Tu joprojām vari pievienot pielāgotu tekstu sākotnējās iestatīšanas beigās
@@ -53,15 +53,15 @@ lv:
locale: Lietotāja saskarnes, e-pasta ziņojumu un push paziņojumu valoda
password: Izmanto vismaz 8 rakstzīmes
phrase: Tiks saskaņots neatkarīgi no ziņas teksta reģistra vai satura brīdinājuma
- scopes: Kuriem API lietojumprogrammai būs atļauta piekļuve. Ja izvēlies augstākā līmeņa tvērumu, tev nav jāatlasa atsevišķi vienumi.
+ scopes: Kuriem API lietotnei būs ļauts piekļūt. Ja atlasa augstākā līmeņa tvērumu, nav nepieciešamas atlasīt atsevišķus.
setting_aggregate_reblogs: Nerādīt jaunus izcēlumus ziņām, kas nesen tika palielinātas (ietekmē tikai nesen saņemtos palielinājumus)
setting_always_send_emails: Parasti e-pasta paziņojumi netiek sūtīti, kad aktīvi izmantojat Mastodon
- setting_default_sensitive: Sensitīva multivide pēc noklusējuma ir paslēpti, un tos var atklāt, noklikšķinot
- setting_display_media_default: Paslēpt multividi, kas atzīmēta kā sensitīva
+ setting_default_sensitive: Pēc noklusējuma jūtīgi informācijas nesēji ir paslēpti, un tos var atklāt ar klikšķi
+ setting_display_media_default: Paslēpt informācijas nesējus, kas atzīmēti kā jūtīgi
setting_display_media_hide_all: Vienmēr slēpt multividi
setting_display_media_show_all: Vienmēr rādīt multividi
setting_use_blurhash: Pāreju pamatā ir paslēpto uzskatāmo līdzekļu krāsas, bet saturs tiek padarīts neskaidrs
- setting_use_pending_items: Paslēpt laika skalas atjauninājumus aiz klikšķa, nevis automātiski ritini plūsmu
+ setting_use_pending_items: Paslēpt laika skalas atjauninājumus aiz klikšķa, nevis ar automātisku plūsmas ritināšanu
username: Tu vari lietot burtus, ciparus un zemsvītras
whole_word: Ja atslēgvārds vai frāze ir tikai burtciparu, tas tiks lietots tikai tad, ja tas atbilst visam vārdam
domain_allow:
@@ -80,15 +80,16 @@ lv:
activity_api_enabled: Vietēji publicēto ziņu, aktīvo lietotāju un jauno reģistrāciju skaits nedēļas kopās
app_icon: WEBP, PNG, GIF vai JPG. Mobilajās ierīcēs aizstāj noklusējuma lietotnes ikonu ar pielāgotu.
backups_retention_period: Lietotājiem ir iespēja izveidot savu ierakstu arhīvu lejupielādēšanai vēlāk. Kad iestatīta pozitīva vērtība, šie arhīvi tiks automātiski izdzēsti no krātuves pēc norādītā dienu skaita.
- bootstrap_timeline_accounts: Šie konti tiks piesprausti jauno lietotāju ieteikumu augšdaļā.
+ bootstrap_timeline_accounts: Šie konti tiks piesprausti jauno lietotāju sekošanas ieteikumu augšdaļā.
closed_registrations_message: Tiek rādīts, kad reģistrēšanās ir slēgta
content_cache_retention_period: Visi ieraksti no citiem serveriem (tajā skaitā pastiprinājumi un atbildes) tiks izdzēsti pēc norādītā dienu skaita, neņemot vērā vietēja lietotāja mijiedarbību ar šādiem ierakstiem. Tas ietver ierakstus, kurus vietējs lietotājs ir atzīmējis kā grāmatzīmi vai pievienojis izlasē. Tiks zaudēti arī privāti pieminējumi starp lietotājiem no dažādiem serveriem, un tos nebūs iespējams atgūt. Šī iestatījuma izmantošana ir paredzēta īpašam nolūkam paredzētiem serveriem un neatbilst tam, ko sagaida vairums lietotāju, kad pielietots vispārējas izmantošanas serveros.
custom_css: Vari lietot pielāgotus stilus Mastodon tīmekļa versijā.
favicon: WEBP, PNG, GIF vai JPG. Aizstāj noklusējuma Mastodon favikonu ar pielāgotu.
mascot: Ignorē ilustrāciju uzlabotajā tīmekļa saskarnē.
+ media_cache_retention_period: Informācijas nesēju datnes no ierakstiem, kurus ir veikuši attālie lietotāji, tiek kešoti šajā serverī. Kad ir iestatīta apstiprinoša vērtība, informācijas nesēji tiks izdzēsti pēc norādītā dienu skaita. Ja informācijas nesēju dati tiks pieprasīti pēc tam, kad tie tika izdzēsti, tie tiks atkārtoti lejupielādēti, ja avota saturs joprojām būs pieejams. Saišu priekšskatījuma karšu vaicājumu biežuma ierobežojumu dēļ ir ieteicams iestatīt šo vērtību vismaz 14 dienas vai saišu priekšskatījuma kartes netiks atjauninātas pēc pieprasījuma pirms tā laika.
peers_api_enabled: Domēna vārdu saraksts, ar kuriem šis serveris ir saskāries fediversā. Šeit nav iekļauti dati par to, vai tu veic federāciju ar noteiktu serveri, tikai tavs serveris par to zina. To izmanto dienesti, kas apkopo statistiku par federāciju vispārīgā nozīmē.
profile_directory: Profilu direktorijā ir uzskaitīti visi lietotāji, kuri ir izvēlējušies būt atklājami.
- require_invite_text: 'Ja pierakstīšanai nepieciešama manuāla apstiprināšana, izdari tā, lai teksta: “Kāpēc vēlaties pievienoties?” ievade ir obligāta, nevis opcionāla'
+ require_invite_text: Ja nepieciešama pašrocīga apstiprināšana, lai pierakstītos, teksta “Kāpēc vēlies pievienoties?” ievade jāpadara par nepieciešamu, nevis izvēles
site_contact_email: Kā cilvēki var sazināties ar tevi par juridiskiem vai atbalsta jautājumiem.
site_contact_username: Tagad cilvēki var tevi sasniegt Mastodon.
site_extended_description: Jebkura papildu informācija, kas var būt noderīga apmeklētājiem un lietotājiem. Var strukturēt ar Markdown sintaksi.
@@ -118,10 +119,10 @@ lv:
sign_up_requires_approval: Jaunām reģistrācijām būs nepieciešams tavs apstiprinājums
severity: Izvēlies, kas notiks ar pieprasījumiem no šīs IP adreses
rule:
- hint: Izvēles. Sniedz vairāk informācijas par nosacījumu
- text: Apraksti nosacījumus vai prasības šī servera lietotājiem. Centies, lai tas būtu īss un vienkāršs
+ hint: Izvēles. Sniedz vairāk informācijas par noteikumu
+ text: Jāapraksta nosacījums vai prasība šī servera lietotājiem. Jāmēģina to veidot īsu un vienkāršu
sessions:
- otp: 'Ievadi divfaktoru kodu, ko ģenerējusi tava tālruņa lietotne, vai izmanto kādu no atkopšanas kodiem:'
+ otp: 'Jāievada tālruņa lietotnes izveidots divpakāpju kods vai jāizmanto viens no saviem atkopes kodie:'
webauthn: Ja tā ir USB atslēga, noteikti ievieto to un, ja nepieciešams, pieskaries tai.
settings:
indexable: Tava profila lapa var tikt parādīta Google, Bing un citu meklēšanas dzinēju rezultātos.
@@ -143,7 +144,7 @@ lv:
url: Kur notikumi tiks nosūtīti
labels:
account:
- attribution_domains_as_text: Ļaut tikai noteiktas tīmekļvietnes
+ attribution_domains_as_text: Tīmekļvietnes, kurām ir tiesības uzskaitīt Tevi
discoverable: Funkcijas profils un ziņas atklāšanas algoritmos
fields:
name: Marķējums
@@ -166,7 +167,7 @@ lv:
types:
disable: Iesaldēt
none: Nosūtīt brīdinājumu
- sensitive: Sensitīvs
+ sensitive: Jūtīgs
silence: Ierobežot
suspend: Apturēt
warning_preset_id: Lietot iepriekš iestatītus brīdinājumus
@@ -182,7 +183,7 @@ lv:
autofollow: Uzaicini sekot tavam kontam
avatar: Profila attēls
bot: Šis ir automatizēts konts
- chosen_languages: Filtrēt valodas
+ chosen_languages: Atlasīt valodas
confirm_new_password: Apstiprināt jauno paroli
confirm_password: Apstiprināt paroli
context: Filtrēt kontekstus
@@ -210,7 +211,7 @@ lv:
setting_boost_modal: Rādīt apstiprinājuma dialogu pirms izcelšanas
setting_default_language: Publicēšanas valoda
setting_default_privacy: Publicēšanas privātums
- setting_default_sensitive: Atļaut atzīmēt multividi kā sensitīvu
+ setting_default_sensitive: Vienmēr atzīmēt informācijas nesējus kā jūtīgus
setting_delete_modal: Parādīt apstiprinājuma dialogu pirms ziņas dzēšanas
setting_disable_hover_cards: Atspējot profila priekšskatījumu pēc kursora novietošanas
setting_disable_swiping: Atspējot vilkšanas kustības
@@ -338,5 +339,5 @@ lv:
text: nepieciešams
title:
sessions:
- webauthn: Lai pierakstītos, izmanto vienu no savām drošības atslēgām
+ webauthn: Lai pieteiktos, jāizmanto viena no savām drošības atslēgām
'yes': Jā
diff --git a/config/locales/simple_form.ms.yml b/config/locales/simple_form.ms.yml
index ecc3588d67..4f6dd7c0a1 100644
--- a/config/locales/simple_form.ms.yml
+++ b/config/locales/simple_form.ms.yml
@@ -78,6 +78,7 @@ ms:
bootstrap_timeline_accounts: Akaun ini akan disematkan pada bahagian atas cadangan ikutan pengguna baharu.
closed_registrations_message: Dipaparkan semasa pendaftaran ditutup
custom_css: Anda boleh menggunakan gaya tersuai pada versi web Mastodon.
+ favicon: WEBP, PNG, GIF, atau JPG. Arca tersuai diutamakan dari arca kegemaran Mastodon lalai.
mascot: Mengatasi ilustrasi dalam antara muka web lanjutan.
peers_api_enabled: Senarai nama domain yang pernah ditemui oleh server ini dalam fediverse. Tiada data disertakan di sini tentang sama ada anda bersekutu dengan server tertentu, cuma server anda mengetahuinya. Ini digunakan oleh perkhidmatan yang mengumpul statistik mengenai persekutuan dalam pengertian umum.
profile_directory: Direktori profil menyenaraikan semua pengguna yang telah mengikut serta untuk ditemui.
@@ -237,6 +238,7 @@ ms:
bootstrap_timeline_accounts: Sentiasa mengesyorkan akaun ini kepada pengguna baharu
closed_registrations_message: Mesej tersuai apabila pendaftaran tidak tersedia
custom_css: CSS tersuai
+ favicon: Arca kegemaran
mascot: Maskot tersuai (warisan)
media_cache_retention_period: Tempoh pengekalan cache media
peers_api_enabled: Terbitkan senarai pelayan yang ditemui dalam API
@@ -277,7 +279,7 @@ ms:
notification_emails:
appeal: Seseorang merayu keputusan moderator
digest: Hantar e-mel ringkasan
- favourite: Seorang menggemarkan hantaran anda
+ favourite: Seseorang menyukai hantaran anda
follow: Seorang mengikuti anda
follow_request: Seorang meminta untuk mengikuti anda
mention: Seorang menyebut anda
diff --git a/config/locales/simple_form.nan.yml b/config/locales/simple_form.nan.yml
new file mode 100644
index 0000000000..aec73b64e1
--- /dev/null
+++ b/config/locales/simple_form.nan.yml
@@ -0,0 +1,12 @@
+---
+nan:
+ simple_form:
+ hints:
+ account:
+ display_name: Lí ê全名á是別號。
+ fields: Lí ê頭頁、代名詞、年歲，kap其他beh分享ê。
+ unlocked: 逐ê m̄免受批准就ē當tuè lí，若是lí想beh審查跟綴ê請求，揀beh准á是拒絕跟tuè ê，請毋通勾。
+ defaults:
+ password: 用 8 ê字元以上
+ setting_display_media_hide_all: 一直khàm掉媒體
+ setting_display_media_show_all: 一直展示媒體
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index 7f8aaa01d6..f50e223e8c 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -3,7 +3,7 @@ nl:
simple_form:
hints:
account:
- attribution_domains_as_text: Beschermt tegen onjuiste attributies.
+ attribution_domains_as_text: Eén per regel. Beschermt tegen ongeldige attributies.
discoverable: Jouw openbare berichten kunnen worden uitgelicht op verschillende plekken binnen Mastodon en jouw account kan worden aanbevolen aan andere gebruikers.
display_name: Jouw volledige naam of een leuke bijnaam.
fields: Jouw website, persoonlijke voornaamwoorden, leeftijd, alles wat je maar kwijt wilt.
@@ -144,7 +144,7 @@ nl:
url: Waar gebeurtenissen naartoe worden verzonden
labels:
account:
- attribution_domains_as_text: Alleen bepaalde websites toestaan
+ attribution_domains_as_text: Websites die jou credit mogen geven
discoverable: Jouw account en berichten laten uitlichten door Mastodon
fields:
name: Label
@@ -213,7 +213,7 @@ nl:
setting_default_privacy: Zichtbaarheid van nieuwe berichten
setting_default_sensitive: Media altijd als gevoelig markeren
setting_delete_modal: Vraag voor het verwijderen van een bericht een bevestiging
- setting_disable_hover_cards: Profielvoorbeelden door eroverheen te zweven uitschakelen
+ setting_disable_hover_cards: Hover-kaarten met profielvoorbeelden uitschakelen
setting_disable_swiping: Swipebewegingen uitschakelen
setting_display_media: Mediaweergave
setting_display_media_default: Standaard
@@ -268,7 +268,7 @@ nl:
site_title: Servernaam
status_page_url: URL van statuspagina
theme: Standaardthema
- thumbnail: Serverthumbnail
+ thumbnail: Server-miniatuur
timeline_preview: Toegang tot de openbare tijdlijnen zonder in te loggen toestaan
trendable_by_default: Trends goedkeuren zonder voorafgaande beoordeling
trends: Trends inschakelen
@@ -295,7 +295,7 @@ nl:
favourite: Wanneer iemand jouw bericht als favoriet markeert
follow: Wanneer iemand jou is gaan volgen
follow_request: Wanneer iemand jou wil volgen
- mention: Wanneer iemand jou heeft vermeld
+ mention: Je bent door iemand vermeld
pending_account: Wanneer een nieuw account moet worden beoordeeld
reblog: Wanneer iemand jouw bericht heeft geboost
report: Nieuwe rapportage is ingediend
diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml
index ddd5ed8995..fc47c7164c 100644
--- a/config/locales/simple_form.nn.yml
+++ b/config/locales/simple_form.nn.yml
@@ -3,7 +3,7 @@ nn:
simple_form:
hints:
account:
- attribution_domains_as_text: Vernar mot falske krediteringar.
+ attribution_domains_as_text: Ein per line. Vernar mot falske krediteringar.
discoverable: Dei offentlege innlegga dine og profilen din kan dukka opp i tilrådingar på ulike stader på Mastodon, og profilen din kan bli føreslegen for andre folk.
display_name: Ditt fulle namn eller ditt tøysenamn.
fields: Heimesida di, pronomen, alder, eller kva du måtte ynskje.
@@ -101,7 +101,7 @@ nn:
thumbnail: Eit omlag 2:1 bilete vist saman med informasjon om tenaren.
timeline_preview: Besøkjande som ikkje er logga inn vil kunne bla gjennom dei siste offentlege innlegga på tenaren.
trendable_by_default: Hopp over manuell gjennomgang av populært innhald. Enkeltståande innlegg kan fjernast frå trendar i etterkant.
- trends: Trendar viser kva for nokre innlegg, emneknaggar og nyheiter som er i støytet på tenaren.
+ trends: Trendar viser kva for nokre innlegg, emneknaggar og nyheiter som er populære på tenaren.
trends_as_landing_page: Vis populært innhald til utlogga brukarar og folk som kjem innom sida i staden for ei skildring av tenaren. Du må ha skrudd på trendar for å kunna bruka dette.
form_challenge:
current_password: Du går inn i eit trygt område
@@ -137,14 +137,14 @@ nn:
highlighted: Dette gjer rolla synleg offentleg
name: Offentleg namn på rolla, dersom rolla skal visast som eit emblem
permissions_as_keys: Brukarar med denne rolla vil ha tilgang til...
- position: Høgare rolle avgjer konfliktløysing i visse situasjonar. Visse handlingar kan kun utførast på rollar med lågare prioritet
+ position: Høgare rolle avgjer konfliktløysing i visse situasjonar. Visse handlingar kan berre utførast på roller med lågare prioritet
webhook:
events: Vel hendingar å senda
template: Skriv di eiga JSON nyttelast ved å bruka variabel interpolering. La stå tom for standard JSON.
url: Kvar hendingar skal sendast
labels:
account:
- attribution_domains_as_text: Tillat berre visse nettstader
+ attribution_domains_as_text: Nettstader som har lov å kreditera deg
discoverable: Ta med profilen og innlegga i oppdagingsalgoritmar
fields:
name: Merkelapp
diff --git a/config/locales/simple_form.no.yml b/config/locales/simple_form.no.yml
index 73ba17cd4c..f1973b1d06 100644
--- a/config/locales/simple_form.no.yml
+++ b/config/locales/simple_form.no.yml
@@ -235,6 +235,7 @@
warn: Skjul med en advarsel
form_admin_settings:
activity_api_enabled: Publiser samlet statistikk om brukeraktivitet i API
+ app_icon: App-ikon
backups_retention_period: Brukers oppbevaringsperiode for arkiv
bootstrap_timeline_accounts: Anbefaler alltid disse kontoene til nye brukere
closed_registrations_message: Egendefinert melding når registrering ikke er tilgjengelig
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index bb404e56c9..866872fb08 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -3,11 +3,11 @@ pl:
simple_form:
hints:
account:
- attribution_domains_as_text: Chroni przed fałszywym przypisaniem wpisów.
+ attribution_domains_as_text: Jedna na linię. Chroni przed fałszywym przypisaniem wpisów.
discoverable: Twój profil i publiczne wpisy mogą być promowane lub polecane na Mastodonie i twój profil może być sugerowany innym użytkownikom.
display_name: Twoje imię lub pseudonim.
fields: Co ci się tylko podoba – twoja strona domowa, zaimki, wiek…
- indexable: Twoje publiczne wpisy mogą pojawiać się w wynikach wyszukiwania w Mastodonie. Użytkownicy, którzy wchodzili w interakcje z twoimi wpisami będą mogli je znaleźć niezależnie od tego ustawienia.
+ indexable: Twoje publiczne wpisy mogą pojawiać się w wynikach wyszukiwania w Mastodonie. Użytkownicy, którzy reagowali na Twoje wpisy, będą mogli je znaleźć niezależnie od tego ustawienia.
note: 'Możesz @wspomnieć użytkowników albo #hasztagi.'
show_collections: Twoja lista obserwowanych i obserwujących będzie widoczna dla wszystkich. Użytkownicy których obserwujesz będą jednak o tym wiedzieli.
unlocked: Inni użytkownicy będą mogli cię obserwować bez proszenia o zgodę. Odznacz, jeżeli chcesz aprobować obserwujących ręcznie po przejrzeniu próśb o obserwowanie.
@@ -144,7 +144,7 @@ pl:
url: Dokąd będą wysłane zdarzenia
labels:
account:
- attribution_domains_as_text: Zezwól tylko na konkretne strony
+ attribution_domains_as_text: Strony które mogą ci przypisywać autorstwo.
discoverable: Udostępniaj profil i wpisy funkcjom odkrywania
fields:
name: Nazwa
diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml
index 96bc219e8e..acc390381d 100644
--- a/config/locales/simple_form.pt-BR.yml
+++ b/config/locales/simple_form.pt-BR.yml
@@ -3,14 +3,14 @@ pt-BR:
simple_form:
hints:
account:
- attribution_domains_as_text: Protege de atribuições falsas.
+ attribution_domains_as_text: Um por linha. Protege de falsas atribuições.
discoverable: Suas publicações e perfil públicos podem ser destaques ou recomendados em várias áreas de Mastodon, e seu perfil pode ser sugerido a outros usuários.
display_name: Seu nome completo ou apelido.
fields: Sua página inicial, pronomes, idade ou qualquer coisa que quiser.
indexable: Suas publicações públicas podem aparecer nos resultados da pesquisa em Mastodon. As pessoas que interagiram com suas publicações podem conseguir pesquisá-las independentemente disso.
- note: 'Você pode @mencionar outras pessoas ou #hashtags.'
- show_collections: As pessoas poderão navegar entre os seus seguidores e seguidores. As pessoas que você segue verão que você as segue independentemente disso.
- unlocked: As pessoas poderão te seguir sem pedir aprovação. Desmarque se você deseja revisar pedidos e escolher se aceita ou rejeita novos seguidores.
+ note: 'Você pode @mencionar outras pessoas ou usar #hashtags.'
+ show_collections: As pessoas podem ver seus seguidores e quem você está seguindo. Os perfis que você seguir saberão que você os segue independentemente do que selecionar.
+ unlocked: As pessoas poderão te seguir sem solicitar aprovação. Desmarque caso você queira revisar as solicitações.
account_alias:
acct: Especifique o usuário@domínio de onde veio
account_migration:
@@ -27,8 +27,8 @@ pt-BR:
disable: Impede o usuário de usar a conta, porém sem excluí-la ou suspendê-la.
none: Use isto para enviar uma advertência ao usuário, sem nenhuma outra ação.
sensitive: Marca todas as mídias do usuário como sensível.
- silence: Impede o usuário de enviar postagens visualmente públicas, além de ocultar suas publicações e notificações dos que não o seguem. Ademais, fecha todas as denúncias contra esta conta.
- suspend: Impede qualquer interação de ou para esta conta e exclui seu conteúdo. Reversível dentro de 30 dias. Ademais, fecha todas as denúncias contra esta conta.
+ silence: Impede o usuário de postar publicamente, restringe suas publicações e notificações a somente quem o segue. Encerra todas as denúncias contra esta conta.
+ suspend: Impede qualquer interação de ou para esta conta e exclui seu conteúdo. Reversível dentro de 30 dias. Encerra todas as denúncias contra esta conta.
warning_preset_id: Opcional. Você pode adicionar texto personalizado no final da advertência pré-definida
announcement:
all_day: Quando marcada, apenas as datas do período serão mostradas
@@ -37,11 +37,11 @@ pt-BR:
starts_at: Opcional. Caso o comunicado esteja vinculado a um período específico
text: Você pode usar a sintaxe do toot. Considere o espaço que o comunicado ocupará na tela do usuário
appeal:
- text: Você só pode solicitar uma revisão uma vez
+ text: Você só pode recorrer uma vez
defaults:
autofollow: Pessoas que criarem conta através de seu convite te seguirão automaticamente
avatar: WEBP, PNG, GIF ou JPG. No máximo %{size}. Será reduzido para %{dimensions}px
- bot: Essa conta executa principalmente ações automatizadas e pode não ser monitorada
+ bot: Sinaliza aos outros de que essa conta executa principalmente ações automatizadas e pode não ser monitorada
context: Um ou mais contextos onde o filtro deve atuar
current_password: Para fins de segurança, digite a senha da conta atual
current_username: Para confirmar, digite o nome de usuário da conta atual
@@ -54,7 +54,7 @@ pt-BR:
password: Use pelo menos 8 caracteres
phrase: Corresponderá independente de maiúsculas ou minúsculas, no texto ou no Aviso de Conteúdo de um toot
scopes: Quais APIs o aplicativo vai ter permissão de acessar. Se você selecionar uma autorização de alto nível, você não precisa selecionar individualmente os outros.
- setting_aggregate_reblogs: Não mostra novos impulsos para publicações já receberam recentemente (afeta somente os impulsos mais recentes)
+ setting_aggregate_reblogs: Não mostrar novos impulsos para publicações que já foram impulsionadas recentemente (afeta somente os impulsos mais recentes)
setting_always_send_emails: Normalmente, as notificações por e-mail não serão enviadas enquanto você estiver usando ativamente o Mastodon
setting_default_sensitive: Mídia sensível está oculta por padrão e pode ser revelada com um clique
setting_display_media_default: Sempre ocultar mídia sensível
@@ -79,7 +79,7 @@ pt-BR:
form_admin_settings:
activity_api_enabled: Contagem de publicações locais, usuários ativos e novos usuários semanais
app_icon: WEBP, PNG, GIF ou JPG. Sobrescrever o ícone padrão do aplicativo em dispositivos móveis com um ícone personalizado.
- backups_retention_period: Os usuários têm a capacidade de gerar arquivos de suas postagens para baixar mais tarde. Quando definido como um valor positivo, esses arquivos serão automaticamente excluídos do seu armazenamento após o número especificado de dias.
+ backups_retention_period: Os usuários podem gerar arquivos de suas postagens para baixar mais tarde. Quando definido como um valor positivo, esses arquivos serão automaticamente excluídos do seu armazenamento após o número especificado de dias.
bootstrap_timeline_accounts: Estas contas serão fixadas no topo das recomendações de novos usuários para seguir.
closed_registrations_message: Exibido quando as inscrições estiverem fechadas
content_cache_retention_period: Todas as postagens de outros servidores (incluindo boosts e respostas) serão excluídas após o número especificado de dias, sem levar a qualquer interação do usuário local com esses posts. Isto inclui postagens onde um usuário local o marcou como favorito ou favoritos. Menções privadas entre usuários de diferentes instâncias também serão perdidas e impossíveis de restaurar. O uso desta configuração destina-se a instâncias especiais de propósitos e quebra muitas expectativas dos usuários quando implementadas para uso de propósito geral.
@@ -144,7 +144,7 @@ pt-BR:
url: Aonde os eventos serão enviados
labels:
account:
- attribution_domains_as_text: Permitir apenas sites específicos
+ attribution_domains_as_text: Sites permitidos para credenciar você
discoverable: Destacar perfil e publicações nos algoritmos de descoberta
fields:
name: Rótulo
diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml
index 3b606df032..c2ebfb0c1f 100644
--- a/config/locales/simple_form.pt-PT.yml
+++ b/config/locales/simple_form.pt-PT.yml
@@ -3,19 +3,20 @@ pt-PT:
simple_form:
hints:
account:
+ attribution_domains_as_text: Um por linha. Protege contra falsas atribuições.
discoverable: As suas publicações e perfil públicos podem ser destacados ou recomendados em várias áreas do Mastodon e o seu perfil pode ser sugerido a outros utilizadores.
display_name: O seu nome completo ou o seu nome divertido.
fields: A sua página inicial, os seus pronomes, idade e tudo o que quiser.
indexable: As suas mensagens públicas podem aparecer nos resultados da pesquisa no Mastodon. Independentemente disso, as pessoas que interagiram com as suas publicações podem ser capazes de as pesquisar.
- note: 'Pode @mencionar outras pessoas ou #hashtags.'
+ note: 'Pode @mencionar outras pessoas e usar #etiquetas.'
show_collections: As pessoas podem navegar pelas listas das pessoas que segue e dos seus seguidores. Independentemente disso, as pessoas que segue verão que você as segue.
- unlocked: As pessoas podem segui-lo/a sem pedir a sua aprovação. Desmarque se quiser rever os pedidos para seguir e escolher se aceita ou rejeita os novos seguidores.
+ unlocked: As pessoas podem seguir-te sem pedir a tua aprovação. Desmarca se quiseres rever os pedidos para seguir e escolher se aceitas ou rejeitas os novos seguidores.
account_alias:
acct: Especifique o utilizador@domínio da conta de onde você deseja migrar
account_migration:
acct: Especifique o utilizador@domínio da conta para onde você deseja migrar
account_warning_preset:
- text: Pode usar sintaxe de escrita, como URL, etiquetas, e referências
+ text: Pode usar sintaxe de publicações, como URL, etiquetas e referências
title: Opcional. Invisível para o destinatário
admin_account_action:
include_statuses: O utilizador verá quais as publicações que foram a razão da moderação ou advertência
@@ -25,18 +26,18 @@ pt-PT:
types:
disable: Impede o utilizador de usar a sua conta, mas não elimina ou oculta o seu conteúdo.
none: Use isto para enviar um aviso ao utilizador, sem espoletar nenhuma outra ação.
- sensitive: Força todos os anexos de media deste utilizador a serem sinalizados como problemáticos.
+ sensitive: Forçar todos os anexos multimédia deste utilizador a serem assinalados como sensíveis.
silence: Impede que o utilizador possa publicar com visibilidade pública, ocultando as suas publicações e notificações de pessoas que não o seguem. Encerra todas as denúncias contra esta conta.
suspend: Evita qualquer interação de ou para esta conta e elimina o seu conteúdo. Reversível num período de 30 dias. Encerra todas as denúncias contra esta conta.
warning_preset_id: Opcional. Tu ainda podes adicionar texto personalizado no fim do predefinido
announcement:
all_day: Quando marcado, apenas as datas do intervalo de tempo serão apresentadas
- ends_at: Opcional. O anúncio será automaticamente retirado de exibição neste momento
- scheduled_at: Deixe em branco para publicar o anúncio imediatamente
- starts_at: Opcional. Caso o seu anúncio seja vinculado a um intervalo de tempo específico
- text: Pode utilizar a sintaxe de publicações. Por favor, tenha em consideração o espaço que o comunicado ocupará no ecrã do utilizador
+ ends_at: Opcional. A mensagem de manutenção deixará de estar publicada neste momento
+ scheduled_at: Deixe em branco para publicar a mensagem de manutenção imediatamente
+ starts_at: Opcional. Caso a sua mensagem de manutenção seja vinculada a um intervalo de tempo específico
+ text: Pode utilizar a sintaxe de publicações. Por favor, tenha em consideração o espaço que a mensagem de manutenção ocupará no ecrã do utilizador
appeal:
- text: Só pode recorrer uma única vez de uma reprimenda
+ text: Só podes recorrer uma única vez de uma reprimenda
defaults:
autofollow: As pessoas que aderirem através do convite segui-lo-ão automaticamente
avatar: WEBP, PNG, GIF ou JPG. No máximo %{size}. Será reduzido para %{dimensions}px
@@ -53,15 +54,15 @@ pt-PT:
password: Use pelo menos 8 caracteres
phrase: Será correspondido independentemente da capitalização ou do aviso de conteúdo duma publicação
scopes: Quais as API a que a aplicação terá permissão para aceder. Se selecionar um âmbito de nível superior, não precisa de selecionar âmbitos individuais.
- setting_aggregate_reblogs: Não mostrar novos reforços de publicações recentemente reforçadas (só afecta publicações acabadas de reforçar)
+ setting_aggregate_reblogs: Não mostrar os novos impulsos para publicações que tenham sido recentemente impulsionadas (apenas afeta os impulsos recentemente recebidos)
setting_always_send_emails: Normalmente as notificações por e-mail não serão enviadas quando estiver a utilizar ativamente o Mastodon
- setting_default_sensitive: Media problemática oculta por padrão, pode ser revelada com um clique
- setting_display_media_default: Esconder media marcada como problemática
- setting_display_media_hide_all: Esconder sempre toda a media
- setting_display_media_show_all: Mostrar sempre a media
+ setting_default_sensitive: Os multimédia sensíveis são ocultados por predefinição e podem ser revelados com um clique/toque
+ setting_display_media_default: Esconder multimédia marcada como sensível
+ setting_display_media_hide_all: Esconder sempre toda a multimédia
+ setting_display_media_show_all: Mostrar sempre a multimédia
setting_use_blurhash: Os gradientes são baseados nas cores das imagens escondidas, mas ofuscam quaisquer pormenores
- setting_use_pending_items: Ocultar atualizações da cronologia por detrás dum clique, em vez de rolar automaticamente o fluxo
- username: Pode utilizar letras, números e sublinhados
+ setting_use_pending_items: Ocultar as atualizações da cronologia após um clique em vez de percorrer automaticamente a cronologia
+ username: Podes utilizar letras, números e traços inferiores (_)
whole_word: Quando a palavra-chave ou expressão-chave é somente alfanumérica, ela só será aplicada se corresponder à palavra completa
domain_allow:
domain: Este domínio será capaz de obter dados desta instância e os dados dele recebidos serão processados e armazenados
@@ -78,10 +79,10 @@ pt-PT:
form_admin_settings:
activity_api_enabled: Contagem, em blocos semanais, de publicações locais, utilizadores ativos e novos registos
app_icon: WEBP, PNG, GIF ou JPG. Substitui o ícone padrão da aplicação em dispositivos móveis por um ícone personalizado.
- backups_retention_period: Os utilizadores têm a possibilidade de gerar arquivos das suas mensagens para descarregar mais tarde. Quando definido para um valor positivo, estes arquivos serão automaticamente eliminados do seu armazenamento após o número de dias especificado.
+ backups_retention_period: Os utilizadores têm a possibilidade de gerar arquivos das suas publicações para descarregar mais tarde. Quando definido para um valor positivo, estes arquivos serão automaticamente eliminados do seu armazenamento após o número de dias especificado.
bootstrap_timeline_accounts: Estas contas serão destacadas no topo das recomendações aos novos utilizadores.
closed_registrations_message: Apresentado quando as inscrições estiverem encerradas
- content_cache_retention_period: Todas as publicações de outros servidores (incluindo boosts e respostas) serão eliminadas após o número de dias especificado, independentemente de qualquer interação do utilizador local com essas publicações. Isto inclui publicações em que um utilizador local as tenha marcado ou favoritado. As menções privadas entre utilizadores de instâncias diferentes também se perderão e serão impossíveis de restaurar. A utilização desta definição destina-se a instâncias para fins especiais e quebra muitas expectativas dos utilizadores quando implementada para utilização geral.
+ content_cache_retention_period: Todas as mensagens de outros servidores (incluindo impulsos e respostas) serão eliminadas após o número de dias especificado, independentemente de qualquer interação do utilizador local com essas mensagens. Isto inclui mensagens em que um utilizador local as tenha marcado ou adicionado aos favoritos. As menções privadas entre utilizadores de instâncias diferentes também se perderão e serão impossíveis de restaurar. A utilização desta definição destina-se a instâncias para fins especiais e quebra muitas expectativas dos utilizadores quando implementada para utilização geral.
custom_css: Pode aplicar estilos personalizados na versão web do Mastodon.
favicon: WEBP, PNG, GIF ou JPG. Substitui o ícone de favorito padrão do Mastodon por um ícone personalizado.
mascot: Sobrepõe-se à ilustração na interface web avançada.
@@ -110,7 +111,7 @@ pt-PT:
text: Isto vai ajudar-nos a analisar o seu pedido
ip_block:
comment: Opcional. Relembre-se por que adicionou esta regra.
- expires_in: Endereços IP são um recurso limitado, algumas vezes são compartilhados e muitas vezes mudam de mãos. Por essa razão, bloqueios de IP indefinidos não são recomendados.
+ expires_in: Os endereços de IP são um recurso limitado, algumas vezes são partilhados e muitas vezes mudam de mãos. Por essa razão, não são recomendados bloqueios de IP indefinidos.
ip: Introduza um endereço IPv4 ou IPv6. Pode bloquear intervalos inteiros usando a sintaxe CIDR. Tenha cuidado para não se bloquear a sí mesmo!
severities:
no_access: Bloquear o acesso a todos os recursos
@@ -121,7 +122,7 @@ pt-PT:
hint: Opcional. Forneça mais detalhes sobre a regra
text: Descreva uma regra ou requisito para os utilizadores nesta instância. Tente mantê-la curta e simples
sessions:
- otp: 'Insira o código de autenticação em duas etapas gerado pelo seu telemóvel ou use um dos seus códigos de recuperação:'
+ otp: 'Insira o código de autenticação de dois fatores gerado pelo seu telemóvel ou use um dos seus códigos de recuperação:'
webauthn: Se for uma chave USB tenha certeza de inseri-la e, se necessário, toque nela.
settings:
indexable: A sua página de perfil pode aparecer nos resultados de pesquisa no Google, Bing e outros.
@@ -143,11 +144,12 @@ pt-PT:
url: Para onde os eventos serão enviados
labels:
account:
+ attribution_domains_as_text: Sites autorizados a atribuir-lhe crédito
discoverable: Destacar perfil e publicações nos algoritmos de descoberta
fields:
name: Rótulo
value: Conteúdo
- indexable: Incluir mensagens públicas nos resultados da pesquisa
+ indexable: Incluir mensagens públicas nos resultados de pesquisas
show_collections: Mostrar quem sigo e os meus seguidores no perfil
unlocked: Aceitar automaticamente novos seguidores
account_alias:
@@ -161,11 +163,11 @@ pt-PT:
include_statuses: Incluir no e-mail as publicações denunciadas
send_email_notification: Notificar o utilizador por e-mail
text: Aviso personalizado
- type: Acção
+ type: Ação
types:
disable: Congelar
none: Enviar um aviso
- sensitive: Problemático
+ sensitive: Sensível
silence: Limitar
suspend: Suspender
warning_preset_id: Usar um aviso pré-definido
@@ -174,11 +176,11 @@ pt-PT:
ends_at: Fim do evento
scheduled_at: Agendar publicação
starts_at: Início do evento
- text: Comunicado
+ text: Mensagem de manutenção
appeal:
- text: Explique porque esta decisão deve ser revertida
+ text: Explicar por que razão esta decisão deve ser anulada
defaults:
- autofollow: Convidar para seguir a tua conta
+ autofollow: Convidar para seguir a sua conta
avatar: Imagem de perfil
bot: Esta é uma conta robô
chosen_languages: Filtrar idiomas
@@ -191,7 +193,7 @@ pt-PT:
email: Endereço de correio electrónico
expires_in: Expira em
fields: Metadados de perfil
- header: Cabeçalho
+ header: Imagem de cabeçalho
honeypot: "%{label} (não preencher)"
inbox_url: URL da caixa de entrada do repetidor
irreversible: Expandir em vez de esconder
@@ -199,32 +201,32 @@ pt-PT:
max_uses: Número máximo de utilizações
new_password: Nova palavra-passe
note: Biografia
- otp_attempt: Código de autenticação em duas etapas
+ otp_attempt: Código de autenticação de dois fatores
password: Palavra-passe
phrase: Palavra-chave ou frase
setting_advanced_layout: Ativar interface web avançada
- setting_aggregate_reblogs: Agrupar reforços em cronologias
- setting_always_send_emails: Enviar sempre notificações de email
+ setting_aggregate_reblogs: Agrupar impulsos em linhas de tempo
+ setting_always_send_emails: Enviar sempre notificações por e-mail
setting_auto_play_gif: Reproduzir GIF automaticamente
- setting_boost_modal: Solicitar confirmação antes de partilhar uma publicação
+ setting_boost_modal: Mostrar caixa de diálogo de confirmação antes de impulsionar
setting_default_language: Idioma de publicação
setting_default_privacy: Privacidade da publicação
- setting_default_sensitive: Marcar sempre os media como problemáticos
+ setting_default_sensitive: Marcar sempre os multimédia como sensíveis
setting_delete_modal: Solicitar confirmação antes de eliminar uma publicação
setting_disable_hover_cards: Desativar visualização de perfil ao passar o cursor
setting_disable_swiping: Desativar os movimentos de deslize
- setting_display_media: Visualização de media
+ setting_display_media: Visualização de multimédia
setting_display_media_default: Pré-definição
setting_display_media_hide_all: Esconder todos
setting_display_media_show_all: Mostrar todos
setting_expand_spoilers: Expandir sempre as publicações marcadas com avisos de conteúdo
setting_hide_network: Esconder a tua rede
- setting_reduce_motion: Reduz movimento em animações
+ setting_reduce_motion: Reduzir movimento em animações
setting_system_font_ui: Usar o tipo de letra padrão do sistema
setting_theme: Tema do sítio
setting_trends: Mostrar as tendências de hoje
setting_unfollow_modal: Solicitar confirmação antes de deixar de seguir alguém
- setting_use_blurhash: Mostrar gradientes coloridos para medias ocultas
+ setting_use_blurhash: Mostrar gradientes coloridos para multimédias ocultas
setting_use_pending_items: Modo lento
severity: Gravidade
sign_in_token_attempt: Código de segurança
@@ -251,7 +253,7 @@ pt-PT:
custom_css: CSS personalizado
favicon: Ícone de favoritos
mascot: Mascote personalizada (legado)
- media_cache_retention_period: Período de retenção de ficheiros de media em cache
+ media_cache_retention_period: Período de retenção de ficheiros multimédia em cache
peers_api_enabled: Publicar lista de servidores descobertos na API
profile_directory: Ativar o diretório de perfis
registrations_mode: Quem se pode inscrever
@@ -288,14 +290,14 @@ pt-PT:
sign_up_requires_approval: Limitar inscrições
severity: Regra
notification_emails:
- appeal: Alguém recorreu de uma decisão de moderação
+ appeal: Alguém contestou uma decisão de moderação
digest: Enviar e-mails de resumo
- favourite: Alguém adicionou uma publicação sua aos marcadores
+ favourite: Quando alguém adiciona uma publicação sua aos favoritos
follow: Alguém começou a segui-lo
follow_request: Alguém pediu para ser seu seguidor
mention: Alguém o mencionou
pending_account: Uma nova conta aguarda aprovação
- reblog: Alguém reforçou uma publicação sua
+ reblog: Alguém impulsionou uma publicação sua
report: Uma nova denúncia foi submetida
software_updates:
all: Notificar todas as atualizações
@@ -314,7 +316,7 @@ pt-PT:
listable: Permitir que esta etiqueta apareça em pesquisas e no diretório de perfis
name: Etiqueta
trendable: Permitir que esta etiqueta apareça nas tendências
- usable: Permitir que as publicações usem esta hashtag localmente
+ usable: Permitir que as publicações usem esta etiqueta localmente
user:
role: Função
time_zone: Fuso horário
diff --git a/config/locales/simple_form.ro.yml b/config/locales/simple_form.ro.yml
index 458638ddec..801a61d5aa 100644
--- a/config/locales/simple_form.ro.yml
+++ b/config/locales/simple_form.ro.yml
@@ -3,10 +3,13 @@ ro:
simple_form:
hints:
account:
+ attribution_domains_as_text: Una pe linie. Protejează împotriva atribuirilor false.
discoverable: Este posibil ca postările și profilul tău să fie recomandate în diferite zone ale Mastodon, iar profilul tău ar poate fi sugerat altor utilizatori.
+ display_name: Numele dvs. complet sau numele dvs. amuzant.
fields: Pagina ta principală, pronumele tale, vârsta, sau orice îți dorești.
indexable: Postările tale publice pot apărea în rezultatele căutărilor pe Mastodon. Persoanele care au interacționat cu postările tale vor putea să le caute oricând.
note: 'Poți @menționa alte persoane sau #hashtag-uri.'
+ show_collections: Oamenii vor putea să răsfoiască urmăriți și urmăritorii dvs. Oamenii pe care îi urmăriți vor vedea că îi urmăriți indiferent.
unlocked: Alte persoane vă vor putea urmări fără a solicita aprobare. Debifați dacă doriți să revizuiți cererile și să alegeți dacă doriți să acceptați sau să respingeți noii urmăritori.
account_alias:
acct: Specificați numele de utilizator@domeniu al contului de la care doriți să treceți
@@ -20,6 +23,12 @@ ro:
send_email_notification: Utilizatorul va primi o explicație cu privire la ceea ce sa întâmplat cu contul lui
text_html: Opțional. Poți utiliza sintaxe. Poți adăuga avertismente predefinite pentru a salva timp
type_html: Alege ce se întâmplă cu %{acct}
+ types:
+ disable: Împiedicați utilizatorul să-și folosească contul, dar nu ștergeți sau ascundeți conținutul acestuia.
+ none: Utilizați acest lucru pentru a trimite o avertizare utilizatorului, fără a declanșa nicio altă acțiune.
+ sensitive: Forțează toate atașamentele media ale acestui utilizator să fie marcate ca sensibile.
+ silence: Împiedicați utilizatorul să poată posta cu vizibilitate publică, ascundeți postările și notificările de la persoanele care nu le urmăresc. Închide toate rapoartele pentru acest cont.
+ suspend: Preveniți orice interacțiune din sau către acest cont și ștergeți conținutul acestuia. Reversibil în 30 de zile. Închide toate rapoartele pentru acest cont.
warning_preset_id: Opțional. Poți adăuga text personalizat la sfârșitul presetului
announcement:
all_day: Când este bifat, numai datele intervalului de timp vor fi afișate
@@ -27,6 +36,8 @@ ro:
scheduled_at: Lăsați necompletat pentru a publica anunțul imediat
starts_at: Opțional. În cazul în care anunțul tău este legat de un anumit interval de timp
text: Poți folosi sintaxa de postare. Te rugăm să fii atent la spațiul pe care anunțul îl va ocupa pe ecranul utilizatorului
+ appeal:
+ text: Puteți contesta un avertisment o singură dată
defaults:
autofollow: Persoanele care se înregistrează datorită invitației tale te vor urmări automat
avatar: WEBP, PNG, GIF sau JPG. Cel mult %{size}. Va fi redimensionată la %{dimensions}px
@@ -65,27 +76,74 @@ ro:
actions:
hide: Ascunde complet conținutul filtrat, ca și cum nu ar exista
warn: Ascunde conținutul filtrat în spatele unui avertisment care menționează titlul filtrului
+ form_admin_settings:
+ activity_api_enabled: Numărul de postări publicate local, utilizatori activi și înregistrări noi în grupe săptămânale
+ app_icon: WEBP, PNG, GIF sau JPG. Înlocuiește pictograma implicită a aplicației pe dispozitivele mobile cu o pictogramă personalizată.
+ backups_retention_period: Utilizatorii au posibilitatea de a genera arhive ale postărilor lor pentru a le descărca mai târziu. Când este setat la o valoare pozitivă, aceste arhive vor fi șterse automat din spațiul dvs. de stocare după numărul de zile specificat.
+ bootstrap_timeline_accounts: Aceste conturi vor fi fixate în partea de sus a recomandărilor de urmărire ale noilor utilizatori.
+ closed_registrations_message: Afișat când înscrierile sunt închise
+ content_cache_retention_period: Toate postările de pe alte servere (inclusiv amplificarea și răspunsurile) vor fi șterse după numărul specificat de zile, fără a ține cont de interacțiunea utilizatorului local cu acele postări. Aceasta include postările în care un utilizator local le-a marcat ca marcaje sau favorite. Mențiunile private între utilizatorii din diferite instanțe se vor pierde și vor fi imposibil de restaurat. Utilizarea acestei setări este destinată cazurilor cu scop special și încalcă multe așteptări ale utilizatorilor atunci când este implementată pentru uz general.
+ custom_css: Puteți aplica stiluri personalizate pe versiunea web a Mastodon.
+ favicon: WEBP, PNG, GIF sau JPG. Suprascrie favicon-ul implicit Mastodon cu o pictogramă personalizată.
+ mascot: Suprascrie ilustrația din interfața web avansată.
+ media_cache_retention_period: Fișierele media din postările făcute de utilizatorii la distanță sunt stocate în cache pe serverul dvs. Când este setată la o valoare pozitivă, fișierele media vor fi ștearse după numărul specificat de zile. Dacă datele media sunt solicitate după ce sunt șterse, acestea vor fi re-descărcate, dacă conținutul sursă este încă disponibil. Din cauza restricțiilor cu privire la frecvența cu care cardurile de previzualizare a linkurilor interogează site-urile terțelor părți, se recomandă să setați această valoare la cel puțin 14 zile, sau cardurile de previzualizare a linkurilor nu vor fi actualizate la cerere înainte de această oră.
+ peers_api_enabled: O listă de nume de domenii pe care acest server le-a întâlnit în fediverse. Nu sunt incluse aici date despre dacă vă federați cu un anumit server, doar că serverul dvs. știe despre asta. Acesta este folosit de serviciile care colectează statistici despre federație în sens general.
+ profile_directory: Directorul de profil listează toți utilizatorii care au optat pentru a fi descoperibili.
+ require_invite_text: Când înscrierile necesită aprobare manuală, faceți introducerea textului „De ce doriți să vă alăturați?” obligatorie și nu opțională
+ site_contact_email: Cum vă pot contacta oamenii pentru întrebări juridice sau de asistență.
+ site_contact_username: Cum vă pot contacta oamenii pe Mastodon.
+ site_extended_description: Orice informație suplimentară care poate fi utilă vizitatorilor și utilizatorilor dvs. Poate fi structurată cu sintaxa Markdown.
+ site_short_description: O descriere scurtă pentru a ajuta la identificarea unică a serverului dvs. Cine-l conduce, pentru cine este?
+ site_terms: Utilizați propria politică de confidențialitate sau lăsați necompletat pentru a o utiliza pe cea implicit. Poate fi structurată cu sintaxa Markdown.
+ site_title: Cum se pot referi oamenii la serverul dvs. în afară de numele său de domeniu.
+ status_page_url: URL-ul unei pagini unde oamenii pot vedea starea acestui server în timpul unei întreruperi
+ theme: Tema pe care vizitatorii deconectați și utilizatorii noi o văd.
+ thumbnail: O imagine de aproximativ 2:1 afișată alături de informațiile serverului dvs.
+ timeline_preview: Vizitatorii deconectați vor putea să răsfoiască cele mai recente postări publice disponibile pe server.
+ trendable_by_default: Omiteți revizuirea manuală a conținutului în tendințe. Elementele individuale pot fi în continuare eliminate din tendințe după fapt.
+ trends: Tendințele arată ce postări, hashtag-uri și știri câștigă teren pe serverul dvs.
+ trends_as_landing_page: Afișați conținut în tendințe utilizatorilor deconectați și vizitatorilor în loc de o descriere a acestui server. Necesită ca tendințele să fie activate.
form_challenge:
current_password: Ați intrat într-o zonă securizată
imports:
data: Fișierul CSV exportat de la o altă instanță
invite_request:
text: Acest lucru ne va ajuta să revizuim cererea dvs
+ ip_block:
+ comment: Opțional. Amintiți-vă de ce ați adăugat această regulă.
+ expires_in: Adresele IP sunt o resursă finită, uneori sunt partajate și adesea se schimbă. Din acest motiv, blocurile IP nedefinite nu sunt recomandate.
+ ip: Introduceți o adresă IPv4 sau IPv6. Puteți bloca întregul spectru folosind sintaxa CIDR. Aveți grijă să nu vă blocați!
+ severities:
+ no_access: Blocați accesul la toate resursele
+ sign_up_block: Nu vor fi posibile înscrieri noi
+ sign_up_requires_approval: Înscrierile noi vor necesita aprobarea dvs.
+ severity: Alegeți ce se va întâmpla cu cererile de la acestă adresă IP
+ rule:
+ hint: Opțional. Oferiți mai multe detalii despre regulă
+ text: Descrieți o regulă sau o cerință pentru utilizatorii de pe acest server. Încercați să o faceți scurtă și simplă
sessions:
otp: 'Introdu codul pentru dubla protecție generat de telefonul mobil sau unul din codurile de rezervă:'
+ webauthn: Dacă este o cheie USB, asigurați-vă că o introduceți și, dacă este necesar, atingeți-o.
+ settings:
+ indexable: Pagina dvs. de profil poate apărea în rezultatele căutării pe Google, Bing și altele.
+ show_application: Veți putea întotdeauna să vedeți ce aplicație v-a publicat postarea.
tag:
name: Poți doar să schimbi caseta literelor, de exemplu, pentru a o face mai lizibilă
user:
chosen_languages: Doar postările în limbile selectate vor fi afișate în fluxurile publice
+ role: Rolul controlează ce permisiuni are utilizatorul.
+ user_role:
+ color: Culoare care va fi folosită pentru rol în întreaga interfață, ca RGB în format hexazecimal
labels:
account:
+ attribution_domains_as_text: Site-uri web care vă pot credita
fields:
name: Etichetă
value: Conținut
account_alias:
- acct: Manipularea contului vechi
+ acct: Identificatorul contului vechi
account_migration:
- acct: Manipularea contului nou
+ acct: Identificatorul contului nou
account_warning_preset:
text: Text presetat
title: Titlu
diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml
index 3ff746451b..37626ff9fd 100644
--- a/config/locales/simple_form.ru.yml
+++ b/config/locales/simple_form.ru.yml
@@ -3,7 +3,7 @@ ru:
simple_form:
hints:
account:
- attribution_domains_as_text: Защищает от ложных атрибуций.
+ attribution_domains_as_text: По одному на строку. Защищает от ложных атрибуций.
discoverable: Ваши публичные сообщения и профиль могут быть показаны или рекомендованы в различных разделах Mastodon, и ваш профиль может быть предложен другим пользователям.
display_name: Ваше полное имя или псевдоним.
fields: Ваша домашняя страница, местоимения, возраст - все, что угодно.
@@ -144,7 +144,7 @@ ru:
url: Куда события будут отправляться
labels:
account:
- attribution_domains_as_text: Разрешить только определенные сайты
+ attribution_domains_as_text: Веб-сайты, которым разрешено ссылаться на вас
discoverable: Профиль и сообщения в алгоритмах обнаружения
fields:
name: Пункт
diff --git a/config/locales/simple_form.sl.yml b/config/locales/simple_form.sl.yml
index d1ae553c8c..d9645aceba 100644
--- a/config/locales/simple_form.sl.yml
+++ b/config/locales/simple_form.sl.yml
@@ -3,6 +3,7 @@ sl:
simple_form:
hints:
account:
+ attribution_domains_as_text: Ena na vrstico. Ščiti pred napačno navedbo avtorstva.
discoverable: Vaše javne objave in profil so lahko predstavljeni ali priporočeni v različnih delih Mastodona, vaš profil pa je lahko predlagan drugim uporabnikom.
display_name: Vaše polno ime ali lažno ime.
fields: Vaša domača stran, starost, kar koli.
@@ -130,6 +131,7 @@ sl:
name: Spremenite lahko le npr. velikost črk (velike/male), da je bolj berljivo
user:
chosen_languages: Ko je označeno, bodo v javnih časovnicah prikazane samo objave v izbranih jezikih
+ role: Vloga določa, katera dovoljenja ima uporabnik.
user_role:
color: Barva, uporabljena za vlogo po celem up. vmesniku, podana v šestnajstiškem zapisu RGB
highlighted: S tem je vloga javno vidna
@@ -142,6 +144,7 @@ sl:
url: Kam bodo poslani dogodki
labels:
account:
+ attribution_domains_as_text: Spletna mesta, ki vas smejo navajati kot avtorja/ico
discoverable: Izpostavljaj profile in objave v algoritmih odkrivanja
fields:
name: Oznaka
diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml
index 169f4a02de..1ca9037e63 100644
--- a/config/locales/simple_form.sq.yml
+++ b/config/locales/simple_form.sq.yml
@@ -3,7 +3,7 @@ sq:
simple_form:
hints:
account:
- attribution_domains_as_text: Mbron nga atribuime të rreme.
+ attribution_domains_as_text: Një për rresht. Kjo mbron nga atribuime të rreme.
discoverable: Postimet dhe profili juaj publik mund të shfaqen, ose rekomandohen në zona të ndryshme të Mastodon-it dhe profili juaj mund të sugjerohet përdoruesve të tjerë.
display_name: Emri juaj i plotë, ose emri juaj lojcak.
fields: Faqja juaj hyrëse, përemra, moshë, ç’të keni qejf.
@@ -144,7 +144,7 @@ sq:
url: Ku do të dërgohen aktet
labels:
account:
- attribution_domains_as_text: Lejo vetëm sajte specifikë
+ attribution_domains_as_text: Sajte të lejuar t’ju japin hakë
discoverable: Profilin dhe postimet bëji objekt të algoritmeve të zbulimit
fields:
name: Etiketë
diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml
index 297e96a2bd..49ad75e3c6 100644
--- a/config/locales/simple_form.sv.yml
+++ b/config/locales/simple_form.sv.yml
@@ -3,6 +3,7 @@ sv:
simple_form:
hints:
account:
+ attribution_domains_as_text: En per rad. Skyddar mot falska attributioner.
discoverable: Dina offentliga inlägg och din profil kan komma att presenteras eller rekommenderas inom olika områden av Mastodon och din profil kan komma att föreslås till andra användare.
display_name: Ditt fullständiga namn eller ditt roliga namn.
fields: Din hemsida, ditt pronomen, din ålder, vadhelst du vill.
@@ -73,7 +74,7 @@ sv:
filters:
action: Välj vilken åtgärd som ska utföras när ett inlägg matchar filtret
actions:
- hide: Dölj det filtrerade innehållet helt (beter sig som om det inte fanns)
+ hide: Dölj det filtrerade innehållet helt, beter sig som om det inte fanns
warn: Dölj det filtrerade innehållet bakom en varning som visar filtrets rubrik
form_admin_settings:
activity_api_enabled: Antalet lokalt publicerade inlägg, aktiva användare och nya registrerade konton per vecka
@@ -143,12 +144,13 @@ sv:
url: Dit händelser kommer skickas
labels:
account:
+ attribution_domains_as_text: Webbplatser som får kreditera dig
discoverable: Presentera profil och inlägg med upptäcktsalgoritmer
fields:
name: Etikett
value: Innehåll
indexable: Inkludera offentliga inlägg i sökresultaten
- show_collections: Göm följare och följeslagare på profilen
+ show_collections: Visa följare och följeslagare på profilen
unlocked: Godkänn nya följare automatiskt
account_alias:
acct: Namnet på det gamla kontot
diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml
index 1ecd672a97..f8f4d3f119 100644
--- a/config/locales/simple_form.th.yml
+++ b/config/locales/simple_form.th.yml
@@ -3,7 +3,7 @@ th:
simple_form:
hints:
account:
- attribution_domains_as_text: ปกป้องจากการระบุแหล่งที่มาที่ผิด
+ attribution_domains_as_text: หนึ่งรายการต่อบรรทัด ปกป้องจากการระบุแหล่งที่มาที่ผิด
discoverable: อาจแสดงหรือแนะนำโพสต์และโปรไฟล์สาธารณะของคุณในพื้นที่ต่าง ๆ ของ Mastodon และอาจเสนอแนะโปรไฟล์ของคุณให้กับผู้ใช้อื่น ๆ
display_name: ชื่อเต็มของคุณหรือชื่อแบบสนุกสนานของคุณ
fields: หน้าแรก, สรรพนาม, อายุของคุณ สิ่งใดก็ตามที่คุณต้องการ
@@ -144,7 +144,7 @@ th:
url: ที่ซึ่งจะส่งเหตุการณ์ไปยัง
labels:
account:
- attribution_domains_as_text: อนุญาตเฉพาะเว็บไซต์ที่เฉพาะเจาะจงเท่านั้น
+ attribution_domains_as_text: เว็บไซต์ที่ได้รับอนุญาตให้ให้เครดิตคุณ
discoverable: แสดงโปรไฟล์และโพสต์ในอัลกอริทึมการค้นพบ
fields:
name: ป้ายชื่อ
diff --git a/config/locales/simple_form.tok.yml b/config/locales/simple_form.tok.yml
index 37b0ee765a..98968ffa93 100644
--- a/config/locales/simple_form.tok.yml
+++ b/config/locales/simple_form.tok.yml
@@ -3,7 +3,16 @@ tok:
simple_form:
hints:
account:
+ attribution_domains_as_text: linja sitelen wan la wan taso o lon. ni la, sona pona pi jan pali li lon.
display_name: nimi sina ale anu nimi sina musi.
+ fields: lipu open sina, en nimi pi kon sina, en suli tenpo sina, en ijo ante ale pi wile sina.
+ note: 'sina ken @mu e jan ante, li ken lon e #kulupu toki suli.'
+ show_collections: 'jan li ken lukin e ni: sina kute e jan seme, jan seme li kute e sina. ale la, sina kute e jan la ona li sona.'
+ unlocked: ni li lon la, ale la jan li ken kute e sina. sina ken anu ala e ona la, ni li suli ala. sina wile ken e wile kute, li wile ala e ona, la o ala e nasin ni.
+ account_alias:
+ acct: o toki e nimi@ma pi sijelo tan
+ account_migration:
+ acct: o toki e nimi@ma pi sijelo tawa
defaults:
setting_display_media_hide_all: sitelen ale li len
setting_display_media_show_all: sitelen ale li len ala
diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml
index d90b97bf9b..5aed566626 100644
--- a/config/locales/simple_form.tr.yml
+++ b/config/locales/simple_form.tr.yml
@@ -3,7 +3,7 @@ tr:
simple_form:
hints:
account:
- attribution_domains_as_text: Sahte atıflardan korur.
+ attribution_domains_as_text: Her satırda bir tanesi. Sahte atıflardan korur.
discoverable: Herkese açık gönderileriniz ve profiliniz Mastodon'un çeşitli kısımlarında öne çıkarılabilir veya önerilebilir ve profiliniz başka kullanıcılara önerilebilir.
display_name: Tam adınız veya kullanıcı adınız.
fields: Ana sayfanız, zamirleriniz, yaşınız, istediğiniz herhangi bir şey.
@@ -144,7 +144,7 @@ tr:
url: Olayların gönderileceği yer
labels:
account:
- attribution_domains_as_text: Yalnızca belirli websitelerine izin ver
+ attribution_domains_as_text: Size atıf verebilecek websiteleri
discoverable: Profil ve gönderileri keşif algoritmalarında kullan
fields:
name: Etiket
diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml
index b584a6cada..9b901cbe2c 100644
--- a/config/locales/simple_form.uk.yml
+++ b/config/locales/simple_form.uk.yml
@@ -3,7 +3,7 @@ uk:
simple_form:
hints:
account:
- attribution_domains_as_text: Захищає від фальшивих атрибутів.
+ attribution_domains_as_text: Один на рядок. Захищає від фальшивих атрибутів.
discoverable: Ваші дописи та профіль можуть бути рекомендовані в різних частинах Mastodon і ваш профіль може бути запропонований іншим користувачам.
display_name: Ваше повне ім'я або ваш псевдонім.
fields: Ваша домашня сторінка, займенники, вік, все, що вам заманеться.
@@ -144,7 +144,7 @@ uk:
url: Куди надсилатимуться події
labels:
account:
- attribution_domains_as_text: Дозволити лише на певних вебсайтах
+ attribution_domains_as_text: Сайти дозволяють вам вказувати ваше авторство
discoverable: Функції профілю та дописів у алгоритмах виявлення
fields:
name: Мітка
@@ -213,7 +213,7 @@ uk:
setting_default_privacy: Видимість дописів
setting_default_sensitive: Позначати медіа делікатними
setting_delete_modal: Показувати діалог підтвердження під час видалення допису
- setting_disable_hover_cards: Вимкнути попередній перегляд профілю при наведенні
+ setting_disable_hover_cards: Вимкнути попередній перегляд профілю під час наведення мишки
setting_disable_swiping: Вимкнути рух посування
setting_display_media: Показ медіа
setting_display_media_default: За промовчанням
@@ -316,7 +316,7 @@ uk:
listable: Дозволити появу цього хештеґа у каталозі пошуку і пропозицій
name: Хештеґ
trendable: Дозволити появу цього хештеґа у списку популярних хештеґів
- usable: Дозволити дописам використовувати цей хештег локально
+ usable: Дозволити дописам використовувати цей гештеґ локально
user:
role: Роль
time_zone: Часовий пояс
diff --git a/config/locales/simple_form.vi.yml b/config/locales/simple_form.vi.yml
index 010bb262ad..2b1d84f595 100644
--- a/config/locales/simple_form.vi.yml
+++ b/config/locales/simple_form.vi.yml
@@ -3,7 +3,7 @@ vi:
simple_form:
hints:
account:
- attribution_domains_as_text: Bảo vệ khỏi những sự gán ghép sai.
+ attribution_domains_as_text: Mỗi cái một dòng. Bảo vệ khỏi những sự gán ghép sai.
discoverable: Hồ sơ và tút công khai của bạn được đề xuất cho những người dùng Mastodon khác.
display_name: Tên đầy đủ hoặc biệt danh đều được.
fields: Trang blog của bạn, nghề nghiệp, tuổi hoặc bất cứ thứ gì.
@@ -43,7 +43,7 @@ vi:
avatar: WEBP, PNG, GIF hoặc JPG, tối đa %{size}. Sẽ bị nén xuống %{dimensions}px
bot: Tài khoản này tự động thực hiện các hành động và không được quản lý bởi người thật
context: Chọn những nơi mà bộ lọc sẽ áp dụng
- current_password: Vì mục đích bảo mật, vui lòng nhập mật khẩu của tài khoản hiện tại
+ current_password: Để bảo mật, vui lòng nhập mật khẩu của tài khoản hiện tại
current_username: Để xác nhận, vui lòng nhập tên người dùng của tài khoản hiện tại
digest: Chỉ gửi sau một thời gian dài không hoạt động hoặc khi bạn nhận được tin nhắn (trong thời gian vắng mặt)
email: Bạn sẽ được gửi một email xác minh
@@ -144,7 +144,7 @@ vi:
url: Nơi những sự kiện được gửi đến
labels:
account:
- attribution_domains_as_text: Chỉ cho phép các website đặc biệt
+ attribution_domains_as_text: Các trang web được ghi nhận cho bạn
discoverable: Cho phép khám phá hồ sơ
fields:
name: Nhãn
@@ -290,7 +290,7 @@ vi:
sign_up_requires_approval: Giới hạn đăng ký
severity: Mức độ
notification_emails:
- appeal: Ai đó kháng cáo kiểm duyệt
+ appeal: Ai đó khiếu nại kiểm duyệt
digest: Gửi email định kỳ
favourite: Ai đó thích tút của bạn
follow: Ai đó theo dõi bạn
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index 419cb99abb..7e204f6b3b 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -3,20 +3,20 @@ zh-CN:
simple_form:
hints:
account:
- attribution_domains_as_text: 保护作品免受虚假署名。
- discoverable: 您的公开嘟文和个人资料可能会在 Mastodon 的多个位置展示，您的个人资料可能会被推荐给其他用户。
+ attribution_domains_as_text: 每行一个域名。这样就可以保护作品免受虚假署名。
+ discoverable: 你的公开嘟文和个人资料可能会在 Mastodon 的多个位置展示，你的个人资料可能会被推荐给其他用户。
display_name: 你的全名或昵称。
fields: 你的主页、人称代词、年龄，以及任何你想要添加的内容。
- indexable: 您的公开嘟文会出现在 Mastodon 的搜索结果中。无论是否勾选，与您的嘟文有过交互的人都可能通过搜索找到它们。
- note: '你可以提及 @其他人 或 #标签 。'
- show_collections: 人们将能够浏览您的关注和追随者。您关注的人会看到您关注他们。
+ indexable: 你的公开嘟文会出现在 Mastodon 的搜索结果中。无论是否勾选，与你的嘟文有过交互的人都可能通过搜索找到它们。
+ note: '你可以提及 @其他人 或 #话题 。'
+ show_collections: 人们将能够浏览你的关注和追随者。你关注的人会看到你关注他们。
unlocked: 人们将能够在不请求批准的情况下关注你。如果你希望审核关注请求并选择接受或拒绝新的粉丝，请取消勾选此项。
account_alias:
acct: 指定你想要迁移过来的原账号：用户名@站点域名
account_migration:
acct: 指定你想迁移过去的目标账号：用户名@站点域名
account_warning_preset:
- text: 你可以使用嘟文格式，例如加入 URL、话题标签和“@”
+ text: 你可以使用嘟文格式，例如加入 URL、话题和“@”
title: 可选。对接收者不可见
admin_account_action:
include_statuses: 用户将会看到哪些嘟文导致了管理操作或警告
@@ -24,11 +24,11 @@ zh-CN:
text_html: 可选。你可以使用嘟文格式。你可以预置警告以节省时间
type_html: 用%{acct}选择做什么
types:
- disable: 禁止用户使用账户，但不会删除或隐藏账户内容。
+ disable: 禁止用户使用账号，但不会删除或隐藏账号内容。
none: 用它来向用户发送警告，不会触发其他操作。
sensitive: 强制将此用户的所有媒体文件标记为敏感内容。
- silence: 阻止用户发送公开嘟文，除了关注者以外，其他人都无法看到他的嘟文和通知。关闭针对此账户的所有举报。
- suspend: 阻止此账户的任何交互并删除其内容。30天内可以撤销操作。关闭针对此账户的所有举报。
+ silence: 阻止用户发送公开嘟文，除了关注者以外，其他人都无法看到他的嘟文和通知。关闭针对此账号的所有举报。
+ suspend: 阻止此账号的任何交互并删除其内容。30天内可以撤销操作。关闭针对此账号的所有举报。
warning_preset_id: 可选。你可以在预置文本末尾添加自定义文本
announcement:
all_day: 如果选中，只有该时间段内的日期会显示。
@@ -41,15 +41,15 @@ zh-CN:
defaults:
autofollow: 通过邀请链接注册的用户将会自动关注你
avatar: 支持WEBP、PNG、GIF 或 JPG。最大 %{size}。将缩小到 %{dimensions}px
- bot: 来自这个账户的绝大多数操作都是自动进行的，并且可能无人监控
- context: 过滤器的应用环境
+ bot: 来自这个账号的绝大多数操作都是自动进行的，并且可能无人监控
+ context: 过滤规则将被应用到的一个或多个场景
current_password: 为了安全起见，请输入当前账号的密码
current_username: 请输入当前账号的用户名以确认
digest: 仅在你长时间未登录，且收到了私信时发送
email: 我们会向你发送一封确认邮件
- header: 支持WEBP、PNG、GIF 或 JPG。最大 %{size}。将缩小到 %{dimensions}px
+ header: 支持 WEBP、PNG、GIF 或 JPG。最大 %{size}。分辨率将被压缩至 %{dimensions}px
inbox_url: 从你想要使用的中继站的主页上复制 URL
- irreversible: 已过滤的嘟文会不可逆转地消失，即便移除过滤器之后也一样
+ irreversible: 被过滤的嘟文会永久消失，移除过滤规则后也不会恢复
locale: 在用户界面、电子邮件和推送通知中使用的语言
password: 至少需要8个字符
phrase: 匹配将忽略嘟文或内容警告里的字母大小写
@@ -61,8 +61,8 @@ zh-CN:
setting_display_media_hide_all: 始终隐藏媒体
setting_display_media_show_all: 始终显示媒体
setting_use_blurhash: 渐变是基于模糊后的隐藏内容生成的
- setting_use_pending_items: 关闭自动滚动更新，时间轴会在点击后更新
- username: 您只能使用字母、数字和下划线
+ setting_use_pending_items: 点击查看时间线更新，而非自动滚动更新动态。
+ username: 你只能使用字母、数字和下划线
whole_word: 如果关键词只包含字母和数字，将只在词语完全匹配时才会应用
domain_allow:
domain: 该站点将能够从该服务器上拉取数据，并处理和存储收到的数据。
@@ -72,22 +72,22 @@ zh-CN:
featured_tag:
name: 以下是你最近使用过的标签：
filters:
- action: 选择在嘟文命中过滤器时要执行的操作
+ action: 选择在嘟文命中过滤规则时要执行的操作
actions:
- hide: 彻底屏蔽过滤内容，犹如它不曾存在过一般
- warn: 在警告中提及过滤器标题后，隐藏过滤内容
+ hide: 选择在嘟文命中过滤规则时要执行的操作
+ warn: 显示带有过滤规则标题的警告，并隐藏过滤内容
form_admin_settings:
activity_api_enabled: 本站每周的嘟文数、活跃用户数和新注册用户数
app_icon: WEBP、PNG、GIF 或 JPG。使用自定义图标覆盖移动设备上的默认应用图标。
backups_retention_period: 用户可以生成其嘟文存档以供之后下载。当该值被设为正值时，这些存档将在指定的天数后自动从你的存储中删除。
- bootstrap_timeline_accounts: 这些账号将在新用户关注推荐中置顶。
+ bootstrap_timeline_accounts: 这些账号将在新用户关注推荐中置顶显示。
closed_registrations_message: 在关闭注册时显示
content_cache_retention_period: 来自其它实例的所有嘟文（包括转嘟与回复）都将在指定天数后被删除，不论本实例用户是否与这些嘟文产生过交互。这包括被本实例用户喜欢和收藏的嘟文。实例间用户的私下提及也将丢失并无法恢复。此设置针对的是特殊用途的实例，用于一般用途时会打破许多用户的期望。
custom_css: 你可以为网页版 Mastodon 应用自定义样式。
favicon: WEBP、PNG、GIF 或 JPG。使用自定义图标覆盖 Mastodon 的默认图标。
mascot: 覆盖高级网页界面中的绘图形象。
media_cache_retention_period: 来自外站用户嘟文的媒体文件将被缓存到你的实例上。当该值被设为正值时，缓存的媒体文件将在指定天数后被清除。如果媒体文件在被清除后重新被请求，且源站内容仍然可用，它将被重新下载。由于链接预览卡拉取第三方站点的频率受到限制，建议将此值设置为至少 14 天，如果小于该值，链接预览卡将不会按需更新。
- peers_api_enabled: 此服务器在联邦宇宙中遇到的域名列表。 这里不包含关于您是否与给定服务器联合的数据，只是您的服务器知道它。 这由收集一般意义上的联邦统计信息的服务使用。
+ peers_api_enabled: 本站在联邦宇宙中遇到的站点列表。 此处不包含关于您是否与给定站点联合的数据，只是您的实例知道它。 这由收集一般意义上的联合统计信息的服务使用。
profile_directory: 个人资料目录会列出所有选择可被发现的用户。
require_invite_text: 当注册需要手动批准时，将“你为什么想要加入？”设为必填项
site_contact_email: 他人需要询恰法务或支持信息时的联络方式
@@ -99,7 +99,7 @@ zh-CN:
status_page_url: 配置一个网址，当服务中断时，人们可以通过该网址查看服务器的状态。
theme: 给未登录访客和新用户使用的主题。
thumbnail: 与服务器信息一并展示的约 2:1 比例的图像。
- timeline_preview: 未登录访客将能够浏览服务器上最新的公共嘟文。
+ timeline_preview: 未登录访客将能够浏览服务器上的最新公开嘟文。
trendable_by_default: 跳过对热门内容的手工审核。个别项目仍可在之后从趋势中删除。
trends: 热门页中会显示正在你服务器上受到关注的嘟文、标签和新闻故事。
trends_as_landing_page: 向注销的用户和访问者显示热门内容，而不是对该服务器的描述，需要启用热门。
@@ -125,17 +125,17 @@ zh-CN:
otp: 输入你手机应用上生成的双因素认证代码，或者任意一个恢复代码：
webauthn: 如果是 USB 密钥，请确保将其插入，如有必要，请点击它。
settings:
- indexable: 您的个人资料页面可能会出现在Google、Bing等搜索结果中。
+ indexable: 你的个人资料可能会出现在Google、Bing等的搜索结果中。
show_application: 无论如何，你始终可以看到是哪个应用发布了你的嘟文。
tag:
name: 你只能改变字母的大小写，让它更易读
user:
- chosen_languages: 仅选中语言的嘟文会出现在公共时间轴上（全不选则显示所有语言的嘟文）
+ chosen_languages: 仅选中语言的嘟文会出现在公共时间线上（全不选则显示所有语言的嘟文）
role: 角色用于控制用户拥有的权限。
user_role:
color: 在界面各处用于标记该角色的颜色，以十六进制 RGB 格式表示
highlighted: 使角色公开可见
- name: 角色的公开名称，将在设为展示徽章时使用
+ name: 角色的公开名称，将在外显为徽章时使用
permissions_as_keys: 具有此角色的用户将有权访问...
position: 用于在特定情况下处理决策冲突。一些特定操作只能对优先级更低的角色执行
webhook:
@@ -144,13 +144,13 @@ zh-CN:
url: 事件将被发往的目的地
labels:
account:
- attribution_domains_as_text: 仅允许特定网站
- discoverable: 在发现算法中展示你的个人资料和嘟文
+ attribution_domains_as_text: 授权展示你的署名的网站
+ discoverable: 在发现算法中展示你的账号与嘟文
fields:
name: 标签
value: 内容
indexable: 将公开嘟文纳入搜索范围
- show_collections: 在个人资料中显示关注和关注者
+ show_collections: 在个人资料显示关注和关注者
unlocked: 自动接受新关注者
account_alias:
acct: 处理旧账号
@@ -180,20 +180,20 @@ zh-CN:
appeal:
text: 说明此结果应当被推翻的理由
defaults:
- autofollow: 让被邀请人关注你的账户
+ autofollow: 让被邀请人关注你的账号
avatar: 头像
- bot: 这是一个机器人账户
- chosen_languages: 语言过滤
+ bot: 这是一个机器人账号
+ chosen_languages: 过滤语言
confirm_new_password: 确认新密码
confirm_password: 确认密码
- context: 过滤环境
+ context: 过滤规则生效场景
current_password: 当前密码
data: 数据文件
display_name: 昵称
email: 邮箱地址
expires_in: 失效时间
fields: 个人资料附加信息
- header: 个人资料页横幅图片
+ header: 封面图
honeypot: "%{label} (请勿填写)"
inbox_url: 中继站收件箱的 URL
irreversible: 丢弃而非隐藏
@@ -205,7 +205,7 @@ zh-CN:
password: 密码
phrase: 关键词
setting_advanced_layout: 启用高级 Web 界面
- setting_aggregate_reblogs: 在时间轴中合并转嘟
+ setting_aggregate_reblogs: 在时间线中合并转嘟
setting_always_send_emails: 总是发送电子邮件通知
setting_auto_play_gif: 自动播放 GIF 动画
setting_boost_modal: 在转嘟前询问我
@@ -238,16 +238,16 @@ zh-CN:
email_domain_block:
with_dns_records: 包括该域名的 MX 记录和 IP 地址
featured_tag:
- name: 话题标签
+ name: 话题
filters:
actions:
hide: 完全隐藏
- warn: 隐藏时显示警告信息
+ warn: 隐藏时显示警告
form_admin_settings:
activity_api_enabled: 在 API 中发布有关用户活动的汇总统计数据
app_icon: 应用图标
backups_retention_period: 用户存档保留期
- bootstrap_timeline_accounts: 推荐新用户关注以下账号
+ bootstrap_timeline_accounts: 向新用户推荐以下账号
closed_registrations_message: 在关闭注册时显示的自定义消息
content_cache_retention_period: 外站内容保留期
custom_css: 自定义 CSS
@@ -257,9 +257,9 @@ zh-CN:
peers_api_enabled: 在API中公开的已知实例的服务器的列表
profile_directory: 启用用户目录
registrations_mode: 谁可以注册
- require_invite_text: 注册前需要提供理由
- show_domain_blocks: 显示域名屏蔽列表
- show_domain_blocks_rationale: 显示域名屏蔽原因
+ require_invite_text: 注册时需要提供理由
+ show_domain_blocks: 显示站点屏蔽列表
+ show_domain_blocks_rationale: 显示站点屏蔽原因
site_contact_email: 联系邮箱
site_contact_username: 用于联系的公开用户名
site_extended_description: 完整说明
@@ -269,7 +269,7 @@ zh-CN:
status_page_url: 状态页网址
theme: 默认主题
thumbnail: 本站缩略图
- timeline_preview: 时间轴预览
+ timeline_preview: 允许未登录用户访问公共时间线
trendable_by_default: 允许在未审核的情况下将话题置为热门
trends: 启用热门
trends_as_landing_page: 使用热门页作为登陆页面
@@ -293,12 +293,12 @@ zh-CN:
appeal: 有人对审核结果提出申诉
digest: 发送摘要邮件
favourite: 当有用户喜欢了我的嘟文时，发送电子邮件提醒我
- follow: 有用户关注我时
- follow_request: 有用户向我发送关注请求时
- mention: 有用户提及我时
- pending_account: 有账号需要审核时
- reblog: 有用户转嘟我的嘟文时
- report: 新举报已提交
+ follow: 有人关注了我
+ follow_request: 有人向我发送了关注请求
+ mention: 有人提到了我
+ pending_account: 有账号需要审核
+ reblog: 有人转嘟了我的嘟文
+ report: 有人提交了新举报
software_updates:
all: 通知所有更新
critical: 仅在有关键更新时通知
@@ -310,13 +310,13 @@ zh-CN:
hint: 补充信息
text: 规则
settings:
- indexable: 允许搜索引擎索引个人资料页面
- show_application: 显示你发嘟所用的应用
+ indexable: 允许搜索引擎索引个人资料
+ show_application: 显示你发嘟使用的应用
tag:
- listable: 允许这个话题标签在用户目录中显示
- name: 话题标签
+ listable: 允许这个话题在用户目录中显示
+ name: 话题
trendable: 允许在热门下显示此话题
- usable: 允许本站嘟文使用此话题标签
+ usable: 允许本站嘟文使用此话题
user:
role: 角色
time_zone: 时区
@@ -324,12 +324,12 @@ zh-CN:
color: 徽章颜色
highlighted: 在用户资料中显示角色徽章
name: 名称
- permissions_as_keys: 权限设置
+ permissions_as_keys: 权限
position: 优先级
webhook:
events: 已启用事件
- template: 载荷模板
- url: 对端 URL
+ template: Payload 模板
+ url: 端点 URL
'no': 否
not_recommended: 不推荐
overridden: 已覆盖
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index a5bc683634..289a24f122 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -3,7 +3,7 @@ zh-TW:
simple_form:
hints:
account:
- attribution_domains_as_text: 偽造署名保護。
+ attribution_domains_as_text: 每行一個。以保護偽造署名。
discoverable: 公開嘟文及個人檔案可能於各 Mastodon 功能中被推薦，並且您的個人檔案可能被推薦至其他使用者。
display_name: 完整名稱或暱稱。
fields: 烘培雞、自我認同代稱、年齡，及任何您想分享的。
@@ -144,7 +144,7 @@ zh-TW:
url: 事件會被傳送至何處
labels:
account:
- attribution_domains_as_text: 僅允許特定網站
+ attribution_domains_as_text: 允許對您予與信譽之網站
discoverable: 於探索演算法中推薦個人檔案及嘟文
fields:
name: 標籤
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 8076682ed4..808c7b04e3 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -8,10 +8,10 @@ sk:
title: Ohľadom
accounts:
followers:
- few: Sledovateľov
+ few: Sledujúcich
many: Sledovateľov
one: Sledujúci
- other: Sledovatelia
+ other: Sledujúci
following: Nasledujem
instance_actor_flash: Toto konto je virtuálny aktér, ktorý predstavuje samotný server, a nie konkrétneho používateľa. Používa sa na účely federácie a nemal by byť pozastavený.
last_active: naposledy aktívny
@@ -25,9 +25,12 @@ sk:
one: Príspevok
other: Príspevkov
posts_tab_heading: Príspevky
+ self_follow_error: Nieje povolené nasledovať svoj vlastný účet
admin:
account_actions:
action: Vykonaj
+ already_silenced: Tento účet už bol obmedzený.
+ already_suspended: Tento účet už bol vylúčený.
title: Vykonaj moderovací úkon voči %{acct}
account_moderation_notes:
create: Zanechaj poznámku
@@ -49,6 +52,7 @@ sk:
title: Zmeň email pre %{username}
change_role:
changed_msg: Postavenie úspešne zmenené!
+ edit_roles: Spravuj role užívateľov
label: Zmeň pozíciu
no_role: Žiadna pozícia
title: Zmeň pozíciu pre %{username}
@@ -61,6 +65,7 @@ sk:
demote: Degraduj
destroyed_msg: "%{username} je teraz zaradený do fronty na okamžité vymazanie"
disable: Zablokuj
+ disable_sign_in_token_auth: Vypni overovanie e-mailovým tokenom
disable_two_factor_authentication: Vypni dvoj-faktorové overovanie
disabled: Blokovaný
display_name: Ukáž meno
@@ -69,6 +74,7 @@ sk:
email: Email
email_status: Stav emailu
enable: Povoľ
+ enable_sign_in_token_auth: Povoľ overovania e-mailovým tokenom
enabled: Povolený
enabled_msg: Úspešne rozmrazené konto %{username}
followers: Sledujúci
@@ -179,11 +185,13 @@ sk:
create_custom_emoji: Vytvor vlastné emotikony
create_domain_allow: Vytvor povolenie pre doménu
create_domain_block: Vytvor zákaz domény
+ create_email_domain_block: Vytvor zákaz emailovej domény
create_ip_block: Vytvor IP pravidlo
create_unavailable_domain: Vytvor nedostupnú doménu
create_user_role: Vytvoriť rolu
demote_user: Zniž užívateľskú rolu
destroy_announcement: Vymaž oboznámenie
+ destroy_canonical_email_block: Zruš blokovanie emailu
destroy_custom_emoji: Vymaž vlastné emotikony
destroy_domain_allow: Zmaž povolenie pre doménu
destroy_domain_block: Zruš blokovanie domény
@@ -239,6 +247,7 @@ sk:
destroy_custom_emoji_html: "%{name} vymazal/a emotikonu %{target}"
destroy_domain_allow_html: "%{name} zakázal/a federáciu s doménou %{target}"
destroy_domain_block_html: "%{name} odblokoval/i doménu %{target}"
+ destroy_email_domain_block_html: "%{name} odblokoval/a emailovú doménu %{target}"
destroy_ip_block_html: "%{name} vymazal/a pravidlo pre IP %{target}"
destroy_status_html: "%{name} zmazal/a príspevok od %{target}"
destroy_unavailable_domain_html: "%{name} znova spustil/a doručovanie pre doménu %{target}"
@@ -353,6 +362,7 @@ sk:
cancel: Zruš
confirm: Vylúč
preamble_html: Chystáš sa vylúčiť %{domain} a jej poddomény.
+ stop_communication: Tvoj server prestane komunikovať s týmito servermi.
title: Potvrď blokovanie domény %{domain}
created_msg: Doména je v štádiu blokovania
destroyed_msg: Blokovanie domény bolo zrušené
@@ -384,6 +394,7 @@ sk:
email_domain_blocks:
add_new: Pridaj nový
allow_registrations_with_approval: Povoľ registrovanie so schválením
+ created_msg: Úspešne zablokovaná emailová doména
delete: Vymaž
dns:
types:
@@ -392,6 +403,7 @@ sk:
new:
create: Pridaj doménu
resolve: Preveď doménu
+ title: Blokovať novú emailovú doménu
not_permitted: Nepovolená
resolved_through_html: Prevedená cez %{domain}
title: Blokované e-mailové domény
@@ -822,6 +834,7 @@ sk:
prefix_invited_by_user: "@%{name} ťa pozýva na tento Mastodon server!"
prefix_sign_up: Zaregistruj sa na Mastodone už dnes!
suffix: S účtom budeš môcť nasledovať ľudí, posielať príspevky, a vymieňať si správy s užívateľmi z hocijakého Mastodon servera a viac!
+ didnt_get_confirmation: Neobdržal/a si odkaz na potvrdenie?
dont_have_your_security_key: Nemáš svoj bezpečnostný kľúč?
forgot_password: Zabudnuté heslo?
invalid_reset_password_token: Token na obnovu hesla vypršal. Prosím vypítaj si nový.
@@ -832,6 +845,7 @@ sk:
migrate_account_html: Ak si želáš presmerovať tento účet na nejaký iný, môžeš si to nastaviť tu.
or_log_in_with: Alebo prihlás s
progress:
+ confirm: Potvrď email
details: Tvoje údaje
rules: Súhlas s pravidlami
register: Zaregistruj sa
@@ -1167,7 +1181,7 @@ sk:
dormant: Spiace
follow_failure: Nemožno nasledovať niektoré z vybraných účtov.
follow_selected_followers: Následuj označených sledovatelov
- followers: Následovatelia
+ followers: Sledovatelia
following: Nasledovaní
invited: Pozvaný/á
last_active: Naposledy aktívny
@@ -1358,6 +1372,7 @@ sk:
explanation: Tu nájdeš nejaké tipy do začiatku
feature_action: Zisti viac
follow_action: Nasleduj
+ follow_title: Prispôsob svoj domáci kanál
follows_title: Koho nasledovať
post_title: Vytvor svoj prvý príspevok
share_action: Zdieľaj
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 286bece877..9474dca721 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -25,9 +25,12 @@ sl:
other: Objav
two: Objavi
posts_tab_heading: Objave
+ self_follow_error: Ni dovoljeno slediti lastnemu računu
admin:
account_actions:
action: Izvedi dejanje
+ already_silenced: Ta račun je že omejen.
+ already_suspended: Ta račun je že suspendiran.
title: Izvedi moderirano dejanje za %{acct}
account_moderation_notes:
create: Pusti opombo
@@ -49,6 +52,7 @@ sl:
title: Spremeni e-naslov za %{username}
change_role:
changed_msg: Vloga uspešno spremenjena!
+ edit_roles: Upravljaj z uporabniškimi vlogami
label: Spremeni vlogo
no_role: Brez vloge
title: Spremeni vlogo za %{username}
@@ -486,6 +490,9 @@ sl:
title: Sledi priporočilom
unsuppress: Obnovi sledenje priporočilom
instances:
+ audit_log:
+ title: Nedavni revizijski zapisi
+ view_all: Prikaži ves revizijski dnevnik
availability:
description_html:
few: Če dostava v domeno spodleti %{count} različne dni brez uspeha, ne bo nadaljnjih poskusov dostopa, razen če je prejeta dostava iz domene.
@@ -622,6 +629,7 @@ sl:
suspend_description_html: Račun in vsa njegova vsebina ne bo dostopna in bo postopoma izbrisana, interakcija z njim pa ne bo več možna. Dejanje je moč povrniti v roku 30 dni. Zaključi vse prijave zoper ta račun.
actions_description_html: Odločite se, katere ukrepe boste sprejeli za rešitev te prijave. Če sprejmete kazenski ukrep proti prijavljenemu računu, mu bo poslano e-poštno obvestilo, razen če je izbrana kategorija Neželena pošta.
actions_description_remote_html: Odločite se za dejanje, ki bo odločilo o tej prijavi. To bo vplivalo le na to, kako vaš strežnik komunicira s tem oddaljenim računom in obravnava njegovo vsebino.
+ actions_no_posts: To poročilo ni vezano na nobene objave, ki bi jih lahko izbrisali
add_to_report: Dodaj več v prijavo
already_suspended_badges:
local: Že suspendiran na tem strežniku
@@ -896,6 +904,9 @@ sl:
message_html: Nobenih pravil strežnika niste določili.
sidekiq_process_check:
message_html: Noben proces Sidekiq ne poteka za %{value} vrst. Preglejte svojo prilagoditev Sidekiq
+ software_version_check:
+ action: Oglejte si razpoložljive posodobitve
+ message_html: Na voljo je posodobitev Mastodona.
software_version_critical_check:
action: Glejte razpoložljive posodobitve
message_html: Na voljo je kritična posodobitev Mastodona. Posodobite čim prej.
@@ -922,6 +933,7 @@ sl:
name: Ime
newest: Najnovejše
oldest: Najstarejše
+ open: Prikaži javno
reset: Ponastavi
review: Stanje pregleda
search: Išči
@@ -1188,6 +1200,14 @@ sl:
view_strikes: Pokaži pretekle ukrepe proti mojemu računu
too_fast: Obrazec oddan prehitro, poskusite znova.
use_security_key: Uporabi varnostni ključ
+ author_attribution:
+ example_title: Vzorčno besedilo
+ hint_html: Ali pišete novičke ali spletni dnevnik kje drugje poleg Mastodona? Poskrbite, da bo vaše avtorstvo pravilno navedeno, ko bo kdo delil vaše delo na Mastodonu.
+ instructions: 'Poskrbite, da bo v dokumentu HTML vašega prispevka naslednja koda:'
+ more_from_html: Več od %{name}
+ s_blog: Spletni dnevnik %{name}
+ then_instructions: Nato dodajte ime domene, kamor objavljate, v spodnje polje.
+ title: Priznanje avtorstva
challenge:
confirm: Nadaljuj
hint_html: "Namig: naslednjo uro vas ne bomo več vprašali po vašem geslu."
@@ -1498,6 +1518,7 @@ sl:
media_attachments:
validations:
images_and_video: Videoposnetka ni mogoče priložiti objavi, ki že vsebuje slike
+ not_found: Predstavnosti %{ids} ne najdem ali pa je že pripeta k drugi objavi
not_ready: Datotek, katerih obdelava ni dokončana, ni mogoče pripeti. Poskusite znova kmalu!
too_many: Ni možno priložiti več kot 4 datoteke
migrations:
@@ -1729,6 +1750,7 @@ sl:
delete: Brisanje računa
development: Razvoj
edit_profile: Uredi profil
+ export: Izvozi
featured_tags: Vključeni ključniki
import: Uvozi
import_and_export: Uvoz in izvoz
@@ -1988,6 +2010,7 @@ sl:
instructions_html: Spodnjo kodo kopirajte in prilepite v HTML svojega spletnega mesta. Nato dodajte naslov svoje spletne strani v eno od dodatnih polj v svojem profilu v zavihku »Uredi profil« in shranite spremembe.
verification: Potrditev
verified_links: Vaše preverjene povezave
+ website_verification: Overitev spletišča
webauthn_credentials:
add: Dodaj nov varnostni ključ
create:
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 2f05d7860c..7d7df6d4c2 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -21,6 +21,7 @@ sq:
one: Mesazh
other: Mesazhe
posts_tab_heading: Mesazhe
+ self_follow_error: Ndjekja e llogarisë personale nuk lejohet
admin:
account_actions:
action: Kryeje veprimin
@@ -644,6 +645,7 @@ sq:
report: 'Raportim #%{id}'
reported_account: Llogari e raportuar
reported_by: Raportuar nga
+ reported_with_application: Raportuar me aplikacion
resolved: I zgjidhur
resolved_msg: Raportimi u zgjidh me sukses!
skip_to_actions: Kaloni te veprimet
@@ -1158,9 +1160,11 @@ sq:
use_security_key: Përdor kyç sigurie
author_attribution:
example_title: Tekst shembull
- hint_html: Kontrolloni se si vlerësoheni, kur ndahen lidhje me të tjerë në Mastodon.
+ hint_html: Shkruani lajme, apo artikuj blogu jashtë Mastodon-it? Kontrolloni se si ju jepet hakë, kur ndahen me të tjerët në Mastodon.
+ instructions: 'Sigurohuni që ky kod të jetë në HTML-në e artikullit tuaj:'
more_from_html: Më tepër nga %{name}
s_blog: Blogu i %{name}
+ then_instructions: Mandej, shtoni te fusha më poshtë emrin e përkatësisë së botimit.
title: Atribuim autorësh
challenge:
confirm: Vazhdo
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index dadd5f1600..9e15ec87cd 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -21,10 +21,12 @@ sv:
one: Inlägg
other: Inlägg
posts_tab_heading: Inlägg
+ self_follow_error: Det är inte tillåtet att följa ditt eget konto
admin:
account_actions:
action: Utför åtgärd
already_silenced: Detta konto är redan begränsat.
+ already_suspended: Detta konto är redan avstängt.
title: Utför aktivitet för moderering på %{acct}
account_moderation_notes:
create: Lämna kommentar
@@ -57,11 +59,11 @@ sv:
delete: Radera data
deleted: Raderad
demote: Degradera
- destroyed_msg: "%{username}'s data har nu lagts till kön för att raderas omedelbart"
- disable: inaktivera
+ destroyed_msg: "%{username}s data har nu lagts till kön för att raderas omedelbart"
+ disable: Inaktivera
disable_sign_in_token_auth: Inaktivera autentisering med pollett via e-post
disable_two_factor_authentication: Inaktivera 2FA
- disabled: inaktiverad
+ disabled: Inaktiverad
display_name: Visningsnamn
domain: Domän
edit: Redigera
@@ -70,7 +72,7 @@ sv:
enable: Aktivera
enable_sign_in_token_auth: Aktivera autentisering med pollett via e-post
enabled: Aktiverad
- enabled_msg: Uppfrysningen av %{username}'s konto lyckades
+ enabled_msg: Uppfrysningen av %{username}s konto lyckades
followers: Följare
follows: Följs
header: Rubrik
@@ -85,7 +87,7 @@ sv:
remote: Avlägsen
title: Plats
login_status: Inloggningsstatus
- media_attachments: Media bifogade filer
+ media_attachments: Mediebilagor
memorialize: Förvandla till ett memoriam
memorialized: Memorialiserad
memorialized_msg: Omvandlingen av %{username} till ett minneskonto lyckades
@@ -140,7 +142,7 @@ sv:
only_password: Endast lösenord
password_and_2fa: Lösenord och 2FA
sensitive: Känsligt
- sensitized: markerad som känsligt
+ sensitized: Markerad som känsligt
shared_inbox_url: Delad inkorg URL
show:
created_reports: Anmälningar som skapats av det här kontot
@@ -261,23 +263,26 @@ sv:
destroy_user_role_html: "%{name} raderade rollen %{target}"
disable_2fa_user_html: "%{name} inaktiverade tvåfaktorsautentiseringskrav för användaren %{target}"
disable_custom_emoji_html: "%{name} inaktiverade emoji %{target}"
+ disable_sign_in_token_auth_user_html: "%{name} inaktiverade e-posttokenautentisering för %{target}"
disable_user_html: "%{name} stängde av inloggning för användaren %{target}"
enable_custom_emoji_html: "%{name} aktiverade emoji %{target}"
+ enable_sign_in_token_auth_user_html: "%{name} aktiverade e-posttokenautentisering för %{target}"
enable_user_html: "%{name} aktiverade inloggning för användaren %{target}"
- memorialize_account_html: "%{name} gjorde %{target}'s konto till en minnessida"
+ memorialize_account_html: "%{name} gjorde %{target}s konto till en minnessida"
promote_user_html: "%{name} befordrade användaren %{target}"
reject_appeal_html: "%{name} avvisade överklagande av modereringsbeslut från %{target}"
reject_user_html: "%{name} avvisade registrering från %{target}"
- remove_avatar_user_html: "%{name} tog bort %{target}'s avatar"
+ remove_avatar_user_html: "%{name} tog bort %{target}s avatar"
reopen_report_html: "%{name} öppnade rapporten igen %{target}"
+ resend_user_html: "%{name} skickade bekräftelsemail för %{target} på nytt"
reset_password_user_html: "%{name} återställ användarens lösenord %{target}"
resolve_report_html: "%{name} löste rapporten %{target}"
- sensitive_account_html: "%{name} markerade %{target}'s media som känsligt"
- silence_account_html: "%{name} begränsade %{target}'s konto"
+ sensitive_account_html: "%{name} markerade %{target}s media som känsligt"
+ silence_account_html: "%{name} begränsade %{target}s konto"
suspend_account_html: "%{name} stängde av %{target}s konto"
unassigned_report_html: "%{name} tog bort tilldelning av rapporten %{target}"
unblock_email_account_html: "%{name} avblockerade %{target}s e-postadress"
- unsensitive_account_html: "%{name} avmarkerade %{target}'s media som känsligt"
+ unsensitive_account_html: "%{name} avmarkerade %{target}s media som känsligt"
unsilence_account_html: "%{name} tog bort begränsning av %{target}s konto"
unsuspend_account_html: "%{name} ångrade avstängningen av %{target}s konto"
update_announcement_html: "%{name} uppdaterade kungörelsen %{target}"
@@ -430,6 +435,7 @@ sv:
attempts_over_week:
one: "%{count} försök under den senaste veckan"
other: "%{count} registreringsförsök under den senaste veckan"
+ created_msg: Blockerade e-postdomänen
delete: Radera
dns:
types:
@@ -438,8 +444,12 @@ sv:
new:
create: Skapa domän
resolve: Slå upp domän
+ title: Blockera ny e-postdomän
+ no_email_domain_block_selected: Inga blockeringar av e-postdomäner ändrades eftersom inga valdes
not_permitted: Ej tillåtet
+ resolved_dns_records_hint_html: Domännamnet ger uppslag till följande MX-domäner, vilka är ytterst ansvariga för att e-post tas emot. Att blockera en MX-domän blockerar även registreringar från alla e-postadresser som använder samma MX-domän, även om det synliga domännamnet är annorlunda. Var noga med att inte blockera stora e-postleverantörer.
resolved_through_html: Uppslagen genom %{domain}
+ title: Blockerade e-postdomäner
export_domain_allows:
new:
title: Importera domäntillåtelser
@@ -532,7 +542,7 @@ sv:
total_followed_by_them: Följs av dem
total_followed_by_us: Följs av oss
total_reported: Rapporter om dem
- total_storage: Media-bilagor
+ total_storage: Mediebilagor
totals_time_period_hint_html: Totalsummorna som visas nedan inkluderar data för all tid.
unknown_instance: Det finns för närvarande inga uppgifter om denna domän på denna server.
invites:
@@ -559,9 +569,9 @@ sv:
no_ip_block_selected: Inga IP-regler ändrades då inga var valda
title: IP-regler
relationships:
- title: "%{acct}'s relationer"
+ title: "%{acct}s relationer"
relays:
- add_new: Lägg till nytt relä
+ add_new: Lägg till nytt ombud
delete: Radera
description_html: Ett federeringsombud är en mellanliggande server som utbyter höga antal offentliga inlägg mellan servrar som prenumererar på och publicerar till det. Det kan hjälpa små och medelstora servrar upptäcka innehåll från fediversumet, vilket annars skulle kräva att lokala användare manuellt följer personer på fjärrservrar.
disable: Inaktivera
@@ -572,10 +582,10 @@ sv:
inbox_url: Ombuds-URL
pending: Väntar på ombudets godkännande
save_and_enable: Spara och aktivera
- setup: Konfigurera en relä-anslutning
- signatures_not_enabled: Ombud fungerar inte korrekt medan säkert läge eller begränsat federeringsläge är aktiverade
+ setup: Konfigurera ett ombud
+ signatures_not_enabled: Ombud fungerar inte korrekt om säkert läge eller begränsat federeringsläge är aktiverade
status: Status
- title: Relä
+ title: Ombud
report_notes:
created_msg: Anmälningsanteckning har skapats!
destroyed_msg: Anmälningsanteckning har raderats!
@@ -593,7 +603,9 @@ sv:
resolve_description_html: Ingen åtgärd vidtas mot det rapporterade kontot, ingen prick registreras och rapporten stängs.
silence_description_html: Kontot kommer endast synas för de som redan följer den eller manuellt söker på den, vilket dramatiskt minskar dess räckvidd. Kan alltid ångras. Stänger alla anmälningar mot detta konto.
suspend_description_html: Kontot och allt dess innehåll kommer att vara oåtkomligt och så småningom tas bort, det kommer inte gå att interagera med kontot. Kan ångras inom 30 dagar. Stänger alla anmälningar mot detta konto.
+ actions_description_html: Välj vilken åtgärd som skall vidtas för att lösa denna rapport. Om du vidtar en bestraffningsåtgärd mot det rapporterade kontot kommer en e-postnotis att skickas till dem, förutom om du valt kategorin Skräppost.
actions_description_remote_html: Bestäm vilka åtgärder som ska vidtas för att lösa denna rapport. Detta kommer bara att påverka hur din server kommunicerar med detta fjärrkonto och hanterar dess innehåll.
+ actions_no_posts: Denna rapport har inga associerade inlägg att ta bort
add_to_report: Lägg till mer i rapporten
already_suspended_badges:
local: Redan avstängd på denna server
@@ -657,6 +669,7 @@ sv:
delete_data_html: Ta bort @%{acct}s profil och innehåll om 30 dagar ifall deras avstängning inte tagits bort under tiden
preview_preamble_html: "@%{acct} kommer få en varning med följande innehåll:"
record_strike_html: Registrera en varning mot @%{acct} för att hjälpa dig eskalera vid framtida överträdelser från detta konto
+ send_email_html: Skicka @%{acct} ett varningsmejl
warning_placeholder: Valfri ytterligare resonemang för modereringsåtgärd.
target_origin: Ursprung för anmält konto
title: Anmälningar
@@ -696,6 +709,7 @@ sv:
manage_appeals: Hantera överklaganden
manage_appeals_description: Tillåter användare att granska överklaganden av modereringsåtgärder
manage_blocks: Hantera blockeringar
+ manage_blocks_description: Tillåter användare att blockera e-postleverantörer och IP-adresser
manage_custom_emojis: Hantera egna emojier
manage_custom_emojis_description: Tillåter användare att hantera egna emojier på servern
manage_federation: Hantera federering
@@ -713,6 +727,7 @@ sv:
manage_taxonomies: Hantera taxonomier
manage_taxonomies_description: Tillåter användare att granska trendande innehåll och uppdatera inställningar för hashtaggar
manage_user_access: Hantera användaråtkomst
+ manage_user_access_description: Tillåter användare att inaktivera andra användares tvåfaktorsautentisering, ändra deras e-postadress samt återställa deras lösenord
manage_users: Hantera användare
manage_users_description: Tillåter användare att granska användares data och utföra modereringsåtgärder på dessa
manage_webhooks: Hantera webhooks
@@ -787,6 +802,7 @@ sv:
destroyed_msg: Webbplatsuppladdningen har raderats!
software_updates:
critical_update: Kritiskt — vänligen uppdatera omgående
+ description: Det rekommenderas att hålla din Mastodon-installation uppdaterad för att ta nytta av de senaste fixarna och funktionerna. Dessutom är det ibland viktigt att uppdatera Mastodon i tid för att undvika säkerhetsproblem. Av dessa skäl kontrollerar Mastodon efter uppdateringar var 30:e minut och meddelar dig i enlighet med dina e-postaviseringsinställningar.
documentation_link: Läs mer
release_notes: Ändringslogg
title: Tillgängliga uppdateringar
@@ -820,7 +836,7 @@ sv:
title: Kontoinlägg
trending: Trendande
visibility: Synlighet
- with_media: med media
+ with_media: Med media
strikes:
actions:
delete_statuses: "%{name} raderade %{target}s inlägg"
@@ -861,6 +877,7 @@ sv:
sidekiq_process_check:
message_html: Ingen Sidekiq-process körs för kön/köerna %{value}. Vänligen kontrollera din Sidekiq-konfiguration
software_version_check:
+ action: Se tillgängliga uppdateringar
message_html: En Mastodon-uppdatering är tillgänglig.
software_version_critical_check:
action: Se tillgängliga uppdateringar
@@ -876,22 +893,38 @@ sv:
message_html: "Din objektlagring är felkonfigurerad. Sekretessen för dina användare är i riskzonen."
tags:
moderation:
+ not_trendable: Kan inte trenda
+ not_usable: Inte användbar
+ pending_review: Väntar på granskning
+ review_requested: Granskning begärd
reviewed: Granskat
title: Status
- trendable:
+ trendable: Kan trenda
+ unreviewed: Ogranskad
+ usable: Användbar
name: Namn
+ newest: Nyaste
+ oldest: Äldsta
+ open: Visa offentligt
reset: Återställ
review: Granskningsstatus
search: Sök
+ title: Hashtaggar
updated_msg: Hashtagg-inställningarna har uppdaterats
title: Administration
trends:
allow: Tillåt
approved: Godkänd
+ confirm_allow: Är du säker på att du vill tillåta valda taggar?
+ confirm_disallow: Är du säker på att du vill förbjuda valda taggar?
disallow: Neka
links:
allow: Tillåt länk
allow_provider: Tillåt utgivare
+ confirm_allow: Är du säker på att du vill tillåta valda länkar?
+ confirm_allow_provider: Är du säker på att du vill tillåta valda leverantörer?
+ confirm_disallow: Är du säker på att du vill förbjuda valda länkar?
+ confirm_disallow_provider: Är du säker på att du vill förbjuda valda leverantörer?
description_html: Detta är länkar som för närvarande delas mycket av konton som din server ser inlägg från. Det kan hjälpa dina användare att ta reda på vad som händer i världen. Inga länkar visas offentligt tills du godkänner utgivaren. Du kan också tillåta eller avvisa enskilda länkar.
disallow: Blockera länk
disallow_provider: Blockera utgivare
@@ -915,6 +948,10 @@ sv:
statuses:
allow: Tillåt inlägg
allow_account: Godkänn författare
+ confirm_allow: Är du säker på att du vill tillåta valda statusar?
+ confirm_allow_account: Är du säker på att du vill tillåta valda konton?
+ confirm_disallow: Är du säker på att du vill förbjuda valda statusar?
+ confirm_disallow_account: Är du säker på att du vill förbjuda valda konton?
description_html: Detta är inlägg som din server vet om som för närvarande delas och favoriseras mycket just nu. Det kan hjälpa dina nya och återvändande användare att hitta fler människor att följa. Inga inlägg visas offentligt förrän du godkänner författaren, och författaren tillåter att deras konto föreslås till andra. Du kan också tillåta eller avvisa enskilda inlägg.
disallow: Tillåt inte inlägg
disallow_account: Tillåt inte författare
@@ -1034,6 +1071,7 @@ sv:
application_mailer:
notification_preferences: Ändra e-postpreferenser
salutation: "%{name},"
+ settings: 'Ändra e-postinställningar: %{link}'
unsubscribe: Avprenumerera
view: 'Granska:'
view_profile: Visa profil
@@ -1053,6 +1091,7 @@ sv:
hint_html: En sista sak till! Vi måste bekräfta att du är en människa (för att hålla borta skräpinlägg!). Lös CAPTCHA nedan och klicka på "Fortsätt".
title: Säkerhetskontroll
confirmations:
+ awaiting_review: Din e-postadress är bekräftad! %{domain} personalen granskar nu din registrering. Du kommer att få ett e-postmeddelande om de godkänner ditt konto!
awaiting_review_title: Din registrering är under granskning
clicking_this_link: klicka på denna länk
login_link: logga in
@@ -1060,6 +1099,7 @@ sv:
redirect_to_app_html: Du borde ha omdirigerats till appen %{app_name}. Om det inte hände, försök att %{clicking_this_link} eller återgå manuellt till appen.
registration_complete: Din registrering på %{domain} är nu slutförd!
welcome_title: Välkommen %{name}!
+ wrong_email_hint: Om e-postadressen inte är rätt, kan du ändra den i kontoinställningarna.
delete_account: Radera konto
delete_account_html: Om du vill radera ditt konto kan du fortsätta här. Du kommer att bli ombedd att bekräfta.
description:
@@ -1080,6 +1120,7 @@ sv:
or_log_in_with: Eller logga in med
privacy_policy_agreement_html: Jag har läst och godkänner integritetspolicyn
progress:
+ confirm: Bekräfta e-postadress
details: Dina uppgifter
review: Vår recension
rules: Acceptera regler
@@ -1101,8 +1142,10 @@ sv:
security: Säkerhet
set_new_password: Skriv in nytt lösenord
setup:
+ email_below_hint_html: Kolla din skräppost-mapp eller begär en ny. Du kan korrigera din e-postadress om den är fel.
email_settings_hint_html: Klicka på länken som vi har skickat till dig för att bekräfta %{email}. Vi väntar här.
link_not_received: Fick du ingen länk?
+ new_confirmation_instructions_sent: Du kommer att få ett nytt e-postmeddelande med bekräftelselänken om några minuter!
title: Kolla din inkorg
sign_in:
preamble_html: Logga in med dina användaruppgifter på %{domain}. Om ditt konto finns på en annan server kommer du inte att kunna logga in här.
@@ -1113,6 +1156,7 @@ sv:
title: Låt oss få igång dig på %{domain}.
status:
account_status: Kontostatus
+ confirming: Väntar på att e-postbekräftelsen ska slutföras.
functional: Ditt konto fungerar som det ska.
pending: Din ansökan inväntar granskning. Detta kan ta tid. Du kommer att få ett e-postmeddelande om din ansökan har godkänts.
redirecting_to: Ditt konto är inaktivt eftersom det för närvarande dirigeras om till %{acct}.
@@ -1122,6 +1166,12 @@ sv:
use_security_key: Använd säkerhetsnyckel
author_attribution:
example_title: Exempeltext
+ hint_html: Skriver du nyheter eller bloggartiklar utanför Mastodon? Kontrollera hur du får krediteras när de delas på Mastodon.
+ instructions: 'Se till att den här koden finns i din artikels HTML:'
+ more_from_html: Mer från %{name}
+ s_blog: "%{name}s blogg"
+ then_instructions: Lägg sedan till domännamnet för publikationen i fältet nedan.
+ title: Författarattribution
challenge:
confirm: Fortsätt
hint_html: "Tips: Vi frågar dig inte efter ditt lösenord igen under nästkommande timme."
@@ -1416,10 +1466,11 @@ sv:
media_attachments:
validations:
images_and_video: Det går inte att bifoga en video till ett inlägg som redan innehåller bilder
+ not_found: Media %{ids} hittades inte eller är redan anslutet till ett annat inlägg
not_ready: Kan inte bifoga filer som inte har behandlats färdigt. Försök igen om ett ögonblick!
too_many: Det går inte att bifoga mer än 4 filer
migrations:
- acct: användarnamn@domän av det nya kontot
+ acct: Flyttad till
cancel: Avbryt omdirigering
cancel_explanation: Avstängning av omdirigeringen kommer att återaktivera ditt nuvarande konto, men kommer inte att återskapa följare som har flyttats till det kontot.
cancelled_msg: Avbröt omdirigeringen.
@@ -1628,7 +1679,7 @@ sv:
ios: iOS
kai_os: KaiOS
linux: Linux
- mac: Mac
+ mac: macOS
unknown_platform: Okänd plattform
windows: Windows
windows_mobile: Windows Mobile
@@ -1751,8 +1802,8 @@ sv:
tags:
does_not_match_previous_name: matchar inte det föregående namnet
themes:
- contrast: Hög kontrast
- default: Mastodon
+ contrast: Mastodon (Hög kontrast)
+ default: Mastodon (Mörk)
mastodon-light: Mastodon (ljust)
system: Automatisk (använd systemtema)
time:
@@ -1804,7 +1855,7 @@ sv:
subject: Andra faktorns autentiseringsfel
title: Misslyckad tvåfaktorsautentisering
suspicious_sign_in:
- change_password: Ändra ditt lösenord
+ change_password: ändra ditt lösenord
details: 'Här är inloggningsdetaljerna:'
explanation: Vi har upptäckt en inloggning till ditt konto från en ny IP-adress.
further_actions_html: Om detta inte var du, rekommenderar vi att du snarast %{action} och aktiverar tvåfaktorsautentisering för att hålla ditt konto säkert.
@@ -1897,6 +1948,7 @@ sv:
instructions_html: Kopiera och klistra in koden nedan in i HTML-koden på din webbplats. Lägg sedan till adressen till din webbplats i ett av de extra fälten på din profil från fliken "Redigera profil" och spara ändringar.
verification: Bekräftelse
verified_links: Dina verifierade länkar
+ website_verification: Webbplats verifiering
webauthn_credentials:
add: Lägg till ny säkerhetsnyckel
create:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 3cb802afe3..f6117ffc32 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -19,6 +19,7 @@ th:
posts:
other: โพสต์
posts_tab_heading: โพสต์
+ self_follow_error: ไม่อนุญาตการติดตามบัญชีของคุณเอง
admin:
account_actions:
action: ทำการกระทำ
@@ -1054,7 +1055,7 @@ th:
salutation: "%{name},"
settings: 'เปลี่ยนการกำหนดลักษณะอีเมล: %{link}'
unsubscribe: เลิกบอกรับ
- view: 'มุมมอง:'
+ view: 'ดู:'
view_profile: ดูโปรไฟล์
view_status: ดูโพสต์
applications:
@@ -1147,9 +1148,11 @@ th:
use_security_key: ใช้กุญแจความปลอดภัย
author_attribution:
example_title: ข้อความตัวอย่าง
- hint_html: ควบคุมวิธีที่ให้เครดิตแก่คุณเมื่อมีการแบ่งปันลิงก์ใน Mastodon
+ hint_html: คุณกำลังเขียนข่าวหรือบทความบล็อกภายนอก Mastodon หรือไม่? ควบคุมวิธีที่คุณได้รับเครดิตเมื่อมีการแบ่งปันข่าวหรือบทความบล็อกใน Mastodon
+ instructions: 'ตรวจสอบให้แน่ใจว่าโค้ดนี้อยู่ใน HTML ของบทความของคุณ:'
more_from_html: เพิ่มเติมจาก %{name}
s_blog: บล็อกของ %{name}
+ then_instructions: จากนั้น เพิ่มชื่อโดเมนของการเผยแพร่ในช่องด้านล่าง
title: การระบุแหล่งที่มาผู้สร้าง
challenge:
confirm: ดำเนินการต่อ
diff --git a/config/locales/tok.yml b/config/locales/tok.yml
index 9f962d2b53..3aff3713b2 100644
--- a/config/locales/tok.yml
+++ b/config/locales/tok.yml
@@ -1,5 +1,51 @@
---
tok:
+ about:
+ about_mastodon_html: ilo toki pi tenpo kama. sitelen esun li lon ala, jan li lawa ala e sina, jan pali li jo ala e wile ike. kin la, jan lawa li wan taso ala a! ilo Masoton la, sona sina li ken ijo pi sina taso!
+ contact_missing: lon ala
+ contact_unavailable: sona ala
+ hosted_on: lipu Masoton pi ma %{domain}
+ title: sona suli
+ accounts:
+ followers:
+ other: jan ni li kute e sina
+ following: sina kute e jan ni
+ instance_actor_flash: sijelo ni li lon ala, li jan wan taso ala, li kulupu jan. ona li pona e nasin pi lawa mute. jan lawa o weka ala e sijelo ni.
+ last_active: tenpo poka
+ link_verified_on: "%{date} la mi sona e ni: jan seme li jo e lipu ni"
+ nothing_here: ala li lon ni a!
+ pin_errors:
+ following: sina wile toki e pona jan la, sina o kute e ona
+ posts:
+ other: toki suli
+ posts_tab_heading: toki suli
+ self_follow_error: sina ken ala kute e sina
admin:
+ account_actions:
+ action: o ijo
+ already_silenced: jan ni li jo e ken lili lon tenpo ni.
accounts:
+ approve: o wile
are_you_sure: ni li pona ala pona?
+ avatar: sitelen
+ delete: o ala e sona
+ deleted: jan li ala e ni
+ demote: o lili e ken
+ edit: ante toki
+ invite_request_text: nasin kama
+ ip: nanpa IP
+ joined: tenpo kama
+ search: o alasa
+ statuses:
+ title: toki suli pi jan ni
+ tags:
+ search: o alasa
+ imports:
+ overwrite_preambles:
+ blocking_html: "jan %{total_items} li lon lipu %{filename}. sina wile ala lukin e toki jan la, sina ni la kulupu pi lukin ala li kama kulupu lipu."
+ bookmarks_html: "toki %{total_items} li lon lipu %{filename}. toki li suli tawa sina la, sina ni la kulupu pi toki suli li kama kulupu lipu."
+ domain_blocking_html: "ma %{total_items} li lon lipu %{filename}. sina wile ala lukin e toki tan ma la, sina ni la kulupu pi lukin ala li kama kulupu lipu."
+ following_html: "jan %{total_items} li lon lipu %{filename}. sina wile kute e jan la, sina ni la kulupu kute li kama kulupu lipu."
+ lists_html: "jan %{total_items} li lon lipu %{filename}. sina jo e kulupu jan. sina ni la kulupu sina li weka, sina kama jo e kulupu lipu."
+ privacy:
+ search: o alasa
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 7382631911..aa697db37e 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1,7 +1,7 @@
---
tr:
about:
- about_mastodon_html: Mastodon ücretsiz ve açık kaynaklı bir sosyal ağdır. Merkezileştirilmemiş yapısı sayesinde diğer ticari sosyal platformların aksine iletişimininizin tek bir firmada tutulmasının/yönetilmesinin önüne geçer. Güvendiğiniz bir sunucuyu seçerek oradaki kişilerle etkileşimde bulunabilirsiniz. Herkes kendi Mastodon sunucusunu kurabilir ve sorunsuz bir şekilde Mastodon sosyal ağına dahil edebilir.
+ about_mastodon_html: Mastodon ücretsiz ve açık kaynaklı bir sosyal ağdır. Merkezi olmayan yapısı sayesinde diğer ticari sosyal platformların aksine iletişimininizin tek bir firmada tutulmasının/yönetilmesinin önüne geçer. Güvendiğiniz bir sunucuyu seçerek oradaki kişilerle etkileşimde bulunabilirsiniz. Herkes kendi Mastodon sunucusunu kurabilir ve sorunsuz bir şekilde Mastodon sosyal ağına dahil edebilir!
contact_missing: Ayarlanmadı
contact_unavailable: Bulunamadı
hosted_on: Mastodon %{domain} üzerinde barındırılıyor
@@ -21,6 +21,7 @@ tr:
one: Gönderi
other: Gönderiler
posts_tab_heading: Gönderiler
+ self_follow_error: Kendi hesabınızı takip etmenize izin yok
admin:
account_actions:
action: Eylemi gerçekleştir
@@ -1165,9 +1166,11 @@ tr:
use_security_key: Güvenlik anahtarını kullan
author_attribution:
example_title: Örnek metin
- hint_html: Mastodon'da bağlantılar paylaşıldığında nasıl tanınmak istediğinizi denetleyin.
+ hint_html: Mastodon dışında haber veya günlük yazıları mı yazıyorsunuz? Bu yazılar Mastodon'da paylaşıldığında size nasıl atıf yapılacağını denetleyin.
+ instructions: 'Bu kodun yazınızın HTML''sinde olduğundan emin olun:'
more_from_html: "%{name} kişisinden daha fazlası"
s_blog: "%{name} kişisinin Günlüğü"
+ then_instructions: Daha sonra, yayının alan adını aşağıda sahaya girin.
title: Yazar atıfı
challenge:
confirm: Devam et
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index de1847a745..f941bfac79 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -25,6 +25,7 @@ uk:
one: Допис
other: Дописів
posts_tab_heading: Дописів
+ self_follow_error: Ви не можете стежити за власним обліковим записом
admin:
account_actions:
action: Виконати дію
@@ -57,7 +58,7 @@ uk:
title: Змінити роль для %{username}
confirm: Зберегти
confirmed: Підтверджено
- confirming: Зберігається
+ confirming: Підтверджується
custom: Власне
delete: Видалити дані
deleted: Видалено
@@ -91,8 +92,8 @@ uk:
title: Розміщення
login_status: Стан входу
media_attachments: Мультимедійні вкладення
- memorialize: Меморіалізувати
- memorialized: Перетворено на пам'ятник
+ memorialize: Увічнити
+ memorialized: Увічнено
memorialized_msg: "%{username} успішно перетворено на пам'ятний обліковий запис"
moderation:
active: Активний
@@ -922,7 +923,7 @@ uk:
moderation:
not_trendable: Не трендові
not_usable: Невикористовувані
- pending_review: Очікує розгляду
+ pending_review: Очікує на розгляд
review_requested: Запит на розгляд
reviewed: Розглянуто
title: Статус
@@ -936,7 +937,7 @@ uk:
reset: Скинути
review: Переглянути допис
search: Пошук
- title: Хештеги
+ title: Гештеґи
updated_msg: Параметри хештеґів успішно оновлені
title: Адміністрування
trends:
@@ -1201,9 +1202,11 @@ uk:
use_security_key: Використовувати ключ безпеки
author_attribution:
example_title: Зразок тексту
- hint_html: Контроль авторства поширених посилань на Mastodon.
+ hint_html: Ви пишете новини чи статті в блозі за межами Mastodon? Контролюйте, як вони підписуються, коли ними діляться на Mastodon.
+ instructions: 'Переконайтесь, що цей код розміщено в HTML-коді вашої статті:'
more_from_html: Більше від %{name}
s_blog: Блог %{name}
+ then_instructions: Потім додайте доменне ім'я публікації у поле нижче.
title: Атрибути авторства
challenge:
confirm: Далі
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 7e44e76e44..560d1282b4 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -19,6 +19,7 @@ vi:
posts:
other: Tút
posts_tab_heading: Tút
+ self_follow_error: Bạn không thể tự theo dõi chính bạn
admin:
account_actions:
action: Thực hiện hành động
@@ -32,7 +33,7 @@ vi:
accounts:
add_email_domain_block: Chặn tên miền email
approve: Phê duyệt
- approved_msg: Đã phê duyệt đăng ký %{username}
+ approved_msg: Đã chấp nhận đăng ký %{username}
are_you_sure: Bạn có chắc không?
avatar: Ảnh đại diện
by_domain: Máy chủ
@@ -131,7 +132,7 @@ vi:
resubscribe: Đăng ký lại
role: Vai trò
search: Tìm kiếm
- search_same_email_domain: Những người khác với cùng tên miền email
+ search_same_email_domain: Những người có cùng tên miền email
search_same_ip: Tra cứu IP
security: Bảo mật
security_measures:
@@ -164,49 +165,49 @@ vi:
unsuspended_msg: Đã kích hoạt lại %{username} thành công
username: Tài khoản
view_domain: Xem mô tả tài khoản này
- warn: Nhắc
+ warn: Cảnh cáo
web: Web
whitelisted: Danh sách trắng
action_logs:
action_types:
- approve_appeal: Chấp nhận kháng cáo
- approve_user: Duyệt đăng ký
+ approve_appeal: Chấp nhận khiếu nại
+ approve_user: Chấp nhận đăng ký
assigned_to_self_report: Tự xử lý báo cáo
change_email_user: Đổi email người dùng
change_role_user: Đổi vai trò
confirm_user: Xác minh
create_account_warning: Cảnh cáo
create_announcement: Tạo thông báo mới
- create_canonical_email_block: Chặn địa chỉ email
+ create_canonical_email_block: Chặn địa chỉ email biến thể
create_custom_emoji: Tạo emoji
create_domain_allow: Cho phép máy chủ
create_domain_block: Chặn máy chủ
- create_email_domain_block: Tạo chặn tên miền email
+ create_email_domain_block: Chặn tên miền email
create_ip_block: Chặn IP
- create_unavailable_domain: Ngừng liên hợp
+ create_unavailable_domain: Bỏ liên hợp
create_user_role: Tạo vai trò
demote_user: Hạ vai trò
destroy_announcement: Xóa thông báo
- destroy_canonical_email_block: Bỏ chặn địa chỉ email
+ destroy_canonical_email_block: Bỏ chặn địa chỉ email biến thể
destroy_custom_emoji: Xóa emoji
- destroy_domain_allow: Bỏ thanh trừng máy chủ
+ destroy_domain_allow: Bỏ máy chủ cho phép
destroy_domain_block: Bỏ chặn máy chủ
destroy_email_domain_block: Bỏ chặn tên miền email
destroy_instance: Thanh trừng máy chủ
destroy_ip_block: Bỏ chặn IP
destroy_status: Xóa tút
- destroy_unavailable_domain: Tái liên hợp
+ destroy_unavailable_domain: Cho phép liên hợp
destroy_user_role: Xóa vai trò
disable_2fa_user: Vô hiệu hóa 2FA
disable_custom_emoji: Vô hiệu hóa emoji
disable_sign_in_token_auth_user: Tắt xác minh bằng email cho người dùng
disable_user: Vô hiệu hóa đăng nhập
- enable_custom_emoji: Duyệt emoji
+ enable_custom_emoji: Cho phép emoji
enable_sign_in_token_auth_user: Bật xác minh bằng email cho người dùng
enable_user: Cho phép đăng nhập
- memorialize_account: Đánh dấu tưởng niệm
+ memorialize_account: Gán tưởng niệm
promote_user: Nâng vai trò
- reject_appeal: Từ chối kháng cáo
+ reject_appeal: Từ chối khiếu nại
reject_user: Từ chối đăng ký
remove_avatar_user: Xóa ảnh đại diện
reopen_report: Mở lại báo cáo
@@ -216,7 +217,7 @@ vi:
sensitive_account: Gán nhạy cảm
silence_account: Gán ẩn
suspend_account: Gán vô hiệu hóa
- unassigned_report: Báo cáo chưa xử lý
+ unassigned_report: Bỏ xử lý báo cáo
unblock_email_account: Bỏ chặn địa chỉ email
unsensitive_account: Bỏ nhạy cảm
unsilence_account: Bỏ ẩn
@@ -229,64 +230,64 @@ vi:
update_status: Cập nhật tút
update_user_role: Cập nhật vai trò
actions:
- approve_appeal_html: "%{name} đã duyệt kháng cáo của %{target}"
+ approve_appeal_html: "%{name} đã chấp nhận khiếu nại từ %{target}"
approve_user_html: "%{name} đã chấp nhận đăng ký từ %{target}"
- assigned_to_self_report_html: "%{name} tự xử lý báo cáo %{target}"
+ assigned_to_self_report_html: "%{name} đã tự xử lý báo cáo %{target}"
change_email_user_html: "%{name} đã thay đổi địa chỉ email của %{target}"
- change_role_user_html: "%{name} đã thay đổi vai trò %{target}"
+ change_role_user_html: "%{name} đã thay đổi vai trò của %{target}"
confirm_user_html: "%{name} đã xác minh địa chỉ email của %{target}"
create_account_warning_html: "%{name} đã cảnh cáo %{target}"
- create_announcement_html: "%{name} tạo thông báo mới %{target}"
- create_canonical_email_block_html: "%{name} đã chặn địa chỉ email với hash %{target}"
+ create_announcement_html: "%{name} đã tạo thông báo %{target}"
+ create_canonical_email_block_html: "%{name} đã chặn địa chỉ email biến thể %{target}"
create_custom_emoji_html: "%{name} đã tải lên biểu tượng cảm xúc mới %{target}"
- create_domain_allow_html: "%{name} kích hoạt liên hợp với %{target}"
- create_domain_block_html: "%{name} chặn máy chủ %{target}"
+ create_domain_allow_html: "%{name} đã bật liên hợp với %{target}"
+ create_domain_block_html: "%{name} đã chặn máy chủ %{target}"
create_email_domain_block_html: "%{name} đã chặn tên miền email %{target}"
create_ip_block_html: "%{name} đã chặn IP %{target}"
- create_unavailable_domain_html: "%{name} ngưng phân phối với máy chủ %{target}"
+ create_unavailable_domain_html: "%{name} đã bỏ liên hợp với máy chủ %{target}"
create_user_role_html: "%{name} đã tạo vai trò %{target}"
demote_user_html: "%{name} đã hạ vai trò của %{target}"
- destroy_announcement_html: "%{name} xóa thông báo %{target}"
- destroy_canonical_email_block_html: "%{name} đã bỏ chặn địa chỉ email với hash %{target}"
+ destroy_announcement_html: "%{name} đã xóa thông báo %{target}"
+ destroy_canonical_email_block_html: "%{name} đã bỏ chặn địa chỉ email biến thể %{target}"
destroy_custom_emoji_html: "%{name} đã xóa emoji %{target}"
destroy_domain_allow_html: "%{name} đã ngừng liên hợp với %{target}"
- destroy_domain_block_html: "%{name} bỏ chặn máy chủ %{target}"
+ destroy_domain_block_html: "%{name} đã bỏ chặn máy chủ %{target}"
destroy_email_domain_block_html: "%{name} đã bỏ chặn email %{target}"
- destroy_instance_html: "%{name} thanh trừng máy chủ %{target}"
- destroy_ip_block_html: "%{name} bỏ chặn IP %{target}"
+ destroy_instance_html: "%{name} đã thanh trừng máy chủ %{target}"
+ destroy_ip_block_html: "%{name} đã bỏ chặn IP %{target}"
destroy_status_html: "%{name} đã xóa tút của %{target}"
- destroy_unavailable_domain_html: "%{name} tiếp tục phân phối với máy chủ %{target}"
+ destroy_unavailable_domain_html: "%{name} tiếp tục liên hợp với máy chủ %{target}"
destroy_user_role_html: "%{name} đã xóa vai trò %{target}"
disable_2fa_user_html: "%{name} đã vô hiệu hóa xác minh hai bước của %{target}"
disable_custom_emoji_html: "%{name} đã ẩn emoji %{target}"
disable_sign_in_token_auth_user_html: "%{name} đã tắt xác minh email của %{target}"
- disable_user_html: "%{name} vô hiệu hóa đăng nhập %{target}"
- enable_custom_emoji_html: "%{name} cho phép emoji %{target}"
+ disable_user_html: "%{name} đã vô hiệu hóa đăng nhập %{target}"
+ enable_custom_emoji_html: "%{name} đã cho phép emoji %{target}"
enable_sign_in_token_auth_user_html: "%{name} đã bật xác minh email của %{target}"
- enable_user_html: "%{name} bỏ vô hiệu hóa đăng nhập %{target}"
+ enable_user_html: "%{name} đã bỏ vô hiệu hóa đăng nhập %{target}"
memorialize_account_html: "%{name} đã biến tài khoản %{target} thành một trang tưởng niệm"
promote_user_html: "%{name} đã nâng vai trò của %{target}"
- reject_appeal_html: "%{name} đã từ chối kháng cáo của %{target}"
+ reject_appeal_html: "%{name} đã từ chối khiếu nại từ %{target}"
reject_user_html: "%{name} đã từ chối đăng ký từ %{target}"
remove_avatar_user_html: "%{name} đã xóa ảnh đại diện của %{target}"
- reopen_report_html: "%{name} mở lại báo cáo %{target}"
+ reopen_report_html: "%{name} đã mở lại báo cáo %{target}"
resend_user_html: "%{name} đã gửi lại email xác minh cho %{target}"
reset_password_user_html: "%{name} đã đặt lại mật khẩu của %{target}"
resolve_report_html: "%{name} đã xử lý báo cáo %{target}"
- sensitive_account_html: "%{name} đánh dấu nội dung của %{target} là nhạy cảm"
+ sensitive_account_html: "%{name} đã gán nội dung của %{target} là nhạy cảm"
silence_account_html: "%{name} đã ẩn %{target}"
suspend_account_html: "%{name} đã vô hiệu hóa %{target}"
- unassigned_report_html: "%{name} đã xử lý báo cáo %{target} chưa xử lí"
- unblock_email_account_html: "%{name} bỏ chặn địa chỉ email của %{target}"
- unsensitive_account_html: "%{name} đánh dấu nội dung của %{target} là bình thường"
+ unassigned_report_html: "%{name} đã thôi xử lý báo cáo %{target}"
+ unblock_email_account_html: "%{name} đã bỏ chặn địa chỉ email của %{target}"
+ unsensitive_account_html: "%{name} đã gán nội dung của %{target} là bình thường"
unsilence_account_html: "%{name} đã bỏ ẩn %{target}"
unsuspend_account_html: "%{name} đã bỏ vô hiệu hóa %{target}"
- update_announcement_html: "%{name} cập nhật thông báo %{target}"
+ update_announcement_html: "%{name} đã cập nhật thông báo %{target}"
update_custom_emoji_html: "%{name} đã cập nhật emoji %{target}"
- update_domain_block_html: "%{name} cập nhật chặn máy chủ %{target}"
- update_ip_block_html: "%{name} cập nhật chặn IP %{target}"
- update_report_html: "%{name} cập nhật báo cáo %{target}"
- update_status_html: "%{name} cập nhật tút của %{target}"
+ update_domain_block_html: "%{name} đã cập nhật chặn máy chủ %{target}"
+ update_ip_block_html: "%{name} đã cập nhật chặn IP %{target}"
+ update_report_html: "%{name} đã cập nhật báo cáo %{target}"
+ update_status_html: "%{name} đã cập nhật tút của %{target}"
update_user_role_html: "%{name} đã cập nhật vai trò %{target}"
deleted_account: tài khoản đã xóa
empty: Không tìm thấy bản ghi.
@@ -353,7 +354,7 @@ vi:
new_users: người mới
opened_reports: báo cáo
pending_appeals_html:
- other: "%{count} kháng cáo đang chờ"
+ other: "%{count} khiếu nại đang chờ"
pending_reports_html:
other: "%{count} báo cáo đang chờ"
pending_tags_html:
@@ -371,7 +372,7 @@ vi:
disputes:
appeals:
empty: Không tìm thấy.
- title: Kháng cáo
+ title: Khiếu nại
domain_allows:
add_new: Cho phép liên hợp với máy chủ
created_msg: Máy chủ đã được kích hoạt liên hợp thành công
@@ -691,8 +692,8 @@ vi:
invite_users_description: Cho phép mời những người mới vào máy chủ
manage_announcements: Quản lý thông báo
manage_announcements_description: Cho phép quản lý thông báo trên máy chủ
- manage_appeals: Quản lý kháng cáo
- manage_appeals_description: Cho phép thành viên kháng cáo đối với các hành động kiểm duyệt
+ manage_appeals: Quản lý khiếu nại
+ manage_appeals_description: Cho phép thành viên khiếu nại đối với các hành động kiểm duyệt
manage_blocks: Quản lý chặn
manage_blocks_description: Cho phép người dùng tự chặn các nhà cung cấp email và địa chỉ IP
manage_custom_emojis: Quản lý emoji
@@ -818,7 +819,7 @@ vi:
original_status: Tút gốc
reblogs: Lượt đăng lại
status_changed: Tút đã sửa
- title: Toàn bộ tút
+ title: Tất cả tút
trending: Xu hướng
visibility: Hiển thị
with_media: Có media
@@ -831,8 +832,8 @@ vi:
sensitive: "%{name} đã đánh dấu %{target} là nhạy cảm"
silence: "%{name} đã ẩn %{target}"
suspend: "%{name} đã vô hiệu hóa %{target}"
- appeal_approved: Đã khiếu nại
- appeal_pending: Đang kháng cáo
+ appeal_approved: Khiếu nại được chấp nhận
+ appeal_pending: Đang khiếu nại
appeal_rejected: Khiếu nại bị từ chối
system_checks:
database_schema_check:
@@ -1007,7 +1008,7 @@ vi:
silence: hạn chế tài khoản của họ
suspend: vô hiệu hóa tài khoản của họ
body: "%{target} đã khiếu nại vì bị %{action_taken_by} %{type} vào %{date}. Họ cho biết:"
- next_steps: Bạn có thể duyệt kháng cáo để hủy kiểm duyệt hoặc bỏ qua.
+ next_steps: Bạn có thể chấp nhận khiếu nại để bỏ kiểm duyệt, hoặc không.
subject: "%{username} đang khiếu nại quyết định kiểm duyệt trên %{instance}"
new_critical_software_updates:
body: Các phiên bản quan trọng mới của Mastodon đã được phát hành, bạn nên cập nhật càng sớm càng tốt!
@@ -1147,9 +1148,11 @@ vi:
use_security_key: Dùng khóa bảo mật
author_attribution:
example_title: Văn bản mẫu
- hint_html: Kiểm soát cách bạn được ghi nhận khi chia sẻ liên kết trên Mastodon.
- more_from_html: Thêm từ %{name}
+ hint_html: Bạn là nhà báo hoặc blogger bên ngoài Mastodon? Kiểm soát cách bài viết của bạn được ghi nhận khi chia sẻ trên Mastodon.
+ instructions: 'Đặt mã này trong HTML bài viết:'
+ more_from_html: Viết bởi %{name}
s_blog: "%{name}'s Blog"
+ then_instructions: Sau đó, thêm URL của báo/blog trong trường bên dưới.
title: Ghi nhận người đăng
challenge:
confirm: Tiếp tục
@@ -1204,12 +1207,12 @@ vi:
appealed_msg: Khiếu nại của bạn đã được gửi đi. Nếu nó được chấp nhận, bạn sẽ nhận được thông báo.
appeals:
submit: Gửi khiếu nại
- approve_appeal: Duyệt kháng cáo
+ approve_appeal: Chấp nhận khiếu nại
associated_report: Báo cáo đính kèm
created_at: Ngày
description_html: Đây là những cảnh cáo và áp đặt kiểm duyệt đối với bạn bởi đội ngũ %{instance}.
recipient: Người nhận
- reject_appeal: Từ chối kháng cáo
+ reject_appeal: Từ chối khiếu nại
status: 'Tút #%{id}'
status_removed: Tút này đã được xóa khỏi hệ thống
title: "%{action} từ %{date}"
@@ -1373,10 +1376,10 @@ vi:
muting: Đang nhập người đã ẩn
type: Kiểu nhập
type_groups:
- constructive: Lượt theo dõi và những thứ đã lưu
- destructive: Lượt chặn và ẩn
+ constructive: Theo dõi và lưu
+ destructive: Chặn và ẩn
types:
- blocking: Danh sách chặn
+ blocking: Danh sách người đã chặn
bookmarks: Tút đã lưu
domain_blocking: Danh sách máy chủ đã chặn
following: Danh sách người theo dõi
@@ -1734,7 +1737,7 @@ vi:
ignore_favs: Bỏ qua số lượt thích
ignore_reblogs: Bỏ qua lượt đăng lại
interaction_exceptions: Ngoại lệ dựa trên tương tác
- interaction_exceptions_explanation: Lưu ý rằng không có gì đảm bảo rằng các tút sẽ bị xóa nếu chúng tụt dưới ngưỡng mức yêu thích hoặc đăng lại, dù đã từng đạt.
+ interaction_exceptions_explanation: Lưu ý là không có gì đảm bảo rằng các tút sẽ bị xóa nếu chúng bị giảm lượt thích hoặc đăng lại, dù đã từng đạt.
keep_direct: Giữ lại tin nhắn
keep_direct_hint: Không xóa tin nhắn của bạn
keep_media: Giữ lại những tút có đính kèm media
@@ -1765,7 +1768,7 @@ vi:
sensitive_content: NSFW
strikes:
errors:
- too_late: Đã quá trễ để kháng cáo
+ too_late: Đã quá trễ để khiếu nại
tags:
does_not_match_previous_name: không khớp với tên trước
themes:
@@ -1839,8 +1842,8 @@ vi:
disable: Bạn không còn có thể sử dụng tài khoản của mình, nhưng hồ sơ của bạn và dữ liệu khác vẫn còn nguyên. Bạn có thể yêu cầu sao lưu dữ liệu của mình, thay đổi cài đặt tài khoản hoặc xóa tài khoản của bạn.
mark_statuses_as_sensitive: Vài tút của bạn đã bị kiểm duyệt viên %{instance} đánh dấu nhạy cảm. Mọi người cần nhấn vào media để xem nó. Bạn có thể tự đánh dấu tài khoản của bạn là nhạy cảm.
sensitive: Từ giờ trở đi, tất cả các media của bạn bạn tải lên sẽ được đánh dấu là nhạy cảm và ẩn đằng sau cảnh báo nhấp chuột.
- silence: Bạn vẫn có thể sử dụng tài khoản của mình, nhưng chỉ những người đang theo dõi bạn mới thấy bài đăng của bạn. Bạn cũng bị loại khỏi các tính năng khám phá khác. Tuy nhiên, những người khác vẫn có thể theo dõi bạn.
- suspend: Bạn không còn có thể sử dụng tài khoản của bạn, hồ sơ và các dữ liệu khác không còn có thể truy cập được. Trong vòng 30 ngày, bạn vẫn có thể đăng nhập để yêu cầu bản sao dữ liệu của mình cho đến khi dữ liệu bị xóa hoàn toàn, nhưng chúng tôi sẽ giữ lại một số dữ liệu cơ bản để ngăn bạn thoát khỏi việc vô hiệu hóa.
+ silence: Bạn vẫn có thể sử dụng tài khoản của mình và người khác vẫn có thể theo dõi bạn, nhưng chỉ những người đã theo dõi bạn mới thấy tút của bạn. Bạn cũng bị loại khỏi các tính năng khám phá khác.
+ suspend: Tài khoản của bạn, hồ sơ và các dữ liệu khác sẽ không thể truy cập được nữa. Bạn vẫn có thể đăng nhập để yêu cầu bản sao dữ liệu của mình cho đến khi dữ liệu bị xóa hoàn toàn trong vòng 30 ngày, nhưng chúng tôi sẽ giữ lại một số dữ liệu cơ bản để phòng khi bạn được bỏ vô hiệu hóa.
reason: 'Lý do:'
statuses: 'Tút vi phạm:'
subject:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index a73871115b..806024b110 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -10,21 +10,22 @@ zh-CN:
followers:
other: 关注者
following: 正在关注
- instance_actor_flash: 该账号用来代表虚拟角色，并不代表个人用户，仅代表服务器本身。该账号用于达成互联之目的，不应该被停用。
- last_active: 最近活动
- link_verified_on: 此链接的所有权已在 %{date} 检查
+ instance_actor_flash: 该账号用来代表虚拟角色，并不代表个人用户，仅代表服务器本身。该账号用于联合目的，不应该被停用。
+ last_active: 上次活跃
+ link_verified_on: 此链接的所有权已在 %{date} 验证
nothing_here: 空空如也！
pin_errors:
following: 你必须关注你要推荐的人
posts:
other: 嘟文
posts_tab_heading: 嘟文
+ self_follow_error: 不可以关注自己
admin:
account_actions:
action: 执行操作
- already_silenced: 此账户已受限。
- already_suspended: 此帐户已被封禁。
- title: 在 %{acct} 上执行管理操作
+ already_silenced: 此账号已受限。
+ already_suspended: 此账号已被封禁。
+ title: 对 %{acct} 执行管理操作
account_moderation_notes:
create: 新建记录
created_msg: 管理记录创建成功！
@@ -55,7 +56,7 @@ zh-CN:
custom: 自定义
delete: 删除数据
deleted: 已删除
- demote: 降任
+ demote: 取消管理员
destroyed_msg: "%{username} 的数据已被安排至删除队列"
disable: 冻结
disable_sign_in_token_auth: 禁用邮件令牌身份验证
@@ -72,7 +73,7 @@ zh-CN:
enabled_msg: 成功解冻 %{username} 的账号
followers: 粉丝
follows: 关注
- header: 个人资料页横幅图片
+ header: 封面图
inbox_url: 收件箱（Inbox）URL
invite_request_text: 加入理由
invited_by: 邀请者为
@@ -81,13 +82,13 @@ zh-CN:
location:
all: 全部
local: 本站
- remote: 远端实例
+ remote: 外站
title: 位置
login_status: 登录状态
media_attachments: 媒体文件
- memorialize: 设置为追悼账户
- memorialized: 被悼念
- memorialized_msg: 成功将 %{username} 转换为悼念账号
+ memorialize: 设为追悼账号
+ memorialized: 已设为追悼账号
+ memorialized_msg: 成功将 %{username} 转换为追悼账号
moderation:
active: 活跃
all: 全部
@@ -97,31 +98,31 @@ zh-CN:
suspended: 已封禁
title: 管理
moderation_notes: 管理记录
- most_recent_activity: 最后一次活跃的时间
- most_recent_ip: 最后一次活跃的 IP 地址
+ most_recent_activity: 最后活跃时间
+ most_recent_ip: 最后活跃IP
no_account_selected: 因为没有选中任何账号，所以没有更改
no_limits_imposed: 无限制
- no_role_assigned: 未定角色
+ no_role_assigned: 未指派角色
not_subscribed: 未订阅
pending: 待审核
perform_full_suspension: 封禁
previous_strikes: 既往处罚
previous_strikes_description_html:
other: 此账号已有%{count}次处罚。
- promote: 升任
+ promote: 设为管理员
protocol: 协议
public: 公开页面
push_subscription_expires: PuSH 订阅过期时间
- redownload: 刷新个人资料
- redownloaded_msg: 成功从来源处刷新 %{username} 的用户资料
+ redownload: 刷新账号信息
+ redownloaded_msg: 成功从来源站点刷新 %{username} 的账号信息
reject: 拒绝
rejected_msg: 已拒绝 %{username} 的注册申请
- remote_suspension_irreversible: 此账户的数据已被不可逆转地删除。
+ remote_suspension_irreversible: 此账号的数据已被不可逆转地删除。
remote_suspension_reversible_hint_html: 账号已在他们的服务器上封禁，数据将在 %{date} 完全删除。 在此之前，远程服务器仍可恢复此账号，并且没有任何不良影响。 如果你想立即移除该账号的所有数据，可以在下面进行。
remove_avatar: 删除头像
- remove_header: 删除横幅图片
+ remove_header: 移除封面图
removed_avatar_msg: 成功删除 %{username} 的头像
- removed_header_msg: 成功删除了 %{username} 的横幅图片
+ removed_header_msg: 成功移除 %{username} 的封面图
resend_confirmation:
already_confirmed: 该用户已被确认
send: 重新发送确认链接
@@ -141,8 +142,8 @@ zh-CN:
sensitized: 已标记为敏感内容
shared_inbox_url: 公用收件箱（Shared Inbox）URL
show:
- created_reports: 这个账户提交的举报
- targeted_reports: 针对这个账户的举报
+ created_reports: 这个账号提交的举报
+ targeted_reports: 针对这个账号的举报
silence: 隐藏
silenced: 已隐藏
statuses: 嘟文
@@ -163,10 +164,10 @@ zh-CN:
unsubscribe: 取消订阅
unsuspended_msg: 已成功取消封禁 %{username} 的账号
username: 用户名
- view_domain: 查看域名摘要
+ view_domain: 查看站点摘要
warn: 警告
web: 站内页面
- whitelisted: 允许跨站交互
+ whitelisted: 允许联合
action_logs:
action_types:
approve_appeal: 批准申诉
@@ -179,24 +180,24 @@ zh-CN:
create_announcement: 创建公告
create_canonical_email_block: 封禁新的邮箱
create_custom_emoji: 创建自定义表情符号
- create_domain_allow: 允许新域名
- create_domain_block: 封禁新域名
+ create_domain_allow: 允许联合
+ create_domain_block: 屏蔽站点
create_email_domain_block: 封禁新的邮箱域名
create_ip_block: 新建 IP 规则
create_unavailable_domain: 创建不可用域名
create_user_role: 创建角色
- demote_user: 给用户降职
+ demote_user: 取消管理员
destroy_announcement: 删除公告
destroy_canonical_email_block: 解除邮箱封禁
destroy_custom_emoji: 删除自定义表情符号
- destroy_domain_allow: 解除域名允许
- destroy_domain_block: 解除域名封禁
+ destroy_domain_allow: 撤销联合许可
+ destroy_domain_block: 撤销站点屏蔽
destroy_email_domain_block: 解除邮箱域名封禁
- destroy_instance: 删除实例
+ destroy_instance: 清除实例
destroy_ip_block: 删除 IP 规则
destroy_status: 删除嘟文
destroy_unavailable_domain: 删除不可用域名
- destroy_user_role: 销毁角色
+ destroy_user_role: 删除角色
disable_2fa_user: 停用双因素认证
disable_custom_emoji: 禁用自定义表情符号
disable_sign_in_token_auth_user: 为用户禁用邮件令牌身份验证
@@ -204,8 +205,8 @@ zh-CN:
enable_custom_emoji: 启用自定义表情符号
enable_sign_in_token_auth_user: 为用户启用邮件令牌身份验证
enable_user: 启用用户
- memorialize_account: 将账户设为追悼模式
- promote_user: 给用户升任
+ memorialize_account: 设为追悼账号
+ promote_user: 指派管理员
reject_appeal: 驳回申诉
reject_user: 拒绝用户
remove_avatar_user: 移除头像
@@ -223,7 +224,7 @@ zh-CN:
unsuspend_account: 解除账号封禁
update_announcement: 更新公告
update_custom_emoji: 更新自定义表情符号
- update_domain_block: 更新域名屏蔽
+ update_domain_block: 更新站点屏蔽
update_ip_block: 编辑 IP 封禁规则
update_report: 更新举报
update_status: 更新嘟文
@@ -239,24 +240,24 @@ zh-CN:
create_announcement_html: "%{name} 创建了新公告 %{target}"
create_canonical_email_block_html: "%{name} 封禁了 hash 为 %{target} 的邮箱地址"
create_custom_emoji_html: "%{name} 添加了新的自定义表情 %{target}"
- create_domain_allow_html: "%{name} 允许了和域名 %{target} 的跨站交互"
- create_domain_block_html: "%{name} 屏蔽了域名 %{target}"
+ create_domain_allow_html: "%{name} 允许了与站点 %{target} 的联合"
+ create_domain_block_html: "%{name} 屏蔽了站点 %{target}"
create_email_domain_block_html: "%{name} 封禁了邮箱域名 %{target}"
create_ip_block_html: "%{name} 为 IP %{target} 创建了规则"
create_unavailable_domain_html: "%{name} 停止了向域名 %{target} 的投递"
- create_user_role_html: "%{name} 创建了 %{target} 角色"
- demote_user_html: "%{name} 对用户 %{target} 进行了降任操作"
+ create_user_role_html: "%{name} 创建了角色 %{target}"
+ demote_user_html: "%{name} 撤销了用户 %{target} 的管理权限"
destroy_announcement_html: "%{name} 删除了公告 %{target}"
destroy_canonical_email_block_html: "%{name} 解封了 hash 为 %{target} 的邮箱地址"
destroy_custom_emoji_html: "%{name} 删除了自定义表情 %{target}"
- destroy_domain_allow_html: "%{name} 拒绝了和 %{target} 跨站交互"
- destroy_domain_block_html: "%{name} 解除了对域名 %{target} 的屏蔽"
+ destroy_domain_allow_html: "%{name} 拒绝了与站点 %{target} 的联合"
+ destroy_domain_block_html: "%{name} 解除了对站点 %{target} 的屏蔽"
destroy_email_domain_block_html: "%{name} 解封了邮箱域名 %{target}"
- destroy_instance_html: "%{name} 删除了实例 %{target}"
+ destroy_instance_html: "%{name} 清除了实例 %{target}"
destroy_ip_block_html: "%{name} 删除了 IP %{target} 的规则"
destroy_status_html: "%{name} 删除了 %{target} 的嘟文"
destroy_unavailable_domain_html: "%{name} 恢复了向域名 %{target} 的投递"
- destroy_user_role_html: "%{name} 删除了 %{target} 角色"
+ destroy_user_role_html: "%{name} 删除了角色 %{target}"
disable_2fa_user_html: "%{name} 停用了用户 %{target} 的双因素认证"
disable_custom_emoji_html: "%{name} 停用了自定义表情 %{target}"
disable_sign_in_token_auth_user_html: "%{name} 为 %{target} 禁用了邮件令牌身份验证"
@@ -264,8 +265,8 @@ zh-CN:
enable_custom_emoji_html: "%{name} 启用了自定义表情 %{target}"
enable_sign_in_token_auth_user_html: "%{name} 为 %{target} 启用了邮件令牌身份验证"
enable_user_html: "%{name} 将用户 %{target} 设置为允许登录"
- memorialize_account_html: "%{name} 将 %{target} 设置为追悼账户"
- promote_user_html: "%{name} 对用户 %{target} 进行了升任操作"
+ memorialize_account_html: "%{name} 将 %{target} 设置为追悼账号"
+ promote_user_html: "%{name} 将用户 %{target} 设为管理员"
reject_appeal_html: "%{name} 驳回了 %{target} 对审核结果的申诉"
reject_user_html: "%{name} 拒绝了用户 %{target} 的注册"
remove_avatar_user_html: "%{name} 删除了 %{target} 的头像"
@@ -287,12 +288,12 @@ zh-CN:
update_ip_block_html: "%{name} 修改了对 IP %{target} 的规则"
update_report_html: "%{name} 更新了举报 %{target}"
update_status_html: "%{name} 刷新了 %{target} 的嘟文"
- update_user_role_html: "%{name} 更改了 %{target} 角色"
+ update_user_role_html: "%{name} 更改了角色 %{target}"
deleted_account: 账号已注销
empty: 没有找到日志
- filter_by_action: 根据行为过滤
- filter_by_user: 根据用户过滤
- title: 运营日志
+ filter_by_action: 根据操作筛选
+ filter_by_user: 根据用户筛选
+ title: 审核日志
unavailable_instance: "(域名不可用)"
announcements:
destroyed_msg: 公告已删除！
@@ -328,7 +329,7 @@ zh-CN:
emoji: 表情
enable: 启用
enabled: 已启用
- enabled_msg: 表情启用成功
+ enabled_msg: 已成功启用此表情
image_hint: 最大 %{size} 的 PNG 或 GIF
list: 列表
listed: 已显示
@@ -341,7 +342,7 @@ zh-CN:
shortcode_hint: 至少 2 个字符，只能使用字母、数字和下划线
title: 自定义表情
uncategorized: 未分类
- unlist: 不公开
+ unlist: 隐藏
unlisted: 已隐藏
update_failed_msg: 表情更新失败
updated_msg: 表情更新成功！
@@ -357,52 +358,52 @@ zh-CN:
pending_reports_html:
other: "%{count} 个待处理举报"
pending_tags_html:
- other: "%{count} 个待处理话题标签"
+ other: "%{count} 个待处理话题"
pending_users_html:
other: "%{count} 个待处理用户"
resolved_reports: 已处理的举报
- software: 软件
+ software: 软件信息
sources: 注册来源
space: 存储使用情况
title: 信息面板
top_languages: 最活跃的语言
top_servers: 最活跃的服务器
- website: 网页端
+ website: 网站
disputes:
appeals:
- empty: 没有发现申诉。
+ empty: 未找到申诉。
title: 申诉
domain_allows:
- add_new: 允许和域名跨站交互
- created_msg: 域名已被允许跨站交互
- destroyed_msg: 域名已被禁止跨站交互
+ add_new: 允许与此站点联合
+ created_msg: 站点已被允许联合
+ destroyed_msg: 站点已被禁止联合
export: 导出
import: 导入
- undo: 不允许和该域名跨站交互
+ undo: 禁止与此站点联合
domain_blocks:
- add_new: 添加新屏蔽域名
+ add_new: 添加新站点屏蔽
confirm_suspension:
cancel: 取消
confirm: 封禁
- permanent_action: 撤销暂停不会恢复任何数据或关系。
- preamble_html: 你将要暂停 %{domain} 及其子域。
- remove_all_data: 这将从你的实例上删除此域名下账户的所有内容、媒体和个人资料数据。
- stop_communication: 你的实例将停止与这些实例的通信。
- title: 确认对 %{domain} 的封锁
- undo_relationships: 这将解除你的实例与这些实例上账户之间的任何关注。
- created_msg: 正在进行域名屏蔽
- destroyed_msg: 域名屏蔽已撤销
+ permanent_action: 撤销屏蔽不会恢复任何数据或关系。
+ preamble_html: 你即将封禁 %{domain} 及其子域名上的站点。
+ remove_all_data: 这将从你的站点上删除对方站点的账号的全部内容、媒体与个人资料数据。
+ stop_communication: 你的站点将停止与这些站点的通信。
+ title: 确认屏蔽 %{domain}
+ undo_relationships: 这将解除你的站点与对方站点的账号之间的任何关注。
+ created_msg: 正在执行站点屏蔽
+ destroyed_msg: 站点屏蔽已被撤销
domain: 域名
- edit: 编辑域名屏蔽
- existing_domain_block: 您已经对 %{name} 设置了更严格的限制。
+ edit: 编辑站点屏蔽列表
+ existing_domain_block: 你已经对 %{name} 设置了更严格的限制。
existing_domain_block_html: 你已经对 %{name} 施加了更严格的限制，你需要先 解封。
export: 导出
import: 导入
new:
create: 添加屏蔽
- hint: 域名屏蔽不会阻止该域名下的帐户进入本站的数据库，但是会对来自这个域名的帐户自动进行预先设置的管理操作。
+ hint: 域名屏蔽不会阻止该域名下的账号进入本站的数据库，但是会对来自这个域名的账号自动进行预先设置的管理操作。
severity:
- desc_html: 选择隐藏会将该域名下帐户发送的嘟文设置为仅关注者可见；选择封禁会将该域名下帐户发送的嘟文、媒体文件以及个人资料数据从本实例上删除；如果你只是想拒绝接收来自该域名的任何媒体文件，请选择无。
+ desc_html: 选择隐藏会将该域名下账号发送的嘟文设置为仅关注者可见；选择封禁会将该域名下账号发送的嘟文、媒体文件以及个人资料数据从本实例上删除；如果你只是想拒绝接收来自该域名的任何媒体文件，请选择无。
noop: 无
silence: 隐藏
suspend: 封禁
@@ -412,7 +413,7 @@ zh-CN:
obfuscate: 混淆域名
obfuscate_hint: 如果启用了域名列表公开限制，就部分混淆列表中的域名
private_comment: 私密评论
- private_comment_hint: 给这一域名限制添加备注，供监察员内部使用
+ private_comment_hint: 给这一域名限制添加备注，供管理员内部使用
public_comment: 公开评论
public_comment_hint: 给这一域名限制添加公开的评论，在公告域名限制列表开启时这些评论将会公开可见。
reject_media: 拒绝接收媒体文件
@@ -438,7 +439,7 @@ zh-CN:
title: 封禁新的邮箱域名
no_email_domain_block_selected: 没有任何项目被选中，因此未更改邮箱域名屏蔽列表
not_permitted: 未允许
- resolved_dns_records_hint_html: 该域名解析的 MX 记录所指向的域名如下，这些域名被用于接收电子邮件。 即使电子邮件地址域名与 MX 域名不同，屏蔽一个 MX 域名意味着阻止任何使用相同 MX 域名的邮箱地址注册本站账户。 请谨慎操作，不要误屏蔽主要的邮箱提供商。
+ resolved_dns_records_hint_html: 该域名解析的 MX 记录所指向的域名如下，这些域名被用于接收电子邮件。 即使电子邮件地址域名与 MX 域名不同，屏蔽一个 MX 域名意味着阻止任何使用相同 MX 域名的邮箱地址注册本站账号。 请谨慎操作，不要误屏蔽主要的邮箱提供商。
resolved_through_html: 通过 %{domain} 解析
title: 被封禁的邮箱域名
export_domain_allows:
@@ -447,9 +448,9 @@ zh-CN:
no_file: 没有选择文件
export_domain_blocks:
import:
- description_html: 您即将导入域名列表，如果您不是此域名列表的作者，请仔细检查核对。
+ description_html: 你即将导入域名列表，如果你不是此域名列表的作者，请仔细检查核对。
existing_relationships_warning: 现有的关注关系
- private_comment_description_html: 为了帮助您追踪域名列表来源，导入的域名列表将被添加如下的私人注释：%{comment}+ private_comment_description_html: 为了帮助你追踪域名列表来源，导入的域名列表将被添加如下的私人注释：
%{comment}private_comment_template: 从 %{source} 导入 %{date} title: 导入域名列表 invalid_domain_block: 由于以下错误，一个或多个域名屏蔽被跳过： %{error} @@ -457,7 +458,7 @@ zh-CN: title: 导入域名列表 no_file: 没有选择文件 follow_recommendations: - description_html: "“关注推荐”可帮助新用户快速找到有趣的内容。 当用户与他人的互动不足以形成个性化的建议时，就会推荐关注这些账户。推荐会每日更新，基于选定语言的近期最高互动数和最多本站关注者数综合评估得出。" + description_html: "“关注推荐”可帮助新用户快速找到有趣的内容。 当用户与他人的互动不足以形成个性化的建议时，就会推荐关注这些账号。推荐会每日更新，基于选定语言的近期最高互动数和最多本站关注者数综合评估得出。" language: 选择语言 status: 嘟文 suppress: 禁用推荐关注 @@ -466,14 +467,14 @@ zh-CN: unsuppress: 恢复推荐关注 instances: audit_log: - title: 近期审计日志 - view_all: 查看完整审计日志 + title: 近期审核记录 + view_all: 查看完整审核记录 availability: description_html: - other: 如果连续 %{count} 天 均无法成功向该域名投递消息，则将不再尝试向其投递，直至收到来自该域名的消息。 + other: 若连续 %{count} 天 均无法成功向该站点投递消息，则将不再尝试向其投递，直至收到来自该站点的消息。 failure_threshold_reached: 于 %{date} 达到失败阈值。 failures_recorded: - other: 在 %{count} 天中尝试失败。 + other: 连续 %{count} 天投递失败。 no_failures_recorded: 没有失败记录。 title: 可用性 warning: 上一次尝试连接此服务器失败 @@ -481,11 +482,11 @@ zh-CN: back_to_limited: 受限 back_to_warning: 警告 by_domain: 域名 - confirm_purge: 你确认要从这个实例中永久地删除数据吗？ + confirm_purge: 确定要删除此站点的全部数据吗？ content_policies: comment: 内部备注 description_html: 你可以设置应用于此域名所有账号和其所有子域名的内容策略。 - limited_federation_mode_description_html: 您可以选择是否允许与该联邦联合。 + limited_federation_mode_description_html: 你可以选择是否允许与此实例联合。 policies: reject_media: 拒收媒体 reject_reports: 拒收举报 @@ -493,12 +494,12 @@ zh-CN: suspend: 封禁 policy: 策略 reason: 公开理由 - title: 本站点内容发布规则 + title: 内容策略 dashboard: instance_accounts_dimension: 被关注最多的账号 instance_accounts_measure: 存储的账号 - instance_followers_measure: 本站关注者 - instance_follows_measure: 对方关注者 + instance_followers_measure: 本站在对方站点的关注者 + instance_follows_measure: 对方在本站的关注者 instance_languages_dimension: 语言排行 instance_media_attachments_measure: 存储的媒体文件 instance_reports_measure: 关于对方的举报 @@ -506,39 +507,39 @@ zh-CN: delivery: all: 全部 clear: 清理投递错误 - failing: 发送失败 + failing: 投递失败 restart: 重新投递 stop: 停止投递 unavailable: 不可用 delivery_available: 可投递 delivery_error_days: 投递错误天数 delivery_error_hint: 如果投递已不可用 %{count} 天，它将被自动标记为无法投递。 - destroyed_msg: "%{domain} 中的数据现在正在排队等待被立刻删除。" + destroyed_msg: 来自 %{domain} 的数据已被加入删除队列，即将删除。 empty: 暂无域名。 known_accounts: other: "%{count} 个已知账号" moderation: all: 全部 limited: 受限的 - title: 运营 + title: 审核 private_comment: 私密评论 public_comment: 公开评论 - purge: 删除 + purge: 清除 purge_description_html: 如果你确认此域名已永久离线，可以从存储中删除此域名的所有账号记录和相关数据。这将会需要一段时间。 - title: 已知实例 - total_blocked_by_us: 被我站屏蔽的 + title: 联合 + total_blocked_by_us: 被本站屏蔽的 total_followed_by_them: 被对方关注的 - total_followed_by_us: 被我站关注的 + total_followed_by_us: 被本站关注的 total_reported: 关于对方的举报 total_storage: 媒体文件 totals_time_period_hint_html: 下方显示的总数来自全部历史数据。 - unknown_instance: 此服务器上目前没有此域名的记录。 + unknown_instance: 本站目前没有此站点的记录。 invites: - deactivate_all: 撤销所有邀请链接 + deactivate_all: 全部停用 filter: all: 全部 available: 可用 - expired: 已失效 + expired: 已过期 title: 筛选 title: 邀请用户 ip_blocks: @@ -554,7 +555,7 @@ zh-CN: '94670856': 3年 new: title: 创建新 IP 规则 - no_ip_block_selected: 因为没有 IP 规则被选中，所以没有更改 + no_ip_block_selected: 未选中任何 IP 规则，所以没有更改 title: IP 规则 relationships: title: "%{acct} 的关系" @@ -571,7 +572,7 @@ zh-CN: pending: 等待中继站的确认 save_and_enable: 保存并启用 setup: 设置中继连接 - signatures_not_enabled: 安全模式或限联模式启用时，中继将不会正常工作 + signatures_not_enabled: 安全模式或白名单模式启用时，中继站可能将不会正常工作 status: 状态 title: 中继站 report_notes: @@ -588,22 +589,22 @@ zh-CN: mark_as_sensitive_description_html: 被举报的嘟文将被标记为敏感，同时该账号将被标记一次处罚，以供未来同一账号再次违规时参考。 other_description_html: 查看更多控制该账号行为的选项，并自定义编写与被举报账号的通信。 resolve_description_html: 不会对被举报账号采取任何动作，举报将被关闭，也不会留下处罚记录。 - silence_description_html: 只有关注或手工搜索此账号才能查看其资料，将严重限制其触达范围。可随时撤销。关闭针对此帐户的所有举报。 - suspend_description_html: 该帐户及其所有内容将无法访问并最终被删除，且无法与该帐户进行互动。 在 30 天内可随时撤销。关闭针对此帐户的所有举报。 + silence_description_html: 只有关注或手工搜索此账号才能查看其资料，将严重限制其触达范围。可随时撤销。关闭针对此账号的所有举报。 + suspend_description_html: 该账号及其所有内容将无法访问并最终被删除，且无法与该账号进行互动。 在 30 天内可随时撤销。关闭针对此账号的所有举报。 actions_description_html: 决定采取何种措施处理此举报。如果对被举报账号采取惩罚性措施，将向其发送一封电子邮件通知。但若选中垃圾信息类别则不会发送通知。 - actions_description_remote_html: 决定采取何种行动来解决此举报。 这只会影响您的服务器如何与该远程帐户的通信并处理其内容。 + actions_description_remote_html: 决定采取何种行动来解决此举报。 这只会影响你的服务器如何与该远程账号的通信并处理其内容。 actions_no_posts: 该举报没有相关嘟文可供删除 - add_to_report: 增加更多举报内容 + add_to_report: 添加更多内容到举报 already_suspended_badges: - local: 已经在此服务器上暂停 + local: 已在此服务器上被封禁 remote: 已在其所属服务器被封禁 are_you_sure: 你确定吗？ assign_to_self: 接管 - assigned: 已接管的监察员 - by_target_domain: 被举报账户的域名 + assigned: 已接管的管理员 + by_target_domain: 被举报账号的域名 cancel: 取消 category: 类别 - category_description_html: 在与被举报账户的通信时，将引用该账号和/或内容被举报的原因 + category_description_html: 在与被举报账号的通信时，将引用该账号和/或内容被举报的原因 comment: none: 没有 comment_description_html: "%{name} 补充道：" @@ -613,7 +614,7 @@ zh-CN: delete_and_resolve: 删除嘟文 forwarded: 已转发 forwarded_replies_explanation: 该举报来自外站用户，涉及外站内容。之所以转发给你，是因为被举报的内容是对你站点一位用户的回复。 - forwarded_to: 转发举报至 %{domain} + forwarded_to: 转发举报到 %{domain} mark_as_resolved: 标记为已处理 mark_as_sensitive: 标记为敏感内容 mark_as_unresolved: 标记为未处理 @@ -621,14 +622,14 @@ zh-CN: notes: create: 添加记录 create_and_resolve: 添加记录并标记为“已处理” - create_and_unresolve: 添加记录并重开 + create_and_unresolve: 添加备注并重新打开 delete: 删除 placeholder: 描述已经执行的操作，或其他任何相关的跟进情况… title: 备注 - notes_description_html: 查看备注或向其他监察员留言 + notes_description_html: 查看备注或向其他管理员留言 processed_msg: '举报 #%{id} 处理成功' quick_actions_description_html: 快捷选择操作或向下滚动以查看举报内容： - remote_user_placeholder: 来自 %{instance} 的远程实例用户 + remote_user_placeholder: 来自 %{instance} 的外站用户 reopen: 重开举报 report: '举报 #%{id}' reported_account: 举报用户 @@ -642,20 +643,20 @@ zh-CN: statuses_description_html: 在与该账号的通信中将引用违规内容 summary: action_preambles: - delete_html: 您即将删除 @%{acct} 的一些嘟文。 这将： - mark_as_sensitive_html: 您即将 标记 @%{acct} 的帖一些子为 敏感。这将： - silence_html: 您即将限制 @%{acct} 的帐户。 这将： - suspend_html: 您即将暂停 @%{acct} 的帐户。 这将： + delete_html: 你即将删除 @%{acct} 的一些嘟文。 这将： + mark_as_sensitive_html: 你即将 标记 @%{acct} 的帖一些子为 敏感。这将： + silence_html: 你即将限制 @%{acct} 的账号。 这将： + suspend_html: 你即将暂停 @%{acct} 的账号。 这将： actions: delete_html: 删除违规嘟文 mark_as_sensitive_html: 将违规嘟文的媒体标记为敏感 silence_html: 严格限制 @%{acct} 的影响力，方法是让他们的个人资料和内容仅对已经关注他们的人可见，或手动查找其个人资料时 suspend_html: 暂停 @%{acct}，使他们的个人资料和内容无法访问，也无法与之互动 - close_report: '将报告 #%{id} 标记为已解决' - close_reports_html: 将针对 @%{acct} 的所有 报告标记为已解决 + close_report: '将举报 #%{id} 标记为已解决' + close_reports_html: 将针对 @%{acct} 的所有举报标记为已解决 delete_data_html: 从现在起 30 天后删除 @%{acct} 的个人资料和内容，除非他们同时解除暂停。 preview_preamble_html: "@%{acct} 将收到包含以下内容的警告：" - record_strike_html: 记录一次针对 @%{acct} 的警示，以帮助您在这个帐户上的未来违规事件中得到重视。 + record_strike_html: 记录一次针对 @%{acct} 的警示，以帮助你在这个账号上的未来违规事件中得到重视。 send_email_html: 向 @%{acct} 发送警告邮件 warning_placeholder: 可选的补充理由，以说明调整的情况。 target_origin: 被举报账号的来源 @@ -668,61 +669,61 @@ zh-CN: roles: add_new: 添加角色 assigned_users: - other: "%{count} 用户" + other: "%{count} 名用户" categories: administration: 管理 devops: 开发运维 invites: 邀请 - moderation: 监察 + moderation: 审核 special: 特殊 delete: 刪除 - description_html: 使用 用户角色，您可以自定义您的用户可以访问的功能和区域。 - edit: 编辑 '%{name}' 角色 + description_html: 使用 用户角色，你可以自定义你的用户可以访问的 Mastodon 功能和区域。 + edit: 编辑角色 '%{name}' everyone: 默认权限 - everyone_full_description_html: 这是影响到 所有用户的基础角色，包括未指定角色的用户。 其他所有的角色都继承着它的权限。 + everyone_full_description_html: 该角色是基础角色，会影响所有用户，包括未指定角色的用户。 其他所有的角色都继承该角色的权限。 permissions_count: - other: "%{count} 权限" + other: "%{count} 个权限" privileges: administrator: 管理员 - administrator_description: 拥有此权限的用户将绕过每个权限 + administrator_description: 拥有此权限的用户将绕过所有权限限制。 delete_user_data: 删除用户数据 delete_user_data_description: 允许用户立即删除其他用户的数据 invite_users: 邀请用户 - invite_users_description: 允许用户邀请新人加入服务器 + invite_users_description: 允许用户邀请新人加入站点 manage_announcements: 管理公告 - manage_announcements_description: 允许用户管理服务器上的通知 + manage_announcements_description: 允许用户管理站点上的公告 manage_appeals: 管理申诉 - manage_appeals_description: 允许用户审阅针对管理操作的申诉 - manage_blocks: 管理地址段 - manage_blocks_description: 允许用户屏蔽邮箱提供商和IP地址 + manage_appeals_description: 允许用户复核针对管理操作的申诉 + manage_blocks: 管理地址屏蔽列表 + manage_blocks_description: 允许用户屏蔽邮箱域名与IP地址 manage_custom_emojis: 管理自定义表情 - manage_custom_emojis_description: 允许用户管理服务器上的自定义表情 - manage_federation: 管理邦联 - manage_federation_description: 允许用户屏蔽或允许同其他域名的邦联，并控制消息投递能力 + manage_custom_emojis_description: 允许用户管理站点上的自定义表情 + manage_federation: 管理联合 + manage_federation_description: 允许用户禁止或允许本站同其他站点的联合，并控制消息投递能力 manage_invites: 管理邀请 - manage_invites_description: 允许用户浏览和停用邀请链接 + manage_invites_description: 允许用户浏览与停用邀请链接 manage_reports: 管理举报 manage_reports_description: 允许用户审核举报并执行管理操作 manage_roles: 管理角色 - manage_roles_description: 允许用户管理和分配比他们权限低的角色 + manage_roles_description: 允许用户管理与指派比自己权限低的角色 manage_rules: 管理规则 - manage_rules_description: 允许用户更改服务器规则 + manage_rules_description: 允许用户修改站点规则 manage_settings: 管理设置 manage_settings_description: 允许用户更改站点设置 - manage_taxonomies: 管理分类 - manage_taxonomies_description: 允许用户查看热门内容并更新标签设置 - manage_user_access: 管理访问 - manage_user_access_description: 允许用户禁用其它用户的双因素身份验证，更改他们的邮箱地址，以及重置他们的密码。 + manage_taxonomies: 管理热门与话题 + manage_taxonomies_description: 允许用户审核热门内容并更新话题设置 + manage_user_access: 管理用户身份验证信息 + manage_user_access_description: 允许用户允许用户为其他用户关闭双因素身份验证、修改邮箱并重置密码。 manage_users: 管理用户 manage_users_description: 允许用户查看其他用户的信息并执行管理操作 manage_webhooks: 管理 Webhooks manage_webhooks_description: 允许用户为管理事件配置 Webhook view_audit_log: 查看审核日志 - view_audit_log_description: 允许用户查看此服务器上的管理操作记录 - view_dashboard: 查看仪表板 - view_dashboard_description: 允许用户访问仪表盘和各种指标 + view_audit_log_description: 允许用户查看此站点上的管理操作记录 + view_dashboard: 查看信息面板 + view_dashboard_description: 允许用户访问信息面板和各种指标 view_devops: 开发运维 - view_devops_description: 允许用户访问 Sidekiq 和 pgHero 仪表板 + view_devops_description: 允许用户访问 Sidekiq 和 pgHero 控制面板 title: 角色 rules: add_new: 添加规则 @@ -734,7 +735,7 @@ zh-CN: settings: about: manage_rules: 管理服务器规则 - preamble: 提供此服务器如何运营、资金状况等的深入信息。 + preamble: 提供此服务器如何运营、审核及资金状况等详细信息。 rules_hint: 有一个专门区域用于显示用户需要遵守的规则。 title: 关于本站 appearance: @@ -745,7 +746,7 @@ zh-CN: title: 招牌 captcha_enabled: desc_html: 这依赖于来自hCaptcha的外部脚本，可能会带来安全和隐私问题。此外，这可能使注册过程对某些人（尤其是残疾人）的注册简易程度大幅下降。出于这些原因，请考虑采取其他措施，如基于批准或邀请的注册方式。 - title: 要求新用户输入验证码以确认他们的账户 + title: 要求新用户输入验证码以确认他们的账号 content_retention: danger_zone: 危险操作区 preamble: 控制用户生成的内容在 Mastodon 中如何存储。 @@ -757,7 +758,7 @@ zh-CN: follow_recommendations: 关注推荐 preamble: 露出有趣的内容有助于新加入 Mastodon 的用户融入。可在这里控制多种发现功能如何在你的服务器上工作。 profile_directory: 个人资料目录 - public_timelines: 公共时间轴 + public_timelines: 公共时间线 publish_discovered_servers: 已公开实例的服务器 publish_statistics: 发布统计数据 title: 发现 @@ -765,7 +766,7 @@ zh-CN: domain_blocks: all: 对所有人 disabled: 不对任何人 - users: 对本地已登录用户 + users: 对已登录的本站用户 registrations: moderation_recommandation: 在向所有人开放注册之前，请确保你拥有一个人手足够且反应迅速的管理团队！ preamble: 控制谁可以在你的服务器上创建账号。 @@ -777,10 +778,10 @@ zh-CN: open: 开放注册 warning_hint: 我们建议使用“注册必须经过批准”，除非你确信你的管理团队能够及时处理骚扰和恶意注册。 security: - authorized_fetch: 需要跨站认证 - authorized_fetch_hint: 要求外站请求通过验证能够使用户级别与服务器级别的封锁更为严格。然而，这将带来额外的性能负担、减少回复触达范围、并可能导致与一些联邦宇宙服务的兼容性问题。此外，这并不能阻止他人针对性地获取公开嘟文与账户。 + authorized_fetch: 与外站联合时要求身份验证 + authorized_fetch_hint: 要求外站请求通过验证能够使用户级别与服务器级别的封锁更为严格。然而，这将带来额外的性能负担、减少回复触达范围、并可能导致与一些联邦宇宙服务的兼容性问题。此外，这并不能阻止他人针对性地获取公开嘟文与账号。 authorized_fetch_overridden_hint: 由于此设置被环境变量覆盖，目前无法更改。 - federation_authentication: 强制跨站认证 + federation_authentication: 联合时强制要求身份验证 title: 服务器设置 site_uploads: delete: 删除已上传的文件 @@ -800,15 +801,15 @@ zh-CN: statuses: account: 作者 application: 应用 - back_to_account: 返回帐户信息页 + back_to_account: 返回账号信息页 back_to_report: 返回举报页 batch: - remove_from_report: 从报告中移除 + remove_from_report: 从举报中移除 report: 举报 deleted: 已删除 favourites: 喜欢 history: 版本历史记录 - in_reply_to: 回复给 + in_reply_to: 回复 language: 语言 media: title: 媒体文件 @@ -818,7 +819,7 @@ zh-CN: original_status: 原始嘟文 reblogs: 转发 status_changed: 嘟文已编辑 - title: 帐户嘟文 + title: 账号嘟文 trending: 当前热门 visibility: 可见性 with_media: 含有媒体文件 @@ -844,10 +845,10 @@ zh-CN: elasticsearch_index_mismatch: message_html: Elasticsearch索引映射已过时。请运行
tootctl search deploy --only=%{value}。
elasticsearch_preset:
- action: 查看文档
+ action: 阅读文档
message_html: 你的Elasticsearch集群有多个节点，但Mastodon未配置好使用它们。
elasticsearch_preset_single_node:
- action: 查看文档
+ action: 阅读文档
message_html: 你的Elasticsearch集群只有一个节点，ES_PRESET应该设置为single_node_cluster。
elasticsearch_reset_chewy:
message_html: 你的Elasticsearch系统索引已过时，可能是由于设置更改导致的。请运行tootctl search deploy --reset-chewy命令来更新它。
@@ -894,8 +895,8 @@ zh-CN:
reset: 重置
review: 审核状态
search: 搜索
- title: 话题标签
- updated_msg: 话题标签设置更新成功
+ title: 话题
+ updated_msg: 话题设置更新成功
title: 管理
trends:
allow: 允许
@@ -925,7 +926,7 @@ zh-CN:
pending_review: 待审核
preview_card_providers:
allowed: 来自此发布者的链接可进入流行列表
- description_html: 这些域名所属的链接经常在此服务器上被分享。在对应域名获得批准前链接不会公开显示在热门中。批准和拒绝操作也会对子域名生效。
+ description_html: 以下域名是用户在本站分享的链接的常见来源。在对应域名获得批准前链接不会公开显示在热门中。批准和拒绝操作也会对子域名生效。
rejected: 来自此发布者的链接不会进入热门列表
title: 发布者
rejected: 已拒绝
@@ -933,9 +934,9 @@ zh-CN:
allow: 允许嘟文
allow_account: 允许发布者
confirm_allow: 你确定要允许选中的嘟文吗？
- confirm_allow_account: 你确定要允许选中的账户吗？
+ confirm_allow_account: 你确定要允许选中的账号吗？
confirm_disallow: 你确定要禁止选中的嘟文吗？
- confirm_disallow_account: 你确定要禁止选中的账户吗？
+ confirm_disallow_account: 你确定要禁止选中的账号吗？
description_html: 这些是当前此服务器可见的被大量分享和喜欢的嘟文。这些嘟文可以帮助新老用户找到更多可关注的账号。批准发布者且发布者允许将其账号推荐给其他用户前，不会公开显示任何嘟文。你也可以批准或拒绝个别嘟文。
disallow: 禁止嘟文
disallow_account: 禁止发布者
@@ -951,7 +952,7 @@ zh-CN:
tag_languages_dimension: 语言排行
tag_servers_dimension: 服务器排行
tag_servers_measure: 不同服务器
- tag_uses_measure: 总使用
+ tag_uses_measure: 总使用次数
description_html: 这些是当前此服务器可见嘟文中大量出现的标签。它可以帮助用户发现其他人正关注的话题。在获得批准前不会公开显示任何标签。
listable: 可被推荐
no_tag_selected: 因为没有选中任何标签，所以没有更改
@@ -966,22 +967,22 @@ zh-CN:
usage_comparison: 今日被使用 %{today} 次，前一日为 %{yesterday} 次
used_by_over_week:
other: 过去一周内被 %{count} 个人使用过
- title: 建议与热门
+ title: 推荐与热门
trending: 当前热门
warning_presets:
add_new: 添加新条目
delete: 删除
- edit_preset: 编辑预置警告
+ edit_preset: 编辑预设警告
empty: 你尚未定义任何警告预设。
title: 预设警告
webhooks:
- add_new: 新增对端
+ add_new: 新增端点
delete: 删除
description_html: "Webhook 使 Mastodon 能够推送 关于所选事件的实时通知 到你自己的应用程序，进而由你的应用程序自动触发反应。"
disable: 禁用
disabled: 已禁用
edit: 编辑对端
- empty: 你尚未配置任何 Webhook 对端。
+ empty: 你尚未配置任何 Webhook 端点。
enable: 启用
enabled: 活跃
enabled_events:
@@ -1011,17 +1012,17 @@ zh-CN:
subject: "%{username} 对 %{instance} 的审核结果提出了申诉"
new_critical_software_updates:
body: 新的紧急更新版本Mastodon已经发布，你可能希望尽快更新！
- subject: 适用于 %{instance} 的Mastodon紧急更新已经可用。
+ subject: "%{instance} 有 Mastodon 的紧急更新！"
new_pending_account:
- body: 新账户的详细信息如下。你可以批准或拒绝此申请。
- subject: 在 %{instance} 上有新账号 (%{username}) 需要审核
+ body: 新账号的详细信息如下。你可以批准或拒绝此申请。
+ subject: "%{instance} 上有新账号 (%{username}) 需要审核"
new_report:
body: "%{reporter} 举报了用户 %{target}"
body_remote: 来自 %{domain} 的用户举报了用户 %{target}
subject: 来自 %{instance} 的用户举报（#%{id}）
new_software_updates:
body: 新的 Mastodon 版本已发布，你可能想要更新！
- subject: 适用于 %{instance} 的Mastodon版本更新已经可用！
+ subject: "%{instance} 有 Mastodon版本更新！"
new_trends:
body: 以下项目需要审核才能公开显示：
new_trending_links:
@@ -1033,15 +1034,15 @@ zh-CN:
subject: "%{instance} 上有新热门等待审核"
aliases:
add_new: 创建别名
- created_msg: 成功创建了一个新别名。你现在可以从旧账户开始迁移了。
- deleted_msg: 成功移除别名。已经无法从该帐户移动到此帐户了。
- empty: 你没有设置别名
+ created_msg: 成功创建了一个新别名。你现在可以从旧账号开始迁移了。
+ deleted_msg: 成功移除别名。已经无法从该账号移动到此账号了。
+ empty: 你没有设置别名。
hint_html: 如果你想从另一个账号迁移到这里，可以先在这里创建一个别名。要把旧账号的关注者迁移过来，这一步是必须的。设置别名的操作是无害且可撤销的。账号迁移的操作会从旧账号发起。
remove: 取消关联别名
appearance:
advanced_web_interface: 高级 Web 界面
- advanced_web_interface_hint: 如果你想使用整个屏幕宽度，高级 web 界面允许您配置多个不同的栏目，可以同时看到更多的信息：主页、通知、跨站时间轴、任意数量的列表和话题标签。
- animations_and_accessibility: 动画和访问选项
+ advanced_web_interface_hint: 在高级网页界面支持自定义多栏显示，你可以利用整个屏幕的宽度，同时查看首页、通知、跨站时间线及任意数量的列表和话题。
+ animations_and_accessibility: 动画与可访问性
confirmation_dialogs: 确认对话框
discovery: 发现
localization:
@@ -1055,7 +1056,7 @@ zh-CN:
settings: 更改邮件偏好： %{link}
unsubscribe: 取消订阅
view: 点此链接查看详情：
- view_profile: 查看个人资料页
+ view_profile: 查看个人资料
view_status: 查看嘟文
applications:
created: 应用创建成功
@@ -1072,20 +1073,20 @@ zh-CN:
hint_html: 只剩最后一件事了！我们需要确认你是一个人类（这样我们才能阻止恶意访问！）。请输入下面的验证码，然后点击“继续”。
title: 安全检查
confirmations:
- awaiting_review: 你的邮箱地址已确认！%{domain} 的工作人员正在审核你的注册信息。如果他们批准了你的账户，你将收到一封邮件通知！
+ awaiting_review: 邮箱确认成功！%{domain} 的工作人员正在审核你的注册信息。如果他们批准了你的账号，你将收到一封邮件通知！
awaiting_review_title: 你的注册申请正在审核中
clicking_this_link: 点击此链接
login_link: 登录
- proceed_to_login_html: 现在你可以继续前往 %{login_link} 。
- redirect_to_app_html: 你应该已被重定向到 %{app_name} 应用程序。如果没有，请尝试 %{clicking_this_link} 或手动返回应用程序。
+ proceed_to_login_html: 你现在可以继续 %{login_link} 。
+ redirect_to_app_html: 你应该已经跳转到 %{app_name}。如果没有，请尝试 %{clicking_this_link} 或手动返回 App。
registration_complete: 你在 %{domain} 上的注册现已完成！
welcome_title: 欢迎你，%{name}！
- wrong_email_hint: 如果该邮箱地址不正确，你可以在账户设置中进行更改。
- delete_account: 删除帐户
- delete_account_html: 如果你想删除你的帐户，请点击这里继续。你需要确认你的操作。
+ wrong_email_hint: 如果这个邮箱地址不正确，你可以在账号设置中更改。
+ delete_account: 删除账号
+ delete_account_html: 如果你想删除你的账号，请点击此处继续。你需要确认你的操作。
description:
prefix_invited_by_user: "@%{name} 邀请你加入这个Mastodon服务器！"
- prefix_sign_up: 现在就注册 Mastodon！
+ prefix_sign_up: 现在就注册 Mastodon 吧！
suffix: 注册一个账号，你就可以关注他人、发布嘟文、并和其它任何 Mastodon 服务器上的用户交流，而且还有其它更多功能！
didnt_get_confirmation: 没有收到确认链接？
dont_have_your_security_key: 没有你的安全密钥？
@@ -1096,14 +1097,14 @@ zh-CN:
log_in_with: 通过外部服务登录
login: 登录
logout: 退出登录
- migrate_account: 迁移到另一个账户
+ migrate_account: 迁移到另一个账号
migrate_account_html: 如果你希望引导他人关注另一个账号，请点击这里进行设置。
or_log_in_with: 或通过外部服务登录
privacy_policy_agreement_html: 我已阅读并同意 隐私政策
progress:
confirm: 确认邮箱
- details: 您的详情
- review: 我们的复审
+ details: 你的详细信息
+ review: 我们的审核
rules: 接受规则
providers:
cas: CAS
@@ -1115,41 +1116,43 @@ zh-CN:
rules:
accept: 接受
back: 返回
- invited_by: 你可以加入%{domain}，这是由于你收到了他人的邀请，邀请来自：
- preamble: 这些由 %{domain} 监察员设置和执行。
- preamble_invited: 在你继续之前，请考虑 %{domain} 的管理员设定的基本规则。
+ invited_by: 欢迎加入%{domain}，你是通过以下用户的邀请加入的：
+ preamble: 以下规则由 %{domain} 的管理员设定并执行。
+ preamble_invited: 在继续操作前，请先阅读并同意 %{domain} 管理员设置的基本规则。
title: 一些基本规则。
- title_invited: 您已经被邀请。
- security: 账户安全
+ title_invited: 通过邀请加入
+ security: 账号安全
set_new_password: 设置新密码
setup:
- email_below_hint_html: 请检查你的垃圾邮件文件夹，或请求再发送一次。如果你的邮箱地址不正确，你可以更正它。
- email_settings_hint_html: 请点击我们发送给 %{email} 地址中的确认链接。我在这儿等着您。
+ email_below_hint_html: 请检查你的垃圾邮件文件夹，或请求重新发送邮件。如果你填写的邮箱地址有误，请更正。
+ email_settings_hint_html: 请点击我们发送给 %{email} 地址中的确认链接。我在这儿等着你。
link_not_received: 没有收到链接？
new_confirmation_instructions_sent: 你将在几分钟内收到一封带有确认链接的新邮件！
title: 请检查你的收件箱
sign_in:
- preamble_html: 使用您在 %{domain} 的账户和密码登录。如果您的账户托管在其他的服务器上，您将无法在此登录。
+ preamble_html: 使用你在 %{domain} 的账号和密码登录。如果你的账号是在其他站点上注册的，你将无法在此登录。
title: 登录到 %{domain}
sign_up:
- manual_review: 您在 %{domain} 上的注册需要经由管理人员手动审核。 为了帮助我们处理您的注册，请稍微介绍一下您为什么想在 %{domain} 上注册。
- preamble: 有了这个Mastodon服务器上的账户，您就可以关注Mastodon网络上的任何其他人，无论他们的账户在哪里。
+ manual_review: 你在 %{domain} 上的注册需要经由管理人员手动审核。 为了帮助我们处理你的注册，请简要说明你为什么想在 %{domain} 上注册。
+ preamble: 有了这个Mastodon服务器上的账号，你就可以关注Mastodon网络上的任何其他人，无论他们的账号在哪里。
title: 让我们在 %{domain} 上开始。
status:
- account_status: 账户状态
+ account_status: 账号状态
confirming: 等待完成邮箱地址确认
functional: 你的账号可以正常使用了。
pending: 站务人员正在审核你的申请。这需要花点时间。在申请被批准后，你将收到一封邮件。
- redirecting_to: 你的账户无效，因为它已被设置为跳转到 %{acct}
- self_destruct: 由于 %{domain} 即将关闭，你只能获得对你本人账号的有限访问权限。
- view_strikes: 查看针对你账号的记录
+ redirecting_to: 你的账号无效，因为它已被设置为跳转到 %{acct}
+ self_destruct: "%{domain} 即将关闭，你只能获得对你自己的账号的有限访问权限。"
+ view_strikes: 查看针对你账号的处罚记录
too_fast: 表单提交过快，请重试。
use_security_key: 使用安全密钥
author_attribution:
example_title: 示例文本
- hint_html: 控制在 Mastodon 上分享的链接如何显示你的署名。
+ hint_html: 你是否在 Mastodon 之外撰写新闻或博客文章？控制它们被分享到 Mastodon 时的署名方式。
+ instructions: 请确保将这段代码放在你文章的 HTML 中：
more_from_html: 来自 %{name} 的更多内容
s_blog: "%{name} 的博客"
+ then_instructions: 然后，在下面的文本框中添加你用于发布文章的域名。
title: 作者归属
challenge:
confirm: 继续
@@ -1181,8 +1184,8 @@ zh-CN:
challenge_not_passed: 你输入的信息不正确
confirm_password: 输入你当前的密码来验证身份
confirm_username: 输入你的用户名以继续
- proceed: 删除账户
- success_msg: 你的账户已成功删除
+ proceed: 删除账号
+ success_msg: 你的账号已成功删除
warning:
before: 在删除前，请仔细阅读下列说明：
caches: 已被其他服务器缓存的内容可能还会保留
@@ -1190,7 +1193,7 @@ zh-CN:
email_change_html: 你可以 更改邮箱地址，而无需删除账号
email_contact_html: 如果它还未送达，你可以发邮件给 %{email} 寻求帮助。
email_reconfirmation_html: 如果你没有收到确认邮件，请点击 重新发送 。
- irreversible: 你将无法恢复或重新激活你的账户
+ irreversible: 你将无法恢复或重新激活你的账号
more_details_html: 更多细节，请查看 隐私政策 。
username_available: 你的用户名现在又可以使用了
username_unavailable: 你的用户名仍将无法使用
@@ -1200,14 +1203,14 @@ zh-CN:
appeal: 申诉
appeal_approved: 此次处罚已申诉成功并不再生效
appeal_rejected: 此次申诉已被驳回
- appeal_submitted_at: 已提出申诉
+ appeal_submitted_at: 已提交申诉
appealed_msg: 你的申诉已经提交。如果申诉通过，你将收到通知。
appeals:
submit: 提交申诉
approve_appeal: 批准申诉
associated_report: 相关举报
created_at: 日期
- description_html: 这些是针对您的账户采取的行动和警告，已经由 %{instance} 的工作人员发送给您。
+ description_html: 以下是针对你的账号采取的行动和警告，已经由 %{instance} 的工作人员发送给你。
recipient: 发送至
reject_appeal: 驳回申诉
status: '嘟文 #%{id}'
@@ -1222,26 +1225,26 @@ zh-CN:
silence: 账号限制
suspend: 账号封禁
your_appeal_approved: 你的申诉已被批准
- your_appeal_pending: 你已提交申诉
+ your_appeal_pending: 你已经提交了一次申诉
your_appeal_rejected: 你的申诉已被驳回
edit_profile:
basic_information: 基本信息
- hint_html: "自定义公开资料和嘟文旁边显示的内容。当您填写完整的个人资料并设置了头像时，其他人更有可能关注您并与您互动。"
+ hint_html: "自定义公开资料和嘟文旁边显示的内容。当你填写完整的个人资料并设置了头像时，其他人更有可能关注你并与你互动。"
other: 其他
errors:
'400': 你提交的请求无效或格式不正确。
- '403': 你没有访问这个页面的权限。
- '404': 无法找到你所要访问的页面。
- '406': 页面无法处理请求。
- '410': 你所要访问的页面此处已不存在。
+ '403': 你没有访问此页面的权限。
+ '404': 无法找到你访问的页面。
+ '406': 无法以要求的格式显示此页面。
+ '410': 你要查看的页面已不存在。
'422':
- content: 无法确认登录信息。你是不是屏蔽了 Cookie？
- title: 无法确认登录信息
- '429': 请求被限制
+ content: 安全验证未通过。请检查是否禁用了 Cookie。
+ title: 安全验证未通过
+ '429': 请求过于频繁
'500':
- content: 抱歉，我们的后台出错了。
- title: 这个页面有问题
- '503': 服务暂时不可用，无法请求该页面。
+ content: 抱歉，服务器出现了一些故障。
+ title: 页面无法正确加载
+ '503': 服务器出现临时故障，无法加载页面。
noscript_html: 使用 Mastodon 网页版应用需要启用 JavaScript。你也可以选择适用于你的平台的 Mastodon 应用。
existing_username_validator:
not_found: 在本站找不到此用户
@@ -1250,67 +1253,67 @@ zh-CN:
archive_takeout:
date: 日期
download: 下载你的存档
- hint_html: 你可以请求一份账户数据存档，其中包含你的嘟文和已上传的媒体文件。导出的数据为 ActivityPub 格式，因而可以被兼容的软件读取。每次允许请求存档的间隔至少为 7 天。
+ hint_html: 你可以请求一份账号数据存档，其中包含你的嘟文和已上传的媒体文件。导出的数据为 ActivityPub 格式，因而可以被兼容的软件读取。每次允许请求存档的间隔至少为 7 天。
in_progress: 正在准备你的存档……
request: 请求你的存档
size: 大小
blocks: 屏蔽的用户
bookmarks: 书签
csv: CSV
- domain_blocks: 域名屏蔽
+ domain_blocks: 站点屏蔽列表
lists: 列表
mutes: 已被你隐藏的
storage: 媒体文件存储
featured_tags:
add_new: 添加新条目
errors:
- limit: 您所推荐的话题标签数已达上限
- hint_html: "什么是精选话题标签？ 它们被显示在你的公开个人资料中的突出位置，人们可以在这些标签下浏览你的公共嘟文。 它们是跟踪创作或长期项目的进度的重要工具。"
+ limit: 你所推荐的话题数已达上限
+ hint_html: "什么是精选话题？ 它们被显示在你的公开个人资料中的突出位置，人们可以在这些标签下浏览你的公共嘟文。 它们是跟踪创作或长期项目的进度的重要工具。"
filters:
contexts:
account: 个人资料
- home: 主页时间轴
+ home: 主页与列表
notifications: 通知
- public: 公共时间轴
+ public: 公共时间线
thread: 对话
edit:
add_keyword: 添加关键词
keywords: 关键词
statuses: 个别嘟文
- statuses_hint_html: 无论是否匹配下列关键词，此过滤器适用于选用个别嘟文。从过滤器中审核嘟文或移除嘟文。
- title: 编辑过滤器
+ statuses_hint_html: 无论是否匹配下列关键词，此过滤规则均适用于选中的个别嘟文。在过滤规则页面检查或移除这些嘟文
+ title: 编辑过滤规则
errors:
- deprecated_api_multiple_keywords: 这些参数不能从此应用程序更改，因为它们应用于一个以上的过滤关键字。 使用较新的应用程序或网页界面。
- invalid_context: 提供的过滤器环境没有或无效
+ deprecated_api_multiple_keywords: 不能在此应用中更改这些参数，因为它们应用于不止一个过滤关键词。请使用较新的应用程序或网页界面。
+ invalid_context: 过滤规则生效场景为空或无效
index:
- contexts: 在 %{contexts} 中的过滤器
+ contexts: 过滤 %{contexts}
delete: 删除
- empty: 你没有过滤器。
- expires_in: 在 %{distance} 后过期
- expires_on: "%{date} 后到期"
+ empty: 你没有过滤规则。
+ expires_in: "%{distance} 后到期"
+ expires_on: 在 %{date} 到期
keywords:
- other: "%{count} 关键词"
+ other: "%{count} 个关键词"
statuses:
other: "%{count} 条嘟文"
statuses_long:
- other: "%{count} 条个别嘟文已隐藏"
- title: 过滤器
+ other: 已隐藏 %{count} 条个别嘟文
+ title: 过滤规则
new:
- save: 保存新过滤器
- title: 添加新的过滤器
+ save: 保存过滤规则
+ title: 新建过滤规则
statuses:
- back_to_filter: 返回过滤器
+ back_to_filter: 返回过滤规则
batch:
- remove: 从过滤器中移除
+ remove: 从过滤规则中移除
index:
- hint: 无论其他条件如何，此过滤器适用于选用个别嘟文。你可以从网页界面中向此过滤器加入更多嘟文。
+ hint: 此过滤规则适用于选中的个别嘟文，不受其它条件限制。你可以通过网页界面向此过滤规则添加更多嘟文。
title: 过滤的嘟文
generic:
all: 全部
all_items_on_page_selected_html:
other: 此页面上的所有 %{count} 项目已被选中。
all_matching_items_selected_html:
- other: 所有 %{count} 匹配您搜索的项目都已被选中。
+ other: 所有 %{count} 匹配你搜索的项目都已被选中。
cancel: 取消
changes_saved_msg: 更改保存成功！
confirm: 确认
@@ -1321,7 +1324,7 @@ zh-CN:
order_by: 排序方式
save_changes: 保存更改
select_all_matching_items:
- other: 选择匹配您搜索的所有 %{count} 个项目。
+ other: 选择匹配你搜索的所有 %{count} 个项目。
today: 今天
validation_errors:
other: 出错啦！检查一下下面 %{count} 处出错的地方吧
@@ -1341,19 +1344,19 @@ zh-CN:
overwrite: 覆盖
overwrite_long: 将当前记录替换为新记录
overwrite_preambles:
- blocking_html: 你即将使用来自 %{filename} 的最多 %{total_items} 个账户替换你的屏蔽列表。
- bookmarks_html: 你即将使用来自 %{filename} 的 %{total_items} 篇嘟文替换你的书签。
- domain_blocking_html: 你即将使用来自 %{filename} 的最多 %{total_items} 个域名替换你的域名屏蔽列表。
- following_html: 你即将从 %{filename} 关注 %{total_items} 个账户，并停止关注其他任何人。
- lists_html: 你即将用 %{filename} 的内容替换你的列表。新列表中将添加 %{total_items} 个账户。
- muting_html: 你即将使用来自 %{filename} 的最多 %{total_items} 个账户替换你已隐藏的账户列表。
+ blocking_html: 你即将使用来自 %{filename} 的最多 %{total_items} 个账号替换你的屏蔽列表。
+ bookmarks_html: 你即将使用来自 %{filename} 的 %{total_items} 篇嘟文替换你的收藏夹。
+ domain_blocking_html: 你即将使用来自 %{filename} 的最多 %{total_items} 个站点域名替换你的站点屏蔽列表。
+ following_html: 你即将从 %{filename} 关注 %{total_items} 个账号，并停止关注其他任何人。
+ lists_html: 你即将用 %{filename} 的内容替换你的列表。新列表中将添加 %{total_items} 个账号。
+ muting_html: 你即将使用来自 %{filename} 的最多 %{total_items} 个账号替换你已隐藏的账号列表。
preambles:
- blocking_html: 你即将从 %{filename} 中封锁多达 %{total_items} 个账户。
+ blocking_html: 你即将从 %{filename} 中封锁多达 %{total_items} 个账号。
bookmarks_html: 你即将把来自 %{filename} 的 %{total_items} 篇嘟文添加到你的书签中。
- domain_blocking_html: 你即将从 %{filename} 中屏蔽 %{total_items} 个域名。
- following_html: 你即将从 %{filename} 关注最多 %{total_items} 个账户。
- lists_html: 你即将从 %{filename} 中添加最多 %{total_items} 个账户到你的列表中。如果没有可用列表，将创建新的列表。
- muting_html: 你即将从 %{filename} 中隐藏 %{total_items} 个账户。
+ domain_blocking_html: 你即将屏蔽 %{filename} 中列出的 %{total_items} 个站点域名。
+ following_html: 你即将从 %{filename} 关注最多 %{total_items} 个账号。
+ lists_html: 你即将从 %{filename} 中添加最多 %{total_items} 个账号到你的列表中。如果没有可用列表，将创建新的列表。
+ muting_html: 你即将从 %{filename} 中隐藏 %{total_items} 个账号。
preface: 你可以在此导入你在其他实例导出的数据，比如你所关注或屏蔽的用户列表。
recent_imports: 最近导入
states:
@@ -1365,20 +1368,20 @@ zh-CN:
success: 数据上传成功，正在处理中
time_started: 开始于
titles:
- blocking: 正在导入被屏蔽的账户
+ blocking: 正在导入被屏蔽的账号
bookmarks: 正在导入书签
- domain_blocking: 正在导入被屏蔽的域名
- following: 正在导入关注的账户
+ domain_blocking: 正在导入站点屏蔽列表
+ following: 正在导入关注的账号
lists: 导入列表
- muting: 正在导入隐藏的账户
+ muting: 正在导入隐藏的账号
type: 导入类型
type_groups:
constructive: 关注和书签
- destructive: 屏蔽和隐藏
+ destructive: 屏蔽与隐藏
types:
blocking: 屏蔽列表
bookmarks: 书签
- domain_blocking: 域名屏蔽列表
+ domain_blocking: 站点屏蔽列表
following: 关注列表
lists: 列表
muting: 隐藏列表
@@ -1407,14 +1410,14 @@ zh-CN:
title: 邀请用户
lists:
errors:
- limit: 您已达到列表数量的上限
+ limit: 你已达到列表数量的上限
login_activities:
authentication_methods:
otp: 双因素认证应用
password: 密码
sign_in_token: 邮件安全码
webauthn: 安全密钥
- description_html: 如有您无法识别的活动，请考虑更改密码并启用双因素认证。
+ description_html: 如有你无法识别的活动，请考虑更改密码并启用双因素认证。
empty: 没有可用的认证记录
failed_sign_in_html: 失败的 %{method} 登录尝试，来自 %{ip} (%{browser})
successful_sign_in_html: 通过 %{method} 成功登录，来自 %{ip} (%{browser})
@@ -1427,9 +1430,9 @@ zh-CN:
emails:
notification_emails:
favourite: 嘟文被喜欢邮件通知
- follow: 账户被关注邮件通知
+ follow: 账号被关注邮件通知
follow_request: 关注请求邮件通知
- mention: 账户被提及邮件通知
+ mention: 账号被提及邮件通知
reblog: 嘟文被转嘟邮件通知
resubscribe_html: 如果你不小心取消了订阅，可以在你的邮件通知设置中重新订阅。
success_html: 你将不会在你的邮箱 %{email} 中收到 %{domain} 上的 Mastodon的 %{type}
@@ -1441,14 +1444,14 @@ zh-CN:
not_ready: 不能附加还在处理中的文件。请稍后再试！
too_many: 最多只能添加 4 张图片
migrations:
- acct: 新账户的 用户名@域名
+ acct: 新账号的 用户名@域名
cancel: 取消跳转
cancel_explanation: 取消跳转将会重新激活你当前的账号，但是已经迁移到新账号的关注者不会回来。
cancelled_msg: 成功取消跳转
errors:
already_moved: 和你已经迁移过的账号相同
missing_also_known_as: 没有引用此账号
- move_to_self: 不能是当前账户
+ move_to_self: 不能是当前账号
not_found: 找不到
on_cooldown: 你正处于冷却状态
followers_count: 迁移时的关注者
@@ -1460,19 +1463,19 @@ zh-CN:
past_migrations: 迁移记录
proceed_with_move: 移动关注者
redirected_msg: 你的账号现在会跳转至 %{acct}
- redirecting_to: 你的账户正在跳转到 %{acct}。
+ redirecting_to: 你的账号正在跳转到 %{acct}。
set_redirect: 设置跳转
warning:
backreference_required: 新账号必须先引用当前账号
before: 在继续前，请仔细阅读下列说明：
cooldown: 移动后会有一个冷却期，在此期间你将无法再次移动
- disabled_account: 此后，你的当前账户将无法使用。但是，你仍然有权导出数据或者重新激活。
- followers: 这步操作将把所有关注者从当前账户移动到新账户
+ disabled_account: 此后，你的当前账号将无法使用。但是，你仍然有权导出数据或者重新激活。
+ followers: 这步操作将把所有关注者从当前账号移动到新账号
only_redirect_html: 或者，你可以只在你的账号资料上设置一个跳转。
other_data: 不会自动移动其它数据
redirect: 在收到一个跳转通知后，你当前的账号资料将会更新，并被排除在搜索范围外
moderation:
- title: 运营
+ title: 审核
move_handler:
carry_blocks_over_text: 这个用户迁移自你屏蔽过的 %{acct}
carry_mutes_over_text: 这个用户由你隐藏过的 %{acct} 迁移而来
@@ -1500,7 +1503,7 @@ zh-CN:
title: 新的关注请求
mention:
action: 回复
- body: "%{name} 在嘟文中提到了你："
+ body: "%{name} 提到了你："
subject: "%{name} 提到了你"
title: 新的提及
poll:
@@ -1556,13 +1559,13 @@ zh-CN:
preferences:
other: 其他
posting_defaults: 发布默认值
- public_timelines: 公共时间轴
+ public_timelines: 公共时间线
privacy:
hint_html: "自定义你希望如何找到你的个人资料和嘟文。启用Mastodon中的各种功能可以帮助你扩大受众范围。请花点时间查看这些设置，确保它们适合你的使用情况。"
privacy: 隐私
privacy_hint_html: 控制你愿意向他人透露多少信息。通过浏览他人的关注列表和查看他们发嘟所用的应用，人们可以发现有趣的用户和酷炫的应用，但你可能更喜欢将其隐藏起来。
reach: 范围
- reach_hint_html: 控制您是否希望被新人发现和关注。您是否希望您的嘟文出现在“探索”页面上？您是否希望其他人在关注推荐中看到您？您是想自动接受所有新粉丝，还是对每个粉丝都进行仔细的筛选？
+ reach_hint_html: 控制你是否希望被新人发现和关注。你是否希望你的嘟文出现在“探索”页面上？你是否希望其他人在关注推荐中看到你？你是想自动接受所有新粉丝，还是对每个粉丝都进行仔细的筛选？
search: 搜索
search_hint_html: 控制你希望被找到的方式。你想让人们通过你公开发布的内容来找到你吗？当在网络上搜索时，你是否希望Mastodon之外的人能够找到你的个人资料？请注意，我们无法保证完全排除所有搜索引擎对公开信息的索引。
title: 隐私与可达性
@@ -1570,18 +1573,18 @@ zh-CN:
title: 隐私政策
reactions:
errors:
- limit_reached: 互动种类的限制
- unrecognized_emoji: 不是一个可识别的表情
+ limit_reached: 回应种类个数超过限制
+ unrecognized_emoji: 不是一个可被识别的表情
redirects:
prompt: 如果你信任此链接，请单击以继续跳转。
title: 你正在离开 %{instance} 。
relationships:
activity: 账号活动
- confirm_follow_selected_followers: 您确定想要关注所选的关注者吗？
- confirm_remove_selected_followers: 您确定想要取关所选的关注者吗？
- confirm_remove_selected_follows: 您确定要删除选定的关注着吗？
+ confirm_follow_selected_followers: 你确定想要关注所选的关注者吗？
+ confirm_remove_selected_followers: 你确定想要取关所选的关注者吗？
+ confirm_remove_selected_follows: 您确定要删除选定的关注者吗？
dormant: 休眠
- follow_failure: 无法关注选中的部分账户。
+ follow_failure: 无法关注选中的部分账号。
follow_selected_followers: 关注选中的关注者
followers: 关注者
following: 正在关注
@@ -1592,12 +1595,12 @@ zh-CN:
mutual: 互相关注
primary: 主要
relationship: 关系
- remove_selected_domains: 从选定的域名中删除所有关注者
+ remove_selected_domains: 删除在选定站点中的所有关注者
remove_selected_followers: 移除选中的关注者
remove_selected_follows: 取消关注所选用户
- status: 账户状态
+ status: 账号状态
remote_follow:
- missing_resource: 无法确定你的账户的跳转 URL
+ missing_resource: 无法确定你的账号的跳转 URL
reports:
errors:
invalid_rules: 没有引用有效的规则
@@ -1626,12 +1629,12 @@ zh-CN:
generic: 未知浏览器
huawei_browser: 华为浏览器
ie: IE 浏览器
- micro_messenger: 微信
+ micro_messenger: MicroMessenger
nokia: Nokia S40 Ovi 浏览器
opera: 欧朋浏览器
otter: Otter
phantom_js: PhantomJS
- qq: QQ浏览器
+ qq: QQ 浏览器
safari: Safari
uc_browser: UC 浏览器
unknown_browser: 未知浏览器
@@ -1639,7 +1642,7 @@ zh-CN:
current_session: 当前会话
date: 日期
description: "%{platform} 上的 %{browser}"
- explanation: 你的 Mastodon 账户目前已在这些浏览器上登录。
+ explanation: 你的 Mastodon 账号目前已在这些浏览器上登录。
ip: IP 地址
platforms:
adobe_air: Adobe Air
@@ -1650,7 +1653,7 @@ zh-CN:
ios: iOS
kai_os: KaiOS
linux: Linux
- mac: Mac
+ mac: macOS
unknown_platform: 未知平台
windows: Windows
windows_mobile: Windows Mobile
@@ -1658,40 +1661,40 @@ zh-CN:
revoke: 注销
revoke_success: 会话注销成功
title: 会话
- view_authentication_history: 查看账户的认证历史
+ view_authentication_history: 查看账号的认证历史
settings:
account: 账号
- account_settings: 账户设置
+ account_settings: 账号设置
aliases: 账号别名
appearance: 外观
authorized_apps: 已授权的应用
back: 返回 Mastodon
- delete: 删除账户
+ delete: 删除账号
development: 开发
edit_profile: 更改个人资料
export: 导出
- featured_tags: 精选的话题标签
+ featured_tags: 精选话题
import: 导入
- import_and_export: 导入和导出
- migrate: 账户迁移
+ import_and_export: 导入与导出
+ migrate: 账号迁移
notifications: 邮件通知
- preferences: 首选项
+ preferences: 偏好设置
profile: 个人资料
relationships: 关注管理
severed_relationships: 已断开的关系
statuses_cleanup: 自动删除嘟文
- strikes: 操作记录
+ strikes: 管理处罚记录
two_factor_authentication: 双因素认证
webauthn_authentication: 安全密钥
severed_relationships:
download: 下载 (%{count})
event_type:
- account_suspension: 账户被封禁 (%{target_name})
- domain_block: 服务器被封禁 (%{target_name})
+ account_suspension: 封禁账号 (%{target_name})
+ domain_block: 封禁服务器 (%{target_name})
user_domain_block: 你屏蔽了 %{target_name}
lost_followers: 失去的关注者
lost_follows: 失去的关注
- preamble: 当你屏蔽一个域名或你的管理员决定封禁一个外站服务器时，你可能会失去关注和粉丝。在这种情况下，你可以下载被切断的关系的列表，进行检查以便导入另一个服务器。
+ preamble: 如果你屏蔽了某个站点，或者管理员封禁了某个站点，你可能会丢失一部分关注和关注者。你可以下载联系被中断的账号列表，进行检查并导入到其他站点。
purged: 关于此服务器的信息已被你所在服务器的管理员清除。
type: 事件
statuses:
@@ -1707,14 +1710,14 @@ zh-CN:
content_warning: 内容警告：%{warning}
default_language: 与界面显示语言相同
disallowed_hashtags:
- other: 包含了这些禁止的话题标签：%{tags}
+ other: 包含以下被禁止的话题：%{tags}
edited_at_html: 编辑于 %{date}
errors:
in_reply_not_found: 你回复的嘟文似乎不存在
over_character_limit: 超过了 %{max} 字的限制
pin_errors:
direct: 仅对被提及的用户可见的帖子不能被置顶
- limit: 你所固定的嘟文数量已达到上限
+ limit: 你置顶的嘟文数量已达上限
ownership: 不能置顶别人的嘟文
reblog: 不能置顶转嘟
title: "%{name}：“%{quote}”"
@@ -1723,29 +1726,29 @@ zh-CN:
private: 仅关注者
private_long: 只有关注你的用户能看到
public: 公开
- public_long: 所有人可见，并会出现在公共时间轴上
- unlisted: 不公开
- unlisted_long: 所有人可见，但不会出现在公共时间轴上
+ public_long: 主页与列表
+ unlisted: 悄悄公开
+ unlisted_long: 对所有人可见，但不出现在公共时间线上
statuses_cleanup:
enabled: 自动删除旧嘟文
- enabled_hint: 达到指定过期时间后自动删除您的嘟文，除非满足下列条件之一
+ enabled_hint: 自动删除你发布的超过指定期限的嘟文，除非满足下列条件之一
exceptions: 例外
- explanation: 删除嘟文是一个消耗系统资源的耗时操作，所以这个操作会在服务器空闲时完成。因此，您的嘟文可能会在达到过期阈值之后一段时间才会被删除。
- ignore_favs: 取消喜欢
- ignore_reblogs: 忽略转嘟
+ explanation: 删除嘟文会占用大量服务器资源，所以这个操作将在服务器空闲时完成。因此，你的嘟文可能会在达到删除期限之后一段时间才会被删除。
+ ignore_favs: 喜欢数阈值
+ ignore_reblogs: 转嘟数阈值
interaction_exceptions: 基于互动的例外
- interaction_exceptions_explanation: 请注意，如果嘟文超出转嘟和喜欢的阈值之后，又降到阈值以下，则可能不会被删除。
+ interaction_exceptions_explanation: 请注意，如果嘟文的转嘟数和喜欢数超过保留阈值之后，又降到阈值以下，则可能不会被删除。
keep_direct: 保留私信
- keep_direct_hint: 不会删除你的任何私信
+ keep_direct_hint: 不删除你的任何私信
keep_media: 保留带媒体附件的嘟文
- keep_media_hint: 不会删除任何包含媒体附件的嘟文
+ keep_media_hint: 不删除任何包含媒体附件的嘟文
keep_pinned: 保留置顶嘟文
keep_pinned_hint: 不会删除你的任何置顶嘟文
keep_polls: 保留投票
- keep_polls_hint: 不会删除你的任何投票
- keep_self_bookmark: 保存被你加入书签的嘟文
- keep_self_bookmark_hint: 如果你已将自己的嘟文添加书签，就不会删除这些嘟文
- keep_self_fav: 保留你点赞的嘟文
+ keep_polls_hint: 不删除你的任何投票
+ keep_self_bookmark: 保留你加入书签的嘟文
+ keep_self_bookmark_hint: 不删除书签中你自己的嘟文
+ keep_self_fav: 保留你喜欢的嘟文
keep_self_fav_hint: 如果你喜欢了自己的嘟文，则不会删除这些嘟文
min_age:
'1209600': 2周
@@ -1757,8 +1760,8 @@ zh-CN:
'63113904': 两年
'7889238': 3个月
min_age_label: 过期阈值
- min_favs: 保留如下嘟文：点赞数超过
- min_favs_hint: 点赞数超过该阈值的的嘟文都不会被删除。如果留空，则无论嘟文获得多少点赞，都将被删除。
+ min_favs: 保留如下嘟文：喜欢数超过
+ min_favs_hint: 获得喜欢数超过该阈值的的嘟文都不会被删除。如果留空，则无论嘟文获得多少点赞，都将被删除。
min_reblogs: 保留如下嘟文：转嘟数超过
min_reblogs_hint: 转嘟数超过该阈值的的嘟文不会被删除。如果留空，则无论嘟文获得多少转嘟，都将被删除。
stream_entries:
@@ -1791,19 +1794,19 @@ zh-CN:
enabled: 已启用双因素认证
enabled_success: 已成功启用双因素认证
generate_recovery_codes: 生成恢复代码
- lost_recovery_codes: 如果你的手机不慎丢失，你可以使用恢复代码来重新获得对账户的访问权。如果你遗失了恢复代码，可以在此处重新生成。之前使用的恢复代码将会失效。
+ lost_recovery_codes: 如果你的手机不慎丢失，你可以使用恢复代码来重新获得对账号的访问权。如果你遗失了恢复代码，可以在此处重新生成。之前使用的恢复代码将会失效。
methods: 双因素认证方式
otp: 身份验证应用
recovery_codes: 备份恢复代码
recovery_codes_regenerated: 恢复代码重新生成成功
- recovery_instructions_html: 如果你的手机无法使用，你可以使用下列任意一个恢复代码来重新获得对账户的访问权。请妥善保管好你的恢复代码（例如，你可以将它们打印出来，然后和其他重要的文件放在一起）。
+ recovery_instructions_html: 如果你的手机无法使用，你可以使用下列任意一个恢复代码来重新获得对账号的访问权。请妥善保管好你的恢复代码（例如，你可以将它们打印出来，然后和其他重要的文件放在一起）。
webauthn: 安全密钥
user_mailer:
appeal_approved:
- action: 账户设置
+ action: 账号设置
explanation: 你于 %{appeal_date} 对 %{strike_date} 在你账号上做出的处罚提出的申诉已被批准，你的账号已回到正常状态。
subject: 你于 %{date} 提出的申诉已被批准
- subtitle: 你的账户已再次回到良好状态。
+ subtitle: 你的账号已再次回到良好状态。
title: 申诉已批准
appeal_rejected:
explanation: 你于 %{appeal_date} 对 %{strike_date} 在你账号上做出的处罚提出的申诉已被驳回。
@@ -1811,23 +1814,23 @@ zh-CN:
subtitle: 你的申诉已被驳回。
title: 申诉已驳回
backup_ready:
- explanation: 你之前请求为你的 Mastodon 账户创建一份完整的备份。
+ explanation: 你之前请求为你的 Mastodon 账号创建一份完整的备份。
extra: 现在它可以下载了！
subject: 你的存档已经准备完毕
title: 存档导出
failed_2fa:
details: 以下是该次登录尝试的详情：
- explanation: 有人试图登录到你的账户，但提供了无效的辅助认证因子。
+ explanation: 有人试图登录到你的账号，但提供了无效的辅助认证因子。
further_actions_html: 如果这不是你所为，你的密码可能已经泄露，建议你立即 %{action} 。
subject: 辅助认证失败
title: 辅助认证失败
suspicious_sign_in:
change_password: 更改密码
details: 以下是该次登录的详细信息：
- explanation: 我们检测到有新 IP 地址登录了您的账号。
- further_actions_html: 如果不是您本人操作，我们建议您立即 %{action} 并启用双因素认证，以确保账号安全。
- subject: 已有新 IP 地址访问了您的账号
- title: 新登录
+ explanation: 我们检测到有新 IP 地址登录了你的账号。
+ further_actions_html: 如果不是你本人操作，我们建议你立即 %{action} 并启用双因素认证，以确保账号安全。
+ subject: 已有新 IP 地址访问了你的账号
+ title: 一次新登录
warning:
appeal: 提交申诉
appeal_description: 如果你认为此结果有误，可以向 %{instance} 的工作人员提交申诉。
@@ -1835,78 +1838,78 @@ zh-CN:
spam: 垃圾信息
violation: 内容违反了以下社区准则
explanation:
- delete_statuses: 你的一些嘟文被发现违反了一条或多条社区准则，并已被 %{instance} 的监察员删除。
- disable: 你不能再使用你的账户，但你的个人资料和其他数据保持不变。你可以请求数据备份，更改账户设置或删除账户。
- mark_statuses_as_sensitive: 你的一些嘟文已经被 %{instance} 检察员标记为敏感内容。这意味着别人需要在嘟文中点击媒体，才能显示媒体预览。你可以在今后发布嘟文时自行将媒体标记为敏感内容。
+ delete_statuses: 你的一些嘟文被发现违反了一条或多条社区准则，并已被 %{instance} 的管理员删除。
+ disable: 你不能再使用你的账号，但你的个人资料和其他数据保持不变。你可以请求数据备份，更改账号设置或删除账号。
+ mark_statuses_as_sensitive: 你的一些嘟文已经被 %{instance} 管理员标记为敏感内容。这意味着别人需要在嘟文中点击媒体，才能显示媒体预览。你可以在今后发布嘟文时自行将媒体标记为敏感内容。
sensitive: 即刻起，你上传的所有媒体文件都将被标记为敏感内容并隐藏，在点击警告后才能查看。
silence: 你可以继续使用你的账号，但只有已关注你的人才能在看到你在此服务器上的嘟文，并且你会被排除在各类公共列表之外。其他用户仍可以手动关注你。
- suspend: 你不能再使用你的账户，并且你的个人资料和其他数据都将无法访问。在大约30天内，你仍可以登录并请求数据备份，之后相关数据将被完全删除。我们会保留一些基础数据以避免封禁失效。
+ suspend: 你不能再使用你的账号，并且你的个人资料和其他数据都将无法访问。在大约30天内，你仍可以登录并请求数据备份，之后相关数据将被完全删除。我们会保留一些基础数据以避免封禁失效。
reason: 理由：
statuses: 被引用的嘟文：
subject:
delete_statuses: 你在 %{acct} 的嘟文已被删除
- disable: 你的账户 %{acct} 已被冻结
+ disable: 你的账号 %{acct} 已被冻结
mark_statuses_as_sensitive: 你在 %{acct} 的嘟文已被标记为敏感内容
none: 对 %{acct} 的警告
sensitive: 你在 %{acct} 的嘟文今后将被标记为敏感内容
- silence: 你的账户 %{acct} 已被隐藏
- suspend: 你的账户 %{acct} 已被封禁
+ silence: 你的账号 %{acct} 已被隐藏
+ suspend: 你的账号 %{acct} 已被封禁
title:
delete_statuses: 嘟文已删除
disable: 账号已冻结
mark_statuses_as_sensitive: 嘟文已被标记为敏感内容
none: 警示
- sensitive: 账户已被标记为敏感内容
- silence: 账户被隐藏
+ sensitive: 账号已被标记为敏感内容
+ silence: 账号被隐藏
suspend: 账号被封禁
welcome:
apps_android_action: 从 Google Play 下载
apps_ios_action: 从 App Store 下载
apps_step: 下载我们的官方应用。
- apps_title: Mastodon应用
+ apps_title: Mastodon 应用
checklist_subtitle: 让我们带你开启这片社交新天地：
checklist_title: 欢迎清单
edit_profile_action: 个性化
edit_profile_step: 完善个人资料，提升你的互动体验。
edit_profile_title: 个性化你的个人资料
explanation: 下面是几个小贴士，希望它们能帮到你
- feature_action: 了解更多
- feature_audience: Mastodon为你提供了无需中间商即可管理受众的独特可能。Mastodon可被部署在你自己的基础设施上，允许你关注其它任何Mastodon在线服务器的用户，或被任何其他在线 Mastodon 服务器的用户关注，并且不受你之外的任何人控制。
- feature_audience_title: 放手去建立起你的受众
+ feature_action: 详细了解
+ feature_audience: Mastodon 为你提供了无需中间商即可管理受众的独特可能。Mastodon 可被部署在你自己的基础设施上，允许你关注其它任何 Mastodon 在线服务器的用户，或被任何其他在线 Mastodon 服务器的用户关注，并且不受你之外的任何人控制。
+ feature_audience_title: 自由吸引你的受众
feature_control: 你最清楚你想在你自己的主页中看到什么动态。没有算法或广告浪费你的时间。你可以用一个账号关注任何 Mastodon 服务器上的任何人，并按时间顺序获得他们发布的嘟文，让你的互联网的角落更合自己的心意。
feature_control_title: 掌控自己的时间线
- feature_creativity: Mastodon支持音频、视频和图片、无障碍描述、投票、内容警告， 动画头像、自定义表情包、缩略图裁剪控制等功能，帮助你在网上尽情表达自己。无论你是要发布你的艺术作品、音乐还是播客，Mastodon 都能为你服务。
- feature_creativity_title: 无与伦比的创造力
- feature_moderation: Mastodon将决策权交还给你。每个服务器都会创建自己的规则和条例，并在站点内施行，而不是像企业社交媒体那样居高临下，这使得它可以最灵活地响应不同人群的需求。加入一个你认同其规则的服务器，或托管你自己的服务器。
+ feature_creativity: Mastodon 支持音频、视频和图片、无障碍描述、投票、内容警告， 动画头像、自定义表情包、缩略图裁剪控制等功能，帮助你在网上尽情表达自己。无论你是要发布你的艺术作品、音乐还是播客，Mastodon 都能为你服务。
+ feature_creativity_title: 尽情发挥创造力
+ feature_moderation: Mastodon 将决策权交还给你。每个服务器都会创建自己的规则和条例，并在站点内施行，而不是像企业社交媒体那样居高临下，这使得它可以最灵活地响应不同人群的需求。加入一个你认同其规则的服务器，或托管你自己的服务器。
feature_moderation_title: 管理，本应如此
follow_action: 关注
- follow_step: 关注有趣的人，这就是Mastodon的意义所在。
- follow_title: 个性化你的首页动态
- follows_subtitle: 关注知名账户
+ follow_step: 关注有趣的人，这就是 Mastodon 的意义所在。
+ follow_title: 个性化你的主页动态
+ follows_subtitle: 关注知名账号
follows_title: 推荐关注
follows_view_more: 查看更多可关注的人
hashtags_recent_count:
other: 过去2天内有 %{people} 人
hashtags_subtitle: 探索过去2天以来的热门内容
- hashtags_title: 热门话题标签
- hashtags_view_more: 查看更多热门话题标签
+ hashtags_title: 热门话题
+ hashtags_view_more: 查看更多热门话题
post_action: 撰写
post_step: 向世界打个招呼吧。
post_title: 发布你的第一条嘟文
share_action: 分享
- share_step: 让你的朋友知道如何在Mastodon找到你。
- share_title: 分享你的Mastodon个人资料
+ share_step: 让你的朋友知道如何在 Mastodon 找到你。
+ share_title: 分享你的 Mastodon 个人资料
sign_in_action: 登录
subject: 欢迎来到 Mastodon
title: "%{name}，欢迎你的加入！"
users:
follow_limit_reached: 你不能关注超过 %{limit} 个人
- go_to_sso_account_settings: 转到您的身份提供商进行账户设置
+ go_to_sso_account_settings: 转到您的身份提供商进行账号设置
invalid_otp_token: 输入的双因素认证代码无效
otp_lost_help_html: 如果你不慎丢失了所有的代码，请联系 %{email} 寻求帮助
rate_limited: 验证尝试次数过多，请稍后再试。
seamless_external_login: 你通过外部服务登录，因此密码和邮件设置不可用。
- signed_in_as: 当前登录的账户：
+ signed_in_as: 当前登录的账号：
verification:
extra_instructions_html: 提示：你网站上的链接可能是不可见的。重要的部分是 rel="me"，它可以防止在具有用户生成内容的网站上冒充身份。你甚至可以在页面头部使用 link 标签而不是 a，但 HTML 必须能够在不执行 JavaScript 的情况下访问。
here_is_how: 具体方法如下：
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 4079f68a50..14b727cf1d 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -19,6 +19,7 @@ zh-TW:
posts:
other: 嘟文
posts_tab_heading: 嘟文
+ self_follow_error: 無法跟隨您自己的帳號
admin:
account_actions:
action: 執行動作
@@ -559,7 +560,7 @@ zh-TW:
relationships:
title: "%{acct} 的關係"
relays:
- add_new: 新增中繼站
+ add_new: 新增中繼
delete: 刪除
description_html: "聯邦中繼站 是種中繼伺服器，會於訂閱並推送至此中繼站的伺服器之間交換大量的公開嘟文。中繼站也能協助小型或中型伺服器自聯邦宇宙中探索內容，而無須本地使用者手動跟隨遠端伺服器的其他使用者。"
disable: 停用
@@ -1149,9 +1150,11 @@ zh-TW:
use_security_key: 使用安全金鑰
author_attribution:
example_title: 範例文字
- hint_html: 控制如何於 Mastodon 上分享連結時註明您的貢獻。
+ hint_html: 您是否正於 Mastodon 之外撰寫新聞或部落格文章？控制當它們於 Mastodon 上分享時您如何獲得信譽。
+ instructions: 確認您文章 HTML 內容中包含此份程式碼：
more_from_html: 來自 %{name} 之更多內容
s_blog: "%{name} 的部落格"
+ then_instructions: 接著，將發表處網域加入以下欄位中。
title: 作者署名
challenge:
confirm: 繼續
@@ -1875,7 +1878,7 @@ zh-TW:
feature_action: 了解更多
feature_audience: Mastodon 為您打開了一扇獨特的門，使您不受平台干擾，自由地管理您的受眾。只需將 Mastodon 部署於您自己的基礎設施上，您便能與線上任何 Mastodon 伺服器互動，而且控制權只在您手中。
feature_audience_title: 自信地建立您的受眾
- feature_control: 您最清楚自己想於首頁動態看到什麼內容，別讓演算法與廣告浪費您寶貴的時間。自同一帳號跟隨任何 Mastodon 伺服器上的任何一個人，依時間順序接收他們的嘟文，建立屬於自己的網路小角落。
+ feature_control: 您最清楚自己想於首頁時間軸看到什麼內容，別讓演算法與廣告浪費您寶貴的時間。自同一帳號跟隨任何 Mastodon 伺服器上的任何一個人，依時間順序接收他們的嘟文，建立屬於自己的網路小角落。
feature_control_title: 掌控自己的時間軸
feature_creativity: Mastodon 支援音訊、影片及圖片嘟文、無障礙說明文字、投票、內容警告、動畫大頭貼、自訂 emoji 表情符號、縮圖裁剪控制等等，協助您表達自我。無論是發佈藝術作品、音樂，或是 podcast，Mastodon 將隨時陪伴著您。
feature_creativity_title: 無與倫比的創意
diff --git a/config/navigation.rb b/config/navigation.rb
index 87d6d7dbec..ebcbf10275 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -30,18 +30,18 @@ SimpleNavigation::Configuration.run do |navigation|
n.item :filters, safe_join([material_symbol('filter_alt'), t('filters.index.title')]), filters_path, highlights_on: %r{/filters}, if: -> { current_user.functional? && !self_destruct }
n.item :statuses_cleanup, safe_join([material_symbol('history'), t('settings.statuses_cleanup')]), statuses_cleanup_path, if: -> { current_user.functional_or_moved? && !self_destruct }
- n.item :security, safe_join([material_symbol('lock'), t('settings.account')]), edit_user_registration_path do |s|
- s.item :password, safe_join([material_symbol('lock'), t('settings.account_settings')]), edit_user_registration_path, highlights_on: %r{/auth/edit|/settings/delete|/settings/migration|/settings/aliases|/settings/login_activities|^/disputes}
+ n.item :security, safe_join([material_symbol('account_circle'), t('settings.account')]), edit_user_registration_path do |s|
+ s.item :password, safe_join([material_symbol('lock'), t('settings.account_settings')]), edit_user_registration_path, highlights_on: %r{^/auth|/settings/delete|/settings/migration|/settings/aliases|/settings/login_activities|^/disputes}
s.item :two_factor_authentication, safe_join([material_symbol('safety_check'), t('settings.two_factor_authentication')]), settings_two_factor_authentication_methods_path, highlights_on: %r{/settings/two_factor_authentication|/settings/otp_authentication|/settings/security_keys}
s.item :authorized_apps, safe_join([material_symbol('list_alt'), t('settings.authorized_apps')]), oauth_authorized_applications_path, if: -> { !self_destruct }
end
n.item :data, safe_join([material_symbol('cloud_sync'), t('settings.import_and_export')]), settings_export_path do |s|
- s.item :import, safe_join([material_symbol('cloud_upload'), t('settings.import')]), settings_imports_path, if: -> { current_user.functional? && !self_destruct }
+ s.item :import, safe_join([material_symbol('cloud_upload'), t('settings.import')]), settings_imports_path, highlights_on: %r{/settings/imports}, if: -> { current_user.functional? && !self_destruct }
s.item :export, safe_join([material_symbol('cloud_download'), t('settings.export')]), settings_export_path
end
- n.item :invites, safe_join([material_symbol('person_add'), t('invites.title')]), invites_path, if: -> { current_user.can?(:invite_users) && current_user.functional? && !self_destruct }
+ n.item :user_invites, safe_join([material_symbol('person_add'), t('invites.title')]), invites_path, if: -> { current_user.can?(:invite_users) && current_user.functional? && !self_destruct }
n.item :development, safe_join([material_symbol('code'), t('settings.development')]), settings_applications_path, highlights_on: %r{/settings/applications}, if: -> { current_user.functional? && !self_destruct }
n.item :trends, safe_join([material_symbol('trending_up'), t('admin.trends.title')]), admin_trends_statuses_path, if: -> { current_user.can?(:manage_taxonomies) && !self_destruct } do |s|
@@ -62,7 +62,9 @@ SimpleNavigation::Configuration.run do |navigation|
s.item :ng_rules, safe_join([material_symbol('edit'), t('admin.ng_rules.title')]), admin_ng_rules_path, highlights_on: %r{/admin/(ng_rules|ng_rule_histories)}, if: -> { current_user.can?(:manage_ng_words) }
s.item :sensitive_words, safe_join([material_symbol('list'), t('admin.sensitive_words.title')]), admin_sensitive_words_path, highlights_on: %r{/admin/sensitive_words}, if: -> { current_user.can?(:manage_sensitive_words) }
s.item :invites, safe_join([material_symbol('person_add'), t('admin.invites.title')]), admin_invites_path, if: -> { current_user.can?(:manage_invites) }
- s.item :instances, safe_join([material_symbol('cloud'), t('admin.instances.title')]), admin_instances_path(limited: limited_federation_mode? ? nil : '1'), highlights_on: %r{/admin/instances|/admin/domain_blocks|/admin/domain_allows}, if: -> { current_user.can?(:manage_federation) }
+ s.item :instances, safe_join([material_symbol('cloud'), t('admin.instances.title')]), admin_instances_path(limited: limited_federation_mode? ? nil : '1'), highlights_on: %r{/admin/instances|/admin/domain_blocks|/admin/domain_allows|/admin/export_domain_blocks}, if: lambda {
+ current_user.can?(:manage_federation)
+ }
s.item :special_instances, safe_join([material_symbol('list'), t('admin.special_instances.title')]), admin_special_instances_path, highlights_on: %r{/admin/special_instances}, if: -> { current_user.can?(:manage_federation) }
s.item :special_domains, safe_join([material_symbol('link'), t('admin.special_domains.title')]), admin_special_domains_path, highlights_on: %r{/admin/special_domains}, if: -> { current_user.can?(:manage_federation) }
s.item :email_domain_blocks, safe_join([material_symbol('mail'), t('admin.email_domain_blocks.title')]), admin_email_domain_blocks_path, highlights_on: %r{/admin/email_domain_blocks}, if: -> { current_user.can?(:manage_blocks) }
diff --git a/config/roles.yml b/config/roles.yml
index 0439c9f741..30e7d60be6 100644
--- a/config/roles.yml
+++ b/config/roles.yml
@@ -29,6 +29,8 @@ admin:
- manage_webhooks
- manage_roles
- invite_users
+ - manage_ng_words
+ - manage_sensitive_words
owner:
name: Owner
position: 1000
diff --git a/config/routes.rb b/config/routes.rb
index 9cf512b8fb..f6d362c772 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -74,7 +74,7 @@ Rails.application.routes.draw do
scope path: '.well-known' do
scope module: :well_known do
get 'oauth-authorization-server', to: 'oauth_metadata#show', as: :oauth_metadata, defaults: { format: 'json' }
- get 'host-meta', to: 'host_meta#show', as: :host_meta, defaults: { format: 'xml' }
+ get 'host-meta', to: 'host_meta#show', as: :host_meta
get 'nodeinfo', to: 'node_info#index', as: :nodeinfo, defaults: { format: 'json' }
get 'webfinger', to: 'webfinger#show', as: :webfinger
end
diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index 9c858087c4..9f6da976dd 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -178,8 +178,10 @@ namespace :admin do
end
resources :users, only: [] do
- resource :two_factor_authentication, only: [:destroy], controller: 'users/two_factor_authentications'
- resource :role, only: [:show, :update], controller: 'users/roles'
+ scope module: :users do
+ resource :two_factor_authentication, only: [:destroy]
+ resource :role, only: [:show, :update]
+ end
end
resources :custom_emojis, only: [:index, :new, :create, :edit, :update] do
diff --git a/config/routes/api.rb b/config/routes/api.rb
index d0ca47f389..23868652dd 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -197,7 +197,7 @@ namespace :api, format: false do
resources :lists, only: :index
resources :antennas, only: :index
resources :exclude_antennas, only: :index
- resources :circlues, only: :index
+ resources :circles, only: :index
resources :identity_proofs, only: :index
resources :featured_tags, only: :index
end
diff --git a/db/migrate/.rubocop.yml b/db/migrate/.rubocop.yml
index 4e23800dd1..6f8b6cc60d 100644
--- a/db/migrate/.rubocop.yml
+++ b/db/migrate/.rubocop.yml
@@ -2,3 +2,8 @@ inherit_from: ../../.rubocop.yml
Naming/VariableNumber:
CheckSymbols: false
+
+# Enabled here as workaround for https://docs.rubocop.org/rubocop/configuration.html#path-relativity
+Rails/CreateTableWithTimestamps:
+ Include:
+ - '*.rb'
diff --git a/db/migrate/20170508230434_create_conversation_mutes.rb b/db/migrate/20170508230434_create_conversation_mutes.rb
index 01122c4516..4beba9dfa3 100644
--- a/db/migrate/20170508230434_create_conversation_mutes.rb
+++ b/db/migrate/20170508230434_create_conversation_mutes.rb
@@ -2,7 +2,7 @@
class CreateConversationMutes < ActiveRecord::Migration[5.0]
def change
- create_table :conversation_mutes do |t|
+ create_table :conversation_mutes do |t| # rubocop:disable Rails/CreateTableWithTimestamps
t.integer :account_id, null: false
t.bigint :conversation_id, null: false
end
diff --git a/db/migrate/20170823162448_create_status_pins.rb b/db/migrate/20170823162448_create_status_pins.rb
index c8d3fab3a5..2cf3a85ca9 100644
--- a/db/migrate/20170823162448_create_status_pins.rb
+++ b/db/migrate/20170823162448_create_status_pins.rb
@@ -2,7 +2,7 @@
class CreateStatusPins < ActiveRecord::Migration[5.1]
def change
- create_table :status_pins do |t|
+ create_table :status_pins do |t| # rubocop:disable Rails/CreateTableWithTimestamps
t.belongs_to :account, foreign_key: { on_delete: :cascade }, null: false
t.belongs_to :status, foreign_key: { on_delete: :cascade }, null: false
end
diff --git a/db/migrate/20171116161857_create_list_accounts.rb b/db/migrate/20171116161857_create_list_accounts.rb
index ff9ab3faad..b0371e4c88 100644
--- a/db/migrate/20171116161857_create_list_accounts.rb
+++ b/db/migrate/20171116161857_create_list_accounts.rb
@@ -2,7 +2,7 @@
class CreateListAccounts < ActiveRecord::Migration[5.2]
def change
- create_table :list_accounts do |t|
+ create_table :list_accounts do |t| # rubocop:disable Rails/CreateTableWithTimestamps
t.belongs_to :list, foreign_key: { on_delete: :cascade }, null: false
t.belongs_to :account, foreign_key: { on_delete: :cascade }, null: false
t.belongs_to :follow, foreign_key: { on_delete: :cascade }, null: false
diff --git a/db/migrate/20180929222014_create_account_conversations.rb b/db/migrate/20180929222014_create_account_conversations.rb
index 9386b86e7c..4e85e68d47 100644
--- a/db/migrate/20180929222014_create_account_conversations.rb
+++ b/db/migrate/20180929222014_create_account_conversations.rb
@@ -2,7 +2,7 @@
class CreateAccountConversations < ActiveRecord::Migration[5.2]
def change
- create_table :account_conversations do |t|
+ create_table :account_conversations do |t| # rubocop:disable Rails/CreateTableWithTimestamps
t.belongs_to :account, foreign_key: { on_delete: :cascade }
t.belongs_to :conversation, foreign_key: { on_delete: :cascade }
t.bigint :participant_account_ids, array: true, null: false, default: []
diff --git a/db/migrate/20181007025445_create_pghero_space_stats.rb b/db/migrate/20181007025445_create_pghero_space_stats.rb
index ddaf4aef31..696b53d8d7 100644
--- a/db/migrate/20181007025445_create_pghero_space_stats.rb
+++ b/db/migrate/20181007025445_create_pghero_space_stats.rb
@@ -2,7 +2,7 @@
class CreatePgheroSpaceStats < ActiveRecord::Migration[5.2]
def change
- create_table :pghero_space_stats do |t|
+ create_table :pghero_space_stats do |t| # rubocop:disable Rails/CreateTableWithTimestamps
t.text :database
t.text :schema
t.text :relation
diff --git a/db/migrate/20190103124649_create_scheduled_statuses.rb b/db/migrate/20190103124649_create_scheduled_statuses.rb
index a66546187e..02b4916be8 100644
--- a/db/migrate/20190103124649_create_scheduled_statuses.rb
+++ b/db/migrate/20190103124649_create_scheduled_statuses.rb
@@ -2,7 +2,7 @@
class CreateScheduledStatuses < ActiveRecord::Migration[5.2]
def change
- create_table :scheduled_statuses do |t|
+ create_table :scheduled_statuses do |t| # rubocop:disable Rails/CreateTableWithTimestamps
t.belongs_to :account, foreign_key: { on_delete: :cascade }
t.datetime :scheduled_at, index: true
t.jsonb :params
diff --git a/db/migrate/20220824233535_create_status_trends.rb b/db/migrate/20220824233535_create_status_trends.rb
index 52dcbf8f38..e68e5b7c11 100644
--- a/db/migrate/20220824233535_create_status_trends.rb
+++ b/db/migrate/20220824233535_create_status_trends.rb
@@ -2,7 +2,7 @@
class CreateStatusTrends < ActiveRecord::Migration[6.1]
def change
- create_table :status_trends do |t|
+ create_table :status_trends do |t| # rubocop:disable Rails/CreateTableWithTimestamps
t.references :status, null: false, foreign_key: { on_delete: :cascade }, index: { unique: true }
t.references :account, null: false, foreign_key: { on_delete: :cascade }
t.float :score, null: false, default: 0
diff --git a/db/migrate/20221006061337_create_preview_card_trends.rb b/db/migrate/20221006061337_create_preview_card_trends.rb
index 934a06e24d..266f644023 100644
--- a/db/migrate/20221006061337_create_preview_card_trends.rb
+++ b/db/migrate/20221006061337_create_preview_card_trends.rb
@@ -2,7 +2,7 @@
class CreatePreviewCardTrends < ActiveRecord::Migration[6.1]
def change
- create_table :preview_card_trends do |t|
+ create_table :preview_card_trends do |t| # rubocop:disable Rails/CreateTableWithTimestamps
t.references :preview_card, null: false, foreign_key: { on_delete: :cascade }, index: { unique: true }
t.float :score, null: false, default: 0
t.integer :rank, null: false, default: 0
diff --git a/db/migrate/20240808124338_migrate_notifications_policy_v2.rb b/db/migrate/20240808124338_migrate_notifications_policy_v2.rb
index 2e0684826a..ed1642d6b8 100644
--- a/db/migrate/20240808124338_migrate_notifications_policy_v2.rb
+++ b/db/migrate/20240808124338_migrate_notifications_policy_v2.rb
@@ -9,7 +9,7 @@ class MigrateNotificationsPolicyV2 < ActiveRecord::Migration[7.1]
def up
NotificationPolicy.in_batches.update_all(<<~SQL.squish)
for_not_following = CASE filter_not_following WHEN true THEN 1 ELSE 0 END,
- for_not_followers = CASE filter_not_following WHEN true THEN 1 ELSE 0 END,
+ for_not_followers = CASE filter_not_followers WHEN true THEN 1 ELSE 0 END,
for_new_accounts = CASE filter_new_accounts WHEN true THEN 1 ELSE 0 END,
for_private_mentions = CASE filter_private_mentions WHEN true THEN 1 ELSE 0 END
SQL
@@ -18,7 +18,7 @@ class MigrateNotificationsPolicyV2 < ActiveRecord::Migration[7.1]
def down
NotificationPolicy.in_batches.update_all(<<~SQL.squish)
filter_not_following = CASE for_not_following WHEN 0 THEN false ELSE true END,
- filter_not_following = CASE for_not_followers WHEN 0 THEN false ELSE true END,
+ filter_not_followers = CASE for_not_followers WHEN 0 THEN false ELSE true END,
filter_new_accounts = CASE for_new_accounts WHEN 0 THEN false ELSE true END,
filter_private_mentions = CASE for_private_mentions WHEN 0 THEN false ELSE true END
SQL
diff --git a/db/migrate/20241007071624_fix_notification_permission_foreign_keys.rb b/db/migrate/20241007071624_fix_notification_permission_foreign_keys.rb
new file mode 100644
index 0000000000..11b82de8a6
--- /dev/null
+++ b/db/migrate/20241007071624_fix_notification_permission_foreign_keys.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+class FixNotificationPermissionForeignKeys < ActiveRecord::Migration[7.1]
+ def up
+ safety_assured do
+ execute <<~SQL.squish
+ ALTER TABLE notification_permissions
+ DROP CONSTRAINT fk_rails_7c0bed08df,
+ ADD CONSTRAINT fk_rails_7c0bed08df
+ FOREIGN KEY (account_id)
+ REFERENCES accounts(id)
+ ON DELETE CASCADE,
+
+ DROP CONSTRAINT fk_rails_e3e0aaad70,
+ ADD CONSTRAINT fk_rails_e3e0aaad70
+ FOREIGN KEY (from_account_id)
+ REFERENCES accounts(id)
+ ON DELETE CASCADE
+ SQL
+ end
+ end
+
+ def down
+ safety_assured do
+ execute <<~SQL.squish
+ ALTER TABLE notification_permissions
+ DROP CONSTRAINT fk_rails_7c0bed08df,
+ ADD CONSTRAINT fk_rails_7c0bed08df
+ FOREIGN KEY (account_id)
+ REFERENCES accounts(id),
+
+ DROP CONSTRAINT fk_rails_e3e0aaad70,
+ ADD CONSTRAINT fk_rails_e3e0aaad70
+ FOREIGN KEY (from_account_id)
+ REFERENCES accounts(id)
+ SQL
+ end
+ end
+end
diff --git a/db/post_migrate/20240808124339_post_deployment_migrate_notifications_policy_v2.rb b/db/post_migrate/20240808124339_post_deployment_migrate_notifications_policy_v2.rb
index eb0c909729..5daf646643 100644
--- a/db/post_migrate/20240808124339_post_deployment_migrate_notifications_policy_v2.rb
+++ b/db/post_migrate/20240808124339_post_deployment_migrate_notifications_policy_v2.rb
@@ -9,7 +9,7 @@ class PostDeploymentMigrateNotificationsPolicyV2 < ActiveRecord::Migration[7.1]
def up
NotificationPolicy.in_batches.update_all(<<~SQL.squish)
for_not_following = CASE filter_not_following WHEN true THEN 1 ELSE 0 END,
- for_not_followers = CASE filter_not_following WHEN true THEN 1 ELSE 0 END,
+ for_not_followers = CASE filter_not_followers WHEN true THEN 1 ELSE 0 END,
for_new_accounts = CASE filter_new_accounts WHEN true THEN 1 ELSE 0 END,
for_private_mentions = CASE filter_private_mentions WHEN true THEN 1 ELSE 0 END
SQL
@@ -18,7 +18,7 @@ class PostDeploymentMigrateNotificationsPolicyV2 < ActiveRecord::Migration[7.1]
def down
NotificationPolicy.in_batches.update_all(<<~SQL.squish)
filter_not_following = CASE for_not_following WHEN 0 THEN false ELSE true END,
- filter_not_following = CASE for_not_followers WHEN 0 THEN false ELSE true END,
+ filter_not_followers = CASE for_not_followers WHEN 0 THEN false ELSE true END,
filter_new_accounts = CASE for_new_accounts WHEN 0 THEN false ELSE true END,
filter_private_mentions = CASE for_private_mentions WHEN 0 THEN false ELSE true END
SQL
diff --git a/db/schema.rb b/db/schema.rb
index 8fcf136f9e..76a8fb7568 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[7.1].define(version: 2024_09_16_190140) do
+ActiveRecord::Schema[7.1].define(version: 2024_10_07_071624) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -1684,8 +1684,8 @@ ActiveRecord::Schema[7.1].define(version: 2024_09_16_190140) do
add_foreign_key "mutes", "accounts", name: "fk_b8d8daf315", on_delete: :cascade
add_foreign_key "ng_rule_histories", "accounts"
add_foreign_key "ng_rule_histories", "ng_rules"
- add_foreign_key "notification_permissions", "accounts"
- add_foreign_key "notification_permissions", "accounts", column: "from_account_id"
+ add_foreign_key "notification_permissions", "accounts", column: "from_account_id", on_delete: :cascade
+ add_foreign_key "notification_permissions", "accounts", on_delete: :cascade
add_foreign_key "notification_policies", "accounts", on_delete: :cascade
add_foreign_key "notification_requests", "accounts", column: "from_account_id", on_delete: :cascade
add_foreign_key "notification_requests", "accounts", on_delete: :cascade
diff --git a/docker-compose.yml b/docker-compose.yml
index 41876d26f9..0aea38746f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -58,8 +58,8 @@ 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/mastodon/mastodon:v4.3.0-rc.1
+ build: .
+ image: kmyblue:15.13-lts
restart: always
env_file: .env.production
command: bundle exec puma -C config/puma.rb
@@ -80,10 +80,10 @@ services:
streaming:
# You can uncomment the following lines if you want to not use the prebuilt image, for example if you have local code changes
- # build:
- # dockerfile: ./streaming/Dockerfile
- # context: .
- image: ghcr.io/mastodon/mastodon-streaming:v4.3.0-rc.1
+ build:
+ dockerfile: ./streaming/Dockerfile
+ context: .
+ image: kmyblue-streaming:15.13-lts
restart: always
env_file: .env.production
command: node ./streaming/index.js
@@ -101,7 +101,7 @@ services:
sidekiq:
build: .
- image: ghcr.io/mastodon/mastodon:v4.3.0-rc.1
+ image: kmyblue:15.13-lts
restart: always
env_file: .env.production
command: bundle exec sidekiq
diff --git a/lib/exceptions.rb b/lib/exceptions.rb
index c2ff162a6e..d3b92f4a09 100644
--- a/lib/exceptions.rb
+++ b/lib/exceptions.rb
@@ -8,7 +8,6 @@ module Mastodon
class LengthValidationError < ValidationError; end
class DimensionsValidationError < ValidationError; end
class StreamValidationError < ValidationError; end
- class FilterValidationError < ValidationError; end
class RaceConditionError < Error; end
class RateLimitExceededError < Error; end
class SyntaxError < Error; end
diff --git a/lib/mastodon/cli/email_domain_blocks.rb b/lib/mastodon/cli/email_domain_blocks.rb
index 6b9107c8ad..1e90a7c283 100644
--- a/lib/mastodon/cli/email_domain_blocks.rb
+++ b/lib/mastodon/cli/email_domain_blocks.rb
@@ -46,7 +46,7 @@ module Mastodon::CLI
if options[:with_dns_records]
Resolv::DNS.open do |dns|
dns.timeouts = 5
- other_domains = dns.getresources(@email_domain_block.domain, Resolv::DNS::Resource::IN::MX).to_a
+ other_domains = dns.getresources(domain, Resolv::DNS::Resource::IN::MX).to_a.map { |e| e.exchange.to_s }.compact_blank
end
end
diff --git a/lib/mastodon/cli/feeds.rb b/lib/mastodon/cli/feeds.rb
index 9d25cd7859..c0635bbcde 100644
--- a/lib/mastodon/cli/feeds.rb
+++ b/lib/mastodon/cli/feeds.rb
@@ -5,6 +5,7 @@ require_relative 'base'
module Mastodon::CLI
class Feeds < Base
include Redisable
+ include DatabaseHelper
option :all, type: :boolean, default: false
option :concurrency, type: :numeric, default: 5, aliases: [:c]
@@ -59,6 +60,38 @@ module Mastodon::CLI
say('OK', :green)
end
+ desc 'vacuum', 'Remove home feeds of inactive users from Redis'
+ long_desc <<-LONG_DESC
+ Running this task should not be needed in most cases, as Mastodon will
+ automatically clean up feeds from inactive accounts every day.
+
+ However, this task is more aggressive in order to clean up feeds that
+ may have been missed because of bugs or database mishaps.
+ LONG_DESC
+ def vacuum
+ with_read_replica do
+ say('Deleting orphaned home feeds…')
+ redis.scan_each(match: 'feed:home:*').each_slice(1000) do |keys|
+ ids = keys.map { |key| key.split(':')[2] }.compact_blank
+
+ known_ids = User.confirmed.signed_in_recently.where(account_id: ids).pluck(:account_id)
+
+ keys_to_delete = keys.filter { |key| known_ids.exclude?(key.split(':')[2]&.to_i) }
+ redis.del(keys_to_delete)
+ end
+
+ say('Deleting orphaned list feeds…')
+ redis.scan_each(match: 'feed:list:*').each_slice(1000) do |keys|
+ ids = keys.map { |key| key.split(':')[2] }.compact_blank
+
+ known_ids = List.where(account_id: User.confirmed.signed_in_recently.select(:account_id)).where(id: ids).pluck(:id)
+
+ keys_to_delete = keys.filter { |key| known_ids.exclude?(key.split(':')[2]&.to_i) }
+ redis.del(keys_to_delete)
+ end
+ end
+ end
+
private
def active_user_accounts
diff --git a/lib/mastodon/cli/ip_blocks.rb b/lib/mastodon/cli/ip_blocks.rb
index 3c5fdb275c..ef24f2e047 100644
--- a/lib/mastodon/cli/ip_blocks.rb
+++ b/lib/mastodon/cli/ip_blocks.rb
@@ -5,7 +5,7 @@ require_relative 'base'
module Mastodon::CLI
class IpBlocks < Base
- option :severity, required: true, enum: %w(no_access sign_up_requires_approval sign_up_block), desc: 'Severity of the block'
+ option :severity, required: true, enum: IpBlock.severities.keys, desc: 'Severity of the block'
option :comment, aliases: [:c], desc: 'Optional comment'
option :duration, aliases: [:d], type: :numeric, desc: 'Duration of the block in seconds'
option :force, type: :boolean, aliases: [:f], desc: 'Overwrite existing blocks'
diff --git a/lib/mastodon/cli/maintenance.rb b/lib/mastodon/cli/maintenance.rb
index 0b84047a1c..532fbc328a 100644
--- a/lib/mastodon/cli/maintenance.rb
+++ b/lib/mastodon/cli/maintenance.rb
@@ -43,6 +43,7 @@ module Mastodon::CLI
class BulkImport < ApplicationRecord; end
class SoftwareUpdate < ApplicationRecord; end
class SeveredRelationship < ApplicationRecord; end
+ class TagFollow < ApplicationRecord; end
class DomainBlock < ApplicationRecord
enum :severity, { silence: 0, suspend: 1, noop: 2 }
@@ -102,6 +103,7 @@ module Mastodon::CLI
owned_classes << AccountIdentityProof if db_table_exists?(:account_identity_proofs)
owned_classes << Appeal if db_table_exists?(:appeals)
owned_classes << BulkImport if db_table_exists?(:bulk_imports)
+ owned_classes << TagFollow if db_table_exists?(:tag_follows)
owned_classes.each do |klass|
klass.where(account_id: other_account.id).find_each do |record|
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 9753be02a0..0c997bae6c 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -6,17 +6,19 @@ module Mastodon
module_function
+ # If you change the version number, also change the image version in docker-compose.yml.
+
def kmyblue_major
15
end
def kmyblue_minor
- 0
+ 13
end
def kmyblue_flag
- # 'LTS'
- 'dev'
+ 'LTS'
+ # 'dev'
# nil
end
@@ -29,11 +31,11 @@ module Mastodon
end
def patch
- 0
+ 8
end
def default_prerelease
- 'rc.1'
+ ''
end
def prerelease
@@ -53,12 +55,11 @@ module Mastodon
def to_s_of_mastodon
components = [to_a.join('.')]
components << "-#{prerelease}" if prerelease.present?
- components << "+#{build_metadata_of_mastodon}" if build_metadata_of_mastodon.present?
components.join
end
def build_metadata
- ['kmyblue', to_s_of_kmyblue, build_metadata_of_mastodon].compact.join('.')
+ ['kmyblue', to_s_of_kmyblue].compact.join('.')
end
def build_metadata_of_mastodon
@@ -73,6 +74,7 @@ module Mastodon
components = [to_a.join('.')]
components << "-#{prerelease}" if prerelease.present?
components << "+#{build_metadata}" if build_metadata.present?
+ components << "+#{build_metadata_of_mastodon}" if build_metadata_of_mastodon.present?
components.join
end
diff --git a/lib/paperclip/vips_lazy_thumbnail.rb b/lib/paperclip/vips_lazy_thumbnail.rb
index 4764b04af8..528d5604dc 100644
--- a/lib/paperclip/vips_lazy_thumbnail.rb
+++ b/lib/paperclip/vips_lazy_thumbnail.rb
@@ -52,6 +52,7 @@ module Paperclip
# implement. If cropping ever becomes necessary for other situations, this will
# need to be expanded.
crop_width = crop_height = [target_width, target_height].min if @target_geometry&.square?
+ crop_width = crop_height = "'min(iw,ih)'" if crop_width == 'ih'
filter = begin
if @crop
@@ -122,7 +123,14 @@ module Paperclip
end
def needs_convert?
- needs_different_geometry? || needs_different_format? || needs_metadata_stripping?
+ strip_animations? || needs_different_geometry? || needs_different_format? || needs_metadata_stripping?
+ end
+
+ def strip_animations?
+ # Detecting whether the source image is animated across all our supported
+ # input file formats is not trivial, and converting unconditionally is just
+ # as simple for now
+ options[:style] == :static
end
def needs_different_geometry?
diff --git a/lib/redis/namespace_extensions.rb b/lib/redis/namespace_extensions.rb
index 9af59c296e..2be738b04d 100644
--- a/lib/redis/namespace_extensions.rb
+++ b/lib/redis/namespace_extensions.rb
@@ -5,6 +5,10 @@ class Redis
def exists?(...)
call_with_namespace('exists?', ...)
end
+
+ def with
+ yield self
+ end
end
end
diff --git a/lib/sanitize_ext/sanitize_config.rb b/lib/sanitize_ext/sanitize_config.rb
index 29c53c1bab..368e2b3bfa 100644
--- a/lib/sanitize_ext/sanitize_config.rb
+++ b/lib/sanitize_ext/sanitize_config.rb
@@ -116,18 +116,16 @@ class Sanitize
)
MASTODON_OEMBED = freeze_config(
- elements: %w(audio embed iframe source video),
+ elements: %w(audio iframe source video),
attributes: {
'audio' => %w(controls),
- 'embed' => %w(height src type width),
'iframe' => %w(allowfullscreen frameborder height scrolling src width),
'source' => %w(src type),
'video' => %w(controls height loop width),
},
protocols: {
- 'embed' => { 'src' => HTTP_PROTOCOLS },
'iframe' => { 'src' => HTTP_PROTOCOLS },
'source' => { 'src' => HTTP_PROTOCOLS },
},
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index d8bc927bc4..e5a58ae3d5 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -7,9 +7,39 @@ namespace :db do
namespace :encryption do
desc 'Generate a set of keys for configuring Active Record encryption in a given environment'
task :init do # rubocop:disable Rails/RakeEnvironment
- puts <<~MSG
- Add these secret environment variables to your Mastodon environment (e.g. .env.production):#{' '}
+ if %w(
+ ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY
+ ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT
+ ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY
+ ).any? { |key| ENV[key].present? }
+ unless ENV['IGNORE_ALREADY_SET_SECRETS'] == 'true'
+ puts <<~MSG
+ Secrets for this server have already been set, this step can likely be ignored!
+ In the unlikely event you need to generate new secrets, re-run this command with `IGNORE_ALREADY_SET_SECRETS=true`.
+ MSG
+ next
+ end
+
+ pastel = Pastel.new
+ puts pastel.red(<<~MSG)
+ WARNING: It looks like encryption secrets have already been set.
+ WARNING: Ensure you are not changing secrets for a Mastodon installation that already uses them, as this will cause data loss and other issues that are difficult to recover from.
+ WARNING: Only proceed if you are absolutely sure of what you are doing!
+ MSG
+
+ puts <<~MSG
+ If you are sure of what you are doing, add the following secret environment variables to your Mastodon environment (e.g. .env.production), ensure they are shared across all your nodes and do not change them after they are set:#{' '}
+ MSG
+ else
+ puts <<~MSG
+ Add the following secret environment variables to your Mastodon environment (e.g. .env.production), ensure they are shared across all your nodes and do not change them after they are set:#{' '}
+ MSG
+ end
+
+ puts <<~MSG
+
+ # Do NOT change these variables once they are set
ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=#{SecureRandom.alphanumeric(32)}
ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=#{SecureRandom.alphanumeric(32)}
ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=#{SecureRandom.alphanumeric(32)}
diff --git a/lib/tasks/icons.rake b/lib/tasks/icons.rake
index 96e0a14315..9a05cf3499 100644
--- a/lib/tasks/icons.rake
+++ b/lib/tasks/icons.rake
@@ -38,6 +38,20 @@ def find_used_icons
end
end
+ Rails.root.join('config', 'navigation.rb').open('r') do |file|
+ pattern = /material_symbol\('(?Hola
' - end - - it 'returns source language' do - expect(service.call(status, 'es').detected_source_language).to eq 'en' - end - - it 'returns translation provider' do - expect(service.call(status, 'es').provider).to eq 'Dummy' - end - - it 'returns original status' do - expect(service.call(status, 'es').status).to eq status + it 'returns translated status content and source language and provider and original status' do + expect(service.call(status, 'es')) + .to have_attributes( + content: 'Hola
', + detected_source_language: 'en', + language: 'es', + provider: 'Dummy', + status: status + ) end describe 'status has content with custom emoji' do @@ -107,6 +102,16 @@ RSpec.describe TranslateStatusService do expect(media_attachment.description).to eq 'Hola & :highfive:' end end + + describe 'target language is regional' do + it 'uses regional variant' do + expect(service.call(status, 'es-MX').language).to eq 'es-MX' + end + + it 'uses parent locale for unsupported regional variant' do + expect(service.call(status, 'es-XX').language).to eq 'es' + end + end end describe '#source_texts' do @@ -155,26 +160,16 @@ RSpec.describe TranslateStatusService do let!(:source_texts) { service.send(:source_texts) } it 'returns formatted poll options' do - expect(source_texts.size).to eq 3 - expect(source_texts.values).to eq %w(Hello
Blue Green) - end - - it 'has a first key with content' do - expect(source_texts.keys.first).to eq :content - end - - it 'has the first option in the second key with correct options' do - option1 = source_texts.keys.second - expect(option1).to be_a Poll::Option - expect(option1.id).to eq '0' - expect(option1.title).to eq 'Blue' - end - - it 'has the second option in the third key with correct options' do - option2 = source_texts.keys.third - expect(option2).to be_a Poll::Option - expect(option2.id).to eq '1' - expect(option2.title).to eq 'Green' + expect(source_texts) + .to have_attributes( + size: 3, + values: %w(Hello
Blue Green), + keys: contain_exactly( + eq(:content), + be_a(Poll::Option).and(have_attributes(id: '0', title: 'Blue')), + be_a(Poll::Option).and(have_attributes(id: '1', title: 'Green')) + ) + ) end end end diff --git a/spec/services/unblock_domain_service_spec.rb b/spec/services/unblock_domain_service_spec.rb index 405fe1cfd2..daa1d480a6 100644 --- a/spec/services/unblock_domain_service_spec.rb +++ b/spec/services/unblock_domain_service_spec.rb @@ -12,26 +12,32 @@ RSpec.describe UnblockDomainService do let!(:silenced) { Fabricate(:account, domain: 'example.com', silenced_at: domain_block.created_at) } let!(:suspended) { Fabricate(:account, domain: 'example.com', suspended_at: domain_block.created_at) } - it 'unsilences accounts and removes block' do - domain_block.update(severity: :silence) + context 'with severity of silence' do + before { domain_block.update(severity: :silence) } - subject.call(domain_block) - expect_deleted_domain_block - expect(silenced.reload.silenced?).to be false - expect(suspended.reload.suspended?).to be true - expect(independently_suspended.reload.suspended?).to be true - expect(independently_silenced.reload.silenced?).to be true + it 'unsilences accounts and removes block' do + subject.call(domain_block) + + expect_deleted_domain_block + expect(silenced.reload.silenced?).to be false + expect(suspended.reload.suspended?).to be true + expect(independently_suspended.reload.suspended?).to be true + expect(independently_silenced.reload.silenced?).to be true + end end - it 'unsuspends accounts and removes block' do - domain_block.update(severity: :suspend) + context 'with severity of suspend' do + before { domain_block.update(severity: :suspend) } - subject.call(domain_block) - expect_deleted_domain_block - expect(suspended.reload.suspended?).to be false - expect(silenced.reload.silenced?).to be false - expect(independently_suspended.reload.suspended?).to be true - expect(independently_silenced.reload.silenced?).to be true + it 'unsuspends accounts and removes block' do + subject.call(domain_block) + + expect_deleted_domain_block + expect(suspended.reload.suspended?).to be false + expect(silenced.reload.silenced?).to be false + expect(independently_suspended.reload.suspended?).to be true + expect(independently_silenced.reload.silenced?).to be true + end end end diff --git a/spec/services/unblock_service_spec.rb b/spec/services/unblock_service_spec.rb index 6132e74415..a2c5188f06 100644 --- a/spec/services/unblock_service_spec.rb +++ b/spec/services/unblock_service_spec.rb @@ -10,13 +10,13 @@ RSpec.describe UnblockService do describe 'local' do let(:bob) { Fabricate(:account) } - before do - sender.block!(bob) - subject.call(sender, bob) - end + before { sender.block!(bob) } it 'destroys the blocking relation' do - expect(sender.blocking?(bob)).to be false + subject.call(sender, bob) + + expect(sender) + .to_not be_blocking(bob) end end @@ -26,15 +26,15 @@ RSpec.describe UnblockService do before do sender.block!(bob) stub_request(:post, 'http://example.com/inbox').to_return(status: 200) + end + + it 'destroys the blocking relation and sends unblock activity', :inline_jobs do subject.call(sender, bob) - end - it 'destroys the blocking relation' do - expect(sender.blocking?(bob)).to be false - end - - it 'sends an unblock activity', :inline_jobs do - expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.once + expect(sender) + .to_not be_blocking(bob) + expect(a_request(:post, 'http://example.com/inbox')) + .to have_been_made.once end end end diff --git a/spec/services/unfollow_service_spec.rb b/spec/services/unfollow_service_spec.rb index 0c206c4b98..6cf24ca5e1 100644 --- a/spec/services/unfollow_service_spec.rb +++ b/spec/services/unfollow_service_spec.rb @@ -10,13 +10,13 @@ RSpec.describe UnfollowService do describe 'local' do let(:bob) { Fabricate(:account, username: 'bob') } - before do - sender.follow!(bob) - subject.call(sender, bob) - end + before { sender.follow!(bob) } it 'destroys the following relation' do - expect(sender.following?(bob)).to be false + subject.call(sender, bob) + + expect(sender) + .to_not be_following(bob) end end @@ -26,15 +26,15 @@ RSpec.describe UnfollowService do before do sender.follow!(bob) stub_request(:post, 'http://example.com/inbox').to_return(status: 200) + end + + it 'destroys the following relation and sends unfollow activity' do subject.call(sender, bob) - end - it 'destroys the following relation' do - expect(sender.following?(bob)).to be false - end - - it 'sends an unfollow activity' do - expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.once + expect(sender) + .to_not be_following(bob) + expect(a_request(:post, 'http://example.com/inbox')) + .to have_been_made.once end end @@ -44,15 +44,15 @@ RSpec.describe UnfollowService do before do bob.follow!(sender) stub_request(:post, 'http://example.com/inbox').to_return(status: 200) + end + + it 'destroys the following relation and sends a reject activity' do subject.call(bob, sender) - end - it 'destroys the following relation' do - expect(bob.following?(sender)).to be false - end - - it 'sends a reject activity' do - expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.once + expect(sender) + .to_not be_following(bob) + expect(a_request(:post, 'http://example.com/inbox')) + .to have_been_made.once end end end diff --git a/spec/services/update_account_service_spec.rb b/spec/services/update_account_service_spec.rb index 3720e85532..e10ec4e2a7 100644 --- a/spec/services/update_account_service_spec.rb +++ b/spec/services/update_account_service_spec.rb @@ -21,23 +21,19 @@ RSpec.describe UpdateAccountService do FollowService.new.call(bob, account) FollowService.new.call(eve, account) FollowService.new.call(ohagi, account) + end + it 'auto accepts pending follow requests from appropriate accounts' do subject.call(account, { locked: false }) - end - it 'auto-accepts pending follow requests' do - expect(alice.following?(account)).to be true - expect(alice.requested?(account)).to be false - end + expect(alice).to be_following(account) + expect(alice).to_not be_requested(account) - it 'does not auto-accept pending follow requests from silenced users' do - expect(bob.following?(account)).to be false - expect(bob.requested?(account)).to be true - end + expect(bob).to_not be_following(account) + expect(bob).to be_requested(account) - it 'auto-accepts pending follow requests from muted users so as to not leak mute' do - expect(eve.following?(account)).to be true - expect(eve.requested?(account)).to be false + expect(eve).to be_following(account) + expect(eve).to_not be_requested(account) end it 'does not auto-accept pending follow requests from blocking straight follow domains' do diff --git a/spec/services/update_status_service_spec.rb b/spec/services/update_status_service_spec.rb index 4df43461be..2a2bbd68b6 100644 --- a/spec/services/update_status_service_spec.rb +++ b/spec/services/update_status_service_spec.rb @@ -10,15 +10,15 @@ RSpec.describe UpdateStatusService do before do allow(ActivityPub::DistributionWorker).to receive(:perform_async) + end + + it 'does not create an edit or notify anyone' do subject.call(status, status.account_id, text: 'Foo') - end - it 'does not create an edit' do - expect(status.reload.edits).to be_empty - end - - it 'does not notify anyone' do - expect(ActivityPub::DistributionWorker).to_not have_received(:perform_async) + expect(status.reload.edits) + .to be_empty + expect(ActivityPub::DistributionWorker) + .to_not have_received(:perform_async) end end @@ -28,18 +28,16 @@ RSpec.describe UpdateStatusService do before do PreviewCardsStatus.create(status: status, preview_card: preview_card) + end + + it 'updates text, resets card, saves edit history' do subject.call(status, status.account_id, text: 'Bar') - end - it 'updates text' do - expect(status.reload.text).to eq 'Bar' - end - - it 'resets preview card' do - expect(status.reload.preview_card).to be_nil - end - - it 'saves edit history' do + expect(status.reload) + .to have_attributes( + text: 'Bar', + preview_card: be_nil + ) expect(status.edits.ordered.pluck(:text)).to eq %w(Foo Bar) end end @@ -50,15 +48,15 @@ RSpec.describe UpdateStatusService do before do PreviewCardsStatus.create(status: status, preview_card: preview_card) + end + + it 'updates content warning and saves history' do subject.call(status, status.account_id, text: 'Foo', spoiler_text: 'Bar') - end - it 'updates content warning' do - expect(status.reload.spoiler_text).to eq 'Bar' - end - - it 'saves edit history' do - expect(status.edits.ordered.pluck(:text, :spoiler_text)).to eq [['Foo', ''], ['Foo', 'Bar']] + expect(status.reload.spoiler_text) + .to eq 'Bar' + expect(status.edits.ordered.pluck(:text, :spoiler_text)) + .to eq [['Foo', ''], ['Foo', 'Bar']] end end @@ -118,23 +116,19 @@ RSpec.describe UpdateStatusService do before do status.media_attachments << detached_media_attachment + end + + it 'updates media attachments, handles attachments, saves history' do subject.call(status, status.account_id, text: 'Foo', media_ids: [attached_media_attachment.id.to_s]) - end - it 'updates media attachments' do - expect(status.ordered_media_attachments).to eq [attached_media_attachment] - end - - it 'does not detach detached media attachments' do - expect(detached_media_attachment.reload.status_id).to eq status.id - end - - it 'attaches attached media attachments' do - expect(attached_media_attachment.reload.status_id).to eq status.id - end - - it 'saves edit history' do - expect(status.edits.ordered.pluck(:ordered_media_attachment_ids)).to eq [[detached_media_attachment.id], [attached_media_attachment.id]] + expect(status.ordered_media_attachments) + .to eq [attached_media_attachment] + expect(detached_media_attachment.reload.status_id) + .to eq status.id + expect(attached_media_attachment.reload.status_id) + .to eq status.id + expect(status.edits.ordered.pluck(:ordered_media_attachment_ids)) + .to eq [[detached_media_attachment.id], [attached_media_attachment.id]] end end @@ -144,19 +138,18 @@ RSpec.describe UpdateStatusService do before do status.media_attachments << media_attachment + end + + it 'does not detach media attachment, updates description, and saves history' do subject.call(status, status.account_id, text: 'Foo', media_ids: [media_attachment.id.to_s], media_attributes: [{ id: media_attachment.id, description: 'New description' }]) - end - it 'does not detach media attachment' do - expect(media_attachment.reload.status_id).to eq status.id - end - - it 'updates the media attachment description' do - expect(media_attachment.reload.description).to eq 'New description' - end - - it 'saves edit history' do - expect(status.edits.ordered.map { |edit| edit.ordered_media_attachments.map(&:description) }).to eq [['Old description'], ['New description']] + expect(media_attachment.reload) + .to have_attributes( + status_id: status.id, + description: 'New description' + ) + expect(status.edits.ordered.map { |edit| edit.ordered_media_attachments.map(&:description) }) + .to eq [['Old description'], ['New description']] end end @@ -169,28 +162,27 @@ RSpec.describe UpdateStatusService do before do status.update(poll: poll) VoteService.new.call(voter, poll, [0]) + end + + it 'updates poll, resets votes, saves history, requeues notifications' do subject.call(status, status.account_id, text: 'Foo', poll: { options: %w(Bar Baz Foo), expires_in: 5.days.to_i }) - end - it 'updates poll' do poll = status.poll.reload - expect(poll.options).to eq %w(Bar Baz Foo) - end - it 'resets votes' do - poll = status.poll.reload - expect(poll.votes_count).to eq 0 - expect(poll.votes.count).to eq 0 - expect(poll.cached_tallies).to eq [0, 0, 0] - end + expect(poll) + .to have_attributes( + options: %w(Bar Baz Foo), + votes_count: 0, + cached_tallies: [0, 0, 0] + ) + expect(poll.votes.count) + .to eq(0) - it 'saves edit history' do - expect(status.edits.ordered.pluck(:poll_options)).to eq [%w(Foo Bar), %w(Bar Baz Foo)] - end + expect(status.edits.ordered.pluck(:poll_options)) + .to eq [%w(Foo Bar), %w(Bar Baz Foo)] - it 'requeues expiration notification' do - poll = status.poll.reload - expect(PollExpirationNotifyWorker).to have_enqueued_sidekiq_job(poll.id).at(poll.expires_at + 5.minutes) + expect(PollExpirationNotifyWorker) + .to have_enqueued_sidekiq_job(poll.id).at(poll.expires_at + 5.minutes) end end @@ -200,16 +192,21 @@ RSpec.describe UpdateStatusService do let!(:bob) { Fabricate(:account, username: 'bob') } let!(:status) { PostStatusService.new.call(account, text: 'Hello @alice') } - before do + it 'changes mentions and keeps old as silent' do subject.call(status, status.account_id, text: 'Hello @bob') - end - it 'changes mentions' do - expect(status.active_mentions.pluck(:account_id)).to eq [bob.id] - end + expect(status.active_mentions.pluck(:account_id)) + .to eq [bob.id] + expect(status.mentions.pluck(:account_id)) + .to contain_exactly(alice.id, bob.id) - it 'keeps old mentions as silent mentions' do - expect(status.mentions.pluck(:account_id)).to contain_exactly(alice.id, bob.id) + # Going back when a mention was switched to silence should still be possible + subject.call(status, status.account_id, text: 'Hello @alice') + + expect(status.active_mentions.pluck(:account_id)) + .to eq [alice.id] + expect(status.mentions.pluck(:account_id)) + .to contain_exactly(alice.id, bob.id) end end @@ -250,11 +247,9 @@ RSpec.describe UpdateStatusService do let!(:account) { Fabricate(:account) } let!(:status) { PostStatusService.new.call(account, text: 'Hello #foo') } - before do - subject.call(status, status.account_id, text: 'Hello #bar') - end - it 'changes tags' do + subject.call(status, status.account_id, text: 'Hello #bar') + expect(status.tags.pluck(:name)).to eq %w(bar) end end diff --git a/spec/support/domain_helpers.rb b/spec/support/domain_helpers.rb new file mode 100644 index 0000000000..9977702099 --- /dev/null +++ b/spec/support/domain_helpers.rb @@ -0,0 +1,44 @@ +# frozen_string_literal: true + +module DomainHelpers + def configure_mx(domain:, exchange:, ip_v4_addr: '2.3.4.5', ip_v6_addr: 'fd00::2') + resolver = instance_double(Resolv::DNS, :timeouts= => nil) + + allow(resolver).to receive(:getresources) + .with(domain, Resolv::DNS::Resource::IN::MX) + .and_return([double_mx(exchange)]) + allow(resolver) + .to receive(:getresources) + .with(domain, Resolv::DNS::Resource::IN::A) + .and_return([]) + allow(resolver) + .to receive(:getresources) + .with(domain, Resolv::DNS::Resource::IN::AAAA) + .and_return([]) + allow(resolver) + .to receive(:getresources) + .with(exchange, Resolv::DNS::Resource::IN::A) + .and_return([double_resource_v4(ip_v4_addr)]) + allow(resolver) + .to receive(:getresources) + .with(exchange, Resolv::DNS::Resource::IN::AAAA) + .and_return([double_resource_v6(ip_v6_addr)]) + allow(Resolv::DNS) + .to receive(:open) + .and_yield(resolver) + end + + private + + def double_mx(exchange) + instance_double(Resolv::DNS::Resource::MX, exchange: exchange) + end + + def double_resource_v4(addr) + instance_double(Resolv::DNS::Resource::IN::A, address: addr) + end + + def double_resource_v6(addr) + instance_double(Resolv::DNS::Resource::IN::AAAA, address: addr) + end +end diff --git a/spec/support/examples/models/concerns/account_avatar.rb b/spec/support/examples/models/concerns/account_avatar.rb index 232f51fa3c..c6cc4e75a5 100644 --- a/spec/support/examples/models/concerns/account_avatar.rb +++ b/spec/support/examples/models/concerns/account_avatar.rb @@ -2,13 +2,20 @@ RSpec.shared_examples 'AccountAvatar' do |fabricator| describe 'static avatars', :attachment_processing do - describe 'when GIF' do + describe 'with a square GIF' do it 'creates a png static style' do account = Fabricate(fabricator, avatar: attachment_fixture('avatar.gif')) expect(account.avatar_static_url).to_not eq account.avatar_original_url end end + describe 'with a higher-than-wide GIF' do + it 'creates a png static style' do + account = Fabricate(fabricator, avatar: attachment_fixture('avatar-high.gif')) + expect(account.avatar_static_url).to_not eq account.avatar_original_url + end + end + describe 'when non-GIF' do it 'does not create extra static style' do account = Fabricate(fabricator, avatar: attachment_fixture('attachment.jpg')) diff --git a/spec/system/admin/invites_spec.rb b/spec/system/admin/invites_spec.rb new file mode 100644 index 0000000000..f2cee626c6 --- /dev/null +++ b/spec/system/admin/invites_spec.rb @@ -0,0 +1,63 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe 'Admin Invites' do + describe 'Invite interaction' do + let!(:invite) { Fabricate(:invite, expires_at: nil) } + + let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) } + + before { sign_in user } + + it 'allows invite listing and creation' do + visit admin_invites_path + + expect(page) + .to have_title(I18n.t('admin.invites.title')) + for_invite(invite) do + expect(find('input').value) + .to include(invite.code) + end + + select I18n.t('invites.max_uses', count: 10), from: max_use_field + + expect { generate_invite } + .to change(Invite, :count).by(1) + expect(user.invites.last) + .to have_attributes(max_uses: 10) + end + + it 'allows invite expiration' do + visit admin_invites_path + + for_invite(invite) do + expect { expire_invite } + .to change { invite.reload.expired? }.from(false).to(true) + end + end + + it 'allows invite deactivation' do + visit admin_invites_path + + expect { click_on I18n.t('admin.invites.deactivate_all') } + .to change { Invite.exists?(expires_at: nil) }.from(true).to(false) + end + + def for_invite(invite, &block) + within("#invite_#{invite.id}", &block) + end + + def expire_invite + click_on I18n.t('invites.delete') + end + + def generate_invite + click_on I18n.t('invites.generate') + end + + def max_use_field + I18n.t('simple_form.labels.defaults.max_uses') + end + end +end diff --git a/spec/system/admin/tags_spec.rb b/spec/system/admin/tags_spec.rb new file mode 100644 index 0000000000..a3eca80d13 --- /dev/null +++ b/spec/system/admin/tags_spec.rb @@ -0,0 +1,38 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe 'Admin Tags' do + describe 'Tag interaction' do + let!(:tag) { Fabricate(:tag, name: 'test') } + + before { sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin')) } + + it 'allows tags listing and editing' do + visit admin_tags_path + + expect(page) + .to have_title(I18n.t('admin.tags.title')) + + click_on '#test' + + fill_in display_name_field, with: 'NewTagName' + expect { click_on submit_button } + .to_not(change { tag.reload.display_name }) + expect(page) + .to have_content(match_error_text) + + fill_in display_name_field, with: 'TEST' + expect { click_on submit_button } + .to(change { tag.reload.display_name }.to('TEST')) + end + + def display_name_field + I18n.t('simple_form.labels.defaults.display_name') + end + + def match_error_text + I18n.t('tags.does_not_match_previous_name') + end + end +end diff --git a/spec/system/invites_spec.rb b/spec/system/invites_spec.rb index dbb5083c85..5a9b5afa2c 100644 --- a/spec/system/invites_spec.rb +++ b/spec/system/invites_spec.rb @@ -9,7 +9,6 @@ RSpec.describe 'Invites' do before do UserRole.everyone.update(permissions: UserRole::FLAGS[:invite_users]) - host! 'localhost:3000' # TODO: Move into before for all system specs? sign_in user end diff --git a/spec/system/oauth_spec.rb b/spec/system/oauth_spec.rb index 0f96a59675..64ac75879e 100644 --- a/spec/system/oauth_spec.rb +++ b/spec/system/oauth_spec.rb @@ -179,7 +179,7 @@ RSpec.describe 'Using OAuth from an external app' do end context 'when the user has set up TOTP' do - let(:user) { Fabricate(:user, email: email, password: password, otp_required_for_login: true, otp_secret: User.generate_otp_secret(32)) } + let(:user) { Fabricate(:user, email: email, password: password, otp_required_for_login: true, otp_secret: User.generate_otp_secret) } it 'when accepting the authorization request' do params = { client_id: client_app.uid, response_type: 'code', redirect_uri: client_app.redirect_uri, scope: 'read' } diff --git a/spec/validators/poll_validator_spec.rb b/spec/validators/poll_expiration_validator_spec.rb similarity index 64% rename from spec/validators/poll_validator_spec.rb rename to spec/validators/poll_expiration_validator_spec.rb index f2a2534898..41b8c96211 100644 --- a/spec/validators/poll_validator_spec.rb +++ b/spec/validators/poll_expiration_validator_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe PollValidator do +RSpec.describe PollExpirationValidator do describe '#validate' do before do validator.validate(poll) @@ -14,16 +14,24 @@ RSpec.describe PollValidator do let(:options) { %w(foo bar) } let(:expires_at) { 1.day.from_now } - it 'have no errors' do + it 'has no errors' do expect(errors).to_not have_received(:add) end - context 'when expires is just 5 min ago' do + context 'when the poll expires in 5 min from now' do let(:expires_at) { 5.minutes.from_now } - it 'not calls errors add' do + it 'has no errors' do expect(errors).to_not have_received(:add) end end + + context 'when the poll expires in the past' do + let(:expires_at) { 5.minutes.ago } + + it 'has errors' do + expect(errors).to have_received(:add) + end + end end end diff --git a/spec/validators/poll_options_validator_spec.rb b/spec/validators/poll_options_validator_spec.rb new file mode 100644 index 0000000000..9e4ec744db --- /dev/null +++ b/spec/validators/poll_options_validator_spec.rb @@ -0,0 +1,45 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe PollOptionsValidator do + describe '#validate' do + before do + validator.validate(poll) + end + + let(:validator) { described_class.new } + let(:poll) { instance_double(Poll, options: options, expires_at: expires_at, errors: errors) } + let(:errors) { instance_double(ActiveModel::Errors, add: nil) } + let(:options) { %w(foo bar) } + let(:expires_at) { 1.day.from_now } + + it 'has no errors' do + expect(errors).to_not have_received(:add) + end + + context 'when the poll has duplicate options' do + let(:options) { %w(foo foo) } + + it 'adds errors' do + expect(errors).to have_received(:add) + end + end + + context 'when the poll has no options' do + let(:options) { [] } + + it 'adds errors' do + expect(errors).to have_received(:add) + end + end + + context 'when the poll has too many options' do + let(:options) { Array.new(described_class::MAX_OPTIONS + 1) { |i| "option #{i}" } } + + it 'adds errors' do + expect(errors).to have_received(:add) + end + end + end +end diff --git a/spec/views/statuses/show.html.haml_spec.rb b/spec/views/statuses/show.html.haml_spec.rb index 1afcb046d4..02b1fe7384 100644 --- a/spec/views/statuses/show.html.haml_spec.rb +++ b/spec/views/statuses/show.html.haml_spec.rb @@ -18,7 +18,7 @@ RSpec.describe 'statuses/show.html.haml' do assign(:descendant_threads, []) end - it 'has valid opengraph tags' do + it 'has valid opengraph tags and twitter player tags' do render expect(header_tags) @@ -26,10 +26,6 @@ RSpec.describe 'statuses/show.html.haml' do .and match(//) .and match(//) .and match(%r{}) - end - - it 'has twitter player tag' do - render expect(header_tags) .to match(%r{}) diff --git a/spec/workers/feed_insert_worker_spec.rb b/spec/workers/feed_insert_worker_spec.rb index 5c5dbeacf8..43810349b2 100644 --- a/spec/workers/feed_insert_worker_spec.rb +++ b/spec/workers/feed_insert_worker_spec.rb @@ -36,7 +36,7 @@ RSpec.describe FeedInsertWorker do context 'when there are real records' do it 'skips the push when there is a filter' do - instance = instance_double(FeedManager, push_to_home: nil, filter?: true) + instance = instance_double(FeedManager, push_to_home: nil, filter?: true, filter: :filter) allow(FeedManager).to receive(:instance).and_return(instance) result = subject.perform(status.id, follower.id) @@ -45,7 +45,7 @@ RSpec.describe FeedInsertWorker do end it 'pushes the status onto the home timeline without filter' do - instance = instance_double(FeedManager, push_to_home: nil, filter?: false) + instance = instance_double(FeedManager, push_to_home: nil, filter?: false, filter: nil) allow(FeedManager).to receive(:instance).and_return(instance) result = subject.perform(status.id, follower.id, :home) @@ -54,7 +54,7 @@ RSpec.describe FeedInsertWorker do end it 'pushes the status onto the tags timeline without filter' do - instance = instance_double(FeedManager, push_to_home: nil, filter?: false) + instance = instance_double(FeedManager, push_to_home: nil, filter?: false, filter: nil) allow(FeedManager).to receive(:instance).and_return(instance) result = subject.perform(status.id, follower.id, :tags) @@ -63,7 +63,7 @@ RSpec.describe FeedInsertWorker do end it 'pushes the status onto the list timeline without filter' do - instance = instance_double(FeedManager, push_to_list: nil, filter?: false) + instance = instance_double(FeedManager, push_to_list: nil, filter?: false, filter: nil) allow(FeedManager).to receive(:instance).and_return(instance) result = subject.perform(status.id, list.id, :list) diff --git a/spec/workers/mention_resolve_worker_spec.rb b/spec/workers/mention_resolve_worker_spec.rb new file mode 100644 index 0000000000..5e23876b4a --- /dev/null +++ b/spec/workers/mention_resolve_worker_spec.rb @@ -0,0 +1,38 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe MentionResolveWorker do + let(:status_id) { -42 } + let(:uri) { 'https://example.com/users/unknown' } + + describe '#perform' do + subject { described_class.new.perform(status_id, uri, {}) } + + context 'with a non-existent status' do + it 'returns nil' do + expect(subject).to be_nil + end + end + + context 'with a valid user' do + let(:status) { Fabricate(:status) } + let(:status_id) { status.id } + + let(:service_double) { instance_double(ActivityPub::FetchRemoteAccountService) } + + before do + allow(ActivityPub::FetchRemoteAccountService).to receive(:new).and_return(service_double) + + allow(service_double).to receive(:call).with(uri, anything) { Fabricate(:account, domain: 'example.com', uri: uri) } + end + + it 'resolves the account and adds a new mention', :aggregate_failures do + expect { subject } + .to change { status.reload.mentions }.from([]).to(a_collection_including(having_attributes(account: having_attributes(uri: uri), silent: false))) + + expect(service_double).to have_received(:call).once + end + end + end +end diff --git a/spec/workers/scheduler/ip_cleanup_scheduler_spec.rb b/spec/workers/scheduler/ip_cleanup_scheduler_spec.rb index 7071fa6e98..98150aa5ef 100644 --- a/spec/workers/scheduler/ip_cleanup_scheduler_spec.rb +++ b/spec/workers/scheduler/ip_cleanup_scheduler_spec.rb @@ -5,9 +5,50 @@ require 'rails_helper' RSpec.describe Scheduler::IpCleanupScheduler do let(:worker) { described_class.new } - describe 'perform' do - it 'runs without error' do - expect { worker.perform }.to_not raise_error + describe '#perform' do + context 'with IP-related data past retention times' do + let!(:future_ip_block) { Fabricate :ip_block, expires_at: 1.week.from_now } + let!(:old_ip_block) { Fabricate :ip_block, expires_at: 1.week.ago } + let!(:session_past_retention) { Fabricate :session_activation, ip: '10.0.0.0', updated_at: 18.months.ago } + let!(:inactive_user) { Fabricate :user, current_sign_in_at: 18.months.ago, sign_up_ip: '10.0.0.0' } + let!(:old_login_activity) { Fabricate :login_activity, created_at: 18.months.ago } + let!(:old_token) { Fabricate :access_token, last_used_at: 18.months.ago, last_used_ip: '10.0.0.0' } + + before { stub_const 'Scheduler::IpCleanupScheduler::SESSION_RETENTION_PERIOD', 10.years.to_i.seconds } + + it 'deletes the expired block' do + expect { worker.perform } + .to_not raise_error + expect { old_ip_block.reload } + .to raise_error(ActiveRecord::RecordNotFound) + expect { old_login_activity.reload } + .to raise_error(ActiveRecord::RecordNotFound) + expect(session_past_retention.reload.ip) + .to be_nil + expect(inactive_user.reload.sign_up_ip) + .to be_nil + expect(old_token.reload.last_used_ip) + .to be_nil + expect(future_ip_block.reload) + .to be_present + end + end + + context 'with old session data' do + let!(:new_activation) { Fabricate :session_activation, updated_at: 1.week.ago } + let!(:old_activation) { Fabricate :session_activation, updated_at: 1.month.ago } + + before { stub_const 'Scheduler::IpCleanupScheduler::SESSION_RETENTION_PERIOD', 10.days.to_i.seconds } + + it 'clears old sessions' do + expect { worker.perform } + .to_not raise_error + + expect { old_activation.reload } + .to raise_error(ActiveRecord::RecordNotFound) + expect(new_activation.reload) + .to be_present + end end end end diff --git a/spec/workers/scheduler/user_cleanup_scheduler_spec.rb b/spec/workers/scheduler/user_cleanup_scheduler_spec.rb index b1be7c4611..604f528586 100644 --- a/spec/workers/scheduler/user_cleanup_scheduler_spec.rb +++ b/spec/workers/scheduler/user_cleanup_scheduler_spec.rb @@ -9,6 +9,7 @@ RSpec.describe Scheduler::UserCleanupScheduler do let!(:old_unconfirmed_user) { Fabricate(:user) } let!(:confirmed_user) { Fabricate(:user) } let!(:moderation_note) { Fabricate(:account_moderation_note, account: Fabricate(:account), target_account: old_unconfirmed_user.account) } + let!(:webauthn_credential) { Fabricate(:webauthn_credential, user_id: old_unconfirmed_user.id) } describe '#perform' do before do @@ -26,6 +27,8 @@ RSpec.describe Scheduler::UserCleanupScheduler do .from(true).to(false) expect { moderation_note.reload } .to raise_error(ActiveRecord::RecordNotFound) + expect { webauthn_credential.reload } + .to raise_error(ActiveRecord::RecordNotFound) expect_preservation_of(new_unconfirmed_user) expect_preservation_of(confirmed_user) end diff --git a/spec/workers/web/push_notification_worker_spec.rb b/spec/workers/web/push_notification_worker_spec.rb index ced21d5bf7..7f836d99e4 100644 --- a/spec/workers/web/push_notification_worker_spec.rb +++ b/spec/workers/web/push_notification_worker_spec.rb @@ -22,27 +22,48 @@ RSpec.describe Web::PushNotificationWorker do let(:payload) { { ciphertext: ciphertext, salt: salt, server_public_key: server_public_key, shared_secret: shared_secret } } describe 'perform' do + around do |example| + original_private = Rails.configuration.x.vapid_private_key + original_public = Rails.configuration.x.vapid_public_key + Rails.configuration.x.vapid_private_key = vapid_private_key + Rails.configuration.x.vapid_public_key = vapid_public_key + example.run + Rails.configuration.x.vapid_private_key = original_private + Rails.configuration.x.vapid_public_key = original_public + end + before do - allow(subscription).to receive_messages(contact_email: contact_email, vapid_key: vapid_key) - allow(Web::PushSubscription).to receive(:find).with(subscription.id).and_return(subscription) + Setting.site_contact_email = contact_email + allow(Webpush::Encryption).to receive(:encrypt).and_return(payload) allow(JWT).to receive(:encode).and_return('jwt.encoded.payload') stub_request(:post, endpoint).to_return(status: 201, body: '') - - subject.perform(subscription.id, notification.id) end it 'calls the relevant service with the correct headers' do - expect(a_request(:post, endpoint).with(headers: { - 'Content-Encoding' => 'aesgcm', - 'Content-Type' => 'application/octet-stream', - 'Crypto-Key' => "dh=BAgtUks5d90kFmxGevk9tH7GEmvz9DB0qcEMUsOBgKwMf-TMjsKIIG6LQvGcFAf6jcmAod15VVwmYwGIIxE4VWE;p256ecdsa=#{vapid_public_key.delete('=')}", - 'Encryption' => 'salt=WJeVM-RY-F9351SVxTFx_g', - 'Ttl' => '172800', - 'Urgency' => 'normal', - 'Authorization' => 'WebPush jwt.encoded.payload', - }, body: "+\xB8\xDBT}\u0013\xB6\xDD.\xF9\xB0\xA7\xC8Ҁ\xFD\x99#\xF7\xAC\x83\xA4\xDB,\u001F\xB5\xB9w\x85>\xF7\xADr")).to have_been_made + subject.perform(subscription.id, notification.id) + + expect(web_push_endpoint_request) + .to have_been_made + end + + def web_push_endpoint_request + a_request( + :post, + endpoint + ).with( + headers: { + 'Content-Encoding' => 'aesgcm', + 'Content-Type' => 'application/octet-stream', + 'Crypto-Key' => "dh=BAgtUks5d90kFmxGevk9tH7GEmvz9DB0qcEMUsOBgKwMf-TMjsKIIG6LQvGcFAf6jcmAod15VVwmYwGIIxE4VWE;p256ecdsa=#{vapid_public_key.delete('=')}", + 'Encryption' => 'salt=WJeVM-RY-F9351SVxTFx_g', + 'Ttl' => '172800', + 'Urgency' => 'normal', + 'Authorization' => 'WebPush jwt.encoded.payload', + }, + body: "+\xB8\xDBT}\u0013\xB6\xDD.\xF9\xB0\xA7\xC8Ҁ\xFD\x99#\xF7\xAC\x83\xA4\xDB,\u001F\xB5\xB9w\x85>\xF7\xADr" + ) end end end diff --git a/streaming/database.js b/streaming/database.js index 9f1d742143..d5caec4fca 100644 --- a/streaming/database.js +++ b/streaming/database.js @@ -49,7 +49,7 @@ export function configFromEnv(env, environment) { if (typeof parsedUrl.password === 'string') baseConfig.password = parsedUrl.password; if (typeof parsedUrl.host === 'string') baseConfig.host = parsedUrl.host; if (typeof parsedUrl.user === 'string') baseConfig.user = parsedUrl.user; - if (typeof parsedUrl.port === 'string') { + if (typeof parsedUrl.port === 'string' && parsedUrl.port) { const parsedPort = parseInt(parsedUrl.port, 10); if (isNaN(parsedPort)) { throw new Error('Invalid port specified in DATABASE_URL environment variable'); diff --git a/streaming/index.js b/streaming/index.js index 7ee22686b7..952e7da6d7 100644 --- a/streaming/index.js +++ b/streaming/index.js @@ -235,7 +235,7 @@ const startServer = async () => { app.get('/favicon.ico', (_req, res) => res.status(404).end()); app.get('/api/v1/streaming/health', (_req, res) => { - res.writeHead(200, { 'Content-Type': 'text/plain' }); + res.writeHead(200, { 'Content-Type': 'text/plain', 'Cache-Control': 'private, no-store' }); res.end('OK'); }); @@ -688,7 +688,7 @@ const startServer = async () => { // filtering of statuses: // Filter based on language: - if (Array.isArray(req.chosenLanguages) && payload.language !== null && req.chosenLanguages.indexOf(payload.language) === -1) { + if (Array.isArray(req.chosenLanguages) && req.chosenLanguages.indexOf(payload.language) === -1) { log.debug(`Message ${payload.id} filtered by language (${payload.language})`); return; } @@ -918,7 +918,7 @@ const startServer = async () => { } res.setHeader('Content-Type', 'text/event-stream'); - res.setHeader('Cache-Control', 'no-store'); + res.setHeader('Cache-Control', 'private, no-store'); res.setHeader('Transfer-Encoding', 'chunked'); res.write(':)\n'); diff --git a/streaming/metrics.js b/streaming/metrics.js index bb6bce3f3c..263339a1ca 100644 --- a/streaming/metrics.js +++ b/streaming/metrics.js @@ -98,9 +98,11 @@ export function setupMetrics(channels, pgPool) { const requestHandler = (req, res) => { metrics.register.metrics().then((output) => { res.set('Content-Type', metrics.register.contentType); + res.set('Cache-Control', 'private, no-store'); res.end(output); }).catch((err) => { req.log.error(err, "Error collecting metrics"); + res.set('Cache-Control', 'private, no-store'); res.status(500).end(); }); }; diff --git a/streaming/redis.js b/streaming/redis.js index 2a36b89dc5..0b582ef2f5 100644 --- a/streaming/redis.js +++ b/streaming/redis.js @@ -50,9 +50,9 @@ function getSentinelConfiguration(env, commonOptions) { return { db: redisDatabase, name: env.REDIS_SENTINEL_MASTER, - username: env.REDIS_USERNAME, + username: env.REDIS_USER, password: env.REDIS_PASSWORD, - sentinelUsername: env.REDIS_SENTINEL_USERNAME ?? env.REDIS_USERNAME, + sentinelUsername: env.REDIS_SENTINEL_USERNAME ?? env.REDIS_USER, sentinelPassword: env.REDIS_SENTINEL_PASSWORD ?? env.REDIS_PASSWORD, sentinels, ...commonOptions, @@ -104,7 +104,7 @@ export function configFromEnv(env) { host: env.REDIS_HOST ?? '127.0.0.1', port: redisPort, db: redisDatabase, - username: env.REDIS_USERNAME, + username: env.REDIS_USER, password: env.REDIS_PASSWORD, ...commonOptions, }; diff --git a/yarn.lock b/yarn.lock index 7b6ddeefc3..65bba72fbd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1763,9 +1763,9 @@ __metadata: languageName: node linkType: hard -"@csstools/postcss-light-dark-function@npm:^2.0.2": - version: 2.0.2 - resolution: "@csstools/postcss-light-dark-function@npm:2.0.2" +"@csstools/postcss-light-dark-function@npm:^2.0.4": + version: 2.0.4 + resolution: "@csstools/postcss-light-dark-function@npm:2.0.4" dependencies: "@csstools/css-parser-algorithms": "npm:^3.0.1" "@csstools/css-tokenizer": "npm:^3.0.1" @@ -1773,7 +1773,7 @@ __metadata: "@csstools/utilities": "npm:^2.0.0" peerDependencies: postcss: ^8.4 - checksum: 10c0/f8973c435868998e5d6af1fc0c35b27bbf65fa9d0c35f5055c689b8ee2807a16802044e296f7def39a7253ae544fb49559e8273ee22eb4e21845aa980a1bc82b + checksum: 10c0/0176422ad9747953964b1ceff002df1ecb1952ebc481db6192070d68777135b582ea6fd32ae819b9c64c96cb9170bd6907c647c85b48daa4984b7ed3d7f9bccb languageName: node linkType: hard @@ -2828,7 +2828,7 @@ __metadata: "@gamestdio/websocket": "npm:^0.3.2" "@github/webauthn-json": "npm:^2.1.1" "@hello-pangea/dnd": "npm:^17.0.0" - "@rails/ujs": "npm:7.1.400" + "@rails/ujs": "npm:7.1.401" "@reduxjs/toolkit": "npm:^2.0.1" "@svgr/webpack": "npm:^5.5.0" "@testing-library/dom": "npm:^10.2.0" @@ -3127,10 +3127,10 @@ __metadata: languageName: node linkType: hard -"@rails/ujs@npm:7.1.400": - version: 7.1.400 - resolution: "@rails/ujs@npm:7.1.400" - checksum: 10c0/181329e731b925788a530dc5bc44eb4a07ae780e20b0309fd9140ebeeca30d9432ed50be0f25ae60f10beb3aa8883f6d662e4b9c6f6cd19a32c1f42ab2505c47 +"@rails/ujs@npm:7.1.401": + version: 7.1.401 + resolution: "@rails/ujs@npm:7.1.401" + checksum: 10c0/08eae084c80e837e47cc01d0be25a431495f7dea381dcaaa4ce39a3217fac46bf87d169b3dfcf304ae16e0714de7435c2b8c5eb8d5052e3ba70ef3050a72fa3c languageName: node linkType: hard @@ -13949,8 +13949,8 @@ __metadata: linkType: hard "postcss-preset-env@npm:^10.0.0": - version: 10.0.3 - resolution: "postcss-preset-env@npm:10.0.3" + version: 10.0.5 + resolution: "postcss-preset-env@npm:10.0.5" dependencies: "@csstools/postcss-cascade-layers": "npm:^5.0.0" "@csstools/postcss-color-function": "npm:^4.0.2" @@ -13964,7 +13964,7 @@ __metadata: "@csstools/postcss-ic-unit": "npm:^4.0.0" "@csstools/postcss-initial": "npm:^2.0.0" "@csstools/postcss-is-pseudo-class": "npm:^5.0.0" - "@csstools/postcss-light-dark-function": "npm:^2.0.2" + "@csstools/postcss-light-dark-function": "npm:^2.0.4" "@csstools/postcss-logical-float-and-clear": "npm:^3.0.0" "@csstools/postcss-logical-overflow": "npm:^2.0.0" "@csstools/postcss-logical-overscroll-behavior": "npm:^2.0.0" @@ -14015,7 +14015,7 @@ __metadata: postcss-selector-not: "npm:^8.0.0" peerDependencies: postcss: ^8.4 - checksum: 10c0/da42caa2aab4d825fddfde00ebe2416d338c7b9a6f79a68840297888a8384f85991991c3fa10cf2d359fb230c885375f5cebd7bd63972725cd2a596d218f8b6a + checksum: 10c0/db5eb1175cb26bed3f1a4c47acc67935ffc784520321470520e59de366ac6f91be1e609fe36056af707ed20f7910721287cff0fae416c437dd3e944de13ffd05 languageName: node linkType: hard