Updating localization files for new release

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

@@ -52,6 +52,7 @@
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for punks you might know or explore trending hashtags.",
   "endorsed_accounts_editor.endorsed_accounts": "Featured accounts",
   "favourite_modal.combo": "You can press {combo} to skip this next time",
+  "firehose.column_settings.allow_local_only": "Show local-only seeds in \"All\"",
   "follow_recommendations.done": "Done",
   "follow_recommendations.heading": "Follow punks you'd like to see seeds from! Here are some suggestions.",
   "follow_recommendations.lead": "Seeds from punks you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow punks just as easily any time!",
@@ -63,12 +64,6 @@
   "keyboard_shortcuts.bookmark": "to bookmark",
   "keyboard_shortcuts.secondary_toot": "to plant seed using secondary privacy setting",
   "keyboard_shortcuts.toggle_collapse": "to collapse/uncollapse seeds",
-  "layout.auto": "Auto",
-  "layout.desktop": "Desktop",
-  "layout.hint.auto": "Automatically chose layout based on “Enable advanced web interface” setting and screen size.",
-  "layout.hint.desktop": "Use multiple-column layout regardless of the “Enable advanced web interface” setting or screen size.",
-  "layout.hint.single": "Use single-column layout regardless of the “Enable advanced web interface” setting or screen size.",
-  "layout.single": "Mobile",
   "media_gallery.sensitive": "Sensitive",
   "moved_to_warning": "This account is marked as moved to {moved_to_link}, and may thus not accept new follows.",
   "navigation_bar.app_settings": "App settings",
@@ -103,12 +98,6 @@
   "onboarding.page_three.search": "Use the search bar to find punks and look at hashtags, such as {illustration} and {introductions}. To look for a punk who is not in this community, use their full handle.",
   "onboarding.page_two.compose": "Plant seeds from the compose column. You can donate images, change privacy settings, and add content warnings with the icons below.",
   "onboarding.skip": "Skip",
-  "search_popout.search_format": "Advanced search format",
-  "search_popout.tips.full_text": "Simple text returns seeds you have planted, shined upon, recycled, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
-  "search_popout.tips.hashtag": "hashtag",
-  "search_popout.tips.status": "seed",
-  "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
-  "search_popout.tips.user": "punk",
   "settings.always_show_spoilers_field": "Always enable the Content Warning field",
   "settings.auto_collapse": "Automatic collapsing",
   "settings.auto_collapse_all": "Everything",
@@ -144,7 +133,6 @@
   "settings.image_backgrounds_media_hint": "If the seed has any media attachment, use the first one as a background",
   "settings.image_backgrounds_users": "Give collapsed seeds an image background",
   "settings.inline_preview_cards": "Inline preview cards for external links",
-  "settings.layout": "Layout:",
   "settings.layout_opts": "Layout options",
   "settings.media": "Media",
   "settings.media_fullwidth": "Full-width media previews",

app/javascript/mastodon/locales/en.json

@@ -26,11 +26,11 @@
   "account.direct": "Privately mention @{name}",
   "account.disable_notifications": "Stop notifying me when @{name} plants",
   "account.domain_blocked": "Domain blocked",
-  "account.edit_profile": "Reimagine yourself",
+  "account.edit_profile": "Rethink yourself",
   "account.enable_notifications": "Notify me when @{name} plants",
   "account.endorse": "Feature on profile",
-  "accoun.featured_tags.last_status_at": "Last seed on {date}",
+  "account.featured_tags.last_status_at": "Last planted on {date}",
-  "account.featured_tags.last_status_never": "No seeds",
+  "account.featured_tags.last_status_never": "Barren crops",
   "account.featured_tags.title": "{name}'s featured hashtags",
   "account.follow": "Follow",
   "account.followers": "Followers",
@@ -49,7 +49,7 @@
   "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
   "account.media": "Media",
   "account.mention": "Mention @{name}",
-  "account.moved_to": "{name} has indicated that their account is now:",
+  "account.moved_to": "{name} has indicated that their new account is now:",
   "account.mute": "Mute @{name}",
   "account.mute_notifications_short": "Mute notifications",
   "account.mute_short": "Mute",
@@ -116,7 +116,7 @@
   "column.directory": "Browse profiles",
   "column.domain_blocks": "Blocked domains",
   "column.favourites": "Shines",
-  "column.firehose": "Live feeds",
+  "column.firehose": "Combined crops",
   "column.follow_requests": "Follow requests",
   "column.home": "Home Crops",
   "column.lists": "Crop Circles",
@@ -137,6 +137,9 @@
   "community.column_settings.remote_only": "Remote only",
   "compose.language.change": "Change language",
   "compose.language.search": "Search languages...",
+  "compose.published.body": "Seed published.",
+  "compose.published.open": "Open",
+  "compose.saved.body": "Seed saved.",
   "compose_form.direct_message_warning_learn_more": "Learn more",
   "compose_form.encryption_warning": "Seeds on the Solarverse are not end-to-end encrypted. Don't whisper anything you wouldn't want others to overhear.",
   "compose_form.hashtag_warning": "This seed won't be listed under any hashtag as it is unlisted. Only global seeds can be searched by hashtag.",
@@ -191,7 +194,6 @@
   "conversation.open": "View thread",
   "conversation.with": "With {names}",
   "copypaste.copied": "Copied",
-  "copypaste.copy": "Copy",
   "copypaste.copy_to_clipboard": "Copy to clipboard",
   "directory.federated": "From known solarverse",
   "directory.local": "From {domain} only",
@@ -296,8 +298,12 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags for this column",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} punk participant} other {{counter} punk participants}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} seed} other {{counter} seeds}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} seed} other {{counter} seeds}} today",
   "hashtag.follow": "Follow hashtag",
   "hashtag.unfollow": "Unfollow hashtag",
+  "hashtags.and_other": "…and {count, plural, other {# more}}",
   "home.actions.go_to_explore": "See what's trending",
   "home.actions.go_to_suggestions": "Find punks to follow",
   "home.column_settings.basic": "Basic",
@@ -306,15 +312,21 @@
   "home.explore_prompt.body": "Your home crops will have a mix of seeds from the hashtags you've chosen to follow, the punks you've chosen to follow, and the seeds they recycle. It's looking pretty barren right now, so how about:",
   "home.explore_prompt.title": "This is your home base within Mastodon.",
   "home.hide_announcements": "Hide proclamations",
+  "home.pending_critical_update.body": "Please update your community as soon as possible!",
+  "home.pending_critical_update.link": "See updates",
+  "home.pending_critical_update.title": "Critical security update available!",
   "home.show_announcements": "Show proclamations",
   "interaction_modal.description.favourite": "With an account on Mastodon, you can shine upon this seed to let the author know you appreciate it and save it for later.",
   "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their seeds in your home crops.",
   "interaction_modal.description.reblog": "With an account on Mastodon, you can recycle this seed to share it with your own followers.",
   "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this seed.",
+  "interaction_modal.login.action": "Take me home",
+  "interaction_modal.login.prompt": "Domain of your home community, e.g. solarpunk.moe",
+  "interaction_modal.no_account_yet": "Not on Mastodon?",
   "interaction_modal.on_another_server": "In a different community",
   "interaction_modal.on_this_server": "In this community",
-  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favorite Mastodon app or the web interface of your Mastodon community.",
+  "interaction_modal.sign_in": "You are not logged in to this community. Where is your account hosted?",
-  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon community or compatible platform if you don't have an account on this one.",
+  "interaction_modal.sign_in_hint": "Tip: That's the website where you signed up. If you don't remember, look for the welcome e-mail in your inbox. You can also enter your full username! (e.g. @punk@solarpunk.moe",
   "interaction_modal.title.favourite": "Shine upon {name}'s seed",
   "interaction_modal.title.follow": "Follow {name}",
   "interaction_modal.title.reblog": "Recycle {name}'s seed",
@@ -386,6 +398,7 @@
   "mute_modal.hide_notifications": "Hide notifications from this punk?",
   "mute_modal.indefinite": "Indefinite",
   "navigation_bar.about": "About",
+  "navigation_bar.advanced_interface": "Open in advanced web interface",
   "navigation_bar.blocks": "Blocked punks",
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Communal crops",
@@ -393,7 +406,7 @@
   "navigation_bar.direct": "Whispers",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Blocked domains",
-  "navigation_bar.edit_profile": "Reimagine yourself",
+  "navigation_bar.edit_profile": "Rethink yourself",
   "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "Shines",
   "navigation_bar.filters": "Muted words",
@@ -403,6 +416,7 @@
   "navigation_bar.lists": "Crop Circles",
   "navigation_bar.logout": "Logout",
   "navigation_bar.mutes": "Muted punks",
+  "navigation_bar.opened_in_classic_interface": "Seeds, punks, and other specific pages are opened by default in the classic web interface.",
   "navigation_bar.personal": "Personal",
   "navigation_bar.pins": "Pinned seeds",
   "navigation_bar.preferences": "Preferences",
@@ -526,6 +540,7 @@
   "reply_indicator.cancel": "Cancel",
   "report.block": "Block",
   "report.block_explanation": "You will not see their seeds. They will not be able to see your seeds or follow you. They will be able to tell that they are blocked.",
+  "report.categories.legal": "Legal",
   "report.categories.other": "Other",
   "report.categories.spam": "Spam",
   "report.categories.violation": "Content violates one or more community rules",
@@ -577,16 +592,20 @@
   "search.quick_action.open_url": "Open URL in Mastodon",
   "search.quick_action.status_search": "Posts matching {x}",
   "search.search_or_paste": "Search or paste URL",
+  "search_popout.full_text_search_disabled_message": "Not available on {domain}.",
+  "search_popout.language_code": "ISO language code",
+  "search_popout.options": "Search options",
   "search_popout.quick_actions": "Quick actions",
   "search_popout.recent": "Recent searches",
+  "search_popout.specific_date": "specific date",
+  "search_popout.user": "punk",
   "search_results.accounts": "Profiles",
   "search_results.all": "All",
   "search_results.hashtags": "Hashtags",
   "search_results.nothing_found": "Could not find anything for these search terms",
+  "search_results.see_all": "See all",
   "search_results.statuses": "Seeds",
-  "search_results.statuses_fts_disabled": "Searching seeds by their content is not enabled in this Mastodon community.",
   "search_results.title": "Search for {q}",
-  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
   "server_banner.about_active_users": "Punks active in this community during the last 30 days (Monthly Active Users)",
   "server_banner.active_users": "active punks",
   "server_banner.administered_by": "Administered by:",
@@ -595,6 +614,7 @@
   "server_banner.server_stats": "Community stats:",
   "sign_in_banner.create_account": "Create account",
   "sign_in_banner.sign_in": "Login",
+  "sign_in_banner.sso_redirect": "Login or Register",
   "sign_in_banner.text": "Login to follow profiles or hashtags, shine upon, recycle, and reply to seeds. You can also interact from your account on a different community.",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_domain": "Open moderation interface for {domain}",
@@ -619,6 +639,8 @@
   "status.history.created": "{name} planted {date}",
   "status.history.edited": "{name} adjusted {date}",
   "status.load_more": "Load more",
+  "status.media.open": "Click to open",
+  "status.media.show": "Click to show",
   "status.media_hidden": "Media hidden",
   "status.mention": "Mention @{name}",
   "status.more": "More",
@@ -649,14 +671,12 @@
   "status.title.with_attachments": "{user} planted {attachmentCount, plural, one {an attachment} other {{attachmentCount} attachments}}",
   "status.translate": "Translate",
   "status.translated_from_with": "Translated from {lang} using {provider}",
-  "status.uncached_media_warning": "Not available",
+  "status.uncached_media_warning": "Preview not available",
   "status.unmute_conversation": "Unmute thread",
   "status.unpin": "Unpin from profile",
   "subscribed_languages.lead": "Only seeds in selected languages will appear on your home and crop circles after the change. Select none to receive seeds in all languages.",
   "subscribed_languages.save": "Save changes",
   "subscribed_languages.target": "Change subscribed languages for {target}",
-  "suggestions.dismiss": "Dismiss suggestion",
-  "suggestions.header": "You might be interested in…",
   "tabs_bar.home": "Home",
   "tabs_bar.notifications": "Notifications",
   "time_remaining.days": "{number, plural, one {# day} other {# days}} left",