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

Add option to overwrite imported data (#9962)

Browse Source 
* Add option to overwrite imported data

Fix #7465

* Add import for domain blocks
This commit is contained in:
Eugen Rochko
2019-02-03 03:59:51 +01:00
committed by GitHub
parent c5071f2d78
commit d14c276e58
12 changed files with 148 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/locales/en.yml
View File

@ -628,10 +628,16 @@ en:
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:
modes:
merge: Merge
merge_long: Keep existing records and add new ones
overwrite: Overwrite
overwrite_long: Replace current records with the new ones
preface: You can import data that you have exported from another instance, such as a list of the people you are following or blocking.
success: Your data was successfully uploaded and will now be processed in due time
types:
blocking: Blocking list
domain_blocking: Domain blocking list
following: Following list
muting: Muting list
upload: Upload