Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream (2024.5.0-host.3b) #16

Merged
merged 32 commits into from
Oct 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
14d71e2
spec(SSO/JWT): トークンの有効期限を2週間に変更 (MisskeyIO#746)
u1-liquid Oct 17, 2024
227c85c
enhance(queue): deliver queue を複数個設定できるようにする (MisskeyIO#745)
riku6460 Oct 17, 2024
8706fa0
feat(moderation): モデレーターがユーザーの名前を変更できるように&トークンを再生成できるように (MisskeyIO#747)
u1-liquid Oct 17, 2024
30c5aa6
Bump up version to 2024.5.0-io.3 (MisskeyIO#748)
u1-liquid Oct 17, 2024
206f28e
Merge branch 'io' into host
u1-liquid Oct 17, 2024
d1a428a
Merge pull request MisskeyIO#749 from update-host
u1-liquid Oct 18, 2024
286d28b
Merge tag '2024.5.0-host.3' into nijimiss
u1-liquid Oct 18, 2024
3fdcf99
perf(backend): queue の delayed の件数が増えた際に deliver-delayed と inbox-dela…
riku6460 Oct 18, 2024
a8bbccb
spec(frontend): Bull Dashboard に relationship queue を追加 (MisskeyIO#751)
riku6460 Oct 18, 2024
c47140e
enhance(queue): inbox と relationship にも MisskeyIO#745 を適用 (MisskeyIO#…
riku6460 Oct 18, 2024
d005daa
feat(announcement): お知らせの既読処理にチュートリアル受講を要求できるように (MisskeyIO#753)
u1-liquid Oct 18, 2024
edeca40
spec(frontend): アカウント新規作成時のOOBE向上 (MisskeyIO#754)
u1-liquid Oct 18, 2024
61b758e
Bump up version to 2024.5.0-io.3a (MisskeyIO#755)
u1-liquid Oct 18, 2024
5d9eed0
Merge tag '2024.5.0-io.3a' into host
u1-liquid Oct 18, 2024
2a364a2
Merge pull request MisskeyIO#756 from update-host
u1-liquid Oct 18, 2024
0199ef6
Merge tag '2024.5.0-host.3a' into nijimiss
u1-liquid Oct 18, 2024
65f0138
enhance(frontend): 絵文字のフォールバック先を文字じゃなくて画像に (MisskeyIO#757)
mattyatea Oct 19, 2024
a73a09a
feat(frontend/reactions): リアクションミュート機能を追加しました (MisskeyIO#758)
mattyatea Oct 19, 2024
8f66f9c
enhance(SSO): ユーザーに対話型プロンプトが表示されないように設定できるように (MisskeyIO#759)
u1-liquid Oct 19, 2024
762cc67
Bump up version to 2024.5.0-io.3b (MisskeyIO#760)
u1-liquid Oct 19, 2024
acfbaaa
Merge tag '2024.5.0-io.3b' into host
u1-liquid Oct 19, 2024
e4ec4b2
Merge pull request MisskeyIO#761 from update-host
u1-liquid Oct 19, 2024
16a8853
Merge tag '2024.5.0-host.3b' into nijimiss
u1-liquid Oct 19, 2024
75b4241
feat(frontend/reactions): リモートのリアクションのミュートの方法を変えた (MisskeyIO#762)
mattyatea Oct 20, 2024
4d92891
i18n: MisskeyIO#758 MisskeyIO#762 (MisskeyIO#763)
u1-liquid Oct 20, 2024
e240151
Merge branch 'io' into host
u1-liquid Oct 20, 2024
c02f5cb
Merge pull request MisskeyIO#764 from update-host
u1-liquid Oct 20, 2024
8f7a01c
Merge branch 'host' into nijimiss
u1-liquid Oct 20, 2024
046eab7
fix(frontend/reactions): ローカルのカスタム絵文字のミュートが正常に機能しない問題を修正 (MisskeyIO#765)
u1-liquid Oct 20, 2024
5cb5679
Merge branch 'io' into host
u1-liquid Oct 20, 2024
385b4b5
Merge pull request MisskeyIO#766 from update-host
u1-liquid Oct 20, 2024
abbab19
Merge branch 'host' into nijimiss
u1-liquid Oct 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions locales/ca-ES.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1234,7 +1234,7 @@ _announcement:
forExistingUsers: "Anunci per usuaris registrats"
forExistingUsersDescription: "Aquest avís només es mostrarà als usuaris existents fins al moment de la publicació. Si no també es mostrarà als usuaris que es registrin després de la publicació."
needConfirmationToRead: "Es necessita confirmació de lectura de la notificació "
needConfirmationToReadDescription: "Si s'activa es mostrarà un diàleg per confirmar la lectura d'aquesta notificació. A més aquesta notificació serà exclosa de qualsevol funcionalitat com \"Marcar tot com a llegit\"."
needConfirmationToReadDescription: "Si s'activa es mostrarà un diàleg per confirmar la lectura d'aquesta notificació."
end: "Final de la notificació "
tooManyActiveAnnouncementDescription: "Tenir massa notificacions actives pot empitjorar l'experiència de l'usuari. Considera finalitzar els anuncis que siguin antics."
readConfirmTitle: "Marcar com llegida?"
Expand Down Expand Up @@ -2003,8 +2003,8 @@ _permissions:
"read:admin:show-user": "Veure informació privada de l'usuari "
"read:admin:show-users": "Veure informació privada de l'usuari "
"write:admin:suspend-user": "Suspendre usuari"
"write:admin:unset-user-avatar": "Esborrar avatar d'usuari "
"write:admin:unset-user-banner": "Esborrar bàner de l'usuari "
"write:admin:user-avatar": "Esborrar avatar d'usuari "
"write:admin:user-banner": "Esborrar bàner de l'usuari "
"write:admin:unsuspend-user": "Treure la suspensió d'un usuari"
"write:admin:meta": "Gestionar les metadades de la instància"
"write:admin:user-note": "Gestionar les notes de moderació "
Expand Down
2 changes: 1 addition & 1 deletion locales/de-DE.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1189,7 +1189,7 @@ _announcement:
forExistingUsers: "Nur für existierende Nutzer"
forExistingUsersDescription: "Ist diese Option aktiviert, wird diese Ankündigung nur Nutzern angezeigt, die zum Zeitpunkt der Ankündigung bereits registriert sind. Ist sie deaktiviert, wird sie auch Nutzern, die sich nach dessen Veröffentlichung registrieren, angezeigt."
needConfirmationToRead: "Separate Lesebestätigung erfordern"
needConfirmationToReadDescription: "Ist dies aktiviert, so wird beim Markieren dieser Ankündigung als gelesen ein separates Bestätigungsfenster angezeigt. Auch wird sie von der \"Alle als gelesen markieren\"-Funktion ausgenommen."
needConfirmationToReadDescription: "Ist dies aktiviert, so wird beim Markieren dieser Ankündigung als gelesen ein separates Bestätigungsfenster angezeigt."
end: "Ankündigung archivieren"
tooManyActiveAnnouncementDescription: "Zu viele aktive Ankündigungen können die Benutzerfreundlichkeit verschlechtern. Es wird empfohlen, veraltete Ankündigungen zu archivieren."
readConfirmTitle: "Als gelesen markieren?"
Expand Down
19 changes: 14 additions & 5 deletions locales/en-US.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,9 @@ mute: "Mute"
unmute: "Unmute"
renoteMute: "Mute Renotes"
renoteUnmute: "Unmute Renotes"
mutedReactions: "Mute reactions"
muteThisReaction: "Mute this reaction"
unmuteThisReaction: "Unmute this reaction"
block: "Block"
unblock: "Unblock"
suspend: "Suspend"
Expand Down Expand Up @@ -693,6 +696,7 @@ useGlobalSetting: "Use global settings"
useGlobalSettingDesc: "If turned on, your account's notification settings will be used. If turned off, individual configurations can be made."
other: "Other"
regenerateLoginToken: "Regenerate login token"
regenerateLoginTokenConfirm: "Are you sure you want to regenerate the login token? All devices will be logged out."
regenerateLoginTokenDescription: "Regenerates the token used internally during login. Normally this action is not necessary. If regenerated, all devices will be logged out."
theKeywordWhenSearchingForCustomEmoji: "This is the keyword when searching for custom emojis."
setMultipleBySeparatingWithSpace: "Separate multiple entries with spaces."
Expand Down Expand Up @@ -1061,7 +1065,7 @@ likeOnlyForRemote: "All (Only likes for remote instances)"
nonSensitiveOnly: "Non-sensitive only"
nonSensitiveOnlyForLocalLikeOnlyForRemote: "Non-sensitive only (Only likes from remote)"
rolesAssignedToMe: "Roles assigned to me"
resetPasswordConfirm: "Really reset your password?"
resetPasswordConfirm: "Are you sure you want to reset password?"
sensitiveWords: "Sensitive words"
sensitiveWordsDescription: "The visibility of all notes containing any of the configured words will be set to \"Home\" automatically. You can list multiple by separating them via line breaks."
sensitiveWordsDescription2: "Using spaces will create AND expressions and surrounding keywords with slashes will turn them into a regular expression."
Expand Down Expand Up @@ -1269,6 +1273,7 @@ inquiry: "Contact"
here: "here"
mutualLink: "Mutual Link"
saveThisFile: "Save this file to Drive"
changeUserName: "Change name"
_bubbleGame:
howToPlay: "How to play"
hold: "Hold"
Expand Down Expand Up @@ -1318,7 +1323,9 @@ _announcement:
forExistingUsers: "Existing users only"
forExistingUsersDescription: "This announcement will only be shown to users existing at the point of publishment if enabled. If disabled, those newly signing up after it has been posted will also see it."
needConfirmationToRead: "Require separate read confirmation"
needConfirmationToReadDescription: "A separate prompt to confirm marking this announcement as read will be displayed if enabled. This announcement will also be excluded from any \"Mark all as read\" functionality."
needConfirmationToReadDescription: "A separate prompt to confirm marking this announcement as read will be displayed if enabled."
needEnrollmentTutorialToRead: "Require tutorial completion to read"
needEnrollmentTutorialToReadDescription: "Users must complete the tutorial to read this announcement if enabled."
end: "Archive announcement"
tooManyActiveAnnouncementDescription: "Having too many active announcements may worsen the user experience. Please consider archiving announcements that have become obsolete."
readConfirmTitle: "Mark as read?"
Expand Down Expand Up @@ -2112,18 +2119,20 @@ _permissions:
"read:admin:user-ips": "View user IP addresses"
"read:admin:meta": "View instance metadata"
"write:admin:reset-password": "Reset user password"
"write:admin:regenerate-user-token": "Regenerate user login token"
"write:admin:resolve-abuse-user-report": "Resolve user report"
"write:admin:send-email": "Send email"
"read:admin:server-info": "View server info"
"read:admin:show-moderation-log": "View moderation log"
"read:admin:show-user": "View private user info"
"read:admin:show-users": "View private user info"
"write:admin:suspend-user": "Suspend user"
"write:admin:unset-user-avatar": "Remove user avatar"
"write:admin:unset-user-banner": "Remove user banner"
"write:admin:unset-user-mutual-link": "Remove user mutual link"
"write:admin:user-avatar": "Remove user avatar"
"write:admin:user-banner": "Remove user banner"
"write:admin:user-mutual-link": "Remove user mutual link"
"write:admin:unsuspend-user": "Unsuspend user"
"write:admin:meta": "Manage instance metadata"
"write:admin:user-name": "Change user name"
"write:admin:user-note": "Manage moderation note"
"write:admin:roles": "Manage roles"
"read:admin:roles": "View roles"
Expand Down
6 changes: 3 additions & 3 deletions locales/es-ES.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1252,7 +1252,7 @@ _announcement:
forExistingUsers: "Solo para usuarios registrados"
forExistingUsersDescription: "Este anuncio solo se mostrará a aquellos usuarios registrados en el momento de su publicación. Si se deshabilita esta opción, aquellos usuarios que se registren tras su publicación también lo verán."
needConfirmationToRead: "Requerir confirmación de lectura aparte"
needConfirmationToReadDescription: "Si se habilita esta opción, se pedirá una confirmación de lectura aparte. Además, este anuncio será excluido de cualquier funcionalidad de \"Marcar todos como leídos\"."
needConfirmationToReadDescription: "Si se habilita esta opción, se pedirá una confirmación de lectura aparte."
end: "Anuncios archivados"
tooManyActiveAnnouncementDescription: "Tener demasiados anuncios activos empeora la experiencia de usuario. Por favor, considera archivar aquellos anuncios que hayan quedado obsoletos."
readConfirmTitle: "¿Marcar como leído?"
Expand Down Expand Up @@ -2031,8 +2031,8 @@ _permissions:
"read:admin:show-user": "Ver información privada de usuario"
"read:admin:show-users": "Ver información privada de usuario"
"write:admin:suspend-user": "Suspender cuentas de usuario"
"write:admin:unset-user-avatar": "Quitar avatares de usuario"
"write:admin:unset-user-banner": "Quitar banner de usuarios"
"write:admin:user-avatar": "Quitar avatares de usuario"
"write:admin:user-banner": "Quitar banner de usuarios"
"write:admin:unsuspend-user": "Quitar suspensión de cuentas de usuario"
"write:admin:meta": "Edición de metadatos de la instancia"
"write:admin:user-note": "Moderación de notas"
Expand Down
2 changes: 1 addition & 1 deletion locales/fr-FR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1237,7 +1237,7 @@ _bubbleGame:
_announcement:
forExistingUsers: "Pour les utilisateurs existants seulement"
needConfirmationToRead: "Exiger la confirmation de la lecture"
needConfirmationToReadDescription: "Si activé, afficher un dialogue de confirmation quand l'annonce est marquée comme lue. Aussi, elle sera exclue de « marquer tout comme lu » ."
needConfirmationToReadDescription: "Si activé, afficher un dialogue de confirmation quand l'annonce est marquée comme lue."
end: "Archiver l'annonce"
tooManyActiveAnnouncementDescription: "Un grand nombre d'annonces actives peut baisser l'expérience utilisateur. Considérez d'archiver les annonces obsolètes."
readConfirmTitle: "Marquer comme lu ?"
Expand Down
6 changes: 3 additions & 3 deletions locales/id-ID.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1254,7 +1254,7 @@ _announcement:
forExistingUsers: "Hanya pengguna yang telah ada"
forExistingUsersDescription: "Pengumuman ini akan dimunculkan ke pengguna yang sudah ada dari titik waktu publikasi jika dinyalakan. Apabila dimatikan, mereka yang baru mendaftar setelah publikasi ini akan juga melihatnya."
needConfirmationToRead: "Membutuhkan konfirmasi terpisah bahwa telah dibaca"
needConfirmationToReadDescription: "Permintaan terpisah untuk mengonfirmasi menandai pengumuman ini telah dibaca akan ditampilkan apabila fitur ini dinyalakan. Pengumuman ini juga akan dikecualikan dari fungsi \"Tandai semua telah dibaca\"."
needConfirmationToReadDescription: "Permintaan terpisah untuk mengonfirmasi menandai pengumuman ini telah dibaca akan ditampilkan apabila fitur ini dinyalakan."
end: "Arsipkan pengumuman"
tooManyActiveAnnouncementDescription: "Terlalu banyak pengumuman dapat memperburuk pengalaman pengguna. Mohon pertimbangkan untuk mengarsipkan pengumuman yang sudah usang/tidak relevan."
readConfirmTitle: "Tandai telah dibaca?"
Expand Down Expand Up @@ -2034,8 +2034,8 @@ _permissions:
"read:admin:show-user": "Lihat informasi pengguna privat"
"read:admin:show-users": "Lihat informasi pengguna privat"
"write:admin:suspend-user": "Tangguhkan pengguna"
"write:admin:unset-user-avatar": "Hapus avatar pengguna"
"write:admin:unset-user-banner": "Hapus banner pengguna"
"write:admin:user-avatar": "Hapus avatar pengguna"
"write:admin:user-banner": "Hapus banner pengguna"
"write:admin:unsuspend-user": "Batalkan penangguhan pengguna"
"write:admin:meta": "Kelola metadata instansi"
"write:admin:user-note": "Kelola moderasi catatan"
Expand Down
46 changes: 41 additions & 5 deletions locales/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -592,6 +592,18 @@ export interface Locale extends ILocale {
* リノートのミュートを解除
*/
"renoteUnmute": string;
/**
* リアクションのミュート
*/
"mutedReactions": string;
/**
* このリアクションをミュートする
*/
"muteThisReaction": string;
/**
* このリアクションのミュートを解除する
*/
"unmuteThisReaction": string;
/**
* ブロック
*/
Expand Down Expand Up @@ -2808,6 +2820,10 @@ export interface Locale extends ILocale {
* ログイントークンを再生成
*/
"regenerateLoginToken": string;
/**
* ログイントークンを再生成しますか?
*/
"regenerateLoginTokenConfirm": string;
/**
* ログインに使用される内部トークンを再生成します。通常この操作を行う必要はありません。再生成すると、全てのデバイスでログアウトされます。
*/
Expand Down Expand Up @@ -4288,7 +4304,7 @@ export interface Locale extends ILocale {
*/
"rolesAssignedToMe": string;
/**
* パスワードリセットしますか
* パスワードをリセットしますか
*/
"resetPasswordConfirm": string;
/**
Expand Down Expand Up @@ -5166,6 +5182,10 @@ export interface Locale extends ILocale {
* このファイルをドライブに保存する
*/
"saveThisFile": string;
/**
* 名前を変更
*/
"changeUserName": string;
/**
* サブスクリプション
*/
Expand Down Expand Up @@ -5415,9 +5435,17 @@ export interface Locale extends ILocale {
*/
"needConfirmationToRead": string;
/**
* 有効にすると、このお知らせを既読にする際に確認ダイアログが表示されます。また、一括既読操作の対象になりません。
* 有効にすると、このお知らせを既読にする際に確認ダイアログが表示されます。
*/
"needConfirmationToReadDescription": string;
/**
* チュートリアルの受講が必要
*/
"needEnrollmentTutorialToRead": string;
/**
* 有効にすると、このお知らせを既読にするためにはチュートリアルの受講が必要です。
*/
"needEnrollmentTutorialToReadDescription": string;
/**
* お知らせを終了
*/
Expand Down Expand Up @@ -8361,6 +8389,10 @@ export interface Locale extends ILocale {
* ユーザーのパスワードをリセットする
*/
"write:admin:reset-password": string;
/**
* ユーザーのログイントークンを再生成する
*/
"write:admin:regenerate-user-token": string;
/**
* ユーザーからの通報を解決する
*/
Expand Down Expand Up @@ -8392,15 +8424,15 @@ export interface Locale extends ILocale {
/**
* ユーザーのアバターを削除する
*/
"write:admin:unset-user-avatar": string;
"write:admin:user-avatar": string;
/**
* ユーザーのバーナーを削除する
*/
"write:admin:unset-user-banner": string;
"write:admin:user-banner": string;
/**
* ユーザーの相互リンクを削除する
*/
"write:admin:unset-user-mutual-link": string;
"write:admin:user-mutual-link": string;
/**
* ユーザーの凍結を解除する
*/
Expand All @@ -8409,6 +8441,10 @@ export interface Locale extends ILocale {
* インスタンスのメタデータを操作する
*/
"write:admin:meta": string;
/**
* ユーザーの名前を変更する
*/
"write:admin:user-name": string;
/**
* モデレーションノートを操作する
*/
Expand Down
6 changes: 3 additions & 3 deletions locales/it-IT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1252,7 +1252,7 @@ _announcement:
forExistingUsers: "Solo ai profili attuali"
forExistingUsersDescription: "L'annuncio sarà visibile solo ai profili esistenti in questo momento. Se disabilitato, sarà visibile anche ai profili che verranno creati dopo la pubblicazione di questo annuncio."
needConfirmationToRead: "Richiede la conferma di lettura"
needConfirmationToReadDescription: "Sarà visualizzata una finestra di dialogo che richiede la conferma di lettura. Inoltre, non è soggetto a conferme di lettura massicce."
needConfirmationToReadDescription: "Sarà visualizzata una finestra di dialogo che richiede la conferma di lettura."
end: "Archivia l'annuncio"
tooManyActiveAnnouncementDescription: "L'esperienza delle persone può peggiorare se ci sono troppi annunci attivi. Considera anche l'archiviazione degli annunci conclusi."
readConfirmTitle: "Segnare come già letto?"
Expand Down Expand Up @@ -2027,8 +2027,8 @@ _permissions:
"read:admin:show-user": "Vedere le informazioni private degli account utente"
"read:admin:show-users": "Vedere le informazioni private degli account utente"
"write:admin:suspend-user": "Sospendere i profili"
"write:admin:unset-user-avatar": "Rimuovere la foto profilo dai profili"
"write:admin:unset-user-banner": "Rimuovere l'immagine testata dai profili"
"write:admin:user-avatar": "Rimuovere la foto profilo dai profili"
"write:admin:user-banner": "Rimuovere l'immagine testata dai profili"
"write:admin:unsuspend-user": "Togliere la sospensione ai profili"
"write:admin:meta": "Modificare i metadati dell'istanza"
"write:admin:user-note": "Scrivere annotazioni di moderazione"
Expand Down
Loading
Loading