Merge remote-tracking branch 'origin/develop' into shigusegubu-vue3

* origin/develop:
  Fix English translation of Shoutbox in features panel
This commit is contained in:
Henry Jameson 2022-03-31 22:35:09 +03:00
commit 789e022442

View file

@ -46,7 +46,7 @@
"processing": "Processing, you'll soon be asked to download your file" "processing": "Processing, you'll soon be asked to download your file"
}, },
"features_panel": { "features_panel": {
"chat": "Chat", "shout": "Shoutbox",
"pleroma_chat_messages": "Pleroma Chat", "pleroma_chat_messages": "Pleroma Chat",
"gopher": "Gopher", "gopher": "Gopher",
"media_proxy": "Media proxy", "media_proxy": "Media proxy",