Otherkin.Club
/
mastodon
1
0
Fork 0
Code Issues Releases Activity

resolve stray merge conflict between tfonline/monsterfork strings

master
multiple creatures 2020-01-20 23:10:12 -06:00
parent edf5be3cfe
commit 5c796f8cf6
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/mastodon/locales/en.json
View File

@ -326,12 +326,8 @@
"search_popout.tips.user": "creature",
"search_results.accounts": "Monsters",
"search_results.hashtags": "Hashtags",
<<<<<<< HEAD
"search_results.statuses": "Roars",
=======
"search_results.statuses": "TF spells",
"search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
>>>>>>> af0c4b345... Make a shoddy attempt to merge pull request #1158 from ThibG/glitch-soc/merge-upstream
"search_results.total": "{count, number} {count, plural, one {result} other {results}}",
"status.admin_account": "Moderate @{name}",
"status.admin_status": "Moderate roar",