Merge remote-tracking branch 'upstream/main'

app/controllers/authorize_interactions_controller.rb

@@ -14,7 +14,7 @@ class AuthorizeInteractionsController < ApplicationController
     if @resource.is_a?(Account)
       render :show
     elsif @resource.is_a?(Status)
-      redirect_to web_url("statuses/#{@resource.id}")
+      redirect_to web_url("@#{@resource.account.pretty_acct}/#{@resource.id}")
     else
       render :error
     end
@@ -26,15 +26,17 @@ class AuthorizeInteractionsController < ApplicationController
     else
       render :error
     end
-  rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
+  rescue ActiveRecord::RecordNotFound
     render :error
   end
 
   private
 
   def set_resource
-    @resource = located_resource || render(:error)
+    @resource = located_resource
     authorize(@resource, :show?) if @resource.is_a?(Status)
+  rescue Mastodon::NotPermittedError
+    not_found
   end
 
   def located_resource

app/controllers/following_accounts_controller.rb

@@ -22,7 +22,10 @@ class FollowingAccountsController < ApplicationController
       end
 
       format.json do
-        raise Mastodon::NotPermittedError if page_requested? && @account.hide_collections?
+        if page_requested? && @account.hide_collections?
+          forbidden
+          next
+        end
 
         expires_in(page_requested? ? 0 : 3.minutes, public: public_fetch_mode?)
 

app/controllers/oauth/tokens_controller.rb

@@ -2,7 +2,8 @@
 
 class Oauth::TokensController < Doorkeeper::TokensController
   def revoke
-    unsubscribe_for_token if authorized? && token.accessible?
+    unsubscribe_for_token if token.present? && authorized? && token.accessible?
+
     super
   end
 

app/javascript/core/admin.js

@@ -101,4 +101,14 @@ ready(() => {
 
   const registrationMode = document.getElementById('form_admin_settings_registrations_mode');
   if (registrationMode) onChangeRegistrationMode(registrationMode);
+
+  document.querySelector('a#add-instance-button')?.addEventListener('click', (e) => {
+    const domain = document.getElementById('by_domain')?.value;
+
+    if (domain) {
+      const url = new URL(event.target.href);
+      url.searchParams.set('_domain', domain);
+      e.target.href = url;
+    }
+  });
 });

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

@@ -1566,7 +1566,7 @@ button.icon-button.active i.fa-retweet {
 .loading-bar {
   background-color: $ui-highlight-color;
   height: 3px;
-  position: absolute;
+  position: fixed;
   top: 0;
   left: 0;
   z-index: 9999;

app/javascript/mastodon/components/common_counter.js

@@ -25,7 +25,7 @@ export function counterRenderer(counterType, isBold = true) {
     return (displayNumber, pluralReady) => (
       <FormattedMessage
         id='account.statuses_counter'
-        defaultMessage='{count, plural, one {{counter} Toot} other {{counter} Toots}}'
+        defaultMessage='{count, plural, one {{counter} Post} other {{counter} Posts}}'
         values={{
           count: pluralReady,
           counter: renderCounter(displayNumber),

app/javascript/mastodon/components/status.js

@@ -56,7 +56,7 @@ const messages = defineMessages({
   public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
   unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
   private_short: { id: 'privacy.private.short', defaultMessage: 'Followers-only' },
-  direct_short: { id: 'privacy.direct.short', defaultMessage: 'Direct' },
+  direct_short: { id: 'privacy.direct.short', defaultMessage: 'Mentioned people only' },
   edited: { id: 'status.edited', defaultMessage: 'Edited {date}' },
 });
 
@@ -349,7 +349,7 @@ class Status extends ImmutablePureComponent {
       prepend = (
         <div className='status__prepend'>
           <div className='status__prepend-icon-wrapper'><Icon id='thumb-tack' className='status__prepend-icon' fixedWidth /></div>
-          <FormattedMessage id='status.pinned' defaultMessage='Pinned toot' />
+          <FormattedMessage id='status.pinned' defaultMessage='Pinned post' />
         </div>
       );
     } else if (status.get('reblog', null) !== null && typeof status.get('reblog') === 'object') {

app/javascript/mastodon/components/status_action_bar.js

@@ -266,7 +266,6 @@ class StatusActionBar extends ImmutablePureComponent {
       menu.push({ text: intl.formatMessage(messages.redraft), action: this.handleRedraftClick });
     } else {
       menu.push({ text: intl.formatMessage(messages.mention, { name: account.get('username') }), action: this.handleMentionClick });
-      menu.push({ text: intl.formatMessage(messages.direct, { name: account.get('username') }), action: this.handleDirectClick });
       menu.push(null);
 
       if (relationship && relationship.get('muting')) {

app/javascript/mastodon/features/account/components/header.js

@@ -38,7 +38,7 @@ const messages = defineMessages({
   showReblogs: { id: 'account.show_reblogs', defaultMessage: 'Show boosts from @{name}' },
   enableNotifications: { id: 'account.enable_notifications', defaultMessage: 'Notify me when @{name} posts' },
   disableNotifications: { id: 'account.disable_notifications', defaultMessage: 'Stop notifying me when @{name} posts' },
-  pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' },
+  pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned posts' },
   preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
   follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
   favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },
@@ -177,7 +177,6 @@ class Header extends ImmutablePureComponent {
 
     if (account.get('id') !== me) {
       menu.push({ text: intl.formatMessage(messages.mention, { name: account.get('username') }), action: this.props.onMention });
-      menu.push({ text: intl.formatMessage(messages.direct, { name: account.get('username') }), action: this.props.onDirect });
       menu.push(null);
     }
 

app/javascript/mastodon/features/account_timeline/components/header.js

@@ -121,8 +121,8 @@ export default class Header extends ImmutablePureComponent {
 
         {!hideTabs && (
           <div className='account__section-headline'>
-            <NavLink exact to={`/@${account.get('acct')}`}><FormattedMessage id='account.posts' defaultMessage='Toots' /></NavLink>
+            <NavLink exact to={`/@${account.get('acct')}`}><FormattedMessage id='account.posts' defaultMessage='Posts' /></NavLink>
-            <NavLink exact to={`/@${account.get('acct')}/with_replies`}><FormattedMessage id='account.posts_with_replies' defaultMessage='Toots and replies' /></NavLink>
+            <NavLink exact to={`/@${account.get('acct')}/with_replies`}><FormattedMessage id='account.posts_with_replies' defaultMessage='Posts and replies' /></NavLink>
             <NavLink exact to={`/@${account.get('acct')}/media`}><FormattedMessage id='account.media' defaultMessage='Media' /></NavLink>
           </div>
         )}

app/javascript/mastodon/features/account_timeline/index.js

@@ -45,7 +45,7 @@ const mapStateToProps = (state, { params: { acct, id }, withReplies = false }) =
 };
 
 const RemoteHint = ({ url }) => (
-  <TimelineHint url={url} resource={<FormattedMessage id='timeline_hint.resources.statuses' defaultMessage='Older toots' />} />
+  <TimelineHint url={url} resource={<FormattedMessage id='timeline_hint.resources.statuses' defaultMessage='Older posts' />} />
 );
 
 RemoteHint.propTypes = {
@@ -156,7 +156,7 @@ class AccountTimeline extends ImmutablePureComponent {
     } else if (remote && statusIds.isEmpty()) {
       emptyMessage = <RemoteHint url={remoteUrl} />;
     } else {
-      emptyMessage = <FormattedMessage id='empty_column.account_timeline' defaultMessage='No toots here!' />;
+      emptyMessage = <FormattedMessage id='empty_column.account_timeline' defaultMessage='No posts found' />;
     }
 
     const remoteMessage = remote ? <RemoteHint url={remoteUrl} /> : null;

app/javascript/mastodon/features/bookmarked_statuses/index.js

@@ -70,7 +70,7 @@ class Bookmarks extends ImmutablePureComponent {
     const { intl, statusIds, columnId, multiColumn, hasMore, isLoading } = this.props;
     const pinned = !!columnId;
 
-    const emptyMessage = <FormattedMessage id='empty_column.bookmarked_statuses' defaultMessage="You don't have any bookmarked toots yet. When you bookmark one, it will show up here." />;
+    const emptyMessage = <FormattedMessage id='empty_column.bookmarked_statuses' defaultMessage="You don't have any bookmarked posts yet. When you bookmark one, it will show up here." />;
 
     return (
       <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.heading)}>

app/javascript/mastodon/features/compose/components/action_bar.js

@@ -6,7 +6,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 const messages = defineMessages({
   edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
-  pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' },
+  pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned posts' },
   preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
   follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
   favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },

app/javascript/mastodon/features/compose/components/privacy_dropdown.js

@@ -11,12 +11,12 @@ import Icon from 'mastodon/components/icon';
 
 const messages = defineMessages({
   public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
-  public_long: { id: 'privacy.public.long', defaultMessage: 'Visible for all, shown in public timelines' },
+  public_long: { id: 'privacy.public.long', defaultMessage: 'Visible for all' },
   unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
-  unlisted_long: { id: 'privacy.unlisted.long', defaultMessage: 'Visible for all, but not in public timelines' },
+  unlisted_long: { id: 'privacy.unlisted.long', defaultMessage: 'Visible for all, but opted-out of discovery features' },
-  private_short: { id: 'privacy.private.short', defaultMessage: 'Followers-only' },
+  private_short: { id: 'privacy.private.short', defaultMessage: 'Followers only' },
   private_long: { id: 'privacy.private.long', defaultMessage: 'Visible for followers only' },
-  direct_short: { id: 'privacy.direct.short', defaultMessage: 'Direct' },
+  direct_short: { id: 'privacy.direct.short', defaultMessage: 'Only people I mention' },
   direct_long: { id: 'privacy.direct.long', defaultMessage: 'Visible for mentioned users only' },
   change_privacy: { id: 'privacy.change', defaultMessage: 'Adjust status privacy' },
 });
@@ -242,7 +242,7 @@ class PrivacyDropdown extends React.PureComponent {
 
     if (!this.props.noDirect) {
       this.options.push(
-        { icon: 'envelope', value: 'direct', text: formatMessage(messages.direct_short), meta: formatMessage(messages.direct_long) },
+        { icon: 'at', value: 'direct', text: formatMessage(messages.direct_short), meta: formatMessage(messages.direct_long) },
       );
     }
   }

app/javascript/mastodon/features/compose/components/search_results.js

@@ -91,7 +91,7 @@ class SearchResults extends ImmutablePureComponent {
       count   += results.get('statuses').size;
       statuses = (
         <div className='search-results__section'>
-          <h5><Icon id='quote-right' fixedWidth /><FormattedMessage id='search_results.statuses' defaultMessage='Toots' /></h5>
+          <h5><Icon id='quote-right' fixedWidth /><FormattedMessage id='search_results.statuses' defaultMessage='Posts' /></h5>
 
           {results.get('statuses').map(statusId => <StatusContainer key={statusId} id={statusId} />)}
 
@@ -101,10 +101,10 @@ class SearchResults extends ImmutablePureComponent {
     } else if(results.get('statuses') && results.get('statuses').size === 0 && !searchEnabled && !(searchTerm.startsWith('@') || searchTerm.startsWith('#') || searchTerm.includes(' '))) {
       statuses = (
         <div className='search-results__section'>
-          <h5><Icon id='quote-right' fixedWidth /><FormattedMessage id='search_results.statuses' defaultMessage='Toots' /></h5>
+          <h5><Icon id='quote-right' fixedWidth /><FormattedMessage id='search_results.statuses' defaultMessage='Posts' /></h5>
 
           <div className='search-results__info'>
-            <FormattedMessage id='search_results.statuses_fts_disabled' defaultMessage='Searching toots by their content is not enabled on this Mastodon server.' />
+            <FormattedMessage id='search_results.statuses_fts_disabled' defaultMessage='Searching posts by their content is not enabled on this Mastodon server.' />
           </div>
         </div>
       );

app/javascript/mastodon/features/compose/containers/warning_container.js

@@ -42,13 +42,13 @@ const WarningWrapper = ({ needsLockWarning, hashtagWarning, directMessageWarning
   }
 
   if (hashtagWarning) {
-    return <Warning message={<FormattedMessage id='compose_form.hashtag_warning' defaultMessage="This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag." />} />;
+    return <Warning message={<FormattedMessage id='compose_form.hashtag_warning' defaultMessage="This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag." />} />;
   }
 
   if (directMessageWarning) {
     const message = (
       <span>
-        <FormattedMessage id='compose_form.direct_message_warning' defaultMessage='This toot will only be sent to all the mentioned users.' /> <a href='/terms' target='_blank'><FormattedMessage id='compose_form.direct_message_warning_learn_more' defaultMessage='Learn more' /></a>
+        <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>
     );
 

app/javascript/mastodon/features/compose/index.js

@@ -26,7 +26,7 @@ const messages = defineMessages({
   community: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
   preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
   logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },
-  compose: { id: 'navigation_bar.compose', defaultMessage: 'Compose new toot' },
+  compose: { id: 'navigation_bar.compose', defaultMessage: 'Compose new post' },
   logoutMessage: { id: 'confirmations.logout.message', defaultMessage: 'Are you sure you want to log out?' },
   logoutConfirm: { id: 'confirmations.logout.confirm', defaultMessage: 'Log out' },
 });

app/javascript/mastodon/features/direct_timeline/index.js

@@ -10,7 +10,7 @@ import { connectDirectStream } from '../../actions/streaming';
 import ConversationsListContainer from './containers/conversations_list_container';
 
 const messages = defineMessages({
-  title: { id: 'column.direct', defaultMessage: 'Direct messages' },
+  title: { id: 'column.conversations', defaultMessage: 'Conversations' },
 });
 
 export default @connect()
@@ -76,7 +76,7 @@ class DirectTimeline extends React.PureComponent {
     return (
       <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.title)}>
         <ColumnHeader
-          icon='envelope'
+          icon='at'
           active={hasUnread}
           title={intl.formatMessage(messages.title)}
           onPin={this.handlePin}
@@ -91,7 +91,7 @@ class DirectTimeline extends React.PureComponent {
           scrollKey={`direct_timeline-${columnId}`}
           timelineId='direct'
           onLoadMore={this.handleLoadMore}
-          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.conversations' defaultMessage="Once you send or receive a post that's only visible to people mentioned in it, it will show up here." />}
         />
       </Column>
     );

app/javascript/mastodon/features/directory/components/account_card.js

@@ -191,7 +191,7 @@ class AccountCard extends ImmutablePureComponent {
             <div className='account-card__counters__item'>
               <ShortNumber value={account.get('statuses_count')} />
               <small>
-                <FormattedMessage id='account.posts' defaultMessage='Toots' />
+                <FormattedMessage id='account.posts' defaultMessage='Posts' />
               </small>
             </div>
 

app/javascript/mastodon/features/explore/results.js

@@ -100,7 +100,7 @@ class Results extends React.PureComponent {
           <button onClick={this.handleSelectAll} className={type === 'all' && 'active'}><FormattedMessage id='search_results.all' defaultMessage='All' /></button>
           <button onClick={this.handleSelectAccounts} className={type === 'accounts' && 'active'}><FormattedMessage id='search_results.accounts' defaultMessage='People' /></button>
           <button onClick={this.handleSelectHashtags} className={type === 'hashtags' && 'active'}><FormattedMessage id='search_results.hashtags' defaultMessage='Hashtags' /></button>
-          <button onClick={this.handleSelectStatuses} className={type === 'statuses' && 'active'}><FormattedMessage id='search_results.statuses' defaultMessage='Toots' /></button>
+          <button onClick={this.handleSelectStatuses} className={type === 'statuses' && 'active'}><FormattedMessage id='search_results.statuses' defaultMessage='Posts' /></button>
         </div>
 
         <div className='explore__search-results'>

app/javascript/mastodon/features/favourited_statuses/index.js

@@ -70,7 +70,7 @@ class Favourites extends ImmutablePureComponent {
     const { intl, statusIds, columnId, multiColumn, hasMore, isLoading } = this.props;
     const pinned = !!columnId;
 
-    const emptyMessage = <FormattedMessage id='empty_column.favourited_statuses' defaultMessage="You don't have any favourite toots yet. When you favourite one, it will show up here." />;
+    const emptyMessage = <FormattedMessage id='empty_column.favourited_statuses' defaultMessage="You don't have any favourite posts yet. When you favourite one, it will show up here." />;
 
     return (
       <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.heading)}>

app/javascript/mastodon/features/favourites/index.js

@@ -59,7 +59,7 @@ class Favourites extends ImmutablePureComponent {
       );
     }
 
-    const emptyMessage = <FormattedMessage id='empty_column.favourites' defaultMessage='No one has favourited this toot yet. When someone does, they will show up here.' />;
+    const emptyMessage = <FormattedMessage id='empty_column.favourites' defaultMessage='No one has favourited this post yet. When someone does, they will show up here.' />;
 
     return (
       <Column bindToDocument={!multiColumn}>

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

@@ -22,7 +22,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: 'column.conversations', defaultMessage: 'Conversations' },
   bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
   preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
   follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
@@ -30,7 +30,7 @@ const messages = defineMessages({
   blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
   domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Hidden domains' },
   mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
-  pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' },
+  pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned posts' },
   lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },
   discover: { id: 'navigation_bar.discover', defaultMessage: 'Discover' },
   personal: { id: 'navigation_bar.personal', defaultMessage: 'Personal' },
@@ -130,7 +130,7 @@ class GettingStarted extends ImmutablePureComponent {
     }
 
     navItems.push(
-      <ColumnLink key='direct' icon='envelope' text={intl.formatMessage(messages.direct)} to='/conversations' />,
+      <ColumnLink key='direct' icon='at' text={intl.formatMessage(messages.direct)} to='/conversations' />,
       <ColumnLink key='bookmark' icon='bookmark' text={intl.formatMessage(messages.bookmarks)} to='/bookmarks' />,
       <ColumnLink key='favourites' icon='star' text={intl.formatMessage(messages.favourites)} to='/favourites' />,
       <ColumnLink key='lists' icon='list-ul' text={intl.formatMessage(messages.lists)} to='/lists' />,

app/javascript/mastodon/features/keyboard_shortcuts/index.js

@@ -86,7 +86,7 @@ class KeyboardShortcuts extends ImmutablePureComponent {
               </tr>
               <tr>
                 <td><kbd>alt</kbd>+<kbd>n</kbd></td>
-                <td><FormattedMessage id='keyboard_shortcuts.toot' defaultMessage='to start a brand new toot' /></td>
+                <td><FormattedMessage id='keyboard_shortcuts.toot' defaultMessage='to start a brand new post' /></td>
               </tr>
               <tr>
                 <td><kbd>alt</kbd>+<kbd>x</kbd></td>
@@ -122,7 +122,7 @@ class KeyboardShortcuts extends ImmutablePureComponent {
               </tr>
               <tr>
                 <td><kbd>g</kbd>+<kbd>d</kbd></td>
-                <td><FormattedMessage id='keyboard_shortcuts.direct' defaultMessage='to open direct messages column' /></td>
+                <td><FormattedMessage id='keyboard_shortcuts.conversations' defaultMessage='to open conversations column' /></td>
               </tr>
               <tr>
                 <td><kbd>g</kbd>+<kbd>s</kbd></td>
@@ -134,7 +134,7 @@ class KeyboardShortcuts extends ImmutablePureComponent {
               </tr>
               <tr>
                 <td><kbd>g</kbd>+<kbd>p</kbd></td>
-                <td><FormattedMessage id='keyboard_shortcuts.pinned' defaultMessage='to open pinned toots list' /></td>
+                <td><FormattedMessage id='keyboard_shortcuts.pinned' defaultMessage='to open pinned posts list' /></td>
               </tr>
               <tr>
                 <td><kbd>g</kbd>+<kbd>u</kbd></td>

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

@@ -145,7 +145,7 @@ export default class ColumnSettings extends React.PureComponent {
         </div>
 
         <div role='group' aria-labelledby='notifications-status'>
-          <span id='notifications-status' className='column-settings__section'><FormattedMessage id='notifications.column_settings.status' defaultMessage='New toots:' /></span>
+          <span id='notifications-status' className='column-settings__section'><FormattedMessage id='notifications.column_settings.status' defaultMessage='New posts:' /></span>
 
           <div className='column-settings__row'>
             <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'status']} onChange={onChange} label={alertStr} />

app/javascript/mastodon/features/pinned_statuses/index.js

@@ -10,7 +10,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const messages = defineMessages({
-  heading: { id: 'column.pins', defaultMessage: 'Pinned toot' },
+  heading: { id: 'column.pins', defaultMessage: 'Pinned post' },
 });
 
 const mapStateToProps = state => ({

app/javascript/mastodon/features/reblogs/index.js

@@ -59,7 +59,7 @@ class Reblogs extends ImmutablePureComponent {
       );
     }
 
-    const emptyMessage = <FormattedMessage id='status.reblogs.empty' defaultMessage='No one has boosted this toot yet. When someone does, they will show up here.' />;
+    const emptyMessage = <FormattedMessage id='status.reblogs.empty' defaultMessage='No one has boosted this post yet. When someone does, they will show up here.' />;
 
     return (
       <Column bindToDocument={!multiColumn}>

app/javascript/mastodon/features/status/components/action_bar.js

@@ -220,7 +220,6 @@ class ActionBar extends React.PureComponent {
       menu.push({ text: intl.formatMessage(messages.redraft), action: this.handleRedraftClick });
     } else {
       menu.push({ text: intl.formatMessage(messages.mention, { name: status.getIn(['account', 'username']) }), action: this.handleMentionClick });
-      menu.push({ text: intl.formatMessage(messages.direct, { name: status.getIn(['account', 'username']) }), action: this.handleDirectClick });
       menu.push(null);
 
       if (relationship && relationship.get('muting')) {

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

@@ -16,7 +16,7 @@ const NavigationPanel = () => (
     <NavLink className='column-link column-link--transparent' to='/explore' data-preview-title-id='explore.title' data-preview-icon='hashtag'><Icon className='column-link__icon' id='hashtag' fixedWidth /><FormattedMessage id='explore.title' defaultMessage='Explore' /></NavLink>
     <NavLink className='column-link column-link--transparent' to='/public/local' data-preview-title-id='column.community' data-preview-icon='users' ><Icon className='column-link__icon' id='users' fixedWidth /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>
     <NavLink className='column-link column-link--transparent' exact to='/public' data-preview-title-id='column.public' data-preview-icon='globe' ><Icon className='column-link__icon' id='globe' fixedWidth /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>
-    <NavLink className='column-link column-link--transparent' to='/conversations'><Icon className='column-link__icon' id='envelope' fixedWidth /><FormattedMessage id='navigation_bar.direct' defaultMessage='Direct messages' /></NavLink>
+    <NavLink className='column-link column-link--transparent' to='/conversations'><Icon className='column-link__icon' id='at' fixedWidth /><FormattedMessage id='column.conversations' defaultMessage='Conversations' /></NavLink>
     <NavLink className='column-link column-link--transparent' to='/favourites'><Icon className='column-link__icon' id='star' fixedWidth /><FormattedMessage id='navigation_bar.favourites' defaultMessage='Favourites' /></NavLink>
     <NavLink className='column-link column-link--transparent' to='/bookmarks'><Icon className='column-link__icon' id='bookmark' fixedWidth /><FormattedMessage id='navigation_bar.bookmarks' defaultMessage='Bookmarks' /></NavLink>
     <NavLink className='column-link column-link--transparent' to='/lists'><Icon className='column-link__icon' id='list-ul' fixedWidth /><FormattedMessage id='navigation_bar.lists' defaultMessage='Lists' /></NavLink>

app/javascript/mastodon/locales/af.json

@@ -1,59 +1,59 @@
 {
-  "account.account_note_header": "Note",
+  "account.account_note_header": "Nota",
-  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.add_or_remove_from_list": "Voeg by of verwyder van lyste",
   "account.badges.bot": "Bot",
-  "account.badges.group": "Group",
+  "account.badges.group": "Groep",
-  "account.block": "Block @{name}",
+  "account.block": "Blok @{name}",
-  "account.block_domain": "Block domain {domain}",
+  "account.block_domain": "Blokeer alles van {domain}",
-  "account.blocked": "Blocked",
+  "account.blocked": "Geblok",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "Snuffel rond op oorspronklike profiel",
-  "account.cancel_follow_request": "Cancel follow request",
+  "account.cancel_follow_request": "Kanselleer volgversoek",
-  "account.direct": "Direct message @{name}",
+  "account.direct": "Stuur direkte boodskap aan @{name}",
   "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Domain blocked",
-  "account.edit_profile": "Edit profile",
+  "account.edit_profile": "Redigeer profiel",
-  "account.enable_notifications": "Notify me when @{name} posts",
+  "account.enable_notifications": "Stel my in kennis wanneer @{name} plasings maak",
-  "account.endorse": "Feature on profile",
+  "account.endorse": "Beklemtoon op profiel",
-  "account.follow": "Follow",
+  "account.follow": "Volg",
-  "account.followers": "Followers",
+  "account.followers": "Volgelinge",
-  "account.followers.empty": "No one follows this user yet.",
+  "account.followers.empty": "Niemand volg tans hierdie gebruiker nie.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
   "account.following": "Following",
   "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
   "account.follows.empty": "This user doesn't follow anyone yet.",
-  "account.follows_you": "Follows you",
+  "account.follows_you": "Volg jou",
-  "account.hide_reblogs": "Hide boosts from @{name}",
+  "account.hide_reblogs": "Versteek hupstoot vanaf @{name}",
-  "account.joined": "Joined {date}",
+  "account.joined": "{date} aangesluit",
-  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.link_verified_on": "Eienaarskap van die skakel was getoets op {date}",
   "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
   "account.media": "Media",
-  "account.mention": "Mention @{name}",
+  "account.mention": "Noem @{name}",
-  "account.moved_to": "{name} has moved to:",
+  "account.moved_to": "{name} is geskuif na:",
-  "account.mute": "Mute @{name}",
+  "account.mute": "Demp @{name}",
-  "account.mute_notifications": "Mute notifications from @{name}",
+  "account.mute_notifications": "Demp kennisgewings van @{name}",
-  "account.muted": "Muted",
+  "account.muted": "Gedemp",
   "account.posts": "Toots",
   "account.posts_with_replies": "Toots and replies",
-  "account.report": "Report @{name}",
+  "account.report": "Rapporteer @{name}",
   "account.requested": "Awaiting approval",
-  "account.share": "Share @{name}'s profile",
+  "account.share": "Deel @{name} se profiel",
-  "account.show_reblogs": "Show boosts from @{name}",
+  "account.show_reblogs": "Wys hupstote vanaf @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
-  "account.unblock": "Unblock @{name}",
+  "account.unblock": "Ontblok @{name}",
-  "account.unblock_domain": "Unblock domain {domain}",
+  "account.unblock_domain": "Ontblok domein {domain}",
-  "account.unblock_short": "Unblock",
+  "account.unblock_short": "Ontblok",
-  "account.unendorse": "Don't feature on profile",
+  "account.unendorse": "Moenie beklemtoon op profiel nie",
   "account.unfollow": "Unfollow",
-  "account.unmute": "Unmute @{name}",
+  "account.unmute": "Ontdemp @{name}",
-  "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account.unmute_notifications": "Ontdemp kennisgewings vanaf @{name}",
-  "account.unmute_short": "Unmute",
+  "account.unmute_short": "Ontdemp",
   "account_note.placeholder": "Click to add a note",
   "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
   "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
-  "admin.dashboard.retention.average": "Average",
+  "admin.dashboard.retention.average": "Gemiddeld",
   "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.retention.cohort_size": "Nuwe gebruikers",
-  "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
+  "alert.rate_limited.message": "Probeer asb. weer na {retry_time, time, medium}.",
   "alert.rate_limited.title": "Rate limited",
   "alert.unexpected.message": "An unexpected error occurred.",
   "alert.unexpected.title": "Oops!",
@@ -70,7 +70,7 @@
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
   "column.community": "Local timeline",
-  "column.direct": "Direct messages",
+  "column.conversations": "Conversations",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "Blocked domains",
   "column.favourites": "Favourites",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Local only",
   "community.column_settings.media_only": "Media only",
   "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
   "compose_form.direct_message_warning_learn_more": "Learn more",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots 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.conversations": "Once you send or receive a post that's only visible to people mentioned in it, 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 toots yet. When you favourite one, it will show up here.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Description",
-  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Edit profile",
@@ -370,9 +369,9 @@
   "privacy.direct.short": "Direct",
   "privacy.private.long": "Visible for followers only",
   "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all, shown in public timelines",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but not in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Unlisted",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",

app/javascript/mastodon/locales/ar.json

@@ -70,7 +70,7 @@
   "column.blocks": "المُستَخدِمون المَحظورون",
   "column.bookmarks": "الفواصل المرجعية",
   "column.community": "الخيط الزمني المحلي",
-  "column.direct": "الرسائل المباشرة",
+  "column.conversations": "المحادثات",
   "column.directory": "تَصَفُّحُ المَلفات الشخصية",
   "column.domain_blocks": "النِّطاقَاتُ المَحظُورَة",
   "column.favourites": "المُفَضَّلَة",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "المحلي فقط",
   "community.column_settings.media_only": "الوسائط فقط",
   "community.column_settings.remote_only": "عن بُعد فقط",
-  "compose_form.direct_message_warning": "سوف تُرسَل هذه التَّبويقة فقط للمُستَخدِمين المَذكورين.",
   "compose_form.direct_message_warning_learn_more": "تَعَلَّم المَزيد",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "لن يُدرَج هذا المنشور تحت أي وسم بما أنَّه غير مُدرَج. فقط المنشورات العامة يُمكن البحث عنها بواسطة الوسم.",
   "compose_form.lock_disclaimer": "حسابُك غير {locked}. يُمكن لأي شخص مُتابعتك لرؤية (منشورات المتابعين فقط).",
   "compose_form.lock_disclaimer.lock": "مُقفَل",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "لم تقم بحظر أي مستخدِم بعد.",
   "empty_column.bookmarked_statuses": "ليس لديك أية منشورات في الفواصل المرجعية بعد. عندما ستقوم بإضافة البعض منها، ستظهر هنا.",
   "empty_column.community": "الخط العام المحلي فارغ. أكتب شيئا ما للعامة كبداية!",
-  "empty_column.direct": "لم تتلق أية رسالة خاصة مباشِرة بعد. سوف يتم عرض الرسائل المباشرة هنا إن قمت بإرسال واحدة أو تلقيت البعض منها.",
+  "empty_column.conversations": "عندما ترسل أو تستلم منشورًا محصورٌا على الأشخاص المشار إليهم فيه، سيظهر هنا.",
   "empty_column.domain_blocks": "ليس هناك نطاقات مخفية بعد.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "ليس لديك أية منشورات مفضلة بعد. عندما ستقوم بالإعجاب بواحدة، ستظهر هنا.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "للترقية",
   "keyboard_shortcuts.column": "للتركيز على منشور على أحد الأعمدة",
   "keyboard_shortcuts.compose": "للتركيز على نافذة تحرير النصوص",
+  "keyboard_shortcuts.conversations": "لفتح عمود المحادثات",
   "keyboard_shortcuts.description": "الوصف",
-  "keyboard_shortcuts.direct": "لفتح عمود الرسائل المباشرة",
   "keyboard_shortcuts.down": "للانتقال إلى أسفل القائمة",
   "keyboard_shortcuts.enter": "لفتح المنشور",
   "keyboard_shortcuts.favourite": "للإضافة إلى المفضلة",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "الفواصل المرجعية",
   "navigation_bar.community_timeline": "الخيط العام المحلي",
   "navigation_bar.compose": "لتحرير منشور جديد",
-  "navigation_bar.direct": "الرسائل المباشِرة",
   "navigation_bar.discover": "اكتشف",
   "navigation_bar.domain_blocks": "النطاقات المخفية",
   "navigation_bar.edit_profile": "عدّل الملف التعريفي",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "إزالة استطلاع الرأي",
   "privacy.change": "اضبط خصوصية المنشور",
   "privacy.direct.long": "أنشر إلى المستخدمين المشار إليهم فقط",
-  "privacy.direct.short": "مباشر",
+  "privacy.direct.short": "للمشار إليهم فقط",
   "privacy.private.long": "أنشر لمتابعيك فقط",
-  "privacy.private.short": "لمتابعيك فقط",
+  "privacy.private.short": "للمتابِعين فقط",
-  "privacy.public.long": "أنشر على الخيوط العامة",
+  "privacy.public.long": "مرئي للكل",
   "privacy.public.short": "للعامة",
-  "privacy.unlisted.long": "لا تقم بإدراجه على الخيوط العامة",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "غير مدرج",
   "refresh": "أنعِش",
   "regeneration_indicator.label": "جارٍ التحميل…",

app/javascript/mastodon/locales/ast.json

@@ -70,7 +70,7 @@
   "column.blocks": "Usuarios bloquiaos",
   "column.bookmarks": "Marcadores",
   "column.community": "Llinia temporal llocal",
-  "column.direct": "Mensaxes direutos",
+  "column.conversations": "Conversations",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "Dominios anubríos",
   "column.favourites": "Favoritos",
@@ -92,9 +92,9 @@
   "community.column_settings.local_only": "Local only",
   "community.column_settings.media_only": "Namái multimedia",
   "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "Esti barritu namái va unviase a los usuarios mentaos.",
   "compose_form.direct_message_warning_learn_more": "Saber más",
-  "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
+  "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
   "compose_form.placeholder": "¿En qué pienses?",
@@ -166,11 +166,11 @@
   "empty_column.blocks": "Entá nun bloquiesti a nengún usuariu.",
   "empty_column.bookmarked_statuses": "Entá nun tienes nengún barritu en Marcadores. Cuando amiestes unu, va amosase equí.",
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
-  "empty_column.direct": "Entá nun tienes nuengún mensaxe direutu. Cuando unvies o recibas dalgún, va apaecer equí.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "Entá nun hai dominios anubríos.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Entá nun tienes nengún barritu en Favoritos. Cuando amiestes unu, va amosase equí.",
-  "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
+  "empty_column.favourites": "No one has favourited this post yet. When someone does, they will show up here.",
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
   "empty_column.follow_requests": "Entá nun tienes nenguna solicitú de siguimientu. Cuando recibas una, va amosase equí.",
   "empty_column.hashtag": "Entá nun hai nada nesta etiqueta.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "pa compartir un toot",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "Enfocar l'área de composición",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Descripción",
-  "keyboard_shortcuts.direct": "Abrir la columna de los mensaxes direutos",
   "keyboard_shortcuts.down": "pa baxar na llista",
   "keyboard_shortcuts.enter": "p'abrir estaos",
   "keyboard_shortcuts.favourite": "p'amestar a Favoritos",
@@ -289,8 +289,7 @@
   "navigation_bar.blocks": "Usuarios bloquiaos",
   "navigation_bar.bookmarks": "Marcadores",
   "navigation_bar.community_timeline": "Llinia temporal llocal",
-  "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.compose": "Compose new post",
-  "navigation_bar.direct": "Mensaxes direutos",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Dominios anubríos",
   "navigation_bar.edit_profile": "Editar el perfil",
@@ -369,10 +368,10 @@
   "privacy.direct.long": "Post to mentioned users only",
   "privacy.direct.short": "Direct",
   "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Namái siguidores",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all, shown in public timelines",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Nun apaez nes llinies temporales públiques",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Nun llistar",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Cargando…",
@@ -502,7 +501,7 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older toots",
+  "timeline_hint.resources.statuses": "Older posts",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "El borrador va perdese si coles de Mastodon.",

app/javascript/mastodon/locales/bg.json

@@ -70,7 +70,7 @@
   "column.blocks": "Блокирани потребители",
   "column.bookmarks": "Отметки",
   "column.community": "Локална емисия",
-  "column.direct": "Директни съобщения",
+  "column.conversations": "Conversations",
   "column.directory": "Преглед на профили",
   "column.domain_blocks": "Hidden domains",
   "column.favourites": "Любими",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Само локално",
   "community.column_settings.media_only": "Media only",
   "community.column_settings.remote_only": "Само дистанционно",
-  "compose_form.direct_message_warning": "This toot will only be visible to all the mentioned users.",
   "compose_form.direct_message_warning_learn_more": "Още информация",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Тази публикация няма да бъде изброена под нито един хаштаг, тъй като е скрита. Само публични публикации могат да се търсят по хаштаг.",
   "compose_form.lock_disclaimer": "Вашият акаунт не е {locked}. Всеки може да ви последва, за да прегледа вашите публикации само за последователи.",
   "compose_form.lock_disclaimer.lock": "заключено",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Не сте блокирали потребители все още.",
   "empty_column.bookmarked_statuses": "Все още нямате отметнати публикации. Когато отметнете някоя, тя ще се покаже тук.",
   "empty_column.community": "Локалната емисия е празна. Напишете нещо публично, за да започнете!",
-  "empty_column.direct": "Все още нямате директни съобщения. Когато изпратите или получите някое, то ще се покаже тук.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Все още нямате любими публикации. Когато поставите някоя в любими, тя ще се покаже тук.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "за споделяне",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "за фокусиране на текстовото пространство за композиране",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Описание",
-  "keyboard_shortcuts.direct": "за отваряне на колона за директни съобщения",
   "keyboard_shortcuts.down": "за придвижване надолу в списъка",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "за поставяне в любими",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Отметки",
   "navigation_bar.community_timeline": "Локална емисия",
   "navigation_bar.compose": "Композиране на нова публикация",
-  "navigation_bar.direct": "Директни съобщения",
   "navigation_bar.discover": "Откриване",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Редактирай профил",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Премахване на анкета",
   "privacy.change": "Adjust status privacy",
   "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Директно",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Само за последователи",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Post to public timelines",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Публично",
-  "privacy.unlisted.long": "Do not show in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Скрито",
   "refresh": "Опресняване",
   "regeneration_indicator.label": "Зареждане…",

app/javascript/mastodon/locales/bn.json

@@ -70,7 +70,7 @@
   "column.blocks": "যাদের ব্লক করা হয়েছে",
   "column.bookmarks": "বুকমার্ক",
   "column.community": "স্থানীয় সময়সারি",
-  "column.direct": "সরাসরি লেখা",
+  "column.conversations": "Conversations",
   "column.directory": "প্রোফাইল ব্রাউজ করুন",
   "column.domain_blocks": "লুকোনো ডোমেনগুলি",
   "column.favourites": "পছন্দের গুলো",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "শুধুমাত্র স্থানীয়",
   "community.column_settings.media_only": "শুধুমাত্র ছবি বা ভিডিও",
   "community.column_settings.remote_only": "শুধুমাত্র দূরবর্তী",
-  "compose_form.direct_message_warning": "শুধুমাত্র যাদেরকে উল্লেখ করা হয়েছে তাদেরকেই এই টুটটি পাঠানো হবে ।",
   "compose_form.direct_message_warning_learn_more": "আরো জানুন",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "কোনো হ্যাশট্যাগের ভেতরে এই টুটটি থাকবেনা কারণ এটি তালিকাবহির্ভূত। শুধুমাত্র প্রকাশ্য ঠোটগুলো হ্যাশট্যাগের ভেতরে খুঁজে পাওয়া যাবে।",
   "compose_form.lock_disclaimer": "আপনার নিবন্ধনে তালা দেওয়া নেই, যে কেও আপনাকে অনুসরণ করতে পারবে এবং অনুশারকদের জন্য লেখা দেখতে পারবে।",
   "compose_form.lock_disclaimer.lock": "তালা দেওয়া",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "আপনি কোনো ব্যবহারকারীদের ব্লক করেন নি।",
   "empty_column.bookmarked_statuses": "আপনার কাছে এখনও কোনও বুকমার্কড টুট নেই। আপনি যখন একটি বুকমার্ক করেন, এটি এখানে প্রদর্শিত হবে।",
   "empty_column.community": "স্থানীয় সময়রেখাতে কিছু নেই। প্রকাশ্যভাবে কিছু লিখে লেখালেখির উদ্বোধন করে ফেলুন!",
-  "empty_column.direct": "আপনার কাছে সরাসরি পাঠানো কোনো লেখা নেই। যদি কেও পাঠায়, সেটা এখানে দেখা যাবে।",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "এখনও কোনও লুকানো ডোমেন নেই।",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "আপনার পছন্দের কোনো টুট এখনো নেই। আপনি কোনো লেখা পছন্দের হিসেবে চিহ্নিত করলে এখানে পাওয়া যাবে।",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "সমর্থন করতে",
   "keyboard_shortcuts.column": "কোনো কলামএ কোনো লেখা ফোকাস করতে",
   "keyboard_shortcuts.compose": "লেখা সম্পদনার জায়গায় ফোকাস করতে",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "বিবরণ",
-  "keyboard_shortcuts.direct": "সরাসরি পাঠানো লেখা দেখতে",
   "keyboard_shortcuts.down": "তালিকার ভেতরে নিচে যেতে",
   "keyboard_shortcuts.enter": "অবস্থা দেখতে",
   "keyboard_shortcuts.favourite": "পছন্দের দেখতে",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "বুকমার্ক",
   "navigation_bar.community_timeline": "স্থানীয় সময়রেখা",
   "navigation_bar.compose": "নতুন টুট লিখুন",
-  "navigation_bar.direct": "সরাসরি লেখাগুলি",
   "navigation_bar.discover": "ঘুরে দেখুন",
   "navigation_bar.domain_blocks": "লুকানো ডোমেনগুলি",
   "navigation_bar.edit_profile": "নিজের পাতা সম্পাদনা করতে",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "নির্বাচন বাদ দিতে",
   "privacy.change": "লেখার গোপনীয়তা অবস্থা ঠিক করতে",
   "privacy.direct.long": "শুধুমাত্র উল্লেখিত ব্যবহারকারীদের কাছে লিখতে",
-  "privacy.direct.short": "সরাসরি",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "শুধুমাত্র আপনার অনুসরণকারীদের লিখতে",
-  "privacy.private.short": "শুধুমাত্র অনুসরণকারীদের জন্য",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "সর্বজনীন প্রকাশ্য সময়রেখাতে লিখতে",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "সর্বজনীন প্রকাশ্য",
-  "privacy.unlisted.long": "সর্বজনীন প্রকাশ্য সময়রেখাতে না দেখাতে",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "প্রকাশ্য নয়",
   "refresh": "সতেজ করা",
   "regeneration_indicator.label": "আসছে…",

app/javascript/mastodon/locales/br.json

@@ -70,7 +70,7 @@
   "column.blocks": "Implijer·ezed·ien berzet",
   "column.bookmarks": "Sinedoù",
   "column.community": "Red-amzer lec'hel",
-  "column.direct": "Kemennadoù prevez",
+  "column.conversations": "Conversations",
   "column.directory": "Mont a-dreuz ar profiloù",
   "column.domain_blocks": "Domani berzet",
   "column.favourites": "Muiañ-karet",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Nemet lec'hel",
   "community.column_settings.media_only": "Nemet Mediaoù",
   "community.column_settings.remote_only": "Nemet a-bell",
-  "compose_form.direct_message_warning": "An toud-mañ a vo kaset nemet d'an implijer·ezed·ien meneget.",
   "compose_form.direct_message_warning_learn_more": "Gouzout hiroc'h",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Ne vo ket lakaet an toud-mañ er rolloù gerioù-klik dre mard eo anlistennet. N'eus nemet an toudoù foran a c'hall bezañ klasket dre c'her-klik.",
   "compose_form.lock_disclaimer": "N'eo ket {locked} ho kont. An holl a c'hal heuliañ ac'hanoc'h evit gwelout ho toudoù prevez.",
   "compose_form.lock_disclaimer.lock": "prennet",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "N'eus ket bet berzet implijer·ez ganeoc'h c'hoazh.",
   "empty_column.bookmarked_statuses": "N'ho peus toud ebet enrollet en ho sinedoù c'hoazh. Pa vo ouzhpennet unan ganeoc'h e teuio war wel amañ.",
   "empty_column.community": "Goulo eo ar red-amzer lec'hel. Skrivit'ta un dra evit lakaat tan dezhi !",
-  "empty_column.direct": "N'ho peus kemennad prevez ebet c'hoazh. Pa vo resevet pe kaset unan ganeoc'h e teuio war wel amañ.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "N'eus domani kuzh ebet c'hoazh.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "N'ho peus toud muiañ-karet ebet c'hoazh. Pa vo lakaet unan ganeoc'h e vo diskouezet amañ.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "da skignañ",
   "keyboard_shortcuts.column": "Fokus ar bann",
   "keyboard_shortcuts.compose": "Fokus an takad testenn",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Deskrivadur",
-  "keyboard_shortcuts.direct": "Digeriñ bann ar c'hemennadennoù prevez",
   "keyboard_shortcuts.down": "Diskennañ er roll",
   "keyboard_shortcuts.enter": "evit digeriñ un toud",
   "keyboard_shortcuts.favourite": "Lakaat an toud evel muiañ-karet",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Sinedoù",
   "navigation_bar.community_timeline": "Red-amzer lec'hel",
   "navigation_bar.compose": "Skrivañ un toud nevez",
-  "navigation_bar.direct": "Kemennadoù prevez",
   "navigation_bar.discover": "Dizoleiñ",
   "navigation_bar.domain_blocks": "Domanioù kuzhet",
   "navigation_bar.edit_profile": "Aozañ ar profil",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Dilemel ar sontadeg",
   "privacy.change": "Kemmañ gwelidigezh ar statud",
   "privacy.direct.long": "Embann evit an implijer·ezed·ien meneget hepken",
-  "privacy.direct.short": "War-eeun",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Embann evit ar re a heuilh ac'hanon hepken",
-  "privacy.private.short": "Ar re a heuilh ac'hanon hepken",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Embann war ar redoù-amzer foran",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Publik",
-  "privacy.unlisted.long": "Na embann war ar redoù-amzer foran",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Anlistennet",
   "refresh": "Freskaat",
   "regeneration_indicator.label": "O kargañ…",

app/javascript/mastodon/locales/ca.json

@@ -70,7 +70,7 @@
   "column.blocks": "Usuaris bloquejats",
   "column.bookmarks": "Marcadors",
   "column.community": "Línia de temps local",
-  "column.direct": "Missatges directes",
+  "column.conversations": "Converses",
   "column.directory": "Navega pels perfils",
   "column.domain_blocks": "Dominis bloquejats",
   "column.favourites": "Favorits",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Només local",
   "community.column_settings.media_only": "Només multimèdia",
   "community.column_settings.remote_only": "Només remot",
-  "compose_form.direct_message_warning": "Aquesta publicació només s'enviarà als usuaris esmentats.",
   "compose_form.direct_message_warning_learn_more": "Més informació",
+  "compose_form.encryption_warning": "Les publicacions a Mastodon no estant xifrades punt a punt. No comparteixis informació perillosa mitjançant Mastodon.",
   "compose_form.hashtag_warning": "Aquesta publicació no es mostrarà en cap etiqueta, ja que no està llistada. Només les publicacions públiques es poden cercar per etiqueta.",
   "compose_form.lock_disclaimer": "El teu compte no està bloquejat {locked}. Tothom pot seguir-te i veure els teus missatges només per a seguidors.",
   "compose_form.lock_disclaimer.lock": "bloquejat",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Encara no has bloquejat cap usuari.",
   "empty_column.bookmarked_statuses": "Encara no has marcat com publicació com a preferida. Quan en marquis una apareixerà aquí.",
   "empty_column.community": "La línia de temps local és buida. Escriu alguna cosa públicament per posar-ho tot en marxa!",
-  "empty_column.direct": "Encara no tens missatges directes. Quan n'enviïs o en rebis, es mostraran aquí.",
+  "empty_column.conversations": "Cada vegada que envies o reps una publicació que és només visible per la gent que hi has mencionat en ella, serà mostrada aquí.",
   "empty_column.domain_blocks": "Encara no hi ha dominis bloquejats.",
   "empty_column.explore_statuses": "No hi ha res en tendència ara mateix. Revisa-ho més tard!",
   "empty_column.favourited_statuses": "Encara no has marcat cap publicació com a preferida. Quan les marquis, apareixeran aquí.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Impulsa publicació",
   "keyboard_shortcuts.column": "Centra la columna",
   "keyboard_shortcuts.compose": "Centra l'àrea de composició del text",
+  "keyboard_shortcuts.conversations": "per a obrir la columna de converses",
   "keyboard_shortcuts.description": "Descripció",
-  "keyboard_shortcuts.direct": "Obre la columna de missatges directes",
   "keyboard_shortcuts.down": "Mou-lo avall en la llista",
   "keyboard_shortcuts.enter": "Obre publicació",
   "keyboard_shortcuts.favourite": "Afavorir publicació",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Marcadors",
   "navigation_bar.community_timeline": "Línia de temps local",
   "navigation_bar.compose": "Redacta una nova publicació",
-  "navigation_bar.direct": "Missatges directes",
   "navigation_bar.discover": "Descobrir",
   "navigation_bar.domain_blocks": "Dominis bloquejats",
   "navigation_bar.edit_profile": "Edita el perfil",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Elimina l'enquesta",
   "privacy.change": "Ajusta la privacitat de la publicació",
   "privacy.direct.long": "Visible només per als usuaris esmentats",
-  "privacy.direct.short": "Directe",
+  "privacy.direct.short": "Només la gent que menciono",
   "privacy.private.long": "Visible només per als seguidors",
   "privacy.private.short": "Només seguidors",
-  "privacy.public.long": "Visible per a tothom, mostrat en línies de temps públiques",
+  "privacy.public.long": "Visible per tothom",
   "privacy.public.short": "Públic",
-  "privacy.unlisted.long": "Visible per a tothom però no en les línies de temps públiques",
+  "privacy.unlisted.long": "Visible per tothom però exclosa de les funcions de descobriment",
   "privacy.unlisted.short": "No llistat",
   "refresh": "Actualitza",
   "regeneration_indicator.label": "Carregant…",

app/javascript/mastodon/locales/ckb.json

@@ -70,7 +70,7 @@
   "column.blocks": "بەکارهێنەرە بلۆککراوەکان",
   "column.bookmarks": "نیشانەکان",
   "column.community": "هێڵی کاتی ناوخۆیی",
-  "column.direct": "نامە ڕاستەوخۆکان",
+  "column.conversations": "Conversations",
   "column.directory": "گەڕان لە پرۆفایلەکان",
   "column.domain_blocks": "دۆمەینە داخراوەکان",
   "column.favourites": "دڵخوازترینەکان",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "تەنها خۆماڵی",
   "community.column_settings.media_only": "تەنها میدیا",
   "community.column_settings.remote_only": "تەنها بۆ دوور",
-  "compose_form.direct_message_warning": "ئەم توتە تەنیا بۆ بەکارهێنەرانی ناوبراو دەنێردرێت.",
   "compose_form.direct_message_warning_learn_more": "زیاتر فێربه",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "ئەم توتە لە ژێر هیچ هاشتاگییەک دا ناکرێت وەک ئەوەی لە لیستەکەدا نەریزراوە. تەنها توتی گشتی دەتوانرێت بە هاشتاگی بگەڕێت.",
   "compose_form.lock_disclaimer": "هەژمێرەکەی لە حاڵەتی {locked}. هەر کەسێک دەتوانێت شوێنت بکەوێت بۆ پیشاندانی بابەتەکانی تەنها دوایخۆی.",
   "compose_form.lock_disclaimer.lock": "قفڵ دراوە",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "تۆ هێشتا هیچ بەکارهێنەرێکت بلۆک نەکردووە.",
   "empty_column.bookmarked_statuses": "تۆ هێشتا هیچ توتێکی دیاریکراوت نیە کاتێک نیشانەیەک نیشان دەکەیت، لێرە دەرئەکەویت.",
   "empty_column.community": "هێڵی کاتی ناوخۆیی بەتاڵە. شتێک بە ئاشکرا بنووسە بۆ ئەوەی تۆپەکە بسووڕێت!",
-  "empty_column.direct": "تۆ هیچ نامەی ڕاستەوخۆت نیە تا ئێستا. کاتێک دانەیەک دەنێریت یان وەرت دەگرێت، لێرە پیشان دەدات.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "هێشتا هیچ دۆمەینێکی بلۆک کراو نییە.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "تۆ هێشتا هیچ توتێکی دڵخوازت نییە، کاتێک حەزت لە دانەیەکی باشە، لێرە دەرئەکەویت.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "بۆ بەهێزکردن",
   "keyboard_shortcuts.column": "بۆ ئەوەی تیشک بخاتە سەر توتێک لە یەکێک لە ستوونەکان",
   "keyboard_shortcuts.compose": "بۆ سەرنجدان بە نووسینی ناوچەی دەق",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "وه‌سف",
-  "keyboard_shortcuts.direct": "بۆ کردنەوەی ستوونی نامە ڕاستەوخۆکان",
   "keyboard_shortcuts.down": "بۆ چوونە خوارەوە لە لیستەکەدا",
   "keyboard_shortcuts.enter": "بۆ کردنەوەی توت",
   "keyboard_shortcuts.favourite": "بۆ دڵخواز",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "نیشانکراوەکان",
   "navigation_bar.community_timeline": "دەمنامەی ناوخۆیی",
   "navigation_bar.compose": "نووسینی توتی نوێ",
-  "navigation_bar.direct": "نامە ڕاستەوخۆکان",
   "navigation_bar.discover": "دۆزینەوە",
   "navigation_bar.domain_blocks": "دۆمەینە بلۆک کراوەکان",
   "navigation_bar.edit_profile": "دەستکاری پرۆفایل بکە",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "ده‌نگدان بسڕه‌وه‌‌",
   "privacy.change": "ڕێکخستنی تایبەتمەندی توت",
   "privacy.direct.long": "تەنیا بۆ بەکارهێنەرانی ناوبراو",
-  "privacy.direct.short": "ڕاستەوخۆ",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "بینراو تەنها بۆ شوێنکەوتوان",
-  "privacy.private.short": "تەنها بۆ شوێنکەوتوان",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "بۆ هەمووان دیاربێت، لە هێڵی کاتی گشتی دا نیشان دەدرێت",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "گشتی",
-  "privacy.unlisted.long": "بۆ هەمووان دیارە، بەڵام لە هێڵی کاتی گشتیدا نا",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "لە لیست نەکراو",
   "refresh": "نوێکردنەوە",
   "regeneration_indicator.label": "بارکردن…",

app/javascript/mastodon/locales/co.json

@@ -70,7 +70,7 @@
   "column.blocks": "Utilizatori bluccati",
   "column.bookmarks": "Segnalibri",
   "column.community": "Linea pubblica lucale",
-  "column.direct": "Missaghji diretti",
+  "column.conversations": "Conversations",
   "column.directory": "Percorre i prufili",
   "column.domain_blocks": "Duminii piattati",
   "column.favourites": "Favuriti",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Solu lucale",
   "community.column_settings.media_only": "Solu media",
   "community.column_settings.remote_only": "Solu distante",
-  "compose_form.direct_message_warning": "Solu l'utilizatori mintuvati puderenu vede stu statutu.",
   "compose_form.direct_message_warning_learn_more": "Amparà di più",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Stu statutu ùn hè \"Micca listatu\" è ùn sarà micca listatu indè e circate da hashtag. Per esse vistu in quesse, u statutu deve esse \"Pubblicu\".",
   "compose_form.lock_disclaimer": "U vostru contu ùn hè micca {locked}. Tuttu u mondu pò seguitavi è vede i vostri statuti privati.",
   "compose_form.lock_disclaimer.lock": "privatu",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Per avà ùn avete bluccatu manc'un utilizatore.",
   "empty_column.bookmarked_statuses": "Ùn avete manc'un segnalibru. Quandu aghjunghjerate unu, sarà mustratu quì.",
   "empty_column.community": "Ùn c'hè nunda indè a linea lucale. Scrivete puru qualcosa!",
-  "empty_column.direct": "Ùn avete ancu nisun missaghju direttu. S'è voi mandate o ricevete unu, u vidarete quì.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "Ùn c'hè manc'un duminiu bluccatu avà.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Ùn avete manc'unu statutu favuritu. Quandu aghjunghjerate unu à i vostri favuriti, sarà mustratu quì.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "sparte",
   "keyboard_shortcuts.column": "fucalizà un statutu indè una colonna",
   "keyboard_shortcuts.compose": "fucalizà nant'à l'area di ridazzione",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Descrizzione",
-  "keyboard_shortcuts.direct": "per apre una culonna di missaghji diretti",
   "keyboard_shortcuts.down": "falà indè a lista",
   "keyboard_shortcuts.enter": "apre u statutu",
   "keyboard_shortcuts.favourite": "aghjunghje à i favuriti",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Segnalibri",
   "navigation_bar.community_timeline": "Linea pubblica lucale",
   "navigation_bar.compose": "Scrive un novu statutu",
-  "navigation_bar.direct": "Missaghji diretti",
   "navigation_bar.discover": "Scopre",
   "navigation_bar.domain_blocks": "Duminii piattati",
   "navigation_bar.edit_profile": "Mudificà u prufile",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Toglie u scandagliu",
   "privacy.change": "Mudificà a cunfidenzialità di u statutu",
   "privacy.direct.long": "Mandà solu à quelli chì so mintuvati",
-  "privacy.direct.short": "Direttu",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Mustrà solu à l'abbunati",
-  "privacy.private.short": "Privatu",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Mustrà à tuttu u mondu nant'à e linee pubbliche",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Pubblicu",
-  "privacy.unlisted.long": "Ùn mette micca nant'à e linee pubbliche",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Micca listatu",
   "refresh": "Attualizà",
   "regeneration_indicator.label": "Caricamentu…",

app/javascript/mastodon/locales/cs.json

@@ -70,7 +70,7 @@
   "column.blocks": "Blokovaní uživatelé",
   "column.bookmarks": "Záložky",
   "column.community": "Místní časová osa",
-  "column.direct": "Přímé zprávy",
+  "column.conversations": "Konverzace",
   "column.directory": "Prozkoumat profily",
   "column.domain_blocks": "Blokované domény",
   "column.favourites": "Oblíbené",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Pouze místní",
   "community.column_settings.media_only": "Pouze média",
   "community.column_settings.remote_only": "Pouze vzdálené",
-  "compose_form.direct_message_warning": "Tento příspěvek bude odeslán pouze zmíněným uživatelům.",
   "compose_form.direct_message_warning_learn_more": "Zjistit více",
+  "compose_form.encryption_warning": "Příspěvky v Mastodonu nejsou šifrovány end-to-end. Nesdílejte žádné nebezpečné informace přes Mastodon.",
   "compose_form.hashtag_warning": "Tento příspěvek nebude zobrazen pod žádným hashtagem, neboť je neuvedený. Pouze veřejné příspěvky mohou být vyhledány podle hashtagu.",
   "compose_form.lock_disclaimer": "Váš účet není {locked}. Kdokoliv vás může sledovat a vidět vaše příspěvky učené pouze pro sledující.",
   "compose_form.lock_disclaimer.lock": "uzamčen",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Ještě jste nezablokovali žádného uživatele.",
   "empty_column.bookmarked_statuses": "Ještě nemáte v záložkách žádné příspěvky. Pokud si do nich nějaký přidáte, zobrazí se zde.",
   "empty_column.community": "Místní časová osa je prázdná. Napište něco veřejně a rozhýbejte to tu!",
-  "empty_column.direct": "Ještě nemáte žádné přímé zprávy. Pokud nějakou pošlete nebo dostanete, zobrazí se zde.",
+  "empty_column.conversations": "Jakmile pošlete nebo obdržíte příspěvek, který je viditelný pouze pro lidi v něm uvedené, zobrazí se zde.",
   "empty_column.domain_blocks": "Ještě nemáte žádné blokované domény.",
   "empty_column.explore_statuses": "Momentálně není nic populární. Vraťte se později!",
   "empty_column.favourited_statuses": "Ještě nemáte žádné oblíbené příspěvky. Pokud si nějaký oblíbíte, zobrazí se zde.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Boostnout příspěvek",
   "keyboard_shortcuts.column": "Focus na sloupec",
   "keyboard_shortcuts.compose": "Focus na textové pole nového příspěvku",
+  "keyboard_shortcuts.conversations": "pro otevření sloupce konverzací",
   "keyboard_shortcuts.description": "Popis",
-  "keyboard_shortcuts.direct": "Otevřít sloupec přímých zpráv",
   "keyboard_shortcuts.down": "Posunout dolů v seznamu",
   "keyboard_shortcuts.enter": "Otevřít příspěvek",
   "keyboard_shortcuts.favourite": "Oblíbit příspěvek",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Záložky",
   "navigation_bar.community_timeline": "Místní časová osa",
   "navigation_bar.compose": "Vytvořit nový příspěvek",
-  "navigation_bar.direct": "Přímé zprávy",
   "navigation_bar.discover": "Objevujte",
   "navigation_bar.domain_blocks": "Blokované domény",
   "navigation_bar.edit_profile": "Upravit profil",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Odstranit anketu",
   "privacy.change": "Změnit soukromí příspěvku",
   "privacy.direct.long": "Viditelné pouze pro zmíněné uživatele",
-  "privacy.direct.short": "Přímý",
+  "privacy.direct.short": "Pouze lidé, které zmiňuji",
   "privacy.private.long": "Viditelné pouze pro sledující",
-  "privacy.private.short": "Pouze pro sledující",
+  "privacy.private.short": "Pouze sledující",
-  "privacy.public.long": "Viditelné pro všechny, i ve veřejných časových osách",
+  "privacy.public.long": "Viditelné pro všechny",
   "privacy.public.short": "Veřejný",
-  "privacy.unlisted.long": "Viditelné pro všechny, ale ne ve veřejných časových osách",
+  "privacy.unlisted.long": "Viditelné pro všechny, ale bez objevovacích funkcí",
   "privacy.unlisted.short": "Neuvedený",
   "refresh": "Obnovit",
   "regeneration_indicator.label": "Načítání…",

app/javascript/mastodon/locales/cy.json

@@ -9,10 +9,10 @@
   "account.browse_more_on_origin_server": "Pori mwy ar y proffil gwreiddiol",
   "account.cancel_follow_request": "Canslo cais dilyn",
   "account.direct": "Neges breifat @{name}",
-  "account.disable_notifications": "Stop notifying me when @{name} posts",
+  "account.disable_notifications": "Stopiwch fy hysbysu pan fydd @{name} yn postio",
   "account.domain_blocked": "Parth wedi ei guddio",
   "account.edit_profile": "Golygu proffil",
-  "account.enable_notifications": "Notify me when @{name} posts",
+  "account.enable_notifications": "Rhowch wybod i fi pan fydd @{name} yn postio",
   "account.endorse": "Arddangos ar fy mhroffil",
   "account.follow": "Dilyn",
   "account.followers": "Dilynwyr",
@@ -23,7 +23,7 @@
   "account.follows.empty": "Nid yw'r defnyddiwr hwn yn dilyn unrhyw un eto.",
   "account.follows_you": "Yn eich dilyn chi",
   "account.hide_reblogs": "Cuddio bwstiau o @{name}",
-  "account.joined": "Joined {date}",
+  "account.joined": "Ymunodd {date}",
   "account.link_verified_on": "Gwiriwyd perchnogaeth y ddolen yma ar {date}",
   "account.locked_info": "Mae'r statws preifatrwydd cyfrif hwn wedi'i osod i gloi. Mae'r perchennog yn adolygu'r sawl sy'n gallu eu dilyn.",
   "account.media": "Cyfryngau",
@@ -70,7 +70,7 @@
   "column.blocks": "Defnyddwyr a flociwyd",
   "column.bookmarks": "Tudalnodau",
   "column.community": "Ffrwd lleol",
-  "column.direct": "Negeseuon preifat",
+  "column.conversations": "Conversations",
   "column.directory": "Pori proffiliau",
   "column.domain_blocks": "Parthau cuddiedig",
   "column.favourites": "Ffefrynnau",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Lleol yn unig",
   "community.column_settings.media_only": "Cyfryngau yn unig",
   "community.column_settings.remote_only": "Anghysbell yn unig",
-  "compose_form.direct_message_warning": "Mi fydd y tŵt hwn ond yn cael ei anfon at y defnyddwyr sy'n cael eu crybwyll.",
   "compose_form.direct_message_warning_learn_more": "Dysgu mwy",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Ni fydd y tŵt hwn wedi ei restru o dan unrhyw hashnod gan ei fod heb ei restru. Dim ond tŵtiau cyhoeddus gellid chwilota amdanynt drwy hashnod.",
   "compose_form.lock_disclaimer": "Nid yw eich cyfri wedi'i {locked}. Gall unrhyw un eich dilyn i weld eich tŵtiau dilynwyr-yn-unig.",
   "compose_form.lock_disclaimer.lock": "wedi ei gloi",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Nid ydych wedi blocio unrhyw ddefnyddwyr eto.",
   "empty_column.bookmarked_statuses": "Nid oes gennych unrhyw dwtiau tudalnodiedig eto. Pan y byddwch yn tudalnodi un, mi fydd yn ymddangos yma.",
   "empty_column.community": "Mae'r ffrwd lleol yn wag. Ysgrifenwch rhywbeth yn gyhoeddus i gael dechrau arni!",
-  "empty_column.direct": "Nid oes gennych unrhyw negeseuon preifat eto. Pan y byddwch yn anfon neu derbyn un, mi fydd yn ymddangos yma.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "Nid oes yna unrhyw barthau cuddiedig eto.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Nid oes gennych unrhyw hoff dwtiau eto. Pan y byddwch yn hoffi un, mi fydd yn ymddangos yma.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "i fŵstio",
   "keyboard_shortcuts.column": "i ffocysu tŵt yn un o'r colofnau",
   "keyboard_shortcuts.compose": "i ffocysu yr ardal cyfansoddi testun",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Disgrifiad",
-  "keyboard_shortcuts.direct": "i agor colofn negeseuon preifat",
   "keyboard_shortcuts.down": "i symud lawr yn y rhestr",
   "keyboard_shortcuts.enter": "i agor tŵt",
   "keyboard_shortcuts.favourite": "i hoffi",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Tudalnodau",
   "navigation_bar.community_timeline": "Ffrwd leol",
   "navigation_bar.compose": "Cyfansoddi tŵt newydd",
-  "navigation_bar.direct": "Negeseuon preifat",
   "navigation_bar.discover": "Darganfod",
   "navigation_bar.domain_blocks": "Parthau cuddiedig",
   "navigation_bar.edit_profile": "Golygu proffil",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Tynnu pleidlais",
   "privacy.change": "Addasu preifatrwdd y tŵt",
   "privacy.direct.long": "Cyhoeddi i'r defnyddwyr sy'n cael eu crybwyll yn unig",
-  "privacy.direct.short": "Uniongyrchol",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Cyhoeddi i ddilynwyr yn unig",
-  "privacy.private.short": "Dilynwyr-yn-unig",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Cyhoeddi i ffrydiau cyhoeddus",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Cyhoeddus",
-  "privacy.unlisted.long": "Peidio a chyhoeddi i ffrydiau cyhoeddus",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Heb ei restru",
   "refresh": "Adnewyddu",
   "regeneration_indicator.label": "Llwytho…",

app/javascript/mastodon/locales/da.json

@@ -70,7 +70,7 @@
   "column.blocks": "Blokerede brugere",
   "column.bookmarks": "Bogmærker",
   "column.community": "Lokal tidslinje",
-  "column.direct": "Direkte beskeder",
+  "column.conversations": "Konversationer",
   "column.directory": "Tjek profiler",
   "column.domain_blocks": "Blokerede domæner",
   "column.favourites": "Favoritter",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Kun lokalt",
   "community.column_settings.media_only": "Kun medier",
   "community.column_settings.remote_only": "Kun udefra",
-  "compose_form.direct_message_warning": "Indlægget sendes kun til de nævnte brugere.",
   "compose_form.direct_message_warning_learn_more": "Få mere at vide",
+  "compose_form.encryption_warning": "Indlæg på Mastodon er ikke ende-til-ende krypteret. Del derfor ikke sensitiv information over Mastodon.",
   "compose_form.hashtag_warning": "Da indlægget ikke er offentligt, vises det ikke under noget hashtag, idet kun offentlige indlæg kan søges via hashtags.",
   "compose_form.lock_disclaimer": "Din konto er ikke {locked}. Enhver kan følge dig og se indlæg kun beregnet for følgere.",
   "compose_form.lock_disclaimer.lock": "låst",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Ingen brugere blokeret endnu.",
   "empty_column.bookmarked_statuses": "Du har ingen bogmærkede indlæg endnu. Når du bogmærker ét, vil det dukke op hér.",
   "empty_column.community": "Den lokale tidslinje er tom. Skriv noget offentligt for at sætte tingene i gang!",
-  "empty_column.direct": "Du har endnu ingen direkte beskeder. Når du sender eller modtager én, vil den dukke op hér.",
+  "empty_column.conversations": "Når der sendes eller modtages indlæg, som kun er synligt for personer nævnt heri, vil de dukke op her.",
   "empty_column.domain_blocks": "Ingen blokerede domæner endnu.",
   "empty_column.explore_statuses": "Ingen nye tendensen pt. Tjek igen senere!",
   "empty_column.favourited_statuses": "Du har endnu ingen favoritindlæg. Når du favoritmarkerer ét, vil det dukke op hér.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Boost indlæg",
   "keyboard_shortcuts.column": "Fokusér kolonne",
   "keyboard_shortcuts.compose": "Fokusér skriveområdet",
+  "keyboard_shortcuts.conversations": "for at åbne konversationskolonnen",
   "keyboard_shortcuts.description": "Beskrivelse",
-  "keyboard_shortcuts.direct": "Åbn Direkte beskeder-kolonnen",
   "keyboard_shortcuts.down": "Flyt nedad på listen",
   "keyboard_shortcuts.enter": "Åbn indlæg",
   "keyboard_shortcuts.favourite": "Favoritmarkér indlæg",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Bogmærker",
   "navigation_bar.community_timeline": "Lokal tidslinje",
   "navigation_bar.compose": "Skriv nyt indlæg",
-  "navigation_bar.direct": "Direkte beskeder",
   "navigation_bar.discover": "Opdag",
   "navigation_bar.domain_blocks": "Blokerede domæner",
   "navigation_bar.edit_profile": "Redigér profil",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Fjern afstemning",
   "privacy.change": "Justér indlægsfortrolighed",
   "privacy.direct.long": "Kun synlig for nævnte brugere",
-  "privacy.direct.short": "Direkte",
+  "privacy.direct.short": "Kun personer, jeg nævner",
   "privacy.private.long": "Kun synlig for følgere",
-  "privacy.private.short": "Kun for følgere",
+  "privacy.private.short": "Kun følgere",
-  "privacy.public.long": "Synlig for alle, fremgår på offentlige tidslinjer",
+  "privacy.public.long": "Synlig for alle",
   "privacy.public.short": "Offentlig",
-  "privacy.unlisted.long": "Synlig for alle, fremgår ikke på offentlige tidslinjer",
+  "privacy.unlisted.long": "Synlig for alle, men med fravalgt visning i opdagelsesfunktioner",
   "privacy.unlisted.short": "Diskret",
   "refresh": "Genindlæs",
   "regeneration_indicator.label": "Indlæser…",
@@ -515,7 +514,7 @@
   "upload_error.poll": "Filupload ikke tilladt for afstemninger.",
   "upload_form.audio_description": "Beskrivelse til hørehæmmede",
   "upload_form.description": "Beskrivelse til svagtseende",
-  "upload_form.description_missing": "No description added",
+  "upload_form.description_missing": "Ingen beskrivelse tilføjet",
   "upload_form.edit": "Redigér",
   "upload_form.thumbnail": "Skift miniature",
   "upload_form.undo": "Slet",

app/javascript/mastodon/locales/de.json

@@ -70,7 +70,7 @@
   "column.blocks": "Blockierte Profile",
   "column.bookmarks": "Lesezeichen",
   "column.community": "Lokale Zeitleiste",
-  "column.direct": "Direktnachrichten",
+  "column.conversations": "Konversationen",
   "column.directory": "Profile durchsuchen",
   "column.domain_blocks": "Blockierte Domains",
   "column.favourites": "Favoriten",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Nur lokal",
   "community.column_settings.media_only": "Nur Medien",
   "community.column_settings.remote_only": "Nur entfernt",
-  "compose_form.direct_message_warning": "Dieser Beitrag wird nur für die erwähnten Nutzer sichtbar sein.",
   "compose_form.direct_message_warning_learn_more": "Mehr erfahren",
+  "compose_form.encryption_warning": "Beiträge auf Mastodon sind nicht Ende-zu-Ende-verschlüsselt. Teile keine sensiblen Informationen über Mastodon.",
   "compose_form.hashtag_warning": "Dieser Beitrag wird nicht durch Hashtags entdeckbar sein, weil er ungelistet ist. Nur öffentliche Beiträge tauchen in Hashtag-Zeitleisten auf.",
   "compose_form.lock_disclaimer": "Dein Profil ist nicht {locked}. Wer dir folgen will, kann das jederzeit tun und dann auch deine privaten Beiträge sehen.",
   "compose_form.lock_disclaimer.lock": "gesperrt",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Du hast keine Profile blockiert.",
   "empty_column.bookmarked_statuses": "Du hast bis jetzt keine Beiträge als Lesezeichen gespeichert. Wenn du einen Beitrag als Lesezeichen speicherst wird er hier erscheinen.",
   "empty_column.community": "Die lokale Zeitleiste ist leer. Schreibe einen öffentlichen Beitrag, um den Ball ins Rollen zu bringen!",
-  "empty_column.direct": "Du hast noch keine Direktnachrichten erhalten. Wenn du eine sendest oder empfängst, wird sie hier zu sehen sein.",
+  "empty_column.conversations": "Sobald du einen Beitrag sendest oder empfängst, der nur für die in ihm erwähnten Personen sichtbar ist, wird er hier angezeigt.",
   "empty_column.domain_blocks": "Es sind noch keine Domains versteckt.",
   "empty_column.explore_statuses": "Momentan ist nichts im Trend. Schau später wieder!",
   "empty_column.favourited_statuses": "Du hast noch keine favorisierten Tröts. Wenn du einen favorisierst, wird er hier erscheinen.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "teilen",
   "keyboard_shortcuts.column": "einen Beitrag in einer der Spalten fokussieren",
   "keyboard_shortcuts.compose": "fokussiere das Eingabefeld",
+  "keyboard_shortcuts.conversations": "um die Konversationsspalte zu öffnen",
   "keyboard_shortcuts.description": "Beschreibung",
-  "keyboard_shortcuts.direct": "Direct-Message-Spalte öffnen",
   "keyboard_shortcuts.down": "sich in der Liste hinunter bewegen",
   "keyboard_shortcuts.enter": "Beitrag öffnen",
   "keyboard_shortcuts.favourite": "um zu favorisieren",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Lesezeichen",
   "navigation_bar.community_timeline": "Lokale Zeitleiste",
   "navigation_bar.compose": "Neuen Beitrag verfassen",
-  "navigation_bar.direct": "Direktnachrichten",
   "navigation_bar.discover": "Entdecken",
   "navigation_bar.domain_blocks": "Versteckte Domains",
   "navigation_bar.edit_profile": "Profil bearbeiten",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Umfrage entfernen",
   "privacy.change": "Sichtbarkeit des Beitrags anpassen",
   "privacy.direct.long": "Wird an erwähnte Profile gesendet",
-  "privacy.direct.short": "Direktnachricht",
+  "privacy.direct.short": "Nur Leute, die ich erwähne",
   "privacy.private.long": "Nur für Folgende sichtbar",
-  "privacy.private.short": "Nur für Folgende",
+  "privacy.private.short": "Nur Folgende",
-  "privacy.public.long": "Wird in öffentlichen Zeitleisten erscheinen",
+  "privacy.public.long": "Sichtbar für alle",
   "privacy.public.short": "Öffentlich",
-  "privacy.unlisted.long": "Wird in öffentlichen Zeitleisten nicht gezeigt",
+  "privacy.unlisted.long": "Sichtbar für alle, aber nicht für Entdeckungsfunktionen",
   "privacy.unlisted.short": "Nicht gelistet",
   "refresh": "Aktualisieren",
   "regeneration_indicator.label": "Laden…",
@@ -524,7 +523,7 @@
   "upload_modal.apply": "Übernehmen",
   "upload_modal.applying": "Anwenden…",
   "upload_modal.choose_image": "Bild auswählen",
-  "upload_modal.description_placeholder": "Die heiße Zypernsonne quälte Max und Victoria ja böse auf dem Weg bis zur Küste",
+  "upload_modal.description_placeholder": "Victor jagt zwölf Boxkämpfer quer über den großen Sylter Deich",
   "upload_modal.detect_text": "Text aus Bild erkennen",
   "upload_modal.edit_media": "Medien bearbeiten",
   "upload_modal.hint": "Klicke oder ziehe den Kreis auf die Vorschau, um den Brennpunkt auszuwählen, der immer auf allen Vorschaubilder angezeigt wird.",

app/javascript/mastodon/locales/defaultMessages.json

@@ -206,7 +206,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+        "defaultMessage": "{count, plural, one {{counter} Post} other {{counter} Posts}}",
         "id": "account.statuses_counter"
       },
       {
@@ -659,7 +659,7 @@
         "id": "privacy.private.short"
       },
       {
-        "defaultMessage": "Direct",
+        "defaultMessage": "Mentioned people only",
         "id": "privacy.direct.short"
       },
       {
@@ -671,7 +671,7 @@
         "id": "status.filtered"
       },
       {
-        "defaultMessage": "Pinned toot",
+        "defaultMessage": "Pinned post",
         "id": "status.pinned"
       },
       {
@@ -773,11 +773,11 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "Toots",
+        "defaultMessage": "Posts",
         "id": "account.posts"
       },
       {
-        "defaultMessage": "Toots and replies",
+        "defaultMessage": "Posts and replies",
         "id": "account.posts_with_replies"
       },
       {
@@ -820,7 +820,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "Older toots",
+        "defaultMessage": "Older posts",
         "id": "timeline_hint.resources.statuses"
       },
       {
@@ -832,7 +832,7 @@
         "id": "empty_column.account_unavailable"
       },
       {
-        "defaultMessage": "No toots here!",
+        "defaultMessage": "No posts found",
         "id": "empty_column.account_timeline"
       }
     ],
@@ -946,7 +946,7 @@
         "id": "account.disable_notifications"
       },
       {
-        "defaultMessage": "Pinned toots",
+        "defaultMessage": "Pinned posts",
         "id": "navigation_bar.pins"
       },
       {
@@ -1069,7 +1069,7 @@
         "id": "column.bookmarks"
       },
       {
-        "defaultMessage": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
+        "defaultMessage": "You don't have any bookmarked posts yet. When you bookmark one, it will show up here.",
         "id": "empty_column.bookmarked_statuses"
       }
     ],
@@ -1104,7 +1104,7 @@
         "id": "account.edit_profile"
       },
       {
-        "defaultMessage": "Pinned toots",
+        "defaultMessage": "Pinned posts",
         "id": "navigation_bar.pins"
       },
       {
@@ -1306,7 +1306,7 @@
         "id": "privacy.public.short"
       },
       {
-        "defaultMessage": "Visible for all, shown in public timelines",
+        "defaultMessage": "Visible for all",
         "id": "privacy.public.long"
       },
       {
@@ -1314,11 +1314,11 @@
         "id": "privacy.unlisted.short"
       },
       {
-        "defaultMessage": "Visible for all, but not in public timelines",
+        "defaultMessage": "Visible for all, but opted-out of discovery features",
         "id": "privacy.unlisted.long"
       },
       {
-        "defaultMessage": "Followers-only",
+        "defaultMessage": "Followers only",
         "id": "privacy.private.short"
       },
       {
@@ -1326,7 +1326,7 @@
         "id": "privacy.private.long"
       },
       {
-        "defaultMessage": "Direct",
+        "defaultMessage": "Only people I mention",
         "id": "privacy.direct.short"
       },
       {
@@ -1364,11 +1364,11 @@
         "id": "search_results.accounts"
       },
       {
-        "defaultMessage": "Toots",
+        "defaultMessage": "Posts",
         "id": "search_results.statuses"
       },
       {
-        "defaultMessage": "Searching toots by their content is not enabled on this Mastodon server.",
+        "defaultMessage": "Searching posts by their content is not enabled on this Mastodon server.",
         "id": "search_results.statuses_fts_disabled"
       },
       {
@@ -1504,12 +1504,12 @@
         "id": "compose_form.lock_disclaimer.lock"
       },
       {
-        "defaultMessage": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
+        "defaultMessage": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
         "id": "compose_form.hashtag_warning"
       },
       {
-        "defaultMessage": "This toot will only be sent to all the mentioned users.",
+        "defaultMessage": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
-        "id": "compose_form.direct_message_warning"
+        "id": "compose_form.encryption_warning"
       },
       {
         "defaultMessage": "Learn more",
@@ -1549,7 +1549,7 @@
         "id": "navigation_bar.logout"
       },
       {
-        "defaultMessage": "Compose new toot",
+        "defaultMessage": "Compose new post",
         "id": "navigation_bar.compose"
       },
       {
@@ -1616,12 +1616,12 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "Direct messages",
+        "defaultMessage": "Conversations",
-        "id": "column.direct"
+        "id": "column.conversations"
       },
       {
-        "defaultMessage": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
+        "defaultMessage": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
-        "id": "empty_column.direct"
+        "id": "empty_column.conversations"
       }
     ],
     "path": "app/javascript/mastodon/features/direct_timeline/index.json"
@@ -1665,7 +1665,7 @@
         "id": "confirmations.unfollow.message"
       },
       {
-        "defaultMessage": "Toots",
+        "defaultMessage": "Posts",
         "id": "account.posts"
       },
       {
@@ -1769,7 +1769,7 @@
         "id": "search_results.hashtags"
       },
       {
-        "defaultMessage": "Toots",
+        "defaultMessage": "Posts",
         "id": "search_results.statuses"
       }
     ],
@@ -1791,7 +1791,7 @@
         "id": "column.favourites"
       },
       {
-        "defaultMessage": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
+        "defaultMessage": "You don't have any favourite posts yet. When you favourite one, it will show up here.",
         "id": "empty_column.favourited_statuses"
       }
     ],
@@ -1804,7 +1804,7 @@
         "id": "refresh"
       },
       {
-        "defaultMessage": "No one has favourited this toot yet. When someone does, they will show up here.",
+        "defaultMessage": "No one has favourited this post yet. When someone does, they will show up here.",
         "id": "empty_column.favourites"
       }
     ],
@@ -1965,8 +1965,8 @@
         "id": "navigation_bar.explore"
       },
       {
-        "defaultMessage": "Direct messages",
+        "defaultMessage": "Conversations",
-        "id": "navigation_bar.direct"
+        "id": "column.conversations"
       },
       {
         "defaultMessage": "Bookmarks",
@@ -1997,7 +1997,7 @@
         "id": "navigation_bar.mutes"
       },
       {
-        "defaultMessage": "Pinned toots",
+        "defaultMessage": "Pinned posts",
         "id": "navigation_bar.pins"
       },
       {
@@ -2186,7 +2186,7 @@
         "id": "keyboard_shortcuts.compose"
       },
       {
-        "defaultMessage": "to start a brand new toot",
+        "defaultMessage": "to start a brand new post",
         "id": "keyboard_shortcuts.toot"
       },
       {
@@ -2222,8 +2222,8 @@
         "id": "keyboard_shortcuts.federated"
       },
       {
-        "defaultMessage": "to open direct messages column",
+        "defaultMessage": "to open conversations column",
-        "id": "keyboard_shortcuts.direct"
+        "id": "keyboard_shortcuts.conversations"
       },
       {
         "defaultMessage": "to open \"get started\" column",
@@ -2234,7 +2234,7 @@
         "id": "keyboard_shortcuts.favourites"
       },
       {
-        "defaultMessage": "to open pinned toots list",
+        "defaultMessage": "to open pinned posts list",
         "id": "keyboard_shortcuts.pinned"
       },
       {
@@ -2468,7 +2468,7 @@
         "id": "notifications.column_settings.poll"
       },
       {
-        "defaultMessage": "New toots:",
+        "defaultMessage": "New posts:",
         "id": "notifications.column_settings.status"
       },
       {
@@ -2690,7 +2690,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "Pinned toot",
+        "defaultMessage": "Pinned post",
         "id": "column.pins"
       }
     ],
@@ -2729,7 +2729,7 @@
         "id": "refresh"
       },
       {
-        "defaultMessage": "No one has boosted this toot yet. When someone does, they will show up here.",
+        "defaultMessage": "No one has boosted this post yet. When someone does, they will show up here.",
         "id": "status.reblogs.empty"
       }
     ],
@@ -3526,8 +3526,8 @@
         "id": "tabs_bar.federated_timeline"
       },
       {
-        "defaultMessage": "Direct messages",
+        "defaultMessage": "Conversations",
-        "id": "navigation_bar.direct"
+        "id": "column.conversations"
       },
       {
         "defaultMessage": "Favourites",

app/javascript/mastodon/locales/el.json

@@ -70,7 +70,7 @@
   "column.blocks": "Αποκλεισμένοι χρήστες",
   "column.bookmarks": "Σελιδοδείκτες",
   "column.community": "Τοπική ροή",
-  "column.direct": "Προσωπικά μηνύματα",
+  "column.conversations": "Συνομιλίες",
   "column.directory": "Δες προφίλ",
   "column.domain_blocks": "Κρυμμένοι τομείς",
   "column.favourites": "Αγαπημένα",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Τοπικά μόνο",
   "community.column_settings.media_only": "Μόνο πολυμέσα",
   "community.column_settings.remote_only": "Απομακρυσμένα μόνο",
-  "compose_form.direct_message_warning": "Αυτό το τουτ θα σταλεί μόνο στους αναφερόμενους χρήστες.",
   "compose_form.direct_message_warning_learn_more": "Μάθετε περισσότερα",
+  "compose_form.encryption_warning": "Οι δημοσιεύσεις στο Mastodon δεν είναι κρυπτογραφημένες από άκρο σε άκρο. Μην μοιράζεστε επικίνδυνες πληροφορίες μέσω του Mastodon.",
   "compose_form.hashtag_warning": "Αυτό το τουτ δεν θα εμφανίζεται κάτω από κανένα hashtag καθώς είναι αφανές. Μόνο τα δημόσια τουτ μπορούν να αναζητηθούν ανά hashtag.",
   "compose_form.lock_disclaimer": "Ο λογαριασμός σου δεν είναι {locked}. Οποιοσδήποτε μπορεί να σε ακολουθήσει για να δει τις δημοσιεύσεις σας προς τους ακολούθους σας.",
   "compose_form.lock_disclaimer.lock": "κλειδωμένο",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Δεν έχεις αποκλείσει κανέναν χρήστη ακόμα.",
   "empty_column.bookmarked_statuses": "Δεν έχεις κανένα αποθηκευμένο τουτ ακόμα. Μόλις αποθηκεύσεις κάποιο, θα εμφανιστεί εδώ.",
   "empty_column.community": "Η τοπική ροή είναι κενή. Γράψε κάτι δημόσιο παραμύθι ν' αρχινίσει!",
-  "empty_column.direct": "Δεν έχεις προσωπικά μηνύματα ακόμα. Όταν στείλεις ή λάβεις κανένα, θα εμφανιστεί εδώ.",
+  "empty_column.conversations": "Μόλις στείλετε ή λάβετε μια δημοσίευση που είναι ορατή μόνο σε άτομα που αναφέρονται σε αυτή, θα εμφανιστεί εδώ.",
   "empty_column.domain_blocks": "Δεν υπάρχουν αποκλεισμένοι τομείς ακόμα.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Δεν έχεις κανένα αγαπημένο τουτ ακόμα. Μόλις αγαπήσεις κάποιο, θα εμφανιστεί εδώ.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "προώθηση",
   "keyboard_shortcuts.column": "εμφάνιση της κατάστασης σε μια από τις στήλες",
   "keyboard_shortcuts.compose": "εστίαση στην περιοχή συγγραφής",
+  "keyboard_shortcuts.conversations": "για να ανοίξετε στήλη συνομιλιών",
   "keyboard_shortcuts.description": "Περιγραφή",
-  "keyboard_shortcuts.direct": "άνοιγμα στήλης απευθείας μηνυμάτων",
   "keyboard_shortcuts.down": "κίνηση προς τα κάτω στη λίστα",
   "keyboard_shortcuts.enter": "εμφάνιση κατάστασης",
   "keyboard_shortcuts.favourite": "σημείωση ως αγαπημένο",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Σελιδοδείκτες",
   "navigation_bar.community_timeline": "Τοπική ροή",
   "navigation_bar.compose": "Γράψε νέο τουτ",
-  "navigation_bar.direct": "Προσωπικά μηνύματα",
   "navigation_bar.discover": "Ανακάλυψη",
   "navigation_bar.domain_blocks": "Κρυμμένοι τομείς",
   "navigation_bar.edit_profile": "Επεξεργασία προφίλ",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Αφαίρεση δημοσκόπησης",
   "privacy.change": "Προσαρμογή ιδιωτικότητας δημοσίευσης",
   "privacy.direct.long": "Δημοσίευση μόνο σε όσους και όσες αναφέρονται",
-  "privacy.direct.short": "Προσωπικά",
+  "privacy.direct.short": "Μόνο άτομα που αναφέρω",
   "privacy.private.long": "Δημοσίευση μόνο στους ακόλουθους",
   "privacy.private.short": "Μόνο ακόλουθοι",
-  "privacy.public.long": "Δημοσίευσε στις δημόσιες ροές",
+  "privacy.public.long": "Ορατό σε όλους",
   "privacy.public.short": "Δημόσιο",
-  "privacy.unlisted.long": "Μην δημοσιεύσεις στις δημόσιες ροές",
+  "privacy.unlisted.long": "Ορατό για όλους, αλλά opted-out των χαρακτηριστικών της ανακάλυψης",
   "privacy.unlisted.short": "Μη καταχωρημένα",
   "refresh": "Ανανέωση",
   "regeneration_indicator.label": "Φορτώνει…",

app/javascript/mastodon/locales/en.json

@@ -70,7 +70,7 @@
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
   "column.community": "Local timeline",
-  "column.direct": "Direct messages",
+  "column.conversations": "Conversations",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "Blocked domains",
   "column.favourites": "Favourites",
@@ -96,8 +96,8 @@
   "community.column_settings.local_only": "Local only",
   "community.column_settings.media_only": "Media Only",
   "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "This post will only be sent to the mentioned users.",
   "compose_form.direct_message_warning_learn_more": "Learn more",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
@@ -170,7 +170,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.conversations": "Once you send or receive a post that's only visible to people mentioned in it, 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.",
@@ -234,8 +234,8 @@
   "keyboard_shortcuts.boost": "Boost post",
   "keyboard_shortcuts.column": "Focus column",
   "keyboard_shortcuts.compose": "Focus compose textarea",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Description",
-  "keyboard_shortcuts.direct": "Open direct messages column",
   "keyboard_shortcuts.down": "Move down in the list",
   "keyboard_shortcuts.enter": "Open post",
   "keyboard_shortcuts.favourite": "Favourite post",
@@ -294,7 +294,6 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new post",
-  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Blocked domains",
   "navigation_bar.edit_profile": "Edit profile",
@@ -372,12 +371,12 @@
   "poll_button.remove_poll": "Remove poll",
   "privacy.change": "Change post privacy",
   "privacy.direct.long": "Visible for mentioned users only",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "Only people I mention",
   "privacy.private.long": "Visible for followers only",
-  "privacy.private.short": "Followers-only",
+  "privacy.private.short": "Followers only",
-  "privacy.public.long": "Visible for all, shown in public timelines",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but not in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Unlisted",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",

app/javascript/mastodon/locales/eo.json

@@ -70,7 +70,7 @@
   "column.blocks": "Blokitaj uzantoj",
   "column.bookmarks": "Legosignoj",
   "column.community": "Loka templinio",
-  "column.direct": "Rektaj mesaĝoj",
+  "column.conversations": "Conversations",
   "column.directory": "Trarigardi profilojn",
   "column.domain_blocks": "Blokitaj domajnoj",
   "column.favourites": "Stelumoj",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Nur loka",
   "community.column_settings.media_only": "Nur aŭdovidaĵoj",
   "community.column_settings.remote_only": "Nur malproksima",
-  "compose_form.direct_message_warning": "Tiu mesaĝo estos sendita nur al menciitaj uzantoj.",
   "compose_form.direct_message_warning_learn_more": "Lerni pli",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Ĉi tiu mesaĝo ne estos listigita per ajna kradvorto. Nur publikaj mesaĝoj estas serĉeblaj per kradvortoj.",
   "compose_form.lock_disclaimer": "Via konta ne estas {locked}. Iu ajn povas sekvi vin por vidi viajn mesaĝojn, kiuj estas nur por sekvantoj.",
   "compose_form.lock_disclaimer.lock": "ŝlosita",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Vi ankoraŭ ne blokis uzanton.",
   "empty_column.bookmarked_statuses": "Vi ankoraŭ ne aldonis mesaĝon al viaj legosignoj. Kiam vi aldonos iun, tiu aperos ĉi tie.",
   "empty_column.community": "La loka templinio estas malplena. Skribu ion por plenigi ĝin!",
-  "empty_column.direct": "Vi ankoraŭ ne havas rektan mesaĝon. Kiam vi sendos aŭ ricevos iun, ĝi aperos ĉi tie.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "Ankoraŭ neniu domajno estas blokita.",
   "empty_column.explore_statuses": "Nenio tendencas nun. Rekontrolu poste!",
   "empty_column.favourited_statuses": "Vi ankoraŭ ne stelumis mesaĝon. Kiam vi stelumos iun, tiu aperos ĉi tie.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "diskonigi",
   "keyboard_shortcuts.column": "fokusi mesaĝon en unu el la kolumnoj",
   "keyboard_shortcuts.compose": "enfokusigi la tekstujon",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Priskribo",
-  "keyboard_shortcuts.direct": "malfermi la kolumnon de rektaj mesaĝoj",
   "keyboard_shortcuts.down": "iri suben en la listo",
   "keyboard_shortcuts.enter": "malfermi mesaĝon",
   "keyboard_shortcuts.favourite": "stelumi",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Legosignoj",
   "navigation_bar.community_timeline": "Loka templinio",
   "navigation_bar.compose": "Skribi novan mesaĝon",
-  "navigation_bar.direct": "Rektaj mesaĝoj",
   "navigation_bar.discover": "Esplori",
   "navigation_bar.domain_blocks": "Blokitaj domajnoj",
   "navigation_bar.edit_profile": "Redakti profilon",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Forigi balotenketon",
   "privacy.change": "Agordi mesaĝan privatecon",
   "privacy.direct.long": "Videbla nur al menciitaj uzantoj",
-  "privacy.direct.short": "Rekta",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Videbla nur al viaj sekvantoj",
-  "privacy.private.short": "Nur al sekvantoj",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Videbla al ĉiuj, afiŝita en publikaj templinioj",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Publika",
-  "privacy.unlisted.long": "Videbla al ĉiuj, sed ne en publikaj templinioj",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Nelistigita",
   "refresh": "Refreŝigu",
   "regeneration_indicator.label": "Ŝargado…",

app/javascript/mastodon/locales/es-AR.json

@@ -70,7 +70,7 @@
   "column.blocks": "Usuarios bloqueados",
   "column.bookmarks": "Marcadores",
   "column.community": "Línea temporal local",
-  "column.direct": "Mensajes directos",
+  "column.conversations": "Conversaciones",
   "column.directory": "Explorar perfiles",
   "column.domain_blocks": "Dominios bloqueados",
   "column.favourites": "Favoritos",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Sólo local",
   "community.column_settings.media_only": "Sólo medios",
   "community.column_settings.remote_only": "Sólo remoto",
-  "compose_form.direct_message_warning": "Este mensaje sólo será enviado a los usuarios mencionados.",
   "compose_form.direct_message_warning_learn_more": "Aprendé más",
+  "compose_form.encryption_warning": "Los mensajes en Mastodon no están cifrados de extremo a extremo. No comparta ninguna información sensible al usar Mastodon.",
   "compose_form.hashtag_warning": "Este mensaje no se mostrará bajo ninguna etiqueta porque no es público. Sólo los mensajes públicos se pueden buscar por etiquetas.",
   "compose_form.lock_disclaimer": "Tu cuenta no es {locked}. Todos pueden seguirte para ver tus mensajes marcados como \"Sólo para seguidores\".",
   "compose_form.lock_disclaimer.lock": "privada",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Todavía no bloqueaste a ningún usuario.",
   "empty_column.bookmarked_statuses": "Todavía no tenés mensajes guardados en \"Marcadores\". Cuando guardés uno en \"Marcadores\", se mostrará acá.",
   "empty_column.community": "La línea temporal local está vacía. ¡Escribí algo en modo público para que se empiece a correr la bola!",
-  "empty_column.direct": "Todavía no tenés ningún mensaje directo. Cuando enviés o recibás uno, se mostrará acá.",
+  "empty_column.conversations": "Una vez que enviés o recibás un mensaje que sólo sea visible para la gente mencionada en él, aparecerá aquí.",
   "empty_column.domain_blocks": "Todavía no hay dominios bloqueados.",
   "empty_column.explore_statuses": "No hay nada en tendencia ahora mismo. ¡Volvé a revisar más tarde!",
   "empty_column.favourited_statuses": "Todavía no tenés mensajes favoritos. Cuando marqués uno como favorito, se mostrará acá.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Adherir al mensaje",
   "keyboard_shortcuts.column": "Enfocar columna",
   "keyboard_shortcuts.compose": "Enfocar el área de texto de redacción",
+  "keyboard_shortcuts.conversations": "para abrir la columna de conversaciones",
   "keyboard_shortcuts.description": "Descripción",
-  "keyboard_shortcuts.direct": "Abrir columna de mensajes directos",
   "keyboard_shortcuts.down": "Bajar en la lista",
   "keyboard_shortcuts.enter": "Abrir mensaje",
   "keyboard_shortcuts.favourite": "Marcar mensaje como favorito",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Marcadores",
   "navigation_bar.community_timeline": "Línea temporal local",
   "navigation_bar.compose": "Redactar un nuevo mensaje",
-  "navigation_bar.direct": "Mensajes directos",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios bloqueados",
   "navigation_bar.edit_profile": "Editar perfil",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Quitar encuesta",
   "privacy.change": "Configurar privacidad del mensaje",
   "privacy.direct.long": "Visible sólo para los usuarios mencionados",
-  "privacy.direct.short": "Directo",
+  "privacy.direct.short": "Sólo a las cuentas que menciono",
   "privacy.private.long": "Visible sólo para los seguidores",
   "privacy.private.short": "Sólo para seguidores",
-  "privacy.public.long": "Visible para todos, mostrado en las líneas temporales públicas",
+  "privacy.public.long": "Visible para todos",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visible para todos, pero no en las líneas temporales públicas",
+  "privacy.unlisted.long": "Visible para todos, pero excluido de las características de descubrimiento",
   "privacy.unlisted.short": "No listado",
   "refresh": "Refrescar",
   "regeneration_indicator.label": "Cargando…",

app/javascript/mastodon/locales/es-MX.json

@@ -70,7 +70,7 @@
   "column.blocks": "Usuarios bloqueados",
   "column.bookmarks": "Marcadores",
   "column.community": "Línea de tiempo local",
-  "column.direct": "Mensajes directos",
+  "column.conversations": "Conversations",
   "column.directory": "Buscar perfiles",
   "column.domain_blocks": "Dominios ocultados",
   "column.favourites": "Favoritos",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Solo local",
   "community.column_settings.media_only": "Solo media",
   "community.column_settings.remote_only": "Solo remoto",
-  "compose_form.direct_message_warning": "Este toot solo será enviado a los usuarios mencionados.",
   "compose_form.direct_message_warning_learn_more": "Aprender mas",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Este toot no se mostrará bajo hashtags porque no es público. Sólo los toots públicos se pueden buscar por hashtag.",
   "compose_form.lock_disclaimer": "Tu cuenta no está bloqueada. Todos pueden seguirte para ver tus toots solo para seguidores.",
   "compose_form.lock_disclaimer.lock": "bloqueado",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Aún no has bloqueado a ningún usuario.",
   "empty_column.bookmarked_statuses": "Aún no tienes ningún toot guardado como marcador. Cuando guardes uno, se mostrará aquí.",
   "empty_column.community": "La línea de tiempo local está vacía. ¡Escribe algo para empezar la fiesta!",
-  "empty_column.direct": "Aún no tienes ningún mensaje directo. Cuando envíes o recibas uno, se mostrará aquí.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "Todavía no hay dominios ocultos.",
   "empty_column.explore_statuses": "Nada es tendencia en este momento. ¡Revisa más tarde!",
   "empty_column.favourited_statuses": "Aún no tienes toots preferidos. Cuando marques uno como favorito, aparecerá aquí.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "retootear",
   "keyboard_shortcuts.column": "enfocar un estado en una de las columnas",
   "keyboard_shortcuts.compose": "enfocar el área de texto de redacción",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Descripción",
-  "keyboard_shortcuts.direct": "abrir la columna de mensajes directos",
   "keyboard_shortcuts.down": "mover hacia abajo en la lista",
   "keyboard_shortcuts.enter": "abrir estado",
   "keyboard_shortcuts.favourite": "añadir a favoritos",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Marcadores",
   "navigation_bar.community_timeline": "Historia local",
   "navigation_bar.compose": "Escribir un nuevo toot",
-  "navigation_bar.direct": "Mensajes directos",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios ocultos",
   "navigation_bar.edit_profile": "Editar perfil",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Eliminar encuesta",
   "privacy.change": "Ajustar privacidad",
   "privacy.direct.long": "Sólo mostrar a los usuarios mencionados",
-  "privacy.direct.short": "Directo",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Sólo mostrar a seguidores",
-  "privacy.private.short": "Privado",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Mostrar en la historia federada",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "No mostrar en la historia federada",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "No listado",
   "refresh": "Actualizar",
   "regeneration_indicator.label": "Cargando…",
@@ -515,7 +514,7 @@
   "upload_error.poll": "Subida de archivos no permitida con encuestas.",
   "upload_form.audio_description": "Describir para personas con problemas auditivos",
   "upload_form.description": "Describir para los usuarios con dificultad visual",
-  "upload_form.description_missing": "No description added",
+  "upload_form.description_missing": "Ninguna descripción añadida",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Cambiar miniatura",
   "upload_form.undo": "Borrar",

app/javascript/mastodon/locales/es.json

@@ -70,7 +70,7 @@
   "column.blocks": "Usuarios bloqueados",
   "column.bookmarks": "Marcadores",
   "column.community": "Línea de tiempo local",
-  "column.direct": "Mensajes directos",
+  "column.conversations": "Conversaciones",
   "column.directory": "Buscar perfiles",
   "column.domain_blocks": "Dominios ocultados",
   "column.favourites": "Favoritos",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Solo local",
   "community.column_settings.media_only": "Solo media",
   "community.column_settings.remote_only": "Solo remoto",
-  "compose_form.direct_message_warning": "Esta nueva publicación solo será enviada a los usuarios mencionados.",
   "compose_form.direct_message_warning_learn_more": "Aprender más",
+  "compose_form.encryption_warning": "Los mensajes en Mastodon no están cifrados de extremo a extremo. No comparta ninguna información confidencial en Mastodon.",
   "compose_form.hashtag_warning": "Esta publicación no se mostrará bajo ningún hashtag porque no está listada. Sólo las publicaciones públicas se pueden buscar por hashtag.",
   "compose_form.lock_disclaimer": "Tu cuenta no está {locked}. Todos pueden seguirte para ver tus publicaciones solo para seguidores.",
   "compose_form.lock_disclaimer.lock": "bloqueado",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Aún no has bloqueado a ningún usuario.",
   "empty_column.bookmarked_statuses": "Aún no tienes ninguna publicación guardada como marcador. Cuando guardes una, se mostrará aquí.",
   "empty_column.community": "La línea de tiempo local está vacía. ¡Escribe algo para empezar la fiesta!",
-  "empty_column.direct": "Aún no tienes ningún mensaje directo. Cuando envíes o recibas uno, se mostrará aquí.",
+  "empty_column.conversations": "Una vez que envíe o reciba un mensaje que solo sea visible para la gente mencionada en él, aparecerá aquí.",
   "empty_column.domain_blocks": "Todavía no hay dominios ocultos.",
   "empty_column.explore_statuses": "Nada está en tendencia en este momento. ¡Revisa más tarde!",
   "empty_column.favourited_statuses": "Aún no tienes publicaciones favoritas. Cuando marques una como favorita, aparecerá aquí.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Retootear",
   "keyboard_shortcuts.column": "enfocar un estado en una de las columnas",
   "keyboard_shortcuts.compose": "enfocar el área de texto de redacción",
+  "keyboard_shortcuts.conversations": "para abrir la columna de conversaciones",
   "keyboard_shortcuts.description": "Descripción",
-  "keyboard_shortcuts.direct": "abrir la columna de mensajes directos",
   "keyboard_shortcuts.down": "mover hacia abajo en la lista",
   "keyboard_shortcuts.enter": "abrir estado",
   "keyboard_shortcuts.favourite": "añadir a favoritos",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Marcadores",
   "navigation_bar.community_timeline": "Línea de tiempo local",
   "navigation_bar.compose": "Escribir nueva publicación",
-  "navigation_bar.direct": "Mensajes directos",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios ocultos",
   "navigation_bar.edit_profile": "Editar perfil",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Eliminar encuesta",
   "privacy.change": "Ajustar privacidad",
   "privacy.direct.long": "Sólo mostrar a los usuarios mencionados",
-  "privacy.direct.short": "Directo",
+  "privacy.direct.short": "Solo la gente que yo menciono",
   "privacy.private.long": "Sólo mostrar a seguidores",
-  "privacy.private.short": "Privado",
+  "privacy.private.short": "Solo seguidores",
-  "privacy.public.long": "Mostrar en la historia federada",
+  "privacy.public.long": "Visible por todos",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "No mostrar en la historia federada",
+  "privacy.unlisted.long": "Visible para todos, pero excluido de las características de descubrimiento",
   "privacy.unlisted.short": "No listado",
   "refresh": "Actualizar",
   "regeneration_indicator.label": "Cargando…",

app/javascript/mastodon/locales/et.json

@@ -70,7 +70,7 @@
   "column.blocks": "Blokeeritud kasutajad",
   "column.bookmarks": "Järjehoidjad",
   "column.community": "Kohalik ajajoon",
-  "column.direct": "Otsesõnumid",
+  "column.conversations": "Conversations",
   "column.directory": "Sirvi profiile",
   "column.domain_blocks": "Peidetud domeenid",
   "column.favourites": "Lemmikud",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Ainult kohalik",
   "community.column_settings.media_only": "Ainult meedia",
   "community.column_settings.remote_only": "Ainult kaug",
-  "compose_form.direct_message_warning": "See tuut saadetakse ainult mainitud kasutajatele.",
   "compose_form.direct_message_warning_learn_more": "Vaata veel",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Seda tuuti ei kuvata ühegi sildi all, sest see on kirjendamata. Ainult avalikud tuutid on sildi järgi otsitavad.",
   "compose_form.lock_disclaimer": "Teie konto ei ole {locked}. Igaüks saab Teid jälgida ja näha Teie ainult-jälgijatele postitusi.",
   "compose_form.lock_disclaimer.lock": "lukus",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Sa ei ole veel ühtegi kasutajat blokeerinud.",
   "empty_column.bookmarked_statuses": "Teil pole veel järjehoidjatesse lisatud tuututusi. Kui lisate mõne, näete neid siin.",
   "empty_column.community": "Kohalik ajajoon on tühi. Kirjutage midagi avalikult, et pall veerema ajada!",
-  "empty_column.direct": "Teil ei ole veel otsesõnumeid. Kui saadate või võtate mõne vastu, ilmuvad nad siia.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "Siin ei ole veel peidetud domeene.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Teil pole veel lemmikuid tuute. Kui märgite mõne, näete neid siin.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "upitamiseks",
   "keyboard_shortcuts.column": "fokuseerimaks staatust ühele tulpadest",
   "keyboard_shortcuts.compose": "fokuseerimaks tekstikoostamise alale",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Kirjeldus",
-  "keyboard_shortcuts.direct": "avamaks otsesõnumite tulpa",
   "keyboard_shortcuts.down": "liikumaks nimstus alla",
   "keyboard_shortcuts.enter": "staatuse avamiseks",
   "keyboard_shortcuts.favourite": "lemmikuks märkimiseks",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Järjehoidjad",
   "navigation_bar.community_timeline": "Kohalik ajajoon",
   "navigation_bar.compose": "Koosta uus tuut",
-  "navigation_bar.direct": "Otsesõnumid",
   "navigation_bar.discover": "Avasta",
   "navigation_bar.domain_blocks": "Peidetud domeenid",
   "navigation_bar.edit_profile": "Muuda profiili",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Eemalda küsitlus",
   "privacy.change": "Muuda staatuse privaatsust",
   "privacy.direct.long": "Postita ainult mainitud kasutajatele",
-  "privacy.direct.short": "Otsene",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Postita ainult jälgijatele",
-  "privacy.private.short": "Ainult jälgijatele",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Postita avalikele ajajoontele",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Avalik",
-  "privacy.unlisted.long": "Ära postita avalikele ajajoontele",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Määramata",
   "refresh": "Värskenda",
   "regeneration_indicator.label": "Laeb…",

app/javascript/mastodon/locales/eu.json

@@ -70,7 +70,7 @@
   "column.blocks": "Blokeatutako erabiltzaileak",
   "column.bookmarks": "Laster-markak",
   "column.community": "Denbora-lerro lokala",
-  "column.direct": "Mezu zuzenak",
+  "column.conversations": "Conversations",
   "column.directory": "Arakatu profilak",
   "column.domain_blocks": "Ezkutatutako domeinuak",
   "column.favourites": "Gogokoak",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Lokala soilik",
   "community.column_settings.media_only": "Multimedia besterik ez",
   "community.column_settings.remote_only": "Urrunekoa soilik",
-  "compose_form.direct_message_warning": "Bidalketa hau aipatutako erabiltzaileei besterik ez zaie bidaliko.",
   "compose_form.direct_message_warning_learn_more": "Ikasi gehiago",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Bidalketa hau ez da traoletan agertuko zerrendatu gabekoa baita. Traoletan bidalketa publikoak besterik ez dira agertzen.",
   "compose_form.lock_disclaimer": "Zure kontua ez dago {locked}. Edonork jarraitu zaitzake zure jarraitzaileentzako soilik diren bidalketak ikusteko.",
   "compose_form.lock_disclaimer.lock": "giltzapetuta",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Ez duzu erabiltzailerik blokeatu oraindik.",
   "empty_column.bookmarked_statuses": "Oraindik ez dituzu bidalketa laster-markatutarik. Bat laster-markatzerakoan, hemen agertuko da.",
   "empty_column.community": "Denbora-lerro lokala hutsik dago. Idatzi zerbait publikoki pilota biraka jartzeko!",
-  "empty_column.direct": "Ez duzu mezu zuzenik oraindik. Baten bat bidali edo jasotzen duzunean, hemen agertuko da.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "Ez dago ezkutatutako domeinurik oraindik.",
   "empty_column.explore_statuses": "Ez dago joerarik une honetan. Begiratu beranduago!",
   "empty_column.favourited_statuses": "Ez duzu gogokorik oraindik. Gogokoren bat duzunean hemen agertuko da.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Bultzatu bidalketa",
   "keyboard_shortcuts.column": "mezu bat zutabe batean fokatzea",
   "keyboard_shortcuts.compose": "testua konposatzeko arean fokatzea",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Deskripzioa",
-  "keyboard_shortcuts.direct": "mezu zuzenen zutabea irekitzeko",
   "keyboard_shortcuts.down": "zerrendan behera mugitzea",
   "keyboard_shortcuts.enter": "Ireki bidalketa",
   "keyboard_shortcuts.favourite": "Egin gogoko bidalketa",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Laster-markak",
   "navigation_bar.community_timeline": "Denbora-lerro lokala",
   "navigation_bar.compose": "Idatzi bidalketa berria",
-  "navigation_bar.direct": "Mezu zuzenak",
   "navigation_bar.discover": "Aurkitu",
   "navigation_bar.domain_blocks": "Ezkutatutako domeinuak",
   "navigation_bar.edit_profile": "Aldatu profila",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Kendu inkesta",
   "privacy.change": "Aldatu bidalketaren pribatutasuna",
   "privacy.direct.long": "Bidali aipatutako erabiltzaileei besterik ez",
-  "privacy.direct.short": "Zuzena",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Bidali jarraitzaileei besterik ez",
-  "privacy.private.short": "Jarraitzaileak soilik",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Bistaratu denbora-lerro publikoetan",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Publikoa",
-  "privacy.unlisted.long": "Do not show in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Zerrendatu gabea",
   "refresh": "Berritu",
   "regeneration_indicator.label": "Kargatzen…",

app/javascript/mastodon/locales/fa.json

@@ -70,7 +70,7 @@
   "column.blocks": "کاربران مسدود شده",
   "column.bookmarks": "نشانک‌ها",
   "column.community": "خط زمانی محلّی",
-  "column.direct": "پیام‌های مستقیم",
+  "column.conversations": "Conversations",
   "column.directory": "مرور نمایه‌ها",
   "column.domain_blocks": "دامنه‌های مسدود شده",
   "column.favourites": "پسندیده‌ها",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "فقط محلّی",
   "community.column_settings.media_only": "فقط رسانه",
   "community.column_settings.remote_only": "تنها دوردست",
-  "compose_form.direct_message_warning": "این فرسته تنها به کاربرانی که از آن‌ها نام برده شده فرستاده خواهد شد.",
   "compose_form.direct_message_warning_learn_more": "بیشتر بدانید",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "از آن‌جا که این فرسته فهرست نشده است، در نتایج جست‌وجوی هشتگ‌ها پیدا نخواهد شد. تنها فرسته‌های عمومی را می‌توان با جست‌وجوی هشتگ یافت.",
   "compose_form.lock_disclaimer": "حسابتان {locked} نیست. هر کسی می‌تواند پی‌گیرتان شده و فرسته‌های ویژهٔ پی‌گیرانتان را ببیند.",
   "compose_form.lock_disclaimer.lock": "قفل‌شده",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "هنوز کسی را مسدود نکرده‌اید.",
   "empty_column.bookmarked_statuses": "هنوز هیچ فرستهٔ نشانه‌گذاری شده‌ای ندارید. هنگامی که فرسته‌ای را نشانه‌گذاری کنید، این‌جا نشان داده خواهد شد.",
   "empty_column.community": "خط زمانی محلّی خالی است. چیزی بنویسید تا چرخش بچرخد!",
-  "empty_column.direct": "هنوز هیچ پیام مستقیمی ندارید. هنگامی که چنین پیامی بگیرید یا بفرستید این‌جا نشان داده خواهد شد.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "هنوز هیچ دامنه‌ای مسدود نشده است.",
   "empty_column.explore_statuses": "الآن چیزی پرطرفدار نیست. بعداً دوباره بررسی کنید!",
   "empty_column.favourited_statuses": "شما هنوز هیچ فرسته‌ای را نپسندیده‌اید. هنگامی که فرسته‌ای را بپسندید، این‌جا نشان داده خواهد شد.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "تقویت فرسته",
   "keyboard_shortcuts.column": "برای تمرکز روی یک فرسته در یکی از ستون‌ها",
   "keyboard_shortcuts.compose": "تمرکز روی محیط نوشتن",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "توضیح",
-  "keyboard_shortcuts.direct": "گشودن ستون پیام‌های مستقیم",
   "keyboard_shortcuts.down": "پایین بردن در سیاهه",
   "keyboard_shortcuts.enter": "گشودن فرسته",
   "keyboard_shortcuts.favourite": "پسندیدن فرسته",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "نشانک‌ها",
   "navigation_bar.community_timeline": "خط زمانی محلّی",
   "navigation_bar.compose": "نوشتن فرستهٔ تازه",
-  "navigation_bar.direct": "پیام‌های مستقیم",
   "navigation_bar.discover": "گشت و گذار",
   "navigation_bar.domain_blocks": "دامنه‌های مسدود شده",
   "navigation_bar.edit_profile": "ویرایش نمایه",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "برداشتن نظرسنجی",
   "privacy.change": "تغییر محرمانگی فرسته",
   "privacy.direct.long": "فقط برای کاربران نام‌برده نمایان است",
-  "privacy.direct.short": "مستقیم",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "نمایان فقط برای پی‌گیرندگان",
-  "privacy.private.short": "فقط پی‌گیرندگان",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "نمایان برای همه، در خط‌های زمانی همگانی نمایش داده خواهد شد",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "عمومی",
-  "privacy.unlisted.long": "نمایان برای همه، ولی در خط‌های زمانی همگانی نمایش داده نخواهد شد",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "فهرست نشده",
   "refresh": "نوسازی",
   "regeneration_indicator.label": "در حال بار شدن…",

app/javascript/mastodon/locales/fi.json

@@ -70,7 +70,7 @@
   "column.blocks": "Estetyt käyttäjät",
   "column.bookmarks": "Kirjanmerkit",
   "column.community": "Paikallinen aikajana",
-  "column.direct": "Pikaviestit",
+  "column.conversations": "Conversations",
   "column.directory": "Selaa profiileja",
   "column.domain_blocks": "Piilotetut verkkotunnukset",
   "column.favourites": "Suosikit",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Vain paikalliset",
   "community.column_settings.media_only": "Vain media",
   "community.column_settings.remote_only": "Vain etäkäyttö",
-  "compose_form.direct_message_warning": "Tämä viesti näkyy vain mainituille käyttäjille.",
   "compose_form.direct_message_warning_learn_more": "Lisätietoja",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Tätä julkaisua listata minkään hastagin alle, koska se on listaamaton. Ainoastaan julkisia julkaisuja etsiä hastageilla.",
   "compose_form.lock_disclaimer": "Tilisi ei ole {locked}. Kuka tahansa voi seurata tiliäsi ja nähdä vain seuraajille rajaamasi julkaisut.",
   "compose_form.lock_disclaimer.lock": "lukittu",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Et ole vielä estänyt yhtään käyttäjää.",
   "empty_column.bookmarked_statuses": "Et ole vielä lisännyt viestejä kirjanmerkkeihisi. Kun lisäät yhden, se näkyy tässä.",
   "empty_column.community": "Paikallinen aikajana on tyhjä. Kirjoita jotain julkista, niin homma lähtee käyntiin!",
-  "empty_column.direct": "Sinulla ei ole vielä yhtään viestiä yksittäiselle käyttäjälle. Kun lähetät tai vastaanotat sellaisen, se näkyy täällä.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "Yhtään verkko-osoitetta ei ole vielä estetty.",
   "empty_column.explore_statuses": "Mikään ei ole nyt trendi. Tarkista myöhemmin!",
   "empty_column.favourited_statuses": "Et ole vielä lisännyt viestejä kirjanmerkkeihisi. Kun lisäät yhden, se näkyy tässä.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Buustaa viestiä",
   "keyboard_shortcuts.column": "Kohdista sarakkeeseen",
   "keyboard_shortcuts.compose": "siirry tekstinsyöttöön",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Kuvaus",
-  "keyboard_shortcuts.direct": "Avaa pikaviestisarake",
   "keyboard_shortcuts.down": "Siirry listassa alaspäin",
   "keyboard_shortcuts.enter": "Avaa julkaisu",
   "keyboard_shortcuts.favourite": "Lisää suosikkeihin",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Kirjanmerkit",
   "navigation_bar.community_timeline": "Paikallinen aikajana",
   "navigation_bar.compose": "Luo uusi viesti",
-  "navigation_bar.direct": "Pikaviestit",
   "navigation_bar.discover": "Löydä uutta",
   "navigation_bar.domain_blocks": "Estetyt verkkotunnukset",
   "navigation_bar.edit_profile": "Muokkaa profiilia",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Poista kysely",
   "privacy.change": "Muuta julkaisun näkyvyyttä",
   "privacy.direct.long": "Julkaise vain mainituille käyttäjille",
-  "privacy.direct.short": "Suora viesti",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Julkaise vain seuraajille",
-  "privacy.private.short": "Vain seuraajat",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Julkaise julkisille aikajanoille",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Julkinen",
-  "privacy.unlisted.long": "Älä julkaise julkisilla aikajanoilla",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Listaamaton julkinen",
   "refresh": "Päivitä",
   "regeneration_indicator.label": "Ladataan…",

app/javascript/mastodon/locales/fr.json

@@ -70,7 +70,7 @@
   "column.blocks": "Comptes bloqués",
   "column.bookmarks": "Marque-pages",
   "column.community": "Fil public local",
-  "column.direct": "Messages directs",
+  "column.conversations": "Conversations",
   "column.directory": "Parcourir les profils",
   "column.domain_blocks": "Domaines bloqués",
   "column.favourites": "Favoris",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Local seulement",
   "community.column_settings.media_only": "Média uniquement",
   "community.column_settings.remote_only": "Distant seulement",
-  "compose_form.direct_message_warning": "Ce message sera uniquement envoyé aux personnes mentionnées. Cependant, l’administration de votre instance et des instances réceptrices pourront inspecter ce message.",
   "compose_form.direct_message_warning_learn_more": "En savoir plus",
+  "compose_form.encryption_warning": "Les messages sur Mastodon ne sont pas chiffrés de bout en bout. Ne partagez aucune information confidentielle sur Mastodon.",
   "compose_form.hashtag_warning": "Ce pouet ne sera pas listé dans les recherches par hashtag car sa visibilité est réglée sur « non listé ». Seuls les pouets avec une visibilité « publique » peuvent être recherchés par hashtag.",
   "compose_form.lock_disclaimer": "Votre compte n’est pas {locked}. Tout le monde peut vous suivre et voir vos messages privés.",
   "compose_form.lock_disclaimer.lock": "verrouillé",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Vous n’avez bloqué aucun compte pour le moment.",
   "empty_column.bookmarked_statuses": "Vous n'avez pas de message en marque-page. Lorsque vous en ajouterez un, il apparaîtra ici.",
   "empty_column.community": "Le fil public local est vide. Écrivez donc quelque chose pour le remplir !",
-  "empty_column.direct": "Vous n’avez pas encore de messages directs. Lorsque vous en enverrez ou recevrez un, il s’affichera ici.",
+  "empty_column.conversations": "Une fois que vous avez envoyé ou reçu un message qui ne sera visible que par les personnes mentionnées, il apparaîtra ici.",
   "empty_column.domain_blocks": "Il n’y a aucun domaine bloqué pour le moment.",
   "empty_column.explore_statuses": "Rien n'est en tendance pour le moment. Revenez plus tard !",
   "empty_column.favourited_statuses": "Vous n’avez pas encore de message en favori. Lorsque vous en ajouterez un, il apparaîtra ici.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Partager le message",
   "keyboard_shortcuts.column": "Se placer dans une colonne",
   "keyboard_shortcuts.compose": "Se placer dans la zone de rédaction",
+  "keyboard_shortcuts.conversations": "pour ouvrir la colonne des conversations",
   "keyboard_shortcuts.description": "Description",
-  "keyboard_shortcuts.direct": "Ouvrir la colonne des messages directs",
   "keyboard_shortcuts.down": "Descendre dans la liste",
   "keyboard_shortcuts.enter": "Ouvrir le message",
   "keyboard_shortcuts.favourite": "Ajouter le message aux favoris",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Marque-pages",
   "navigation_bar.community_timeline": "Fil public local",
   "navigation_bar.compose": "Rédiger un nouveau message",
-  "navigation_bar.direct": "Messages directs",
   "navigation_bar.discover": "Découvrir",
   "navigation_bar.domain_blocks": "Domaines bloqués",
   "navigation_bar.edit_profile": "Modifier le profil",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Supprimer le sondage",
   "privacy.change": "Ajuster la confidentialité du message",
   "privacy.direct.long": "Visible uniquement par les comptes mentionnés",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "Seulement les personnes mentionnées",
   "privacy.private.long": "Visible uniquement par vos abonné·e·s",
   "privacy.private.short": "Abonné·e·s uniquement",
-  "privacy.public.long": "Visible par tou·te·s, affiché dans les fils publics",
+  "privacy.public.long": "Visible pour tous",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible par tou·te·s, mais pas dans les fils publics",
+  "privacy.unlisted.long": "Visible pour tous, mais sans fonctionnalités de découverte",
   "privacy.unlisted.short": "Non listé",
   "refresh": "Actualiser",
   "regeneration_indicator.label": "Chargement…",

app/javascript/mastodon/locales/ga.json

@@ -70,7 +70,7 @@
   "column.blocks": "Cuntais choiscthe",
   "column.bookmarks": "Leabharmharcanna",
   "column.community": "Local timeline",
-  "column.direct": "Direct messages",
+  "column.conversations": "Conversations",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "Blocked domains",
   "column.favourites": "Favourites",
@@ -79,7 +79,7 @@
   "column.lists": "Liostaí",
   "column.mutes": "Úsáideoirí balbhaithe",
   "column.notifications": "Notifications",
-  "column.pins": "Pinned toot",
+  "column.pins": "Pinned post",
   "column.public": "Federated timeline",
   "column_back_button.label": "Siar",
   "column_header.hide_settings": "Hide settings",
@@ -92,9 +92,9 @@
   "community.column_settings.local_only": "Local only",
   "community.column_settings.media_only": "Media only",
   "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
   "compose_form.direct_message_warning_learn_more": "Learn more",
-  "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
+  "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
   "compose_form.placeholder": "Cad atá ag tarlú?",
@@ -161,16 +161,16 @@
   "emoji_button.symbols": "Symbols",
   "emoji_button.travel": "Taisteal ⁊ Áiteanna",
   "empty_column.account_suspended": "Account suspended",
-  "empty_column.account_timeline": "No toots here!",
+  "empty_column.account_timeline": "No posts found",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
-  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
+  "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.conversations": "Once you send or receive a post that's only visible to people mentioned in it, 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 toots yet. When you favourite one, it will show up here.",
+  "empty_column.favourited_statuses": "You don't have any favourite posts yet. When you favourite one, it will show up here.",
-  "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
+  "empty_column.favourites": "No one has favourited this post yet. When someone does, they will show up here.",
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
   "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
   "empty_column.hashtag": "There is nothing in this hashtag yet.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Description",
-  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -247,7 +247,7 @@
   "keyboard_shortcuts.my_profile": "to open your profile",
   "keyboard_shortcuts.notifications": "to open notifications column",
   "keyboard_shortcuts.open_media": "to open media",
-  "keyboard_shortcuts.pinned": "to open pinned toots list",
+  "keyboard_shortcuts.pinned": "to open pinned posts list",
   "keyboard_shortcuts.profile": "to open author's profile",
   "keyboard_shortcuts.reply": "to reply",
   "keyboard_shortcuts.requests": "to open follow requests list",
@@ -256,7 +256,7 @@
   "keyboard_shortcuts.start": "to open \"get started\" column",
   "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
   "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
-  "keyboard_shortcuts.toot": "to start a brand new toot",
+  "keyboard_shortcuts.toot": "to start a brand new post",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
   "lightbox.close": "Close",
@@ -289,8 +289,7 @@
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
-  "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.compose": "Compose new post",
-  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Cuir an phróifíl in eagar",
@@ -305,7 +304,7 @@
   "navigation_bar.logout": "Logáil Amach",
   "navigation_bar.mutes": "Úsáideoirí balbhaithe",
   "navigation_bar.personal": "Pearsanta",
-  "navigation_bar.pins": "Pinned toots",
+  "navigation_bar.pins": "Pinned posts",
   "navigation_bar.preferences": "Preferences",
   "navigation_bar.public_timeline": "Federated timeline",
   "navigation_bar.security": "Security",
@@ -335,7 +334,7 @@
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
-  "notifications.column_settings.status": "New toots:",
+  "notifications.column_settings.status": "New posts:",
   "notifications.column_settings.unread_notifications.category": "Unread notifications",
   "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
   "notifications.column_settings.update": "Eagair:",
@@ -369,10 +368,10 @@
   "privacy.direct.long": "Visible for mentioned users only",
   "privacy.direct.short": "Direct",
   "privacy.private.long": "Sofheicthe do Leantóirí amháin",
-  "privacy.private.short": "Leantóirí amháin",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all, shown in public timelines",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Poiblí",
-  "privacy.unlisted.long": "Visible for all, but not in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Unlisted",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Ag lódáil…",
@@ -438,7 +437,7 @@
   "search_results.hashtags": "Haischlibeanna",
   "search_results.nothing_found": "Could not find anything for these search terms",
   "search_results.statuses": "Postálacha",
-  "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
+  "search_results.statuses_fts_disabled": "Searching posts by their content is not enabled on this Mastodon server.",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this status in the moderation interface",
@@ -466,12 +465,12 @@
   "status.mute_conversation": "Balbhaigh comhrá",
   "status.open": "Expand this status",
   "status.pin": "Pin on profile",
-  "status.pinned": "Pinned toot",
+  "status.pinned": "Pinned post",
   "status.read_more": "Read more",
   "status.reblog": "Boost",
   "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} boosted",
-  "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
+  "status.reblogs.empty": "No one has boosted this post yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.remove_bookmark": "Remove bookmark",
   "status.reply": "Reply",
@@ -502,7 +501,7 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
   "timeline_hint.resources.followers": "Leantóirí",
   "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older toots",
+  "timeline_hint.resources.statuses": "Older posts",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",

app/javascript/mastodon/locales/gd.json

@@ -70,7 +70,7 @@
   "column.blocks": "Cleachdaichean bacte",
   "column.bookmarks": "Comharran-lìn",
   "column.community": "Loidhne-ama ionadail",
-  "column.direct": "Teachdaireachdan dìreach",
+  "column.conversations": "Còmhraidhean",
   "column.directory": "Rùraich sna pròifilean",
   "column.domain_blocks": "Àrainnean bacte",
   "column.favourites": "Na h-annsachdan",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Feadhainn ionadail a-mhàin",
   "community.column_settings.media_only": "Meadhanan a-mhàin",
   "community.column_settings.remote_only": "Feadhainn chèin a-mhàin",
-  "compose_form.direct_message_warning": "Cha dèid am post seo a chur ach dha na cleachdaichean air an dug thu iomradh.",
   "compose_form.direct_message_warning_learn_more": "Barrachd fiosrachaidh",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Cha nochd am post seo fon taga hais on a tha e falaichte o liostaichean. Cha ghabh ach postaichean poblach a lorg a-rèir an tagaichean hais.",
   "compose_form.lock_disclaimer": "Chan eil an cunntas agad {locked}. ’S urrainn do dhuine sam bith leantainn ort is na postaichean agad a tha ag amas air an luchd-leantainn agad a-mhàin a shealltainn.",
   "compose_form.lock_disclaimer.lock": "glaiste",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Cha do bhac thu cleachdaiche sam bith fhathast.",
   "empty_column.bookmarked_statuses": "Chan eil comharra-lìn ri post agad fhathast. Nuair a nì thu comharra-lìn de dh’fhear, nochdaidh e an-seo.",
   "empty_column.community": "Tha an loidhne-ama ionadail falamh. Sgrìobh rudeigin gu poblach airson toiseach-tòiseachaidh a dhèanamh!",
-  "empty_column.direct": "Chan eil teachdaireachd dhìreach agad fhathast. Nuair a chuireas no a gheibh thu tè, nochdaidh i an-seo.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "Cha deach àrainn sam bith a bhacadh fhathast.",
   "empty_column.explore_statuses": "Chan eil dad a’ treandadh an-dràsta fhèin. Thoir sùil a-rithist an ceann greis!",
   "empty_column.favourited_statuses": "Chan eil annsachd air post agad fhathast. Nuair a nì thu annsachd de dh’fhear, nochdaidh e an-seo.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Brosnaich post",
   "keyboard_shortcuts.column": "Cuir am fòcas air colbh",
   "keyboard_shortcuts.compose": "Cuir am fòcas air raon teacsa an sgrìobhaidh",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Tuairisgeul",
-  "keyboard_shortcuts.direct": "Fosgail colbh nan teachdaireachdan dìreach",
   "keyboard_shortcuts.down": "Gluais sìos air an liosta",
   "keyboard_shortcuts.enter": "Fosgail post",
   "keyboard_shortcuts.favourite": "Cuir post ris na h-annsachdan",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Comharran-lìn",
   "navigation_bar.community_timeline": "Loidhne-ama ionadail",
   "navigation_bar.compose": "Sgrìobh post ùr",
-  "navigation_bar.direct": "Teachdaireachdan dìreach",
   "navigation_bar.discover": "Fidir",
   "navigation_bar.domain_blocks": "Àrainnean bacte",
   "navigation_bar.edit_profile": "Deasaich a’ phròifil",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Thoir air falbh an cunntas-bheachd",
   "privacy.change": "Cuir gleus air prìobhaideachd a’ phuist",
   "privacy.direct.long": "Chan fhaic ach na cleachdaichean le iomradh orra seo",
-  "privacy.direct.short": "Dìreach",
+  "privacy.direct.short": "Daoine air an dug mi iomradh a-mhàin",
   "privacy.private.long": "Chan fhaic ach na daoine a tha a’ leantainn ort seo",
   "privacy.private.short": "Luchd-leantainn a-mhàin",
-  "privacy.public.long": "Chì a h-uile duine seo ’s e ’ga shealltainn air loidhnichean-ama poblach",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Poblach",
-  "privacy.unlisted.long": "Chì a h-uile duine seo ach cha dèid a shealltainn air loidhnichean-ama poblach",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Falaichte o liostaichean",
   "refresh": "Ath-nuadhaich",
   "regeneration_indicator.label": "’Ga luchdadh…",

app/javascript/mastodon/locales/gl.json

@@ -70,7 +70,7 @@
   "column.blocks": "Usuarias bloqueadas",
   "column.bookmarks": "Marcadores",
   "column.community": "Cronoloxía local",
-  "column.direct": "Mensaxes directas",
+  "column.conversations": "Conversas",
   "column.directory": "Procurar perfís",
   "column.domain_blocks": "Dominios agochados",
   "column.favourites": "Favoritos",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Só local",
   "community.column_settings.media_only": "Só multimedia",
   "community.column_settings.remote_only": "Só remoto",
-  "compose_form.direct_message_warning": "Esta publicación só será enviada ás usuarias mencionadas.",
   "compose_form.direct_message_warning_learn_more": "Coñecer máis",
+  "compose_form.encryption_warning": "As publicacións en Mastodon non están cifradas de extremo-a-extremo. Non compartas información sensible en Mastodon.",
   "compose_form.hashtag_warning": "Esta publicación non aparecerá baixo ningún cancelo (hashtag) porque non está listada. Só se poden procurar publicacións públicas por cancelos.",
   "compose_form.lock_disclaimer": "A túa conta non está {locked}. Todas poden seguirte para ollar os teus toots só para seguidoras.",
   "compose_form.lock_disclaimer.lock": "bloqueada",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Aínda non bloqueaches a ningún usuaria.",
   "empty_column.bookmarked_statuses": "Aínda non marcaches ningunha publicación. Cando o fagas, aparecerán aquí.",
   "empty_column.community": "A cronoloxía local está baleira. Escribe algo de xeito público para espallalo!",
-  "empty_column.direct": "Aínda non tes mensaxes directas. Cando envíes ou recibas unha, amosarase aquí.",
+  "empty_column.conversations": "Aquí verás as publicacións que envíes ou recibas é só son visibles para as persoas mencionadas.",
   "empty_column.domain_blocks": "Aínda non hai dominios agochados.",
   "empty_column.explore_statuses": "Non hai temas en voga. Volve máis tarde!",
   "empty_column.favourited_statuses": "Aínda non tes publicacións favoritas. Cando che guste algunha, aparecerá aquí.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Promover publicación",
   "keyboard_shortcuts.column": "Destacar unha columna",
   "keyboard_shortcuts.compose": "Por o cursor na área de escritura",
+  "keyboard_shortcuts.conversations": "para abrir a columna das conversas",
   "keyboard_shortcuts.description": "Descrición",
-  "keyboard_shortcuts.direct": "Para abrir a columna de mensaxes directas",
   "keyboard_shortcuts.down": "Para mover cara abaixo na listaxe",
   "keyboard_shortcuts.enter": "Para abrir publicación",
   "keyboard_shortcuts.favourite": "Para engadir a favoritos",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Marcadores",
   "navigation_bar.community_timeline": "Cronoloxía local",
   "navigation_bar.compose": "Escribir unha nova publicación",
-  "navigation_bar.direct": "Mensaxes directas",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios agochados",
   "navigation_bar.edit_profile": "Editar perfil",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Eliminar enquisa",
   "privacy.change": "Axustar privacidade",
   "privacy.direct.long": "Só para as usuarias mencionadas",
-  "privacy.direct.short": "Directo",
+  "privacy.direct.short": "Só para persoas mencionadas",
   "privacy.private.long": "Só para os seguidoras",
   "privacy.private.short": "Só para seguidoras",
-  "privacy.public.long": "Publicar nas cronoloxías públicas",
+  "privacy.public.long": "Visible por todas",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Non publicar nas cronoloxías públicas",
+  "privacy.unlisted.long": "Visible por todas, pero excluída da sección descubrir",
   "privacy.unlisted.short": "Non listado",
   "refresh": "Actualizar",
   "regeneration_indicator.label": "Estase a cargar…",

app/javascript/mastodon/locales/he.json

@@ -70,7 +70,7 @@
   "column.blocks": "חסימות",
   "column.bookmarks": "סימניות",
   "column.community": "ציר זמן מקומי",
-  "column.direct": "הודעות ישירות",
+  "column.conversations": "Conversations",
   "column.directory": "גלוש פרופילים",
   "column.domain_blocks": "Hidden domains",
   "column.favourites": "חיבובים",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "מקומי בלבד",
   "community.column_settings.media_only": "Media only",
   "community.column_settings.remote_only": "מרחוק בלבד",
-  "compose_form.direct_message_warning": "This toot will only be visible to all the mentioned users.",
   "compose_form.direct_message_warning_learn_more": "מידע נוסף",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
   "compose_form.lock_disclaimer": "חשבונך אינו {locked}. כל אחד יוכל לעקוב אחריך כדי לקרוא את הודעותיך המיועדות לעוקבים בלבד.",
   "compose_form.lock_disclaimer.lock": "נעול",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "עדיין לא חסמתם משתמשים אחרים.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
   "empty_column.community": "טור הסביבה ריק. יש לפרסם משהו כדי שדברים יתרחילו להתגלגל!",
-  "empty_column.direct": "עדיין אין לכם הודעות פרטיות. כאשר תשלחו או תקבלו אחת, היא תופיע כאן.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "להדהד",
   "keyboard_shortcuts.column": "להתמקד בהודעה באחד מהטורים",
   "keyboard_shortcuts.compose": "להתמקד בתיבת חיבור ההודעות",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "תיאור",
-  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "לנוע במורד הרשימה",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "לחבב",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "ציר זמן מקומי",
   "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.direct": "הודעות ישירות",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "עריכת פרופיל",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Remove poll",
   "privacy.change": "שינוי פרטיות ההודעה",
   "privacy.direct.long": "הצג רק למי שהודעה זו פונה אליו",
-  "privacy.direct.short": "הודעה ישירה",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "הצג לעוקבים בלבד",
-  "privacy.private.short": "לעוקבים בלבד",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "פרסם בפומבי",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "פומבי",
-  "privacy.unlisted.long": "לא יופיע בפידים הציבוריים המשותפים",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "לא לפיד הכללי",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",

app/javascript/mastodon/locales/hi.json

@@ -70,7 +70,7 @@
   "column.blocks": "ब्लॉक्ड यूज़र्स",
   "column.bookmarks": "पुस्तकचिह्न:",
   "column.community": "लोकल टाइम्लाइन",
-  "column.direct": "सीधा संदेश",
+  "column.conversations": "Conversations",
   "column.directory": "प्रोफाइल्स खोजें",
   "column.domain_blocks": "छुपे डोमेन्स",
   "column.favourites": "पसंदीदा",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "स्थानीय ही",
   "community.column_settings.media_only": "सिर्फ़ मीडिया",
   "community.column_settings.remote_only": "केवल सुदूर",
-  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
   "compose_form.direct_message_warning_learn_more": "और जानें",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "यह टूट् किसी भी हैशटैग के तहत सूचीबद्ध नहीं होगा क्योंकि यह अनलिस्टेड है। हैशटैग द्वारा केवल सार्वजनिक टूट्स खोजे जा सकते हैं।",
   "compose_form.lock_disclaimer": "आपका खाता {locked} नहीं है। आपको केवल फॉलोवर्स को दिखाई दिए जाने वाले पोस्ट देखने के लिए कोई भी फॉलो कर सकता है।",
   "compose_form.lock_disclaimer.lock": "लॉक्ड",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "आप अभी तक किसी भी यूजर के द्वारा ब्लॉक्ड नहीं हो।",
   "empty_column.bookmarked_statuses": "आपके पास अभी तक कोई बुकमार्क नहीं है। जब आप एक बुकमार्क करते हैं, तो यह यहां दिखाई देगा।",
   "empty_column.community": "लोकल टाइम्लाइन खाली है, कुछ देखने के लिये सार्वजनिक रूप से कुछ लिखें!",
-  "empty_column.direct": "आपके पास कोई सीधा सन्देश नहीं है, जब आप कोई भेजेंगे प्राप्त करेंगे तो यहाँ दिखेगा।",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "अभी तक कोई छुपा हुआ डोमेन नहीं है।",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "आपके पास अभी कोई भी चहिता टूट नहीं है. जब आप किसी टूट को पसंद (स्टार) करेंगे, तब वो यहाँ दिखेगा।",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "बढ़ावा देने के लिए",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "कंपोज़ टेक्स्ट-एरिया पर ध्यान केंद्रित करने के लिए",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "विवरण",
-  "keyboard_shortcuts.direct": "सीधा सन्देश कॉलम को खोलने के लिए",
   "keyboard_shortcuts.down": "सूची में शामिल करने के लिए",
   "keyboard_shortcuts.enter": "स्टेटस खोलने के लिए",
   "keyboard_shortcuts.favourite": "पसंदीदा के लिए",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "पुस्तकचिह्न:",
   "navigation_bar.community_timeline": "लोकल टाइम्लाइन",
   "navigation_bar.compose": "नया टूट् लिखें",
-  "navigation_bar.direct": "सीधा संदेश",
   "navigation_bar.discover": "खोजें",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "प्रोफ़ाइल संपादित करें",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Remove poll",
   "privacy.change": "Adjust status privacy",
   "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "सीधा",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Post to followers only",
   "privacy.private.short": "Followers-only",
-  "privacy.public.long": "सार्वजनिक टाइम्लाइन पर भेजें",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "सार्वजनिक",
-  "privacy.unlisted.long": "Do not show in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "अनलिस्टेड",
   "refresh": "रीफ्रेश करें",
   "regeneration_indicator.label": "लोड हो रहा है...",

app/javascript/mastodon/locales/hr.json

@@ -70,7 +70,7 @@
   "column.blocks": "Blokirani korisnici",
   "column.bookmarks": "Knjižne oznake",
   "column.community": "Lokalna vremenska crta",
-  "column.direct": "Izravne poruke",
+  "column.conversations": "Conversations",
   "column.directory": "Pregledavanje profila",
   "column.domain_blocks": "Blokirane domene",
   "column.favourites": "Favoriti",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Samo lokalno",
   "community.column_settings.media_only": "Samo medijski sadržaj",
   "community.column_settings.remote_only": "Samo udaljeno",
-  "compose_form.direct_message_warning": "Ovaj toot bit će poslan samo spomenutim korisnicima.",
   "compose_form.direct_message_warning_learn_more": "Saznajte više",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Ovaj toot neće biti prikazan ni pod jednim hashtagom jer je postavljen kao neprikazan. Samo javni tootovi mogu biti pretraživani pomoći hashtagova.",
   "compose_form.lock_disclaimer": "Vaš račun nije {locked}. Svatko Vas može pratiti kako bi vidjeli objave namijenjene Vašim pratiteljima.",
   "compose_form.lock_disclaimer.lock": "zaključan",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Još niste blokirali nikoga.",
   "empty_column.bookmarked_statuses": "Još nemaš niti jedan označeni toot. Kada označiš jedan, prikazad će se ovdje.",
   "empty_column.community": "Lokalna vremenska crta je prazna. Napišite nešto javno da biste pokrenuli stvari!",
-  "empty_column.direct": "Nemate još niti jedne direktne poruke. Kada ih pošaljete ili primite, prikazati će se ovdje.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "Još nema blokiranih domena.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "za boostanje",
   "keyboard_shortcuts.column": "za fokusiranje na toot u jednom od stupaca",
   "keyboard_shortcuts.compose": "za fokusiranje na tekstualni okvir za stvaranje",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Opis",
-  "keyboard_shortcuts.direct": "za otvaranje stupca s izravnim porukama",
   "keyboard_shortcuts.down": "za pomak dolje na listi",
   "keyboard_shortcuts.enter": "za otvaranje toota",
   "keyboard_shortcuts.favourite": "za označavanje favoritom",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Lokalna vremenska crta",
   "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.direct": "Izravne poruke",
   "navigation_bar.discover": "Istraživanje",
   "navigation_bar.domain_blocks": "Blokirane domene",
   "navigation_bar.edit_profile": "Uredi profil",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Ukloni anketu",
   "privacy.change": "Podesi privatnost toota",
   "privacy.direct.long": "Vidljivo samo spomenutim korisnicima",
-  "privacy.direct.short": "Izravno",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Vidljivo samo pratiteljima",
-  "privacy.private.short": "Samo pratitelji",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Vidljivo svima, prikazano u javim vremenskim crtama",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Javno",
-  "privacy.unlisted.long": "Vidljivo svima, ali se ne prikazuje u javnim vremenskim crtama",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Neprikazano",
   "refresh": "Osvježi",
   "regeneration_indicator.label": "Učitavanje…",

app/javascript/mastodon/locales/hu.json

@@ -70,7 +70,7 @@
   "column.blocks": "Letiltott felhasználók",
   "column.bookmarks": "Könyvjelzők",
   "column.community": "Helyi idővonal",
-  "column.direct": "Közvetlen üzenetek",
+  "column.conversations": "Beszélgetések",
   "column.directory": "Profilok böngészése",
   "column.domain_blocks": "Rejtett domainek",
   "column.favourites": "Kedvencek",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Csak helyi",
   "community.column_settings.media_only": "Csak média",
   "community.column_settings.remote_only": "Csak távoli",
-  "compose_form.direct_message_warning": "Ezt a bejegyzést csak a benne megemlített felhasználók láthatják majd.",
   "compose_form.direct_message_warning_learn_more": "Tudj meg többet",
+  "compose_form.encryption_warning": "A bejegyzések a Mastodonon nem használnak végpontok közötti titkosítást. Ne ossz meg érzékeny információt Mastodonon.",
   "compose_form.hashtag_warning": "Ez a bejegyzésed nem fog megjelenni semmilyen hashtag alatt, mivel listázatlan. Csak a nyilvános bejegyzések kereshetők hashtaggel.",
   "compose_form.lock_disclaimer": "A fiókod nincs {locked}. Bárki követni tud, hogy megtekintse a kizárólag követőknek szánt bejegyzéseket.",
   "compose_form.lock_disclaimer.lock": "lezárva",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Még senkit sem tiltottál le.",
   "empty_column.bookmarked_statuses": "Még nincs egyetlen könyvjelzőzött bejegyzésed sem. Ha könyvjelzőzöl egyet, itt fog megjelenni.",
   "empty_column.community": "A helyi idővonal üres. Tégy közzé valamit nyilvánosan, hogy elindítsd az eseményeket!",
-  "empty_column.direct": "Még nincs egy közvetlen üzeneted sem. Ha küldesz vagy kapsz egyet, itt fog megjelenni.",
+  "empty_column.conversations": "Ha olyan bejegyzést küldesz vagy fogadsz, melyet csak az abban megemlítettek látnak, itt fog megjelenni.",
   "empty_column.domain_blocks": "Még nem rejtettél el egyetlen domaint sem.",
   "empty_column.explore_statuses": "Jelenleg semmi sem felkapott. Nézz vissza később!",
   "empty_column.favourited_statuses": "Még nincs egyetlen kedvenc bejegyzésed sem. Ha kedvencnek jelölsz egyet, itt fog megjelenni.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Bejegyzés megtolása",
   "keyboard_shortcuts.column": "Fókuszálás egy oszlopra",
   "keyboard_shortcuts.compose": "fókuszálás a szerkesztési szövegdobozra",
+  "keyboard_shortcuts.conversations": "beszélgetések megnyitása",
   "keyboard_shortcuts.description": "Leírás",
-  "keyboard_shortcuts.direct": "Közvetlen üzenetek oszlopának megnyitása",
   "keyboard_shortcuts.down": "lefele navigálás a listában",
   "keyboard_shortcuts.enter": "Bejegyzés megnyitása",
   "keyboard_shortcuts.favourite": "Bejegyzés kedvencnek jelölése",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Könyvjelzők",
   "navigation_bar.community_timeline": "Helyi idővonal",
   "navigation_bar.compose": "Új bejegyzés írása",
-  "navigation_bar.direct": "Közvetlen üzenetek",
   "navigation_bar.discover": "Felfedezés",
   "navigation_bar.domain_blocks": "Rejtett domainek",
   "navigation_bar.edit_profile": "Profil szerkesztése",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Szavazás törlése",
   "privacy.change": "Bejegyzés láthatóságának módosítása",
   "privacy.direct.long": "Csak a megemlített felhasználóknak látható",
-  "privacy.direct.short": "Közvetlen",
+  "privacy.direct.short": "Csak a megemlítettek",
   "privacy.private.long": "Csak követőknek látható",
-  "privacy.private.short": "Csak követőknek",
+  "privacy.private.short": "Csak követők",
-  "privacy.public.long": "Mindenki számára látható, nyilvános idővonalakon is szerepel",
+  "privacy.public.long": "Mindenki számára látható",
   "privacy.public.short": "Nyilvános",
-  "privacy.unlisted.long": "Ne mutassuk nyilvános idővonalon",
+  "privacy.unlisted.long": "Mindenki számára látható, de kimarad a felfedezős funkciókból",
   "privacy.unlisted.short": "Listázatlan",
   "refresh": "Frissítés",
   "regeneration_indicator.label": "Töltődik…",

app/javascript/mastodon/locales/hy.json

@@ -70,7 +70,7 @@
   "column.blocks": "Արգելափակուած օգտատէրեր",
   "column.bookmarks": "Էջանիշեր",
   "column.community": "Տեղական հոսք",
-  "column.direct": "Հասցէագրուած հաղորդագրութիւններ",
+  "column.conversations": "Conversations",
   "column.directory": "Զննել անձնական էջերը",
   "column.domain_blocks": "Թաքցուած տիրոյթները",
   "column.favourites": "Հաւանածներ",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Միայն տեղական",
   "community.column_settings.media_only": "Միայն մեդիա",
   "community.column_settings.remote_only": "Միայն հեռակայ",
-  "compose_form.direct_message_warning": "Այս գրառումը տեսանելի կը լինի միայն նշուած օգտատէրերին։",
   "compose_form.direct_message_warning_learn_more": "Իմանալ աւելին",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Այս գրառումը չի հաշուառուի որեւէ պիտակի տակ, քանզի այն ծածուկ է։ Միայն հրապարակային թթերը հնարաւոր է որոնել պիտակներով։",
   "compose_form.lock_disclaimer": "Քո հաշիւը {locked} չէ։ Իւրաքանչիւրութիւն ոք կարող է հետեւել քեզ եւ տեսնել միայն հետեւողների համար նախատեսուած գրառումները։",
   "compose_form.lock_disclaimer.lock": "փակ",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Դու դեռ ոչ մէկի չես արգելափակել։",
   "empty_column.bookmarked_statuses": "Դու դեռ չունես որեւէ էջանշուած գրառում։ Երբ էջանշես, դրանք կը երեւան այստեղ։",
   "empty_column.community": "Տեղական հոսքը դատարկ է։ Հրապարակային մի բան գրի՛ր շարժիչը գործարկելու համար։",
-  "empty_column.direct": "Դու դեռ չունես ոչ մի հասցէագրուած հաղորդագրութիւն։ Երբ ուղարկես կամ ստանաս որեւէ անձնական նամակ, այն այստեղ կերեւայ։",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "Թաքցուած տիրոյթներ դեռ չկան։",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Դու դեռ չունես որեւէ հաւանած գրառում։ Երբ հաւանես, դրանք կերեւան այստեղ։",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "տարածելու համար",
   "keyboard_shortcuts.column": "սիւներից մէկի վրայ սեւեռուելու համար",
   "keyboard_shortcuts.compose": "շարադրման տիրոյթին սեւեռուելու համար",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Նկարագրութիւն",
-  "keyboard_shortcuts.direct": "հասցէագրուած գրուածքների հոսքը բացելու համար",
   "keyboard_shortcuts.down": "ցանկով ներքեւ շարժուելու համար",
   "keyboard_shortcuts.enter": "Գրառումը բացելու համար",
   "keyboard_shortcuts.favourite": "հաւանելու համար",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Էջանիշեր",
   "navigation_bar.community_timeline": "Տեղական հոսք",
   "navigation_bar.compose": "Ստեղծել նոր գրառում",
-  "navigation_bar.direct": "Հասցէագրուած",
   "navigation_bar.discover": "Բացայայտել",
   "navigation_bar.domain_blocks": "Թաքցուած տիրոյթներ",
   "navigation_bar.edit_profile": "Խմբագրել անձնական էջը",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Հեռացնել հարցումը",
   "privacy.change": "Կարգաւորել գրառման գաղտնիութիւնը",
   "privacy.direct.long": "Կը տեսնեն միայն նշուած օգտատէրերը",
-  "privacy.direct.short": "Հասցէագրուած",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Կը տեսնեն միայն հետեւորդները",
-  "privacy.private.short": "Միայն հետեւողներին",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Կը տեսնեն բոլոր,  հրապարակային հոսքում",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Հրապարակային",
-  "privacy.unlisted.long": "Կը տեսնեն բոլոր,  բայց ոչ հրապարակային հոսքում",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Ծածուկ",
   "refresh": "Թարմացնել",
   "regeneration_indicator.label": "Բեռնւում է…",

app/javascript/mastodon/locales/id.json

@@ -70,7 +70,7 @@
   "column.blocks": "Pengguna yang diblokir",
   "column.bookmarks": "Markah",
   "column.community": "Linimasa Lokal",
-  "column.direct": "Pesan langsung",
+  "column.conversations": "Percakapan",
   "column.directory": "Jelajahi profil",
   "column.domain_blocks": "Topik tersembunyi",
   "column.favourites": "Favorit",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Hanya lokal",
   "community.column_settings.media_only": "Hanya media",
   "community.column_settings.remote_only": "Hanya jarak jauh",
-  "compose_form.direct_message_warning": "This toot will only be visible to all the mentioned users.",
   "compose_form.direct_message_warning_learn_more": "Pelajari selengkapnya",
+  "compose_form.encryption_warning": "Kiriman di Mastodon tidak dienkripsi end-to-end. Jangan bagikan informasi rahasial melalui Mastodon.",
   "compose_form.hashtag_warning": "Toot ini tidak akan ada dalam daftar tagar manapun karena telah diatur sebagai tidak terdaftar. Hanya postingan publik yang bisa dicari dengan tagar.",
   "compose_form.lock_disclaimer": "Akun anda tidak {locked}. Semua orang dapat mengikuti anda untuk melihat postingan khusus untuk pengikut anda.",
   "compose_form.lock_disclaimer.lock": "terkunci",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Anda belum memblokir siapapun.",
   "empty_column.bookmarked_statuses": "Anda belum memiliki toot termarkah. Saat Anda menandainya sebagai markah, ia akan muncul di sini.",
   "empty_column.community": "Linimasa lokal masih kosong. Tulis sesuatu secara publik dan buat roda berputar!",
-  "empty_column.direct": "Anda belum memiliki pesan langsung. Ketika Anda mengirim atau menerimanya, maka akan muncul di sini.",
+  "empty_column.conversations": "Saat Anda mengirim atau menerima kiriman yang hanya terlihat oleh orang yang disebutkan, itu akan muncul di sini.",
   "empty_column.domain_blocks": "Tidak ada topik tersembunyi.",
   "empty_column.explore_statuses": "Tidak ada yang sedang tren pada saat ini. Silakan mengecek lagi nanti!",
   "empty_column.favourited_statuses": "Anda belum memiliki toot favorit. Ketika Anda mengirim atau menerimanya, maka akan muncul di sini.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "untuk menyebarkan",
   "keyboard_shortcuts.column": "untuk fokus kepada sebuah status di sebuah kolom",
   "keyboard_shortcuts.compose": "untuk fokus ke area penulisan",
+  "keyboard_shortcuts.conversations": "untuk membuka kolom percakapan",
   "keyboard_shortcuts.description": "Deskripsi",
-  "keyboard_shortcuts.direct": "buka kolom pesan langsung",
   "keyboard_shortcuts.down": "untuk pindah ke bawah dalam sebuah daftar",
   "keyboard_shortcuts.enter": "untuk membuka status",
   "keyboard_shortcuts.favourite": "untuk memfavoritkan",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Markah",
   "navigation_bar.community_timeline": "Linimasa lokal",
   "navigation_bar.compose": "Tulis toot baru",
-  "navigation_bar.direct": "Pesan langsung",
   "navigation_bar.discover": "Temukan",
   "navigation_bar.domain_blocks": "Domain tersembunyi",
   "navigation_bar.edit_profile": "Ubah profil",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Hapus japat",
   "privacy.change": "Tentukan privasi status",
   "privacy.direct.long": "Kirim hanya ke pengguna yang disebut",
-  "privacy.direct.short": "Langsung",
+  "privacy.direct.short": "Hanya orang yang saya sebut",
   "privacy.private.long": "Kirim postingan hanya kepada pengikut",
-  "privacy.private.short": "Pribadi",
+  "privacy.private.short": "Pengikut saja",
-  "privacy.public.long": "Kirim ke linimasa publik",
+  "privacy.public.long": "Terlihat oleh semua",
   "privacy.public.short": "Publik",
-  "privacy.unlisted.long": "Tidak ditampilkan di linimasa publik",
+  "privacy.unlisted.long": "Terlihat oleh semua, tapi jangan tampilkan di fitur jelajah",
   "privacy.unlisted.short": "Tak Terdaftar",
   "refresh": "Segarkan",
   "regeneration_indicator.label": "Memuat…",

app/javascript/mastodon/locales/io.json

@@ -70,7 +70,7 @@
   "column.blocks": "Blokusita uzeri",
   "column.bookmarks": "Bookmarks",
   "column.community": "Lokala tempolineo",
-  "column.direct": "Direct messages",
+  "column.conversations": "Conversations",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "Hidden domains",
   "column.favourites": "Favorati",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Local only",
   "community.column_settings.media_only": "Media only",
   "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "This toot will only be visible to all the mentioned users.",
   "compose_form.direct_message_warning_learn_more": "Learn more",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
   "empty_column.community": "La lokala tempolineo esas vakua. Skribez ulo publike por iniciar la agiveso!",
-  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Description",
-  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Lokala tempolineo",
   "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Modifikar profilo",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Remove poll",
   "privacy.change": "Aranjar privateso di mesaji",
   "privacy.direct.long": "Sendar nur a mencionata uzeri",
-  "privacy.direct.short": "Direte",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Sendar nur a sequanti",
-  "privacy.private.short": "Private",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Sendar a publika tempolinei",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Publike",
-  "privacy.unlisted.long": "Ne montrar en publika tempolinei",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Ne enlistigota",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",

app/javascript/mastodon/locales/is.json

@@ -70,7 +70,7 @@
   "column.blocks": "Útilokaðir notendur",
   "column.bookmarks": "Bókamerki",
   "column.community": "Staðvær tímalína",
-  "column.direct": "Bein skilaboð",
+  "column.conversations": "Samtöl",
   "column.directory": "Skoða notandasnið",
   "column.domain_blocks": "Útilokuð lén",
   "column.favourites": "Eftirlæti",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Einungis staðvært",
   "community.column_settings.media_only": "Einungis myndskrár",
   "community.column_settings.remote_only": "Einungis fjartengt",
-  "compose_form.direct_message_warning": "Þessi færsla verður aðeins send á notendur sem minnst er á.",
   "compose_form.direct_message_warning_learn_more": "Kanna nánar",
+  "compose_form.encryption_warning": "Færslur á Mastodon eru ekki enda-í-enda dulritaðar. Ekki deila viðkvæmum upplýsingum á Mastodon.",
   "compose_form.hashtag_warning": "Þessi færsla verður ekki talin með undir nokkru myllumerki þar sem það er óskráð. Einungis er hægt að leita að opinberum færslum eftir myllumerkjum.",
   "compose_form.lock_disclaimer": "Aðgangurinn þinn er ekki {locked}. Hver sem er getur fylgst með þeim færslum þínum sem einungis eru til fylgjenda þinna.",
   "compose_form.lock_disclaimer.lock": "læst",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Þú hefur ekki ennþá útilokað neina notendur.",
   "empty_column.bookmarked_statuses": "Þú ert ekki ennþá með neinar bókamerktar færslur. Þegar þú bókamerkir færslu, mun það birtast hér.",
   "empty_column.community": "Staðværa tímalínan er tóm. Skrifaðu eitthvað opinberlega til að láta boltann fara að rúlla!",
-  "empty_column.direct": "Þú átt ennþá engin bein skilaboð. Þegar þú sendir eða tekur á móti slíkum skilaboðum, munu þau birtast hér.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "Það eru ennþá engin útilokuð lén.",
   "empty_column.explore_statuses": "Ekkert er á uppleið í augnablikinu. Athugaðu aftur síðar!",
   "empty_column.favourited_statuses": "Þú ert ekki ennþá með neinar eftirlætisfærslur. Þegar þú setur færslu í eftirlæti, munu þau birtast hér.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Endurbirta færslu",
   "keyboard_shortcuts.column": "Setja virkni í dálk",
   "keyboard_shortcuts.compose": "Setja virkni á textainnsetningarreit",
+  "keyboard_shortcuts.conversations": "að opna samtalsdálka",
   "keyboard_shortcuts.description": "Lýsing",
-  "keyboard_shortcuts.direct": "Opna dálk með beinum skilaboðum",
   "keyboard_shortcuts.down": "Fara neðar í listanum",
   "keyboard_shortcuts.enter": "Opna færslu",
   "keyboard_shortcuts.favourite": "Eftirlætisfærsla",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Bókamerki",
   "navigation_bar.community_timeline": "Staðvær tímalína",
   "navigation_bar.compose": "Semja nýja færslu",
-  "navigation_bar.direct": "Bein skilaboð",
   "navigation_bar.discover": "Uppgötva",
   "navigation_bar.domain_blocks": "Útilokuð lén",
   "navigation_bar.edit_profile": "Breyta notandasniði",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Fjarlægja könnun",
   "privacy.change": "Aðlaga gagnaleynd færslu",
   "privacy.direct.long": "Senda einungis á notendur sem minnst er á",
-  "privacy.direct.short": "Beint",
+  "privacy.direct.short": "Aðeins fólk sem ég minnist á",
   "privacy.private.long": "Senda einungis á fylgjendur",
   "privacy.private.short": "Einungis fylgjendur",
-  "privacy.public.long": "Senda á opinberar tímalínur",
+  "privacy.public.long": "Sýnilegt fyrir alla",
   "privacy.public.short": "Opinbert",
-  "privacy.unlisted.long": "Ekki senda á opinberar tímalínur",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Óskráð",
   "refresh": "Endurlesa",
   "regeneration_indicator.label": "Hleð inn…",

app/javascript/mastodon/locales/it.json

@@ -70,7 +70,7 @@
   "column.blocks": "Utenti bloccati",
   "column.bookmarks": "Segnalibri",
   "column.community": "Timeline locale",
-  "column.direct": "Messaggi diretti",
+  "column.conversations": "Conversazioni",
   "column.directory": "Sfoglia profili",
   "column.domain_blocks": "Domini bloccati",
   "column.favourites": "Preferiti",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Solo Locale",
   "community.column_settings.media_only": "Solo Media",
   "community.column_settings.remote_only": "Solo Remoto",
-  "compose_form.direct_message_warning": "Questo post sarà inviato solo agli utenti menzionati.",
   "compose_form.direct_message_warning_learn_more": "Scopri di più",
+  "compose_form.encryption_warning": "I messaggi su Mastodon non sono crittografati end-to-end. Non condividere alcuna informazione sensibile su Mastodon.",
   "compose_form.hashtag_warning": "Questo post non sarà elencato sotto alcun hashtag poiché senza elenco. Solo i toot pubblici possono essere ricercati per hashtag.",
   "compose_form.lock_disclaimer": "Il tuo profilo non è {locked}. Chiunque può seguirti e vedere le tue pubblicazioni visibili solo dai follower.",
   "compose_form.lock_disclaimer.lock": "bloccato",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Non hai ancora bloccato alcun utente.",
   "empty_column.bookmarked_statuses": "Non hai ancora segnato alcun post. Quando ne segni uno, sarà mostrato qui.",
   "empty_column.community": "La timeline locale è vuota. Condividi qualcosa pubblicamente per dare inizio alla festa!",
-  "empty_column.direct": "Non hai ancora nessun messaggio privato. Quando ne manderai o riceverai qualcuno, apparirà qui.",
+  "empty_column.conversations": "Quando invii o ricevi un post visibile solo alle persone citate in esso, apparirà qui.",
   "empty_column.domain_blocks": "Non vi sono domini nascosti.",
   "empty_column.explore_statuses": "Nulla è in tendenza in questo momento. Riprova più tardi!",
   "empty_column.favourited_statuses": "Non hai ancora segnato nessun post come apprezzato. Quando lo farai, comparirà qui.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Condividi il post",
   "keyboard_shortcuts.column": "per portare il focus su uno status in una delle colonne",
   "keyboard_shortcuts.compose": "per portare il focus nell'area di composizione",
+  "keyboard_shortcuts.conversations": "per aprire la colonna conversazioni",
   "keyboard_shortcuts.description": "Descrizione",
-  "keyboard_shortcuts.direct": "per aprire la colonna dei messaggi diretti",
   "keyboard_shortcuts.down": "Spostati in basso nella lista",
   "keyboard_shortcuts.enter": "Apri il post",
   "keyboard_shortcuts.favourite": "Apprezza post",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Segnalibri",
   "navigation_bar.community_timeline": "Timeline locale",
   "navigation_bar.compose": "Componi nuovo toot",
-  "navigation_bar.direct": "Messaggi diretti",
   "navigation_bar.discover": "Scopri",
   "navigation_bar.domain_blocks": "Domini nascosti",
   "navigation_bar.edit_profile": "Modifica profilo",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Rimuovi sondaggio",
   "privacy.change": "Modifica privacy del post",
   "privacy.direct.long": "Invia solo a utenti menzionati",
-  "privacy.direct.short": "Diretto in privato",
+  "privacy.direct.short": "Solo le persone che menziono",
   "privacy.private.long": "Invia solo ai follower",
-  "privacy.private.short": "Privato",
+  "privacy.private.short": "Solo i seguaci",
-  "privacy.public.long": "Invia alla timeline pubblica",
+  "privacy.public.long": "Visibile a tutti",
   "privacy.public.short": "Pubblico",
-  "privacy.unlisted.long": "Non mostrare sulla timeline pubblica",
+  "privacy.unlisted.long": "Visibile a tutti, ma escluso dalle funzioni di scoperta",
   "privacy.unlisted.short": "Non elencato",
   "refresh": "Aggiorna",
   "regeneration_indicator.label": "Caricamento in corso…",

app/javascript/mastodon/locales/ja.json

@@ -70,7 +70,7 @@
   "column.blocks": "ブロックしたユーザー",
   "column.bookmarks": "ブックマーク",
   "column.community": "ローカルタイムライン",
-  "column.direct": "ダイレクトメッセージ",
+  "column.conversations": "ダイレクトメッセージ",
   "column.directory": "ディレクトリ",
   "column.domain_blocks": "ブロックしたドメイン",
   "column.favourites": "お気に入り",
@@ -96,8 +96,8 @@
   "community.column_settings.local_only": "ローカルのみ表示",
   "community.column_settings.media_only": "メディアのみ表示",
   "community.column_settings.remote_only": "リモートのみ表示",
-  "compose_form.direct_message_warning": "この投稿はメンションされた人にのみ送信されます。",
   "compose_form.direct_message_warning_learn_more": "もっと詳しく",
+  "compose_form.encryption_warning": "Mastodon の投稿はエンドツーエンド暗号化に対応していません。安全に送受信されるべき情報を Mastodon で共有しないでください。",
   "compose_form.hashtag_warning": "この投稿は公開設定ではないのでハッシュタグの一覧に表示されません。公開投稿だけがハッシュタグで検索できます。",
   "compose_form.lock_disclaimer": "あなたのアカウントは{locked}になっていません。誰でもあなたをフォローすることができ、フォロワー限定の投稿を見ることができます。",
   "compose_form.lock_disclaimer.lock": "承認制",
@@ -170,7 +170,7 @@
   "empty_column.blocks": "まだ誰もブロックしていません。",
   "empty_column.bookmarked_statuses": "まだ何もブックマーク登録していません。ブックマーク登録するとここに表示されます。",
   "empty_column.community": "ローカルタイムラインはまだ使われていません。何か書いてみましょう！",
-  "empty_column.direct": "ダイレクトメッセージはまだありません。ダイレクトメッセージをやりとりすると、ここに表示されます。",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "ブロックしているドメインはありません。",
   "empty_column.explore_statuses": "まだ何もありません。後で確認してください。",
   "empty_column.favourited_statuses": "まだ何もお気に入り登録していません。お気に入り登録するとここに表示されます。",
@@ -234,8 +234,8 @@
   "keyboard_shortcuts.boost": "ブースト",
   "keyboard_shortcuts.column": "左からn番目のカラムの最新に移動",
   "keyboard_shortcuts.compose": "投稿の入力欄に移動",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "説明",
-  "keyboard_shortcuts.direct": "ダイレクトメッセージのカラムを開く",
   "keyboard_shortcuts.down": "カラム内一つ下に移動",
   "keyboard_shortcuts.enter": "投稿の詳細を表示",
   "keyboard_shortcuts.favourite": "お気に入り",
@@ -294,7 +294,6 @@
   "navigation_bar.bookmarks": "ブックマーク",
   "navigation_bar.community_timeline": "ローカルタイムライン",
   "navigation_bar.compose": "投稿の新規作成",
-  "navigation_bar.direct": "ダイレクトメッセージ",
   "navigation_bar.discover": "見つける",
   "navigation_bar.domain_blocks": "ブロックしたドメイン",
   "navigation_bar.edit_profile": "プロフィールを編集",
@@ -374,10 +373,10 @@
   "privacy.direct.long": "送信した相手のみ閲覧可",
   "privacy.direct.short": "ダイレクト",
   "privacy.private.long": "フォロワーのみ閲覧可",
-  "privacy.private.short": "フォロワー限定",
+  "privacy.private.short": "フォロワーのみ",
-  "privacy.public.long": "誰でも閲覧可、公開TLに表示",
+  "privacy.public.long": "誰でも閲覧可",
   "privacy.public.short": "公開",
-  "privacy.unlisted.long": "誰でも閲覧可、公開TLに非表示",
+  "privacy.unlisted.long": "誰でも閲覧可、サイレント",
   "privacy.unlisted.short": "未収載",
   "refresh": "更新",
   "regeneration_indicator.label": "読み込み中…",

app/javascript/mastodon/locales/ka.json

@@ -70,7 +70,7 @@
   "column.blocks": "დაბლოკილი მომხმარებლები",
   "column.bookmarks": "Bookmarks",
   "column.community": "ლოკალური თაიმლაინი",
-  "column.direct": "პირდაპირი წერილები",
+  "column.conversations": "Conversations",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "დამალული დომენები",
   "column.favourites": "ფავორიტები",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Local only",
   "community.column_settings.media_only": "მხოლოდ მედია",
   "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "ეს ტუტი გაეგზავნება მხოლოდ ნახსენებ მომხმარებლებს.",
   "compose_form.direct_message_warning_learn_more": "გაიგე მეტი",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "ეს ტუტი არ მოექცევა ჰეშტეგების ქვეს, რამეთუ ის არაა მითითებული. მხოლოდ ღია ტუტები მოიძებნება ჰეშტეგით.",
   "compose_form.lock_disclaimer": "თქვენი ანგარიში არაა {locked}. ნებისმიერს შეიძლია გამოგყვეთ, რომ იხილოს თქვენი მიმდევრებზე გათვლილი პოსტები.",
   "compose_form.lock_disclaimer.lock": "ჩაკეტილი",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
   "empty_column.community": "ლოკალური თაიმლაინი ცარიელია. დაწერეთ რაიმე ღიად ან ქენით რაიმე სხვა!",
-  "empty_column.direct": "ჯერ პირდაპირი წერილები არ გაქვთ. როდესაც მიიღებთ ან გააგზავნით, გამოჩნდება აქ.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "დასაბუსტად",
   "keyboard_shortcuts.column": "ერთ-ერთი სვეტში სტატუსზე ფოკუსირებისთვის",
   "keyboard_shortcuts.compose": "შედგენის ტექსტ-არეაზე ფოკუსირებისთვის",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "აღწერილობა",
-  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "სიაში ქვემოთ გადასაადგილებლად",
   "keyboard_shortcuts.enter": "სტატუსის გასახსნელად",
   "keyboard_shortcuts.favourite": "ფავორიტად ქცევისთვის",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "ლოკალური თაიმლაინი",
   "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.direct": "პირდაპირი წერილები",
   "navigation_bar.discover": "აღმოაჩინე",
   "navigation_bar.domain_blocks": "დამალული დომენები",
   "navigation_bar.edit_profile": "შეცვალე პროფილი",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Remove poll",
   "privacy.change": "სტატუსის კონფიდენციალურობის მითითება",
   "privacy.direct.long": "დაიპოსტოს მხოლოდ დასახელებულ მომხმარებლებთან",
-  "privacy.direct.short": "პირდაპირი",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "დაიპოსტოს მხოლოდ მიმდევრებთან",
-  "privacy.private.short": "მხოლოდ-მიმდევრებისთვის",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "დაიპოსტოს საჯარო თაიმლაინებზე",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "საჯარო",
-  "privacy.unlisted.long": "არ დაიპოსტოს საჯარო თაიმლაინებზე",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "ჩამოუთვლელი",
   "refresh": "Refresh",
   "regeneration_indicator.label": "იტვირთება…",

app/javascript/mastodon/locales/kab.json

@@ -70,7 +70,7 @@
   "column.blocks": "Imiḍanen yettusḥebsen",
   "column.bookmarks": "Ticraḍ",
   "column.community": "Tasuddemt tadigant",
-  "column.direct": "Iznan usriden",
+  "column.conversations": "Conversations",
   "column.directory": "Inig deg imaɣnuten",
   "column.domain_blocks": "Taɣulin yeffren",
   "column.favourites": "Ismenyifen",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Adigan kan",
   "community.column_settings.media_only": "Allal n teywalt kan",
   "community.column_settings.remote_only": "Anmeggag kan",
-  "compose_form.direct_message_warning": "Tajewwaqt-a ad d-tettwasken kan i yimseqdacen i d-yettwabedren.",
   "compose_form.direct_message_warning_learn_more": "Issin ugar",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Amiḍan-ik ur yelli ara {locked}. Menwala yezmer ad k-yeḍfeṛ akken ad iẓer acu tbeṭṭuḍ akked yimeḍfaṛen-ik.",
   "compose_form.lock_disclaimer.lock": "yettwacekkel",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Ur tesḥebseḍ ula yiwen n umseqdac ar tura.",
   "empty_column.bookmarked_statuses": "Ulac tijewwaqin i terniḍ ɣer yismenyifen-ik ar tura. Ticki terniḍ yiwet, ad d-tettwasken da.",
   "empty_column.community": "Tasuddemt tazayezt tadigant n yisallen d tilemt. Aru ihi kra akken ad tt-teččareḍ!",
-  "empty_column.direct": "Ulac ɣur-k ula yiwen n yizen usrid. Ad d-yettwasken da, ticki tuzneḍ neɣ teṭṭfeḍ-d yiwen.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "Ulac kra n taɣult yettwaffren ar tura.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Ulac ula yiwet n tjewwaqt deg yismenyifen-ik ar tura. Ticki Tella-d yiwet, ad d-ban da.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "i beṭṭu tikelt-nniḍen",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Aglam",
-  "keyboard_shortcuts.direct": "akken ad teldiḍ ajgu n yiznan usriden",
   "keyboard_shortcuts.down": "i kennu ɣer wadda n tebdart",
   "keyboard_shortcuts.enter": "i tildin n tsuffeɣt",
   "keyboard_shortcuts.favourite": "akken ad ternuḍ ɣer yismenyifen",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Ticraḍ",
   "navigation_bar.community_timeline": "Tasuddemt tadigant",
   "navigation_bar.compose": "Aru tajewwiqt tamaynut",
-  "navigation_bar.direct": "Iznan usridden",
   "navigation_bar.discover": "Ẓer",
   "navigation_bar.domain_blocks": "Tiɣula yeffren",
   "navigation_bar.edit_profile": "Ẓreg amaɣnu",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Kkes asenqed",
   "privacy.change": "Seggem tabaḍnit n yizen",
   "privacy.direct.long": "Bḍu gar yimseqdacen i tbedreḍ kan",
-  "privacy.direct.short": "Usrid",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Bḍu i yimeḍfaṛen-ik kan",
-  "privacy.private.short": "Imeḍfaṛen kan",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Bḍu deg tsuddemt tazayezt",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Azayez",
-  "privacy.unlisted.long": "Ur beṭṭu ara deg tsuddemt tazayezt",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "War tabdert",
   "refresh": "Smiren",
   "regeneration_indicator.label": "Yessalay-d…",

app/javascript/mastodon/locales/kk.json

@@ -70,7 +70,7 @@
   "column.blocks": "Бұғатталғандар",
   "column.bookmarks": "Бетбелгілер",
   "column.community": "Жергілікті желі",
-  "column.direct": "Жеке хаттар",
+  "column.conversations": "Conversations",
   "column.directory": "Профильдерді аралау",
   "column.domain_blocks": "Жасырылған домендер",
   "column.favourites": "Таңдаулылар",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Тек жергілікті",
   "community.column_settings.media_only": "Тек медиа",
   "community.column_settings.remote_only": "Тек сыртқы",
-  "compose_form.direct_message_warning": "Тек аталған қолданушыларға.",
   "compose_form.direct_message_warning_learn_more": "Көбірек білу",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Бұл пост іздеуде хэштегпен шықпайды, өйткені ол бәріне ашық емес. Тек ашық жазбаларды ғана хэштег арқылы іздеп табуға болады.",
   "compose_form.lock_disclaimer": "Аккаунтыңыз {locked} емес. Кез келген адам жазылып, сізді оқи алады.",
   "compose_form.lock_disclaimer.lock": "жабық",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Ешкімді бұғаттамағансыз.",
   "empty_column.bookmarked_statuses": "Ешқандай жазба Бетбелгілер тізіміне қосылмапты. Қосылғаннан кейін осында жинала бастайды.",
   "empty_column.community": "Жергілікті желі бос. Сіз бастап жазыңыз!",
-  "empty_column.direct": "Әзірше дым хат жоқ. Өзіңіз жазып көріңіз алдымен.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "Бұғатталған домен жоқ.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Ешқандай жазба 'Таңдаулылар' тізіміне қосылмапты. Қосылғаннан кейін осында жинала бастайды.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "жазба бөлісу",
   "keyboard_shortcuts.column": "бағандардағы жазбаны оқу",
   "keyboard_shortcuts.compose": "пост жазу",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Сипаттама",
-  "keyboard_shortcuts.direct": "жеке хаттар бағаны",
   "keyboard_shortcuts.down": "тізімде төмен түсу",
   "keyboard_shortcuts.enter": "жазбаны ашу",
   "keyboard_shortcuts.favourite": "таңдаулыға қосу",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Бетбелгілер",
   "navigation_bar.community_timeline": "Жергілікті желі",
   "navigation_bar.compose": "Жаңа жазба бастау",
-  "navigation_bar.direct": "Жеке хаттар",
   "navigation_bar.discover": "шарлау",
   "navigation_bar.domain_blocks": "Жабық домендер",
   "navigation_bar.edit_profile": "Профиль түзету",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Сауалнаманы өшіру",
   "privacy.change": "Құпиялылықты реттеу",
   "privacy.direct.long": "Аталған адамдарға ғана көрінетін жазба",
-  "privacy.direct.short": "Тікелей",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Тек оқырмандарға арналған жазба",
-  "privacy.private.short": "Оқырмандарға ғана",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Ашық желіге жібер",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Ашық",
-  "privacy.unlisted.long": "Do not show in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Тізімсіз",
   "refresh": "Жаңарту",
   "regeneration_indicator.label": "Жүктеу…",

app/javascript/mastodon/locales/kn.json

@@ -70,7 +70,7 @@
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
   "column.community": "Local timeline",
-  "column.direct": "Direct messages",
+  "column.conversations": "Conversations",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "Hidden domains",
   "column.favourites": "Favourites",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Local only",
   "community.column_settings.media_only": "Media only",
   "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
   "compose_form.direct_message_warning_learn_more": "Learn more",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots 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.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Description",
-  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Edit profile",
@@ -370,9 +369,9 @@
   "privacy.direct.short": "Direct",
   "privacy.private.long": "Post to followers only",
   "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Post to public timelines",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Do not show in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Unlisted",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",

app/javascript/mastodon/locales/ko.json

@@ -70,7 +70,7 @@
   "column.blocks": "차단한 사용자",
   "column.bookmarks": "보관함",
   "column.community": "로컬 타임라인",
-  "column.direct": "다이렉트 메시지",
+  "column.conversations": "대화",
   "column.directory": "프로필 둘러보기",
   "column.domain_blocks": "차단한 도메인",
   "column.favourites": "좋아요",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "로컬만",
   "community.column_settings.media_only": "미디어만",
   "community.column_settings.remote_only": "원격만",
-  "compose_form.direct_message_warning": "이 게시물은 멘션 된 유저들에게만 보여집니다.",
   "compose_form.direct_message_warning_learn_more": "더 알아보기",
+  "compose_form.encryption_warning": "마스토돈의 게시물들은 종단간 암호화가 되지 않습니아. 위험한 정보를 마스토돈을 통해 전달하지 마세요.",
   "compose_form.hashtag_warning": "이 게시물은 어떤 해시태그로도 검색 되지 않습니다. 전체공개로 게시 된 게시물만이 해시태그로 검색 될 수 있습니다.",
   "compose_form.lock_disclaimer": "이 계정은 {locked}로 설정 되어 있지 않습니다. 누구나 이 계정을 팔로우 할 수 있으며, 팔로워 공개의 포스팅을 볼 수 있습니다.",
   "compose_form.lock_disclaimer.lock": "비공개",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "아직 아무도 차단하지 않았습니다.",
   "empty_column.bookmarked_statuses": "아직 보관한 게시물이 없습니다. 게시물을 보관하면 여기에 나타납니다.",
   "empty_column.community": "로컬 타임라인에 아무 것도 없습니다. 아무거나 적어 보세요!",
-  "empty_column.direct": "아직 다이렉트 메시지가 없습니다. 다이렉트 메시지를 보내거나 받은 경우, 여기에 표시 됩니다.",
+  "empty_column.conversations": "멘션한 사람만 볼 수 있는 게시물을 보내거나 받은 경우에, 여기에 나타납니다.",
   "empty_column.domain_blocks": "아직 차단한 도메인이 없습니다.",
   "empty_column.explore_statuses": "아직 유행하는 것이 없습니다. 나중에 다시 확인하세요!",
   "empty_column.favourited_statuses": "아직 마음에 들어한 게시물이 없습니다. 게시물을 좋아요 하면 여기에 나타납니다.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "게시물 부스트",
   "keyboard_shortcuts.column": "해당 컬럼에 포커스",
   "keyboard_shortcuts.compose": "작성창에 포커스",
+  "keyboard_shortcuts.conversations": "대화 컬럼 열기",
   "keyboard_shortcuts.description": "설명",
-  "keyboard_shortcuts.direct": "다이렉트 메시지 컬럼 열기",
   "keyboard_shortcuts.down": "리스트에서 아래로 이동",
   "keyboard_shortcuts.enter": "게시물 열기",
   "keyboard_shortcuts.favourite": "관심글 지정",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "보관함",
   "navigation_bar.community_timeline": "로컬 타임라인",
   "navigation_bar.compose": "새 게시물 작성",
-  "navigation_bar.direct": "다이렉트 메시지",
   "navigation_bar.discover": "발견하기",
   "navigation_bar.domain_blocks": "차단한 도메인",
   "navigation_bar.edit_profile": "프로필 편집",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "투표 삭제",
   "privacy.change": "게시물의 프라이버시 설정을 변경",
   "privacy.direct.long": "멘션한 사용자에게만 공개",
-  "privacy.direct.short": "다이렉트",
+  "privacy.direct.short": "내가 멘션한 사람만",
   "privacy.private.long": "팔로워에게만 공개",
-  "privacy.private.short": "비공개",
+  "privacy.private.short": "팔로워 전용",
-  "privacy.public.long": "공개 타임라인에 표시",
+  "privacy.public.long": "모두가 볼 수 있음",
   "privacy.public.short": "공개",
-  "privacy.unlisted.long": "공개 타임라인에 표시하지 않음",
+  "privacy.unlisted.long": "모두가 볼 수 있지만, 발견하기 기능에서는 제외됨",
   "privacy.unlisted.short": "타임라인에 비표시",
   "refresh": "새로고침",
   "regeneration_indicator.label": "불러오는 중…",

app/javascript/mastodon/locales/ku.json

@@ -70,7 +70,7 @@
   "column.blocks": "Bikarhênerên astengkirî",
   "column.bookmarks": "Şûnpel",
   "column.community": "Demnameya herêmî",
-  "column.direct": "Peyamên taybet",
+  "column.conversations": "Axaftin",
   "column.directory": "Li profîlan bigere",
   "column.domain_blocks": "Navperên astengkirî",
   "column.favourites": "Bijarte",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Tenê herêmî",
   "community.column_settings.media_only": "Tenê media",
   "community.column_settings.remote_only": "Tenê ji dûr ve",
-  "compose_form.direct_message_warning": "Ev şandî tenê ji bikarhênerên qalkirî re wê were şandin.",
   "compose_form.direct_message_warning_learn_more": "Bêtir fêr bibe",
+  "compose_form.encryption_warning": "Şandiyên li ser Mastodon dawî-bi-dawî ne şîfrekirî ne. Li ser Mastodon zanyariyên talûke parve neke.",
   "compose_form.hashtag_warning": "Ev şandî ji ber ku nehatiye tomarkirin dê di binê hashtagê de neyê tomar kirin. Tenê peyamên gelemperî dikarin bi hashtagê werin lêgerîn.",
   "compose_form.lock_disclaimer": "Ajimêrê te {locked} nîne. Herkes dikare te bişopîne da ku şandiyên te yên tenê şopînerên te ra xûya dibin bibînin.",
   "compose_form.lock_disclaimer.lock": "girtî ye",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Te tu bikarhêner asteng nekiriye.",
   "empty_column.bookmarked_statuses": "Hîn tu peyamên şûnpelkirî tuneye. Gava ku hûn yek şûnpel bikin, ew ê li vir xûya bike.",
   "empty_column.community": "Demnameya herêmî vala ye. Tiştek ji raya giştî re binivsînin da ku rûpel biherike!",
-  "empty_column.direct": "Hêj peyameke te yê rasterast tuneye. Gava ku tu yekî bişeynî an jî bigirî, ew ê li vir xûya bike.",
+  "empty_column.conversations": "Dema tu şandiyekê bişîninî an jî bistînî ku tenê ji kesên qalkirî re xuyabar in, ew ê li vir xuya bibe.",
   "empty_column.domain_blocks": "Hê jî navperên hatine asteng kirin tune ne.",
   "empty_column.explore_statuses": "Tiştek niha di rojevê de tune. Paşê vegere!",
   "empty_column.favourited_statuses": "Hîn tu peyamên te yên bijare tunene. Gava ku te yekî bijart, ew ê li vir xûya bike.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Şandiyê bilind bike",
   "keyboard_shortcuts.column": "Stûna balkişandinê",
   "keyboard_shortcuts.compose": "Bal bikşîne cîhê nivîsê/textarea",
+  "keyboard_shortcuts.conversations": "ji bo vekirina stûna axaftinan",
   "keyboard_shortcuts.description": "Danasîn",
-  "keyboard_shortcuts.direct": "Ji stûnê peyamên rasterast veke",
   "keyboard_shortcuts.down": "Di rêzokê de dakêşe jêr",
   "keyboard_shortcuts.enter": "Şandiyê veke",
   "keyboard_shortcuts.favourite": "Şandiya bijarte",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Şûnpel",
   "navigation_bar.community_timeline": "Demnameya herêmî",
   "navigation_bar.compose": "Şandiyeke nû binivsîne",
-  "navigation_bar.direct": "Peyamên rasterast",
   "navigation_bar.discover": "Vekolê",
   "navigation_bar.domain_blocks": "Navparên astengkirî",
   "navigation_bar.edit_profile": "Profîl serrast bike",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Rapirsî yê rake",
   "privacy.change": "Nepênîtiya şandiyan biguherîne",
   "privacy.direct.long": "Tenê ji bo bikarhênerên qalkirî tê dîtin",
-  "privacy.direct.short": "Taybet",
+  "privacy.direct.short": "Tenê mirovên ku min qalkirî",
   "privacy.private.long": "Tenê bo şopîneran xuyabar e",
   "privacy.private.short": "Tenê şopîneran",
-  "privacy.public.long": "Ji bo herkesî li berçav e, di demnameyên gelemperî de dê xûyakirin",
+  "privacy.public.long": "Ji bo hemûyan xuyabar e",
   "privacy.public.short": "Gelemperî",
-  "privacy.unlisted.long": "Ji herkesî ra tê xûya, lê demnameyê gelemperî ra nay xûyakirin",
+  "privacy.unlisted.long": "Ji bo hemûyan xuyabar e, lê ji taybetmendiyên vekolînê veqetiya ye",
   "privacy.unlisted.short": "Nerêzok",
   "refresh": "Nû bike",
   "regeneration_indicator.label": "Tê barkirin…",

app/javascript/mastodon/locales/kw.json

@@ -70,7 +70,7 @@
   "column.blocks": "Devnydhyoryon lettys",
   "column.bookmarks": "Folennosow",
   "column.community": "Amserlin leel",
-  "column.direct": "Messajys didro",
+  "column.conversations": "Conversations",
   "column.directory": "Peuri profilys",
   "column.domain_blocks": "Gorfarthow lettys",
   "column.favourites": "Re drudh",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Leel hepken",
   "community.column_settings.media_only": "Myski hepken",
   "community.column_settings.remote_only": "A-bell hepken",
-  "compose_form.direct_message_warning": "An post ma a vydh danvenys dhe'n dhevnydhyoryon menegys hepken.",
   "compose_form.direct_message_warning_learn_more": "Dyski moy",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Ny vydh an post ma diskwedhys yn-dann vòlnos vyth awos y vos mes a rol. Ny yllir hwilas saw poblow postek dre vòlnos.",
   "compose_form.lock_disclaimer": "Nyns yw agas akont {locked}. Piwpynag a yll agas holya dhe weles agas postow holyoryon-hepken.",
   "compose_form.lock_disclaimer.lock": "Alhwedhys",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Ny wrussowgh lettya devnydhyoryon vyth hwath.",
   "empty_column.bookmarked_statuses": "Nyns eus dhywgh postow gans folennos hwath. Pan wrewgh gorra onan, ev a wra omdhiskwedhes omma.",
   "empty_column.community": "An amserlin leel yw gwag. Skrifewgh neppytn yn poblek dh'y lonchya!",
-  "empty_column.direct": "Nyns eus dhywgh messajys didro hwath. Pan wrewgh dannvon po degemeres onan, ev a wra omdhiskwedhes omma.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "Nyns eus gorfarthow lettys hwath.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Nyns eus dhywgh postow drudh hwath. Pan wrewgh merkya onan vel drudh, ev a wra omdhiskwedhes omma.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Kenertha post",
   "keyboard_shortcuts.column": "Fogella koloven",
   "keyboard_shortcuts.compose": "Fogella tekstva gomposya",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Deskrifans",
-  "keyboard_shortcuts.direct": "Ygeri koloven messajys didro",
   "keyboard_shortcuts.down": "Movya war-nans y'n rol",
   "keyboard_shortcuts.enter": "Ygeri post",
   "keyboard_shortcuts.favourite": "Merkya post vel drudh",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Folennosow",
   "navigation_bar.community_timeline": "Amserlin leel",
   "navigation_bar.compose": "Komposya post nowydh",
-  "navigation_bar.direct": "Messajys didro",
   "navigation_bar.discover": "Diskudha",
   "navigation_bar.domain_blocks": "Gorfarthow lettys",
   "navigation_bar.edit_profile": "Golegi profil",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Dilea sondyans",
   "privacy.change": "Chanjya privetter an post",
   "privacy.direct.long": "Gweladow dhe'n dhevnydhyoryon menegys hepken",
-  "privacy.direct.short": "Didro",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Gweladow dhe holyoryon hepken",
-  "privacy.private.short": "Holyoryon-hepken",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Gweladow dhe beub, diskwedhys yn amserlinyow poblek",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Poblek",
-  "privacy.unlisted.long": "Gweladow dhe beub, a-der yn amserlinyow poblek",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Anrelys",
   "refresh": "Daskarga",
   "regeneration_indicator.label": "Ow karga…",

app/javascript/mastodon/locales/lt.json

@@ -70,7 +70,7 @@
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
   "column.community": "Local timeline",
-  "column.direct": "Direct messages",
+  "column.conversations": "Conversations",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "Hidden domains",
   "column.favourites": "Mėgstamiausi",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Local only",
   "community.column_settings.media_only": "Media only",
   "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
   "compose_form.direct_message_warning_learn_more": "Learn more",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots 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.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Description",
-  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Edit profile",
@@ -370,9 +369,9 @@
   "privacy.direct.short": "Direct",
   "privacy.private.long": "Post to followers only",
   "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Post to public timelines",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Do not show in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Unlisted",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",

app/javascript/mastodon/locales/lv.json

@@ -70,7 +70,7 @@
   "column.blocks": "Bloķētie lietotāji",
   "column.bookmarks": "Grāmatzīmes",
   "column.community": "Vietējā ziņu līnija",
-  "column.direct": "Privātās ziņas",
+  "column.conversations": "Sarunas",
   "column.directory": "Pārlūkot profilus",
   "column.domain_blocks": "Bloķētie domēni",
   "column.favourites": "Izlase",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Tikai vietējie",
   "community.column_settings.media_only": "Tikai mediji",
   "community.column_settings.remote_only": "Tikai attālinātie",
-  "compose_form.direct_message_warning": "Šis ziņojums tiks nosūtīts tikai pieminētajiem lietotājiem.",
   "compose_form.direct_message_warning_learn_more": "Uzzināt vairāk",
+  "compose_form.encryption_warning": "Ziņas vietnē Mastodon nav pilnībā šifrētas. Nedalies ar bīstamu informāciju caur Mastodon.",
   "compose_form.hashtag_warning": "Ziņojumu nebūs iespējams atrast zem haštagiem jo tas nav publisks. Tikai publiskos ziņojumus ir iespējams meklēt pēc tiem.",
   "compose_form.lock_disclaimer": "Tavs konts nav {locked}. Ikviens var Tev sekot lai apskatītu tikai sekotājiem paredzētos ziņojumus.",
   "compose_form.lock_disclaimer.lock": "slēgts",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Patreiz tu neesi nevienu bloķējis.",
   "empty_column.bookmarked_statuses": "Patreiz tev nav neviena grāmatzīmēm pievienota ieraksta. Kad tādu pievienosi, tas parādīsies šeit.",
   "empty_column.community": "Vietējā ziņu lenta ir tukša. Uzraksti kaut ko publiski, lai viss notiktu!",
-  "empty_column.direct": "Patrez tev nav privātu ziņu. Tiklīdz tādu nosūtīsi vai saņemsi, tās parādīsies šeit.",
+  "empty_column.conversations": "Kad nosūtīsi vai saņemsi ziņu, kas ir redzama tikai tajā minētajām personām, tā tiks parādīta šeit.",
   "empty_column.domain_blocks": "Vēl nav neviena bloķēta domēna.",
   "empty_column.explore_statuses": "Pašlaik nekas nav tendēts. Pārbaudiet vēlāk!",
   "empty_column.favourited_statuses": "Patreiz tev nav neviena izceltā ieraksta. Kad kādu izcelsi, tas parādīsies šeit.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Palielināt ziņu",
   "keyboard_shortcuts.column": "Fokusēt kolonnu",
   "keyboard_shortcuts.compose": "Fokusēt veidojamā teksta lauku",
+  "keyboard_shortcuts.conversations": "lai atvērtu sarunu kolonnu",
   "keyboard_shortcuts.description": "Apraksts",
-  "keyboard_shortcuts.direct": "Atvērt privāto ziņojumu kolonnu",
   "keyboard_shortcuts.down": "Pārvietot sarakstā uz leju",
   "keyboard_shortcuts.enter": "Atvērt ziņu",
   "keyboard_shortcuts.favourite": "Pievienot izlasei",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Grāmatzīmes",
   "navigation_bar.community_timeline": "Vietējā ziņu lenta",
   "navigation_bar.compose": "Veidot jaunu ziņu",
-  "navigation_bar.direct": "Privātās ziņas",
   "navigation_bar.discover": "Atklāt",
   "navigation_bar.domain_blocks": "Bloķētie domēni",
   "navigation_bar.edit_profile": "Rediģēt profilu",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Noņemt aptauju",
   "privacy.change": "Mainīt ziņas privātumu",
   "privacy.direct.long": "Redzams tikai pieminētajiem lietotājiem",
-  "privacy.direct.short": "Tiešs",
+  "privacy.direct.short": "Tikai cilvēki, kurus es pieminu",
   "privacy.private.long": "Redzams tikai sekotājiem",
   "privacy.private.short": "Tikai sekotājiem",
-  "privacy.public.long": "Redzams visiem, rāda publiskajās ziņu lentās",
+  "privacy.public.long": "Redzama visiem",
   "privacy.public.short": "Publisks",
-  "privacy.unlisted.long": "Redzams visiem, bet ne publiskajās ziņu lentās",
+  "privacy.unlisted.long": "Redzama visiem, bet atteicās no atklāšanas funkcijām",
   "privacy.unlisted.short": "Neminētie",
   "refresh": "Atsvaidzināt",
   "regeneration_indicator.label": "Ielādē…",

app/javascript/mastodon/locales/mk.json

@@ -70,7 +70,7 @@
   "column.blocks": "Блокирани корисници",
   "column.bookmarks": "Bookmarks",
   "column.community": "Локална временска зона",
-  "column.direct": "Директна порака",
+  "column.conversations": "Conversations",
   "column.directory": "Види профили",
   "column.domain_blocks": "Скриени домеини",
   "column.favourites": "Омилени",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Local only",
   "community.column_settings.media_only": "Само медиа",
   "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
   "compose_form.direct_message_warning_learn_more": "Научи повеќе",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "заклучен",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Немате сеуште блокирано корисници.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
   "empty_column.community": "Локалниот времеплов е празен. Објавете нешто јавно за да може да почне шоуто!",
-  "empty_column.direct": "Немате директни пораки. Кога ќе пратите или примите, ќе се појават тука.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "Немате сокриени домеини уште.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Description",
-  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Уреди профил",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Избришете анкета",
   "privacy.change": "Штеловај статус на приватност",
   "privacy.direct.long": "Објави само на спомнати корисници",
-  "privacy.direct.short": "Директно",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Објави само на следбеници",
-  "privacy.private.short": "Само следбеници",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Објави во јавни времплови",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Јавно",
-  "privacy.unlisted.long": "Не објавувај на јавни времеплови",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Необјавено",
   "refresh": "Освежи",
   "regeneration_indicator.label": "Вчитување…",

app/javascript/mastodon/locales/ml.json

@@ -70,7 +70,7 @@
   "column.blocks": "തടയപ്പെട്ട ഉപയോക്താക്കൾ",
   "column.bookmarks": "ബുക്ക്മാർക്കുകൾ",
   "column.community": "പ്രാദേശികമായ സമയരേഖ",
-  "column.direct": "നേരിട്ടുള്ള സന്ദേശങ്ങൾ",
+  "column.conversations": "Conversations",
   "column.directory": "പ്രൊഫൈലുകൾ മറിച്ചുനോക്കുക",
   "column.domain_blocks": "മറയ്ക്കപ്പെട്ട മേഖലകൾ",
   "column.favourites": "പ്രിയപ്പെട്ടവ",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "പ്രാദേശികം മാത്രം",
   "community.column_settings.media_only": "മാധ്യമങ്ങൾ മാത്രം",
   "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "പരാമർശിക്കപ്പെട്ടിരിക്കുന്ന ഉപയോഗ്താക്കൾക്കെ ഈ ടൂട്ട് അയക്കപ്പെടുകയുള്ളു.",
   "compose_form.direct_message_warning_learn_more": "കൂടുതൽ പഠിക്കുക",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "ഈ ടൂട്ട് പട്ടികയിൽ ഇല്ലാത്തതിനാൽ ഒരു ചർച്ചാവിഷയത്തിന്റെ പട്ടികയിലും പെടുകയില്ല. പരസ്യമായ ടൂട്ടുകൾ മാത്രമേ ചർച്ചാവിഷയം അടിസ്ഥാനമാക്കി തിരയുവാൻ സാധിക്കുകയുള്ളു.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "ലോക്കുചെയ്തു",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "നിങ്ങൾ ഇതുവരെ ഒരു ഉപയോക്താക്കളെയും തടഞ്ഞിട്ടില്ല.",
   "empty_column.bookmarked_statuses": "നിങ്ങൾക് ഇതുവരെ അടയാളപ്പെടുത്തിയ ടൂട്ടുകൾ ഇല്ല. അടയാളപ്പെടുത്തിയാൽ അത് ഇവിടെ വരും.",
   "empty_column.community": "പ്രാദേശികമായ സമയരേഖ ശൂന്യമാണ്. എന്തെങ്കിലും പരസ്യമായി എഴുതി തുടക്കം കുറിക്കു!",
-  "empty_column.direct": "നിങ്ങൾക്ക് ഇതുവരെ നേരിട്ടുള്ള സന്ദേശങ്ങൾ ഒന്നുമില്ല. നിങ്ങൾ അങ്ങനെ ഒന്ന് അയക്കുകയോ, നിങ്ങൾക്ക് ലഭിക്കുകയോ ചെയ്യുന്നപക്ഷം അതിവിടെ കാണപ്പെടുന്നതാണ്.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "മറയ്ക്കപ്പെട്ടിരിക്കുന്ന മേഖലകൾ ഇതുവരെ ഇല്ല.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "നിങ്ങൾക്ക് ഇത് വരെ ഒരു പ്രിയപ്പെട്ട ടൂട്ടും ഇല്ല. നിങ്ങൾ അങ്ങനെ ഒന്ന് പ്രിയപ്പെടുന്ന പക്ഷം അതിവിടെ കാണപ്പെടുന്നതാണ്.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "ബൂസ്റ്റ് ചെയ്യുക",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "വിവരണം",
-  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "ടൂട്ട് എടുക്കാൻ",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "ബുക്ക്മാർക്കുകൾ",
   "navigation_bar.community_timeline": "പ്രാദേശിക സമയരേഖ",
   "navigation_bar.compose": "പുതിയ ടൂട്ട് എഴുതുക",
-  "navigation_bar.direct": "നേരിട്ടുള്ള സന്ദേശങ്ങൾ",
   "navigation_bar.discover": "കണ്ടെത്തുക",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "പ്രൊഫൈൽ തിരുത്തുക",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "പോൾ നീക്കംചെയ്യുക",
   "privacy.change": "ടൂട്ട് സ്വകാര്യത ക്രമീകരിക്കുക",
   "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "നേരിട്ട്",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "പിന്തുടരുന്നവർക്ക് മാത്രം",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Post to public timelines",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "എല്ലാവര്‍ക്കും",
-  "privacy.unlisted.long": "Do not show in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Unlisted",
   "refresh": "പുതുക്കുക",
   "regeneration_indicator.label": "ലഭ്യമാക്കുന്നു…",

app/javascript/mastodon/locales/mr.json

@@ -70,7 +70,7 @@
   "column.blocks": "ब्लॉक केलेले खातेधारक",
   "column.bookmarks": "Bookmarks",
   "column.community": "Local timeline",
-  "column.direct": "थेट संदेश",
+  "column.conversations": "Conversations",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "गुप्त डोमेन्स",
   "column.favourites": "आवडते",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Local only",
   "community.column_settings.media_only": "केवळ मीडिया",
   "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
   "compose_form.direct_message_warning_learn_more": "अधिक जाणून घ्या",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots 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.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Description",
-  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Edit profile",
@@ -370,9 +369,9 @@
   "privacy.direct.short": "Direct",
   "privacy.private.long": "Post to followers only",
   "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Post to public timelines",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Do not show in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Unlisted",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",

app/javascript/mastodon/locales/ms.json

@@ -70,7 +70,7 @@
   "column.blocks": "Pengguna yang disekat",
   "column.bookmarks": "Tanda buku",
   "column.community": "Garis masa tempatan",
-  "column.direct": "Mesej terus",
+  "column.conversations": "Conversations",
   "column.directory": "Layari profil",
   "column.domain_blocks": "Domain disekat",
   "column.favourites": "Kegemaran",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Tempatan sahaja",
   "community.column_settings.media_only": "Media sahaja",
   "community.column_settings.remote_only": "Jauh sahaja",
-  "compose_form.direct_message_warning": "Hantaran ini hanya akan dihantar kepada pengguna yang disebut.",
   "compose_form.direct_message_warning_learn_more": "Ketahui lebih lanjut",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Hantaran ini tidak akan disenaraikan di bawah mana-mana tanda pagar kerana ia tidak tersenarai. Hanya hantaran awam sahaja boleh dicari menggunakan tanda pagar.",
   "compose_form.lock_disclaimer": "Akaun anda tidak {locked}. Sesiapa pun boleh mengikuti anda untuk melihat hantaran pengikut-sahaja anda.",
   "compose_form.lock_disclaimer.lock": "dikunci",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Anda belum menyekat sesiapa.",
   "empty_column.bookmarked_statuses": "Anda belum ada hantaran yang ditanda buku. Apabila anda menanda buku sesuatu, ia akan muncul di sini.",
   "empty_column.community": "Garis masa tempatan kosong. Tulislah secara awam untuk memulakan sesuatu!",
-  "empty_column.direct": "Anda tidak mempunyai mesej terus. Apabila anda menghantar atau menerimanya, ia akan muncul di sini.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "Belum ada domain yang disekat.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Anda belum ada hantaran yang digemari. Apabila anda menggemari sesuatu, ia akan muncul di sini.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "Tumpu pada lajur",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Keterangan",
-  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "Buka hantaran",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Tanda buku",
   "navigation_bar.community_timeline": "Garis masa tempatan",
   "navigation_bar.compose": "Karang hantaran baharu",
-  "navigation_bar.direct": "Mesej terus",
   "navigation_bar.discover": "Teroka",
   "navigation_bar.domain_blocks": "Domain disekat",
   "navigation_bar.edit_profile": "Sunting profil",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Buang undian",
   "privacy.change": "Ubah privasi hantaran",
   "privacy.direct.long": "Hanya boleh dilihat oleh pengguna disebut",
-  "privacy.direct.short": "Terus",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Hanya boleh dilihat oleh pengikut",
-  "privacy.private.short": "Pengikut sahaja",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Boleh dilihat oleh semua orang, ditunjukkan di garis masa awam",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Awam",
-  "privacy.unlisted.long": "Boleh dilihat oleh semua orang, tapi jangan tunjukkan di garis masa awam",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Tidak tersenarai",
   "refresh": "Muat semula",
   "regeneration_indicator.label": "Memuatkan…",

app/javascript/mastodon/locales/nl.json

@@ -70,7 +70,7 @@
   "column.blocks": "Geblokkeerde gebruikers",
   "column.bookmarks": "Bladwijzers",
   "column.community": "Lokale tijdlijn",
-  "column.direct": "Directe berichten",
+  "column.conversations": "Gesprekken",
   "column.directory": "Gebruikersgids",
   "column.domain_blocks": "Geblokkeerde domeinen",
   "column.favourites": "Favorieten",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Alleen lokaal",
   "community.column_settings.media_only": "Alleen media",
   "community.column_settings.remote_only": "Alleen andere servers",
-  "compose_form.direct_message_warning": "Dit bericht wordt alleen naar vermelde gebruikers verstuurd.",
   "compose_form.direct_message_warning_learn_more": "Meer leren",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Dit bericht valt niet onder een hashtag te bekijken, omdat deze niet op openbare tijdlijnen wordt getoond. Alleen openbare berichten kunnen via hashtags gevonden worden.",
   "compose_form.lock_disclaimer": "Jouw account is niet {locked}. Iedereen kan jou volgen en kan de berichten zien die je alleen aan jouw volgers hebt gericht.",
   "compose_form.lock_disclaimer.lock": "besloten",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Jij hebt nog geen enkele gebruiker geblokkeerd.",
   "empty_column.bookmarked_statuses": "Jij hebt nog geen berichten aan je bladwijzers toegevoegd. Wanneer je er een aan jouw bladwijzers toevoegt, valt deze hier te zien.",
   "empty_column.community": "De lokale tijdlijn is nog leeg. Plaats een openbaar bericht om de spits af te bijten!",
-  "empty_column.direct": "Je hebt nog geen directe berichten. Wanneer je er een verzend of ontvangt, zijn deze hier te zien.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "Er zijn nog geen geblokkeerde domeinen.",
   "empty_column.explore_statuses": "Momenteel zijn er geen trends. Kom later terug!",
   "empty_column.favourited_statuses": "Jij hebt nog geen favoriete berichten. Wanneer je er een aan jouw favorieten toevoegt, valt deze hier te zien.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Bericht boosten",
   "keyboard_shortcuts.column": "Op één van de kolommen focussen",
   "keyboard_shortcuts.compose": "Tekstveld om een bericht te schrijven focussen",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Omschrijving",
-  "keyboard_shortcuts.direct": "Jouw directe berichten tonen",
   "keyboard_shortcuts.down": "Naar beneden in de lijst bewegen",
   "keyboard_shortcuts.enter": "Volledig bericht tonen",
   "keyboard_shortcuts.favourite": "Aan jouw favorieten toevoegen",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Bladwijzers",
   "navigation_bar.community_timeline": "Lokale tijdlijn",
   "navigation_bar.compose": "Nieuw bericht schrijven",
-  "navigation_bar.direct": "Directe berichten",
   "navigation_bar.discover": "Ontdekken",
   "navigation_bar.domain_blocks": "Geblokkeerde domeinen",
   "navigation_bar.edit_profile": "Profiel bewerken",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Poll verwijderen",
   "privacy.change": "Zichtbaarheid van bericht aanpassen",
   "privacy.direct.long": "Alleen aan vermelde gebruikers tonen",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "Alleen gebruikers die ik noem",
   "privacy.private.long": "Alleen aan volgers tonen",
   "privacy.private.short": "Alleen volgers",
-  "privacy.public.long": "Voor iedereen zichtbaar en op openbare tijdlijnen tonen",
+  "privacy.public.long": "Voor iedereen zichtbaar",
   "privacy.public.short": "Openbaar",
-  "privacy.unlisted.long": "Voor iedereen zichtbaar, maar niet op openbare tijdlijnen tonen",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Minder openbaar",
   "refresh": "Vernieuwen",
   "regeneration_indicator.label": "Aan het laden…",
@@ -515,7 +514,7 @@
   "upload_error.poll": "Het uploaden van bestanden is in polls niet toegestaan.",
   "upload_form.audio_description": "Omschrijf dit voor mensen met een auditieve beperking",
   "upload_form.description": "Omschrijf dit voor mensen met een visuele beperking",
-  "upload_form.description_missing": "No description added",
+  "upload_form.description_missing": "Geen omschrijving toegevoegd",
   "upload_form.edit": "Bewerken",
   "upload_form.thumbnail": "Miniatuurafbeelding wijzigen",
   "upload_form.undo": "Verwijderen",

app/javascript/mastodon/locales/nn.json

@@ -18,7 +18,7 @@
   "account.followers": "Fylgjarar",
   "account.followers.empty": "Ingen fylgjer denne brukaren enno.",
   "account.followers_counter": "{count, plural, one {{counter} fylgjar} other {{counter} fylgjarar}}",
-  "account.following": "Following",
+  "account.following": "Følger",
   "account.following_counter": "{count, plural, one {{counter} fylgjar} other {{counter} fylgjar}}",
   "account.follows.empty": "Denne brukaren fylgjer ikkje nokon enno.",
   "account.follows_you": "Fylgjer deg",
@@ -41,16 +41,16 @@
   "account.statuses_counter": "{count, plural, one {{counter} tut} other {{counter} tut}}",
   "account.unblock": "Slutt å blokera @{name}",
   "account.unblock_domain": "Vis {domain}",
-  "account.unblock_short": "Unblock",
+  "account.unblock_short": "Opphev blokkering",
   "account.unendorse": "Ikkje framhev på profil",
   "account.unfollow": "Slutt å fylgja",
   "account.unmute": "Av-demp @{name}",
   "account.unmute_notifications": "Vis varsel frå @{name}",
-  "account.unmute_short": "Unmute",
+  "account.unmute_short": "Opphev demping",
   "account_note.placeholder": "Klikk for å leggja til merknad",
   "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
   "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
-  "admin.dashboard.retention.average": "Average",
+  "admin.dashboard.retention.average": "Gjennomsnitt",
   "admin.dashboard.retention.cohort": "Sign-up month",
   "admin.dashboard.retention.cohort_size": "Nye brukere",
   "alert.rate_limited.message": "Ver venleg å prøva igjen etter {retry_time, time, medium}.",
@@ -70,7 +70,7 @@
   "column.blocks": "Blokkerte brukarar",
   "column.bookmarks": "Bokmerke",
   "column.community": "Lokal tidsline",
-  "column.direct": "Meldingar",
+  "column.conversations": "Conversations",
   "column.directory": "Sjå gjennom profilar",
   "column.domain_blocks": "Gøymde domene",
   "column.favourites": "Favorittar",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Berre lokalt",
   "community.column_settings.media_only": "Berre media",
   "community.column_settings.remote_only": "Berre eksternt",
-  "compose_form.direct_message_warning": "Dette tutet vert berre synleg for nemnde brukarar.",
   "compose_form.direct_message_warning_learn_more": "Lær meir",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Dette tutet vert ikkje oppført under nokon emneknagg sidan det ikkje er oppført. Berre offentlege tut kan verta søkt etter med emneknagg.",
   "compose_form.lock_disclaimer": "Kontoen din er ikkje {locked}. Kven som helst kan fylgja deg for å sjå innlegga dine som berre visast til fylgjarar.",
   "compose_form.lock_disclaimer.lock": "låst",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Du har ikkje blokkert nokon brukarar enno.",
   "empty_column.bookmarked_statuses": "Du har ikkje nokon bokmerkte tut enno. Når du bokmerkjer eit, dukkar det opp her.",
   "empty_column.community": "Den lokale samtiden er tom. Skriv noko offentleg å få ballen til å rulle!",
-  "empty_column.direct": "Du har ingen direktemeldingar ennå. Når du sender eller får ein vil den dukke opp her.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "Det er ingen gøymde domene ennå.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Du har ingen favoritt-tut ennå. Når du merkjer ein som favoritt, så dukkar det opp her.",
@@ -187,11 +187,11 @@
   "error.unexpected_crash.next_steps_addons": "Prøv å deaktivere dem og laste siden på nytt. Hvis det ikke hjelper, kan du fremdeles bruke Mastodon via en annen nettleser eller en annen app.",
   "errors.unexpected_crash.copy_stacktrace": "Kopier stacktrace til utklippstavla",
   "errors.unexpected_crash.report_issue": "Rapporter problem",
-  "explore.search_results": "Search results",
+  "explore.search_results": "Søkeresultater",
-  "explore.suggested_follows": "For you",
+  "explore.suggested_follows": "For deg",
-  "explore.title": "Explore",
+  "explore.title": "Utforsk",
-  "explore.trending_links": "News",
+  "explore.trending_links": "Nyheter",
-  "explore.trending_statuses": "Posts",
+  "explore.trending_statuses": "Innlegg",
   "explore.trending_tags": "Hashtags",
   "follow_recommendations.done": "Ferdig",
   "follow_recommendations.heading": "Følg folk du ønsker å se innlegg fra! Her er noen forslag.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "for å framheva",
   "keyboard_shortcuts.column": "for å fokusera på ein status i ei av kolonnane",
   "keyboard_shortcuts.compose": "for å fokusera tekstfeltet for skriving",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Skildring",
-  "keyboard_shortcuts.direct": "for å opna direktemeldingskolonna",
   "keyboard_shortcuts.down": "for å flytta seg opp og ned i lista",
   "keyboard_shortcuts.enter": "for å opna status",
   "keyboard_shortcuts.favourite": "for å merkja som favoritt",
@@ -290,11 +290,10 @@
   "navigation_bar.bookmarks": "Bokmerke",
   "navigation_bar.community_timeline": "Lokal tidsline",
   "navigation_bar.compose": "Lag eit nytt tut",
-  "navigation_bar.direct": "Direktemeldingar",
   "navigation_bar.discover": "Oppdag",
   "navigation_bar.domain_blocks": "Skjulte domene",
   "navigation_bar.edit_profile": "Rediger profil",
-  "navigation_bar.explore": "Explore",
+  "navigation_bar.explore": "Utforsk",
   "navigation_bar.favourites": "Favorittar",
   "navigation_bar.filters": "Målbundne ord",
   "navigation_bar.follow_requests": "Fylgjeførespurnader",
@@ -338,7 +337,7 @@
   "notifications.column_settings.status": "Nye tuter:",
   "notifications.column_settings.unread_notifications.category": "Unread notifications",
   "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
-  "notifications.column_settings.update": "Edits:",
+  "notifications.column_settings.update": "Redigeringer:",
   "notifications.filter.all": "Alle",
   "notifications.filter.boosts": "Framhevingar",
   "notifications.filter.favourites": "Favorittar",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Fjern røyst",
   "privacy.change": "Juster status-synlegheit",
   "privacy.direct.long": "Legg berre ut for nemnde brukarar",
-  "privacy.direct.short": "Direkte",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Post kun til følgjarar",
-  "privacy.private.short": "Kun følgjarar",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Post til offentlege tidslinjer",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Offentleg",
-  "privacy.unlisted.long": "Ikkje post til offentlege tidslinjer",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Uoppført",
   "refresh": "Oppdater",
   "regeneration_indicator.label": "Lastar…",
@@ -389,28 +388,28 @@
   "relative_time.seconds": "{number}sek",
   "relative_time.today": "i dag",
   "reply_indicator.cancel": "Avbryt",
-  "report.block": "Block",
+  "report.block": "Blokker",
   "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
   "report.categories.other": "Other",
-  "report.categories.spam": "Spam",
+  "report.categories.spam": "Søppelpost",
   "report.categories.violation": "Content violates one or more server rules",
   "report.category.subtitle": "Choose the best match",
   "report.category.title": "Tell us what's going on with this {type}",
-  "report.category.title_account": "profile",
+  "report.category.title_account": "profil",
-  "report.category.title_status": "post",
+  "report.category.title_status": "innlegg",
-  "report.close": "Done",
+  "report.close": "Utført",
   "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Vidaresend til {target}",
   "report.forward_hint": "Kontoen er frå ein annan tenar. Vil du senda ein anonymisert kopi av rapporten dit òg?",
-  "report.mute": "Mute",
+  "report.mute": "Demp",
   "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
-  "report.next": "Next",
+  "report.next": "Neste",
   "report.placeholder": "Tilleggskommentarar",
-  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike": "Jeg liker det ikke",
   "report.reasons.dislike_description": "It is not something you want to see",
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
-  "report.reasons.spam": "It's spam",
+  "report.reasons.spam": "Det er spam",
   "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
@@ -515,7 +514,7 @@
   "upload_error.poll": "Filopplasting ikkje tillate med meiningsmålingar.",
   "upload_form.audio_description": "Grei ut for folk med nedsett høyrsel",
   "upload_form.description": "Skildr for synshemja",
-  "upload_form.description_missing": "No description added",
+  "upload_form.description_missing": "Ingen beskrivelse lagt til",
   "upload_form.edit": "Rediger",
   "upload_form.thumbnail": "Bytt miniatyrbilete",
   "upload_form.undo": "Slett",

app/javascript/mastodon/locales/no.json

@@ -18,7 +18,7 @@
   "account.followers": "Følgere",
   "account.followers.empty": "Ingen følger denne brukeren ennå.",
   "account.followers_counter": "{count, plural, one {{counter} følger} other {{counter} følgere}}",
-  "account.following": "Following",
+  "account.following": "Følger",
   "account.following_counter": "{count, plural, one {{counter} som følges} other {{counter} som følges}}",
   "account.follows.empty": "Denne brukeren følger ikke noen enda.",
   "account.follows_you": "Følger deg",
@@ -41,16 +41,16 @@
   "account.statuses_counter": "{count, plural, one {{counter} tut} other {{counter} tuter}}",
   "account.unblock": "Avblokker @{name}",
   "account.unblock_domain": "Vis {domain}",
-  "account.unblock_short": "Unblock",
+  "account.unblock_short": "Opphev blokkering",
   "account.unendorse": "Ikke vis frem på profilen",
   "account.unfollow": "Avfølg",
   "account.unmute": "Avdemp @{name}",
   "account.unmute_notifications": "Vis varsler fra @{name}",
-  "account.unmute_short": "Unmute",
+  "account.unmute_short": "Opphev demping",
   "account_note.placeholder": "Klikk for å legge til et notat",
   "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
   "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
-  "admin.dashboard.retention.average": "Average",
+  "admin.dashboard.retention.average": "Gjennomsnitt",
   "admin.dashboard.retention.cohort": "Sign-up month",
   "admin.dashboard.retention.cohort_size": "Nye brukere",
   "alert.rate_limited.message": "Vennligst prøv igjen etter kl. {retry_time, time, medium}.",
@@ -70,7 +70,7 @@
   "column.blocks": "Blokkerte brukere",
   "column.bookmarks": "Bokmerker",
   "column.community": "Lokal tidslinje",
-  "column.direct": "Direktemeldinger",
+  "column.conversations": "Conversations",
   "column.directory": "Bla gjennom profiler",
   "column.domain_blocks": "Skjulte domener",
   "column.favourites": "Likt",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Kun lokalt",
   "community.column_settings.media_only": "Media only",
   "community.column_settings.remote_only": "Kun eksternt",
-  "compose_form.direct_message_warning": "This toot will only be visible to all the mentioned users.",
   "compose_form.direct_message_warning_learn_more": "Lær mer",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Denne tuten blir ikke listet under noen emneknagger da den er ulistet. Kun offentlige tuter kan søktes etter med emneknagg.",
   "compose_form.lock_disclaimer": "Din konto er ikke {locked}. Hvem som helst kan følge deg og se dine private poster.",
   "compose_form.lock_disclaimer.lock": "låst",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Du har ikke blokkert noen brukere enda.",
   "empty_column.bookmarked_statuses": "Du har ikke bokmerket noen tuter enda. Når du bokmerker en, vil den dukke opp her.",
   "empty_column.community": "Den lokale tidslinjen er tom. Skriv noe offentlig for å få snøballen til å rulle!",
-  "empty_column.direct": "Du har ingen direktemeldinger enda. Når du mottar eller sender en, vil den dukke opp her.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "Det er ingen skjulte domener enda.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Du har ikke likt noen tuter enda. Når du liker en, vil den dukke opp her.",
@@ -187,11 +187,11 @@
   "error.unexpected_crash.next_steps_addons": "Prøv å deaktivere dem og laste siden på nytt. Hvis det ikke hjelper, kan du fremdeles bruke Mastodon via en annen nettleser eller en annen app.",
   "errors.unexpected_crash.copy_stacktrace": "Kopier stacktrace-en til utklippstavlen",
   "errors.unexpected_crash.report_issue": "Rapporter en feil",
-  "explore.search_results": "Search results",
+  "explore.search_results": "Søkeresultater",
-  "explore.suggested_follows": "For you",
+  "explore.suggested_follows": "For deg",
-  "explore.title": "Explore",
+  "explore.title": "Utforsk",
-  "explore.trending_links": "News",
+  "explore.trending_links": "Nyheter",
-  "explore.trending_statuses": "Posts",
+  "explore.trending_statuses": "Innlegg",
   "explore.trending_tags": "Hashtags",
   "follow_recommendations.done": "Utført",
   "follow_recommendations.heading": "Følg folk du ønsker å se innlegg fra! Her er noen forslag.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "å fremheve",
   "keyboard_shortcuts.column": "å fokusere en status i en av kolonnene",
   "keyboard_shortcuts.compose": "å fokusere komponeringsfeltet",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Beskrivelse",
-  "keyboard_shortcuts.direct": "åpne direktemeldingskolonnen",
   "keyboard_shortcuts.down": "for å flytte ned i listen",
   "keyboard_shortcuts.enter": "å åpne status",
   "keyboard_shortcuts.favourite": "for å favorittmarkere",
@@ -290,11 +290,10 @@
   "navigation_bar.bookmarks": "Bokmerker",
   "navigation_bar.community_timeline": "Lokal tidslinje",
   "navigation_bar.compose": "Skriv en ny tut",
-  "navigation_bar.direct": "Direktemeldinger",
   "navigation_bar.discover": "Oppdag",
   "navigation_bar.domain_blocks": "Skjulte domener",
   "navigation_bar.edit_profile": "Rediger profil",
-  "navigation_bar.explore": "Explore",
+  "navigation_bar.explore": "Utforsk",
   "navigation_bar.favourites": "Favoritter",
   "navigation_bar.filters": "Stilnede ord",
   "navigation_bar.follow_requests": "Følgeforespørsler",
@@ -338,7 +337,7 @@
   "notifications.column_settings.status": "Nye tuter:",
   "notifications.column_settings.unread_notifications.category": "Unread notifications",
   "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
-  "notifications.column_settings.update": "Edits:",
+  "notifications.column_settings.update": "Redigeringer:",
   "notifications.filter.all": "Alle",
   "notifications.filter.boosts": "Fremhevinger",
   "notifications.filter.favourites": "Favoritter",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Fjern avstemningen",
   "privacy.change": "Justér synlighet",
   "privacy.direct.long": "Post kun til nevnte brukere",
-  "privacy.direct.short": "Direkte",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Post kun til følgere",
-  "privacy.private.short": "Privat",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Post kun til offentlige tidslinjer",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Offentlig",
-  "privacy.unlisted.long": "Ikke vis i offentlige tidslinjer",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Uoppført",
   "refresh": "Oppfrisk",
   "regeneration_indicator.label": "Laster…",
@@ -389,28 +388,28 @@
   "relative_time.seconds": "{number}s",
   "relative_time.today": "i dag",
   "reply_indicator.cancel": "Avbryt",
-  "report.block": "Block",
+  "report.block": "Blokker",
   "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
   "report.categories.other": "Other",
-  "report.categories.spam": "Spam",
+  "report.categories.spam": "Søppelpost",
   "report.categories.violation": "Content violates one or more server rules",
   "report.category.subtitle": "Choose the best match",
   "report.category.title": "Tell us what's going on with this {type}",
-  "report.category.title_account": "profile",
+  "report.category.title_account": "profil",
-  "report.category.title_status": "post",
+  "report.category.title_status": "innlegg",
-  "report.close": "Done",
+  "report.close": "Utført",
   "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Videresend til {target}",
   "report.forward_hint": "Denne kontoen er fra en annen tjener. Vil du sende en anonymisert kopi av rapporten dit også?",
-  "report.mute": "Mute",
+  "report.mute": "Demp",
   "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
-  "report.next": "Next",
+  "report.next": "Neste",
   "report.placeholder": "Tilleggskommentarer",
-  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike": "Jeg liker det ikke",
   "report.reasons.dislike_description": "It is not something you want to see",
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
-  "report.reasons.spam": "It's spam",
+  "report.reasons.spam": "Det er spam",
   "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
@@ -515,7 +514,7 @@
   "upload_error.poll": "Filopplasting inni avstemninger er ikke tillatt.",
   "upload_form.audio_description": "Beskriv det for folk med hørselstap",
   "upload_form.description": "Beskriv for synshemmede",
-  "upload_form.description_missing": "No description added",
+  "upload_form.description_missing": "Ingen beskrivelse lagt til",
   "upload_form.edit": "Rediger",
   "upload_form.thumbnail": "Endre miniatyrbilde",
   "upload_form.undo": "Angre",

app/javascript/mastodon/locales/oc.json

@@ -70,7 +70,7 @@
   "column.blocks": "Personas blocadas",
   "column.bookmarks": "Marcadors",
   "column.community": "Flux public local",
-  "column.direct": "Messatges dirèctes",
+  "column.conversations": "Conversations",
   "column.directory": "Percórrer los perfils",
   "column.domain_blocks": "Domenis resconduts",
   "column.favourites": "Favorits",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Sonque local",
   "community.column_settings.media_only": "Solament los mèdias",
   "community.column_settings.remote_only": "Sonque alonhat",
-  "compose_form.direct_message_warning": "Sols los mencionats poiràn veire aqueste tut.",
   "compose_form.direct_message_warning_learn_more": "Ne saber mai",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Aqueste tut serà pas ligat a cap d’etiqueta estant qu’es pas listat. Òm pòt pas cercar que los tuts publics per etiqueta.",
   "compose_form.lock_disclaimer": "Vòstre compte es pas {locked}. Tot lo mond pòt vos sègre e veire los estatuts reservats als seguidors.",
   "compose_form.lock_disclaimer.lock": "clavat",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Avètz pas blocat degun pel moment.",
   "empty_column.bookmarked_statuses": "Avètz pas cap de tuts marcats pel moment. Quand ne marquetz un, serà mostrat aquí.",
   "empty_column.community": "Lo flux public local es void. Escrivètz quicòm per lo garnir !",
-  "empty_column.direct": "Avètz pas encara cap de messatges. Quand ne mandatz un o que ne recebètz un, serà mostrat aquí.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "I a pas encara cap de domeni amagat.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Avètz pas encara cap de tut favorit. Quand n’auretz un, apareisserà aquí.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "partejar",
   "keyboard_shortcuts.column": "centrar un estatut a una colomna",
   "keyboard_shortcuts.compose": "anar al camp tèxte",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "descripcion",
-  "keyboard_shortcuts.direct": "dobrir la colomna de messatges dirèctes",
   "keyboard_shortcuts.down": "far davalar dins la lista",
   "keyboard_shortcuts.enter": "dobrir los estatuts",
   "keyboard_shortcuts.favourite": "apondre als favorits",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Marcadors",
   "navigation_bar.community_timeline": "Flux public local",
   "navigation_bar.compose": "Escriure un nòu tut",
-  "navigation_bar.direct": "Messatges dirèctes",
   "navigation_bar.discover": "Trobar",
   "navigation_bar.domain_blocks": "Domenis resconduts",
   "navigation_bar.edit_profile": "Modificar lo perfil",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Levar lo sondatge",
   "privacy.change": "Ajustar la confidencialitat del messatge",
   "privacy.direct.long": "Mostrar pas qu’a las personas mencionadas",
-  "privacy.direct.short": "Dirècte",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Mostrar pas qu’a vòstres seguidors",
-  "privacy.private.short": "Privat",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Mostrar dins los fluxes publics",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Mostrar pas dins los fluxes publics",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Pas-listat",
   "refresh": "Actualizar",
   "regeneration_indicator.label": "Cargament…",

app/javascript/mastodon/locales/pa.json

@@ -70,7 +70,7 @@
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
   "column.community": "Local timeline",
-  "column.direct": "Direct messages",
+  "column.conversations": "Conversations",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "Blocked domains",
   "column.favourites": "Favourites",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Local only",
   "community.column_settings.media_only": "Media only",
   "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
   "compose_form.direct_message_warning_learn_more": "Learn more",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots 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.conversations": "Once you send or receive a post that's only visible to people mentioned in it, 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 toots yet. When you favourite one, it will show up here.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Description",
-  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Edit profile",
@@ -370,9 +369,9 @@
   "privacy.direct.short": "Direct",
   "privacy.private.long": "Visible for followers only",
   "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all, shown in public timelines",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but not in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Unlisted",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",

app/javascript/mastodon/locales/pl.json

@@ -70,7 +70,7 @@
   "column.blocks": "Zablokowani użytkownicy",
   "column.bookmarks": "Zakładki",
   "column.community": "Lokalna oś czasu",
-  "column.direct": "Wiadomości bezpośrednie",
+  "column.conversations": "Konwersacje",
   "column.directory": "Przeglądaj profile",
   "column.domain_blocks": "Ukryte domeny",
   "column.favourites": "Ulubione",
@@ -96,8 +96,8 @@
   "community.column_settings.local_only": "Tylko Lokalne",
   "community.column_settings.media_only": "Tylko zawartość multimedialna",
   "community.column_settings.remote_only": "Tylko Zdalne",
-  "compose_form.direct_message_warning": "Ten wpis będzie widoczny tylko dla wszystkich wspomnianych użytkowników.",
   "compose_form.direct_message_warning_learn_more": "Dowiedz się więcej",
+  "compose_form.encryption_warning": "Posty na Mastodon nie są szyfrowane end-to-end. Nie udostępniaj żadnych wrażliwych informacji przez Mastodon.",
   "compose_form.hashtag_warning": "Ten wpis nie będzie widoczny pod podanymi hasztagami, ponieważ jest oznaczony jako niewidoczny. Tylko publiczne wpisy mogą zostać znalezione z użyciem hasztagów.",
   "compose_form.lock_disclaimer": "Twoje konto nie jest {locked}. Każdy, kto Cię śledzi, może wyświetlać Twoje wpisy przeznaczone tylko dla śledzących.",
   "compose_form.lock_disclaimer.lock": "zablokowane",
@@ -170,7 +170,7 @@
   "empty_column.blocks": "Nie zablokowałeś(-aś) jeszcze żadnego użytkownika.",
   "empty_column.bookmarked_statuses": "Nie dodałeś(-aś) żadnego wpisu do zakładek. Kiedy to zrobisz, pojawi się on tutaj.",
   "empty_column.community": "Lokalna oś czasu jest pusta. Napisz coś publicznie, aby zagaić!",
-  "empty_column.direct": "Nie masz żadnych wiadomości bezpośrednich. Kiedy dostaniesz lub wyślesz jakąś, pojawi się ona tutaj.",
+  "empty_column.conversations": "Gdy wyślesz lub otrzymasz wpis, który jest widoczny tylko dla osób w nim wymienionych, pojawi się on tutaj.",
   "empty_column.domain_blocks": "Brak ukrytych domen.",
   "empty_column.explore_statuses": "Nic nie jest w tej chwili popularne. Sprawdź później!",
   "empty_column.favourited_statuses": "Nie dodałeś(-aś) żadnego wpisu do ulubionych. Kiedy to zrobisz, pojawi się on tutaj.",
@@ -234,8 +234,8 @@
   "keyboard_shortcuts.boost": "aby podbić wpis",
   "keyboard_shortcuts.column": "aby przejść do wpisu z jednej z kolumn",
   "keyboard_shortcuts.compose": "aby przejść do pola tworzenia wpisu",
+  "keyboard_shortcuts.conversations": "aby otworzyć kolumnę konwersacji",
   "keyboard_shortcuts.description": "Opis",
-  "keyboard_shortcuts.direct": "aby otworzyć kolumnę wiadomości bezpośrednich",
   "keyboard_shortcuts.down": "aby przejść na dół listy",
   "keyboard_shortcuts.enter": "aby otworzyć wpis",
   "keyboard_shortcuts.favourite": "aby dodać do ulubionych",
@@ -294,7 +294,6 @@
   "navigation_bar.bookmarks": "Zakładki",
   "navigation_bar.community_timeline": "Lokalna oś czasu",
   "navigation_bar.compose": "Utwórz nowy wpis",
-  "navigation_bar.direct": "Wiadomości bezpośrednie",
   "navigation_bar.discover": "Odkrywaj",
   "navigation_bar.domain_blocks": "Ukryte domeny",
   "navigation_bar.edit_profile": "Edytuj profil",
@@ -372,12 +371,12 @@
   "poll_button.remove_poll": "Usuń głosowanie",
   "privacy.change": "Dostosuj widoczność wpisów",
   "privacy.direct.long": "Widoczny tylko dla wspomnianych",
-  "privacy.direct.short": "Bezpośrednio",
+  "privacy.direct.short": "Tylko wspominane osoby",
   "privacy.private.long": "Widoczny tylko dla osób, które Cię śledzą",
-  "privacy.private.short": "Tylko dla śledzących",
+  "privacy.private.short": "Tylko śledzący",
-  "privacy.public.long": "Widoczny na publicznych osiach czasu",
+  "privacy.public.long": "Widoczne dla każdego",
   "privacy.public.short": "Publiczny",
-  "privacy.unlisted.long": "Niewidoczny na publicznych osiach czasu",
+  "privacy.unlisted.long": "Widoczne dla każdego, z wyłączeniem funkcji odkrywania",
   "privacy.unlisted.short": "Niewidoczny",
   "refresh": "Odśwież",
   "regeneration_indicator.label": "Ładuję…",

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

@@ -70,7 +70,7 @@
   "column.blocks": "Usuários bloqueados",
   "column.bookmarks": "Salvos",
   "column.community": "Linha local",
-  "column.direct": "Toots Diretos",
+  "column.conversations": "Conversations",
   "column.directory": "Explorar perfis",
   "column.domain_blocks": "Domínios bloqueados",
   "column.favourites": "Favoritos",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Somente local",
   "community.column_settings.media_only": "Somente mídia",
   "community.column_settings.remote_only": "Somente global",
-  "compose_form.direct_message_warning": "Este toot só será enviado aos usuários mencionados.",
   "compose_form.direct_message_warning_learn_more": "Saiba mais",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Este toot não aparecerá em nenhuma hashtag porque está como não-listado. Somente toots públicos podem ser pesquisados por hashtag.",
   "compose_form.lock_disclaimer": "Seu perfil não está {locked}. Qualquer um pode te seguir e ver os toots privados.",
   "compose_form.lock_disclaimer.lock": "trancado",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Nada aqui.",
   "empty_column.bookmarked_statuses": "Nada aqui. Quando você salvar um toot, ele aparecerá aqui.",
   "empty_column.community": "A linha local está vazia. Publique algo para começar!",
-  "empty_column.direct": "Nada aqui. Quando você enviar ou receber toots diretos, eles aparecerão aqui.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "Nada aqui.",
   "empty_column.explore_statuses": "Nada está em alta no momento. Volte mais tarde!",
   "empty_column.favourited_statuses": "Nada aqui. Quando você favoritar um toot, ele aparecerá aqui.",
@@ -190,7 +190,7 @@
   "explore.search_results": "Resultado da pesquisa",
   "explore.suggested_follows": "Para você",
   "explore.title": "Explorar",
-  "explore.trending_links": "Novidades",
+  "explore.trending_links": "Notícias",
   "explore.trending_statuses": "Posts",
   "explore.trending_tags": "Hashtags",
   "follow_recommendations.done": "Salvar",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "dar boost",
   "keyboard_shortcuts.column": "focar na coluna",
   "keyboard_shortcuts.compose": "focar no compositor",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Descrição",
-  "keyboard_shortcuts.direct": "abrir toots diretos",
   "keyboard_shortcuts.down": "mover para baixo",
   "keyboard_shortcuts.enter": "abrir toot",
   "keyboard_shortcuts.favourite": "favoritar toot",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Salvos",
   "navigation_bar.community_timeline": "Linha do tempo local",
   "navigation_bar.compose": "Compor novo toot",
-  "navigation_bar.direct": "Toots diretos",
   "navigation_bar.discover": "Descobrir",
   "navigation_bar.domain_blocks": "Domínios bloqueados",
   "navigation_bar.edit_profile": "Editar perfil",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Remover enquete",
   "privacy.change": "Alterar privacidade do toot",
   "privacy.direct.long": "Postar só para usuários mencionados",
-  "privacy.direct.short": "Direto",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Postar só para seguidores",
-  "privacy.private.short": "Privado",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Postar em linhas públicas",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Não postar em linhas públicas",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Não-listado",
   "refresh": "Atualizar",
   "regeneration_indicator.label": "Carregando…",

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

@@ -70,7 +70,7 @@
   "column.blocks": "Utilizadores Bloqueados",
   "column.bookmarks": "Itens salvos",
   "column.community": "Cronologia local",
-  "column.direct": "Mensagens diretas",
+  "column.conversations": "Conversations",
   "column.directory": "Procurar perfis",
   "column.domain_blocks": "Domínios escondidos",
   "column.favourites": "Favoritos",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Local apenas",
   "community.column_settings.media_only": "Somente media",
   "community.column_settings.remote_only": "Remoto apenas",
-  "compose_form.direct_message_warning": "Esta publicação será enviada apenas para os utilizadores mencionados.",
   "compose_form.direct_message_warning_learn_more": "Conhecer mais",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Este toot não será listado em nenhuma hashtag por ser não listado. Apenas toots públics podem ser pesquisados por hashtag.",
   "compose_form.lock_disclaimer": "A sua conta não é {locked}. Qualquer pessoa pode segui-lo e ver as publicações direcionadas apenas a seguidores.",
   "compose_form.lock_disclaimer.lock": "bloqueado",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Ainda não bloqueaste qualquer utilizador.",
   "empty_column.bookmarked_statuses": "Ainda não adicionou nenhum toot aos Itens salvos. Quando adicionar, eles serão exibidos aqui.",
   "empty_column.community": "A timeline local está vazia. Escreve algo publicamente para começar!",
-  "empty_column.direct": "Ainda não tem qualquer mensagem direta. Quando enviar ou receber alguma, ela irá aparecer aqui.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "Ainda não há qualquer domínio escondido.",
   "empty_column.explore_statuses": "Nada em destaque por agora. Volte mais tarde!",
   "empty_column.favourited_statuses": "Ainda não tens quaisquer toots favoritos. Quando tiveres algum, ele irá aparecer aqui.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "para partilhar",
   "keyboard_shortcuts.column": "para focar uma publicação numa das colunas",
   "keyboard_shortcuts.compose": "para focar na área de publicação",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Descrição",
-  "keyboard_shortcuts.direct": "para abrir a coluna das mensagens diretas",
   "keyboard_shortcuts.down": "para mover para baixo na lista",
   "keyboard_shortcuts.enter": "para expandir uma publicação",
   "keyboard_shortcuts.favourite": "para adicionar aos favoritos",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Itens salvos",
   "navigation_bar.community_timeline": "Cronologia local",
   "navigation_bar.compose": "Escrever novo toot",
-  "navigation_bar.direct": "Mensagens diretas",
   "navigation_bar.discover": "Descobrir",
   "navigation_bar.domain_blocks": "Domínios escondidos",
   "navigation_bar.edit_profile": "Editar perfil",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Remover votação",
   "privacy.change": "Ajustar a privacidade da publicação",
   "privacy.direct.long": "Apenas para utilizadores mencionados",
-  "privacy.direct.short": "Directo",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Apenas para os seguidores",
-  "privacy.private.short": "Privado",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Publicar em todos os feeds",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Não publicar nos feeds públicos",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Não listar",
   "refresh": "Actualizar",
   "regeneration_indicator.label": "A carregar…",

app/javascript/mastodon/locales/ro.json

@@ -70,7 +70,7 @@
   "column.blocks": "Utilizatori blocați",
   "column.bookmarks": "Marcaje",
   "column.community": "Cronologie locală",
-  "column.direct": "Mesaje directe",
+  "column.conversations": "Conversations",
   "column.directory": "Explorează profiluri",
   "column.domain_blocks": "Domenii blocate",
   "column.favourites": "Favorite",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Doar local",
   "community.column_settings.media_only": "Doar media",
   "community.column_settings.remote_only": "Doar la distanţă",
-  "compose_form.direct_message_warning": "Această postare va fi trimisă doar utilizatorilor menționați.",
   "compose_form.direct_message_warning_learn_more": "Află mai multe",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Această postare nu va fi listată sub niciun hashtag deoarece este nelistată. Doar postările publice pot fi căutate cu un hashtag.",
   "compose_form.lock_disclaimer": "Contul tău nu este {locked}. Oricine se poate abona la tine pentru a îți vedea postările numai pentru abonați.",
   "compose_form.lock_disclaimer.lock": "privat",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Momentan nu ai blocat niciun utilizator.",
   "empty_column.bookmarked_statuses": "Momentan nu ai nicio postare marcată. Când vei marca una, va apărea aici.",
   "empty_column.community": "Nu există nimic în cronologia locală. Postează ceva public pentru a sparge gheața!",
-  "empty_column.direct": "Momentan nu ai niciun mesaj direct. Când trimiți sau primești un mesaj, va apărea aici.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "Momentan nu există domenii blocate.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Momentan nu ai nicio postare favorită. Când vei adăuga una, va apărea aici.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Distribuie postarea",
   "keyboard_shortcuts.column": "Focalizează pe coloană",
   "keyboard_shortcuts.compose": "Focalizează pe zona de text",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Descriere",
-  "keyboard_shortcuts.direct": "Deschide coloana de mesaje directe",
   "keyboard_shortcuts.down": "Coboară în listă",
   "keyboard_shortcuts.enter": "Deschide postarea",
   "keyboard_shortcuts.favourite": "Adaugă postarea la favorite",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Marcaje",
   "navigation_bar.community_timeline": "Cronologie locală",
   "navigation_bar.compose": "Compune o nouă postare",
-  "navigation_bar.direct": "Mesaje directe",
   "navigation_bar.discover": "Descoperă",
   "navigation_bar.domain_blocks": "Domenii blocate",
   "navigation_bar.edit_profile": "Modifică profilul",
@@ -369,10 +368,10 @@
   "privacy.direct.long": "Vizibil doar pentru utilizatorii menționați",
   "privacy.direct.short": "Direct",
   "privacy.private.long": "Vizibil doar pentru abonați",
-  "privacy.private.short": "Doar abonați",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Vizibil pentru toți, afișat în cronologiile publice",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Vizibil pentru toți, dar nu și în cronologiile publice",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Nelistat",
   "refresh": "Reîncarcă",
   "regeneration_indicator.label": "Se încarcă…",

app/javascript/mastodon/locales/ru.json

@@ -70,7 +70,7 @@
   "column.blocks": "Заблокированные пользователи",
   "column.bookmarks": "Закладки",
   "column.community": "Локальная лента",
-  "column.direct": "Личные сообщения",
+  "column.conversations": "Диалоги",
   "column.directory": "Просмотр профилей",
   "column.domain_blocks": "Заблокированные домены",
   "column.favourites": "Избранное",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Только локальные",
   "community.column_settings.media_only": "Только с медиафайлами",
   "community.column_settings.remote_only": "Только удалённые",
-  "compose_form.direct_message_warning": "Адресованные посты отправляются и видны только упомянутым в них пользователям.",
   "compose_form.direct_message_warning_learn_more": "Подробнее",
+  "compose_form.encryption_warning": "Посты в Mastodon не защищены сквозным шифрованием. Не делитесь потенциально опасной информацией.",
   "compose_form.hashtag_warning": "Так как этот пост не публичный, он не отобразится в поиске по хэштегам.",
   "compose_form.lock_disclaimer": "Ваша учётная запись {locked}. Любой пользователь сможет подписаться на вас и просматривать посты для подписчиков.",
   "compose_form.lock_disclaimer.lock": "не закрыта",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Вы ещё никого не заблокировали.",
   "empty_column.bookmarked_statuses": "У вас пока нет постов в закладках. Как добавите один, он отобразится здесь.",
   "empty_column.community": "Локальная лента пуста. Напишите что-нибудь, чтобы разогреть народ!",
-  "empty_column.direct": "У вас пока нет личных сообщений. Как только вы отправите или получите одно, оно появится здесь.",
+  "empty_column.conversations": "Здесь отображаются адресованные посты. Как только вы отправите или получите один, он отобразится здесь.",
   "empty_column.domain_blocks": "Скрытых доменов пока нет.",
   "empty_column.explore_statuses": "Нет актуального. Проверьте позже!",
   "empty_column.favourited_statuses": "Вы не добавили ни один пост в «Избранное». Как только вы это сделаете, он появится здесь.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "продвинуть пост",
   "keyboard_shortcuts.column": "фокус на одном из столбцов",
   "keyboard_shortcuts.compose": "фокус на поле ввода",
+  "keyboard_shortcuts.conversations": "открыть колонку диалогов",
   "keyboard_shortcuts.description": "Описание",
-  "keyboard_shortcuts.direct": "чтобы показать колонку личных сообщений",
   "keyboard_shortcuts.down": "вниз по списку",
   "keyboard_shortcuts.enter": "открыть пост",
   "keyboard_shortcuts.favourite": "в избранное",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Закладки",
   "navigation_bar.community_timeline": "Локальная лента",
   "navigation_bar.compose": "Создать новый пост",
-  "navigation_bar.direct": "Личные сообщения",
   "navigation_bar.discover": "Изучайте",
   "navigation_bar.domain_blocks": "Скрытые домены",
   "navigation_bar.edit_profile": "Изменить профиль",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Удалить опрос",
   "privacy.change": "Изменить видимость поста",
   "privacy.direct.long": "Показать только упомянутым",
-  "privacy.direct.short": "Адресованный",
+  "privacy.direct.short": "Для упомянутых",
   "privacy.private.long": "Показать только подписчикам",
-  "privacy.private.short": "Приватный",
+  "privacy.private.short": "Для подписчиков",
-  "privacy.public.long": "Показать в публичных лентах",
+  "privacy.public.long": "Виден всем",
   "privacy.public.short": "Публичный",
-  "privacy.unlisted.long": "Не показывать в публичных лентах",
+  "privacy.unlisted.long": "Виден всем, но не через функции обзора",
   "privacy.unlisted.short": "Скрытый",
   "refresh": "Обновить",
   "regeneration_indicator.label": "Загрузка…",

app/javascript/mastodon/locales/sa.json

@@ -70,7 +70,7 @@
   "column.blocks": "निषिद्धभोक्तारः",
   "column.bookmarks": "पुटचिह्नानि",
   "column.community": "स्थानीयसमयतालिका",
-  "column.direct": "प्रत्यक्षसन्देशाः",
+  "column.conversations": "Conversations",
   "column.directory": "व्यक्तित्वानि दृश्यन्ताम्",
   "column.domain_blocks": "निषिद्धप्रदेशाः",
   "column.favourites": "प्रियाः",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "केवलं स्थानीयम्",
   "community.column_settings.media_only": "सामग्री केवलम्",
   "community.column_settings.remote_only": "दर्गमः केवलम्",
-  "compose_form.direct_message_warning": "दौत्यमेतत्केवलमुल्लेखितजनानां कृते वर्तते",
   "compose_form.direct_message_warning_learn_more": "अधिकं ज्ञायताम्",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "न कस्मिन्नपि प्रचलितवस्तुषु सूचितमिदं दौत्यम् । केवलं सार्वजनिकदौत्यानि प्रचलितवस्तुचिह्नेन अन्वेषयितुं शक्यते ।",
   "compose_form.lock_disclaimer": "तव लेखा न प्रवेष्टुमशक्या {locked} । कोऽप्यनुसर्ता ते केवलमनुसर्तृृणां कृते स्थितानि दौत्यानि द्रष्टुं शक्नोति ।",
   "compose_form.lock_disclaimer.lock": "अवरुद्धः",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "नैकोऽप्युपभोक्ता निषिद्धो वर्तते",
   "empty_column.bookmarked_statuses": "नैकमपि पुटचिह्नयुक्तदौत्यानि सन्ति । यदा भविष्यति तदत्र दृश्यते ।",
   "empty_column.community": "स्थानीयसमयतालिका रिक्ता । सार्वजनिकत्वेनाऽत्र किमपि लिख्यताम् ।",
-  "empty_column.direct": "नैकोऽपि प्रत्यक्षसन्देशो वर्तते । यदा प्रेष्यते वा प्राप्यतेऽत्र दृश्यते",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "न निषिद्धप्रदेशाः सन्ति ।",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "न प्रियदौत्यानि सन्ति । यदा प्रीतिरित्यङ्क्यतेऽत्र दृश्यते ।",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Description",
-  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Edit profile",
@@ -370,9 +369,9 @@
   "privacy.direct.short": "Direct",
   "privacy.private.long": "Visible for followers only",
   "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all, shown in public timelines",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but not in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Unlisted",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",

app/javascript/mastodon/locales/sc.json

@@ -70,7 +70,7 @@
   "column.blocks": "Persones blocadas",
   "column.bookmarks": "Sinnalibros",
   "column.community": "Lìnia de tempus locale",
-  "column.direct": "Messàgios diretos",
+  "column.conversations": "Conversations",
   "column.directory": "Nàviga in is profilos",
   "column.domain_blocks": "Domìnios blocados",
   "column.favourites": "Preferidos",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Isceti locale",
   "community.column_settings.media_only": "Isceti multimediale",
   "community.column_settings.remote_only": "Isceti remotu",
-  "compose_form.direct_message_warning": "Custa publicatzione at a èssere imbiada isceti a is persones mentovadas.",
   "compose_form.direct_message_warning_learn_more": "Àteras informatziones",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Custa publicatzione no at a èssere ammustrada in peruna eticheta, dae chi no est listada. Isceti is publicatziones pùblicas podent èssere chircadas cun etichetas.",
   "compose_form.lock_disclaimer": "Su contu tuo no est {locked}. Cale si siat persone ti podet sighire pro bìdere is messàgios tuos chi imbies a sa gente chi ti sighit.",
   "compose_form.lock_disclaimer.lock": "blocadu",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "No as blocadu ancora nemos.",
   "empty_column.bookmarked_statuses": "Non tenes ancora peruna publicatzione in is marcadores. Cando nd'as a agiùnghere una, at a èssere ammustrada inoghe.",
   "empty_column.community": "Sa lìnia de tempus locale est bòida. Iscrie inoghe pro cumintzare sa festa!",
-  "empty_column.direct": "Non tenes ancora perunu messàgiu deretu. Cando nd'as a imbiare o nd'as a retzire unu, at a èssere ammustradu inoghe.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "Non tenes ancora perunu domìniu blocadu.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Non tenes ancora peruna publicatzione in is preferidos. Cando nd'as a agiùnghere una, at a èssere ammustrada inoghe.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "pro cumpartzire",
   "keyboard_shortcuts.column": "pro atzentrare una publicatzione in una de is colunnas",
   "keyboard_shortcuts.compose": "pro atzentrare in s'àrea de cumpositzione de testu",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Descritzione",
-  "keyboard_shortcuts.direct": "pro abèrrere sa colunna de messàgios diretos",
   "keyboard_shortcuts.down": "pro mòere in bàsciu in sa lista",
   "keyboard_shortcuts.enter": "pro abèrrere una publicatzione",
   "keyboard_shortcuts.favourite": "pro marcare comente a preferidu",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Sinnalibros",
   "navigation_bar.community_timeline": "Lìnia de tempus locale",
   "navigation_bar.compose": "Cumpone una publicatzione noa",
-  "navigation_bar.direct": "Messàgios diretos",
   "navigation_bar.discover": "Iscoberi",
   "navigation_bar.domain_blocks": "Domìnios blocados",
   "navigation_bar.edit_profile": "Modìfica profilu",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Cantzella su sondàgiu",
   "privacy.change": "Modìfica s'istadu de riservadesa",
   "privacy.direct.long": "Visìbile isceti pro is persones mentovadas",
-  "privacy.direct.short": "Deretu",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Visìbile isceti pro chie ti sighit",
-  "privacy.private.short": "Isceti pro chie ti sighit",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visìbile pro chie si siat, ammustra in lìnias de tempus pùblicas",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Pùblicu",
-  "privacy.unlisted.long": "Visìbile pro chie si siat, però no ammustres in lìnias de tempus pùblicas",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Esclùidu de sa lista",
   "refresh": "Atualiza",
   "regeneration_indicator.label": "Carrighende…",

app/javascript/mastodon/locales/si.json

@@ -70,7 +70,7 @@
   "column.blocks": "අවහිර කළ පරිශීලකයින්",
   "column.bookmarks": "පොත් යොමු",
   "column.community": "Local timeline",
-  "column.direct": "සෘජු පණිවිඩ",
+  "column.conversations": "Conversations",
   "column.directory": "පැතිකඩයන් පිරික්සන්න",
   "column.domain_blocks": "අවහිර කළ වසම්",
   "column.favourites": "ප්‍රියතමයන්",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "ස්ථානීයව පමණයි",
   "community.column_settings.media_only": "මාධ්‍ය පමණයි",
   "community.column_settings.remote_only": "දුරස්ථව පමණයි",
-  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
   "compose_form.direct_message_warning_learn_more": "තව දැනගන්න",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "අගුළු දමා ඇත",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "ඔබ තවමත් කිසිදු පරිශීලකයෙකු අවහිර කර නැත.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots 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.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "අවහිර කළ වසම් නොමැත.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "සවිස්තරය",
-  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "පොත් යොමු",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.direct": "සෘජු පණිවිඩ",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "පැතිකඩ සංස්කරණය",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Remove poll",
   "privacy.change": "Adjust status privacy",
   "privacy.direct.long": "Visible for mentioned users only",
-  "privacy.direct.short": "සෘජු",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Visible for followers only",
   "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all, shown in public timelines",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "ප්‍රසිද්ධ",
-  "privacy.unlisted.long": "Visible for all, but not in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Unlisted",
   "refresh": "නැවුම් කරන්න",
   "regeneration_indicator.label": "පූරණය වෙමින්…",

app/javascript/mastodon/locales/sk.json

@@ -70,7 +70,7 @@
   "column.blocks": "Blokovaní užívatelia",
   "column.bookmarks": "Záložky",
   "column.community": "Miestna časová os",
-  "column.direct": "Priame správy",
+  "column.conversations": "Conversations",
   "column.directory": "Prehľadávaj profily",
   "column.domain_blocks": "Skryté domény",
   "column.favourites": "Obľúbené",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Iba miestna",
   "community.column_settings.media_only": "Iba médiá",
   "community.column_settings.remote_only": "Iba odľahlé",
-  "compose_form.direct_message_warning": "Tento príspevok bude boslaný iba spomenutým užívateľom.",
   "compose_form.direct_message_warning_learn_more": "Zisti viac",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Tento toot nebude zobrazený pod žiadným haštagom lebo nieje listovaný. Iba verejné tooty môžu byť nájdené podľa haštagu.",
   "compose_form.lock_disclaimer": "Tvoj účet nie je {locked}. Ktokoľvek ťa môže nasledovať a vidieť tvoje správy pre sledujúcich.",
   "compose_form.lock_disclaimer.lock": "zamknutý",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Ešte si nikoho nezablokoval/a.",
   "empty_column.bookmarked_statuses": "Ešte nemáš žiadné záložky. Keď si pridáš príspevok k záložkám, zobrazí sa tu.",
   "empty_column.community": "Lokálna časová os je prázdna. Napíšte niečo, aby sa to tu začalo hýbať!",
-  "empty_column.direct": "Ešte nemáš žiadne priame správy. Keď nejakú pošleš, alebo dostaneš, ukáže sa tu.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "Žiadne domény ešte niesú skryté.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Nemáš obľúbené ešte žiadne príspevky. Keď si nejaký obľúbiš, bude zobrazený práve tu.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Vyzdvihni príspevok",
   "keyboard_shortcuts.column": "zameraj sa na príspevok v jednom zo stĺpcov",
   "keyboard_shortcuts.compose": "zameraj sa na písaciu plochu",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Popis",
-  "keyboard_shortcuts.direct": "pre otvorenie panelu priamých správ",
   "keyboard_shortcuts.down": "posunúť sa dole v zozname",
   "keyboard_shortcuts.enter": "Otvor príspevok",
   "keyboard_shortcuts.favourite": "pridaj do obľúbených",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Záložky",
   "navigation_bar.community_timeline": "Miestna časová os",
   "navigation_bar.compose": "Napíš nový príspevok",
-  "navigation_bar.direct": "Priame správy",
   "navigation_bar.discover": "Objavuj",
   "navigation_bar.domain_blocks": "Skryté domény",
   "navigation_bar.edit_profile": "Uprav profil",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Odstráň anketu",
   "privacy.change": "Uprav súkromie príspevku",
   "privacy.direct.long": "Pošli iba spomenutým užívateľom",
-  "privacy.direct.short": "Súkromne",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Pošli iba následovateľom",
-  "privacy.private.short": "Iba pre sledujúcich",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Pošli všetkým verejne",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Verejné",
-  "privacy.unlisted.long": "Neposielaj do verejných časových osí",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Verejne, ale nezobraziť v osi",
   "refresh": "Obnoviť",
   "regeneration_indicator.label": "Načítava sa…",

app/javascript/mastodon/locales/sl.json

@@ -70,7 +70,7 @@
   "column.blocks": "Blokirani uporabniki",
   "column.bookmarks": "Zaznamki",
   "column.community": "Lokalna časovnica",
-  "column.direct": "Neposredna sporočila",
+  "column.conversations": "Conversations",
   "column.directory": "Prebrskaj profile",
   "column.domain_blocks": "Skrite domene",
   "column.favourites": "Priljubljene",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Samo krajevno",
   "community.column_settings.media_only": "Samo mediji",
   "community.column_settings.remote_only": "Samo oddaljeno",
-  "compose_form.direct_message_warning": "Ta tut bo viden le vsem omenjenim uporabnikom.",
   "compose_form.direct_message_warning_learn_more": "Nauči se več",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Ta tut ne bo naveden pod nobenim ključnikom, ker ni javen. Samo javne tute lahko iščete s ključniki.",
   "compose_form.lock_disclaimer": "Vaš račun ni {locked}. Vsakdo vam lahko sledi in si ogleda objave, ki so namenjene samo sledilcem.",
   "compose_form.lock_disclaimer.lock": "zaklenjen",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Niste še blokirali nobenega uporabnika.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
   "empty_column.community": "Lokalna časovnica je prazna. Napišite nekaj javnega, da se bo žoga zakotalila!",
-  "empty_column.direct": "Nimate še nobenih neposrednih sporočil. Ko ga boste poslali ali prejeli, se bo prikazal tukaj.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "Še vedno ni skritih domen.",
   "empty_column.explore_statuses": "Trenutno ni nič v trendu. Preverite znova kasneje!",
   "empty_column.favourited_statuses": "Nimate priljubljenih tutov. Ko boste vzljubili kakšnega, se bo prikazal tukaj.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "spodbudi",
   "keyboard_shortcuts.column": "fokusiraj na status v enemu od stolpcev",
   "keyboard_shortcuts.compose": "fokusiraj na območje za sestavljanje besedila",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Opis",
-  "keyboard_shortcuts.direct": "odpri stolpec za neposredna sporočila",
   "keyboard_shortcuts.down": "premakni se navzdol po seznamu",
   "keyboard_shortcuts.enter": "odpri status",
   "keyboard_shortcuts.favourite": "vzljubi",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Zaznamki",
   "navigation_bar.community_timeline": "Lokalna časovnica",
   "navigation_bar.compose": "Sestavi nov tut",
-  "navigation_bar.direct": "Neposredna sporočila",
   "navigation_bar.discover": "Odkrijte",
   "navigation_bar.domain_blocks": "Skrite domene",
   "navigation_bar.edit_profile": "Uredi profil",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Odstrani anketo",
   "privacy.change": "Prilagodi zasebnost statusa",
   "privacy.direct.long": "Objavi samo omenjenim uporabnikom",
-  "privacy.direct.short": "Neposredno",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Objavi samo sledilcem",
-  "privacy.private.short": "Samo sledilci",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Objavi na javne časovnice",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Javno",
-  "privacy.unlisted.long": "Ne objavi na javne časovnice",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Ni prikazano",
   "refresh": "Osveži",
   "regeneration_indicator.label": "Nalaganje…",

app/javascript/mastodon/locales/sq.json

@@ -70,7 +70,7 @@
   "column.blocks": "Përdorues të bllokuar",
   "column.bookmarks": "Faqerojtës",
   "column.community": "Rrjedhë kohore vendore",
-  "column.direct": "Mesazhe të drejtpërdrejtë",
+  "column.conversations": "Biseda",
   "column.directory": "Shfletoni profile",
   "column.domain_blocks": "Përkatësi të bllokuara",
   "column.favourites": "Të parapëlqyer",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Vetëm vendore",
   "community.column_settings.media_only": "Vetëm Media",
   "community.column_settings.remote_only": "Vetëm të largëta",
-  "compose_form.direct_message_warning": "Ky mesazh do t’u dërgohet përdoruesve të përmendur.",
   "compose_form.direct_message_warning_learn_more": "Mësoni më tepër",
+  "compose_form.encryption_warning": "Postimet në Mastodon nuk fshehtëzohen skaj-më-skaj. Mos ndani me të tjerë gjëra me spec në Mastodon.",
   "compose_form.hashtag_warning": "Ky mesazh s’do të paraqitet nën ndonjë hashtag, ngaqë s’i është caktuar ndonjë. Vetëm mesazhet publike mund të kërkohen sipas hashtagësh.",
   "compose_form.lock_disclaimer": "Llogaria juaj s’është {locked}. Mund ta ndjekë cilido, për të parë postimet tuaja vetëm për ndjekësit.",
   "compose_form.lock_disclaimer.lock": "e kyçur",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "S’keni bllokuar ende ndonjë përdorues.",
   "empty_column.bookmarked_statuses": "S’keni faqeruajtur ende ndonjë mesazh. Kur faqeruani një të tillë, ai do të shfaqet këtu.",
   "empty_column.community": "Rrjedha kohore vendore është e zbrazët. Shkruani diçka publikisht që t’i hyhet valles!",
-  "empty_column.direct": "S’keni ende ndonjë mesazh të drejtpërdrejt. Kur dërgoni ose merrni një të tillë, ai do të shfaqet këtu.",
+  "empty_column.conversations": "Pasi të dërgoni ose merrni një postim që është i dukshëm vetëm për personat e përmendur në të, do të shfaqet këtu.",
   "empty_column.domain_blocks": "Ende s’ka përkatësi të fshehura.",
   "empty_column.explore_statuses": "Asgjë në modë tani. Kontrolloni më vonë!",
   "empty_column.favourited_statuses": "S’keni ende ndonjë mesazh të parapëlqyer. Kur parapëlqeni një të tillë, ai do të shfaqet këtu.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "për përforcim",
   "keyboard_shortcuts.column": "për kalim fokusi mbi një gjendje te një nga shtyllat",
   "keyboard_shortcuts.compose": "për kalim fokusi te fusha e hartimit të mesazheve",
+  "keyboard_shortcuts.conversations": "për të hapur shtyllë bisedash",
   "keyboard_shortcuts.description": "Përshkrim",
-  "keyboard_shortcuts.direct": "për hapje shtylle mesazhesh të drejtpërdrejtë",
   "keyboard_shortcuts.down": "për zbritje poshtë nëpër listë",
   "keyboard_shortcuts.enter": "për hapje gjendjeje",
   "keyboard_shortcuts.favourite": "për t’i vënë shenjë si të parapëlqyer",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Faqerojtës",
   "navigation_bar.community_timeline": "Rrjedhë kohore vendore",
   "navigation_bar.compose": "Hartoni mesazh të ri",
-  "navigation_bar.direct": "Mesazhe të drejtpërdrejtë",
   "navigation_bar.discover": "Zbuloni",
   "navigation_bar.domain_blocks": "Përkatësi të bllokuara",
   "navigation_bar.edit_profile": "Përpunoni profilin",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Hiqe pyetësorin",
   "privacy.change": "Rregulloni privatësi mesazhesh",
   "privacy.direct.long": "I dukshëm vetëm për përdorues të përmendur",
-  "privacy.direct.short": "I drejtpërdrejtë",
+  "privacy.direct.short": "Vetëm persona që përmend",
   "privacy.private.long": "I dukshëm vetëm për ndjekës",
-  "privacy.private.short": "Vetëm ndjekësve",
+  "privacy.private.short": "Vetëm ndjekës",
-  "privacy.public.long": "I dukshëm për të tërë, shfaqur në rrjedha kohore publike",
+  "privacy.public.long": "I dukshëm për të tërë",
   "privacy.public.short": "Publik",
-  "privacy.unlisted.long": "I dukshëm për të tërë, por jo në rrjedha kohore publike",
+  "privacy.unlisted.long": "I dukshëm për të tërë, por lënë jashtë nga veçoritë e zbulimit",
   "privacy.unlisted.short": "Jo në lista",
   "refresh": "Rifreskoje",
   "regeneration_indicator.label": "Po ngarkohet…",

app/javascript/mastodon/locales/sr-Latn.json

@@ -70,7 +70,7 @@
   "column.blocks": "Blokirani korisnici",
   "column.bookmarks": "Bookmarks",
   "column.community": "Lokalna lajna",
-  "column.direct": "Direct messages",
+  "column.conversations": "Conversations",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "Hidden domains",
   "column.favourites": "Omiljeni",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Local only",
   "community.column_settings.media_only": "Media only",
   "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "This toot will only be visible to all the mentioned users.",
   "compose_form.direct_message_warning_learn_more": "Learn more",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Vaš nalog nije {locked}. Svako može da Vas zaprati i da vidi objave namenjene samo Vašim pratiocima.",
   "compose_form.lock_disclaimer.lock": "zaključan",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
   "empty_column.community": "Lokalna lajna je prazna. Napišite nešto javno da lajna produva!",
-  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "da podržite",
   "keyboard_shortcuts.column": "da se prebacite na status u jednoj od kolona",
   "keyboard_shortcuts.compose": "da se prebacite na pisanje novog tuta",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Opis",
-  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "da se pomerite na dole u listi",
   "keyboard_shortcuts.enter": "da otvorite status",
   "keyboard_shortcuts.favourite": "da označite kao omiljeno",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Lokalna lajna",
   "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Izmeni profil",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Remove poll",
   "privacy.change": "Podesi status privatnosti",
   "privacy.direct.long": "Objavi samo korisnicima koji su pomenuti",
-  "privacy.direct.short": "Direktno",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Objavi samo pratiocima",
-  "privacy.private.short": "Samo za pratioce",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Objavi na javnoj lajni",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Javno",
-  "privacy.unlisted.long": "Ne objavljuj na javnim lajnama",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Neizlistano",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",

app/javascript/mastodon/locales/sr.json

@@ -70,7 +70,7 @@
   "column.blocks": "Блокирани корисници",
   "column.bookmarks": "Обележивачи",
   "column.community": "Локална временска линија",
-  "column.direct": "Директне поруке",
+  "column.conversations": "Conversations",
   "column.directory": "Претражи налоге",
   "column.domain_blocks": "Скривени домени",
   "column.favourites": "Омиљене",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Само локално",
   "community.column_settings.media_only": "Само Медији",
   "community.column_settings.remote_only": "Само удаљено",
-  "compose_form.direct_message_warning": "Ова труба ће бити послата споменутим корисницима.",
   "compose_form.direct_message_warning_learn_more": "Сазнајте више",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Ова труба неће бити излистана под било којом тарабом јер је сакривена. Само јавне трубе могу бити претражене тарабом.",
   "compose_form.lock_disclaimer": "Ваш налог није {locked}. Свако може да Вас запрати и да види објаве намењене само Вашим пратиоцима.",
   "compose_form.lock_disclaimer.lock": "закључан",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Још увек немате блокираних корисника.",
   "empty_column.bookmarked_statuses": "Још увек немате обележене трубе. Када их обележите, појавиће се овде.",
   "empty_column.community": "Локална временска линија је празна. Напишите нешто јавно да започнете!",
-  "empty_column.direct": "Још увек немате директних порука. Када пошаљете или примите једну, појавиће се овде.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "Још увек нема сакривених домена.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Још увек немате труба које су вам се свиделе. Када вам се једна свиди, појавиће се овде.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "да подржите",
   "keyboard_shortcuts.column": "да се пребаците на статус у једној од колона",
   "keyboard_shortcuts.compose": "да се пребаците на писање новог тута",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Опис",
-  "keyboard_shortcuts.direct": "да отворите колону за директне поруке",
   "keyboard_shortcuts.down": "да се померите на доле у листи",
   "keyboard_shortcuts.enter": "да отворите статус",
   "keyboard_shortcuts.favourite": "да означите као омиљено",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Маркери",
   "navigation_bar.community_timeline": "Локална временска линија",
   "navigation_bar.compose": "Саставите нову трубу",
-  "navigation_bar.direct": "Директне поруке",
   "navigation_bar.discover": "Откриј",
   "navigation_bar.domain_blocks": "Сакривени домени",
   "navigation_bar.edit_profile": "Измени налог",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Уклони анкету",
   "privacy.change": "Подеси статус приватности",
   "privacy.direct.long": "Објави само корисницима који су поменути",
-  "privacy.direct.short": "Директно",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Објави само пратиоцима",
-  "privacy.private.short": "Само за пратиоце",
+  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Објави на јавној лајни",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Јавно",
-  "privacy.unlisted.long": "Не објављуј на јавним временским линијама",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Неизлистано",
   "refresh": "Освежи",
   "regeneration_indicator.label": "Учитавање…",

app/javascript/mastodon/locales/sv.json

@@ -70,7 +70,7 @@
   "column.blocks": "Blockerade användare",
   "column.bookmarks": "Bokmärken",
   "column.community": "Lokal tidslinje",
-  "column.direct": "Direktmeddelanden",
+  "column.conversations": "Konversationer",
   "column.directory": "Bläddra bland profiler",
   "column.domain_blocks": "Dolda domäner",
   "column.favourites": "Favoriter",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Endast lokalt",
   "community.column_settings.media_only": "Endast media",
   "community.column_settings.remote_only": "Endast fjärr",
-  "compose_form.direct_message_warning": "Denna tutning kommer endast skickas till de nämnda användarna.",
   "compose_form.direct_message_warning_learn_more": "Lär dig mer",
+  "compose_form.encryption_warning": "Inlägg på Mastodon är inte end-to-end-krypterade. Dela inte någon känslig information över Mastodon.",
   "compose_form.hashtag_warning": "Denna toot kommer inte att visas under någon hashtag eftersom den är onoterad. Endast offentliga toots kan sökas med hashtag.",
   "compose_form.lock_disclaimer": "Ditt konto är inte {locked}. Vem som helst kan följa dig för att se dina inlägg som endast är för följare.",
   "compose_form.lock_disclaimer.lock": "låst",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Du har ännu ej blockerat några användare.",
   "empty_column.bookmarked_statuses": "Du har inte bokmärkt några tutar än. När du gör ett bokmärke kommer det synas här.",
   "empty_column.community": "Den lokala tidslinjen är tom. Skriv något offentligt för att sätta bollen i rullning!",
-  "empty_column.direct": "Du har inga direktmeddelanden än. När du skickar eller tar emot ett kommer det att visas här.",
+  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
   "empty_column.domain_blocks": "Det finns ännu inga dolda domäner.",
   "empty_column.explore_statuses": "Ingenting är trendigt just nu. Kom tillbaka senare!",
   "empty_column.favourited_statuses": "Du har inga favoritmarkerade toots än. När du favoritmarkerar en kommer den visas här.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "för att knuffa",
   "keyboard_shortcuts.column": "för att fokusera en status i en av kolumnerna",
   "keyboard_shortcuts.compose": "för att fokusera skrivfältet",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Beskrivning",
-  "keyboard_shortcuts.direct": "för att öppna Direktmeddelanden",
   "keyboard_shortcuts.down": "för att flytta nedåt i listan",
   "keyboard_shortcuts.enter": "för att öppna en status",
   "keyboard_shortcuts.favourite": "för att sätta som favorit",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Bokmärken",
   "navigation_bar.community_timeline": "Lokal tidslinje",
   "navigation_bar.compose": "Författa ny toot",
-  "navigation_bar.direct": "Direktmeddelanden",
   "navigation_bar.discover": "Upptäck",
   "navigation_bar.domain_blocks": "Dolda domäner",
   "navigation_bar.edit_profile": "Redigera profil",
@@ -367,12 +366,12 @@
   "poll_button.remove_poll": "Ta bort omröstning",
   "privacy.change": "Justera sekretess",
   "privacy.direct.long": "Skicka endast till nämnda användare",
-  "privacy.direct.short": "Direkt",
+  "privacy.direct.short": "Bara personer jag nämner",
   "privacy.private.long": "Endast synligt för följare",
   "privacy.private.short": "Endast följare",
-  "privacy.public.long": "Skicka till publik tidslinje",
+  "privacy.public.long": "Synlig för alla",
   "privacy.public.short": "Publik",
-  "privacy.unlisted.long": "Skicka inte till publik tidslinje",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Olistad",
   "refresh": "Läs om",
   "regeneration_indicator.label": "Laddar…",
@@ -423,7 +422,7 @@
   "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
   "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
   "report.thanks.title": "Vill du inte se det här?",
-  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.thanks.title_actionable": "Tack för att du rapporterar, vi kommer att titta på detta.",
   "report.unfollow": "Sluta följ @{username}",
   "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
   "search.placeholder": "Sök",
@@ -436,7 +435,7 @@
   "search_results.accounts": "Människor",
   "search_results.all": "Alla",
   "search_results.hashtags": "Hashtaggar",
-  "search_results.nothing_found": "Could not find anything for these search terms",
+  "search_results.nothing_found": "Kunde inte hitta något för dessa sökord",
   "search_results.statuses": "Tutor",
   "search_results.statuses_fts_disabled": "Att söka toots med deras innehåll är inte möjligt på denna Mastodon-server.",
   "search_results.total": "{count, number} {count, plural, ett {result} andra {results}}",
@@ -451,13 +450,13 @@
   "status.detailed_status": "Detaljerad samtalsvy",
   "status.direct": "Direktmeddela @{name}",
   "status.edit": "Redigera",
-  "status.edited": "Edited {date}",
+  "status.edited": "Ändrad {date}",
   "status.edited_x_times": "Redigerad {count, plural, one {{count} gång} other {{count} gånger}}",
   "status.embed": "Bädda in",
   "status.favourite": "Favorit",
   "status.filtered": "Filtrerat",
-  "status.history.created": "{name} created {date}",
+  "status.history.created": "{name} skapade {date}",
-  "status.history.edited": "{name} edited {date}",
+  "status.history.edited": "{name} redigerade {date}",
   "status.load_more": "Ladda fler",
   "status.media_hidden": "Media dold",
   "status.mention": "Omnämn @{name}",

app/javascript/mastodon/locales/szl.json

@@ -70,7 +70,7 @@
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
   "column.community": "Local timeline",
-  "column.direct": "Direct messages",
+  "column.conversations": "Conversations",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "Blocked domains",
   "column.favourites": "Favourites",
@@ -92,8 +92,8 @@
   "community.column_settings.local_only": "Local only",
   "community.column_settings.media_only": "Media only",
   "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
   "compose_form.direct_message_warning_learn_more": "Learn more",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots 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.conversations": "Once you send or receive a post that's only visible to people mentioned in it, 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 toots yet. When you favourite one, it will show up here.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Description",
-  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -290,7 +290,6 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Edit profile",
@@ -370,9 +369,9 @@
   "privacy.direct.short": "Direct",
   "privacy.private.long": "Visible for followers only",
   "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all, shown in public timelines",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but not in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Unlisted",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",