chore(client): tweak style

This reverts commit 38d5303ccd.

.config/example.yml

@@ -57,6 +57,7 @@ db:
 redis:
   host: localhost
   port: 6379
+  #family: 0  # 0=Both, 4=IPv4, 6=IPv6
   #pass: example-pass
   #prefix: example-prefix
   #db: 1

CHANGELOG.md

@@ -9,6 +9,46 @@
 You should also include the user name that made the change.
 -->
 
+## 12.x.x (unreleased)
+
+### Changes
+- ハイライトがみつけるに統合されました
+- カスタム絵文字ページはインスタンス情報ページに統合されました
+- 連合ページはインスタンス情報ページに統合されました
+
+### Improvements
+- Server: Allow GET method for some endpoints @syuilo
+- Server: Add rate limit to i/notifications @tamaina
+- Client: Improve control panel @syuilo
+- Client: Show warning in control panel when there is an unresolved abuse report @syuilo
+- Client: Add instance-cloud widget @syuilo
+- Client: Add rss-ticker widget @syuilo
+- Client: Removing entries from a clip @futchitwo
+- Client: Poll highlights in explore page @syuilo
+- Client: Improve deck UI @syuilo
+- Client: Word mute also checks content warnings @Johann150
+- Client: メニューからページをリロードできるように @syuilo
+- Client: Improve emoji picker performance @syuilo
+- ユーザーにモデレーションメモを残せる機能 @syuilo
+- Make possible to delete an account by admin @syuilo
+- Improve player detection in URL preview @mei23
+- Add Badge Image to Push Notification #8012 @tamaina
+- Server: Improve performance
+- Server: Supports IPv6 on Redis transport. @mei23  
+  IPv4/IPv6 is used by default. You can tune this behavior via `redis.family`.
+- Server: Add possibility to log IP addresses of users @syuilo
+- Add additional drive capacity change support @CyberRex0
+
+### Bugfixes
+- Server: Fix GenerateVideoThumbnail failed @mei23
+- Server: Ensure temp directory cleanup @Johann150
+- favicons of federated instances not showing @syuilo
+- Admin: The checkbox for blocking an instance works again @Johann150
+- Client: Prevent access to user pages when not logged in @pixeldesu @Johann150
+- Client: Disable some hotkeys (e.g. for creating a post) for not logged in users @pixeldesu
+- Client: Ask users that are not logged in to log in when trying to vote in a poll @Johann150
+- Instance mutes also apply in antennas etc. @Johann150
+
 ## 12.111.1 (2022/06/13)
 
 ### Bugfixes

CONTRIBUTING.md

@@ -74,8 +74,6 @@ The `/deploy` command by issue comment can be used to deploy the contents of a P
 An actual domain will be assigned so you can test the federation.
 
 ## Merge
-For now, basically only @syuilo has the authority to merge PRs into develop because he is most familiar with the codebase.
-However, minor fixes, refactoring, and urgent changes may be merged at the discretion of a contributor.
 
 ## Release
 ### Release Instructions

ROADMAP.md

@@ -19,6 +19,7 @@ This is the phase we are at now. We need to make a high-maintenance environment
 ## (2) Improve functionality
 Once Phase 1 is complete and an environment conducive to the development of a stable system is in place, the implementation of new functions can begin gradually.
 
+- Improve features for moderation
 - OAuth2 support https://github.com/misskey-dev/misskey/issues/8262
 - GraphQL support?
 

locales/ar-SA.yml

@@ -803,6 +803,7 @@ oneHour: "ساعة"
 oneDay: "يوم"
 oneWeek: "أسبوع"
 failedToFetchAccountInformation: "تعذر جلب معلومات الحساب"
+file: "الملفات"
 _emailUnavailable:
   used: "هذا البريد الإلكتروني مستخدم"
   format: "صيغة البريد الإلكتروني غير صالحة"

locales/bn-BD.yml

@@ -843,6 +843,7 @@ oneWeek: "এক সপ্তাহ"
 reflectMayTakeTime: "এটির কাজ দেখা যেতে কিছুটা সময় লাগতে পারে।"
 failedToFetchAccountInformation: "অ্যাকাউন্টের তথ্য উদ্ধার করা যায়নি"
 rateLimitExceeded: "রেট লিমিট ছাড়িয়ে গেছে "
+file: "ফাইলগুলি"
 _emailUnavailable:
   used: "এই ইমেইল ঠিকানাটি ইতোমধ্যে ব্যবহৃত হয়েছে"
   format: "এই ইমেল ঠিকানাটি সঠিকভাবে লিখা হয়নি"
@@ -1638,8 +1639,6 @@ _notification:
 _deck:
   alwaysShowMainColumn: "সর্বদা মেইন কলাম দেখান"
   columnAlign: "কলাম সাজান"
-  columnMargin: "কলামের মধ্যবর্তী মার্জিন"
-  columnHeaderHeight: "কলামের হেডারের উচ্চতা"
   addColumn: "কলাম যুক্ত করুন"
   swapLeft: "বামে সরান"
   swapRight: "ডানে সরান"

locales/ca-ES.yml

@@ -120,6 +120,7 @@ smtpUser: "Nom d'usuari"
 smtpPass: "Contrasenya"
 user: "Usuaris"
 searchByGoogle: "Cercar"
+file: "Fitxers"
 _email:
   _follow:
     title: "t'ha seguit"

locales/cs-CZ.yml

@@ -474,6 +474,7 @@ info: "Informace"
 user: "Uživatelé"
 administration: "Administrace"
 searchByGoogle: "Vyhledávání"
+file: "Soubor(ů)"
 _email:
   _follow:
     title: "Máte nového následovníka"

locales/de-DE.yml

@@ -203,6 +203,7 @@ done: "Fertig"
 processing: "In Bearbeitung …"
 preview: "Vorschau"
 default: "Standard"
+defaultValueIs: "Standardwert: {value}"
 noCustomEmojis: "Keine benutzerdefinierten Emojis gefunden"
 noJobs: "Keine Jobs vorhanden"
 federating: "Wird föderiert"
@@ -356,7 +357,7 @@ antennaExcludeKeywords: "Zu ignorierende Schlüsselwörter"
 antennaKeywordsDescription: "Zum Nutzen einer \"UND\"-Verknüpfung Einträge mit Leerzeichen trennen, zum Nutzen einer \"ODER\"-Verknüpfung Einträge mit einem Zeilenumbruch trennen"
 notifyAntenna: "Über neue Notizen benachrichtigen"
 withFileAntenna: "Nur Notizen mit Dateien"
-enableServiceworker: "ServiceWorker aktivieren"
+enableServiceworker: "Push-Benachrichtigungen im Browser aktivieren"
 antennaUsersDescription: "Benutzernamen getrennt durch Zeilenumbrüche angeben"
 caseSensitive: "Groß-/Kleinschreibung unterscheiden"
 withReplies: "Antworten beinhalten"
@@ -381,6 +382,7 @@ administrator: "Administrator"
 token: "Token"
 twoStepAuthentication: "Zwei-Faktor-Authentifizierung"
 moderator: "Moderator"
+moderation: "Moderation"
 nUsersMentioned: "Von {n} Benutzern erwähnt"
 securityKey: "Sicherheitsschlüssel"
 securityKeyName: "Schlüsselname"
@@ -425,7 +427,7 @@ quoteQuestion: "Als Zitat anhängen?"
 noMessagesYet: "Noch keine Nachrichten vorhanden"
 newMessageExists: "Du hast eine neue Nachricht"
 onlyOneFileCanBeAttached: "Es kann pro Nachricht nur eine Datei angehängt werden"
-signinRequired: "Bitte melde dich an"
+signinRequired: "Bitte registriere oder melde dich an, um fortzufahren"
 invitations: "Einladungen"
 invitationCode: "Einladungscode"
 checking: "Wird überprüft …"
@@ -643,6 +645,8 @@ clip: "Clip erstellen"
 createNew: "Neu erstellen"
 optional: "Optional"
 createNewClip: "Neuen Clip erstellen"
+unclip: "Aus Clip entfernen"
+confirmToUnclipAlreadyClippedNote: "Diese Notiz ist bereits im \"{name}\" Clip enthalten. Möchtest du sie aus diesem Clip entfernen?"
 public: "Öffentlich"
 i18nInfo: "Misskey wird durch freiwillige Helfer in viele verschiedene Sprachen übersetzt. Auf {link} kannst du mithelfen."
 manageAccessTokens: "Zugriffstokens verwalten"
@@ -830,7 +834,7 @@ auto: "Automatisch"
 themeColor: "Farbe der Instanz-Information"
 size: "Größe"
 numberOfColumn: "Spaltenanzahl"
-searchByGoogle: "Googlen"
+searchByGoogle: "Suchen"
 instanceDefaultLightTheme: "Instanzweites Standardfarbschema (Hell)"
 instanceDefaultDarkTheme: "Instanzweites Standardfarbschema (Dunkel)"
 instanceDefaultThemeDescription: "Gib den Farbschemencode im Objektformat ein."
@@ -845,6 +849,26 @@ failedToFetchAccountInformation: "Benutzerkontoinformationen konnten nicht abgef
 rateLimitExceeded: "Versuchsanzahl überschritten"
 cropImage: "Bild zuschneiden"
 cropImageAsk: "Möchtest du das Bild zuschneiden?"
+file: "Datei"
+recentNHours: "Letzten {n} Stunden"
+recentNDays: "Letzten {n} Tage"
+noEmailServerWarning: "Es ist kein Email-Server konfiguriert."
+thereIsUnresolvedAbuseReportWarning: "Es liegen ungelöste Meldungen vor."
+recommended: "Empfehlung"
+check: "Check"
+driveCapOverrideLabel: "Die Drive-Kapazität dieses Nutzers verändern"
+driveCapOverrideCaption: "Gib einen Wert von 0 oder weniger ein, um die Kapazität auf den Standard zurückzusetzen."
+requireAdminForView: "Melde dich mit einem Administratorkonto an, um dies einzusehen."
+isSystemAccount: "Ein Benutzerkonto, dass durch das System erstellt und automatisch kontrolliert wird."
+typeToConfirm: "Bitte gib zur Bestätigung {x} ein"
+deleteAccount: "Benutzerkonto löschen"
+document: "Dokument"
+numberOfPageCache: "Seitencachegröße"
+numberOfPageCacheDescription: "Das Erhöhen dieses Caches führt zu einer angenehmerern Benutzererfahrung, erhöht aber Serverlast und Arbeitsspeicherauslastung."
+logoutConfirm: "Wirklich abmelden?"
+lastActiveDate: "Zuletzt verwendet am"
+statusbar: "Statusleiste"
+pleaseSelect: "Wähle eine Option"
 _emailUnavailable:
   used: "Diese Email-Adresse wird bereits verwendet"
   format: "Das Format dieser Email-Adresse ist ungültig"
@@ -1199,10 +1223,12 @@ _widgets:
   trends: "Trends"
   clock: "Uhr"
   rss: "RSS-Reader"
+  rssTicker: "RSS-Ticker"
   activity: "Aktivität"
   photos: "Fotos"
   digitalClock: "Digitaluhr"
   federation: "Föderation"
+  instanceCloud: "Instanzwolke"
   postForm: "Notizfenster"
   slideshow: "Diashow"
   button: "Knopf"
@@ -1640,8 +1666,6 @@ _notification:
 _deck:
   alwaysShowMainColumn: "Hauptspalte immer zeigen"
   columnAlign: "Spaltenausrichtung"
-  columnMargin: "Spaltenabstand"
-  columnHeaderHeight: "Spaltenkopfhöhe"
   addColumn: "Spalte hinzufügen"
   swapLeft: "Mit linker Spalte tauschen"
   swapRight: "Mit rechter Spalte tauschen"
@@ -1650,6 +1674,9 @@ _deck:
   stackLeft: "Auf linke Spalte stapeln"
   popRight: "Nach rechts vom Stapel nehmen"
   profile: "Profil"
+  introduction: "Erstelle eine auf dich zugeschneiderte Benutzeroberfläche durch das Aneinanderreihen von Spalten!"
+  introduction2: "Klicke auf das + rechts um wann immer du möchtest neue Spalten hinzuzufügen."
+  widgetsIntroduction: "Drücke bitte \"Widgets bearbeiten\" im Spaltenmenü und füge ein Widget hinzu."
   _columns:
     main: "Hauptspalte"
     widgets: "Widgets"

locales/en-US.yml

@@ -203,6 +203,7 @@ done: "Done"
 processing: "Processing..."
 preview: "Preview"
 default: "Default"
+defaultValueIs: "Default: {value}"
 noCustomEmojis: "There are no emoji"
 noJobs: "There are no jobs"
 federating: "Federating"
@@ -356,7 +357,7 @@ antennaExcludeKeywords: "Keywords to exclude"
 antennaKeywordsDescription: "Separate with spaces for an AND condition or with line breaks for an OR condition."
 notifyAntenna: "Notify about new notes"
 withFileAntenna: "Only notes with files"
-enableServiceworker: "Enable ServiceWorker"
+enableServiceworker: "Enable Push-Notifications for your Browser"
 antennaUsersDescription: "List one username per line"
 caseSensitive: "Case sensitive"
 withReplies: "Include replies"
@@ -381,6 +382,7 @@ administrator: "Administrator"
 token: "Token"
 twoStepAuthentication: "Two-factor authentication"
 moderator: "Moderator"
+moderation: "Moderation"
 nUsersMentioned: "Mentioned by {n} users"
 securityKey: "Security key"
 securityKeyName: "Key name"
@@ -425,7 +427,7 @@ quoteQuestion: "Append as quote?"
 noMessagesYet: "No messages yet"
 newMessageExists: "There are new messages"
 onlyOneFileCanBeAttached: "You can only attach one file to a message"
-signinRequired: "Please sign in"
+signinRequired: "Please register or sign in before continuing"
 invitations: "Invites"
 invitationCode: "Invitation code"
 checking: "Checking..."
@@ -643,6 +645,8 @@ clip: "Clip"
 createNew: "Create new"
 optional: "Optional"
 createNewClip: "Create new clip"
+unclip: "Unclip"
+confirmToUnclipAlreadyClippedNote: "This note is already part of the \"{name}\" clip. Do you want to remove it from this clip instead?"
 public: "Public"
 i18nInfo: "Misskey is being translated into various languages by volunteers. You can help at {link}."
 manageAccessTokens: "Manage access tokens"
@@ -830,7 +834,7 @@ auto: "Auto"
 themeColor: "Instance Ticker Color"
 size: "Size"
 numberOfColumn: "Number of columns"
-searchByGoogle: "Google"
+searchByGoogle: "Search"
 instanceDefaultLightTheme: "Instance-wide default light theme"
 instanceDefaultDarkTheme: "Instance-wide default dark theme"
 instanceDefaultThemeDescription: "Enter the theme code in object format."
@@ -845,6 +849,26 @@ failedToFetchAccountInformation: "Could not fetch account information"
 rateLimitExceeded: "Rate limit exceeded"
 cropImage: "Crop image"
 cropImageAsk: "Do you want to crop this image?"
+file: "File"
+recentNHours: "Last {n} hours"
+recentNDays: "Last {n} days"
+noEmailServerWarning: "Email server not configured."
+thereIsUnresolvedAbuseReportWarning: "There are unsolved reports."
+recommended: "Recommended"
+check: "Check"
+driveCapOverrideLabel: "Change the drive capacity for this user"
+driveCapOverrideCaption: "Reset the capacity to default by inputting a value of 0 or lower."
+requireAdminForView: "You must log in with an administrator account to view this."
+isSystemAccount: "An account created and automatically operated by the system."
+typeToConfirm: "Please enter {x} to confirm"
+deleteAccount: "Delete account"
+document: "Document"
+numberOfPageCache: "Number of cached pages"
+numberOfPageCacheDescription: "Increasing this number will improve convenience for users but cause more server load as well as more memory to be used."
+logoutConfirm: "Really log out?"
+lastActiveDate: "Last used at"
+statusbar: "Status bar"
+pleaseSelect: "Select an option"
 _emailUnavailable:
   used: "This email address is already being used"
   format: "The format of this email address is invalid"
@@ -1199,10 +1223,12 @@ _widgets:
   trends: "Trending"
   clock: "Clock"
   rss: "RSS reader"
+  rssTicker: "RSS-Ticker"
   activity: "Activity"
   photos: "Photos"
   digitalClock: "Digital clock"
   federation: "Federation"
+  instanceCloud: "Instance cloud"
   postForm: "Posting form"
   slideshow: "Slideshow"
   button: "Button"
@@ -1640,8 +1666,6 @@ _notification:
 _deck:
   alwaysShowMainColumn: "Always show main column"
   columnAlign: "Align columns"
-  columnMargin: "Margin between columns"
-  columnHeaderHeight: "Column header height"
   addColumn: "Add column"
   swapLeft: "Swap with the left column"
   swapRight: "Swap with the right column"
@@ -1650,6 +1674,9 @@ _deck:
   stackLeft: "Stack with the left column"
   popRight: "Pop column to the right"
   profile: "Profile"
+  introduction: "Create the perfect interface for you by arranging columns freely!"
+  introduction2: "Click on the + on the right of the screen to add new colums whenever you want."
+  widgetsIntroduction: "Please select \"Edit widgets\" in the column menu and add a widget."
   _columns:
     main: "Main"
     widgets: "Widgets"

locales/es-ES.yml

@@ -592,6 +592,8 @@ smtpSecure: "Usar SSL/TLS implícito en la conexión SMTP"
 smtpSecureInfo: "Apagar cuando se use STARTTLS"
 testEmail: "Prueba de envío"
 wordMute: "Silenciar palabras"
+regexpError: "Error de la expresión regular"
+regexpErrorDescription: "Ocurrió un error en la expresión regular en la linea {line} de las palabras muteadas {tab}"
 instanceMute: "Instancias silenciadas"
 userSaysSomething: "{name} dijo algo"
 makeActive: "Activar"
@@ -620,8 +622,9 @@ reportAbuse: "Reportar"
 reportAbuseOf: "Reportar a {name}"
 fillAbuseReportDescription: "Ingrese los detalles del reporte. Si hay una nota en particular, ingrese la URL de esta."
 abuseReported: "Se ha enviado el reporte. Muchas gracias."
-reporteeOrigin: "Informar a"
-reporterOrigin: "Origen del informe"
+reporter: "Reportador"
+reporteeOrigin: "Reportar a"
+reporterOrigin: "Origen del reporte"
 forwardReport: "Transferir un informe a una instancia remota"
 forwardReportIsAnonymous: "No puede ver su información de la instancia remota y aparecerá como una cuenta anónima del sistema"
 send: "Enviar"
@@ -640,6 +643,8 @@ clip: "Clip"
 createNew: "Crear"
 optional: "Opcional"
 createNewClip: "Crear clip nuevo"
+unclip: "Quitar clip"
+confirmToUnclipAlreadyClippedNote: "Esta nota ya está incluida en el clip \"{name}\". ¿Quiere quitar la nota del clip?"
 public: "Público"
 i18nInfo: "Misskey está siendo traducido a varios idiomas gracias a voluntarios. Se puede colaborar traduciendo en {link}"
 manageAccessTokens: "Administrar tokens de acceso"
@@ -727,6 +732,7 @@ showingPastTimeline: "Mostrar líneas de tiempo antiguas"
 clear: "Limpiar"
 markAllAsRead: "Marcar todo como leído"
 goBack: "Deseleccionar"
+unlikeConfirm: "¿Quitar como favorito?"
 fullView: "Vista completa"
 quitFullView: "quitar vista completa"
 addDescription: "Agregar descripción"
@@ -794,6 +800,7 @@ pubSub: "Cuentas Pub/Sub"
 lastCommunication: "Última comunicación"
 resolved: "Resuelto"
 unresolved: "Sin resolver"
+breakFollow: "Dejar de seguir"
 itsOn: "¡Está encendido!"
 itsOff: "¡Está apagado!"
 emailRequiredForSignup: "Se requere una dirección de correo electrónico para el registro de la cuenta"
@@ -807,16 +814,80 @@ classic: "Clásico"
 muteThread: "Ocultar hilo"
 unmuteThread: "Mostrar hilo"
 ffVisibility: "Visibilidad de seguidores y seguidos"
+ffVisibilityDescription: "Puedes configurar quien puede ver a quienes sigues y quienes te siguen"
+continueThread: "Ver la continuación del hilo"
+deleteAccountConfirm: "La cuenta será borrada. ¿Está seguro?"
+incorrectPassword: "La contraseña es incorrecta"
+voteConfirm: "¿Confirma su voto a {choice}?"
 hide: "Ocultar"
+leaveGroup: "Dejar el grupo"
+leaveGroupConfirm: "¿Desea salir de {name}?"
+useDrawerReactionPickerForMobile: "Mostrar panel de reacciones en móviles"
+welcomeBackWithName: "Bienvenido otra vez, {name}"
+clickToFinishEmailVerification: "Cliquée {ok} y verifique su correo"
+overridedDeviceKind: "Tipo de dispositivo"
+smartphone: "Teléfono smartphone"
+tablet: "Tablet"
+auto: "Automático"
+themeColor: "Color del tema"
+size: "Tamaño"
+numberOfColumn: "Cantidad de columnas"
 searchByGoogle: "Buscar"
+instanceDefaultLightTheme: "Tema claro por defecto de la instancia"
+instanceDefaultDarkTheme: "Tema oscuro por defecto de la instancia"
+instanceDefaultThemeDescription: "Ingrese el código del tema en formato objeto"
+mutePeriod: "Período de silenciamiento"
 indefinitely: "Sin límite de tiempo"
+tenMinutes: "10 minutos"
+oneHour: "1 hora"
+oneDay: "1 día"
+oneWeek: "1 semana"
+reflectMayTakeTime: "Puede pasar un tiempo hasta que se reflejen los cambios"
+failedToFetchAccountInformation: "No se pudo obtener información de la cuenta"
+rateLimitExceeded: "Se excedió el límite de peticiones"
+cropImage: "Recortar imágen"
+cropImageAsk: "¿Desea recortar la imagen?"
+file: "Archivos"
+recentNHours: "Últimas {n} horas"
+recentNDays: "Últimos {n} días"
+noEmailServerWarning: "No se ha configurado un servidor de correo electrónico."
+thereIsUnresolvedAbuseReportWarning: "Hay reportes sin resolver"
+recommended: "Recomendado"
+check: "Verificar"
+isSystemAccount: "Cuenta creada y operada automáticamente por el sistema"
+typeToConfirm: "Ingrese {x} para confirmar"
+deleteAccount: "Borrar cuenta"
+document: "Documento"
+numberOfPageCache: "Cantidad de páginas cacheadas"
+numberOfPageCacheDescription: "Al aumentar el número mejora la conveniencia pero tambien puede aumentar la carga y la memoria a usarse"
+logoutConfirm: "¿Cerrar sesión?"
+_emailUnavailable:
+  used: "Ya fue usado"
+  format: "Formato no válido."
+  disposable: "No es un correo reutilizable"
+  mx: "Servidor de correo inválido"
+  smtp: "Servidor de correo no disponible"
 _ffVisibility:
   public: "Publicar"
+  followers: "Visible solo para seguidores"
+  private: "Privado"
+_signup:
+  almostThere: "Ya falta poco"
+  emailAddressInfo: "Ingrese el correo electrónico que usa. Este no se hará público."
+  emailSent: "Se envió un correo de verificación a la dirección {email}. Acceda al link enviado en el correo para completar el ingreso."
 _accountDelete:
   accountDelete: "Eliminar Cuenta"
+  mayTakeTime: "La eliminación de la cuenta es un proceso que precisa de carga. Puede pasar un tiempo hasta que se complete si es mucho el contenido creado y los archivos subidos."
+  sendEmail: "Cuando se termine de borrar la cuenta, se enviará un correo a la dirección usada para el registro."
+  requestAccountDelete: "Pedir la eliminación de la cuenta."
+  started: "El proceso de eliminación ha comenzado."
+  inProgress: "La eliminación está en proceso."
 _ad:
   back: "Deseleccionar"
+  reduceFrequencyOfThisAd: "Mostrar menos este anuncio."
 _forgotPassword:
+  enterEmail: "Ingrese el correo usado para registrar la cuenta. Se enviará un link para resetear la contraseña."
+  ifNoEmail: "Si no utilizó un correo para crear la cuenta, contáctese con el administrador."
   contactAdmin: "Esta instancia no admite el uso de direcciones de correo electrónico, póngase en contacto con el administrador de la instancia para restablecer su contraseña"
 _gallery:
   my: "Mi galería"
@@ -858,20 +929,63 @@ _mfm:
   mention: "Menciones"
   mentionDescription: "El signo @ seguido de un nombre de usuario se puede utilizar para notificar a un usuario en particular."
   hashtag: "Hashtag"
+  hashtagDescription: "Puede especificar un hashtag con un numeral y el texto."
   url: "URL"
   urlDescription: "Se pueden mostrar las URL"
   link: "Vínculo"
+  linkDescription: "Se pueden asociar partes de texto a la URL"
   bold: "Negrita"
+  boldDescription: "Muestra el texto con las letras más gruesas"
+  small: "Pequeño"
+  smallDescription: "Muestra el texto más pequeño y delgado"
   center: "Centrar"
+  centerDescription: "Muestra el texto centrado"
+  inlineCode: "Código (insertado)"
+  inlineCodeDescription: "Muestra el código de un programa resaltando su sintaxis"
   blockCode: "Código (bloque)"
   blockCodeDescription: "Código de resaltado de sintaxis, como programas de varias líneas con bloques."
+  inlineMath: "Fórmula (insertado)"
+  inlineMathDescription: "Muestra fórmulas (KaTeX) insertadas"
+  blockMath: "Fórmula (bloque)"
+  blockMathDescription: "Muestra fórmulas (KaTeX) de varias líneas en un bloque"
   quote: "Citar"
+  quoteDescription: "Muestra el contenido como una cita"
   emoji: "Emojis personalizados"
+  emojiDescription: "Muestra los emojis personalizados encerrados entre dos puntos."
   search: "Buscar"
+  searchDescription: "Muestra una caja de búsqueda con texto pre-escrito"
   flip: "Echar de un capirotazo"
   flipDescription: "Voltea el contenido hacia arriba / abajo o hacia la izquierda / derecha."
+  jelly: "Animación (gelatina)"
+  jellyDescription: "Aplica un efecto de animación tipo gelatina"
+  tada: "Animación (tadá)"
+  tadaDescription: "Aplica un efecto de animación al estilo \"Tadá\""
+  jump: "Animación (saltar)"
+  jumpDescription: "Aplica un efecto de animación tipo salto"
+  bounce: "Animación (rebotar)"
+  bounceDescription: "Aplica un efecto de animación tipo rebote"
+  shake: "Animación (temblor)"
+  shakeDescription: "Aplica un efecto de animación tipo temblor"
+  twitch: "Animación (sacudida)"
+  twitchDescription: "Aplica un efecto de animación tipo sacudida"
+  spin: "Animación (giro)"
+  spinDescription: "Aplica un efecto de animación tipo rotación"
+  x2: "Grande"
+  x2Description: "Muestra el contenido más grande"
+  x3: "Muy grande"
+  x3Description: "Muestra el contenido mucho más grande"
+  x4: "Totalmente grande"
+  x4Description: "Muestra el contenido totalmente grande"
+  blur: "Desenfoque"
+  blurDescription: "Para desenfocar el contenido. Se muestra claramente al colocar el puntero encima."
   font: "Fuente"
+  fontDescription: "Elegir la fuente del contenido"
+  rainbow: "Arcoíris"
+  rainbowDescription: "Muestra el contenido con los colores del arcoíris"
+  sparkle: "Parpadeante"
+  sparkleDescription: "Aplica un efecto de partículas parpadeantes"
   rotate: "Rotar"
+  rotateDescription: "Rota el contenido a un ángulo especificado."
 _instanceTicker:
   none: "No mostrar"
   remote: "Mostrar a usuarios remotos"
@@ -893,6 +1007,7 @@ _channel:
 _menuDisplay:
   sideFull: "Horizontal"
   sideIcon: "Horizontal (ícono)"
+  top: "Arriba"
   hide: "Ocultar"
 _wordMute:
   muteWords: "Palabras que silenciar"
@@ -915,6 +1030,8 @@ _theme:
   code: "Código del tema"
   description: "Descripción"
   installed: "{name} ha sido instalado"
+  installedThemes: "Temas instalados"
+  builtinThemes: "Temas integrados"
   alreadyInstalled: "Este tema ya está instalado"
   invalid: "El formato del tema no es válido"
   make: "Crear tema"
@@ -1032,6 +1149,7 @@ _2fa:
   registerKey: "Registrar clave"
   step1: "Primero, instale en su dispositivo la aplicación de autenticación {a} o {b} u otra."
   step2: "Luego, escanee con la aplicación el código QR mostrado en pantalla."
+  step2Url: "En una aplicación de escritorio se puede ingresar la siguiente URL:"
   step3: "Para terminar, ingrese el token mostrado en la aplicación."
   step4: "Ahora cuando inicie sesión, ingrese el mismo token"
   securityKeyInfo: "Se puede configurar el inicio de sesión usando una clave de seguridad de hardware que soporte FIDO2 o con un certificado de huella digital o con un PIN"
@@ -1064,6 +1182,10 @@ _permissions:
   "write:user-groups": "Administrar grupos de usuarios"
   "read:channels": "Ver canal"
   "write:channels": "Modificar canal"
+  "read:gallery": "Ver galería"
+  "write:gallery": "Editar galería"
+  "read:gallery-likes": "Ver favoritos de la galería"
+  "write:gallery-likes": "Editar favoritos de la galería"
 _auth:
   shareAccess: "¿Desea permitir el acceso a la cuenta \"{name}\"?"
   shareAccessAsk: "¿Está seguro de que desea autorizar esta aplicación para acceder a su cuenta?"
@@ -1097,9 +1219,15 @@ _widgets:
   photos: "Fotos"
   digitalClock: "Reloj digital"
   federation: "Federación"
+  instanceCloud: "Nube de palabras de la instancia"
   postForm: "Formulario"
+  slideshow: "Diapositivas"
   button: "Botón"
+  onlineUsers: "Usuarios en linea"
   jobQueue: "Cola de trabajos"
+  serverMetric: "Estadísticas del servidor"
+  aiscript: "Consola de AiScript"
+  aichan: "indigo"
 _cw:
   hide: "Ocultar"
   show: "Ver más"
@@ -1154,14 +1282,21 @@ _profile:
   username: "Nombre de usuario"
   description: "Descripción"
   youCanIncludeHashtags: "Puedes añadir hashtags"
+  metadata: "información adicional"
+  metadataEdit: "Editar información adicional"
+  metadataDescription: "Muestra la información adicional en el perfil"
   metadataLabel: "Etiqueta"
   metadataContent: "Contenido"
+  changeAvatar: "Cambiar avatar"
+  changeBanner: "Cambiar banner"
 _exportOrImport:
   allNotes: "Todas las notas"
   followingList: "Siguiendo"
   muteList: "Silenciados"
   blockingList: "Bloqueados"
   userLists: "Listas"
+  excludeMutingUsers: "Excluir usuarios silenciados"
+  excludeInactiveUsers: "Excluir usuarios inactivos"
 _charts:
   federation: "Federación"
   apRequest: "Pedidos"
@@ -1200,6 +1335,7 @@ _pages:
   created: "La página fue creada"
   updated: "La página fue actualizada"
   deleted: "La página borrada"
+  pageSetting: "Configurar página"
   nameAlreadyExists: "La URL de la página especificada ya existe"
   invalidNameTitle: "URL inválida"
   invalidNameText: "Verifique que no tenga espacios en blanco"
@@ -1210,6 +1346,7 @@ _pages:
   unlike: "Quitar me gusta"
   my: "Mis páginas"
   liked: "Páginas que me gustan"
+  featured: "Popular"
   inspector: "Inspector"
   contents: "Contenido"
   content: "Bloque de página"
@@ -1265,6 +1402,11 @@ _pages:
       id: "Lienzo ID"
       width: "Ancho"
       height: "Altura"
+    note: "Nota embebida"
+    _note:
+      id: "Id de la nota"
+      idDescription: "Pega la URL de la nota para configurarla"
+      detailed: "Ver Detalles"
     switch: "Interruptor"
     _switch:
       name: "Nombre de variable"
@@ -1492,6 +1634,8 @@ _notification:
   youReceivedFollowRequest: "Has mandado una solicitud de seguimiento"
   yourFollowRequestAccepted: "Tu solicitud de seguimiento fue aceptada"
   youWereInvitedToGroup: "Invitado al grupo"
+  pollEnded: "Estan disponibles los resultados de la encuesta"
+  emptyPushNotificationMessage: "Se han actualizado las notificaciones push"
   _types:
     all: "Todo"
     follow: "Siguiendo"
@@ -1501,11 +1645,13 @@ _notification:
     quote: "Citar"
     reaction: "Reacción"
     pollVote: "Votado en la encuesta"
+    pollEnded: "La encuesta terminó"
     receiveFollowRequest: "Recibió una solicitud de seguimiento"
     followRequestAccepted: "El seguimiento fue aceptado"
     groupInvited: "Invitado al grupo"
     app: "Notificaciones desde aplicaciones"
   _actions:
+    followBack: "Te sigue de vuelta"
     reply: "Responder"
     renote: "Renotar"
 _deck:
@@ -1518,7 +1664,9 @@ _deck:
   swapDown: "Mover abajo"
   stackLeft: "Apilar a la izquierda"
   popRight: "Sacar a la derecha"
+  profile: "Perfil"
   _columns:
+    main: "Principal"
     widgets: "Widgets"
     notifications: "Notificaciones"
     tl: "Linea de tiempo"

locales/fr-FR.yml

@@ -815,6 +815,7 @@ voteConfirm: "Confirmez-vous votre vote pour « {choice} » ?"
 hide: "Masquer"
 leaveGroup: "Quitter le groupe"
 leaveGroupConfirm: "Êtes vous sûr de vouloir quitter \"{name}\" ?"
+useDrawerReactionPickerForMobile: "Afficher le sélecteur de réactions en tant que panneau sur mobile"
 welcomeBackWithName: "Heureux de vous revoir, {name}"
 clickToFinishEmailVerification: "Veuillez cliquer sur [{ok}] afin de compléter la vérification par courriel."
 overridedDeviceKind: "Type d’appareil"
@@ -827,15 +828,21 @@ numberOfColumn: "Nombre de colonnes"
 searchByGoogle: "Google"
 instanceDefaultLightTheme: "Thème clair par défaut sur toute l’instance"
 instanceDefaultDarkTheme: "Thème sombre par défaut sur toute l’instance"
+instanceDefaultThemeDescription: "Saisissez le code du thème en format objet."
 mutePeriod: "Durée de mise en sourdine"
 indefinitely: "Illimité"
 tenMinutes: "10 minutes"
 oneHour: "1 heure"
 oneDay: "1 jour"
 oneWeek: "1 semaine"
+rateLimitExceeded: "Limite de taux dépassée"
+cropImage: "Recadrer l'image"
+cropImageAsk: "Voulez-vous recadrer cette image ?"
+file: "Fichiers"
 _emailUnavailable:
   used: "Non disponible"
   format: "Le format de cette adresse de courriel est invalide"
+  disposable: "Les adresses e-mail jetables ne peuvent pas être utilisées"
   mx: "Ce serveur de courriels est invalide"
   smtp: "Ce serveur de courriels ne répond pas"
 _ffVisibility:
@@ -1118,6 +1125,7 @@ _2fa:
   registerKey: "Enregistrer une clef"
   step1: "Tout d'abord, installez une application d'authentification, telle que {a} ou {b}, sur votre appareil."
   step2: "Ensuite, scannez le code QR affiché sur l’écran."
+  step2Url: "Vous pouvez également saisir cette URL si vous utilisez un programme de bureau :"
   step3: "Entrez le jeton affiché sur votre application pour compléter la configuration."
   step4: "À partir de maintenant, ce même jeton vous sera demandé à chacune de vos connexions."
   securityKeyInfo: "Vous pouvez configurer l'authentification WebAuthN pour sécuriser davantage le processus de connexion grâce à une clé de sécurité matérielle qui prend en charge FIDO2, ou bien en configurant l'authentification par empreinte digitale ou par code PIN sur votre appareil."
@@ -1601,6 +1609,8 @@ _notification:
   youReceivedFollowRequest: "Vous avez reçu une demande d’abonnement"
   yourFollowRequestAccepted: "Votre demande d’abonnement a été accepté"
   youWereInvitedToGroup: "Invité·e au groupe"
+  pollEnded: "Les résultats du sondage sont disponibles"
+  emptyPushNotificationMessage: "Les notifications push ont été mises à jour"
   _types:
     all: "Toutes"
     follow: "Nouvel·le abonné·e"
@@ -1615,13 +1625,12 @@ _notification:
     groupInvited: "Invitation à un groupe"
     app: "Notifications provenant des apps"
   _actions:
+    followBack: "Suivre"
     reply: "Répondre"
     renote: "Renoter"
 _deck:
   alwaysShowMainColumn: "Toujours afficher la colonne principale"
   columnAlign: "Aligner les colonnes"
-  columnMargin: "Marge entre les colonnes"
-  columnHeaderHeight: "Taille de l'en-tête de colonne"
   addColumn: "Ajouter une colonne"
   swapLeft: "Déplacer à gauche"
   swapRight: "Déplacer à droite"

locales/id-ID.yml

@@ -81,7 +81,7 @@ somethingHappened: "Terjadi kesalahan"
 retry: "Coba lagi"
 pageLoadError: "Gagal memuat halaman."
 pageLoadErrorDescription: "Umumnya disebabkan jaringan atau tembolok perambah. Cobalah bersihkan tembolok peramban lalu tunggu sesaat sebelum mencoba kembali."
-serverIsDead: "Tidak ada respon dari server. Mohon tunggu dan coba beberapa saat lagi."
+serverIsDead: "Tidak ada respon dari peladen. Mohon tunggu dan coba beberapa saat lagi."
 youShouldUpgradeClient: "Untuk melihat halaman ini, mohon muat ulang untuk memutakhirkan klienmu."
 enterListName: "Masukkan nama daftar"
 privacy: "Privasi"
@@ -294,8 +294,8 @@ rename: "Ubah nama"
 avatar: "Avatar"
 banner: "Banner"
 nsfw: "Konten sensitif"
-whenServerDisconnected: "Ketika kehilangan koneksi dengan server"
-disconnectedFromServer: "Terputus koneksi dari server"
+whenServerDisconnected: "Ketika kehilangan koneksi dengan peladen"
+disconnectedFromServer: "Terputus koneksi dari peladen"
 reload: "Muat ulang"
 doNothing: "Abaikan"
 reloadConfirm: "Apakah kamu ingin memuat ulang linimasa?"
@@ -495,7 +495,7 @@ objectStorageUseSSLDesc: "Matikan ini jika kamu tidak akan menggunakan HTTPS unt
 objectStorageUseProxy: "Hubungkan melalui Proxy"
 objectStorageUseProxyDesc: "Matikan ini jika kamu tidak akan menggunakan Proxy untuk koneksi ObjectStorage"
 objectStorageSetPublicRead: "Setel \"public-read\" disaat mengunggah"
-serverLogs: "Log Server"
+serverLogs: "Log Peladen"
 deleteAll: "Hapus semua"
 showFixedPostForm: "Tampilkan form posting di atas linimasa."
 newNoteRecived: "Kamu mendapat catatan baru"
@@ -533,7 +533,7 @@ removeAllFollowingDescription: "Batal mengikuti semua akun dari {host}. Mohon ja
 userSuspended: "Pengguna ini telah dibekukan."
 userSilenced: "Pengguna ini telah dibungkam."
 yourAccountSuspendedTitle: "Akun ini dibekukan"
-yourAccountSuspendedDescription: "Akun ini dibekukan karena melanggar ketentuan penggunaan layanan server atau semacamnya. Hubungi admin apabila ingin tahu alasan lebih lanjut. Mohon untuk tidak membuat akun baru."
+yourAccountSuspendedDescription: "Akun ini dibekukan karena melanggar ketentuan penggunaan layanan peladen atau semacamnya. Hubungi admin apabila ingin tahu alasan lebih lanjut. Mohon untuk tidak membuat akun baru."
 menu: "Menu"
 divider: "Pembagi"
 addItem: "Tambahkan item"
@@ -577,12 +577,12 @@ pluginTokenRequestedDescription: "Plugin ini dapat menggunakan setelan ijin disi
 notificationType: "Jenis pemberitahuan"
 edit: "Sunting"
 useStarForReactionFallback: "Gunakan ★ sebagai fallback jika reaksi emoji tidak diketahui"
-emailServer: "Server surel"
+emailServer: "Peladen surel"
 enableEmail: "Nyalakan distribusi surel"
 emailConfigInfo: "Digunakan untuk mengonfirmasi surel kamu disaat mendaftar dan lupa kata sandi"
 email: "Surel"
 emailAddress: "Alamat surel"
-smtpConfig: "Konfigurasi server SMTP"
+smtpConfig: "Konfigurasi peladen SMTP"
 smtpHost: "Host"
 smtpPort: "Port"
 smtpUser: "Nama Pengguna"
@@ -643,6 +643,8 @@ clip: "Klip"
 createNew: "Buat baru"
 optional: "Opsional"
 createNewClip: "Buat klip baru"
+unclip: "Batalkan klip"
+confirmToUnclipAlreadyClippedNote: "Catatan ini sudah disertakan di klip \"{name}\". Yakin ingin membatalkan catatan dari klip ini?"
 public: "Publik"
 i18nInfo: "Misskey diterjemahkan ke dalam banyak bahasa oleh sukarelawan. Kamu dapat ikut membantu di {link}."
 manageAccessTokens: "Kelola access token"
@@ -791,7 +793,7 @@ whatIsNew: "Lihat perubahan pemutakhiran"
 translate: "Terjemahkan"
 translatedFrom: "Terjemahkan dari {x}"
 accountDeletionInProgress: "Penghapusan akun sedang dalam proses"
-usernameInfo: "Nama yang mengidentifikasikan akun kamu dari yang lain pada server ini. Kamu dapat menggunakan alfabet (a~z, A~Z), digit (0~9) atau garis bawah (_). Username tidak dapat diubah setelahnya."
+usernameInfo: "Nama yang mengidentifikasikan akun kamu dari yang lain pada peladen ini. Kamu dapat menggunakan alfabet (a~z, A~Z), digit (0~9) atau garis bawah (_). Username tidak dapat diubah setelahnya."
 aiChanMode: "Mode Ai"
 keepCw: "Biarkan Peringatan Konten"
 pubSub: "Akun Pub/Sub"
@@ -804,7 +806,7 @@ itsOff: "Nonaktif"
 emailRequiredForSignup: "Membutuhkan alamat surel untuk mendaftar"
 unread: "Belum dibaca"
 filter: "Saring"
-controlPanel: "Panel kontrol"
+controlPanel: "Panel kendali"
 manageAccounts: "Kelola Akun"
 makeReactionsPublic: "Tampilkan riwayat reaksi ke publik"
 makeReactionsPublicDescription: "Pengaturan ini akan membuat daftar dari semua reaksi masa lalu kamu ditampilkan secara publik."
@@ -845,12 +847,13 @@ failedToFetchAccountInformation: "Gagal untuk mendapatkan informasi akun"
 rateLimitExceeded: "Batas sudah terlampaui"
 cropImage: "potong gambar"
 cropImageAsk: "Ingin memotong gambar?"
+file: "Berkas"
 _emailUnavailable:
   used: "Alamat surel ini telah digunakan"
   format: "Format tidak valid."
   disposable: "Alamat surel temporer tidak dapat digunakan"
-  mx: "Server alamat surel ini tidak valid"
-  smtp: "Server alamat surel ini tidak merespon"
+  mx: "Peladen alamat surel ini tidak valid"
+  smtp: "Peladen alamat surel ini tidak merespon"
 _ffVisibility:
   public: "Terbitkan"
   followers: "Tampil untuk pengikut saja"
@@ -1208,7 +1211,7 @@ _widgets:
   button: "Tombol"
   onlineUsers: "Pengguna online"
   jobQueue: "Antrian kerja"
-  serverMetric: "Statistik server"
+  serverMetric: "Statistik peladen"
   aiscript: "Konsol AiScript"
   aichan: "Ai"
 _cw:
@@ -1640,8 +1643,6 @@ _notification:
 _deck:
   alwaysShowMainColumn: "Selalu tampilkan kolom utama"
   columnAlign: "Luruskan kolom"
-  columnMargin: "Batas antar kolom"
-  columnHeaderHeight: "Tinggi kolom header"
   addColumn: "Tambahkan kolom"
   swapLeft: "Pindah ke kiri"
   swapRight: "Pindah ke kanan"

locales/it-IT.yml

@@ -809,6 +809,7 @@ tenMinutes: "10 minuti"
 oneHour: "1 ora"
 oneDay: "1 giorno"
 oneWeek: "1 settimana"
+file: "Allegati"
 _emailUnavailable:
   used: "Email già in uso"
   format: "Formato email non valido"
@@ -1443,8 +1444,6 @@ _notification:
 _deck:
   alwaysShowMainColumn: "Mostra sempre la colonna principale"
   columnAlign: "Allineare colonne"
-  columnMargin: "Margine tra le colonne"
-  columnHeaderHeight: "Dimensioni dell'intestazione della colonna"
   addColumn: "Aggiungi colonna"
   swapLeft: "Sposta a sinistra"
   swapRight: "Sposta a destra"

locales/ja-JP.yml

@@ -203,6 +203,7 @@ done: "完了"
 processing: "処理中"
 preview: "プレビュー"
 default: "デフォルト"
+defaultValueIs: "デフォルト: {value}"
 noCustomEmojis: "絵文字はありません"
 noJobs: "ジョブはありません"
 federating: "連合中"
@@ -381,6 +382,7 @@ administrator: "管理者"
 token: "トークン"
 twoStepAuthentication: "二段階認証"
 moderator: "モデレーター"
+moderation: "モデレーション"
 nUsersMentioned: "{n}人が投稿"
 securityKey: "セキュリティキー"
 securityKeyName: "キーの名前"
@@ -541,7 +543,7 @@ relays: "リレー"
 addRelay: "リレーの追加"
 inboxUrl: "inboxのURL"
 addedRelays: "追加済みのリレー"
-serviceworkerInfo: "プッシュ通知を行うには有効する必要があります。"
+serviceworkerInfo: "プッシュ通知を行うには有効にする必要があります。"
 deletedNote: "削除された投稿"
 invisibleNote: "非公開の投稿"
 enableInfiniteScroll: "自動でもっと見る"
@@ -643,6 +645,8 @@ clip: "クリップ"
 createNew: "新規作成"
 optional: "任意"
 createNewClip: "新しいクリップを作成"
+unclip: "クリップ解除"
+confirmToUnclipAlreadyClippedNote: "このノートはすでにクリップ「{name}」に含まれています。ノートをこのクリップから除外しますか？"
 public: "パブリック"
 i18nInfo: "Misskeyは有志によって様々な言語に翻訳されています。{link}で翻訳に協力できます。"
 manageAccessTokens: "アクセストークンの管理"
@@ -845,6 +849,26 @@ failedToFetchAccountInformation: "アカウント情報の取得に失敗しま
 rateLimitExceeded: "レート制限を超えました"
 cropImage: "画像のクロップ"
 cropImageAsk: "画像をクロップしますか？"
+file: "ファイル"
+recentNHours: "直近{n}時間"
+recentNDays: "直近{n}日"
+noEmailServerWarning: "メールサーバーの設定がされていません。"
+thereIsUnresolvedAbuseReportWarning: "未対応の通報があります。"
+recommended: "推奨"
+check: "チェック"
+driveCapOverrideLabel: "このユーザーのドライブ容量上限を変更"
+driveCapOverrideCaption: "0以下を指定すると解除されます。"
+requireAdminForView: "閲覧するには管理者アカウントでログインしている必要があります。"
+isSystemAccount: "システムにより自動で作成・管理されているアカウントです。"
+typeToConfirm: "この操作を行うには {x} と入力してください"
+deleteAccount: "アカウント削除"
+document: "ドキュメント"
+numberOfPageCache: "ページキャッシュ数"
+numberOfPageCacheDescription: "多くすると利便性が向上しますが、負荷とメモリ使用量が増えます。"
+logoutConfirm: "ログアウトしますか？"
+lastActiveDate: "最終利用日時"
+statusbar: "ステータスバー"
+pleaseSelect: "選択してください"
 
 _emailUnavailable:
   used: "既に使用されています"
@@ -1230,10 +1254,12 @@ _widgets:
   trends: "トレンド"
   clock: "時計"
   rss: "RSSリーダー"
+  rssTicker: "RSSティッカー"
   activity: "アクティビティ"
   photos: "フォト"
   digitalClock: "デジタル時計"
   federation: "連合"
+  instanceCloud: "インスタンスクラウド"
   postForm: "投稿フォーム"
   slideshow: "スライドショー"
   button: "ボタン"
@@ -1698,8 +1724,6 @@ _notification:
 _deck:
   alwaysShowMainColumn: "常にメインカラムを表示"
   columnAlign: "カラムの寄せ"
-  columnMargin: "カラム間のマージン"
-  columnHeaderHeight: "カラムのヘッダー幅"
   addColumn: "カラムを追加"
   swapLeft: "左に移動"
   swapRight: "右に移動"
@@ -1708,6 +1732,9 @@ _deck:
   stackLeft: "左に重ねる"
   popRight: "右に出す"
   profile: "プロファイル"
+  introduction: "カラムを組み合わせて自分だけのインターフェイスを作りましょう！"
+  introduction2: "画面の右にある + を押して、いつでもカラムを追加できます。"
+  widgetsIntroduction: "カラムのメニューから、「ウィジェットの編集」を選択してウィジェットを追加してください"
 
   _columns:
     main: "メイン"

locales/ja-KS.yml

@@ -657,6 +657,7 @@ hashtags: "ハッシュタグ"
 hide: "隠す"
 searchByGoogle: "探す"
 indefinitely: "無期限"
+file: "ファイル"
 _ad:
   back: "戻る"
 _gallery:
@@ -1207,8 +1208,6 @@ _notification:
 _deck:
   alwaysShowMainColumn: "いつもメインカラムを表示"
   columnAlign: "カラムの寄せ"
-  columnMargin: "カラム間のマージン"
-  columnHeaderHeight: "カラムのヘッダー幅"
   addColumn: "カラムを追加"
   swapLeft: "左に移動"
   swapRight: "右に移動"

locales/kab-KAB.yml

@@ -56,6 +56,7 @@ emailNotification: "Ilɣa imayl"
 selectAccount: "Fren amiḍan"
 accounts: "Imiḍan"
 searchByGoogle: "Nadi"
+file: "Ifuyla"
 _email:
   _follow:
     title: "Yeṭṭafaṛ-ik·em-id"

locales/kn-IN.yml

@@ -60,6 +60,7 @@ smtpUser: "ಬಳಕೆಹೆಸರು"
 smtpPass: "ಗುಪ್ತಪದ"
 user: "ಬಳಕೆದಾರ"
 searchByGoogle: "ಹುಡುಕು"
+file: "ಕಡತಗಳು"
 _email:
   _follow:
     title: "ಹಿಂಬಾಲಿಸಿದರು"

locales/ko-KR.yml

@@ -643,6 +643,8 @@ clip: "클립"
 createNew: "새로 만들기"
 optional: "옵션"
 createNewClip: "새 클립 만들기"
+unclip: "클립 해제"
+confirmToUnclipAlreadyClippedNote: "이 노트는 이미 \"{name}\" 클립에 포함되어 있습니다. 클립을 해제하시겠습니까?"
 public: "공개"
 i18nInfo: "Misskey는 자원봉사자들에 의해 다양한 언어로 번역되고 있습니다. {link}에서 번역에 참가할 수 있습니다."
 manageAccessTokens: "액세스 토큰 관리"
@@ -845,6 +847,16 @@ failedToFetchAccountInformation: "계정 정보를 가져오지 못했습니다"
 rateLimitExceeded: "요청 제한 횟수를 초과하였습니다"
 cropImage: "이미지 자르기"
 cropImageAsk: "이미지를 자르시겠습니까?"
+file: "파일"
+recentNHours: "최근 {n}시간"
+recentNDays: "최근 {n}일"
+noEmailServerWarning: "메일 서버가 설정되어 있지 않습니다."
+thereIsUnresolvedAbuseReportWarning: "해결되지 않은 신고가 있습니다."
+recommended: "추천"
+check: "체크"
+isSystemAccount: "시스템에 의해 자동으로 생성되어 관리되는 계정입니다."
+typeToConfirm: "계속하시려면 {x} 을 입력하세요"
+deleteAccount: "계정 삭제"
 _emailUnavailable:
   used: "이 메일 주소는 사용중입니다"
   format: "형식이 올바르지 않습니다"
@@ -1640,8 +1652,6 @@ _notification:
 _deck:
   alwaysShowMainColumn: "메인 칼럼 항상 표시"
   columnAlign: "칼럼 정렬"
-  columnMargin: "칼럼 간 여백"
-  columnHeaderHeight: "칼럼 헤더 폭"
   addColumn: "칼럼 추가"
   swapLeft: "왼쪽으로 이동"
   swapRight: "오른쪽으로 이동"

locales/nl-NL.yml

@@ -305,6 +305,7 @@ hide: "Verbergen"
 searchByGoogle: "Zoeken"
 cropImage: "Afbeelding bijsnijden"
 cropImageAsk: "Bijsnijdengevraagd"
+file: "Bestanden"
 _email:
   _follow:
     title: "volgde jou"

locales/pl-PL.yml

@@ -760,6 +760,7 @@ pubSub: "Konta Pub/Sub"
 hide: "Ukryj"
 searchByGoogle: "Szukaj"
 indefinitely: "Nigdy"
+file: "Pliki"
 _ffVisibility:
   public: "Publikuj"
 _ad:
@@ -1406,8 +1407,6 @@ _notification:
 _deck:
   alwaysShowMainColumn: "Zawsze pokazuj główną kolumnę"
   columnAlign: "Wyrównaj kolumny"
-  columnMargin: "Odstęp między kolumnami"
-  columnHeaderHeight: "Wysokość nagłówka kolumny"
   addColumn: "Dodaj kolumnę"
   swapLeft: "Przesuń w lewo"
   swapRight: "Przesuń w prawo"

locales/pt-PT.yml

@@ -1,9 +1,9 @@
 ---
 _lang_: "Português"
-headlineMisskey: "Rede conectada por notas"
+headlineMisskey: "Uma rede ligada por notas"
 introMisskey: "Bem-vindo! Misskey é um serviço de microblogue descentralizado de código aberto.\nCria \"notas\" e partilha o que te ocorre com todos à tua volta. 📡\nCom \"reações\" podes também expressar logo o que sentes às notas de todos. 👍\nExploremos um novo mundo! 🚀"
 monthAndDay: "{day}/{month}"
-search: "Pesquisar"
+search: "Buscar"
 notifications: "Notificações"
 username: "Nome de usuário"
 password: "Senha"
@@ -94,6 +94,7 @@ unfollow: "Deixar de seguir"
 followRequestPending: "Pedido de seguimento pendente"
 enterEmoji: "Inserir emoji"
 renote: "Repostar"
+unrenote: "Desmarcar"
 renoted: "Repostado"
 cantRenote: "Não pode repostar"
 cantReRenote: "Não pode repostar este repost"
@@ -106,6 +107,7 @@ sensitive: "Conteúdo sensível"
 add: "Adicionar"
 reaction: "Reações"
 reactionSetting: "Quais reações a mostrar no selecionador de reações"
+reactionSettingDescription2: "Arraste para reordenar, clique para excluir, pressione + para adicionar."
 rememberNoteVisibility: "Lembrar das configurações de visibilidade de notas"
 attachCancel: "Remover anexo"
 markAsSensitive: "Marcar como sensível"
@@ -133,35 +135,339 @@ emojiName: "Nome do Emoji"
 emojiUrl: "URL do Emoji"
 addEmoji: "Adicionar um Emoji"
 settingGuide: "Guia de configuração"
+cacheRemoteFiles: "Memória transitória de arquivos remotos"
+cacheRemoteFilesDescription: "Se você desabilitar essa configuração, os arquivos remotos não serão armazenados em memória transitória e serão vinculados diretamente. Economiza o armazenamento do servidor, mas não gera miniaturas, o que aumenta o tráfego."
 flagAsBot: "Marcar conta como robô"
+flagAsBotDescription: "Se esta conta for operada por um programa, ative este sinalizador. Quando ativado, serve como um sinalizador para evitar o encadeamento de reações para outros programadores, e o manuseio do sistema do Misskey é adequado para ‘bots’."
 flagAsCat: "Marcar conta como gato"
 flagAsCatDescription: "Ative essa opção para marcar essa conta como gato."
 flagShowTimelineReplies: "Mostrar respostas na linha de tempo"
+flagShowTimelineRepliesDescription: "Quando ativado, a linha do tempo mostra as respostas às outras notas do utilizador, além da nota do utilizador."
+autoAcceptFollowed: "Aprove automaticamente os seguidores dos seguintes utilizadores"
+addAccount: "Adicionar Conta"
+loginFailed: "Não consegui logar"
+showOnRemote: "Exibir remotamente"
 general: "Geral"
 wallpaper: "Papel de parede"
+setWallpaper: "Definir papel de parede"
+removeWallpaper: "Remover papel de parede"
 searchWith: "Buscar: {q}"
 youHaveNoLists: "Não tem nenhuma lista"
 followConfirm: "Tem certeza que quer deixar de seguir {name}?"
+proxyAccount: "Conta proxy"
+proxyAccountDescription: "Uma conta proxy é uma conta que atua como seguidora remota para utilizadores sob determinadas condições. Por exemplo, quando um utilizador lista um utilizador remoto, a atividade não será entregue à instância, a menos que alguém esteja seguindo o utilizador listado, portanto, a conta proxy deve seguir."
+host: "hospedeiro"
+selectUser: "Selecionar utilizador"
+recipient: "Morada"
+annotation: "Anotação"
+federation: "União"
 instances: "Instância"
 registeredAt: "Registrado em"
+latestRequestSentAt: "Enviar a solicitação mais recente"
+latestRequestReceivedAt: "Recebeu a última solicitação"
+latestStatus: "Status mais recente"
+storageUsage: "Uso de armazenamento"
+charts: "gráfico"
 perHour: "por hora"
 perDay: "por dia"
+stopActivityDelivery: "Parar a entrega de atividades"
+blockThisInstance: "Bloquear esta instância"
+operations: "operar"
+software: "Programas"
+version: "versão"
+metadata: "Metadados"
+withNFiles: "{n} Um arquivo"
+monitor: "monitor"
+jobQueue: "Fila de trabalhos"
+cpuAndMemory: "CPU e memória"
+network: "rede"
+disk: "disco"
+instanceInfo: "Informações da instância"
+statistics: "Estatisticas"
+clearQueue: "Limpar a fila"
+clearQueueConfirmTitle: "Quer limpar a fila?"
+clearQueueConfirmText: "Postagens não entregues não serão mais entregues. Normalmente você não precisa fazer isso."
+clearCachedFiles: "Limpar memória transitória"
+clearCachedFilesConfirm: "Tem certeza de que deseja excluir todos os arquivos remotos armazenados em memória transitória?"
+blockedInstances: "Instância bloqueada"
+blockedInstancesDescription: "Defina os anfitriões das instâncias que deseja bloquear, separados por quebras de linha. Uma instância bloqueada não poderá interagir com esta instância."
+muteAndBlock: "Silenciar e bloquear"
+mutedUsers: "Silenciar utilizador"
+blockedUsers: "Utilizadores bloqueados"
 noUsers: "Sem usuários"
+editProfile: "Editar Perfil"
+noteDeleteConfirm: "Deseja excluir esta nota?"
+pinLimitExceeded: "Não consigo mais fixar"
+intro: "A instalação do Misskey está completa! Crie uma conta de administrador."
+done: "Concluído"
+processing: "Em Progresso"
+preview: "Pré-visualizar"
+default: "Padrão"
+noCustomEmojis: "Não há emojis"
+noJobs: "Sem trabalho"
+federating: "federar"
+blocked: "Bloqueado"
+suspended: "Cancelar subscrição"
+all: "Todos"
+subscribing: "Subscrito"
+publishing: "Executando"
+notResponding: "Sem resposta"
+instanceFollowing: "Seguir a instância"
+instanceFollowers: "Seguidores da instância"
+instanceUsers: "Utilizador da instância"
+changePassword: "Mudar senha"
+security: "Segurança"
+retypedNotMatch: "As entradas não coincidem."
+currentPassword: "Palavra-passe atual"
+newPassword: "Nova palavra-passe"
+newPasswordRetype: "Nova senha (redigite)"
+attachFile: "Anexar arquivo"
+more: "Mais!"
+featured: "Destaques"
+usernameOrUserId: "Nome de utilizador ou ID de utilizador"
+noSuchUser: "Utilizador não encontrado"
+lookup: "Buscando"
+announcements: "Notícia"
+imageUrl: "URL da imagem"
 remove: "Eliminar"
+removed: "Foi deletado"
+removeAreYouSure: "Deseja excluir \"{x}\"?"
+deleteAreYouSure: "Deseja excluir \"{x}\"?"
+resetAreYouSure: "Redefinir agora?"
+saved: "Salvo"
+messaging: "Chat"
+upload: "Enviando"
+keepOriginalUploading: "Manter a imagem original"
+keepOriginalUploadingDescription: "Mantenha a versão original ao carregar a imagem. Quando desligado, a imagem para publicação na web será gerada no navegador no momento do upload."
+fromDrive: "\nDa unidade"
+fromUrl: "Da URL"
+uploadFromUrl: "Carregamento de URL"
+uploadFromUrlDescription: "URL do arquivo que você deseja enviar"
+uploadFromUrlRequested: "Upload solicitado"
+uploadFromUrlMayTakeTime: "Pode levar algum tempo para que o upload seja concluído."
+explore: "Explorar"
 messageRead: "Lida"
+noMoreHistory: "Sem mais história"
+startMessaging: "Iniciar conversação"
+nUsersRead: "{n} Pessoas leem"
+agreeTo: "Eu concordo com {0}"
+tos: "Termos de serviço"
+start: "começar"
+home: "casa"
+remoteUserCaution: "As informações estão incompletas porque é um utilizador remoto."
+activity: "atividade"
+images: "imagem"
+birthday: "aniversário"
+yearsOld: "{age} anos"
+registeredDate: "Data de registro"
+location: "Lugar, colocar"
+theme: "tema"
+themeForLightMode: "Temas usados ​​no modo de luz"
+themeForDarkMode: "Temas usados ​​no modo escuro"
+light: "Claro"
+dark: "Escuro"
 lightThemes: "Tema claro"
 darkThemes: "Tema escuro"
+syncDeviceDarkMode: "Sincronize com o modo escuro do dispositivo"
+drive: "Unidades"
+fileName: "Nome do Ficheiro"
+selectFile: "Selecione os arquivos"
+selectFiles: "Selecione os arquivos"
+selectFolder: "Selecionar uma pasta"
+selectFolders: "Selecionar uma pasta"
+renameFile: "Renomear ficheiro"
+folderName: "Nome da pasta"
+createFolder: "Criar pasta"
+renameFolder: "Renomear Pasta"
+deleteFolder: "Eliminar Pasta"
 addFile: "Adicionar arquivo"
+emptyDrive: "A unidade está vazia"
+emptyFolder: "A pasta está vazia"
+unableToDelete: "Não é possível eliminar"
+inputNewFileName: "Por favor, digite um novo nome para a pasta!"
+inputNewDescription: "Insira uma nova legenda"
+inputNewFolderName: "Por favor, digite um novo nome para a pasta!"
+circularReferenceFolder: "A pasta de destino é uma subpasta da pasta que você deseja mover."
+hasChildFilesOrFolders: "Esta pasta não está vazia e não pode ser excluída."
+copyUrl: "Copiar URL"
+rename: "Renomear"
+avatar: "Avatar"
+banner: "Capa"
 nsfw: "Conteúdo sensível"
+whenServerDisconnected: "Quando a conexão com o servidor é perdida"
+disconnectedFromServer: "Desconectado do servidor"
+reload: "Recarregar"
+doNothing: "Nenhuma ação adicional"
+reloadConfirm: "Quer recarregar?"
+watch: "ver"
+unwatch: "Não observar"
+accept: "Aceitar"
+reject: "Rejeitar"
+normal: "Normal"
+instanceName: "Nome da instância"
+instanceDescription: "Descrição da instância"
+maintainerName: "Nome do administrador"
+maintainerEmail: "E-mail do Administrador:"
+tosUrl: "URL dos Termos de Uso"
+thisYear: "Este ano"
+thisMonth: "Este mês"
+today: "Hoje"
+dayX: " Dia {day}"
 monthX: "mês de {month}"
+yearX: "Ano {year}"
+pages: "Páginas"
+integration: "Integração"
+connectService: "Conectar"
+disconnectService: "Desconectar"
+enableLocalTimeline: "Ativar linha do tempo local"
+enableGlobalTimeline: "Ativar linha do tempo global"
+disablingTimelinesInfo: "Se você desabilitar essas linhas do tempo, administradores e moderadores ainda poderão usá-las por conveniência."
+registration: "Registar"
+enableRegistration: "Permitir que qualquer pessoa se registre"
+invite: "Convidar"
+driveCapacityPerLocalAccount: "Capacidade da unidade por utilizador local"
+driveCapacityPerRemoteAccount: "Capacidade da unidade por utilizador remoto"
+inMb: "Em ‘megabytes’"
+iconUrl: "URL da imagem do ícone (favicon, etc.)"
+bannerUrl: "URL da imagem do ‘banner’"
+backgroundImageUrl: "URL da imagem de fundo"
+basicInfo: "Informações básicas"
+pinnedUsers: "Utilizador fixado"
+pinnedUsersDescription: "Descreva os utilizadores que você deseja fixar na página \"Localizar\", etc., separados por quebras de linha."
+pinnedPages: "Página fixada"
+pinnedPagesDescription: "Descreva o caminho da página que você deseja fixar na página superior da instância, separada por quebras de linha."
+pinnedClipId: "ID do clipe a ser fixado"
 pinnedNotes: "Post fixado"
+hcaptcha: "hCaptcha"
+enableHcaptcha: "Ativar hCaptcha"
+hcaptchaSiteKey: "Chave do sítio ‘web’"
+hcaptchaSecretKey: "Chave secreta"
+recaptcha: "reCAPTCHA"
+enableRecaptcha: "Habilitar reCAPTCHA"
+recaptchaSiteKey: "Chave do sítio ‘web’"
+recaptchaSecretKey: "Chave secreta"
+avoidMultiCaptchaConfirm: "O uso de vários captchas pode causar interferência. Deseja desativar outros captchas? Você também pode cancelar e deixar vários captchas ativados."
+antennas: "Antenas"
+manageAntennas: "Gestão de antena"
+name: "Nome"
+antennaSource: "Origem de entrada"
+antennaKeywords: "Palavras-chave recebidas"
+antennaExcludeKeywords: "Palavras-chave negativas"
+antennaKeywordsDescription: "Se você separá-lo com um espaço, será uma especificação AND, e se você separá-lo com uma quebra de linha, será uma especificação OR."
+notifyAntenna: "Notificar novas notas"
+withFileAntenna: "Apenas notas com arquivos anexados"
+enableServiceworker: "Ative as notificações push para o seu navegador"
+antennaUsersDescription: "Especificar nomes de utilizador separados por quebras de linha"
+caseSensitive: "Maiúsculas e minúsculas"
+withReplies: "Incluindo resposta"
+connectedTo: "Você está conectado à seguinte conta"
+notesAndReplies: "Publicações e respostas"
+withFiles: "Com arquivo"
+silence: "Silenciado"
+silenceConfirm: "Quer silenciar?"
+unsilence: "Liberar silenciar"
+unsilenceConfirm: "Quer liberar o silêncio?"
+popularUsers: "Utilizadores populares"
+recentlyUpdatedUsers: "Utilizadores postados recentemente"
+recentlyRegisteredUsers: "Utilizadores registrados recentemente"
+recentlyDiscoveredUsers: "Utilizadores descobertos recentemente"
+exploreUsersCount: "Há um utilizador de {count}"
+exploreFediverse: "Explorar Fediverse"
+popularTags: "Tags populares"
 userList: "Listas"
+about: "Informações"
+aboutMisskey: "Sobre Misskey"
+administrator: "Administrador"
+token: "Símbolo"
+twoStepAuthentication: "Verificação em duas etapas"
+moderator: "Moderador"
+nUsersMentioned: "Postado por {n} pessoas"
+securityKey: "Chave de segurança"
+securityKeyName: "Nome chave"
+registerSecurityKey: "Registre a chave de segurança"
+lastUsed: "Último uso"
+unregister: "Cancelar registro"
+passwordLessLogin: "Entrar sem senha"
+resetPassword: "Redefinir senha"
+newPasswordIs: "A nova senha é \"{password}\""
+reduceUiAnimation: "Reduzir a animação da ‘interface’ do utilizador"
+share: "Compartilhar"
+notFound: "Não encontrado"
+notFoundDescription: "Não havia página correspondente ao URL especificado."
+uploadFolder: "Destino de ‘upload’ padrão"
+cacheClear: "Excluir memória transitória"
+markAsReadAllNotifications: "Marcar todas as notificações como lidas"
+markAsReadAllUnreadNotes: "Marcar todas as postagens como lidas"
+markAsReadAllTalkMessages: "Marcar todas as conversas como lidas"
+help: "Ajuda"
+inputMessageHere: "Escrever mensagem aqui"
+close: "Fechar"
+group: "Grupos"
+groups: "Grupos"
+createGroup: "Criar grupo"
+ownedGroups: "Grupo próprio"
+invites: "Convidar"
+invitations: "Convidar"
+tags: "Etiquetas"
+docSource: "Fonte deste documento"
+createAccount: "Criar conta"
+existingAccount: "Contas existentes"
+regenerate: "Gerar novamente"
+fontSize: "Tamanho do texto"
+noFollowRequests: "Não há aplicação de acompanhamento"
+openImageInNewTab: "Abrir a imagem numa nova aba"
+dashboard: "Painel de controle"
+local: "Local"
+remote: "Remoto"
+total: "Total"
+weekOverWeekChanges: "Em comparação com a semana anterior"
+dayOverDayChanges: "Dia anterior"
+appearance: "Aparência"
+clientSettings: "Configurações do cliente"
+accountSettings: "Configurações da conta"
+promotion: "Promoção"
+promote: "Promover"
+numberOfDays: "Dias"
+hideThisNote: "Ocultar esta nota"
+showFeaturedNotesInTimeline: "Mostrar notas recomendadas na linha do tempo"
+objectStorage: "Armazenamento de objetos"
+useObjectStorage: "Usar armazenamento de objetos"
+objectStorageBaseUrl: "URL base"
+objectStorageBaseUrlDesc: "O URL usado para referência. Se você estiver usando um CDN ou Proxy, seu URL, S3:'https: // <bucket> .s3.amazonaws.com', GCS, etc .:'https://storage.googleapis.com/ <bucket>' ."
+objectStorageBucket: "Bucket"
+objectStorageBucketDesc: "Especifique o nome do bucket do serviço a ser usado."
+objectStoragePrefix: "Prefixo"
+objectStoragePrefixDesc: "Ele é armazenado neste diretório de prefixo."
+objectStorageEndpoint: "Ponto final"
+objectStorageEndpointDesc: "Especifique vazio para S3, caso contrário, especifique o ponto final para cada serviço. Especifique como'<host>'ou'<host>: <port>'."
+objectStorageRegion: "Região"
+objectStorageRegionDesc: "Especifique uma região como 'xx-east-1'. Caso seu serviço não tenha o conceito de região, ele deve estar vazio ou 'us-east-1'."
+objectStorageUseSSL: "Usar SSL"
+objectStorageUseSSLDesc: "Desative-o se não quiser usar https para conexões de API"
+objectStorageUseProxy: "Usar proxy"
+objectStorageUseProxyDesc: "Se você não usa proxy para conexão de API, desative-o."
+objectStorageSetPublicRead: "Definir 'public-read' ao fazer o upload"
+serverLogs: "Registro do servidor"
+deleteAll: "Apagar Tudo"
+showFixedPostForm: "Exibir o formulário de postagem na parte superior da linha do tempo"
+newNoteRecived: "Nova nota recebida"
+sounds: "Sons"
+listen: "Ouvir"
 none: "Nenhum"
+showInPage: "Ver na página"
+popout: "Sair"
+volume: "Volume"
+masterVolume: "volume principal"
+details: "Detalhes"
 output: "Resultado"
+smtpHost: "hospedeiro"
 smtpUser: "Nome de usuário"
 smtpPass: "Senha"
+clearCache: "Limpar memória transitória"
+info: "Informações"
 user: "Usuários"
-searchByGoogle: "Pesquisar"
+searchByGoogle: "Buscar"
+file: "Ficheiros"
 _email:
   _follow:
     title: "Você tem um novo seguidor"
@@ -169,7 +475,7 @@ _mfm:
   mention: "Menção"
   quote: "Citar"
   emoji: "Emoji personalizado"
-  search: "Pesquisar"
+  search: "Buscar"
 _theme:
   keys:
     mention: "Menção"
@@ -177,22 +483,33 @@ _theme:
 _sfx:
   note: "Posts"
   notification: "Notificações"
+  chat: "Chat"
 _widgets:
   notifications: "Notificações"
   timeline: "Timeline"
+  activity: "atividade"
+  federation: "União"
+  jobQueue: "Fila de trabalhos"
 _cw:
   show: "Carregar mais"
 _visibility:
+  home: "casa"
   followers: "Seguidores"
 _profile:
+  name: "Nome"
   username: "Nome de usuário"
 _exportOrImport:
   followingList: "Seguindo"
   muteList: "Silenciar"
   blockingList: "Bloquear"
   userLists: "Listas"
+_charts:
+  federation: "União"
+_timelines:
+  home: "casa"
 _pages:
   blocks:
+    image: "imagem"
     _button:
       _action:
         _pushEvent:
@@ -397,8 +714,6 @@ _notification:
 _deck:
   alwaysShowMainColumn: "Sempre mostrar a coluna principal"
   columnAlign: "Alinhar colunas"
-  columnMargin: "Margem entre colunas"
-  columnHeaderHeight: "Altura do cabeçalho de coluna"
   addColumn: "Adicionar coluna"
   swapLeft: "Trocar de posição com a coluna à esquerda"
   swapRight: "Trocar de posição com a coluna à direita"

locales/ro-RO.yml

@@ -644,6 +644,7 @@ administration: "Gestionare"
 middle: "Mediu"
 sent: "Trimite"
 searchByGoogle: "Caută"
+file: "Fișiere"
 _email:
   _follow:
     title: "te-a urmărit"

locales/ru-RU.yml

@@ -381,6 +381,7 @@ administrator: "Администратор"
 token: "Токен"
 twoStepAuthentication: "Двухфакторная аутентификация"
 moderator: "Модератор"
+moderation: "Модерация"
 nUsersMentioned: "Упомянуло пользователей: {n}"
 securityKey: "Ключ безопасности"
 securityKeyName: "Имя ключа"
@@ -636,7 +637,7 @@ waitingFor: "Ждём, когда {x} ответит"
 random: "Случайные"
 system: "Система"
 switchUi: "Выбор вида"
-desktop: "Стол"
+desktop: "Компьютер"
 clip: "Подборка"
 createNew: "Новый документ"
 optional: "Необязательно"
@@ -832,6 +833,7 @@ searchByGoogle: "Поиск"
 instanceDefaultLightTheme: "Светлая тема по умолчанию"
 instanceDefaultDarkTheme: "Темная тема по умолчанию"
 indefinitely: "вечно"
+file: "Файлы"
 _emailUnavailable:
   used: "Уже используется"
   format: "Неверный формат"
@@ -1619,8 +1621,6 @@ _notification:
 _deck:
   alwaysShowMainColumn: "Всегда показывать главную колонку"
   columnAlign: "Выравнивание колонок"
-  columnMargin: "Расстояние между колонками"
-  columnHeaderHeight: "Высота заголовка колонки"
   addColumn: "Добавить колонку"
   swapLeft: "Переставить левее"
   swapRight: "Переставить правее"

locales/sk-SK.yml

@@ -203,6 +203,7 @@ done: "Hotovo"
 processing: "Pracujem..."
 preview: "Náhľad"
 default: "Predvolené"
+defaultValueIs: "Predvolené: {value}"
 noCustomEmojis: "Žiadne emoji"
 noJobs: "Žiadne úlohy"
 federating: "Federácia"
@@ -381,6 +382,7 @@ administrator: "Administrátor"
 token: "Token"
 twoStepAuthentication: "Dvojfaktorová autentifikácia"
 moderator: "Moderátor"
+moderation: "Moderovanie"
 nUsersMentioned: "{n} používateľov spomenulo"
 securityKey: "Bezpečnostný kľúč"
 securityKeyName: "Názov kľúča"
@@ -642,6 +644,8 @@ clip: "Klip"
 createNew: "Vytvoriť nový"
 optional: "Voliteľné"
 createNewClip: "Vytvoriť nový klip"
+unclip: "Odopnúť"
+confirmToUnclipAlreadyClippedNote: "Táto poznámka je už pripnutá ako \"{name}\". Naozaj ju chcete odopnúť?"
 public: "Verejné"
 i18nInfo: "Misskey je prekladaný do rôznych jazykov dobrovoľníkmi. Pomôcť môžete na {link}."
 manageAccessTokens: "Spravovať prístupové tokeny"
@@ -842,6 +846,25 @@ oneWeek: "1 týždeň"
 reflectMayTakeTime: "Zmeny môžu chvíľu trvať kým sa prejavia."
 failedToFetchAccountInformation: "Nepodarilo sa načítať informácie o účte."
 rateLimitExceeded: "Prekročený limit rýchlosti"
+cropImage: "Orezanie obrázku"
+cropImageAsk: "Chcete orezať obrázok?"
+file: "Súbor/y"
+recentNHours: "Posledných {n} hodín"
+recentNDays: "Posledných {n} dní"
+noEmailServerWarning: "Nie je nastavený emailový server."
+thereIsUnresolvedAbuseReportWarning: "Existuje nevyriešené nahlásenie zneužitia."
+recommended: "Odporúčané"
+driveCapOverrideLabel: "Zmena limitu úložiska pre tohoto používateľa"
+driveCapOverrideCaption: "Ak je zadaná hodnota menšia alebo rovná 0, zruší sa."
+isSystemAccount: "Tieto účty automaticky vytvoril a spravuje systém."
+typeToConfirm: "Ak chcete vykonať túto operáciu, napíšte {x}"
+deleteAccount: "Vymazať účet"
+document: "Dokument"
+numberOfPageCache: "Počet cachí pre stránky"
+numberOfPageCacheDescription: "Zvýši rýchlosť ale tiež nároky na pamäť."
+logoutConfirm: "Naozaj sa chcete odhlásiť?"
+statusbar: "Stavový riadok"
+pleaseSelect: "Prosím vyberte"
 _emailUnavailable:
   used: "Táto emailová adresa sa už používa"
   format: "Formát emailovej adresy je nesprávny"
@@ -1196,10 +1219,12 @@ _widgets:
   trends: "Trendy"
   clock: "Hodiny"
   rss: "RSS čítačka"
+  rssTicker: "RSS Ticker"
   activity: "Aktivita"
   photos: "Fotky"
   digitalClock: "Digitálne hodiny"
   federation: "Federácia"
+  instanceCloud: "Cloud serverov"
   postForm: "Napísať poznámku"
   slideshow: "Prezentácia"
   button: "Tlačidlo"
@@ -1615,6 +1640,7 @@ _notification:
   yourFollowRequestAccepted: "Vaša žiadosť o sledovanie bola prijatá"
   youWereInvitedToGroup: "Pozvať do skupiny"
   pollEnded: "Výsledky hlasovania sú k dispozícii."
+  emptyPushNotificationMessage: "Push notifikácie aktualizované"
   _types:
     all: "Všetky"
     follow: "Sledujete"
@@ -1636,8 +1662,6 @@ _notification:
 _deck:
   alwaysShowMainColumn: "Vždy zobraziť v hlavnom stĺpci"
   columnAlign: "Zarovnať stĺpce"
-  columnMargin: "Rozostup medzi stĺpcami"
-  columnHeaderHeight: "Výška hlavičky stĺpca"
   addColumn: "Pridať stĺpec"
   swapLeft: "Vymeniť vľavo"
   swapRight: "Vymeniť vpravo"
@@ -1646,6 +1670,9 @@ _deck:
   stackLeft: "Priložiť do ľavého stĺpca"
   popRight: "Vybrať napravo"
   profile: "Profil"
+  introduction: "Kombinujte stĺpce a vytvorte si svoje vlastné rozhranie!"
+  introduction2: "Stlačením tlačidla + v pravej časti obrazovky môžete kedykoľvek pridať stĺpce."
+  widgetsIntroduction: "V ponuke stĺpca vyberte možnosť \"Upraviť widget\" a pridajte widget"
   _columns:
     main: "Hlavný"
     widgets: "Widgety"

locales/sv-SE.yml

@@ -247,6 +247,7 @@ smtpPass: "Lösenord"
 clearCache: "Rensa cache"
 user: "Användare"
 searchByGoogle: "Sök"
+file: "Filer"
 _email:
   _follow:
     title: "följde dig"

locales/th-TH.yml

@@ -1 +1,677 @@
 ---
+_lang_: "ภาษาไทย"
+headlineMisskey: "เชื่อมต่อเครือข่ายโดยโน้ต"
+introMisskey: "ยินดีต้อนรับจ้าาา! Misskey เป็นบริการไมโครบล็อกโอเพ่นซอร์ส แบบการกระจายอำนาจ\nสร้าง \"โน้ต\" เพื่อแบ่งปันความคิดของคุณกับทุกคนรอบตัวคุณกันเถอะ 📡\nด้วยการ \"รีแอคชั่นผู้คน\" คุณยังสามารถแสดงความรู้สึกของคุณเกี่ยวกับบันทึกของทุกคนได้อย่างรวดเร็ว 👍\n\nแล้วมาท่องสำรวจโลกใบใหม่กันเถอะ! 🚀"
+monthAndDay: "{เดือน}/{วัน}"
+search: "ค้นหา"
+notifications: "การเเจ้งเตือน"
+username: "ชื่อผู้ใช้"
+password: "รหัสผ่าน"
+forgotPassword: "ลืมรหัสผ่าน?"
+fetchingAsApObject: "กำลังดึงข้อมูล จาก เฟดิเวิร์ส..."
+ok: "ตกลง"
+gotIt: "เข้าใจแล้ว !"
+cancel: "ยกเลิก"
+enterUsername: "ใส่ชื่อผู้ใช้"
+renotedBy: "รีโน้ตโดย {ผู้ใช้}"
+noNotes: "ไม่มีโน้ต"
+noNotifications: "ไม่มีการแจ้งเตือน"
+instance: "ตัวอย่าง"
+settings: "การตั้งค่า"
+basicSettings: "การตั้งค่าพื้นฐาน"
+otherSettings: "การตั้งค่าอื่นๆ"
+openInWindow: "เปิดในหน้าต่าง"
+profile: "โปรไฟล์"
+timeline: "ไทม์ไลน์"
+noAccountDescription: "ผู้ใช้รายนี้ยังไม่ได้เขียนลงประวัติของพวกเขา"
+login: "เข้าสู่ระบบ"
+loggingIn: "กำลังเข้าสู่ระบบ"
+logout: "ออกจากระบบ"
+signup: "สร้างบัญชีผู้ใช้"
+uploading: "กำลังอัพโหลด..."
+save: "บันทึก"
+users: "ผู้ใช้งาน"
+addUser: "เพิ่มผู้ใช้"
+favorite: "รายการโปรด"
+favorites: "รายการโปรด"
+unfavorite: "ลบออกจากรายการโปรด"
+favorited: "เพิ่มแล้วในรายการโปรด"
+alreadyFavorited: "เพิ่มในรายการโปรดอยู่แล้ว"
+cantFavorite: "ไม่สามารถเพิ่มในรายการโปรดได้"
+pin: "ปักหมุดไปยังโปรไฟล์"
+unpin: "เลิกปักหมุดจากโปรไฟล์"
+copyContent: "คัดลอกเนื้อหา"
+copyLink: "คัดลอกลิงก์"
+delete: "ลบ"
+deleteAndEdit: "ลบและแก้ไข"
+deleteAndEditConfirm: "นายแน่ใจแล้วเหรอ? ว่าต้องการลบโน้ตนี้และแก้ไข คุณอาจจะสูญเสียการโต้ตอบ, โน้ต, และการตอบกลับทั้งหมดได้นะ"
+addToList: "เพิ่มในลิสต์"
+sendMessage: "ส่งข้อความ"
+copyUsername: "คัดลอกชื่อผู้ใช้"
+searchUser: "ค้นหาผู้ใช้งาน"
+reply: "ตอบกลับ"
+loadMore: "โหลดเพิ่มเติม"
+showMore: "แสดงเพิ่มเติม"
+youGotNewFollower: "ได้ติดตามคุณ"
+receiveFollowRequest: "คำขอผู้ติดตามที่ได้รับ"
+followRequestAccepted: "ผู้ติดตามได้ตอบรับคำขอร้องของคุณแล้ว"
+mention: "กล่าวถึง"
+mentions: "พูดถึง"
+directNotes: "ไดเร็คโน้ต"
+importAndExport: "นำเข้า / ส่งออก"
+import: "การนำเข้า"
+export: "การนำออก"
+files: "ไฟล์"
+download: "ดาวน์โหลด"
+driveFileDeleteConfirm: "นายแน่ใจแล้วหรอ? ว่าต้องการลบไฟล์ \"{name}\" โน้ตย่อที่แนบมากับไฟล์นี้ก็จะถูกลบด้วยนะ"
+unfollowConfirm: "นายแน่ใจแล้วหรอว่าต้องการเลิกติดตาม {name}?"
+exportRequested: "เมื่อคุณได้ร้องขอการส่งออก อาจจะต้องใช้เวลาสักครู่ และจะถูกเพิ่มในไดรฟ์ของคุณเมื่อเสร็จสิ้นแล้ว"
+importRequested: "เมื่อคุณได้ร้องขอการนำเข้า อาจจะต้องใช้เวลาสักครู่นะ"
+lists: "รายการ"
+noLists: "คุณไม่มีลิสต์ใดๆนะ"
+note: "ตัวโน้ต"
+notes: "หมายเหตุ"
+following: "กำลังติดตาม"
+followers: "ผู้ติดตาม"
+followsYou: "ติดตามคุณ"
+createList: "สร้างลิสต์"
+manageLists: "จัดการลิสต์"
+error: "ผิดพลาด!"
+somethingHappened: "อุ๊ย ! มีอะไรบางอย่างผิดพลาด"
+retry: "ลองใหม่อีกครั้ง"
+pageLoadError: "เกิดข้อผิดพลาดในการโหลดหน้านี้"
+pageLoadErrorDescription: "โดยปกติแล้วมักจะเกิดจากข้อผิดพลาดของเครือข่ายหรือแคชของเบราว์เซอร์ ลองล้างแคชแล้วลองใหม่อีกครั้งหลังจากรอสักครู่ "
+serverIsDead: "เซิร์ฟเวอร์นี้ไม่มีการตอบสนอง ได้โปรดกรุณารอสักครู่แล้วลองใหม่อีกครั้งนะ"
+youShouldUpgradeClient: "หากต้องการดูหน้านี้ได้โปรดกรุณา รีเซ็ตเพื่ออัปเดตไคลเอ็นต์ของคุณนะ"
+enterListName: "ใส่ชื่อสำหรับรายการลิสต์"
+privacy: "ความเป็นส่วนตัว"
+makeFollowManuallyApprove: "ติดตามคำขอที่ต้องได้รับการอนุมัติ"
+defaultNoteVisibility: "การมองเห็นที่เป็นค่าเริ่มต้น"
+follow: "กำลังติดตาม"
+followRequest: "ส่งคำขอติดตาม"
+followRequests: "ติดตามการร้องขอ"
+unfollow: "เลิกติดตาม"
+followRequestPending: "กำลังรอดำเนินการร้องขอติดตาม"
+enterEmoji: "ใส่อีโมจิ"
+renote: "รีโน้ต"
+unrenote: "เลิกรีโน้ต"
+renoted: "รีโน้ตเอาไว้"
+cantRenote: "โพสต์นี้ไม่สามารถรีโน้ตไว้ใหม่ได้นะ"
+cantReRenote: "ไม่สามารถรีโน้ตเอาไว้ใหม่ได้นะ"
+quote: "อ้างคำพูด"
+pinnedNote: "โน้ตที่ปักหมุดเอาไว้"
+pinned: "ปักหมุดไปยังโปรไฟล์"
+you: "ตัวเอง"
+clickToShow: "คลิกเพื่อแสดง"
+sensitive: "เนื้อหาที่ละเอียดอ่อน NSFW"
+add: "เพิ่ม"
+reaction: "รีแอคชั่น"
+reactionSetting: "รีแอคชั่นไปยังแสดงผลในตัวเลือกการรีแอคชั่น"
+reactionSettingDescription2: "กดลากเพื่อจัดลำดับใหม่ กดคลิกเพื่อลบ กด \"+\" เพื่อเพิ่ม"
+rememberNoteVisibility: "จดจำการตั้งค่าการมองเห็นตัวโน้ต"
+attachCancel: "ลบไฟล์ออกที่แนบมา"
+markAsSensitive: "ทำเครื่องหมายว่าละเอียดอ่อน"
+unmarkAsSensitive: "ยกเลิกทำเครื่องหมายเป็น NSFW"
+enterFileName: "พิมพ์ชื่อไฟล์"
+mute: "ปิดเสียง"
+unmute: "ไม่ปิดเสียง"
+block: "บล็อค"
+unblock: "เลิกปิดกั้น"
+suspend: "ถูกระงับ"
+unsuspend: "ยกเลิกระงับ"
+blockConfirm: "คุณแน่ใจแล้วเหรอ? ว่าต้องการบล็อกบัญชีนี้"
+unblockConfirm: "คุณแน่ใจแล้วเหรอ? ว่าต้องการปลดบล็อคบัญชีนี้"
+suspendConfirm: "นายแน่ใจแล้วเหรอว่าต้องการระงับบัญชีนี้อ่ะ?"
+unsuspendConfirm: "นายแน่ใจแล้วหรอ? ว่าต้องการยกเลิกการระงับบัญชีนี้"
+selectList: "เลือกรายการ (Automatic Translation)"
+selectAntenna: "เลือกเสาอากาศ"
+selectWidget: "เลือกวิดเจ็ต"
+editWidgets: "แก้ไขวิดเจ็ต"
+editWidgetsExit: "เรียบร้อย"
+customEmojis: "กำหนดอีโมจิเอง"
+emoji: "อีโมจิ"
+emojis: "อีโมจิ"
+emojiName: "ชื่ออิโมจิ"
+emojiUrl: "อิโมจิ URL"
+addEmoji: "แทรกอีโมจิ"
+settingGuide: "การตั้งค่าที่แนะนำ"
+cacheRemoteFiles: "แคชไฟล์ระยะไกล"
+cacheRemoteFilesDescription: "เมื่อปิดใช้งานการตั้งค่านี้ ไฟล์ระยะไกลนั้นจะถูกโหลดโดยตรงจากอินสแตนซ์ระยะไกล แต่กรณีการปิดใช้งานนี้จะช่วยลดปริมาณการใช้พื้นที่จัดเก็บข้อมูล แต่เพิ่มปริมาณการใช้งาน เพราะเนื่องจากจะไม่มีการสร้างภาพขนาดย่อ"
+flagAsBot: "ทำเครื่องหมายบอกว่าบัญชีนี้เป็นบอท"
+flagAsBotDescription: "การเปิดใช้งานตัวเลือกนี้หากบัญชีนี้ถูกควบคุมโดยนักเขียนโปรแกรม หรือ ถ้าหากเปิดใช้งาน มันจะทำหน้าที่เป็นแฟล็กสำหรับนักพัฒนารายอื่นๆ และเพื่อป้องกันการโต้ตอบแบบไม่มีที่สิ้นสุดกับบอทตัวอื่นๆ และยังสามารถปรับเปลี่ยนระบบภายในของ Misskey เพื่อปฏิบัติต่อบัญชีนี้เป็นบอท"
+flagAsCat: "ทำเครื่องหมายบอกว่าบัญชีนี้เป็นแมว"
+flagAsCatDescription: "การเปิดใช้งานตัวเลือกนี้เพื่อทำเครื่องหมายบอกว่าบัญชีนี้เป็นแมว"
+flagShowTimelineReplies: "แสดงตอบกลับ ในไทม์ไลน์"
+flagShowTimelineRepliesDescription: "แสดงการตอบกลับของผู้ใช้งานไปยังโน้ตของผู้ใช้งานรายอื่นๆในไทม์ไลน์หากได้เปิดเอาไว้"
+autoAcceptFollowed: "อนุมัติคำขอติดตามโดยอัตโนมัติทันที จากผู้ใช้งานที่คุณกำลังติดตาม"
+addAccount: "เพิ่มบัญชี"
+loginFailed: "การเข้าสู่ระบบไม่สำเร็จ"
+showOnRemote: "ดูบนอินสแตนซ์ระยะไกล"
+general: "ทั่วไป"
+wallpaper: "วอลล์เปเปอร์"
+setWallpaper: "ตั้งวอลเปเปอร์"
+removeWallpaper: "นำวอลเปเปอร์ออก"
+searchWith: "ค้นหา: {q}"
+youHaveNoLists: "รายการนี้ว่างเปล่า"
+followConfirm: "คุณแน่ใจแล้วหรอว่าต้องการที่จะติดตาม {name}?"
+proxyAccount: "บัญชี พร็อกซี่"
+proxyAccountDescription: "บัญชีพร็อกซี่ คือ บัญชีที่จะทำหน้าที่เป็นผู้ติดตามระยะไกลสำหรับผู้ใช้งานที่อยู่ภายใต้ด้วยเงื่อนไขบางอย่าง ยกตัวอย่าง เช่น เมื่อมีผู้ใช้งานนั้นได้เพิ่มผู้ใช้งานจากระยะไกลลงในรายการ แต่กิจกรรมของผู้ใช้ในระยะไกลนั้นจะไม่ถูกส่งไปยังอินสแตนซ์หากไม่มีผู้ใช้งานในพื้นที่ติดตามผู้ใช้รายนั้น ดังนั้นบัญชีพร็อกซีนี้จะติดตามแทน"
+host: "โฮสต์"
+selectUser: "เลือกผู้ใช้งาน"
+recipient: "ผู้รับ"
+annotation: "ความคิดเห็น"
+federation: "สหพันธ์"
+instances: "ตัวอย่าง"
+registeredAt: "จดทะเบียนที่"
+latestRequestSentAt: "ส่งคำขอล่าสุดไปแล้ว"
+latestRequestReceivedAt: "ได้รับคำขอล่าสุดไปแล้ว"
+latestStatus: "สถานะล่าสุด"
+storageUsage: "พื้นที่จัดเก็บข้อมูลที่ใช้ไป"
+charts: "โดดเด่น"
+perHour: "ทุกชั่วโมง"
+perDay: "ต่อวัน"
+stopActivityDelivery: "หยุดส่งกิจกรรม"
+blockThisInstance: "บล็อกอินสแตนซ์นี้"
+operations: "ดำเนินการ"
+software: "ซอฟต์แวร์"
+version: "เวอร์ชั่น"
+metadata: "ข้อมูลเมตา"
+withNFiles: "{n} ไฟล์(s)"
+monitor: "มอนิเตอร์"
+jobQueue: "คิวงาน"
+cpuAndMemory: "ซีพียู และ หน่วยความจำ"
+network: "เน็ตเวิร์ก"
+disk: "ดิสก์"
+instanceInfo: "ข้อมูล อินสแตนซ์"
+statistics: "สถิติการใช้งาน"
+clearQueue: "ล้างคิว"
+clearQueueConfirmTitle: "คุณแน่ใจแล้วหรอว่าต้องการที่จะล้างคิว?"
+clearQueueConfirmText: "บันทึกย่อที่ยังไม่ได้ส่งที่เหลืออยู่ในคิวนั้นมักจะ ไม่ถูกรวมเข้าด้วยกัน โดยปกติแล้วไม่จำเป็นต้องดำเนินการนี้"
+clearCachedFiles: "ล้างแคช"
+clearCachedFilesConfirm: "นายแน่ใจแล้วหรอว่าต้องการที่จะลบไฟล์ระยะไกลที่แคชไว้ทั้งหมด?"
+blockedInstances: "อินสแตนซ์ที่ ถูกบล็อก"
+blockedInstancesDescription: "ระบุชื่อโฮสต์ของอินสแตนซ์ที่คุณต้องการบล็อก อินสแตนซ์ที่อยู่ในรายการนั้นจะไม่สามารถพูดคุยกับอินสแตนซ์นี้ได้อีกต่อไป"
+muteAndBlock: "ปิดเสียงและบล็อก"
+mutedUsers: "ผู้ใช้ที่ถูกปิดเสียง"
+blockedUsers: "ผู้ใช้ที่ถูกบล็อก"
+noUsers: "ไม่พบผู้ใช้งาน"
+editProfile: "แก้ไขโปรไฟล์"
+noteDeleteConfirm: "นายแน่ใจแล้วหรอว่าต้องการลบโน้ตนี้นะ?"
+pinLimitExceeded: "คุณไม่สามารถปักหมุดโน้ตเพิ่มเติมใดๆได้อีก"
+intro: "การติดตั้ง Misskey เสร็จสิ้นแล้วนะ! โปรดสร้างผู้ใช้งานที่เป็นผู้ดูแลระบบ"
+done: "เสร็จสิ้น"
+processing: "กำลังประมวลผล..."
+preview: "แสดงตัวอย่าง"
+default: "ค่าตั้งต้น"
+noCustomEmojis: "ไม่มีอีโมจิ"
+noJobs: "ไม่มีชิ้นงาน"
+federating: "สหพันธ์"
+blocked: "ถูกบล็อก"
+suspended: "ถูกระงับ"
+all: "ทั้งหมด"
+subscribing: "สมัครแล้ว"
+publishing: "กำลังเผยแพร่"
+notResponding: "ไม่มีการตอบสนอง"
+instanceFollowing: "กำลังติดตาม บน อินสแตนซ์"
+instanceFollowers: "ผู้ติดตามของอินสแตนซ์"
+instanceUsers: "ผู้ใช้งานของอินสแตนซ์นี้"
+changePassword: "เปลี่ยนรหัสผ่าน"
+security: "ความปลอดภัย"
+retypedNotMatch: "อินพุตไม่ตรงกันนะ"
+currentPassword: "รหัสผ่านปัจจุบัน"
+newPassword: "รหัสผ่านใหม่"
+newPasswordRetype: "ใส่รหัสผ่านใหม่อีกครั้ง"
+attachFile: "แนบไฟล์"
+more: "เพิ่มเติม!"
+featured: "เป็นจุดเด่น"
+usernameOrUserId: "ชื่อผู้ใช้หรือรหัสผู้ใช้งาน"
+noSuchUser: "ไม่มีผู้ใช้นี้อยู่ในระบบ"
+lookup: "ค้นหา"
+announcements: "ประกาศ"
+imageUrl: "url รูปภาพ"
+remove: "ลบ"
+removed: "ถูกลบไปแล้ว"
+removeAreYouSure: "นายแน่ใจจริงหรอว่าต้องการที่จะลบออก \"{x}\""
+deleteAreYouSure: "นายแน่ใจจริงหรอว่าต้องการที่จะลบออก \"{x}\""
+resetAreYouSure: "รีเซ็ตเลยไหม"
+saved: "บันทึกแล้ว"
+messaging: "แชท"
+upload: "อัพโหลด"
+keepOriginalUploading: "เก็บภาพต้นฉบับ"
+keepOriginalUploadingDescription: "บันทึกรูปภาพที่อัพโหลดต้นฉบับตามที่เป็นอยู่ ถ้าหากปิดอยู่ ระบบจะสร้างเวอร์ชั่นที่จะแสดงบนเว็บเมื่ออัพโหลดนะ"
+fromDrive: "จากไดรฟ์"
+fromUrl: "จาก URL"
+uploadFromUrl: "อัพโหลดจาก URL"
+uploadFromUrlDescription: "URL ของไฟล์ที่คุณต้องการอัปโหลด"
+uploadFromUrlRequested: "อัพโหลดที่ร้องขอ"
+uploadFromUrlMayTakeTime: "มันอาจจะต้องใช้เวลาสักครู่จนกว่าการอัพโหลดจะเสร็จสมบูรณ์นะ"
+explore: "สำรวจ"
+messageRead: "อ่านแล้ว"
+noMoreHistory: "ในนั้นไม่มีประวัติอีกต่อไปแล้วนะ"
+startMessaging: "เริ่มการสนทนา"
+nUsersRead: "อ่านโดย {n}"
+agreeTo: "ฉันยอมรับที่จะ {0}"
+tos: "ข้อกำหนดและเงื่อนไข"
+start: "เริ่มต้น​ใช้งาน​"
+home: "หน้าแรก"
+remoteUserCaution: "เนื่องจากผู้ใช้งานรายนี้นั้น มาจากอินสแตนซ์ระยะไกล ข้อมูลที่แสดงดังกล่าวนั้นอาจจะไม่สมบูรณ์ก็ได้นะ"
+activity: "กิจกรรม"
+images: "รูปภาพ"
+birthday: "วันเกิด"
+yearsOld: "{อายุ} ปี"
+registeredDate: "วันที่สมัครสมาชิก"
+location: "ตำแหน่งที่ตั้ง"
+theme: "ธีม"
+themeForLightMode: "ธีมที่จะใช้ในโหมดแสง"
+themeForDarkMode: "ธีมที่จะใช้ในโหมดมืด"
+light: "สว่าง"
+dark: "มืด"
+lightThemes: "ธีมสีสว่าง"
+darkThemes: "ธีมมืด"
+syncDeviceDarkMode: "ซิงค์โหมดมืดด้วยการตั้งค่ากับอุปกรณ์"
+drive: "ไดรฟ์"
+fileName: "ชื่อไฟล์"
+selectFile: "เลือกไฟล์"
+selectFiles: "เลือกไฟล์"
+selectFolder: "เลือกโฟลเดอร์"
+selectFolders: "เลือกโฟลเดอร์"
+renameFile: "เปลี่ยนชื่อไฟล์"
+folderName: "ชื่อแฟ้ม"
+createFolder: "สร้างโฟลเดอร์"
+renameFolder: "เปลี่ยนชื่อโฟลเดอร์"
+deleteFolder: "ลบโฟลเดอร์"
+addFile: "เพิ่มไฟล์"
+emptyDrive: "ไดรฟ์ของคุณว่างเปล่านะ"
+emptyFolder: "โฟลเดอร์นี้น่าจะว่างเปล่านะ"
+unableToDelete: "ไม่สามารถลบออกได้นะ"
+inputNewFileName: "ป้อนชื่อไฟล์ใหม่นะ"
+inputNewDescription: "กรุณาใส่แคปชั่นใหม่"
+inputNewFolderName: "กรุณาใส่ชื่อโฟลเดอร์ใหม่นะ\n"
+circularReferenceFolder: "โฟลเดอร์ปลายทาง คือ โฟลเดอร์ย่อยของโฟลเดอร์ที่คุณต้องการที่จะย้ายล่ะนะ"
+hasChildFilesOrFolders: "เนื่องจากโฟลเดอร์นี้ไม่ว่างเปล่า จึงไม่สามารถลบได้นะ"
+copyUrl: "คัดลอก URL"
+rename: "เปลี่ยนชื่อ"
+avatar: "ไอคอน"
+banner: "แบนเนอร์"
+nsfw: "เนื้อหาที่ละเอียดอ่อน NSFW"
+whenServerDisconnected: "สูญเสียการเชื่อมต่อกับเซิร์ฟเวอร์"
+disconnectedFromServer: "ถูกตัดการเชื่อมต่อออกจากเซิร์ฟเวอร์"
+reload: "รีโหลด"
+doNothing: "เมิน"
+reloadConfirm: "นายต้องการรีเฟรชไทม์ไลน์หรือป่าว?"
+watch: "ดู"
+unwatch: "หยุดดู"
+accept: "ยอมรับ"
+reject: "ปฏิเสธ"
+normal: "โหมดปกติ"
+instanceName: "ชื่อ อินสแตนซ์"
+instanceDescription: "คำอธิบายอินสแตนซ์"
+maintainerName: "ผู้ดูแล"
+maintainerEmail: "อีเมล์แอดมิน"
+tosUrl: "เงื่อนไขการให้บริการ URL"
+thisYear: "ปีนี้"
+thisMonth: "เดือนนี้"
+today: "วันนี้"
+dayX: "{วัน}"
+monthX: "{เดือน}"
+yearX: "{ปี}"
+pages: "หน้า"
+integration: "รวบรวม"
+connectService: "เชื่อมต่อ"
+disconnectService: "ตัดการเชื่อมต่อ"
+enableLocalTimeline: "เปิดใช้งานไทม์ไลน์ในพื้นที่"
+enableGlobalTimeline: "เปิดใช้งานไทม์ไลน์ทั่วโลก"
+disablingTimelinesInfo: "ผู้ดูแลระบบและผู้ควบคุมจะสามารถเข้าถึงไทม์ไลน์ทั้งหมด ถึงแม้ว่าจะไม่ได้เปิดใช้งานก็ตาม"
+registration: "ลงทะเบียน"
+enableRegistration: "เปิดใช้งานการลงทะเบียนผู้ใช้ใหม่"
+invite: "เชิญชวน"
+driveCapacityPerLocalAccount: "ความจุของไดรฟ์ต่อผู้ใช้ภายในเครื่อง"
+driveCapacityPerRemoteAccount: "ความจุของไดรฟ์ต่อผู้ใช้ระยะไกล"
+inMb: "เป็นเมกะไบต์"
+iconUrl: "ไอคอน URL"
+bannerUrl: "URL รูปภาพแบนเนอร์"
+backgroundImageUrl: "URL ภาพพื้นหลัง"
+basicInfo: "ข้อมูลเบื้องต้น"
+pinnedUsers: "ผู้ใช้งานที่ได้รับการปักหมุด"
+pinnedUsersDescription: "ลิสต์ชื่อผู้ใช้โดยคั่นด้วยการขึ้นบรรทัดใหม่เพื่อปักหมุดในแท็บ \"สำรวจ\""
+pinnedPages: "หน้าที่ปักหมุด"
+pinnedPagesDescription: "ป้อนเส้นทางของหน้าที่คุณต้องการตรึงไว้ที่หน้าแรกของอินสแตนซ์นี้ โดยคั่นด้วยตัวแบ่งบรรทัด"
+pinnedClipId: "ID ของคลิปที่จะปักหมุด"
+pinnedNotes: "โน้ตที่ปักหมุดเอาไว้"
+hcaptcha: "hCaptcha"
+enableHcaptcha: "เปิดใช้ hCaptcha"
+hcaptchaSiteKey: "คีย์ไซต์"
+hcaptchaSecretKey: "คีย์ลับ"
+recaptcha: "reCAPTCHA"
+enableRecaptcha: "เปิดใช้ reCAPTCHA"
+recaptchaSiteKey: "คีย์ไซต์"
+recaptchaSecretKey: "คีย์ลับ"
+avoidMultiCaptchaConfirm: "การใช้ระบบ Captcha หลายระบบอาจทำให้เกิดการรบกวนหรืออาจจะเกิดข้อผิดพลาดได้ หากต้องการที่จะปิดการใช้งานระบบ Captcha อื่น ๆ แนะนำให้ปิดตัวอื่นๆก่อน ถ้าหากคุณต้องการให้เปิดใช้งานต่อไป ให้ กด ยกเลิก"
+antennas: "เสาอากาศ"
+manageAntennas: "จัดการเสาอากาศ"
+name: "ชื่อ"
+antennaSource: "แหล่งเสาอากาศ"
+antennaKeywords: "คีย์เวิร์ดที่ควรฟัง"
+antennaExcludeKeywords: "คีย์เวิร์ดที่จะยกเว้น"
+antennaKeywordsDescription: "คั่นด้วยช่องว่างสำหรับเงื่อนไข AND หรือด้วยการขึ้นบรรทัดใหม่สำหรับเงื่อนไข OR นะ"
+notifyAntenna: "แจ้งเตือนเกี่ยวกับโน้ตใหม่"
+withFileAntenna: "เฉพาะโน้ตที่มีไฟล์"
+enableServiceworker: "เปิดใช้งาน การแจ้งเตือนแบบพุชสำหรับเบราว์เซอร์ของคุณ"
+antennaUsersDescription: "ระบุหนึ่งชื่อผู้ใช้ต่อบรรทัด"
+caseSensitive: "กรณีที่สำคัญ"
+withReplies: "รวมตอบกลับ"
+connectedTo: "บัญชีดังต่อไปนี้มีการเชื่อมต่อกัน"
+notesAndReplies: "โพสต์และการตอบกลับ"
+withFiles: "รวบรวมไฟล์"
+silence: "ถูกปิดปาก"
+silenceConfirm: "นายแน่ใจแล้วหรอว่าต้องการที่จะ ปิดปาก ผู้ใช้งานรายนี้?"
+unsilence: "ยกเลิกการปิดปาก"
+unsilenceConfirm: "นายแน่ใจแล้วหรอว่าต้องการที่จะยกเลิกปิดปากผู้ใช้งานรายนี้?"
+popularUsers: "ผู้ใช้ที่เป็นที่นิยม"
+recentlyUpdatedUsers: "ผู้ใช้ที่เพิ่งใช้งานล่าสุด"
+recentlyRegisteredUsers: "ผู้ใช้ที่เข้าร่วมใหม่"
+recentlyDiscoveredUsers: "ผู้ใช้ที่เพิ่งค้นพบใหม่"
+exploreUsersCount: "มีผู้ใช้ {จำนวน} ราย"
+exploreFediverse: "สำรวจเฟดดิเวิร์ส"
+popularTags: "แท็กยอดนิยม"
+userList: "รายการ"
+about: "เกี่ยวกับ"
+aboutMisskey: "เกี่ยวกับ Misskey"
+administrator: "ผู้ดูแลระบบ"
+token: "โทเค็น"
+twoStepAuthentication: "ยืนยันตัวตน 2 ชั้น"
+moderator: "ผู้ควบคุม"
+nUsersMentioned: "กล่าวถึงโดยผู้ใช้ {n} รายนี้"
+securityKey: "กุญแจความปลอดภัย"
+securityKeyName: "ชื่อคีย์"
+registerSecurityKey: "ลงทะเบียนรหัสความปลอดภัยคีย์"
+lastUsed: "ใช้ล่าสุด"
+unregister: "เลิกติดตาม"
+passwordLessLogin: "เข้าสู่ระบบแบบไม่ใช้รหัสผ่าน"
+resetPassword: "รีเซ็ตรหัสผ่าน"
+newPasswordIs: "รหัสผ่านใหม่คือ \"{password}\""
+reduceUiAnimation: "ลดภาพเคลื่อนไหว UI"
+share: "แชร์"
+notFound: "ไม่พบหน้าที่ต้องการ"
+notFoundDescription: "ไม่พบหน้าที่สอดคล้องตรงกันกับ URL นี้นะ"
+uploadFolder: "โฟลเดอร์เริ่มต้นสำหรับอัพโหลด"
+cacheClear: "ล้างแคช"
+markAsReadAllNotifications: "ทำเครื่องหมายการแจ้งเตือนทั้งหมดว่าอ่านแล้ว"
+markAsReadAllUnreadNotes: "ทำเครื่องหมายโน้ตทั้งหมดว่าอ่านแล้ว"
+markAsReadAllTalkMessages: "ทำเครื่องหมายข้อความทั้งหมดว่าอ่านแล้ว"
+help: "ช่วยเหลือ"
+inputMessageHere: "พิมพ์ข้อความที่นี่"
+close: "ปิด"
+group: "กลุ่ม"
+groups: "กลุ่ม"
+createGroup: "สร้างกลุ่ม"
+ownedGroups: "กลุ่มที่เป็นเจ้าของ"
+joinedGroups: "เข้าร่วมกลุ่ม"
+invites: "เชิญชวน"
+groupName: "ชื่อกลุ่ม"
+members: "สมาชิก"
+transfer: "ถ่ายโอน"
+messagingWithUser: "แชทส่วนตัว"
+messagingWithGroup: "แชทกลุ่ม"
+title: "หัวข้อ"
+text: "ข้อความ"
+enable: "เปิดใช้งาน"
+next: "ถัด​ไป"
+retype: "พิมพ์รหัสอีกครั้ง"
+noteOf: "โน้ต โดย {ผู้ใช้งาน}"
+inviteToGroup: "ชวนเข้ากลุ่ม"
+quoteAttached: "อ้างอิง"
+quoteQuestion: "นายต้องการที่จะอ้างอิงหรอ?"
+noMessagesYet: "ยังไม่มีข้อความนะ"
+newMessageExists: "คุณมีข้อความใหม่"
+onlyOneFileCanBeAttached: "คุณสามารถแนบไฟล์กับข้อความได้เพียงไฟล์เดียวเท่านั้นนะ"
+signinRequired: "กรุณาลงทะเบียนหรือลงชื่อเข้าใช้ก่อนดำเนินการต่อนะ"
+invitations: "เชิญชวน"
+invitationCode: "รหัสคำเชิญ"
+checking: "Checking"
+available: "พร้อมใช้งาน"
+unavailable: "ไม่พร้อมใช้"
+usernameInvalidFormat: "คุณสามารถใช้อักษรตัวพิมพ์ใหญ่และตัวพิมพ์เล็ก ตัวเลข และขีดล่างได้นะ ( a-z , A-Z , 0-9 , รวมไปถึงอักษรพิเศษเช่น + * / , . - อื่นๆเป็นต้น )"
+tooShort: "สั้นเกินไปนะ"
+tooLong: "ยาวเกินไปนะ"
+weakPassword: "รหัสผ่าน แย่มาก"
+normalPassword: "รหัสผ่านปกติ"
+strongPassword: "รหัสผ่านรัดกุมมาก"
+passwordMatched: "ถูกต้อง!"
+passwordNotMatched: "ไม่ถูกต้อง"
+signinWith: "ลงชื่อเข้าใช้ด้วย {x}"
+signinFailed: "ไม่สามารถลงชื่อผู้เข้าใช้ได้ เนื่องจาก ชื่อผู้ใช้หรือรหัสผ่านที่คุณป้อนนั้นไม่ถูกต้องนะ"
+tapSecurityKey: "แตะคีย์ความปลอดภัย"
+or: "หรือ"
+language: "ภาษา"
+uiLanguage: "ภาษาอินเทอร์เฟซผู้ใช้งาน"
+groupInvited: "คุณได้รับเชิญให้เข้าร่วมกลุ่ม"
+aboutX: "เกี่ยวกับ {x}"
+useOsNativeEmojis: "ใช้อีโมจิ OS แบบดั้งเดิม"
+disableDrawer: "อย่าใช้ลิ้นชักสไตล์เมนู"
+youHaveNoGroups: "คุณยังไม่มีกลุ่ม"
+joinOrCreateGroup: "รับเชิญเข้าร่วมกลุ่มหรือสร้างกลุ่มของคุณเองเลยนะ"
+noHistory: "ไม่มีรายการ"
+signinHistory: "ประวัติการเข้าสู่ระบบ"
+disableAnimatedMfm: "ปิดการใช้งาน MFM ด้วยแอนิเมชั่น"
+doing: "กำลังประมวลผล......"
+category: "หมวดหมู่"
+tags: "แท็ก"
+docSource: "ที่มาของเอกสารนี้"
+createAccount: "สร้างบัญชี"
+existingAccount: "บัญชีที่มีอยู่"
+regenerate: "สร้างอีกครั้ง"
+fontSize: "ขนาดตัวอักษร"
+noFollowRequests: "คุณไม่มีคำขอติดตามที่รอดำเนินการ"
+openImageInNewTab: "เปิดรูปภาพในแท็บใหม่"
+dashboard: "หน้ากระดานหลัก"
+local: "ในพื้นที่"
+remote: "ระยะไกล"
+total: "รวมทั้งหมด"
+weekOverWeekChanges: "เปลี่ยนแปลงไปเมื่อสัปดาห์ที่แล้ว"
+dayOverDayChanges: "เปลี่ยนแปลงไปเมื่อวานนี้"
+appearance: "ภาพลักษณ์"
+clientSettings: "การตั้งค่าไคลเอนต์"
+accountSettings: "ตั้งค่าบัญชี"
+promotion: "โฆษณา"
+promote: "โปรโมท"
+numberOfDays: "จำนวนวัน"
+hideThisNote: "ซ่อนโน้ตนี้"
+showFeaturedNotesInTimeline: "แสดงโน้ตเด่นในไทม์ไลน์"
+objectStorage: "อ็อบเจ็กต์ ที่จัดเก็บ"
+useObjectStorage: "ใช้ อ็อบเจ็กต์ ที่จัดเก็บ"
+objectStorageBaseUrl: "URL ฐาน"
+objectStorageBaseUrlDesc: "URL ที่ใช้เป็นข้อมูลอ้างอิง ระบุ URL ของ CDN หรือ Proxy ถ้าหากคุณใช้อย่างใดอย่างหนึ่ง\n สำหรับการใช้งาน S3 'https://<bucket>.s3.amazonaws.com' และสำหรับ GCS หรือบริการที่เทียบเท่าใช้ 'https://storage.googleapis.com/<bucket>', เป็นต้น"
+objectStorageBucket: "Bucket"
+objectStorageBucketDesc: "โปรดระบุชื่อที่เก็บข้อมูลที่ใช้กับผู้ให้บริการของคุณ"
+objectStoragePrefix: "คำนำหน้า"
+masterVolume: "มาสเตอร์วอลุ่ม"
+details: "รายละเอียด"
+chooseEmoji: "เลือกโมจิของเธอ"
+unableToProcess: "ไม่สามารถดำเนินการให้เสร็จสิ้นได้"
+recentUsed: "ใช้ล่าสุด"
+install: "ติดตั้ง"
+uninstall: "ถอนการติดตั้ง"
+installedApps: "แอปที่ติดตั้งแล้ว"
+nothing: "ไม่พบผลลัพธ์"
+installedDate: "วันที่ติดตั้ง"
+lastUsedDate: "ใช้งานครั้งล่าสุด"
+state: "สถานะ"
+sort: "เรียงลำดับ"
+ascendingOrder: "เรียงจากน้อยไปมาก"
+descendingOrder: "เรียงจากมากไปน้อย"
+scratchpad: "กระดานทดลอง"
+scratchpadDescription: "Scratchpad เป็นการจัดเตรียมสภาพแวดล้อมสำหรับการทดลอง AiScript แต่คุณสามารถเขียน ดำเนินการ และตรวจสอบผลลัพธ์ของการโต้ตอบกับ Misskey มันได้ด้วยนะ"
+output: "เอาท์พุต"
+script: "สคริปต์"
+disablePagesScript: "ปิดการใช้งาน AiScript บนเพจ"
+updateRemoteUser: "อัปเดตข้อมูลผู้ใช้งานระยะไกล"
+deleteAllFiles: "ลบไฟล์ทั้งหมด"
+deleteAllFilesConfirm: "นายแน่ใจแล้วหรอว่าต้องการที่จะลบไฟล์ทั้งหมด?"
+removeAllFollowing: "เลิกติดตามผู้ใช้ที่ติดตามทั้งหมด"
+removeAllFollowingDescription: "การที่คุณดำเนินการนี้จะเลิกติดตามบัญชีทั้งหมดจาก {host} โปรดเรียกใช้คำสั่งสิ่งนี้หากต้องการยกเลิกอินสแตนซ์ เช่น ไม่มีอยู่แล้ว"
+userSuspended: "ผู้ใช้รายนี้ถูกระงับการใช้งาน"
+userSilenced: "ผู้ใช้รายนี้กำลังถูกปิดกั้น"
+yourAccountSuspendedDescription: "บัญชีนี้ถูกระงับ เนื่องจากละเมิดข้อกำหนดในการให้บริการของเซิร์ฟเวอร์หรืออาจจะละเมิดหลักเกณฑ์ชุมชน หรือ อาจจะโดนร้องเรียนเรื่องการละเมิดลิขสิทธิ์และอื่นๆอย่างต่อเนื่องซ้ำๆ หากคุณคิดว่าไม่ได้ทำผิดจริงๆหรือตัดสินผิดพลาด ได้โปรดกรุณาติดต่อผู้ดูแลระบบหากคุณต้องการทราบเหตุผลโดยละเอียดเพิ่มเติม และขอความกรุณาอย่าสร้างบัญชีใหม่"
+menu: "เมนู"
+divider: "ตัวแบ่ง"
+addItem: "เพิ่มรายการ"
+relays: "รีเลย์"
+addRelay: "เพิ่มรีเลย์"
+inboxUrl: "อินบ็อกซ์ URL"
+addedRelays: "เพิ่มรีเลย์แล้ว"
+serviceworkerInfo: "ต้องเปิดใช้งานสำหรับการแจ้งเตือนแบบพุช"
+deletedNote: "โน้ตที่ถูกลบ"
+invisibleNote: "โน้ตที่มองไม่เห็น"
+enableInfiniteScroll: "โหลดเพิ่มเติมโดยอัตโนมัติ"
+visibility: "การมองเห็น"
+poll: "โพล"
+useCw: "ซ่อนเนื้อหา"
+enablePlayer: "เปิดเครื่องเล่นวิดีโอ"
+disablePlayer: "ปิดเครื่องเล่นวิดีโอ"
+expandTweet: "ขยายทวีต"
+themeEditor: "ตัวแก้ไขธีม"
+description: "รายละเอียด"
+describeFile: "เพิ่มแคปชั่น"
+enterFileDescription: "ใส่แคปชั่น"
+smtpHost: "โฮสต์"
+smtpUser: "ชื่อผู้ใช้"
+smtpPass: "รหัสผ่าน"
+emptyToDisableSmtpAuth: "ปล่อยชื่อผู้ใช้และรหัสผ่านว่างไว้เพื่อปิดใช้งานการยืนยัน SMTP"
+smtpSecure: "ใช้โดยนัย SSL/TLS สำหรับการเชื่อมต่อ SMTP"
+smtpSecureInfo: "ปิดสิ่งนี้เมื่อใช้ STARTTLS"
+testEmail: "ทดสอบการส่งอีเมล"
+wordMute: "ปิดเสียงคำ"
+regexpError: "ข้อผิดพลาดของนิพจน์ทั่วไป"
+regexpErrorDescription: "เกิดข้อผิดพลาดในนิพจน์ทั่วไปในบรรทัดที่ {line} ของการปิดเสียงคำ {tab} ของคุณ:"
+instanceMute: "ปิดเสียง อินสแตนซ์"
+userSaysSomething: "{ชื่อ} พูดอะไรบางอย่าง"
+makeActive: "เปิดใช้งาน"
+display: "แสดงผล"
+copy: "คัดลอก"
+metrics: "เมตริก"
+overview: "ภาพรวม"
+logs: "บันทึกข้อมูลระบบ"
+delayed: "ดีเลย์"
+database: "ฐานข้อมูล"
+channel: "แชนแนล"
+create: "สร้าง"
+notificationSetting: "ตั้งค่าการแจ้งเตือน"
+notificationSettingDesc: "เลือกประเภทการแจ้งเตือนที่ต้องการจะแสดง"
+useGlobalSetting: "ใช้การตั้งค่าส่วนกลาง"
+useGlobalSettingDesc: "หากเปิดไว้ ระบบจะใช้การตั้งค่าการแจ้งเตือนของบัญชีของคุณ หากปิดอยู่ สามารถทำการกำหนดค่าแต่ละรายการได้นะ"
+other: "อื่น ๆ"
+regenerateLoginToken: "สร้างโทเค็นการเข้าสู่ระบบอีกครั้ง"
+regenerateLoginTokenDescription: "สร้างโทเค็นใหม่ที่ใช้ภายในระหว่างการเข้าสู่ระบบ โดยตามหลักปกติแล้วการดำเนินการนี้ไม่จำเป็น หากสร้างใหม่ อุปกรณ์ทั้งหมดจะถูกออกจากระบบนะ"
+setMultipleBySeparatingWithSpace: "คั่นหลายรายการด้วยช่องว่าง"
+fileIdOrUrl: "ไฟล์ ID หรือ URL"
+behavior: "พฤติกรรม"
+sample: "ตัวอย่าง"
+abuseReports: "รายงาน"
+reportAbuse: "รายงาน"
+reportAbuseOf: "รายงาน {ชื่อ}"
+fillAbuseReportDescription: "กรุณากรอกรายละเอียดเกี่ยวกับรายงานนี้ หากเป็นเรื่องเกี่ยวกับโน้ตโดยเฉพาะ ได้โปรดระบุ URL"
+abuseReported: "เราได้ส่งรายงานของคุณไปแล้ว ขอบคุณมากๆนะ"
+reporter: "นักข่าว"
+reporteeOrigin: "รายงานต้นทาง"
+reporterOrigin: "นักข่าวต้นทาง"
+forwardReport: "ส่งต่อรายงานไปยังอินสแตนซ์ระยะไกล"
+forwardReportIsAnonymous: "แทนที่จะเป็นบัญชีของคุณ บัญชีระบบที่ไม่ระบุตัวตนจะแสดงเป็นนักข่าวที่อินสแตนซ์ระยะไกล"
+send: "ส่ง"
+abuseMarkAsResolved: "ทำเครื่องหมายรายงานว่าแก้ไขแล้ว"
+openInNewTab: "เปิดในแท็บใหม่"
+openInSideView: "เปิดในมุมมองด้านข้าง"
+defaultNavigationBehaviour: "พฤติกรรมการนำทางที่เป็นค่าเริ่มต้น"
+editTheseSettingsMayBreakAccount: "การแก้ไขการตั้งค่าเหล่านี้อาจทำให้บัญชีของคุณเสียหายนะ"
+instanceTicker: "ข้อมูลอินสแตนซ์ของบันทึกย่อ"
+waitingFor: "กำลังรอคอย {x}"
+random: "สุ่มค่า"
+system: "ระบบ"
+switchUi: "สลับ UI"
+desktop: "เดสก์ท็อป"
+clearCache: "ล้างแคช"
+info: "เกี่ยวกับ"
+user: "ผู้ใช้งาน"
+sent: "ส่ง"
+searchByGoogle: "ค้นหา"
+file: "ไฟล์"
+_email:
+  _follow:
+    title: "ได้ติดตามคุณ"
+_mfm:
+  mention: "กล่าวถึง"
+  quote: "อ้างคำพูด"
+  emoji: "กำหนดอีโมจิเอง"
+  search: "ค้นหา"
+_theme:
+  description: "รายละเอียด"
+  keys:
+    mention: "กล่าวถึง"
+    renote: "รีโน้ต"
+    divider: "ตัวแบ่ง"
+_sfx:
+  note: "หมายเหตุ"
+  notification: "การเเจ้งเตือน"
+  chat: "แชท"
+_widgets:
+  notifications: "การเเจ้งเตือน"
+  timeline: "ไทม์ไลน์"
+  activity: "กิจกรรม"
+  federation: "สหพันธ์"
+  jobQueue: "คิวงาน"
+_cw:
+  show: "โหลดเพิ่มเติม"
+_visibility:
+  home: "หน้าแรก"
+  followers: "ผู้ติดตาม"
+_profile:
+  name: "ชื่อ"
+  username: "ชื่อผู้ใช้"
+_exportOrImport:
+  followingList: "กำลังติดตาม"
+  muteList: "ปิดเสียง"
+  blockingList: "บล็อค"
+  userLists: "รายการ"
+_charts:
+  federation: "สหพันธ์"
+_timelines:
+  home: "หน้าแรก"
+_pages:
+  blocks:
+    image: "รูปภาพ"
+  script:
+    categories:
+      list: "รายการ"
+    blocks:
+      _join:
+        arg1: "รายการ"
+      _randomPick:
+        arg1: "รายการ"
+      _dailyRandomPick:
+        arg1: "รายการ"
+      _seedRandomPick:
+        arg2: "รายการ"
+      _pick:
+        arg1: "รายการ"
+      _listLen:
+        arg1: "รายการ"
+    types:
+      array: "รายการ"
+_notification:
+  youWereFollowed: "ได้ติดตามคุณ"
+  _types:
+    follow: "กำลังติดตาม"
+    mention: "กล่าวถึง"
+    renote: "รีโน้ต"
+    quote: "อ้างคำพูด"
+    reaction: "รีแอคชั่น"
+  _actions:
+    reply: "ตอบกลับ"
+    renote: "รีโน้ต"
+_deck:
+  _columns:
+    notifications: "การเเจ้งเตือน"
+    tl: "ไทม์ไลน์"
+    antenna: "เสาอากาศ"
+    list: "รายการ"
+    mentions: "พูดถึง"

locales/uk-UA.yml

@@ -737,6 +737,7 @@ hashtags: "Хештеґ"
 hide: "Сховати"
 searchByGoogle: "Пошук"
 indefinitely: "Ніколи"
+file: "Файли"
 _ffVisibility:
   public: "Опублікувати"
 _ad:
@@ -1434,8 +1435,6 @@ _notification:
 _deck:
   alwaysShowMainColumn: "Завжди показувати головну колонку"
   columnAlign: "Вирівняти стовпці"
-  columnMargin: "Відступ між стовпцями"
-  columnHeaderHeight: "Висота заголовку колони"
   addColumn: "Додати стовпець"
   swapLeft: "Пересунути ліворуч"
   swapRight: "Пересунути праворуч"

locales/vi-VN.yml

@@ -203,6 +203,7 @@ done: "Xong"
 processing: "Đang xử lý"
 preview: "Xem trước"
 default: "Mặc định"
+defaultValueIs: "Mặc định: {value}"
 noCustomEmojis: "Không có emoji"
 noJobs: "Không có công việc"
 federating: "Đang liên hợp"
@@ -381,6 +382,7 @@ administrator: "Quản trị viên"
 token: "Token"
 twoStepAuthentication: "Xác minh 2 bước"
 moderator: "Kiểm duyệt viên"
+moderation: "Kiểm duyệt"
 nUsersMentioned: "Dùng bởi {n} người"
 securityKey: "Khóa bảo mật"
 securityKeyName: "Tên khoá"
@@ -643,6 +645,8 @@ clip: "Ghim"
 createNew: "Tạo mới"
 optional: "Không bắt buộc"
 createNewClip: "Tạo một ghim mới"
+unclip: "Bỏ ghim"
+confirmToUnclipAlreadyClippedNote: "Bài đăng này là một phần của \"{name}\" ghim. Bạn có muốn bỏ khỏi ghim?"
 public: "Công khai"
 i18nInfo: "Misskey đang được các tình nguyện viên dịch sang nhiều thứ tiếng khác nhau. Bạn có thể hỗ trợ tại {link}."
 manageAccessTokens: "Tạo mã truy cập"
@@ -843,6 +847,28 @@ oneWeek: "1 tuần"
 reflectMayTakeTime: "Có thể mất một thời gian để điều này được áp dụng."
 failedToFetchAccountInformation: "Không thể lấy thông tin tài khoản"
 rateLimitExceeded: "Giới hạn quá mức"
+cropImage: "Cắt hình ảnh"
+cropImageAsk: "Bạn có muốn cắt ảnh này?"
+file: "Tập tin"
+recentNHours: "{n}h trước"
+recentNDays: "{n} ngày trước"
+noEmailServerWarning: "Chưa đặt máy chủ email."
+thereIsUnresolvedAbuseReportWarning: "Có báo cáo chưa xử lí."
+recommended: "Được đề xuất"
+check: "Kiểm tra"
+driveCapOverrideLabel: "Thay đổi dung lượng drive cho người này"
+driveCapOverrideCaption: "Đặt dung lượng drive về mặc định bằng cách nhập 0 hoặc số âm."
+requireAdminForView: "Bạn phải đăng nhập như là quản trị viên mới xem được."
+isSystemAccount: "Đã tạo một tài khoản và tự động vận hành bởi hệ thống."
+typeToConfirm: "Nhấn {x} để xác nhận"
+deleteAccount: "Xóa tài khoản"
+document: "Tài liệu"
+numberOfPageCache: "Số lượng trang bộ nhớ đệm"
+numberOfPageCacheDescription: "Việc tăng con số này sẽ cải thiện sự thuận tiện cho người dùng nhưng gây ra nhiều áp lực hơn cho máy chủ cũng như sử dụng nhiều bộ nhớ hơn."
+logoutConfirm: "Bạn có chắc muốn đăng xuất?"
+lastActiveDate: "Lần cuối vào"
+statusbar: "Thanh trạng thái"
+pleaseSelect: "Chọn một lựa chọn"
 _emailUnavailable:
   used: "Địa chỉ email đã được sử dụng"
   format: "Địa chỉ email không hợp lệ"
@@ -1197,10 +1223,12 @@ _widgets:
   trends: "Xu hướng"
   clock: "Đồng hồ"
   rss: "Trình đọc RSS"
+  rssTicker: "RSS-Ticker"
   activity: "Hoạt động"
   photos: "Kho ảnh"
   digitalClock: "Đồng hồ số"
   federation: "Liên hợp"
+  instanceCloud: "Instance cloud"
   postForm: "Mẫu đăng"
   slideshow: "Trình chiếu"
   button: "Nút"
@@ -1638,8 +1666,6 @@ _notification:
 _deck:
   alwaysShowMainColumn: "Luôn hiện cột chính"
   columnAlign: "Căn cột"
-  columnMargin: "Căn lề giữa các cột"
-  columnHeaderHeight: "Chiều rộng cột ảnh bìa"
   addColumn: "Thêm cột"
   swapLeft: "Hoán đổi với cột bên trái"
   swapRight: "Hoán đổi với cột bên phải"
@@ -1648,6 +1674,9 @@ _deck:
   stackLeft: "Xếp chồng với cột bên trái"
   popRight: "Xếp chồng với cột bên trái"
   profile: "Hồ sơ"
+  introduction: "Kết hợp các cột để tạo giao diện của riêng bạn!"
+  introduction2: "Bạn có thể thêm cột bất kỳ lúc nào bằng cách nhấn + ở bên phải màn hình."
+  widgetsIntroduction: "Chọn \"Sửa widget\" trong menu cột và thêm một widget."
   _columns:
     main: "Chính"
     widgets: "Tiện ích"

locales/zh-CN.yml

@@ -842,6 +842,16 @@ oneDay: "1天"
 oneWeek: "1周"
 reflectMayTakeTime: "可能需要一些时间才能体现出效果。"
 failedToFetchAccountInformation: "获取账户信息失败"
+cropImage: "剪裁图像"
+cropImageAsk: "是否要裁剪图像？"
+file: "文件"
+recentNHours: "最近{n}小时"
+recentNDays: "最近{n}天"
+noEmailServerWarning: "电子邮件服务器未设置。"
+thereIsUnresolvedAbuseReportWarning: "有未解决的报告"
+recommended: "推荐"
+check: "检查"
+isSystemAccount: "该账号由系统自动创建和管理。"
 _emailUnavailable:
   used: "已经被使用过"
   format: "无效的格式"
@@ -1637,8 +1647,6 @@ _notification:
 _deck:
   alwaysShowMainColumn: "总是显示主列"
   columnAlign: "列对齐"
-  columnMargin: "列间距"
-  columnHeaderHeight: "列标题高度"
   addColumn: "添加列"
   swapLeft: "向左移动"
   swapRight: "向右移动"

locales/zh-TW.yml

@@ -203,6 +203,7 @@ done: "完成"
 processing: "處理中"
 preview: "預覽"
 default: "預設"
+defaultValueIs: "預設值：{value}"
 noCustomEmojis: "沒有自訂的表情符號"
 noJobs: "沒有任務"
 federating: "整合搜索中"
@@ -381,6 +382,7 @@ administrator: "管理員"
 token: "權杖"
 twoStepAuthentication: "兩階段驗證"
 moderator: "板主"
+moderation: "言論調節"
 nUsersMentioned: "提到了{n}"
 securityKey: "安全金鑰"
 securityKeyName: "金鑰名稱"
@@ -643,6 +645,8 @@ clip: "摘錄"
 createNew: "新建"
 optional: "可選"
 createNewClip: "建立新摘錄"
+unclip: "解除摘錄"
+confirmToUnclipAlreadyClippedNote: "此貼文已包含在摘錄「{name}」中。 你想將貼文從這個摘錄中排除嗎？"
 public: "公開"
 i18nInfo: "Misskey已經被志願者們翻譯成各種語言版本，如果想要幫忙的話，可以進入{link}幫助翻譯。"
 manageAccessTokens: "管理存取權杖"
@@ -842,6 +846,29 @@ oneDay: "1天"
 oneWeek: "1週"
 reflectMayTakeTime: "可能需要一些時間才會出現效果。"
 failedToFetchAccountInformation: "取得帳戶資訊失敗"
+rateLimitExceeded: "已超過速率限制"
+cropImage: "圖片裁剪"
+cropImageAsk: "要剪裁圖片嗎？"
+file: "檔案"
+recentNHours: "過去{n}小時"
+recentNDays: "過去{n}天"
+noEmailServerWarning: "尚未設定電子郵件伺服器。"
+thereIsUnresolvedAbuseReportWarning: "有尚未處理的檢舉。"
+recommended: "推薦"
+check: "檢查"
+driveCapOverrideLabel: "更改這個使用者的雲端硬碟容量上限"
+driveCapOverrideCaption: "如果指定0以下的值，就會被取消。"
+requireAdminForView: "必須以管理者帳號登入才可以檢視。"
+isSystemAccount: "由系統自動建立與管理的帳號。"
+typeToConfirm: "要執行這項操作，請輸入 {x} "
+deleteAccount: "刪除帳號"
+document: "文件"
+numberOfPageCache: "快取頁面數"
+numberOfPageCacheDescription: "增加數量會提高便利性，但也會增加負荷與記憶體使用量。"
+logoutConfirm: "確定要登出嗎？"
+lastActiveDate: "上次使用日期及時間"
+statusbar: "狀態列"
+pleaseSelect: "請選擇"
 _emailUnavailable:
   used: "已經在使用中"
   format: "格式無效"
@@ -1196,10 +1223,12 @@ _widgets:
   trends: "發燒貼文"
   clock: "時鐘"
   rss: "RSS閱讀器"
+  rssTicker: "RSS跑馬燈"
   activity: "動態"
   photos: "照片"
   digitalClock: "電子時鐘"
   federation: "聯邦宇宙"
+  instanceCloud: "實例雲"
   postForm: "發佈窗口"
   slideshow: "幻燈片"
   button: "按鈕"
@@ -1637,8 +1666,6 @@ _notification:
 _deck:
   alwaysShowMainColumn: "總是顯示主欄"
   columnAlign: "對齊欄位"
-  columnMargin: "列之間的邊距"
-  columnHeaderHeight: "欄位標題高度"
   addColumn: "新增欄位"
   swapLeft: "向左移動"
   swapRight: "向右移動"
@@ -1647,6 +1674,9 @@ _deck:
   stackLeft: "向左折疊"
   popRight: "向右彈出"
   profile: "個人檔案"
+  introduction: "組合欄位來製作屬於自己的介面吧！"
+  introduction2: "您可以隨時透過按畫面右方的 + 來添加欄位。"
+  widgetsIntroduction: "請從欄位的選單中，選擇「編輯小工具」來添加小工具"
   _columns:
     main: "主列"
     widgets: "小工具"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.111.1",
+	"version": "12.112.0-beta.20",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
@@ -41,10 +41,10 @@
 	"devDependencies": {
 		"@types/gulp": "4.0.9",
 		"@types/gulp-rename": "2.0.1",
-		"@typescript-eslint/parser": "5.27.1",
+		"@typescript-eslint/parser": "5.30.0",
 		"cross-env": "7.0.3",
-		"cypress": "10.0.3",
+		"cypress": "10.3.0",
 		"start-server-and-test": "1.14.0",
-		"typescript": "4.7.3"
+		"typescript": "4.7.4"
 	}
 }

packages/backend/.mocharc.json

@@ -5,6 +5,6 @@
 		"loader=./test/loader.js"
 	],
 	"slow": 1000,
-	"timeout": 10000,
+	"timeout": 30000,
 	"exit": true
 }

packages/backend/assets/notification-badges/LICENSE

@@ -0,0 +1,5 @@
+Font Awesome Icons
+-------------------------
+
+Ⓒ Font Awesome
+CC BY 4.0 (https://creativecommons.org/licenses/by/4.0/)

packages/backend/migration/1655813815729-driveCapacityOverrideMb.js

@@ -0,0 +1,13 @@
+export class driveCapacityOverrideMb1655813815729 {
+    name = 'driveCapacityOverrideMb1655813815729'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user" ADD "driveCapacityOverrideMb" integer`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."driveCapacityOverrideMb" IS 'Overrides user drive capacity limit'`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`COMMENT ON COLUMN "user"."driveCapacityOverrideMb" IS 'Overrides user drive capacity limit'`);
+        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "driveCapacityOverrideMb"`);
+    }
+}

packages/backend/migration/1655918165614-user-ip.js

@@ -0,0 +1,17 @@
+export class userIp1655918165614 {
+    name = 'userIp1655918165614'
+
+    async up(queryRunner) {
+        await queryRunner.query(`CREATE TABLE "user_ip" ("id" SERIAL NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "ip" character varying(128) NOT NULL, CONSTRAINT "PK_2c44ddfbf7c0464d028dcef325e" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE INDEX "IDX_7f7f1c66f48e9a8e18a33bc515" ON "user_ip" ("userId") `);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_361b500e06721013c124b7b6c5" ON "user_ip" ("userId", "ip") `);
+        await queryRunner.query(`ALTER TABLE "user_ip" ADD CONSTRAINT "FK_7f7f1c66f48e9a8e18a33bc5150" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user_ip" DROP CONSTRAINT "FK_7f7f1c66f48e9a8e18a33bc5150"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_361b500e06721013c124b7b6c5"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_7f7f1c66f48e9a8e18a33bc515"`);
+        await queryRunner.query(`DROP TABLE "user_ip"`);
+    }
+}

packages/backend/migration/1656122560740-file-ip.js

@@ -0,0 +1,13 @@
+export class fileIp1656122560740 {
+    name = 'fileIp1656122560740'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "drive_file" ADD "requestHeaders" jsonb DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "drive_file" ADD "requestIp" character varying(128)`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "drive_file" DROP COLUMN "requestIp"`);
+        await queryRunner.query(`ALTER TABLE "drive_file" DROP COLUMN "requestHeaders"`);
+    }
+}

packages/backend/migration/1656328812281-ip-2.js

@@ -0,0 +1,13 @@
+export class ip21656328812281 {
+    name = 'ip21656328812281'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user_ip" DROP CONSTRAINT "FK_7f7f1c66f48e9a8e18a33bc5150"`);
+        await queryRunner.query(`ALTER TABLE "meta" ADD "enableIpLogging" boolean NOT NULL DEFAULT false`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableIpLogging"`);
+        await queryRunner.query(`ALTER TABLE "user_ip" ADD CONSTRAINT "FK_7f7f1c66f48e9a8e18a33bc5150" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+    }
+}

packages/backend/migration/1656772790599-user-moderation-note.js

@@ -0,0 +1,11 @@
+export class userModerationNote1656772790599 {
+    name = 'userModerationNote1656772790599'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "moderationNote" character varying(8192) NOT NULL DEFAULT ''`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "moderationNote"`);
+    }
+}

packages/backend/package.json

@@ -14,7 +14,7 @@
 		"lodash": "^4.17.21"
 	},
 	"dependencies": {
-		"@bull-board/koa": "3.11.1",
+		"@bull-board/koa": "4.0.0",
 		"@discordapp/twemoji": "14.0.2",
 		"@elastic/elasticsearch": "7.11.0",
 		"@koa/cors": "3.1.0",
@@ -28,10 +28,10 @@
 		"archiver": "5.3.1",
 		"autobind-decorator": "2.4.0",
 		"autwh": "0.1.0",
-		"aws-sdk": "2.1152.0",
+		"aws-sdk": "2.1165.0",
 		"bcryptjs": "2.4.3",
 		"blurhash": "1.1.5",
-		"bull": "4.8.3",
+		"bull": "4.8.4",
 		"cacheable-lookup": "6.0.4",
 		"cbor": "8.1.0",
 		"chalk": "5.0.1",
@@ -47,14 +47,15 @@
 		"fluent-ffmpeg": "2.1.2",
 		"got": "12.1.0",
 		"hpagent": "0.1.2",
+		"ioredis": "4.28.5",
 		"ip-cidr": "3.0.10",
 		"is-svg": "4.3.2",
 		"js-yaml": "4.1.0",
-		"jsdom": "19.0.0",
+		"jsdom": "20.0.0",
 		"json5": "2.2.1",
 		"json5-loader": "4.0.1",
 		"jsonld": "6.0.0",
-		"jsrsasign": "10.5.24",
+		"jsrsasign": "10.5.25",
 		"koa": "2.13.4",
 		"koa-bodyparser": "4.3.0",
 		"koa-favicon": "2.1.0",
@@ -72,26 +73,26 @@
 		"multer": "1.4.4",
 		"nested-property": "4.0.0",
 		"node-fetch": "3.2.6",
-		"nodemailer": "6.7.5",
+		"nodemailer": "6.7.6",
 		"os-utils": "0.0.14",
-		"parse5": "6.0.1",
+		"parse5": "7.0.0",
 		"pg": "8.7.3",
 		"private-ip": "2.3.3",
 		"probe-image-size": "7.2.3",
 		"promise-limit": "2.7.0",
 		"pug": "3.0.2",
 		"punycode": "2.1.1",
-		"pureimage": "0.3.8",
+		"pureimage": "0.3.14",
 		"qrcode": "1.5.0",
 		"random-seed": "0.3.0",
 		"ratelimiter": "3.4.1",
-		"re2": "1.17.4",
-		"redis": "3.1.2",
+		"re2": "1.17.7",
 		"redis-lock": "0.1.4",
 		"reflect-metadata": "0.1.13",
 		"rename": "1.0.4",
 		"require-all": "3.0.0",
 		"rndstr": "1.0.0",
+		"rss-parser": "3.12.0",
 		"s-age": "1.1.2",
 		"sanitize-html": "2.7.0",
 		"semver": "7.3.7",
@@ -100,17 +101,17 @@
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
 		"style-loader": "3.3.1",
-		"summaly": "2.5.1",
+		"summaly": "2.6.0",
 		"syslog-pro": "1.0.0",
-		"systeminformation": "5.11.16",
+		"systeminformation": "5.11.22",
 		"tinycolor2": "1.4.2",
 		"tmp": "0.2.1",
-		"ts-loader": "9.3.0",
+		"ts-loader": "9.3.1",
 		"ts-node": "10.8.1",
-		"tsc-alias": "1.6.9",
+		"tsc-alias": "1.6.11",
 		"tsconfig-paths": "4.0.0",
 		"twemoji-parser": "14.0.0",
-		"typeorm": "0.3.6",
+		"typeorm": "0.3.7",
 		"ulid": "2.3.0",
 		"unzipper": "0.10.11",
 		"uuid": "8.3.2",
@@ -121,7 +122,6 @@
 	},
 	"devDependencies": {
 		"@redocly/openapi-core": "1.0.0-beta.97",
-		"@types/semver": "7.3.9",
 		"@types/bcryptjs": "2.4.2",
 		"@types/bull": "3.15.8",
 		"@types/cbor": "6.0.0",
@@ -144,11 +144,10 @@
 		"@types/koa__multer": "2.0.4",
 		"@types/koa__router": "8.0.11",
 		"@types/mocha": "9.1.1",
-		"@types/node": "17.0.41",
+		"@types/node": "18.0.0",
 		"@types/node-fetch": "3.0.3",
 		"@types/nodemailer": "6.4.4",
 		"@types/oauth": "0.9.1",
-		"@types/parse5": "6.0.3",
 		"@types/pug": "2.0.6",
 		"@types/punycode": "2.1.0",
 		"@types/qrcode": "1.4.2",
@@ -157,7 +156,8 @@
 		"@types/redis": "4.0.11",
 		"@types/rename": "1.0.4",
 		"@types/sanitize-html": "2.6.2",
-		"@types/sharp": "0.30.2",
+		"@types/semver": "7.3.10",
+		"@types/sharp": "0.30.4",
 		"@types/sinonjs__fake-timers": "8.1.2",
 		"@types/speakeasy": "2.0.7",
 		"@types/tinycolor2": "1.4.3",
@@ -166,12 +166,12 @@
 		"@types/web-push": "3.3.2",
 		"@types/websocket": "1.0.5",
 		"@types/ws": "8.5.3",
-		"@typescript-eslint/eslint-plugin": "5.27.1",
-		"@typescript-eslint/parser": "5.27.1",
-		"typescript": "4.7.3",
-		"eslint": "8.17.0",
-		"eslint-plugin-import": "2.26.0",
+		"@typescript-eslint/eslint-plugin": "5.30.0",
+		"@typescript-eslint/parser": "5.30.0",
 		"cross-env": "7.0.3",
-		"execa": "6.1.0"
+		"eslint": "8.18.0",
+		"eslint-plugin-import": "2.26.0",
+		"execa": "6.1.0",
+		"typescript": "4.7.4"
 	}
 }

packages/backend/src/config/types.ts

@@ -19,6 +19,7 @@ export type Source = {
 	redis: {
 		host: string;
 		port: number;
+		family?: number;
 		pass: string;
 		db?: number;
 		prefix?: string;

packages/backend/src/db/postgre.ts

@@ -68,9 +68,10 @@ import { RegistryItem } from '@/models/entities/registry-item.js';
 import { Ad } from '@/models/entities/ad.js';
 import { PasswordResetRequest } from '@/models/entities/password-reset-request.js';
 import { UserPending } from '@/models/entities/user-pending.js';
+import { Webhook } from '@/models/entities/webhook.js';
+import { UserIp } from '@/models/entities/user-ip.js';
 
 import { entities as charts } from '@/services/chart/entities.js';
-import { Webhook } from '@/models/entities/webhook.js';
 import { envOption } from '../env.js';
 import { dbLogger } from './logger.js';
 import { redisClient } from './redis.js';
@@ -173,6 +174,7 @@ export const entities = [
 	PasswordResetRequest,
 	UserPending,
 	Webhook,
+	UserIp,
 	...charts,
 ];
 
@@ -192,12 +194,13 @@ export const db = new DataSource({
 	synchronize: process.env.NODE_ENV === 'test',
 	dropSchema: process.env.NODE_ENV === 'test',
 	cache: !config.db.disableCache ? {
-		type: 'redis',
+		type: 'ioredis',
 		options: {
 			host: config.redis.host,
 			port: config.redis.port,
+			family: config.redis.family == null ? 0 : config.redis.family,
 			password: config.redis.pass,
-			prefix: `${config.redis.prefix}:query:`,
+			keyPrefix: `${config.redis.prefix}:query:`,
 			db: config.redis.db || 0,
 		},
 	} : false,
@@ -226,7 +229,7 @@ export async function initDb(force = false) {
 
 export async function resetDb() {
 	const reset = async () => {
-		await redisClient.FLUSHDB();
+		await redisClient.flushdb();
 		const tables = await db.query(`SELECT relname AS "table"
 		FROM pg_class C LEFT JOIN pg_namespace N ON (N.oid = C.relnamespace)
 		WHERE nspname NOT IN ('pg_catalog', 'information_schema')

packages/backend/src/db/redis.ts

@@ -1,16 +1,15 @@
-import * as redis from 'redis';
+import Redis from 'ioredis';
 import config from '@/config/index.js';
 
 export function createConnection() {
-	return redis.createClient(
-		config.redis.port,
-		config.redis.host,
-		{
-			password: config.redis.pass,
-			prefix: config.redis.prefix,
-			db: config.redis.db || 0,
-		}
-	);
+	return new Redis({
+		port: config.redis.port,
+		host: config.redis.host,
+		family: config.redis.family == null ? 0 : config.redis.family,
+		password: config.redis.pass,
+		keyPrefix: `${config.redis.prefix}:`,
+		db: config.redis.db || 0,
+	});
 }
 
 export const subsdcriber = createConnection();

packages/backend/src/mfm/from-html.ts

@@ -1,8 +1,10 @@
-import * as parse5 from 'parse5';
-import treeAdapter from 'parse5/lib/tree-adapters/default.js';
 import { URL } from 'node:url';
+import * as parse5 from 'parse5';
+import * as TreeAdapter from '../../node_modules/parse5/dist/tree-adapters/default.js';
 
-const urlRegex     = /^https?:\/\/[\w\/:%#@$&?!()\[\]~.,=+\-]+/;
+const treeAdapter = TreeAdapter.defaultTreeAdapter;
+
+const urlRegex = /^https?:\/\/[\w\/:%#@$&?!()\[\]~.,=+\-]+/;
 const urlRegexFull = /^https?:\/\/[\w\/:%#@$&?!()\[\]~.,=+\-]+$/;
 
 export function fromHtml(html: string, hashtagNames?: string[]): string {
@@ -19,7 +21,7 @@ export function fromHtml(html: string, hashtagNames?: string[]): string {
 
 	return text.trim();
 
-	function getText(node: parse5.Node): string {
+	function getText(node: TreeAdapter.Node): string {
 		if (treeAdapter.isTextNode(node)) return node.value;
 		if (!treeAdapter.isElementNode(node)) return '';
 		if (node.nodeName === 'br') return '\n';
@@ -31,7 +33,7 @@ export function fromHtml(html: string, hashtagNames?: string[]): string {
 		return '';
 	}
 
-	function appendChildren(childNodes: parse5.ChildNode[]): void {
+	function appendChildren(childNodes: TreeAdapter.ChildNode[]): void {
 		if (childNodes) {
 			for (const n of childNodes) {
 				analyze(n);
@@ -39,7 +41,7 @@ export function fromHtml(html: string, hashtagNames?: string[]): string {
 		}
 	}
 
-	function analyze(node: parse5.Node) {
+	function analyze(node: TreeAdapter.Node) {
 		if (treeAdapter.isTextNode(node)) {
 			text += node.value;
 			return;
@@ -170,7 +172,7 @@ export function fromHtml(html: string, hashtagNames?: string[]): string {
 				const t = getText(node);
 				if (t) {
 					text += '\n> ';
-					text += t.split('\n').join(`\n> `);
+					text += t.split('\n').join('\n> ');
 				}
 				break;
 			}

packages/backend/src/misc/check-word-mute.ts

@@ -16,11 +16,13 @@ export async function checkWordMute(note: NoteLike, me: UserLike | null | undefi
 	if (me && (note.userId === me.id)) return false;
 
 	if (mutedWords.length > 0) {
-		if (note.text == null) return false;
+		const text = ((note.cw ?? '') + '\n' + (note.text ?? '')).trim();
+
+		if (text === '') return false;
 
 		const matched = mutedWords.some(filter => {
 			if (Array.isArray(filter)) {
-				return filter.every(keyword => note.text!.includes(keyword));
+				return filter.every(keyword => text.includes(keyword));
 			} else {
 				// represents RegExp
 				const regexp = filter.match(/^\/(.+)\/(.*)$/);
@@ -29,7 +31,7 @@ export async function checkWordMute(note: NoteLike, me: UserLike | null | undefi
 				if (!regexp) return false;
 
 				try {
-					return new RE2(regexp[1], regexp[2]).test(note.text!);
+					return new RE2(regexp[1], regexp[2]).test(text);
 				} catch (err) {
 					// This should never happen due to input sanitisation.
 					return false;

packages/backend/src/misc/create-temp.ts

@@ -11,9 +11,14 @@ export function createTemp(): Promise<[string, () => void]> {
 
 export function createTempDir(): Promise<[string, () => void]> {
 	return new Promise<[string, () => void]>((res, rej) => {
-		tmp.dir((e, path, cleanup) => {
-			if (e) return rej(e);
-			res([path, cleanup]);
-		});
+		tmp.dir(
+			{
+				unsafeCleanup: true,
+			},
+			(e, path, cleanup) => {
+				if (e) return rej(e);
+				res([path, cleanup]);
+			}
+		);
 	});
 }

packages/backend/src/misc/is-blocker-user-related.ts

@@ -1,15 +0,0 @@
-export function isBlockerUserRelated(note: any, blockerUserIds: Set<string>): boolean {
-	if (blockerUserIds.has(note.userId)) {
-		return true;
-	}
-
-	if (note.reply != null && blockerUserIds.has(note.reply.userId)) {
-		return true;
-	}
-
-	if (note.renote != null && blockerUserIds.has(note.renote.userId)) {
-		return true;
-	}
-
-	return false;
-}

packages/backend/src/misc/is-mime-image.ts

@@ -0,0 +1,8 @@
+import { FILE_TYPE_BROWSERSAFE } from '@/const.js';
+
+const dictionary = {
+	'safe-file': FILE_TYPE_BROWSERSAFE,
+	'sharp-convertible-image': ['image/jpeg', 'image/png', 'image/gif', 'image/apng', 'image/vnd.mozilla.apng', 'image/webp', 'image/svg+xml'],
+};
+
+export const isMimeImage = (mime: string, type: keyof typeof dictionary): boolean => dictionary[type].includes(mime);

packages/backend/src/misc/is-muted-user-related.ts

@@ -1,15 +0,0 @@
-export function isMutedUserRelated(note: any, mutedUserIds: Set<string>): boolean {
-	if (mutedUserIds.has(note.userId)) {
-		return true;
-	}
-
-	if (note.reply != null && mutedUserIds.has(note.reply.userId)) {
-		return true;
-	}
-
-	if (note.renote != null && mutedUserIds.has(note.renote.userId)) {
-		return true;
-	}
-
-	return false;
-}

packages/backend/src/misc/is-user-related.ts

@@ -0,0 +1,15 @@
+export function isUserRelated(note: any, userIds: Set<string>): boolean {
+	if (userIds.has(note.userId)) {
+		return true;
+	}
+
+	if (note.reply != null && userIds.has(note.reply.userId)) {
+		return true;
+	}
+
+	if (note.renote != null && userIds.has(note.renote.userId)) {
+		return true;
+	}
+
+	return false;
+}

packages/backend/src/models/entities/drive-file.ts

@@ -1,7 +1,7 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
+import { id } from '../id.js';
 import { User } from './user.js';
 import { DriveFolder } from './drive-folder.js';
-import { id } from '../id.js';
 
 @Entity()
 @Index(['userId', 'folderId', 'id'])
@@ -165,4 +165,15 @@ export class DriveFile {
 		comment: 'Whether the DriveFile is direct link to remote server.',
 	})
 	public isLink: boolean;
+
+	@Column('jsonb', {
+		default: {},
+		nullable: true,
+	})
+	public requestHeaders: Record<string, string> | null;
+
+	@Column('varchar', {
+		length: 128, nullable: true,
+	})
+	public requestIp: string | null;
 }

packages/backend/src/models/entities/meta.ts

@@ -1,6 +1,6 @@
 import { Entity, Column, PrimaryColumn, ManyToOne, JoinColumn } from 'typeorm';
-import { User } from './user.js';
 import { id } from '../id.js';
+import { User } from './user.js';
 import { Clip } from './clip.js';
 
 @Entity()
@@ -427,4 +427,9 @@ export class Meta {
 		default: true,
 	})
 	public objectStorageS3ForcePathStyle: boolean;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public enableIpLogging: boolean;
 }

packages/backend/src/models/entities/user-ip.ts

@@ -0,0 +1,24 @@
+import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
+import { id } from '../id.js';
+import { Note } from './note.js';
+import { User } from './user.js';
+
+@Entity()
+@Index(['userId', 'ip'], { unique: true })
+export class UserIp {
+	@PrimaryGeneratedColumn()
+	public id: string;
+
+	@Column('timestamp with time zone', {
+	})
+	public createdAt: Date;
+
+	@Index()
+	@Column(id())
+	public userId: User['id'];
+
+	@Column('varchar', {
+		length: 128,
+	})
+	public ip: string;
+}

packages/backend/src/models/entities/user-profile.ts

@@ -1,8 +1,8 @@
 import { Entity, Column, Index, OneToOne, JoinColumn, PrimaryColumn } from 'typeorm';
+import { ffVisibility, notificationTypes } from '@/types.js';
 import { id } from '../id.js';
 import { User } from './user.js';
 import { Page } from './page.js';
-import { ffVisibility, notificationTypes } from '@/types.js';
 
 // TODO: このテーブルで管理している情報すべてレジストリで管理するようにしても良いかも
 //       ただ、「emailVerified が true なユーザーを find する」のようなクエリは書けなくなるからウーン
@@ -117,6 +117,11 @@ export class UserProfile {
 	})
 	public password: string | null;
 
+	@Column('varchar', {
+		length: 8192, default: '',
+	})
+	public moderationNote: string | null;
+
 	// TODO: そのうち消す
 	@Column('jsonb', {
 		default: {},

packages/backend/src/models/entities/user.ts

@@ -218,6 +218,12 @@ export class User {
 	})
 	public token: string | null;
 
+	@Column('integer', {
+		nullable: true,
+		comment: 'Overrides user drive capacity limit',
+	})
+	public driveCapacityOverrideMb: number | null;
+
 	constructor(data: Partial<User>) {
 		if (data == null) return;
 

packages/backend/src/models/index.ts

@@ -65,6 +65,7 @@ import { PasswordResetRequest } from './entities/password-reset-request.js';
 import { UserPending } from './entities/user-pending.js';
 import { InstanceRepository } from './repositories/instance.js';
 import { Webhook } from './entities/webhook.js';
+import { UserIp } from './entities/user-ip.js';
 
 export const Announcements = db.getRepository(Announcement);
 export const AnnouncementReads = db.getRepository(AnnouncementRead);
@@ -90,6 +91,7 @@ export const UserGroups = (UserGroupRepository);
 export const UserGroupJoinings = db.getRepository(UserGroupJoining);
 export const UserGroupInvitations = (UserGroupInvitationRepository);
 export const UserNotePinings = db.getRepository(UserNotePining);
+export const UserIps = db.getRepository(UserIp);
 export const UsedUsernames = db.getRepository(UsedUsername);
 export const Followings = (FollowingRepository);
 export const FollowRequests = (FollowRequestRepository);

packages/backend/src/models/repositories/instance.ts

@@ -1,11 +1,13 @@
 import { db } from '@/db/postgre.js';
 import { Instance } from '@/models/entities/instance.js';
 import { Packed } from '@/misc/schema.js';
+import { fetchMeta } from '@/misc/fetch-meta.js';
 
 export const InstanceRepository = db.getRepository(Instance).extend({
 	async pack(
 		instance: Instance,
 	): Promise<Packed<'FederationInstance'>> {
+		const meta = await fetchMeta();
 		return {
 			id: instance.id,
 			caughtAt: instance.caughtAt.toISOString(),
@@ -18,6 +20,7 @@ export const InstanceRepository = db.getRepository(Instance).extend({
 			lastCommunicatedAt: instance.lastCommunicatedAt.toISOString(),
 			isNotResponding: instance.isNotResponding,
 			isSuspended: instance.isSuspended,
+			isBlocked: meta.blockedHosts.includes(instance.host),
 			softwareName: instance.softwareName,
 			softwareVersion: instance.softwareVersion,
 			openRegistrations: instance.openRegistrations,
@@ -26,6 +29,8 @@ export const InstanceRepository = db.getRepository(Instance).extend({
 			maintainerName: instance.maintainerName,
 			maintainerEmail: instance.maintainerEmail,
 			iconUrl: instance.iconUrl,
+			faviconUrl: instance.faviconUrl,
+			themeColor: instance.themeColor,
 			infoUpdatedAt: instance.infoUpdatedAt ? instance.infoUpdatedAt.toISOString() : null,
 		};
 	},

packages/backend/src/models/repositories/user.ts

@@ -315,6 +315,7 @@ export const UserRepository = db.getRepository(User).extend({
 			} : undefined) : undefined,
 			emojis: populateEmojis(user.emojis, user.host),
 			onlineStatus: this.getOnlineStatus(user),
+			driveCapacityOverrideMb: user.driveCapacityOverrideMb,
 
 			...(opts.detail ? {
 				url: profile!.url,

packages/backend/src/models/schema/federation-instance.ts

@@ -52,6 +52,10 @@ export const packedFederationInstanceSchema = {
 			type: 'boolean',
 			optional: false, nullable: false,
 		},
+		isBlocked: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
 		softwareName: {
 			type: 'string',
 			optional: false, nullable: true,
@@ -88,6 +92,15 @@ export const packedFederationInstanceSchema = {
 			optional: false, nullable: true,
 			format: 'url',
 		},
+		faviconUrl: {
+			type: 'string',
+			optional: false, nullable: true,
+			format: 'url',
+		},
+		themeColor: {
+			type: 'string',
+			optional: false, nullable: true,
+		},
 		infoUpdatedAt: {
 			type: 'string',
 			optional: false, nullable: true,

packages/backend/src/queue/index.ts

@@ -2,6 +2,9 @@ import httpSignature from '@peertube/http-signature';
 import { v4 as uuid } from 'uuid';
 
 import config from '@/config/index.js';
+import { DriveFile } from '@/models/entities/drive-file.js';
+import { IActivity } from '@/remote/activitypub/type.js';
+import { Webhook, webhookEventTypes } from '@/models/entities/webhook.js';
 import { envOption } from '../env.js';
 
 import processDeliver from './processors/deliver.js';
@@ -12,18 +15,15 @@ import processSystemQueue from './processors/system/index.js';
 import processWebhookDeliver from './processors/webhook-deliver.js';
 import { endedPollNotification } from './processors/ended-poll-notification.js';
 import { queueLogger } from './logger.js';
-import { DriveFile } from '@/models/entities/drive-file.js';
 import { getJobInfo } from './get-job-info.js';
 import { systemQueue, dbQueue, deliverQueue, inboxQueue, objectStorageQueue, endedPollNotificationQueue, webhookDeliverQueue } from './queues.js';
 import { ThinUser } from './types.js';
-import { IActivity } from '@/remote/activitypub/type.js';
-import { Webhook, webhookEventTypes } from '@/models/entities/webhook.js';
 
 function renderError(e: Error): any {
 	return {
-		stack: e?.stack,
-		message: e?.message,
-		name: e?.name,
+		stack: e.stack,
+		message: e.message,
+		name: e.name,
 	};
 }
 
@@ -314,6 +314,12 @@ export default function() {
 		removeOnComplete: true,
 	});
 
+	systemQueue.add('clean', {
+	}, {
+		repeat: { cron: '0 0 * * *' },
+		removeOnComplete: true,
+	});
+
 	systemQueue.add('checkExpiredMutings', {
 	}, {
 		repeat: { cron: '*/5 * * * *' },

packages/backend/src/queue/initialize.ts

@@ -6,6 +6,7 @@ export function initialize<T>(name: string, limitPerSec = -1) {
 		redis: {
 			port: config.redis.port,
 			host: config.redis.host,
+			family: config.redis.family == null ? 0 : config.redis.family,
 			password: config.redis.pass,
 			db: config.redis.db || 0,
 		},

packages/backend/src/queue/processors/system/clean.ts

@@ -0,0 +1,18 @@
+import Bull from 'bull';
+import { LessThan } from 'typeorm';
+import { UserIps } from '@/models/index.js';
+
+import { queueLogger } from '../../logger.js';
+
+const logger = queueLogger.createSubLogger('clean');
+
+export async function clean(job: Bull.Job<Record<string, unknown>>, done: any): Promise<void> {
+	logger.info('Cleaning...');
+
+	UserIps.delete({
+		createdAt: LessThan(new Date(Date.now() - (1000 * 60 * 60 * 24 * 90))),
+	});
+
+	logger.succ('Cleaned.');
+	done();
+}

packages/backend/src/queue/processors/system/index.ts

@@ -3,12 +3,14 @@ import { tickCharts } from './tick-charts.js';
 import { resyncCharts } from './resync-charts.js';
 import { cleanCharts } from './clean-charts.js';
 import { checkExpiredMutings } from './check-expired-mutings.js';
+import { clean } from './clean.js';
 
 const jobs = {
 	tickCharts,
 	resyncCharts,
 	cleanCharts,
 	checkExpiredMutings,
+	clean,
 } as Record<string, Bull.ProcessCallbackFunction<Record<string, unknown>> | Bull.ProcessPromiseFunction<Record<string, unknown>>>;
 
 export default function(dbQueue: Bull.Queue<Record<string, unknown>>) {

packages/backend/src/remote/activitypub/models/note.ts

@@ -200,7 +200,7 @@ export async function createNote(value: string | IObject, resolver?: Resolver, s
 	let text: string | null = null;
 	if (note.source?.mediaType === 'text/x.misskeymarkdown' && typeof note.source?.content === 'string') {
 		text = note.source.content;
-	} else if (typeof note._misskey_content === 'string') {
+	} else if (typeof note._misskey_content !== 'undefined') {
 		text = note._misskey_content;
 	} else if (typeof note.content === 'string') {
 		text = htmlToMfm(note.content, note.tag);

packages/backend/src/remote/activitypub/renderer/note.ts

@@ -82,15 +82,14 @@ export default async function renderNote(note: Note, dive = true, isTalk = false
 
 	const files = await getPromisedFiles(note.fileIds);
 
-	// text should never be undefined
-	const text = note.text ?? null;
+	const text = note.text ?? '';
 	let poll: Poll | null = null;
 
 	if (note.hasPoll) {
 		poll = await Polls.findOneBy({ noteId: note.id });
 	}
 
-	let apText = text ?? '';
+	let apText = text;
 
 	if (quote) {
 		apText += `\n\nRE: ${quote}`;

packages/backend/src/remote/activitypub/type.ts

@@ -201,7 +201,7 @@ export interface IApMention extends IObject {
 	href: string;
 }
 
-export const isMention = (object: IObject): object is IApMention=>
+export const isMention = (object: IObject): object is IApMention =>
 	getApType(object) === 'Mention' &&
 	typeof object.href === 'string';
 

packages/backend/src/server/api/api-handler.ts

@@ -1,12 +1,25 @@
 import Koa from 'koa';
 
+import { User } from '@/models/entities/user.js';
+import { UserIps } from '@/models/index.js';
+import { fetchMeta } from '@/misc/fetch-meta.js';
 import { IEndpoint } from './endpoints.js';
 import authenticate, { AuthenticationError } from './authenticate.js';
 import call from './call.js';
 import { ApiError } from './error.js';
 
+const userIpHistories = new Map<User['id'], Set<string>>();
+
+setInterval(() => {
+	userIpHistories.clear();
+}, 1000 * 60 * 60);
+
 export default (endpoint: IEndpoint, ctx: Koa.Context) => new Promise<void>((res) => {
-	const body = ctx.request.body;
+	const body = ctx.is('multipart/form-data')
+		? (ctx.request as any).body
+		: ctx.method === 'GET'
+			? ctx.query
+			: ctx.request.body;
 
 	const reply = (x?: any, y?: ApiError) => {
 		if (x == null) {
@@ -33,10 +46,38 @@ export default (endpoint: IEndpoint, ctx: Koa.Context) => new Promise<void>((res
 	authenticate(body['i']).then(([user, app]) => {
 		// API invoking
 		call(endpoint.name, user, app, body, ctx).then((res: any) => {
+			if (ctx.method === 'GET' && endpoint.meta.cacheSec && !body['i'] && !user) {
+				ctx.set('Cache-Control', `public, max-age=${endpoint.meta.cacheSec}`);
+			}
 			reply(res);
 		}).catch((e: ApiError) => {
 			reply(e.httpStatusCode ? e.httpStatusCode : e.kind === 'client' ? 400 : 500, e);
 		});
+
+		// Log IP
+		if (user) {
+			fetchMeta().then(meta => {
+				if (!meta.enableIpLogging) return;
+				const ip = ctx.ip;
+				const ips = userIpHistories.get(user.id);
+				if (ips == null || !ips.has(ip)) {
+					if (ips == null) {
+						userIpHistories.set(user.id, new Set([ip]));
+					} else {
+						ips.add(ip);
+					}
+
+					try {
+						UserIps.insert({
+							createdAt: new Date(),
+							userId: user.id,
+							ip: ip,
+						});
+					} catch {
+					}
+				}
+			});
+		}
 	}).catch(e => {
 		if (e instanceof AuthenticationError) {
 			reply(403, new ApiError({

packages/backend/src/server/api/call.ts

@@ -1,12 +1,12 @@
-import Koa from 'koa';
 import { performance } from 'perf_hooks';
-import { limiter } from './limiter.js';
+import Koa from 'koa';
 import { CacheableLocalUser, User } from '@/models/entities/user.js';
+import { AccessToken } from '@/models/entities/access-token.js';
+import { getIpHash } from '@/misc/get-ip-hash.js';
+import { limiter } from './limiter.js';
 import endpoints, { IEndpointMeta } from './endpoints.js';
 import { ApiError } from './error.js';
 import { apiLogger } from './logger.js';
-import { AccessToken } from '@/models/entities/access-token.js';
-import { getIpHash } from '@/misc/get-ip-hash.js';
 
 const accessDenied = {
 	message: 'Access denied.',
@@ -33,7 +33,7 @@ export default async (endpoint: string, user: CacheableLocalUser | null | undefi
 		throw new ApiError(accessDenied);
 	}
 
-	if (ep.meta.limit && !isModerator) {
+	if (ep.meta.limit) {
 		// koa will automatically load the `X-Forwarded-For` header if `proxy: true` is configured in the app.
 		let limitActor: string;
 		if (user) {
@@ -94,7 +94,7 @@ export default async (endpoint: string, user: CacheableLocalUser | null | undefi
 	}
 
 	// Cast non JSON input
-	if (ep.meta.requireFile && ep.params.properties) {
+	if ((ep.meta.requireFile || ctx?.method === 'GET') && ep.params.properties) {
 		for (const k of Object.keys(ep.params.properties)) {
 			const param = ep.params.properties![k];
 			if (['boolean', 'number', 'integer'].includes(param.type ?? '') && typeof data[k] === 'string') {
@@ -116,24 +116,24 @@ export default async (endpoint: string, user: CacheableLocalUser | null | undefi
 
 	// API invoking
 	const before = performance.now();
-	return await ep.exec(data, user, token, ctx?.file).catch((e: Error) => {
+	return await ep.exec(data, user, token, ctx?.file, ctx?.ip, ctx?.headers).catch((e: Error) => {
 		if (e instanceof ApiError) {
 			throw e;
 		} else {
-			apiLogger.error(`Internal error occurred in ${ep.name}: ${e?.message}`, {
+			apiLogger.error(`Internal error occurred in ${ep.name}: ${e.message}`, {
 				ep: ep.name,
 				ps: data,
 				e: {
-					message: e?.message,
-					code: e?.name,
-					stack: e?.stack,
+					message: e.message,
+					code: e.name,
+					stack: e.stack,
 				},
 			});
 			throw new ApiError(null, {
 				e: {
-					message: e?.message,
-					code: e?.name,
-					stack: e?.stack,
+					message: e.message,
+					code: e.name,
+					stack: e.stack,
 				},
 			});
 		}

packages/backend/src/server/api/common/generate-muted-instance-query.ts

@@ -1,40 +0,0 @@
-import { User } from '@/models/entities/user.js';
-import { id } from '@/models/id.js';
-import { UserProfiles } from '@/models/index.js';
-import { SelectQueryBuilder, Brackets } from 'typeorm';
-
-function createMutesQuery(id: string) {
-	return UserProfiles.createQueryBuilder('user_profile')
-		.select('user_profile.mutedInstances')
-		.where('user_profile.userId = :muterId', { muterId: id });
-}
-
-export function generateMutedInstanceQuery(q: SelectQueryBuilder<any>, me: { id: User['id'] }) {
-	const mutingQuery = createMutesQuery(me.id);
-
-	q
-		.andWhere(new Brackets(qb => { qb
-			.andWhere('note.userHost IS NULL')
-			.orWhere(`NOT((${ mutingQuery.getQuery() })::jsonb ? note.userHost)`);
-		}))
-		.andWhere(new Brackets(qb => { qb
-			.where(`note.replyUserHost IS NULL`)
-			.orWhere(`NOT ((${ mutingQuery.getQuery() })::jsonb ? note.replyUserHost)`);
-		}))
-		.andWhere(new Brackets(qb => { qb
-			.where(`note.renoteUserHost IS NULL`)
-			.orWhere(`NOT ((${ mutingQuery.getQuery() })::jsonb ? note.renoteUserHost)`);
-		}));
-	q.setParameters(mutingQuery.getParameters());
-}
-
-export function generateMutedInstanceNotificationQuery(q: SelectQueryBuilder<any>, me: { id: User['id'] }) {
-	const mutingQuery = createMutesQuery(me.id);
-
-	q.andWhere(new Brackets(qb => { qb 
-		.andWhere('notifier.host IS NULL')
-		.orWhere(`NOT (( ${mutingQuery.getQuery()} )::jsonb ? notifier.host)`);
-	}));
-
-	q.setParameters(mutingQuery.getParameters());
-}

packages/backend/src/server/api/common/generate-muted-user-query.ts

@@ -1,6 +1,6 @@
-import { User } from '@/models/entities/user.js';
-import { Mutings } from '@/models/index.js';
 import { SelectQueryBuilder, Brackets } from 'typeorm';
+import { User } from '@/models/entities/user.js';
+import { Mutings, UserProfiles } from '@/models/index.js';
 
 export function generateMutedUserQuery(q: SelectQueryBuilder<any>, me: { id: User['id'] }, exclude?: User) {
 	const mutingQuery = Mutings.createQueryBuilder('muting')
@@ -11,21 +11,39 @@ export function generateMutedUserQuery(q: SelectQueryBuilder<any>, me: { id: Use
 		mutingQuery.andWhere('muting.muteeId != :excludeId', { excludeId: exclude.id });
 	}
 
+	const mutingInstanceQuery = UserProfiles.createQueryBuilder('user_profile')
+		.select('user_profile.mutedInstances')
+		.where('user_profile.userId = :muterId', { muterId: me.id });
+
 	// 投稿の作者をミュートしていない かつ
 	// 投稿の返信先の作者をミュートしていない かつ
 	// 投稿の引用元の作者をミュートしていない
 	q
 		.andWhere(`note.userId NOT IN (${ mutingQuery.getQuery() })`)
 		.andWhere(new Brackets(qb => { qb
-			.where(`note.replyUserId IS NULL`)
+			.where('note.replyUserId IS NULL')
 			.orWhere(`note.replyUserId NOT IN (${ mutingQuery.getQuery() })`);
 		}))
 		.andWhere(new Brackets(qb => { qb
-			.where(`note.renoteUserId IS NULL`)
+			.where('note.renoteUserId IS NULL')
 			.orWhere(`note.renoteUserId NOT IN (${ mutingQuery.getQuery() })`);
+		}))
+		// mute instances
+		.andWhere(new Brackets(qb => { qb
+			.andWhere('note.userHost IS NULL')
+			.orWhere(`NOT ((${ mutingInstanceQuery.getQuery() })::jsonb ? note.userHost)`);
+		}))
+		.andWhere(new Brackets(qb => { qb
+			.where('note.replyUserHost IS NULL')
+			.orWhere(`NOT ((${ mutingInstanceQuery.getQuery() })::jsonb ? note.replyUserHost)`);
+		}))
+		.andWhere(new Brackets(qb => { qb
+			.where('note.renoteUserHost IS NULL')
+			.orWhere(`NOT ((${ mutingInstanceQuery.getQuery() })::jsonb ? note.renoteUserHost)`);
 		}));
 
 	q.setParameters(mutingQuery.getParameters());
+	q.setParameters(mutingInstanceQuery.getParameters());
 }
 
 export function generateMutedUserQueryForUsers(q: SelectQueryBuilder<any>, me: { id: User['id'] }) {
@@ -33,8 +51,7 @@ export function generateMutedUserQueryForUsers(q: SelectQueryBuilder<any>, me: {
 		.select('muting.muteeId')
 		.where('muting.muterId = :muterId', { muterId: me.id });
 
-	q
-		.andWhere(`user.id NOT IN (${ mutingQuery.getQuery() })`);
+	q.andWhere(`user.id NOT IN (${ mutingQuery.getQuery() })`);
 
 	q.setParameters(mutingQuery.getParameters());
 }

packages/backend/src/server/api/define.ts

@@ -1,16 +1,16 @@
 import * as fs from 'node:fs';
 import Ajv from 'ajv';
 import { CacheableLocalUser, ILocalUser } from '@/models/entities/user.js';
-import { IEndpointMeta } from './endpoints.js';
-import { ApiError } from './error.js';
 import { Schema, SchemaType } from '@/misc/schema.js';
 import { AccessToken } from '@/models/entities/access-token.js';
+import { IEndpointMeta } from './endpoints.js';
+import { ApiError } from './error.js';
 
 export type Response = Record<string, any> | void;
 
 // TODO: paramsの型をT['params']のスキーマ定義から推論する
 type executor<T extends IEndpointMeta, Ps extends Schema> =
-	(params: SchemaType<Ps>, user: T['requireCredential'] extends true ? CacheableLocalUser : CacheableLocalUser | null, token: AccessToken | null, file?: any, cleanup?: () => any) =>
+	(params: SchemaType<Ps>, user: T['requireCredential'] extends true ? CacheableLocalUser : CacheableLocalUser | null, token: AccessToken | null, file?: any, cleanup?: () => any, ip?: string | null, headers?: Record<string, string> | null) =>
 		Promise<T['res'] extends undefined ? Response : SchemaType<NonNullable<T['res']>>>;
 
 const ajv = new Ajv({
@@ -20,24 +20,27 @@ const ajv = new Ajv({
 ajv.addFormat('misskey:id', /^[a-zA-Z0-9]+$/);
 
 export default function <T extends IEndpointMeta, Ps extends Schema>(meta: T, paramDef: Ps, cb: executor<T, Ps>)
-		: (params: any, user: T['requireCredential'] extends true ? CacheableLocalUser : CacheableLocalUser | null, token: AccessToken | null, file?: any) => Promise<any> {
-
+		: (params: any, user: T['requireCredential'] extends true ? CacheableLocalUser : CacheableLocalUser | null, token: AccessToken | null, file?: any, ip?: string | null, headers?: Record<string, string> | null) => Promise<any> {
 	const validate = ajv.compile(paramDef);
 
-	return (params: any, user: T['requireCredential'] extends true ? CacheableLocalUser : CacheableLocalUser | null, token: AccessToken | null, file?: any) => {
-		function cleanup() {
-			fs.unlink(file.path, () => {});
-		}
+	return (params: any, user: T['requireCredential'] extends true ? CacheableLocalUser : CacheableLocalUser | null, token: AccessToken | null, file?: any, ip?: string | null, headers?: Record<string, string> | null) => {
+		let cleanup: undefined | (() => void) = undefined;
 
-		if (meta.requireFile && file == null) return Promise.reject(new ApiError({
-			message: 'File required.',
-			code: 'FILE_REQUIRED',
-			id: '4267801e-70d1-416a-b011-4ee502885d8b',
-		}));
+		if (meta.requireFile) {
+			cleanup = () => {
+				fs.unlink(file.path, () => {});
+			};
+
+			if (file == null) return Promise.reject(new ApiError({
+				message: 'File required.',
+				code: 'FILE_REQUIRED',
+				id: '4267801e-70d1-416a-b011-4ee502885d8b',
+			}));
+		}
 
 		const valid = validate(params);
 		if (!valid) {
-			if (file) cleanup();
+			if (file) cleanup!();
 
 			const errors = validate.errors!;
 			const err = new ApiError({
@@ -51,6 +54,6 @@ export default function <T extends IEndpointMeta, Ps extends Schema>(meta: T, pa
 			return Promise.reject(err);
 		}
 
-		return cb(params as SchemaType<Ps>, user, token, file, cleanup);
+		return cb(params as SchemaType<Ps>, user, token, file, cleanup, ip, headers);
 	};
 }

packages/backend/src/server/api/endpoints.ts

@@ -35,6 +35,7 @@ import * as ep___admin_federation_removeAllFollowing from './endpoints/admin/fed
 import * as ep___admin_federation_updateInstance from './endpoints/admin/federation/update-instance.js';
 import * as ep___admin_getIndexStats from './endpoints/admin/get-index-stats.js';
 import * as ep___admin_getTableStats from './endpoints/admin/get-table-stats.js';
+import * as ep___admin_getUserIps from './endpoints/admin/get-user-ips.js';
 import * as ep___admin_invite from './endpoints/admin/invite.js';
 import * as ep___admin_moderators_add from './endpoints/admin/moderators/add.js';
 import * as ep___admin_moderators_remove from './endpoints/admin/moderators/remove.js';
@@ -59,6 +60,8 @@ import * as ep___admin_unsilenceUser from './endpoints/admin/unsilence-user.js';
 import * as ep___admin_unsuspendUser from './endpoints/admin/unsuspend-user.js';
 import * as ep___admin_updateMeta from './endpoints/admin/update-meta.js';
 import * as ep___admin_vacuum from './endpoints/admin/vacuum.js';
+import * as ep___admin_deleteAccount from './endpoints/admin/delete-account.js';
+import * as ep___admin_updateUserNote from './endpoints/admin/update-user-note.js';
 import * as ep___announcements from './endpoints/announcements.js';
 import * as ep___antennas_create from './endpoints/antennas/create.js';
 import * as ep___antennas_delete from './endpoints/antennas/delete.js';
@@ -99,6 +102,7 @@ import * as ep___charts_user_notes from './endpoints/charts/user/notes.js';
 import * as ep___charts_user_reactions from './endpoints/charts/user/reactions.js';
 import * as ep___charts_users from './endpoints/charts/users.js';
 import * as ep___clips_addNote from './endpoints/clips/add-note.js';
+import * as ep___clips_removeNote from './endpoints/clips/remove-note.js';
 import * as ep___clips_create from './endpoints/clips/create.js';
 import * as ep___clips_delete from './endpoints/clips/delete.js';
 import * as ep___clips_list from './endpoints/clips/list.js';
@@ -133,6 +137,7 @@ import * as ep___federation_instances from './endpoints/federation/instances.js'
 import * as ep___federation_showInstance from './endpoints/federation/show-instance.js';
 import * as ep___federation_updateRemoteUser from './endpoints/federation/update-remote-user.js';
 import * as ep___federation_users from './endpoints/federation/users.js';
+import * as ep___federation_stats from './endpoints/federation/stats.js';
 import * as ep___following_create from './endpoints/following/create.js';
 import * as ep___following_delete from './endpoints/following/delete.js';
 import * as ep___following_invalidate from './endpoints/following/invalidate.js';
@@ -308,6 +313,8 @@ import * as ep___users_searchByUsernameAndHost from './endpoints/users/search-by
 import * as ep___users_search from './endpoints/users/search.js';
 import * as ep___users_show from './endpoints/users/show.js';
 import * as ep___users_stats from './endpoints/users/stats.js';
+import * as ep___fetchRss from './endpoints/fetch-rss.js';
+import * as ep___admin_driveCapOverride from './endpoints/admin/drive-capacity-override.js';
 
 const eps = [
 	['admin/meta', ep___admin_meta],
@@ -345,6 +352,7 @@ const eps = [
 	['admin/federation/update-instance', ep___admin_federation_updateInstance],
 	['admin/get-index-stats', ep___admin_getIndexStats],
 	['admin/get-table-stats', ep___admin_getTableStats],
+	['admin/get-user-ips', ep___admin_getUserIps],
 	['admin/invite', ep___admin_invite],
 	['admin/moderators/add', ep___admin_moderators_add],
 	['admin/moderators/remove', ep___admin_moderators_remove],
@@ -369,6 +377,8 @@ const eps = [
 	['admin/unsuspend-user', ep___admin_unsuspendUser],
 	['admin/update-meta', ep___admin_updateMeta],
 	['admin/vacuum', ep___admin_vacuum],
+	['admin/delete-account', ep___admin_deleteAccount],
+	['admin/update-user-note', ep___admin_updateUserNote],
 	['announcements', ep___announcements],
 	['antennas/create', ep___antennas_create],
 	['antennas/delete', ep___antennas_delete],
@@ -409,6 +419,7 @@ const eps = [
 	['charts/user/reactions', ep___charts_user_reactions],
 	['charts/users', ep___charts_users],
 	['clips/add-note', ep___clips_addNote],
+	['clips/remove-note', ep___clips_removeNote],
 	['clips/create', ep___clips_create],
 	['clips/delete', ep___clips_delete],
 	['clips/list', ep___clips_list],
@@ -443,6 +454,7 @@ const eps = [
 	['federation/show-instance', ep___federation_showInstance],
 	['federation/update-remote-user', ep___federation_updateRemoteUser],
 	['federation/users', ep___federation_users],
+	['federation/stats', ep___federation_stats],
 	['following/create', ep___following_create],
 	['following/delete', ep___following_delete],
 	['following/invalidate', ep___following_invalidate],
@@ -618,6 +630,8 @@ const eps = [
 	['users/search', ep___users_search],
 	['users/show', ep___users_show],
 	['users/stats', ep___users_stats],
+	['admin/drive-capacity-override', ep___admin_driveCapOverride],
+	['fetch-rss', ep___fetchRss],
 ];
 
 export interface IEndpointMeta {
@@ -699,6 +713,16 @@ export interface IEndpointMeta {
 	readonly kind?: string;
 
 	readonly description?: string;
+
+	/**
+	 * GETでのリクエストを許容するか否か
+	 */
+	readonly allowGet?: boolean;
+
+	/**
+	 * 正常応答をキャッシュ (Cache-Control: public) する秒数
+	 */
+	readonly cacheSec?: number;
 }
 
 export interface IEndpoint {

packages/backend/src/server/api/endpoints/admin/delete-account.ts

@@ -0,0 +1,31 @@
+import { Users } from '@/models/index.js';
+import { deleteAccount } from '@/services/delete-account.js';
+import define from '../../define.js';
+
+export const meta = {
+	tags: ['admin'],
+
+	requireCredential: true,
+	requireAdmin: true,
+
+	res: {
+	},
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		userId: { type: 'string', format: 'misskey:id' },
+	},
+	required: ['userId'],
+} as const;
+
+// eslint-disable-next-line import/no-default-export
+export default define(meta, paramDef, async (ps) => {
+	const user = await Users.findOneByOrFail({ id: ps.userId });
+	if (user.isDeleted) {
+		return;
+	}
+
+	await deleteAccount(user);
+});

packages/backend/src/server/api/endpoints/admin/drive-capacity-override.ts

@@ -0,0 +1,47 @@
+import define from '../../define.js';
+import { Users } from '@/models/index.js';
+import { User } from '@/models/entities/user.js';
+import { insertModerationLog } from '@/services/insert-moderation-log.js';
+export const meta = {
+	tags: ['admin'],
+
+	requireCredential: true,
+	requireModerator: true,
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		userId: { type: 'string', format: 'misskey:id' },
+		overrideMb: { type: 'number', nullable: true },
+	},
+	required: ['userId', 'overrideMb'],
+} as const;
+
+// eslint-disable-next-line import/no-default-export
+export default define(meta, paramDef, async (ps, me) => {
+	const user = await Users.findOneBy({ id: ps.userId });
+
+	if (user == null) {
+		throw new Error('user not found');
+	}
+
+	if (!Users.isLocalUser(user)) {
+		throw new Error('user is not local user');
+	} 
+
+	/*if (user.isAdmin) {
+		throw new Error('cannot suspend admin');
+	}
+	if (user.isModerator) {
+		throw new Error('cannot suspend moderator');
+	}*/
+
+	await Users.update(user.id, {
+		driveCapacityOverrideMb: ps.overrideMb,
+	});
+
+	insertModerationLog(me, 'change-drive-capacity-override', {
+		targetId: user.id,
+	});
+});

packages/backend/src/server/api/endpoints/admin/drive/files.ts

@@ -1,5 +1,5 @@
-import define from '../../../define.js';
 import { DriveFiles } from '@/models/index.js';
+import define from '../../../define.js';
 import { makePaginationQuery } from '../../../common/make-pagination-query.js';
 
 export const meta = {
@@ -25,8 +25,9 @@ export const paramDef = {
 		limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
 		sinceId: { type: 'string', format: 'misskey:id' },
 		untilId: { type: 'string', format: 'misskey:id' },
+		userId: { type: 'string', format: 'misskey:id', nullable: true },
 		type: { type: 'string', nullable: true, pattern: /^[a-zA-Z0-9\/\-*]+$/.toString().slice(1, -1) },
-		origin: { type: 'string', enum: ['combined', 'local', 'remote'], default: "local" },
+		origin: { type: 'string', enum: ['combined', 'local', 'remote'], default: 'local' },
 		hostname: {
 			type: 'string',
 			nullable: true,
@@ -41,14 +42,18 @@ export const paramDef = {
 export default define(meta, paramDef, async (ps, me) => {
 	const query = makePaginationQuery(DriveFiles.createQueryBuilder('file'), ps.sinceId, ps.untilId);
 
-	if (ps.origin === 'local') {
-		query.andWhere('file.userHost IS NULL');
-	} else if (ps.origin === 'remote') {
-		query.andWhere('file.userHost IS NOT NULL');
-	}
+	if (ps.userId) {
+		query.andWhere('file.userId = :userId', { userId: ps.userId });
+	} else {
+		if (ps.origin === 'local') {
+			query.andWhere('file.userHost IS NULL');
+		} else if (ps.origin === 'remote') {
+			query.andWhere('file.userHost IS NOT NULL');
+		}
 
-	if (ps.hostname) {
-		query.andWhere('file.userHost = :hostname', { hostname: ps.hostname });
+		if (ps.hostname) {
+			query.andWhere('file.userHost = :hostname', { hostname: ps.hostname });
+		}
 	}
 
 	if (ps.type) {

packages/backend/src/server/api/endpoints/admin/drive/show-file.ts

@@ -1,6 +1,6 @@
+import { DriveFiles } from '@/models/index.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
-import { DriveFiles } from '@/models/index.js';
 
 export const meta = {
 	tags: ['admin'],
@@ -184,5 +184,10 @@ export default define(meta, paramDef, async (ps, me) => {
 		throw new ApiError(meta.errors.noSuchFile);
 	}
 
+	if (!me.isAdmin) {
+		delete file.requestIp;
+		delete file.requestHeaders;
+	}
+
 	return file;
 });

packages/backend/src/server/api/endpoints/admin/get-user-ips.ts

@@ -0,0 +1,31 @@
+import { UserIps } from '@/models/index.js';
+import define from '../../define.js';
+
+export const meta = {
+	tags: ['admin'],
+
+	requireCredential: true,
+	requireAdmin: true,
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		userId: { type: 'string', format: 'misskey:id' },
+	},
+	required: ['userId'],
+} as const;
+
+// eslint-disable-next-line import/no-default-export
+export default define(meta, paramDef, async (ps, me) => {
+	const ips = await UserIps.find({
+		where: { userId: ps.userId },
+		order: { createdAt: 'DESC' },
+		take: 30,
+	});
+
+	return ips.map(x => ({
+		ip: x.ip,
+		createdAt: x.createdAt.toISOString(),
+	}));
+});

packages/backend/src/server/api/endpoints/admin/meta.ts

@@ -1,7 +1,7 @@
 import config from '@/config/index.js';
-import define from '../../define.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
 import { MAX_NOTE_TEXT_LENGTH } from '@/const.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['meta'],
@@ -304,6 +304,10 @@ export const meta = {
 				type: 'boolean',
 				optional: true, nullable: false,
 			},
+			enableIpLogging: {
+				type: 'boolean',
+				optional: true, nullable: false,
+			},
 		},
 	},
 } as const;
@@ -360,7 +364,6 @@ export default define(meta, paramDef, async (ps, me) => {
 		pinnedPages: instance.pinnedPages,
 		pinnedClipId: instance.pinnedClipId,
 		cacheRemoteFiles: instance.cacheRemoteFiles,
-
 		useStarForReactionFallback: instance.useStarForReactionFallback,
 		pinnedUsers: instance.pinnedUsers,
 		hiddenTags: instance.hiddenTags,
@@ -397,5 +400,6 @@ export default define(meta, paramDef, async (ps, me) => {
 		objectStorageS3ForcePathStyle: instance.objectStorageS3ForcePathStyle,
 		deeplAuthKey: instance.deeplAuthKey,
 		deeplIsPro: instance.deeplIsPro,
+		enableIpLogging: instance.enableIpLogging,
 	};
 });

packages/backend/src/server/api/endpoints/admin/server-info.ts

@@ -99,12 +99,16 @@ export default define(meta, paramDef, async () => {
 	const fsStats = await si.fsSize();
 	const netInterface = await si.networkInterfaceDefault();
 
+	const redisServerInfo = await redisClient.info('Server');
+	const m = redisServerInfo.match(new RegExp('^redis_version:(.*)', 'm'));
+	const redis_version = m?.[1];
+
 	return {
 		machine: os.hostname(),
 		os: os.platform(),
 		node: process.version,
 		psql: await db.query('SHOW server_version').then(x => x[0].server_version),
-		redis: redisClient.server_info.redis_version,
+		redis: redis_version,
 		cpu: {
 			model: os.cpus()[0].model,
 			cores: os.cpus().length,

packages/backend/src/server/api/endpoints/admin/show-user.ts

@@ -25,7 +25,7 @@ export const paramDef = {
 export default define(meta, paramDef, async (ps, me) => {
 	const [user, profile] = await Promise.all([
 		Users.findOneBy({ id: ps.userId }),
-		UserProfiles.findOneBy({ userId: ps.userId })
+		UserProfiles.findOneBy({ userId: ps.userId }),
 	]);
 
 	if (user == null || profile == null) {
@@ -68,6 +68,8 @@ export default define(meta, paramDef, async (ps, me) => {
 		isModerator: user.isModerator,
 		isSilenced: user.isSilenced,
 		isSuspended: user.isSuspended,
+		lastActiveDate: user.lastActiveDate,
+		moderationNote: profile.moderationNote,
 		signins,
 	};
 });

packages/backend/src/server/api/endpoints/admin/update-meta.ts

@@ -1,8 +1,8 @@
-import define from '../../define.js';
 import { Meta } from '@/models/entities/meta.js';
 import { insertModerationLog } from '@/services/insert-moderation-log.js';
 import { DB_MAX_NOTE_TEXT_LENGTH } from '@/misc/hard-limits.js';
 import { db } from '@/db/postgre.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['admin'],
@@ -96,6 +96,7 @@ export const paramDef = {
 		objectStorageUseProxy: { type: 'boolean' },
 		objectStorageSetPublicRead: { type: 'boolean' },
 		objectStorageS3ForcePathStyle: { type: 'boolean' },
+		enableIpLogging: { type: 'boolean' },
 	},
 	required: [],
 } as const;
@@ -396,6 +397,10 @@ export default define(meta, paramDef, async (ps, me) => {
 		set.deeplIsPro = ps.deeplIsPro;
 	}
 
+	if (ps.enableIpLogging !== undefined) {
+		set.enableIpLogging = ps.enableIpLogging;
+	}
+
 	await db.transaction(async transactionalEntityManager => {
 		const metas = await transactionalEntityManager.find(Meta, {
 			order: {

packages/backend/src/server/api/endpoints/admin/update-user-note.ts

@@ -0,0 +1,31 @@
+import { UserProfiles, Users } from '@/models/index.js';
+import define from '../../define.js';
+
+export const meta = {
+	tags: ['admin'],
+
+	requireCredential: true,
+	requireModerator: true,
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		userId: { type: 'string', format: 'misskey:id' },
+		text: { type: 'string' },
+	},
+	required: ['userId', 'text'],
+} as const;
+
+// eslint-disable-next-line import/no-default-export
+export default define(meta, paramDef, async (ps, me) => {
+	const user = await Users.findOneBy({ id: ps.userId });
+
+	if (user == null) {
+		throw new Error('user not found');
+	}
+
+	await UserProfiles.update({ userId: user.id }, {
+		moderationNote: ps.text,
+	});
+});

packages/backend/src/server/api/endpoints/announcements.ts

@@ -1,5 +1,5 @@
-import define from '../define.js';
 import { Announcements, AnnouncementReads } from '@/models/index.js';
+import define from '../define.js';
 import { makePaginationQuery } from '../common/make-pagination-query.js';
 
 export const meta = {

packages/backend/src/server/api/endpoints/ap/show.ts

@@ -2,12 +2,13 @@ import define from '../../define.js';
 import config from '@/config/index.js';
 import { createPerson } from '@/remote/activitypub/models/person.js';
 import { createNote } from '@/remote/activitypub/models/note.js';
+import DbResolver from '@/remote/activitypub/db-resolver.js';
 import Resolver from '@/remote/activitypub/resolver.js';
 import { ApiError } from '../../error.js';
 import { extractDbHost } from '@/misc/convert-host.js';
 import { Users, Notes } from '@/models/index.js';
 import { Note } from '@/models/entities/note.js';
-import { User } from '@/models/entities/user.js';
+import { CacheableLocalUser, User } from '@/models/entities/user.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
 import { isActor, isPost, getApId } from '@/remote/activitypub/type.js';
 import ms from 'ms';
@@ -77,8 +78,8 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps) => {
-	const object = await fetchAny(ps.uri);
+export default define(meta, paramDef, async (ps, me) => {
+	const object = await fetchAny(ps.uri, me);
 	if (object) {
 		return object;
 	} else {
@@ -89,48 +90,18 @@ export default define(meta, paramDef, async (ps) => {
 /***
  * URIからUserかNoteを解決する
  */
-async function fetchAny(uri: string): Promise<SchemaType<typeof meta['res']> | null> {
-	// URIがこのサーバーを指しているなら、ローカルユーザーIDとしてDBからフェッチ
-	if (uri.startsWith(config.url + '/')) {
-		const parts = uri.split('/');
-		const id = parts.pop();
-		const type = parts.pop();
-
-		if (type === 'notes') {
-			const note = await Notes.findOneBy({ id });
-
-			if (note) {
-				return {
-					type: 'Note',
-					object: await Notes.pack(note, null, { detail: true }),
-				};
-			}
-		} else if (type === 'users') {
-			const user = await Users.findOneBy({ id });
-
-			if (user) {
-				return {
-					type: 'User',
-					object: await Users.pack(user, null, { detail: true }),
-				};
-			}
-		}
-	}
-
+async function fetchAny(uri: string, me: CacheableLocalUser | null | undefined): Promise<SchemaType<typeof meta['res']> | null> {
 	// ブロックしてたら中断
 	const fetchedMeta = await fetchMeta();
 	if (fetchedMeta.blockedHosts.includes(extractDbHost(uri))) return null;
 
-	// URI(AP Object id)としてDB検索
-	{
-		const [user, note] = await Promise.all([
-			Users.findOneBy({ uri: uri }),
-			Notes.findOneBy({ uri: uri }),
-		]);
+	const dbResolver = new DbResolver();
 
-		const packed = await mergePack(user, note);
-		if (packed !== null) return packed;
-	}
+	let local = await mergePack(me, ...await Promise.all([
+		dbResolver.getUserFromApId(uri),
+		dbResolver.getNoteFromApId(uri),
+	]));
+	if (local != null) return local;
 
 	// リモートから一旦オブジェクトフェッチ
 	const resolver = new Resolver();
@@ -139,74 +110,37 @@ async function fetchAny(uri: string): Promise<SchemaType<typeof meta['res']> | n
 	// /@user のような正規id以外で取得できるURIが指定されていた場合、ここで初めて正規URIが確定する
 	// これはDBに存在する可能性があるため再度DB検索
 	if (uri !== object.id) {
-		if (object.id.startsWith(config.url + '/')) {
-			const parts = object.id.split('/');
-			const id = parts.pop();
-			const type = parts.pop();
-
-			if (type === 'notes') {
-				const note = await Notes.findOneBy({ id });
-
-				if (note) {
-					return {
-						type: 'Note',
-						object: await Notes.pack(note, null, { detail: true }),
-					};
-				}
-			} else if (type === 'users') {
-				const user = await Users.findOneBy({ id });
-
-				if (user) {
-					return {
-						type: 'User',
-						object: await Users.pack(user, null, { detail: true }),
-					};
-				}
-			}
-		}
-
-		const [user, note] = await Promise.all([
-			Users.findOneBy({ uri: object.id }),
-			Notes.findOneBy({ uri: object.id }),
-		]);
-
-		const packed = await mergePack(user, note);
-		if (packed !== null) return packed;
+		local = await mergePack(me, ...await Promise.all([
+			dbResolver.getUserFromApId(object.id),
+			dbResolver.getNoteFromApId(object.id),
+		]));
+		if (local != null) return local;
 	}
 
-	// それでもみつからなければ新規であるため登録
-	if (isActor(object)) {
-		const user = await createPerson(getApId(object));
-		return {
-			type: 'User',
-			object: await Users.pack(user, null, { detail: true }),
-		};
-	}
-
-	if (isPost(object)) {
-		const note = await createNote(getApId(object), undefined, true);
-		return {
-			type: 'Note',
-			object: await Notes.pack(note!, null, { detail: true }),
-		};
-	}
-
-	return null;
+	return await mergePack(
+		me,
+		isActor(object) ? await createPerson(getApId(object)) : null,
+		isPost(object) ? await createNote(getApId(object), undefined, true) : null,
+	);
 }
 
-async function mergePack(user: User | null | undefined, note: Note | null | undefined): Promise<SchemaType<typeof meta.res> | null> {
+async function mergePack(me: CacheableLocalUser | null | undefined, user: User | null | undefined, note: Note | null | undefined): Promise<SchemaType<typeof meta.res> | null> {
 	if (user != null) {
 		return {
 			type: 'User',
-			object: await Users.pack(user, null, { detail: true }),
+			object: await Users.pack(user, me, { detail: true }),
 		};
-	}
+	} else if (note != null) {
+		try {
+			const object = await Notes.pack(note, me, { detail: true });
 
-	if (note != null) {
-		return {
-			type: 'Note',
-			object: await Notes.pack(note, null, { detail: true }),
-		};
+			return {
+				type: 'Note',
+				object,
+			};
+		} catch (e) {
+			return null;
+		}
 	}
 
 	return null;

packages/backend/src/server/api/endpoints/charts/active-users.ts

@@ -1,11 +1,14 @@
-import define from '../../define.js';
 import { getJsonSchema } from '@/services/chart/core.js';
 import { activeUsersChart } from '@/services/chart/index.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['charts', 'users'],
 
 	res: getJsonSchema(activeUsersChart.schema),
+
+	allowGet: true,
+	cacheSec: 60 * 60,
 } as const;
 
 export const paramDef = {

packages/backend/src/server/api/endpoints/charts/ap-request.ts

@@ -1,11 +1,14 @@
-import define from '../../define.js';
 import { getJsonSchema } from '@/services/chart/core.js';
 import { apRequestChart } from '@/services/chart/index.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['charts'],
 
 	res: getJsonSchema(apRequestChart.schema),
+
+	allowGet: true,
+	cacheSec: 60 * 60,
 } as const;
 
 export const paramDef = {

packages/backend/src/server/api/endpoints/charts/drive.ts

@@ -1,11 +1,14 @@
-import define from '../../define.js';
 import { getJsonSchema } from '@/services/chart/core.js';
 import { driveChart } from '@/services/chart/index.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['charts', 'drive'],
 
 	res: getJsonSchema(driveChart.schema),
+
+	allowGet: true,
+	cacheSec: 60 * 60,
 } as const;
 
 export const paramDef = {