Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, we deleted it to not be flooded by Depandabot.
Kept deleted.
- `Gemfile.lock`:
Puma updated on both sides, went for the most recent version.
- `app/controllers/api/v1/mutes_controller.rb`:
Upstream updated the serializer to support timed mutes, while
glitch-soc added a custom API ages ago to get information that
is already available elsewhere.
Dropped the glitch-soc-specific API, went with upstream changes.
- `app/javascript/core/admin.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/javascript/packs/public.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/models/mute.rb`:
🤷
- `app/models/user.rb`:
New user setting added upstream while we have glitch-soc-specific
user settings. Added upstream's user setting.
- `config/settings.yml`:
Upstream added a new user setting close to a user setting we had
changed the defaults for. Added the new upstream setting.
- `package.json`:
Upstream dependency updated “too close” to a glitch-soc-specific
dependency. No real conflict. Updated the dependency.
This commit is contained in:
Thibaut Girka
@ -167,10 +167,18 @@
|
||||
},
|
||||
{
|
||||
"descriptors": [
|
||||
{
|
||||
"defaultMessage": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
|
||||
"id": "error.unexpected_crash.explanation_addons"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
|
||||
"id": "error.unexpected_crash.explanation"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
|
||||
"id": "error.unexpected_crash.next_steps_addons"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
|
||||
"id": "error.unexpected_crash.next_steps"
|
||||
@ -265,6 +273,15 @@
|
||||
],
|
||||
"path": "app/javascript/mastodon/components/missing_indicator.json"
|
||||
},
|
||||
{
|
||||
"descriptors": [
|
||||
{
|
||||
"defaultMessage": "Put it back",
|
||||
"id": "picture_in_picture.restore"
|
||||
}
|
||||
],
|
||||
"path": "app/javascript/mastodon/components/picture_in_picture_placeholder.json"
|
||||
},
|
||||
{
|
||||
"descriptors": [
|
||||
{
|
||||
@ -633,6 +650,15 @@
|
||||
],
|
||||
"path": "app/javascript/mastodon/containers/status_container.json"
|
||||
},
|
||||
{
|
||||
"descriptors": [
|
||||
{
|
||||
"defaultMessage": "Profile unavailable",
|
||||
"id": "empty_column.account_unavailable"
|
||||
}
|
||||
],
|
||||
"path": "app/javascript/mastodon/features/account_gallery/index.json"
|
||||
},
|
||||
{
|
||||
"descriptors": [
|
||||
{
|
||||
@ -796,6 +822,14 @@
|
||||
"defaultMessage": "Show boosts from @{name}",
|
||||
"id": "account.show_reblogs"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Notify me when @{name} posts",
|
||||
"id": "account.enable_notifications"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Stop notifying me when @{name} posts",
|
||||
"id": "account.disable_notifications"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Pinned toots",
|
||||
"id": "navigation_bar.pins"
|
||||
@ -2125,6 +2159,18 @@
|
||||
"defaultMessage": "Delete",
|
||||
"id": "confirmations.delete_list.confirm"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Any followed user",
|
||||
"id": "lists.replies_policy.all_replies"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "No one",
|
||||
"id": "lists.replies_policy.no_replies"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Members of the list",
|
||||
"id": "lists.replies_policy.list_replies"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Edit list",
|
||||
"id": "lists.edit"
|
||||
@ -2133,6 +2179,10 @@
|
||||
"defaultMessage": "Delete list",
|
||||
"id": "lists.delete"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Show replies to:",
|
||||
"id": "lists.replies_policy.title"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
|
||||
"id": "empty_column.list"
|
||||
@ -2218,6 +2268,10 @@
|
||||
"defaultMessage": "Push notifications",
|
||||
"id": "notifications.column_settings.push"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Desktop notifications are unavailable due to previously denied browser permissions request",
|
||||
"id": "notifications.permission_denied"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Quick filter bar",
|
||||
"id": "notifications.column_settings.filter_bar.category"
|
||||
@ -2245,6 +2299,10 @@
|
||||
{
|
||||
"defaultMessage": "Poll results:",
|
||||
"id": "notifications.column_settings.poll"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "New toots:",
|
||||
"id": "notifications.column_settings.status"
|
||||
}
|
||||
],
|
||||
"path": "app/javascript/mastodon/features/notifications/components/column_settings.json"
|
||||
@ -2271,6 +2329,10 @@
|
||||
"defaultMessage": "Follows",
|
||||
"id": "notifications.filter.follows"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Updates from people you follow",
|
||||
"id": "notifications.filter.statuses"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "All",
|
||||
"id": "notifications.filter.all"
|
||||
@ -2313,6 +2375,10 @@
|
||||
"defaultMessage": "{name} boosted your status",
|
||||
"id": "notification.reblog"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "{name} just posted",
|
||||
"id": "notification.status"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "{name} has requested to follow you",
|
||||
"id": "notification.follow_request"
|
||||
@ -2320,6 +2386,23 @@
|
||||
],
|
||||
"path": "app/javascript/mastodon/features/notifications/components/notification.json"
|
||||
},
|
||||
{
|
||||
"descriptors": [
|
||||
{
|
||||
"defaultMessage": "Never miss a thing",
|
||||
"id": "notifications_permission_banner.title"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
|
||||
"id": "notifications_permission_banner.how_to_control"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Enable desktop notifications",
|
||||
"id": "notifications_permission_banner.enable"
|
||||
}
|
||||
],
|
||||
"path": "app/javascript/mastodon/features/notifications/components/notifications_permission_banner.json"
|
||||
},
|
||||
{
|
||||
"descriptors": [
|
||||
{
|
||||
@ -2329,6 +2412,10 @@
|
||||
{
|
||||
"defaultMessage": "Clear notifications",
|
||||
"id": "notifications.clear"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Desktop notifications can't be enabled, as browser permission has been denied before",
|
||||
"id": "notifications.permission_denied_alert"
|
||||
}
|
||||
],
|
||||
"path": "app/javascript/mastodon/features/notifications/containers/column_settings_container.json"
|
||||
@ -2339,6 +2426,10 @@
|
||||
"defaultMessage": "Notifications",
|
||||
"id": "column.notifications"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Mark every notification as read",
|
||||
"id": "notifications.mark_as_read"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "You don't have any notifications yet. Interact with others to start the conversation.",
|
||||
"id": "empty_column.notifications"
|
||||
@ -2346,6 +2437,47 @@
|
||||
],
|
||||
"path": "app/javascript/mastodon/features/notifications/index.json"
|
||||
},
|
||||
{
|
||||
"descriptors": [
|
||||
{
|
||||
"defaultMessage": "Reply",
|
||||
"id": "status.reply"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Reply to thread",
|
||||
"id": "status.replyAll"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Boost",
|
||||
"id": "status.reblog"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Boost with original visibility",
|
||||
"id": "status.reblog_private"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Unboost",
|
||||
"id": "status.cancel_reblog_private"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "This post cannot be boosted",
|
||||
"id": "status.cannot_reblog"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Favourite",
|
||||
"id": "status.favourite"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Reply",
|
||||
"id": "confirmations.reply.confirm"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
|
||||
"id": "confirmations.reply.message"
|
||||
}
|
||||
],
|
||||
"path": "app/javascript/mastodon/features/picture_in_picture/components/footer.json"
|
||||
},
|
||||
{
|
||||
"descriptors": [
|
||||
{
|
||||
@ -2798,6 +2930,14 @@
|
||||
"defaultMessage": "Describe for the visually impaired",
|
||||
"id": "upload_form.description"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Analyzing picture…",
|
||||
"id": "upload_modal.analyzing_picture"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Preparing OCR…",
|
||||
"id": "upload_modal.preparing_ocr"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Edit media",
|
||||
"id": "upload_modal.edit_media"
|
||||
@ -2810,10 +2950,6 @@
|
||||
"defaultMessage": "Change thumbnail",
|
||||
"id": "upload_form.thumbnail"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Analyzing picture…",
|
||||
"id": "upload_modal.analyzing_picture"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Detect text from picture",
|
||||
"id": "upload_modal.detect_text"
|
||||
@ -2910,6 +3046,22 @@
|
||||
},
|
||||
{
|
||||
"descriptors": [
|
||||
{
|
||||
"defaultMessage": "{number, plural, one {# minute} other {# minutes}}",
|
||||
"id": "intervals.full.minutes"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "{number, plural, one {# hour} other {# hours}}",
|
||||
"id": "intervals.full.hours"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "{number, plural, one {# day} other {# days}}",
|
||||
"id": "intervals.full.days"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Indefinite",
|
||||
"id": "mute_modal.indefinite"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Are you sure you want to mute {name}?",
|
||||
"id": "confirmations.mute.message"
|
||||
@ -2922,6 +3074,10 @@
|
||||
"defaultMessage": "Hide notifications from this user?",
|
||||
"id": "mute_modal.hide_notifications"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Duration",
|
||||
"id": "mute_modal.duration"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Cancel",
|
||||
"id": "confirmation_modal.cancel"
|
||||
|
||||
@ -9,8 +9,10 @@
|
||||
"account.browse_more_on_origin_server": "Browse more on the original profile",
|
||||
"account.cancel_follow_request": "Cancel follow request",
|
||||
"account.direct": "Direct message @{name}",
|
||||
"account.disable_notifications": "Stop notifying me when @{name} posts",
|
||||
"account.domain_blocked": "Domain blocked",
|
||||
"account.edit_profile": "Edit profile",
|
||||
"account.enable_notifications": "Notify me when @{name} posts",
|
||||
"account.endorse": "Feature on profile",
|
||||
"account.follow": "Follow",
|
||||
"account.followers": "Followers",
|
||||
@ -170,7 +172,9 @@
|
||||
"empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
|
||||
"empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
|
||||
"error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
|
||||
"error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
|
||||
"error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
|
||||
"error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
|
||||
"errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
|
||||
"errors.unexpected_crash.report_issue": "Report issue",
|
||||
"follow_request.authorize": "Authorize",
|
||||
@ -264,6 +268,10 @@
|
||||
"lists.edit.submit": "Change title",
|
||||
"lists.new.create": "Add list",
|
||||
"lists.new.title_placeholder": "New list title",
|
||||
"lists.replies_policy.all_replies": "Any followed user",
|
||||
"lists.replies_policy.list_replies": "Members of the list",
|
||||
"lists.replies_policy.no_replies": "No one",
|
||||
"lists.replies_policy.title": "Show replies to:",
|
||||
"lists.search": "Search among people you follow",
|
||||
"lists.subheading": "Your lists",
|
||||
"load_pending": "{count, plural, one {# new item} other {# new items}}",
|
||||
@ -271,7 +279,9 @@
|
||||
"media_gallery.toggle_visible": "Hide {number, plural, one {image} other {images}}",
|
||||
"missing_indicator.label": "Not found",
|
||||
"missing_indicator.sublabel": "This resource could not be found",
|
||||
"mute_modal.duration": "Duration",
|
||||
"mute_modal.hide_notifications": "Hide notifications from this user?",
|
||||
"mute_modal.indefinite": "Indefinite",
|
||||
"navigation_bar.apps": "Mobile apps",
|
||||
"navigation_bar.blocks": "Blocked users",
|
||||
"navigation_bar.bookmarks": "Bookmarks",
|
||||
@ -303,6 +313,7 @@
|
||||
"notification.own_poll": "Your poll has ended",
|
||||
"notification.poll": "A poll you have voted in has ended",
|
||||
"notification.reblog": "{name} boosted your toot",
|
||||
"notification.status": "{name} just posted",
|
||||
"notifications.clear": "Clear notifications",
|
||||
"notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
|
||||
"notifications.column_settings.alert": "Desktop notifications",
|
||||
@ -318,13 +329,22 @@
|
||||
"notifications.column_settings.reblog": "Boosts:",
|
||||
"notifications.column_settings.show": "Show in column",
|
||||
"notifications.column_settings.sound": "Play sound",
|
||||
"notifications.column_settings.status": "New toots:",
|
||||
"notifications.filter.all": "All",
|
||||
"notifications.filter.boosts": "Boosts",
|
||||
"notifications.filter.favourites": "Favourites",
|
||||
"notifications.filter.follows": "Follows",
|
||||
"notifications.filter.mentions": "Mentions",
|
||||
"notifications.filter.polls": "Poll results",
|
||||
"notifications.filter.statuses": "Updates from people you follow",
|
||||
"notifications.group": "{count} notifications",
|
||||
"notifications.mark_as_read": "Mark every notification as read",
|
||||
"notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
|
||||
"notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
|
||||
"notifications_permission_banner.enable": "Enable desktop notifications",
|
||||
"notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
|
||||
"notifications_permission_banner.title": "Never miss a thing",
|
||||
"picture_in_picture.restore": "Put it back",
|
||||
"poll.closed": "Closed",
|
||||
"poll.refresh": "Refresh",
|
||||
"poll.total_people": "{count, plural, one {# person} other {# people}}",
|
||||
@ -451,6 +471,7 @@
|
||||
"upload_modal.detect_text": "Detect text from picture",
|
||||
"upload_modal.edit_media": "Edit media",
|
||||
"upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
|
||||
"upload_modal.preparing_ocr": "Preparing OCR…",
|
||||
"upload_modal.preview_label": "Preview ({ratio})",
|
||||
"upload_progress.label": "Uploading...",
|
||||
"video.close": "Close video",
|
||||
|
||||
@ -272,6 +272,8 @@
|
||||
"missing_indicator.label": "見つかりません",
|
||||
"missing_indicator.sublabel": "見つかりませんでした",
|
||||
"mute_modal.hide_notifications": "このユーザーからの通知を隠しますか？",
|
||||
"mute_modal.duration": "ミュートする期間",
|
||||
"mute_modal.indefinite": "無期限",
|
||||
"navigation_bar.apps": "アプリ",
|
||||
"navigation_bar.blocks": "ブロックしたユーザー",
|
||||
"navigation_bar.bookmarks": "ブックマーク",
|
||||
|
||||
Reference in New Issue
Block a user