diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-04-15 17:07:49 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-04-15 17:07:49 +0200 |
| commit | 66ad30db489ddb2b3ecc98d284aabd47c9d4ae84 (patch) | |
| tree | d8f035139c20e59c39bb35a74686783094c297da /config | |
| parent | 615073df33b9a4317ac5c93fdef83c9cd34567fa (diff) | |
| parent | 5524258da9bc1d62b1396d19c672d3a8335ffbc5 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `package.json`: No real conflict, upstream updated a dependency which is textually adjacent to a glitch-soc-specific dependency. Updated it. - `yarn.lock`: No real conflict, upstream updated a dependency which is textually adjacent to a glitch-soc-specific dependency. Updated it.
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 5a4302606..edb7bb684 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -648,6 +648,7 @@ en: add_new: Create alias created_msg: Successfully created a new alias. You can now initiate the move from the old account. deleted_msg: Successfully remove the alias. Moving from that account to this one will no longer be possible. + empty: You have no aliases. hint_html: If you want to move from another account to this one, here you can create an alias, which is required before you can proceed with moving followers from the old account to this one. This action by itself is <strong>harmless and reversible</strong>. <strong>The account migration is initiated from the old account</strong>. remove: Unlink alias appearance: |