Merge pull request #2684 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 50fd94f481

.browserslistrc

@@ -1,7 +1,9 @@
 [production]
 defaults
-not IE 11
+> 0.2%
+ios >= 15.6
 not dead
+not OperaMini all
 
 [development]
 supports es6-module

app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx

@@ -332,6 +332,7 @@ class EmojiPickerDropdown extends PureComponent {
   state = {
     active: false,
     loading: false,
+    placement: 'bottom',
   };
 
   setRef = (c) => {
@@ -383,10 +384,14 @@ class EmojiPickerDropdown extends PureComponent {
     return this.target;
   };
 
+  handleOverlayEnter = (state) => {
+    this.setState({ placement: state.placement });
+  };
+
   render () {
     const { intl, onPickEmoji, onSkinTone, skinTone, frequentlyUsedEmojis } = this.props;
     const title = intl.formatMessage(messages.emoji);
-    const { active, loading } = this.state;
+    const { active, loading, placement } = this.state;
 
     return (
       <div className='emoji-picker-dropdown' onKeyDown={this.handleKeyDown} ref={this.setTargetRef}>
@@ -399,7 +404,7 @@ class EmojiPickerDropdown extends PureComponent {
           inverted
         />
 
-        <Overlay show={active} placement={'bottom'} target={this.findTarget} popperConfig={{ strategy: 'fixed' }}>
+        <Overlay show={active} placement={placement} flip target={this.findTarget} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
           {({ props, placement })=> (
             <div {...props} style={{ ...props.style }}>
               <div className={`dropdown-animation ${placement}`}>

app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx

@@ -71,16 +71,18 @@ export default class ColumnSettings extends PureComponent {
           <span className='warning-hint'><FormattedMessage id='notifications.permission_denied' defaultMessage='Desktop notifications are unavailable due to previously denied browser permissions request' /></span>
         )}
 
-        {alertsEnabled && browserSupport && browserPermission === 'default' && (
-          <span className='warning-hint'>
-            <FormattedMessage id='notifications.permission_required' defaultMessage='Desktop notifications are unavailable because the required permission has not been granted.' /> <GrantPermissionButton onClick={onRequestNotificationPermission} />
-          </span>
-        )}
-
         <section>
           <ClearColumnButton onClick={onClear} />
         </section>
 
+        {alertsEnabled && browserSupport && browserPermission === 'default' && (
+          <section>
+            <span className='warning-hint'>
+              <FormattedMessage id='notifications.permission_required' defaultMessage='Desktop notifications are unavailable because the required permission has not been granted.' /> <GrantPermissionButton onClick={onRequestNotificationPermission} />
+            </span>
+          </section>
+        )}
+
         <section>
           <h3><FormattedMessage id='notifications.policy.title' defaultMessage='Filter out notifications from…' /></h3>
 

app/javascript/flavours/glitch/features/notifications/components/notifications_permission_banner.jsx

@@ -5,8 +5,8 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 
 import { connect } from 'react-redux';
 
+import SettingsIcon from '@/material-icons/400-20px/settings.svg?react';
 import CloseIcon from '@/material-icons/400-24px/close.svg?react';
-import TuneIcon from '@/material-icons/400-24px/tune.svg?react';
 import { requestBrowserPermission } from 'flavours/glitch/actions/notifications';
 import { changeSetting } from 'flavours/glitch/actions/settings';
 import { Button } from 'flavours/glitch/components/button';
@@ -42,7 +42,7 @@ class NotificationsPermissionBanner extends PureComponent {
         </div>
 
         <h2><FormattedMessage id='notifications_permission_banner.title' defaultMessage='Never miss a thing' /></h2>
-        <p><FormattedMessage id='notifications_permission_banner.how_to_control' 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." values={{ icon: <Icon id='sliders' icon={TuneIcon} /> }} /></p>
+        <p><FormattedMessage id='notifications_permission_banner.how_to_control' 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." values={{ icon: <Icon id='sliders' icon={SettingsIcon} /> }} /></p>
         <Button onClick={this.handleClick}><FormattedMessage id='notifications_permission_banner.enable' defaultMessage='Enable desktop notifications' /></Button>
       </div>
     );

app/javascript/flavours/glitch/styles/components.scss

@@ -5234,6 +5234,11 @@ a.status-card {
   position: relative;
   margin-top: 5px;
   z-index: 2;
+  background: var(--dropdown-background-color);
+  backdrop-filter: var(--background-filter);
+  border: 1px solid var(--dropdown-border-color);
+  box-shadow: var(--dropdown-shadow);
+  border-radius: 5px;
 
   .emoji-mart-scroll {
     transition: opacity 200ms ease;
@@ -9169,6 +9174,12 @@ noscript {
     color: $darker-text-color;
     margin-bottom: 15px;
     text-align: center;
+
+    .icon {
+      width: 20px;
+      height: 20px;
+      vertical-align: middle;
+    }
   }
 }
 

app/javascript/flavours/glitch/styles/emoji_picker.scss

@@ -14,21 +14,9 @@
 }
 
 .emoji-mart-bar {
-  border: 0 solid var(--dropdown-border-color);
-
   &:first-child {
-    border-bottom-width: 1px;
-    border-top-left-radius: 5px;
-    border-top-right-radius: 5px;
     background: var(--dropdown-border-color);
   }
-
-  &:last-child {
-    border-top-width: 1px;
-    border-bottom-left-radius: 5px;
-    border-bottom-right-radius: 5px;
-    display: none;
-  }
 }
 
 .emoji-mart-anchors {
@@ -94,7 +82,6 @@
   height: 270px;
   max-height: 35vh;
   padding: 0 6px 6px;
-  background: var(--dropdown-background-color);
   will-change: transform;
 
   &::-webkit-scrollbar-track:hover,
@@ -106,7 +93,6 @@
 .emoji-mart-search {
   padding: 10px;
   padding-inline-end: 45px;
-  background: var(--dropdown-background-color);
   position: relative;
 
   input {
@@ -195,7 +181,6 @@
     width: 100%;
     font-weight: 500;
     padding: 5px 6px;
-    background: var(--dropdown-background-color);
   }
 }
 

app/javascript/flavours/glitch/styles/rich_text.scss

@@ -1,5 +1,6 @@
 .status__content__text,
 .e-content,
+.edit-indicator__content,
 .reply-indicator__content {
   pre,
   blockquote {
@@ -90,10 +91,3 @@
     list-style-type: decimal;
   }
 }
-
-.reply-indicator__content {
-  blockquote {
-    border-inline-start-color: $inverted-text-color;
-    color: $inverted-text-color;
-  }
-}

app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx

@@ -330,6 +330,7 @@ class EmojiPickerDropdown extends PureComponent {
   state = {
     active: false,
     loading: false,
+    placement: 'bottom',
   };
 
   setRef = (c) => {
@@ -381,10 +382,14 @@ class EmojiPickerDropdown extends PureComponent {
     return this.target;
   };
 
+  handleOverlayEnter = (state) => {
+    this.setState({ placement: state.placement });
+  };
+
   render () {
     const { intl, onPickEmoji, onSkinTone, skinTone, frequentlyUsedEmojis } = this.props;
     const title = intl.formatMessage(messages.emoji);
-    const { active, loading } = this.state;
+    const { active, loading, placement } = this.state;
 
     return (
       <div className='emoji-picker-dropdown' onKeyDown={this.handleKeyDown} ref={this.setTargetRef}>
@@ -397,7 +402,7 @@ class EmojiPickerDropdown extends PureComponent {
           inverted
         />
 
-        <Overlay show={active} placement={'bottom'} target={this.findTarget} popperConfig={{ strategy: 'fixed' }}>
+        <Overlay show={active} placement={placement} flip target={this.findTarget} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
           {({ props, placement })=> (
             <div {...props} style={{ ...props.style }}>
               <div className={`dropdown-animation ${placement}`}>

app/javascript/mastodon/features/notifications/components/column_settings.jsx

@@ -68,16 +68,18 @@ export default class ColumnSettings extends PureComponent {
           <span className='warning-hint'><FormattedMessage id='notifications.permission_denied' defaultMessage='Desktop notifications are unavailable due to previously denied browser permissions request' /></span>
         )}
 
-        {alertsEnabled && browserSupport && browserPermission === 'default' && (
-          <span className='warning-hint'>
-            <FormattedMessage id='notifications.permission_required' defaultMessage='Desktop notifications are unavailable because the required permission has not been granted.' /> <GrantPermissionButton onClick={onRequestNotificationPermission} />
-          </span>
-        )}
-
         <section>
           <ClearColumnButton onClick={onClear} />
         </section>
 
+        {alertsEnabled && browserSupport && browserPermission === 'default' && (
+          <section>
+            <span className='warning-hint'>
+              <FormattedMessage id='notifications.permission_required' defaultMessage='Desktop notifications are unavailable because the required permission has not been granted.' /> <GrantPermissionButton onClick={onRequestNotificationPermission} />
+            </span>
+          </section>
+        )}
+
         <section>
           <h3><FormattedMessage id='notifications.policy.title' defaultMessage='Filter out notifications from…' /></h3>
 

app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx

@@ -5,8 +5,8 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 
 import { connect } from 'react-redux';
 
+import SettingsIcon from '@/material-icons/400-20px/settings.svg?react';
 import CloseIcon from '@/material-icons/400-24px/close.svg?react';
-import TuneIcon from '@/material-icons/400-24px/tune.svg?react';
 import { requestBrowserPermission } from 'mastodon/actions/notifications';
 import { changeSetting } from 'mastodon/actions/settings';
 import { Button } from 'mastodon/components/button';
@@ -42,7 +42,7 @@ class NotificationsPermissionBanner extends PureComponent {
         </div>
 
         <h2><FormattedMessage id='notifications_permission_banner.title' defaultMessage='Never miss a thing' /></h2>
-        <p><FormattedMessage id='notifications_permission_banner.how_to_control' 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." values={{ icon: <Icon id='sliders' icon={TuneIcon} /> }} /></p>
+        <p><FormattedMessage id='notifications_permission_banner.how_to_control' 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." values={{ icon: <Icon id='sliders' icon={SettingsIcon} /> }} /></p>
         <Button onClick={this.handleClick}><FormattedMessage id='notifications_permission_banner.enable' defaultMessage='Enable desktop notifications' /></Button>
       </div>
     );

app/javascript/mastodon/locales/fo.json

@@ -7,7 +7,7 @@
   "about.domain_blocks.silenced.explanation": "Yvirhøvur, so sært tú ikki vangar og innihald frá hesum ambætaranum, uttan so at tú skilliga leitar hesi upp ella velur tey við at fylgja teimum.",
   "about.domain_blocks.silenced.title": "Avmarkað",
   "about.domain_blocks.suspended.explanation": "Ongar dátur frá hesum ambætara verða viðgjørd, goymd ella deild, tað ger, at samskifti við aðrar ambætarar er iki møguligt.",
-  "about.domain_blocks.suspended.title": "Koyrdur frá",
+  "about.domain_blocks.suspended.title": "Gjørt óvirkið",
   "about.not_available": "Hetta er ikki tøkt á føroyska servaranum enn.",
   "about.powered_by": "Miðfirra almennur miðil koyrandi á {mastodon}",
   "about.rules": "Ambætarareglur",

app/javascript/mastodon/locales/hu.json

@@ -92,11 +92,11 @@
   "block_modal.remote_users_caveat": "Arra kérjük a {domain} kiszolgálót, hogy tartsa tiszteletben a döntésedet. Ugyanakkor az együttműködés nem garantált, mivel néhány kiszolgáló másképp kezelheti a letiltásokat. A nyilvános bejegyzések a be nem jelentkezett felhasználók számára továbbra is látszódhatnak.",
   "block_modal.show_less": "Kevesebb mutatása",
   "block_modal.show_more": "Több mutatása",
-  "block_modal.they_cant_mention": "Nem említhetnek meg vagy követhetnek téged.",
+  "block_modal.they_cant_mention": "Nem említhet meg és nem követhet téged.",
-  "block_modal.they_cant_see_posts": "Nem láthatják a bejegyzéseidet, és te sem fogod látni az övékét.",
+  "block_modal.they_cant_see_posts": "Nem láthatja a bejegyzéseidet, és te sem fogod látni az övéit.",
-  "block_modal.they_will_know": "Láthatják, hogy le vannak tiltva.",
+  "block_modal.they_will_know": "Láthatja, hogy le van tiltva.",
   "block_modal.title": "Letiltsuk a felhasználót?",
-  "block_modal.you_wont_see_mentions": "Nem látsz majd őket említő bejegyzéseket.",
+  "block_modal.you_wont_see_mentions": "Nem látsz majd őt említő bejegyzéseket.",
   "boost_modal.combo": "Hogy átugord ezt következő alkalommal, használd {combo}",
   "bundle_column_error.copy_stacktrace": "Hibajelentés másolása",
   "bundle_column_error.error.body": "A kért lap nem jeleníthető meg. Ez lehet, hogy kódhiba, vagy böngészőkompatibitási hiba.",
@@ -176,7 +176,7 @@
   "confirmations.delete_list.confirm": "Törlés",
   "confirmations.delete_list.message": "Biztos, hogy véglegesen törölni szeretnéd ezt a listát?",
   "confirmations.discard_edit_media.confirm": "Elvetés",
-  "confirmations.discard_edit_media.message": "Elmentetlen változtatásaid vannak a média leírásában vagy előnézetében. Eldobjuk őket?",
+  "confirmations.discard_edit_media.message": "Mentetlen változtatásaid vannak a média leírásában vagy előnézetében, mindenképp elveted?",
   "confirmations.domain_block.confirm": "Kiszolgáló letiltása",
   "confirmations.domain_block.message": "Biztos, hogy le szeretnéd tiltani a teljes {domain} domaint? A legtöbb esetben néhány célzott tiltás vagy némítás elegendő, és kívánatosabb megoldás. Semmilyen tartalmat nem fogsz látni ebből a domainből se az idővonalakon, se az értesítésekben. Az ebben a domainben lévő követőidet is eltávolítjuk.",
   "confirmations.edit.confirm": "Szerkesztés",
@@ -213,7 +213,7 @@
   "domain_block_modal.block_account_instead": "Helyette @{name} letiltása",
   "domain_block_modal.they_can_interact_with_old_posts": "Az ezen a kiszolgálón lévő emberek interaktálhatnak a régi bejegyzéseiddel.",
   "domain_block_modal.they_cant_follow": "Erről a kiszolgálóról senki sem követhet.",
-  "domain_block_modal.they_wont_know": "Nem fogják tudni, hogy letiltották őket.",
+  "domain_block_modal.they_wont_know": "Nem fogja tudni, hogy letiltották.",
   "domain_block_modal.title": "Letiltsuk a domaint?",
   "domain_block_modal.you_will_lose_followers": "Az ezen a kiszolgálón lévő összes követődet törölni fogjuk.",
   "domain_block_modal.you_wont_see_posts": "Nem látsz majd bejegyzéseket vagy értesítéseket ennek a kiszolgálónak a felhasználóitól.",
@@ -350,7 +350,7 @@
   "home.pending_critical_update.title": "Kritikus biztonsági frissítés érhető el!",
   "home.show_announcements": "Közlemények megjelenítése",
   "interaction_modal.description.favourite": "Egy Mastodon fiókkal kedvencnek jelölheted ezt a bejegyzést, tudatva a szerzővel, hogy értékeled és elteszed későbbre.",
-  "interaction_modal.description.follow": "Egy Mastodon fiókkal bekövetheted {name} fiókot, hogy lásd a bejegyzéseit a saját hírfolyamodban.",
+  "interaction_modal.description.follow": "Egy Mastodon-fiókkal követheted {name} fiókját, hogy lásd a bejegyzéseit a kezdőlapodon.",
   "interaction_modal.description.reblog": "Egy Mastodon fiókkal megtolhatod ezt a bejegyzést, hogy megoszd a saját követőiddel.",
   "interaction_modal.description.reply": "Egy Mastodon fiókkal válaszolhatsz erre a bejegyzésre.",
   "interaction_modal.login.action": "Vigyen haza",
@@ -431,11 +431,11 @@
   "mute_modal.hide_options": "Beállítások elrejtése",
   "mute_modal.indefinite": "Amíg nem oldom fel a némítást",
   "mute_modal.show_options": "Beállítások megjelenítése",
-  "mute_modal.they_can_mention_and_follow": "Megemlíthetnek vagy követhetnek téged, de nem fogod őket látni.",
+  "mute_modal.they_can_mention_and_follow": "Megemlíthet vagy követhet téged, de te nem fogod ezeket látni.",
-  "mute_modal.they_wont_know": "Nem fogják tudni, hogy lenémították őket.",
+  "mute_modal.they_wont_know": "Nem fogja tudni, hogy lenémítottad.",
   "mute_modal.title": "Elnémítsuk a felhasználót?",
-  "mute_modal.you_wont_see_mentions": "Nem látsz majd őket említő bejegyzéseket.",
+  "mute_modal.you_wont_see_mentions": "Nem látsz majd őt említő bejegyzéseket.",
-  "mute_modal.you_wont_see_posts": "Továbbra is látni fogják a bejegyzéseidet, de te nem fogod látni az övékét.",
+  "mute_modal.you_wont_see_posts": "Továbbra is látni fogja a bejegyzéseidet, de te nem fogod látni az övéit.",
   "navigation_bar.about": "Névjegy",
   "navigation_bar.advanced_interface": "Megnyitás a speciális webes felületben",
   "navigation_bar.blocks": "Letiltott felhasználók",

app/javascript/mastodon/locales/ko.json

@@ -221,10 +221,15 @@
   "domain_pill.activitypub_like_language": "액티비티펍은 마스토돈이 다른 소셜 네트워크와 대화할 때 쓰는 언어 같은 것입니다.",
   "domain_pill.server": "서버",
   "domain_pill.their_handle": "그의 핸들:",
+  "domain_pill.their_server": "그의 게시물이 살고 있는 디지털 거처입니다.",
+  "domain_pill.their_username": "그의 서버에서 유일한 식별자입니다. 다른 서버에서 같은 사용자명을 가진 사용자를 찾을 수도 있습니다.",
   "domain_pill.username": "사용자명",
   "domain_pill.whats_in_a_handle": "핸들엔 무엇이 담겨 있나요?",
+  "domain_pill.who_they_are": "핸들은 어디에 있는 누구인지를 나타내기 때문에 <button>액티비티펍을 사용하는 플랫폼</button>들의 소셜 웹을 넘나들며 사람들과 상호작용 할 수 있습니다.",
   "domain_pill.who_you_are": "내 핸들은 내가 어디에 있는 누군지 나타내기 때문에 사람들은 <button>액티비티펍</button>을 통해 소셜 웹을 넘나들며 나와 상호작용 할 수 있습니다.",
   "domain_pill.your_handle": "내 핸들:",
+  "domain_pill.your_server": "내 게시물들이 살고 있는 나의 디지털 거처입니다. 마음에 들지 않나요? 팔로워를 데리고 언제든지 다른 서버로 거처를 옮길 수도 있습니다.",
+  "domain_pill.your_username": "이 서버에서 유일한 내 식별자입니다. 다른 서버에서 같은 사용자명을 가진 사용자를 찾을 수도 있습니다.",
   "embed.instructions": "아래의 코드를 복사하여 대화를 원하는 곳으로 공유하세요.",
   "embed.preview": "이렇게 표시됩니다:",
   "emoji_button.activity": "활동",
@@ -507,11 +512,11 @@
   "notifications.policy.filter_new_accounts_title": "새 계정",
   "notifications.policy.filter_not_followers_hint": "나를 팔로우 한 지 {days, plural, other {# 일}}이 되지 않은 사람들을 포함",
   "notifications.policy.filter_not_followers_title": "나를 팔로우하지 않는 사람들",
-  "notifications.policy.filter_not_following_hint": "내가 수동으로 승인하기 전까지",
+  "notifications.policy.filter_not_following_hint": "내가 수동으로 승인하지 않는 한",
   "notifications.policy.filter_not_following_title": "내가 팔로우하지 않는 사람들",
   "notifications.policy.filter_private_mentions_hint": "내가 한 멘션에 단 답글이거나 내가 발신자를 팔로우 한 것이 아닌 이상 걸러집니다",
   "notifications.policy.filter_private_mentions_title": "청하지 않은 개인적인 멘션",
-  "notifications.policy.title": "알림을 거를 사람들…",
+  "notifications.policy.title": "알림을 제외할 조건들…",
   "notifications_permission_banner.enable": "데스크탑 알림 활성화",
   "notifications_permission_banner.how_to_control": "마스토돈이 열려 있지 않을 때에도 알림을 받으려면, 데스크탑 알림을 활성화 하세요. 당신은 어떤 종류의 반응이 데스크탑 알림을 발생할 지를 {icon} 버튼을 통해 세세하게 설정할 수 있습니다.",
   "notifications_permission_banner.title": "아무것도 놓치지 마세요",

app/javascript/mastodon/locales/nn.json

@@ -92,6 +92,11 @@
   "block_modal.remote_users_caveat": "Vi vil be tenaren {domain} om å respektere di avgjerd. Det kan ikkje garanterast at det vert etterfølgd, sidan nokre tenarar kan handtere blokkering ulikt. Offentlege innlegg kan framleis vere synlege for ikkje-innlogga brukarar.",
   "block_modal.show_less": "Vis mindre",
   "block_modal.show_more": "Vis meir",
+  "block_modal.they_cant_mention": "Dei kan ikkje nemna eller fylgja deg.",
+  "block_modal.they_cant_see_posts": "Dei kan ikkje sjå innlegga dine, og du vil ikkje sjå deira.",
+  "block_modal.they_will_know": "Dei kan sjå at dei er blokkerte.",
+  "block_modal.title": "Blokker brukaren?",
+  "block_modal.you_wont_see_mentions": "Du ser ikkje innlegg som nemner dei.",
   "boost_modal.combo": "Du kan trykkja {combo} for å hoppa over dette neste gong",
   "bundle_column_error.copy_stacktrace": "Kopier feilrapport",
   "bundle_column_error.error.body": "Den etterspurde sida kan ikke hentast fram. Det kan skuldast ein feil i koden vår eller eit kompatibilitetsproblem.",
@@ -172,6 +177,7 @@
   "confirmations.delete_list.message": "Er du sikker på at du vil sletta denne lista for alltid?",
   "confirmations.discard_edit_media.confirm": "Forkast",
   "confirmations.discard_edit_media.message": "Du har ulagra endringar i mediaskildringa eller førehandsvisinga. Vil du forkasta dei likevel?",
+  "confirmations.domain_block.confirm": "Blokker tenaren",
   "confirmations.domain_block.message": "Er du heilt, heilt sikker på at du vil skjula heile {domain}? I dei fleste tilfelle er det godt nok og føretrekt med nokre få målretta blokkeringar eller målbindingar. Du kjem ikkje til å sjå innhald frå domenet i fødererte tidsliner eller i varsla dine. Fylgjarane dine frå domenet vert fjerna.",
   "confirmations.edit.confirm": "Rediger",
   "confirmations.edit.message": "Å redigera no vil overskriva den meldinga du er i ferd med å skriva. Er du sikker på at du vil halda fram?",
@@ -203,6 +209,14 @@
   "dismissable_banner.explore_statuses": "Dette er innlegg frå det desentraliserte nettverket som er i støytet i dag. Nye statusar som er mykje framheva og merkte som favorittar er rangert høgare.",
   "dismissable_banner.explore_tags": "Desse emneknaggane er populære blant folk på denne tenaren og andre tenarar i det desentraliserte nettverket nett no.",
   "dismissable_banner.public_timeline": "Dette er dei nyaste offentlege innlegga frå menneske på det sosiale nettet som folk på {domain} følgjer.",
+  "domain_block_modal.block": "Blokker tenaren",
+  "domain_block_modal.block_account_instead": "Blokker @{name} i staden",
+  "domain_block_modal.they_can_interact_with_old_posts": "Folk på denne tenaren kan samhandla med dei gamle innlegga dine.",
+  "domain_block_modal.they_cant_follow": "Ingen på denne tenaren kan fylgja deg.",
+  "domain_block_modal.they_wont_know": "Dei veit ikkje at dei er blokkerte.",
+  "domain_block_modal.title": "Blokker domenet?",
+  "domain_block_modal.you_will_lose_followers": "Alle fylgjarane dine frå denne tenaren blir fjerna.",
+  "domain_block_modal.you_wont_see_posts": "Du vil ikkje sjå innlegg eller varslingar frå brukarar på denne tenaren.",
   "domain_pill.activitypub_lets_connect": "Den lar deg kople til og samhandle med folk ikkje berre på Mastodon, men òg på tvers av forskjellige sosiale appar.",
   "domain_pill.activitypub_like_language": "ActivityPub er som språket Mastodon snakkar med andre sosiale nettverk.",
   "domain_pill.server": "Tenar",
@@ -234,7 +248,7 @@
   "emoji_button.symbols": "Symbol",
   "emoji_button.travel": "Reise & stader",
   "empty_column.account_hides_collections": "Denne brukaren har valt å ikkje gjere denne informasjonen tilgjengeleg",
-  "empty_column.account_suspended": "Kontoen er suspendert",
+  "empty_column.account_suspended": "Kontoen er utestengd",
   "empty_column.account_timeline": "Ingen tut her!",
   "empty_column.account_unavailable": "Profil ikkje tilgjengeleg",
   "empty_column.blocks": "Du har ikkje blokkert nokon enno.",
@@ -413,6 +427,15 @@
   "loading_indicator.label": "Lastar…",
   "media_gallery.toggle_visible": "{number, plural, one {Skjul bilete} other {Skjul bilete}}",
   "moved_to_account_banner.text": "Kontoen din, {disabledAccount} er for tida deaktivert fordi du har flytta til {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Ikkje vis varslingar",
+  "mute_modal.hide_options": "Gøym val",
+  "mute_modal.indefinite": "Til eg avdempar dei",
+  "mute_modal.show_options": "Vis val",
+  "mute_modal.they_can_mention_and_follow": "Dei kan nemna og fylgja deg, men du vil ikkje sjå dei.",
+  "mute_modal.they_wont_know": "Dei veit ikkje at dei er dempa.",
+  "mute_modal.title": "Demp brukaren?",
+  "mute_modal.you_wont_see_mentions": "Du vil ikkje sjå innlegg som nemner dei.",
+  "mute_modal.you_wont_see_posts": "Dei kan framleis sjå innlegga dine, men du vil ikkje sjå deira.",
   "navigation_bar.about": "Om",
   "navigation_bar.advanced_interface": "Opne i avansert nettgrensesnitt",
   "navigation_bar.blocks": "Blokkerte brukarar",
@@ -670,9 +693,11 @@
   "status.direct": "Nevn @{name} privat",
   "status.direct_indicator": "Privat omtale",
   "status.edit": "Rediger",
+  "status.edited": "Sist endra {date}",
   "status.edited_x_times": "Redigert {count, plural, one {{count} gong} other {{count} gonger}}",
   "status.embed": "Bygg inn",
   "status.favourite": "Favoritt",
+  "status.favourites": "{count, plural, one {favoritt} other {favorittar}}",
   "status.filter": "Filtrer dette innlegget",
   "status.filtered": "Filtrert",
   "status.hide": "Skjul innlegget",
@@ -693,6 +718,7 @@
   "status.reblog": "Framhev",
   "status.reblog_private": "Framhev til dei originale mottakarane",
   "status.reblogged_by": "{name} framheva",
+  "status.reblogs": "{count, plural, one {framheving} other {framhevingar}}",
   "status.reblogs.empty": "Ingen har framheva dette tutet enno. Om nokon gjer, så dukkar det opp her.",
   "status.redraft": "Slett & skriv på nytt",
   "status.remove_bookmark": "Fjern bokmerke",

app/javascript/mastodon/locales/pt-PT.json

@@ -89,6 +89,14 @@
   "announcement.announcement": "Anúncio",
   "attachments_list.unprocessed": "(não processado)",
   "audio.hide": "Ocultar áudio",
+  "block_modal.remote_users_caveat": "Vamos pedir ao servidor {domain} para respeitar a sua decisão. No entanto, não é garantido o seu cumprimento, uma vez que alguns servidores podem tratar os bloqueios de forma diferente. As mensagens públicas podem continuar a ser visíveis para utilizadores não autenticados.",
+  "block_modal.show_less": "Mostrar menos",
+  "block_modal.show_more": "Mostrar mais",
+  "block_modal.they_cant_mention": "Eles não o podem mencionar ou seguir.",
+  "block_modal.they_cant_see_posts": "Eles não podem ver as suas publicações e você não verá as deles.",
+  "block_modal.they_will_know": "Eles podem ver que estão bloqueados.",
+  "block_modal.title": "Bloquear utilizador?",
+  "block_modal.you_wont_see_mentions": "Não verá publicações que os mencionem.",
   "boost_modal.combo": "Pode clicar {combo} para não voltar a ver",
   "bundle_column_error.copy_stacktrace": "Copiar relatório de erros",
   "bundle_column_error.error.body": "A página solicitada não pôde ser sintetizada. Isto pode ser devido a uma falha no nosso código ou a um problema de compatibilidade com o navegador.",
@@ -169,6 +177,7 @@
   "confirmations.delete_list.message": "Tens a certeza de que deseja eliminar permanentemente esta lista?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Tem alterações por guardar na descrição ou pré-visualização do conteúdo. Descartar mesmo assim?",
+  "confirmations.domain_block.confirm": "Bloquear servidor",
   "confirmations.domain_block.message": "De certeza que queres bloquear completamente o domínio {domain}? Na maioria dos casos, silenciar ou bloquear alguns utilizadores é suficiente e é o recomendado. Não irás ver conteúdo daquele domínio em cronologia alguma nem nas tuas notificações. Os teus seguidores daquele domínio serão removidos.",
   "confirmations.edit.confirm": "Editar",
   "confirmations.edit.message": "Editar agora irá sobrescrever a mensagem que está a compor. Tem a certeza de que deseja continuar?",
@@ -200,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Estas são publicações de toda a rede social que estão a ganhar popularidade atualmente. As mensagens mais recentes com mais partilhas e favoritos obtêm uma classificação mais elevada.",
   "dismissable_banner.explore_tags": "Estas #etiquetas estão presentemente a ganhar atenção entre as pessoas neste e noutros servidores da rede descentralizada.",
   "dismissable_banner.public_timeline": "Estas são as publicações públicas mais recentes de pessoas na rede social que as pessoas em {domain} seguem.",
+  "domain_block_modal.block": "Bloquear servidor",
+  "domain_block_modal.block_account_instead": "Bloquear @{name} em alternativa",
+  "domain_block_modal.they_can_interact_with_old_posts": "As pessoas deste servidor podem interagir com as suas publicações antigas.",
+  "domain_block_modal.they_cant_follow": "Ninguém deste servidor pode segui-lo.",
+  "domain_block_modal.they_wont_know": "Eles não saberão que foram bloqueados.",
+  "domain_block_modal.title": "Bloquear domínio?",
+  "domain_block_modal.you_will_lose_followers": "Todos os seus seguidores deste servidor serão removidos.",
+  "domain_block_modal.you_wont_see_posts": "Não verá publicações ou notificações de utilizadores neste servidor.",
+  "domain_pill.activitypub_lets_connect": "Permite-lhe conectar e interagir com pessoas não só no Mastodon, mas também em diferentes aplicações sociais.",
+  "domain_pill.activitypub_like_language": "O ActivityPub é como a linguagem que o Mastodon fala com outras redes sociais.",
+  "domain_pill.server": "Servidor",
+  "domain_pill.their_handle": "O seu identificador:",
+  "domain_pill.their_server": "A sua casa digital, onde se encontram todas as suas publicações.",
+  "domain_pill.their_username": "O seu identificador único no seu servidor. É possível encontrar utilizadores com o mesmo nome de utilizador em diferentes servidores.",
+  "domain_pill.username": "Nome de utilizador",
+  "domain_pill.whats_in_a_handle": "Em que consiste um identificador?",
+  "domain_pill.who_they_are": "Uma vez que os identificadores dizem quem é alguém e onde está, pode interagir com as pessoas através da rede social de <button>plataformas que suportam ActivityPub</button>.",
+  "domain_pill.who_you_are": "Uma vez que o seu identificador indica quem é e onde está, as pessoas podem interagir consigo através da rede social de <button>plataformas que suportam ActivityPub</button>.",
+  "domain_pill.your_handle": "O seu identificador:",
+  "domain_pill.your_server": "A sua casa digital, onde se encontram todas as suas publicações. Não gosta deste? Mude de servidor a qualquer momento e leve também os seus seguidores.",
+  "domain_pill.your_username": "O seu identificador único neste servidor. É possível encontrar utilizadores com o mesmo nome de utilizador em diferentes servidores.",
   "embed.instructions": "Incorpore esta publicação no seu site copiando o código abaixo.",
   "embed.preview": "Podes ver aqui como irá ficar:",
   "emoji_button.activity": "Actividade",
@@ -397,6 +427,15 @@
   "loading_indicator.label": "A carregar…",
   "media_gallery.toggle_visible": "Alternar visibilidade",
   "moved_to_account_banner.text": "A sua conta {disabledAccount} está, no momento, desativada, porque você migrou para {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Ocultar das notificações",
+  "mute_modal.hide_options": "Ocultar opções",
+  "mute_modal.indefinite": "Até que eu os tire do silêncio",
+  "mute_modal.show_options": "Mostrar opções",
+  "mute_modal.they_can_mention_and_follow": "Eles podem mencioná-lo e segui-lo, mas você não os verá.",
+  "mute_modal.they_wont_know": "Eles não saberão que foram silenciados.",
+  "mute_modal.title": "Silenciar utilizador?",
+  "mute_modal.you_wont_see_mentions": "Não verá publicações que os mencionem.",
+  "mute_modal.you_wont_see_posts": "Eles podem continuar a ver as suas publicações, mas você não verá as deles.",
   "navigation_bar.about": "Sobre",
   "navigation_bar.advanced_interface": "Abrir na interface web avançada",
   "navigation_bar.blocks": "Utilizadores bloqueados",

app/javascript/mastodon/locales/ry.json

@@ -6,6 +6,8 @@
   "about.domain_blocks.silenced.title": "Обмежено",
   "about.domain_blocks.suspended.explanation": "Ниякі податкы из сього сервера не будут уброблені, усокочені ци поміняні, што чинит невозможнов хоть-яку інтеракцію ци зязок из хосновачами из сього сервера.",
   "about.domain_blocks.suspended.title": "Заблоковано",
+  "about.not_available": "Ися інформація не была доступна на сюм сервері.",
+  "about.powered_by": "Децентралізована медіа основана на {mastodon}",
   "about.rules": "Правила сервера",
   "account.account_note_header": "Примітка",
   "account.add_or_remove_from_list": "Дати авадь забрати из исписа",
@@ -16,18 +18,24 @@
   "account.block_short": "Заблоковати",
   "account.blocked": "Заблоковано",
   "account.browse_more_on_origin_server": "Позирайте бульше на ориґіналнум профілю",
+  "account.cancel_follow_request": "Удмінити пудписку",
   "account.copy": "Зкопіровати удкликованя на профіл",
+  "account.disable_notifications": "Бульше не сповіщати ми коли {name} пише",
   "account.domain_blocked": "Домен заблокованый",
   "account.edit_profile": "Управити профіл",
+  "account.enable_notifications": "Уповістити ня, кой {name} пише",
   "account.endorse": "Указовати на профілови",
   "account.featured_tags.last_status_at": "Датум послідньої публикації {date}",
   "account.featured_tags.last_status_never": "Ниє публикацій",
+  "account.featured_tags.title": "Ублюблені гештеґы {name}",
   "account.follow": "Пудписати ся",
+  "account.follow_back": "Пудписати ся тоже",
   "account.followers": "Пудписникы",
   "account.followers.empty": "У сього хосновача раз ниє пудписникув.",
   "account.following": "Слідуєте",
   "account.follows.empty": "Сись хосновач щи никого не слідує.",
   "account.go_to_profile": "Перейти на профіл",
+  "account.joined_short": "Датум прикапчованя",
   "account.languages": "Поміняти убрані языкы",
   "account.link_verified_on": "Властность сього удкликованя было звірено {date}",
   "account.media": "Медіа",

app/javascript/mastodon/locales/sk.json

@@ -89,6 +89,9 @@
   "announcement.announcement": "Oznámenie",
   "attachments_list.unprocessed": "(nespracované)",
   "audio.hide": "Skryť zvuk",
+  "block_modal.show_less": "Zobraziť menej",
+  "block_modal.show_more": "Zobraziť viac",
+  "block_modal.title": "Blokovať užívateľa?",
   "boost_modal.combo": "Nabudúce môžete preskočiť stlačením {combo}",
   "bundle_column_error.copy_stacktrace": "Kopírovať chybovú hlášku",
   "bundle_column_error.error.body": "Požadovanú stránku nebolo možné vykresliť. Môže to byť spôsobené chybou v našom kóde alebo problémom s kompatibilitou prehliadača.",
@@ -169,6 +172,7 @@
   "confirmations.delete_list.message": "Určite chcete tento zoznam trvalo vymazať?",
   "confirmations.discard_edit_media.confirm": "Zahodiť",
   "confirmations.discard_edit_media.message": "Máte neuložené zmeny v popise alebo náhľade média, zahodiť ich aj tak?",
+  "confirmations.domain_block.confirm": "Blokovať server",
   "confirmations.domain_block.message": "Určite chcete blokovať celú doménu {domain}? Vo väčšine prípadov stačí blokovať alebo ignorovať pár konkrétnych účtov, čo aj odporúčame. Obsah z tejto domény neuvidíte v žiadnej verejnej časovej osi ani v upozorneniach. Vaši sledujúci pochádzajúci z tejto domény budú odstránení.",
   "confirmations.edit.confirm": "Upraviť",
   "confirmations.edit.message": "Úpravou prepíšete príspevok, ktorý máte rozpísaný. Určite chcete pokračovať?",
@@ -200,6 +204,10 @@
   "dismissable_banner.explore_statuses": "Toto sú príspevky z celej sociálnej siete, ktoré sú dnes populárne. Novšie príspevky s viacerými ohviezdičkovaniami a zdieľaniami sú radené vyššie.",
   "dismissable_banner.explore_tags": "Toto sú hashtagy zo sociálnej siete, ktoré sú dnes populárne. Novšie hashtagy používané viacerými ľuďmi sú radené vyššie.",
   "dismissable_banner.public_timeline": "Toto sú najnovšie verejné príspevky od účtov na sociálnej sieti, ktoré sú sledované účtami z {domain}.",
+  "domain_block_modal.block": "Blokovať server",
+  "domain_block_modal.title": "Blokovať doménu?",
+  "domain_pill.server": "Server",
+  "domain_pill.username": "Používateľské meno",
   "embed.instructions": "Tento príspevok môžete pridať na svoju webovú stránku použitím tohto kódu.",
   "embed.preview": "Takto bude vyzerať:",
   "emoji_button.activity": "Aktivita",
@@ -267,6 +275,7 @@
   "filter_modal.select_filter.title": "Filtrovanie tohto príspevku",
   "filter_modal.title.status": "Filtrovanie príspevku",
   "filtered_notifications_banner.pending_requests": "Oboznámenia od {count, plural, =0 {nikoho} one {jedného človeka} other {# ľudí}} čo môžeš poznať",
+  "filtered_notifications_banner.title": "Filtrované oznámenia",
   "firehose.all": "Všetko",
   "firehose.local": "Tento server",
   "firehose.remote": "Ostatné servery",
@@ -395,6 +404,9 @@
   "loading_indicator.label": "Načítavanie…",
   "media_gallery.toggle_visible": "{number, plural, one {Skryť obrázok} other {Skryť obrázky}}",
   "moved_to_account_banner.text": "Váš účet {disabledAccount} je momentálne deaktivovaný, pretože ste sa presunuli na {movedToAccount}.",
+  "mute_modal.hide_options": "Skryť možnosti",
+  "mute_modal.show_options": "Zobraziť možnosti",
+  "mute_modal.title": "Stíšiť užívateľa?",
   "navigation_bar.about": "O tomto serveri",
   "navigation_bar.advanced_interface": "Otvoriť v pokročilom webovom rozhraní",
   "navigation_bar.blocks": "Blokované účty",
@@ -433,6 +445,7 @@
   "notification.status": "{name} uverejňuje niečo nové",
   "notification.update": "{name} upravuje príspevok",
   "notification_requests.accept": "Prijať",
+  "notification_requests.dismiss": "Zamietnuť",
   "notification_requests.notifications_from": "Oboznámenia od {name}",
   "notification_requests.title": "Filtrované oboznámenia",
   "notifications.clear": "Vyčistiť upozornenia",
@@ -469,6 +482,7 @@
   "notifications.policy.filter_new_accounts_title": "Nové účty",
   "notifications.policy.filter_not_followers_title": "Ľudia, ktorí ťa nenasledujú",
   "notifications.policy.filter_not_following_title": "Ľudia, ktorých nenasleduješ",
+  "notifications.policy.title": "Filtrovať oznámenia od…",
   "notifications_permission_banner.enable": "Povoliť upozornenia na ploche",
   "notifications_permission_banner.how_to_control": "Ak chcete dostávať upozornenia, keď Mastodon nie je otvorený, povoľte upozornenia na ploche. Po ich zapnutí môžete presne kontrolovať, ktoré typy interakcií generujú upozornenia na ploche, a to prostredníctvom tlačidla {icon} vyššie.",
   "notifications_permission_banner.title": "Nenechajte si nič ujsť",

app/javascript/material-icons/400-20px/settings-fill.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="m403-96-22-114q-23-9-44.5-21T296-259l-110 37-77-133 87-76q-2-12-3-24t-1-25q0-13 1-25t3-24l-87-76 77-133 110 37q19-16 40.5-28t44.5-21l22-114h154l22 114q23 9 44.5 21t40.5 28l110-37 77 133-87 76q2 12 3 24t1 25q0 13-1 25t-3 24l87 76-77 133-110-37q-19 16-40.5 28T579-210L557-96H403Zm77-240q60 0 102-42t42-102q0-60-42-102t-102-42q-60 0-102 42t-42 102q0 60 42 102t102 42Z"/></svg>

app/javascript/material-icons/400-20px/settings.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="m403-96-22-114q-23-9-44.5-21T296-259l-110 37-77-133 87-76q-2-12-3-24t-1-25q0-13 1-25t3-24l-87-76 77-133 110 37q19-16 40.5-28t44.5-21l22-114h154l22 114q23 9 44.5 21t40.5 28l110-37 77 133-87 76q2 12 3 24t1 25q0 13-1 25t-3 24l87 76-77 133-110-37q-19 16-40.5 28T579-210L557-96H403Zm59-72h36l19-99q38-7 71-26t57-48l96 32 18-30-76-67q6-17 9.5-35.5T696-480q0-20-3.5-38.5T683-554l76-67-18-30-96 32q-24-29-57-48t-71-26l-19-99h-36l-19 99q-38 7-71 26t-57 48l-96-32-18 30 76 67q-6 17-9.5 35.5T264-480q0 20 3.5 38.5T277-406l-76 67 18 30 96-32q24 29 57 48t71 26l19 99Zm18-168q60 0 102-42t42-102q0-60-42-102t-102-42q-60 0-102 42t-42 102q0 60 42 102t102 42Zm0-144Z"/></svg>

app/javascript/styles/mastodon/components.scss

@@ -4848,6 +4848,11 @@ a.status-card {
   position: relative;
   margin-top: 5px;
   z-index: 2;
+  background: var(--dropdown-background-color);
+  backdrop-filter: var(--background-filter);
+  border: 1px solid var(--dropdown-border-color);
+  box-shadow: var(--dropdown-shadow);
+  border-radius: 5px;
 
   .emoji-mart-scroll {
     transition: opacity 200ms ease;
@@ -8581,6 +8586,12 @@ noscript {
     color: $darker-text-color;
     margin-bottom: 15px;
     text-align: center;
+
+    .icon {
+      width: 20px;
+      height: 20px;
+      vertical-align: middle;
+    }
   }
 }
 

app/javascript/styles/mastodon/emoji_picker.scss

@@ -14,21 +14,9 @@
 }
 
 .emoji-mart-bar {
-  border: 0 solid var(--dropdown-border-color);
-
   &:first-child {
-    border-bottom-width: 1px;
-    border-top-left-radius: 5px;
-    border-top-right-radius: 5px;
     background: var(--dropdown-border-color);
   }
-
-  &:last-child {
-    border-top-width: 1px;
-    border-bottom-left-radius: 5px;
-    border-bottom-right-radius: 5px;
-    display: none;
-  }
 }
 
 .emoji-mart-anchors {
@@ -94,7 +82,6 @@
   height: 270px;
   max-height: 35vh;
   padding: 0 6px 6px;
-  background: var(--dropdown-background-color);
   will-change: transform;
 
   &::-webkit-scrollbar-track:hover,
@@ -106,7 +93,6 @@
 .emoji-mart-search {
   padding: 10px;
   padding-inline-end: 45px;
-  background: var(--dropdown-background-color);
   position: relative;
 
   input {
@@ -195,7 +181,6 @@
     width: 100%;
     font-weight: 500;
     padding: 5px 6px;
-    background: var(--dropdown-background-color);
   }
 }
 

app/javascript/styles/mastodon/rich_text.scss

@@ -1,5 +1,6 @@
 .status__content__text,
 .e-content,
+.edit-indicator__content,
 .reply-indicator__content {
   pre,
   blockquote {
@@ -55,10 +56,3 @@
     list-style-type: decimal;
   }
 }
-
-.reply-indicator__content {
-  blockquote {
-    border-left-color: $inverted-text-color;
-    color: $inverted-text-color;
-  }
-}

app/views/admin/status_edits/_status_edit.html.haml

@@ -1,20 +1,30 @@
-.status
+%li
-  .status__content><
+  .history__entry
-    - if status_edit.spoiler_text.blank?
+    %h5
-      = prerender_custom_emojis(status_content_format(status_edit), status_edit.emojis)
+      - if status_edit_iteration.first?
-    - else
+        = t('admin.statuses.original_status')
-      %details<
+      - else
-        %summary><
+        = t('admin.statuses.status_changed')
-          %strong> Content warning: #{prerender_custom_emojis(h(status_edit.spoiler_text), status_edit.emojis)}
-        = prerender_custom_emojis(status_content_format(status_edit), status_edit.emojis)
-
-  - unless status_edit.ordered_media_attachments.empty?
-    = render partial: 'admin/reports/media_attachments', locals: { status: status_edit }
-
-  .detailed-status__meta
-    %time.formatted{ datetime: status_edit.created_at.iso8601, title: l(status_edit.created_at) }= l(status_edit.created_at)
-
-    - if status_edit.sensitive?
       ·
-      = fa_icon('eye-slash fw')
+      %time.formatted{ datetime: status_edit.created_at.iso8601, title: l(status_edit.created_at) }= l(status_edit.created_at)
-      = t('stream_entries.sensitive_content')
+
+    .status
+      .status__content><
+        - if status_edit.spoiler_text.blank?
+          = prerender_custom_emojis(status_content_format(status_edit), status_edit.emojis)
+        - else
+          %details<
+            %summary><
+              %strong> Content warning: #{prerender_custom_emojis(h(status_edit.spoiler_text), status_edit.emojis)}
+            = prerender_custom_emojis(status_content_format(status_edit), status_edit.emojis)
+
+      - unless status_edit.ordered_media_attachments.empty?
+        = render partial: 'admin/reports/media_attachments', locals: { status: status_edit }
+
+      .detailed-status__meta
+        %time.formatted{ datetime: status_edit.created_at.iso8601, title: l(status_edit.created_at) }= l(status_edit.created_at)
+
+        - if status_edit.sensitive?
+          ·
+          = fa_icon('eye-slash fw')
+          = t('stream_entries.sensitive_content')

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

@@ -47,15 +47,4 @@
 %h3= t('admin.statuses.history')
 
 %ol.history
-  - batched_ordered_status_edits.with_index do |status_edit, i|
+  = render partial: 'admin/status_edits/status_edit', collection: batched_ordered_status_edits
-    %li
-      .history__entry
-        %h5
-          - if i.zero?
-            = t('admin.statuses.original_status')
-          - else
-            = t('admin.statuses.status_changed')
-          ·
-          %time.formatted{ datetime: status_edit.created_at.iso8601, title: l(status_edit.created_at) }= l(status_edit.created_at)
-
-        = render status_edit

config/locales/an.yml

@@ -1423,7 +1423,6 @@ an:
     import: Importar
     import_and_export: Importar y exportar
     migrate: Migración de cuenta
-    notifications: Notificacions
     preferences: Preferencias
     profile: Perfil
     relationships: Seguindo y seguidores

config/locales/ar.yml

@@ -1751,7 +1751,6 @@ ar:
     import: استيراد
     import_and_export: استيراد وتصدير
     migrate: تهجير الحساب
-    notifications: الإخطارات
     preferences: التفضيلات
     profile: الملف التعريفي
     relationships: المتابِعون والمتابَعون

config/locales/ast.yml

@@ -801,7 +801,6 @@ ast:
     import: Importación
     import_and_export: Importación ya esportación
     migrate: Migración de la cuenta
-    notifications: Avisos
     preferences: Preferencies
     profile: Perfil públicu
     relationships: Perfiles que sigues ya te siguen

config/locales/be.yml

@@ -1704,7 +1704,6 @@ be:
     import: Імпарт
     import_and_export: Імпарт і экспарт
     migrate: Перамяшчэнне ўліковага запісу
-    notifications: Апавяшчэнні
     preferences: Налады
     profile: Профіль
     relationships: Падпіскі і падпісчыкі

config/locales/bg.yml

@@ -597,6 +597,9 @@ bg:
       actions_description_html: Решете какво действие може да се предприеме, за да бъде отхвърлен докладът. Ако предприемете наказателно действие срещу докладвания акаунт, към него ще бъде изпратено известие по имейл, освен ако <strong>Спам</strong> категорията не е била избрана.
       actions_description_remote_html: Преценете с какво действие да решите този доклад. Това ще има ефекет върху това как <strong>вашият</strong> сървър комуникира с този отдалечен акаунт и се справя с неговото съдържание.
       add_to_report: Добавяне на още към доклада
+      already_suspended_badges:
+        local: Вече е спряно на този сървър
+        remote: Вече е спряно на сървъра им
       are_you_sure: Сигурни ли сте?
       assign_to_self: Назначаване на мен
       assigned: Назначен модератор
@@ -1652,7 +1655,7 @@ bg:
     import: Импортиране
     import_and_export: Импортиране и експортиране
     migrate: Миграция на акаунта
-    notifications: Известия
+    notifications: Известия по имейла
     preferences: Предпочитания
     profile: Профил
     relationships: Последвания и последователи

config/locales/ca.yml

@@ -597,6 +597,9 @@ ca:
       actions_description_html: Decideix quina acció a prendre per a resoldre aquest informe. Si prens un acció punitiva contra el compte denunciat, se li enviarà una notificació per correu electrònic, excepte quan se selecciona la categoria <strong>Spam</strong>.
       actions_description_remote_html: Decideix quina acció prendre per a resoldre aquest informe. Això només afectarà com <strong>el teu</strong> servidor es comunica amb aquest compte remot i en gestiona el contingut.
       add_to_report: Afegir més al informe
+      already_suspended_badges:
+        local: Ja és suspès en aquest servidor
+        remote: Ja és suspès al seu servidor
       are_you_sure: Segur?
       assign_to_self: Assigna'm
       assigned: Moderador assignat
@@ -1652,7 +1655,7 @@ ca:
     import: Importació
     import_and_export: Importació i exportació
     migrate: Migració del compte
-    notifications: Notificacions
+    notifications: Notificacions per correu electrònic
     preferences: Preferències
     profile: Perfil
     relationships: Seguits i seguidors

config/locales/ckb.yml

@@ -942,7 +942,6 @@ ckb:
     import: هاوردن
     import_and_export: هاوردەکردن و ناردن
     migrate: گواستنەوەی هەژمارە
-    notifications: ئاگادارییەکان
     preferences: پەسەندەکان
     profile: پرۆفایل
     relationships: شوێنکەوتوو و شوێنکەوتوان

config/locales/co.yml

@@ -926,7 +926,6 @@ co:
     import: Impurtazione
     import_and_export: Impurtazione è spurtazione
     migrate: Migrazione di u contu
-    notifications: Nutificazione
     preferences: Priferenze
     profile: Prufile
     relationships: Abbunamenti è abbunati

config/locales/cs.yml

@@ -1704,7 +1704,6 @@ cs:
     import: Import
     import_and_export: Import a export
     migrate: Přesun účtu
-    notifications: Oznámení
     preferences: Předvolby
     profile: Profil
     relationships: Sledovaní a sledující

config/locales/cy.yml

@@ -1756,7 +1756,6 @@ cy:
     import: Mewnforio
     import_and_export: Mewnforio ac allforio
     migrate: Mudo cyfrif
-    notifications: Hysbysiadau
     preferences: Dewisiadau
     profile: Proffil cyhoeddus
     relationships: Yn dilyn a dilynwyr

config/locales/da.yml

@@ -597,6 +597,9 @@ da:
       actions_description_html: Afgør, hvilke foranstaltning, der skal træffes for at løse denne anmeldelse. Træffes en straffende foranstaltning mod den anmeldte konto, fremsendes en e-mailnotifikation, undtagen når kategorien <strong>Spam</strong> er valgt.
       actions_description_remote_html: Fastslå en nødvendig handling mhp. at løse denne anmeldelse. Dette vil kun påvirke <strong>din</strong> servers kommunikation med, og indholdshåndtering for, fjernkontoen.
       add_to_report: Føj mere til anmeldelse
+      already_suspended_badges:
+        local: Allerede suspenderet på denne server
+        remote: Allerede suspenderet på vedkommendes server
       are_you_sure: Sikker?
       assign_to_self: Tildel til mig
       assigned: Tildelt moderator
@@ -1652,7 +1655,7 @@ da:
     import: Import
     import_and_export: Import og eksport
     migrate: Kontomigrering
-    notifications: Notifikationer
+    notifications: E-mailnotifikationer
     preferences: Præferencer
     profile: Offentlig profil
     relationships: Følger og følgere

config/locales/de.yml

@@ -597,6 +597,9 @@ de:
       actions_description_html: Entscheide, welche Maßnahmen du zum Klären dieser Meldung ergreifen möchtest. Wenn du eine Strafmaßnahme gegen das gemeldete Konto ergreifst, wird eine E-Mail-Benachrichtigung an dieses gesendet, außer wenn die <strong>Spam</strong>-Kategorie ausgewählt ist.
       actions_description_remote_html: Entscheide, welche Maßnahmen du zum Klären dieser Meldung ergreifen möchtest. Dies wirkt sich lediglich darauf aus, wie <strong>dein</strong> Server mit diesem externen Konto kommuniziert und dessen Inhalt handhabt.
       add_to_report: Meldung ergänzen
+      already_suspended_badges:
+        local: Auf diesem Server bereits gesperrt
+        remote: Auf dem anderen Server bereits gesperrt
       are_you_sure: Bist du dir sicher?
       assign_to_self: Mir zuweisen
       assigned: Zugewiesene*r Moderator*in
@@ -1652,7 +1655,7 @@ de:
     import: Importieren
     import_and_export: Importieren und exportieren
     migrate: Kontoumzug
-    notifications: Benachrichtigungen
+    notifications: E-Mail-Benachrichtigungen
     preferences: Einstellungen
     profile: Öffentliches Profil
     relationships: Follower und Folge ich

config/locales/el.yml

@@ -1524,7 +1524,6 @@ el:
     import: Εισαγωγή
     import_and_export: Εισαγωγή και εξαγωγή
     migrate: Μετακόμιση λογαριασμού
-    notifications: Ειδοποιήσεις
     preferences: Προτιμήσεις
     profile: Προφίλ
     relationships: Ακολουθείς και σε ακολουθούν

config/locales/en-GB.yml

@@ -1647,7 +1647,6 @@ en-GB:
     import: Import
     import_and_export: Import and export
     migrate: Account migration
-    notifications: Notifications
     preferences: Preferences
     profile: Profile
     relationships: Follows and followers

config/locales/eo.yml

@@ -1579,7 +1579,6 @@ eo:
     import: Enporti
     import_and_export: Importi kaj eksporti
     migrate: Konta migrado
-    notifications: Sciigoj
     preferences: Preferoj
     profile: Profilo
     relationships: Sekvatoj kaj sekvantoj

config/locales/es-AR.yml

@@ -1652,7 +1652,7 @@ es-AR:
     import: Importar
     import_and_export: Importación y exportación
     migrate: Migración de la cuenta
-    notifications: Notificaciones
+    notifications: Notificaciones por correo electrónico
     preferences: Configuración
     profile: Perfil público
     relationships: Seguimientos

config/locales/es-MX.yml

@@ -597,6 +597,9 @@ es-MX:
       actions_description_html: Decide qué medidas tomar para resolver esta denuncia. Si tomas una acción punitiva contra la cuenta denunciada, se le enviará a dicha cuenta una notificación por correo electrónico, excepto cuando se seleccione la categoría <strong>Spam</strong>.
       actions_description_remote_html: Decide qué medidas tomar para resolver este reporte. Esto solo afectará a la forma en que <strong>tu servidor</strong> se comunica con esta cuenta remota y gestiona su contenido.
       add_to_report: Añadir más al reporte
+      already_suspended_badges:
+        local: Ya suspendido en este servidor
+        remote: Ya suspendido en su servidor
       are_you_sure: "¿Estás seguro?"
       assign_to_self: Asignármela a mí
       assigned: Moderador asignado
@@ -1652,7 +1655,7 @@ es-MX:
     import: Importar
     import_and_export: Importar y exportar
     migrate: Migración de cuenta
-    notifications: Notificaciones
+    notifications: Notificaciones por correo electrónico
     preferences: Preferencias
     profile: Perfil
     relationships: Siguiendo y seguidores
@@ -1865,6 +1868,9 @@ es-MX:
       follows_subtitle: Seguir cuentas conocidas
       follows_title: A quién seguir
       follows_view_more: Ver más personas para seguir
+      hashtags_recent_count:
+        one: "%{people} personas en los últimos 2 días"
+        other: "%{people} personas en los últimos 2 días"
       hashtags_subtitle: Explora las tendencias de los últimos 2 días
       hashtags_title: Etiquetas en tendencia
       hashtags_view_more: Ver más etiquetas en tendencia

config/locales/es.yml

@@ -1652,7 +1652,7 @@ es:
     import: Importar
     import_and_export: Importar y exportar
     migrate: Migración de cuenta
-    notifications: Notificaciones
+    notifications: Notificaciones por correo electrónico
     preferences: Preferencias
     profile: Perfil
     relationships: Siguiendo y seguidores

config/locales/et.yml

@@ -1652,7 +1652,6 @@ et:
     import: Impordi
     import_and_export: Import / eksport
     migrate: Konto kolimine
-    notifications: Teated
     preferences: Eelistused
     profile: Profiil
     relationships: Jälgitud ja jälgijad

config/locales/eu.yml

@@ -599,6 +599,9 @@ eu:
       actions_description_html: Erabaki txosten hau konpontzeko ze ekintza hartu. Salatutako kontuaren aurka zigor ekintza bat hartzen baduzu, eposta jakinarazpen bat bidaliko zaie, <strong>Spam</strong> kategoria hautatzean ezik.
       actions_description_remote_html: Hautatu txosten honi konponbidea aurkitzeko zein neurri hartu. Hau soilik <strong>zure</strong> zerbitzaria urruneko kontu honekin nola komunikatu eta bere edukia nola maneiatzeko da.
       add_to_report: Gehitu gehiago txostenera
+      already_suspended_badges:
+        local: Dagoeneko kanporatu da zerbitzari honetatik
+        remote: Dagoeneko kanporatu da bere zerbitzaritik
       are_you_sure: Ziur zaude?
       assign_to_self: Esleitu niri
       assigned: Esleitutako moderatzailea
@@ -1656,7 +1659,7 @@ eu:
     import: Inportazioa
     import_and_export: Inportatu eta esportatu
     migrate: Kontuaren migrazioa
-    notifications: Jakinarazpenak
+    notifications: Posta bidezko jakinarazpenak
     preferences: Hobespenak
     profile: Profila
     relationships: Jarraitutakoak eta jarraitzaileak

config/locales/fa.yml

@@ -1416,7 +1416,6 @@ fa:
     import: درون‌ریزی
     import_and_export: درون‌ریزی و برون‌بری
     migrate: انتقال حساب
-    notifications: آگاهی‌ها
     preferences: ترجیحات
     profile: نمایه
     relationships: پیگیری‌ها و پیگیران

config/locales/fi.yml

@@ -597,6 +597,9 @@ fi:
       actions_description_html: Päätä, mihin toimiin ryhdyt tämän raportin ratkaisemiseksi. Jos ryhdyt rangaistustoimeen ilmoitettua tiliä kohtaan, hänelle lähetetään sähköposti-ilmoitus, paitsi jos <strong>Roskaposti</strong>-luokka on valittuna.
       actions_description_remote_html: Päätä, mihin toimiin ryhdyt tämän raportin ratkaisemiseksi. Tämä vaikuttaa vain siihen, miten <strong>palvelimesi</strong> kommunikoi tämän etätilin kanssa ja käsittelee sen sisältöä.
       add_to_report: Lisää raporttiin
+      already_suspended_badges:
+        local: Jäädytetty jo tällä palvelimella
+        remote: Jäädytetty jo tällä palvelimella
       are_you_sure: Oletko varma?
       assign_to_self: Ota tehtäväksi
       assigned: Määritetty valvoja
@@ -1652,7 +1655,7 @@ fi:
     import: Tuo
     import_and_export: Tuonti ja vienti
     migrate: Tilin muutto muualle
-    notifications: Ilmoitukset
+    notifications: Sähköposti-ilmoitukset
     preferences: Ominaisuudet
     profile: Julkinen profiili
     relationships: Seuratut ja seuraajat

config/locales/fo.yml

@@ -94,7 +94,7 @@ fo:
         disabled: Óvirkið
         pending: Í bíðistøðu
         silenced: Avmarkað
-        suspended: Avbrotin
+        suspended: Gjørt óvirkin
         title: Umsjón
       moderation_notes: Umsjónarviðmerkingar
       most_recent_activity: Feskasta virksemi
@@ -150,7 +150,7 @@ fo:
       strikes: Eldri fráboðanir
       subscribe: Tekna hald
       suspend: Fyribils ikki í gildi
-      suspended: Ikki í gildi
+      suspended: Gjørt óvirkin
       suspension_irreversible: Dáturnar á hesu kontu er endaliga sletttaðar. Tú kann seta hana í gildi, men dáturnar fáast ikki aftur.
       suspension_reversible_hint_html: Kontan er sett úr gildi og dáturnar verða endaliga strikaðar tann %{date}. Inntil tá kann kontan endurskapast uttan fylgjur. Ynskir tú at strika allar dátur hjá kontuni beinan vegin, so kanst tú gera tað niðanfyri.
       title: Kontur
@@ -597,6 +597,9 @@ fo:
       actions_description_html: Ger av hvør atgerð skal takast fyri at avgreiða hesa meldingina. Revsitiltøk móti meldaðu kontuni føra við sær, at ein teldupostfráboðan verður send teimum, undantikið tá <strong>Ruskpostur</strong> verður valdur.
       actions_description_remote_html: Tak avgerð um hvat skal gerast fyri at avgreiða hesa rapporteringina. Hetta fer einans at ávirka, hvussu <strong>tín</strong> ambætari samskiftir við hesa fjarkontuna og hvussu hann handfer tilfar frá henni.
       add_to_report: Legg meira afturat meldingini
+      already_suspended_badges:
+        local: Longu gjørt óvirkin á hesum ambætaranum
+        remote: Longu gjørt óvirkin á teirra ambætara
       are_you_sure: Er tú vís/ur?
       assign_to_self: Tilluta mær
       assigned: Tilnevnt umsjónarfólk
@@ -1652,7 +1655,7 @@ fo:
     import: Innflyt
     import_and_export: Innflyt og útflyt
     migrate: Flyting av kontu
-    notifications: Fráboðanir
+    notifications: Teldupostfráboðanir
     preferences: Stillingar
     profile: Vangi
     relationships: Fylging og fylgjarar

config/locales/fr-CA.yml

@@ -1652,7 +1652,6 @@ fr-CA:
     import: Import de données
     import_and_export: Import et export
     migrate: Migration de compte
-    notifications: Notifications
     preferences: Préférences
     profile: Profil
     relationships: Abonnements et abonné·e·s

config/locales/fr.yml

@@ -1652,7 +1652,6 @@ fr:
     import: Import de données
     import_and_export: Import et export
     migrate: Migration de compte
-    notifications: Notifications
     preferences: Préférences
     profile: Profil
     relationships: Abonnements et abonné·e·s

config/locales/fy.yml

@@ -1647,7 +1647,6 @@ fy:
     import: Ymportearje
     import_and_export: Ymportearje en eksportearje
     migrate: Accountmigraasje
-    notifications: Meldingen
     preferences: Ynstellingen
     profile: Profyl
     relationships: Folgers en folgjenden

config/locales/ga.yml

@@ -461,7 +461,6 @@ ga:
     development: Forbairt
     edit_profile: Cuir an phróifíl in eagar
     import: Iompórtáil
-    notifications: Fógraí
     preferences: Sainroghanna pearsanta
     profile: Próifíl
     webauthn_authentication: Eochracha slándála

config/locales/gd.yml

@@ -1704,7 +1704,6 @@ gd:
     import: Ion-phortadh
     import_and_export: Ion-phortadh ⁊ às-phortadh
     migrate: Imrich cunntais
-    notifications: Brathan
     preferences: Roghainnean
     profile: Pròifil phoblach
     relationships: Dàimhean leantainn

config/locales/gl.yml

@@ -597,6 +597,9 @@ gl:
       actions_description_html: Decide que acción tomar respecto desta denuncia. Se tomas accións punitivas contra a conta denunciada, enviaráselles un email coa notificación, excepto se está seleccionada a categoría <strong>Spam</strong>.
       actions_description_remote_html: Decide a acción a tomar para resolver a denuncia. Isto só lle afecta ao xeito en que o <strong>teu</strong> servidor se comunica con esta conta remota e xestiona o seu contido.
       add_to_report: Engadir máis á denuncia
+      already_suspended_badges:
+        local: Xa está suspendida neste servidor
+        remote: Xa está suspendida no seu servidor
       are_you_sure: Tes certeza?
       assign_to_self: Asignarme
       assigned: Moderador asignado
@@ -1652,7 +1655,7 @@ gl:
     import: Importar
     import_and_export: Importar e exportar
     migrate: Migrar conta
-    notifications: Notificacións
+    notifications: Notificacións por correo
     preferences: Preferencias
     profile: Perfil
     relationships: Seguindo e seguidoras

config/locales/he.yml

@@ -621,6 +621,9 @@ he:
       actions_description_html: בחר/י איזו פעולה לבצע על מנת לפתור את הדו"ח. אם תופעל פעולת ענישה כנגד החשבון המדווח, הודעת דוא"ל תשלח אליהם, אלא אם נבחרה קטגוריית ה<strong>ספאם</strong>.
       actions_description_remote_html: בחרו איזו פעולה לבצע כדי לפתור את הדיווח שהוגש. פעולה זו תשפיע רק על התקשורת מול השרת <strong>שלך</strong> עם החשבון המרוחק ותוכנו.
       add_to_report: הוספת פרטים לדיווח
+      already_suspended_badges:
+        local: כבר הודח בשרת זה
+        remote: כבר הודח בשרת שלו
       are_you_sure: 100% על בטוח?
       assign_to_self: הקצה אלי
       assigned: מנחה מוקצה
@@ -1704,7 +1707,6 @@ he:
     import: יבוא
     import_and_export: יבוא ויצוא
     migrate: הגירת חשבון
-    notifications: התראות
     preferences: העדפות
     profile: פרופיל
     relationships: נעקבים ועוקבים

config/locales/hr.yml

@@ -211,7 +211,6 @@ hr:
     featured_tags: Istaknuti hashtagovi
     import: Uvezi
     import_and_export: Uvezi i izvezi
-    notifications: Obavijesti
     preferences: Postavke
     profile: Profil
     statuses_cleanup: Automatsko brisanje postova

config/locales/hu.yml

@@ -597,6 +597,9 @@ hu:
       actions_description_html: Döntsd el, mit csináljunk, hogy megoldjuk ezt a bejelentést. Ha valamilyen büntető intézkedést hozol a bejelentett fiók ellen, küldünk neki egy figyelmeztetést e-mail-ben, kivéve ha a <strong>Spam</strong> kategóriát választod.
       actions_description_remote_html: Döntsd el, mit tegyünk a bejelentés lezárásának érdekében. Ez csak azt befolyásolja, hogy a <strong>saját</strong> kiszolgálód hogyan kommunikál ezzel a távoli fiókkal és hogyan kezeli annak tartalmait.
       add_to_report: Továbbiak hozzáadása a bejelentéshez
+      already_suspended_badges:
+        local: Már felfüggesztették ezen a szerveren
+        remote: Már felfüggesztették a kiszolgálóján
       are_you_sure: Biztos vagy benne?
       assign_to_self: Magamhoz rendelés
       assigned: Hozzárendelt moderátor
@@ -1652,7 +1655,7 @@ hu:
     import: Importálás
     import_and_export: Import és export
     migrate: Fiók átirányítása
-    notifications: Értesítések
+    notifications: E-mail értesítések
     preferences: Beállítások
     profile: Profil
     relationships: Követések és követők

config/locales/hy.yml

@@ -778,7 +778,6 @@ hy:
     import: Ներմուծել
     import_and_export: Ներմուծել և արտահանել
     migrate: Հաշուի տեղափոխում
-    notifications: Ծանուցումներ
     preferences: Կարգավորումներ
     profile: Հաշիւ
     relationships: Հետեւումներ և հետեւորդներ

config/locales/id.yml

@@ -1389,7 +1389,6 @@ id:
     import: Impor
     import_and_export: Impor dan ekspor
     migrate: Pemindahan akun
-    notifications: Notifikasi
     preferences: Pilihan
     profile: Profil
     relationships: Ikuti dan pengikut

config/locales/ie.yml

@@ -1652,7 +1652,6 @@ ie:
     import: Importar
     import_and_export: Importation e exportation
     migrate: Migration de conto
-    notifications: Notificationes
     preferences: Preferenties
     profile: Public profil
     relationships: Sequetes e sequitores

config/locales/io.yml

@@ -1621,7 +1621,6 @@ io:
     import: Importacar
     import_and_export: Importaco e exportaco
     migrate: Kontomigro
-    notifications: Avizi
     preferences: Preferi
     profile: Profilo
     relationships: Sequati e sequanti

config/locales/is.yml

@@ -597,6 +597,9 @@ is:
       actions_description_html: Ákveddu til hvaða aðgerða eigi að taka til að leysa þessa kæru. Ef þú ákveður að refsa kærða notandaaðgangnum, verður viðkomandi send tilkynning í tölvupósti, nema ef flokkurinn <strong>Ruslpóstur</strong> sé valinn.
       actions_description_remote_html: Ákveddu til hvaða aðgerða eigi að taka til að leysa þessa kæru. Þetta mun aðeins hafa áhrif á hvernig <strong>netþjónninn þinn</strong> meðhöndlar þennan fjartengda aðgang og efnið á honum.
       add_to_report: Bæta fleiru í kæru
+      already_suspended_badges:
+        local: Þegar frystur á þessum netþjóni
+        remote: Þegar frystur á hinum netþjóninum
       are_you_sure: Ertu viss?
       assign_to_self: Úthluta mér
       assigned: Úthlutaður umsjónarmaður
@@ -1656,7 +1659,6 @@ is:
     import: Flytja inn
     import_and_export: Inn- og útflutningur
     migrate: Yfirfærsla notandaaðgangs
-    notifications: Tilkynningar
     preferences: Kjörstillingar
     profile: Notandasnið
     relationships: Fylgist með og fylgjendur

config/locales/it.yml

@@ -597,6 +597,9 @@ it:
       actions_description_html: Decidete quali azioni intraprendere per risolvere la segnalazione. Se si intraprende un'azione punitiva contro l'account segnalato, gli sarà inviata una notifica via e-mail, tranne quando è selezionata la categoria <strong>Spam</strong>.
       actions_description_remote_html: Decide quali azioni intraprendere per risolvere la relazione. Questo influenzerà solo come <strong>il tuo</strong> server comunica con questo account remoto e ne gestisce il contenuto.
       add_to_report: Aggiungi altro al report
+      already_suspended_badges:
+        local: Già sospeso su questo server
+        remote: Già sospeso sul loro server
       are_you_sure: Sei sicuro?
       assign_to_self: Assegna a me
       assigned: Moderatore assegnato
@@ -1654,7 +1657,7 @@ it:
     import: Importa
     import_and_export: Importa ed esporta
     migrate: Migrazione dell'account
-    notifications: Notifiche
+    notifications: Notifiche e-mail
     preferences: Preferenze
     profile: Profilo
     relationships: Follows e followers

config/locales/ja.yml

@@ -1626,7 +1626,6 @@ ja:
     import: データのインポート
     import_and_export: インポート・エクスポート
     migrate: アカウントの引っ越し
-    notifications: 通知
     preferences: ユーザー設定
     profile: プロフィール
     relationships: フォロー・フォロワー

config/locales/ka.yml

@@ -419,7 +419,6 @@ ka:
     export: მონაცემის ექსპორტი
     import: იმპორტი
     migrate: ანგარიშის მიგრაცია
-    notifications: შეტყობინებები
     preferences: პრეფერენციები
     two_factor_authentication: მეორე-ფაქტორის აუტენტიფიკაცია
   statuses:

config/locales/kab.yml

@@ -784,7 +784,6 @@ kab:
     import: Kter
     import_and_export: Taktert d usifeḍ
     migrate: Tunigin n umiḍan
-    notifications: Ilɣa
     preferences: Imenyafen
     profile: Ameɣnu
     relationships: Imeḍfaṛen akked wid i teṭṭafaṛeḍ

config/locales/kk.yml

@@ -643,7 +643,6 @@ kk:
     import: Импорт
     import_and_export: Импорт/экспорт
     migrate: Аккаунт көшіру
-    notifications: Ескертпелер
     preferences: Баптаулар
     profile: Профиль
     relationships: Жазылымдар және оқырмандар

config/locales/ko.yml

@@ -587,6 +587,9 @@ ko:
       actions_description_html: 이 신고를 해결하기 위해 취해야 할 조치를 지정해주세요. 신고된 계정에 대해 처벌 조치를 취하면, <strong>스팸</strong> 카테고리가 선택된 경우를 제외하고 해당 계정으로 이메일 알림이 전송됩니다.
       actions_description_remote_html: 이 신고를 해결하기 위해 실행할 행동을 결정하세요. 이 결정은 이 원격 계정과 그 콘텐츠를 다루는 방식에 대해 <strong>이 서버</strong>에서만 영향을 끼칩니다
       add_to_report: 신고에 더 추가하기
+      already_suspended_badges:
+        local: 이 서버에서 이미 정지되었습니다
+        remote: 저 서버에서 이미 정지되었습니다
       are_you_sure: 확실합니까?
       assign_to_self: 나에게 할당하기
       assigned: 할당된 중재자
@@ -1628,7 +1631,7 @@ ko:
     import: 데이터 가져오기
     import_and_export: 가져오기 & 내보내기
     migrate: 계정 이동
-    notifications: 알림
+    notifications: 이메일 알림
     preferences: 환경설정
     profile: 공개 프로필
     relationships: 팔로잉과 팔로워
@@ -1823,8 +1826,10 @@ ko:
       feature_action: 더 알아보기
       feature_audience: 마스토돈은 중개자 없이 청중을 관리할 수 있는 특별한 가능성을 제공합니다. 자체 인프라에 배포된 마스토돈을 사용하면 온라인에 있는 다른 마스토돈 서버에도 팔로우하거나 팔로우할 수 있으며, 본인 외에는 누구의 통제도 받지 않습니다.
       feature_audience_title: 신뢰 있는 청중 구축
+      feature_control: 내가 홈 피드에서 무엇을 보고 싶은지는 내가 제일 잘 압니다. 알고리즘이나 시간을 낭비하게 만드는 광고는 없습니다. 계정 하나로 다른 마스토돈 서버에 있는 누구나 팔로우 하여 그들의 게시물을 시간순으로 받아보고 인터넷의 한 구석을 좀 더 나답게 만들어 보세요.
       feature_control_title: 내 타임라인에 대해 통제권을 유지하세요
       feature_creativity: 마스토돈은 오디오, 비디오, 사진, 접근성 설명(alt),  투표, 콘텐츠 주의 (블라인드), 움직이는 아바타, 커스텀 이모티콘, 썸네일 자르기, 그리고 더 많은 것들을 당신이 온라인에서 당신을 더 잘 드러낼 수 있도록 돕기위해 지원합니다. 당신이 그림이나 음악을 올리던, 팟캐스트 같은것을 진행하던 마스토돈이 함께합니다.
+      feature_creativity_title: 독보적인 창의성
       feature_moderation: 마스토돈은 의사 결정권을 사용자에게 돌려줍니다. 각 서버는 기업 소셜 미디어처럼 하향식이 아닌 로컬에서 시행되는 자체 규칙과 규정을 만들 수 있어 다양한 그룹의 요구에 가장 유연하게 대응할 수 있습니다. 동의하는 규칙이 있는 서버에 가입하거나 직접 서버를 호스팅하세요.
       feature_moderation_title: 올바른 중재
       follow_action: 팔로우

config/locales/ku.yml

@@ -1417,7 +1417,6 @@ ku:
     import: Têxistin
     import_and_export: Têxistin û derxistin
     migrate: Barkirina ajimêrê
-    notifications: Agahdarî
     preferences: Hilbijarte
     profile: Profîl
     relationships: Şopandin û şopîner

config/locales/lad.yml

@@ -597,6 +597,9 @@ lad:
       actions_description_html: Dechide kualas mizuras tomar para rezolver esta denunsia. Si tomas una aksion punitiva kontra el kuento denunsiada, se le embiara a dicho kuento un avizo por posta elektronika, ekseptado kuando se eskoja la kategoria <strong>Spam</strong>.
       actions_description_remote_html: Dechide ke fazer para rezolver este raporto. Esto solo va afektar komo <strong>tu</strong> sirvidor komunike kon este kuento remoto i ke faze kon su kontenido.
       add_to_report: Adjusta mas al raporto
+      already_suspended_badges:
+        local: Ya suspendido en este sirvidor
+        remote: Ya suspendido en sus sirvidor
       are_you_sure: Estas siguro?
       assign_to_self: Asinyamela a mi
       assigned: Moderador asinyado
@@ -1652,7 +1655,6 @@ lad:
     import: Importo
     import_and_export: Importo i eksporto
     migrate: Migrasyon de kuento
-    notifications: Avizos
     preferences: Preferensyas
     profile: Profil publiko
     relationships: Segidos i suivantes

config/locales/lt.yml

@@ -466,6 +466,9 @@ lt:
       destroyed_msg: Skundo žinutė sekmingai ištrinta!
     reports:
       action_taken_by: Veiksmo ėmėsi
+      already_suspended_badges:
+        local: Jau sustabdytas šiame serveryje
+        remote: Jau sustabdytas jų serveryje
       are_you_sure: Ar esi įsitikinęs (-usi)?
       assign_to_self: Paskirti man
       assigned: Paskirtas moderatorius
@@ -755,7 +758,6 @@ lt:
     featured_tags: Rodomi saitažodžiai(#)
     import: Importuoti
     migrate: Paskyros migracija
-    notifications: Pranešimai
     preferences: Preferencijos
     two_factor_authentication: Dviejų veiksnių autentikacija
   statuses:

config/locales/lv.yml

@@ -1667,7 +1667,6 @@ lv:
     import: Imports
     import_and_export: Imports un eksports
     migrate: Konta migrācija
-    notifications: Paziņojumi
     preferences: Iestatījumi
     profile: Profils
     relationships: Sekojamie un sekotāji

config/locales/ml.yml

@@ -87,5 +87,3 @@ ml:
       subject: "%{name} ഇപ്പോൾ നിങ്ങളെ പിന്തുടരുന്നു"
   relationships:
     following: പിന്തുടരുന്നു
-  settings:
-    notifications: അറിയിപ്പുകൾ

config/locales/ms.yml

@@ -1595,7 +1595,6 @@ ms:
     import: Import
     import_and_export: Import dan eksport
     migrate: Penghijrahan akaun
-    notifications: Pemberitahuan
     preferences: Keutamaan
     profile: Profil
     relationships: Ikutan dan pengikut

config/locales/my.yml

@@ -1594,7 +1594,6 @@ my:
     import: ထည့်သွင်းခြင်း
     import_and_export: ထည့်သွင်းခြင်းနှင့် ထုတ်ယူခြင်း
     migrate: အကောင့်ပြောင်းရွှေ့ခြင်း
-    notifications: အသိပေးချက်များ
     preferences: သတ်မှတ်ချက်များ
     profile: ပရိုဖိုင်
     relationships: စောင့်ကြည့်သူများနှင့် စောင့်ကြည့်စာရင်း

config/locales/nl.yml

@@ -597,6 +597,9 @@ nl:
       actions_description_html: Beslis welke maatregel moet worden genomen om deze rapportage op te lossen. Wanneer je een (straf)maatregel tegen het gerapporteerde account neemt, krijgt het account een e-mailmelding, behalve wanneer de <strong>spam</strong>-categorie is gekozen.
       actions_description_remote_html: Beslis welke actie moet worden ondernomen om deze rapportage op te lossen. Dit is alleen van invloed op hoe <strong>jouw</strong> server met dit externe account communiceert en de inhoud ervan beheert.
       add_to_report: Meer aan de rapportage toevoegen
+      already_suspended_badges:
+        local: Al geschorst op deze server
+        remote: Al geschorst op hun server
       are_you_sure: Weet je het zeker?
       assign_to_self: Aan mij toewijzen
       assigned: Toegewezen moderator
@@ -1652,7 +1655,7 @@ nl:
     import: Importeren
     import_and_export: Importeren en exporteren
     migrate: Accountmigratie
-    notifications: Meldingen
+    notifications: E-mailmeldingen
     preferences: Voorkeuren
     profile: Openbaar profiel
     relationships: Volgers en gevolgde accounts

config/locales/nn.yml

@@ -152,7 +152,7 @@ nn:
       suspend: Utvis og slett kontodata for godt
       suspended: Utvist
       suspension_irreversible: Data frå denne kontoen har blitt ikkje-reverserbart sletta. Du kan oppheve suspenderinga av kontoen for å bruke den, men det vil ikkje gjenopprette alle data den tidligare har hatt.
-      suspension_reversible_hint_html: Kontoen har blitt suspendert, og data vil bli fullstendig fjerna den %{date}. Fram til då kan kontoen gjenopprettes uten negative effekter. Om du ynskjer å fjerne kontodata no, kan du gjere det nedanfor.
+      suspension_reversible_hint_html: Kontoen har vorte stengd, og data vil bli fullstendig fjerna den %{date}. Fram til då kandu gjenoppretta kontoen utan negative konsekvensar. Om du ynskjer å fjerna kontodata no, kan du gjera det nedanfor.
       title: Kontoar
       unblock_email: Avblokker e-postadresse
       unblocked_email_msg: Avblokkerte %{username} si e-postadresse
@@ -221,7 +221,7 @@ nn:
         unblock_email_account: Avblokker e-postadresse
         unsensitive_account: Angr tving ømtolig konto
         unsilence_account: Angre avgrensing av konto
-        unsuspend_account: Opphev suspensjonen av kontoen
+        unsuspend_account: Opphev utestenginga av kontoen
         update_announcement: Oppdater kunngjøringen
         update_custom_emoji: Oppdater tilpassa emoji
         update_domain_block: Oppdater domene-sperring
@@ -385,9 +385,9 @@ nn:
       add_new: Lag ny
       confirm_suspension:
         cancel: Avbryt
-        confirm: Suspender
+        confirm: Utvis
         permanent_action: Å oppheve suspensjonen vil ikkje gjenopprette data eller koplingar.
-        preamble_html: Du er i ferd med å suspendera <strong>%{domain}</strong> inkludert underdomener.
+        preamble_html: Du er i ferd med å utestenga <strong>%{domain}</strong> inkludert underdomene.
         remove_all_data: Dette vil fjerna alt innhald, media og profildata for kontoar som tilhøyrer dette domenet frå din tenar.
         stop_communication: Tenaren din vil slutta å kommunisera med desse tenarane.
         title: Stadfest domeneblokkering for %{domain}
@@ -492,7 +492,7 @@ nn:
           reject_media: Avvis media
           reject_reports: Avvis rapporter
           silence: Begrens
-          suspend: Suspender
+          suspend: Utvis
         policy: Vilkår
         reason: Offentlig årsak
         title: Retningslinjer for innhold
@@ -597,6 +597,9 @@ nn:
       actions_description_html: Avgjer kva som skal gjerast med denne rapporteringa. Dersom du utfører straffetiltak mot den rapporterte kontoen, vil dei motta ein e-post – så sant du ikkje har valt kategorien <strong>Spam</strong>.
       actions_description_remote_html: Avgjer kva du vil gjera for å løysa denne rapporten. Dette påverkar berre korleis tenaren <strong>din</strong> kommuniserer med kontoen på ein annan tenar, og korleis tenaren din handterer innhald derifrå.
       add_to_report: Legg til i rapporten
+      already_suspended_badges:
+        local: Allereie utestengd på denne tenaren
+        remote: Allereie utestengd på tenaren deira
       are_you_sure: Er du sikker?
       assign_to_self: Tilegn til meg
       assigned: Tilsett moderator
@@ -979,7 +982,7 @@ nn:
         none: en advarsel
         sensitive: å merke kontoen sin som følsom
         silence: for å begrense deres konto
-        suspend: for å suspendere kontoen deres
+        suspend: for å stenga kontoen deira
       body: "%{target} ankar på ei modereringsavgjerd av %{action_taken_by} den %{date}, som var %{type}. Dei skreiv:"
       next_steps: Du kan godkjenna anken for å endra modereringsavgjerda, eller du kan oversjå anken.
       subject: "%{username} ankar ei modereringsavgjer på %{instance}"
@@ -1189,7 +1192,7 @@ nn:
         none: Advarsel
         sensitive: Markering av konto som ømtolig
         silence: Begrensning av konto
-        suspend: Suspensjon av konto
+        suspend: Utestenging av konto
       your_appeal_approved: Din klage har blitt godkjent
       your_appeal_pending: Du har levert en klage
       your_appeal_rejected: Din klage har blitt avvist
@@ -1652,7 +1655,7 @@ nn:
     import: Hent inn
     import_and_export: Importer og eksporter
     migrate: Kontoflytting
-    notifications: Varsel
+    notifications: E-postvarslingar
     preferences: Innstillingar
     profile: Profil
     relationships: Fylgjar og fylgjarar
@@ -1820,7 +1823,7 @@ nn:
         mark_statuses_as_sensitive: Nokre av innlegga dine har vorte markerte som ømtolige av moderatorane ved %{instance}. Dette tyder at folk må trykkje på mediane i innlegga for å førehandsvise dei. Du kan markera media som ømtolig sjølv når du legg ut nye innlegg.
         sensitive: Frå no av vil alle dine opplasta mediefiler bli markert som ømtolig og skjult bak ei klikk-åtvaring.
         silence: Medan kontoen din er avgrensa, vil berre folk som allereie fylgjer deg sjå dine tutar på denne tenaren, og du kan bli ekskludert fra diverse offentlige oppføringer. Andre kan framleis fylgje deg manuelt.
-        suspend: Du kan ikkje lenger bruke kontoen din, og profilen og andre data er ikkje lenger tilgjengelege. Du kan framleis logge inn for å be om ein sikkerheitskopi av data før dei blir fullstendig sletta om omtrent 30 dagar, men vi beheld nokre grunnleggjande data for å forhindre deg å omgå suspenderinga.
+        suspend: Du kan ikkje lenger bruka kontoen din, og profilen og andre data er ikkje lenger tilgjengelege. Du kan framleis logga inn for å be om ein sikkerheitskopi av data før dei blir fullstendig sletta om omtrent 30 dagar, men me vil lagra nokre grunnleggjande data for å syta for at du ikkje omgår utestenginga.
       reason: 'Årsak:'
       statuses: 'Innlegg sitert:'
       subject:
@@ -1865,6 +1868,9 @@ nn:
       follows_subtitle: Fylg kjende folk
       follows_title: Kven du kan fylgja
       follows_view_more: Sjå fleire du kan fylgja
+      hashtags_recent_count:
+        one: "%{people} person dei siste to dagane"
+        other: "%{people} personar dei siste to dagane"
       hashtags_subtitle: Sjå kva som har vore populært dei siste to dagane
       hashtags_title: Populære emneknaggar
       hashtags_view_more: Sjå fleire populære emneknaggar

config/locales/no.yml

@@ -1649,7 +1649,6 @@
     import: Importér
     import_and_export: Importer og eksporter
     migrate: Kontomigrering
-    notifications: Varslinger
     preferences: Innstillinger
     profile: Profil
     relationships: Følginger og følgere

config/locales/oc.yml

@@ -832,7 +832,6 @@ oc:
     import: Importar de donadas
     import_and_export: Import e export
     migrate: Migracion de compte
-    notifications: Notificacions
     preferences: Preferéncias
     profile: Perfil
     relationships: Abonaments e seguidors

config/locales/pl.yml

@@ -621,6 +621,9 @@ pl:
       actions_description_html: Zdecyduj, jakie działania należy podjąć, aby rozstrzygnąć niniejsze zgłoszenie. Jeśli podejmiesz działania karne przeciwko zgłoszonemu kontowi, zostanie do nich wysłane powiadomienie e-mail, chyba że wybrano kategorię <strong>Spam</strong>.
       actions_description_remote_html: Zdecyduj, jakie działanie należy podjąć, aby rozwiązać to zgłoszenie. Będzie to miało wpływ jedynie na sposób, w jaki <strong>Twój</strong> serwer komunikuje się z tym kontem zdalnym i obsługuje jego zawartość.
       add_to_report: Dodaj więcej do zgłoszenia
+      already_suspended_badges:
+        local: Już zawieszono na tym serwerze
+        remote: Już zawieszono na ich serwerze
       are_you_sure: Czy na pewno?
       assign_to_self: Przypisz do siebie
       assigned: Przypisany moderator
@@ -1704,7 +1707,7 @@ pl:
     import: Importowanie danych
     import_and_export: Import i eksport
     migrate: Migracja konta
-    notifications: Powiadomienia
+    notifications: Powiadomienia e-mail
     preferences: Preferencje
     profile: Profil
     relationships: Obserwowani i obserwujący

config/locales/pt-BR.yml

@@ -1652,7 +1652,6 @@ pt-BR:
     import: Importar
     import_and_export: Importar e exportar
     migrate: Migração de conta
-    notifications: Notificações
     preferences: Preferências
     profile: Perfil
     relationships: Seguindo e seguidores

config/locales/pt-PT.yml

@@ -597,6 +597,9 @@ pt-PT:
       actions_description_html: Decida a ação a tomar para resolver esta denúncia. Se decidir por uma ação punitiva contra a conta denunciada, um e-mail de notificação será enviado, excetuando quando selecionada a categoria <strong>Spam</strong>.
       actions_description_remote_html: Decida quais as medidas a tomar para resolver esta denúncia. Isso apenas afetará como <strong>o seu</strong> servido comunica com esta conta remota e gere o seu conteúdo.
       add_to_report: Adicionar mais à denúncia
+      already_suspended_badges:
+        local: Já suspenso neste servidor
+        remote: Já suspenso no servidor deles
       are_you_sure: Tem a certeza?
       assign_to_self: Atribuída a mim
       assigned: Atribuída ao moderador
@@ -1652,7 +1655,7 @@ pt-PT:
     import: Importar
     import_and_export: Importar e exportar
     migrate: Migração de conta
-    notifications: Notificações
+    notifications: Notificações por e-mail
     preferences: Preferências
     profile: Perfil
     relationships: Seguindo e seguidores
@@ -1865,6 +1868,9 @@ pt-PT:
       follows_subtitle: Siga contas bem conhecidas
       follows_title: Quem seguir
       follows_view_more: Veja mais pessoas para seguir
+      hashtags_recent_count:
+        one: "%{people} pessoa nos últimos 2 dias"
+        other: "%{people} pessoas nos últimos 2 dias"
       hashtags_subtitle: Explore o que está em tendência desde os últimos 2 dias
       hashtags_title: Trending hashtags
       hashtags_view_more: Ver mais hashtags em alta

config/locales/ru.yml

@@ -1699,7 +1699,6 @@ ru:
     import: Импорт
     import_and_export: Импорт и экспорт
     migrate: Миграция учётной записи
-    notifications: Уведомления
     preferences: Настройки
     profile: Профиль
     relationships: Подписки и подписчики

config/locales/sc.yml

@@ -985,7 +985,6 @@ sc:
     import: Importatzione
     import_and_export: Importatzione e esportatzione
     migrate: Tràmuda de contu
-    notifications: Notìficas
     preferences: Preferèntzias
     profile: Profilu
     relationships: Gente chi sighis e sighiduras

config/locales/sco.yml

@@ -1407,7 +1407,6 @@ sco:
     import: Import
     import_and_export: Import an export
     migrate: Accoont flittin
-    notifications: Notes
     preferences: Preferences
     profile: Profile
     relationships: Follaes and follaers

config/locales/si.yml

@@ -1274,7 +1274,6 @@ si:
     import: ආයාතය
     import_and_export: ආයාත හා නිර්යාත
     migrate: ගිණුම් සංක්‍රමණය
-    notifications: දැනුම්දීම්
     preferences: අභිප්‍රේත
     profile: ප්‍රසිද්ධ පැතිකඩ
     relationships: අනුගමන හා අනුගාමික

config/locales/simple_form.nn.yml

@@ -165,7 +165,7 @@ nn:
           none: Gjer inkje
           sensitive: Ømtolig
           silence: Togn
-          suspend: Utvis og slett kontodata for godt
+          suspend: Utvis
         warning_preset_id: Bruk åtvaringsoppsett
       announcement:
         all_day: Heildagshending

config/locales/sk.yml

@@ -198,11 +198,14 @@ sk:
         destroy_ip_block: Vymaž IP pravidlo
         destroy_status: Vymaž príspevok
         destroy_unavailable_domain: Vymaž nedostupnú doménu
+        destroy_user_role: Zničiť rolu
         disable_2fa_user: Vypni dvoj-faktorové overovanie
         disable_custom_emoji: Vypni vlastné emotikony
+        disable_sign_in_token_auth_user: Zakázať používateľom overovanie e-mailovým tokenom
         disable_user: Deaktivuj užívateľa
         enable_custom_emoji: Povoľ vlastné emotikony
         enable_user: Povoľ užívateľa
+        memorialize_account: Zmena na „in memoriam“
         promote_user: Povýš užívateľskú rolu
         reject_appeal: Zamietni námietku
         reject_user: Zamietni užívateľa
@@ -447,10 +450,13 @@ sk:
         instance_statuses_measure: uložené príspevky
       delivery:
         all: Všetko
+        clear: Vymazať chyby doručovania
         failing: Zlyhávajúce
+        restart: Reštartovať doručovanie
         stop: Zastav doručenie
         unavailable: Nedostupné
       delivery_available: Je v dosahu doručovania
+      delivery_error_days: Dni chybného doručovania
       empty: Nenájdené žiadne domény.
       moderation:
         all: Všetky
@@ -1188,7 +1194,7 @@ sk:
     import: Importuj
     import_and_export: Import a export
     migrate: Presuň účet
-    notifications: Oboznámenia
+    notifications: Emailové upozornenia
     preferences: Voľby
     profile: Profil
     relationships: Sledovania a následovatelia

config/locales/sl.yml

@@ -621,6 +621,9 @@ sl:
       actions_description_html: Odločite se, katere ukrepe boste sprejeli za rešitev te prijave. Če sprejmete kazenski ukrep proti prijavljenemu računu, mu bo poslano e-poštno obvestilo, razen če je izbrana kategorija <strong>Neželena pošta</strong>.
       actions_description_remote_html: Odločite se za dejanje, ki bo odločilo o tej prijavi. To bo vplivalo le na to, kako <strong>vaš</strong> strežnik komunicira s tem oddaljenim računom in obravnava njegovo vsebino.
       add_to_report: Dodaj več v prijavo
+      already_suspended_badges:
+        local: Že suspendiran na tem strežniku
+        remote: Že suspendiran na njihovem strežniku
       are_you_sure: Ali ste prepričani?
       assign_to_self: Dodeli meni
       assigned: Dodeljen moderator
@@ -1704,7 +1707,7 @@ sl:
     import: Uvozi
     import_and_export: Uvoz in izvoz
     migrate: Selitev računa
-    notifications: Obvestila
+    notifications: Obvestila po e-pošti
     preferences: Nastavitve
     profile: Profil
     relationships: Sledenja in sledilci

config/locales/sq.yml

@@ -596,6 +596,9 @@ sq:
       actions_description_html: Vendosni cili veprim të kryhet për të zgjidhur këtë raportim. Nëse ndërmerrni një veprim ndëshkues kundër llogarisë së raportuar, atyre do t’u dërgohet një njoftim me email, hiq rastin kur përzgjidhet kategoria <strong>I padëshiruar</strong>.
       actions_description_remote_html: Vendosni cili veprim të ndërmerret për zgjidhjen e këtij raportimi. Kjo do të prekë vetëm mënyrën se si shërbyesi <strong>juaj</strong> komunikon me këtë llogari të largët dhe se si e trajtojnë lëndën e saj.
       add_to_report: Shtoni më tepër te raportimi
+      already_suspended_badges:
+        local: Tashmë i pezulluar në këtë shërbyes
+        remote: Tashmë i pezulluar në shërbyesin e vet
       are_you_sure: A jeni i sigurt?
       assign_to_self: Caktojani vetes
       assigned: Iu caktua moderator
@@ -1648,7 +1651,7 @@ sq:
     import: Importo
     import_and_export: Importim dhe eksportim
     migrate: Migrim llogarie
-    notifications: Njoftime
+    notifications: Njoftime me email
     preferences: Parapëlqime
     profile: Profil
     relationships: Ndjekje dhe ndjekës

config/locales/sr-Latn.yml

@@ -1678,7 +1678,6 @@ sr-Latn:
     import: Uvoz
     import_and_export: Uvoz i izvoz
     migrate: Prebacivanje naloga
-    notifications: Obaveštenja
     preferences: Podešavanja
     profile: Javni profil
     relationships: Praćenja i pratioci

config/locales/sr.yml

@@ -1678,7 +1678,6 @@ sr:
     import: Увоз
     import_and_export: Увоз и извоз
     migrate: Пребацивање налога
-    notifications: Обавештења
     preferences: Подешавања
     profile: Јавни профил
     relationships: Праћења и пратиоци

config/locales/sv.yml

@@ -1652,7 +1652,7 @@ sv:
     import: Importera
     import_and_export: Import och export
     migrate: Kontoflytt
-    notifications: Aviseringar
+    notifications: E-postaviseringar
     preferences: Inställningar
     profile: Profil
     relationships: Följer och följare

config/locales/th.yml

@@ -585,6 +585,9 @@ th:
       actions_description_html: ตัดสินใจว่าการกระทำใดที่จะใช้เพื่อแก้ปัญหารายงานนี้ หากคุณใช้การกระทำที่เป็นการลงโทษต่อบัญชีที่รายงาน จะส่งการแจ้งเตือนอีเมลถึงเขา ยกเว้นเมื่อมีการเลือกหมวดหมู่ <strong>สแปม</strong>
       actions_description_remote_html: ตัดสินใจว่าการกระทำใดที่จะใช้เพื่อแก้ปัญหารายงานนี้ นี่จะมีผลต่อวิธีที่เซิร์ฟเวอร์ <strong>ของคุณ</strong> สื่อสารกับบัญชีระยะไกลนี้และจัดการเนื้อหาของบัญชีเท่านั้น
       add_to_report: เพิ่มข้อมูลเพิ่มเติมไปยังรายงาน
+      already_suspended_badges:
+        local: ระงับในเซิร์ฟเวอร์นี้อยู่แล้ว
+        remote: ระงับในเซิร์ฟเวอร์ของเขาอยู่แล้ว
       are_you_sure: คุณแน่ใจหรือไม่?
       assign_to_self: มอบหมายให้ฉัน
       assigned: ผู้กลั่นกรองที่ได้รับมอบหมาย
@@ -1626,7 +1629,7 @@ th:
     import: การนำเข้า
     import_and_export: การนำเข้าและการส่งออก
     migrate: การโยกย้ายบัญชี
-    notifications: การแจ้งเตือน
+    notifications: การแจ้งเตือนทางอีเมล
     preferences: การกำหนดลักษณะ
     profile: โปรไฟล์สาธารณะ
     relationships: การติดตามและผู้ติดตาม

config/locales/tr.yml

@@ -597,6 +597,9 @@ tr:
       actions_description_html: Bu bildirimi çözmek için ne yapılması gerektiğine karar verin. Bildirilen hesap için ceza işlemi yaparsanız, <strong>İstenmeyen</strong> kategorisi seçilmemişse, onlara bir e-posta duyurusu gönderilecektir.
       actions_description_remote_html: Bu bildirimi çözmek için hangi eylemi yapmak istediğinize karar verin. Bu yalnızca <strong>sizin</strong> sunucunuzun bu uzak hesapla nasıl etkileşeğini ve içeriğiyle ne yapacağını etkiler.
       add_to_report: Bildirime daha fazlasını ekle
+      already_suspended_badges:
+        local: Bu sunucuda zaten askıya alınmış
+        remote: Sunucularında zaten askıya alınmış
       are_you_sure: Emin misiniz?
       assign_to_self: Bana ata
       assigned: Denetleyici atandı
@@ -1652,7 +1655,7 @@ tr:
     import: İçe aktar
     import_and_export: İçe ve dışa aktar
     migrate: Hesap taşıma
-    notifications: Bildirimler
+    notifications: E-posta bildirimleri
     preferences: Tercihler
     profile: Profil
     relationships: Takip edilenler ve takipçiler

config/locales/tt.yml

@@ -511,7 +511,6 @@ tt:
     development: Ясаучылар өчен
     edit_profile: Профильне үзгәртү
     import: Импортлау
-    notifications: Искәртүләр
     preferences: Caylaw
     profile: Профиль
     two_factor_authentication: Ике-факторлы авторизация

config/locales/uk.yml

@@ -621,6 +621,9 @@ uk:
       actions_description_html: Визначте, які дії слід вжити для розв'язання цієї скарги. Якщо ви оберете каральні дії проти зареєстрованого облікового запису, про них буде надіслано сповіщення електронним листом, крім випадків, коли вибрано категорію <strong>Спам</strong>.
       actions_description_remote_html: Визначте, які дії слід вжити для розв'язання цього звіту. Це вплине тільки на те, як <strong>ваш</strong> сервер з'єднується з цим віддаленим обліковим записом і обробляє його вміст.
       add_to_report: Додати ще подробиць до скарги
+      already_suspended_badges:
+        local: Вже призупинено на цьому сервері
+        remote: Уже призупинено на їх сервері
       are_you_sure: Ви впевнені?
       assign_to_self: Призначити мені
       assigned: Призначений модератор
@@ -1704,7 +1707,7 @@ uk:
     import: Імпорт
     import_and_export: Імпорт та експорт
     migrate: Міграція облікового запису
-    notifications: Сповіщення
+    notifications: E-mail сповіщення
     preferences: Налаштування
     profile: Загальнодоступний профіль
     relationships: Підписки та підписники

config/locales/vi.yml

@@ -1626,7 +1626,6 @@ vi:
     import: Nhập dữ liệu
     import_and_export: Dữ liệu
     migrate: Chuyển tài khoản sang máy chủ khác
-    notifications: Thông báo
     preferences: Chung
     profile: Hồ sơ
     relationships: Quan hệ

config/locales/zgh.yml

@@ -110,5 +110,4 @@ zgh:
     account_settings: ⵜⵉⵙⵖⴰⵍ ⵏ ⵓⵎⵉⴹⴰⵏ
     back: ⴰⵖⵓⵍ ⵖⵔ ⵎⴰⵙⵜⵓⴷⵓⵏ
     edit_profile: ⵙⵏⴼⵍ ⵉⴼⵔⵙ
-    notifications: ⵜⵉⵏⵖⵎⵉⵙⵉⵏ
     profile: ⵉⴼⵔⵙ

config/locales/zh-CN.yml

@@ -585,6 +585,9 @@ zh-CN:
       actions_description_html: 决定采取何种措施处理此举报。如果对被举报账号采取惩罚性措施，将向其发送一封电子邮件通知。但若选中<strong>垃圾信息</strong>类别则不会发送通知。
       actions_description_remote_html: 决定采取何种行动来解决此举报。 这只会影响<strong>您的</strong>服务器如何与该远程帐户的通信并处理其内容。
       add_to_report: 增加更多举报内容
+      already_suspended_badges:
+        local: 已经在此服务器上暂停
+        remote: 已在其所属服务器被封禁
       are_you_sure: 你确定吗？
       assign_to_self: 接管
       assigned: 已接管的监察员
@@ -1626,7 +1629,7 @@ zh-CN:
     import: 导入
     import_and_export: 导入和导出
     migrate: 账户迁移
-    notifications: 通知
+    notifications: 电子邮件通知
     preferences: 首选项
     profile: 个人资料
     relationships: 关注管理

config/locales/zh-HK.yml

@@ -1626,7 +1626,6 @@ zh-HK:
     import: 匯入
     import_and_export: 匯入及匯出
     migrate: 帳戶遷移
-    notifications: 通知
     preferences: 偏好設定
     profile: 個人資料
     relationships: 關注及追隨者