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

2021-06-03 20:47:02 +02:00
parent 02dffa8edd f6088922c0
commit 0157caacef
498 changed files with 1454 additions and 551 deletions
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -1074,10 +1074,6 @@
        "defaultMessage": "Search...",
        "id": "emoji_button.search"
      },
-      {
-        "defaultMessage": "No emojos!! (╯°□°）╯︵ ┻━┻",
-        "id": "emoji_button.not_found"
-      },
      {
        "defaultMessage": "Custom",
        "id": "emoji_button.custom"
@@ -1121,6 +1117,10 @@
      {
        "defaultMessage": "Flags",
        "id": "emoji_button.flags"
+      },
+      {
+        "defaultMessage": "No matching emojis found",
+        "id": "emoji_button.not_found"
      }
    ],
    "path": "app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.json"