hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into improve_settings_reusability

Browse source
This commit is contained in:
Henry Jameson 2023-05-23 22:24:04 +03:00
commit b72af7d6ae
14 changed files with 906 additions and 293 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/i18n/en.json
View file

@ -1027,7 +1027,8 @@
"show_all_conversation_with_icon": "{icon} {text}",
"show_all_conversation": "Show full conversation ({numStatus} other status) | Show full conversation ({numStatus} other statuses)",
"show_only_conversation_under_this": "Only show replies to this status",
"status_history": "Status history"
"status_history": "Status history",
"reaction_count_label": "{num} person reacted | {num} people reacted"
},
"user_card": {
"approve": "Approve",