Merge branch 'develop' of https://github.com/syuilo/misskey into develop

4 files changed, 22 insertions, 5 deletions

diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index cf9296981f..469b1c9493 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -704,6 +704,11 @@ editCode: "Code bearbeiten"
 apply: "Anwenden"
 receiveAnnouncementFromInstance: "E-Mail-Benachrichtigungen von dieser Instanz empfangen"
 emailNotification: "E-Mail-Benachrichtigungen"
+inChannelSearch: "In Kanal suchen"
+useReactionPickerForContextMenu: "Reaktionsauswahl durch Rechtsklick öffnen"
+jumpToSpecifiedDate: "Zu bestimmtem Datum springen"
+showingPastTimeline: "Momentan wird eine alte Chronik angezeigt"
+clear: "Zurückkehren"
 _email:
   _follow:
     title: "Du hast einen neuen Follower"
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 467fbdfd13..d3b6804744 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -704,6 +704,11 @@ editCode: "Edit code"
 apply: "Apply"
 receiveAnnouncementFromInstance: "Receive Email notifications from this instance"
 emailNotification: "Email notifications"
+inChannelSearch: "Search in channel"
+useReactionPickerForContextMenu: "Open reaction picker on right-click"
+jumpToSpecifiedDate: "Jump to specific date"
+showingPastTimeline: "Currently displaying an old timeline"
+clear: "Return"
 _email:
   _follow:
     title: "You've got a new follower"
diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index 07cd456796..4f8cc6d85c 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -704,6 +704,7 @@ editCode: "Редактировать исходный текст"
 apply: "Применить"
 receiveAnnouncementFromInstance: "Получать оповещения с инстанса"
 emailNotification: "Уведомления по электронной почте"
+inChannelSearch: "Поиск по каналу"
 _email:
   _follow:
     title: "Новый подписчик"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index f19562b1e4..c13cf12220 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -309,7 +309,7 @@ monthX: "{month}月"
 yearX: "{year}年"
 pages: "页面"
 integration: "关联"
-connectSerice: "已连接"
+connectSerice: "连接"
 disconnectSerice: "断开连接"
 enableLocalTimeline: "启用本地时间线功能"
 enableGlobalTimeline: "启用全局时间线"
@@ -321,7 +321,7 @@ proxyRemoteFiles: "代理远程文件"
 proxyRemoteFilesDescription: "启用此设置后，由于超出存储容量而导致未保存被删除的远程文件将被本地代理，并且会生成缩略图。不会影响服务器的存储。"
 driveCapacityPerLocalAccount: "每个用户的网盘空间"
 driveCapacityPerRemoteAccount: "每个远程用户的网盘容量"
-inMb: "以兆字节(Mbps)为单位"
+inMb: "以兆字节(MegaByte)为单位"
 iconUrl: "图标URL"
 bannerUrl: "Banner URL"
 basicInfo: "基本信息"
@@ -579,7 +579,7 @@ smtpPort: "端口"
 smtpUser: "用户名"
 smtpPass: "密码"
 emptyToDisableSmtpAuth: "用户名和密码留空可以禁用SMTP验证"
-smtpSecure: "在 SMTP 连接中使用隐式 SSL / TLS"
+smtpSecure: "在 SMTP 连接中默认使用 SSL / TLS"
 smtpSecureInfo: "使用STARTTLS时关闭。"
 testEmail: "邮件发送测试"
 wordMute: "文字屏蔽"
@@ -638,8 +638,8 @@ repliedCount: "回复数"
 renotedCount: "转发数"
 followingCount: "正在关注数量"
 followersCount: "关注者数量"
-sentReactionsCount: "发送反应数"
-receivedReactionsCount: "收到反应数"
+sentReactionsCount: "发送回应数"
+receivedReactionsCount: "收到回应数"
 pollVotesCount: "问卷调查的投票数"
 pollVotedCount: "问卷调查的被投票数"
 yes: "是"
@@ -704,6 +704,12 @@ editCode: "编辑代码"
 apply: "应用"
 receiveAnnouncementFromInstance: "从实例接收通知"
 emailNotification: "邮件通知"
+inChannelSearch: "频道内搜索"
+useReactionPickerForContextMenu: "单击右键打开回应工具栏"
+typingUsers: "{users}正在输入"
+jumpToSpecifiedDate: "跳转到特定日期"
+showingPastTimeline: "显示过去的时间线"
+clear: "清除"
 _email:
   _follow:
     title: "你有新的关注者"