Merge remote-tracking branch 'misskey-original/develop' into develop

# Conflicts:
#	packages/backend/src/core/EmailService.ts
#	packages/frontend/src/components/MkSignupDialog.form.vue
This commit is contained in:
mattyatea 2023-12-23 23:16:48 +09:00
commit 09fbfee252
15 changed files with 86 additions and 20 deletions

View file

@ -1917,6 +1917,7 @@ _notification:
pollEnded: "Sondages se cloturant"
receiveFollowRequest: "Demande d'abonnement reçue"
followRequestAccepted: "Demande d'abonnement acceptée"
roleAssigned: "Rôle reçu"
achievementEarned: "Accomplissement"
app: "Notifications provenant des apps"
_actions:

1
locales/index.d.ts vendored
View file

@ -1791,6 +1791,7 @@ export interface Locale {
"disposable": string;
"mx": string;
"smtp": string;
"banned": string;
};
"_ffVisibility": {
"public": string;

View file

@ -1698,6 +1698,7 @@ _emailUnavailable:
disposable: "恒久的に使用可能なアドレスではありません"
mx: "正しいメールサーバーではありません"
smtp: "メールサーバーが応答しません"
banned: "このメールアドレスでは登録できません"
_ffVisibility:
public: "公開"

View file

@ -2193,6 +2193,7 @@ _notification:
pollEnded: "투표가 종료됨"
receiveFollowRequest: "팔로우 요청을 받았을 때"
followRequestAccepted: "팔로우 요청이 승인되었을 때"
roleAssigned: "역할이 부여 됨"
achievementEarned: "도전 과제 획득"
app: "연동된 앱을 통한 알림"
_actions:

View file

@ -2193,6 +2193,7 @@ _notification:
pollEnded: "問卷調查結束"
receiveFollowRequest: "已收到追隨請求"
followRequestAccepted: "追隨請求已接受"
roleAssigned: "已授予角色"
achievementEarned: "獲得成就"
app: "應用程式通知"
_actions: