12.64.0

Bumps [@fortawesome/vue-fontawesome](https://github.com/FortAwesome/vue-fontawesome) from 3.0.0-2 to 3.0.0-3.
- [Release notes](https://github.com/FortAwesome/vue-fontawesome/releases)
- [Changelog](https://github.com/FortAwesome/vue-fontawesome/blob/3.0.0-3/CHANGELOG.md)
- [Commits](https://github.com/FortAwesome/vue-fontawesome/commits/3.0.0-3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

.circleci/config.yml

@@ -4,7 +4,7 @@ executors:
   docker:
     working_directory: /tmp/workspace
     docker:
-      - image: docker:latest
+      - image: docker:12.10.1
 
 jobs:
   docker:
@@ -32,7 +32,7 @@ jobs:
                     apk update && apk add jq
                     docker tag misskey/misskey misskey/misskey:$(cat package.json | jq -r .version)
                     docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
-                    docker push misskey/misskey
+                    docker push -a misskey/misskey
                    else
                     echo -e '\033[0;33mAborted deploying to Docker Hub\033[0;39m'
                   fi

README.md

@@ -8,7 +8,7 @@
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=for-the-badge&logo=github)](http://makeapullrequest.com)
 [![Awesome Humane Tech](https://raw.githubusercontent.com/humanetech-community/awesome-humane-tech/main/humane-tech-badge.svg?sanitize=true)](https://github.com/humanetech-community/awesome-humane-tech)
 
-**A forever evolving, professional microblogging platform.**
+**A forever evolving, interplanetary microblogging platform.**
 
 <p align="justify">
 <a href="https://join.misskey.page/">Misskey</a> is a decentralized microblogging platform born on Earth.

crowdin.yml

@@ -1,3 +1,7 @@
 files:
   - source: /locales/ja-JP.yml
     translation: /locales/%locale%.yml
+    update_option: update_as_unapproved
+  - source: /src/docs/ja-JP/*.md
+    translation: /src/docs/%locale%/%original_file_name%
+    update_option: update_as_unapproved

gulpfile.ts

@@ -7,6 +7,9 @@ import * as gulp from 'gulp';
 import * as ts from 'gulp-typescript';
 import * as rimraf from 'rimraf';
 import * as rename from 'gulp-rename';
+import * as replace from 'gulp-replace';
+const terser = require('gulp-terser');
+const cssnano = require('gulp-cssnano');
 
 const locales: { [x: string]: any } = require('./locales');
 const meta = require('./package.json');
@@ -25,6 +28,10 @@ gulp.task('build:copy:views', () =>
 	gulp.src('./src/server/web/views/**/*').pipe(gulp.dest('./built/server/web/views'))
 );
 
+gulp.task('build:copy:fonts', () =>
+	gulp.src('./node_modules/three/examples/fonts/**/*').pipe(gulp.dest('./built/client/assets/fonts/'))
+);
+
 gulp.task('build:copy:locales', cb => {
 	fs.mkdirSync('./built/client/assets/locales', { recursive: true });
 
@@ -37,11 +44,23 @@ gulp.task('build:copy:locales', cb => {
 	cb();
 });
 
-gulp.task('build:copy:fonts', () =>
-	gulp.src('./node_modules/three/examples/fonts/**/*').pipe(gulp.dest('./built/client/assets/fonts/'))
-);
+gulp.task('build:client:script', () => {
+	return gulp.src(['./src/server/web/boot.js'])
+		.pipe(replace('VERSION', JSON.stringify(meta.version)))
+		.pipe(replace('LANGS', JSON.stringify(Object.keys(locales))))
+		.pipe(terser({
+			toplevel: true
+		}))
+		.pipe(gulp.dest('./built/server/web/'));
+});
 
-gulp.task('build:copy', gulp.parallel('build:copy:views', 'build:copy:locales', 'build:copy:fonts', () =>
+gulp.task('build:client:style', () => {
+	return gulp.src(['./src/server/web/style.css'])
+		.pipe(cssnano())
+		.pipe(gulp.dest('./built/server/web/'));
+});
+
+gulp.task('build:copy', gulp.parallel('build:copy:locales', 'build:copy:views', 'build:client:script', 'build:client:style', 'build:copy:fonts', () =>
 	gulp.src([
 		'./src/emojilist.json',
 		'./src/server/web/views/**/*',

locales/ar-SA.yml

@@ -251,6 +251,7 @@ registration: "إنشاء حساب"
 enableRegistration: "تفعيل إنشاء الحسابات الجديدة"
 invite: "دعوة"
 basicInfo: "المعلومات الأساسية "
+pinnedNotes: "ملاحظة مدبسة"
 hcaptchaSiteKey: "مفتاح الموقع"
 hcaptchaSecretKey: "المفتاح السري"
 recaptcha: "reCAPTCHA"

locales/de-DE.yml

@@ -33,6 +33,9 @@ addUser: "Benutzer hinzufügen"
 favorite: "Zu Favoriten hinzufügen"
 favorites: "Favoriten"
 unfavorite: "Aus Favoriten entfernen"
+favorited: "Zu Favoriten hinzugefügt."
+alreadyFavorited: "Bereits zu den Favoriten hinzugefügt."
+cantFavorite: "Hinzufügen zu Favoriten fehlgeschlagen."
 pin: "Anheften"
 unpin: "Lösen"
 copyContent: "Inhalt kopieren"
@@ -87,6 +90,9 @@ followRequestPending: "Ausstehende Follow-Anfrage"
 enterEmoji: "Gib ein Emoji ein"
 renote: "Renote"
 unrenote: "Renote zurücknehmen"
+renoted: "Renote getätigt."
+cantRenote: "Renote dieses Beitrags nicht möglich."
+cantReRenote: "Renote einer Renote nicht möglich."
 quote: "Zitieren"
 pinnedNote: "Angepinnte Notiz"
 you: "Du"
@@ -95,7 +101,7 @@ sensitive: "NSFW"
 add: "Hinzufügen"
 reaction: "Reaktionen"
 reactionSettingDescription: "Gib deine Lieblingsreaktionen ein, um sie der Reaktionsauswahl hinzuzufügen."
-reactionSettingDescription2: "Ziehen zum Reorganisieren, Klicken zum Löschen."
+reactionSettingDescription2: "Ziehe zum Anordnen, Klicke zum Löschen,  Drücke \"+\" zum Hinzufügen"
 rememberNoteVisibility: "Notizsichtbarkeit merken"
 attachCancel: "Anhang entfernen"
 markAsSensitive: "Als NSFW markieren"
@@ -237,7 +243,7 @@ nUsersRead: "Von {n} gelesen"
 agreeTo: "Ich stimme {0} zu"
 tos: "Nutzungsbedingungen"
 start: "Anfangen"
-home: "Startseite"
+home: "Home"
 remoteUserCaution: "Diese Informationen sind möglicherweise veraltet, da der Benutzer von einer anderen Instanz stammt."
 activity: "Aktivität"
 images: "Bilder"
@@ -320,6 +326,8 @@ pinnedUsers: "Angepinnte Benutzer"
 pinnedUsersDescription: "Gib einen Benutzernamen pro Zeile ein. Diese werden im \"Erkunden\" Tab angezeigt."
 pinnedPages: "Angepinnte Seiten"
 pinnedPagesDescription: "Gib hier die Pfäde zu den Seiten an, die du an die Spitze dieser Instanz anheften möchtest, getrennt durch neue Zeilen."
+pinnedClipId: "ID des angehefteten Clips"
+pinnedNotes: "Angepinnte Notizen"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "hCaptcha aktivieren"
 hcaptchaSiteKey: "Site key"
@@ -648,6 +656,29 @@ noteFavoritesCount: "Anzahl favorisierter Notizen"
 pageLikesCount: "Anzahl der Seiten, die mir gefallen"
 pageLikedCount: "Anzahl erhaltener \"Gefällt mir\" auf Seiten"
 reversiCount: "Anzahl von Reversi-Runden"
+contact: "Kontakt"
+useSystemFont: "Standardschriftart des Systems verwenden"
+clips: "Clips"
+experimentalFeatures: "Experimentelle Funktionalitäten"
+developer: "Entwickler"
+makeExplorable: "Benutzerkonto in \"Erkunden\" sichtbar machen"
+makeExplorableDescription: "Wenn diese Option deaktiviert ist, ist dein Benutzerkonto nicht im \"Erkunden\"-Bereich sichtbar."
+showGapBetweenNotesInTimeline: "Abstände zwischen Notizen auf der Chronik anzeigen"
+duplicate: "Duplizieren"
+left: "Links"
+center: "Mitte"
+wide: "Breit"
+narrow: "Schmal"
+reloadToApplySetting: "Einstellungen treten nach einer Aktualisierung der Seite in Kraft. Jetzt aktualisieren?"
+_aboutMisskey:
+  about: "Misskey ist Open-Source-Software die von syuilo seit 2014 entwickelt wird."
+  contributors: "Hauptmitwirkende"
+  allContributors: "Alle Mitwirkenden"
+  source: "Quellcode"
+  translation: "Misskey übersetzen"
+  donate: "An Misskey spenden"
+  morePatrons: "Wir schätzen ebenso die Unterstützung vieler anderer hier nicht gelisteter Personen sehr. Danke! 🥰"
+  patrons: "UnterstützerInnen"
 _nsfw:
   respect: "Als NSFW markierte Bilder verdecken"
   ignore: "Als NSFW markierte Bilder nicht verdecken"
@@ -958,6 +989,8 @@ _widgets:
   digitalClock: "Digitaluhr"
   federation: "Föderation"
   postForm: "Neue Notiz anfertigen"
+  slideshow: "Diashow"
+  button: "Knopf"
 _cw:
   hide: "Ausblenden"
   show: "Mehr anzeigen"
@@ -1017,6 +1050,8 @@ _profile:
   metadataDescription: "Du kannst auf deinem Profil vier zusätzliche Informationsblöcke anzeigen lassen."
   metadataLabel: "Name"
   metadataContent: "Inhalt"
+  changeAvatar: "Profilbild ändern"
+  changeBanner: "Banner ändern"
 _exportOrImport:
   allNotes: "Alle Notizen"
   followingList: "Gefolgte Benutzer"
@@ -1438,6 +1473,8 @@ _notification:
 _deck:
   alwaysShowMainColumn: "Hauptspalte immer zeigen"
   columnAlign: "Spalten ausrichten"
+  columnMargin: "Spaltenabstand"
+  columnHeaderHeight: "Spaltenkopfhöhe"
   addColumn: "Spalte hinzufügen"
   swapLeft: "Nach links verschieben"
   swapRight: "Nach rechts verschieben"
@@ -1446,6 +1483,7 @@ _deck:
   stackLeft: "Nach links stapeln"
   popRight: "Nach rechts vom Stapel nehmen"
   _columns:
+    main: "Hauptspalte"
     widgets: "Widgets"
     notifications: "Benachrichtigungen"
     tl: "Chronik"

locales/en-US.yml

@@ -33,6 +33,9 @@ addUser: "Add a user"
 favorite: "Favorite"
 favorites: "Favorites"
 unfavorite: "Unfavorite"
+favorited: "Added to favorites."
+alreadyFavorited: "Already added to favorites."
+cantFavorite: "Couldn't add to favorites."
 pin: "Pin to profile"
 unpin: "Unpin from profile"
 copyContent: "Copy contents"
@@ -87,6 +90,9 @@ followRequestPending: "Pending follow request"
 enterEmoji: "Enter an emoji"
 renote: "Renote"
 unrenote: "Unrenote"
+renoted: "Renoted."
+cantRenote: "This post can't be renoted."
+cantReRenote: "A renote can't be renoted."
 quote: "Quote"
 pinnedNote: "Pinned note"
 you: "You"
@@ -95,7 +101,7 @@ sensitive: "NSFW"
 add: "Add"
 reaction: "Reaction"
 reactionSettingDescription: "Assign your favorite reactions which want to pin in reaction picker."
-reactionSettingDescription2: "Drag to reorganize, click to delete."
+reactionSettingDescription2: "Drag to reorder, Click to delete, Press \"+\" to add"
 rememberNoteVisibility: "Remember note visibility settings"
 attachCancel: "Remove attachment"
 markAsSensitive: "Mark as NSFW"
@@ -320,6 +326,8 @@ pinnedUsers: "Pinned user"
 pinnedUsersDescription: "List one username per line. Users listed here will be pinned under \"Explore\" tab."
 pinnedPages: "Pinned pages"
 pinnedPagesDescription: "Enter the paths of the pages you want to pin to the top page of this instance, separated by new lines."
+pinnedClipId: "ID of the pinned clip"
+pinnedNotes: "Pinned notes"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "Enable hCaptcha"
 hcaptchaSiteKey: "Site key"
@@ -648,6 +656,29 @@ noteFavoritesCount: "Amount of favorite notes"
 pageLikesCount: "Amount of received Page likes"
 pageLikedCount: "Amount of liked Pages"
 reversiCount: "Number of Reversi matches"
+contact: "Contact"
+useSystemFont: "Use the system's default font"
+clips: "Clips"
+experimentalFeatures: "Experimental features"
+developer: "Developer"
+makeExplorable: "Make account visible in \"Explore\""
+makeExplorableDescription: "If you turn this off, your account will not show up in the \"Explore\" section."
+showGapBetweenNotesInTimeline: "Show a gap between posts on the timeline"
+duplicate: "Duplicate"
+left: "Left"
+center: "Center"
+wide: "Wide"
+narrow: "Narrow"
+reloadToApplySetting: "Settings will be applied upon page reload. Reload now?"
+_aboutMisskey:
+  about: "Misskey is open-source software being developed by syuilo since 2014."
+  contributors: "Main contributors"
+  allContributors: "All contributors"
+  source: "Source code"
+  translation: "Translate Misskey"
+  donate: "Donate to Misskey"
+  morePatrons: "We really appreciate the support of many other helpers not listed here. Thank you! 🥰"
+  patrons: "Backers"
 _nsfw:
   respect: "Hide NSFW media"
   ignore: "Don't hide NSFW media"
@@ -958,6 +989,8 @@ _widgets:
   digitalClock: "Digital clock"
   federation: "Federation"
   postForm: "Compose a note"
+  slideshow: "Slideshow"
+  button: "Button"
 _cw:
   hide: "Hide"
   show: "Load more"
@@ -1017,6 +1050,8 @@ _profile:
   metadataDescription: "You can display up to four additional information sections in your profile."
   metadataLabel: "Label"
   metadataContent: "Content"
+  changeAvatar: "Change avatar"
+  changeBanner: "Change banner"
 _exportOrImport:
   allNotes: "All notes"
   followingList: "Following"
@@ -1438,6 +1473,8 @@ _notification:
 _deck:
   alwaysShowMainColumn: "Always show main column"
   columnAlign: "Align columns"
+  columnMargin: "Margin between columns"
+  columnHeaderHeight: " Column header height"
   addColumn: "Add column"
   swapLeft: "Swap to left"
   swapRight: "Swap to right"
@@ -1446,6 +1483,7 @@ _deck:
   stackLeft: "Stack on the left"
   popRight: "Pop to the right"
   _columns:
+    main: "Main"
     widgets: "Widgets"
     notifications: "Notifications"
     tl: "Timeline"

locales/es-ES.yml

@@ -33,6 +33,9 @@ addUser: "Agregar usuario"
 favorite: "Favorito"
 favorites: "Favoritos"
 unfavorite: "Quitar de favoritos"
+favorited: "Añadido a favoritos"
+alreadyFavorited: "Ya había sido añadido a favoritos"
+cantFavorite: "No fue añadido a favoritos"
 pin: "Fijar"
 unpin: "Desfijar"
 copyContent: "Copiar contenido"
@@ -87,6 +90,9 @@ followRequestPending: "Solicitudes de seguimiento pendientes"
 enterEmoji: "Ingresar emojis"
 renote: "Renotar"
 unrenote: "Quitar renota"
+renoted: "Renotado"
+cantRenote: "No se puede renotar este post"
+cantReRenote: "No se puede renotar una renota"
 quote: "Citar"
 pinnedNote: "Nota fijada"
 you: "Tú"
@@ -95,6 +101,7 @@ sensitive: "Marcado como sensible"
 add: "Agregar"
 reaction: "Reacción"
 reactionSettingDescription: "Asigne sus reacción favoritas que desean anclar en el selector de reacciones."
+reactionSettingDescription2: "Arrastre para reordenar, click para borrar, apriete la tecla + para añadir."
 rememberNoteVisibility: "Recordar visibilidad"
 attachCancel: "Quitar adjunto"
 markAsSensitive: "Marcar como sensible"
@@ -124,7 +131,9 @@ settingGuide: "Configuración sugerida"
 cacheRemoteFiles: "Mantener en cache los archivos remotos"
 cacheRemoteFilesDescription: "Si desactiva esta configuración, Los archivos remotos se cargarán desde el link directo sin usar la caché. Con eso se puede ahorrar almacenamiento del servidor, pero eso aumentará el tráfico al no crear miniaturas."
 flagAsBot: "Esta cuenta es un bot"
+flagAsBotDescription: "En caso de que esta cuenta fuera usada por un programa, active esta opción. Al hacerlo, esta opción servirá para otros desarrolladores para evitar cadenas infinitas de reacciones, y ajustará los sistemas internos de Misskey para que trate a esta cuenta como un bot."
 flagAsCat: "Esta cuenta es un gato"
+flagAsCatDescription: "En caso de que declare que esta cuenta es de un gato, active esta opción."
 autoAcceptFollowed: "Aceptar automáticamente las solicitudes de seguimiento de los usuarios que sigues"
 addAcount: "Agregar cuenta"
 loginFailed: "Error al iniciar sesión."
@@ -215,6 +224,7 @@ remove: "Borrar"
 removed: "Borrado"
 removeAreYouSure: "¿Desea borrar \"{x}\"?"
 deleteAreYouSure: "¿Desea borrar \"{x}\"?"
+resetAreYouSure: "¿Desea reestablecer?"
 saved: "Guardado"
 messaging: "Chat"
 upload: "Subir"
@@ -314,6 +324,10 @@ bannerUrl: "URL de la imagen del banner"
 basicInfo: "Información básica"
 pinnedUsers: "Usuarios fijados"
 pinnedUsersDescription: "Describir los usuarios que quiere fijar en la página \"Descubrir\" separados por una linea nueva"
+pinnedPages: "Páginas fijadas"
+pinnedPagesDescription: "Describa las rutas de las páginas que desea fijar a la página principal de la instancia, separadas por lineas nuevas"
+pinnedClipId: "Id del clip fijado"
+pinnedNotes: "Nota fijada"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "Habilitar hCaptcha"
 hcaptchaSiteKey: "Clave del sitio"
@@ -428,6 +442,7 @@ useOsNativeEmojis: "Usa los emojis nativos de la plataforma"
 youHaveNoGroups: "Sin grupos"
 joinOrCreateGroup: "Obtenga una invitación para unirse al grupos o puede crear su propio grupo."
 noHistory: "No hay datos en el historial"
+signinHistory: "Historial de ingresos"
 disableAnimatedMfm: "Deshabilitar MFM que tiene animaciones"
 doing: "Voy en camino"
 category: "Categoría"
@@ -480,6 +495,7 @@ none: "Ninguna"
 showInPage: "Mostrar en la página"
 popout: "Popout"
 volume: "Volumen"
+masterVolume: "Volumen principal"
 details: "Detalles"
 chooseEmoji: "Elije un emoji"
 unableToProcess: "La operación no se puede llevar a cabo"
@@ -537,6 +553,9 @@ useBlurEffectForModal: "Usar efecto borroso en modales"
 useFullReactionPicker: "Reacción"
 width: "Ancho"
 height: "Altura"
+large: "Grande"
+medium: "Mediano"
+small: "Pequeño"
 generateAccessToken: "Generar token de acceso"
 permission: "Permisos"
 enableAll: "Activar todo"
@@ -549,6 +568,8 @@ useStarForReactionFallback: "En caso de que los emojis de reacciones no sean cla
 emailConfig: "Configuración del servidor de correos"
 enableEmail: "Activar el envío de correos electrónicos"
 emailConfigInfo: "Usar en caso de validación de correo electrónico y pedido de contraseña"
+email: "Correo"
+emailAddress: "Correo electrónico"
 smtpConfig: "Configuración del servidor SMTP"
 smtpHost: "Host"
 smtpPort: "Puerto"
@@ -580,6 +601,7 @@ regenerateLoginTokenDescription: "Regenerar el token usado internamente durante
 setMultipleBySeparatingWithSpace: "Puedes añadir mas de uno, separado por espacios."
 fileIdOrUrl: "Id del archivo o URL"
 chatOpenBehavior: "Comportamiento al abrir el chat"
+behavior: "Comportamiento"
 sample: "Muestra"
 abuseReports: "Reportes"
 reportAbuse: "Reportar"
@@ -598,7 +620,32 @@ random: "Aleatorio"
 system: "Sistema"
 switchUi: "Cambiar interfaz de usuario"
 desktop: "Escritorio"
+clip: "Clip"
+createNew: "Crear"
+optional: "Opcional"
+createNewClip: "Crear clip nuevo"
 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"
+accountInfo: "Información de la Cuenta"
+notesCount: "Cantidad de notas"
+repliesCount: "Cantidad de respuestas hechas"
+renotesCount: "Cantidad de renotas hechas"
+repliedCount: "Cantidad de respuestas recibidas"
+renotedCount: "Cantidad de renotas recibidas"
+followingCount: "Cantidad de seguidos"
+followersCount: "Cantidad de seguidores"
+sentReactionsCount: "Cantidad de reacciones hechas"
+receivedReactionsCount: "Cantidad de reacciones recibidas"
+pollVotesCount: "Cantidad de votaciones hechas"
+pollVotedCount: "Cantidad de votaciones recibidas"
+yes: "Si"
+no: "No"
+driveFilesCount: "Cantidad de archivos en el drive"
+driveUsage: "Uso del drive"
+noCrawle: "Rechazar indexación del crawler"
+noCrawleDescription: "Pedir a los motores de búsqueda que no indexen tu perfil, notas, páginas, etc."
+clips: "Clip"
 _mfm:
   cheatSheet: "Hoja de referencia de MFM"
   intro: "MFM es un lenguaje de marcado dedicado que se puede usar en varios lugares dentro de Misskey. Aquí puede ver una lista de sintaxis disponibles en MFM."
@@ -870,6 +917,7 @@ _widgets:
   digitalClock: "Reloj digital"
   federation: "Federación"
   postForm: "Formulario"
+  button: "Botón"
 _cw:
   hide: "Ocultar"
   show: "Ver más"

locales/fr-FR.yml

@@ -313,6 +313,7 @@ bannerUrl: "URL de l’image de la bannière"
 basicInfo: "Informations basiques"
 pinnedUsers: "Utilisateur·rice épinglé·e"
 pinnedUsersDescription: "Listez les utilisateur·rice·s que vous souhaitez voir épinglé·e·s sur la page \"Découvrir\", un·e par ligne."
+pinnedNotes: "Note épinglée"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "Activer hCaptcha"
 hcaptchaSiteKey: "Clé du site"
@@ -761,6 +762,7 @@ _widgets:
   digitalClock: "Horloge numérique"
   federation: "Fédération"
   postForm: "Formulaire à publier"
+  button: "Bouton"
 _cw:
   hide: "Masquer"
   show: "Afficher plus …"

locales/ja-JP.yml

@@ -33,6 +33,9 @@ addUser: "ユーザーを追加"
 favorite: "お気に入り"
 favorites: "お気に入り"
 unfavorite: "お気に入り解除"
+favorited: "お気に入りに登録しました。"
+alreadyFavorited: "既にお気に入りに登録されています。"
+cantFavorite: "お気に入りに登録できませんでした。"
 pin: "ピン留め"
 unpin: "ピン留め解除"
 copyContent: "内容をコピー"
@@ -87,6 +90,9 @@ followRequestPending: "フォロー許可待ち"
 enterEmoji: "絵文字を入力"
 renote: "Renote"
 unrenote: "Renote解除"
+renoted: "Renoteしました。"
+cantRenote: "この投稿はRenoteできません。"
+cantReRenote: "RenoteをRenoteすることはできません。"
 quote: "引用"
 pinnedNote: "ピン留めされたノート"
 you: "あなた"
@@ -95,7 +101,7 @@ sensitive: "閲覧注意"
 add: "追加"
 reaction: "リアクション"
 reactionSettingDescription: "リアクションピッカーに表示するリアクションを設定します。"
-reactionSettingDescription2: "ドラッグして並び替えます。クリックして削除します。"
+reactionSettingDescription2: "ドラッグして並び替え、クリックして削除、＋を押して追加します。"
 rememberNoteVisibility: "公開範囲を記憶する"
 attachCancel: "添付取り消し"
 markAsSensitive: "閲覧注意にする"
@@ -320,6 +326,8 @@ pinnedUsers: "ピン留めユーザー"
 pinnedUsersDescription: "「みつける」ページなどにピン留めしたいユーザーを改行で区切って記述します。"
 pinnedPages: "ピン留めページ"
 pinnedPagesDescription: "インスタンスのトップページにピン留めしたいページのパスを改行で区切って記述します。"
+pinnedClipId: "ピン留めするクリップのID"
+pinnedNotes: "ピン留めされたノート"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "hCaptchaを有効にする"
 hcaptchaSiteKey: "サイトキー"
@@ -650,6 +658,18 @@ pageLikedCount: "Pageにいいねされた数"
 reversiCount: "リバーシの対局数"
 contact: "連絡先"
 useSystemFont: "システムのデフォルトのフォントを使う"
+clips: "クリップ"
+experimentalFeatures: "実験的機能"
+developer: "開発者"
+makeExplorable: "アカウントを見つけやすくする"
+makeExplorableDescription: "オフにすると、「みつける」にアカウントが載らなくなります。"
+showGapBetweenNotesInTimeline: "タイムラインのノートを離して表示"
+duplicate: "複製"
+left: "左"
+center: "中央"
+wide: "広い"
+narrow: "狭い"
+reloadToApplySetting: "設定はページリロード後に反映されます。今すぐリロードしますか？"
 
 _aboutMisskey:
   about: "Misskeyはsyuiloによって2014年から開発されている、オープンソースのソフトウェアです。"
@@ -990,6 +1010,8 @@ _widgets:
   digitalClock: "デジタル時計"
   federation: "連合"
   postForm: "投稿フォーム"
+  slideshow: "スライドショー"
+  button: "ボタン"
 
 _cw:
   hide: "隠す"
@@ -1054,6 +1076,8 @@ _profile:
   metadataDescription: "プロフィールに表として4つまでの追加情報を表示することができます。"
   metadataLabel: "ラベル"
   metadataContent: "内容"
+  changeAvatar: "アバター画像を変更"
+  changeBanner: "バナー画像を変更"
 
 _exportOrImport:
   allNotes: "全てのノート"
@@ -1497,6 +1521,8 @@ _notification:
 _deck:
   alwaysShowMainColumn: "常にメインカラムを表示"
   columnAlign: "カラムの寄せ"
+  columnMargin: "カラム間のマージン"
+  columnHeaderHeight: "カラムのヘッダー幅"
   addColumn: "カラムを追加"
   swapLeft: "左に移動"
   swapRight: "右に移動"
@@ -1506,6 +1532,7 @@ _deck:
   popRight: "右に出す"
 
   _columns:
+    main: "メイン"
     widgets: "ウィジェット"
     notifications: "通知"
     tl: "タイムライン"

locales/ja-KS.yml

@@ -33,6 +33,9 @@ addUser: "ユーザーを追加や"
 favorite: "お気に入り"
 favorites: "お気に入り"
 unfavorite: "やっぱ気に入らん"
+favorited: "お気に入りに登録したで"
+alreadyFavorited: "もうお気に入りに入れとるがな。"
+cantFavorite: "アカン、お気に入り登録できへんかったで。"
 pin: "ピン留めしとく"
 unpin: "やっぱピン留めせん"
 copyContent: "内容をコピー"
@@ -87,6 +90,9 @@ followRequestPending: "フォロー許してくれるん待っとる"
 enterEmoji: "絵文字を入れてや"
 renote: "Renote"
 unrenote: "Renoteやめる"
+renoted: "Renoteしたで。"
+cantRenote: "この投稿はRenoteできへんらしい。"
+cantReRenote: "すまん、今このRenoteにRenoteはできへんのや。"
 quote: "引用"
 pinnedNote: "ピン留めされとるノート"
 you: "あんた"
@@ -95,6 +101,7 @@ sensitive: "ちょっとアカンやつやで"
 add: "増やす"
 reaction: "リアクション"
 reactionSettingDescription: "リアクションピッカーに出しとくリアクションを選んでや。"
+reactionSettingDescription2: "ドラッグして並び替え、クリックして削除、＋を押すと追加できるで。"
 rememberNoteVisibility: "公開範囲覚えといて"
 attachCancel: "やっぱ添付やめてくれん？"
 markAsSensitive: "ちょっとこれはアカン"
@@ -124,7 +131,9 @@ settingGuide: "ええ感じの設定"
 cacheRemoteFiles: "リモートのファイルをキャッシュする"
 cacheRemoteFilesDescription: "この設定を切っとくと、リモートファイルをキャッシュせず直リンクするようになってしまうんやで？　サーバーのストレージは節約できるんやけど、かわりにサムネイルが作られんくなるから通信量が増えるで？"
 flagAsBot: "Botやで"
+flagAsBotDescription: "もしこのアカウントがプログラムによって運用されるんやったら、このフラグをオンにしてたのむで。オンにすると、反応の連鎖を防ぐためのフラグとして他の開発者に役立ったり、Misskeyのシステム上での扱いがBotに合ったもんになるんやで。"
 flagAsCat: "Catやで"
+flagAsCatDescription: "ワレ、猫ちゃんならこのフラグをつけてみ？"
 autoAcceptFollowed: "フォローしとるユーザーからのフォローリクエストには勝手に許可しとくで。"
 addAcount: "アカウント追加"
 loginFailed: "ログインに失敗してしもうた…"
@@ -215,6 +224,7 @@ remove: "ほかす"
 removed: "削除したで！"
 removeAreYouSure: "「{x}」はなおしてしもてええか？"
 deleteAreYouSure: "「{x}」はなおしてしもてええか？"
+resetAreYouSure: "リセットしてええん？"
 saved: "保存したで！"
 messaging: "チャット"
 upload: "アップロード"
@@ -314,6 +324,8 @@ bannerUrl: "バナー画像のURL"
 basicInfo: "基本情報"
 pinnedUsers: "ピン留めしたユーザー"
 pinnedUsersDescription: "「みつける」ページとかにピン留めしたいユーザーをここに書けばええんやで。他ん人との名前は改行で区切ればええんやで。"
+pinnedPages: "ピン留めページ"
+pinnedNotes: "ピン留めされとるノート"
 hcaptcha: "hCaptcha（キャプチャ）"
 enableHcaptcha: "hCaptcha（キャプチャ）をつけとく"
 hcaptchaSiteKey: "サイトキー"
@@ -403,9 +415,42 @@ quoteQuestion: "引用として添付してもええか？"
 noMessagesYet: "まだチャットはあらへんで"
 newMessageExists: "新しいメッセージがきたで"
 onlyOneFileCanBeAttached: "すまん、メッセージに添付できるファイルはひとつだけなんや。"
+signinRequired: "ログインしてくれへん？"
 invitations: "来てや"
 invitationCode: "招待コード"
 checking: "確認しとるで"
+available: "利用できる\n"
+unavailable: "利用できん"
+usernameInvalidFormat: "a~z、A~Z、0~9、_が使えるで"
+tooShort: "短すぎやろ!"
+tooLong: "長すぎやろ！"
+weakPassword: "弱いパスワード"
+normalPassword: "普通のパスワード"
+strongPassword: "ええ感じのパスワード"
+passwordMatched: "よし！一致や！"
+passwordNotMatched: "一致しとらんで？"
+signinWith: "{x}でログイン"
+or: "それか"
+uiLanguage: "UIの表示言語"
+groupInvited: "グループに招待されとるで"
+aboutX: "{x}について"
+useOsNativeEmojis: "OSネイティブの絵文字を使う"
+youHaveNoGroups: "グループがあらへんねぇ。"
+noHistory: "履歴はあらへんねぇ。"
+signinHistory: "ログイン履歴"
+doing: "やっとるがな"
+category: "カテゴリ"
+tags: "タグ"
+docSource: "このドキュメントのソース"
+createAccount: "アカウントを作成"
+existingAcount: "既存のアカウント"
+regenerate: "再生成"
+fontSize: "フォントサイズ"
+noFollowRequests: "フォロー申請はあらへんで"
+openImageInNewTab: "画像を新しいタブで開く"
+dashboard: "ダッシュボード"
+local: "ローカル"
+remote: "リモート"
 smtpHost: "ホスト"
 smtpUser: "ユーザー名"
 smtpPass: "パスワード"
@@ -500,6 +545,7 @@ _pages:
       array: "リスト"
 _notification:
   youWereFollowed: "フォローされたで"
+  youWereInvitedToGroup: "グループに招待されとるで"
   _types:
     follow: "フォロー"
     mention: "メンション"

locales/ko-KR.yml

@@ -95,7 +95,6 @@ sensitive: "열람주의"
 add: "추가"
 reaction: "리액션"
 reactionSettingDescription: "리액션 선택 상자에 표시할 리액션을 설정합니다."
-reactionSettingDescription2: "드래그하여 순서를 바꿉니다. 클릭하면 삭제됩니다."
 rememberNoteVisibility: "공개 범위를 기억하기"
 attachCancel: "첨부 취소"
 markAsSensitive: "열람주의로 설정"
@@ -127,6 +126,7 @@ cacheRemoteFilesDescription: "이 설정을 해지하면 리모트 파일을 캐
 flagAsBot: "나는 봇입니다"
 flagAsBotDescription: "이 계정을 자동화된 수단으로 운용할 경우에 활성화해 주세요. 이 플래그를 활성화하면, 다른 봇이 이를 참고하여 봇 끼리의 무한 연쇄 반응을 회피하거나, 이 계정의 시스템 상에서의 취급이 Bot 운영에 최적화되는 등의 변화가 생깁니다."
 flagAsCat: "나는 고양이다냥"
+flagAsCatDescription: "이 계정이 고양이라면 활성화 해주세요."
 autoAcceptFollowed: "팔로우 중인 유저로부터의 팔로우 요청을 자동 수락"
 addAcount: "계정 추가"
 loginFailed: "로그인에 실패했습니다"
@@ -319,6 +319,7 @@ pinnedUsers: "고정된 유저"
 pinnedUsersDescription: "\"발견하기\" 페이지 등에 고정하고 싶은 유저를 한 줄에 한 명씩 적습니다."
 pinnedPages: "고정한 페이지"
 pinnedPagesDescription: "인스턴스의 대문에 고정하고 싶은 페이지의 경로를 한 줄에 하나씩 적습니다."
+pinnedNotes: "고정해놓은 노트"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "hCaptcha 활성화"
 hcaptchaSiteKey: "사이트 키"
@@ -433,6 +434,7 @@ useOsNativeEmojis: "OS 기본 이모지를 사용"
 youHaveNoGroups: "그룹이 없습니다"
 joinOrCreateGroup: "다른 그룹의 초대를 받거나, 직접 새 그룹을 만들어 보세요."
 noHistory: "기록이 없습니다"
+signinHistory: "로그인 기록"
 disableAnimatedMfm: "움직임이 있는 MFM을 비활성화"
 doing: "잠시만요"
 category: "카테고리"
@@ -484,6 +486,7 @@ none: "없음"
 showInPage: "페이지로 보기"
 popout: "새 창으로 열기"
 volume: "음량"
+masterVolume: "마스터 볼륨"
 details: "자세히"
 chooseEmoji: "이모지 선택"
 unableToProcess: "작업을 완료할 수 없습니다"
@@ -581,6 +584,7 @@ regenerateLoginTokenDescription: "로그인할 때 사용되는 내부 토큰을
 setMultipleBySeparatingWithSpace: "공백으로 구분하여 여러 개 설정할 수 있습니다."
 fileIdOrUrl: "파일 ID 또는 URL"
 chatOpenBehavior: "대화를 열 때의 동작"
+behavior: "동작"
 sample: "예시"
 abuseReports: "신고"
 reportAbuse: "신고"
@@ -588,7 +592,9 @@ reportAbuseOf: "{name}을 신고하기"
 fillAbuseReportDescription: "신고하려는 이유를 자세히 알려주세요. 특정 게시물을 신고할 때에는 게시물의 URL도 포함해 주세요."
 abuseReported: "신고를 보냈습니다. 신고해 주셔서 감사합니다."
 send: "전송"
+openInNewTab: "새 탭에서 열기"
 random: "랜덤"
+system: "시스템"
 switchUi: "UI 전환"
 desktop: "데스크탑"
 clip: "클립"
@@ -596,6 +602,18 @@ createNew: "새로 만들기"
 optional: "옵션"
 createNewClip: "새 클립 만들기"
 public: "공개"
+manageAccessTokens: "액세스 토큰 관리"
+yes: "예"
+no: "아니오"
+driveUsage: "드라이브 사용량"
+noCrawle: "검색엔진의 인덱싱 거부"
+noCrawleDescription: "검색엔진에 사용자 페이지, 노트, 페이지 등의 콘텐츠를 인덱싱되지 않게 합니다."
+lockedAccountInfo: "팔로우를 승인으로 승인받더라도 노트의 공개 범위를 '팔로워'로 하지 않는 한 누구나 당신의 노트를 볼 수 있습니다."
+alwaysMarkSensitive: "미디어를 항상 열람 주의로 설정"
+emailVerified: "메일 주소가 확인되었습니다."
+clips: "클립"
+_nsfw:
+  ignore: "열람 주의 미디어 항상 표시"
 _mfm:
   cheatSheet: "MFM 도움말"
   intro: "MFM는 Misskey의 다양한 곳에서 사용할 수 있는 전용 마크업 언어입니다. 여기에서는 MFM에서 사용할 수 있는 구문을 확인할 수 있습니다."
@@ -610,13 +628,20 @@ _mfm:
   smallDescription: "내용을 작고 연하게 보이게 합니다."
   center: "가운데 정렬"
   centerDescription: "내용을 가운데 정렬로 보이게 합니다."
+  inlineCode: "코드(인라인)"
+  blockCode: "코드(블록)"
+  inlineMath: "수식(인라인)"
   inlineMathDescription: "수식(KaTeX)를 인라인으로 보이게 합니다."
+  blockMath: "수식(블록)"
   blockMathDescription: "여러 줄의 수식(KaTeX)를 블록으로 보이게 합니다."
   quote: "인용"
   emoji: "커스텀 이모지"
   emojiDescription: "커스텀 이모지의 이름을 쌍점(:)으로 감싸서 커스텀 이모지를 사용합니다."
   search: "검색"
   searchDescription: "주어진 키워드가 입력된 검색창을 보이게 합니다."
+  flip: "플립"
+  flipDescription: "내용을 상하 또는 좌우로 반전시킵니다."
+  jump: "애니메이션(점프)"
 _reversi:
   reversi: "리버시"
   gameSettings: "대국 설정"
@@ -628,6 +653,7 @@ _reversi:
   thisGameIsStartedSoon: "잠시 후에 대국이 시작됩니다"
   waitingForOther: "상대의 준비가 완료될 때까지 기다리고 있습니다"
   waitingForMe: "당신의 준비 완료를 기다리고 있습니다"
+  ready: "준비 완료"
   myTurn: "당신의 차례입니다"
   turnOf: "{name}님의 차례입니다"
   pastTurnOf: "{name}님의 차례"
@@ -635,6 +661,8 @@ _reversi:
   surrendered: "기권에 의해"
   drawn: "무승부"
   won: "{name}님의 승리"
+  black: "흑"
+  white: "백"
   total: "합계"
   turnCount: "{count}턴 째"
   myGames: "내 대국"
@@ -806,6 +834,7 @@ _widgets:
   digitalClock: "디지털 시계"
   federation: "연합"
   postForm: "글 입력란"
+  button: "버튼"
 _cw:
   hide: "숨기기"
   show: "더 보기"

locales/ru-RU.yml

@@ -33,6 +33,9 @@ addUser: "Добавить пользователя"
 favorite: "В избранное"
 favorites: "Избранное"
 unfavorite: "Убрать из избранного"
+favorited: "Добавлено в избранное."
+alreadyFavorited: "Уже есть в избранном."
+cantFavorite: "Не удалось добавить в избранное."
 pin: "Закрепить в профиле"
 unpin: "Открепить от профиля"
 copyContent: "Скопировать содержимое"
@@ -87,6 +90,9 @@ followRequestPending: "Нерассмотренный запрос на подп
 enterEmoji: "Введите эмодзи"
 renote: "Репост"
 unrenote: "Отмена репоста"
+renoted: "Репост совершён."
+cantRenote: "Это нельзя репостить."
+cantReRenote: "Невозможно репостить репост."
 quote: "Цитата"
 pinnedNote: "Закреплённая заметка"
 you: "Вы"
@@ -95,7 +101,7 @@ sensitive: "Содержимое не для всех"
 add: "Добавить"
 reaction: "Реакции"
 reactionSettingDescription: "Подберите, что будет у вас в палитре реакций"
-reactionSettingDescription2: "Меняйте порядок перетаскиванием. Удаляйте нажатием."
+reactionSettingDescription2: "Расставляйте перетаскиванием, удаляйте нажатием, добавляйте кнопкой «+»."
 rememberNoteVisibility: "Запоминать видимость заметок"
 attachCancel: "Удалить вложение"
 markAsSensitive: "Отметить как «не для всех»"
@@ -320,6 +326,8 @@ pinnedUsers: "Прикреплённый пользователь"
 pinnedUsersDescription: "Перечислите по одному имени пользователя в строке. Пользователи, перечисленные здесь, будут привязаны к закладке \"Изучение\"."
 pinnedPages: "Закрепленные страницы"
 pinnedPagesDescription: "Если хотите закрепить страницы на главной сайта, сюда можно добавить пути к ним, каждый в отдельной строке."
+pinnedClipId: "Идентификатор закреплённой памятки"
+pinnedNotes: "Закреплённая заметка"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "Включить hCaptcha"
 hcaptchaSiteKey: "Ключ сайта"
@@ -648,6 +656,26 @@ noteFavoritesCount: "Количество добавленного в избра
 pageLikesCount: "Количество понравившихся страниц"
 pageLikedCount: "Количество страниц, понравившихся другим"
 reversiCount: "Количество сыгранных игр в реверси"
+contact: "Как связаться"
+useSystemFont: "Использовать шрифт, предлагаемый системой"
+clips: "Памятки"
+experimentalFeatures: "Экспериментальные функции"
+developer: "Разработчик"
+makeExplorable: "Опубликовать профиль в «Обзоре»."
+makeExplorableDescription: "Если выключить, ваш профиль не будет показан в разделе «Обзор»."
+showGapBetweenNotesInTimeline: "Показывать разделитель между заметками в ленте"
+duplicate: "Дубликат"
+left: "Влево"
+center: "По центру"
+_aboutMisskey:
+  about: "Misskey — программа с открытым исходным кодом, которую разрабатывает syuilo с 2014 года."
+  contributors: "Основные соавторы"
+  allContributors: "Все соавторы"
+  source: "Исходный код"
+  translation: "Перевод Misskey"
+  donate: "Пожертвование на Misskey"
+  morePatrons: "Большое спасибо и многим другим, кто принял участие в этом проекте! 🥰"
+  patrons: "Материальная поддержка"
 _nsfw:
   respect: "Скрывать содержимое не для всех"
   ignore: "Показывать содержимое не для всех"
@@ -958,6 +986,8 @@ _widgets:
   digitalClock: "Цифровые часы"
   federation: "Федерация"
   postForm: "Форма отправки"
+  slideshow: "Показ слайдов"
+  button: "Кнопка"
 _cw:
   hide: "Спрятать"
   show: "Показать еще"
@@ -1017,6 +1047,8 @@ _profile:
   metadataDescription: "Можно добавить до четырёх дополнительных граф в профиль."
   metadataLabel: "Метка"
   metadataContent: "Содержимое"
+  changeAvatar: "Поменять аватар"
+  changeBanner: "Поменять изображение в шапке"
 _exportOrImport:
   allNotes: "Все записи\n"
   followingList: "Подписки"
@@ -1438,6 +1470,8 @@ _notification:
 _deck:
   alwaysShowMainColumn: "Всегда показывать главную колонку"
   columnAlign: "Выравнивание колонок"
+  columnMargin: "Расстояние между колонками"
+  columnHeaderHeight: "Высота заголовка колонки"
   addColumn: "Добавить колонку"
   swapLeft: "Переставить левее"
   swapRight: "Переставить правее"
@@ -1446,6 +1480,7 @@ _deck:
   stackLeft: "В столбик влево"
   popRight: "Из столбика вправо"
   _columns:
+    main: "Основная"
     widgets: "Виджеты"
     notifications: "Уведомления"
     tl: "Лента"

locales/uk-UA.yml

@@ -82,7 +82,7 @@ defaultNoteVisibility: "Видимість за замовчуванням"
 follow: "Підписка"
 followRequest: "Запит на підписку"
 followRequests: "Запити на підписку"
-unfollow: "Відписатися"
+unfollow: "Відписатись"
 followRequestPending: "Очікуючі запити на підписку"
 enterEmoji: "Введіть емодзі"
 renote: "Поширити"
@@ -95,7 +95,6 @@ sensitive: "NSFW"
 add: "Додати"
 reaction: "Реакції"
 reactionSettingDescription: "Виберіть свої улюблені реакції, які хочете закріпити в селекторі реакцій."
-reactionSettingDescription2: "Перетягніть для реорганізації, натисніть для видалення."
 rememberNoteVisibility: "Пам’ятати параметри видимісті"
 attachCancel: "Видалити вкладення"
 markAsSensitive: "Позначити як NSFW"
@@ -144,7 +143,7 @@ recipient: "Кому"
 annotation: "Коментар"
 federation: "Федіверс"
 instances: "Інстанс"
-registeredAt: "Приєднався(-лась)"
+registeredAt: "Приєднався(лась)"
 latestRequestSentAt: "Останній запит надіслано"
 latestRequestReceivedAt: "Останній запит прийнято"
 latestStatus: "Останній статус"
@@ -240,7 +239,7 @@ activity: "Активність"
 images: "Зображення"
 birthday: "День народження"
 yearsOld: "{age} років"
-registeredDate: "Приєднався(-лась)"
+registeredDate: "Приєднався(лась)"
 location: "Локація"
 theme: "Тема"
 themeForLightMode: "Світла тема"
@@ -314,6 +313,7 @@ basicInfo: "Основна інформація"
 pinnedUsers: "Закріплені користувачі"
 pinnedPages: "Закріплені сторінки"
 pinnedPagesDescription: "Введіть шляхи сторінок, які ви бажаєте закріпити на головній сторінці цього інстанса, розділені новими рядками."
+pinnedNotes: "Закріплена нотатка"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "Увімкнути hCaptcha"
 hcaptchaSiteKey: "Ключ сайту"
@@ -337,6 +337,10 @@ withReplies: "Включаючи відповіді"
 connectedTo: "Наступні акаунти під'єднані"
 notesAndReplies: "Нотатки та відповіді"
 withFiles: "Файли"
+silence: "Заглушити"
+silenceConfirm: "Ви впевнені, що хочете заглушити цього користувача?"
+unsilence: "Не глушити"
+unsilenceConfirm: "Ви впевнені, що хочете скасувати глушіння цього користувача?"
 popularUsers: "Популярні користувачі"
 recentlyUpdatedUsers: "Нещодавно активні користувачі"
 recentlyRegisteredUsers: "Нещодавно зареєстровані користувачі"
@@ -419,6 +423,7 @@ groupInvited: "Запрошення до групи"
 aboutX: "Про {x}"
 useOsNativeEmojis: "Використовувати емодзі ОС"
 youHaveNoGroups: "Немає груп"
+joinOrCreateGroup: "Отримуйте запрошення до груп або створюйте свої власні групи."
 noHistory: "Історія порожня"
 signinHistory: "Історія входів"
 disableAnimatedMfm: "Відключити анімації MFM"
@@ -447,6 +452,7 @@ numberOfDays: "Кількість днів"
 hideThisNote: "Сховати цю нотатку"
 showFeaturedNotesInTimeline: "Показувати популярні нотатки у стрічці"
 objectStorage: "Object Storage"
+useObjectStorage: "Використовувати object storage"
 objectStorageBaseUrl: "Base URL"
 objectStorageBucket: "Bucket"
 objectStoragePrefix: "Prefix"
@@ -479,6 +485,7 @@ sort: "Сортування"
 ascendingOrder: "За зростанням"
 descendingOrder: "За спаданням"
 scratchpad: "Чернетка"
+scratchpadDescription: "Scratchpad надає середовище для експериментів з AiScript. Ви можете писати, виконувати його і тестувати взаємодію з Misskey."
 output: "Вихід"
 script: "Скрипт"
 disablePagesScript: "Вимкнути AiScript на Сторінках"
@@ -527,13 +534,16 @@ notificationType: "Тип сповіщення"
 edit: "Редагувати"
 useStarForReactionFallback: "Використовувати ★ як запасний варіант, якщо емодзі реакції невідомий"
 emailConfig: "Налаштування email сервера"
+email: "E-mail"
+emailAddress: "E-mail адреса"
 smtpHost: "Хост"
 smtpPort: "Порт"
 smtpUser: "Ім'я користувача"
 smtpPass: "Пароль"
 testEmail: "Тестовий email"
-wordMute: "Ігнор слів"
+wordMute: "Блокування слів"
 makeActive: "Активувати"
+display: "Відображення"
 copy: "Скопіювати"
 metrics: "Показники"
 overview: "Огляд"
@@ -547,25 +557,83 @@ notificationSettingDesc: "Виберіть типи сповіщень для в
 useGlobalSetting: "Застосувати глобальнi параметри"
 other: "Інше"
 regenerateLoginToken: "Оновити Login Token"
+behavior: "Поведінка"
 sample: "Приклад"
+abuseReports: "Скарги"
 reportAbuse: "Поскаржитись"
 reportAbuseOf: "Поскаржитись на {name}"
 send: "Відправити"
 abuseMarkAsResolved: "Позначити скаргу як вирішену"
 openInNewTab: "Відкрити в новій вкладці"
+defaultNavigationBehaviour: "Поведінка навігації за замовчуванням"
+editTheseSettingsMayBreakAccount: "Зміна цих параметрів може призвести до пошкодження вашого акаунта."
+instanceTicker: "Мітка з назвою інстанса в нотатках"
 waitingFor: "Чекаємо на {x}"
 random: "Випадковий"
 system: "Система"
 switchUi: "Інтерфейс"
 desktop: "Десктоп"
 clip: "Добірка"
+createNew: "Створити новий"
+optional: "Необов'язково"
 public: "Публічний"
+i18nInfo: "Misskey перекладається на різні мови волонтерами. Ви можете допомогти: {link}"
+manageAccessTokens: "Керування токенами доступу"
+accountInfo: "Інформація про акаунт"
+notesCount: "Кількість нотаток"
+repliesCount: "Кількість надісланих відповідей"
+renotesCount: "Кількість поширень"
+repliedCount: "Кількість отриманих відповідей"
+renotedCount: "Кількість отриманих поширень"
+followingCount: "Кількість підписок"
+followersCount: "Кількість підписників"
+sentReactionsCount: "Кількість надісланих реакцій"
+receivedReactionsCount: "Кількість отриманих реакцій"
+pollVotesCount: "Кількість надісланих голосів"
+pollVotedCount: "Кількість отриманих голосів"
+yes: "Так"
+no: "Ні"
+driveFilesCount: "Кількість файлів на диску"
+driveUsage: "Використання місця на диску"
+noCrawle: "Заборонити індексацію"
+noCrawleDescription: "Просити пошукові системи не індексувати ваш профіль, нотатки, сторінки тощо."
+alwaysMarkSensitive: "Позначати NSFW за замовчуванням"
+loadRawImages: "Відображати вкладені зображення повністю замість ескізів"
+disableShowingAnimatedImages: "Не програвати анімовані зображення"
+notSet: "Не налаштовано"
+emailVerified: "Електронну пошту підтверджено."
+noteFavoritesCount: "Кількість улюблених нотаток"
+pageLikesCount: "Кількість отриманих вподобань сторінки"
+pageLikedCount: "Кількість вподобаних сторінок"
+reversiCount: "Кількість матчів \"Реверсі\""
+contact: "Контакт"
+useSystemFont: "Використовувати стандартний шрифт системи"
+clips: "Добірка"
+experimentalFeatures: "Експериментальні функції"
+developer: "Розробник"
+_aboutMisskey:
+  about: "Misskey - це програмне забезпечення з відкритим кодом, яке розробляє syuilo з 2014 року."
+  contributors: "Головні помічники"
+  allContributors: "Всі помічники"
+  source: "Вихідний код"
+  translation: "Перекладати Misskey"
+  donate: "Пожертвувати Misskey"
+  morePatrons: "Ми дуже цінуємо підтримку багатьох інших помічників, не перелічених тут. Дякуємо! 🥰"
+  patrons: "Підтримали"
+_nsfw:
+  respect: "Приховувати NSFW медіа"
+  ignore: "Не приховувати NSFW медіа"
+  force: "Приховувати всі медіа файли"
 _mfm:
   cheatSheet: " Довідка MFM"
   intro: "MFM це ексклюзивна мова розмітки тексту в Misskey, яку можна використовувати в багатьох місцях. Тут ви можете переглянути приклади її синтаксису."
+  dummy: "Misskey розширює світ Федіверсу"
   mention: "Згадка"
+  mentionDescription: "За допомогою знака \"@\" перед ім'ям можна згадати конкретного користувача."
   hashtag: "Хештеґ"
+  hashtagDescription: "За допомогою знака \"решітка\" перед словом задається хештег."
   url: "URL"
+  urlDescription: "Відображаються URL-адреси."
   link: "Посилання"
   linkDescription: "Окремі частини тексту можуть містити посилання"
   bold: "Жирний шрифт"
@@ -579,6 +647,7 @@ _mfm:
   blockCode: "Код (блок)"
   blockCodeDescription: "Показує кілька рядків тексту як блок програмного кода"
   inlineMath: "Формула (у рядку)"
+  inlineMathDescription: "Відображення математичних формул (KaTeX) у рядку"
   blockMath: "Формули (блок)"
   quote: "Цитата"
   emoji: "Кастомні емоджі"
@@ -602,6 +671,7 @@ _reversi:
   blackOrWhite: "Чорні / Білі"
   blackIs: "{name} грає чорними"
   rules: "Правила"
+  botSettings: "Параметри бота"
   thisGameIsStartedSoon: "Гра розпочнеться через кілька секунд"
   waitingForOther: "Чекаємо на хід суперника"
   waitingForMe: "Чекаємо на ваш хід"
@@ -636,9 +706,19 @@ _channel:
   setBanner: "Встановити банер"
   removeBanner: "Видалити банер"
   featured: "Тренди"
+  usersCount: "{n} учасників"
+  notesCount: "{n} дописів"
 _sidebar:
+  full: "Повна"
   icon: "Аватар"
+  hide: "Сховати"
+_wordMute:
+  soft: "М'яко"
+  hard: "Жорстко"
+  mutedNotes: "Заблоковані нотатки"
 _theme:
+  defaultValue: "Значення за замовчуванням"
+  func: "Функції"
   keys:
     accent: "Акцент"
     bg: "Фон"
@@ -661,8 +741,10 @@ _theme:
     divider: "Розділювач"
 _sfx:
   note: "Нотатки"
+  noteMy: "Мої нотатки"
   notification: "Сповіщення"
   chat: "Чати"
+  chatBg: "Чати (фон)"
 _ago:
   unknown: "Невідомо"
   future: "Майбутнє"
@@ -682,80 +764,522 @@ _time:
 _tutorial:
   title: "Як користуватись Misskey"
   step1_1: "Ласкаво просимо!"
+  step1_3: "Наразі ваша стрічка порожня, оскільки ви ще не написали жодної нотатки і не підписані на інших."
+  step3_2: "Наступним кроком є написання нотатки. Це можна зробити, натиснувши зображення олівця на екрані."
+_2fa:
+  registerKey: "Зареєструвати новий ключ безпеки"
+_permissions:
+  "read:account": "Переглядати дані профілю"
+  "write:account": "Змінити дані акаунту"
+  "read:blocks": "Переглянути список заблокованих"
+  "write:blocks": "Редагувати список заблокованих"
+  "read:drive": "Переглянути вміст Диска"
+  "write:drive": "Змінювати вміст Диска"
+  "read:favorites": "Переглядати обране"
+  "write:favorites": "Змінювати обране"
+  "read:following": "Переглядати підписки"
+  "write:following": "Змінювати підписки"
+  "read:messaging": "Переглядати повідомлення"
+  "write:messaging": "Створювати та видаляти повідомлення"
+  "read:mutes": "Переглядати список ігнорованих"
+  "write:mutes": "Змінювати список ігнорованих"
+  "write:notes": "Писати і видаляти нотатки"
+  "read:notifications": "Переглядати сповіщення"
+  "read:reactions": "Переглядати реакції"
+  "write:reactions": "Змінювати реакції"
+  "write:votes": "Голосувати в опитуваннях"
+  "read:pages": "Переглядати сторінки"
+  "write:pages": "Змінювати і видаляти сторінки"
+  "read:page-likes": "Переглядати вподобання сторінок"
+  "write:page-likes": "Змінювати вподобання сторінок"
+  "read:user-groups": "Переглядати групи користувача"
+  "write:user-groups": "Змінювати групи користувача"
+  "read:channels": "Переглядати канали"
+  "write:channels": "Змінювати канали"
+_auth:
+  shareAccess: "Ви хочете надати \"{name}\" доступ до цього акаунту?"
+  shareAccessAsk: "Ви впевнені, що хочете надати цій програмі доступ до вашого акаунту?"
+  denied: "У доступі відмовлено"
 _antennaSources:
+  all: "Всі нотатки"
   homeTimeline: "Нотатки тих, на кого ви підписані"
+_weekday:
+  sunday: "Неділя"
+  monday: "Понеділок"
+  tuesday: "Вівторок"
+  wednesday: "Середа"
+  thursday: "Четвер"
+  friday: "П'ятниця"
+  saturday: "Субота"
 _widgets:
   notifications: "Сповіщення"
   timeline: "Стрічка"
+  calendar: "Календар"
+  trends: "Тенденції"
+  clock: "Годинник"
+  rss: "RSS-читач"
   activity: "Активність"
+  photos: "Фото"
+  digitalClock: "Цифровий годинник"
   federation: "Федіверс"
+  postForm: "Створення нотатки"
+  slideshow: "Слайд-шоу"
+  button: "Кнопка"
 _cw:
+  hide: "Сховати"
   show: "Показати більше"
+  chars: "{count} символів"
+  files: "{count} файлів"
 _poll:
+  noOnlyOneChoice: "Потрібні принаймні два варіанти."
+  noMore: "Більше варіантів додати не можна"
+  canMultipleVote: "Можна вибрати кілька варіантів"
+  expiration: "Опитування закінчується"
+  infinite: "Ніколи"
+  deadlineDate: "Дата закінчення"
   deadlineTime: "г"
+  duration: "Тривалість"
+  votesCount: "{n} голосів"
+  totalVotes: "Всього {n} голосів"
+  vote: "Голосувати"
+  showResult: "Переглянути результати"
+  voted: "Проголосовано"
+  closed: "Завершено"
+  remainingDays: "Залишилось {d} днів {h} годин"
+  remainingHours: "Залишилось {h} годин {m} хвилин"
+  remainingMinutes: "Залишилось {m} хвилин {s} секунд"
+  remainingSeconds: "Залишилось {s} секунд"
 _visibility:
+  public: "Публічний"
+  publicDescription: "Для всіх користувачів"
   home: "Домівка"
+  homeDescription: "Лише на домашній стрічці"
   followers: "Підписники"
-  localOnly: "Лише локально"
+  followersDescription: "Тільки для підписників"
+  specified: "Особисто"
+  specifiedDescription: "Лише для певних користувачів"
+  localOnly: "Локально"
+  localOnlyDescription: "Приховано для віддалених користувачів"
 _postForm:
   replyPlaceholder: "Відповідь на цю нотатку..."
+  quotePlaceholder: "Прокоментуйте цю нотатку..."
+  channelPlaceholder: "Опублікувати в каналі"
+  _placeholders:
+    a: "Чим займаєтесь?"
+    b: "Що відбувається навколо вас?"
+    c: "Що у вас на думці?"
+    d: "Що ви хочете висловити?"
+    e: "Напишіть тут, будь ласка..."
+    f: "Чекаю коли ви напишете..."
 _profile:
   name: "Ім'я"
   username: "Ім'я користувача"
+  description: "Про себе"
+  youCanIncludeHashtags: "Ви також можете включити хештеги у свій опис."
+  metadata: "Додаткова інформація"
+  metadataEdit: "Редагувати додаткову інформацію"
+  metadataDescription: "Ви можете вказати до чотирьох пунктів додаткової інформації у своєму профілі."
+  metadataLabel: "Назва"
+  metadataContent: "Вміст"
+  changeAvatar: "Змінити аватар"
+  changeBanner: "Змінити банер"
 _exportOrImport:
+  allNotes: "Всі нотатки"
   followingList: "Підписки"
   muteList: "Ігнорувати"
   blockingList: "Заблокувати"
   userLists: "Списки"
+_charts:
+  federationInstancesTotal: "Загальна кількість федеративних інстансів"
+  usersTotal: "Загальна кількість користувачів"
+  activeUsers: "Активні користувачі"
+  notesTotal: "Загальна кількість нотаток"
+  filesIncDec: "Зміни кількості файлів"
+  filesTotal: "Загальна кількість файлів"
+_instanceCharts:
+  requests: "Запити"
+  usersTotal: "Сумарна кількість користувачів"
+  notesTotal: "Сумарна кількість нотаток"
+  cacheSizeTotal: "Сумарний розмір кешу"
+  filesTotal: "Сумарна кількість файлів"
 _timelines:
   home: "Домівка"
+  local: "Локальна"
+  social: "Соціальна"
+  global: "Глобальна"
 _rooms:
+  roomOf: "Кімната {user}"
+  addFurniture: "Розмістити меблі"
+  translate: "Пересунути"
+  rotate: "Обертати"
+  exit: "Назад"
+  remove: "Видалити"
+  clear: "Видалити все"
+  leaveConfirm: "Є незбережені зміни. Ви дійсно хочете вийти?"
+  chooseImage: "Виберіть зображення"
+  roomType: "Тип кімнати"
+  carpetColor: "Колір килима"
   _roomType:
-    default: "За умовчанням"
+    default: "За замовчуванням"
+    washitsu: "В японському стилі"
   _furnitures:
+    milk: "Пакет молока"
+    bed: "Ліжко"
+    low-table: "Журнальний стіл"
+    desk: "Письмовий стіл"
+    chair: "Стілець"
+    chair2: "Стілець 2"
+    fan: "Вентилятор"
+    pc: "Комп’ютер"
+    plant: "Кімнатна рослина"
+    plant2: "Кімнатна рослина 2"
+    eraser: "Ластик"
+    pencil: "Олівець"
+    pudding: "Пудинг"
+    cardboard-box: "Картонна коробка"
+    cardboard-box2: "Картонна коробка 2"
+    cardboard-box3: "Картонна коробка 3"
+    book: "Книга"
+    book2: "Книга 2"
+    piano: "Піаніно"
+    facial-tissue: "Серветки"
+    server: "Сервер"
+    moon: "Місяць"
+    corkboard: "Коркова дошка"
+    mousepad: "Килимок для миші"
     monitor: "Монітор"
+    keyboard: "Клавіатура"
+    carpet-stripe: "Смугастий килим"
+    mat: "Мат"
+    color-box: "Книжкова полиця"
+    wall-clock: "Настінний годинник"
+    photoframe: "Фоторамка"
+    cube: "Куб"
+    tv: "Телевізор"
+    pinguin: "Пінгвін"
+    rubik-cube: "Кубик Рубіка"
+    poster-h: "Плакат (горизонтальний)"
+    poster-v: "Плакат (вертикальний)"
+    sofa: "Диван"
+    spiral: "Гвинтові сходи"
+    bin: "Смітник"
+    holo-display: "Голографічний дисплей"
+    energy-drink: "Енергетичний напій"
+    doll-ai: "Лялька Аі-тян"
+    banknote: "Пачка грошей"
 _pages:
+  newPage: "Створити сторінку"
+  editPage: "Редагувати сторінку"
+  readPage: "Перегляд вихідного коду"
+  created: "Сторінка успішно створена."
+  updated: "Сторінка успішно оновлена."
+  deleted: "Сторінку видалено"
+  pageSetting: "Налаштування сторінки"
+  nameAlreadyExists: "Вказана адреса сторінки вже існує."
+  invalidNameTitle: "Вказана адреса сторінки неприпустима."
+  invalidNameText: "Переконайтеся, що не залишили порожнім."
+  editThisPage: "Редагувати цю сторінку"
+  viewSource: "Переглянути вихідний код"
+  viewPage: "Переглянути свої сторінки"
+  like: "Вподобати"
+  unlike: "Не вподобати"
+  my: "Мої сторінки"
+  liked: "Вподобані сторінки"
   featured: "Популярні"
+  inspector: "Інспектор"
+  contents: "Вміст"
+  variables: "Змінні"
+  title: "Заголовок"
+  url: "URL сторінки"
+  summary: "Короткий зміст"
+  alignCenter: "Рівняти елементи по центру"
+  hideTitleWhenPinned: "Приховати заголовок сторінки при закріпленні в профілі"
+  font: "Шрифт"
+  fontSerif: "Serif"
+  fontSansSerif: "Sans serif"
+  eyeCatchingImageSet: "Встановити привабливе зображення"
+  eyeCatchingImageRemove: "Видалити привабливе зображення"
+  chooseBlock: "Додати блок"
+  selectType: "Виберіть тип"
+  enterVariableName: "Введіть назву для змінної"
+  contentBlocks: "Контент"
+  inputBlocks: "Ввід"
+  specialBlocks: "Особливе"
   blocks:
+    text: "Текст"
+    textarea: "Текстова область"
+    section: "Розділ"
     image: "Зображення"
+    button: "Кнопка"
+    if: "Якщо"
+    _if:
+      variable: "Змінні"
+    post: "Створення нотатки"
+    _post:
+      text: "Вміст"
+    textInput: "Введення тексту"
+    _textInput:
+      name: "Ім'я змінної"
+      text: "Назва"
+      default: "Значення за замовчуванням"
+    textareaInput: "Багаторядкове введення тексту"
+    _textareaInput:
+      name: "Ім'я змінної"
+      text: "Назва"
+      default: "Значення за замовчуванням"
+    numberInput: "Числове введення"
+    _numberInput:
+      name: "Ім'я змінної"
+      text: "Назва"
+      default: "Значення за замовчуванням"
+    _canvas:
+      width: "Ширина"
+      height: "Висота"
+    note: "Вбудована нотатка"
+    _note:
+      id: "Ідентифікатор нотатки"
+      idDescription: "Також можна вказати посилання на нотатку"
+      detailed: "Детальний вигляд"
+    switch: "Перемикач"
+    _switch:
+      name: "Ім'я змінної"
+      text: "Назва"
+      default: "Значення за замовчуванням"
+    counter: "Лічильник"
+    _counter:
+      name: "Ім'я змінної"
+      text: "Назва"
+      inc: "Збільшити на"
+    _button:
+      text: "Напис"
+      _action:
+        _dialog:
+          content: "Вміст"
+        resetRandom: "Скидання генератора випадковості"
+        pushEvent: "Надіслати подію"
+        _pushEvent:
+          event: "Назві події"
+          message: "Повідомлення для відображення при активації"
+          variable: "Змінна для надсилання"
+          no-variable: "Відсутньо"
+        callAiScript: "Виклик AiScript"
+        _callAiScript:
+          functionName: "Ім'я функції"
+    radioButton: "Вибір"
+    _radioButton:
+      name: "Ім'я змінної"
+      title: "Напис"
+      values: "Варіанти, розділені розривами рядків"
+      default: "Значення за замовчуванням"
   script:
     categories:
+      flow: "Керування потоком"
+      logical: "Логічні операції"
+      operation: "Обчислення"
+      comparison: "Порівняння"
+      random: "Випадковість"
+      value: "Значення"
+      fn: "Функції"
+      text: "Дії з текстом"
+      convert: "Перетворення"
       list: "Списки"
     blocks:
+      text: "Текст"
+      multiLineText: "Текст (багаторядковий)"
+      textList: "Текстовий список"
+      strLen: "Довжина тексту"
+      _strLen:
+        arg1: "Текст"
+      _strPick:
+        arg1: "Текст"
+      strReplace: "Заміна тексту"
+      _strReplace:
+        arg1: "Текст"
+        arg2: "Текст, який потрібно замінити"
+        arg3: "Заміняти на"
+      strReverse: "Перевернути текст"
+      _strReverse:
+        arg1: "Текст"
+      join: "Конкатенація тексту"
       _join:
         arg1: "Списки"
+        arg2: "Розділювач"
+      add: "Додати"
+      _add:
+        arg1: "A"
+        arg2: "B"
+      subtract: "Відняти"
+      _subtract:
+        arg1: "A"
+        arg2: "B"
+      multiply: "Помножити"
+      _multiply:
+        arg1: "A"
+        arg2: "B"
+      divide: "Поділити"
+      _divide:
+        arg1: "A"
+        arg2: "B"
+      mod: "Остача"
+      _mod:
+        arg1: "A"
+        arg2: "B"
+      round: "Десяткове округлення"
+      _round:
+        arg1: "Число"
+      eq: "A дорівнює B"
+      _eq:
+        arg1: "A"
+        arg2: "B"
+      notEq: "A не дорівнює B"
+      _notEq:
+        arg1: "A"
+        arg2: "B"
+      and: "А І Б"
+      _and:
+        arg1: "A"
+        arg2: "B"
+      or: "A АБО B"
+      _or:
+        arg1: "A"
+        arg2: "B"
+      lt: "< A менше, ніж B"
+      _lt:
+        arg1: "A"
+        arg2: "B"
+      gt: "> A більше, ніж B"
+      _gt:
+        arg1: "A"
+        arg2: "B"
+      ltEq: "<= A менше або дорівнює B"
+      _ltEq:
+        arg1: "A"
+        arg2: "B"
+      gtEq: ">= A більше або дорівнює B"
+      _gtEq:
+        arg1: "A"
+        arg2: "B"
+      if: "Умова"
+      _if:
+        arg1: "Якщо"
+        arg2: "Якщо так"
+        arg3: "Якщо ні"
+      not: "НЕ"
+      _not:
+        arg1: "НЕ"
+      random: "Випадково"
+      _random:
+        arg1: "Імовірність"
+      rannum: "Випадкове число"
+      _rannum:
+        arg1: "Мінімальне значення"
+        arg2: "Максимальне значення"
+      randomPick: "Випадковий вибір зі списку"
       _randomPick:
         arg1: "Списки"
+      dailyRandom: "Випадково (триває добу)"
+      _dailyRandom:
+        arg1: "Імовірність"
+      dailyRannum: "Випадкове число (триває добу)"
+      _dailyRannum:
+        arg1: "Мінімальне значення"
+        arg2: "Максимальне значення"
+      dailyRandomPick: "Випадково вибрати зі списку (триває добу)"
       _dailyRandomPick:
         arg1: "Списки"
+      seedRandom: "Випадковість (з насінням)"
+      _seedRandom:
+        arg1: "Насіння"
+        arg2: "Імовірність"
+      seedRannum: "Випадкове число (з насінням)"
+      _seedRannum:
+        arg1: "Насіння"
+        arg2: "Мінімальне значення"
+        arg3: "Максимальне значення"
+      seedRandomPick: "Випадково вибрати зі списку (з насінням)"
       _seedRandomPick:
+        arg1: "Насіння"
         arg2: "Списки"
+      DRPWPM: "Випадково вибрати зі зваженого списку (триває добу)"
+      _DRPWPM:
+        arg1: "Текстовий список"
+      pick: "Вибір зі списку"
       _pick:
         arg1: "Списки"
+        arg2: "Позиція"
+      listLen: "Отримати довжину списку"
       _listLen:
         arg1: "Списки"
+      number: "Число"
+      stringToNumber: "Текст на число"
+      _stringToNumber:
+        arg1: "Текст"
+      numberToString: "Число на текст"
+      _numberToString:
+        arg1: "Число"
+      splitStrByLine: "Розбиття тексту на рядки"
+      _splitStrByLine:
+        arg1: "Текст"
+      ref: "Змінні"
+      aiScriptVar: "Змінна AiScript"
+      fn: "Функції"
       _fn:
-        arg1: "Вихід"
+        arg1: "Вивід"
+      for: "Повторення"
+      _for:
+        arg1: "Кількість повторень"
+        arg2: "Дія"
     types:
+      string: "Текст"
+      number: "Число"
+      boolean: "Прапорець"
       array: "Списки"
+      stringArray: "Текстовий список"
 _relayStatus:
   requesting: "Очікує затвердження"
   accepted: "Затверджено"
   rejected: "Відхилено"
 _notification:
-  youRenoted: "{name} поширив(ла) вашу нотатку"
+  fileUploaded: "Файл успішно завантажено"
+  youGotMention: "{name} згадує вас"
+  youGotReply: "{name} відповідає"
+  youGotQuote: "{name} цитує вас"
+  youRenoted: "{name} поширює"
+  youGotPoll: "{name} бере участь в опитуванні"
+  youGotMessagingMessageFromUser: "Повідомлення від {name}"
+  youGotMessagingMessageFromGroup: "Нове повідомлення в групі {name}"
   youWereFollowed: "Новий підписник"
+  youReceivedFollowRequest: "Ви отримали запит на підписку"
+  yourFollowRequestAccepted: "Запит на підписку прийнято"
   youWereInvitedToGroup: "Запрошення до групи"
   _types:
+    all: "Все"
     follow: "Підписки"
     mention: "Згадка"
-    renote: "Поширити"
-    quote: "Цитата"
+    reply: "Відповіді"
+    renote: "Поширення"
+    quote: "Цитування"
     reaction: "Реакції"
+    pollVote: "Опитування"
+    receiveFollowRequest: "Запити на підписку"
+    followRequestAccepted: "Прийняті підписки"
+    groupInvited: "Запрошення до груп"
+    app: "Сповіщення від додатків"
 _deck:
+  alwaysShowMainColumn: "Завжди показувати головну колонку"
+  columnAlign: "Вирівняти стовпці"
+  addColumn: "Додати стовпець"
+  swapLeft: "Пересунути ліворуч"
+  swapRight: "Пересунути праворуч"
+  swapUp: "Пересунути вгору"
+  swapDown: "Пересунути вниз"
+  stackLeft: "У стовпчик вліво"
+  popRight: "Витягнути вправо"
   _columns:
+    widgets: "Віджети"
     notifications: "Сповіщення"
     tl: "Стрічка"
     antenna: "Антени"
     list: "Списки"
     mentions: "Згадки"
+    direct: "Особисте"

locales/zh-CN.yml

@@ -11,7 +11,7 @@ ok: "OK"
 gotIt: "我明白了"
 cancel: "取消"
 enterUsername: "输入用户名"
-renotedBy: "{user} 转贴了"
+renotedBy: "{user} 转发了"
 noNotes: "没有帖文"
 noNotifications: "无通知"
 instance: "实例"
@@ -33,6 +33,9 @@ addUser: "添加用户"
 favorite: "收藏"
 favorites: "收藏"
 unfavorite: "取消收藏"
+favorited: "已加入收藏夹。"
+alreadyFavorited: "收藏夹中已存在。"
+cantFavorite: "无法添加到收藏夹。"
 pin: "置顶"
 unpin: "取消置顶"
 copyContent: "复制内容"
@@ -87,6 +90,9 @@ followRequestPending: "发送关注申请"
 enterEmoji: "输入表情符号"
 renote: "转发"
 unrenote: "取消转发"
+renoted: "已转发。"
+cantRenote: "该帖子无法转发。"
+cantReRenote: "转发无法被再次转发。"
 quote: "引用"
 pinnedNote: "已置顶的帖子"
 you: "您"
@@ -95,7 +101,7 @@ sensitive: "阅读注意"
 add: "添加"
 reaction: "回应"
 reactionSettingDescription: "选择您想要置顶的回应。"
-reactionSettingDescription2: "通过拖动来重新排列。单击即可删除。"
+reactionSettingDescription2: "拖动重新排序，单击删除，点击 + 添加。"
 rememberNoteVisibility: "记录公开范围"
 attachCancel: "删除附件"
 markAsSensitive: "阅读注意"
@@ -116,7 +122,7 @@ selectAntenna: "天线选择"
 selectWidget: "选择小工具"
 editWidgets: "编辑小工具"
 editWidgetsExit: "完成编辑"
-customEmojis: "自定义Emoji"
+customEmojis: "自定义表情符号"
 emoji: "表情符号"
 emojiName: "表情符号名称"
 emojiUrl: "表情符号地址"
@@ -320,6 +326,8 @@ pinnedUsers: "置顶用户"
 pinnedUsersDescription: "在「发现」页面中使用换行标记想要置顶的用户。"
 pinnedPages: "固定页面"
 pinnedPagesDescription: "输入您要固定到实例首页的页面路径，以换行符分隔。"
+pinnedClipId: "置顶的片段ID"
+pinnedNotes: "已置顶的帖子"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "启用 hCaptcha"
 hcaptchaSiteKey: "网站密钥"
@@ -531,7 +539,7 @@ poll: "调查问卷"
 useCw: "隐藏内容"
 enablePlayer: "打开播放器"
 disablePlayer: "关闭播放器"
-expandTweet: "展开推文"
+expandTweet: "展开贴文"
 themeEditor: "主题编辑器"
 description: "描述"
 author: "作者"
@@ -617,7 +625,7 @@ createNew: "新建"
 optional: "可选"
 createNewClip: "新建片段"
 public: "公开"
-i18nInfo: "Misskey已经被志愿者们翻译到了各种语言。如果你也有兴趣，可以来{link}帮助翻译。"
+i18nInfo: "Misskey已经被志愿者们翻译到了各种语言。如果你也有兴趣，可以通过{link}帮助翻译。"
 manageAccessTokens: "管理 Access Tokens"
 accountInfo: "帐户信息"
 notesCount: "贴文数量"
@@ -648,6 +656,29 @@ noteFavoritesCount: "收藏的帖子数"
 pageLikesCount: "页面点赞次数"
 pageLikedCount: "页面被点赞次数"
 reversiCount: "黑白棋对战次数"
+contact: "联系人"
+useSystemFont: "使用系统默认字体"
+clips: "片段"
+experimentalFeatures: "实验性功能"
+developer: "开发者"
+makeExplorable: "使账号可见。"
+makeExplorableDescription: "关闭时，账号不会显示在\"发现\"中。"
+showGapBetweenNotesInTimeline: "时间线上的帖子分开显示。"
+duplicate: "复制"
+left: "左"
+center: "中央"
+wide: "宽"
+narrow: "窄"
+reloadToApplySetting: "页面刷新后设置才会生效。是否现在刷新页面？"
+_aboutMisskey:
+  about: "Misskey是由syuilo于2014年开发的开源软件。"
+  contributors: "主要贡献者"
+  allContributors: "全体贡献者"
+  source: "源代码"
+  translation: "翻译Misskey"
+  donate: "赞助Misskey"
+  morePatrons: "还有很多其他的人也在支持我们，非常感谢🥰"
+  patrons: "支持者"
 _nsfw:
   respect: "隐藏NSFW内容"
   ignore: "不隐藏NSFW内容"
@@ -759,7 +790,7 @@ _wordMute:
   muteWords: "禁用词"
   muteWordsDescription: "使用空格分隔表示AND逻辑，使用换行符分隔表示OR逻辑。"
   muteWordsDescription2: "将关键字用斜线括起来表示正则表达式。"
-  softDescription: "隐藏时间轴中指定条件的帖文。"
+  softDescription: "隐藏时间线中指定条件的帖文。"
   hardDescription: "防止将具有指定条件的帖文添加到时间线。 即使您更改条件，未添加的帖文也会被排除在外。"
   soft: "软屏蔽"
   hard: "硬屏蔽"
@@ -845,6 +876,8 @@ _sfx:
   chatBg: "聊天背景"
   antenna: "天线接收"
   channel: "频道通知"
+  reversiPutBlack: "黑白棋：黑方下子时"
+  reversiPutWhite: "黑白棋：白方下子时"
 _ago:
   unknown: "未知"
   future: "未来"
@@ -956,6 +989,8 @@ _widgets:
   digitalClock: "数字时钟"
   federation: "联邦宇宙"
   postForm: "投稿窗口"
+  slideshow: "幻灯片展示"
+  button: "按钮"
 _cw:
   hide: "隐藏"
   show: "查看更多"
@@ -1015,6 +1050,8 @@ _profile:
   metadataDescription: "最多可以在个人资料中以表格形式显示四条其他信息。"
   metadataLabel: "标签"
   metadataContent: "内容"
+  changeAvatar: "修改头像"
+  changeBanner: "修改横幅"
 _exportOrImport:
   allNotes: "所有帖子"
   followingList: "关注中"
@@ -1436,6 +1473,8 @@ _notification:
 _deck:
   alwaysShowMainColumn: "总是显示主列"
   columnAlign: "列对齐"
+  columnMargin: "列间距"
+  columnHeaderHeight: "列标题高度"
   addColumn: "添加列"
   swapLeft: "向左移动"
   swapRight: "向右移动"
@@ -1444,6 +1483,7 @@ _deck:
   stackLeft: "向左折叠"
   popRight: "向右弹出"
   _columns:
+    main: "主列"
     widgets: "小工具"
     notifications: "通知"
     tl: "时间线"

locales/zh-TW.yml

@@ -12,7 +12,7 @@ gotIt: "知道了"
 cancel: "取消"
 enterUsername: "輸入使用者名稱"
 renotedBy: "{user} 轉發了"
-noNotes: "貼文不可用。"
+noNotes: "箋文不可用。"
 noNotifications: "沒有通知"
 instance: "實例"
 settings: "設定"
@@ -63,8 +63,8 @@ exportRequested: "已請求匯出。這可能會花一點時間。結束後檔
 importRequested: "已請求匯入。這可能會花一點時間"
 lists: "清單"
 noLists: "沒有清單"
-note: "貼文"
-notes: "筆記"
+note: "箋文"
+notes: "箋文"
 following: "追隨中"
 followers: "追隨者"
 followsYou: "追隨你的人"
@@ -86,6 +86,7 @@ followRequestPending: "追隨許可批准中"
 enterEmoji: "輸入表情符號"
 renote: "轉發貼文"
 unrenote: "取消轉發貼文"
+renoted: "轉發成功"
 quote: "引用"
 pinnedNote: "已置頂的貼文"
 you: "您"
@@ -289,7 +290,7 @@ tosUrl: "服務條款URL"
 thisYear: "今年"
 thisMonth: "本月"
 today: "本日"
-dayX: "{day}天"
+dayX: "{day}日"
 monthX: "{month}月"
 yearX: "{year}年"
 pages: "頁面"
@@ -312,6 +313,7 @@ bannerUrl: "橫幅圖片URL"
 basicInfo: "基本資訊"
 pinnedUsers: "置頂用戶"
 pinnedUsersDescription: "在「發現」頁面中使用換行標記想要置頂的用戶。"
+pinnedNotes: "已置頂的貼文"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "啟用 hCaptcha"
 hcaptchaSiteKey: "網站金鑰"
@@ -329,6 +331,7 @@ antennaKeywords: "包含關鍵字"
 antennaExcludeKeywords: "排除關鍵字"
 antennaKeywordsDescription: "用空格分隔指定AND、用換行符分隔指定OR"
 notifyAntenna: "通知我有新的貼文"
+withFileAntenna: "僅帶有附件的箋文"
 serviceworker: "ServiceWorker"
 enableServiceworker: "開啟 ServiceWorker"
 antennaUsersDescription: "指定用換行符分隔的用戶名"
@@ -392,7 +395,7 @@ text: "文字"
 enable: "啟用"
 next: "下一步"
 retype: "重新輸入"
-noteOf: "{user}的貼文"
+noteOf: "{user}的箋文"
 inviteToGroup: "邀請至群組"
 maxNoteTextLength: "貼文的字數限制"
 quoteAttached: "引用"
@@ -458,7 +461,9 @@ objectStorageUseSSL: "使用SSL"
 objectStorageUseProxy: "使用網路代理"
 serverLogs: "伺服器日誌"
 deleteAll: "刪除所有記錄"
+newNoteRecived: "有新的箋文"
 sounds: "音效"
+listen: "聆聽"
 none: "無"
 showInPage: "在頁面中顯示"
 volume: "音量"
@@ -514,6 +519,9 @@ deck: "多欄模式"
 undeck: "取消多欄模式"
 width: "寬度"
 height: "高度"
+large: "大"
+medium: "中"
+small: "小"
 permission: "權限"
 enableAll: "啟用全部"
 disableAll: "停用全部"
@@ -524,6 +532,8 @@ useStarForReactionFallback: "以★代替未知的表情符號"
 emailConfig: "電子郵件伺服器設定"
 enableEmail: "啟用發送電郵功能"
 emailConfigInfo: "用於確認電郵地址及密碼重置"
+email: "電子郵件"
+emailAddress: "電郵地址"
 smtpConfig: "SMTP伺服器設定"
 smtpHost: "主機"
 smtpPort: "端口"
@@ -544,19 +554,46 @@ create: "新增"
 notificationSetting: "通知設定"
 other: "其他"
 regenerateLoginTokenDescription: "再生用於登入的內部權杖。一般情況下是不需要這樣做的。一旦再生，所有裝置將會被登出。"
+behavior: "行為"
 sample: "範例 "
 abuseReports: "檢舉"
 reportAbuse: "檢舉"
 reportAbuseOf: "檢舉{name}"
+fillAbuseReportDescription: "請填寫檢舉的詳細理由。可以的話，請附上針對的URL網址。"
 send: "發送"
 openInNewTab: "在新分頁中開啟"
+instanceTicker: "箋文的實例資訊"
 random: "隨機"
 system: "系統"
+switchUi: "切換界面"
+optional: "可選"
 public: "公開"
+notesCount: "箋文數量"
+repliesCount: "回覆數量\n"
+renotesCount: "轉發數量"
+repliedCount: "回覆數量"
+yes: "確定"
+no: "取消"
+driveFilesCount: "雲端硬碟檔案數量"
+driveUsage: "雲端硬碟使用量"
+noCrawleDescription: "請求網路搜尋引擎不要索引你的個人資料頁、箋文及頁面等。"
+lockedAccountInfo: "即使你通過了追隨者請求，除非你將筆記的公開範圍設定為 「追隨者」，否則任何人都能看見你的箋文。"
+noteFavoritesCount: "收藏箋文的數目"
+contact: "聯絡人"
+clips: "標籤"
+experimentalFeatures: "測試中的功能"
+developer: "開發者"
+showGapBetweenNotesInTimeline: "分開顯示時間線上的箋文。"
+_aboutMisskey:
+  about: "Misskey是由syuilo於2014年開發的開源軟件。"
+  contributors: "主要貢獻者"
 _mfm:
   mention: "提及"
   hashtag: "#tag"
+  url: "URL"
   link: "鏈接"
+  bold: "粗體"
+  center: "置中"
   quote: "引用"
   emoji: "自訂表情符號"
   search: "搜尋"
@@ -597,7 +634,8 @@ _sidebar:
   hide: "隱藏"
 _wordMute:
   muteWords: "加入靜音文字"
-  mutedNotes: "已靜音的貼文"
+  softDescription: "隱藏時間軸中指定條件的箋文。"
+  mutedNotes: "已靜音的箋文"
 _theme:
   constant: "常數"
   defaultValue: "預設值"
@@ -622,8 +660,8 @@ _theme:
     infoWarnBg: "警告背景"
     infoWarnFg: "警告字元"
 _sfx:
-  note: "貼文"
-  noteMy: "我的貼文"
+  note: "箋文"
+  noteMy: "我的箋文"
   notification: "通知"
   chat: "傳送訊息"
   channel: "頻道通知"
@@ -642,7 +680,7 @@ _time:
   second: "秒"
   minute: "分鐘"
   hour: "小時"
-  day: "天"
+  day: "日"
 _tutorial:
   title: "Misskey使用方法"
   step1_1: "歡迎！"
@@ -655,7 +693,7 @@ _tutorial:
   step3_3: "輸入完內容後，按視窗右上角的按鈕來發文"
   step3_4: "不知道該寫什麼內容嗎？試試看「開始使用Misskey了」如何。"
   step4_1: "筆記發出去了嗎？"
-  step4_2: "如果你的貼文有顯示在時間軸上，就代表已經發文成功。"
+  step4_2: "如果你的箋文出現在時間軸上，就代表發文成功。"
   step5_1: "現在試試看追隨其他人來讓你的時間軸變得更生動吧。"
   step5_2: "你可以在{featured}上看到受歡迎的貼文，你也可以選擇從列表中追隨你喜歡的人，或者在{explore}上找到熱門使用者。"
   step5_3: "想要追隨其他人，只要點擊他們的頭像並按「追隨」即可。"
@@ -679,7 +717,7 @@ _permissions:
   "write:messaging": "撰寫或刪除私人訊息"
   "read:mutes": "顯示已靜音列表"
   "write:mutes": "編輯已靜音列表"
-  "write:notes": "撰寫或刪除貼文"
+  "write:notes": "撰寫或刪除箋文"
   "read:notifications": "查看通知"
   "write:notifications": "編輯通知"
   "read:reactions": "查看反應"
@@ -696,11 +734,11 @@ _permissions:
 _auth:
   shareAccess: "要授權「“{name}”」存取您的帳戶嗎？"
 _antennaSources:
-  all: "全部貼文"
-  homeTimeline: "來自已追隨使用者的貼文"
-  users: "來自特定使用者的貼文"
-  userList: "來自特定清單中的貼文"
-  userGroup: "來自特定群組的貼文"
+  all: "全部箋文"
+  homeTimeline: "來自已追隨使用者的箋文"
+  users: "來自特定使用者的箋文"
+  userList: "來自特定清單中的箋文"
+  userGroup: "來自特定群組的箋文"
 _weekday:
   sunday: "週日"
   monday: "週一"
@@ -721,6 +759,7 @@ _widgets:
   photos: "照片"
   digitalClock: "電子時鐘"
   federation: "聯邦宇宙"
+  button: "按鈕"
 _cw:
   hide: "隱藏"
   show: "瀏覽更多"
@@ -750,7 +789,7 @@ _visibility:
   localOnly: "僅限本地"
   localOnlyDescription: "對遠端使用者隱藏"
 _postForm:
-  replyPlaceholder: "回覆此貼文..."
+  replyPlaceholder: "回覆此箋文..."
   quotePlaceholder: "引用此貼文..."
   channelPlaceholder: "發佈到頻道"
   _placeholders:
@@ -768,7 +807,7 @@ _profile:
   metadataLabel: "標籤"
   metadataContent: "内容"
 _exportOrImport:
-  allNotes: "全部貼文"
+  allNotes: "全部箋文"
   followingList: "追隨中"
   muteList: "靜音"
   blockingList: "封鎖"
@@ -777,10 +816,10 @@ _charts:
   usersIncDec: "使用者増減"
   usersTotal: "使用者合共"
   activeUsers: "活躍使用者"
-  notesIncDec: "貼文増減"
-  localNotesIncDec: "本地貼文増減"
-  remoteNotesIncDec: "非本地貼文的數目增减"
-  notesTotal: "貼文合共"
+  notesIncDec: "箋文増減"
+  localNotesIncDec: "本地箋文増減"
+  remoteNotesIncDec: "遠端箋文數目增减"
+  notesTotal: "箋文合共"
   filesIncDec: "檔案増減"
   filesTotal: "累計檔案"
   storageUsageIncDec: "儲存空間的増減"
@@ -789,8 +828,8 @@ _instanceCharts:
   requests: "請求"
   users: "使用者増減"
   usersTotal: "總計使用者"
-  notes: "貼文増減"
-  notesTotal: "累計貼文"
+  notes: "箋文増減"
+  notesTotal: "累計箋文"
   ff: "追隨/追隨者的増減"
   ffTotal: "追隨/追隨者累計"
   cacheSize: "增加或減少快取用量"
@@ -903,6 +942,10 @@ _pages:
       id: "畫布ID"
       width: "寬度"
       height: "高度"
+    note: "嵌式箋文"
+    _note:
+      id: "箋文ID"
+      detailed: "顯示詳細內容"
     switch: "開關"
     _switch:
       name: "變數名稱"

migration/1607151207216-instance-pinned-clip.ts

@@ -0,0 +1,14 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class instancePinnedClip1607151207216 implements MigrationInterface {
+    name = 'instancePinnedClip1607151207216'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "meta" ADD "pinnedClipId" character varying(32)`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "pinnedClipId"`);
+    }
+
+}

migration/1607353487793-isExplorable.ts

@@ -0,0 +1,18 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class isExplorable1607353487793 implements MigrationInterface {
+    name = 'isExplorable1607353487793'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "user" ADD "isExplorable" boolean NOT NULL DEFAULT true`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."isExplorable" IS 'Whether the User is explorable.'`);
+        await queryRunner.query(`CREATE INDEX "IDX_d5a1b83c7cab66f167e6888188" ON "user" ("isExplorable") `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`DROP INDEX "IDX_d5a1b83c7cab66f167e6888188"`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."isExplorable" IS 'Whether the User is explorable.'`);
+        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "isExplorable"`);
+    }
+
+}

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <syuilotan@yahoo.co.jp>",
-	"version": "12.60.1",
+	"version": "12.64.0",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
@@ -35,20 +35,20 @@
 		"lodash": "^4.17.20"
 	},
 	"dependencies": {
-		"@babel/plugin-transform-runtime": "7.11.0",
-		"@elastic/elasticsearch": "7.8.0",
+		"@babel/plugin-transform-runtime": "7.12.1",
+		"@elastic/elasticsearch": "7.10.0",
 		"@fortawesome/fontawesome-svg-core": "1.2.32",
 		"@fortawesome/free-brands-svg-icons": "5.15.1",
 		"@fortawesome/free-regular-svg-icons": "5.15.1",
 		"@fortawesome/free-solid-svg-icons": "5.15.1",
-		"@fortawesome/vue-fontawesome": "3.0.0-2",
+		"@fortawesome/vue-fontawesome": "3.0.0-3",
 		"@koa/cors": "3.1.0",
 		"@koa/multer": "3.0.0",
 		"@koa/router": "9.0.1",
 		"@sinonjs/fake-timers": "6.0.1",
 		"@syuilo/aiscript": "0.11.1",
 		"@types/bcryptjs": "2.4.2",
-		"@types/bull": "3.14.0",
+		"@types/bull": "3.14.4",
 		"@types/cbor": "5.0.1",
 		"@types/dateformat": "3.0.1",
 		"@types/double-ended-queue": "2.1.1",
@@ -59,10 +59,10 @@
 		"@types/gulp-replace": "0.0.31",
 		"@types/is-url": "1.2.28",
 		"@types/js-yaml": "3.12.5",
-		"@types/jsdom": "16.2.3",
+		"@types/jsdom": "16.2.5",
 		"@types/jsonld": "1.5.1",
 		"@types/katex": "0.11.0",
-		"@types/koa": "2.11.3",
+		"@types/koa": "2.11.6",
 		"@types/koa-bodyparser": "4.3.0",
 		"@types/koa-cors": "0.0.0",
 		"@types/koa-favicon": "2.0.19",
@@ -70,79 +70,82 @@
 		"@types/koa-mount": "4.0.0",
 		"@types/koa-send": "4.1.2",
 		"@types/koa-views": "2.0.4",
-		"@types/koa__cors": "3.0.1",
-		"@types/koa__multer": "2.0.1",
+		"@types/koa__cors": "3.0.2",
+		"@types/koa__multer": "2.0.2",
 		"@types/koa__router": "8.0.2",
-		"@types/markdown-it": "10.0.1",
+		"@types/markdown-it": "10.0.3",
+		"@types/matter-js": "0.14.8",
 		"@types/mocha": "7.0.2",
-		"@types/node": "14.0.22",
+		"@types/node": "14.14.13",
 		"@types/node-fetch": "2.5.7",
 		"@types/nodemailer": "6.4.0",
 		"@types/nprogress": "0.2.0",
 		"@types/oauth": "0.9.1",
 		"@types/parse5": "5.0.3",
-		"@types/parsimmon": "1.10.2",
+		"@types/parsimmon": "1.10.6",
 		"@types/portscanner": "2.1.0",
 		"@types/pug": "2.0.4",
-		"@types/qrcode": "1.3.4",
+		"@types/qrcode": "1.3.5",
 		"@types/random-seed": "0.3.3",
-		"@types/ratelimiter": "2.1.28",
-		"@types/redis": "2.8.25",
-		"@types/rename": "1.0.1",
+		"@types/ratelimiter": "3.4.0",
+		"@types/redis": "2.8.28",
+		"@types/rename": "1.0.2",
 		"@types/request-stats": "3.0.0",
 		"@types/rimraf": "3.0.0",
 		"@types/seedrandom": "2.4.28",
-		"@types/sharp": "0.26.0",
+		"@types/sharp": "0.26.1",
 		"@types/sinonjs__fake-timers": "6.0.1",
 		"@types/speakeasy": "2.0.5",
 		"@types/tinycolor2": "1.4.2",
 		"@types/tmp": "0.2.0",
 		"@types/uuid": "8.3.0",
 		"@types/web-push": "3.3.0",
-		"@types/webpack": "4.41.24",
+		"@types/webpack": "4.41.25",
 		"@types/webpack-stream": "3.2.11",
 		"@types/websocket": "1.0.1",
-		"@types/ws": "7.2.7",
-		"@typescript-eslint/parser": "4.6.1",
+		"@types/ws": "7.4.0",
+		"@typescript-eslint/parser": "4.10.0",
 		"@vue/compiler-sfc": "3.0.3",
 		"abort-controller": "3.0.0",
-		"apexcharts": "3.22.1",
+		"apexcharts": "3.22.3",
 		"autobind-decorator": "2.4.0",
 		"autosize": "4.0.2",
 		"autwh": "0.1.0",
-		"aws-sdk": "2.787.0",
+		"aws-sdk": "2.809.0",
 		"bcryptjs": "2.4.3",
 		"blurhash": "1.1.3",
-		"bull": "3.18.1",
+		"bull": "3.20.0",
 		"cafy": "15.2.1",
 		"cbor": "5.1.0",
 		"chalk": "4.1.0",
 		"chart.js": "2.9.4",
-		"cli-highlight": "2.1.4",
+		"cli-highlight": "2.1.9",
 		"commander": "4.1.1",
 		"content-disposition": "0.5.3",
-		"core-js": "3.7.0",
+		"core-js": "3.8.1",
 		"crc-32": "1.2.0",
 		"css-loader": "5.0.1",
 		"cssnano": "4.1.10",
-		"dateformat": "3.0.3",
+		"dateformat": "4.3.1",
 		"deep-entries": "3.1.0",
 		"diskusage": "1.1.3",
 		"double-ended-queue": "2.1.0-0",
 		"escape-regexp": "0.0.1",
-		"eslint": "7.12.1",
-		"eslint-plugin-vue": "7.1.0",
+		"eslint": "7.16.0",
+		"eslint-plugin-vue": "7.3.0",
 		"eventemitter3": "4.0.7",
 		"feed": "4.2.1",
 		"fibers": "5.0.0",
 		"file-type": "16.0.1",
 		"fluent-ffmpeg": "2.1.2",
 		"glob": "7.1.6",
-		"got": "11.8.0",
+		"got": "11.8.1",
 		"gulp": "4.0.2",
+		"gulp-cssnano": "2.1.3",
 		"gulp-rename": "2.0.0",
 		"gulp-replace": "1.0.0",
 		"gulp-sourcemaps": "2.6.5",
+		"gulp-terser": "2.0.0",
 		"gulp-tslint": "8.1.4",
 		"gulp-typescript": "6.0.0-alpha.1",
 		"hard-source-webpack-plugin": "0.13.1",
@@ -151,7 +154,6 @@
 		"http-proxy-agent": "4.0.1",
 		"http-signature": "1.3.5",
 		"https-proxy-agent": "5.0.0",
-		"idb-keyval": "3.2.0",
 		"insert-text-at-cursor": "0.3.0",
 		"is-root": "2.1.0",
 		"is-svg": "4.2.1",
@@ -174,23 +176,24 @@
 		"langmap": "0.0.16",
 		"lookup-dns-cache": "2.1.0",
 		"markdown-it": "11.0.1",
-		"markdown-it-anchor": "6.0.0",
+		"markdown-it-anchor": "6.0.1",
+		"matter-js": "0.14.2",
 		"mocha": "8.2.1",
 		"moji": "0.5.1",
-		"ms": "2.1.2",
+		"ms": "2.1.3",
 		"multer": "1.4.2",
 		"nested-property": "4.0.0",
 		"node-fetch": "2.6.1",
-		"nodemailer": "6.4.15",
+		"nodemailer": "6.4.17",
 		"object-assign-deep": "0.4.0",
 		"os-utils": "0.0.14",
 		"p-cancelable": "2.0.0",
 		"parse5": "6.0.1",
 		"parsimmon": "1.16.0",
-		"pg": "8.4.2",
+		"pg": "8.5.1",
 		"portscanner": "2.2.0",
-		"postcss": "8.1.6",
-		"postcss-loader": "4.0.4",
+		"postcss": "8.2.1",
+		"postcss-loader": "4.1.0",
 		"prismjs": "1.22.0",
 		"probe-image-size": "6.0.0",
 		"promise-limit": "2.7.0",
@@ -215,7 +218,7 @@
 		"rndstr": "1.0.0",
 		"s-age": "1.1.2",
 		"sass": "1.29.0",
-		"sass-loader": "10.0.5",
+		"sass-loader": "10.1.0",
 		"seedrandom": "3.0.5",
 		"sharp": "0.26.2",
 		"speakeasy": "2.0.0",
@@ -223,44 +226,42 @@
 		"style-loader": "2.0.0",
 		"summaly": "2.4.0",
 		"syslog-pro": "1.0.0",
-		"systeminformation": "4.28.1",
+		"systeminformation": "4.31.1",
 		"syuilo-password-strength": "0.0.1",
 		"textarea-caret": "3.1.0",
 		"three": "0.117.1",
 		"tinycolor2": "1.4.2",
 		"tmp": "0.2.1",
-		"ts-loader": "8.0.9",
-		"ts-node": "9.0.0",
+		"ts-loader": "8.0.11",
+		"ts-node": "9.1.0",
 		"tslint": "6.1.3",
 		"tslint-sonarts": "1.9.0",
 		"typeorm": "0.2.29",
-		"typescript": "4.0.5",
+		"typescript": "4.1.2",
 		"ulid": "2.3.0",
 		"url-loader": "4.1.1",
-		"uuid": "8.3.1",
+		"uuid": "8.3.2",
 		"v-debounce": "0.1.2",
+		"vanilla-tilt": "1.7.0",
 		"vue": "3.0.3",
 		"vue-color": "2.7.1",
-		"vue-draggable-next": "1.0.8",
-		"vue-i18n": "9.0.0-beta.7",
 		"vue-json-pretty": "1.7.1",
 		"vue-loader": "16.0.0",
-		"vue-prism-editor": "1.2.2",
-		"vue-router": "4.0.0-rc.2",
+		"vue-prism-editor": "2.0.0-alpha.2",
+		"vue-router": "4.0.1",
 		"vue-style-loader": "4.1.2",
-		"vuex": "4.0.0-rc.1",
-		"vuex-persistedstate": "3.1.0",
+		"vuedraggable": "4.0.1",
 		"web-push": "3.4.4",
-		"webpack": "5.8.0",
+		"webpack": "5.10.1",
 		"webpack-cli": "4.2.0",
-		"websocket": "1.0.32",
-		"ws": "7.3.1",
+		"websocket": "1.0.33",
+		"ws": "7.4.1",
 		"xev": "2.0.1"
 	},
 	"devDependencies": {
-		"@types/chai": "4.2.11",
-		"@types/fluent-ffmpeg": "2.1.14",
+		"@types/chai": "4.2.14",
+		"@types/fluent-ffmpeg": "2.1.16",
 		"chai": "4.2.0",
-		"cross-env": "7.0.2"
+		"cross-env": "7.0.3"
 	}
 }

src/client/@types/global.d.ts

@@ -1,4 +1,4 @@
-declare const _LANGS_: string[];
+declare const _LANGS_: string[][];
 declare const _VERSION_: string;
 declare const _ENV_: string;
 declare const _DEV_: boolean;

src/client/@types/vue.d.ts

@@ -1,5 +1,5 @@
 declare module '*.vue' {
-	import { defineComponent } from 'vue';
-	const component: ReturnType<typeof defineComponent>;
+	import type { DefineComponent } from 'vue';
+	const component: DefineComponent<{}, {}, any>;
 	export default component;
 }

src/client/@types/vuex-shim.d.ts

@@ -1,12 +0,0 @@
-import { ComponentCustomProperties } from 'vue';
-import { Store } from 'vuex';
-
-declare module '@vue/runtime-core' {
-	// tslint:disable-next-line:no-empty-interface
-	interface State {
-	}
-
-	interface ComponentCustomProperties {
-		$store: Store<State>;
-	}
-}

src/client/account.ts

@@ -0,0 +1,86 @@
+import { reactive } from 'vue';
+import { apiUrl } from '@/config';
+import { waiting } from '@/os';
+
+// TODO: 他のタブと永続化されたstateを同期
+
+type Account = {
+	id: string;
+	token: string;
+	clientData: Record<string, any>;
+};
+
+const data = localStorage.getItem('account');
+
+// TODO: 外部からはreadonlyに
+export const $i = data ? reactive(JSON.parse(data) as Account) : null;
+
+export function signout() {
+	localStorage.removeItem('account');
+	document.cookie = `igi=; path=/`;
+	location.href = '/';
+}
+
+export function getAccounts() {
+	const accountsData = localStorage.getItem('accounts');
+	const accounts: { id: Account['id'], token: Account['token'] }[] = accountsData ? JSON.parse(accountsData) : [];
+	return accounts;
+}
+
+export function addAccount(id: Account['id'], token: Account['token']) {
+	const accounts = getAccounts();
+	if (!accounts.some(x => x.id === id)) {
+		localStorage.setItem('accounts', JSON.stringify(accounts.concat([{ id, token }])));
+	}
+}
+
+function fetchAccount(token): Promise<Account> {
+	return new Promise((done, fail) => {
+		// Fetch user
+		fetch(`${apiUrl}/i`, {
+			method: 'POST',
+			body: JSON.stringify({
+				i: token
+			})
+		})
+		.then(res => {
+			// When failed to authenticate user
+			if (res.status !== 200 && res.status < 500) {
+				return signout();
+			}
+
+			// Parse response
+			res.json().then(i => {
+				i.token = token;
+				done(i);
+			});
+		})
+		.catch(fail);
+	});
+}
+
+export function updateAccount(data) {
+	for (const [key, value] of Object.entries(data)) {
+		$i[key] = value;
+	}
+}
+
+export function refreshAccount() {
+	fetchAccount($i.token).then(updateAccount);
+}
+
+export async function login(token: Account['token']) {
+	waiting();
+	if (_DEV_) console.log('logging as token ', token);
+	const me = await fetchAccount(token);
+	localStorage.setItem('account', JSON.stringify(me));
+	addAccount(me.id, token);
+	location.reload();
+}
+
+// このファイルに書きたくないけどここに書かないと何故かVeturが認識しない
+declare module '@vue/runtime-core' {
+	interface ComponentCustomProperties {
+		$i: typeof $i;
+	}
+}

src/client/cold-storage.ts

@@ -1,34 +0,0 @@
-// 常にメモリにロードしておく必要がないような設定情報を保管するストレージ
-
-const PREFIX = 'miux:';
-
-export const defaultDeviceSettings = {
-	sound_masterVolume: 0.3,
-	sound_note: { type: 'syuilo/down', volume: 1 },
-	sound_noteMy: { type: 'syuilo/up', volume: 1 },
-	sound_notification: { type: 'syuilo/pope2', volume: 1 },
-	sound_chat: { type: 'syuilo/pope1', volume: 1 },
-	sound_chatBg: { type: 'syuilo/waon', volume: 1 },
-	sound_antenna: { type: 'syuilo/triple', volume: 1 },
-	sound_channel: { type: 'syuilo/square-pico', volume: 1 },
-	sound_reversiPutBlack: { type: 'syuilo/kick', volume: 0.3 },
-	sound_reversiPutWhite: { type: 'syuilo/snare', volume: 0.3 },
-};
-
-export const device = {
-	get<T extends keyof typeof defaultDeviceSettings>(key: T): typeof defaultDeviceSettings[T] {
-		// TODO: indexedDBにする
-		//       ただしその際はnullチェックではなくキー存在チェックにしないとダメ
-		//       (indexedDBはnullを保存できるため、ユーザーが意図してnullを格納した可能性がある)
-		const value = localStorage.getItem(PREFIX + key);
-		if (value == null) {
-			return defaultDeviceSettings[key];
-		} else {
-			return JSON.parse(value);
-		}
-	},
-
-	set(key: keyof typeof defaultDeviceSettings, value: any): any {
-		localStorage.setItem(PREFIX + key, JSON.stringify(value));
-	},
-};

src/client/components/abuse-report-window.vue

@@ -2,24 +2,24 @@
 <XWindow ref="window" :initial-width="400" :initial-height="500" :can-resize="true" @closed="$emit('closed')">
 	<template #header>
 		<Fa :icon="faExclamationCircle" style="margin-right: 0.5em;"/>
-		<i18n-t keypath="reportAbuseOf" tag="span">
+		<I18n :src="$ts.reportAbuseOf" tag="span">
 			<template #name>
 				<b><MkAcct :user="user"/></b>
 			</template>
-		</i18n-t>
+		</I18n>
 	</template>
 	<div class="dpvffvvy">
 		<div class="_section">
 			<div class="_content">
 				<MkTextarea v-model:value="comment">
-					<span>{{ $t('details') }}</span>
-					<template #desc>{{ $t('fillAbuseReportDescription') }}</template>
+					<span>{{ $ts.details }}</span>
+					<template #desc>{{ $ts.fillAbuseReportDescription }}</template>
 				</MkTextarea>
 			</div>
 		</div>
 		<div class="_section">
 			<div class="_content">
-				<MkButton @click="send" primary full :disabled="comment.length === 0">{{ $t('send') }}</MkButton>
+				<MkButton @click="send" primary full :disabled="comment.length === 0">{{ $ts.send }}</MkButton>
 			</div>
 		</div>
 	</div>
@@ -69,7 +69,7 @@ export default defineComponent({
 			}, undefined, res => {
 				os.dialog({
 					type: 'success',
-					text: this.$t('abuseReported')
+					text: this.$ts.abuseReported
 				});
 				this.$refs.window.close();
 			});

src/client/components/analog-clock.vue

@@ -116,16 +116,6 @@ export default defineComponent({
 			}
 		};
 		update();
-
-		this.$store.subscribe((mutation, state) => {
-			if (mutation.type !== 'device/set') return;
-
-			if (mutation?.payload?.key !== 'theme') return;
-
-			setTimeout(() => {
-				this.computedStyle = getComputedStyle(document.documentElement);
-			}, 250);
-		});
 	},
 
 	beforeUnmount() {

src/client/components/autocomplete.vue

@@ -8,7 +8,7 @@
 			</span>
 			<span class="username">@{{ acct(user) }}</span>
 		</li>
-		<li @click="chooseUser()" @keydown="onKeydown" tabindex="-1" class="choose">{{ $t('selectUser') }}</li>
+		<li @click="chooseUser()" @keydown="onKeydown" tabindex="-1" class="choose">{{ $ts.selectUser }}</li>
 	</ol>
 	<ol class="hashtags" ref="suggests" v-if="hashtags.length > 0">
 		<li v-for="hashtag in hashtags" @click="complete(type, hashtag)" @keydown="onKeydown" tabindex="-1">
@@ -17,8 +17,8 @@
 	</ol>
 	<ol class="emojis" ref="suggests" v-if="emojis.length > 0">
 		<li v-for="emoji in emojis" @click="complete(type, emoji.emoji)" @keydown="onKeydown" tabindex="-1">
-			<span class="emoji" v-if="emoji.isCustomEmoji"><img :src="$store.state.device.disableShowingAnimatedImages ? getStaticImageUrl(emoji.url) : emoji.url" :alt="emoji.emoji"/></span>
-			<span class="emoji" v-else-if="!useOsNativeEmojis"><img :src="emoji.url" :alt="emoji.emoji"/></span>
+			<span class="emoji" v-if="emoji.isCustomEmoji"><img :src="$store.state.disableShowingAnimatedImages ? getStaticImageUrl(emoji.url) : emoji.url" :alt="emoji.emoji"/></span>
+			<span class="emoji" v-else-if="!$store.state.useOsNativeEmojis"><img :src="emoji.url" :alt="emoji.emoji"/></span>
 			<span class="emoji" v-else>{{ emoji.emoji }}</span>
 			<span class="name" v-html="emoji.name.replace(q, `<b>${q}</b>`)"></span>
 			<span class="alias" v-if="emoji.aliasOf">({{ emoji.aliasOf }})</span>
@@ -128,12 +128,6 @@ export default defineComponent({
 		}
 	},
 
-	computed: {
-		useOsNativeEmojis(): boolean {
-			return this.$store.state.device.useOsNativeEmojis;
-		}
-	},
-
 	watch: {
 		showing() {
 			if (!this.showing) {
@@ -151,7 +145,7 @@ export default defineComponent({
 		this.setPosition();
 
 		//#region Construct Emoji DB
-		const customEmojis = this.$store.state.instance.meta.emojis;
+		const customEmojis = this.$instance.emojis;
 		const emojiDefinitions: EmojiDef[] = [];
 
 		for (const x of customEmojis) {

src/client/components/captcha.vue

@@ -1,6 +1,6 @@
 <template>
 <div>
-	<span v-if="!available">{{ $t('waiting') }}<MkEllipsis/></span>
+	<span v-if="!available">{{ $ts.waiting }}<MkEllipsis/></span>
 	<div ref="captcha"></div>
 </div>
 </template>
@@ -28,7 +28,6 @@ declare global {
 	interface Window extends CaptchaContainer {
 	}
 }
-import * as os from '@/os';
 
 export default defineComponent({
 	props: {
@@ -101,7 +100,7 @@ export default defineComponent({
 			if (this.captcha.render && this.$refs.captcha instanceof Element) {
 				this.captcha.render(this.$refs.captcha, {
 					sitekey: this.sitekey,
-					theme: this.$store.state.device.darkMode ? 'dark' : 'light',
+					theme: this.$store.state.darkMode ? 'dark' : 'light',
 					callback: this.callback,
 					'expired-callback': this.callback,
 					'error-callback': this.callback,

src/client/components/channel-follow-button.vue

@@ -6,14 +6,14 @@
 >
 	<template v-if="!wait">
 		<template v-if="isFollowing">
-			<span v-if="full">{{ $t('unfollow') }}</span><Fa :icon="faMinus"/>
+			<span v-if="full">{{ $ts.unfollow }}</span><Fa :icon="faMinus"/>
 		</template>
 		<template v-else>
-			<span v-if="full">{{ $t('follow') }}</span><Fa :icon="faPlus"/>
+			<span v-if="full">{{ $ts.follow }}</span><Fa :icon="faPlus"/>
 		</template>
 	</template>
 	<template v-else>
-		<span v-if="full">{{ $t('processing') }}</span><Fa :icon="faSpinner" pulse fixed-width/>
+		<span v-if="full">{{ $ts.processing }}</span><Fa :icon="faSpinner" pulse fixed-width/>
 	</template>
 </button>
 </template>

src/client/components/channel-preview.vue

@@ -6,19 +6,19 @@
 		<div class="status">
 			<div>
 				<Fa :icon="faUsers" fixed-width/>
-				<i18n-t keypath="_channel.usersCount" tag="span" style="margin-left: 4px;">
+				<I18n :src="$ts._channel.usersCount" tag="span" style="margin-left: 4px;">
 					<template #n>
 						<b>{{ channel.usersCount }}</b>
 					</template>
-				</i18n-t>
+				</I18n>
 			</div>
 			<div>
 				<Fa :icon="faPencilAlt" fixed-width/>
-				<i18n-t keypath="_channel.notesCount" tag="span" style="margin-left: 4px;">
+				<I18n :src="$ts._channel.notesCount" tag="span" style="margin-left: 4px;">
 					<template #n>
 						<b>{{ channel.notesCount }}</b>
 					</template>
-				</i18n-t>
+				</I18n>
 			</div>
 		</div>
 	</div>
@@ -27,7 +27,7 @@
 	</article>
 	<footer>
 		<span v-if="channel.lastNotedAt">
-			{{ $t('updatedAt') }}: <MkTime :time="channel.lastNotedAt"/>
+			{{ $ts.updatedAt }}: <MkTime :time="channel.lastNotedAt"/>
 		</span>
 	</footer>
 </MkA>

src/client/components/cw-button.vue

@@ -1,6 +1,6 @@
 <template>
 <button class="nrvgflfu _button" @click="toggle">
-	<b>{{ value ? $t('_cw.hide') : $t('_cw.show') }}</b>
+	<b>{{ value ? $ts._cw.hide : $ts._cw.show }}</b>
 	<span v-if="!value">{{ label }}</span>
 </button>
 </template>
@@ -27,7 +27,7 @@ export default defineComponent({
 			return concat([
 				this.note.text ? [this.$t('_cw.chars', { count: length(this.note.text) })] : [],
 				this.note.files && this.note.files.length !== 0 ? [this.$t('_cw.files', { count: this.note.files.length }) ] : [],
-				this.note.poll != null ? [this.$t('poll')] : []
+				this.note.poll != null ? [this.$ts.poll] : []
 			] as string[][]).join(' / ');
 		}
 	},

src/client/components/date-separated-list.vue

@@ -1,20 +1,7 @@
-<template>
-<transition-group class="sqadhkmv _list_" name="list" tag="div" :data-direction="direction" :data-reversed="reversed ? 'true' : 'false'">
-	<template v-for="(item, i) in items">
-		<slot :item="item"></slot>
-		<div class="separator" v-if="showDate(i, item)" :key="item.id + '_date'">
-			<p class="date">
-				<span><Fa class="icon" :icon="faAngleUp"/>{{ getDateText(item.createdAt) }}</span>
-				<span>{{ getDateText(items[i + 1].createdAt) }}<Fa class="icon" :icon="faAngleDown"/></span>
-			</p>
-		</div>
-	</template>
-</transition-group>
-</template>
-
 <script lang="ts">
-import { defineComponent } from 'vue';
+import { defineComponent, h, TransitionGroup } from 'vue';
 import { faAngleUp, faAngleDown } from '@fortawesome/free-solid-svg-icons';
+import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 
 export default defineComponent({
 	props: {
@@ -34,36 +21,72 @@ export default defineComponent({
 		}
 	},
 
-	data() {
-		return {
-			faAngleUp, faAngleDown
-		};
+	methods: {
+		focus() {
+			this.$slots.default[0].elm.focus();
+		}
 	},
 
-	methods: {
-		getDateText(time: string) {
+	render() {
+		const getDateText = (time: string) => {
 			const date = new Date(time).getDate();
 			const month = new Date(time).getMonth() + 1;
 			return this.$t('monthAndDay', {
 				month: month.toString(),
 				day: date.toString()
 			});
-		},
+		}
 
-		showDate(i, item) {
-			return (
+		return h(this.$store.state.animation ? TransitionGroup : 'div', this.$store.state.animation ? {
+			class: 'sqadhkmv _list_',
+			name: 'list',
+			tag: 'div',
+			'data-direction': this.direction,
+			'data-reversed': this.reversed ? 'true' : 'false',
+		} : {
+			class: 'sqadhkmv _list_',
+		}, this.items.map((item, i) => {
+			const el = this.$slots.default({
+				item: item
+			})[0];
+			el.key = item.id;
+
+			if (
 				i != this.items.length - 1 &&
 				new Date(item.createdAt).getDate() != new Date(this.items[i + 1].createdAt).getDate() &&
 				!item._prId_ &&
 				!this.items[i + 1]._prId_ &&
 				!item._featuredId_ &&
-				!this.items[i + 1]._featuredId_);
-		},
+				!this.items[i + 1]._featuredId_
+			) {
+				const separator = h('div', {
+					class: 'separator',
+					key: item.id + ':separator',
+				}, h('p', {
+					class: 'date'
+				}, [
+					h('span', [
+						h(FontAwesomeIcon, {
+							class: 'icon',
+							icon: faAngleUp,
+						}),
+						getDateText(item.createdAt)
+					]),
+					h('span', [
+						getDateText(this.items[i + 1].createdAt),
+						h(FontAwesomeIcon, {
+							class: 'icon',
+							icon: faAngleDown,
+						})
+					])
+				]));
 
-		focus() {
-			this.$slots.default[0].elm.focus();
-		}
-	}
+				return [el, separator];
+			} else {
+				return el;
+			}
+		}));
+	},
 });
 </script>
 
@@ -97,7 +120,7 @@ export default defineComponent({
 }
 </style>
 
-<style lang="scss" scoped>
+<style lang="scss">
 .sqadhkmv {
 	> .separator {
 		text-align: center;

src/client/components/dialog.vue

@@ -26,8 +26,8 @@
 			</template>
 		</MkSelect>
 		<div class="buttons" v-if="(showOkButton || showCancelButton) && !actions">
-			<MkButton inline @click="ok" v-if="showOkButton" primary :autofocus="!input && !select">{{ (showCancelButton || input || select) ? $t('ok') : $t('gotIt') }}</MkButton>
-			<MkButton inline @click="cancel" v-if="showCancelButton || input || select">{{ $t('cancel') }}</MkButton>
+			<MkButton inline @click="ok" v-if="showOkButton" primary :autofocus="!input && !select">{{ (showCancelButton || input || select) ? $ts.ok : $ts.gotIt }}</MkButton>
+			<MkButton inline @click="cancel" v-if="showCancelButton || input || select">{{ $ts.cancel }}</MkButton>
 		</div>
 		<div class="buttons" v-if="actions">
 			<MkButton v-for="action in actions" inline @click="() => { action.callback(); close(); }" :primary="action.primary" :key="action.text">{{ action.text }}</MkButton>

src/client/components/drive-file-thumbnail.vue

@@ -27,6 +27,7 @@ import {
 	faFilm
 	} from '@fortawesome/free-solid-svg-icons';
 import ImgWithBlurhash from './img-with-blurhash.vue';
+import { ColdDeviceStorage } from '@/store';
 
 export default defineComponent({
 	components: {
@@ -89,12 +90,12 @@ export default defineComponent({
 	},
 	mounted() {
 		const audioTag = this.$refs.volumectrl as HTMLAudioElement;
-		if (audioTag) audioTag.volume = this.$store.state.device.mediaVolume;
+		if (audioTag) audioTag.volume = ColdDeviceStorage.get('mediaVolume');
 	},
 	methods: {
 		volumechange() {
 			const audioTag = this.$refs.volumectrl as HTMLAudioElement;
-			this.$store.commit('device/set', { key: 'mediaVolume', value: audioTag.volume });
+			ColdDeviceStorage.set('mediaVolume', audioTag.volume);
 		}
 	}
 });

src/client/components/drive-select-dialog.vue

@@ -10,7 +10,7 @@
 	@closed="$emit('closed')"
 >
 	<template #header>
-		{{ multiple ? ((type === 'file') ? $t('selectFiles') : $t('selectFolders')) : ((type === 'file') ? $t('selectFile') : $t('selectFolder')) }}
+		{{ multiple ? ((type === 'file') ? $ts.selectFiles : $ts.selectFolders) : ((type === 'file') ? $ts.selectFile : $ts.selectFolder) }}
 		<span v-if="selected.length > 0" style="margin-left: 8px; opacity: 0.5;">({{ number(selected.length) }})</span>
 	</template>
 	<XDrive :multiple="multiple" @changeSelection="onChangeSelection" @selected="ok()" :select="type"/>

src/client/components/drive-window.vue

@@ -6,7 +6,7 @@
 	@closed="$emit('closed')"
 >
 	<template #header>
-		{{ $t('drive') }}
+		{{ $ts.drive }}
 	</template>
 	<XDrive :initial-folder="initialFolder"/>
 </XWindow>

src/client/components/drive.file.vue

@@ -8,17 +8,17 @@
 	@dragend="onDragend"
 	:title="title"
 >
-	<div class="label" v-if="$store.state.i.avatarId == file.id">
+	<div class="label" v-if="$i.avatarId == file.id">
 		<img src="/assets/label.svg"/>
-		<p>{{ $t('avatar') }}</p>
+		<p>{{ $ts.avatar }}</p>
 	</div>
-	<div class="label" v-if="$store.state.i.bannerId == file.id">
+	<div class="label" v-if="$i.bannerId == file.id">
 		<img src="/assets/label.svg"/>
-		<p>{{ $t('banner') }}</p>
+		<p>{{ $ts.banner }}</p>
 	</div>
 	<div class="label red" v-if="file.isSensitive">
 		<img src="/assets/label-red.svg"/>
-		<p>{{ $t('nsfw') }}</p>
+		<p>{{ $ts.nsfw }}</p>
 	</div>
 
 	<MkDriveFileThumbnail class="thumbnail" :file="file" fit="contain"/>
@@ -82,26 +82,26 @@ export default defineComponent({
 	methods: {
 		getMenu() {
 			return [{
-				text: this.$t('rename'),
+				text: this.$ts.rename,
 				icon: faICursor,
 				action: this.rename
 			}, {
-				text: this.file.isSensitive ? this.$t('unmarkAsSensitive') : this.$t('markAsSensitive'),
+				text: this.file.isSensitive ? this.$ts.unmarkAsSensitive : this.$ts.markAsSensitive,
 				icon: this.file.isSensitive ? faEye : faEyeSlash,
 				action: this.toggleSensitive
 			}, null, {
-				text: this.$t('copyUrl'),
+				text: this.$ts.copyUrl,
 				icon: faLink,
 				action: this.copyUrl
 			}, {
 				type: 'a',
 				href: this.file.url,
 				target: '_blank',
-				text: this.$t('download'),
+				text: this.$ts.download,
 				icon: faDownload,
 				download: this.file.name
 			}, null, {
-				text: this.$t('delete'),
+				text: this.$ts.delete,
 				icon: faTrashAlt,
 				danger: true,
 				action: this.deleteFile
@@ -137,9 +137,9 @@ export default defineComponent({
 
 		rename() {
 			os.dialog({
-				title: this.$t('renameFile'),
+				title: this.$ts.renameFile,
 				input: {
-					placeholder: this.$t('inputNewFileName'),
+					placeholder: this.$ts.inputNewFileName,
 					default: this.file.name,
 					allowEmpty: false
 				}

src/client/components/drive.folder.vue

@@ -19,8 +19,8 @@
 		<template v-if="!hover"><Fa :icon="faFolder" fixed-width/></template>
 		{{ folder.name }}
 	</p>
-	<p class="upload" v-if="$store.state.settings.uploadFolder == folder.id">
-		{{ $t('uploadFolder') }}
+	<p class="upload" v-if="$store.state.uploadFolder == folder.id">
+		{{ $ts.uploadFolder }}
 	</p>
 	<button v-if="selectMode" class="checkbox _button" :class="{ checked: isSelected }" @click.prevent.stop="checkboxClicked"></button>
 </div>
@@ -155,14 +155,14 @@ export default defineComponent({
 					switch (err) {
 						case 'detected-circular-definition':
 							os.dialog({
-								title: this.$t('unableToProcess'),
-								text: this.$t('circularReferenceFolder')
+								title: this.$ts.unableToProcess,
+								text: this.$ts.circularReferenceFolder
 							});
 							break;
 						default:
 							os.dialog({
 								type: 'error',
-								text: this.$t('somethingHappened')
+								text: this.$ts.somethingHappened
 							});
 					}
 				});
@@ -195,9 +195,9 @@ export default defineComponent({
 
 		rename() {
 			os.dialog({
-				title: this.$t('renameFolder'),
+				title: this.$ts.renameFolder,
 				input: {
-					placeholder: this.$t('inputNewFolderName'),
+					placeholder: this.$ts.inputNewFolderName,
 					default: this.folder.name
 				}
 			}).then(({ canceled, result: name }) => {
@@ -213,40 +213,34 @@ export default defineComponent({
 			os.api('drive/folders/delete', {
 				folderId: this.folder.id
 			}).then(() => {
-				if (this.$store.state.settings.uploadFolder === this.folder.id) {
-					this.$store.dispatch('settings/set', {
-						key: 'uploadFolder',
-						value: null
-					});
+				if (this.$store.state.uploadFolder === this.folder.id) {
+					this.$store.set('uploadFolder', null);
 				}
 			}).catch(err => {
 				switch(err.id) {
 					case 'b0fc8a17-963c-405d-bfbc-859a487295e1':
 						os.dialog({
 							type: 'error',
-							title: this.$t('unableToDelete'),
-							text: this.$t('hasChildFilesOrFolders')
+							title: this.$ts.unableToDelete,
+							text: this.$ts.hasChildFilesOrFolders
 						});
 						break;
 					default:
 						os.dialog({
 							type: 'error',
-							text: this.$t('unableToDelete')
+							text: this.$ts.unableToDelete
 						});
 				}
 			});
 		},
 
 		setAsUploadFolder() {
-			this.$store.dispatch('settings/set', {
-				key: 'uploadFolder',
-				value: this.folder.id
-			});
+			this.$store.set('uploadFolder', this.folder.id);
 		},
 
 		onContextmenu(e) {
 			os.contextMenu([{
-				text: this.$t('openInWindow'),
+				text: this.$ts.openInWindow,
 				icon: faWindowRestore,
 				action: () => {
 					os.popup(import('./drive-window.vue'), {
@@ -255,11 +249,11 @@ export default defineComponent({
 					}, 'closed');
 				}
 			}, null, {
-				text: this.$t('rename'),
+				text: this.$ts.rename,
 				icon: faICursor,
 				action: this.rename
 			}, null, {
-				text: this.$t('delete'),
+				text: this.$ts.delete,
 				icon: faTrashAlt,
 				danger: true,
 				action: this.deleteFolder

src/client/components/drive.nav-folder.vue

@@ -8,7 +8,7 @@
 	@drop.stop="onDrop"
 >
 	<i v-if="folder == null"><Fa :icon="faCloud"/></i>
-	<span>{{ folder == null ? $t('drive') : folder.name }}</span>
+	<span>{{ folder == null ? $ts.drive : folder.name }}</span>
 </div>
 </template>
 

src/client/components/drive.vue

@@ -24,18 +24,18 @@
 				<XFolder v-for="f in folders" :key="f.id" class="folder" :folder="f" :select-mode="select === 'folder'" :is-selected="selectedFolders.some(x => x.id === f.id)" @chosen="chooseFolder"/>
 				<!-- SEE: https://stackoverflow.com/questions/18744164/flex-box-align-last-row-to-grid -->
 				<div class="padding" v-for="(n, i) in 16" :key="i"></div>
-				<MkButton ref="moreFolders" v-if="moreFolders">{{ $t('loadMore') }}</MkButton>
+				<MkButton ref="moreFolders" v-if="moreFolders">{{ $ts.loadMore }}</MkButton>
 			</div>
 			<div class="files" ref="filesContainer" v-show="files.length > 0">
 				<XFile v-for="file in files" :key="file.id" class="file" :file="file" :select-mode="select === 'file'" :is-selected="selectedFiles.some(x => x.id === file.id)" @chosen="chooseFile"/>
 				<!-- SEE: https://stackoverflow.com/questions/18744164/flex-box-align-last-row-to-grid -->
 				<div class="padding" v-for="(n, i) in 16" :key="i"></div>
-				<MkButton ref="loadMoreFiles" @click="fetchMoreFiles" v-show="moreFiles">{{ $t('loadMore') }}</MkButton>
+				<MkButton ref="loadMoreFiles" @click="fetchMoreFiles" v-show="moreFiles">{{ $ts.loadMore }}</MkButton>
 			</div>
 			<div class="empty" v-if="files.length == 0 && folders.length == 0 && !fetching">
 				<p v-if="draghover">{{ $t('empty-draghover') }}</p>
-				<p v-if="!draghover && folder == null"><strong>{{ $t('emptyDrive') }}</strong><br/>{{ $t('empty-drive-description') }}</p>
-				<p v-if="!draghover && folder != null">{{ $t('emptyFolder') }}</p>
+				<p v-if="!draghover && folder == null"><strong>{{ $ts.emptyDrive }}</strong><br/>{{ $t('empty-drive-description') }}</p>
+				<p v-if="!draghover && folder != null">{{ $ts.emptyFolder }}</p>
 			</div>
 		</div>
 		<MkLoading v-if="fetching"/>
@@ -136,7 +136,7 @@ export default defineComponent({
 	},
 
 	mounted() {
-		if (this.$store.state.device.enableInfiniteScroll && this.$refs.loadMoreFiles) {
+		if (this.$store.state.enableInfiniteScroll && this.$refs.loadMoreFiles) {
 			this.$nextTick(() => {
 				this.ilFilesObserver.observe((this.$refs.loadMoreFiles as Vue).$el)
 			});
@@ -159,7 +159,7 @@ export default defineComponent({
 	},
 
 	activated() {
-		if (this.$store.state.device.enableInfiniteScroll) {
+		if (this.$store.state.enableInfiniteScroll) {
 			this.$nextTick(() => {
 				this.ilFilesObserver.observe((this.$refs.loadMoreFiles as Vue).$el)
 			});
@@ -277,14 +277,14 @@ export default defineComponent({
 					switch (err) {
 						case 'detected-circular-definition':
 							os.dialog({
-								title: this.$t('unableToProcess'),
-								text: this.$t('circularReferenceFolder')
+								title: this.$ts.unableToProcess,
+								text: this.$ts.circularReferenceFolder
 							});
 							break;
 						default:
 							os.dialog({
 								type: 'error',
-								text: this.$t('somethingHappened')
+								text: this.$ts.somethingHappened
 							});
 					}
 				});
@@ -298,9 +298,9 @@ export default defineComponent({
 
 		urlUpload() {
 			os.dialog({
-				title: this.$t('uploadFromUrl'),
+				title: this.$ts.uploadFromUrl,
 				input: {
-					placeholder: this.$t('uploadFromUrlDescription')
+					placeholder: this.$ts.uploadFromUrlDescription
 				}
 			}).then(({ canceled, result: url }) => {
 				if (canceled) return;
@@ -310,17 +310,17 @@ export default defineComponent({
 				});
 
 				os.dialog({
-					title: this.$t('uploadFromUrlRequested'),
-					text: this.$t('uploadFromUrlMayTakeTime')
+					title: this.$ts.uploadFromUrlRequested,
+					text: this.$ts.uploadFromUrlMayTakeTime
 				});
 			});
 		},
 
 		createFolder() {
 			os.dialog({
-				title: this.$t('createFolder'),
+				title: this.$ts.createFolder,
 				input: {
-					placeholder: this.$t('folderName')
+					placeholder: this.$ts.folderName
 				}
 			}).then(({ canceled, result: name }) => {
 				if (canceled) return;
@@ -335,9 +335,9 @@ export default defineComponent({
 
 		renameFolder(folder) {
 			os.dialog({
-				title: this.$t('renameFolder'),
+				title: this.$ts.renameFolder,
 				input: {
-					placeholder: this.$t('inputNewFolderName'),
+					placeholder: this.$ts.inputNewFolderName,
 					default: folder.name
 				}
 			}).then(({ canceled, result: name }) => {
@@ -363,14 +363,14 @@ export default defineComponent({
 					case 'b0fc8a17-963c-405d-bfbc-859a487295e1':
 						os.dialog({
 							type: 'error',
-							title: this.$t('unableToDelete'),
-							text: this.$t('hasChildFilesOrFolders')
+							title: this.$ts.unableToDelete,
+							text: this.$ts.hasChildFilesOrFolders
 						});
 						break;
 					default:
 						os.dialog({
 							type: 'error',
-							text: this.$t('unableToDelete')
+							text: this.$ts.unableToDelete
 						});
 					}
 			});
@@ -602,29 +602,29 @@ export default defineComponent({
 
 		getMenu() {
 			return [{
-				text: this.$t('addFile'),
+				text: this.$ts.addFile,
 				type: 'label'
 			}, {
-				text: this.$t('upload'),
+				text: this.$ts.upload,
 				icon: faUpload,
 				action: () => { this.selectLocalFile(); }
 			}, {
-				text: this.$t('fromUrl'),
+				text: this.$ts.fromUrl,
 				icon: faLink,
 				action: () => { this.urlUpload(); }
 			}, null, {
-				text: this.folder ? this.folder.name : this.$t('drive'),
+				text: this.folder ? this.folder.name : this.$ts.drive,
 				type: 'label'
 			}, this.folder ? {
-				text: this.$t('renameFolder'),
+				text: this.$ts.renameFolder,
 				icon: faICursor,
 				action: () => { this.renameFolder(this.folder); }
 			} : undefined, this.folder ? {
-				text: this.$t('deleteFolder'),
+				text: this.$ts.deleteFolder,
 				icon: faTrashAlt,
 				action: () => { this.deleteFolder(this.folder); }
 			} : undefined, {
-				text: this.$t('createFolder'),
+				text: this.$ts.createFolder,
 				icon: faFolderPlus,
 				action: () => { this.createFolder(); }
 			}];

src/client/components/emoji-picker.vue

@@ -1,7 +1,7 @@
 <template>
 <MkModal ref="modal" :src="src" @click="$refs.modal.close()" @closed="$emit('closed')">
 	<div class="omfetrab _popup" :class="['w' + width, 'h' + height, { big }]">
-		<input ref="search" class="search" :class="{ filled: q != null && q != '' }" v-model.trim="q" :placeholder="$t('search')" @paste.stop="paste" @keyup.enter="done()">
+		<input ref="search" class="search" :class="{ filled: q != null && q != '' }" v-model.trim="q" :placeholder="$ts.search" @paste.stop="paste" @keyup.enter="done()">
 		<div class="emojis">
 			<section class="result">
 				<div v-if="searchResultCustom.length > 0">
@@ -13,7 +13,7 @@
 						tabindex="0"
 					>
 						<MkEmoji v-if="emoji.char != null" :emoji="emoji.char"/>
-						<img v-else :src="$store.state.device.disableShowingAnimatedImages ? getStaticImageUrl(emoji.url) : emoji.url"/>
+						<img v-else :src="$store.state.disableShowingAnimatedImages ? getStaticImageUrl(emoji.url) : emoji.url"/>
 					</button>
 				</div>
 				<div v-if="searchResultUnicode.length > 0">
@@ -43,9 +43,9 @@
 				</section>
 
 				<section>
-					<header class="_acrylic"><Fa :icon="faClock" fixed-width/> {{ $t('recentUsed') }}</header>
+					<header class="_acrylic"><Fa :icon="faClock" fixed-width/> {{ $ts.recentUsed }}</header>
 					<div>
-						<button v-for="emoji in $store.state.device.recentlyUsedEmojis"
+						<button v-for="emoji in $store.state.recentlyUsedEmojis"
 							class="_button"
 							@click="chosen(emoji, $event)"
 							:key="emoji"
@@ -59,7 +59,7 @@
 			</div>
 
 			<section v-for="category in customEmojiCategories" :key="'custom:' + category" class="custom">
-				<header class="_acrylic" v-appear="() => visibleCategories[category] = true">{{ category || $t('other') }}</header>
+				<header class="_acrylic" v-appear="() => visibleCategories[category] = true">{{ category || $ts.other }}</header>
 				<div v-if="visibleCategories[category]">
 					<button v-for="emoji in customEmojis.filter(e => e.category === category)"
 						class="_button"
@@ -67,7 +67,7 @@
 						@click="chosen(emoji, $event)"
 						:key="emoji.name"
 					>
-						<img :src="$store.state.device.disableShowingAnimatedImages ? getStaticImageUrl(emoji.url) : emoji.url"/>
+						<img :src="$store.state.disableShowingAnimatedImages ? getStaticImageUrl(emoji.url) : emoji.url"/>
 					</button>
 				</div>
 			</section>
@@ -100,6 +100,7 @@ import MkModal from '@/components/ui/modal.vue';
 import Particle from '@/components/particle.vue';
 import * as os from '@/os';
 import { isDeviceTouch } from '../scripts/is-device-touch';
+import { emojiCategories } from '@/instance';
 
 export default defineComponent({
 	components: {
@@ -125,12 +126,12 @@ export default defineComponent({
 		return {
 			emojilist: markRaw(emojilist),
 			getStaticImageUrl,
-			pinned: this.$store.state.settings.reactions,
-			width: this.asReactionPicker ? this.$store.state.device.reactionPickerWidth : 3,
-			height: this.asReactionPicker ? this.$store.state.device.reactionPickerHeight : 2,
+			pinned: this.$store.state.reactions,
+			width: this.asReactionPicker ? this.$store.state.reactionPickerWidth : 3,
+			height: this.asReactionPicker ? this.$store.state.reactionPickerHeight : 2,
 			big: this.asReactionPicker ? isDeviceTouch : false,
-			customEmojiCategories: this.$store.getters['instance/emojiCategories'],
-			customEmojis: this.$store.state.instance.meta.emojis,
+			customEmojiCategories: emojiCategories,
+			customEmojis: this.$instance.emojis,
 			visibleCategories: {},
 			q: null,
 			searchResultCustom: [],
@@ -346,10 +347,10 @@ export default defineComponent({
 
 			// 最近使った絵文字更新
 			if (!this.pinned.includes(key)) {
-				let recents = this.$store.state.device.recentlyUsedEmojis;
+				let recents = this.$store.state.recentlyUsedEmojis;
 				recents = recents.filter((e: any) => e !== key);
 				recents.unshift(key);
-				this.$store.commit('device/set', { key: 'recentlyUsedEmojis', value: recents.splice(0, 16) });
+				this.$store.set('recentlyUsedEmojis', recents.splice(0, 16));
 			}
 		},
 

src/client/components/follow-button.vue

@@ -1,29 +1,28 @@
 <template>
 <button class="kpoogebi _button"
-	:class="{ wait, active: isFollowing || hasPendingFollowRequestFromYou, full }"
+	:class="{ wait, active: isFollowing || hasPendingFollowRequestFromYou, full, large }"
 	@click="onClick"
 	:disabled="wait"
-	v-if="isFollowing != null"
 >
 	<template v-if="!wait">
 		<template v-if="hasPendingFollowRequestFromYou && user.isLocked">
-			<span v-if="full">{{ $t('followRequestPending') }}</span><Fa :icon="faHourglassHalf"/>
+			<span v-if="full">{{ $ts.followRequestPending }}</span><Fa :icon="faHourglassHalf"/>
 		</template>
 		<template v-else-if="hasPendingFollowRequestFromYou && !user.isLocked"> <!-- つまりリモートフォローの場合。 -->
-			<span v-if="full">{{ $t('processing') }}</span><Fa :icon="faSpinner" pulse/>
+			<span v-if="full">{{ $ts.processing }}</span><Fa :icon="faSpinner" pulse/>
 		</template>
 		<template v-else-if="isFollowing">
-			<span v-if="full">{{ $t('unfollow') }}</span><Fa :icon="faMinus"/>
+			<span v-if="full">{{ $ts.unfollow }}</span><Fa :icon="faMinus"/>
 		</template>
 		<template v-else-if="!isFollowing && user.isLocked">
-			<span v-if="full">{{ $t('followRequest') }}</span><Fa :icon="faPlus"/>
+			<span v-if="full">{{ $ts.followRequest }}</span><Fa :icon="faPlus"/>
 		</template>
 		<template v-else-if="!isFollowing && !user.isLocked">
-			<span v-if="full">{{ $t('follow') }}</span><Fa :icon="faPlus"/>
+			<span v-if="full">{{ $ts.follow }}</span><Fa :icon="faPlus"/>
 		</template>
 	</template>
 	<template v-else>
-		<span v-if="full">{{ $t('processing') }}</span><Fa :icon="faSpinner" pulse fixed-width/>
+		<span v-if="full">{{ $ts.processing }}</span><Fa :icon="faSpinner" pulse fixed-width/>
 	</template>
 </button>
 </template>
@@ -44,6 +43,11 @@ export default defineComponent({
 			required: false,
 			default: false,
 		},
+		large: {
+			type: Boolean,
+			required: false,
+			default: false,
+		},
 	},
 
 	data() {
@@ -149,6 +153,12 @@ export default defineComponent({
 		font-size: 14px;
 	}
 
+	&.large {
+		font-size: 16px;
+		height: 38px;
+		padding: 0 12px 0 16px;
+	}
+
 	&:not(.full) {
 		width: 31px;
 	}

src/client/components/form-dialog.vue

@@ -15,15 +15,15 @@
 	<FormBase class="xkpnjxcv">
 		<template v-for="item in Object.keys(form).filter(item => !form[item].hidden)">
 			<FormInput v-if="form[item].type === 'number'" v-model:value="values[item]" type="number" :step="form[item].step || 1">
-				<span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ $t('optional') }})</span>
+				<span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ $ts.optional }})</span>
 				<template v-if="form[item].description" #desc>{{ form[item].description }}</template>
 			</FormInput>
 			<FormInput v-else-if="form[item].type === 'string' && !form[item].multiline" v-model:value="values[item]" type="text">
-				<span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ $t('optional') }})</span>
+				<span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ $ts.optional }})</span>
 				<template v-if="form[item].description" #desc>{{ form[item].description }}</template>
 			</FormInput>
 			<FormTextarea v-else-if="form[item].type === 'string' && form[item].multiline" v-model:value="values[item]">
-				<span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ $t('optional') }})</span>
+				<span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ $ts.optional }})</span>
 				<template v-if="form[item].description" #desc>{{ form[item].description }}</template>
 			</FormTextarea>
 			<FormSwitch v-else-if="form[item].type === 'boolean'" v-model:value="values[item]">
@@ -31,11 +31,11 @@
 				<template v-if="form[item].description" #desc>{{ form[item].description }}</template>
 			</FormSwitch>
 			<FormSelect v-else-if="form[item].type === 'enum'" v-model:value="values[item]">
-				<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ $t('optional') }})</span></template>
+				<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ $ts.optional }})</span></template>
 				<option v-for="item in form[item].enum" :value="item.value" :key="item.value">{{ item.label }}</option>
 			</FormSelect>
 			<FormRange v-else-if="form[item].type === 'range'" v-model:value="values[item]" :min="form[item].mim" :max="form[item].max" :step="form[item].step">
-				<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ $t('optional') }})</span></template>
+				<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ $ts.optional }})</span></template>
 				<template v-if="form[item].description" #desc>{{ form[item].description }}</template>
 			</FormRange>
 			<FormButton v-else-if="form[item].type === 'button'" @click="form[item].action($event, values)">

src/client/components/form/form.scss

@@ -4,7 +4,7 @@
 
 	&._formClickable {
 		&:hover {
-			background: var(--panelHighlight);
+			//background: var(--panelHighlight);
 		}
 	}
 }
@@ -12,6 +12,7 @@
 ._formLabel {
 	font-size: 80%;
 	padding: 0 16px 8px 16px;
+	opacity: 0.8;
 
 	&:empty {
 		display: none;
@@ -21,6 +22,7 @@
 ._formCaption {
 	font-size: 80%;
 	padding: 8px 16px 0 16px;
+	opacity: 0.8;
 
 	&:empty {
 		display: none;

src/client/components/form/input.vue

@@ -44,7 +44,7 @@
 		</datalist>
 		<div class="suffix" ref="suffixEl"><slot name="suffix"></slot></div>
 	</div>
-	<button class="save _textButton" v-if="save && changed" @click="() => { changed = false; save(); }">{{ $t('save') }}</button>
+	<button class="save _textButton" v-if="save && changed" @click="() => { changed = false; save(); }">{{ $ts.save }}</button>
 	<div class="_formCaption"><slot name="desc"></slot></div>
 </div>
 </template>

src/client/components/form/link.vue

@@ -3,12 +3,18 @@
 	<a class="main _button _formPanel _formClickable" :href="to" target="_blank" v-if="external">
 		<span class="icon"><slot name="icon"></slot></span>
 		<span class="text"><slot></slot></span>
-		<Fa :icon="faExternalLinkAlt" class="right"/>
+		<span class="right">
+			<span class="text"><slot name="suffix"></slot></span>
+			<Fa :icon="faExternalLinkAlt" class="icon"/>
+		</span>
 	</a>
 	<MkA class="main _button _formPanel _formClickable" :class="{ active }" :to="to" v-else>
 		<span class="icon"><slot name="icon"></slot></span>
 		<span class="text"><slot></slot></span>
-		<Fa :icon="faChevronRight" class="right"/>
+		<span class="right">
+			<span class="text"><slot name="suffix"></slot></span>
+			<Fa :icon="faChevronRight" class="icon"/>
+		</span>
 	</MkA>
 </div>
 </template>
@@ -84,6 +90,10 @@ export default defineComponent({
 		> .right {
 			margin-left: auto;
 			opacity: 0.7;
+
+			> .text:not(:empty) {
+				margin-right: 0.75em;
+			}
 		}
 	}
 }

src/client/components/form/pagination.vue

@@ -6,7 +6,7 @@
 		<slot name="empty"></slot>
 	</div>
 	<FormButton v-show="more" class="button" @click="fetchMore" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" primary>
-		<template v-if="!moreFetching">{{ $t('loadMore') }}</template>
+		<template v-if="!moreFetching">{{ $ts.loadMore }}</template>
 		<template v-if="moreFetching"><MkLoading inline/></template>
 	</FormButton>
 </FormGroup>

src/client/components/form/textarea.vue

@@ -14,7 +14,7 @@
 			@blur="focused = false"
 		></textarea>
 	</div>
-	<button class="save _textButton" v-if="save && changed" @click="() => { changed = false; save(); }">{{ $t('save') }}</button>
+	<button class="save _textButton" v-if="save && changed" @click="() => { changed = false; save(); }">{{ $ts.save }}</button>
 	<div class="_formCaption"><slot name="desc"></slot></div>
 </div>
 </template>

src/client/components/global/a.vue

@@ -10,8 +10,9 @@ import { faExpandAlt, faColumns, faExternalLinkAlt, faLink, faWindowMaximize } f
 import * as os from '@/os';
 import copyToClipboard from '@/scripts/copy-to-clipboard';
 import { router } from '@/router';
-import { ui, url } from '@/config';
+import { url } from '@/config';
 import { popout } from '@/scripts/popout';
+import { ColdDeviceStorage } from '@/store';
 
 export default defineComponent({
 	inject: {
@@ -57,31 +58,31 @@ export default defineComponent({
 				text: this.to,
 			}, {
 				icon: faWindowMaximize,
-				text: this.$t('openInWindow'),
+				text: this.$ts.openInWindow,
 				action: () => {
 					os.pageWindow(this.to);
 				}
 			}, this.sideViewHook ? {
 				icon: faColumns,
-				text: this.$t('openInSideView'),
+				text: this.$ts.openInSideView,
 				action: () => {
 					this.sideViewHook(this.to);
 				}
 			} : undefined, {
 				icon: faExpandAlt,
-				text: this.$t('showInPage'),
+				text: this.$ts.showInPage,
 				action: () => {
 					this.$router.push(this.to);
 				}
 			}, null, {
 				icon: faExternalLinkAlt,
-				text: this.$t('openInNewTab'),
+				text: this.$ts.openInNewTab,
 				action: () => {
 					window.open(this.to, '_blank');
 				}
 			}, {
 				icon: faLink,
-				text: this.$t('copyLink'),
+				text: this.$ts.copyLink,
 				action: () => {
 					copyToClipboard(`${url}${this.to}`);
 				}
@@ -98,8 +99,8 @@ export default defineComponent({
 
 		nav() {
 			if (this.to.startsWith('/my/messaging')) {
-				if (this.$store.state.device.chatOpenBehavior === 'window') return this.window();
-				if (this.$store.state.device.chatOpenBehavior === 'popout') return this.popout();
+				if (ColdDeviceStorage.get('chatOpenBehavior') === 'window') return this.window();
+				if (ColdDeviceStorage.get('chatOpenBehavior') === 'popout') return this.popout();
 			}
 
 			if (this.behavior) {
@@ -111,15 +112,9 @@ export default defineComponent({
 			if (this.navHook) {
 				this.navHook(this.to);
 			} else {
-				if (this.$store.state.device.defaultSideView && this.sideViewHook && this.to !== '/') {
+				if (this.$store.state.defaultSideView && this.sideViewHook && this.to !== '/') {
 					return this.sideViewHook(this.to);
 				}
-				if (this.$store.state.device.deckNavWindow && (ui === 'deck') && this.to !== '/') {
-					return this.window();
-				}
-				if (ui === 'desktop') {
-					return this.window();
-				}
 
 				if (this.$router.currentRoute.value.path === this.to) {
 					window.scroll({ top: 0, behavior: 'smooth' });

src/client/components/global/acct.vue

@@ -1,7 +1,7 @@
 <template>
 <span class="mk-acct" v-once>
 	<span class="name">@{{ user.username }}</span>
-	<span class="host" v-if="user.host || detail || $store.state.settings.showFullAcct">@{{ user.host || host }}</span>
+	<span class="host" v-if="user.host || detail || $store.state.showFullAcct">@{{ user.host || host }}</span>
 </span>
 </template>
 

src/client/components/global/avatar.vue

@@ -1,9 +1,9 @@
 <template>
 <span class="eiwwqkts" :class="{ cat }" :title="acct(user)" v-if="disableLink" v-user-preview="disablePreview ? undefined : user.id" @click="onClick">
-	<img class="inner" :src="url"/>
+	<img class="inner" :src="url" decoding="async"/>
 </span>
 <MkA class="eiwwqkts" :class="{ cat }" :to="userPage(user)" :title="acct(user)" :target="target" v-else v-user-preview="disablePreview ? undefined : user.id">
-	<img class="inner" :src="url"/>
+	<img class="inner" :src="url" decoding="async"/>
 </MkA>
 </template>
 
@@ -11,7 +11,7 @@
 import { defineComponent } from 'vue';
 import { getStaticImageUrl } from '@/scripts/get-static-image-url';
 import { extractAvgColorFromBlurhash } from '@/scripts/extract-avg-color-from-blurhash';
-import { acct, userPage } from '../filters/user';
+import { acct, userPage } from '@/filters/user';
 
 export default defineComponent({
 	props: {
@@ -38,7 +38,7 @@ export default defineComponent({
 			return this.user.isCat;
 		},
 		url(): string {
-			return this.$store.state.device.disableShowingAnimatedImages
+			return this.$store.state.disableShowingAnimatedImages
 				? getStaticImageUrl(this.user.avatarUrl)
 				: this.user.avatarUrl;
 		},

src/client/components/global/emoji.vue

@@ -1,6 +1,6 @@
 <template>
-<img v-if="customEmoji" class="mk-emoji custom" :class="{ normal, noStyle }" :src="url" :alt="alt" :title="alt"/>
-<img v-else-if="char && !useOsNativeEmojis" class="mk-emoji" :src="url" :alt="alt" :title="alt"/>
+<img v-if="customEmoji" class="mk-emoji custom" :class="{ normal, noStyle }" :src="url" :alt="alt" :title="alt" decoding="async"/>
+<img v-else-if="char && !useOsNativeEmojis" class="mk-emoji" :src="url" :alt="alt" :title="alt" decoding="async"/>
 <span v-else-if="char && useOsNativeEmojis">{{ char }}</span>
 <span v-else>{{ emoji }}</span>
 </template>
@@ -8,7 +8,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { getStaticImageUrl } from '@/scripts/get-static-image-url';
-import { twemojiSvgBase } from '../../misc/twemoji-base';
+import { twemojiSvgBase } from '@/../misc/twemoji-base';
 
 export default defineComponent({
 	props: {
@@ -54,13 +54,13 @@ export default defineComponent({
 		},
 
 		useOsNativeEmojis(): boolean {
-			return this.$store.state.device.useOsNativeEmojis && !this.isReaction;
+			return this.$store.state.useOsNativeEmojis && !this.isReaction;
 		},
 
 		ce() {
 			let ce = [];
 			if (this.customEmojis) ce = ce.concat(this.customEmojis);
-			if (this.$store.state.instance.meta && this.$store.state.instance.meta.emojis) ce = ce.concat(this.$store.state.instance.meta.emojis);
+			if (this.$instance && this.$instance.emojis) ce = ce.concat(this.$instance.emojis);
 			return ce;
 		}
 	},
@@ -72,7 +72,7 @@ export default defineComponent({
 					const customEmoji = this.ce.find(x => x.name === this.emoji.substr(1, this.emoji.length - 2));
 					if (customEmoji) {
 						this.customEmoji = customEmoji;
-						this.url = this.$store.state.device.disableShowingAnimatedImages
+						this.url = this.$store.state.disableShowingAnimatedImages
 							? getStaticImageUrl(customEmoji.url)
 							: customEmoji.url;
 					}

src/client/components/global/error.vue

@@ -1,9 +1,9 @@
 <template>
-<transition :name="$store.state.device.animation ? 'zoom' : ''" appear>
+<transition :name="$store.state.animation ? 'zoom' : ''" appear>
 	<div class="mjndxjcg">
 		<img src="https://xn--931a.moe/assets/error.jpg" class="_ghost"/>
-		<p><Fa :icon="faExclamationTriangle"/> {{ $t('somethingHappened') }}</p>
-		<MkButton @click="() => $emit('retry')" class="button">{{ $t('retry') }}</MkButton>
+		<p><Fa :icon="faExclamationTriangle"/> {{ $ts.somethingHappened }}</p>
+		<MkButton @click="() => $emit('retry')" class="button">{{ $ts.retry }}</MkButton>
 	</div>
 </transition>
 </template>
@@ -11,7 +11,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';
-import MkButton from './ui/button.vue';
+import MkButton from '@/components/ui/button.vue';
 
 export default defineComponent({
 	components: {

src/client/components/global/i18n.ts

@@ -0,0 +1,37 @@
+import { h, defineComponent } from 'vue';
+
+export default defineComponent({
+	props: {
+		src: {
+			type: String,
+			required: true,
+		},
+		tag: {
+			type: String,
+			required: false,
+			default: 'span',
+		},
+	},
+	render() {
+		let str = this.src;
+		const parsed = [] as (string | { arg: string; })[];
+		while (true) {
+			const nextBracketOpen = str.indexOf('{');
+			const nextBracketClose = str.indexOf('}');
+
+			if (nextBracketOpen === -1) {
+				parsed.push(str);
+				break;
+			} else {
+				if (nextBracketOpen > 0) parsed.push(str.substr(0, nextBracketOpen));
+				parsed.push({
+					arg: str.substring(nextBracketOpen + 1, nextBracketClose)
+				});
+			}
+
+			str = str.substr(nextBracketClose + 1);
+		}
+
+		return h(this.tag, parsed.map(x => typeof x === 'string' ? x : this.$slots[x.arg]()));
+	}
+});

src/client/components/global/misskey-flavored-markdown.vue

@@ -4,7 +4,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import MfmCore from './mfm';
+import MfmCore from '@/components/mfm';
 
 export default defineComponent({
 	components: {

src/client/components/global/time.vue

@@ -44,9 +44,9 @@ export default defineComponent({
 				ago >= 3600     ? this.$t('_ago.hoursAgo',   { n: (~~(ago / 3600)).toString() }) :
 				ago >= 60       ? this.$t('_ago.minutesAgo', { n: (~~(ago / 60)).toString() }) :
 				ago >= 10       ? this.$t('_ago.secondsAgo', { n: (~~(ago % 60)).toString() }) :
-				ago >= -1       ? this.$t('_ago.justNow') :
-				ago <  -1       ? this.$t('_ago.future') :
-				this.$t('_ago.unknown'));
+				ago >= -1       ? this.$ts._ago.justNow :
+				ago <  -1       ? this.$ts._ago.future :
+				this.$ts._ago.unknown);
 		}
 	},
 	created() {

src/client/components/google.vue

@@ -1,7 +1,7 @@
 <template>
 <div class="mk-google">
 	<input type="search" v-model="query" :placeholder="q">
-	<button @click="search"><Fa :icon="faSearch"/> {{ $t('search') }}</button>
+	<button @click="search"><Fa :icon="faSearch"/> {{ $ts.search }}</button>
 </div>
 </template>
 
@@ -23,7 +23,7 @@ export default defineComponent({
 	},
 	methods: {
 		search() {
-			const engine = this.$store.state.settings.webSearchEngine ||
+			const engine = this.$store.state.webSearchEngine ||
 				'https://www.google.com/search?q={{query}}';
 			const url = engine.replace('{{query}}', this.query)
 			window.open(url, '_blank');

src/client/components/index.ts

@@ -1,16 +1,17 @@
 import { App } from 'vue';
 
-import mfm from './misskey-flavored-markdown.vue';
-import a from './ui/a.vue';
-import acct from './acct.vue';
-import avatar from './avatar.vue';
-import emoji from './emoji.vue';
-import userName from './user-name.vue';
-import ellipsis from './ellipsis.vue';
-import time from './time.vue';
-import url from './url.vue';
-import loading from './loading.vue';
-import error from './error.vue';
+import mfm from './global/misskey-flavored-markdown.vue';
+import a from './global/a.vue';
+import acct from './global/acct.vue';
+import avatar from './global/avatar.vue';
+import emoji from './global/emoji.vue';
+import userName from './global/user-name.vue';
+import ellipsis from './global/ellipsis.vue';
+import time from './global/time.vue';
+import url from './global/url.vue';
+import i18n from './global/i18n';
+import loading from './global/loading.vue';
+import error from './global/error.vue';
 
 export default function(app: App) {
 	app.component('Mfm', mfm);
@@ -24,4 +25,5 @@ export default function(app: App) {
 	app.component('MkUrl', url);
 	app.component('MkLoading', loading);
 	app.component('MkError', error);
+	app.component('I18n', i18n);
 }

src/client/components/instance-stats.vue

@@ -3,80 +3,80 @@
 	<div class="stats" v-if="info">
 		<div class="_panel">
 			<div>
-				<b><Fa :icon="faUser"/>{{ $t('users') }}</b>
-				<small>{{ $t('local') }}</small>
+				<b><Fa :icon="faUser"/>{{ $ts.users }}</b>
+				<small>{{ $ts.local }}</small>
 			</div>
 			<div>
 				<dl class="total">
-					<dt>{{ $t('total') }}</dt>
+					<dt>{{ $ts.total }}</dt>
 					<dd>{{ number(info.originalUsersCount) }}</dd>
 				</dl>
 				<dl class="diff" :class="{ inc: usersLocalDoD > 0 }">
-					<dt>{{ $t('dayOverDayChanges') }}</dt>
+					<dt>{{ $ts.dayOverDayChanges }}</dt>
 					<dd>{{ number(usersLocalDoD) }}</dd>
 				</dl>
 				<dl class="diff" :class="{ inc: usersLocalWoW > 0 }">
-					<dt>{{ $t('weekOverWeekChanges') }}</dt>
+					<dt>{{ $ts.weekOverWeekChanges }}</dt>
 					<dd>{{ number(usersLocalWoW) }}</dd>
 				</dl>
 			</div>
 		</div>
 		<div class="_panel">
 			<div>
-				<b><Fa :icon="faUser"/>{{ $t('users') }}</b>
-				<small>{{ $t('remote') }}</small>
+				<b><Fa :icon="faUser"/>{{ $ts.users }}</b>
+				<small>{{ $ts.remote }}</small>
 			</div>
 			<div>
 				<dl class="total">
-					<dt>{{ $t('total') }}</dt>
+					<dt>{{ $ts.total }}</dt>
 					<dd>{{ number((info.usersCount - info.originalUsersCount)) }}</dd>
 				</dl>
 				<dl class="diff" :class="{ inc: usersRemoteDoD > 0 }">
-					<dt>{{ $t('dayOverDayChanges') }}</dt>
+					<dt>{{ $ts.dayOverDayChanges }}</dt>
 					<dd>{{ number(usersRemoteDoD) }}</dd>
 				</dl>
 				<dl class="diff" :class="{ inc: usersRemoteWoW > 0 }">
-					<dt>{{ $t('weekOverWeekChanges') }}</dt>
+					<dt>{{ $ts.weekOverWeekChanges }}</dt>
 					<dd>{{ number(usersRemoteWoW) }}</dd>
 				</dl>
 			</div>
 		</div>
 		<div class="_panel">
 			<div>
-				<b><Fa :icon="faPencilAlt"/>{{ $t('notes') }}</b>
-				<small>{{ $t('local') }}</small>
+				<b><Fa :icon="faPencilAlt"/>{{ $ts.notes }}</b>
+				<small>{{ $ts.local }}</small>
 			</div>
 			<div>
 				<dl class="total">
-					<dt>{{ $t('total') }}</dt>
+					<dt>{{ $ts.total }}</dt>
 					<dd>{{ number(info.originalNotesCount) }}</dd>
 				</dl>
 				<dl class="diff" :class="{ inc: notesLocalDoD > 0 }">
-					<dt>{{ $t('dayOverDayChanges') }}</dt>
+					<dt>{{ $ts.dayOverDayChanges }}</dt>
 					<dd>{{ number(notesLocalDoD) }}</dd>
 				</dl>
 				<dl class="diff" :class="{ inc: notesLocalWoW > 0 }">
-					<dt>{{ $t('weekOverWeekChanges') }}</dt>
+					<dt>{{ $ts.weekOverWeekChanges }}</dt>
 					<dd>{{ number(notesLocalWoW) }}</dd>
 				</dl>
 			</div>
 		</div>
 		<div class="_panel">
 			<div>
-				<b><Fa :icon="faPencilAlt"/>{{ $t('notes') }}</b>
-				<small>{{ $t('remote') }}</small>
+				<b><Fa :icon="faPencilAlt"/>{{ $ts.notes }}</b>
+				<small>{{ $ts.remote }}</small>
 			</div>
 			<div>
 				<dl class="total">
-					<dt>{{ $t('total') }}</dt>
+					<dt>{{ $ts.total }}</dt>
 					<dd>{{ number((info.notesCount - info.originalNotesCount)) }}</dd>
 				</dl>
 				<dl class="diff" :class="{ inc: notesRemoteDoD > 0 }">
-					<dt>{{ $t('dayOverDayChanges') }}</dt>
+					<dt>{{ $ts.dayOverDayChanges }}</dt>
 					<dd>{{ number(notesRemoteDoD) }}</dd>
 				</dl>
 				<dl class="diff" :class="{ inc: notesRemoteWoW > 0 }">
-					<dt>{{ $t('weekOverWeekChanges') }}</dt>
+					<dt>{{ $ts.weekOverWeekChanges }}</dt>
 					<dd>{{ number(notesRemoteWoW) }}</dd>
 				</dl>
 			</div>
@@ -84,35 +84,35 @@
 	</div>
 
 	<section class="_card">
-		<div class="_title" style="position: relative;"><Fa :icon="faChartBar"/> {{ $t('statistics') }}<button @click="fetchChart" class="_button" style="position: absolute; right: 0; bottom: 0; top: 0; padding: inherit;"><Fa :icon="faSync"/></button></div>
+		<div class="_title" style="position: relative;"><Fa :icon="faChartBar"/> {{ $ts.statistics }}<button @click="fetchChart" class="_button" style="position: absolute; right: 0; bottom: 0; top: 0; padding: inherit;"><Fa :icon="faSync"/></button></div>
 		<div class="_content" style="margin-top: -8px;">
 			<div class="selects" style="display: flex;">
 				<MkSelect v-model:value="chartSrc" style="margin: 0; flex: 1;">
-					<optgroup :label="$t('federation')">
-						<option value="federation-instances">{{ $t('_charts.federationInstancesIncDec') }}</option>
-						<option value="federation-instances-total">{{ $t('_charts.federationInstancesTotal') }}</option>
+					<optgroup :label="$ts.federation">
+						<option value="federation-instances">{{ $ts._charts.federationInstancesIncDec }}</option>
+						<option value="federation-instances-total">{{ $ts._charts.federationInstancesTotal }}</option>
 					</optgroup>
-					<optgroup :label="$t('users')">
-						<option value="users">{{ $t('_charts.usersIncDec') }}</option>
-						<option value="users-total">{{ $t('_charts.usersTotal') }}</option>
-						<option value="active-users">{{ $t('_charts.activeUsers') }}</option>
+					<optgroup :label="$ts.users">
+						<option value="users">{{ $ts._charts.usersIncDec }}</option>
+						<option value="users-total">{{ $ts._charts.usersTotal }}</option>
+						<option value="active-users">{{ $ts._charts.activeUsers }}</option>
 					</optgroup>
-					<optgroup :label="$t('notes')">
-						<option value="notes">{{ $t('_charts.notesIncDec') }}</option>
-						<option value="local-notes">{{ $t('_charts.localNotesIncDec') }}</option>
-						<option value="remote-notes">{{ $t('_charts.remoteNotesIncDec') }}</option>
-						<option value="notes-total">{{ $t('_charts.notesTotal') }}</option>
+					<optgroup :label="$ts.notes">
+						<option value="notes">{{ $ts._charts.notesIncDec }}</option>
+						<option value="local-notes">{{ $ts._charts.localNotesIncDec }}</option>
+						<option value="remote-notes">{{ $ts._charts.remoteNotesIncDec }}</option>
+						<option value="notes-total">{{ $ts._charts.notesTotal }}</option>
 					</optgroup>
-					<optgroup :label="$t('drive')">
-						<option value="drive-files">{{ $t('_charts.filesIncDec') }}</option>
-						<option value="drive-files-total">{{ $t('_charts.filesTotal') }}</option>
-						<option value="drive">{{ $t('_charts.storageUsageIncDec') }}</option>
-						<option value="drive-total">{{ $t('_charts.storageUsageTotal') }}</option>
+					<optgroup :label="$ts.drive">
+						<option value="drive-files">{{ $ts._charts.filesIncDec }}</option>
+						<option value="drive-files-total">{{ $ts._charts.filesTotal }}</option>
+						<option value="drive">{{ $ts._charts.storageUsageIncDec }}</option>
+						<option value="drive-total">{{ $ts._charts.storageUsageTotal }}</option>
 					</optgroup>
 				</MkSelect>
 				<MkSelect v-model:value="chartSpan" style="margin: 0;">
-					<option value="hour">{{ $t('perHour') }}</option>
-					<option value="day">{{ $t('perDay') }}</option>
+					<option value="hour">{{ $ts.perHour }}</option>
+					<option value="day">{{ $ts.perDay }}</option>
 				</MkSelect>
 			</div>
 			<canvas ref="chart"></canvas>
@@ -278,7 +278,7 @@ export default defineComponent({
 			}
 
 			// TODO: var(--panel)の色が暗いか明るいかで判定する
-			const gridColor = this.$store.state.device.darkMode ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.1)';
+			const gridColor = this.$store.state.darkMode ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.1)';
 
 			Chart.defaults.global.defaultFontColor = getComputedStyle(document.documentElement).getPropertyValue('--fg');
 			this.chartInstance = markRaw(new Chart(this.$refs.chart, {

src/client/components/launch-pad.vue

@@ -18,7 +18,7 @@
 		<div class="sub">
 			<MkA to="/docs" @click.passive="close()">
 				<Fa :icon="faQuestionCircle" class="icon"/>
-				<div class="text">{{ $t('help') }}</div>
+				<div class="text">{{ $ts.help }}</div>
 			</MkA>
 			<MkA to="/about" @click.passive="close()">
 				<Fa :icon="faInfoCircle" class="icon"/>
@@ -26,7 +26,7 @@
 			</MkA>
 			<MkA to="/about-misskey" @click.passive="close()">
 				<Fa :icon="faInfoCircle" class="icon"/>
-				<div class="text">{{ $t('aboutMisskey') }}</div>
+				<div class="text">{{ $ts.aboutMisskey }}</div>
 			</MkA>
 		</div>
 	</div>
@@ -58,14 +58,14 @@ export default defineComponent({
 
 	computed: {
 		menu(): string[] {
-			return this.$store.state.deviceUser.menu;
+			return this.$store.state.menu;
 		},
 	},
 
 	created() {
 		this.items = Object.keys(this.menuDef).filter(k => !this.menu.includes(k)).map(k => this.menuDef[k]).filter(def => def.show == null ? true : def.show).map(def => ({
 			type: def.to ? 'link' : 'button',
-			text: this.$t(def.title),
+			text: this.$ts[def.title],
 			icon: def.icon,
 			to: def.to,
 			action: def.action,

src/client/components/media-banner.vue

@@ -2,8 +2,8 @@
 <div class="mk-media-banner">
 	<div class="sensitive" v-if="media.isSensitive && hide" @click="hide = false">
 		<span class="icon"><Fa :icon="faExclamationTriangle"/></span>
-		<b>{{ $t('sensitive') }}</b>
-		<span>{{ $t('clickToShow') }}</span>
+		<b>{{ $ts.sensitive }}</b>
+		<span>{{ $ts.clickToShow }}</span>
 	</div>
 	<div class="audio" v-else-if="media.type.startsWith('audio') && media.type !== 'audio/midi'">
 		<audio class="audio"
@@ -29,6 +29,7 @@
 import { defineComponent } from 'vue';
 import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';
 import * as os from '@/os';
+import { ColdDeviceStorage } from '@/store';
 
 export default defineComponent({
 	props: {
@@ -45,12 +46,12 @@ export default defineComponent({
 	},
 	mounted() {
 		const audioTag = this.$refs.audio as HTMLAudioElement;
-		if (audioTag) audioTag.volume = this.$store.state.device.mediaVolume;
+		if (audioTag) audioTag.volume = ColdDeviceStorage.get('mediaVolume');
 	},
 	methods: {
 		volumechange() {
 			const audioTag = this.$refs.audio as HTMLAudioElement;
-			this.$store.commit('device/set', { key: 'mediaVolume', value: audioTag.volume });
+			ColdDeviceStorage.set('mediaVolume', audioTag.volume);
 		},
 	},
 })

src/client/components/media-image.vue

@@ -3,8 +3,8 @@
 	<ImgWithBlurhash class="bg" :hash="image.blurhash" :title="image.name"/>
 	<div class="text">
 		<div>
-			<b><Fa :icon="faExclamationTriangle"/> {{ $t('sensitive') }}</b>
-			<span>{{ $t('clickToShow') }}</span>
+			<b><Fa :icon="faExclamationTriangle"/> {{ $ts.sensitive }}</b>
+			<span>{{ $ts.clickToShow }}</span>
 		</div>
 	</div>
 </div>
@@ -52,13 +52,11 @@ export default defineComponent({
 	},
 	computed: {
 		url(): any {
-			let url = this.$store.state.device.disableShowingAnimatedImages
+			let url = this.$store.state.disableShowingAnimatedImages
 				? getStaticImageUrl(this.image.thumbnailUrl)
 				: this.image.thumbnailUrl;
 
-			if (this.$store.state.device.loadRemoteMedia) {
-				url = null;
-			} else if (this.raw || this.$store.state.device.loadRawImages) {
+			if (this.raw || this.$store.state.loadRawImages) {
 				url = this.image.url;
 			}
 
@@ -68,7 +66,7 @@ export default defineComponent({
 	created() {
 		// Plugin:register_note_view_interruptor を使って書き換えられる可能性があるためwatchする
 		this.$watch('image', () => {
-			this.hide = (this.$store.state.device.nsfw === 'force') ? true : this.image.isSensitive && (this.$store.state.device.nsfw !== 'ignore');
+			this.hide = (this.$store.state.nsfw === 'force') ? true : this.image.isSensitive && (this.$store.state.nsfw !== 'ignore');
 			if (this.image.blurhash) {
 				this.color = extractAvgColorFromBlurhash(this.image.blurhash);
 			}
@@ -79,7 +77,7 @@ export default defineComponent({
 	},
 	methods: {
 		onClick() {
-			if (this.$store.state.device.imageNewTab) {
+			if (this.$store.state.imageNewTab) {
 				window.open(this.image.url, '_blank');
 			} else {
 				os.popup(ImageViewer, {

src/client/components/media-video.vue

@@ -1,8 +1,8 @@
 <template>
 <div class="icozogqfvdetwohsdglrbswgrejoxbdj" v-if="hide" @click="hide = false">
 	<div>
-		<b><Fa :icon="faExclamationTriangle"/> {{ $t('sensitive') }}</b>
-		<span>{{ $t('clickToShow') }}</span>
+		<b><Fa :icon="faExclamationTriangle"/> {{ $ts.sensitive }}</b>
+		<span>{{ $ts.clickToShow }}</span>
 	</div>
 </div>
 <div class="kkjnbbplepmiyuadieoenjgutgcmtsvu" v-else>
@@ -48,7 +48,7 @@ export default defineComponent({
 		}
 	},
 	created() {
-		this.hide = (this.$store.state.device.nsfw === 'force') ? true : this.video.isSensitive && (this.$store.state.device.nsfw !== 'ignore');
+		this.hide = (this.$store.state.nsfw === 'force') ? true : this.video.isSensitive && (this.$store.state.nsfw !== 'ignore');
 	},
 });
 </script>

src/client/components/mention.vue

@@ -1,9 +1,9 @@
 <template>
 <MkA class="ldlomzub" :class="{ isMe }" :to="url" v-user-preview="canonical" v-if="url.startsWith('/')">
-	<span class="me" v-if="isMe">{{ $t('you') }}</span>
+	<span class="me" v-if="isMe">{{ $ts.you }}</span>
 	<span class="main">
 		<span class="username">@{{ username }}</span>
-		<span class="host" v-if="(host != localHost) || $store.state.settings.showFullAcct">@{{ toUnicode(host) }}</span>
+		<span class="host" v-if="(host != localHost) || $store.state.showFullAcct">@{{ toUnicode(host) }}</span>
 	</span>
 </MkA>
 <a class="ldlomzub" :href="url" target="_blank" rel="noopener" v-else>
@@ -50,8 +50,8 @@ export default defineComponent({
 			return this.host === localHost ? `@${this.username}` : `@${this.username}@${toUnicode(this.host)}`;
 		},
 		isMe(): boolean {
-			return this.$store.getters.isSignedIn && (
-				`@${this.username}@${toUnicode(this.host)}` === `@${this.$store.state.i.username}@${toUnicode(localHost)}`.toLowerCase()
+			return this.$i && (
+				`@${this.username}@${toUnicode(this.host)}` === `@${this.$i.username}@${toUnicode(localHost)}`.toLowerCase()
 			);
 		}
 	},

src/client/components/mfm.ts

@@ -1,15 +1,15 @@
 import { VNode, defineComponent, h } from 'vue';
-import { MfmForest } from '../../mfm/prelude';
-import { parse, parsePlain } from '../../mfm/parse';
-import MkUrl from './url.vue';
-import MkLink from './link.vue';
-import MkMention from './mention.vue';
-import MkEmoji from './emoji.vue';
-import { concat } from '../../prelude/array';
-import MkFormula from './formula.vue';
-import MkCode from './code.vue';
-import MkGoogle from './google.vue';
-import MkA from './ui/a.vue';
+import { MfmForest } from '@/../mfm/prelude';
+import { parse, parsePlain } from '@/../mfm/parse';
+import MkUrl from '@/components/global/url.vue';
+import MkLink from '@/components/link.vue';
+import MkMention from '@/components/mention.vue';
+import MkEmoji from '@/components/global/emoji.vue';
+import { concat } from '@/../prelude/array';
+import MkFormula from '@/components/formula.vue';
+import MkCode from '@/components/code.vue';
+import MkGoogle from '@/components/google.vue';
+import MkA from '@/components/global/a.vue';
 import { host } from '@/config';
 
 export default defineComponent({
@@ -82,22 +82,22 @@ export default defineComponent({
 					let style;
 					switch (token.node.props.name) {
 						case 'tada': {
-							style = `font-size: 150%;` + (this.$store.state.device.animatedMfm ? 'animation: tada 1s linear infinite both;' : '');
+							style = `font-size: 150%;` + (this.$store.state.animatedMfm ? 'animation: tada 1s linear infinite both;' : '');
 							break;
 						}
 						case 'jelly': {
 							const speed = token.node.props.args.speed || '1s';
-							style = (this.$store.state.device.animatedMfm ? `animation: mfm-rubberBand ${speed} linear infinite both;` : '');
+							style = (this.$store.state.animatedMfm ? `animation: mfm-rubberBand ${speed} linear infinite both;` : '');
 							break;
 						}
 						case 'twitch': {
 							const speed = token.node.props.args.speed || '0.5s';
-							style = this.$store.state.device.animatedMfm ? `animation: mfm-twitch ${speed} ease infinite;` : '';
+							style = this.$store.state.animatedMfm ? `animation: mfm-twitch ${speed} ease infinite;` : '';
 							break;
 						}
 						case 'shake': {
 							const speed = token.node.props.args.speed || '0.5s';
-							style = this.$store.state.device.animatedMfm ? `animation: mfm-shake ${speed} ease infinite;` : '';
+							style = this.$store.state.animatedMfm ? `animation: mfm-shake ${speed} ease infinite;` : '';
 							break;
 						}
 						case 'spin': {
@@ -110,15 +110,15 @@ export default defineComponent({
 								token.node.props.args.y ? 'mfm-spinY' :
 								'mfm-spin';
 							const speed = token.node.props.args.speed || '1.5s';
-							style = this.$store.state.device.animatedMfm ? `animation: ${anime} ${speed} linear infinite; animation-direction: ${direction};` : '';
+							style = this.$store.state.animatedMfm ? `animation: ${anime} ${speed} linear infinite; animation-direction: ${direction};` : '';
 							break;
 						}
 						case 'jump': {
-							style = this.$store.state.device.animatedMfm ? 'animation: mfm-jump 0.75s linear infinite;' : '';
+							style = this.$store.state.animatedMfm ? 'animation: mfm-jump 0.75s linear infinite;' : '';
 							break;
 						}
 						case 'bounce': {
-							style = this.$store.state.device.animatedMfm ? 'animation: mfm-bounce 0.75s linear infinite; transform-origin: center bottom;' : '';
+							style = this.$store.state.animatedMfm ? 'animation: mfm-bounce 0.75s linear infinite; transform-origin: center bottom;' : '';
 							break;
 						}
 						case 'flip': {

src/client/components/note.sub.vue

@@ -6,7 +6,7 @@
 			<XNoteHeader class="header" :note="note" :mini="true"/>
 			<div class="body">
 				<p v-if="note.cw != null" class="cw">
-					<Mfm v-if="note.cw != ''" class="text" :text="note.cw" :author="note.user" :i="$store.state.i" :custom-emojis="note.emojis" />
+					<Mfm v-if="note.cw != ''" class="text" :text="note.cw" :author="note.user" :i="$i" :custom-emojis="note.emojis" />
 					<XCwButton v-model:value="showContent" :note="note"/>
 				</p>
 				<div class="content" v-show="note.cw == null || showContent">

src/client/components/note.vue

@@ -10,19 +10,19 @@
 >
 	<XSub v-for="note in conversation" class="reply-to-more" :key="note.id" :note="note"/>
 	<XSub :note="appearNote.reply" class="reply-to" v-if="appearNote.reply"/>
-	<div class="info" v-if="pinned"><Fa :icon="faThumbtack"/> {{ $t('pinnedNote') }}</div>
-	<div class="info" v-if="appearNote._prId_"><Fa :icon="faBullhorn"/> {{ $t('promotion') }}<button class="_textButton hide" @click="readPromo()">{{ $t('hideThisNote') }} <Fa :icon="faTimes"/></button></div>
-	<div class="info" v-if="appearNote._featuredId_"><Fa :icon="faBolt"/> {{ $t('featured') }}</div>
+	<div class="info" v-if="pinned"><Fa :icon="faThumbtack"/> {{ $ts.pinnedNote }}</div>
+	<div class="info" v-if="appearNote._prId_"><Fa :icon="faBullhorn"/> {{ $ts.promotion }}<button class="_textButton hide" @click="readPromo()">{{ $ts.hideThisNote }} <Fa :icon="faTimes"/></button></div>
+	<div class="info" v-if="appearNote._featuredId_"><Fa :icon="faBolt"/> {{ $ts.featured }}</div>
 	<div class="renote" v-if="isRenote">
 		<MkAvatar class="avatar" :user="note.user"/>
 		<Fa :icon="faRetweet"/>
-		<i18n-t keypath="renotedBy" tag="span">
+		<I18n :src="$ts.renotedBy" tag="span">
 			<template #user>
 				<MkA class="name" :to="userPage(note.user)" v-user-preview="note.userId">
 					<MkUserName :user="note.user"/>
 				</MkA>
 			</template>
-		</i18n-t>
+		</I18n>
 		<div class="info">
 			<button class="_button time" @click="showRenoteMenu()" ref="renoteTime">
 				<Fa class="dropdownIcon" v-if="isMyRenote" :icon="faEllipsisH"/>
@@ -43,14 +43,14 @@
 			<MkInstanceTicker v-if="showTicker" class="ticker" :instance="appearNote.user.instance"/>
 			<div class="body">
 				<p v-if="appearNote.cw != null" class="cw">
-					<Mfm v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$store.state.i" :custom-emojis="appearNote.emojis"/>
+					<Mfm v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
 					<XCwButton v-model:value="showContent" :note="appearNote"/>
 				</p>
 				<div class="content" v-show="appearNote.cw == null || showContent">
 					<div class="text">
-						<span v-if="appearNote.isHidden" style="opacity: 0.5">({{ $t('private') }})</span>
+						<span v-if="appearNote.isHidden" style="opacity: 0.5">({{ $ts.private }})</span>
 						<MkA class="reply" v-if="appearNote.replyId" :to="`/notes/${appearNote.replyId}`"><Fa :icon="faReply"/></MkA>
-						<Mfm v-if="appearNote.text" :text="appearNote.text" :author="appearNote.user" :i="$store.state.i" :custom-emojis="appearNote.emojis"/>
+						<Mfm v-if="appearNote.text" :text="appearNote.text" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
 						<a class="rp" v-if="appearNote.renote != null">RN:</a>
 					</div>
 					<div class="files" v-if="appearNote.files.length > 0">
@@ -90,13 +90,13 @@
 	<XSub v-for="note in replies" :key="note.id" :note="note" class="reply" :detail="true"/>
 </div>
 <div v-else class="_panel muted" @click="muted = false">
-	<i18n-t keypath="userSaysSomething" tag="small">
+	<I18n :src="$ts.userSaysSomething" tag="small">
 		<template #name>
 			<MkA class="name" :to="userPage(appearNote.user)" v-user-preview="appearNote.userId">
 				<MkUserName :user="appearNote.user"/>
 			</MkA>
 		</template>
-	</i18n-t>
+	</I18n>
 </div>
 </template>
 
@@ -182,7 +182,7 @@ export default defineComponent({
 
 	computed: {
 		rs() {
-			return this.$store.state.settings.reactions;
+			return this.$store.state.reactions;
 		},
 		keymap(): any {
 			return {
@@ -222,11 +222,11 @@ export default defineComponent({
 		},
 
 		isMyNote(): boolean {
-			return this.$store.getters.isSignedIn && (this.$store.state.i.id === this.appearNote.userId);
+			return this.$i && (this.$i.id === this.appearNote.userId);
 		},
 
 		isMyRenote(): boolean {
-			return this.$store.getters.isSignedIn && (this.$store.state.i.id === this.note.userId);
+			return this.$i && (this.$i.id === this.note.userId);
 		},
 
 		canRenote(): boolean {
@@ -262,14 +262,14 @@ export default defineComponent({
 		},
 
 		showTicker() {
-			if (this.$store.state.device.instanceTicker === 'always') return true;
-			if (this.$store.state.device.instanceTicker === 'remote' && this.appearNote.user.instance) return true;
+			if (this.$store.state.instanceTicker === 'always') return true;
+			if (this.$store.state.instanceTicker === 'remote' && this.appearNote.user.instance) return true;
 			return false;
 		}
 	},
 
 	async created() {
-		if (this.$store.getters.isSignedIn) {
+		if (this.$i) {
 			this.connection = os.stream;
 		}
 
@@ -282,7 +282,7 @@ export default defineComponent({
 			this.$emit('update:note', Object.freeze(result));
 		}
 
-		this.muted = await checkWordMute(this.appearNote, this.$store.state.i, this.$store.state.settings.mutedWords);
+		this.muted = await checkWordMute(this.appearNote, this.$i, this.$store.state.mutedWords);
 
 		if (this.detail) {
 			os.api('notes/children', {
@@ -305,7 +305,7 @@ export default defineComponent({
 	mounted() {
 		this.capture(true);
 
-		if (this.$store.getters.isSignedIn) {
+		if (this.$i) {
 			this.connection.on('_connected_', this.onStreamConnected);
 		}
 	},
@@ -313,7 +313,7 @@ export default defineComponent({
 	beforeUnmount() {
 		this.decapture(true);
 
-		if (this.$store.getters.isSignedIn) {
+		if (this.$i) {
 			this.connection.off('_connected_', this.onStreamConnected);
 		}
 	},
@@ -340,14 +340,14 @@ export default defineComponent({
 		},
 
 		capture(withHandler = false) {
-			if (this.$store.getters.isSignedIn) {
+			if (this.$i) {
 				this.connection.send(document.body.contains(this.$el) ? 'sn' : 's', { id: this.appearNote.id });
 				if (withHandler) this.connection.on('noteUpdated', this.onStreamNoteUpdated);
 			}
 		},
 
 		decapture(withHandler = false) {
-			if (this.$store.getters.isSignedIn) {
+			if (this.$i) {
 				this.connection.send('un', {
 					id: this.appearNote.id
 				});
@@ -389,7 +389,7 @@ export default defineComponent({
 						[reaction]: currentCount + 1
 					};
 
-					if (body.userId === this.$store.state.i.id) {
+					if (body.userId === this.$i.id) {
 						n.myReaction = reaction;
 					}
 
@@ -414,7 +414,7 @@ export default defineComponent({
 						[reaction]: Math.max(0, currentCount - 1)
 					};
 
-					if (body.userId === this.$store.state.i.id) {
+					if (body.userId === this.$i.id) {
 						n.myReaction = null;
 					}
 
@@ -434,7 +434,7 @@ export default defineComponent({
 					choices[choice] = {
 						...choices[choice],
 						votes: choices[choice].votes + 1,
-						...(body.userId === this.$store.state.i.id ? {
+						...(body.userId === this.$i.id ? {
 							isVoted: true
 						} : {})
 					};
@@ -469,7 +469,7 @@ export default defineComponent({
 			pleaseLogin();
 			this.blur();
 			os.modalMenu([{
-				text: this.$t('renote'),
+				text: this.$ts.renote,
 				icon: faRetweet,
 				action: () => {
 					os.api('notes/create', {
@@ -477,7 +477,7 @@ export default defineComponent({
 					});
 				}
 			}, {
-				text: this.$t('quote'),
+				text: this.$ts.quote,
 				icon: faQuoteRight,
 				action: () => {
 					os.post({
@@ -490,8 +490,25 @@ export default defineComponent({
 		},
 
 		renoteDirectly() {
-			os.api('notes/create', {
+			os.apiWithDialog('notes/create', {
 				renoteId: this.appearNote.id
+			}, undefined, (res: any) => {
+				os.dialog({
+					type: 'success',
+					text: this.$ts.renoted,
+				});
+			}, (e: Error) => {
+				if (e.id === 'b5c90186-4ab0-49c8-9bba-a1f76c282ba4') {
+					os.dialog({
+						type: 'error',
+						text: this.$ts.cantRenote,
+					});
+				} else if (e.id === 'fd4cc33e-2a37-48dd-99cc-9b806eb2031a') {
+					os.dialog({
+						type: 'error',
+						text: this.$ts.cantReRenote,
+					});
+				}
 			});
 		},
 
@@ -533,13 +550,30 @@ export default defineComponent({
 			pleaseLogin();
 			os.apiWithDialog('notes/favorites/create', {
 				noteId: this.appearNote.id
+			}, undefined, (res: any) => {
+				os.dialog({
+					type: 'success',
+					text: this.$ts.favorited,
+				});
+			}, (e: Error) => {
+				if (e.id === 'a402c12b-34dd-41d2-97d8-4d2ffd96a1a6') {
+					os.dialog({
+						type: 'error',
+						text: this.$ts.alreadyFavorited,
+					});
+				} else if (e.id === '6dd26674-e060-4816-909a-45ba3f4da458') {
+					os.dialog({
+						type: 'error',
+						text: this.$ts.cantFavorite,
+					});
+				}
 			});
 		},
 
 		del() {
 			os.dialog({
 				type: 'warning',
-				text: this.$t('noteDeleteConfirm'),
+				text: this.$ts.noteDeleteConfirm,
 				showCancelButton: true
 			}).then(({ canceled }) => {
 				if (canceled) return;
@@ -553,7 +587,7 @@ export default defineComponent({
 		delEdit() {
 			os.dialog({
 				type: 'warning',
-				text: this.$t('deleteAndEditConfirm'),
+				text: this.$ts.deleteAndEditConfirm,
 				showCancelButton: true
 			}).then(({ canceled }) => {
 				if (canceled) return;
@@ -580,22 +614,22 @@ export default defineComponent({
 
 		getMenu() {
 			let menu;
-			if (this.$store.getters.isSignedIn) {
+			if (this.$i) {
 				const statePromise = os.api('notes/state', {
 					noteId: this.appearNote.id
 				});
 
 				menu = [{
 					icon: faCopy,
-					text: this.$t('copyContent'),
+					text: this.$ts.copyContent,
 					action: this.copyContent
 				}, {
 					icon: faLink,
-					text: this.$t('copyLink'),
+					text: this.$ts.copyLink,
 					action: this.copyLink
 				}, (this.appearNote.url || this.appearNote.uri) ? {
 					icon: faExternalLinkSquareAlt,
-					text: this.$t('showOnRemote'),
+					text: this.$ts.showOnRemote,
 					action: () => {
 						window.open(this.appearNote.url || this.appearNote.uri, '_blank');
 					}
@@ -603,50 +637,50 @@ export default defineComponent({
 				null,
 				statePromise.then(state => state.isFavorited ? {
 					icon: faStar,
-					text: this.$t('unfavorite'),
+					text: this.$ts.unfavorite,
 					action: () => this.toggleFavorite(false)
 				} : {
 					icon: faStar,
-					text: this.$t('favorite'),
+					text: this.$ts.favorite,
 					action: () => this.toggleFavorite(true)
 				}),
 				{
 					icon: faPaperclip,
-					text: this.$t('clip'),
+					text: this.$ts.clip,
 					action: () => this.clip()
 				},
-				(this.appearNote.userId != this.$store.state.i.id) ? statePromise.then(state => state.isWatching ? {
+				(this.appearNote.userId != this.$i.id) ? statePromise.then(state => state.isWatching ? {
 					icon: faEyeSlash,
-					text: this.$t('unwatch'),
+					text: this.$ts.unwatch,
 					action: () => this.toggleWatch(false)
 				} : {
 					icon: faEye,
-					text: this.$t('watch'),
+					text: this.$ts.watch,
 					action: () => this.toggleWatch(true)
 				}) : undefined,
-				this.appearNote.userId == this.$store.state.i.id ? (this.$store.state.i.pinnedNoteIds || []).includes(this.appearNote.id) ? {
+				this.appearNote.userId == this.$i.id ? (this.$i.pinnedNoteIds || []).includes(this.appearNote.id) ? {
 					icon: faThumbtack,
-					text: this.$t('unpin'),
+					text: this.$ts.unpin,
 					action: () => this.togglePin(false)
 				} : {
 					icon: faThumbtack,
-					text: this.$t('pin'),
+					text: this.$ts.pin,
 					action: () => this.togglePin(true)
 				} : undefined,
-				...(this.$store.state.i.isModerator || this.$store.state.i.isAdmin ? [
+				...(this.$i.isModerator || this.$i.isAdmin ? [
 					null,
 					{
 						icon: faBullhorn,
-						text: this.$t('promote'),
+						text: this.$ts.promote,
 						action: this.promote
 					}]
 					: []
 				),
-				...(this.appearNote.userId != this.$store.state.i.id ? [
+				...(this.appearNote.userId != this.$i.id ? [
 					null,
 					{
 						icon: faExclamationCircle,
-						text: this.$t('reportAbuse'),
+						text: this.$ts.reportAbuse,
 						action: () => {
 							const u = `${url}/notes/${this.appearNote.id}`;
 							os.popup(import('@/components/abuse-report-window.vue'), {
@@ -657,16 +691,16 @@ export default defineComponent({
 					}]
 					: []
 				),
-				...(this.appearNote.userId == this.$store.state.i.id || this.$store.state.i.isModerator || this.$store.state.i.isAdmin ? [
+				...(this.appearNote.userId == this.$i.id || this.$i.isModerator || this.$i.isAdmin ? [
 					null,
-					this.appearNote.userId == this.$store.state.i.id ? {
+					this.appearNote.userId == this.$i.id ? {
 						icon: faEdit,
-						text: this.$t('deleteAndEdit'),
+						text: this.$ts.deleteAndEdit,
 						action: this.delEdit
 					} : undefined,
 					{
 						icon: faTrashAlt,
-						text: this.$t('delete'),
+						text: this.$ts.delete,
 						danger: true,
 						action: this.del
 					}]
@@ -676,15 +710,15 @@ export default defineComponent({
 			} else {
 				menu = [{
 					icon: faCopy,
-					text: this.$t('copyContent'),
+					text: this.$ts.copyContent,
 					action: this.copyContent
 				}, {
 					icon: faLink,
-					text: this.$t('copyLink'),
+					text: this.$ts.copyLink,
 					action: this.copyLink
 				}, (this.appearNote.url || this.appearNote.uri) ? {
 					icon: faExternalLinkSquareAlt,
-					text: this.$t('showOnRemote'),
+					text: this.$ts.showOnRemote,
 					action: () => {
 						window.open(this.appearNote.url || this.appearNote.uri, '_blank');
 					}
@@ -726,7 +760,7 @@ export default defineComponent({
 		showRenoteMenu(viaKeyboard = false) {
 			if (!this.isMyRenote) return;
 			os.modalMenu([{
-				text: this.$t('unrenote'),
+				text: this.$ts.unrenote,
 				icon: faTrashAlt,
 				danger: true,
 				action: () => {
@@ -761,7 +795,7 @@ export default defineComponent({
 				if (e.id === '72dab508-c64d-498f-8740-a8eec1ba385a') {
 					os.dialog({
 						type: 'error',
-						text: this.$t('pinLimitExceeded')
+						text: this.$ts.pinLimitExceeded
 					});
 				}
 			});
@@ -771,22 +805,22 @@ export default defineComponent({
 			const clips = await os.api('clips/list');
 			os.modalMenu([{
 				icon: faPlus,
-				text: this.$t('createNew'),
+				text: this.$ts.createNew,
 				action: async () => {
-					const { canceled, result } = await os.form(this.$t('createNewClip'), {
+					const { canceled, result } = await os.form(this.$ts.createNewClip, {
 						name: {
 							type: 'string',
-							label: this.$t('name')
+							label: this.$ts.name
 						},
 						description: {
 							type: 'string',
 							required: false,
 							multiline: true,
-							label: this.$t('description')
+							label: this.$ts.description
 						},
 						isPublic: {
 							type: 'boolean',
-							label: this.$t('public'),
+							label: this.$ts.public,
 							default: false
 						}
 					});
@@ -807,7 +841,7 @@ export default defineComponent({
 
 		async promote() {
 			const { canceled, result: days } = await os.dialog({
-				title: this.$t('numberOfDays'),
+				title: this.$ts.numberOfDays,
 				input: { type: 'number' }
 			});
 
@@ -847,6 +881,14 @@ export default defineComponent({
 	overflow: hidden;
 	contain: content;
 
+	// これらの指定はパフォーマンス向上には有効だが、ノートの高さは一定でないため、
+	// 下の方までスクロールすると上のノートの高さがここで決め打ちされたものに変化し、表示しているノートの位置が変わってしまう
+	// ノートがマウントされたときに自身の高さを取得し contain-intrinsic-size を設定しなおせばほぼ解決できそうだが、
+	// 今度はその処理自体がパフォーマンス低下の原因にならないか懸念される。また、被リアクションでも高さは変化するため、やはり多少のズレは生じる
+	// 一度レンダリングされた要素はブラウザがよしなにサイズを覚えておいてくれるような実装になるまで待った方が良さそう(なるのか？)
+	//content-visibility: auto;
+  //contain-intrinsic-size: 0 128px;
+
 	&:focus {
 		outline: none;
 

src/client/components/notes.vue

@@ -2,14 +2,14 @@
 <div class="_list_">
 	<div class="_fullinfo" v-if="empty">
 		<img src="https://xn--931a.moe/assets/info.jpg" class="_ghost"/>
-		<div>{{ $t('noNotes') }}</div>
+		<div>{{ $ts.noNotes }}</div>
 	</div>
 
 	<MkError v-if="error" @retry="init()"/>
 
 	<div v-show="more && reversed" style="margin-bottom: var(--margin);">
 		<button class="_loadMore" @click="fetchMore" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }">
-			<template v-if="!moreFetching">{{ $t('loadMore') }}</template>
+			<template v-if="!moreFetching">{{ $ts.loadMore }}</template>
 			<template v-if="moreFetching"><MkLoading inline/></template>
 		</button>
 	</div>
@@ -19,8 +19,8 @@
 	</XList>
 
 	<div v-show="more && !reversed" style="margin-top: var(--margin);">
-		<button class="_loadMore" v-appear="$store.state.device.enableInfiniteScroll ? fetchMore : null" @click="fetchMore" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }">
-			<template v-if="!moreFetching">{{ $t('loadMore') }}</template>
+		<button class="_loadMore" v-appear="$store.state.enableInfiniteScroll ? fetchMore : null" @click="fetchMore" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }">
+			<template v-if="!moreFetching">{{ $ts.loadMore }}</template>
 			<template v-if="moreFetching"><MkLoading inline/></template>
 		</button>
 	</div>

src/client/components/notification-setting-window.vue

@@ -8,17 +8,17 @@
 	@close="$refs.dialog.close()"
 	@closed="$emit('closed')"
 >
-	<template #header>{{ $t('notificationSetting') }}</template>
+	<template #header>{{ $ts.notificationSetting }}</template>
 	<div v-if="showGlobalToggle" class="_section">
 		<MkSwitch v-model:value="useGlobalSetting">
-			{{ $t('useGlobalSetting') }}
-			<template #desc>{{ $t('useGlobalSettingDesc') }}</template>
+			{{ $ts.useGlobalSetting }}
+			<template #desc>{{ $ts.useGlobalSettingDesc }}</template>
 		</MkSwitch>
 	</div>
 	<div v-if="!useGlobalSetting" class="_section">
-		<MkInfo>{{ $t('notificationSettingDesc') }}</MkInfo>
-		<MkButton inline @click="disableAll">{{ $t('disableAll') }}</MkButton>
-		<MkButton inline @click="enableAll">{{ $t('enableAll') }}</MkButton>
+		<MkInfo>{{ $ts.notificationSettingDesc }}</MkInfo>
+		<MkButton inline @click="disableAll">{{ $ts.disableAll }}</MkButton>
+		<MkButton inline @click="enableAll">{{ $ts.enableAll }}</MkButton>
 		<MkSwitch v-for="type in notificationTypes" :key="type" v-model:value="typesMap[type]">{{ $t(`_notification._types.${type}`) }}</MkSwitch>
 	</div>
 </XModalWindow>

src/client/components/notification.vue

@@ -46,10 +46,10 @@
 			<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="!full" :custom-emojis="notification.note.emojis"/>
 			<Fa :icon="faQuoteRight"/>
 		</MkA>
-		<span v-if="notification.type === 'follow'" class="text" style="opacity: 0.6;">{{ $t('youGotNewFollower') }}<div v-if="full"><MkFollowButton :user="notification.user" :full="true"/></div></span>
-		<span v-if="notification.type === 'followRequestAccepted'" class="text" style="opacity: 0.6;">{{ $t('followRequestAccepted') }}</span>
-		<span v-if="notification.type === 'receiveFollowRequest'" class="text" style="opacity: 0.6;">{{ $t('receiveFollowRequest') }}<div v-if="full && !followRequestDone"><button class="_textButton" @click="acceptFollowRequest()">{{ $t('accept') }}</button> | <button class="_textButton" @click="rejectFollowRequest()">{{ $t('reject') }}</button></div></span>
-		<span v-if="notification.type === 'groupInvited'" class="text" style="opacity: 0.6;">{{ $t('groupInvited') }}: <b>{{ notification.invitation.group.name }}</b><div v-if="full && !groupInviteDone"><button class="_textButton" @click="acceptGroupInvitation()">{{ $t('accept') }}</button> | <button class="_textButton" @click="rejectGroupInvitation()">{{ $t('reject') }}</button></div></span>
+		<span v-if="notification.type === 'follow'" class="text" style="opacity: 0.6;">{{ $ts.youGotNewFollower }}<div v-if="full"><MkFollowButton :user="notification.user" :full="true"/></div></span>
+		<span v-if="notification.type === 'followRequestAccepted'" class="text" style="opacity: 0.6;">{{ $ts.followRequestAccepted }}</span>
+		<span v-if="notification.type === 'receiveFollowRequest'" class="text" style="opacity: 0.6;">{{ $ts.receiveFollowRequest }}<div v-if="full && !followRequestDone"><button class="_textButton" @click="acceptFollowRequest()">{{ $ts.accept }}</button> | <button class="_textButton" @click="rejectFollowRequest()">{{ $ts.reject }}</button></div></span>
+		<span v-if="notification.type === 'groupInvited'" class="text" style="opacity: 0.6;">{{ $ts.groupInvited }}: <b>{{ notification.invitation.group.name }}</b><div v-if="full && !groupInviteDone"><button class="_textButton" @click="acceptGroupInvitation()">{{ $ts.accept }}</button> | <button class="_textButton" @click="rejectGroupInvitation()">{{ $ts.reject }}</button></div></span>
 		<span v-if="notification.type === 'app'" class="text">
 			<Mfm :text="notification.body" :nowrap="!full"/>
 		</span>

src/client/components/notifications.vue

@@ -5,12 +5,12 @@
 		<XNotification v-else :notification="notification" :with-time="true" :full="true" class="_panel notification" :key="notification.id"/>
 	</XList>
 
-	<button class="_loadMore" v-appear="$store.state.device.enableInfiniteScroll ? fetchMore : null" @click="fetchMore" v-show="more" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }">
-		<template v-if="!moreFetching">{{ $t('loadMore') }}</template>
+	<button class="_loadMore" v-appear="$store.state.enableInfiniteScroll ? fetchMore : null" @click="fetchMore" v-show="more" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }">
+		<template v-if="!moreFetching">{{ $ts.loadMore }}</template>
 		<template v-if="moreFetching"><MkLoading inline/></template>
 	</button>
 
-	<p class="empty" v-if="empty">{{ $t('noNotifications') }}</p>
+	<p class="empty" v-if="empty">{{ $ts.noNotifications }}</p>
 
 	<MkError v-if="error" @retry="init()"/>
 </div>
@@ -59,7 +59,7 @@ export default defineComponent({
 
 	computed: {
 		allIncludeTypes() {
-			return this.includeTypes ?? notificationTypes.filter(x => !this.$store.state.i.mutingNotificationTypes.includes(x));
+			return this.includeTypes ?? notificationTypes.filter(x => !this.$i.mutingNotificationTypes.includes(x));
 		}
 	},
 
@@ -70,9 +70,9 @@ export default defineComponent({
 			},
 			deep: true
 		},
-		// TODO: vue/vuexのバグか仕様かは不明なものの、プロフィール更新するなどして $store.state.i が更新されると、
+		// TODO: vue/vuexのバグか仕様かは不明なものの、プロフィール更新するなどして $i が更新されると、
 		// mutingNotificationTypes に変化が無くてもこのハンドラーが呼び出され無駄なリロードが発生するのを直す
-		'$store.state.i.mutingNotificationTypes': {
+		'$i.mutingNotificationTypes': {
 			handler() {
 				if (this.includeTypes === null) {
 					this.reload();

src/client/components/page-window.vue

@@ -90,29 +90,29 @@ export default defineComponent({
 				text: this.path,
 			}, {
 				icon: faExpandAlt,
-				text: this.$t('showInPage'),
+				text: this.$ts.showInPage,
 				action: this.expand
 			}, this.sideViewHook ? {
 				icon: faColumns,
-				text: this.$t('openInSideView'),
+				text: this.$ts.openInSideView,
 				action: () => {
 					this.sideViewHook(this.path);
 					this.$refs.window.close();
 				}
 			} : undefined, {
 				icon: faExternalLinkAlt,
-				text: this.$t('popout'),
+				text: this.$ts.popout,
 				action: this.popout
 			}, null, {
 				icon: faExternalLinkAlt,
-				text: this.$t('openInNewTab'),
+				text: this.$ts.openInNewTab,
 				action: () => {
 					window.open(this.url, '_blank');
 					this.$refs.window.close();
 				}
 			}, {
 				icon: faLink,
-				text: this.$t('copyLink'),
+				text: this.$ts.copyLink,
 				action: () => {
 					copyToClipboard(this.url);
 				}

src/client/components/page/page.post.vue

@@ -49,9 +49,9 @@ export default defineComponent({
 				canvas.toBlob(blob => {
 					const data = new FormData();
 					data.append('file', blob);
-					data.append('i', this.$store.state.i.token);
-					if (this.$store.state.settings.uploadFolder) {
-						data.append('folderId', this.$store.state.settings.uploadFolder);
+					data.append('i', this.$i.token);
+					if (this.$store.state.uploadFolder) {
+						data.append('folderId', this.$store.state.uploadFolder);
 					}
 
 					fetch(apiUrl + '/drive/files/create', {

src/client/components/page/page.radio-button.vue

@@ -1,7 +1,7 @@
 <template>
 <div>
 	<div>{{ hpml.interpolate(value.title) }}</div>
-	<MkRadio v-for="x in value.values" v-model:value="v" :value="x" :key="x">{{ x }}</MkRadio>
+	<MkRadio v-for="x in value.values" v-model="v" :value="x" :key="x">{{ x }}</MkRadio>
 </div>
 </template>
 

src/client/components/page/page.text.vue

@@ -1,6 +1,6 @@
 <template>
 <div class="mrdgzndn">
-	<Mfm :text="text" :is-note="false" :i="$store.state.i" :key="text"/>
+	<Mfm :text="text" :is-note="false" :i="$i" :key="text"/>
 	<MkUrlPreview v-for="url in urls" :url="url" :key="url" class="url"/>
 </div>
 </template>

src/client/components/page/page.vue

@@ -1,6 +1,6 @@
 <template>
 <div class="iroscrza" :class="{ center: page.alignCenter, serif: page.font === 'serif' }" v-if="hpml">
-	<XBlock v-for="child in page.content" :value="child" @update:value="v => updateBlock(v)" :page="page" :hpml="hpml" :key="child.id" :h="2"/>
+	<XBlock v-for="child in page.content" :value="child" :page="page" :hpml="hpml" :key="child.id" :h="2"/>
 </div>
 </template>
 
@@ -35,9 +35,9 @@ export default defineComponent({
 	created() {
 		this.hpml = new Hpml(this.page, {
 			randomSeed: Math.random(),
-			visitor: this.$store.state.i,
+			visitor: this.$i,
 			url: url,
-			enableAiScript: !this.$store.state.device.disablePagesScript
+			enableAiScript: !this.$store.state.disablePagesScript
 		});
 	},
 

src/client/components/poll-editor.vue

@@ -1,7 +1,7 @@
 <template>
 <div class="zmdxowus">
 	<p class="caution" v-if="choices.length < 2">
-		<Fa :icon="faExclamationTriangle"/>{{ $t('_poll.noOnlyOneChoice') }}
+		<Fa :icon="faExclamationTriangle"/>{{ $ts._poll.noOnlyOneChoice }}
 	</p>
 	<ul ref="choices">
 		<li v-for="(choice, i) in choices" :key="i">
@@ -13,34 +13,34 @@
 			</button>
 		</li>
 	</ul>
-	<MkButton class="add" v-if="choices.length < 10" @click="add">{{ $t('add') }}</MkButton>
-	<MkButton class="add" v-else disabled>{{ $t('_poll.noMore') }}</MkButton>
+	<MkButton class="add" v-if="choices.length < 10" @click="add">{{ $ts.add }}</MkButton>
+	<MkButton class="add" v-else disabled>{{ $ts._poll.noMore }}</MkButton>
 	<section>
-		<MkSwitch v-model:value="multiple">{{ $t('_poll.canMultipleVote') }}</MkSwitch>
+		<MkSwitch v-model:value="multiple">{{ $ts._poll.canMultipleVote }}</MkSwitch>
 		<div>
 			<MkSelect v-model:value="expiration">
-				<template #label>{{ $t('_poll.expiration') }}</template>
-				<option value="infinite">{{ $t('_poll.infinite') }}</option>
-				<option value="at">{{ $t('_poll.at') }}</option>
-				<option value="after">{{ $t('_poll.after') }}</option>
+				<template #label>{{ $ts._poll.expiration }}</template>
+				<option value="infinite">{{ $ts._poll.infinite }}</option>
+				<option value="at">{{ $ts._poll.at }}</option>
+				<option value="after">{{ $ts._poll.after }}</option>
 			</MkSelect>
 			<section v-if="expiration === 'at'">
 				<MkInput v-model:value="atDate" type="date" class="input">
-					<span>{{ $t('_poll.deadlineDate') }}</span>
+					<span>{{ $ts._poll.deadlineDate }}</span>
 				</MkInput>
 				<MkInput v-model:value="atTime" type="time" class="input">
-					<span>{{ $t('_poll.deadlineTime') }}</span>
+					<span>{{ $ts._poll.deadlineTime }}</span>
 				</MkInput>
 			</section>
 			<section v-if="expiration === 'after'">
 				<MkInput v-model:value="after" type="number" class="input">
-					<span>{{ $t('_poll.duration') }}</span>
+					<span>{{ $ts._poll.duration }}</span>
 				</MkInput>
 				<MkSelect v-model:value="unit">
-					<option value="second">{{ $t('_time.second') }}</option>
-					<option value="minute">{{ $t('_time.minute') }}</option>
-					<option value="hour">{{ $t('_time.hour') }}</option>
-					<option value="day">{{ $t('_time.day') }}</option>
+					<option value="second">{{ $ts._time.second }}</option>
+					<option value="minute">{{ $ts._time.minute }}</option>
+					<option value="hour">{{ $ts._time.hour }}</option>
+					<option value="day">{{ $ts._time.day }}</option>
 				</MkSelect>
 			</section>
 		</div>

src/client/components/poll.vue

@@ -13,9 +13,9 @@
 	<p>
 		<span>{{ $t('_poll.totalVotes', { n: total }) }}</span>
 		<span> · </span>
-		<a v-if="!closed && !isVoted" @click="toggleShowResult">{{ showResult ? $t('_poll.vote') : $t('_poll.showResult') }}</a>
-		<span v-if="isVoted">{{ $t('_poll.voted') }}</span>
-		<span v-else-if="closed">{{ $t('_poll.closed') }}</span>
+		<a v-if="!closed && !isVoted" @click="toggleShowResult">{{ showResult ? $ts._poll.vote : $ts._poll.showResult }}</a>
+		<span v-if="isVoted">{{ $ts._poll.voted }}</span>
+		<span v-else-if="closed">{{ $ts._poll.closed }}</span>
 		<span v-if="remaining > 0"> · {{ timer }}</span>
 	</p>
 </div>

src/client/components/post-form-attaches.vue

@@ -1,12 +1,14 @@
 <template>
 <div class="skeikyzd" v-show="files.length != 0">
-	<XDraggable class="files" :list="files" animation="150" delay="100" delay-on-touch-only="true">
-		<div v-for="file in files" :key="file.id" @click="showFileMenu(file, $event)" @contextmenu.prevent="showFileMenu(file, $event)">
-			<MkDriveFileThumbnail :data-id="file.id" class="thumbnail" :file="file" fit="cover"/>
-			<div class="sensitive" v-if="file.isSensitive">
-				<Fa class="icon" :icon="faExclamationTriangle"/>
+	<XDraggable class="files" v-model="_files" item-key="id" animation="150" delay="100" delay-on-touch-only="true">
+		<template #item="{element}">
+			<div @click="showFileMenu(element, $event)" @contextmenu.prevent="showFileMenu(element, $event)">
+				<MkDriveFileThumbnail :data-id="element.id" class="thumbnail" :file="element" fit="cover"/>
+				<div class="sensitive" v-if="element.isSensitive">
+					<Fa class="icon" :icon="faExclamationTriangle"/>
+				</div>
 			</div>
-		</div>
+		</template>
 	</XDraggable>
 	<p class="remain">{{ 4 - files.length }}/4</p>
 </div>
@@ -21,7 +23,7 @@ import * as os from '@/os';
 
 export default defineComponent({
 	components: {
-		XDraggable: defineAsyncComponent(() => import('vue-draggable-next').then(x => x.VueDraggableNext)),
+		XDraggable: defineAsyncComponent(() => import('vuedraggable').then(x => x.default)),
 		MkDriveFileThumbnail
 	},
 
@@ -36,7 +38,7 @@ export default defineComponent({
 		}
 	},
 
-	emits: ['updated', 'detach'],
+	emits: ['updated', 'detach', 'changeSensitive', 'changeName'],
 
 	data() {
 		return {
@@ -46,6 +48,17 @@ export default defineComponent({
 		};
 	},
 
+	computed: {
+		_files: {
+			get() {
+				return this.files;
+			},
+			set(value) {
+				this.$emit('updated', value);
+			}
+		}
+	},
+
 	methods: {
 		detachMedia(id) {
 			if (this.detachMediaFn) {
@@ -59,13 +72,12 @@ export default defineComponent({
 				fileId: file.id,
 				isSensitive: !file.isSensitive
 			}).then(() => {
-				file.isSensitive = !file.isSensitive;
-				this.$emit('updated', file);
+				this.$emit('changeSensitive', file, !file.isSensitive);
 			});
 		},
 		async rename(file) {
 			const { canceled, result } = await os.dialog({
-				title: this.$t('enterFileName'),
+				title: this.$ts.enterFileName,
 				input: {
 					default: file.name
 				},
@@ -76,22 +88,22 @@ export default defineComponent({
 				fileId: file.id,
 				name: result
 			}).then(() => {
+				this.$emit('changeName', file, result);
 				file.name = result;
-				this.$emit('updated', file);
 			});
 		},
 		showFileMenu(file, ev: MouseEvent) {
 			if (this.menu) return;
 			this.menu = os.modalMenu([{
-				text: this.$t('renameFile'),
+				text: this.$ts.renameFile,
 				icon: faICursor,
 				action: () => { this.rename(file) }
 			}, {
-				text: file.isSensitive ? this.$t('unmarkAsSensitive') : this.$t('markAsSensitive'),
+				text: file.isSensitive ? this.$ts.unmarkAsSensitive : this.$ts.markAsSensitive,
 				icon: file.isSensitive ? faEyeSlash : faEye,
 				action: () => { this.toggleSensitive(file) }
 			}, {
-				text: this.$t('attachCancel'),
+				text: this.$ts.attachCancel,
 				icon: faTimesCircle,
 				action: () => { this.detachMedia(file.id) }
 			}], ev.currentTarget || ev.target).then(() => this.menu = null);

src/client/components/post-form.vue

@@ -11,7 +11,7 @@
 		<div>
 			<span class="text-count" :class="{ over: trimmedLength(text) > max }">{{ max - trimmedLength(text) }}</span>
 			<span class="local-only" v-if="localOnly"><Fa :icon="faBiohazard"/></span>
-			<button class="_button visibility" @click="setVisibility" ref="visibilityButton" v-tooltip="$t('visibility')" :disabled="channel != null">
+			<button class="_button visibility" @click="setVisibility" ref="visibilityButton" v-tooltip="$ts.visibility" :disabled="channel != null">
 				<span v-if="visibility === 'public'"><Fa :icon="faGlobe"/></span>
 				<span v-if="visibility === 'home'"><Fa :icon="faHome"/></span>
 				<span v-if="visibility === 'followers'"><Fa :icon="faUnlock"/></span>
@@ -23,9 +23,9 @@
 	<div class="form" :class="{ fixed }">
 		<XNotePreview class="preview" v-if="reply" :note="reply"/>
 		<XNotePreview class="preview" v-if="renote" :note="renote"/>
-		<div class="with-quote" v-if="quoteId"><Fa icon="quote-left"/> {{ $t('quoteAttached') }}<button @click="quoteId = null"><Fa icon="times"/></button></div>
+		<div class="with-quote" v-if="quoteId"><Fa icon="quote-left"/> {{ $ts.quoteAttached }}<button @click="quoteId = null"><Fa icon="times"/></button></div>
 		<div v-if="visibility === 'specified'" class="to-specified">
-			<span style="margin-right: 8px;">{{ $t('recipient') }}</span>
+			<span style="margin-right: 8px;">{{ $ts.recipient }}</span>
 			<div class="visibleUsers">
 				<span v-for="u in visibleUsers" :key="u.id">
 					<MkAcct :user="u"/>
@@ -34,17 +34,17 @@
 				<button @click="addVisibleUser" class="_buttonPrimary"><Fa :icon="faPlus" fixed-width/></button>
 			</div>
 		</div>
-		<input v-show="useCw" ref="cw" class="cw" v-model="cw" :placeholder="$t('annotation')" @keydown="onKeydown">
+		<input v-show="useCw" ref="cw" class="cw" v-model="cw" :placeholder="$ts.annotation" @keydown="onKeydown">
 		<textarea v-model="text" class="text" :class="{ withCw: useCw }" ref="text" :disabled="posting" :placeholder="placeholder" @keydown="onKeydown" @paste="onPaste"></textarea>
-		<XPostFormAttaches class="attaches" :files="files" @updated="updateMedia" @detach="detachMedia"/>
+		<XPostFormAttaches class="attaches" :files="files" @updated="updateFiles" @detach="detachFile" @changeSensitive="updateFileSensitive" @changeName="updateFileName"/>
 		<XPollEditor v-if="poll" :poll="poll" @destroyed="poll = null" @updated="onPollUpdate"/>
 		<footer>
-			<button class="_button" @click="chooseFileFrom" v-tooltip="$t('attachFile')"><Fa :icon="faPhotoVideo"/></button>
-			<button class="_button" @click="togglePoll" :class="{ active: poll }" v-tooltip="$t('poll')"><Fa :icon="faPollH"/></button>
-			<button class="_button" @click="useCw = !useCw" :class="{ active: useCw }" v-tooltip="$t('useCw')"><Fa :icon="faEyeSlash"/></button>
-			<button class="_button" @click="insertMention" v-tooltip="$t('mention')"><Fa :icon="faAt"/></button>
-			<button class="_button" @click="insertEmoji" v-tooltip="$t('emoji')"><Fa :icon="faLaughSquint"/></button>
-			<button class="_button" @click="showActions" v-tooltip="$t('plugin')" v-if="postFormActions.length > 0"><Fa :icon="faPlug"/></button>
+			<button class="_button" @click="chooseFileFrom" v-tooltip="$ts.attachFile"><Fa :icon="faPhotoVideo"/></button>
+			<button class="_button" @click="togglePoll" :class="{ active: poll }" v-tooltip="$ts.poll"><Fa :icon="faPollH"/></button>
+			<button class="_button" @click="useCw = !useCw" :class="{ active: useCw }" v-tooltip="$ts.useCw"><Fa :icon="faEyeSlash"/></button>
+			<button class="_button" @click="insertMention" v-tooltip="$ts.mention"><Fa :icon="faAt"/></button>
+			<button class="_button" @click="insertEmoji" v-tooltip="$ts.emoji"><Fa :icon="faLaughSquint"/></button>
+			<button class="_button" @click="showActions" v-tooltip="$ts.plugin" v-if="postFormActions.length > 0"><Fa :icon="faPlug"/></button>
 		</footer>
 	</div>
 </div>
@@ -135,8 +135,8 @@ export default defineComponent({
 			poll: null,
 			useCw: false,
 			cw: null,
-			localOnly: this.$store.state.settings.rememberNoteVisibility ? this.$store.state.deviceUser.localOnly : this.$store.state.settings.defaultNoteLocalOnly,
-			visibility: this.$store.state.settings.rememberNoteVisibility ? this.$store.state.deviceUser.visibility : this.$store.state.settings.defaultNoteVisibility,
+			localOnly: this.$store.state.rememberNoteVisibility ? this.$store.state.localOnly : this.$store.state.defaultNoteLocalOnly,
+			visibility: this.$store.state.rememberNoteVisibility ? this.$store.state.visibility : this.$store.state.defaultNoteVisibility,
 			visibleUsers: [],
 			autocomplete: null,
 			draghover: false,
@@ -164,19 +164,19 @@ export default defineComponent({
 
 		placeholder(): string {
 			if (this.renote) {
-				return this.$t('_postForm.quotePlaceholder');
+				return this.$ts._postForm.quotePlaceholder;
 			} else if (this.reply) {
-				return this.$t('_postForm.replyPlaceholder');
+				return this.$ts._postForm.replyPlaceholder;
 			} else if (this.channel) {
-				return this.$t('_postForm.channelPlaceholder');
+				return this.$ts._postForm.channelPlaceholder;
 			} else {
 				const xs = [
-					this.$t('_postForm._placeholders.a'),
-					this.$t('_postForm._placeholders.b'),
-					this.$t('_postForm._placeholders.c'),
-					this.$t('_postForm._placeholders.d'),
-					this.$t('_postForm._placeholders.e'),
-					this.$t('_postForm._placeholders.f')
+					this.$ts._postForm._placeholders.a,
+					this.$ts._postForm._placeholders.b,
+					this.$ts._postForm._placeholders.c,
+					this.$ts._postForm._placeholders.d,
+					this.$ts._postForm._placeholders.e,
+					this.$ts._postForm._placeholders.f
 				];
 				return xs[Math.floor(Math.random() * xs.length)];
 			}
@@ -184,10 +184,10 @@ export default defineComponent({
 
 		submitText(): string {
 			return this.renote
-				? this.$t('quote')
+				? this.$ts.quote
 				: this.reply
-					? this.$t('reply')
-					: this.$t('note');
+					? this.$ts.reply
+					: this.$ts.note;
 		},
 
 		canPost(): boolean {
@@ -198,7 +198,7 @@ export default defineComponent({
 		},
 
 		max(): number {
-			return this.$store.state.instance.meta ? this.$store.state.instance.meta.maxNoteTextLength : 1000;
+			return this.$instance ? this.$instance.maxNoteTextLength : 1000;
 		}
 	},
 
@@ -223,8 +223,8 @@ export default defineComponent({
 				const mention = x.host ? `@${x.username}@${toASCII(x.host)}` : `@${x.username}`;
 
 				// 自分は除外
-				if (this.$store.state.i.username == x.username && x.host == null) continue;
-				if (this.$store.state.i.username == x.username && x.host == host) continue;
+				if (this.$i.username == x.username && x.host == null) continue;
+				if (this.$i.username == x.username && x.host == host) continue;
 
 				// 重複は除外
 				if (this.text.indexOf(`${mention} `) != -1) continue;
@@ -243,12 +243,12 @@ export default defineComponent({
 			this.visibility = this.reply.visibility;
 			if (this.reply.visibility === 'specified') {
 				os.api('users/show', {
-					userIds: this.reply.visibleUserIds.filter(uid => uid !== this.$store.state.i.id && uid !== this.reply.userId)
+					userIds: this.reply.visibleUserIds.filter(uid => uid !== this.$i.id && uid !== this.reply.userId)
 				}).then(users => {
 					this.visibleUsers.push(...users);
 				});
 
-				if (this.reply.userId !== this.$store.state.i.id) {
+				if (this.reply.userId !== this.$i.id) {
 					os.api('users/show', { userId: this.reply.userId }).then(user => {
 						this.visibleUsers.push(user);
 					});
@@ -262,7 +262,7 @@ export default defineComponent({
 		}
 
 		// keep cw when reply
-		if (this.$store.state.settings.keepCw && this.reply && this.reply.cw) {
+		if (this.$store.keepCw && this.reply && this.reply.cw) {
 			this.useCw = true;
 			this.cw = this.reply.cw;
 		}
@@ -352,23 +352,31 @@ export default defineComponent({
 		},
 
 		chooseFileFrom(ev) {
-			selectFile(ev.currentTarget || ev.target, this.$t('attachFile'), true).then(files => {
+			selectFile(ev.currentTarget || ev.target, this.$ts.attachFile, true).then(files => {
 				for (const file of files) {
 					this.files.push(file);
 				}
 			});
 		},
 
-		detachMedia(id) {
+		detachFile(id) {
 			this.files = this.files.filter(x => x.id != id);
 		},
 
-		updateMedia(file) {
-			this.files[this.files.findIndex(x => x.id === file.id)] = file;
+		updateFiles(files) {
+			this.files = files;
+		},
+
+		updateFileSensitive(file, sensitive) {
+			this.files[this.files.findIndex(x => x.id === file.id)].isSensitive = sensitive;
+		},
+
+		updateFileName(file, name) {
+			this.files[this.files.findIndex(x => x.id === file.id)].name = name;
 		},
 
 		upload(file: File, name?: string) {
-			os.upload(file, this.$store.state.settings.uploadFolder, name).then(res => {
+			os.upload(file, this.$store.state.uploadFolder, name).then(res => {
 				this.files.push(res);
 			});
 		},
@@ -391,14 +399,14 @@ export default defineComponent({
 			}, {
 				changeVisibility: visibility => {
 					this.visibility = visibility;
-					if (this.$store.state.settings.rememberNoteVisibility) {
-						this.$store.commit('deviceUser/setVisibility', visibility);
+					if (this.$store.state.rememberNoteVisibility) {
+						this.$store.set('visibility', visibility);
 					}
 				},
 				changeLocalOnly: localOnly => {
 					this.localOnly = localOnly;
-					if (this.$store.state.settings.rememberNoteVisibility) {
-						this.$store.commit('deviceUser/setLocalOnly', localOnly);
+					if (this.$store.state.rememberNoteVisibility) {
+						this.$store.set('localOnly', localOnly);
 					}
 				}
 			}, 'closed');
@@ -432,7 +440,7 @@ export default defineComponent({
 					const file = item.getAsFile();
 					const lio = file.name.lastIndexOf('.');
 					const ext = lio >= 0 ? file.name.slice(lio) : '';
-					const formatted = `${formatTimeString(new Date(file.lastModified), this.$store.state.settings.pastedFileName).replace(/{{number}}/g, `${i + 1}`)}${ext}`;
+					const formatted = `${formatTimeString(new Date(file.lastModified), this.$store.state.pastedFileName).replace(/{{number}}/g, `${i + 1}`)}${ext}`;
 					this.upload(file, formatted);
 				}
 			}
@@ -444,7 +452,7 @@ export default defineComponent({
 
 				os.dialog({
 					type: 'info',
-					text: this.$t('quoteQuestion'),
+					text: this.$ts.quoteQuestion,
 					showCancelButton: true
 				}).then(({ canceled }) => {
 					if (canceled) {

src/client/components/reactions-viewer.reaction.vue

@@ -53,7 +53,7 @@ export default defineComponent({
 	},
 	computed: {
 		canToggle(): boolean {
-			return !this.reaction.match(/@\w/) && this.$store.getters.isSignedIn;
+			return !this.reaction.match(/@\w/) && this.$i;
 		},
 	},
 	watch: {

src/client/components/reactions-viewer.vue

@@ -25,7 +25,7 @@ export default defineComponent({
 	},
 	computed: {
 		isMe(): boolean {
-			return this.$store.getters.isSignedIn && this.$store.state.i.id === this.note.userId;
+			return this.$i && this.$i.id === this.note.userId;
 		},
 	},
 });

src/client/components/remote-caution.vue

@@ -1,5 +1,5 @@
 <template>
-<div class="jmgmzlwq _panel"><Fa :icon="faExclamationTriangle" style="margin-right: 8px;"/>{{ $t('remoteUserCaution') }}<a :href="href" rel="nofollow noopener" target="_blank">{{ $t('showOnRemote') }}</a></div>
+<div class="jmgmzlwq _panel"><Fa :icon="faExclamationTriangle" style="margin-right: 8px;"/>{{ $ts.remoteUserCaution }}<a :href="href" rel="nofollow noopener" target="_blank">{{ $ts.showOnRemote }}</a></div>
 </template>
 
 <script lang="ts">
@@ -26,6 +26,8 @@ export default defineComponent({
 .jmgmzlwq {
 	font-size: 0.8em;
 	padding: 16px;
+	background: var(--infoWarnBg);
+	color: var(--infoWarnFg);
 
 	> a {
 		margin-left: 4px;

src/client/components/sample.vue

@@ -51,7 +51,7 @@ export default defineComponent({
 			text: '',
 			flag: false,
 			radio: 'misskey',
-			mfm: `Hello world! This is an @example mention. BTW you are @${this.$store.state.i.username}.\nAlso, here is ${config.url} and [example link](${config.url}). for more details, see https://example.com.\nAs you know #misskey is open-source software.`
+			mfm: `Hello world! This is an @example mention. BTW you are @${this.$i.username}.\nAlso, here is ${config.url} and [example link](${config.url}). for more details, see https://example.com.\nAs you know #misskey is open-source software.`
 		}
 	},
 

src/client/components/sidebar.vue

@@ -12,29 +12,32 @@
 		<nav class="nav" :class="{ iconOnly, hidden }" v-show="showing">
 			<div>
 				<button class="item _button account" @click="openAccountMenu">
-					<MkAvatar :user="$store.state.i" class="avatar"/><MkAcct class="text" :user="$store.state.i"/>
+					<MkAvatar :user="$i" class="avatar"/><MkAcct class="text" :user="$i"/>
 				</button>
 				<MkA class="item index" active-class="active" to="/" exact>
-					<Fa :icon="faHome" fixed-width/><span class="text">{{ $t('timeline') }}</span>
+					<Fa :icon="faHome" fixed-width/><span class="text">{{ $ts.timeline }}</span>
 				</MkA>
 				<template v-for="item in menu">
 					<div v-if="item === '-'" class="divider"></div>
 					<component v-else-if="menuDef[item] && (menuDef[item].show !== false)" :is="menuDef[item].to ? 'MkA' : 'button'" class="item _button" :class="item" active-class="active" v-on="menuDef[item].action ? { click: menuDef[item].action } : {}" :to="menuDef[item].to">
-						<Fa :icon="menuDef[item].icon" fixed-width/><span class="text">{{ $t(menuDef[item].title) }}</span>
+						<Fa :icon="menuDef[item].icon" fixed-width/><span class="text">{{ $ts[menuDef[item].title] }}</span>
 						<i v-if="menuDef[item].indicated"><Fa :icon="faCircle"/></i>
 					</component>
 				</template>
 				<div class="divider"></div>
-				<button class="item _button" :class="{ active: $route.path === '/instance' || $route.path.startsWith('/instance/') }" v-if="$store.state.i.isAdmin || $store.state.i.isModerator" @click="oepnInstanceMenu">
-					<Fa :icon="faServer" fixed-width/><span class="text">{{ $t('instance') }}</span>
+				<button class="item _button" :class="{ active: $route.path === '/instance' || $route.path.startsWith('/instance/') }" v-if="$i.isAdmin || $i.isModerator" @click="oepnInstanceMenu">
+					<Fa :icon="faServer" fixed-width/><span class="text">{{ $ts.instance }}</span>
 				</button>
 				<button class="item _button" @click="more">
-					<Fa :icon="faEllipsisH" fixed-width/><span class="text">{{ $t('more') }}</span>
+					<Fa :icon="faEllipsisH" fixed-width/><span class="text">{{ $ts.more }}</span>
 					<i v-if="otherNavItemIndicated"><Fa :icon="faCircle"/></i>
 				</button>
 				<MkA class="item" active-class="active" to="/settings">
-					<Fa :icon="faCog" fixed-width/><span class="text">{{ $t('settings') }}</span>
+					<Fa :icon="faCog" fixed-width/><span class="text">{{ $ts.settings }}</span>
 				</MkA>
+				<button class="item _button post" @click="post">
+					<Fa :icon="faPencilAlt" fixed-width/><span class="text">{{ $ts.note }}</span>
+				</button>
 			</div>
 		</nav>
 	</transition>
@@ -49,6 +52,7 @@ import { host } from '@/config';
 import { search } from '@/scripts/search';
 import * as os from '@/os';
 import { sidebarDef } from '@/sidebar';
+import { getAccounts, addAccount, login } from '@/account';
 
 export default defineComponent({
 	data() {
@@ -67,7 +71,7 @@ export default defineComponent({
 
 	computed: {
 		menu(): string[] {
-			return this.$store.state.deviceUser.menu;
+			return this.$store.state.menu;
 		},
 
 		otherNavItemIndicated(): boolean {
@@ -84,7 +88,7 @@ export default defineComponent({
 			this.showing = false;
 		},
 
-		'$store.state.device.sidebarDisplay'() {
+		'$store.reactiveState.sidebarDisplay.value'() {
 			this.calcViewState();
 		},
 
@@ -108,19 +112,23 @@ export default defineComponent({
 
 	methods: {
 		calcViewState() {
-			this.iconOnly = (window.innerWidth <= 1279) || (this.$store.state.device.sidebarDisplay === 'icon');
-			this.hidden = (window.innerWidth <= 650) || (this.$store.state.device.sidebarDisplay === 'hide');
+			this.iconOnly = (window.innerWidth <= 1279) || (this.$store.state.sidebarDisplay === 'icon');
+			this.hidden = (window.innerWidth <= 650);
 		},
 
 		show() {
 			this.showing = true;
 		},
 
+		post() {
+			os.post();
+		},
+
 		search() {
 			if (this.searching) return;
 
 			os.dialog({
-				title: this.$t('search'),
+				title: this.$ts.search,
 				input: true
 			}).then(async ({ canceled, result: query }) => {
 				if (canceled || query == null || query === '') return;
@@ -133,7 +141,8 @@ export default defineComponent({
 		},
 
 		async openAccountMenu(ev) {
-			const accounts = (await os.api('users/show', { userIds: this.$store.state.device.accounts.map(x => x.id) })).filter(x => x.id !== this.$store.state.i.id);
+			const storedAccounts = getAccounts();
+			const accounts = (await os.api('users/show', { userIds: storedAccounts.map(x => x.id) })).filter(x => x.id !== this.$i.id);
 
 			const accountItems = accounts.map(account => ({
 				type: 'user',
@@ -143,18 +152,18 @@ export default defineComponent({
 
 			os.modalMenu([...[{
 				type: 'link',
-				text: this.$t('profile'),
-				to: `/@${ this.$store.state.i.username }`,
-				avatar: this.$store.state.i,
+				text: this.$ts.profile,
+				to: `/@${ this.$i.username }`,
+				avatar: this.$i,
 			}, null, ...accountItems, {
 				icon: faPlus,
-				text: this.$t('addAcount'),
+				text: this.$ts.addAcount,
 				action: () => {
 					os.modalMenu([{
-						text: this.$t('existingAcount'),
+						text: this.$ts.existingAcount,
 						action: () => { this.addAcount(); },
 					}, {
-						text: this.$t('createAccount'),
+						text: this.$ts.createAccount,
 						action: () => { this.createAccount(); },
 					}], ev.currentTarget || ev.target);
 				},
@@ -166,57 +175,57 @@ export default defineComponent({
 		oepnInstanceMenu(ev) {
 			os.modalMenu([{
 				type: 'link',
-				text: this.$t('dashboard'),
+				text: this.$ts.dashboard,
 				to: '/instance',
 				icon: faTachometerAlt,
-			}, null, this.$store.state.i.isAdmin ? {
+			}, null, this.$i.isAdmin ? {
 				type: 'link',
-				text: this.$t('settings'),
+				text: this.$ts.settings,
 				to: '/instance/settings',
 				icon: faCog,
 			} : undefined, {
 				type: 'link',
-				text: this.$t('customEmojis'),
+				text: this.$ts.customEmojis,
 				to: '/instance/emojis',
 				icon: faLaugh,
 			}, {
 				type: 'link',
-				text: this.$t('users'),
+				text: this.$ts.users,
 				to: '/instance/users',
 				icon: faUsers,
 			}, {
 				type: 'link',
-				text: this.$t('files'),
+				text: this.$ts.files,
 				to: '/instance/files',
 				icon: faCloud,
 			}, {
 				type: 'link',
-				text: this.$t('jobQueue'),
+				text: this.$ts.jobQueue,
 				to: '/instance/queue',
 				icon: faExchangeAlt,
 			}, {
 				type: 'link',
-				text: this.$t('federation'),
+				text: this.$ts.federation,
 				to: '/instance/federation',
 				icon: faGlobe,
 			}, {
 				type: 'link',
-				text: this.$t('relays'),
+				text: this.$ts.relays,
 				to: '/instance/relays',
 				icon: faProjectDiagram,
 			}, {
 				type: 'link',
-				text: this.$t('announcements'),
+				text: this.$ts.announcements,
 				to: '/instance/announcements',
 				icon: faBroadcastTower,
 			}, {
 				type: 'link',
-				text: this.$t('abuseReports'),
+				text: this.$ts.abuseReports,
 				to: '/instance/abuses',
 				icon: faExclamationCircle,
 			}, {
 				type: 'link',
-				text: this.$t('logs'),
+				text: this.$ts.logs,
 				to: '/instance/logs',
 				icon: faStream,
 			}], ev.currentTarget || ev.target);
@@ -230,7 +239,7 @@ export default defineComponent({
 		addAcount() {
 			os.popup(import('./signin-dialog.vue'), {}, {
 				done: res => {
-					this.$store.dispatch('addAcount', res);
+					addAccount(res.id, res.i);
 					os.success();
 				},
 			}, 'closed');
@@ -239,30 +248,20 @@ export default defineComponent({
 		createAccount() {
 			os.popup(import('./signup-dialog.vue'), {}, {
 				done: res => {
-					this.$store.dispatch('addAcount', res);
+					addAccount(res.id, res.i);
 					this.switchAccountWithToken(res.i);
 				},
 			}, 'closed');
 		},
 
 		switchAccount(account: any) {
-			const token = this.$store.state.device.accounts.find((x: any) => x.id === account.id).token;
+			const storedAccounts = getAccounts();
+			const token = storedAccounts.find(x => x.id === account.id).token;
 			this.switchAccountWithToken(token);
 		},
 
 		switchAccountWithToken(token: string) {
-			os.waiting();
-
-			os.api('i', {}, token).then((i: any) => {
-				this.$store.dispatch('switchAccount', {
-					...i,
-					token: token
-				}).then(() => {
-					this.$nextTick(() => {
-						location.reload();
-					});
-				});
-			});
+			login(token);
 		},
 	}
 });
@@ -294,7 +293,7 @@ export default defineComponent({
 .mvcprjjd {
 	$ui-font-size: 1em; // TODO: どこかに集約したい
 	$nav-width: 250px;
-	$nav-icon-only-width: 80px;
+	$nav-icon-only-width: 86px;
 
 	> .nav-back {
 		z-index: 1001;
@@ -360,7 +359,6 @@ export default defineComponent({
 			z-index: 1001;
 
 			> div {
-				> .index,
 				> .notifications {
 					display: none;
 				}
@@ -382,7 +380,6 @@ export default defineComponent({
 			box-sizing: border-box;
 			overflow: auto;
 			background: var(--navBg);
-			border-right: solid 1px var(--divider);
 
 			> .divider {
 				margin: 16px 0;

src/client/components/signin-dialog.vue

@@ -5,7 +5,7 @@
 	@close="$refs.dialog.close()"
 	@closed="$emit('closed')"
 >
-	<template #header>{{ $t('login') }}</template>
+	<template #header>{{ $ts.login }}</template>
 
 	<MkSignin :auto-set="autoSet" @login="onLogin"/>
 </XModalWindow>

src/client/components/signin.vue

@@ -4,37 +4,37 @@
 		<div class="avatar" :style="{ backgroundImage: user ? `url('${ user.avatarUrl }')` : null }" v-show="withAvatar"></div>
 		<div class="normal-signin" v-if="!totpLogin">
 			<MkInput v-model:value="username" type="text" pattern="^[a-zA-Z0-9_]+$" spellcheck="false" autofocus required @update:value="onUsernameChange">
-				<span>{{ $t('username') }}</span>
+				<span>{{ $ts.username }}</span>
 				<template #prefix>@</template>
 				<template #suffix>@{{ host }}</template>
 			</MkInput>
 			<MkInput v-model:value="password" type="password" :with-password-toggle="true" v-if="!user || user && !user.usePasswordLessLogin" required>
-				<span>{{ $t('password') }}</span>
+				<span>{{ $ts.password }}</span>
 				<template #prefix><Fa :icon="faLock"/></template>
 			</MkInput>
-			<MkButton type="submit" primary :disabled="signing" style="margin: 0 auto;">{{ signing ? $t('loggingIn') : $t('login') }}</MkButton>
+			<MkButton type="submit" primary :disabled="signing" style="margin: 0 auto;">{{ signing ? $ts.loggingIn : $ts.login }}</MkButton>
 		</div>
 		<div class="2fa-signin" v-if="totpLogin" :class="{ securityKeys: user && user.securityKeys }">
 			<div v-if="user && user.securityKeys" class="twofa-group tap-group">
-				<p>{{ $t('tapSecurityKey') }}</p>
+				<p>{{ $ts.tapSecurityKey }}</p>
 				<MkButton @click="queryKey" v-if="!queryingKey">
-					{{ $t('retry') }}
+					{{ $ts.retry }}
 				</MkButton>
 			</div>
 			<div class="or-hr" v-if="user && user.securityKeys">
-				<p class="or-msg">{{ $t('or') }}</p>
+				<p class="or-msg">{{ $ts.or }}</p>
 			</div>
 			<div class="twofa-group totp-group">
-				<p style="margin-bottom:0;">{{ $t('twoStepAuthentication') }}</p>
+				<p style="margin-bottom:0;">{{ $ts.twoStepAuthentication }}</p>
 				<MkInput v-model:value="password" type="password" :with-password-toggle="true" v-if="user && user.usePasswordLessLogin" required>
-					<span>{{ $t('password') }}</span>
+					<span>{{ $ts.password }}</span>
 					<template #prefix><Fa :icon="faLock"/></template>
 				</MkInput>
 				<MkInput v-model:value="token" type="text" pattern="^[0-9]{6}$" autocomplete="off" spellcheck="false" required>
-					<span>{{ $t('token') }}</span>
+					<span>{{ $ts.token }}</span>
 					<template #prefix><Fa :icon="faGavel"/></template>
 				</MkInput>
-				<MkButton type="submit" :disabled="signing" primary style="margin: 0 auto;">{{ signing ? $t('loggingIn') : $t('login') }}</MkButton>
+				<MkButton type="submit" :disabled="signing" primary style="margin: 0 auto;">{{ signing ? $ts.loggingIn : $ts.login }}</MkButton>
 			</div>
 		</div>
 	</div>
@@ -56,6 +56,7 @@ import MkInput from './ui/input.vue';
 import { apiUrl, host } from '@/config';
 import { byteify, hexify } from '@/scripts/2fa';
 import * as os from '@/os';
+import { login } from '@/account';
 
 export default defineComponent({
 	components: {
@@ -97,7 +98,7 @@ export default defineComponent({
 
 	computed: {
 		meta() {
-			return this.$store.state.instance.meta;
+			return this.$instance;
 		},
 	},
 
@@ -114,8 +115,7 @@ export default defineComponent({
 
 		onLogin(res) {
 			if (this.autoSet) {
-				localStorage.setItem('i', res.i);
-				location.reload();
+				login(res.i);
 			}
 		},
 
@@ -153,7 +153,7 @@ export default defineComponent({
 				if (err === null) return;
 				os.dialog({
 					type: 'error',
-					text: this.$t('signinFailed')
+					text: this.$ts.signinFailed
 				});
 				this.signing = false;
 			});
@@ -174,7 +174,7 @@ export default defineComponent({
 					}).catch(() => {
 						os.dialog({
 							type: 'error',
-							text: this.$t('signinFailed')
+							text: this.$ts.signinFailed
 						});
 						this.challengeData = null;
 						this.totpLogin = false;
@@ -195,7 +195,7 @@ export default defineComponent({
 				}).catch(() => {
 					os.dialog({
 						type: 'error',
-						text: this.$t('loginFailed')
+						text: this.$ts.loginFailed
 					});
 					this.signing = false;
 				});

src/client/components/signup-dialog.vue

@@ -5,7 +5,7 @@
 	@close="$refs.dialog.close()"
 	@closed="$emit('closed')"
 >
-	<template #header>{{ $t('signup') }}</template>
+	<template #header>{{ $ts.signup }}</template>
 
 	<div class="_section">
 		<XSignup :auto-set="autoSet" @signup="onSignup"/>

src/client/components/signup.vue

@@ -2,48 +2,51 @@
 <form class="mk-signup" @submit.prevent="onSubmit" :autocomplete="Math.random()">
 	<template v-if="meta">
 		<MkInput v-if="meta.disableRegistration" v-model:value="invitationCode" type="text" :autocomplete="Math.random()" spellcheck="false" required>
-			<span>{{ $t('invitationCode') }}</span>
+			<span>{{ $ts.invitationCode }}</span>
 			<template #prefix><Fa :icon="faKey"/></template>
 		</MkInput>
 		<MkInput v-model:value="username" type="text" pattern="^[a-zA-Z0-9_]{1,20}$" :autocomplete="Math.random()" spellcheck="false" required @update:value="onChangeUsername">
-			<span>{{ $t('username') }}</span>
+			<span>{{ $ts.username }}</span>
 			<template #prefix>@</template>
 			<template #suffix>@{{ host }}</template>
 			<template #desc>
-				<span v-if="usernameState == 'wait'" style="color:#999"><Fa :icon="faSpinner" pulse fixed-width/> {{ $t('checking') }}</span>
-				<span v-if="usernameState == 'ok'" style="color:#3CB7B5"><Fa :icon="faCheck" fixed-width/> {{ $t('available') }}</span>
-				<span v-if="usernameState == 'unavailable'" style="color:#FF1161"><Fa :icon="faExclamationTriangle" fixed-width/> {{ $t('unavailable') }}</span>
-				<span v-if="usernameState == 'error'" style="color:#FF1161"><Fa :icon="faExclamationTriangle" fixed-width/> {{ $t('error') }}</span>
-				<span v-if="usernameState == 'invalid-format'" style="color:#FF1161"><Fa :icon="faExclamationTriangle" fixed-width/> {{ $t('usernameInvalidFormat') }}</span>
-				<span v-if="usernameState == 'min-range'" style="color:#FF1161"><Fa :icon="faExclamationTriangle" fixed-width/> {{ $t('tooShort') }}</span>
-				<span v-if="usernameState == 'max-range'" style="color:#FF1161"><Fa :icon="faExclamationTriangle" fixed-width/> {{ $t('tooLong') }}</span>
+				<span v-if="usernameState == 'wait'" style="color:#999"><Fa :icon="faSpinner" pulse fixed-width/> {{ $ts.checking }}</span>
+				<span v-if="usernameState == 'ok'" style="color:#3CB7B5"><Fa :icon="faCheck" fixed-width/> {{ $ts.available }}</span>
+				<span v-if="usernameState == 'unavailable'" style="color:#FF1161"><Fa :icon="faExclamationTriangle" fixed-width/> {{ $ts.unavailable }}</span>
+				<span v-if="usernameState == 'error'" style="color:#FF1161"><Fa :icon="faExclamationTriangle" fixed-width/> {{ $ts.error }}</span>
+				<span v-if="usernameState == 'invalid-format'" style="color:#FF1161"><Fa :icon="faExclamationTriangle" fixed-width/> {{ $ts.usernameInvalidFormat }}</span>
+				<span v-if="usernameState == 'min-range'" style="color:#FF1161"><Fa :icon="faExclamationTriangle" fixed-width/> {{ $ts.tooShort }}</span>
+				<span v-if="usernameState == 'max-range'" style="color:#FF1161"><Fa :icon="faExclamationTriangle" fixed-width/> {{ $ts.tooLong }}</span>
 			</template>
 		</MkInput>
 		<MkInput v-model:value="password" type="password" :autocomplete="Math.random()" required @update:value="onChangePassword">
-			<span>{{ $t('password') }}</span>
+			<span>{{ $ts.password }}</span>
 			<template #prefix><Fa :icon="faLock"/></template>
 			<template #desc>
-				<p v-if="passwordStrength == 'low'" style="color:#FF1161"><Fa :icon="faExclamationTriangle" fixed-width/> {{ $t('weakPassword') }}</p>
-				<p v-if="passwordStrength == 'medium'" style="color:#3CB7B5"><Fa :icon="faCheck" fixed-width/> {{ $t('normalPassword') }}</p>
-				<p v-if="passwordStrength == 'high'" style="color:#3CB7B5"><Fa :icon="faCheck" fixed-width/> {{ $t('strongPassword') }}</p>
+				<p v-if="passwordStrength == 'low'" style="color:#FF1161"><Fa :icon="faExclamationTriangle" fixed-width/> {{ $ts.weakPassword }}</p>
+				<p v-if="passwordStrength == 'medium'" style="color:#3CB7B5"><Fa :icon="faCheck" fixed-width/> {{ $ts.normalPassword }}</p>
+				<p v-if="passwordStrength == 'high'" style="color:#3CB7B5"><Fa :icon="faCheck" fixed-width/> {{ $ts.strongPassword }}</p>
 			</template>
 		</MkInput>
 		<MkInput v-model:value="retypedPassword" type="password" :autocomplete="Math.random()" required @update:value="onChangePasswordRetype">
-			<span>{{ $t('password') }} ({{ $t('retype') }})</span>
+			<span>{{ $ts.password }} ({{ $ts.retype }})</span>
 			<template #prefix><Fa :icon="faLock"/></template>
 			<template #desc>
-				<p v-if="passwordRetypeState == 'match'" style="color:#3CB7B5"><Fa :icon="faCheck" fixed-width/> {{ $t('passwordMatched') }}</p>
-				<p v-if="passwordRetypeState == 'not-match'" style="color:#FF1161"><Fa :icon="faExclamationTriangle" fixed-width/> {{ $t('passwordNotMatched') }}</p>
+				<p v-if="passwordRetypeState == 'match'" style="color:#3CB7B5"><Fa :icon="faCheck" fixed-width/> {{ $ts.passwordMatched }}</p>
+				<p v-if="passwordRetypeState == 'not-match'" style="color:#FF1161"><Fa :icon="faExclamationTriangle" fixed-width/> {{ $ts.passwordNotMatched }}</p>
 			</template>
 		</MkInput>
-		<MkSwitch v-model:value="ToSAgreement" v-if="meta.tosUrl">
-			<i18n-t keypath="agreeTo">
-				<a :href="meta.tosUrl" class="_link" target="_blank">{{ $t('tos') }}</a>
-			</i18n-t>
-		</MkSwitch>
+		<label v-if="meta.tosUrl" class="tou">
+			<input type="checkbox" v-model="ToSAgreement">
+			<I18n :src="$ts.agreeTo">
+				<template #0>
+					<a :href="meta.tosUrl" class="_link" target="_blank">{{ $ts.tos }}</a>
+				</template>
+			</I18n>
+		</label>
 		<captcha v-if="meta.enableHcaptcha" class="captcha" provider="hcaptcha" ref="hcaptcha" v-model:value="hCaptchaResponse" :sitekey="meta.hcaptchaSiteKey"/>
 		<captcha v-if="meta.enableRecaptcha" class="captcha" provider="grecaptcha" ref="recaptcha" v-model:value="reCaptchaResponse" :sitekey="meta.recaptchaSiteKey"/>
-		<MkButton type="submit" :disabled="shouldDisableSubmitting" primary>{{ $t('start') }}</MkButton>
+		<MkButton type="submit" :disabled="shouldDisableSubmitting" primary>{{ $ts.start }}</MkButton>
 	</template>
 </form>
 </template>
@@ -58,6 +61,7 @@ import MkButton from './ui/button.vue';
 import MkInput from './ui/input.vue';
 import MkSwitch from './ui/switch.vue';
 import * as os from '@/os';
+import { login } from '@/account';
 
 export default defineComponent({
 	components: {
@@ -98,7 +102,7 @@ export default defineComponent({
 
 	computed: {
 		meta() {
-			return this.$store.state.instance.meta;
+			return this.$instance;
 		},
 
 		shouldDisableSubmitting(): boolean {
@@ -183,8 +187,7 @@ export default defineComponent({
 					this.$emit('signup', res);
 
 					if (this.autoSet) {
-						localStorage.setItem('i', res.i);
-						location.reload();
+						login(res.i);
 					}
 				});
 			}).catch(() => {
@@ -194,7 +197,7 @@ export default defineComponent({
 
 				os.dialog({
 					type: 'error',
-					text: this.$t('somethingHappened')
+					text: this.$ts.somethingHappened
 				});
 			});
 		}
@@ -207,5 +210,11 @@ export default defineComponent({
 	.captcha {
 		margin: 16px 0;
 	}
+
+	> .tou {
+		display: block;
+		margin: 16px 0;
+		cursor: pointer;
+	}
 }
 </style>

src/client/components/sub-note-content.vue

@@ -1,10 +1,10 @@
 <template>
 <div class="wrmlmaau">
 	<div class="body">
-		<span v-if="note.isHidden" style="opacity: 0.5">({{ $t('private') }})</span>
-		<span v-if="note.deletedAt" style="opacity: 0.5">({{ $t('deleted') }})</span>
+		<span v-if="note.isHidden" style="opacity: 0.5">({{ $ts.private }})</span>
+		<span v-if="note.deletedAt" style="opacity: 0.5">({{ $ts.deleted }})</span>
 		<MkA class="reply" v-if="note.replyId" :to="`/notes/${note.replyId}`"><Fa :icon="faReply"/></MkA>
-		<Mfm v-if="note.text" :text="note.text" :author="note.user" :i="$store.state.i" :custom-emojis="note.emojis"/>
+		<Mfm v-if="note.text" :text="note.text" :author="note.user" :i="$i" :custom-emojis="note.emojis"/>
 		<MkA class="rp" v-if="note.renoteId" :to="`/notes/${note.renoteId}`">RN: ...</MkA>
 	</div>
 	<details v-if="note.files.length > 0">
@@ -12,7 +12,7 @@
 		<XMediaList :media-list="note.files"/>
 	</details>
 	<details v-if="note.poll">
-		<summary>{{ $t('poll') }}</summary>
+		<summary>{{ $ts.poll }}</summary>
 		<XPoll :note="note"/>
 	</details>
 </div>

src/client/components/timeline.vue

@@ -1,5 +1,5 @@
 <template>
-<XNotes ref="tl" :pagination="pagination" @before="$emit('before')" @after="e => $emit('after', e)" @queue="$emit('queue', $event)"/>
+<XNotes :class="{ _noGap_: !$store.state.showGapBetweenNotesInTimeline }" ref="tl" :pagination="pagination" @before="$emit('before')" @after="e => $emit('after', e)" @queue="$emit('queue', $event)"/>
 </template>
 
 <script lang="ts">
@@ -51,9 +51,9 @@ export default defineComponent({
 			connection2: null,
 			pagination: null,
 			baseQuery: {
-				includeMyRenotes: this.$store.state.settings.showMyRenotes,
-				includeRenotedMyNotes: this.$store.state.settings.showRenotedMyNotes,
-				includeLocalRenotes: this.$store.state.settings.showLocalRenotes
+				includeMyRenotes: this.$store.state.showMyRenotes,
+				includeRenotedMyNotes: this.$store.state.showRenotedMyNotes,
+				includeLocalRenotes: this.$store.state.showLocalRenotes
 			},
 			query: {},
 		};
@@ -66,7 +66,7 @@ export default defineComponent({
 			this.$emit('note');
 
 			if (this.sound) {
-				sound.play(note.userId === this.$store.state.i.id ? 'noteMy' : 'note');
+				sound.play(note.userId === this.$i.id ? 'noteMy' : 'note');
 			}
 		};
 

src/client/components/token-generate-window.vue

@@ -9,17 +9,17 @@
 	@closed="$emit('closed')"
 	@ok="ok()"
 >
-	<template #header>{{ title || $t('generateAccessToken') }}</template>
+	<template #header>{{ title || $ts.generateAccessToken }}</template>
 	<div v-if="information" class="_section">
 		<MkInfo warn>{{ information }}</MkInfo>
 	</div>
 	<div class="_section">
-		<MkInput v-model:value="name">{{ $t('name') }}</MkInput>
+		<MkInput v-model:value="name">{{ $ts.name }}</MkInput>
 	</div>
 	<div class="_section">
-		<div style="margin-bottom: 16px;"><b>{{ $t('permission') }}</b></div>
-		<MkButton inline @click="disableAll">{{ $t('disableAll') }}</MkButton>
-		<MkButton inline @click="enableAll">{{ $t('enableAll') }}</MkButton>
+		<div style="margin-bottom: 16px;"><b>{{ $ts.permission }}</b></div>
+		<MkButton inline @click="disableAll">{{ $ts.disableAll }}</MkButton>
+		<MkButton inline @click="enableAll">{{ $ts.enableAll }}</MkButton>
 		<MkSwitch v-for="kind in (initialPermissions || kinds)" :key="kind" v-model:value="permissions[kind]">{{ $t(`_permissions.${kind}`) }}</MkSwitch>
 	</div>
 </XModalWindow>

src/client/components/ui/button.vue

@@ -123,7 +123,7 @@ export default defineComponent({
 	box-shadow: none;
 	text-decoration: none;
 	background: var(--buttonBg);
-	border-radius: 6px;
+	border-radius: 8px;
 	overflow: hidden;
 
 	&:not(:disabled):hover {

src/client/components/ui/context-menu.vue

@@ -1,5 +1,5 @@
 <template>
-<transition :name="$store.state.device.animation ? 'fade' : ''" appear>
+<transition :name="$store.state.animation ? 'fade' : ''" appear>
 	<div class="nvlagfpb" @contextmenu.prevent.stop="() => {}">
 		<MkMenu :items="items" @close="$emit('closed')" class="_popup _shadow" :align="'left'"/>
 	</div>

src/client/components/ui/input.vue

@@ -48,7 +48,7 @@
 		</datalist>
 		<div class="suffix" ref="suffixEl"><slot name="suffix"></slot></div>
 	</div>
-	<button class="save _textButton" v-if="save && changed" @click="() => { changed = false; save(); }">{{ $t('save') }}</button>
+	<button class="save _textButton" v-if="save && changed" @click="() => { changed = false; save(); }">{{ $ts.save }}</button>
 	<div class="desc _caption"><slot name="desc"></slot></div>
 </div>
 </template>

src/client/components/ui/menu.vue

@@ -35,7 +35,7 @@
 		</button>
 	</template>
 	<span v-if="_items.length === 0" class="none item">
-		<span>{{ $t('none') }}</span>
+		<span>{{ $ts.none }}</span>
 	</span>
 </div>
 </template>