Merge tag 'v3.0.1' into instance_only_statuses
This commit is contained in:
Renato "Lond" Cerqueira
@@ -2,9 +2,14 @@
|
||||
en:
|
||||
simple_form:
|
||||
hints:
|
||||
account_alias:
|
||||
acct: Specify the username@domain of the account you want to move from
|
||||
account_migration:
|
||||
acct: Specify the username@domain of the account you want to move to
|
||||
account_warning_preset:
|
||||
text: You can use toot syntax, such as URLs, hashtags and mentions
|
||||
admin_account_action:
|
||||
include_statuses: The user will see which toots have caused the moderation action or warning
|
||||
send_email_notification: The user will receive an explanation of what happened with their account
|
||||
text_html: Optional. You can use toot syntax. You can <a href="%{path}">add warning presets</a> to save time
|
||||
type_html: Choose what to do with <strong>%{acct}</strong>
|
||||
@@ -14,8 +19,10 @@ en:
|
||||
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
|
||||
current_password: For security purposes please enter the password of the current account
|
||||
current_username: To confirm, please enter the username of the current account
|
||||
digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence
|
||||
discoverable_html: The <a href="%{path}" target="_blank">directory</a> lets people find accounts based on interests and activity. Requires at least %{min_followers} followers
|
||||
discoverable: The profile directory is another way by which your account can reach a wider audience
|
||||
email: You will be sent a confirmation e-mail
|
||||
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
|
||||
@@ -35,16 +42,24 @@ en:
|
||||
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_show_application: The application you use to toot will be displayed in the detailed view of your toots
|
||||
setting_use_blurhash: Gradients are based on the colors of the hidden visuals but obfuscate any details
|
||||
setting_use_pending_items: Hide timeline updates behind a click instead of automatically scrolling the feed
|
||||
username: Your username will be unique on %{domain}
|
||||
whole_word: When the keyword or phrase is alphanumeric only, it will only be applied if it matches the whole word
|
||||
domain_allow:
|
||||
domain: This domain will be able to fetch data from this server and incoming data from it will be processed and stored
|
||||
featured_tag:
|
||||
name: 'You might want to use one of these:'
|
||||
form_challenge:
|
||||
current_password: You are entering a secure area
|
||||
imports:
|
||||
data: CSV file exported from another Mastodon server
|
||||
invite_request:
|
||||
text: This will help us review your application
|
||||
sessions:
|
||||
otp: 'Enter the two-factor code generated by your phone app or use one of your recovery codes:'
|
||||
tag:
|
||||
name: You can only change the casing of the letters, for example, to make it more readable
|
||||
user:
|
||||
chosen_languages: When checked, only toots in selected languages will be displayed in public timelines
|
||||
labels:
|
||||
@@ -52,9 +67,14 @@ en:
|
||||
fields:
|
||||
name: Label
|
||||
value: Content
|
||||
account_alias:
|
||||
acct: Handle of the old account
|
||||
account_migration:
|
||||
acct: Handle of the new account
|
||||
account_warning_preset:
|
||||
text: Preset text
|
||||
admin_account_action:
|
||||
include_statuses: Include reported toots in the e-mail
|
||||
send_email_notification: Notify the user per e-mail
|
||||
text: Custom warning
|
||||
type: Action
|
||||
@@ -110,7 +130,10 @@ en:
|
||||
setting_show_application: Disclose application used to send toots
|
||||
setting_system_font_ui: Use system's default font
|
||||
setting_theme: Site theme
|
||||
setting_trends: Show today's trends
|
||||
setting_unfollow_modal: Show confirmation dialog before unfollowing someone
|
||||
setting_use_blurhash: Show colorful gradients for hidden media
|
||||
setting_use_pending_items: Slow mode
|
||||
severity: Severity
|
||||
type: Import type
|
||||
username: Username
|
||||
@@ -122,6 +145,8 @@ en:
|
||||
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
|
||||
invite:
|
||||
comment: Comment
|
||||
invite_request:
|
||||
text: Why do you want to join?
|
||||
notification_emails:
|
||||
@@ -133,6 +158,12 @@ en:
|
||||
pending_account: Send e-mail when a new account needs review
|
||||
reblog: Send e-mail when someone boosts your status
|
||||
report: Send e-mail when a new report is submitted
|
||||
trending_tag: Send e-mail when an unreviewed hashtag is trending
|
||||
tag:
|
||||
listable: Allow this hashtag to appear in searches and on the profile directory
|
||||
name: Hashtag
|
||||
trendable: Allow this hashtag to appear under trends
|
||||
usable: Allow toots to use this hashtag
|
||||
'no': 'No'
|
||||
recommended: Recommended
|
||||
required:
|
||||
|
||||
Reference in New Issue
Block a user