Merge branch 'instance_only_statuses' of https://github.com/masto-donte-com-br/mastodon into hometown-dev
This commit is contained in:
Darius Kazemi
@ -293,6 +293,10 @@
|
||||
},
|
||||
{
|
||||
"descriptors": [
|
||||
{
|
||||
"defaultMessage": "today",
|
||||
"id": "relative_time.today"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "now",
|
||||
"id": "relative_time.just_now"
|
||||
@ -402,6 +406,14 @@
|
||||
"defaultMessage": "Favourite",
|
||||
"id": "status.favourite"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Bookmark",
|
||||
"id": "status.bookmark"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Remove bookmark",
|
||||
"id": "status.remove_bookmark"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Expand this status",
|
||||
"id": "status.open"
|
||||
@ -441,6 +453,22 @@
|
||||
{
|
||||
"defaultMessage": "Copy link to status",
|
||||
"id": "status.copy"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Hide everything from {domain}",
|
||||
"id": "account.block_domain"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Unhide {domain}",
|
||||
"id": "account.unblock_domain"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Unmute @{name}",
|
||||
"id": "account.unmute"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Unblock @{name}",
|
||||
"id": "account.unblock"
|
||||
}
|
||||
],
|
||||
"path": "app/javascript/mastodon/components/status_action_bar.json"
|
||||
@ -534,6 +562,14 @@
|
||||
{
|
||||
"defaultMessage": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
|
||||
"id": "confirmations.reply.message"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Hide entire domain",
|
||||
"id": "confirmations.domain_block.confirm"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
|
||||
"id": "confirmations.domain_block.message"
|
||||
}
|
||||
],
|
||||
"path": "app/javascript/mastodon/containers/status_container.json"
|
||||
@ -748,6 +784,10 @@
|
||||
"defaultMessage": "Bot",
|
||||
"id": "account.badges.bot"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Group",
|
||||
"id": "account.badges.group"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Posts",
|
||||
"id": "account.posts"
|
||||
@ -780,6 +820,10 @@
|
||||
{
|
||||
"defaultMessage": "Unmute sound",
|
||||
"id": "video.unmute"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Download file",
|
||||
"id": "video.download"
|
||||
}
|
||||
],
|
||||
"path": "app/javascript/mastodon/features/audio/index.json"
|
||||
@ -797,6 +841,19 @@
|
||||
],
|
||||
"path": "app/javascript/mastodon/features/blocks/index.json"
|
||||
},
|
||||
{
|
||||
"descriptors": [
|
||||
{
|
||||
"defaultMessage": "Bookmarks",
|
||||
"id": "column.bookmarks"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
|
||||
"id": "empty_column.bookmarked_statuses"
|
||||
}
|
||||
],
|
||||
"path": "app/javascript/mastodon/features/bookmarked_statuses/index.json"
|
||||
},
|
||||
{
|
||||
"descriptors": [
|
||||
{
|
||||
@ -1015,6 +1072,14 @@
|
||||
"defaultMessage": "Poll duration",
|
||||
"id": "compose_form.poll.duration"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Change poll to allow multiple choices",
|
||||
"id": "compose_form.poll.switch_to_multiple"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Change poll to allow for a single choice",
|
||||
"id": "compose_form.poll.switch_to_single"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "{number, plural, one {# minute} other {# minutes}}",
|
||||
"id": "intervals.full.minutes"
|
||||
@ -1375,6 +1440,10 @@
|
||||
"defaultMessage": "Unmute @{name}",
|
||||
"id": "account.unmute"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Unfollow",
|
||||
"id": "confirmations.unfollow.confirm"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Are you sure you want to unfollow {name}?",
|
||||
"id": "confirmations.unfollow.message"
|
||||
@ -1518,6 +1587,27 @@
|
||||
],
|
||||
"path": "app/javascript/mastodon/features/following/index.json"
|
||||
},
|
||||
{
|
||||
"descriptors": [
|
||||
{
|
||||
"defaultMessage": "Close",
|
||||
"id": "lightbox.close"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Previous",
|
||||
"id": "lightbox.previous"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Next",
|
||||
"id": "lightbox.next"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Announcement",
|
||||
"id": "announcement.announcement"
|
||||
}
|
||||
],
|
||||
"path": "app/javascript/mastodon/features/getting_started/components/announcements.json"
|
||||
},
|
||||
{
|
||||
"descriptors": [
|
||||
{
|
||||
@ -1553,6 +1643,10 @@
|
||||
"defaultMessage": "Direct messages",
|
||||
"id": "navigation_bar.direct"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Bookmarks",
|
||||
"id": "navigation_bar.bookmarks"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Preferences",
|
||||
"id": "navigation_bar.preferences"
|
||||
@ -1681,6 +1775,14 @@
|
||||
"defaultMessage": "Home",
|
||||
"id": "column.home"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Show announcements",
|
||||
"id": "home.show_announcements"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Hide announcements",
|
||||
"id": "home.hide_announcements"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Your home timeline is empty! Visit {public} or use search to get started and meet other users.",
|
||||
"id": "empty_column.home"
|
||||
@ -1803,6 +1905,10 @@
|
||||
"defaultMessage": "to open status",
|
||||
"id": "keyboard_shortcuts.enter"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "to open media",
|
||||
"id": "keyboard_shortcuts.open_media"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "to show/hide text behind CW",
|
||||
"id": "keyboard_shortcuts.toggle_hidden"
|
||||
@ -2053,6 +2159,10 @@
|
||||
"defaultMessage": "New followers:",
|
||||
"id": "notifications.column_settings.follow"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "New follow requests:",
|
||||
"id": "notifications.column_settings.follow_request"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Favourites:",
|
||||
"id": "notifications.column_settings.favourite"
|
||||
@ -2103,21 +2213,42 @@
|
||||
},
|
||||
{
|
||||
"descriptors": [
|
||||
{
|
||||
"defaultMessage": "Authorize",
|
||||
"id": "follow_request.authorize"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Reject",
|
||||
"id": "follow_request.reject"
|
||||
}
|
||||
],
|
||||
"path": "app/javascript/mastodon/features/notifications/components/follow_request.json"
|
||||
},
|
||||
{
|
||||
"descriptors": [
|
||||
{
|
||||
"defaultMessage": "{name} favourited your status",
|
||||
"id": "notification.favourite"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "{name} followed you",
|
||||
"id": "notification.follow"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "{name} favourited your status",
|
||||
"id": "notification.favourite"
|
||||
"defaultMessage": "Your poll has ended",
|
||||
"id": "notification.own_poll"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "A poll you have voted in has ended",
|
||||
"id": "notification.poll"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "{name} boosted your status",
|
||||
"id": "notification.reblog"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "A poll you have voted in has ended",
|
||||
"id": "notification.poll"
|
||||
"defaultMessage": "{name} has requested to follow you",
|
||||
"id": "notification.follow_request"
|
||||
}
|
||||
],
|
||||
"path": "app/javascript/mastodon/features/notifications/components/notification.json"
|
||||
@ -2225,6 +2356,14 @@
|
||||
"defaultMessage": "Favourite",
|
||||
"id": "status.favourite"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Bookmark",
|
||||
"id": "status.bookmark"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "More",
|
||||
"id": "status.more"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Mute @{name}",
|
||||
"id": "status.mute"
|
||||
@ -2272,6 +2411,22 @@
|
||||
{
|
||||
"defaultMessage": "Copy link to status",
|
||||
"id": "status.copy"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Hide everything from {domain}",
|
||||
"id": "account.block_domain"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Unhide {domain}",
|
||||
"id": "account.unblock_domain"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Unmute @{name}",
|
||||
"id": "account.unmute"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Unblock @{name}",
|
||||
"id": "account.unblock"
|
||||
}
|
||||
],
|
||||
"path": "app/javascript/mastodon/features/status/components/action_bar.json"
|
||||
@ -2351,6 +2506,14 @@
|
||||
{
|
||||
"defaultMessage": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
|
||||
"id": "confirmations.reply.message"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Hide entire domain",
|
||||
"id": "confirmations.domain_block.confirm"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
|
||||
"id": "confirmations.domain_block.message"
|
||||
}
|
||||
],
|
||||
"path": "app/javascript/mastodon/features/status/index.json"
|
||||
@ -2489,6 +2652,18 @@
|
||||
"defaultMessage": "A quick brown fox jumps over the lazy dog",
|
||||
"id": "upload_modal.description_placeholder"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Describe for people with hearing loss",
|
||||
"id": "upload_form.audio_description"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Describe for people with hearing loss or visual impairment",
|
||||
"id": "upload_form.video_description"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Describe for the visually impaired",
|
||||
"id": "upload_form.description"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Edit media",
|
||||
"id": "upload_modal.edit_media"
|
||||
@ -2497,10 +2672,6 @@
|
||||
"defaultMessage": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
|
||||
"id": "upload_modal.hint"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Describe for the visually impaired",
|
||||
"id": "upload_form.description"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Analyzing picture…",
|
||||
"id": "upload_modal.analyzing_picture"
|
||||
@ -2650,6 +2821,10 @@
|
||||
"defaultMessage": "Favourites",
|
||||
"id": "navigation_bar.favourites"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Bookmarks",
|
||||
"id": "navigation_bar.bookmarks"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Lists",
|
||||
"id": "navigation_bar.lists"
|
||||
@ -2792,6 +2967,10 @@
|
||||
"defaultMessage": "Exit full screen",
|
||||
"id": "video.exit_fullscreen"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Download file",
|
||||
"id": "video.download"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Sensitive content",
|
||||
"id": "status.sensitive_warning"
|
||||
|
||||
Reference in New Issue
Block a user