Merge branch 'main' into glitch-soc/merge-upstream

2022-06-10 11:51:43 +02:00
parent 3d841eba69 a2871cd747
commit edaaf6a5e9
156 changed files with 1768 additions and 156 deletions
--- a/app/javascript/mastodon/features/ui/components/columns_area.js
+++ b/app/javascript/mastodon/features/ui/components/columns_area.js
@ -50,7 +50,7 @@ const componentMap = {
 };

 const messages = defineMessages({
-  publish: { id: 'compose_form.publish', defaultMessage: 'Toot' },
+  publish: { id: 'compose_form.publish', defaultMessage: 'Publish' },
 });

 const shouldHideFAB = path => path.match(/^\/statuses\/|^\/@[^/]+\/\d+|^\/publish|^\/explore|^\/getting-started|^\/start/);