Update localization and docker compose for new glitch-soc

app/javascript/flavours/glitch/locales/en.json

@@ -14,6 +14,7 @@
   "column_subheading.lists": "Circles",
   "column_subheading.navigation": "Navigation",
   "community.column_settings.allow_local_only": "Show communal-only toots",
+  "compose.attach.doodle": "Draw something",
   "compose.change_federation": "Change federation settings",
   "compose.content-type.change": "Change advanced formatting options",
   "compose.content-type.html": "HTML",
@@ -22,8 +23,8 @@
   "compose.content-type.markdown_meta": "Format your seeds using Markdown",
   "compose.content-type.plain": "Plain text",
   "compose.content-type.plain_meta": "Write with no advanced formatting",
-  "compose.disable_threaded_mode": "Disable threaded more",
+  "compose.disable_threaded_mode": "Disable threaded mode",
-  "compose.enable_threaded_mode": "Enable threaded more",
+  "compose.enable_threaded_mode": "Enable threaded mode",
   "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
   "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
@@ -63,6 +64,7 @@
   "notification_purge.btn_invert": "Invert\nselection",
   "notification_purge.btn_none": "Select\nnone",
   "notification_purge.start": "Enter notification cleaning mode",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.marked_clear": "Clear selected notifications",
   "notifications.marked_clear_confirmation": "Are you sure you want to permanently clear all selected notifications?",
   "settings.always_show_spoilers_field": "Always enable the Content Warning field",
@@ -126,6 +128,7 @@
   "settings.shared_settings_link": "punk preferences",
   "settings.show_action_bar": "Show action buttons in collapsed seeds",
   "settings.show_content_type_choice": "Show content-type choice when planting seeds",
+  "settings.show_published_toast": "Display toast when (re)planting seeds",
   "settings.show_reply_counter": "Display an estimate of the reply count",
   "settings.side_arm": "Secondary plant button:",
   "settings.side_arm.none": "None",
@@ -152,6 +155,5 @@
   "status.in_reply_to": "This seed is a reply",
   "status.is_poll": "This seed is a poll",
   "status.local_only": "Only visible from your community",
-  "status.uncollapse": "Uncollapse",
+  "status.uncollapse": "Uncollapse"
-  "suggestions.dismiss": "Dismiss suggestion"
 }

app/javascript/mastodon/locales/en.json

@@ -35,9 +35,9 @@
   "account.follow_back": "Follow back",
   "account.followers": "Followers",
   "account.followers.empty": "No one follows this punk yet.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
+  "account.followers_counter": "{count, plural, one {{counter} follower} other {{counter} followers}}",
   "account.following": "Following",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.following_counter": "{count, plural, one {{counter} following} other {{counter} following}}",
   "account.follows.empty": "This punk doesn't follow anyone yet.",
   "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "Hide recycles from @{name}",
@@ -63,7 +63,7 @@
   "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Show recycles from @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Seed} other {{counter} Seeds}}",
+  "account.statuses_counter": "{count, plural, one {{counter} seed} other {{counter} seeds}}",
   "account.unblock": "Unblock @{name}",
   "account.unblock_domain": "Unblock domain {domain}",
   "account.unblock_short": "Unblock",
@@ -89,6 +89,14 @@
   "announcement.announcement": "Proclamation",
   "attachments_list.unprocessed": "(unprocessed)",
   "audio.hide": "Hide audio",
+  "block_modal.remote_users_caveat": "We will ask the server {domain} to respect your decision. However, compliance is not guaranteed since some servers may handle blocks differently. Public posts may still be visible to non-logged-in users.",
+  "block_modal.show_less": "Show less",
+  "block_modal.show_more": "Show more",
+  "block_modal.they_cant_mention": "They can't mention or follow you.",
+  "block_modal.they_cant_see_posts": "They can't see your posts and you won't see theirs.",
+  "block_modal.they_will_know": "They can see that they're blocked.",
+  "block_modal.title": "Block user?",
+  "block_modal.you_wont_see_mentions": "You won't see posts that mention them.",
   "boost_modal.combo": "You can press {combo} to skip this next time",
   "bundle_column_error.copy_stacktrace": "Copy error report",
   "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Add content warning",
   "compose_form.spoiler_placeholder": "Content warning (optional)",
   "confirmation_modal.cancel": "Cancel",
-  "confirmations.block.block_and_report": "Block & Report",
   "confirmations.block.confirm": "Block",
-  "confirmations.block.message": "Are you sure you want to block {name}?",
   "confirmations.cancel_follow_request.confirm": "Withdraw request",
   "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "Uproot",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "Are you sure you want to permanently ditch this circle?",
   "confirmations.discard_edit_media.confirm": "Uproot",
   "confirmations.discard_edit_media.message": "You have unplanted adjustments to the media description or preview, uproot them?",
-  "confirmations.domain_block.confirm": "Block entire domain",
+  "confirmations.domain_block.confirm": "Block server",
   "confirmations.domain_block.message": "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 global crops or your notifications. Your followers from that domain will be removed.",
   "confirmations.edit.confirm": "Adjust",
   "confirmations.edit.message": "Adjusting now will overwrite the seed you are currently planting. Are you sure you want to proceed?",
   "confirmations.logout.confirm": "Log out",
   "confirmations.logout.message": "Are you sure you want to log out?",
   "confirmations.mute.confirm": "Mute",
-  "confirmations.mute.explanation": "This will hide seeds from them and seeds mentioning them, but it will still allow them to see your seeds and follow you.",
-  "confirmations.mute.message": "Are you sure you want to mute {name}?",
   "confirmations.redraft.confirm": "Uproot & replant",
   "confirmations.redraft.message": "Are you sure you want to uproot this seed and replant it? Shines and recycles will be lost, and replies to the original seed will be eaten by the worms.",
   "confirmations.reply.confirm": "Reply",
@@ -204,7 +208,28 @@
   "dismissable_banner.explore_links": "These are news stories being shared the most on the social web today. Newer news stories planted by more different punks are ranked higher.",
   "dismissable_banner.explore_statuses": "These are seeds from across the social web that are gaining traction today. Newer seeds with more recycles and shines are ranked higher.",
   "dismissable_banner.explore_tags": "These are hashtags that are gaining traction on the social web today. Hashtags that are used by more different punks are ranked higher.",
-  "dismissable_banner.public_timeline": "These are the most recent global seeds from punks on this and other communities of the decentralized network that this community knows about.",
+  "dismissable_banner.public_timeline": "These are the most recent global seeds from punks on the social web that punks on {domain} follow.",
+  "domain_block_modal.block": "Block server",
+  "domain_block_modal.block_account_instead": "Block @{name} instead",
+  "domain_block_modal.they_can_interact_with_old_posts": "Punks from this server can interact with your old seeds.",
+  "domain_block_modal.they_cant_follow": "Nobody from this server can follow you.",
+  "domain_block_modal.they_wont_know": "They won't know they've been blocked.",
+  "domain_block_modal.title": "Block domain?",
+  "domain_block_modal.you_will_lose_followers": "All your followers from this server will be removed.",
+  "domain_block_modal.you_wont_see_posts": "You won't see seeds or notifications from punks on this server.",
+  "domain_pill.activitypub_lets_connect": "It lets you connect and interact with people not just on Mastodon, but across different social apps too.",
+  "domain_pill.activitypub_like_language": "ActivityPub is like the language Mastodon speaks with other social networks.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Their handle:",
+  "domain_pill.their_server": "Their digital home, where all of their seeds live.",
+  "domain_pill.their_username": "Their unique identifier on their server. It’s possible to find punks with the same username on different servers.",
+  "domain_pill.username": "Username",
+  "domain_pill.whats_in_a_handle": "What's in a handle?",
+  "domain_pill.who_they_are": "Since handles say who someone is and where they are, you can interact with punks across the social web of <button>ActivityPub-powered platforms</button>.",
+  "domain_pill.who_you_are": "Because your handle says who you are and where you are, punks can interact with you across the social web of <button>ActivityPub-powered platforms</button>.",
+  "domain_pill.your_handle": "Your handle:",
+  "domain_pill.your_server": "Your digital home, where all of your seeds live. Don’t like this one? Transfer servers at any time and bring your followers, too.",
+  "domain_pill.your_username": "Your unique identifier on this server. It’s possible to find punks with the same username on different servers.",
   "embed.instructions": "Embed this seed on your website by copying the code below.",
   "embed.preview": "Here is what it will look like:",
   "emoji_button.activity": "Activity",
@@ -241,6 +266,7 @@
   "empty_column.list": "There is nothing in this circle yet. When punks in this circle plant new seeds, they will appear here.",
   "empty_column.lists": "You don't have any circles yet. When you create one, it will show up here.",
   "empty_column.mutes": "You haven't muted any punks yet.",
+  "empty_column.notification_requests": "All clear! There is nothing here. When you receive new notifications, they will appear here according to your settings.",
   "empty_column.notifications": "You don't have any notifications yet. When other punks interact with you, you will see it here.",
   "empty_column.public": "The crops are barren! Plant something globally, or manually follow punks from other communities 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.",
@@ -271,6 +297,9 @@
   "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
   "filter_modal.select_filter.title": "Filter this seed",
   "filter_modal.title.status": "Filter a seed",
+  "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentions}}",
+  "filtered_notifications_banner.pending_requests": "Notifications from {count, plural, =0 {no one} one {one punk} other {# punks}} you may know",
+  "filtered_notifications_banner.title": "Filtered notifications",
   "firehose.all": "All",
   "firehose.local": "This community",
   "firehose.remote": "Other communities",
@@ -279,6 +308,8 @@
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
   "follow_suggestions.curated_suggestion": "Custodian pick",
   "follow_suggestions.dismiss": "Don't show again",
+  "follow_suggestions.featured_longer": "Hand-picked by the {domain} team",
+  "follow_suggestions.friends_of_friends_longer": "Popular among punks you follow",
   "follow_suggestions.hints.featured": "This punk has been hand-picked by the {domain} team.",
   "follow_suggestions.hints.friends_of_friends": "This punk is popular among the punks you follow.",
   "follow_suggestions.hints.most_followed": "This punk is one of the most followed on {domain}.",
@@ -286,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "This punk is similar to the punks you have most recently followed.",
   "follow_suggestions.personalized_suggestion": "Personalized suggestion",
   "follow_suggestions.popular_suggestion": "Popular suggestion",
+  "follow_suggestions.popular_suggestion_longer": "Popular on {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Similar to profiles you recently followed",
   "follow_suggestions.view_all": "View all",
   "follow_suggestions.who_to_follow": "Who to follow",
   "followed_tags": "Followed hashtags",
@@ -314,7 +347,6 @@
   "hashtag.follow": "Follow hashtag",
   "hashtag.unfollow": "Unfollow hashtag",
   "hashtags.and_other": "…and {count, plural, other {# more}}",
-  "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show recycles",
   "home.column_settings.show_replies": "Show replies",
   "home.hide_announcements": "Hide proclamations",
@@ -382,7 +414,9 @@
   "limited_account_hint.action": "Show profile anyway",
   "limited_account_hint.title": "This profile has been hidden by the custodians of the Solarverse.",
   "link_preview.author": "By {name}",
-"lists.account.add": "Induct into circle",
+  "link_preview.more_from_author": "More from {name}",
+  "link_preview.shares": "{count, plural, one {{counter} seed} other {{counter} seeds}}",
+  "lists.account.add": "Induct into circle",
   "lists.account.remove": "Expel from circle",
   "lists.delete": "Ditch circle",
   "lists.edit": "Adjust circle",
@@ -400,9 +434,15 @@
   "loading_indicator.label": "Imagining…",
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
-  "mute_modal.duration": "Duration",
+  "mute_modal.hide_from_notifications": "Hide from notifications",
-  "mute_modal.hide_notifications": "Hide notifications from this punk?",
+  "mute_modal.hide_options": "Hide options",
-  "mute_modal.indefinite": "Indefinite",
+  "mute_modal.indefinite": "Until I unmute them",
+  "mute_modal.show_options": "Show options",
+  "mute_modal.they_can_mention_and_follow": "They can mention and follow you, but you won't see them.",
+  "mute_modal.they_wont_know": "They won't know they've been muted.",
+  "mute_modal.title": "Mute punk?",
+  "mute_modal.you_wont_see_mentions": "You won't see sseeds that mention them.",
+  "mute_modal.you_wont_see_posts": "They can still see your seeds, but you won't see theirs.",
   "navigation_bar.about": "About",
   "navigation_bar.advanced_interface": "Open in advanced web interface",
   "navigation_bar.blocks": "Blocked punks",
@@ -435,11 +475,29 @@
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
   "notification.mention": "{name} mentioned you",
+  "notification.moderation-warning.learn_more": "Learn more",
+  "notification.moderation_warning": "You have received a moderation warning",
+  "notification.moderation_warning.action_delete_statuses": "Some of your posts have been removed.",
+  "notification.moderation_warning.action_disable": "Your account has been disabled.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Some of your posts have been marked as sensitive.",
+  "notification.moderation_warning.action_none": "Your account has received a moderation warning.",
+  "notification.moderation_warning.action_sensitive": "Your posts will be marked as sensitive from now on.",
+  "notification.moderation_warning.action_silence": "Your account has been limited.",
+  "notification.moderation_warning.action_suspend": "Your account has been suspended.",
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} recycled your seed",
+  "notification.relationships_severance_event": "Lost connections with {name}",
+  "notification.relationships_severance_event.account_suspension": "An admin from {from} has suspended {target}, which means you can no longer receive updates from them or interact with them.",
+  "notification.relationships_severance_event.domain_block": "An admin from {from} has blocked {target}, including {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.",
+  "notification.relationships_severance_event.learn_more": "Learn more",
+  "notification.relationships_severance_event.user_domain_block": "You have blocked {target}, removing {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.",
   "notification.status": "{name} just planted a seed",
   "notification.update": "{name} adjusted a seed",
+  "notification_requests.accept": "Accept",
+  "notification_requests.dismiss": "Dismiss",
+  "notification_requests.notifications_from": "Notifications from {name}",
+  "notification_requests.title": "Filtered notifications",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
   "notifications.column_settings.admin.report": "New reports:",
@@ -448,7 +506,6 @@
   "notifications.column_settings.favourite": "Shines:",
   "notifications.column_settings.filter_bar.advanced": "Display all categories",
   "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.follow_request": "New follow requests:",
   "notifications.column_settings.mention": "Mentions:",
@@ -474,6 +531,15 @@
   "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_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications.policy.filter_new_accounts.hint": "Created within the past {days, plural, one {one day} other {# days}}",
+  "notifications.policy.filter_new_accounts_title": "New accounts",
+  "notifications.policy.filter_not_followers_hint": "Including people who have been following you fewer than {days, plural, one {one day} other {# days}}",
+  "notifications.policy.filter_not_followers_title": "People not following you",
+  "notifications.policy.filter_not_following_hint": "Until you manually approve them",
+  "notifications.policy.filter_not_following_title": "People you don't follow",
+  "notifications.policy.filter_private_mentions_hint": "Filtered unless it's in reply to your own mention or if you follow the sender",
+  "notifications.policy.filter_private_mentions_title": "Unsolicited private mentions",
+  "notifications.policy.title": "Filter out notifications from…",
   "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",
@@ -630,13 +696,13 @@
   "server_banner.about_active_users": "Punks active in this community during the last 30 days (Monthly Active Punks)",
   "server_banner.active_users": "active punks",
   "server_banner.administered_by": "Administered by:",
-  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.is_one_of_many": "{domain} is one of the many independent Mastodon servers you can use to participate in the fediverse.",
-  "server_banner.learn_more": "Learn more",
   "server_banner.server_stats": "Community stats:",
   "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.follow_anyone": "Follow anyone across the fediverse and see it all in chronological order. No algorithms, ads, or clickbait in sight.",
+  "sign_in_banner.mastodon_is": "Mastodon is the best way to keep up with what's happening.",
   "sign_in_banner.sign_in": "Login",
   "sign_in_banner.sso_redirect": "Login or Register",
-  "sign_in_banner.text": "Login to follow profiles or hashtags, favorite, share and reply to seeds. You can also interact from your account on a different server.",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_domain": "Open moderation interface for {domain}",
   "status.admin_status": "Open this seed in the moderation interface",
@@ -654,6 +720,7 @@
   "status.edited_x_times": "Adjusted {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Embed",
   "status.favourite": "Shine upon",
+  "status.favourites": "{count, plural, one {shine} other {shines}}",
   "status.filter": "Filter this seed",
   "status.filtered": "Filtered",
   "status.hide": "Hide seed",
@@ -674,6 +741,7 @@
   "status.reblog": "Recycle",
   "status.reblog_private": "Recycle with original visibility",
   "status.reblogged_by": "{name} recycled",
+  "status.reblogs": "{count, plural, one {recycle} other {recycles}}",
   "status.reblogs.empty": "No one has recycled this seed yet. When someone does, they will show up here.",
   "status.redraft": "Uproot & replant",
   "status.remove_bookmark": "Remove bookmark",

docker-compose.yml

@@ -81,10 +81,8 @@ services:
       - ./public/system:/mastodon/public/system
     
   streaming:
-    build: 
+    build: .
-      context: .
+    image: git.solarpunk.moe/solarpunk/mastodon:${MASTO_VERSION}
-      dockerfile: streaming/Dockerfile
-    image: git.solarpunk.moe/solarpunk/mastodon-streaming:${MASTO_VERSION}
     restart: always
     env_file: .env.production
     command: node ./streaming