gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-26 15:31:52 +00:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

Merge eba662d8d2 into 429e08e3d2

Browse Source
This commit is contained in:
Josh Soref 2024-11-26 11:02:49 +00:00 committed by GitHub
commit 69327bc3b1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/settings/migrations/show.html.haml
View File

@ -30,8 +30,8 @@
%ul.hint
%li.warning-hint= t('migrations.warning.followers')
%li.warning-hint= t('migrations.warning.redirect')
%li.warning-hint= t('migrations.warning.other_data')
%li.warning-hint= t('migrations.warning.redirect')
%li.warning-hint= t('migrations.warning.backreference_required')
%li.warning-hint= t('migrations.warning.cooldown')
%li.warning-hint= t('migrations.warning.disabled_account')

2
config/locales/en.yml
View File

@ -1536,7 +1536,7 @@ en:
disabled_account: Your current account will not be fully usable afterwards. However, you will have access to data export as well as re-activation.
followers: This action will move all followers from the current account to the new account
only_redirect_html: Alternatively, you can <a href="%{path}">only put up a redirect on your profile</a>.
other_data: No other data will be moved automatically
other_data: No other data will be moved automatically (includes your posts and the list of accounts you follow)
redirect: Your current account's profile will be updated with a redirect notice and be excluded from searches
moderation:
title: Moderation