tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Import feature for following/blocking lists (addresses #62, #177, #201, #454)

Browse Source
This commit is contained in:
Eugen Rochko
2017-03-30 19:42:33 +02:00
parent 03fb6c16ec
commit e8875c6046
15 changed files with 184 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/locales/en.yml
View File

@ -85,6 +85,13 @@ en:
validation_errors:
one: Something isn't quite right yet! Please review the error below
other: Something isn't quite right yet! Please review %{count} errors below
imports:
preface: You can import certain data like all the people you are following or blocking into your account on this instance, from files created by an export on another instance.
success: Your data was successfully uploaded and will now be processed in due time
types:
blocking: Blocking list
following: Following list
upload: Upload
landing_strip_html: <strong>%{name}</strong> is a user on <strong>%{domain}</strong>. You can follow them or interact with them if you have an account anywhere in the fediverse. If you don't, you can <a href="%{sign_up_path}">sign up here</a>.
notification_mailer:
digest:
@ -124,6 +131,7 @@ en:
back: Back to Mastodon
edit_profile: Edit profile
export: Data export
import: Import
preferences: Preferences
settings: Settings
two_factor_auth: Two-factor Authentication