diff options
author | Ondřej Hruška <ondra@ondrovo.com> | 2017-08-07 22:43:52 +0200 |
---|---|---|
committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-08-07 22:43:52 +0200 |
commit | 7a1ca8b0df9d82a1e6ac4943a2d5562f93eab69f (patch) | |
tree | 36fbf6f3d2019cc345d33fe555569ec750a66957 /config/locales/en.yml | |
parent | b8791ae79be7a9b7c0e541928b2741e40bbdc8a5 (diff) | |
parent | a3e53bd442752f210db2025f2dfc45e7599354c2 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'config/locales/en.yml')
-rw-r--r-- | config/locales/en.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 90b4fe82b..1fa0de90b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -215,7 +215,7 @@ en: body: "%{reporter} has reported %{target}" subject: New report for %{instance} (#%{id}) application_mailer: - salutation: '%{name},' + salutation: "%{name}," settings: 'Change e-mail preferences: %{link}' signature: Mastodon notifications from %{instance} view: 'View:' @@ -228,6 +228,7 @@ en: delete_account_html: If you wish to delete your account, you can <a href="%{path}">proceed here</a>. You will be asked for confirmation. didnt_get_confirmation: Didn't receive confirmation instructions? forgot_password: Forgot your password? + invalid_reset_password_token: Password reset token is invalid or expired. Please request a new one. login: Log in logout: Logout register: Sign up @@ -243,7 +244,6 @@ en: close: Or, you can just close this window. return: Return to the user's profile web: Go to web - prompt_html: 'You (<strong>%{self}</strong>) have requested to follow:' title: Follow %{acct} datetime: distance_in_words: @@ -523,3 +523,4 @@ en: users: invalid_email: The e-mail address is invalid invalid_otp_token: Invalid two-factor code + signed_in_as: 'Signed in as:' |