Fix merge issues
This commit is contained in:
@ -134,6 +134,11 @@
|
||||
"empty_column.mutes": "你没有隐藏任何用户。",
|
||||
"empty_column.notifications": "你还没有收到过任何通知,快向其他用户搭讪吧。",
|
||||
"empty_column.public": "这里什么都没有!写一些公开的嘟文,或者关注其他服务器的用户后,这里就会有嘟文出现了",
|
||||
"federation.change": "Adjust status federation",
|
||||
"federation.federated.long": "Allow toot to reach other instances",
|
||||
"federation.federated.short": "Federated",
|
||||
"federation.local_only.long": "Restrict this toot only to my instance",
|
||||
"federation.local_only.short": "Local-only",
|
||||
"follow_request.authorize": "同意",
|
||||
"follow_request.reject": "拒绝",
|
||||
"getting_started.developers": "开发",
|
||||
|
||||
Reference in New Issue
Block a user