mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-10 09:29:18 +00:00
04fef7b888
* add pam support, without extra column * bugfixes for pam login * document options * fix code style * fix codestyle * fix tests * don't call remember_me without password * fix codestyle * improve checks for pam usage (should fix tests) * fix remember_me part 1 * add remember_token column because :rememberable requires either a password or this column. * migrate db for remember_token * move pam_authentication to the right place, fix logic bug in edit.html.haml * fix tests * fix pam authentication, improve username lookup, add comment * valid? is sometimes not honored, return nil instead trying to authenticate with pam * update devise_pam_authenticatable2 and adjust code. Fixes sideeffects observed in tests * update devise_pam_authenticatable gem, fixes for codeconventions, fix finding user * codeconvention fixes * code convention fixes * fix idention * update dependency, explicit conflict check * fix disabled password updates if in pam mode * fix check password if password is present, fix templates * block registration if account is maintained by pam * Revert "block registration if account is maintained by pam" This reverts commit 8e7a083d650240b6fac414926744b4b90b435f20. * fix identation error introduced by rebase * block usernames maintained by pam * document pam settings better * fix code style
73 lines
3.1 KiB
YAML
73 lines
3.1 KiB
YAML
---
|
|
en:
|
|
simple_form:
|
|
hints:
|
|
defaults:
|
|
avatar: PNG, GIF or JPG. At most 2MB. Will be downscaled to 120x120px
|
|
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
|
|
header: PNG, GIF or JPG. At most 2MB. Will be downscaled to 700x335px
|
|
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
|
|
setting_noindex: Affects your public profile and status pages
|
|
setting_theme: Affects how Mastodon looks when you're logged in from any device.
|
|
imports:
|
|
data: CSV file exported from another Mastodon instance
|
|
sessions:
|
|
otp: Enter the Two-factor code from your phone or use one of your recovery codes.
|
|
user:
|
|
filtered_languages: Checked languages will be filtered from public timelines for you
|
|
labels:
|
|
defaults:
|
|
avatar: Avatar
|
|
confirm_new_password: Confirm new password
|
|
confirm_password: Confirm password
|
|
current_password: Current password
|
|
data: Data
|
|
display_name: Display name
|
|
email: E-mail address
|
|
expires_in: Expire after
|
|
filtered_languages: Filtered languages
|
|
header: Header
|
|
locale: Language
|
|
locked: Lock account
|
|
max_uses: Max number of uses
|
|
new_password: New password
|
|
note: Bio
|
|
otp_attempt: Two-factor code
|
|
password: Password
|
|
setting_auto_play_gif: Auto-play animated GIFs
|
|
setting_boost_modal: Show confirmation dialog before boosting
|
|
setting_default_privacy: Post privacy
|
|
setting_default_sensitive: Always mark media as sensitive
|
|
setting_delete_modal: Show confirmation dialog before deleting a toot
|
|
setting_noindex: Opt-out of search engine indexing
|
|
setting_reduce_motion: Reduce motion in animations
|
|
setting_system_font_ui: Use system's default font
|
|
setting_theme: Site theme
|
|
setting_unfollow_modal: Show confirmation dialog before unfollowing someone
|
|
severity: Severity
|
|
type: Import type
|
|
username: Username
|
|
username_or_email: Username or Email
|
|
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'
|