~cytrogen/masto-fe

68a192e7186733885b1d70160170c4772fab7242 — Eugen Rochko 3 years ago a9b5598
Change "direct message" nomenclature to "private mention" in web UI (#24248)

109 files changed, 191 insertions(+), 26 deletions(-)

M app/javascript/mastodon/components/status.jsx
M app/javascript/mastodon/components/status_action_bar.jsx
M app/javascript/mastodon/features/account/components/header.jsx
M app/javascript/mastodon/features/direct_timeline/index.jsx
M app/javascript/mastodon/features/getting_started/index.jsx
M app/javascript/mastodon/features/status/components/action_bar.jsx
M app/javascript/mastodon/features/status/components/detailed_status.jsx
M app/javascript/mastodon/features/status/index.jsx
M app/javascript/mastodon/features/ui/components/navigation_panel.jsx
M app/javascript/mastodon/locales/af.json
M app/javascript/mastodon/locales/an.json
M app/javascript/mastodon/locales/ar.json
M app/javascript/mastodon/locales/ast.json
M app/javascript/mastodon/locales/be.json
M app/javascript/mastodon/locales/bg.json
M app/javascript/mastodon/locales/bn.json
M app/javascript/mastodon/locales/br.json
M app/javascript/mastodon/locales/bs.json
M app/javascript/mastodon/locales/ca.json
M app/javascript/mastodon/locales/ckb.json
M app/javascript/mastodon/locales/co.json
M app/javascript/mastodon/locales/cs.json
M app/javascript/mastodon/locales/csb.json
M app/javascript/mastodon/locales/cy.json
M app/javascript/mastodon/locales/da.json
M app/javascript/mastodon/locales/de.json
M app/javascript/mastodon/locales/defaultMessages.json
M app/javascript/mastodon/locales/el.json
M app/javascript/mastodon/locales/en-GB.json
M app/javascript/mastodon/locales/en.json
M app/javascript/mastodon/locales/eo.json
M app/javascript/mastodon/locales/es-AR.json
M app/javascript/mastodon/locales/es-MX.json
M app/javascript/mastodon/locales/es.json
M app/javascript/mastodon/locales/et.json
M app/javascript/mastodon/locales/eu.json
M app/javascript/mastodon/locales/fa.json
M app/javascript/mastodon/locales/fi.json
M app/javascript/mastodon/locales/fo.json
M app/javascript/mastodon/locales/fr-QC.json
M app/javascript/mastodon/locales/fr.json
M app/javascript/mastodon/locales/fy.json
M app/javascript/mastodon/locales/ga.json
M app/javascript/mastodon/locales/gd.json
M app/javascript/mastodon/locales/gl.json
M app/javascript/mastodon/locales/he.json
M app/javascript/mastodon/locales/hi.json
M app/javascript/mastodon/locales/hr.json
M app/javascript/mastodon/locales/hu.json
M app/javascript/mastodon/locales/hy.json
M app/javascript/mastodon/locales/id.json
M app/javascript/mastodon/locales/ig.json
M app/javascript/mastodon/locales/io.json
M app/javascript/mastodon/locales/is.json
M app/javascript/mastodon/locales/it.json
M app/javascript/mastodon/locales/ja.json
M app/javascript/mastodon/locales/ka.json
M app/javascript/mastodon/locales/kab.json
M app/javascript/mastodon/locales/kk.json
M app/javascript/mastodon/locales/kn.json
M app/javascript/mastodon/locales/ko.json
M app/javascript/mastodon/locales/ku.json
M app/javascript/mastodon/locales/kw.json
M app/javascript/mastodon/locales/la.json
M app/javascript/mastodon/locales/lt.json
M app/javascript/mastodon/locales/lv.json
M app/javascript/mastodon/locales/mk.json
M app/javascript/mastodon/locales/ml.json
M app/javascript/mastodon/locales/mr.json
M app/javascript/mastodon/locales/ms.json
M app/javascript/mastodon/locales/my.json
M app/javascript/mastodon/locales/nl.json
M app/javascript/mastodon/locales/nn.json
M app/javascript/mastodon/locales/no.json
M app/javascript/mastodon/locales/oc.json
M app/javascript/mastodon/locales/pa.json
M app/javascript/mastodon/locales/pl.json
M app/javascript/mastodon/locales/pt-BR.json
M app/javascript/mastodon/locales/pt-PT.json
M app/javascript/mastodon/locales/ro.json
M app/javascript/mastodon/locales/ru.json
M app/javascript/mastodon/locales/sa.json
M app/javascript/mastodon/locales/sc.json
M app/javascript/mastodon/locales/sco.json
M app/javascript/mastodon/locales/si.json
M app/javascript/mastodon/locales/sk.json
M app/javascript/mastodon/locales/sl.json
M app/javascript/mastodon/locales/sq.json
M app/javascript/mastodon/locales/sr-Latn.json
M app/javascript/mastodon/locales/sr.json
M app/javascript/mastodon/locales/sv.json
M app/javascript/mastodon/locales/szl.json
M app/javascript/mastodon/locales/ta.json
M app/javascript/mastodon/locales/tai.json
M app/javascript/mastodon/locales/te.json
M app/javascript/mastodon/locales/th.json
M app/javascript/mastodon/locales/tr.json
M app/javascript/mastodon/locales/tt.json
M app/javascript/mastodon/locales/ug.json
M app/javascript/mastodon/locales/uk.json
M app/javascript/mastodon/locales/ur.json
M app/javascript/mastodon/locales/uz.json
M app/javascript/mastodon/locales/vi.json
M app/javascript/mastodon/locales/zgh.json
M app/javascript/mastodon/locales/zh-CN.json
M app/javascript/mastodon/locales/zh-HK.json
M app/javascript/mastodon/locales/zh-TW.json
M app/javascript/styles/mastodon-light/diff.scss
M app/javascript/styles/mastodon/components.scss
M app/javascript/mastodon/components/status.jsx => app/javascript/mastodon/components/status.jsx +7 -0
@@ 386,6 386,13 @@ class Status extends ImmutablePureComponent {

      account = status.get('account');
      status  = status.get('reblog');
    } else if (status.get('visibility') === 'direct') {
      prepend = (
        <div className='status__prepend'>
          <div className='status__prepend-icon-wrapper'><Icon id='at' className='status__prepend-icon' fixedWidth /></div>
          <FormattedMessage id='status.direct_indicator' defaultMessage='Private mention' />
        </div>
      );
    } else if (showThread && status.get('in_reply_to_id') && status.get('in_reply_to_account_id') === status.getIn(['account', 'id'])) {
      const display_name_html = { __html: status.getIn(['account', 'display_name_html']) };


M app/javascript/mastodon/components/status_action_bar.jsx => app/javascript/mastodon/components/status_action_bar.jsx +1 -1
@@ 14,7 14,7 @@ const messages = defineMessages({
  delete: { id: 'status.delete', defaultMessage: 'Delete' },
  redraft: { id: 'status.redraft', defaultMessage: 'Delete & re-draft' },
  edit: { id: 'status.edit', defaultMessage: 'Edit' },
  direct: { id: 'status.direct', defaultMessage: 'Direct message @{name}' },
  direct: { id: 'status.direct', defaultMessage: 'Privately mention @{name}' },
  mention: { id: 'status.mention', defaultMessage: 'Mention @{name}' },
  mute: { id: 'account.mute', defaultMessage: 'Mute @{name}' },
  block: { id: 'account.block', defaultMessage: 'Block @{name}' },

M app/javascript/mastodon/features/account/components/header.jsx => app/javascript/mastodon/features/account/components/header.jsx +1 -1
@@ 28,7 28,7 @@ const messages = defineMessages({
  linkVerifiedOn: { id: 'account.link_verified_on', defaultMessage: 'Ownership of this link was checked on {date}' },
  account_locked: { id: 'account.locked_info', defaultMessage: 'This account privacy status is set to locked. The owner manually reviews who can follow them.' },
  mention: { id: 'account.mention', defaultMessage: 'Mention @{name}' },
  direct: { id: 'account.direct', defaultMessage: 'Direct message @{name}' },
  direct: { id: 'account.direct', defaultMessage: 'Privately mention @{name}' },
  unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' },
  block: { id: 'account.block', defaultMessage: 'Block @{name}' },
  mute: { id: 'account.mute', defaultMessage: 'Mute @{name}' },

M app/javascript/mastodon/features/direct_timeline/index.jsx => app/javascript/mastodon/features/direct_timeline/index.jsx +2 -2
@@ 11,7 11,7 @@ import ColumnHeader from 'mastodon/components/column_header';
import ConversationsListContainer from './containers/conversations_list_container';

const messages = defineMessages({
  title: { id: 'column.direct', defaultMessage: 'Direct messages' },
  title: { id: 'column.direct', defaultMessage: 'Private mentions' },
});

class DirectTimeline extends React.PureComponent {


@@ 91,7 91,7 @@ class DirectTimeline extends React.PureComponent {
          timelineId='direct'
          onLoadMore={this.handleLoadMore}
          prepend={<div className='follow_requests-unlocked_explanation'><span><FormattedMessage id='compose_form.encryption_warning' defaultMessage='Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.' /> <a href='/terms' target='_blank'><FormattedMessage id='compose_form.direct_message_warning_learn_more' defaultMessage='Learn more' /></a></span></div>}
          emptyMessage={<FormattedMessage id='empty_column.direct' defaultMessage="You don't have any direct messages yet. When you send or receive one, it will show up here." />}
          emptyMessage={<FormattedMessage id='empty_column.direct' defaultMessage="You don't have any private mentions yet. When you send or receive one, it will show up here." />}
        />

        <Helmet>

M app/javascript/mastodon/features/getting_started/index.jsx => app/javascript/mastodon/features/getting_started/index.jsx +1 -1
@@ 23,7 23,7 @@ const messages = defineMessages({
  settings_subheading: { id: 'column_subheading.settings', defaultMessage: 'Settings' },
  community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
  explore: { id: 'navigation_bar.explore', defaultMessage: 'Explore' },
  direct: { id: 'navigation_bar.direct', defaultMessage: 'Direct messages' },
  direct: { id: 'navigation_bar.direct', defaultMessage: 'Private mentions' },
  bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
  preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
  follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },

M app/javascript/mastodon/features/status/components/action_bar.jsx => app/javascript/mastodon/features/status/components/action_bar.jsx +1 -1
@@ 13,7 13,7 @@ const messages = defineMessages({
  delete: { id: 'status.delete', defaultMessage: 'Delete' },
  redraft: { id: 'status.redraft', defaultMessage: 'Delete & re-draft' },
  edit: { id: 'status.edit', defaultMessage: 'Edit' },
  direct: { id: 'status.direct', defaultMessage: 'Direct message @{name}' },
  direct: { id: 'status.direct', defaultMessage: 'Privately mention @{name}' },
  mention: { id: 'status.mention', defaultMessage: 'Mention @{name}' },
  reply: { id: 'status.reply', defaultMessage: 'Reply' },
  reblog: { id: 'status.reblog', defaultMessage: 'Boost' },

M app/javascript/mastodon/features/status/components/detailed_status.jsx => app/javascript/mastodon/features/status/components/detailed_status.jsx +8 -2
@@ 6,7 6,7 @@ import DisplayName from '../../../components/display_name';
import StatusContent from '../../../components/status_content';
import MediaGallery from '../../../components/media_gallery';
import { Link } from 'react-router-dom';
import { injectIntl, defineMessages, FormattedDate } from 'react-intl';
import { injectIntl, defineMessages, FormattedDate, FormattedMessage } from 'react-intl';
import Card from './card';
import ImmutablePureComponent from 'react-immutable-pure-component';
import Video from '../../video';


@@ 262,7 262,13 @@ class DetailedStatus extends ImmutablePureComponent {

    return (
      <div style={outerStyle}>
        <div ref={this.setRef} className={classNames('detailed-status', `detailed-status-${status.get('visibility')}`, { compact })}>
        <div ref={this.setRef} className={classNames('detailed-status', { compact })}>
          {status.get('visibility') === 'direct' && (
            <div className='status__prepend'>
              <div className='status__prepend-icon-wrapper'><Icon id='at' className='status__prepend-icon' fixedWidth /></div>
              <FormattedMessage id='status.direct_indicator' defaultMessage='Private mention' />
            </div>
          )}
          <a href={`/@${status.getIn(['account', 'acct'])}`} onClick={this.handleAccountClick} className='detailed-status__display-name'>
            <div className='detailed-status__display-avatar'><Avatar account={status.get('account')} size={46} /></div>
            <DisplayName account={status.get('account')} localDomain={this.props.domain} />

M app/javascript/mastodon/features/status/index.jsx => app/javascript/mastodon/features/status/index.jsx +1 -1
@@ 630,7 630,7 @@ class Status extends ImmutablePureComponent {
            {ancestors}

            <HotKeys handlers={handlers}>
              <div className={classNames('focusable', 'detailed-status__wrapper')} tabIndex='0' aria-label={textForScreenReader(intl, status, false)}>
              <div className={classNames('focusable', 'detailed-status__wrapper', `detailed-status__wrapper-${status.get('visibility')}`)} tabIndex='0' aria-label={textForScreenReader(intl, status, false)}>
                <DetailedStatus
                  key={`details-${status.get('id')}`}
                  status={status}

M app/javascript/mastodon/features/ui/components/navigation_panel.jsx => app/javascript/mastodon/features/ui/components/navigation_panel.jsx +1 -1
@@ 18,7 18,7 @@ const messages = defineMessages({
  explore: { id: 'explore.title', defaultMessage: 'Explore' },
  local: { id: 'tabs_bar.local_timeline', defaultMessage: 'Local' },
  federated: { id: 'tabs_bar.federated_timeline', defaultMessage: 'Federated' },
  direct: { id: 'navigation_bar.direct', defaultMessage: 'Direct messages' },
  direct: { id: 'navigation_bar.direct', defaultMessage: 'Private mentions' },
  favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },
  bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
  lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },

M app/javascript/mastodon/locales/af.json => app/javascript/mastodon/locales/af.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Delete",
  "status.detailed_status": "Detailed conversation view",
  "status.direct": "Direct message @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
  "status.edited": "Edited {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/an.json => app/javascript/mastodon/locales/an.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Borrar",
  "status.detailed_status": "Vista de conversación detallada",
  "status.direct": "Mensache directo a @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Editar",
  "status.edited": "Editau {date}",
  "status.edited_x_times": "Editau {count, plural, one {{count} vez} other {{count} veces}}",

M app/javascript/mastodon/locales/ar.json => app/javascript/mastodon/locales/ar.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "احذف",
  "status.detailed_status": "تفاصيل المحادثة",
  "status.direct": "رسالة خاصة إلى @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "تعديل",
  "status.edited": "عُدّل في {date}",
  "status.edited_x_times": "عُدّل {count, plural, zero {} one {مرةً واحدة} two {مرّتان} few {{count} مرات} many {{count} مرة} other {{count} مرة}}",

M app/javascript/mastodon/locales/ast.json => app/javascript/mastodon/locales/ast.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Desaniciar",
  "status.detailed_status": "Detailed conversation view",
  "status.direct": "Unviar un mensaxe direutu a @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
  "status.edited": "Editóse'l {date}",
  "status.edited_x_times": "Editóse {count, plural, one {{count} vegada} other {{count} vegaes}}",

M app/javascript/mastodon/locales/be.json => app/javascript/mastodon/locales/be.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Выдаліць",
  "status.detailed_status": "Дэтальны агляд размовы",
  "status.direct": "Асабістае паведамленне @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Рэдагаваць",
  "status.edited": "Адрэдагавана {date}",
  "status.edited_x_times": "Рэдагавана {count, plural, one {{count} раз} few {{count} разы} many {{count} разоў} other {{count} разу}}",

M app/javascript/mastodon/locales/bg.json => app/javascript/mastodon/locales/bg.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Изтриване",
  "status.detailed_status": "Подробен изглед на разговора",
  "status.direct": "Директно съобщение до @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Редактиране",
  "status.edited": "Редактирано на {date}",
  "status.edited_x_times": "Редактирано {count, plural,one {{count} път} other {{count} пъти}}",

M app/javascript/mastodon/locales/bn.json => app/javascript/mastodon/locales/bn.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "মুছে ফেলতে",
  "status.detailed_status": "বিস্তারিত কথোপকথনের হিসেবে দেখতে",
  "status.direct": "@{name} কে সরাসরি লেখা পাঠাতে",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
  "status.edited": "Edited {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/br.json => app/javascript/mastodon/locales/br.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Dilemel",
  "status.detailed_status": "Gwel kaozeadenn munudek",
  "status.direct": "Kas ur c'hannad eeun da @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Kemmañ",
  "status.edited": "Aozet {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/bs.json => app/javascript/mastodon/locales/bs.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Delete",
  "status.detailed_status": "Detailed conversation view",
  "status.direct": "Direct message @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
  "status.edited": "Edited {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/ca.json => app/javascript/mastodon/locales/ca.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Elimina",
  "status.detailed_status": "Vista detallada de la conversa",
  "status.direct": "Missatge directe a @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edita",
  "status.edited": "Editat {date}",
  "status.edited_x_times": "Editat {count, plural, one {{count} vegada} other {{count} vegades}}",

M app/javascript/mastodon/locales/ckb.json => app/javascript/mastodon/locales/ckb.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "سڕینەوە",
  "status.detailed_status": "ڕوانگەی گفتوگۆ بە وردەکاری",
  "status.direct": "پەیامی ڕاستەوخۆ @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "دەستکاری",
  "status.edited": "بەشداری {date}",
  "status.edited_x_times": "دەستکاریکراوە {count, plural, one {{count} کات} other {{count} کات}}",

M app/javascript/mastodon/locales/co.json => app/javascript/mastodon/locales/co.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Toglie",
  "status.detailed_status": "Vista in ditagliu di a cunversazione",
  "status.direct": "Mandà un missaghju @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
  "status.edited": "Edited {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/cs.json => app/javascript/mastodon/locales/cs.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Smazat",
  "status.detailed_status": "Podrobné zobrazení konverzace",
  "status.direct": "Poslat @{name} přímou zprávu",
  "status.direct_indicator": "Private mention",
  "status.edit": "Upravit",
  "status.edited": "Upraveno {date}",
  "status.edited_x_times": "Upraveno {count, plural, one {{count}krát} few {{count}krát} many {{count}krát} other {{count}krát}}",

M app/javascript/mastodon/locales/csb.json => app/javascript/mastodon/locales/csb.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Delete",
  "status.detailed_status": "Detailed conversation view",
  "status.direct": "Direct message @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
  "status.edited": "Edited {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/cy.json => app/javascript/mastodon/locales/cy.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Dileu",
  "status.detailed_status": "Golwg manwl o'r sgwrs",
  "status.direct": "Neges breifat @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Golygu",
  "status.edited": "Golygwyd {date}",
  "status.edited_x_times": "Golygwyd {count, plural, one {waith} two {waith} other {{count} gwaith}}",

M app/javascript/mastodon/locales/da.json => app/javascript/mastodon/locales/da.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Slet",
  "status.detailed_status": "Detaljeret samtalevisning",
  "status.direct": "Direkte besked til @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Redigér",
  "status.edited": "Redigeret {date}",
  "status.edited_x_times": "Redigeret {count, plural, one {{count} gang} other {{count} gange}}",

M app/javascript/mastodon/locales/de.json => app/javascript/mastodon/locales/de.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Beitrag löschen",
  "status.detailed_status": "Detaillierte Ansicht der Unterhaltung",
  "status.direct": "Direktnachricht an @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Beitrag bearbeiten",
  "status.edited": "Bearbeitet {date}",
  "status.edited_x_times": "{count, plural, one {{count} mal} other {{count} mal}} bearbeitet",

M app/javascript/mastodon/locales/defaultMessages.json => app/javascript/mastodon/locales/defaultMessages.json +12 -8
@@ 560,7 560,7 @@
        "id": "status.edit"
      },
      {
        "defaultMessage": "Direct message @{name}",
        "defaultMessage": "Privately mention @{name}",
        "id": "status.direct"
      },
      {


@@ 762,6 762,10 @@
        "id": "status.reblogged_by"
      },
      {
        "defaultMessage": "Private mention",
        "id": "status.direct_indicator"
      },
      {
        "defaultMessage": "Replied to {name}",
        "id": "status.replied_to"
      }


@@ 1109,7 1113,7 @@
        "id": "account.mention"
      },
      {
        "defaultMessage": "Direct message @{name}",
        "defaultMessage": "Privately mention @{name}",
        "id": "account.direct"
      },
      {


@@ 1627,7 1631,7 @@
        "id": "privacy.private.long"
      },
      {
        "defaultMessage": "Mentioned people only",
        "defaultMessage": "Private mention",
        "id": "privacy.direct.short"
      },
      {


@@ 1925,7 1929,7 @@
  {
    "descriptors": [
      {
        "defaultMessage": "Direct messages",
        "defaultMessage": "Private mentions",
        "id": "column.direct"
      },
      {


@@ 1937,7 1941,7 @@
        "id": "compose_form.direct_message_warning_learn_more"
      },
      {
        "defaultMessage": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
        "defaultMessage": "You don't have any private mentions yet. When you send or receive one, it will show up here.",
        "id": "empty_column.direct"
      }
    ],


@@ 2432,7 2436,7 @@
        "id": "navigation_bar.explore"
      },
      {
        "defaultMessage": "Direct messages",
        "defaultMessage": "Private mentions",
        "id": "navigation_bar.direct"
      },
      {


@@ 3550,7 3554,7 @@
        "id": "status.edit"
      },
      {
        "defaultMessage": "Direct message @{name}",
        "defaultMessage": "Privately mention @{name}",
        "id": "status.direct"
      },
      {


@@ 4199,7 4203,7 @@
        "id": "tabs_bar.federated_timeline"
      },
      {
        "defaultMessage": "Direct messages",
        "defaultMessage": "Private mentions",
        "id": "navigation_bar.direct"
      },
      {

M app/javascript/mastodon/locales/el.json => app/javascript/mastodon/locales/el.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Διαγραφή",
  "status.detailed_status": "Προβολή λεπτομερειών συζήτησης",
  "status.direct": "Προσωπικό μήνυμα προς @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Επεξεργασία",
  "status.edited": "Επεξεργάστηκε στις {date}",
  "status.edited_x_times": "Επεξεργάστηκε {count, plural, one {{count} φορά} other {{count} φορές}}",

M app/javascript/mastodon/locales/en-GB.json => app/javascript/mastodon/locales/en-GB.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Delete",
  "status.detailed_status": "Detailed conversation view",
  "status.direct": "Direct message @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
  "status.edited": "Edited {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/en.json => app/javascript/mastodon/locales/en.json +7 -6
@@ 20,7 20,7 @@
  "account.blocked": "Blocked",
  "account.browse_more_on_origin_server": "Browse more on the original profile",
  "account.cancel_follow_request": "Withdraw follow request",
  "account.direct": "Direct message @{name}",
  "account.direct": "Privately mention @{name}",
  "account.disable_notifications": "Stop notifying me when @{name} posts",
  "account.domain_blocked": "Domain blocked",
  "account.edit_profile": "Edit profile",


@@ 102,7 102,7 @@
  "column.blocks": "Blocked users",
  "column.bookmarks": "Bookmarks",
  "column.community": "Local timeline",
  "column.direct": "Direct messages",
  "column.direct": "Private mentions",
  "column.directory": "Browse profiles",
  "column.domain_blocks": "Blocked domains",
  "column.favourites": "Favourites",


@@ 216,7 216,7 @@
  "empty_column.blocks": "You haven't blocked any users yet.",
  "empty_column.bookmarked_statuses": "You don't have any bookmarked posts yet. When you bookmark one, it will show up here.",
  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
  "empty_column.direct": "You don't have any private mentions yet. When you send or receive one, it will show up here.",
  "empty_column.domain_blocks": "There are no blocked domains yet.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "You don't have any favourite posts yet. When you favourite one, it will show up here.",


@@ 314,7 314,7 @@
  "keyboard_shortcuts.column": "Focus column",
  "keyboard_shortcuts.compose": "Focus compose textarea",
  "keyboard_shortcuts.description": "Description",
  "keyboard_shortcuts.direct": "to open direct messages column",
  "keyboard_shortcuts.direct": "to open private mentions column",
  "keyboard_shortcuts.down": "Move down in the list",
  "keyboard_shortcuts.enter": "Open post",
  "keyboard_shortcuts.favourite": "Favourite post",


@@ 376,7 376,7 @@
  "navigation_bar.bookmarks": "Bookmarks",
  "navigation_bar.community_timeline": "Local timeline",
  "navigation_bar.compose": "Compose new post",
  "navigation_bar.direct": "Direct messages",
  "navigation_bar.direct": "Private mentions",
  "navigation_bar.discover": "Discover",
  "navigation_bar.domain_blocks": "Blocked domains",
  "navigation_bar.edit_profile": "Edit profile",


@@ 557,7 557,8 @@
  "status.copy": "Copy link to post",
  "status.delete": "Delete",
  "status.detailed_status": "Detailed conversation view",
  "status.direct": "Direct message @{name}",
  "status.direct": "Privately mention @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
  "status.edited": "Edited {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/eo.json => app/javascript/mastodon/locales/eo.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Forigi",
  "status.detailed_status": "Detala konversacia vido",
  "status.direct": "Rekte mesaĝi @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Redakti",
  "status.edited": "Redaktita {date}",
  "status.edited_x_times": "Redactita {count, plural, one {{count} fojon} other {{count} fojojn}}",

M app/javascript/mastodon/locales/es-AR.json => app/javascript/mastodon/locales/es-AR.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Eliminar",
  "status.detailed_status": "Vista de conversación detallada",
  "status.direct": "Mensaje directo para @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Editar",
  "status.edited": "Editado {date}",
  "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",

M app/javascript/mastodon/locales/es-MX.json => app/javascript/mastodon/locales/es-MX.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Borrar",
  "status.detailed_status": "Vista de conversación detallada",
  "status.direct": "Enviar mensaje a @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Editar",
  "status.edited": "Editado {date}",
  "status.edited_x_times": "Editado {count, plural, one {{count} time} other {{count} veces}}",

M app/javascript/mastodon/locales/es.json => app/javascript/mastodon/locales/es.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Borrar",
  "status.detailed_status": "Vista de conversación detallada",
  "status.direct": "Mensaje directo a @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Editar",
  "status.edited": "Editado {date}",
  "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",

M app/javascript/mastodon/locales/et.json => app/javascript/mastodon/locales/et.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Kustuta",
  "status.detailed_status": "Detailne vestluskuva",
  "status.direct": "Saada otsesõnum @{name}'ile",
  "status.direct_indicator": "Private mention",
  "status.edit": "Muuda",
  "status.edited": "{date} muudetud",
  "status.edited_x_times": "Muudetud {count, plural, one{{count} kord} other {{count} korda}}",

M app/javascript/mastodon/locales/eu.json => app/javascript/mastodon/locales/eu.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Ezabatu",
  "status.detailed_status": "Elkarrizketaren ikuspegi xehetsua",
  "status.direct": "Mezu zuzena @{name}(r)i",
  "status.direct_indicator": "Private mention",
  "status.edit": "Editatu",
  "status.edited": "Editatua {date}",
  "status.edited_x_times": "{count, plural, one {behin} other {{count} aldiz}} editatua",

M app/javascript/mastodon/locales/fa.json => app/javascript/mastodon/locales/fa.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "حذف",
  "status.detailed_status": "نمایش کامل گفتگو",
  "status.direct": "پیام مستقیم به ‎@{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "ویرایش",
  "status.edited": "ویرایش شده در {date}",
  "status.edited_x_times": "{count, plural, one {{count} مرتبه} other {{count} مرتبه}} ویرایش شد",

M app/javascript/mastodon/locales/fi.json => app/javascript/mastodon/locales/fi.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Poista",
  "status.detailed_status": "Yksityiskohtainen keskustelunäkymä",
  "status.direct": "Yksityisviesti käyttäjälle @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Muokkaa",
  "status.edited": "Muokattu {date}",
  "status.edited_x_times": "Muokattu {count, plural, one {{count} kerran} other {{count} kertaa}}",

M app/javascript/mastodon/locales/fo.json => app/javascript/mastodon/locales/fo.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Strika",
  "status.detailed_status": "Útgreinað samrøðusýni",
  "status.direct": "Beinleiðis boð @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Rætta",
  "status.edited": "Rættað {date}",
  "status.edited_x_times": "Rættað {count, plural, one {{count} ferð} other {{count} ferð}}",

M app/javascript/mastodon/locales/fr-QC.json => app/javascript/mastodon/locales/fr-QC.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Supprimer",
  "status.detailed_status": "Vue détaillée de la conversation",
  "status.direct": "Envoyer un message direct à @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Modifier",
  "status.edited": "Modifiée le {date}",
  "status.edited_x_times": "Modifiée {count, plural, one {{count} fois} other {{count} fois}}",

M app/javascript/mastodon/locales/fr.json => app/javascript/mastodon/locales/fr.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Supprimer",
  "status.detailed_status": "Vue détaillée de la conversation",
  "status.direct": "Envoyer un message direct à @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Éditer",
  "status.edited": "Édité le {date}",
  "status.edited_x_times": "Edité {count, plural, one {{count} fois} other {{count} fois}}",

M app/javascript/mastodon/locales/fy.json => app/javascript/mastodon/locales/fy.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Fuortsmite",
  "status.detailed_status": "Detaillearre petearoersjoch",
  "status.direct": "@{name} in direkt berjocht stjoere",
  "status.direct_indicator": "Private mention",
  "status.edit": "Bewurkje",
  "status.edited": "Bewurke op {date}",
  "status.edited_x_times": "{count, plural, one {{count} kear} other {{count} kearen}} bewurke",

M app/javascript/mastodon/locales/ga.json => app/javascript/mastodon/locales/ga.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Scrios",
  "status.detailed_status": "Detailed conversation view",
  "status.direct": "Seol teachtaireacht dhíreach chuig @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Cuir in eagar",
  "status.edited": "Curtha in eagar in {date}",
  "status.edited_x_times": "Curtha in eagar {count, plural, one {{count} uair amháin} two {{count} uair} few {{count} uair} many {{count} uair} other {{count} uair}}",

M app/javascript/mastodon/locales/gd.json => app/javascript/mastodon/locales/gd.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Sguab às",
  "status.detailed_status": "Mion-shealladh a’ chòmhraidh",
  "status.direct": "Cuir teachdaireachd dhìreach gu @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Deasaich",
  "status.edited": "Air a dheasachadh {date}",
  "status.edited_x_times": "Chaidh a dheasachadh {count, plural, one {{counter} turas} two {{counter} thuras} few {{counter} tursan} other {{counter} turas}}",

M app/javascript/mastodon/locales/gl.json => app/javascript/mastodon/locales/gl.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Eliminar",
  "status.detailed_status": "Vista detallada da conversa",
  "status.direct": "Mensaxe directa a @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Editar",
  "status.edited": "Editado {date}",
  "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",

M app/javascript/mastodon/locales/he.json => app/javascript/mastodon/locales/he.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "מחיקה",
  "status.detailed_status": "תצוגת שיחה מפורטת",
  "status.direct": "הודעה ישירה ל@{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "עריכה",
  "status.edited": "נערך ב{date}",
  "status.edited_x_times": "נערך {count, plural, one {פעם {count}} other {{count} פעמים}}",

M app/javascript/mastodon/locales/hi.json => app/javascript/mastodon/locales/hi.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Delete",
  "status.detailed_status": "Detailed conversation view",
  "status.direct": "Direct message @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
  "status.edited": "Edited {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/hr.json => app/javascript/mastodon/locales/hr.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Obriši",
  "status.detailed_status": "Detailed conversation view",
  "status.direct": "Direct message @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Uredi",
  "status.edited": "Uređeno {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/hu.json => app/javascript/mastodon/locales/hu.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Törlés",
  "status.detailed_status": "Részletes beszélgetési nézet",
  "status.direct": "Közvetlen üzenet @{name} számára",
  "status.direct_indicator": "Private mention",
  "status.edit": "Szerkesztés",
  "status.edited": "Szerkesztve: {date}",
  "status.edited_x_times": "{count, plural, one {{count} alkalommal} other {{count} alkalommal}} szerkesztve",

M app/javascript/mastodon/locales/hy.json => app/javascript/mastodon/locales/hy.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Ջնջել",
  "status.detailed_status": "Շղթայի ընդլայնուած դիտում",
  "status.direct": "Նամակ գրել {name} -ին",
  "status.direct_indicator": "Private mention",
  "status.edit": "Խմբագրել",
  "status.edited": "Խմբագրուել է՝ {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/id.json => app/javascript/mastodon/locales/id.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Hapus",
  "status.detailed_status": "Tampilan detail percakapan",
  "status.direct": "Pesan langsung @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
  "status.edited": "Diedit {date}",
  "status.edited_x_times": "Diedit {count, plural, other {{count} kali}}",

M app/javascript/mastodon/locales/ig.json => app/javascript/mastodon/locales/ig.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Hichapụ",
  "status.detailed_status": "Detailed conversation view",
  "status.direct": "Direct message @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
  "status.edited": "Edited {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/io.json => app/javascript/mastodon/locales/io.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Efacar",
  "status.detailed_status": "Detala konversvido",
  "status.direct": "Direta mesajigez @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Modifikez",
  "status.edited": "Modifikesis ye {date}",
  "status.edited_x_times": "Modifikesis {count, plural, one {{count} foyo} other {{count} foyi}}",

M app/javascript/mastodon/locales/is.json => app/javascript/mastodon/locales/is.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Eyða",
  "status.detailed_status": "Nákvæm spjallþráðasýn",
  "status.direct": "Bein skilaboð @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Breyta",
  "status.edited": "Breytt {date}",
  "status.edited_x_times": "Breytt {count, plural, one {{count} sinni} other {{count} sinnum}}",

M app/javascript/mastodon/locales/it.json => app/javascript/mastodon/locales/it.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Elimina",
  "status.detailed_status": "Vista conversazione dettagliata",
  "status.direct": "Messaggio diretto a @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Modifica",
  "status.edited": "Modificato il {date}",
  "status.edited_x_times": "Modificato {count, plural, one {{count} volta} other {{count} volte}}",

M app/javascript/mastodon/locales/ja.json => app/javascript/mastodon/locales/ja.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "削除",
  "status.detailed_status": "詳細な会話ビュー",
  "status.direct": "@{name}さんにダイレクトメッセージ",
  "status.direct_indicator": "Private mention",
  "status.edit": "編集",
  "status.edited": "{date}に編集",
  "status.edited_x_times": "{count}回編集",

M app/javascript/mastodon/locales/ka.json => app/javascript/mastodon/locales/ka.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "წაშლა",
  "status.detailed_status": "Detailed conversation view",
  "status.direct": "პირდაპირი წერილი @{name}-ს",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
  "status.edited": "Edited {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/kab.json => app/javascript/mastodon/locales/kab.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Kkes",
  "status.detailed_status": "Detailed conversation view",
  "status.direct": "Izen usrid i @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Ẓreg",
  "status.edited": "Tettwaẓreg deg {date}",
  "status.edited_x_times": "Tettwaẓreg {count, plural, one {{count} n tikkelt} other {{count} n tikkal}}",

M app/javascript/mastodon/locales/kk.json => app/javascript/mastodon/locales/kk.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Өшіру",
  "status.detailed_status": "Толық пікірталас көрінісі",
  "status.direct": "Хат жіберу @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
  "status.edited": "Edited {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/kn.json => app/javascript/mastodon/locales/kn.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Delete",
  "status.detailed_status": "Detailed conversation view",
  "status.direct": "Direct message @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
  "status.edited": "Edited {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/ko.json => app/javascript/mastodon/locales/ko.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "삭제",
  "status.detailed_status": "대화 자세히 보기",
  "status.direct": "@{name}에게 다이렉트 메시지",
  "status.direct_indicator": "Private mention",
  "status.edit": "수정",
  "status.edited": "{date}에 편집됨",
  "status.edited_x_times": "{count}번 수정됨",

M app/javascript/mastodon/locales/ku.json => app/javascript/mastodon/locales/ku.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Jê bibe",
  "status.detailed_status": "Dîtina axaftina berfireh",
  "status.direct": "Peyama rasterast @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Serrast bike",
  "status.edited": "Di {date} de hate serrastkirin",
  "status.edited_x_times": "{count, plural, one {{count} car} other {{count} car}} hate serrastkirin",

M app/javascript/mastodon/locales/kw.json => app/javascript/mastodon/locales/kw.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Dilea",
  "status.detailed_status": "Gwel kesklapp a-vanyl",
  "status.direct": "Messach didro dhe @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
  "status.edited": "Edited {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/la.json => app/javascript/mastodon/locales/la.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Oblitterare",
  "status.detailed_status": "Detailed conversation view",
  "status.direct": "Direct message @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Recolere",
  "status.edited": "Recultum {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/lt.json => app/javascript/mastodon/locales/lt.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Delete",
  "status.detailed_status": "Detailed conversation view",
  "status.direct": "Direct message @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
  "status.edited": "Edited {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/lv.json => app/javascript/mastodon/locales/lv.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Dzēst",
  "status.detailed_status": "Detalizēts sarunas skats",
  "status.direct": "Privāta ziņa @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Rediģēt",
  "status.edited": "Rediģēts {date}",
  "status.edited_x_times": "Rediģēts {count, plural, one {{count} reizi} other {{count} reizes}}",

M app/javascript/mastodon/locales/mk.json => app/javascript/mastodon/locales/mk.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Delete",
  "status.detailed_status": "Detailed conversation view",
  "status.direct": "Direct message @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
  "status.edited": "Edited {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/ml.json => app/javascript/mastodon/locales/ml.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "മായ്ക്കുക",
  "status.detailed_status": "വിശദമായ സംഭാഷണ കാഴ്‌ച",
  "status.direct": "@{name} ന് നേരിട്ട് മെസേജ് അയക്കുക",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
  "status.edited": "Edited {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/mr.json => app/javascript/mastodon/locales/mr.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Delete",
  "status.detailed_status": "Detailed conversation view",
  "status.direct": "Direct message @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
  "status.edited": "Edited {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/ms.json => app/javascript/mastodon/locales/ms.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Padam",
  "status.detailed_status": "Paparan perbualan terperinci",
  "status.direct": "Mesej terus @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Sunting",
  "status.edited": "Disunting {date}",
  "status.edited_x_times": "Disunting {count, plural, other {{count} kali}}",

M app/javascript/mastodon/locales/my.json => app/javascript/mastodon/locales/my.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "ဖျက်ရန်",
  "status.detailed_status": "အသေးစိတ်စကားပြောဆိုမှုမြင်ကွင်း",
  "status.direct": "@{name} ကို တိုက်ရိုက်စာပို့မည်",
  "status.direct_indicator": "Private mention",
  "status.edit": "ပြင်ဆင်ရန်",
  "status.edited": "{date} ကို ပြင်ဆင်ပြီးပါပြီ",
  "status.edited_x_times": "{count, plural, one {{count} time} other {{count} times}} ပြင်ဆင်ခဲ့သည်",

M app/javascript/mastodon/locales/nl.json => app/javascript/mastodon/locales/nl.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Verwijderen",
  "status.detailed_status": "Uitgebreide gespreksweergave",
  "status.direct": "@{name} een direct bericht sturen",
  "status.direct_indicator": "Private mention",
  "status.edit": "Bewerken",
  "status.edited": "Bewerkt op {date}",
  "status.edited_x_times": "{count, plural, one {{count} keer} other {{count} keer}} bewerkt",

M app/javascript/mastodon/locales/nn.json => app/javascript/mastodon/locales/nn.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Slett",
  "status.detailed_status": "Detaljert samtalevisning",
  "status.direct": "Send melding til @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Rediger",
  "status.edited": "Redigert {date}",
  "status.edited_x_times": "Redigert {count, plural, one {{count} gong} other {{count} gonger}}",

M app/javascript/mastodon/locales/no.json => app/javascript/mastodon/locales/no.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Slett",
  "status.detailed_status": "Detaljert samtalevisning",
  "status.direct": "Send direktemelding til @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Rediger",
  "status.edited": "Redigert {date}",
  "status.edited_x_times": "Redigert {count, plural,one {{count} gang} other {{count} ganger}}",

M app/javascript/mastodon/locales/oc.json => app/javascript/mastodon/locales/oc.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Escafar",
  "status.detailed_status": "Vista detalhada de la convèrsa",
  "status.direct": "Messatge per @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Modificar",
  "status.edited": "Modificat {date}",
  "status.edited_x_times": "Modificat {count, plural, un {{count} còp} other {{count} còps}}",

M app/javascript/mastodon/locales/pa.json => app/javascript/mastodon/locales/pa.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Delete",
  "status.detailed_status": "Detailed conversation view",
  "status.direct": "Direct message @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
  "status.edited": "Edited {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/pl.json => app/javascript/mastodon/locales/pl.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Usuń",
  "status.detailed_status": "Szczegółowy widok konwersacji",
  "status.direct": "Wyślij wiadomość bezpośrednią do @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edytuj",
  "status.edited": "Edytowano {date}",
  "status.edited_x_times": "Edytowano {count, plural, one {{count} raz} other {{count} razy}}",

M app/javascript/mastodon/locales/pt-BR.json => app/javascript/mastodon/locales/pt-BR.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Excluir",
  "status.detailed_status": "Visão detalhada da conversa",
  "status.direct": "Enviar toot direto para @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Editar",
  "status.edited": "Editado em {date}",
  "status.edited_x_times": "Editado {count, plural, one {{count} hora} other {{count} vezes}}",

M app/javascript/mastodon/locales/pt-PT.json => app/javascript/mastodon/locales/pt-PT.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Eliminar",
  "status.detailed_status": "Vista pormenorizada da conversa",
  "status.direct": "Mensagem direta @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Editar",
  "status.edited": "Editado em {date}",
  "status.edited_x_times": "Editado {count, plural,one {{count} vez} other {{count} vezes}}",

M app/javascript/mastodon/locales/ro.json => app/javascript/mastodon/locales/ro.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Șterge",
  "status.detailed_status": "Conversația detaliată",
  "status.direct": "Mesaj direct către @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Modifică",
  "status.edited": "Modificat în data de {date}",
  "status.edited_x_times": "Modificată {count, plural, one {o dată} few {de {count} ori} other {de {count} de ori}}",

M app/javascript/mastodon/locales/ru.json => app/javascript/mastodon/locales/ru.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Удалить",
  "status.detailed_status": "Подробный просмотр обсуждения",
  "status.direct": "Написать @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Изменить",
  "status.edited": "Последнее изменение: {date}",
  "status.edited_x_times": "{count, plural, one {{count} изменение} many {{count} изменений} other {{count} изменения}}",

M app/javascript/mastodon/locales/sa.json => app/javascript/mastodon/locales/sa.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "मार्जय",
  "status.detailed_status": "विस्तृतसंभाषणदृश्यम्",
  "status.direct": "प्रत्यक्षसन्देशः @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "सम्पादय",
  "status.edited": "सम्पादितं {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} वारम्} other {{count} वारम्}}",

M app/javascript/mastodon/locales/sc.json => app/javascript/mastodon/locales/sc.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Cantzella",
  "status.detailed_status": "Visualizatzione de detàlliu de arresonada",
  "status.direct": "Messàgiu deretu a @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
  "status.edited": "Edited {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/sco.json => app/javascript/mastodon/locales/sco.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Delete",
  "status.detailed_status": "Detailt conversation view",
  "status.direct": "Direck message @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
  "status.edited": "Editit {date}",
  "status.edited_x_times": "Editit {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/si.json => app/javascript/mastodon/locales/si.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "මකන්න",
  "status.detailed_status": "විස්තරාත්මක සංවාද දැක්ම",
  "status.direct": "@{name} සෘජු පණිවිඩයක්",
  "status.direct_indicator": "Private mention",
  "status.edit": "සංස්කරණය",
  "status.edited": "සංශෝධිතයි {date}",
  "status.edited_x_times": "සංශෝධිතයි {count, plural, one {වාර {count}} other {වාර {count}}}",

M app/javascript/mastodon/locales/sk.json => app/javascript/mastodon/locales/sk.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Zmazať",
  "status.detailed_status": "Podrobný náhľad celej konverzácie",
  "status.direct": "Priama správa pre @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Uprav",
  "status.edited": "Upravené {date}",
  "status.edited_x_times": "Upravený {count, plural, one {{count} krát} other {{count} krát}}",

M app/javascript/mastodon/locales/sl.json => app/javascript/mastodon/locales/sl.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Izbriši",
  "status.detailed_status": "Podroben pogled pogovora",
  "status.direct": "Neposredno sporočilo @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Uredi",
  "status.edited": "Urejeno {date}",
  "status.edited_x_times": "Urejeno {count, plural, one {#-krat} two {#-krat} few {#-krat} other {#-krat}}",

M app/javascript/mastodon/locales/sq.json => app/javascript/mastodon/locales/sq.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Fshije",
  "status.detailed_status": "Pamje e hollësishme bisede",
  "status.direct": "Mesazh i drejtpërdrejtë për @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Përpunojeni",
  "status.edited": "Përpunuar më {date}",
  "status.edited_x_times": "Përpunuar {count, plural, one {{count} herë} other {{count} herë}}",

M app/javascript/mastodon/locales/sr-Latn.json => app/javascript/mastodon/locales/sr-Latn.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Izbriši",
  "status.detailed_status": "Detaljan prikaz razgovora",
  "status.direct": "Pošalji poruku @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Uredi",
  "status.edited": "Uređeno {date}",
  "status.edited_x_times": "Uređeno {count, plural, one {{count} put} other {{count} puta}}",

M app/javascript/mastodon/locales/sr.json => app/javascript/mastodon/locales/sr.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Избриши",
  "status.detailed_status": "Детаљан приказ разговора",
  "status.direct": "Пошаљи поруку @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Уреди",
  "status.edited": "Уређено {date}",
  "status.edited_x_times": "Уређено {count, plural, one {{count} пут} other {{count} пута}}",

M app/javascript/mastodon/locales/sv.json => app/javascript/mastodon/locales/sv.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Radera",
  "status.detailed_status": "Detaljerad samtalsvy",
  "status.direct": "Direktmeddela @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Redigera",
  "status.edited": "Ändrad {date}",
  "status.edited_x_times": "Redigerad {count, plural, one {{count} gång} other {{count} gånger}}",

M app/javascript/mastodon/locales/szl.json => app/javascript/mastodon/locales/szl.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Delete",
  "status.detailed_status": "Detailed conversation view",
  "status.direct": "Direct message @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
  "status.edited": "Edited {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/ta.json => app/javascript/mastodon/locales/ta.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "நீக்கு",
  "status.detailed_status": "விரிவான உரையாடல் காட்சி",
  "status.direct": "நேரடி செய்தி @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
  "status.edited": "Edited {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/tai.json => app/javascript/mastodon/locales/tai.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Delete",
  "status.detailed_status": "Detailed conversation view",
  "status.direct": "Direct message @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
  "status.edited": "Edited {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/te.json => app/javascript/mastodon/locales/te.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "తొలగించు",
  "status.detailed_status": "వివరణాత్మక సంభాషణ వీక్షణ",
  "status.direct": "@{name}కు నేరుగా సందేశం పంపు",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
  "status.edited": "Edited {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/th.json => app/javascript/mastodon/locales/th.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "ลบ",
  "status.detailed_status": "มุมมองการสนทนาโดยละเอียด",
  "status.direct": "ส่งข้อความโดยตรงถึง @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "แก้ไข",
  "status.edited": "แก้ไขเมื่อ {date}",
  "status.edited_x_times": "แก้ไข {count, plural, other {{count} ครั้ง}}",

M app/javascript/mastodon/locales/tr.json => app/javascript/mastodon/locales/tr.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Sil",
  "status.detailed_status": "Ayrıntılı sohbet görünümü",
  "status.direct": "@{name} adlı kişiye direkt mesaj",
  "status.direct_indicator": "Private mention",
  "status.edit": "Düzenle",
  "status.edited": "{date} tarihinde düzenlenmiş",
  "status.edited_x_times": "{count, plural, one {{count} kez} other {{count} kez}} düzenlendi",

M app/javascript/mastodon/locales/tt.json => app/javascript/mastodon/locales/tt.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Бетерү",
  "status.detailed_status": "Detailed conversation view",
  "status.direct": "Direct message @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Үзгәртү",
  "status.edited": "Edited {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/ug.json => app/javascript/mastodon/locales/ug.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Delete",
  "status.detailed_status": "Detailed conversation view",
  "status.direct": "Direct message @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
  "status.edited": "Edited {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/uk.json => app/javascript/mastodon/locales/uk.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Видалити",
  "status.detailed_status": "Детальний вигляд бесіди",
  "status.direct": "Пряме повідомлення до @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Редагувати",
  "status.edited": "Відредаговано {date}",
  "status.edited_x_times": "Відредаговано {count, plural, one {{count} раз} few {{count} рази} many {{counter} разів} other {{counter} разів}}",

M app/javascript/mastodon/locales/ur.json => app/javascript/mastodon/locales/ur.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Delete",
  "status.detailed_status": "Detailed conversation view",
  "status.direct": "Direct message @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
  "status.edited": "Edited {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/uz.json => app/javascript/mastodon/locales/uz.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Delete",
  "status.detailed_status": "Detailed conversation view",
  "status.direct": "Direct message @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
  "status.edited": "Edited {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/vi.json => app/javascript/mastodon/locales/vi.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "Xóa",
  "status.detailed_status": "Xem chi tiết thêm",
  "status.direct": "Nhắn riêng @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Sửa",
  "status.edited": "Đã sửa {date}",
  "status.edited_x_times": "Đã sửa {count, plural, other {{count} lần}}",

M app/javascript/mastodon/locales/zgh.json => app/javascript/mastodon/locales/zgh.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "ⴽⴽⵙ",
  "status.detailed_status": "Detailed conversation view",
  "status.direct": "ⵜⵓⵣⵉⵏⵜ ⵜⵓⵙⵔⵉⴷⵜ ⵉ @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
  "status.edited": "Edited {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",

M app/javascript/mastodon/locales/zh-CN.json => app/javascript/mastodon/locales/zh-CN.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "删除",
  "status.detailed_status": "详细的对话视图",
  "status.direct": "私信 @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "编辑",
  "status.edited": "编辑于 {date}",
  "status.edited_x_times": "共编辑 {count, plural, one {{count} 次} other {{count} 次}}",

M app/javascript/mastodon/locales/zh-HK.json => app/javascript/mastodon/locales/zh-HK.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "刪除",
  "status.detailed_status": "詳細對話內容",
  "status.direct": "私訊 @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "編輯",
  "status.edited": "編輯於 {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} 次} other {{count} 次}}",

M app/javascript/mastodon/locales/zh-TW.json => app/javascript/mastodon/locales/zh-TW.json +1 -0
@@ 558,6 558,7 @@
  "status.delete": "刪除",
  "status.detailed_status": "詳細的對話內容",
  "status.direct": "發送私訊給 @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "編輯",
  "status.edited": "編輯於 {date}",
  "status.edited_x_times": "已編輯 {count, plural, one {{count} 次} other {{count} 次}}",

M app/javascript/styles/mastodon-light/diff.scss => app/javascript/styles/mastodon-light/diff.scss +9 -1
@@ 264,7 264,7 @@ html {

// Change the background colors of statuses
.focusable:focus {
  background: $ui-base-color;
  background: lighten($white, 4%);
}

.detailed-status,


@@ 697,3 697,11 @@ html {
    url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(lighten($ui-base-color, 8%))}'/></svg>")
    no-repeat right 8px center / auto 16px;
}

.status__wrapper-direct {
  background-color: rgba($ui-highlight-color, 0.1);

  &:focus {
    background-color: rgba($ui-highlight-color, 0.15);
  }
}

M app/javascript/styles/mastodon/components.scss => app/javascript/styles/mastodon/components.scss +44 -1
@@ 1244,7 1244,7 @@ body > [data-popper-placement] {
.status__prepend {
  padding: 16px;
  padding-bottom: 0;
  display: flex;
  display: inline-flex;
  gap: 10px;
  font-size: 15px;
  line-height: 22px;


@@ 1262,6 1262,18 @@ body > [data-popper-placement] {
  }
}

.status__wrapper-direct {
  background: mix($ui-base-color, $ui-highlight-color, 95%);

  &:focus {
    background: mix(lighten($ui-base-color, 4%), $ui-highlight-color, 95%);
  }

  .status__prepend {
    color: $highlight-text-color;
  }
}

.status__action-bar {
  display: flex;
  justify-content: space-between;


@@ 1315,6 1327,11 @@ body > [data-popper-placement] {
  .audio-player {
    margin-top: 16px;
  }

  .status__prepend {
    padding: 0;
    margin-bottom: 16px;
  }
}

.detailed-status__meta {


@@ 1333,6 1350,32 @@ body > [data-popper-placement] {
  padding: 10px 0;
}

.detailed-status__wrapper-direct {
  .detailed-status,
  .detailed-status__action-bar {
    background: mix($ui-base-color, $ui-highlight-color, 95%);
  }

  &:focus {
    .detailed-status,
    .detailed-status__action-bar {
      background: mix(lighten($ui-base-color, 4%), $ui-highlight-color, 95%);
    }
  }

  .detailed-status__action-bar {
    border-top-color: mix(
      lighten($ui-base-color, 8%),
      $ui-highlight-color,
      95%
    );
  }

  .status__prepend {
    color: $highlight-text-color;
  }
}

.detailed-status__link {
  color: inherit;
  text-decoration: none;