diff options
author | ThibG <thib@sitedethib.com> | 2019-08-06 17:25:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-06 17:25:54 +0200 |
commit | 8400ddca7155005ab79485ed6054c04ea3ca5667 (patch) | |
tree | 696f5ae9a70891e96fdf819905b05aa6482bcf07 /config/locales/en.yml | |
parent | 3ea7a334d89d2c4075b1dbf649d692ff49325f2e (diff) | |
parent | d10f6036cfeebec5b2c160db8659d2c19d29fe9c (diff) |
Merge pull request #1191 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/en.yml')
-rw-r--r-- | config/locales/en.yml | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index ae59bb63e..d4e4a0c9a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -496,13 +496,14 @@ en: title: Account statuses with_media: With media tags: - accounts: Accounts - hidden: Hidden - hide: Hide from directory - name: Hashtag + context: Context + directory: In directory + in_directory: "%{count} in directory" + review: Review status + reviewed: Reviewed title: Hashtags - unhide: Show in directory - visible: Visible + trending_right_now: Trending right now + unique_uses_today: "%{count} posting today" title: Administration warning_presets: add_new: Add new @@ -518,6 +519,9 @@ en: body: "%{reporter} has reported %{target}" body_remote: Someone from %{domain} has reported %{target} subject: New report for %{instance} (#%{id}) + new_trending_tag: + body: 'The hashtag #%{name} is trending today, but has not been previously reviewed. It will not be displayed publicly unless you allow it to, or just save the form as it is to never hear about it again.' + subject: New hashtag up for review on %{instance} (#%{name}) appearance: advanced_web_interface: Advanced web interface advanced_web_interface_hint: 'If you want to make use of your entire screen width, the advanced web interface allows you to configure many different columns to see as much information at the same time as you want: Home, notifications, federated timeline, any number of lists and hashtags.' @@ -954,6 +958,8 @@ en: pinned: Pinned toot reblogged: boosted sensitive_content: Sensitive content + tags: + does_not_match_previous_name: does not match the previous name terms: body_html: | <h2>Privacy Policy</h2> |