Merge pull request #254 from kmycode/upstream-20231108

Upstream 20231108

app/helpers/admin/account_moderation_notes_helper.rb

@@ -6,7 +6,7 @@ module Admin::AccountModerationNotesHelper
 
     link_to path || admin_account_path(account.id), class: name_tag_classes(account), title: account.acct do
       safe_join([
-                  image_tag(account.avatar.url, width: 15, height: 15, alt: display_name(account), class: 'avatar'),
+                  image_tag(account.avatar.url, width: 15, height: 15, alt: '', class: 'avatar'),
                   content_tag(:span, account.acct, class: 'username'),
                 ], ' ')
     end

app/helpers/settings_helper.rb

@@ -25,7 +25,7 @@ module SettingsHelper
     return if account.nil?
 
     link_to ActivityPub::TagManager.instance.url_for(account), class: 'name-tag', title: account.acct do
-      safe_join([image_tag(account.avatar.url, width: 15, height: 15, alt: display_name(account), class: 'avatar'), content_tag(:span, account.acct, class: 'username')], ' ')
+      safe_join([image_tag(account.avatar.url, width: 15, height: 15, alt: '', class: 'avatar'), content_tag(:span, account.acct, class: 'username')], ' ')
     end
   end
 end

app/javascript/mastodon/actions/notifications.js

@@ -107,8 +107,8 @@ export function updateNotifications(notification, intlMessages, intlLocale) {
         dispatch(importFetchedAccount(notification.report.target_account));
       }
 
-      
-      dispatch(notificationsUpdate({ notification }, preferPendingItems, playSound && !filtered));
+
+      dispatch(notificationsUpdate({ notification, preferPendingItems, playSound: playSound && !filtered}));
 
       fetchRelatedRelationships(dispatch, [notification]);
     } else if (playSound && !filtered) {

app/javascript/mastodon/components/__tests__/__snapshots__/avatar-test.jsx.snap

@@ -13,7 +13,7 @@ exports[`<Avatar /> Autoplay renders a animated avatar 1`] = `
   }
 >
   <img
-    alt="alice"
+    alt=""
     src="/animated/alice.gif"
   />
 </div>
@@ -32,7 +32,7 @@ exports[`<Avatar /> Still renders a still avatar 1`] = `
   }
 >
   <img
-    alt="alice"
+    alt=""
     src="/static/alice.jpg"
   />
 </div>

app/javascript/mastodon/components/avatar.tsx

@@ -42,7 +42,7 @@ export const Avatar: React.FC<Props> = ({
       onMouseLeave={handleMouseLeave}
       style={style}
     >
-      {src && <img src={src} alt={account?.get('acct')} />}
+      {src && <img src={src} alt='' />}
     </div>
   );
 };

app/javascript/mastodon/features/account_timeline/containers/header_container.jsx

@@ -207,7 +207,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
       modalType: 'IMAGE',
       modalProps: {
         src: account.get('avatar'),
-        alt: account.get('acct'),
+        alt: '',
       },
     }));
   },

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

@@ -19,6 +19,7 @@ import { throttle } from 'lodash';
 
 import { Blurhash } from 'mastodon/components/blurhash';
 import { Icon }  from 'mastodon/components/icon';
+import { playerSettings } from 'mastodon/settings';
 
 import { displayMedia, useBlurhash } from '../../initial_state';
 import { isFullscreen, requestFullscreen, exitFullscreen } from '../ui/util/fullscreen';
@@ -226,8 +227,8 @@ class Video extends PureComponent {
 
     if(!isNaN(x)) {
       this.setState((state) => ({ volume: x, muted: state.muted && x === 0 }), () => {
-        this.video.volume = x;
-        this.video.muted = this.state.muted;
+        this._syncVideoToVolumeState(x);
+        this._saveVolumeState(x);
       });
     }
   }, 15);
@@ -365,6 +366,8 @@ class Video extends PureComponent {
     document.addEventListener('MSFullscreenChange', this.handleFullscreenChange, true);
 
     window.addEventListener('scroll', this.handleScroll);
+
+    this._syncVideoFromLocalStorage();
   }
 
   componentWillUnmount () {
@@ -437,8 +440,24 @@ class Video extends PureComponent {
     const muted = !(this.video.muted || this.state.volume === 0);
 
     this.setState((state) => ({ muted, volume: Math.max(state.volume || 0.5, 0.05) }), () => {
-      this.video.volume = this.state.volume;
-      this.video.muted = this.state.muted;
+      this._syncVideoToVolumeState();
+      this._saveVolumeState();
+    });
+  };
+
+  _syncVideoToVolumeState = (volume = null, muted = null) => {
+    this.video.volume = volume ?? this.state.volume;
+    this.video.muted = muted ?? this.state.muted;
+  };
+
+  _saveVolumeState = (volume = null, muted = null) => {
+    playerSettings.set('volume', volume ?? this.state.volume);
+    playerSettings.set('muted', muted ?? this.state.muted);
+  };
+
+  _syncVideoFromLocalStorage = () => {
+    this.setState({ volume: playerSettings.get('volume') ?? 0.5, muted: playerSettings.get('muted') ?? false }, () => {
+      this._syncVideoToVolumeState();
     });
   };
 
@@ -480,6 +499,7 @@ class Video extends PureComponent {
 
   handleVolumeChange = () => {
     this.setState({ volume: this.video.volume, muted: this.video.muted });
+    this._saveVolumeState(this.video.volume, this.video.muted);
   };
 
   handleOpenVideo = () => {

app/javascript/mastodon/locales/fi.json

@@ -1,6 +1,6 @@
 {
   "about.blocks": "Moderoidut palvelimet",
-  "about.contact": "Ota yhteyttä:",
+  "about.contact": "Ota yhteys:",
   "about.disclaimer": "Mastodon on vapaa avoimen lähdekoodin ohjelmisto ja Mastodon gGmbH:n tavaramerkki.",
   "about.domain_blocks.no_reason_available": "Syytä ei ole ilmoitettu",
   "about.domain_blocks.preamble": "Mastodonin avulla voidaan yleensä tarkastella minkä tahansa fediversumiin kuuluvan palvelimen sisältöä ja vuorovaikuttaa eri palvelinten käyttäjien kanssa. Nämä ovat tälle palvelimelle määritetyt poikkeukset.",

app/javascript/mastodon/locales/gl.json

@@ -39,7 +39,7 @@
   "account.follows.empty": "Esta usuaria aínda non segue a ninguén.",
   "account.follows_you": "Séguete",
   "account.go_to_profile": "Ir ao perfil",
-  "account.hide_reblogs": "Agochar repeticións de @{name}",
+  "account.hide_reblogs": "Agochar promocións de @{name}",
   "account.in_memoriam": "Lembranzas.",
   "account.joined_short": "Uniuse",
   "account.languages": "Modificar os idiomas subscritos",
@@ -518,7 +518,7 @@
   "privacy.public.long": "Visible por todas",
   "privacy.public.short": "Público",
   "privacy.unlisted.long": "Visible por todas, pero excluída da sección descubrir",
-  "privacy.unlisted.short": "Non listado",
+  "privacy.unlisted.short": "Sen listar",
   "privacy_policy.last_updated": "Actualizado por última vez no {date}",
   "privacy_policy.title": "Política de Privacidade",
   "refresh": "Actualizar",

app/javascript/mastodon/locales/he.json

@@ -143,7 +143,7 @@
   "compose_form.hashtag_warning": "הודעה זו לא תרשם תחת תגיות הקבצה היות והנראות שלה איננה 'ציבורית'. רק הודעות ציבוריות ימצאו בחיפוש תגיות הקבצה.",
   "compose_form.lock_disclaimer": "חשבונך אינו {locked}. כל אחד יוכל לעקוב אחריך כדי לקרוא את הודעותיך המיועדות לעוקבים בלבד.",
   "compose_form.lock_disclaimer.lock": "נעול",
-  "compose_form.placeholder": "על מה את/ה חושב/ת ?",
+  "compose_form.placeholder": "על מה את.ה חושב.ת?",
   "compose_form.poll.add_option": "הוסיפו בחירה",
   "compose_form.poll.duration": "משך הסקר",
   "compose_form.poll.option_placeholder": "אפשרות מספר {number}",
@@ -235,7 +235,7 @@
   "empty_column.favourites": "עוד לא חיבבו את ההודעה הזו. כאשר זה יקרה, החיבובים יופיעו כאן.",
   "empty_column.follow_requests": "אין לך שום בקשות מעקב עדיין. לכשיתקבלו כאלה, הן תופענה כאן.",
   "empty_column.followed_tags": "עוד לא עקבת אחרי תגיות. כשיהיו לך תגיות נעקבות, ההודעות יופיעו פה.",
-  "empty_column.hashtag": "אין כלום בהאשתג הזה עדיין.",
+  "empty_column.hashtag": "אין כלום בתגית הזאת עדיין.",
   "empty_column.home": "פיד הבית ריק ! אפשר לבקר ב{public} או להשתמש בחיפוש כדי להתחיל ולהכיר משתמשים/ות אחרים/ות. {suggestions}",
   "empty_column.list": "אין עדיין פריטים ברשימה. כאשר חברים ברשימה הזאת יפרסמו הודעות חדשות, הן יופיעו פה.",
   "empty_column.lists": "אין לך שום רשימות עדיין. לכשיהיו, הן תופענה כאן.",
@@ -278,7 +278,7 @@
   "follow_requests.unlocked_explanation": "למרות שחשבונך אינו נעול, צוות {domain} חושב שאולי כדאי לוודא את בקשות המעקב האלה ידנית.",
   "followed_tags": "התגיות שהחשבון שלך עוקב אחריהן",
   "footer.about": "אודות",
-  "footer.directory": "מדריך פרופילים",
+  "footer.directory": "ספריית פרופילים",
   "footer.get_app": "להתקנת היישומון",
   "footer.invite": "להזמין אנשים",
   "footer.keyboard_shortcuts": "קיצורי מקלדת",

app/javascript/mastodon/locales/hr.json

@@ -1,12 +1,16 @@
 {
+  "about.blocks": "Moderirani poslužitelji",
   "about.contact": "Kontakt:",
   "about.domain_blocks.no_reason_available": "Razlog nije dostupan",
+  "about.domain_blocks.suspended.title": "Suspendiran",
+  "about.rules": "Pravila servera",
   "account.account_note_header": "Bilješka",
   "account.add_or_remove_from_list": "Dodaj ili ukloni s liste",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grupa",
   "account.block": "Blokiraj @{name}",
   "account.block_domain": "Blokiraj domenu {domain}",
+  "account.block_short": "Blokiraj",
   "account.blocked": "Blokirano",
   "account.browse_more_on_origin_server": "Pogledajte više na izvornom profilu",
   "account.cancel_follow_request": "Withdraw follow request",
@@ -15,17 +19,20 @@
   "account.edit_profile": "Uredi profil",
   "account.enable_notifications": "Obavjesti me kada @{name} napravi objavu",
   "account.endorse": "Istakni na profilu",
+  "account.featured_tags.last_status_at": "Zadnji post {date}",
   "account.featured_tags.last_status_never": "Nema postova",
   "account.follow": "Prati",
   "account.followers": "Pratitelji",
   "account.followers.empty": "Nitko još ne prati korisnika/cu.",
   "account.followers_counter": "{count, plural, one {{counter} pratitelj} other {{counter} pratitelja}}",
+  "account.following": "Pratim",
   "account.following_counter": "{count, plural, one {{counter} praćeni} few{{counter} praćena} other {{counter} praćenih}}",
   "account.follows.empty": "Korisnik/ca još ne prati nikoga.",
   "account.follows_you": "Prati te",
   "account.go_to_profile": "Idi na profil",
   "account.hide_reblogs": "Sakrij boostove od @{name}",
   "account.in_memoriam": "U sjećanje.",
+  "account.joined_short": "Pridružen",
   "account.link_verified_on": "Vlasništvo ove poveznice provjereno je {date}",
   "account.locked_info": "Status privatnosti ovog računa postavljen je na zaključano. Vlasnik ručno pregledava tko ih može pratiti.",
   "account.media": "Medijski sadržaj",
@@ -65,13 +72,17 @@
   "bundle_column_error.error.title": "Oh, ne!",
   "bundle_column_error.network.title": "Greška mreže",
   "bundle_column_error.retry": "Pokušajte ponovno",
+  "bundle_column_error.return": "Na glavnu",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Zatvori",
   "bundle_modal_error.message": "Nešto je pošlo po zlu tijekom učitavanja ove komponente.",
   "bundle_modal_error.retry": "Pokušajte ponovno",
+  "closed_registrations_modal.find_another_server": "Nađi drugi server",
+  "column.about": "O aplikaciji",
   "column.blocks": "Blokirani korisnici",
   "column.bookmarks": "Knjižne oznake",
   "column.community": "Lokalna vremenska crta",
+  "column.direct": "Privatna spominjanja",
   "column.directory": "Pregledavanje profila",
   "column.domain_blocks": "Blokirane domene",
   "column.favourites": "Favoriti",
@@ -95,6 +106,7 @@
   "community.column_settings.remote_only": "Samo udaljeno",
   "compose.language.change": "Promijeni jezik",
   "compose.language.search": "Pretraži jezike...",
+  "compose.published.body": "Post je objavljen.",
   "compose.published.open": "Otvori",
   "compose.saved.body": "Post spremljen.",
   "compose_form.direct_message_warning_learn_more": "Saznajte više",
@@ -132,6 +144,7 @@
   "confirmations.discard_edit_media.message": "Postoje nespremljene promjene u opisu medija ili u pretpregledu, svejedno ih odbaciti?",
   "confirmations.domain_block.confirm": "Blokiraj cijelu domenu",
   "confirmations.domain_block.message": "Jeste li zaista, zaista sigurni da želite blokirati cijelu domenu {domain}? U većini slučajeva dovoljno je i preferirano nekoliko ciljanih blokiranja ili utišavanja. Nećete vidjeti sadržaj s te domene ni u kojim javnim vremenskim crtama ili Vašim obavijestima. Vaši pratitelji s te domene bit će uklonjeni.",
+  "confirmations.edit.confirm": "Uredi",
   "confirmations.logout.confirm": "Odjavi se",
   "confirmations.logout.message": "Jeste li sigurni da se želite odjaviti?",
   "confirmations.mute.confirm": "Utišaj",
@@ -146,10 +159,14 @@
   "conversation.mark_as_read": "Označi kao pročitano",
   "conversation.open": "Prikaži razgovor",
   "conversation.with": "S {names}",
+  "copypaste.copied": "Kopirano",
+  "copypaste.copy_to_clipboard": "Kopiraj u međuspremnik",
   "directory.federated": "Iz znanog fediversa",
   "directory.local": "Samo iz {domain}",
   "directory.new_arrivals": "Novi korisnici",
   "directory.recently_active": "Nedavno aktivni",
+  "disabled_account_banner.account_settings": "Postavke računa",
+  "disabled_account_banner.text": "Tvoj račun {disabledAccount} je trenutno onemogućen.",
   "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.",
@@ -172,7 +189,7 @@
   "empty_column.account_timeline": "Ovdje nema tootova!",
   "empty_column.account_unavailable": "Profil nije dostupan",
   "empty_column.blocks": "Još niste blokirali nikoga.",
-  "empty_column.bookmarked_statuses": "Još nemaš niti jedan označeni toot. Kada označiš jedan, prikazad će se ovdje.",
+  "empty_column.bookmarked_statuses": "Još nemaš niti jedan označeni toot. Kada označiš jedan, prikazat će se ovdje.",
   "empty_column.community": "Lokalna vremenska crta je prazna. Napišite nešto javno da biste pokrenuli stvari!",
   "empty_column.domain_blocks": "Još nema blokiranih domena.",
   "empty_column.follow_requests": "Nemaš niti jedan zahtjev za praćenjem. Ako ga dobiješ, prikazat će se ovdje.",
@@ -204,6 +221,7 @@
   "filter_modal.title.status": "Filtriraj objavu",
   "firehose.all": "Sve",
   "firehose.local": "Ovaj server",
+  "firehose.remote": "Drugi serveri",
   "follow_request.authorize": "Autoriziraj",
   "follow_request.reject": "Odbij",
   "footer.about": "O aplikaciji",
@@ -235,6 +253,7 @@
   "interaction_modal.login.action": "Odvedi me kući",
   "interaction_modal.no_account_yet": "Nisi na Mastodonu?",
   "interaction_modal.on_this_server": "Na ovom serveru",
+  "interaction_modal.title.follow": "Prati {name}",
   "intervals.full.days": "{number, plural, one {# dan} other {# dana}}",
   "intervals.full.hours": "{number, plural, one {# sat} few {# sata} other {# sati}}",
   "intervals.full.minutes": "{number, plural, one {# minuta} few {# minute} other {# minuta}}",
@@ -247,6 +266,7 @@
   "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "za pomak dolje na listi",
   "keyboard_shortcuts.enter": "za otvaranje toota",
+  "keyboard_shortcuts.favourites": "Otvori listu omiljenih",
   "keyboard_shortcuts.federated": "za otvaranje federalne vremenske crte",
   "keyboard_shortcuts.heading": "Tipkovnički prečaci",
   "keyboard_shortcuts.home": "za otvaranje početne vremenske crte",
@@ -273,6 +293,7 @@
   "lightbox.close": "Zatvori",
   "lightbox.next": "Sljedeće",
   "lightbox.previous": "Prethodno",
+  "limited_account_hint.action": "Svejedno prikaži profil",
   "lists.account.add": "Dodaj na listu",
   "lists.account.remove": "Ukloni s liste",
   "lists.delete": "Izbriši listu",
@@ -289,12 +310,16 @@
   "media_gallery.toggle_visible": "Sakrij {number, plural, one {sliku} other {slike}}",
   "mute_modal.duration": "Trajanje",
   "mute_modal.hide_notifications": "Sakrij obavijesti ovog korisnika?",
+  "navigation_bar.about": "O aplikaciji",
   "navigation_bar.blocks": "Blokirani korisnici",
   "navigation_bar.community_timeline": "Lokalna vremenska crta",
   "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Privatna spominjanja",
   "navigation_bar.discover": "Istraživanje",
   "navigation_bar.domain_blocks": "Blokirane domene",
   "navigation_bar.edit_profile": "Uredi profil",
+  "navigation_bar.explore": "Istraži",
+  "navigation_bar.favourites": "Favoriti",
   "navigation_bar.filters": "Utišane riječi",
   "navigation_bar.follow_requests": "Zahtjevi za praćenje",
   "navigation_bar.follows_and_followers": "Praćeni i pratitelji",
@@ -305,6 +330,7 @@
   "navigation_bar.pins": "Prikvačeni tootovi",
   "navigation_bar.preferences": "Postavke",
   "navigation_bar.public_timeline": "Federalna vremenska crta",
+  "navigation_bar.search": "Traži",
   "navigation_bar.security": "Sigurnost",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.follow": "{name} Vas je počeo/la pratiti",
@@ -332,6 +358,7 @@
   "notifications.filter.follows": "Praćenja",
   "notifications.filter.mentions": "Spominjanja",
   "notifications.filter.polls": "Rezultati anketa",
+  "notifications.grant_permission": "Odobri dopuštenje.",
   "notifications.group": "{count} obavijesti",
   "notifications.mark_as_read": "Označi sve obavijesti kao pročitane",
   "onboarding.actions.go_to_explore": "See what's trending",
@@ -343,12 +370,14 @@
   "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": "Napiši svoj prvi post",
   "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!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "poll.closed": "Završeno",
   "poll.refresh": "Osvježi",
+  "poll.reveal": "Vidi rezultate",
   "poll.total_people": "{count, plural, one {# osoba} few {# osobe} other {# osoba}}",
   "poll.total_votes": "{count, plural, one {# glas} few {# glasa} other {# glasova}}",
   "poll.vote": "Glasaj",
@@ -397,14 +426,41 @@
   "report.reasons.spam_description": "Zlonamjerne poveznice, lažni angažman ili repetitivni odgovori",
   "report.submit": "Pošalji",
   "report.target": "Prijavljivanje korisnika {target}",
+  "report.thanks.title": "Ne želiš vidjeti ovo?",
   "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
+  "report_notification.categories.other": "Drugo",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Povreda pravila",
+  "report_notification.open": "Otvori izvješće",
+  "search.no_recent_searches": "Nema nedavnih pretraga",
   "search.placeholder": "Traži",
+  "search.quick_action.go_to_account": "Idi na profil {x}",
+  "search.quick_action.open_url": "Otvori link u Mastodonu",
+  "search.search_or_paste": "Pretraži ili zalijepi URL",
+  "search_popout.full_text_search_disabled_message": "Nije dostuppno na {domain}.",
+  "search_popout.language_code": "ISO jezični kod",
+  "search_popout.options": "Opcije pretraživanja",
+  "search_popout.quick_actions": "Brze radnje",
+  "search_popout.recent": "Nedavne pretrage",
+  "search_popout.specific_date": "specifičan datum",
+  "search_popout.user": "korisnik",
+  "search_results.accounts": "Profili",
+  "search_results.all": "Sve",
+  "search_results.nothing_found": "Nije pronađeno ništa za te ključne riječi",
+  "search_results.see_all": "Prikaži sve",
   "search_results.statuses": "Toots",
+  "search_results.title": "Traži {q}",
+  "server_banner.about_active_users": "Popis aktivnih korisnika prošli mjesec",
   "server_banner.active_users": "aktivni korisnici",
+  "server_banner.administered_by": "Administrator je:",
+  "server_banner.introduction": "{domain} je dio decentralizirane socijalne mreže koju pokreće {mastodon}.",
   "server_banner.learn_more": "Saznaj više",
+  "server_banner.server_stats": "Statistike poslužitelja:",
   "sign_in_banner.create_account": "Stvori račun",
   "sign_in_banner.sign_in": "Prijavi se",
+  "sign_in_banner.sso_redirect": "Prijava ili registracija",
   "status.admin_status": "Open this status in the moderation interface",
+  "status.block": "Blokiraj @{name}",
   "status.bookmark": "Dodaj u favorite",
   "status.cannot_reblog": "Ova objava ne može biti boostana",
   "status.copy": "Copy link to status",
@@ -419,6 +475,7 @@
   "status.history.created": "Kreirao/la {name} prije {date}",
   "status.history.edited": "Uredio/la {name} prije {date}",
   "status.load_more": "Učitaj više",
+  "status.media.open": "Kliknite za otvaranje",
   "status.media_hidden": "Sakriven medijski sadržaj",
   "status.mention": "Spomeni @{name}",
   "status.more": "Više",
@@ -447,6 +504,7 @@
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.translate": "Prevedi",
   "status.translated_from_with": "Prevedno s {lang} koristeći {provider}",
+  "status.uncached_media_warning": "Pregled nije dostupan",
   "status.unmute_conversation": "Poništi utišavanje razgovora",
   "status.unpin": "Otkvači s profila",
   "subscribed_languages.save": "Spremi promjene",
@@ -484,6 +542,7 @@
   "upload_modal.description_placeholder": "Gojazni đačić s biciklom drži hmelj i finu vatu u džepu nošnje",
   "upload_modal.detect_text": "Detektiraj tekst sa slike",
   "upload_modal.edit_media": "Uređivanje medija",
+  "upload_modal.preparing_ocr": "Pripremam OCR…",
   "upload_modal.preview_label": "Pretpregled ({ratio})",
   "upload_progress.label": "Prenošenje...",
   "upload_progress.processing": "Obrada…",

app/javascript/mastodon/locales/ko.json

@@ -204,7 +204,7 @@
   "dismissable_banner.explore_links": "이 소식들은 오늘 소셜 웹에서 가장 많이 공유된 내용들입니다. 새 소식을 더 많은 사람들이 공유할수록 높은 순위가 됩니다.",
   "dismissable_banner.explore_statuses": "이 게시물들은 오늘 소셜 웹에서 호응을 얻고 있는 게시물들입니다. 부스트와 관심을 받는 새로운 글들이 높은 순위가 됩니다.",
   "dismissable_banner.explore_tags": "이 해시태그들은 이 서버와 분산화된 네트워크의 다른 서버에서 사람들의 인기를 끌고 있는 것들입니다.",
-  "dismissable_banner.public_timeline": "{domain} 사람들이 팔로우하는 소셜 웹 사람들의 최신 공개 게시물입니다.",
+  "dismissable_banner.public_timeline": "이것들은 {domain}에 있는 사람들이 팔로우한 사람들의 최신 공개 게시물들입니다.",
   "embed.instructions": "아래의 코드를 복사하여 대화를 원하는 곳으로 공유하세요.",
   "embed.preview": "이렇게 표시됩니다:",
   "emoji_button.activity": "활동",

app/javascript/mastodon/locales/zh-TW.json

@@ -225,7 +225,7 @@
   "empty_column.account_suspended": "帳號已被停權",
   "empty_column.account_timeline": "這裡還沒有嘟文！",
   "empty_column.account_unavailable": "無法取得個人檔案",
-  "empty_column.blocks": "您尚未封鎖任何使用者。",
+  "empty_column.blocks": "您還沒有封鎖任何使用者。",
   "empty_column.bookmarked_statuses": "您還沒有建立任何書籤。當您建立書籤時，它將於此顯示。",
   "empty_column.community": "本站時間軸是空的。快公開嘟些文搶頭香啊！",
   "empty_column.direct": "您還沒有收到任何私訊。當您私訊別人或收到私訊時，它將於此顯示。",

app/javascript/mastodon/settings.js

@@ -46,4 +46,5 @@ export default class Settings {
 export const pushNotificationsSetting = new Settings('mastodon_push_notification_data');
 export const tagHistory = new Settings('mastodon_tag_history');
 export const bannerSettings = new Settings('mastodon_banner_settings');
-export const searchHistory = new Settings('mastodon_search_history');
+export const searchHistory = new Settings('mastodon_search_history');
+export const playerSettings = new Settings('mastodon_player');

app/lib/feed_manager.rb

@@ -283,7 +283,7 @@ class FeedManager
   end
 
   def clear_from_antennas(account, target_account)
-    Antenna.where(account: account).each do |antenna|
+    Antenna.where(account: account).find_each do |antenna|
       clear_from_antenna(antenna, target_account)
     end
   end

app/models/feed.rb

@@ -23,9 +23,9 @@ class Feed
     max_id = '+inf' if max_id.blank?
     if min_id.blank?
       since_id   = '-inf' if since_id.blank?
-      unhydrated = redis.zrevrangebyscore(key, "(#{max_id}", "(#{since_id}", limit: [0, limit], with_scores: true).map(&:first).map(&:to_i)
+      unhydrated = redis.zrevrangebyscore(key, "(#{max_id}", "(#{since_id}", limit: [0, limit], with_scores: true).map { |id| id.first.to_i }
     else
-      unhydrated = redis.zrangebyscore(key, "(#{min_id}", "(#{max_id}", limit: [0, limit], with_scores: true).map(&:first).map(&:to_i)
+      unhydrated = redis.zrangebyscore(key, "(#{min_id}", "(#{max_id}", limit: [0, limit], with_scores: true).map { |id| id.first.to_i }
     end
 
     Status.where(id: unhydrated).cache_ids

app/models/user.rb

@@ -490,7 +490,7 @@ class User < ApplicationRecord
   end
 
   def validate_email_dns?
-    email_changed? && !external? && !Rails.env.local? # rubocop:disable Rails/UnknownEnv
+    email_changed? && !external? && !Rails.env.local?
   end
 
   def validate_role_elevation

app/services/approve_appeal_service.rb

@@ -62,7 +62,7 @@ class ApproveAppealService < BaseService
 
   def undo_force_cw!
     representative_account = Account.representative
-    @strike.statuses.includes(:media_attachments).each do |status|
+    @strike.statuses.includes(:media_attachments).find_each do |status|
       UpdateStatusService.new.call(status, representative_account.id, spoiler_text: '')
     end
   end

app/services/remove_status_service.rb

@@ -128,7 +128,7 @@ class RemoveStatusService < BaseService
   end
 
   def decrement_references
-    @status.references.each do |ref|
+    @status.references.reorder(nil).find_each do |ref|
       ref.decrement_count!(:status_referred_by_count)
     end
   end

app/services/un_emoji_react_service.rb

@@ -28,7 +28,7 @@ class UnEmojiReactService < BaseService
   private
 
   def bulk(account, status)
-    EmojiReaction.where(account: account, status: status).each do |emoji_reaction|
+    EmojiReaction.where(account: account, status: status).find_each do |emoji_reaction|
       call(account, status, emoji_reaction)
     end
   end

app/views/admin/statuses/show.html.haml

@@ -60,7 +60,7 @@
 %h3= t('admin.statuses.history')
 
 %ol.history
-  - @status.edits.includes(:account, status: [:account]).each.with_index do |status_edit, i|
+  - @status.edits.reorder(nil).includes(:account, status: [:account]).find_each(order: :asc).with_index do |status_edit, i|
     %li
       .history__entry
         %h5

app/views/filters/statuses/_status_filter.html.haml

@@ -20,7 +20,7 @@
 
     .detailed-status__meta
       = link_to ActivityPub::TagManager.instance.url_for(status.account), class: 'name-tag', target: '_blank', rel: 'noopener noreferrer' do
-        = image_tag(status.account.avatar.url, width: 15, height: 15, alt: display_name(status.account), class: 'avatar')
+        = image_tag(status.account.avatar.url, width: 15, height: 15, alt: '', class: 'avatar')
         .username= status.account.acct
       ·
       = link_to ActivityPub::TagManager.instance.url_for(status), class: 'detailed-status__datetime', target: stream_link_target, rel: 'noopener noreferrer' do