c1c514ca70
Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”.
101 lines
4.9 KiB
YAML
101 lines
4.9 KiB
YAML
---
|
|
en:
|
|
simple_form:
|
|
hints:
|
|
defaults:
|
|
autofollow: People who sign up through the invite will automatically follow you
|
|
avatar: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
|
|
bot: This account mainly performs automated actions and might not be monitored
|
|
context: One or multiple contexts where the filter should apply
|
|
digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence
|
|
display_name:
|
|
one: <span class="name-counter">1</span> character left
|
|
other: <span class="name-counter">%{count}</span> characters left
|
|
fields: You can have up to 4 items displayed as a table on your profile
|
|
header: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
|
|
inbox_url: Copy the URL from the frontpage of the relay you want to use
|
|
irreversible: Filtered toots will disappear irreversibly, even if filter is later removed
|
|
locale: The language of the user interface, e-mails and push notifications
|
|
locked: Requires you to manually approve followers
|
|
note:
|
|
one: <span class="note-counter">1</span> character left
|
|
other: <span class="note-counter">%{count}</span> characters left
|
|
phrase: Will be matched regardless of casing in text or content warning of a toot
|
|
scopes: Which APIs the application will be allowed to access. If you select a top-level scope, you don't need to select individual ones.
|
|
setting_default_language: The language of your toots can be detected automatically, but it's not always accurate
|
|
setting_hide_network: Who you follow and who follows you will not be shown on your profile
|
|
setting_noindex: Affects your public profile and status pages
|
|
setting_skin: Reskins the selected Mastodon flavour
|
|
whole_word: When the keyword or phrase is alphanumeric only, it will only be applied if it matches the whole word
|
|
imports:
|
|
data: CSV file exported from another Mastodon instance
|
|
sessions:
|
|
otp: 'Enter the two-factor code generated by your phone app or use one of your recovery codes:'
|
|
user:
|
|
chosen_languages: When checked, only toots in selected languages will be displayed in public timelines
|
|
labels:
|
|
account:
|
|
fields:
|
|
name: Label
|
|
value: Content
|
|
defaults:
|
|
autofollow: Invite to follow your account
|
|
avatar: Avatar
|
|
bot: This is a bot account
|
|
chosen_languages: Filter languages
|
|
confirm_new_password: Confirm new password
|
|
confirm_password: Confirm password
|
|
context: Filter contexts
|
|
current_password: Current password
|
|
data: Data
|
|
display_name: Display name
|
|
email: E-mail address
|
|
expires_in: Expire after
|
|
fields: Profile metadata
|
|
header: Header
|
|
inbox_url: URL of the relay inbox
|
|
irreversible: Drop instead of hide
|
|
locale: Interface language
|
|
locked: Lock account
|
|
max_uses: Max number of uses
|
|
new_password: New password
|
|
note: Bio
|
|
otp_attempt: Two-factor code
|
|
password: Password
|
|
phrase: Keyword or phrase
|
|
setting_auto_play_gif: Auto-play animated GIFs
|
|
setting_boost_modal: Show confirmation dialog before boosting
|
|
setting_default_language: Posting language
|
|
setting_default_privacy: Post privacy
|
|
setting_default_sensitive: Always mark media as sensitive
|
|
setting_delete_modal: Show confirmation dialog before deleting a toot
|
|
setting_display_sensitive_media: Always show media marked as sensitive
|
|
setting_favourite_modal: Show confirmation dialog before favouriting (applies to Glitch flavour only)
|
|
setting_hide_network: Hide your network
|
|
setting_noindex: Opt-out of search engine indexing
|
|
setting_reduce_motion: Reduce motion in animations
|
|
setting_skin: Skin
|
|
setting_system_font_ui: Use system's default font
|
|
setting_unfollow_modal: Show confirmation dialog before unfollowing someone
|
|
severity: Severity
|
|
type: Import type
|
|
username: Username
|
|
username_or_email: Username or Email
|
|
whole_word: Whole word
|
|
interactions:
|
|
must_be_follower: Block notifications from non-followers
|
|
must_be_following: Block notifications from people you don't follow
|
|
must_be_following_dm: Block direct messages from people you don't follow
|
|
notification_emails:
|
|
digest: Send digest e-mails
|
|
favourite: Send e-mail when someone favourites your status
|
|
follow: Send e-mail when someone follows you
|
|
follow_request: Send e-mail when someone requests to follow you
|
|
mention: Send e-mail when someone mentions you
|
|
reblog: Send e-mail when someone boosts your status
|
|
'no': 'No'
|
|
required:
|
|
mark: "*"
|
|
text: required
|
|
'yes': 'Yes'
|