diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-06-03 20:47:02 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-06-03 20:47:02 +0200 |
| commit | 0157caacefe34838ff5d5093dc188f5491cb7b15 (patch) | |
| tree | a5b56590b7660b6ed3257f929bf209a26cb25a15 /app/javascript/mastodon/locales/defaultMessages.json | |
| parent | 02dffa8edd097014578774aed30249ed08d2f3a4 (diff) | |
| parent | f6088922c06f3da02e9051b39f3a7111f19298dd (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/javascript/mastodon/locales/defaultMessages.json')
| -rw-r--r-- | app/javascript/mastodon/locales/defaultMessages.json | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json index 4e910a757..ca25f053e 100644 --- a/app/javascript/mastodon/locales/defaultMessages.json +++ b/app/javascript/mastodon/locales/defaultMessages.json @@ -1075,10 +1075,6 @@ "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" |