Merge remote-tracking branch 'parent/main' into upstream-20240227

Gemfile.lock

@@ -333,7 +333,7 @@ GEM
     http-form_data (2.3.0)
     http_accept_language (2.1.1)
     httpclient (2.8.3)
-    httplog (1.6.2)
+    httplog (1.6.3)
       rack (>= 2.0)
       rainbow (>= 2.0.0)
     i18n (1.14.1)

app/controllers/application_controller.rb

@@ -178,7 +178,7 @@ def check_self_destruct!
 
     respond_to do |format|
       format.any  { render 'errors/self_destruct', layout: 'auth', status: 410, formats: [:html] }
-      format.json { render json: { error: Rack::Utils::HTTP_STATUS_CODES[410] }, status: code }
+      format.json { render json: { error: Rack::Utils::HTTP_STATUS_CODES[410] }, status: 410 }
     end
   end
 

app/javascript/mastodon/features/explore/index.jsx

@@ -58,7 +58,7 @@ class Explore extends PureComponent {
     return (
       <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.title)}>
         <ColumnHeader
-          icon={isSearching ? 'search' : 'hashtag'}
+          icon={isSearching ? 'search' : 'explore'}
           iconComponent={isSearching ? SearchIcon : ExploreIcon}
           title={intl.formatMessage(isSearching ? messages.searchResults : messages.title)}
           onClick={this.handleHeaderClick}

app/javascript/mastodon/features/getting_started/index.jsx

@@ -117,7 +117,7 @@ class GettingStarted extends ImmutablePureComponent {
 
     if (showTrends) {
       navItems.push(
-        <ColumnLink key='explore' icon='hashtag' iconComponent={TagIcon} text={intl.formatMessage(messages.explore)} to='/explore' />,
+        <ColumnLink key='explore' icon='explore' iconComponent={TagIcon} text={intl.formatMessage(messages.explore)} to='/explore' />,
       );
     }
 

app/javascript/mastodon/features/ui/components/navigation_panel.jsx

@@ -74,7 +74,7 @@ class NavigationPanel extends Component {
     const { signedIn, disabledAccountId } = this.context.identity;
 
     const explorer = (trendsEnabled ? (
-      <ColumnLink transparent to='/explore' icon='hashtag' iconComponent={ExploreIcon} text={intl.formatMessage(messages.explore)} />
+      <ColumnLink transparent to='/explore' icon='explore' iconComponent={ExploreIcon} text={intl.formatMessage(messages.explore)} />
     ) : (
       <ColumnLink transparent to='/search' icon='search' iconComponent={SearchIcon} text={intl.formatMessage(messages.search)} />
     ));

app/javascript/mastodon/locales/fr-CA.json

@@ -277,6 +277,17 @@
   "follow_request.authorize": "Autoriser",
   "follow_request.reject": "Rejeter",
   "follow_requests.unlocked_explanation": "Même si votre compte n’est pas privé, l’équipe de {domain} a pensé que vous pourriez vouloir peut-être consulter manuellement les demandes d'abonnement de ces comptes.",
+  "follow_suggestions.curated_suggestion": "Choix du staff",
+  "follow_suggestions.dismiss": "Ne plus afficher",
+  "follow_suggestions.hints.featured": "Ce profil a été sélectionné par l'équipe de {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Ce profil est populaire parmi les personnes que vous suivez.",
+  "follow_suggestions.hints.most_followed": "Ce profil est l'un des plus suivis sur {domain}.",
+  "follow_suggestions.hints.most_interactions": "Ce profil a récemment fait l'objet d'une grande attention sur {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Ce profil est similaire aux profils que vous avez suivis le plus récemment.",
+  "follow_suggestions.personalized_suggestion": "Suggestion personnalisée",
+  "follow_suggestions.popular_suggestion": "Suggestion populaire",
+  "follow_suggestions.view_all": "Tout afficher",
+  "follow_suggestions.who_to_follow": "Qui suivre",
   "followed_tags": "Hashtags suivis",
   "footer.about": "À propos",
   "footer.directory": "Annuaire des profils",

app/javascript/mastodon/locales/fr.json

@@ -277,6 +277,17 @@
   "follow_request.authorize": "Accepter",
   "follow_request.reject": "Rejeter",
   "follow_requests.unlocked_explanation": "Même si votre compte n’est pas privé, l’équipe de {domain} a pensé que vous pourriez vouloir consulter manuellement les demandes de suivi de ces comptes.",
+  "follow_suggestions.curated_suggestion": "Choix du staff",
+  "follow_suggestions.dismiss": "Ne plus afficher",
+  "follow_suggestions.hints.featured": "Ce profil a été sélectionné par l'équipe de {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Ce profil est populaire parmi les personnes que vous suivez.",
+  "follow_suggestions.hints.most_followed": "Ce profil est l'un des plus suivis sur {domain}.",
+  "follow_suggestions.hints.most_interactions": "Ce profil a récemment fait l'objet d'une grande attention sur {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Ce profil est similaire aux profils que vous avez suivis le plus récemment.",
+  "follow_suggestions.personalized_suggestion": "Suggestion personnalisée",
+  "follow_suggestions.popular_suggestion": "Suggestion populaire",
+  "follow_suggestions.view_all": "Tout afficher",
+  "follow_suggestions.who_to_follow": "Qui suivre",
   "followed_tags": "Hashtags suivis",
   "footer.about": "À propos",
   "footer.directory": "Annuaire des profils",

app/javascript/mastodon/locales/ie.json

@@ -277,7 +277,13 @@
   "follow_request.authorize": "Autorisar",
   "follow_request.reject": "Rejecter",
   "follow_requests.unlocked_explanation": "Benque tu conto ne es cludet, li administratores de {domain} pensat que tu fórsan vell voler tractar seque-petitiones de tis-ci contos manualmen.",
+  "follow_suggestions.curated_suggestion": "Selection del employates",
   "follow_suggestions.dismiss": "Ne monstrar plu",
+  "follow_suggestions.hints.featured": "Ti-ci profil ha esset selectet directmen del equip de {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Ti-ci profil es populari ínter tis qui tu seque.",
+  "follow_suggestions.hints.most_followed": "Ti-ci profil es un del max sequet sur {domain}.",
+  "follow_suggestions.hints.most_interactions": "Ti-ci profil ha recivet mult atention recentmen sur {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Ti-ci profil es simil al profiles queles tu ha recentmen sequet.",
   "follow_suggestions.personalized_suggestion": "Personalisat suggestion",
   "follow_suggestions.popular_suggestion": "Populari suggestion",
   "follow_suggestions.view_all": "Vider omnicos",

app/javascript/mastodon/locales/kab.json

@@ -22,6 +22,7 @@
   "account.followers": "Imeḍfaren",
   "account.followers.empty": "Ar tura, ulac yiwen i yeṭṭafaṛen amseqdac-agi.",
   "account.followers_counter": "{count, plural, one {{count} n umeḍfar} other {{count} n imeḍfaren}}",
+  "account.following": "Yeṭṭafaṛ",
   "account.following_counter": "{count, plural, one {{counter} yettwaḍfaren} other {{counter} yettwaḍfaren}}",
   "account.follows.empty": "Ar tura, amseqdac-agi ur yeṭṭafaṛ yiwen.",
   "account.go_to_profile": "Ddu ɣer umaɣnu",
@@ -39,6 +40,7 @@
   "account.posts_with_replies": "Tisuffaɣ d tririyin",
   "account.report": "Cetki ɣef @{name}",
   "account.requested": "Di laɛḍil ad yettwaqbel. Ssit i wakken ad yefsex usuter n uḍfar",
+  "account.requested_follow": "{name} yessuter ad k-yeḍfer",
   "account.share": "Bḍu amaɣnu n @{name}",
   "account.show_reblogs": "Ssken-d inebḍa n @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} n tsuffeɣt} other {{counter} n tsuffaɣ}}",
@@ -57,7 +59,7 @@
   "alert.unexpected.title": "Ayhuh!",
   "announcement.announcement": "Ulɣu",
   "audio.hide": "Ffer amesli",
-  "boost_modal.combo": "Tzemreḍ ad tetekkiḍ ɣef {combo} akken ad tessurfeḍ aya tikelt-nniḍen",
+  "boost_modal.combo": "Tzemreḍ ad tsiteḍ ɣef {combo} akken ad tzegleḍ aya tikelt i d-iteddun",
   "bundle_column_error.copy_stacktrace": "Nɣel tuccḍa n uneqqis",
   "bundle_column_error.error.title": "Uh, ala !",
   "bundle_column_error.network.title": "Tuccḍa deg uẓeṭṭa",
@@ -73,7 +75,8 @@
   "column.blocks": "Imiḍanen yettusḥebsen",
   "column.bookmarks": "Ticraḍ",
   "column.community": "Tasuddemt tadigant",
-  "column.directory": "Inig deg imaɣnuten",
+  "column.direct": "Tabdarin tusligin",
+  "column.directory": "Inig deg imeɣna",
   "column.domain_blocks": "Taɣulin yeffren",
   "column.favourites": "Imenyafen",
   "column.follow_requests": "Isuturen n teḍfeṛt",
@@ -105,6 +108,7 @@
   "compose_form.lock_disclaimer.lock": "yettwacekkel",
   "compose_form.placeholder": "D acu i itezzin deg wallaɣ?",
   "compose_form.poll.duration": "Tanzagt n tefrant",
+  "compose_form.poll.multiple": "Aṭas n ufran",
   "compose_form.poll.option_placeholder": "Taxtiṛt {number}",
   "compose_form.poll.single": "Fren yiwen",
   "compose_form.publish": "Suffeɣ",
@@ -187,17 +191,20 @@
   "explore.trending_links": "Isallen",
   "explore.trending_statuses": "Tisuffaɣ",
   "explore.trending_tags": "Ihacṭagen",
+  "filter_modal.added.review_and_configure_title": "Iɣewwaṛen n imzizdig",
   "filter_modal.added.settings_link": "asebter n yiɣewwaṛen",
   "filter_modal.select_filter.prompt_new": "Taggayt tamaynutt : {name}",
   "filter_modal.select_filter.search": "Nadi neɣ snulfu-d",
   "firehose.all": "Akk",
   "firehose.local": "Deg uqeddac-ayi",
+  "firehose.remote": "Iqeddacen nniḍen",
   "follow_request.authorize": "Ssireg",
   "follow_request.reject": "Agi",
+  "follow_suggestions.dismiss": "Ur ttɛawad ara ad t-id-sekneṭ",
   "follow_suggestions.who_to_follow": "Menhu ara ḍefṛeḍ",
   "followed_tags": "Ihacṭagen yettwaḍfaren",
   "footer.about": "Ɣef",
-  "footer.directory": "Akaram n imaɣnuten",
+  "footer.directory": "Akaram n imeɣna",
   "footer.get_app": "Awi-d asnas",
   "footer.invite": "Ɛreḍ-d kra n yimdanen",
   "footer.keyboard_shortcuts": "Inegzumen n unasiw",
@@ -221,9 +228,12 @@
   "home.column_settings.show_reblogs": "Ssken-d beṭṭu",
   "home.column_settings.show_replies": "Ssken-d tiririyin",
   "home.hide_announcements": "Ffer ulɣuyen",
+  "home.pending_critical_update.body": "Ma ulac aɣilif, leqqem aqeddac-ik Mastodon akken kan tzemreḍ !",
   "home.show_announcements": "Ssken-d ulɣuyen",
   "interaction_modal.no_account_yet": "Ulac-ik·ikem deg Maṣṭudun?",
+  "interaction_modal.on_another_server": "Deg uqeddac nniḍen",
   "interaction_modal.on_this_server": "Deg uqeddac-ayi",
+  "interaction_modal.sign_in": "Ur tekcimeḍ ara ɣer uqeddac-a. Anda yella umiḍan-ik·im ?",
   "interaction_modal.title.follow": "Ḍfer {name}",
   "intervals.full.days": "{number, plural, one {# n wass} other {# n wussan}}",
   "intervals.full.hours": "{number, plural, one {# n usarag} other {# n yesragen}}",
@@ -351,12 +361,15 @@
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
   "onboarding.profile.display_name": "Isem ara d-yettwaskanen",
+  "onboarding.share.message": "Nekk d {username} deg #Mastodon! Ḍfer iyi-d sya {url}",
   "onboarding.share.title": "Bḍu amaɣnu-inek·inem",
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
   "onboarding.start.skip": "Want to skip right ahead?",
+  "onboarding.start.title": "Tseggmeḍ-tt !",
   "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
   "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
   "onboarding.steps.publish_status.body": "Say hello to the world.",
+  "onboarding.steps.publish_status.title": "Aru tasuffeɣt-inek·inem tamezwarutt",
   "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
   "onboarding.steps.setup_profile.title": "Customize your profile",
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
@@ -371,7 +384,10 @@
   "poll_button.add_poll": "Rnu asenqed",
   "poll_button.remove_poll": "Kkes asenqed",
   "privacy.change": "Seggem tabaḍnit n yizen",
+  "privacy.direct.long": "Wid akk i d-yettwabdaren deg tuffeɣt",
+  "privacy.private.long": "Ala wid i k-yeṭṭafaṛen",
   "privacy.private.short": "Imeḍfaren",
+  "privacy.public.long": "Kra n win yellan deg Masṭudun neɣ berra-s",
   "privacy.public.short": "Azayez",
   "privacy_policy.title": "Tasertit tabaḍnit",
   "refresh": "Smiren",
@@ -404,9 +420,14 @@
   "report_notification.categories.other": "Ayen nniḍen",
   "report_notification.categories.spam": "Aspam",
   "report_notification.open": "Ldi aneqqis",
+  "search.no_recent_searches": "Ulac inadiyen ineggura",
   "search.placeholder": "Nadi",
   "search.search_or_paste": "Nadi neɣ senṭeḍ URL",
+  "search_popout.language_code": "Tangalt ISO n tutlayt",
+  "search_popout.options": "Iwellihen n unadi",
+  "search_popout.recent": "Inadiyen ineggura",
   "search_popout.user": "amseqdac",
+  "search_results.accounts": "Imeɣna",
   "search_results.all": "Akk",
   "search_results.hashtags": "Ihacṭagen",
   "search_results.see_all": "Wali-ten akk",
@@ -471,7 +492,7 @@
   "timeline_hint.resources.followers": "Imeḍfaṛen",
   "timeline_hint.resources.follows": "T·Yeṭafaṛ",
   "timeline_hint.resources.statuses": "Tisuffaɣ tiqdimin",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} n wemdan} other {{counter} n medden}} deg {days, plural, one {ass} other {{days} n wussan}} iɛeddan",
   "trends.trending_now": "Ayen mucaɛen tura",
   "ui.beforeunload": "Arewway-ik·im ad iruḥ ma yella tefeɣ-d deg Maṣṭudun.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/ko.json

@@ -536,7 +536,7 @@
   "privacy.public.long": "마스토돈 내외 모두",
   "privacy.public.short": "공개",
   "privacy.unlisted.additional": "공개와 똑같지만 게시물이 실시간 피드나 해시태그, 둘러보기, (계정 설정에서 허용했더라도) 마스토돈 검색에서 제외됩니다.",
-  "privacy.unlisted.long": "더 적은 알고리즘 팡파레",
+  "privacy.unlisted.long": "더 적은 알고리즘 팡파르",
   "privacy.unlisted.short": "조용한 공개",
   "privacy_policy.last_updated": "{date}에 마지막으로 업데이트됨",
   "privacy_policy.title": "개인정보처리방침",

app/javascript/mastodon/locales/sk.json

@@ -277,6 +277,7 @@
   "follow_request.authorize": "Povoľ prístup",
   "follow_request.reject": "Odmietni",
   "follow_requests.unlocked_explanation": "Síce Váš učet nie je uzamknutý, ale {domain} tím si myslel že môžete chcieť skontrolovať žiadosti o sledovanie z týchto účtov manuálne.",
+  "follow_suggestions.curated_suggestion": "Staff pick",
   "follow_suggestions.dismiss": "Znovu nezobrazuj",
   "follow_suggestions.personalized_suggestion": "Prispôsobené odporúčania",
   "follow_suggestions.popular_suggestion": "Populárne návrhy",

app/javascript/mastodon/locales/tai.json

@@ -2,25 +2,25 @@
   "about.blocks": "Siū kuán-tsè ê su-hāu-khì",
   "about.contact": "Liân-lo̍k:",
   "about.disclaimer": "Ling-khí-tshiūnn sī tsi̍t-ê khai-guân nńg-thé，i ê siong-phiau sī Mastodon gGmbH.",
-  "account.badges.bot": "Bot",
-  "account.cancel_follow_request": "Withdraw follow request",
+  "account.badges.bot": "Tsū-tōng-ê",
+  "account.cancel_follow_request": "Mài-koh tui-tsong",
   "account.media": "Mûi-thé",
   "account.mention": "Thê-khí @{name}",
-  "account.posts": "Toots",
-  "account.posts_with_replies": "Toots and replies",
-  "account.requested": "Awaiting approval",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
-  "account_note.placeholder": "Click to add a note",
-  "column.pins": "Pinned toot",
-  "community.column_settings.media_only": "Media only",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
-  "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
-  "compose_form.placeholder": "What is on your mind?",
-  "compose_form.publish_form": "Publish",
-  "compose_form.spoiler.marked": "Text is hidden behind warning",
-  "compose_form.spoiler.unmarked": "Text is not hidden",
-  "confirmations.delete.message": "Are you sure you want to delete this status?",
-  "confirmations.domain_block.confirm": "Hide entire domain",
+  "account.posts": "Huah-siann",
+  "account.posts_with_replies": "Huah-siann kah huê-ìng",
+  "account.requested": "Tán-thāi phue-tsún",
+  "account.statuses_counter": "{count, plural, one {{counter} Huah-siann} other {{counter} Huah-siann}}",
+  "account_note.placeholder": "Tiám tsi̍t-ē ka-thiam pī-tsù",
+  "column.pins": "Tah thâu-tsîng ê huah-siann",
+  "community.column_settings.media_only": "Kan-na muî-thé",
+  "compose_form.encryption_warning": "Tī Mastodon tah huah-siann m̄-sī tuan-tuì-tuan ka-pì ê. M̄-thang tī Mastodon hun-hióng jīm-hô bín-kám ê tsū-sìn.",
+  "compose_form.hashtag_warning": "Tsit-ê huah-siann in-uī m̄-sī kong-khai ê, sóo-í buē tī jīm-hô tsú-tê piau-tshiam hián-sī. Kan-na kong-khai ê huah-siann ē-tàng hōo tsú-tê piau-tshiam tshâ-tshuē.",
+  "compose_form.placeholder": "Lí teh siūnn siánn?",
+  "compose_form.publish_form": "Huah--tshut-khì",
+  "compose_form.spoiler.marked": "Î-tû luē-iông kíng-kò",
+  "compose_form.spoiler.unmarked": "Tsing-ka luē-iông kíng-kò",
+  "confirmations.delete.message": "Lí kám bueh thâi-tiāu tsi̍t-ē huah-siann?",
+  "confirmations.domain_block.confirm": "Hong-só tsíng-kò bāng-hi̍k",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
@@ -46,7 +46,7 @@
   "keyboard_shortcuts.muted": "to open muted users list",
   "keyboard_shortcuts.my_profile": "to open your profile",
   "keyboard_shortcuts.notifications": "to open notifications column",
-  "keyboard_shortcuts.open_media": "to open media",
+  "keyboard_shortcuts.open_media": "Khui muî-thé",
   "keyboard_shortcuts.pinned": "to open pinned toots list",
   "keyboard_shortcuts.profile": "to open author's profile",
   "keyboard_shortcuts.reply": "to reply",