New Crowdin Translations (automated) (#27596)

Co-authored-by: GitHub Actions <noreply@github.com>

.devcontainer/docker-compose.yml

@@ -70,7 +70,7 @@ services:
         hard: -1
 
   libretranslate:
-    image: libretranslate/libretranslate:v1.3.12
+    image: libretranslate/libretranslate:v1.4.1
     restart: unless-stopped
     volumes:
       - lt-data:/home/libretranslate/.local

Gemfile.lock

@@ -532,7 +532,7 @@ GEM
     public_suffix (5.0.3)
     puma (6.4.0)
       nio4r (~> 2.0)
-    pundit (2.3.0)
+    pundit (2.3.1)
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.7.1)

app/controllers/admin/disputes/appeals_controller.rb

@@ -20,7 +20,7 @@ class Admin::Disputes::AppealsController < Admin::BaseController
     authorize @appeal, :approve?
     log_action :reject, @appeal
     @appeal.reject!(current_account)
-    UserMailer.appeal_rejected(@appeal.account.user, @appeal)
+    UserMailer.appeal_rejected(@appeal.account.user, @appeal).deliver_later
     redirect_to disputes_strike_path(@appeal.strike)
   end
 

app/controllers/concerns/cache_concern.rb

@@ -92,18 +92,10 @@ module CacheConcern
         arguments
       end
 
-      if Rails.gem_version >= Gem::Version.new('7.0')
-        def attributes_for_database(record)
-          attributes = record.attributes_for_database
-          attributes.transform_values! { |attr| attr.is_a?(::ActiveModel::Type::Binary::Data) ? attr.to_s : attr }
-          attributes
-        end
-      else
-        def attributes_for_database(record)
-          attributes = record.instance_variable_get(:@attributes).send(:attributes).transform_values(&:value_for_database)
-          attributes.transform_values! { |attr| attr.is_a?(::ActiveModel::Type::Binary::Data) ? attr.to_s : attr }
-          attributes
-        end
+      def attributes_for_database(record)
+        attributes = record.attributes_for_database
+        attributes.transform_values! { |attr| attr.is_a?(::ActiveModel::Type::Binary::Data) ? attr.to_s : attr }
+        attributes
       end
 
       def deserialize_record(class_name, attributes_from_database, new_record = false) # rubocop:disable Style/OptionalBooleanParameter

app/javascript/mastodon/components/__tests__/button-test.jsx

@@ -1,6 +1,7 @@
-import { render, fireEvent, screen } from '@testing-library/react';
 import renderer from 'react-test-renderer';
 
+import { render, fireEvent, screen } from 'mastodon/test_helpers';
+
 import { Button } from '../button';
 
 describe('<Button />', () => {

app/javascript/mastodon/components/column_back_button.tsx

@@ -43,28 +43,3 @@ export const ColumnBackButton: React.FC<{ onClick: OnClickCallback }> = ({
 
   return <ButtonInTabsBar>{component}</ButtonInTabsBar>;
 };
-
-export const ColumnBackButtonSlim: React.FC<{ onClick: OnClickCallback }> = ({
-  onClick,
-}) => {
-  const handleClick = useHandleClick(onClick);
-
-  return (
-    <div className='column-back-button--slim'>
-      {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events */}
-      <div
-        role='button'
-        tabIndex={0}
-        onClick={handleClick}
-        className='column-back-button column-back-button--slim-button'
-      >
-        <Icon
-          id='chevron-left'
-          icon={ArrowBackIcon}
-          className='column-back-button__icon'
-        />
-        <FormattedMessage id='column_back_button.label' defaultMessage='Back' />
-      </div>
-    </div>
-  );
-};

app/javascript/mastodon/components/column_header.jsx

@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
+import { PureComponent, useCallback } from 'react';
 
 import { FormattedMessage, injectIntl, defineMessages } from 'react-intl';
 
@@ -14,9 +14,11 @@ import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/
 import { ReactComponent as TuneIcon } from '@material-symbols/svg-600/outlined/tune.svg';
 
 import { Icon }  from 'mastodon/components/icon';
-import { ButtonInTabsBar } from 'mastodon/features/ui/util/columns_context';
+import { ButtonInTabsBar, useColumnsContext } from 'mastodon/features/ui/util/columns_context';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
+import { useAppHistory } from './router';
+
 const messages = defineMessages({
   show: { id: 'column_header.show_settings', defaultMessage: 'Show settings' },
   hide: { id: 'column_header.hide_settings', defaultMessage: 'Hide settings' },
@@ -24,6 +26,34 @@ const messages = defineMessages({
   moveRight: { id: 'column_header.moveRight_settings', defaultMessage: 'Move column to the right' },
 });
 
+const BackButton = ({ pinned, show }) => {
+  const history = useAppHistory();
+  const { multiColumn } = useColumnsContext();
+
+  const handleBackClick = useCallback(() => {
+    if (history.location?.state?.fromMastodon) {
+      history.goBack();
+    } else {
+      history.push('/');
+    }
+  }, [history]);
+
+  const showButton = history && !pinned && ((multiColumn && history.location?.state?.fromMastodon) || show);
+
+  if(!showButton) return null;
+
+  return (<button onClick={handleBackClick} className='column-header__back-button'>
+    <Icon id='chevron-left' icon={ArrowBackIcon} className='column-back-button__icon' />
+    <FormattedMessage id='column_back_button.label' defaultMessage='Back' />
+  </button>);
+
+};
+
+BackButton.propTypes = {
+  pinned: PropTypes.bool,
+  show: PropTypes.bool,
+};
+
 class ColumnHeader extends PureComponent {
 
   static contextTypes = {
@@ -72,16 +102,6 @@ class ColumnHeader extends PureComponent {
     this.props.onMove(1);
   };
 
-  handleBackClick = () => {
-    const { history } = this.props;
-
-    if (history.location?.state?.fromMastodon) {
-      history.goBack();
-    } else {
-      history.push('/');
-    }
-  };
-
   handleTransitionEnd = () => {
     this.setState({ animating: false });
   };
@@ -95,7 +115,7 @@ class ColumnHeader extends PureComponent {
   };
 
   render () {
-    const { title, icon, iconComponent, active, children, pinned, multiColumn, extraButton, showBackButton, intl: { formatMessage }, placeholder, appendContent, collapseIssues, history } = this.props;
+    const { title, icon, iconComponent, active, children, pinned, multiColumn, extraButton, showBackButton, intl: { formatMessage }, placeholder, appendContent, collapseIssues } = this.props;
     const { collapsed, animating } = this.state;
 
     const wrapperClassName = classNames('column-header__wrapper', {
@@ -138,14 +158,7 @@ class ColumnHeader extends PureComponent {
       pinButton = <button key='pin-button' className='text-btn column-header__setting-btn' onClick={this.handlePin}><Icon id='plus' icon={AddIcon} /> <FormattedMessage id='column_header.pin' defaultMessage='Pin' /></button>;
     }
 
-    if (!pinned && ((multiColumn && history.location?.state?.fromMastodon) || showBackButton)) {
-      backButton = (
-        <button onClick={this.handleBackClick} className='column-header__back-button'>
-          <Icon id='chevron-left' icon={ArrowBackIcon} className='column-back-button__icon' />
-          <FormattedMessage id='column_back_button.label' defaultMessage='Back' />
-        </button>
-      );
-    }
+    backButton = <BackButton pinned={pinned} show={showBackButton} />;
 
     const collapsedContent = [
       extraContent,

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

@@ -10,7 +10,6 @@ import { ReactComponent as BlockIcon } from '@material-symbols/svg-600/outlined/
 import { debounce } from 'lodash';
 
 import { fetchBlocks, expandBlocks } from '../../actions/blocks';
-import { ColumnBackButtonSlim } from '../../components/column_back_button';
 import { LoadingIndicator } from '../../components/loading_indicator';
 import ScrollableList from '../../components/scrollable_list';
 import AccountContainer from '../../containers/account_container';
@@ -60,8 +59,7 @@ class Blocks extends ImmutablePureComponent {
     const emptyMessage = <FormattedMessage id='empty_column.blocks' defaultMessage="You haven't blocked any users yet." />;
 
     return (
-      <Column bindToDocument={!multiColumn} icon='ban' iconComponent={BlockIcon} heading={intl.formatMessage(messages.heading)}>
-        <ColumnBackButtonSlim />
+      <Column bindToDocument={!multiColumn} icon='ban' iconComponent={BlockIcon} heading={intl.formatMessage(messages.heading)} alwaysShowBackButton>
         <ScrollableList
           scrollKey='blocks'
           onLoadMore={this.handleLoadMore}

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

@@ -12,7 +12,6 @@ import { ReactComponent as BlockIcon } from '@material-symbols/svg-600/outlined/
 import { debounce } from 'lodash';
 
 import { fetchDomainBlocks, expandDomainBlocks } from '../../actions/domain_blocks';
-import { ColumnBackButtonSlim } from '../../components/column_back_button';
 import { LoadingIndicator } from '../../components/loading_indicator';
 import ScrollableList from '../../components/scrollable_list';
 import DomainContainer from '../../containers/domain_container';
@@ -61,9 +60,7 @@ class Blocks extends ImmutablePureComponent {
     const emptyMessage = <FormattedMessage id='empty_column.domain_blocks' defaultMessage='There are no blocked domains yet.' />;
 
     return (
-      <Column bindToDocument={!multiColumn} icon='ban' iconComponent={BlockIcon} heading={intl.formatMessage(messages.heading)}>
-        <ColumnBackButtonSlim />
-
+      <Column bindToDocument={!multiColumn} icon='ban' iconComponent={BlockIcon} heading={intl.formatMessage(messages.heading)} alwaysShowBackButton>
         <ScrollableList
           scrollKey='domain_blocks'
           onLoadMore={this.handleLoadMore}

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

@@ -12,7 +12,6 @@ import { ReactComponent as PersonAddIcon } from '@material-symbols/svg-600/outli
 import { debounce } from 'lodash';
 
 import { fetchFollowRequests, expandFollowRequests } from '../../actions/accounts';
-import { ColumnBackButtonSlim } from '../../components/column_back_button';
 import ScrollableList from '../../components/scrollable_list';
 import { me } from '../../initial_state';
 import Column from '../ui/components/column';
@@ -68,8 +67,7 @@ class FollowRequests extends ImmutablePureComponent {
     );
 
     return (
-      <Column bindToDocument={!multiColumn} icon='user-plus' iconComponent={PersonAddIcon} heading={intl.formatMessage(messages.heading)}>
-        <ColumnBackButtonSlim />
+      <Column bindToDocument={!multiColumn} icon='user-plus' iconComponent={PersonAddIcon} heading={intl.formatMessage(messages.heading)} alwaysShowBackButton>
         <ScrollableList
           scrollKey='follow_requests'
           onLoadMore={this.handleLoadMore}

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

@@ -12,7 +12,6 @@ import { ReactComponent as VolumeOffIcon } from '@material-symbols/svg-600/outli
 import { debounce } from 'lodash';
 
 import { fetchMutes, expandMutes } from '../../actions/mutes';
-import { ColumnBackButtonSlim } from '../../components/column_back_button';
 import { LoadingIndicator } from '../../components/loading_indicator';
 import ScrollableList from '../../components/scrollable_list';
 import AccountContainer from '../../containers/account_container';
@@ -62,8 +61,7 @@ class Mutes extends ImmutablePureComponent {
     const emptyMessage = <FormattedMessage id='empty_column.mutes' defaultMessage="You haven't muted any users yet." />;
 
     return (
-      <Column bindToDocument={!multiColumn} icon='volume-off' iconComponent={VolumeOffIcon} heading={intl.formatMessage(messages.heading)}>
-        <ColumnBackButtonSlim />
+      <Column bindToDocument={!multiColumn} icon='volume-off' iconComponent={VolumeOffIcon} heading={intl.formatMessage(messages.heading)} alwaysShowBackButton>
         <ScrollableList
           scrollKey='mutes'
           onLoadMore={this.handleLoadMore}

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

@@ -13,7 +13,6 @@ import { ReactComponent as PushPinIcon } from '@material-symbols/svg-600/outline
 import { getStatusList } from 'mastodon/selectors';
 
 import { fetchPinnedStatuses } from '../../actions/pin_statuses';
-import { ColumnBackButtonSlim } from '../../components/column_back_button';
 import StatusList from '../../components/status_list';
 import Column from '../ui/components/column';
 
@@ -52,8 +51,7 @@ class PinnedStatuses extends ImmutablePureComponent {
     const { intl, statusIds, hasMore, multiColumn } = this.props;
 
     return (
-      <Column bindToDocument={!multiColumn} icon='thumb-tack' iconComponent={PushPinIcon} heading={intl.formatMessage(messages.heading)} ref={this.setRef}>
-        <ColumnBackButtonSlim />
+      <Column bindToDocument={!multiColumn} icon='thumb-tack' iconComponent={PushPinIcon} heading={intl.formatMessage(messages.heading)} ref={this.setRef} alwaysShowBackButton>
         <StatusList
           statusIds={statusIds}
           scrollKey='pinned_statuses'

app/javascript/mastodon/features/status/components/detailed_status.jsx

@@ -58,7 +58,7 @@ class DetailedStatus extends ImmutablePureComponent {
   handleAccountClick = (e) => {
     if (e.button === 0 && !(e.ctrlKey || e.metaKey) && this.props.history) {
       e.preventDefault();
-      this.history.push(`/@${this.props.status.getIn(['account', 'acct'])}`);
+      this.props.history.push(`/@${this.props.status.getIn(['account', 'acct'])}`);
     }
 
     e.stopPropagation();

app/javascript/mastodon/features/ui/components/__tests__/column-test.jsx

@@ -1,13 +1,15 @@
-import { render, fireEvent, screen } from '@testing-library/react';
+import { render, fireEvent, screen } from 'mastodon/test_helpers';
 
 import Column from '../column';
 
+const fakeIcon = () => <span />;
+
 describe('<Column />', () => {
   describe('<ColumnHeader /> click handler', () => {
     it('runs the scroll animation if the column contains scrollable content', () => {
       const scrollToMock = jest.fn();
       const { container } = render(
-        <Column heading='notifications'>
+        <Column heading='notifications' icon='notifications' iconComponent={fakeIcon}>
           <div className='scrollable' />
         </Column>,
       );
@@ -17,7 +19,7 @@ describe('<Column />', () => {
     });
 
     it('does not try to scroll if there is no scrollable content', () => {
-      render(<Column heading='notifications' />);
+      render(<Column heading='notifications' icon='notifications' iconComponent={fakeIcon} />);
       fireEvent.click(screen.getByText('notifications'));
     });
   });

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

@@ -3,15 +3,15 @@ import { PureComponent } from 'react';
 
 import { debounce } from 'lodash';
 
+import ColumnHeader from '../../../components/column_header';
 import { isMobile } from '../../../is_mobile';
 import { scrollTop } from '../../../scroll';
 
-import ColumnHeader from './column_header';
-
 export default class Column extends PureComponent {
 
   static propTypes = {
     heading: PropTypes.string,
+    alwaysShowBackButton: PropTypes.bool,
     icon: PropTypes.string,
     iconComponent: PropTypes.func,
     children: PropTypes.node,
@@ -51,13 +51,14 @@ export default class Column extends PureComponent {
   };
 
   render () {
-    const { heading, icon, iconComponent, children, active, hideHeadingOnMobile } = this.props;
+    const { heading, icon, iconComponent, children, active, hideHeadingOnMobile, alwaysShowBackButton } = this.props;
 
     const showHeading = heading && (!hideHeadingOnMobile || (hideHeadingOnMobile && !isMobile(window.innerWidth)));
 
     const columnHeaderId = showHeading && heading.replace(/ /g, '-');
+
     const header = showHeading && (
-      <ColumnHeader icon={icon} iconComponent={iconComponent} active={active} type={heading} onClick={this.handleHeaderClick} columnHeaderId={columnHeaderId} />
+      <ColumnHeader icon={icon} iconComponent={iconComponent} active={active} title={heading} onClick={this.handleHeaderClick} columnHeaderId={columnHeaderId} showBackButton={alwaysShowBackButton} />
     );
     return (
       <div

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

@@ -1,41 +0,0 @@
-import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
-
-import classNames from 'classnames';
-
-import { Icon }  from 'mastodon/components/icon';
-
-export default class ColumnHeader extends PureComponent {
-
-  static propTypes = {
-    icon: PropTypes.string,
-    iconComponent: PropTypes.func,
-    type: PropTypes.string,
-    active: PropTypes.bool,
-    onClick: PropTypes.func,
-    columnHeaderId: PropTypes.string,
-  };
-
-  handleClick = () => {
-    this.props.onClick();
-  };
-
-  render () {
-    const { icon, iconComponent, type, active, columnHeaderId } = this.props;
-    let iconElement = '';
-
-    if (icon) {
-      iconElement = <Icon id={icon} icon={iconComponent} className='column-header__icon' />;
-    }
-
-    return (
-      <h1 className={classNames('column-header', { active })} id={columnHeaderId || null}>
-        <button onClick={this.handleClick}>
-          {iconElement}
-          {type}
-        </button>
-      </h1>
-    );
-  }
-
-}

app/javascript/mastodon/locales/he.json

@@ -202,7 +202,7 @@
   "dismissable_banner.community_timeline": "אלו הם החצרוצים הציבוריים האחרונים מהמשתמשים על שרת {domain}.",
   "dismissable_banner.dismiss": "בטל",
   "dismissable_banner.explore_links": "אלו הקישורים האחרונים ששותפו על ידי משתמשים ששרת זה רואה ברשת המבוזרת כרגע.",
-  "dismissable_banner.explore_statuses": "ההודעות האלו, משרת זה ואחרים ברשת המבוזרת, צוברים חשיפה היום. הודעות חדשות יותר עם יותר הדהודים וחיבובים מדורגים יותר לגובה.",
+  "dismissable_banner.explore_statuses": "ההודעות האלו, משרת זה ואחרים ברשת המבוזרת, צוברים חשיפה היום. הודעות חדשות יותר עם יותר הדהודים וחיבובים מדורגים גבוה יותר.",
   "dismissable_banner.explore_tags": "התגיות האלו, משרת זה ואחרים ברשת המבוזרת, צוברות חשיפה כעת.",
   "dismissable_banner.public_timeline": "אלו ההודעות האחרונות שהתקבלו מהמשתמשים שנעקבים על ידי משתמשים מ־{domain}.",
   "embed.instructions": "ניתן להטמיע את ההודעה הזו באתרך ע\"י העתקת הקוד שלהלן.",
@@ -315,7 +315,7 @@
   "home.pending_critical_update.title": "יצא עדכון אבטחה חשוב!",
   "home.show_announcements": "הצג הכרזות",
   "interaction_modal.description.favourite": "עם חשבון מסטודון, ניתן לחבב את ההודעה כדי לומר למחבר/ת שהערכת את תוכנו או כדי לשמור אותו לקריאה בעתיד.",
-  "interaction_modal.description.follow": "עם חשבון מסטודון, ניתן לעקוב אחרי {name} כדי לקבל את הםוסטים שלו/ה בפיד הבית.",
+  "interaction_modal.description.follow": "עם חשבון מסטודון, ניתן לעקוב אחרי {name} כדי לקבל את הפוסטים שלו/ה בפיד הבית.",
   "interaction_modal.description.reblog": "עם חשבון מסטודון, ניתן להדהד את החצרוץ ולשתף עם עוקבים.",
   "interaction_modal.description.reply": "עם חשבון מסטודון, ניתן לענות לחצרוץ.",
   "interaction_modal.login.action": "קח אותי לדף הבית",
@@ -493,7 +493,7 @@
   "onboarding.steps.setup_profile.title": "התאמה אישית של הפרופיל",
   "onboarding.steps.share_profile.body": "ספרו לחברים איך למצוא אתכם במסטודון!",
   "onboarding.steps.share_profile.title": "לשתף פרופיל",
-  "onboarding.tips.2fa": "<strong>הידעת?</strong> ניתן לאבטח את החשבון ע\"י הקמת אימות בשני צעדים במסך מאפייני החשבון. השיטה תעבוד עם כל יישומון תואם TOTP על המגשיר שלך, אין צורך לתת לנו את מספר הטלפון!",
+  "onboarding.tips.2fa": "<strong>הידעת?</strong> ניתן לאבטח את החשבון ע\"י הקמת אימות דו-שלבי במסך מאפייני החשבון. השיטה תעבוד עם כל יישומון תואם TOTP על המכשיר שלך, ללא צורך במספר טלפון!",
   "onboarding.tips.accounts_from_other_servers": "<strong>הידעת?</strong> כיוון שמסטודון פועל ברשת מבוזרת, חלק מהפרופילים שתתקלו בהם פועלים משרתים אחרים משרת הבית שלכם. ניתן להיות איתם בקשר בצורה זהה לכל חשבון אחר! שם השרת שלהם הוא החלק השני של שם המשתמש שלהם!",
   "onboarding.tips.migration": "<strong>הידעת?</strong> אם תחליטו כי {domain} איננו שרת שמתאים לכם בעתיד, ניתן לעבור לשרת אחר מבלי לאבד עוקבים. תוכלו אפילו להקים שרת משלכן!",
   "onboarding.tips.verification": "<strong>הידעת?</strong> ניתן לאשרר את החשבון ע\"י קישור הפרופיל אל האתר שלכם ומהאתר חזרה לפרופיל. לא נדרשים תשלומים ומסמכים!",
@@ -575,7 +575,7 @@
   "report.thanks.title": "לא מעוניין/ת לראות את זה?",
   "report.thanks.title_actionable": "תודה על הדיווח, נבדוק את העניין.",
   "report.unfollow": "הפסיקו לעקוב אחרי @{name}",
-  "report.unfollow_explanation": "אתם עוקבים אחרי החשבון הזה. כדי להפסיק לראות את הפרסומים שלו בפיד הבית שלכם, הפסיקו לעקוב אחריהם.",
+  "report.unfollow_explanation": "אתם עוקבים אחרי החשבון הזה. כדי להפסיק לראות את הפרסומים שלו בפיד הבית שלכם, הפסיקו לעקוב אחריו.",
   "report_notification.attached_statuses": "{count, plural, one {הודעה מצורפת} two {הודעותיים מצורפות} many {{count} הודעות מצורפות} other {{count} הודעות מצורפות}}",
   "report_notification.categories.legal": "חוקי",
   "report_notification.categories.other": "שונות",

app/javascript/mastodon/test_helpers.tsx

@@ -0,0 +1,62 @@
+import PropTypes from 'prop-types';
+import type { PropsWithChildren } from 'react';
+import { Component } from 'react';
+
+import { IntlProvider } from 'react-intl';
+
+import { MemoryRouter } from 'react-router';
+
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { render as rtlRender } from '@testing-library/react';
+
+class FakeIdentityWrapper extends Component<
+  PropsWithChildren<{ signedIn: boolean }>
+> {
+  static childContextTypes = {
+    identity: PropTypes.shape({
+      signedIn: PropTypes.bool.isRequired,
+      accountId: PropTypes.string,
+      disabledAccountId: PropTypes.string,
+      accessToken: PropTypes.string,
+    }).isRequired,
+  };
+
+  getChildContext() {
+    return {
+      identity: {
+        signedIn: this.props.signedIn,
+        accountId: '123',
+        accessToken: 'test-access-token',
+      },
+    };
+  }
+
+  render() {
+    return this.props.children;
+  }
+}
+
+function render(
+  ui: React.ReactElement,
+  { locale = 'en', signedIn = true, ...renderOptions } = {},
+) {
+  const Wrapper = (props: { children: React.ReactElement }) => {
+    return (
+      <MemoryRouter>
+        <IntlProvider locale={locale}>
+          <FakeIdentityWrapper signedIn={signedIn}>
+            {props.children}
+          </FakeIdentityWrapper>
+        </IntlProvider>
+      </MemoryRouter>
+    );
+  };
+  return rtlRender(ui, { wrapper: Wrapper, ...renderOptions });
+}
+
+// re-export everything
+// eslint-disable-next-line import/no-extraneous-dependencies
+export * from '@testing-library/react';
+
+// override render method
+export { render };

app/javascript/styles/mastodon/components.scss

@@ -3137,20 +3137,6 @@ $ui-header-height: 55px;
   margin-inline-end: 5px;
 }
 
-.column-back-button--slim {
-  position: relative;
-}
-
-.column-back-button--slim-button {
-  cursor: pointer;
-  flex: 0 0 auto;
-  font-size: 16px;
-  padding: 15px;
-  position: absolute;
-  inset-inline-end: 0;
-  top: -50px;
-}
-
 .react-toggle {
   display: inline-block;
   position: relative;

app/lib/content_security_policy.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+class ContentSecurityPolicy
+  def base_host
+    Rails.configuration.x.web_domain
+  end
+
+  def assets_host
+    url_from_configured_asset_host || url_from_base_host
+  end
+
+  def media_host
+    cdn_host_value || assets_host
+  end
+
+  private
+
+  def url_from_configured_asset_host
+    Rails.configuration.action_controller.asset_host
+  end
+
+  def cdn_host_value
+    s3_alias_host || s3_cloudfront_host || azure_alias_host || s3_hostname_host
+  end
+
+  def url_from_base_host
+    host_to_url(base_host)
+  end
+
+  def host_to_url(host_string)
+    uri_from_configuration_and_string(host_string) if host_string.present?
+  end
+
+  def s3_alias_host
+    host_to_url ENV.fetch('S3_ALIAS_HOST', nil)
+  end
+
+  def s3_cloudfront_host
+    host_to_url ENV.fetch('S3_CLOUDFRONT_HOST', nil)
+  end
+
+  def azure_alias_host
+    host_to_url ENV.fetch('AZURE_ALIAS_HOST', nil)
+  end
+
+  def s3_hostname_host
+    host_to_url ENV.fetch('S3_HOSTNAME', nil)
+  end
+
+  def uri_from_configuration_and_string(host_string)
+    Addressable::URI.parse("#{host_protocol}://#{host_string}").tap do |uri|
+      uri.path += '/' unless uri.path.blank? || uri.path.end_with?('/')
+    end.to_s
+  end
+
+  def host_protocol
+    Rails.configuration.x.use_https ? 'https' : 'http'
+  end
+end

app/mailers/user_mailer.rb

@@ -8,13 +8,15 @@ class UserMailer < Devise::Mailer
   helper :instance
   helper :statuses
   helper :formatting
+  helper :routing
 
-  helper RoutingHelper
+  before_action :set_instance
+
+  default to: -> { @resource.email }
 
   def confirmation_instructions(user, token, *, **)
     @resource = user
     @token    = token
-    @instance = Rails.configuration.x.local_domain
 
     return unless @resource.active_for_authentication?
 
@@ -28,185 +30,177 @@ class UserMailer < Devise::Mailer
   def reset_password_instructions(user, token, *, **)
     @resource = user
     @token    = token
-    @instance = Rails.configuration.x.local_domain
 
     return unless @resource.active_for_authentication?
 
     I18n.with_locale(locale) do
-      mail to: @resource.email, subject: I18n.t('devise.mailer.reset_password_instructions.subject')
+      mail subject: default_devise_subject
     end
   end
 
   def password_change(user, *, **)
     @resource = user
-    @instance = Rails.configuration.x.local_domain
 
     return unless @resource.active_for_authentication?
 
     I18n.with_locale(locale) do
-      mail to: @resource.email, subject: I18n.t('devise.mailer.password_change.subject')
+      mail subject: default_devise_subject
     end
   end
 
   def email_changed(user, *, **)
     @resource = user
-    @instance = Rails.configuration.x.local_domain
 
     return unless @resource.active_for_authentication?
 
     I18n.with_locale(locale) do
-      mail to: @resource.email, subject: I18n.t('devise.mailer.email_changed.subject')
+      mail subject: default_devise_subject
     end
   end
 
   def two_factor_enabled(user, *, **)
     @resource = user
-    @instance = Rails.configuration.x.local_domain
 
     return unless @resource.active_for_authentication?
 
     I18n.with_locale(locale) do
-      mail to: @resource.email, subject: I18n.t('devise.mailer.two_factor_enabled.subject')
+      mail subject: default_devise_subject
     end
   end
 
   def two_factor_disabled(user, *, **)
     @resource = user
-    @instance = Rails.configuration.x.local_domain
 
     return unless @resource.active_for_authentication?
 
     I18n.with_locale(locale) do
-      mail to: @resource.email, subject: I18n.t('devise.mailer.two_factor_disabled.subject')
+      mail subject: default_devise_subject
     end
   end
 
   def two_factor_recovery_codes_changed(user, *, **)
     @resource = user
-    @instance = Rails.configuration.x.local_domain
 
     return unless @resource.active_for_authentication?
 
     I18n.with_locale(locale) do
-      mail to: @resource.email, subject: I18n.t('devise.mailer.two_factor_recovery_codes_changed.subject')
+      mail subject: default_devise_subject
     end
   end
 
   def webauthn_enabled(user, *, **)
     @resource = user
-    @instance = Rails.configuration.x.local_domain
 
     return unless @resource.active_for_authentication?
 
     I18n.with_locale(locale) do
-      mail to: @resource.email, subject: I18n.t('devise.mailer.webauthn_enabled.subject')
+      mail subject: default_devise_subject
     end
   end
 
   def webauthn_disabled(user, *, **)
     @resource = user
-    @instance = Rails.configuration.x.local_domain
 
     return unless @resource.active_for_authentication?
 
     I18n.with_locale(locale) do
-      mail to: @resource.email, subject: I18n.t('devise.mailer.webauthn_disabled.subject')
+      mail subject: default_devise_subject
     end
   end
 
   def webauthn_credential_added(user, webauthn_credential)
     @resource = user
-    @instance = Rails.configuration.x.local_domain
     @webauthn_credential = webauthn_credential
 
     return unless @resource.active_for_authentication?
 
     I18n.with_locale(locale) do
-      mail to: @resource.email, subject: I18n.t('devise.mailer.webauthn_credential.added.subject')
+      mail subject: I18n.t('devise.mailer.webauthn_credential.added.subject')
     end
   end
 
   def webauthn_credential_deleted(user, webauthn_credential)
     @resource = user
-    @instance = Rails.configuration.x.local_domain
     @webauthn_credential = webauthn_credential
 
     return unless @resource.active_for_authentication?
 
     I18n.with_locale(locale) do
-      mail to: @resource.email, subject: I18n.t('devise.mailer.webauthn_credential.deleted.subject')
+      mail subject: I18n.t('devise.mailer.webauthn_credential.deleted.subject')
     end
   end
 
   def welcome(user)
     @resource = user
-    @instance = Rails.configuration.x.local_domain
 
     return unless @resource.active_for_authentication?
 
     I18n.with_locale(locale) do
-      mail to: @resource.email, subject: I18n.t('user_mailer.welcome.subject')
+      mail subject: default_i18n_subject
     end
   end
 
   def backup_ready(user, backup)
     @resource = user
-    @instance = Rails.configuration.x.local_domain
     @backup   = backup
 
     return unless @resource.active_for_authentication?
 
     I18n.with_locale(locale) do
-      mail to: @resource.email, subject: I18n.t('user_mailer.backup_ready.subject')
+      mail subject: default_i18n_subject
     end
   end
 
   def warning(user, warning)
     @resource = user
     @warning  = warning
-    @instance = Rails.configuration.x.local_domain
     @statuses = @warning.statuses.includes(:account, :preloadable_poll, :media_attachments, active_mentions: [:account])
 
     I18n.with_locale(locale) do
-      mail to: @resource.email, subject: I18n.t("user_mailer.warning.subject.#{@warning.action}", acct: "@#{user.account.local_username_and_domain}")
+      mail subject: I18n.t("user_mailer.warning.subject.#{@warning.action}", acct: "@#{user.account.local_username_and_domain}")
     end
   end
 
   def appeal_approved(user, appeal)
     @resource = user
-    @instance = Rails.configuration.x.local_domain
     @appeal   = appeal
 
     I18n.with_locale(locale) do
-      mail to: @resource.email, subject: I18n.t('user_mailer.appeal_approved.subject', date: l(@appeal.created_at))
+      mail subject: default_i18n_subject(date: l(@appeal.created_at))
     end
   end
 
   def appeal_rejected(user, appeal)
     @resource = user
-    @instance = Rails.configuration.x.local_domain
     @appeal   = appeal
 
     I18n.with_locale(locale) do
-      mail to: @resource.email, subject: I18n.t('user_mailer.appeal_rejected.subject', date: l(@appeal.created_at))
+      mail subject: default_i18n_subject(date: l(@appeal.created_at))
     end
   end
 
   def suspicious_sign_in(user, remote_ip, user_agent, timestamp)
     @resource   = user
-    @instance   = Rails.configuration.x.local_domain
     @remote_ip  = remote_ip
     @user_agent = user_agent
     @detection  = Browser.new(user_agent)
     @timestamp  = timestamp.to_time.utc
 
     I18n.with_locale(locale) do
-      mail to: @resource.email, subject: I18n.t('user_mailer.suspicious_sign_in.subject')
+      mail subject: default_i18n_subject
     end
   end
 
   private
 
+  def default_devise_subject
+    I18n.t(:subject, scope: ['devise.mailer', action_name])
+  end
+
+  def set_instance
+    @instance = Rails.configuration.x.local_domain
+  end
+
   def locale
     @resource.locale.presence || I18n.default_locale
   end

app/models/tag.rb

@@ -35,7 +35,7 @@ class Tag < ApplicationRecord
   HASHTAG_LAST_SEQUENCE = '([[:word:]_]*[[:alpha:]][[:word:]_]*)'
   HASHTAG_NAME_PAT = "#{HASHTAG_FIRST_SEQUENCE}|#{HASHTAG_LAST_SEQUENCE}"
 
-  HASHTAG_RE = %r{(?<![=/)[:word]])#(#{HASHTAG_NAME_PAT})}i
+  HASHTAG_RE = %r{(?<![=/)\w])#(#{HASHTAG_NAME_PAT})}i
   HASHTAG_NAME_RE = /\A(#{HASHTAG_NAME_PAT})\z/i
   HASHTAG_INVALID_CHARS_RE = /[^[:alnum:]#{HASHTAG_SEPARATORS}]/
 

app/services/follow_service.rb

@@ -71,7 +71,7 @@ class FollowService < BaseService
     if @target_account.local?
       LocalNotificationWorker.perform_async(@target_account.id, follow_request.id, follow_request.class.name, 'follow_request')
     elsif @target_account.activitypub?
-      ActivityPub::DeliveryWorker.perform_async(build_json(follow_request), @source_account.id, @target_account.inbox_url)
+      ActivityPub::DeliveryWorker.perform_async(build_json(follow_request), @source_account.id, @target_account.inbox_url, { 'bypass_availability' => true })
     end
 
     follow_request

app/workers/activitypub/delivery_worker.rb

@@ -23,9 +23,10 @@ class ActivityPub::DeliveryWorker
   HEADERS = { 'Content-Type' => 'application/activity+json' }.freeze
 
   def perform(json, source_account_id, inbox_url, options = {})
-    return unless DeliveryFailureTracker.available?(inbox_url)
-
     @options        = options.with_indifferent_access
+
+    return unless @options[:bypass_availability] || DeliveryFailureTracker.available?(inbox_url)
+
     @json           = json
     @source_account = Account.find(source_account_id)
     @inbox_url      = inbox_url

config/i18n-tasks.yml

@@ -64,6 +64,7 @@ ignore_unused:
   - 'statuses.attached.*'
   - 'move_handler.carry_{mutes,blocks}_over_text'
   - 'admin_mailer.*.subject'
+  - 'user_mailer.*.subject'
   - 'notification_mailer.*'
   - 'imports.overwrite_preambles.{following,blocking,muting,domain_blocking,bookmarks,lists}_html'
   - 'imports.preambles.{following,blocking,muting,domain_blocking,bookmarks,lists}_html'

config/initializers/content_security_policy.rb

@@ -6,24 +6,11 @@
 # See the Securing Rails Applications Guide for more information:
 # https://guides.rubyonrails.org/security.html#content-security-policy-header
 
-def host_to_url(str)
-  return if str.blank?
+require_relative '../../app/lib/content_security_policy'
 
-  uri = Addressable::URI.parse("http#{Rails.configuration.x.use_https ? 's' : ''}://#{str}")
-  uri.path += '/' unless uri.path.blank? || uri.path.end_with?('/')
-  uri.to_s
-end
-
-base_host = Rails.configuration.x.web_domain
-
-assets_host   = Rails.configuration.action_controller.asset_host
-assets_host ||= host_to_url(base_host)
-
-media_host   = host_to_url(ENV['S3_ALIAS_HOST'])
-media_host ||= host_to_url(ENV['S3_CLOUDFRONT_HOST'])
-media_host ||= host_to_url(ENV['AZURE_ALIAS_HOST'])
-media_host ||= host_to_url(ENV['S3_HOSTNAME']) if ENV['S3_ENABLED'] == 'true'
-media_host ||= assets_host
+policy = ContentSecurityPolicy.new
+assets_host = policy.assets_host
+media_host = policy.media_host
 
 def sso_host
   return unless ENV['ONE_CLICK_SSO_LOGIN'] == 'true'

config/locales/activerecord.he.yml

@@ -9,7 +9,7 @@ he:
         agreement: הסכם שירות
         email: כתובת דוא"ל
         locale: הגדרות אזוריות
-        password: סיסמא
+        password: סיסמה
       user/account:
         username: שם משתמש/ת
       user/invite_request:

config/locales/de.yml

@@ -1043,8 +1043,10 @@ de:
     confirmations:
       awaiting_review: Deine E-Mail-Adresse wurde bestätigt und das Team von %{domain} überprüft nun deine Registrierung. Sobald es dein Konto genehmigt, wirst du eine E-Mail erhalten.
       awaiting_review_title: Deine Registrierung wird überprüft
+      clicking_this_link: Klick auf diesen Link
       login_link: anmelden
       proceed_to_login_html: Du kannst dich nun %{login_link}.
+      redirect_to_app_html: Du hättest zur <strong>%{app_name}</strong>-App weitergeleitet werden sollen. Wenn das nicht geschehen ist, versuche es mit einem %{clicking_this_link} oder kehre manuell zur App zurück.
       registration_complete: Deine Registrierung auf %{domain} ist nun abgeschlossen!
       welcome_title: Willkommen, %{name}!
       wrong_email_hint: Sollte diese E-Mail-Adresse nicht korrekt sein, kannst du sie in den Kontoeinstellungen ändern.

config/locales/devise.he.yml

@@ -8,10 +8,10 @@ he:
     failure:
       already_authenticated: חשבון זה כבר מחובר.
       inactive: חשבון זה טרם הופעל.
-      invalid: "%{authentication_keys} או סיסמא לא נכונים."
+      invalid: "%{authentication_keys} או סיסמה לא נכונים."
       last_attempt: יש לך עוד ניסיון אחד לפני נעילת החשבון.
       locked: חשבון זה נעול.
-      not_found_in_database: "%{authentication_keys} או סיסמא לא נכונים."
+      not_found_in_database: "%{authentication_keys} או סיסמה לא נכונים."
       pending: חשבונך נמצא עדיין בבדיקה.
       timeout: פג תוקף השהיה בחשבון. נא להכנס מחדש על מנת להמשיך.
       unauthenticated: יש להרשם או להכנס לחשבון על מנת להמשיך.
@@ -27,24 +27,24 @@ he:
         title: אימות כתובת דוא״ל
       email_changed:
         explanation: 'כתובת הדוא"ל של חשבונך שונתה ל:'
-        extra: אם לא שינית את כתובת הדוא"ל שלך, יכול להיות שמישהו השתלט על חשבונך. נא לשנות את הסיסמא מיידית או ליצור קשר עם מנהלי השרת אם ננעלת מחוץ לחשבון.
+        extra: אם לא שינית את כתובת הדוא"ל שלך, יכול להיות שמישהו השתלט על חשבונך. נא לשנות את הסיסמה שלך מיידית או ליצור קשר עם מנהלי השרת אם ננעלת מחוץ לחשבונך.
         subject: 'מסטודון: כתובת הדוא"ל שונתה'
         title: כתובת דוא״ל חדשה
       password_change:
-        explanation: הסיסמא לחשבונך שונתה.
-        extra: אם לא שינית את סיסמתך, יכול להיות שמישהו השתלט על חשבונך. נא לשנות את הסיסמא מיידית או ליצור קשר עם מנהלי השרת אם ננעלת מחוץ לחשבון.
-        subject: 'מסטודון: הסיסמא שונתה'
-        title: הסיסמא שונתה
+        explanation: הסיסמה לחשבונך שונתה.
+        extra: אם לא שינית את סיסמתך, יכול להיות שמישהו השתלט על חשבונך. נא לשנות את הסיסמה שלך מיידית או ליצור קשר עם מנהלי השרת אם ננעלת מחוץ לחשבונך.
+        subject: 'מסטודון: הסיסמה שונתה'
+        title: הסיסמה שונתה
       reconfirmation_instructions:
         explanation: נא לאמת את הכתובת הדוא"ל החדשה על מנת לשנותה.
         extra: אם שינוי זה לא בוצע על ידך, נא להתעלם מדוא"ל זה. כתובת הדוא"ל של חשבון המסטודון שלך לא תשונה אלא אם תלחץ הקישורית לעיל.
         subject: 'מסטודון: נא לאשר כתובת דוא"ל עבור %{instance}'
         title: אימות כתובת דוא״ל
       reset_password_instructions:
-        action: שינוי סיסמא
-        explanation: ביקשת סיסמא חדשה לחשבון.
-        extra: אם לא ביקשת את זה, נא להתעלם מדוא"ל זה. סיסמתך לא תשתנה עוד שתלחץ הקישורית לעיל ותיוצר סיסמא חדשה.
-        subject: 'מסטודון: הוראות לאיפוס סיסמא'
+        action: שינוי סיסמה
+        explanation: ביקשת סיסמה חדשה לחשבון שלך.
+        extra: אם לא ביקשת זאת, נא להתעלם מדוא"ל זה. סיסמתך לא תשתנה עוד שתלחץ הקישורית לעיל ותיוצר סיסמה חדשה.
+        subject: 'מסטודון: הוראות לאיפוס סיסמה'
         title: איפוס סיסמה
       two_factor_disabled:
         explanation: האימות הדו-גורמי לחשבונך בוטל. ניתן עתה להכנס לחשבון עם כתובת דוא"ל וסיסמא בלבד.
@@ -81,7 +81,7 @@ he:
       failure: 'לא ניתן לאמת את חשבונך מ־%{kind} מהסיבה: "%{reason}".'
       success: נכשל אימות מחשבון %{kind}.
     passwords:
-      no_token: לא ניתן לגשת לעמוד זה, אלא מדוא"ל איפוס סיסמא. אם לא הגעת מדוא"ל איפוס סיסמא, יש לוודא שכתובת הקישורית הוקלדה בשלמותה.
+      no_token: לא ניתן לגשת לעמוד זה, אלא מדוא"ל איפוס סיסמה. אם הגעת מדוא"ל איפוס סיסמה, יש לוודא שכתובת הקישורית הוקלדה בשלמותה.
       send_instructions: בדקות הקרובות יתקבל דוא"ל עם הוראות לאיפוס סיסמתך. יש לבדוק את תיבת הספאם ליתר בטחון אם ההודעה לא הגיעה תוך דקות ספורות.
       send_paranoid_instructions: אם כתובת הדוא"ל שלך קיימת במסד הנתונים, יתקבל בדקות הקרובות דוא"ל עם הוראות לאחזור סיסמא. יש לבדוק את תיבת הספאם ליתר בטחון אם ההודעה לא הגיעה תוך דקות ספורות.
       updated: סיסמתך שונתה בהצלחה. הינך כעת במצב מחובר.

config/locales/es-AR.yml

@@ -1041,6 +1041,14 @@ es-AR:
       hint_html: ¡Sólo una cosa más! Necesitamos confirmar que sos humano (¡esto es para que podamos mantener el spam fuera!). Resuelvé la CAPTCHA abajo y hacé clic en "Continuar".
       title: Comprobación de seguridad
     confirmations:
+      awaiting_review: "¡Tu dirección de correo electrónico fue confirmada! El equipo de %{domain} está revisando tu registro. ¡Recibirás un correo electrónico si aprueban tu cuenta!"
+      awaiting_review_title: Tu registro está siendo revisado
+      clicking_this_link: haciendo clic en este enlace
+      login_link: iniciar sesión
+      proceed_to_login_html: Ahora podés %{login_link}.
+      redirect_to_app_html: Deberías haber sido redirigido a la aplicación <strong>%{app_name}</strong>. Si eso no sucedió, probá %{clicking_this_link} o volvé a la aplicación manualmente.
+      registration_complete: "¡Tu registro en %{domain} fue completado!"
+      welcome_title: "¡Te damos la bienvenida, %{name}!"
       wrong_email_hint: Si esa dirección de correo electrónico no es correcta, podés cambiarla en la configuración de la cuenta.
     delete_account: Eliminar cuenta
     delete_account_html: Si querés eliminar tu cuenta, podés <a href="%{path}">seguir por acá</a>. Se te va a pedir una confirmación.

config/locales/es.yml

@@ -1041,6 +1041,14 @@ es:
       hint_html: ¡Una última cosita! Necesitamos confirmar que eres humano (¡así podemos evitar el spam!). Resuelve este CAPTCHA de debajo y pulsa en "Continuar".
       title: Comprobación de seguridad
     confirmations:
+      awaiting_review: "¡Tu dirección de correo electrónico ha sido confirmada! El personal de %{domain} está revisando tu registro. ¡Recibirás un correo electrónico cuando aprueben tu cuenta!"
+      awaiting_review_title: Estamos revisando tu registro
+      clicking_this_link: haciendo clic en este enlace
+      login_link: iniciar sesión
+      proceed_to_login_html: Ahora puedes proceder a %{login_link}.
+      redirect_to_app_html: Serás redirigido a la aplicación <strong>%{app_name}</strong>. Si esto no sucede, prueba %{clicking_this_link} o regresa manualmente a la aplicación.
+      registration_complete: "¡Has completado tu registro en %{domain}!"
+      welcome_title: "¡Bienvenido, %{name}!"
       wrong_email_hint: Si esa dirección de correo electrónico no es correcta, puedes cambiarla en la configuración de la cuenta.
     delete_account: Borrar cuenta
     delete_account_html: Si desea eliminar su cuenta, puede <a href="%{path}">proceder aquí</a>. Será pedido de una confirmación.
@@ -1100,7 +1108,7 @@ es:
       account_status: Estado de la cuenta
       confirming: Esperando confirmación de correo electrónico.
       functional: Tu cuenta está completamente operativa.
-      pending: Su solicitud está pendiente de revisión por nuestros administradores. Eso puede tardar algún tiempo. Usted recibirá un correo electrónico si el solicitud sea aprobada.
+      pending: Tu solicitud está pendiente de revisión por nuestro personal. Eso puede tardar un tiempo. Recibirás un correo electrónico cuando tu solicitud sea aprobada.
       redirecting_to: Tu cuenta se encuentra inactiva porque está siendo redirigida a %{acct}.
       self_destruct: Como %{domain} está en proceso de cierre, solo tendrás acceso limitado a tu cuenta.
       view_strikes: Ver amonestaciones pasadas contra tu cuenta
@@ -1786,7 +1794,7 @@ es:
       title: Un nuevo inicio de sesión
     warning:
       appeal: Enviar una apelación
-      appeal_description: Si crees que esto es un error, puedes enviar una apelación al equipo de %{instance}.
+      appeal_description: Si crees que esto es un error, puedes enviar una apelación al personal de %{instance}.
       categories:
         spam: Spam
         violation: El contenido viola las siguientes directrices de la comunidad

config/locales/fi.yml

@@ -534,7 +534,7 @@ fi:
       total_reported: Niitä koskevat raportit
       total_storage: Medialiitteet
       totals_time_period_hint_html: Alla näkyvät yhteenlasketut tiedot sisältävät koko ajan.
-      unknown_instance: Tällä palvelimella ei ole tällä hetkellä tähän verkkotunnukseen liittyviä tietueita.
+      unknown_instance: Tällä palvelimella ei tällä hetkellä ole tähän verkkotunnukseen liittyviä tietueita.
     invites:
       deactivate_all: Poista kaikki käytöstä
       filter:
@@ -1041,13 +1041,13 @@ fi:
       hint_html: Vielä yksi juttu! Meidän on vahvistettava, että olet ihminen (tämän avulla pidämme roskapostin poissa!). Ratkaise alla oleva CAPTCHA-vahvistus ja paina "Jatka".
       title: Turvatarkastus
     confirmations:
-      awaiting_review: Sähköpostiosoitteesi on vahvistettu! Palvelun %{domain} ylläpito tarkistaa nyt rekisteröitymisesi. Saat sähköpostiviestin, jos tilisi hyväksytään!
+      awaiting_review: Sähköpostiosoitteesi on vahvistettu! Seuraavaksi palvelimen %{domain} ylläpito tarkistaa rekisteröitymisesi ja saat lopuksi ilmoituksen sähköpostitse, jos tilisi hyväksytään!
       awaiting_review_title: Rekisteröitymisesi on tarkistettavana
-      clicking_this_link: napsauttaa tätä linkkiä
+      clicking_this_link: tästä linkistä
       login_link: kirjautumalla sisään
       proceed_to_login_html: Voit nyt jatkaa %{login_link}.
-      redirect_to_app_html: Sinun olisi pitänyt ohjautua sovellukseen <strong>%{app_name}</strong>. Jos näin ei tapahtunut, kokeile %{clicking_this_link} tai palaa sovellukseen manuaalisesti.
-      registration_complete: Rekisteröitymisesi palveluun %{domain} on nyt valmis!
+      redirect_to_app_html: Sinun olisi pitänyt ohjautua sovellukseen <strong>%{app_name}</strong>. Jos näin ei tapahtunut, yritä avata se %{clicking_this_link} tai palaa sovellukseen manuaalisesti.
+      registration_complete: Rekisteröitymisesi palvelimelle %{domain} on suoritettu!
       welcome_title: Tervetuloa, %{name}!
       wrong_email_hint: Jos sähköpostiosoite ei ole oikein, voit muuttaa sen tilin asetuksista.
     delete_account: Poista tili

config/locales/fo.yml

@@ -1041,6 +1041,14 @@ fo:
       hint_html: Bara eitt afturat! Tað er neyðugt hjá okkum at vátta, at tú ert eitt menniskja (fyri at sleppa undan ruskposti!). Loys CAPTCHA niðanfyri og trýst á "Halt fram".
       title: Trygdarkanning
     confirmations:
+      awaiting_review: Teldupostadressan hjá góðkend! Nú kanna %{domain} ábyrgdarfólk skrásetingina hjá tær. Góðkenna tey kontu tína, so senda tey tær eitt teldubræv!
+      awaiting_review_title: Skrásetingin hjá tær verður viðgjørd
+      clicking_this_link: við at klikkja á hetta leinki
+      login_link: rita inn
+      proceed_to_login_html: Nú kanst tú fara víðari til %{login_link}.
+      redirect_to_app_html: Tú skuldi verið send/ur víðari til <strong>%{app_name}</strong> appina. Hendi tað ikki, so kanst tú royna %{clicking_this_link} ella fara manuelt aftur til appina.
+      registration_complete: Skráseting tín á %{domain} er nú avgreidd!
+      welcome_title: Vælkomin, %{name}!
       wrong_email_hint: Um hesin teldupoststaðurin ikki er rættur, so kanst tú broyta hann í kontustillingunum.
     delete_account: Strika kontu
     delete_account_html: Ynskir tú at strika kontuna, so kanst tú <a href="%{path}">halda fram her</a>. Tú verður spurd/ur um váttan.

config/locales/fr-QC.yml

@@ -1041,6 +1041,14 @@ fr-QC:
       hint_html: Juste une autre chose! Nous avons besoin de confirmer que vous êtes un humain (pour que nous puissions empêcher les spams!). Résolvez le CAPTCHA ci-dessous et cliquez sur "Continuer".
       title: Vérification de sécurité
     confirmations:
+      awaiting_review: Votre adresse e-mail est confirmée ! L’équipe de %{domain} vérifie désormais votre inscription. Vous recevrez un e-mail si votre compte est approuvé !
+      awaiting_review_title: Votre inscription est en cours de validation
+      clicking_this_link: cliquer sur ce lien
+      login_link: vous connecter
+      proceed_to_login_html: Vous pouvez désormais %{login_link}.
+      redirect_to_app_html: Vous auriez dû être redirigé vers l’application <strong>%{app_name}</strong>. Si cela ne s’est pas produit, essayez de %{clicking_this_link} ou de revenir manuellement à l’application.
+      registration_complete: Votre inscription sur %{domain} est désormais terminée !
+      welcome_title: Bienvenue, %{name} !
       wrong_email_hint: Si cette adresse de courriel est incorrecte, vous pouvez la modifier dans vos paramètres de compte.
     delete_account: Supprimer le compte
     delete_account_html: Si vous désirez supprimer votre compte, vous pouvez <a href="%{path}">cliquer ici</a>. Il vous sera demandé de confirmer cette action.

config/locales/fr.yml

@@ -1041,6 +1041,14 @@ fr:
       hint_html: Encore une chose ! Nous avons besoin de confirmer que vous êtes un humain (c'est pour que nous puissions empêcher les spams !). Résolvez le CAPTCHA ci-dessous et cliquez sur "Continuer".
       title: Vérification de sécurité
     confirmations:
+      awaiting_review: Votre adresse e-mail est confirmée ! L’équipe de %{domain} vérifie désormais votre inscription. Vous recevrez un e-mail si votre compte est approuvé !
+      awaiting_review_title: Votre inscription est en cours de validation
+      clicking_this_link: cliquer sur ce lien
+      login_link: vous connecter
+      proceed_to_login_html: Vous pouvez désormais %{login_link}.
+      redirect_to_app_html: Vous auriez dû être redirigé vers l’application <strong>%{app_name}</strong>. Si cela ne s’est pas produit, essayez de %{clicking_this_link} ou de revenir manuellement à l’application.
+      registration_complete: Votre inscription sur %{domain} est désormais terminée !
+      welcome_title: Bienvenue, %{name} !
       wrong_email_hint: Si cette adresse de courriel est incorrecte, vous pouvez la modifier dans vos paramètres de compte.
     delete_account: Supprimer le compte
     delete_account_html: Si vous désirez supprimer votre compte, vous pouvez <a href="%{path}">cliquer ici</a>. Il vous sera demandé de confirmer cette action.

config/locales/fy.yml

@@ -1041,6 +1041,14 @@ fy:
       hint_html: Noch ien ding! Jo moatte befêstigje dat jo in minske binne (dit is om de spam bûten de doar te hâlden!). Los de ûndersteande CAPTCHA op en klik op ‘Trochgean’.
       title: Befeiligingskontrôle
     confirmations:
+      awaiting_review: Jo e-mailadres is befêstige! De %{domain}-meiwurkers binne no dwaande mei it besjen fan jo registraasje. Jo ûntfange in e-mailberjocht as de jo account goedkarre!
+      awaiting_review_title: Jo registraasje wurdt beoardield
+      clicking_this_link: klik op dizze keppeling
+      login_link: oanmelde
+      proceed_to_login_html: Jo kinne no fierder gean nei %{login_link}.
+      redirect_to_app_html: Jo soene omlaad wêze moatte nei de <strong>%{app_name}</strong> app. As dat net bard is, probearje dan %{clicking_this_link} of kear hânmjittich werom nei de app.
+      registration_complete: Jo registraasje op %{domain} is no foltôge!
+      welcome_title: Wolkom, %{name}!
       wrong_email_hint: As it e-mailadres net korrekt is, kinne jo dat wizigje yn de accountynstellingen.
     delete_account: Account fuortsmite
     delete_account_html: Wannear’t jo jo account graach fuortsmite wolle, kinne jo dat <a href="%{path}">hjir dwaan</a>. Wy freegje jo dêr om in befêstiging.

config/locales/he.yml

@@ -1077,6 +1077,14 @@ he:
       hint_html: עוד דבר אחד, עלינו לאשרר שאת(ה) אנושיים (לצורך סינון ספאם). נא לפתור את הקאפצ'ה להלן וללחוץ "המשך".
       title: בדיקות אבטחה
     confirmations:
+      awaiting_review: כתובת הדואל שלך אושרה! צוות %{domain} עכשיו יבדוק את הרשמתך. תשלח אליך הודעת דואל אם הצוות יאשר את החשבון!
+      awaiting_review_title: הרשמתך עוברת בדיקה
+      clicking_this_link: לחיצה על קישור זה
+      login_link: כניסה
+      proceed_to_login_html: ניתן להמשיך עכשיו אל %{login_link}.
+      redirect_to_app_html: כאן אמורה היתה להיות הפניה אוטמטית ליישומון <strong>%{app_name}</strong>. אם זה לא קרה, ניתן לנסות שוב על ידי %{clicking_this_link} או חזרה ידנית אל היישומון.
+      registration_complete: הרשמתך לשרת %{domain} הושלמה כעת!
+      welcome_title: ברוך/ה הבא/ה, %{name}!
       wrong_email_hint: אם כתובת הדואל הזו איננה נכונה, ניתן לשנות אותה בעמוד ההגדרות.
     delete_account: מחיקת חשבון
     delete_account_html: אם ברצונך למחוק את החשבון, ניתן <a href="%{path}">להמשיך כאן</a>. תתבקש/י לספק אישור נוסף.
@@ -1126,7 +1134,7 @@ he:
       new_confirmation_instructions_sent: אתם עומדים לקבל הודעת דואל חדשה עם קיש/ור אימות בדקות הקרובות!
       title: בדוק/בדקי את תיבת הדואר הנכנס שלך
     sign_in:
-      preamble_html: הכנס.י עם שם וסיסמא מאתר <strong>%{domain}</strong>. אם חשבונך מתארח בשרת אחר, לא ניתן להתחבר איתו פה.
+      preamble_html: הכנס.י עם שם וסיסמה מאתר <strong>%{domain}</strong>. אם חשבונך מתארח בשרת אחר, לא ניתן להתחבר איתו פה.
       title: התחבר אל %{domain}
     sign_up:
       manual_review: פתיחת חשבון אצל %{domain} עוברת בדיקה ידנית על ידי הצוות שלנו. כדי לסייע בתהליך הרישום שלכןם, כתבו לנו על עצמכןם ולמה אתןם רוצותים חשבון בשרת %{domain}.

config/locales/hu.yml

@@ -1041,13 +1041,13 @@ hu:
       hint_html: Még egy dolog! Meg kell győződnünk róla, hogy tényleg valós személy vagy (így távol tarthatjuk a spam-et). Oldd meg az alábbi CAPTCHA-t és kattints a "Folytatás"-ra.
       title: Biztonsági ellenőrzés
     confirmations:
-      awaiting_review: Az email cím megerősítésre került. %{domain} stáb elenleg áttrkinti a regisztrációt. Ha jóváhagyásra kerül a fiók, egy email kerül kiküldésre!
-      awaiting_review_title: A regisztráció áttekintés alatt áll.
+      awaiting_review: Az email címed megerősítésre került. %{domain} stábja jelenleg áttekinti a regisztrációdat. Ha jóváhagyásra került a fiókod, egy emailt küldenek majd!
+      awaiting_review_title: A regisztrációd áttekintés alatt áll
       clicking_this_link: kattintás erre a hivatkozásra
       login_link: bejelentkezés
-      proceed_to_login_html: 'Most továbbléphetünk: %{login_link}.'
-      redirect_to_app_html: Át kellett volna kerülni <strong>%{app_name}</strong> alkalmazáshoz. Ha ez nem történt meg, próbálkozzunk %{clicking_this_link} lehetőséggel vagy térjünk vissza manuálisan az alkalmazáshoz.
-      registration_complete: A regisztráció %{domain} domainen befejeződött!
+      proceed_to_login_html: 'Most továbbléphetsz: %{login_link}.'
+      redirect_to_app_html: Át kellett volna irányítsunk a <strong>%{app_name}</strong> alkalmazáshoz. Ha ez nem történt meg, próbálkozz a %{clicking_this_link} lehetőséggel vagy térj vissza manuálisan az alkalmazáshoz.
+      registration_complete: A regisztrációd %{domain} domainen befejeződött!
       welcome_title: Üdvözlet, %{name}!
       wrong_email_hint: Ha az emailcím nem helyes, a fiókbeállításokban megváltoztathatod.
     delete_account: Felhasználói fiók törlése

config/locales/is.yml

@@ -1045,9 +1045,13 @@ is:
         Leystu Turing skynprófið og smelltu á "Áfram".
       title: Öryggisathugun
     confirmations:
+      awaiting_review: Tölvupóstfangið þitt er staðfest. Umsjónarfólk %{domain} er núna að yfirfara skráninguna þína. Þú munt fá tölvupóst ef þau samþykkja skráninguna þína!
+      awaiting_review_title: Verið er að yfirfara skráninguna þína
       clicking_this_link: smella á þennan tengil
       login_link: skrá þig inn
       proceed_to_login_html: Þú getur núna farið í að %{login_link}.
+      redirect_to_app_html: Þér ætti að hafa verið endurbeint í <strong>%{app_name}</strong> forritið. Ef það gerðist ekki, skaltu prófa að %{clicking_this_link} eða fara aftur í forritið.
+      registration_complete: Skráning þín á %{domain} er núna tilbúin!
       welcome_title: Velkomin/n %{name}!
       wrong_email_hint: Ef það tölvupóstfang er ekki rétt geturðu breytt því í stillingum notandaaðgangsins.
     delete_account: Eyða notandaaðgangi

config/locales/it.yml

@@ -1043,6 +1043,14 @@ it:
       hint_html: Solamente un'altra cosa! Dobbiamo confermare che tu sia un essere umano (così possiamo tenere fuori lo spam!). Risolvi il CAPTCHA sottostante e fai clic su "Continua".
       title: Controllo di sicurezza
     confirmations:
+      awaiting_review: Il tuo indirizzo e-mail è confermato! Lo staff di %{domain} sta esaminando la tua registrazione. Riceverai una e-mail se il tuo account sarà approvato!
+      awaiting_review_title: La tua registrazione è in corso di revisione
+      clicking_this_link: cliccando su questo link
+      login_link: accedi
+      proceed_to_login_html: Ora puoi procedere con il %{login_link}.
+      redirect_to_app_html: Avresti dovuto essere reindirizzato all'app <strong>%{app_name}</strong>. Se ciò non fosse avvenuto, prova %{clicking_this_link} o torna manualmente all'app.
+      registration_complete: La tua registrazione su %{domain} è ora completata!
+      welcome_title: Benvenutə, %{name}!
       wrong_email_hint: Se l'indirizzo e-mail non è corretto, puoi modificarlo nelle impostazioni dell'account.
     delete_account: Elimina account
     delete_account_html: Se desideri cancellare il tuo account, puoi <a href="%{path}">farlo qui</a>. Ti sarà chiesta conferma.

config/locales/ko.yml

@@ -1025,14 +1025,14 @@ ko:
       hint_html: 하나만 더! 당신이 사람인지 확인이 필요합니다 (스팸 계정을 거르기 위해서 필요한 과정입니다). 아래에 있는 CAPTCHA를 풀고 "계속"을 누르세요
       title: 보안 체크
     confirmations:
-      awaiting_review: 이메일 주소를 확인했어요! 이제 %{domain} 스태프가 가입을 검토해요. 계정이 승인되면 이메일을 보내드려요.
-      awaiting_review_title: 가입 검토 중
+      awaiting_review: 이메일 주소가 확인되었습니다! 이제 %{domain} 스태프가 가입을 검토할 것입니다. 계정이 승인되면 이메일을 받게 됩니다!
+      awaiting_review_title: 가입 신청을 검토 중입니다
       clicking_this_link: 이 링크를 클릭
       login_link: 로그인
-      proceed_to_login_html: "%{login_link} 할 수 있게 되었어요."
-      redirect_to_app_html: 곧 <strong>%{app_name}</strong>으로 리디렉션 되어요. 안 된다면, %{clicking_this_link}하거나 직접 앱으로 돌아가세요.
-      registration_complete: 지금 막 %{domain} 가입을 마쳤어요!
-      welcome_title: "%{name} 님 반가워요!"
+      proceed_to_login_html: 이제 %{login_link} 할 수 있습니다.
+      redirect_to_app_html: 곧 <strong>%{app_name}</strong>으로 리디렉션 됩니다. 안 된다면, %{clicking_this_link}하거나 직접 앱으로 돌아가세요.
+      registration_complete: 지금 막 %{domain} 가입이 완료되었습니다!
+      welcome_title: "%{name} 님 반갑습니다!"
       wrong_email_hint: 만약 이메일 주소가 올바르지 않다면, 계정 설정에서 수정할 수 있습니다.
     delete_account: 계정 삭제
     delete_account_html: 계정을 삭제하고 싶은 경우, <a href="%{path}">여기서</a> 삭제할 수 있습니다. 삭제 전 확인 화면이 표시됩니다.

config/locales/nl.yml

@@ -1041,6 +1041,14 @@ nl:
       hint_html: Nog maar één ding! Je moet bevestigen dat je een mens bent (dit is om de spam buiten de deur te houden!). Los de onderstaande CAPTCHA op en klik op "Doorgaan".
       title: Veiligheidscontrole
     confirmations:
+      awaiting_review: Je e-mailadres is bevestigd! De medewerkers van %{domain} zijn nu bezig met het beoordelen van jouw registratie. Je ontvangt een e-mailbericht wanneer ze jouw account goedkeuren!
+      awaiting_review_title: Je registratie wordt beoordeeld
+      clicking_this_link: op deze link te klikken
+      login_link: inloggen
+      proceed_to_login_html: Je kunt nu verder gaan naar %{login_link}.
+      redirect_to_app_html: Je zou omgeleid moeten zijn naar de <strong>%{app_name}</strong> app. Als dat niet is gebeurd, probeer dan %{clicking_this_link} of keer handmatig terug naar de app.
+      registration_complete: Je registratie op %{domain} is nu voltooid!
+      welcome_title: Welkom %{name}!
       wrong_email_hint: Als dat e-mailadres niet correct is, kun je het wijzigen in je accountinstellingen.
     delete_account: Account verwijderen
     delete_account_html: Wanneer je jouw account graag wilt verwijderen, kun je dat <a href="%{path}">hier doen</a>. We vragen jou daar om een bevestiging.
@@ -1573,8 +1581,8 @@ nl:
     over_total_limit: Je hebt de limiet van %{limit} in te plannen berichten overschreden
     too_soon: De datum voor het ingeplande bericht moet in de toekomst liggen
   self_destruct:
-    lead_html: Helaas gaat <strong>%{domain}</strong> permanent afsluiten. Als u daar een account had, kunt u deze niet meer gebruiken, maar u kunt nog steeds een back-up van uw gegevens opvragen.
-    title: Deze server gaat afsluiten
+    lead_html: Helaas gaat <strong>%{domain}</strong> permanent sluiten. Als je daar een account had, kun je deze niet meer gebruiken, maar je kunt nog steeds een back-up van je gegevens opvragen.
+    title: Deze server gaat sluiten
   sessions:
     activity: Laatst actief
     browser: Webbrowser

config/locales/pl.yml

@@ -1077,6 +1077,14 @@ pl:
       hint_html: Jeszcze jedno! Potrzebujemy potwierdzić twoje człowieczeństwo, żeby ograniczyć spam. Rozwiąż poniższą CAPTCHA-ę i naciśnij "Kontynuuj".
       title: Kontrola bezpieczeństwa
     confirmations:
+      awaiting_review: Twój adres e-mail został potwierdzony! Administracja %{domain} sprawdza Twoją rejestrację. Otrzymasz e-mail w momencie, gdy zaakceptują Twoje konto!
+      awaiting_review_title: Twoja rejestracja jest obecnie sprawdzana
+      clicking_this_link: kliknąć ten link
+      login_link: zaloguj się
+      proceed_to_login_html: Teraz możesz przejść do %{login_link}.
+      redirect_to_app_html: Powinieneś zostać przekierowany do aplikacji <strong>%{app_name}</strong>. Jeśli tak się nie stało, spróbuj %{clicking_this_link} lub ręcznie wróć do aplikacji.
+      registration_complete: Twoja rejestracja na %{domain} została zakończona!
+      welcome_title: Witaj, %{name}!
       wrong_email_hint: Jeśli ten adres e-mail nie jest poprawny, możesz go zmienić w ustawieniach konta.
     delete_account: Usunięcie konta
     delete_account_html: Jeżeli chcesz usunąć konto, <a href="%{path}">przejdź tutaj</a>. Otrzymasz prośbę o potwierdzenie.

config/locales/pt-BR.yml

@@ -1040,6 +1040,8 @@ pt-BR:
       hint_html: Só mais uma coisa! Precisamos confirmar que você é um humano (isso é para que possamos evitar o spam!). Resolva o CAPTCHA abaixo e clique em "Continuar".
       title: Verificação de segurança
     confirmations:
+      registration_complete: Seu cadastro no %{domain} foi concluído!
+      welcome_title: Boas vindas, %{name}!
       wrong_email_hint: Se esse endereço de e-mail não estiver correto, você pode alterá-lo nas configurações da conta.
     delete_account: Excluir conta
     delete_account_html: Se você deseja excluir sua conta, você pode <a href="%{path}">fazer isso aqui</a>. Uma confirmação será solicitada.

config/locales/pt-PT.yml

@@ -1041,6 +1041,14 @@ pt-PT:
       hint_html: Só mais uma coisa! Precisamos confirmar que você é um humano (isto para que possamos evitar spam!). Resolva o CAPTCHA abaixo e clique em "Continuar".
       title: Verificação de segurança
     confirmations:
+      awaiting_review: O seu endereço de correio eletrónico foi confirmado! A equipa %{domain} está agora a rever a sua inscrição. Receberá uma mensagem de correio eletrónico se aprovarem a sua conta!
+      awaiting_review_title: A sua inscrição está a ser revista
+      clicking_this_link: clicar nesta hiperligação
+      login_link: iniciar sessão
+      proceed_to_login_html: Pode agora prosseguir para %{login_link}.
+      redirect_to_app_html: Devia ter sido reencaminhado para a aplicação <strong>%{app_name}</strong>. Se isso não aconteceu, tente %{clicking_this_link} ou volte manualmente para a aplicação.
+      registration_complete: O seu registo sem %{domain} está agora concluído!
+      welcome_title: Bem-vindo(a), %{name}!
       wrong_email_hint: Se esse endereço de e-mail não estiver correto, você pode alterá-lo nas configurações da conta.
     delete_account: Eliminar conta
     delete_account_html: Se deseja eliminar a sua conta, pode <a href="%{path}">continuar aqui</a>. Uma confirmação será solicitada.

config/locales/ru.yml

@@ -556,6 +556,7 @@ ru:
       total_reported: Жалобы на них
       total_storage: Медиафайлы
       totals_time_period_hint_html: Итоги, показанные ниже, включают данные за всё время.
+      unknown_instance: На данный момент нет записей об этом домене на этом сервере.
     invites:
       deactivate_all: Отключить все
       filter:
@@ -1076,6 +1077,12 @@ ru:
       hint_html: Еще одна вещь! Нам нужно подтвердить, что вы человек (так что мы можем держать спам!). Решите капчу ниже и нажмите кнопку «Продолжить».
       title: Проверка безопасности
     confirmations:
+      awaiting_review: Ваш адрес электронной почты подтвержден! Сотрудники %{domain} проверяют вашу регистрацию. Вы получите письмо, если они подтвердят вашу учетную запись!
+      awaiting_review_title: Ваша регистрация проверяется
+      login_link: войти
+      proceed_to_login_html: Теперь вы можете перейти к %{login_link}.
+      registration_complete: Ваша регистрация на %{domain} завершена!
+      welcome_title: Добро пожаловать, %{name}!
       wrong_email_hint: Если этот адрес электронной почты неверен, вы можете изменить его в настройках аккаунта.
     delete_account: Удалить учётную запись
     delete_account_html: Удалить свою учётную запись <a href="%{path}">можно в два счёта здесь</a>, но прежде у вас будет спрошено подтверждение.
@@ -1137,6 +1144,7 @@ ru:
       functional: Ваша учётная запись в полном порядке.
       pending: Ваша заявка ожидает одобрения администраторами, это может занять немного времени. Вы получите письмо, как только заявку одобрят.
       redirecting_to: Ваша учётная запись деактивированна, потому что вы настроили перенаправление на %{acct}.
+      self_destruct: Поскольку %{domain} закрывается, вы получите ограниченный доступ к вашей учетной записи.
       view_strikes: Просмотр предыдущих замечаний в адрес вашей учетной записи
     too_fast: Форма отправлена слишком быстро, попробуйте еще раз.
     use_security_key: Использовать ключ безопасности
@@ -1622,6 +1630,8 @@ ru:
     over_daily_limit: Вы превысили лимит в %{limit} запланированных постов на указанный день
     over_total_limit: Вы превысили лимит на %{limit} запланированных постов
     too_soon: Запланированная дата должна быть в будущем
+  self_destruct:
+    title: Этот сервер закрывается
   sessions:
     activity: Последняя активность
     browser: Браузер

config/locales/simple_form.he.yml

@@ -180,9 +180,9 @@ he:
         bot: זהו חשבון מסוג בוט
         chosen_languages: סינון שפות
         confirm_new_password: אישור סיסמא חדשה
-        confirm_password: אישור סיסמא
+        confirm_password: אישור סיסמה
         context: סינון לפי הקשר
-        current_password: סיסמא נוכחית
+        current_password: סיסמה נוכחית
         data: מידע
         display_name: שם להצגה
         email: כתובת דוא"ל
@@ -194,10 +194,10 @@ he:
         irreversible: הסרה במקום הסתרה
         locale: שפה
         max_uses: מספר מרבי של שימושים
-        new_password: סיסמא חדשה
+        new_password: סיסמה חדשה
         note: אודות
         otp_attempt: קוד אימות דו-שלבי
-        password: סיסמא
+        password: סיסמה
         phrase: מילת מפתח או ביטוי
         setting_advanced_layout: אפשר ממשק ווב מתקדם
         setting_aggregate_reblogs: קבץ הדהודים זהים

config/locales/sl.yml

@@ -401,9 +401,11 @@ sl:
         cancel: Prekliči
         confirm: Suspendiraj
         permanent_action: Z razveljavitvijo suzpenza ne boste obnovili nobenih podatkov ali razmerij.
+        preamble_html: Suspendirali boste <strong>%{domain}</strong> in njene poddomene.
         remove_all_data: S tem boste odstranili celotno vsebino, medijske vsebine ter podatke iz profila za rčune te domene na vašem strežniku.
         stop_communication: Vaš strežnik bo prenehal komunicirati s temi strežniki.
         title: Potrdi domenski blok za %{domain}
+        undo_relationships: To bo prekinilo vse odnose sledenja med računi na teh strežnikih in na vašem strežniku.
       created_msg: Domenski blok se sedaj obdeluje
       destroyed_msg: Domenski blok je bil razveljavljen
       domain: Domena
@@ -554,6 +556,7 @@ sl:
       total_reported: Prijave o njih
       total_storage: Predstavnostne priloge
       totals_time_period_hint_html: Spodaj prikazani seštevki vključujejo podatke za celotno obdobje.
+      unknown_instance: Trenutno ne obstaja zapis te domene na tem strežniku.
     invites:
       deactivate_all: Onemogoči vse
       filter:
@@ -767,6 +770,9 @@ sl:
       branding:
         preamble: Blagovna znamka vašega strežnika ga loči od drugih strežnikov v omrežju. Podatki se lahko prikžejo prek številnih okolij, kot so spletni vmesnik Mastodona, domorodni programi, predogledi povezav na drugih spletiščih, aplikacije za sporočanje itn. Zatorej je najbolje, da te podatke ohranite jasne, kratke in pomenljive.
         title: Blagovne znamke
+      captcha_enabled:
+        desc_html: To se zanaša na zunanje skripte hCaptcha in lahko predstavlja tveganje za varnost in zasebnost. Poleg tega <strong>to lahko nekaterim ljudem (posebno invalidom) občutno oteži dostopnost registracijskega postopka</strong>. Zato svetujemo, da razmislite o drugih ukrepih, kot je na primer registracija na podlagi odobritve ali povabila.
+        title: Od novih uporabnikov zahtevaj reševanje CAPTCHA za potrditev računov
       content_retention:
         preamble: Nazdor nad hrambo vsebine uporabnikov v Mastodonu.
         title: Hramba vsebin
@@ -795,13 +801,17 @@ sl:
           none: Nihče se ne more prijaviti
           open: Vsakdo se lahko prijavi
       security:
+        authorized_fetch: Od drugih strežnikov v federaciji zahtevaj overitev pristnosti
+        authorized_fetch_hint: Zahtevanje overitve pristnosti od drugih strežnikov v federaciji omogoči strožje uveljavljanje uporabniških in strežniških blokad. Vendar je cena za to počasnejše delovanje, zmanjšanje dosega vaših odgovorov in morebitne težave z združljivostjo z nekaterimi storitvami v federaciji. Poleg tega to odločenim akterjem ne bo preprečilo pridobivanja vaših javnih objav in računov.
         authorized_fetch_overridden_hint: Trenutno ne morete spremeniti te nastavitve, ker jo preglasi okoljska spremenljivka.
+        federation_authentication: Izvršba overitve pristnosti v federaciji
       title: Nastavitve strežnika
     site_uploads:
       delete: Izbriši naloženo datoteko
       destroyed_msg: Prenos na strežnik uspešno izbrisan!
     software_updates:
       critical_update: Kritično — čim prej posodobite
+      description: Vašo namestitev Mastodona je priporočeno vedno imeti posodobljeno in tako koristiti najnovejše popravke ter zmožnosti. Poleg tega je včasih nujno čim prej posodobiti Mastodon in se s tem izogniti varnostnim težavam. Zato Mastodon vsakih 30 minut preverja razpoložljivost posodobitev in vas o njih obvešča glede na vaše nastavitve obveščanja po e-pošti.
       documentation_link: Več o tem
       release_notes: Opombe ob izdaji
       title: Razpoložljive posodobitve
@@ -851,10 +861,20 @@ sl:
     system_checks:
       database_schema_check:
         message_html: Na čakanju so migracije zbirke podatkov. Prosimo, izvedite jih, da zagotovite, da se program vede pričakovano
+      elasticsearch_health_red:
+        message_html: Z gručo Elasticsearch ni vse v redu (rdeče stanje), zmožnosti iskanja niso na voljo
+      elasticsearch_health_yellow:
+        message_html: Z gručo Elasticsearch ni vse v redu (rumeno stanje), priporočeno je ugotoviti razlog
+      elasticsearch_index_mismatch:
+        message_html: Preslikave kazala Elasticsearch so zastarele. Poženite <code>tootctl search deploy --only=%{value}</code>
       elasticsearch_preset:
         action: Glejte dokumentacijo
+        message_html: Vaša gruča Elasticsearch vsebuje več kot eno vozlišče, vendar Mastodon ni nastavljen, da bi jih uporabljal.
       elasticsearch_preset_single_node:
         action: Glejte dokumentacijo
+        message_html: Vaša gruča Elasticsearch vsebuje samo eno vozlišče, <code>ES_PRESET</code> bi moralo biti nastavljeno na <code>single_node_cluster</code>.
+      elasticsearch_reset_chewy:
+        message_html: Sistemsko kazalo Elasticsearch je zastarelo zaradi spremembe nastavitve. Za posodobitev poženite <code>tootctl search deploy --reset-chewy</code>.
       elasticsearch_running_check:
         message_html: Povezava z Elasticsearch ni uspela. Preverite, da deluje, ali onemogočite iskanje po vsem besedilu
       elasticsearch_version_check:
@@ -867,6 +887,7 @@ sl:
         message_html: Noben proces Sidekiq ne poteka za %{value} vrst. Preglejte svojo prilagoditev Sidekiq
       software_version_critical_check:
         action: Glejte razpoložljive posodobitve
+        message_html: Na voljo je kritična posodobitev Mastodona. Posodobite čim prej.
       software_version_patch_check:
         action: Glejte razpoložljive posodobitve
         message_html: Na voljo je posodobitev Mastodona s popravki hroščev.
@@ -991,6 +1012,9 @@ sl:
       body: "%{target} se pritožuje na moderatorsko odločitev %{action_taken_by} z dne %{date}, ki je bila %{type}. Zapisal/a je:"
       next_steps: Pritožbi lahko ugodite in s tem razveljavite moderatorsko odločitev ali pa jo prezrete.
       subject: "%{username} se je pritožil na moderatorsko odločitev na %{instance}"
+    new_critical_software_updates:
+      body: Izdane so bile nove kritične različice Mastodona. Priporočena je čimprejšnja posodobitev.
+      subject: Za %{instance} so na voljo kritične posodobitve Mastodona!
     new_pending_account:
       body: Podrobnosti o novem računu so navedene spodaj. To aplikacijo lahko odobrite ali zavrnete.
       subject: Nov račun za pregled na %{instance} (%{username})
@@ -998,6 +1022,9 @@ sl:
       body: "%{reporter} je prijavil %{target}"
       body_remote: Nekdo iz %{domain} je prijavil %{target}
       subject: Nove prijave za %{instance} (#%{id})
+    new_software_updates:
+      body: Izdane so bile nove različice Mastodona. Priporočena je posodobitev.
+      subject: Za %{instance} so na voljo nove različice Mastodona.
     new_trends:
       body: 'Naslednji elementi potrebujejo pregled, preden jih je možno javno prikazati:'
       new_trending_links:
@@ -1046,8 +1073,18 @@ sl:
   auth:
     apply_for_account: Zaprosite za račun
     captcha_confirmation:
+      help_html: Če imate težave pri reševanju CAPTCHA, lahko prek %{email} stopite v stik z nami in pomagali vam bomo.
+      hint_html: Samo še nekaj. Moramo se prepričati, da ste človek (to nam pomaga pri preprečevanju neželenih vsebin). Rešite spodnji CAPTCHA in kliknite »Nadaljuj«.
       title: Varnostno preverjanje
     confirmations:
+      awaiting_review: Vaš e-poštni naslov je potrjen. Skrbniki %{domain} bodo pregledali vašo prijavo. Če odobrijo vaš račun, boste o tem prejeli e-pošto.
+      awaiting_review_title: Vaša prijava se pregleduje
+      clicking_this_link: s klikom na to povezavo
+      login_link: prijavo
+      proceed_to_login_html: Sedaj lahko nadaljujete na %{login_link}.
+      redirect_to_app_html: Morali bi biti preusmerjeni na aplikacijo <strong>%{app_name}</strong>. Če se to ni zgodilo, poskusite %{clicking_this_link} ali pa se ročno vrnite na aplikacijo.
+      registration_complete: Vaša prijava na %{domain} je sedaj zaključena.
+      welcome_title: Pozdravljeni, %{name}!
       wrong_email_hint: Če ta e-poštni naslov ni pravilen, ga lahko spremenite v nastavitvah računa.
     delete_account: Izbriši račun
     delete_account_html: Če želite izbrisati svoj račun, lahko nadaljujete <a href="%{path}">tukaj</a>. Prosili vas bomo za potrditev.
@@ -1083,7 +1120,9 @@ sl:
     rules:
       accept: Sprejmi
       back: Nazaj
+      invited_by: "%{domain} se lahko pridružite zahvaljujoč povabilu, ki ste ga prejeli od:"
       preamble: Slednje določajo in njihovo spoštovanje zagotavljajo moderatorji %{domain}.
+      preamble_invited: Preden nadaljujete, si preberite osnovna pravila, ki so jih postavili moderatorji na %{domain}.
       title: Nekaj osnovnih pravil.
       title_invited: Ste povabljeni.
     security: Varnost
@@ -1107,6 +1146,7 @@ sl:
       functional: Vaš račun je polno opravilen.
       pending: Naše osebje preverja vašo prijavo. To lahko traja nekaj časa. Če bo vaša prijava odobrena, boste prejeli e-pošto.
       redirecting_to: Vaš račun ni dejaven, ker trenutno preusmerja na račun %{acct}.
+      self_destruct: Ker se %{domain} zapira, boste imeli omejen dostop da svojega računa.
       view_strikes: Pokaži pretekle ukrepe proti mojemu računu
     too_fast: Obrazec oddan prehitro, poskusite znova.
     use_security_key: Uporabi varnostni ključ
@@ -1188,6 +1228,7 @@ sl:
     invalid_domain: ni veljavno ime domene
   edit_profile:
     basic_information: Osnovni podatki
+    hint_html: "<strong>Prilagodite, kaj ljudje vidijo na vašem javnem profilu in poleg vaših objav.</strong> Drugi vam bodo raje sledili nazaj in z vami klepetali, če boste imeli izpolnjen profil in nastavljeno profilno sliko."
     other: Drugo
   errors:
     '400': Zahteva, ki ste jo oddali, je neveljavna ali nepravilno oblikovana.
@@ -1322,6 +1363,20 @@ sl:
       merge_long: Ohrani obstoječe zapise in dodaj nove
       overwrite: Prepiši
       overwrite_long: Zamenjaj trenutne zapise z novimi
+    overwrite_preambles:
+      blocking_html: Svoj <strong>seznam blokiranih računov boste nadomestili</strong> z največ <strong>%{total_items} računi</strong> iz <strong>%{filename}</strong>.
+      bookmarks_html: Svoje <strong>zaznamke boste nadomestili</strong> z največ <strong>%{total_items} objavami</strong> iz <strong>%{filename}</strong>.
+      domain_blocking_html: Svoj <strong>seznam blokiranih domen boste nadomestili</strong> z največ <strong>%{total_items} domenami</strong> iz <strong>%{filename}</strong>.
+      following_html: "<strong>Začeli boste slediti</strong> največ <strong>%{total_items} računom</strong> iz <strong>%{filename}</strong> in <strong>prenehali slediti vsem ostalim</strong>."
+      lists_html: Svoje <strong>sezname boste nadomestili</strong> z vsebino datoteke <strong>%{filename}</strong>. Največ <strong>%{total_items} računov</strong> bo dodanih na nove sezname.
+      muting_html: Svoj <strong>seznam utišanih računov boste nadomestili</strong> z največ <strong>%{total_items} računi</strong> iz <strong>%{filename}</strong>.
+    preambles:
+      blocking_html: "<strong>Blokirali boste</strong> največ <strong>%{total_items} računov</strong> iz <strong>%{filename}</strong>."
+      bookmarks_html: "<strong>Med zaznamke</strong> boste dodali boste največ <strong>%{total_items} objav</strong> iz <strong>%{filename}</strong>."
+      domain_blocking_html: "<strong>Blokirali boste</strong> največ <strong>%{total_items} domen</strong> iz <strong>%{filename}</strong>."
+      following_html: "<strong>Začeli boste slediti</strong> največ <strong>%{total_items} računom</strong> iz <strong>%{filename}</strong>."
+      lists_html: Dodali boste največ <strong>%{total_items} računov</strong> iz <strong>%{filename}</strong> na svoje <strong>sezname</strong>. Po potrebi bodo ustvarjeni novi seznami.
+      muting_html: "<strong>Utišali boste</strong> največ <strong>%{total_items} računov</strong> iz <strong>%{filename}</strong>."
     preface: Podatke, ki ste jih izvozili iz drugega strežnika, lahko uvozite. Na primer seznam oseb, ki jih spremljate ali blokirate.
     recent_imports: Nedavni uvozi
     states:
@@ -1393,6 +1448,7 @@ sl:
     unsubscribe:
       action: Da, odjavi me
       complete: Odjavljeni
+      confirmation_html: Ali se res želite odjaviti od prejemanja %{type} za Mastodon na %{domain} na svojo e-pošto %{email}? Kadarkoli se lahko znova prijavite iz svojih <a href="%{settings_path}">nastavitev e-poštnih obvestil</a>.
       emails:
         notification_emails:
           favourite: e-sporočil z obvestili o priljubljenosti
@@ -1400,6 +1456,7 @@ sl:
           follow_request: e-sporočil o zahtevah za sledenje
           mention: e-sporočil z obvestili o omembah
           reblog: e-sporočil z obvestili o izpostavljanju
+      resubscribe_html: Če ste se odjavili po pomoti, se lahko znova prijavite iz svojih <a href="%{settings_path}">nastavitev e-poštnih obvestil</a>.
       success_html: Nič več ne boste prejemali %{type} za Mastodon na %{domain} na svoj e-naslov %{email}.
       title: Odjavi od naročnine
   media_attachments:
@@ -1526,9 +1583,13 @@ sl:
     posting_defaults: Privzete nastavitev objavljanja
     public_timelines: Javne časovnice
   privacy:
+    hint_html: "<strong>Prilagodite, kako lahko drugi najdejo vaš profil in vaše objave.</strong> V Mastodonu obstaja več zmožnosti, ki vam pomagajo doseči širše občinstvo, če so omogočene. Vzemite si čas in preverite, ali te nastavitve ustrezajo vašemu namenu uporabe."
     privacy: Zasebnost
+    privacy_hint_html: Nadzorujte, koliko informacij želite razkriti drugim. Ljudje lahko zanimive profile in aplikacije odkrijejo z brskanjem po seznamih sledenih in ko vidijo katere programe drugi uporabljajo za objavljanje. Morda pa bi to želeli skriti in varovati zasebnost.
     reach: Dosegljivost
+    reach_hint_html: Nadzorujte, ali želite, da vas drugi ljudje najdejo in vam pričnejo slediti. Ali želite, da se vaše objave prikažejo na strani Razišči? Ali želite, da vas drugi ljudje vidijo med predlogi za sledenje? Ali želite nove sledilce odobriti samodejno, ali vsakega posebej odobriti ročno?
     search: Iskanje
+    search_hint_html: Nadzorujte, kako želite, da vas najdejo. Ali želite, da vas ljudje najdejo po javnih objavah? Ali želite, da ljudje, ki niso na Mastodonu, lahko najdejo vaš profil med iskanjem po spletu? Vedite, da javnih objav in podatkov ni mogoče povsem izvzeti iz podatkovnih zbirk vseh spletnih iskalnikov.
     title: Zasebnost in dosegljivost
   privacy_policy:
     title: Pravilnik o zasebnosti
@@ -1571,6 +1632,9 @@ sl:
     over_daily_limit: Za ta dan ste presegli omejitev %{limit} načrtovanih objav
     over_total_limit: Presegli ste omejitev %{limit} načrtovanih objav
     too_soon: Načrtovani datum mora biti v prihodnosti
+  self_destruct:
+    lead_html: Na žalost se <strong>%{domain}</strong> za vedno zapira. Če ste tu imeli svoj račun, ga v prihodnje ne boste mogli več uporabljati. Zahtevate lahko kopijo svojih podatkov.
+    title: Ta strežnik se zapira
   sessions:
     activity: Zadnja dejavnost
     browser: Brskalnik
@@ -1752,6 +1816,10 @@ sl:
       month: "%b %Y"
       time: "%H:%M"
       with_time_zone: "%d.  %b. %Y %H:%M %Z"
+  translation:
+    errors:
+      quota_exceeded: Kvota uporabe prevajalne storitve za ta strežnik je bila presežena.
+      too_many_requests: V zadnjem času je prevajalna storitev prejela preveč zahtevkov.
   two_factor_authentication:
     add: Dodaj
     disable: Onemogoči
@@ -1837,7 +1905,9 @@ sl:
     seamless_external_login: Prijavljeni ste prek zunanje storitve, tako da nastavitve gesla in e-pošte niso na voljo.
     signed_in_as: 'Vpisani kot:'
   verification:
+    extra_instructions_html: <strong>Nasvet:</strong> Povezava na vaši spletni strani je lahko nevidna. Pomembni del je atribut <code>rel="me"</code>, ki preprečuje lažno predstavljanje na spletnih straneh z uporabniško ustvarjeno vsebino. Namesto oznake <code>a</code> lahko uporabite tudi oznako <code>link</code> znotraj glave (<code>head</code>) spletne strani, vendar mora biti HTML dosegljiv brez izvajanja skript JavaScript.
     here_is_how: Kako to poteka
+    hint_html: "<strong>Vsakdo lahko potrdi svojo istovetnost na Mastodonu.</strong> To temelji na odprtih spletnih standardih in je sedaj in za vedno brezplačno. Potrebujete le osebno spletno stran, po kateri vas ljudje prepoznajo. Ko na svoj profil dodate povezavo na to osebno spletno stran, bo Mastodon preveril, ali na njej obstaja povezava nazaj na profil. Če ta obstaja, bo to vidno na profiu."
     instructions_html: Spodnjo kodo kopirajte in prilepite v HTML svojega spletnega mesta. Nato dodajte naslov svoje spletne strani v eno od dodatnih polj v svojem profilu v zavihku »Uredi profil« in shranite spremembe.
     verification: Potrditev
     verified_links: Vaše preverjene povezave

config/locales/sq.yml

@@ -1035,6 +1035,14 @@ sq:
       hint_html: Edhe një gjë tjetër! Na duhet të ripohoni se jeni qenie njerëzore (që të mbajmë larg mesazhe të padëshiruar!). Zgjidhni CAPTCHA-n më poshtë dhe klikoni mbi “Vazhdo”.
       title: Kontroll sigurie
     confirmations:
+      awaiting_review: Adresa juaj email u ripohua! Ekipi i %{domain} stani po bën regjistrimin tuaj. Nëse e miratojnë llogarinë tuaj, do të merrni një email!
+      awaiting_review_title: Regjistrimi juaj po merret në shqyrtim
+      clicking_this_link: duke klikuar këtë lidhje
+      login_link: hyni
+      proceed_to_login_html: Tani mund të vazhdoni të %{login_link}.
+      redirect_to_app_html: Duhet të ishit ridrejtuar te aplikacioni <strong>%{app_name}</strong>. Nëse s’ndodhi, provoni %{clicking_this_link}, ose të ktheheni dorazi te aplikacioni.
+      registration_complete: Tanimë është plotësuar regjistrimi juaj në %{domain}!
+      welcome_title: Mirë se vini, %{name}!
       wrong_email_hint: Nëse ajo adresë email s’është e saktë, mund ta ndryshoni te rregullimet e llogarisë.
     delete_account: Fshije llogarinë
     delete_account_html: Nëse dëshironi të fshihni llogarinë tuaj, mund <a href="%{path}">ta bëni që këtu</a>. Do t’ju kërkohet ta ripohoni.

config/locales/sv.yml

@@ -1043,8 +1043,11 @@ sv:
     confirmations:
       awaiting_review_title: Din registrering är under granskning
       clicking_this_link: klicka på denna länk
+      login_link: logga in
+      proceed_to_login_html: Du kan nu fortsätta med att %{login_link}.
+      redirect_to_app_html: Du borde ha omdirigerats till appen <strong>%{app_name}</strong>. Om det inte hände, försök att %{clicking_this_link} eller återgå manuellt till appen.
       registration_complete: Din registrering på %{domain} är nu slutförd!
-      welcome_title: Välkommen, %{name}!
+      welcome_title: Välkommen %{name}!
       wrong_email_hint: Om e-postadressen inte är rätt, kan du ändra den i kontoinställningarna.
     delete_account: Radera konto
     delete_account_html: Om du vill radera ditt konto kan du <a href="%{path}">fortsätta här</a>. Du kommer att bli ombedd att bekräfta.

config/locales/th.yml

@@ -1023,6 +1023,14 @@ th:
       hint_html: อีกเพียงหนึ่งสิ่งเพิ่มเติม! เราจำเป็นต้องยืนยันว่าคุณเป็นมนุษย์ (นี่ก็เพื่อให้เราสามารถกันสแปมออกไป!) แก้ CAPTCHA ด้านล่างและคลิก "ดำเนินการต่อ"
       title: การตรวจสอบความปลอดภัย
     confirmations:
+      awaiting_review: ยืนยันที่อยู่อีเมลของคุณแล้ว! ตอนนี้พนักงานของ %{domain} กำลังตรวจทานการลงทะเบียนของคุณ คุณจะได้รับอีเมลหากพนักงานอนุมัติบัญชีของคุณ!
+      awaiting_review_title: กำลังตรวจทานการลงทะเบียนของคุณ
+      clicking_this_link: คลิกลิงก์นี้
+      login_link: เข้าสู่ระบบ
+      proceed_to_login_html: ตอนนี้คุณสามารถดำเนินการต่อเพื่อ %{login_link}
+      redirect_to_app_html: คุณควรได้รับการเปลี่ยนเส้นทางไปยังแอป <strong>%{app_name}</strong> หากนั่นไม่เกิดขึ้น ลอง %{clicking_this_link} หรือกลับไปยังแอปด้วยตนเอง
+      registration_complete: ตอนนี้การลงทะเบียนของคุณใน %{domain} เสร็จสมบูรณ์แล้ว!
+      welcome_title: ยินดีต้อนรับ %{name}!
       wrong_email_hint: หากที่อยู่อีเมลนั้นไม่ถูกต้อง คุณสามารถเปลี่ยนที่อยู่อีเมลได้ในการตั้งค่าบัญชี
     delete_account: ลบบัญชี
     delete_account_html: หากคุณต้องการลบบัญชีของคุณ คุณสามารถ <a href="%{path}">ดำเนินการต่อที่นี่</a> คุณจะได้รับการถามเพื่อการยืนยัน

config/locales/tr.yml

@@ -1041,6 +1041,14 @@ tr:
       hint_html: Sadece bir şey daha! Sizin bir insan olduğunuzu doğrulamamız gerekiyor (bu, spam'i dışarıda tutabilmemiz içindir!). Aşağıdaki CAPTCHA'yı çözün ve "Devam Et" düğmesini tıklayın.
       title: Güvenlik denetimi
     confirmations:
+      awaiting_review: E-posta adresiniz doğrulandı! %{domain} çalışanları şimdi kaydınızı inceliyorlar. Hesabınızı onayladıklarında bir e-posta alacaksınız!
+      awaiting_review_title: Kaydınız inceleniyor
+      clicking_this_link: bu bağlantıyı tıklamayı
+      login_link: oturum aç
+      proceed_to_login_html: Şimdi %{login_link} devam edebilirsiniz.
+      redirect_to_app_html: "<strong>%{app_name}</strong> uygulamasına yönlendirileceksiniz. Eğer yönlendirme olmazsa, %{clicking_this_link} veya uygulamaya geri dönmeyi deneyin."
+      registration_complete: "%{domain} sunucusunda kaydınız şimdi tamamlandı!"
+      welcome_title: Hoşgeldin %{name}!
       wrong_email_hint: Eğer bu e-posta adresi doğru değilse, hesap ayarlarında değiştirebilirsiniz.
     delete_account: Hesabı sil
     delete_account_html: Hesabını silmek istersen, <a href="%{path}">buradan devam edebilirsin</a>. Onay istenir.

config/locales/uk.yml

@@ -1077,6 +1077,14 @@ uk:
       hint_html: Ще одне! Ми повинні пересвідчитись, що ви людина (щоб ми могли уникнути спаму!). Розв'яжіть CAPTCHA внизу і натисніть кнопку "Продовжити".
       title: Перевірка безпеки
     confirmations:
+      awaiting_review: Ваша електронна адреса підтверджена! Співробітники %{domain} тепер переглядають вашу реєстрацію. Ви отримаєте електронного листа, якщо вони затвердять ваш обліковий запис!
+      awaiting_review_title: Ваша реєстрація розглядається
+      clicking_this_link: натисніть це посилання
+      login_link: увійти
+      proceed_to_login_html: Тепер ви можете перейти до %{login_link}.
+      redirect_to_app_html: Ви мали бути перенаправлені до програми <strong>%{app_name}</strong>. Якщо цього не сталося, спробуйте %{clicking_this_link} або вручну поверніться до програми.
+      registration_complete: Ваша реєстрація на %{domain} завершена!
+      welcome_title: Ласкаво просимо, %{name}!
       wrong_email_hint: Якщо ця адреса електронної пошти неправильна, можна змінити її в налаштуваннях облікового запису.
     delete_account: Видалити обліковий запис
     delete_account_html: Якщо ви хочете видалити свій обліковий запис, ви можете <a href="%{path}">перейти сюди</a>. Вас попросять підтвердити дію.

config/locales/vi.yml

@@ -1023,6 +1023,14 @@ vi:
       hint_html: Còn một xíu nữa! Chúng tôi cần xác minh bạn là con người (để chúng tôi có thể ngăn chặn thư rác!). Nhập CAPTCHA bên dưới và nhấn "Tiếp tục".
       title: Kiểm tra an toàn
     confirmations:
+      awaiting_review: Đã xác minh email của bạn! Kiểm duyệt viên %{domain} đang xem xét đăng ký của bạn. Bạn sẽ nhận được một email nếu tài khoản của bạn được duyệt!
+      awaiting_review_title: Đăng ký của bạn đang chờ duyệt
+      clicking_this_link: nhấn vào link này
+      login_link: đăng nhập
+      proceed_to_login_html: Bạn có thể tiếp tục %{login_link}.
+      redirect_to_app_html: Bạn đã có thể chuyển tiếp tới <strong>%{app_name}</strong>. Nếu không có gì xảy ra, thử %{clicking_this_link} hoặc tự quay lại app.
+      registration_complete: Hoàn tất đăng ký trên %{domain}!
+      welcome_title: Chào mừng, %{name}!
       wrong_email_hint: Nếu địa chỉ email đó không chính xác, bạn có thể thay đổi nó trong cài đặt tài khoản.
     delete_account: Xóa tài khoản
     delete_account_html: Nếu bạn muốn xóa tài khoản của mình, hãy <a href="%{path}">yêu cầu tại đây</a>. Bạn sẽ được yêu cầu xác nhận.

config/locales/zh-TW.yml

@@ -1027,7 +1027,7 @@ zh-TW:
     confirmations:
       awaiting_review: 已驗證您的電子郵件！%{domain} 的管理員正在審核您的註冊申請。若您的帳號通過審核，您將收到電子郵件通知。
       awaiting_review_title: 我們正在審核您的註冊申請
-      clicking_this_link: 點擊這個連結
+      clicking_this_link: 點擊此連結
       login_link: 登入
       proceed_to_login_html: 您現在可以前往 %{login_link}。
       redirect_to_app_html: 您應被重新導向至 <strong>%{app_name}</strong> 應用程式。如尚未重新導向，請嘗試 %{clicking_this_link} 或手動回到應用程式。

spec/controllers/admin/disputes/appeals_controller_spec.rb

@@ -33,8 +33,6 @@ RSpec.describe Admin::Disputes::AppealsController do
     let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
     before do
-      allow(UserMailer).to receive(:appeal_approved)
-        .and_return(instance_double(ActionMailer::MessageDelivery, deliver_later: nil))
       post :approve, params: { id: appeal.id }
     end
 
@@ -47,7 +45,9 @@ RSpec.describe Admin::Disputes::AppealsController do
     end
 
     it 'notifies target account about approved appeal' do
-      expect(UserMailer).to have_received(:appeal_approved).with(target_account.user, appeal)
+      expect(UserMailer.deliveries.size).to eq(1)
+      expect(UserMailer.deliveries.first.to.first).to eq(target_account.user.email)
+      expect(UserMailer.deliveries.first.subject).to eq(I18n.t('user_mailer.appeal_approved.subject', date: I18n.l(appeal.created_at)))
     end
   end
 
@@ -55,8 +55,6 @@ RSpec.describe Admin::Disputes::AppealsController do
     let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
     before do
-      allow(UserMailer).to receive(:appeal_rejected)
-        .and_return(instance_double(ActionMailer::MessageDelivery, deliver_later: nil))
       post :reject, params: { id: appeal.id }
     end
 
@@ -65,7 +63,9 @@ RSpec.describe Admin::Disputes::AppealsController do
     end
 
     it 'notifies target account about rejected appeal' do
-      expect(UserMailer).to have_received(:appeal_rejected).with(target_account.user, appeal)
+      expect(UserMailer.deliveries.size).to eq(1)
+      expect(UserMailer.deliveries.first.to.first).to eq(target_account.user.email)
+      expect(UserMailer.deliveries.first.subject).to eq(I18n.t('user_mailer.appeal_rejected.subject', date: I18n.l(appeal.created_at)))
     end
   end
 end

spec/controllers/auth/sessions_controller_spec.rb

@@ -127,8 +127,6 @@ RSpec.describe Auth::SessionsController do
 
         before do
           allow_any_instance_of(ActionDispatch::Request).to receive(:remote_ip).and_return(current_ip)
-          allow(UserMailer).to receive(:suspicious_sign_in)
-            .and_return(instance_double(ActionMailer::MessageDelivery, deliver_later!: nil))
           user.update(current_sign_in_at: 1.month.ago)
           post :create, params: { user: { email: user.email, password: user.password } }
         end
@@ -142,7 +140,9 @@ RSpec.describe Auth::SessionsController do
         end
 
         it 'sends a suspicious sign-in mail' do
-          expect(UserMailer).to have_received(:suspicious_sign_in).with(user, current_ip, anything, anything)
+          expect(UserMailer.deliveries.size).to eq(1)
+          expect(UserMailer.deliveries.first.to.first).to eq(user.email)
+          expect(UserMailer.deliveries.first.subject).to eq(I18n.t('user_mailer.suspicious_sign_in.subject'))
         end
       end
 

spec/lib/content_security_policy_spec.rb

@@ -0,0 +1,129 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe ContentSecurityPolicy do
+  subject { described_class.new }
+
+  around do |example|
+    original_asset_host = Rails.configuration.action_controller.asset_host
+    original_web_domain = Rails.configuration.x.web_domain
+    original_use_https = Rails.configuration.x.use_https
+    example.run
+    Rails.configuration.action_controller.asset_host = original_asset_host
+    Rails.configuration.x.web_domain = original_web_domain
+    Rails.configuration.x.use_https = original_use_https
+  end
+
+  describe '#base_host' do
+    before { Rails.configuration.x.web_domain = 'host.example' }
+
+    it 'returns the configured value for the web domain' do
+      expect(subject.base_host).to eq 'host.example'
+    end
+  end
+
+  describe '#assets_host' do
+    context 'when asset_host is not configured' do
+      before { Rails.configuration.action_controller.asset_host = nil }
+
+      context 'with a configured web domain' do
+        before { Rails.configuration.x.web_domain = 'host.example' }
+
+        context 'when use_https is enabled' do
+          before { Rails.configuration.x.use_https = true }
+
+          it 'returns value from base host with https protocol' do
+            expect(subject.assets_host).to eq 'https://host.example'
+          end
+        end
+
+        context 'when use_https is disabled' do
+          before { Rails.configuration.x.use_https = false }
+
+          it 'returns value from base host with http protocol' do
+            expect(subject.assets_host).to eq 'http://host.example'
+          end
+        end
+      end
+    end
+
+    context 'when asset_host is configured' do
+      before do
+        Rails.configuration.action_controller.asset_host = 'https://assets.host.example'
+      end
+
+      it 'returns full value from configured host' do
+        expect(subject.assets_host).to eq 'https://assets.host.example'
+      end
+    end
+  end
+
+  describe '#media_host' do
+    context 'when there is no configured CDN' do
+      it 'defaults to using the assets_host value' do
+        expect(subject.media_host).to eq(subject.assets_host)
+      end
+    end
+
+    context 'when an S3 alias host is configured' do
+      around do |example|
+        ClimateControl.modify S3_ALIAS_HOST: 'asset-host.s3-alias.example' do
+          example.run
+        end
+      end
+
+      it 'uses the s3 alias host value' do
+        expect(subject.media_host).to eq 'https://asset-host.s3-alias.example'
+      end
+    end
+
+    context 'when an S3 alias host with a trailing path is configured' do
+      around do |example|
+        ClimateControl.modify S3_ALIAS_HOST: 'asset-host.s3-alias.example/pathname' do
+          example.run
+        end
+      end
+
+      it 'uses the s3 alias host value and preserves the path' do
+        expect(subject.media_host).to eq 'https://asset-host.s3-alias.example/pathname/'
+      end
+    end
+
+    context 'when an S3 cloudfront host is configured' do
+      around do |example|
+        ClimateControl.modify S3_CLOUDFRONT_HOST: 'asset-host.s3-cloudfront.example' do
+          example.run
+        end
+      end
+
+      it 'uses the s3 cloudfront host value' do
+        expect(subject.media_host).to eq 'https://asset-host.s3-cloudfront.example'
+      end
+    end
+
+    context 'when an azure alias host is configured' do
+      around do |example|
+        ClimateControl.modify AZURE_ALIAS_HOST: 'asset-host.azure-alias.example' do
+          example.run
+        end
+      end
+
+      it 'uses the azure alias host value' do
+        expect(subject.media_host).to eq 'https://asset-host.azure-alias.example'
+      end
+    end
+
+    context 'when s3_enabled is configured' do
+      around do |example|
+        ClimateControl.modify S3_ENABLED: 'true', S3_HOSTNAME: 'asset-host.s3.example' do
+          example.run
+        end
+      end
+
+      it 'uses the s3 hostname host value' do
+        expect(subject.media_host).to eq 'https://asset-host.s3.example'
+      end
+    end
+  end
+end

spec/mailers/user_mailer_spec.rb

@@ -5,7 +5,7 @@ require 'rails_helper'
 describe UserMailer do
   let(:receiver) { Fabricate(:user) }
 
-  describe 'confirmation_instructions' do
+  describe '#confirmation_instructions' do
     let(:mail) { described_class.confirmation_instructions(receiver, 'spec') }
 
     it 'renders confirmation instructions' do
@@ -20,7 +20,7 @@ describe UserMailer do
                      instance: Rails.configuration.x.local_domain
   end
 
-  describe 'reconfirmation_instructions' do
+  describe '#reconfirmation_instructions' do
     let(:mail) { described_class.confirmation_instructions(receiver, 'spec') }
 
     it 'renders reconfirmation instructions' do
@@ -34,7 +34,7 @@ describe UserMailer do
     end
   end
 
-  describe 'reset_password_instructions' do
+  describe '#reset_password_instructions' do
     let(:mail) { described_class.reset_password_instructions(receiver, 'spec') }
 
     it 'renders reset password instructions' do
@@ -47,7 +47,7 @@ describe UserMailer do
                      'devise.mailer.reset_password_instructions.subject'
   end
 
-  describe 'password_change' do
+  describe '#password_change' do
     let(:mail) { described_class.password_change(receiver) }
 
     it 'renders password change notification' do
@@ -59,7 +59,7 @@ describe UserMailer do
                      'devise.mailer.password_change.subject'
   end
 
-  describe 'email_changed' do
+  describe '#email_changed' do
     let(:mail) { described_class.email_changed(receiver) }
 
     it 'renders email change notification' do
@@ -71,7 +71,7 @@ describe UserMailer do
                      'devise.mailer.email_changed.subject'
   end
 
-  describe 'warning' do
+  describe '#warning' do
     let(:strike) { Fabricate(:account_warning, target_account: receiver.account, text: 'dont worry its just the testsuite', action: 'suspend') }
     let(:mail)   { described_class.warning(receiver, strike) }
 
@@ -82,7 +82,7 @@ describe UserMailer do
     end
   end
 
-  describe 'webauthn_credential_deleted' do
+  describe '#webauthn_credential_deleted' do
     let(:credential) { Fabricate(:webauthn_credential, user_id: receiver.id) }
     let(:mail) { described_class.webauthn_credential_deleted(receiver, credential) }
 
@@ -95,7 +95,7 @@ describe UserMailer do
                      'devise.mailer.webauthn_credential.deleted.subject'
   end
 
-  describe 'suspicious_sign_in' do
+  describe '#suspicious_sign_in' do
     let(:ip) { '192.168.0.1' }
     let(:agent) { 'NCSA_Mosaic/2.0 (Windows 3.1)' }
     let(:timestamp) { Time.now.utc }
@@ -110,7 +110,7 @@ describe UserMailer do
                      'user_mailer.suspicious_sign_in.subject'
   end
 
-  describe 'appeal_approved' do
+  describe '#appeal_approved' do
     let(:appeal) { Fabricate(:appeal, account: receiver.account, approved_at: Time.now.utc) }
     let(:mail) { described_class.appeal_approved(receiver, appeal) }
 
@@ -120,7 +120,7 @@ describe UserMailer do
     end
   end
 
-  describe 'appeal_rejected' do
+  describe '#appeal_rejected' do
     let(:appeal) { Fabricate(:appeal, account: receiver.account, rejected_at: Time.now.utc) }
     let(:mail) { described_class.appeal_rejected(receiver, appeal) }
 
@@ -130,7 +130,7 @@ describe UserMailer do
     end
   end
 
-  describe 'two_factor_enabled' do
+  describe '#two_factor_enabled' do
     let(:mail) { described_class.two_factor_enabled(receiver) }
 
     it 'renders two_factor_enabled mail' do
@@ -139,7 +139,7 @@ describe UserMailer do
     end
   end
 
-  describe 'two_factor_disabled' do
+  describe '#two_factor_disabled' do
     let(:mail) { described_class.two_factor_disabled(receiver) }
 
     it 'renders two_factor_disabled mail' do
@@ -148,7 +148,7 @@ describe UserMailer do
     end
   end
 
-  describe 'webauthn_enabled' do
+  describe '#webauthn_enabled' do
     let(:mail) { described_class.webauthn_enabled(receiver) }
 
     it 'renders webauthn_enabled mail' do
@@ -157,7 +157,7 @@ describe UserMailer do
     end
   end
 
-  describe 'webauthn_disabled' do
+  describe '#webauthn_disabled' do
     let(:mail) { described_class.webauthn_disabled(receiver) }
 
     it 'renders webauthn_disabled mail' do
@@ -166,7 +166,7 @@ describe UserMailer do
     end
   end
 
-  describe 'two_factor_recovery_codes_changed' do
+  describe '#two_factor_recovery_codes_changed' do
     let(:mail) { described_class.two_factor_recovery_codes_changed(receiver) }
 
     it 'renders two_factor_recovery_codes_changed mail' do
@@ -175,7 +175,7 @@ describe UserMailer do
     end
   end
 
-  describe 'webauthn_credential_added' do
+  describe '#webauthn_credential_added' do
     let(:credential) { Fabricate.build(:webauthn_credential) }
     let(:mail) { described_class.webauthn_credential_added(receiver, credential) }
 
@@ -184,4 +184,23 @@ describe UserMailer do
       expect(mail.body.encoded).to include I18n.t('devise.mailer.webauthn_credential.added.explanation')
     end
   end
+
+  describe '#welcome' do
+    let(:mail) { described_class.welcome(receiver) }
+
+    it 'renders welcome mail' do
+      expect(mail.subject).to eq I18n.t('user_mailer.welcome.subject')
+      expect(mail.body.encoded).to include I18n.t('user_mailer.welcome.explanation')
+    end
+  end
+
+  describe '#backup_ready' do
+    let(:backup) { Fabricate(:backup) }
+    let(:mail) { described_class.backup_ready(receiver, backup) }
+
+    it 'renders backup_ready mail' do
+      expect(mail.subject).to eq I18n.t('user_mailer.backup_ready.subject')
+      expect(mail.body.encoded).to include I18n.t('user_mailer.backup_ready.explanation')
+    end
+  end
 end

spec/models/tag_spec.rb

@@ -32,6 +32,10 @@ RSpec.describe Tag do
       expect(subject.match('https://en.wikipedia.org/wiki/Ghostbusters_(song)#Lawsuit')).to be_nil
     end
 
+    it 'does not match URLs with hashtag-like anchors after a numeral' do
+      expect(subject.match('https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111895#c4')).to be_nil
+    end
+
     it 'does not match URLs with hashtag-like anchors after an empty query parameter' do
       expect(subject.match('https://en.wikipedia.org/wiki/Ghostbusters_(song)?foo=#Lawsuit')).to be_nil
     end