about summary refs log tree commit diff
path: root/config/locales
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2017-11-27 22:33:26 -0600
committerDavid Yip <yipdw@member.fsf.org>2017-11-27 22:33:26 -0600
commit7463d80ff442833a4ad299460f37c27be9b8cda1 (patch)
treeeb84f712515a4b5c59a36cbc0340781c6765a545 /config/locales
parent8bad6bdd00254484e04570b7a631403c24e73939 (diff)
parent706e534455e2137c324c0ebb30435e7630ab7c1f (diff)
Merge remote-tracking branch 'tootsuite/master'
Diffstat (limited to 'config/locales')
-rw-r--r--config/locales/en.yml7
1 files changed, 7 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 70712d34b..e0ae9eef9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -347,6 +347,8 @@ en:
     invalid_reset_password_token: Password reset token is invalid or expired. Please request a new one.
     login: Log in
     logout: Logout
+    migrate_account: Move to a different account
+    migrate_account_html: If you wish to redirect this account to a different one, you can <a href="%{path}">configure it here</a>.
     register: Sign up
     resend_confirmation: Resend confirmation instructions
     reset_password: Reset password
@@ -462,6 +464,10 @@ en:
     validations:
       images_and_video: Cannot attach a video to a status that already contains images
       too_many: Cannot attach more than 4 files
+  migrations:
+    acct: username@domain of the new account
+    currently_redirecting: 'Your profile is set to redirect to:'
+    proceed: Save
   moderation:
     title: Moderation
   notification_mailer:
@@ -577,6 +583,7 @@ en:
     followers: Authorized followers
     import: Import
     keyword_mutes: Muted keywords
+    migrate: Account migration
     notifications: Notifications
     preferences: Preferences
     settings: Settings