diff options
| author | Henry Jameson <me@hjkos.com> | 2022-06-08 02:13:47 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2022-06-08 02:13:47 +0300 |
| commit | 1154a6514bf5596aa55aa415e1640560bd3716b3 (patch) | |
| tree | 4c088c0b9d02a827b8f5d2a055631854cf645df7 /src/i18n | |
| parent | fd831a27f4e9c6bcd5c40f3449d63546fba2560d (diff) | |
| parent | 0aa334515bd67ca69e84177c22273592f694fc28 (diff) | |
Merge remote-tracking branch 'origin/develop' into disjointed-popovers
* origin/develop: (25 commits)
force panel headers to be square on mobile (for now?)
fix gap between panel heading and timeline menu
Fix Open Chat button
fix?
fix
Revert "Merge branch 'revert-a88abc7e' into 'develop'"
Revert "Merge branch 'from/develop/tusooa/lang-opts' into 'develop'"
Fix registration error
stick chat scroll to bottom to help with OSK resizing the viewport
Pass file name of cropped avatar to form data
Add English translation for filtering end-of-poll notifications
Add settings for filtering end-of-poll notifications
Add English translations for poll-end notifications
Show poll-end notifications
Fix virtual scrolling when the user has a lot of pinned statuses
Update dependency @vuelidate/core to v2.0.0-alpha.41
Make lint happy
Make lint happy
Add English translation for language options
Add email language option to registration form
...
Diffstat (limited to 'src/i18n')
| -rw-r--r-- | src/i18n/en.json | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/i18n/en.json b/src/i18n/en.json index d04df325..0cfda804 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -160,7 +160,8 @@ "repeated_you": "repeated your status", "no_more_notifications": "No more notifications", "migrated_to": "migrated to", - "reacted_with": "reacted with {0}" + "reacted_with": "reacted with {0}", + "poll_ended": "poll has ended" }, "polls": { "add_poll": "Add poll", @@ -254,7 +255,8 @@ "password_required": "cannot be left blank", "password_confirmation_required": "cannot be left blank", "password_confirmation_match": "should be the same as password" - } + }, + "email_language": "In which language do you want to receive emails from the server?" }, "remote_user_resolver": { "remote_user_resolver": "Remote user resolver", @@ -303,6 +305,7 @@ "avatarRadius": "Avatars", "background": "Background", "bio": "Bio", + "email_language": "Language for receiving emails from the server", "block_export": "Block export", "block_export_button": "Export your blocks to a csv file", "block_import": "Block import", @@ -427,6 +430,7 @@ "notification_visibility_repeats": "Repeats", "notification_visibility_moves": "User Migrates", "notification_visibility_emoji_reactions": "Reactions", + "notification_visibility_polls": "Ends of polls you voted in", "no_rich_text_description": "Strip rich text formatting from all posts", "no_blocks": "No blocks", "no_mutes": "No mutes", |