Merge remote-tracking branch 'origin/settings-and-filtering' into settings-and-filtering

* origin/settings-and-filtering:
  Apply 1 suggestion(s) to 1 file(s)

src/i18n/en.json

@@ -422,7 +422,7 @@
     "hide_followers_count_description": "Don't show follower count",
     "show_admin_badge": "Show \"Admin\" badge in my profile",
     "show_moderator_badge": "Show \"Moderator\" badge in my profile",
-    "nsfw_clickthrough": "Censor NSFW content",
+    "nsfw_clickthrough": "Hide sensitive/NSFW media",
     "oauth_tokens": "OAuth tokens",
     "token": "Token",
     "refresh_token": "Refresh token",