diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-02-03 03:59:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-03 03:59:51 +0100 |
| commit | d14c276e58f0f223b0e4889d342a948c961081b2 (patch) | |
| tree | f25b687f755725ee58b80ab2281dc368f5dc42eb /config | |
| parent | c5071f2d787e81251c2b3111074b20d94773ee44 (diff) | |
Add option to overwrite imported data (#9962)
* Add option to overwrite imported data Fix #7465 * Add import for domain blocks
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index c7ef36598..f23f867e5 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -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 |