Merge branch 'develop' into refactor/notification_settings

This commit is contained in:
Mark Felder 2020-07-15 09:01:40 -05:00
commit 49aaf9dc57
35 changed files with 42 additions and 89 deletions

View file

@ -199,7 +199,6 @@
},
"attachmentRadius": "附件",
"attachments": "附件",
"autoload": "启用滚动到底部时的自动加载",
"avatar": "头像",
"avatarAltRadius": "头像(通知)",
"avatarRadius": "头像",
@ -299,7 +298,6 @@
"profile_tab": "个人资料",
"radii_help": "设置界面边缘的圆角 (单位:像素)",
"replies_in_timeline": "时间线中的回复",
"reply_link_preview": "启用鼠标悬停时预览回复链接",
"reply_visibility_all": "显示所有回复",
"reply_visibility_following": "只显示发送给我的回复/发送给我关注的用户的回复",
"reply_visibility_self": "只显示发送给我的回复",