Merge tag 'v2.6.5' into instance_only_statuses

app/javascript/mastodon/locales/zh-CN.json

@@ -95,7 +95,6 @@
   "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
   "confirmations.unfollow.confirm": "取消关注",
   "confirmations.unfollow.message": "你确定要取消关注 {name} 吗？",
-  "conversation.last_message": "Last message:",
   "embed.instructions": "要在你的网站上嵌入这条嘟文，请复制以下代码。",
   "embed.preview": "它会像这样显示出来：",
   "emoji_button.activity": "活动",
@@ -321,6 +320,8 @@
   "status.show_more_all": "显示所有内容",
   "status.unmute_conversation": "不再隐藏此对话",
   "status.unpin": "在个人资料页面取消置顶",
+  "suggestions.dismiss": "Dismiss suggestion",
+  "suggestions.header": "You might be interested in…",
   "tabs_bar.federated_timeline": "跨站",
   "tabs_bar.home": "主页",
   "tabs_bar.local_timeline": "本站",