Merge remote-tracking branch 'upstream/develop' into translations-separation

* upstream/develop: (21 commits)
  use prime number step for Who to follow panel
  fix
  Revert "Update messages.js"
  Update messages.js Update the Occitan language - Fixed Linting
  remove formatting options
  Remove outdated settings
  features panel i18n
  features panes supports chat & gopher
  fix collapse link being too small
  small fix for non-square gif avatars
  Fixed collapseMessageWithSubjectLocal always using instance-provided config.
  Fix last place with usercard having wrong width
  Fixed non-masked image looking weird in chrome.
  Kinda went back to using align-items: stretch. Fixed error message floating.
  Simplified image sensitivity label
  show features panel only if not login
  update
  debug
  update
  debug
  ...

2 files changed, 19 insertions, 2 deletions

diff --git a/src/i18n/en.json b/src/i18n/en.json
index 3cdff280..90850b34 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -2,6 +2,15 @@
   "chat": {
     "title": "Chat"
   },
+  "features_panel": {
+    "chat": "Chat",
+    "gopher": "Gopher",
+    "media_proxy": "Media proxy",
+    "scope_options": "Scope options",
+    "text_limit": "Text limit",
+    "title": "Features",
+    "who_to_follow": "Who to follow"
+  },
   "finder": {
     "error_fetching_user": "Error fetching user",
     "find_user": "Find user"
@@ -38,8 +47,7 @@
   "post_status": {
     "account_not_locked_warning": "Your account is not {0}. Anyone can follow you to view your follower-only posts.",
     "account_not_locked_warning_link": "locked",
-    "attachments_not_sensitive": "Attachments <strong>not</strong> marked sensitive",
-    "attachments_sensitive": "Attachments marked sensitive",
+    "attachments_sensitive": "Mark attachments as sensitive",
     "content_type": {
       "plain_text": "Plain text"
     },
diff --git a/src/i18n/ja.json b/src/i18n/ja.json
index 442bce16..facef5f2 100644
--- a/src/i18n/ja.json
+++ b/src/i18n/ja.json
@@ -2,6 +2,15 @@
   "chat": {
     "title": "チャット"
   },
+  "features_panel": {
+    "chat": "チャット",
+    "gopher": "Gopher",
+    "media_proxy": "メディアプロクシ",
+    "scope_options": "こうかいはんい",
+    "text_limit": "もじのかず",
+    "title": "ゆうこうなきのう",
+    "who_to_follow": "おすすめユーザー"
+  },
   "finder": {
     "error_fetching_user": "ユーザーけんさくがエラーになりました。",
     "find_user": "ユーザーをさがす"