therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://git.ihatebeinga.live/IHBAGang/pleroma-fe into develop

Browse source
This commit is contained in:
FloatingGhost 2021-05-21 11:37:33 +01:00
commit 6d47156297
21 changed files with 1073 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/i18n/en.json
View file

@ -313,6 +313,8 @@
"collapse_subject": "Collapse posts with subjects",
"composing": "Composing",
"confirm_new_password": "Confirm new password",
"current_avatar": "Your current avatar",
"current_mascot": "Your current mascot",
"current_password": "Current password",
"mutes_and_blocks": "Mutes and Blocks",
"data_import_export_tab": "Data import / export",
@ -433,8 +435,10 @@
"search_user_to_mute": "Search whom you want to mute",
"security_tab": "Security",
"scope_copy": "Copy scope when replying (DMs are always copied)",
"mascot": "Mastodon FE Mascot",
"minimal_scopes_mode": "Minimize post scope selection options",
"set_new_avatar": "Set new avatar",
"set_new_mascot": "Set new mascot",
"set_new_profile_background": "Set new profile background",
"set_new_profile_banner": "Set new profile banner",
"reset_avatar": "Reset avatar",