diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-18 18:22:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-18 18:22:54 +0200 |
| commit | 44e31c3e531e5c206003b7ed83ee1d6fdd3b2b53 (patch) | |
| tree | e9d1366c30b94df21ec767276fbde175428399fb /config/locales/en.yml | |
| parent | 7423c0c1308555db3072ae64141250fdd33ce235 (diff) | |
| parent | bfeac6747a58b660f0d1b3766c7cfb3ea2655fce (diff) | |
Merge pull request #649 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/en.yml')
| -rw-r--r-- | config/locales/en.yml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index ecabd9a36..3028ba5fc 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -656,11 +656,14 @@ en: publishing: Publishing web: Web remote_follow: - acct: Enter your username@domain you want to follow from + acct: Enter your username@domain you want to act from missing_resource: Could not find the required redirect URL for your account no_account_html: Don't have an account? You can <a href='%{sign_up_path}' target='_blank'>sign up here</a> proceed: Proceed to follow prompt: 'You are going to follow:' + remote_interaction: + proceed: Proceed to interact + prompt: 'You want to interact with this toot:' remote_unfollow: error: Error title: Title @@ -745,6 +748,7 @@ en: private: Non-public toot cannot be pinned reblog: A boost cannot be pinned show_more: Show more + sign_in_to_participate: Sign in to participate in the conversation title: '%{name}: "%{quote}"' visibilities: private: Followers-only |