1
0
mirror of https://github.com/mastodon/mastodon synced 2025-01-22 09:43:25 +09:00

Merge branch 'main' into patch-1

This commit is contained in:
Colin Dean 2025-01-17 18:49:15 -05:00 committed by GitHub
commit bc6b4a0ac8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
127 changed files with 480 additions and 603 deletions

View File

@ -50,7 +50,7 @@ OTP_SECRET=
# Must be available (and set to same values) for all server processes
# These are private/secret values, do not share outside hosting environment
# Use `bin/rails db:encryption:init` to generate fresh secrets
# Do not change these secrets once in use, as this would cause data loss and other issues
# Do NOT change these secrets once in use, as this would cause data loss and other issues
# ------------------
# ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=
# ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=

View File

@ -9,30 +9,51 @@ You can contribute in the following ways:
- Contributing code to Mastodon by fixing bugs or implementing features
- Improving the documentation
If your contributions are accepted into Mastodon, you can request to be paid through [our OpenCollective](https://opencollective.com/mastodon).
Please review the org-level [contribution guidelines] for high-level acceptance
criteria guidance and the [DEVELOPMENT] guide for environment-specific details.
[contribution guidelines]: https://github.com/mastodon/.github/blob/main/CONTRIBUTING.md
## API Changes and Additions
Please note that any changes or additions made to the API should have an accompanying pull request on [our documentation repository](https://github.com/mastodon/documentation).
Any changes or additions made to the API should have an accompanying pull
request on our [documentation repository].
## Bug reports
## Bug Reports
Bug reports and feature suggestions must use descriptive and concise titles and be submitted to [GitHub Issues](https://github.com/mastodon/mastodon/issues). Please use the search function to make sure that you are not submitting duplicates, and that a similar report or request has not already been resolved or rejected.
Bug reports and feature suggestions must use descriptive and concise titles and
be submitted to [GitHub Issues]. Please use the search function to make sure
there are not duplicate bug reports or feature requests.
## Translations
You can submit translations via [Crowdin](https://crowdin.com/project/mastodon). They are periodically merged into the codebase.
Translations are community contributed via [Crowdin]. They are periodically
reviewed and merged into the codebase.
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/mastodon/localized.svg)](https://crowdin.com/project/mastodon)
## Pull requests
## Pull Requests
**Please use clean, concise titles for your pull requests.** Unless the pull request is about refactoring code, updating dependencies or other internal tasks, assume that the person reading the pull request title is not a programmer or Mastodon developer, but instead a Mastodon user or server administrator, and **try to describe your change or fix from their perspective**. We use commit squashing, so the final commit in the main branch will carry the title of the pull request, and commits from the main branch are fed into the changelog. The changelog is separated into [keepachangelog.com categories](https://keepachangelog.com/en/1.0.0/), and while that spec does not prescribe how the entries ought to be named, for easier sorting, start your pull request titles using one of the verbs "Add", "Change", "Deprecate", "Remove", or "Fix" (present tense).
### Size and Scope
Our time is limited and PRs making large, unsolicited changes are unlikely to
get a response. Changes which link to an existing confirmed issue, or which come
from a "help wanted" issue or other request are more likely to be reviewed.
The smaller and more narrowly focused the changes in a PR are, the easier they
are to review and potentially merge. If the change only makes sense in some
larger context of future ongoing work, note that in the description, but still
aim to keep each distinct PR to a "smallest viable change" chunk of work.
### Description of Changes
Unless the Pull Request is about refactoring code, updating dependencies or
other internal tasks, assume that the audience are not developers, but a
Mastodon user or server admin, and try to describe it from their perspective.
The final commit in the main branch will carry the title from the PR. The main
branch is then fed into the changelog and ultimately into release notes. We try
to follow the [keepachangelog] spec, and while that does not prescribe how
exactly the entries ought to be named, starting titles using one of the verbs
"Add", "Change", "Deprecate", "Remove", or "Fix" (present tense) is helpful.
Example:
@ -40,18 +61,25 @@ Example:
| ------------------------------------ | ------------------------------------------------------------- |
| Fixed NoMethodError in RemovalWorker | Fix nil error when removing statuses caused by race condition |
It is not always possible to phrase every change in such a manner, but it is desired.
### Technical Requirements
**The smaller the set of changes in the pull request is, the quicker it can be reviewed and merged.** Splitting tasks into multiple smaller pull requests is often preferable.
**Pull requests that do not pass automated checks may not be reviewed**. In particular, you need to keep in mind:
Pull requests that do not pass automated checks on CI may not be reviewed. In
particular, please keep in mind:
- Unit and integration tests (rspec, jest)
- Code style rules (rubocop, eslint)
- Normalization of locale files (i18n-tasks)
- Relevant accessibility or performance concerns
## Documentation
The [Mastodon documentation](https://docs.joinmastodon.org) is a statically generated site. You can [submit merge requests to mastodon/documentation](https://github.com/mastodon/documentation).
The [Mastodon documentation] is a statically generated site that contains guides
and API docs. Improvements are made via PRs to the [documentation repository].
[contribution guidelines]: https://github.com/mastodon/.github/blob/main/CONTRIBUTING.md
[Crowdin]: https://crowdin.com/project/mastodon
[DEVELOPMENT]: docs/DEVELOPMENT.md
[documentation repository]: https://github.com/mastodon/documentation
[GitHub Issues]: https://github.com/mastodon/mastodon/issues
[keepachangelog]: https://keepachangelog.com/en/1.0.0/
[Mastodon documentation]: https://docs.joinmastodon.org

View File

@ -94,20 +94,20 @@ GEM
ast (2.4.2)
attr_required (1.0.2)
aws-eventstream (1.3.0)
aws-partitions (1.1038.0)
aws-sdk-core (3.216.0)
aws-partitions (1.1032.0)
aws-sdk-core (3.214.1)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.992.0)
aws-sigv4 (~> 1.9)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.97.0)
aws-sdk-core (~> 3, >= 3.216.0)
aws-sdk-kms (1.96.0)
aws-sdk-core (~> 3, >= 3.210.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.178.0)
aws-sdk-core (~> 3, >= 3.216.0)
aws-sdk-s3 (1.177.0)
aws-sdk-core (~> 3, >= 3.210.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.11.0)
aws-sigv4 (1.10.1)
aws-eventstream (~> 1, >= 1.0.2)
azure-blob (0.5.4)
rexml
@ -833,7 +833,7 @@ GEM
unf (~> 0.1.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
tzinfo-data (1.2024.2)
tzinfo-data (1.2025.1)
tzinfo (>= 1.0.0)
unf (0.1.4)
unf_ext

View File

@ -33,6 +33,7 @@ class Api::V1::Accounts::CredentialsController < Api::BaseController
:discoverable,
:hide_collections,
:indexable,
attribution_domains: [],
fields_attributes: [:name, :value]
)
end

View File

@ -18,7 +18,9 @@ class Settings::VerificationsController < Settings::BaseController
private
def account_params
params.require(:account).permit(:attribution_domains_as_text)
params.require(:account).permit(:attribution_domains).tap do |params|
params[:attribution_domains] = params[:attribution_domains].split if params[:attribution_domains]
end
end
def set_account

View File

@ -69,6 +69,11 @@
"announcement.announcement": "Annooncement",
"attachments_list.unprocessed": "(No processed)",
"audio.hide": "Stow audio",
"block_modal.remote_users_caveat": "We will ask the server {domain} tae respect yer decision. Awtho mind compliance isnae a guarantee, sin some servers may haundle blocks differently. Public posts may yet be visible tae non-loggit-in uisers.",
"block_modal.they_cant_mention": "Thay cannae mention or follae you.",
"block_modal.they_cant_see_posts": "Thay cannae see yer posts and you willnae see thairs.",
"block_modal.they_will_know": "Thay can see that they're blockit.",
"block_modal.title": "Block uiser?",
"boost_modal.combo": "Ye kin chap {combo} tae dingie this neist tim",
"bundle_column_error.copy_stacktrace": "Copy error report",
"bundle_column_error.error.body": "The requestit page cuidnae be rennert. Hit cuid be doon tae a bug in wir code, or a brooser compatability issue.",
@ -112,9 +117,11 @@
"community.column_settings.remote_only": "Remote ainly",
"compose.language.change": "Chynge Leid",
"compose.language.search": "Seirch leids...",
"compose.published.body": "Post published.",
"compose.saved.body": "Post saved.",
"compose_form.direct_message_warning_learn_more": "Lairn mair",
"compose_form.encryption_warning": "Posts on Mastodon isnae en-tae-en encryptit. Dinnae share onie sensitive information ower Mastodon.",
"compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
"compose_form.hashtag_warning": "This post willnae be listit under ony hashtag fir it is unlistit. Only public posts can be searched by hashtag.",
"compose_form.lock_disclaimer": "Yer accoont isnae {locked}. Awbody kin follae ye for tae luik at yer follaer-ainly posts.",
"compose_form.lock_disclaimer.lock": "lockit",
"compose_form.placeholder": "Whit's on yer mind?",
@ -124,6 +131,7 @@
"compose_form.publish_form": "Publish",
"compose_form.spoiler.marked": "Tak aff the content warnin",
"compose_form.spoiler.unmarked": "Pit on a content warnin",
"compose_form.spoiler_placeholder": "Content warnin (optional)",
"confirmation_modal.cancel": "Stap",
"confirmations.block.confirm": "Dingie",
"confirmations.delete.confirm": "Delete",
@ -132,6 +140,7 @@
"confirmations.delete_list.message": "Ye shair thit ye'r wantin fir tae delete this post fir ever?",
"confirmations.discard_edit_media.confirm": "Fling awa",
"confirmations.discard_edit_media.message": "Ye'v chynges tae the media description or preview thit ye'v no saved, fling them awa onie weys?",
"confirmations.edit.message": "Editin the noo will owerwrit the message yer componin. Are ye suir yer wantin tae proceed?",
"confirmations.logout.confirm": "Log oot",
"confirmations.logout.message": "Ye shair thit ye'r wantin tae log oot?",
"confirmations.mute.confirm": "Wheesht",
@ -180,7 +189,7 @@
"empty_column.explore_statuses": "Naethin is trendin the noo. Check back efter!",
"empty_column.follow_requests": "Ye dinnae hae onie follaer requests yit. Whan ye get ane, it'll shaw up here.",
"empty_column.hashtag": "There naethin in this hashtag yit.",
"empty_column.home": "Yer hame timeline is toum! Follae mair fowk fir tae full it up. {suggestions}",
"empty_column.home": "Yer hame timeline is toum! Follae mair fowk fir tae full it up.",
"empty_column.list": "There naethin in this list yit. Whan memmers o this list publish new posts, ye'll see them here.",
"empty_column.mutes": "Ye'v no wheesht onie uisers yit.",
"empty_column.notifications": "Ye dinnae hae onie notes yit. Whan ither fowk interacks wi ye, ye'll see it here.",
@ -466,7 +475,7 @@
"status.show_less_all": "Shaw less fir aw",
"status.show_more_all": "Shaw mair fir aw",
"status.show_original": "Shaw original",
"status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
"status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {{attachmentCount} attachments}}",
"status.translate": "Owerset",
"status.translated_from_with": "Owerset fae {lang} uisin {provider}",
"status.unmute_conversation": "Unwheesht conversation",

View File

@ -11,7 +11,7 @@
"about.not_available": "此信息在当前服务器尚不可用。",
"about.powered_by": "由 {mastodon} 驱动的去中心化社交媒体",
"about.rules": "站点规则",
"account.account_note_header": "备注",
"account.account_note_header": "个人备注",
"account.add_or_remove_from_list": "从列表中添加或移除",
"account.badges.bot": "机器人",
"account.badges.group": "群组",
@ -26,7 +26,7 @@
"account.domain_blocked": "域名已屏蔽",
"account.edit_profile": "修改个人资料",
"account.enable_notifications": "当 @{name} 发布嘟文时通知我",
"account.endorse": "在账户页推荐此用户",
"account.endorse": "在个人资料中推荐此用户",
"account.featured_tags.last_status_at": "上次发言于 {date}",
"account.featured_tags.last_status_never": "暂无嘟文",
"account.featured_tags.title": "{name} 的精选标签",
@ -43,8 +43,8 @@
"account.in_memoriam": "谨此悼念。",
"account.joined_short": "加入于",
"account.languages": "更改订阅语言",
"account.link_verified_on": "已于 {date} 验证此链接的所有权",
"account.locked_info": "此账户已锁嘟。账户所有人会手动审核新关注者。",
"account.link_verified_on": "此链接的所有权已在 {date} 检查",
"account.locked_info": "此账号已锁嘟。账号所有人会手动审核新关注者。",
"account.media": "媒体",
"account.mention": "提及 @{name}",
"account.moved_to": "{name} 的新账号是:",
@ -60,9 +60,9 @@
"account.report": "举报 @{name}",
"account.requested": "正在等待对方同意。点击取消发送关注请求",
"account.requested_follow": "{name} 向你发送了关注请求",
"account.share": "分享 @{name} 的账户页",
"account.share": "分享 @{name} 的个人资料",
"account.show_reblogs": "显示来自 @{name} 的转嘟",
"account.statuses_counter": "{count, plural, other {{counter} 嘟文}}",
"account.statuses_counter": "{count, plural, other {{counter} 嘟文}}",
"account.unblock": "取消屏蔽 @{name}",
"account.unblock_domain": "取消屏蔽 {domain} 域名",
"account.unblock_short": "取消屏蔽",
@ -77,9 +77,9 @@
"admin.dashboard.retention.average": "平均",
"admin.dashboard.retention.cohort": "注册月份",
"admin.dashboard.retention.cohort_size": "新用户",
"admin.impact_report.instance_accounts": "将被删除的账",
"admin.impact_report.instance_followers": "本用户即将丢失的关注者",
"admin.impact_report.instance_follows": "对方站点用户即将丢失的关注者",
"admin.impact_report.instance_accounts": "将被删除的账",
"admin.impact_report.instance_followers": "本实例用户即将丢失的关注者",
"admin.impact_report.instance_follows": "对方实例用户将会丢失的关注者",
"admin.impact_report.title": "影响摘要",
"alert.rate_limited.message": "请在 {retry_time, time, medium} 后重试。",
"alert.rate_limited.title": "频率受限",
@ -89,23 +89,23 @@
"announcement.announcement": "公告",
"annual_report.summary.archetype.booster": "潮流捕手",
"annual_report.summary.archetype.lurker": "吃瓜群众",
"annual_report.summary.archetype.oracle": "无所不在",
"annual_report.summary.archetype.pollster": "投票狂魔",
"annual_report.summary.archetype.replier": "评论区原住民",
"annual_report.summary.archetype.oracle": "未卜先知",
"annual_report.summary.archetype.pollster": "民调专家",
"annual_report.summary.archetype.replier": "社交蝴蝶",
"annual_report.summary.followers.followers": "关注者",
"annual_report.summary.followers.total": "共 {count} 人",
"annual_report.summary.here_it_is": "你的 {year} 年度回顾在此:",
"annual_report.summary.highlighted_post.by_favourites": "最受欢迎嘟嘟",
"annual_report.summary.highlighted_post.by_reblogs": "传播最广嘟嘟",
"annual_report.summary.highlighted_post.by_replies": "最热闹嘟嘟",
"annual_report.summary.here_it_is": "您的 {year} 年度回顾在此:",
"annual_report.summary.highlighted_post.by_favourites": "最受欢迎的嘟文",
"annual_report.summary.highlighted_post.by_reblogs": "传播最广的嘟文",
"annual_report.summary.highlighted_post.by_replies": "评论最多的嘟文",
"annual_report.summary.highlighted_post.possessive": "{name} 的",
"annual_report.summary.most_used_app.most_used_app": "最常用的应用",
"annual_report.summary.most_used_hashtag.most_used_hashtag": "最常用的话题",
"annual_report.summary.most_used_hashtag.none": "无",
"annual_report.summary.new_posts.new_posts": "新嘟",
"annual_report.summary.new_posts.new_posts": "新嘟",
"annual_report.summary.percentile.text": "<topLabel>这使你跻身 {domain} 用户的前</topLabel><percentage></percentage><bottomLabel></bottomLabel>",
"annual_report.summary.percentile.we_wont_tell_bernie": " ",
"annual_report.summary.thanks": "谢谢你这一年和 Mastodon 上的大家一起嘟嘟",
"annual_report.summary.thanks": "感谢您成为 Mastodon 的一员",
"attachments_list.unprocessed": "(未处理)",
"audio.hide": "隐藏音频",
"block_modal.remote_users_caveat": "我们将要求站点 {domain} 尊重你的决定。然而,我们无法保证对方一定遵从,因为某些站点可能会以不同的方案处理屏蔽操作。公开嘟文仍然可能对未登录用户可见。",
@ -114,11 +114,11 @@
"block_modal.they_cant_mention": "他们不能提及或关注你。",
"block_modal.they_cant_see_posts": "他们看不到你的嘟文,你也看不到他们的嘟文。",
"block_modal.they_will_know": "对方将能看到自己被屏蔽。",
"block_modal.title": "屏蔽该用户?",
"block_modal.title": "确定要屏蔽此用户?",
"block_modal.you_wont_see_mentions": "你将不会看到提及他们的嘟文。",
"boost_modal.combo": "下次按住 {combo} 即可跳过此提示",
"boost_modal.reblog": "是否转嘟?",
"boost_modal.undo_reblog": "是否取消转嘟?",
"boost_modal.reblog": "是否转嘟?",
"boost_modal.undo_reblog": "是否取消转嘟?",
"bundle_column_error.copy_stacktrace": "复制错误报告",
"bundle_column_error.error.body": "请求的页面无法渲染,可能是代码出现错误或浏览器存在兼容性问题。",
"bundle_column_error.error.title": "糟糕!",
@ -131,14 +131,14 @@
"bundle_modal_error.close": "关闭",
"bundle_modal_error.message": "载入此页面时发生了错误。",
"bundle_modal_error.retry": "重试",
"closed_registrations.other_server_instructions": "基于 Mastodon 的去中心化特性,你可以在其它服务器上创建账号,并与本站用户保持互动。",
"closed_registrations_modal.description": "你目前无法在 {domain} 上创建账户,但请注意,使用 Mastodon 并非需要专门在 {domain} 上注册账户。",
"closed_registrations.other_server_instructions": "基于 Mastodon 去中心化的特性,你可以其他服务器上创建账号,并继续与此服务器互动。",
"closed_registrations_modal.description": "你目前无法在 {domain} 上创建账号,但请注意,使用 Mastodon 并非需要专门在 {domain} 上注册账号。",
"closed_registrations_modal.find_another_server": "查找其他服务器",
"closed_registrations_modal.preamble": "Mastodon 是去中心化的,所以无论在哪个实例创建账号,都可以关注本服务器上的账号并与之交流。 或者你还可以自己搭建实例!",
"closed_registrations_modal.title": "注册 Mastodon 账号",
"column.about": "关于",
"column.blocks": "屏蔽的用户",
"column.bookmarks": "收藏夹",
"column.bookmarks": "书签",
"column.community": "本站时间线",
"column.create_list": "创建列表",
"column.direct": "私下提及",
@ -175,7 +175,7 @@
"compose_form.direct_message_warning_learn_more": "详细了解",
"compose_form.encryption_warning": "Mastodon 上的嘟文未经端到端加密。请勿在 Mastodon 上分享敏感信息。",
"compose_form.hashtag_warning": "这条嘟文被设置为“不公开”,因此它不会出现在任何话题的列表下。只有公开的嘟文才能通过话题进行搜索。",
"compose_form.lock_disclaimer": "你的账没有{locked}。任何人都可以在关注你后立即查看仅关注者可见的嘟文。",
"compose_form.lock_disclaimer": "你的账没有{locked}。任何人都可以在关注你后立即查看仅关注者可见的嘟文。",
"compose_form.lock_disclaimer.lock": "锁嘟",
"compose_form.placeholder": "想写什么?",
"compose_form.poll.duration": "投票期限",
@ -186,7 +186,7 @@
"compose_form.poll.switch_to_single": "将投票改为单选",
"compose_form.poll.type": "类型",
"compose_form.publish": "发布",
"compose_form.publish_form": "新建嘟文",
"compose_form.publish_form": "发嘟",
"compose_form.reply": "回复",
"compose_form.save_changes": "更改",
"compose_form.spoiler.marked": "移除内容警告",
@ -196,21 +196,21 @@
"confirmations.block.confirm": "屏蔽",
"confirmations.delete.confirm": "删除",
"confirmations.delete.message": "你确定要删除这条嘟文吗?",
"confirmations.delete.title": "是否删除嘟文?",
"confirmations.delete.title": "确定要删除嘟文?",
"confirmations.delete_list.confirm": "删除",
"confirmations.delete_list.message": "确定要永久删除此列表吗?",
"confirmations.delete_list.title": "是否删除列表?",
"confirmations.delete_list.message": "确定要永久删除此列表吗?",
"confirmations.delete_list.title": "确定要删除列表?",
"confirmations.discard_edit_media.confirm": "丢弃",
"confirmations.discard_edit_media.message": "你还有未保存的媒体描述或预览修改,仍要丢弃吗?",
"confirmations.edit.confirm": "编辑",
"confirmations.edit.message": "编辑此消息将会覆盖当前正在撰写的信息。仍要继续吗?",
"confirmations.edit.title": "是否重写嘟文?",
"confirmations.edit.title": "确定要重写嘟文?",
"confirmations.follow_to_list.confirm": "关注并添加到列表",
"confirmations.follow_to_list.message": "你需要先关注 {name},才能将其添加到列表。",
"confirmations.follow_to_list.title": "是否关注用户?",
"confirmations.follow_to_list.title": "确定要关注此用户?",
"confirmations.logout.confirm": "退出登录",
"confirmations.logout.message": "确定要退出登录吗?",
"confirmations.logout.title": "是否退出登录?",
"confirmations.logout.title": "确定要退出登录?",
"confirmations.mute.confirm": "隐藏",
"confirmations.redraft.confirm": "删除并重新编辑",
"confirmations.redraft.message": "确定删除这条嘟文并重写吗?所有相关的喜欢和转嘟都将丢失,嘟文的回复也会失去关联。",
@ -220,7 +220,7 @@
"confirmations.reply.title": "是否重写嘟文?",
"confirmations.unfollow.confirm": "取消关注",
"confirmations.unfollow.message": "你确定要取消关注 {name} 吗?",
"confirmations.unfollow.title": "是否取消关注用户?",
"confirmations.unfollow.title": "确定要取消关注用户?",
"content_warning.hide": "隐藏",
"content_warning.show": "展开",
"content_warning.show_more": "展开",
@ -248,10 +248,10 @@
"domain_block_modal.they_can_interact_with_old_posts": "该站点的用户可以与你之前的嘟文交互。",
"domain_block_modal.they_cant_follow": "该站点上将没有人可以关注你。",
"domain_block_modal.they_wont_know": "对方不会知道自己被屏蔽。",
"domain_block_modal.title": "是否屏蔽该域名?",
"domain_block_modal.title": "确定要屏蔽此域名?",
"domain_block_modal.you_will_lose_num_followers": "你将失去 {followersCount, plural, other {{followersCountDisplay} 名关注者}}和 {followingCount, plural, other {{followingCountDisplay} 名关注}}。",
"domain_block_modal.you_will_lose_relationships": "你将丢失该站点上的所有关注与关注者。",
"domain_block_modal.you_wont_see_posts": "你将不会看到该站点用户的嘟文或通知。",
"domain_block_modal.you_wont_see_posts": "你将不会看到此服务器上用户的嘟文或通知。",
"domain_pill.activitypub_lets_connect": "它可以让你与不同社交应用上的人交流互动,而不仅限于 Mastodon。",
"domain_pill.activitypub_like_language": "ActivityPub 好比 Mastodon 与其它社交网络交流时使用的语言。",
"domain_pill.server": "服务器",
@ -283,7 +283,7 @@
"emoji_button.symbols": "符号",
"emoji_button.travel": "旅行与地点",
"empty_column.account_hides_collections": "该用户选择不公开此信息",
"empty_column.account_suspended": "账已被停用",
"empty_column.account_suspended": "账已被停用",
"empty_column.account_timeline": "这里没有嘟文!",
"empty_column.account_unavailable": "个人资料不可用",
"empty_column.blocks": "你还未屏蔽任何用户。",
@ -300,7 +300,7 @@
"empty_column.home": "你的主页时间线还没有内容!快去关注更多人吧。",
"empty_column.list": "列表中还没有任何内容。当列表成员发布新嘟文时,它们将出现在这里。",
"empty_column.mutes": "你没有隐藏任何用户。",
"empty_column.notification_requests": "都看完了!这里没有任何未读通知。当收到新的通知时,它们将根据你的设置显示在这里。",
"empty_column.notification_requests": "一扫而空!这里没有任何未读通知。当收到新的通知时,将根据你的设置显示在这里。",
"empty_column.notifications": "你还没有收到过任何通知,快和其他用户互动吧。",
"empty_column.public": "这里什么都没有!写一些公开的嘟文,或者关注其他服务器的用户后,这里就会有嘟文出现了",
"error.unexpected_crash.explanation": "此页面无法正确显示,这可能是因为我们的代码中有错误,也可能是因为浏览器兼容问题。",
@ -318,16 +318,16 @@
"filter_modal.added.context_mismatch_title": "场景不匹配!",
"filter_modal.added.expired_explanation": "此过滤规则类别已过期,你需要修改到期日期才能应用。",
"filter_modal.added.expired_title": "过滤规则已过期!",
"filter_modal.added.review_and_configure": "要检查并进一步配置此过滤规则分类,请前往{settings_link}。",
"filter_modal.added.review_and_configure": "要检查并进一步配置这条过滤规则,请前往{settings_link}。",
"filter_modal.added.review_and_configure_title": "过滤规则设置",
"filter_modal.added.settings_link": "设置页面",
"filter_modal.added.short_explanation": "此嘟文已被添加到以下过滤规则:{title}。",
"filter_modal.added.title": "已添加过滤规则 ",
"filter_modal.select_filter.context_mismatch": "不适用于此场景",
"filter_modal.select_filter.expired": "已过期",
"filter_modal.select_filter.prompt_new": "新条目{name}",
"filter_modal.select_filter.prompt_new": "新类别{name}",
"filter_modal.select_filter.search": "搜索或创建",
"filter_modal.select_filter.subtitle": "使用一个已存在条目,或创建新条目",
"filter_modal.select_filter.subtitle": "使用已存在类别,或创建新类别",
"filter_modal.select_filter.title": "过滤此嘟文",
"filter_modal.title.status": "过滤一条嘟文",
"filter_warning.matches_filter": "命中过滤规则 “<span>{title}</span>”",
@ -343,8 +343,8 @@
"follow_suggestions.dismiss": "不再显示",
"follow_suggestions.featured_longer": "由 {domain} 管理团队精选",
"follow_suggestions.friends_of_friends_longer": "在你关注的人中很受欢迎",
"follow_suggestions.hints.featured": "该用户已被 {domain} 管理团队精选。",
"follow_suggestions.hints.friends_of_friends": "该用户在你关注的人中很受欢迎。",
"follow_suggestions.hints.featured": "该账号已被 {domain} 管理团队精选。",
"follow_suggestions.hints.friends_of_friends": "该账号在你关注的人中很受欢迎。",
"follow_suggestions.hints.most_followed": "该用户是 {domain} 上关注度最高的用户之一。",
"follow_suggestions.hints.most_interactions": "该用户最近在 {domain} 获得了很多关注。",
"follow_suggestions.hints.similar_to_recently_followed": "该用户与你最近关注的人类似。",
@ -381,9 +381,9 @@
"hashtag.follow": "关注话题",
"hashtag.unfollow": "取消关注话题",
"hashtags.and_other": "… 和另外 {count, plural, other {# 个话题}}",
"hints.profiles.followers_may_be_missing": "该账的关注者列表可能没有完全显示。",
"hints.profiles.follows_may_be_missing": "该账的关注列表可能没有完全显示。",
"hints.profiles.posts_may_be_missing": "该账的嘟文可能没有完全显示。",
"hints.profiles.followers_may_be_missing": "该账的关注者列表可能没有完全显示。",
"hints.profiles.follows_may_be_missing": "该账的关注列表可能没有完全显示。",
"hints.profiles.posts_may_be_missing": "该账的嘟文可能没有完全显示。",
"hints.profiles.see_more_followers": "在 {domain} 查看更多关注者",
"hints.profiles.see_more_follows": "在 {domain} 查看更多关注",
"hints.profiles.see_more_posts": "在 {domain} 查看更多嘟文",
@ -399,19 +399,19 @@
"ignore_notifications_modal.disclaimer": "Mastodon无法通知对方用户你忽略了他们的通知。忽略通知不会阻止消息本身的发送。",
"ignore_notifications_modal.filter_instead": "改为过滤",
"ignore_notifications_modal.filter_to_act_users": "你仍然可以接受、拒绝或举报用户",
"ignore_notifications_modal.filter_to_avoid_confusion": "过滤有助于避免潜在的混淆",
"ignore_notifications_modal.filter_to_avoid_confusion": "选择过滤有助于避免潜在的混淆",
"ignore_notifications_modal.filter_to_review_separately": "你可以单独查看被过滤的通知",
"ignore_notifications_modal.ignore": "忽略通知",
"ignore_notifications_modal.limited_accounts_title": "是否忽略来自受限账号的通知?",
"ignore_notifications_modal.new_accounts_title": "是否忽略来自新账的通知?",
"ignore_notifications_modal.new_accounts_title": "是否忽略来自新账的通知?",
"ignore_notifications_modal.not_followers_title": "是否忽略未关注你的人的通知?",
"ignore_notifications_modal.not_following_title": "是否忽略你未关注的人的通知?",
"ignore_notifications_modal.private_mentions_title": "是否忽略不请自来的私下提及?",
"interaction_modal.action.favourite": "你需要切换到自己的账,再发送喜欢。",
"interaction_modal.action.follow": "你需要切换到自己的账,再进行关注。",
"interaction_modal.action.reblog": "你需要切换到自己的账,再进行转嘟。",
"interaction_modal.action.reply": "你需要切换到自己的账,再发送回复。",
"interaction_modal.action.vote": "你需要切换到自己的账,再发送投票。",
"interaction_modal.action.favourite": "你需要切换到自己的账,再发送喜欢。",
"interaction_modal.action.follow": "你需要切换到自己的账,再进行关注。",
"interaction_modal.action.reblog": "你需要切换到自己的账,再进行转嘟。",
"interaction_modal.action.reply": "你需要切换到自己的账,再发送回复。",
"interaction_modal.action.vote": "你需要切换到自己的账,再发送投票。",
"interaction_modal.go": "跳转",
"interaction_modal.no_account_yet": "还没有账号?",
"interaction_modal.on_another_server": "在另一服务器",
@ -429,7 +429,7 @@
"keyboard_shortcuts.blocked": "打开被屏蔽用户列表",
"keyboard_shortcuts.boost": "转嘟",
"keyboard_shortcuts.column": "选中某栏",
"keyboard_shortcuts.compose": "选输入框",
"keyboard_shortcuts.compose": "选输入框",
"keyboard_shortcuts.description": "说明",
"keyboard_shortcuts.direct": "打开私下提及栏",
"keyboard_shortcuts.down": "在列表中让光标下移",
@ -444,11 +444,11 @@
"keyboard_shortcuts.local": "打开本站时间线",
"keyboard_shortcuts.mention": "提及嘟文作者",
"keyboard_shortcuts.muted": "打开隐藏用户列表",
"keyboard_shortcuts.my_profile": "打开你的账户页",
"keyboard_shortcuts.my_profile": "打开你的个人资料",
"keyboard_shortcuts.notifications": "打开通知栏",
"keyboard_shortcuts.open_media": "打开媒体",
"keyboard_shortcuts.pinned": "打开置顶嘟文列表",
"keyboard_shortcuts.profile": "打开作者的账户页",
"keyboard_shortcuts.profile": "打开作者的个人资料",
"keyboard_shortcuts.reply": "回复嘟文",
"keyboard_shortcuts.requests": "打开关注请求列表",
"keyboard_shortcuts.search": "选中搜索框",
@ -513,7 +513,7 @@
"navigation_bar.administration": "管理",
"navigation_bar.advanced_interface": "在高级网页界面中打开",
"navigation_bar.blocks": "已屏蔽的用户",
"navigation_bar.bookmarks": "收藏夹",
"navigation_bar.bookmarks": "书签",
"navigation_bar.community_timeline": "本站时间线",
"navigation_bar.compose": "撰写新嘟文",
"navigation_bar.direct": "私下提及",
@ -529,7 +529,7 @@
"navigation_bar.logout": "退出登录",
"navigation_bar.moderation": "审核",
"navigation_bar.mutes": "已隐藏的用户",
"navigation_bar.opened_in_classic_interface": "嘟文页、账户页与其他某些页面默认在经典网页界面中打开。",
"navigation_bar.opened_in_classic_interface": "嘟文页、个人资料与其他某些页面默认在经典网页界面中打开。",
"navigation_bar.personal": "个人",
"navigation_bar.pins": "置顶嘟文",
"navigation_bar.preferences": "偏好设置",
@ -592,16 +592,16 @@
"notification_requests.dismiss_multiple": "{count, plural, other {拒绝 # 个请求…}}",
"notification_requests.edit_selection": "编辑",
"notification_requests.exit_selection": "完成",
"notification_requests.explainer_for_limited_account": "来自此账户的通知已被过滤,因为此账户已被管理员限制。",
"notification_requests.explainer_for_limited_remote_account": "来自此账户的通知已被过滤,因为此账户或其所在的服务器已被管理员限制。",
"notification_requests.explainer_for_limited_account": "来自该账号的通知已被过滤,因为该账号已被管理员限制。",
"notification_requests.explainer_for_limited_remote_account": "来自该账号的通知已被过滤,因为该账号或其所在的实例已被管理员限制。",
"notification_requests.maximize": "最大化",
"notification_requests.minimize_banner": "最小化被过滤通知横幅",
"notification_requests.notifications_from": "来自 {name} 的通知",
"notification_requests.title": "被过滤的通知",
"notification_requests.view": "查看通知",
"notifications.clear": "清空通知列表",
"notifications.clear_confirmation": "确定要永久清空通知列表吗?",
"notifications.clear_title": "是否清空通知?",
"notifications.clear_confirmation": "确定要永久清空通知列表吗?",
"notifications.clear_title": "确定要清空通知?",
"notifications.column_settings.admin.report": "新举报:",
"notifications.column_settings.admin.sign_up": "新注册:",
"notifications.column_settings.alert": "桌面通知",
@ -616,7 +616,7 @@
"notifications.column_settings.push": "推送通知",
"notifications.column_settings.reblog": "转嘟:",
"notifications.column_settings.show": "在通知栏显示",
"notifications.column_settings.sound": "播放提示音",
"notifications.column_settings.sound": "播放",
"notifications.column_settings.status": "新嘟文:",
"notifications.column_settings.unread_notifications.category": "未读通知",
"notifications.column_settings.unread_notifications.highlight": "高亮显示未读通知",
@ -643,11 +643,11 @@
"notifications.policy.filter_limited_accounts_hint": "被服务器管理员限制的账号",
"notifications.policy.filter_limited_accounts_title": "受限账号",
"notifications.policy.filter_new_accounts.hint": "注册未满 {days, plural, other {# 天}} 的账号",
"notifications.policy.filter_new_accounts_title": "新账",
"notifications.policy.filter_new_accounts_title": "新账",
"notifications.policy.filter_not_followers_hint": "包括关注你未满 {days, plural, other {# 天}}的人",
"notifications.policy.filter_not_followers_title": "没有关注你的人",
"notifications.policy.filter_not_following_hint": "需要你手动批准",
"notifications.policy.filter_not_following_title": "你没有关注的人",
"notifications.policy.filter_not_following_title": "需要你手动批准",
"notifications.policy.filter_private_mentions_hint": "过滤通知,除非对应嘟文是在回复你的私下提及,或来自你关注的人。",
"notifications.policy.filter_private_mentions_title": "不请自来的私下提及",
"notifications.policy.title": "管理来自 … 的通知",
@ -659,8 +659,8 @@
"onboarding.follows.empty": "很抱歉,现在无法显示任何结果。你可以尝试使用搜索或浏览探索页面来查找要关注的人,或稍后再试。",
"onboarding.follows.search": "搜索",
"onboarding.follows.title": "关注用户,玩转 Mastodon",
"onboarding.profile.discoverable": "让我的账可被他人发现",
"onboarding.profile.discoverable_hint": "当你在 Mastodon 上启用发现功能时,你的嘟文可能会出现在搜索结果与热门中,你的账可能会被推荐给与你兴趣相似的人。",
"onboarding.profile.discoverable": "让我的账可被他人发现",
"onboarding.profile.discoverable_hint": "当你在 Mastodon 上启用发现功能时,你的嘟文可能会出现在搜索结果与热门中,你的账可能会被推荐给与你兴趣相似的人。",
"onboarding.profile.display_name": "昵称",
"onboarding.profile.display_name_hint": "你的全名或昵称…",
"onboarding.profile.note": "简介",
@ -668,7 +668,7 @@
"onboarding.profile.save_and_continue": "保存并继续",
"onboarding.profile.title": "设置个人资料",
"onboarding.profile.upload_avatar": "上传头像",
"onboarding.profile.upload_header": "上传账户页封面图",
"onboarding.profile.upload_header": "上传账封面图",
"password_confirmation.exceeds_maxlength": "密码确认超过最大密码长度",
"password_confirmation.mismatching": "确认密码与密码不一致。",
"picture_in_picture.restore": "恢复",
@ -687,7 +687,7 @@
"privacy.direct.short": "特定的人",
"privacy.private.long": "仅限你的关注者",
"privacy.private.short": "关注者",
"privacy.public.long": "所有 Mastodon 内外的人",
"privacy.public.long": "",
"privacy.public.short": "公开",
"privacy.unlisted.additional": "此模式的行为与“公开”类似,只是嘟文不会出现在实时动态、话题、探索或 Mastodon 搜索页面中,即使您已全局开启了对应的发现设置。",
"privacy.unlisted.long": "减少算法影响",
@ -720,7 +720,7 @@
"report.categories.violation": "内容违反一条或多条服务器规则",
"report.category.subtitle": "选择最佳匹配",
"report.category.title": "告诉我们此 {type} 存在的问题",
"report.category.title_account": "账",
"report.category.title_account": "账",
"report.category.title_status": "嘟文",
"report.close": "完成",
"report.comment.title": "还有什么你认为我们应该知道的吗?",
@ -743,7 +743,7 @@
"report.rules.subtitle": "选择所有适用选项",
"report.rules.title": "违反了哪些规则?",
"report.statuses.subtitle": "选择所有适用选项",
"report.statuses.title": "是否有可以证实此举报的嘟文",
"report.statuses.title": "是否有任何嘟文可以支持这一报告",
"report.submit": "提交",
"report.target": "举报 {target}",
"report.thanks.take_action": "以下是你控制你在 Mastodon 上能看到哪些内容的选项:",
@ -751,7 +751,7 @@
"report.thanks.title": "不想看到这个内容?",
"report.thanks.title_actionable": "感谢提交举报,我们将会进行处理。",
"report.unfollow": "取消关注 @{name}",
"report.unfollow_explanation": "你正在关注此账。如果不想继续在主页看到他们的嘟文,取消对他们的关注即可。",
"report.unfollow_explanation": "你正在关注此账。如果不想继续在主页看到他们的嘟文,取消对他们的关注即可。",
"report_notification.attached_statuses": "附上 {count} 条嘟文",
"report_notification.categories.legal": "法律义务",
"report_notification.categories.legal_sentence": "非法内容",
@ -764,8 +764,8 @@
"report_notification.open": "打开举报",
"search.no_recent_searches": "无最近搜索",
"search.placeholder": "搜索",
"search.quick_action.account_search": "包含 {x} 的账",
"search.quick_action.go_to_account": "打开 {x} 的账户页",
"search.quick_action.account_search": "包含 {x} 的账",
"search.quick_action.go_to_account": "打开 {x} 的个人资料",
"search.quick_action.go_to_hashtag": "打开话题 {x}",
"search.quick_action.open_url": "在 Mastodon 中打开此链接",
"search.quick_action.status_search": "包含 {x} 的嘟文",
@ -782,7 +782,7 @@
"search_results.all": "全部",
"search_results.hashtags": "话题",
"search_results.no_results": "未找到结果。",
"search_results.no_search_yet": "可以尝试搜索嘟文、账户或话题。",
"search_results.no_search_yet": "不妨试下搜索嘟文、账号或话题。",
"search_results.see_all": "查看全部",
"search_results.statuses": "嘟文",
"search_results.title": "搜索 “{q}”",
@ -791,7 +791,7 @@
"server_banner.administered_by": "本站管理员:",
"server_banner.is_one_of_many": "{domain} 是可用于参与联邦宇宙的众多独立 Mastodon 站点之一。",
"server_banner.server_stats": "服务器统计数据:",
"sign_in_banner.create_account": "创建账",
"sign_in_banner.create_account": "创建账",
"sign_in_banner.follow_anyone": "关注联邦宇宙中的任何人,并按时间顺序查看所有内容。没有算法、广告或诱导链接。",
"sign_in_banner.mastodon_is": "Mastodon 是了解最新动态的最佳途径。",
"sign_in_banner.sign_in": "登录",
@ -827,14 +827,14 @@
"status.mute": "隐藏 @{name}",
"status.mute_conversation": "关闭此对话的通知",
"status.open": "展开嘟文",
"status.pin": "在账户页置顶",
"status.pin": "在个人资料页面置顶",
"status.pinned": "置顶嘟文",
"status.read_more": "查看更多",
"status.reblog": "转嘟",
"status.reblog_private": "以相同可见性转嘟",
"status.reblogged_by": "{name} 转嘟了",
"status.reblogs": "{count, plural, other {次转嘟}}",
"status.reblogs.empty": "还没有人转嘟过此条嘟文。转嘟此嘟文的人会显示在这里。",
"status.reblogs.empty": "没有人转嘟过此条嘟文。如果有人转嘟了,就会显示在这里。",
"status.redraft": "删除并重新编辑",
"status.remove_bookmark": "取消收藏",
"status.remove_favourite": "从喜欢列表中移除",
@ -853,7 +853,7 @@
"status.translated_from_with": "由 {provider} 翻译自 {lang}",
"status.uncached_media_warning": "预览不可用",
"status.unmute_conversation": "恢复此对话的通知提醒",
"status.unpin": "在账户页取消置顶",
"status.unpin": "在个人资料页面取消置顶",
"subscribed_languages.lead": "更改此选择后,只有选定语言的嘟文才会出现在你的主页和列表时间线上。选择「无」将显示所有语言的嘟文。",
"subscribed_languages.save": "保存更改",
"subscribed_languages.target": "更改 {target} 的订阅语言",

View File

@ -53,7 +53,7 @@
"account.mute_short": "靜音",
"account.muted": "已靜音",
"account.mutual": "互相跟隨",
"account.no_bio": "無個人檔案描述",
"account.no_bio": "無個人檔案描述",
"account.open_original_page": "檢視原始頁面",
"account.posts": "嘟文",
"account.posts_with_replies": "嘟文與回覆",

View File

@ -4,21 +4,9 @@ module Account::AttributionDomains
extend ActiveSupport::Concern
included do
validates :attribution_domains_as_text, domain: { multiline: true }, lines: { maximum: 100 }, if: -> { local? && will_save_change_to_attribution_domains? }
end
normalizes :attribution_domains, with: ->(arr) { arr.filter_map { |str| str.to_s.strip.delete_prefix('http://').delete_prefix('https://').delete_prefix('*.').presence }.uniq }
def attribution_domains_as_text
self[:attribution_domains].join("\n")
end
def attribution_domains_as_text=(str)
self[:attribution_domains] = str.split.filter_map do |line|
line
.strip
.delete_prefix('http://')
.delete_prefix('https://')
.delete_prefix('*.')
end
validates :attribution_domains, domain: true, length: { maximum: 100 }, if: -> { local? && will_save_change_to_attribution_domains? }
end
def can_be_attributed_from?(domain)

View File

@ -18,6 +18,7 @@ class REST::CredentialAccountSerializer < REST::AccountSerializer
hide_collections: object.hide_collections,
discoverable: object.discoverable,
indexable: object.indexable,
attribution_domains: object.attribution_domains,
}
end

View File

@ -9,18 +9,21 @@ class DomainValidator < ActiveModel::EachValidator
def validate_each(record, attribute, value)
return if value.blank?
(options[:multiline] ? value.split : [value]).each do |domain|
_, domain = domain.split('@') if options[:acct]
Array.wrap(value).each do |domain|
if options[:acct]
_, domain = domain.split('@')
next if domain.blank?
end
next if domain.blank?
record.errors.add(attribute, options[:multiline] ? :invalid_domain_on_line : :invalid, value: domain) unless compliant?(domain)
record.errors.add(attribute, value.is_a?(Enumerable) ? :invalid_domain_on_line : :invalid, value: domain) unless compliant?(domain)
end
end
private
def compliant?(value)
return false if value.blank?
uri = Addressable::URI.new
uri.host = value
uri.normalized_host.size < MAX_DOMAIN_LENGTH && uri.normalized_host.split('.').all? { |label| label.size.between?(MIN_LABEL_LENGTH, MAX_LABEL_LENGTH) && label =~ ALLOWED_CHARACTERS_RE }

View File

@ -1,9 +0,0 @@
# frozen_string_literal: true
class LinesValidator < ActiveModel::EachValidator
def validate_each(record, attribute, value)
return if value.blank?
record.errors.add(attribute, :too_many_lines, limit: options[:maximum]) if options[:maximum].present? && value.split.size > options[:maximum]
end
end

View File

@ -65,7 +65,7 @@
%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' }
= f.input :attribution_domains, as: :text, wrapper: :with_block_label, input_html: { value: @account.attribution_domains.join("\n"), placeholder: "example1.com\nexample2.com\nexample3.com", rows: 4, autocapitalize: 'none', autocorrect: 'off' }
.actions
= f.button :button, t('generic.save_changes'), type: :submit

View File

@ -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)

View File

@ -15,8 +15,6 @@ be:
user/invite_request:
text: Прычына
errors:
messages:
too_many_lines: перавышана абмежаванне ў %{limit} радкоў
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ bg:
invalid: не е действително име на домейн
messages:
invalid_domain_on_line: "%{value} не е действително име на домейн"
too_many_lines: е над ограничение от %{limit} реда
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ ca:
invalid: no és un nom de domini vàlid
messages:
invalid_domain_on_line: "%{value} no és un nom de domini vàlid"
too_many_lines: sobrepassa el límit de %{limit} línies
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ cs:
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:

View File

@ -20,7 +20,6 @@ cy:
invalid: "- nid yw'n enw parth dilys"
messages:
invalid_domain_on_line: Nid yw %{value} yn enw parth dilys
too_many_lines: "- dros y terfyn o %{limit} llinell"
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ da:
invalid: er ikke et gyldigt domænenavn
messages:
invalid_domain_on_line: "%{value} er ikke et gyldigt domænenavn"
too_many_lines: overstiger grænsen på %{limit} linjer
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ de:
invalid: ist kein gültiger Domain-Name
messages:
invalid_domain_on_line: "%{value} ist kein gültiger Domain-Name"
too_many_lines: übersteigt das Limit von %{limit} Zeilen
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ el:
invalid: δεν είναι έγκυρο όνομα τομέα
messages:
invalid_domain_on_line: το %{value} δεν είναι έγκυρο όνομα τομέα
too_many_lines: υπερβαίνει το όριο των %{limit} γραμμών
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ en-GB:
invalid: is not a valid domain name
messages:
invalid_domain_on_line: "%{value} is not a valid domain name"
too_many_lines: is over the limit of %{limit} lines
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ en:
invalid: is not a valid domain name
messages:
invalid_domain_on_line: "%{value} is not a valid domain name"
too_many_lines: is over the limit of %{limit} lines
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ eo:
invalid: ne estas valida domajna nomo
messages:
invalid_domain_on_line: "%{value} ne estas valida domajna nomo"
too_many_lines: superas la limon de %{limit} linioj
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ es-AR:
invalid: no es un nombre de dominio válido
messages:
invalid_domain_on_line: "%{value} no es un nombre de dominio válido"
too_many_lines: está por encima del límite de %{limit} líneas
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ es-MX:
invalid: no es un nombre de dominio válido
messages:
invalid_domain_on_line: "%{value} no es un nombre de dominio válido"
too_many_lines: excede el límite de %{limit} líneas
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ es:
invalid: no es un nombre de dominio válido
messages:
invalid_domain_on_line: "%{value} no es un nombre de dominio válido"
too_many_lines: excede el límite de %{limit} líneas
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ et:
invalid: pole kehtiv domeeninimi
messages:
invalid_domain_on_line: "%{value} ei ole kehtiv domeeninimi"
too_many_lines: on üle limiidi %{limit} rida
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ fa:
invalid: نام دامنهٔ معتبری نیست
messages:
invalid_domain_on_line: "%{value} نام دامنهٔ معتبری نیست"
too_many_lines: بیش از کران %{limit} خط است
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ fi:
invalid: ei ole kelvollinen verkkotunnus
messages:
invalid_domain_on_line: "%{value} ei ole kelvollinen verkkotunnus"
too_many_lines: ylittää %{limit} rivin rajan
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ fo:
invalid: er ikki eitt virkið økisnavn
messages:
invalid_domain_on_line: "%{value} er ikki eitt virkið økisnavn"
too_many_lines: er longri enn markið á %{limit} reglur
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ fr-CA:
invalid: n'est pas un nom de domaine valide
messages:
invalid_domain_on_line: "%{value} n'est pas un nom de domaine valide"
too_many_lines: dépasse la limite de %{limit} lignes
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ fr:
invalid: n'est pas un nom de domaine valide
messages:
invalid_domain_on_line: "%{value} n'est pas un nom de domaine valide"
too_many_lines: dépasse la limite de %{limit} lignes
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ fy:
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:

View File

@ -20,7 +20,6 @@ ga:
invalid: nach ainm fearainn bailí é
messages:
invalid_domain_on_line: Ní ainm fearainn bailí é %{value}
too_many_lines: thar an teorainn de %{limit} línte
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ gd:
invalid: " chan eil seo na ainm àrainne dligheach"
messages:
invalid_domain_on_line: Chan eil %{value} na ainm àrainne dligheach
too_many_lines: " tha seo thar crìoch de %{limit} nan loidhnichean"
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ gl:
invalid: non é un nome de dominio válido
messages:
invalid_domain_on_line: "%{value} non é un nome de dominio válido"
too_many_lines: superou o límite de %{limit} liñas
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ he:
invalid: אינו שם מתחם קביל
messages:
invalid_domain_on_line: "%{value} אינו שם מתחם קביל"
too_many_lines: מעבר למגבלה של %{limit} שורות
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ hu:
invalid: nem egy érvényes domain név
messages:
invalid_domain_on_line: "%{value} nem egy érvényes domain név"
too_many_lines: túllépi a(z) %{limit} soros korlátot
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ 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:

View File

@ -20,7 +20,6 @@ io:
invalid: ne esas valida domennomo
messages:
invalid_domain_on_line: "%{value} ne esas valida domennomo"
too_many_lines: esas plu kam la limito qua esas %{limit} linei
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ is:
invalid: er ekki leyfilegt nafn á léni
messages:
invalid_domain_on_line: "%{value} er ekki leyfilegt nafn á léni"
too_many_lines: er yfir takmörkum á %{limit} línum
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ it:
invalid: non è un nome di dominio valido
messages:
invalid_domain_on_line: "%{value} non è un nome di dominio valido"
too_many_lines: è oltre il limite di %{limit} righe
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ ja:
invalid: 有効なドメイン名ではありません
messages:
invalid_domain_on_line: "%{value} は有効なドメイン名ではありません"
too_many_lines: "%{limit} 行の制限を超えています。"
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ ko:
invalid: 올바른 도메인 네임이 아닙니다
messages:
invalid_domain_on_line: "%{value}는 올바른 도메인 네임이 아닙니다"
too_many_lines: "%{limit}줄 제한을 초과합니다"
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ lt:
invalid: nėra tinkamas domeno vardas.
messages:
invalid_domain_on_line: "%{value} nėra tinkamas domeno vardas."
too_many_lines: yra daugiau nei %{limit} eilučių ribojimą.
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ lv:
invalid: nav derīgs domēna nosaukums
messages:
invalid_domain_on_line: "%{value} nav derīgs domēna nosaukums"
too_many_lines: pārsniedz %{limit} līniju ierobežojumu
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ ml:
invalid: ഇതൊരു തെറ്റിയ മേഖലപേരാണു്
messages:
invalid_domain_on_line: "%{value} ഒരു തെറ്റിയ മേഖലപേരാണു്"
too_many_lines: ഇതു് %{limit} വരിയതിരിന്റെ മേലെയാണു്
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ nl:
invalid: is een ongeldige domeinnaam
messages:
invalid_domain_on_line: "%{value} is een ongeldige domeinnaam"
too_many_lines: overschrijdt de limiet van %{limit} regels
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ nn:
invalid: er ikkje eit gyldig domenenamn
messages:
invalid_domain_on_line: "%{value} er ikkje gyldig i eit domenenamn"
too_many_lines: er over grensa på %{limit} liner
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ pl:
invalid: nie jest prawidłową nazwą domeny
messages:
invalid_domain_on_line: "%{value} nie jest prawidłową nazwą domeny"
too_many_lines: przekracza limit %{limit} linii
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ pt-BR:
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:

View File

@ -20,7 +20,6 @@ pt-PT:
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:

View File

@ -20,7 +20,6 @@ ro:
invalid: nu este un nume de domeniu valid
messages:
invalid_domain_on_line: "%{value} nu este un nume de domeniu valid"
too_many_lines: este peste limita de %{limit} linii
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ ru:
invalid: не является действующим доменным именем
messages:
invalid_domain_on_line: "%{value} Не является действительным доменным именем"
too_many_lines: Превышает предел %{limit} строк
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ sq:
invalid: sështë emër i vlefshëm përkatësie
messages:
invalid_domain_on_line: "%{value} sështë emër i vlefshëm përkatësie"
too_many_lines: është tej kufirit prej %{limit} rreshta
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ sv:
invalid: är inte ett giltigt domännamn
messages:
invalid_domain_on_line: "%{value} Är inte ett giltigt domännamn"
too_many_lines: överskrider gränsen på %{limit} rader
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ th:
invalid: ไม่ใช่ชื่อโดเมนที่ถูกต้อง
messages:
invalid_domain_on_line: "%{value} ไม่ใช่ชื่อโดเมนที่ถูกต้อง"
too_many_lines: เกินขีดจำกัด %{limit} บรรทัด
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ tok:
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:

View File

@ -20,7 +20,6 @@ tr:
invalid: geçerli bir alan adı değil
messages:
invalid_domain_on_line: "%{value} geçerli bir alan adı değil"
too_many_lines: "%{limit} satır sınırının üzerinde"
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ uk:
invalid: не є дійсним іменем домену
messages:
invalid_domain_on_line: "%{value} не є дійсним іменем домену"
too_many_lines: перевищує ліміт %{limit} рядків
models:
account:
attributes:

View File

@ -20,7 +20,6 @@ vi:
invalid: không phải là một tên miền hợp lệ
messages:
invalid_domain_on_line: "%{value} không phải là một tên miền hợp lệ"
too_many_lines: vượt quá giới hạn %{limit} dòng
models:
account:
attributes:

View File

@ -20,10 +20,11 @@ zh-CN:
invalid: 不是有效的域名
messages:
invalid_domain_on_line: "%{value} 不是有效的域名"
too_many_lines: 超出 %{limit} 行的长度限制
models:
account:
attributes:
fields:
fields_with_values_missing_labels: 包含缺失标签的值
username:
invalid: 只能使用字母、数字和下划线
reserved: 是保留关键字
@ -43,7 +44,7 @@ zh-CN:
attributes:
account_id:
taken: 已经被加入到列表了
must_be_following: 需要是你关注的账
must_be_following: 需要是你关注的账
status:
attributes:
reblog:
@ -58,7 +59,7 @@ zh-CN:
user_role:
attributes:
permissions_as_keys:
dangerous: 包含对基本角色而言不安全的权限
dangerous: 包含对基本角色不安全的权限
elevated: 不能包含你当前身份未有的权限
own_role: 你当前的角色无权执行此更改
position:

View File

@ -20,7 +20,6 @@ zh-TW:
invalid: 並非一個有效網域
messages:
invalid_domain_on_line: "%{value} 並非一個有效網域"
too_many_lines: 已超過行數限制 (%{limit} 行)
models:
account:
attributes:

View File

@ -7,12 +7,12 @@ zh-CN:
send_paranoid_instructions: 如果你的邮箱地址存在于我们的数据库中,你将在几分钟内收到一封邮件,内含如何验证邮箱地址的指引。如果你没有收到这封邮件,请检查你的垃圾邮件文件夹。
failure:
already_authenticated: 你已登录。
inactive: 你还没有激活账
inactive: 你还没有激活账
invalid: "%{authentication_keys} 无效或密码错误。"
last_attempt: 你只有最后一次尝试机会,若未通过,账号将被锁定。
locked: 你的账已被锁定。
locked: 你的账已被锁定。
not_found_in_database: "%{authentication_keys}或密码错误。"
omniauth_user_creation_failure: 为此身份创建账时出错。
omniauth_user_creation_failure: 为此身份创建账时出错。
pending: 你的账号仍在审核中。
timeout: 你的会话已过期。请重新登录再继续操作。
unauthenticated: 继续操作前请注册或者登录。
@ -28,34 +28,34 @@ zh-CN:
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,17 +93,17 @@ zh-CN:
updated: 你的密码已成功修改,现在你已登录。
updated_not_active: 你的密码已修改成功。
registrations:
destroyed: 再见!你的账已成功注销。我们希望很快可以再见到你。
destroyed: 再见!你的账已成功注销。我们希望很快可以再见到你。
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: 已经成功确认,请尝试登录

View File

@ -60,7 +60,7 @@ zh-CN:
error:
title: 发生错误
new:
prompt_html: "%{client_name} 请求获得访问你账的权限。 <strong>请在确保自己了解并信任此来源后再批准该请求。</strong>"
prompt_html: "%{client_name} 请求获得访问你账的权限。 <strong>请在确保自己了解并信任此来源后再批准该请求。</strong>"
review_permissions: 检查权限
title: 需要授权
show:
@ -123,7 +123,7 @@ zh-CN:
admin/accounts: 账号管理
admin/all: 所有管理功能
admin/reports: 举报管理
all: 完全访问你的Mastodon账
all: 完全访问你的Mastodon账
blocks: 屏蔽
bookmarks: 收藏
conversations: 会话
@ -167,12 +167,12 @@ zh-CN:
admin:write:reports: 对举报执行管理操作
crypto: 使用端到端加密
follow: 关注或屏蔽用户
profile: 仅读取你账的个人资料信息
push: 接收你的账的推送通知
read: 读取你的账数据
profile: 仅读取你账的个人资料信息
push: 接收你的账的推送通知
read: 读取你的账数据
read:accounts: 查看账号信息
read:blocks: 查看你的屏蔽列表
read:bookmarks: 查看你的收藏夹
read:bookmarks: 查看你的书签
read:favourites: 查看喜欢的嘟文
read:filters: 查看你的过滤规则
read:follows: 查看你的关注
@ -184,7 +184,7 @@ zh-CN:
read:statuses: 查看所有嘟文
write: 修改你的账号数据
write:accounts: 修改你的个人资料
write:blocks: 屏蔽账与站点
write:blocks: 屏蔽账与站点
write:bookmarks: 收藏嘟文
write:conversations: 静音并删除会话
write:favourites: 喜欢嘟文

View File

@ -164,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
@ -1117,7 +1117,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
@ -1519,7 +1519,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 <a href="%{settings_path}">parametros de notification in e-mail</a>.
emails:

View File

@ -3,7 +3,6 @@ bg:
simple_form:
hints:
account:
attribution_domains_as_text: Едно на ред. Защитава от фалшиви атрибути.
discoverable: Вашите публични публикации и профил може да се представят или препоръчват в различни области на Mastodon и вашия профил може да се предлага на други потребители.
display_name: Вашето пълно име или псевдоним.
fields: Вашата начална страница, местоимения, години, всичко що искате.
@ -150,7 +149,6 @@ bg:
url: До къде ще се изпращат събитията
labels:
account:
attribution_domains_as_text: Уебсайтове, на които е позволено да приписват авторството ви
discoverable: Включване на профил и публикации в алгоритмите за откриване
fields:
name: Етикет

View File

@ -3,7 +3,6 @@ ca:
simple_form:
hints:
account:
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.
@ -148,7 +147,6 @@ ca:
url: On els esdeveniments seran enviats
labels:
account:
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

View File

@ -3,7 +3,6 @@ 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.
@ -156,7 +155,6 @@ 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í

View File

@ -3,7 +3,6 @@ cy:
simple_form:
hints:
account:
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.
@ -156,7 +155,6 @@ cy:
url: I ble bydd digwyddiadau'n cael eu hanfon
labels:
account:
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

View File

@ -3,7 +3,6 @@ da:
simple_form:
hints:
account:
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.
@ -156,7 +155,6 @@ da:
url: Hvor begivenheder sendes til
labels:
account:
attribution_domains_as_text: Websteder, man må krediteres af
discoverable: Fremhæv profil og indlæg i opdagelsesalgoritmer
fields:
name: Etiket

View File

@ -3,7 +3,6 @@ de:
simple_form:
hints:
account:
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.
@ -156,7 +155,6 @@ de:
url: Wohin Ereignisse gesendet werden
labels:
account:
attribution_domains_as_text: Websites, die auf dich verweisen dürfen
discoverable: Profil und Beiträge in Suchalgorithmen berücksichtigen
fields:
name: Beschriftung

View File

@ -3,7 +3,6 @@ el:
simple_form:
hints:
account:
attribution_domains_as_text: Μία ανά γραμμή. Προστατεύει από ψευδείς ιδιότητες.
discoverable: Οι δημόσιες δημοσιεύσεις και το προφίλ σου μπορεί να εμφανίζονται ή να συνιστώνται σε διάφορους τομείς του Mastodon και το προφίλ σου μπορεί να προτείνεται σε άλλους χρήστες.
display_name: Το πλήρες ή το αστείο σου όνομα.
fields: Η αρχική σου σελίδα, αντωνυμίες, ηλικία, ό,τι θες.
@ -155,7 +154,6 @@ el:
url: Πού θα σταλούν τα γεγονότα
labels:
account:
attribution_domains_as_text: Ιστοσελίδες που επιτρέπεται να σου δώσουν εύσημα
discoverable: Παροχή προφίλ και αναρτήσεων σε αλγορίθμους ανακάλυψης
fields:
name: Περιγραφή

View File

@ -3,7 +3,6 @@ en-GB:
simple_form:
hints:
account:
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 +143,6 @@ en-GB:
url: Where events will be sent to
labels:
account:
attribution_domains_as_text: Websites allowed to credit you
discoverable: Feature profile and posts in discovery algorithms
fields:
name: Label

View File

@ -3,7 +3,7 @@ en:
simple_form:
hints:
account:
attribution_domains_as_text: One per line. Protects from false attributions.
attribution_domains: 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.
@ -156,7 +156,7 @@ en:
url: Where events will be sent to
labels:
account:
attribution_domains_as_text: Websites allowed to credit you
attribution_domains: Websites allowed to credit you
discoverable: Feature profile and posts in discovery algorithms
fields:
name: Label

View File

@ -3,7 +3,6 @@ eo:
simple_form:
hints:
account:
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.
@ -156,7 +155,6 @@ eo:
url: Kien eventoj sendotas
labels:
account:
attribution_domains_as_text: Retejoj permesitaj krediti vin
discoverable: Elstarigi profilon kaj afiŝojn en eltrovantaj algoritmoj
fields:
name: Etikedo

View File

@ -3,7 +3,6 @@ es-AR:
simple_form:
hints:
account:
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.
@ -156,7 +155,6 @@ es-AR:
url: Adónde serán enviados los eventos
labels:
account:
attribution_domains_as_text: Sitios web autorizados a acreditarte
discoverable: Destacar perfil y mensajes en algoritmos de descubrimiento
fields:
name: Nombre de campo

View File

@ -3,7 +3,6 @@ es-MX:
simple_form:
hints:
account:
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 apodo.
fields: Tu página de inicio, pronombres, edad, lo que quieras.
@ -156,7 +155,6 @@ es-MX:
url: Donde los eventos serán enviados
labels:
account:
attribution_domains_as_text: Sitios web autorizados para acreditarte
discoverable: Destacar el perfil y las publicaciones en el algoritmo de descubrimiento
fields:
name: Etiqueta

View File

@ -3,7 +3,6 @@ es:
simple_form:
hints:
account:
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.
@ -156,7 +155,6 @@ es:
url: Donde los eventos serán enviados
labels:
account:
attribution_domains_as_text: Sitios web autorizados a acreditarte
discoverable: Destacar perfil y publicaciones en algoritmos de descubrimiento
fields:
name: Etiqueta

View File

@ -3,7 +3,6 @@ et:
simple_form:
hints:
account:
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.
@ -146,7 +145,6 @@ et:
url: Kuhu sündmused saadetakse
labels:
account:
attribution_domains_as_text: Sinule viidata lubatud veebilehed
discoverable: Tõsta postitused ja profiil avastamise algoritmides esile
fields:
name: Nimetus

View File

@ -3,7 +3,6 @@ fa:
simple_form:
hints:
account:
attribution_domains_as_text: یکی در هر خط. محافظت از اعتباردهی‌های اشتباه.
discoverable: ممکن است نمایه و فرسته‌های عمومیتان در جاهای مختلف ماستودون نمایانده و توصیه شود و نمایه‌تان به دیگر کاربران پیشنهاد شود.
display_name: نام کامل یا باحالتان.
fields: صفحهٔ خانگی، تلفّظ، سن و هرچیزی که دوست دارید.
@ -156,7 +155,6 @@ fa:
url: جایی که رویدادها فرستاده می‌شوند
labels:
account:
attribution_domains_as_text: پابگاه‌های وبی که اجازهٔ اعتبار دهی به شما را دارند
discoverable: مشخص کردن مشخصات و فرسته‌ها در الگوریتم‌های اکتشاف
fields:
name: برچسب

View File

@ -3,7 +3,6 @@ fi:
simple_form:
hints:
account:
attribution_domains_as_text: Yksi riviä kohti. Suojaa vääriltä tunnustuksilta.
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.
@ -156,7 +155,6 @@ fi:
url: Mihin tapahtumat lähetetään
labels:
account:
attribution_domains_as_text: Verkkosivustot, jotka voivat antaa sinulle tunnustusta
discoverable: Pidä profiiliasi ja julkaisujasi esillä löytämisalgoritmeissa
fields:
name: Nimike

View File

@ -3,7 +3,6 @@ fo:
simple_form:
hints:
account:
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.
@ -156,7 +155,6 @@ fo:
url: Hvar hendingar verða sendar til
labels:
account:
attribution_domains_as_text: Heimasíður, sum hava loyvi at sipa til tín
discoverable: Framheva vanga og postar í uppdagingar-algoritmum
fields:
name: Spjaldur

View File

@ -3,7 +3,6 @@ fr-CA:
simple_form:
hints:
account:
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é à dautres utilisateurs.
display_name: Votre nom complet ou votre nom cool.
fields: Votre page d'accueil, pronoms, âge, tout ce que vous voulez.
@ -156,7 +155,6 @@ fr-CA:
url: Là où les événements seront envoyés
labels:
account:
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

View File

@ -3,7 +3,6 @@ fr:
simple_form:
hints:
account:
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é à dautres utilisateurs.
display_name: Votre nom complet ou votre nom rigolo.
fields: Votre page personnelle, vos pronoms, votre âge, ce que vous voulez.
@ -156,7 +155,6 @@ fr:
url: Là où les événements seront envoyés
labels:
account:
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

View File

@ -3,7 +3,6 @@ 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.
@ -156,7 +155,6 @@ fy:
url: Wêrt eveneminten nei ta stjoerd wurde
labels:
account:
attribution_domains_as_text: Websites dyt jo wurdearring jaan meie
discoverable: Profyl en bydragen yn sykalgoritmen opnimme litte
fields:
name: Label

View File

@ -3,7 +3,6 @@ ga:
simple_form:
hints:
account:
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.
@ -156,7 +155,6 @@ ga:
url: An áit a seolfar imeachtaí chuig
labels:
account:
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

View File

@ -3,7 +3,6 @@ gd:
simple_form:
hints:
account:
attribution_domains_as_text: Loidhne fa leth do gach fear. Dìonaidh seo o iomraidhean meallta.
discoverable: Dhfhaoidte 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 +143,6 @@ gd:
url: Far an dèid na tachartasan a chur
labels:
account:
attribution_domains_as_text: Na làraichean-lìn a dhfhaodas iomradh a thoirt ort
discoverable: Brosnaich a phròifil is postaichean agad sna h-algairimean rùrachaidh
fields:
name: Leubail

View File

@ -3,7 +3,6 @@ gl:
simple_form:
hints:
account:
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.
@ -156,7 +155,6 @@ gl:
url: A onde se enviarán os eventos
labels:
account:
attribution_domains_as_text: Sitios web que poden acreditarte
discoverable: Perfil destacado e publicacións nos algoritmos de descubrimento
fields:
name: Etiqueta

View File

@ -3,7 +3,6 @@ he:
simple_form:
hints:
account:
attribution_domains_as_text: אחד בכל שורה. יגן מפני יחוס מטעה.
discoverable: הפוסטים והפרופיל שלך עשויים להיות מוצגים או מומלצים באזורים שונים באתר וייתכן שהפרופיל שלך יוצע למשתמשים אחרים.
display_name: שמך המלא או שם הכיף שלך.
fields: עמוד הבית שלך, לשון הפנייה, גיל, וכל מידע אחר לפי העדפתך האישית.
@ -156,7 +155,6 @@ he:
url: היעד שאליו יישלחו אירועים
labels:
account:
attribution_domains_as_text: אתרים המורשים לייחס אליך מאמרים
discoverable: הצג משתמש ופוסטים בעמוד התגליות
fields:
name: תווית

View File

@ -3,7 +3,6 @@ hu:
simple_form:
hints:
account:
attribution_domains_as_text: Megvéd a hamis forrásmegjelölésektől.
discoverable: A nyilvános bejegyzéseid és a profilod kiemelhető vagy ajánlható a Mastodon különböző területein, a profilod más felhasználóknak is javasolható.
display_name: Teljes neved vagy vicces neved.
fields: Weboldalad, megszólításaid, korod, bármi, amit szeretnél.
@ -153,7 +152,6 @@ hu:
url: Ahová az eseményket küldjük
labels:
account:
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

View File

@ -3,7 +3,6 @@ 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.
@ -156,7 +155,6 @@ ia:
url: Ubi le eventos essera inviate
labels:
account:
attribution_domains_as_text: Sitos web autorisate a accreditar te
discoverable: Evidentiar le profilo e messages in le algorithmos de discoperta
fields:
name: Etiquetta

View File

@ -3,7 +3,6 @@ is:
simple_form:
hints:
account:
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.
@ -156,7 +155,6 @@ is:
url: Hvert atburðir verða sendir
labels:
account:
attribution_domains_as_text: Vefsvæði sem mega vitna í þig
discoverable: Hafa notandasnið og færslur með í reikniritum leitar
fields:
name: Skýring

View File

@ -3,7 +3,6 @@ it:
simple_form:
hints:
account:
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.
@ -156,7 +155,6 @@ it:
url: Dove gli eventi saranno inviati
labels:
account:
attribution_domains_as_text: Siti web autorizzati ad accreditarti
discoverable: Include il profilo e i post negli algoritmi di scoperta
fields:
name: Etichetta

View File

@ -3,7 +3,6 @@ ja:
simple_form:
hints:
account:
attribution_domains_as_text: 1行につき1つずつ入力してください。この設定は関わりのないwebサイトに対して虚偽の帰属表示が行われることを防止する役割があります。
discoverable: プロフィールと公開投稿をMastodonのおすすめやハイライトとしてほかのユーザーに表示することを許可します。
display_name: フルネーム、ハンドルネームなど
fields: ホームページ、代名詞、年齢など何でも構いません。
@ -156,7 +155,6 @@ ja:
url: イベントの送信先
labels:
account:
attribution_domains_as_text: あなたの著者表示を許可するwebサイト
discoverable: アカウントを見つけやすくする
fields:
name: ラベル

View File

@ -3,7 +3,6 @@ ko:
simple_form:
hints:
account:
attribution_domains_as_text: 한 줄에 하나씩. 가짜 기여로부터 보호합니다.
discoverable: 내 공개 게시물과 프로필이 마스토돈의 다양한 추천 기능에 나타날 수 있고 프로필이 다른 사용자에게 제안될 수 있습니다
display_name: 진짜 이름 또는 재미난 이름.
fields: 홈페이지, 호칭, 나이, 뭐든지 적고 싶은 것들.
@ -151,7 +150,6 @@ ko:
url: 이벤트가 어디로 전송될 지
labels:
account:
attribution_domains_as_text: 나를 기여자로 올릴 수 있도록 허용된 웹사이트들
discoverable: 발견하기 알고리즘에 프로필과 게시물을 추천하기
fields:
name: 라벨

View File

@ -3,7 +3,6 @@ lt:
simple_form:
hints:
account:
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.
@ -119,7 +118,6 @@ lt:
role: Vaidmuo valdo, kokius leidimus naudotojas turi.
labels:
account:
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

View File

@ -3,7 +3,6 @@ lv:
simple_form:
hints:
account:
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.
@ -144,7 +143,6 @@ lv:
url: Kur notikumi tiks nosūtīti
labels:
account:
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

Some files were not shown because too many files have changed in this diff Show More