10.62.0

Use mk-user-name

.config/example.yml

@@ -118,12 +118,3 @@ autoAdmin: true
 
 # Clustering
 #clusterLimit: 1
-
-# Summaly proxy
-#summalyProxy: "http://example.com"
-
-# User recommendation
-#user_recommendation:
-#  external: true
-#  engine: http://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}
-#  timeout: 300000

.gitignore

@@ -17,3 +17,4 @@ api-docs.json
 /mongo
 /elasticsearch
 *.code-workspace
+yarn.lock

Dockerfile

@@ -8,18 +8,20 @@ WORKDIR /misskey
 
 FROM base AS builder
 
+RUN unlink /usr/bin/free
 RUN apk add --no-cache \
-    gcc \
-    g++ \
-    libc-dev \
-    python \
     autoconf \
     automake \
     file \
+    g++ \
+    gcc \
+    libc-dev \
+    libtool \
     make \
     nasm \
     pkgconfig \
-    libtool \
+    procps \
+    python \
     zlib-dev
 RUN npm i -g node-gyp
 

README.md

@@ -73,46 +73,50 @@ Please see [Contribution guide](./CONTRIBUTING.md).
 ----------------------------------------------------------------
 <!-- PATREON_START -->
 <table><tr>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12190916/fb7fa7983c14425f890369535b1506a4/1?token-time=2145916800&token-hash=Zeh1u6l_Vmgoy8A1eT1Sltea-_SZSq8t8uOWDRZRh94%3D" alt="weep"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/13376668/71f3cf87ec6c4393a44b1b9df5ee3d12/1?token-time=2145916800&token-hash=7pSmWqgMfMSJHVIEcNsuuQoKeU3TRluew5p0EGTzWA4%3D" alt="Arctic"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12731202/0995c46cdcb54153ab5f073f5869b70a/1?token-time=2145916800&token-hash=Yd60FK_SWfQO56SeiJpy1tDHOnCV4xdEywQe8gn5_Wo%3D" alt="negao"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12913507/f7181eacafe8469a93033d85f5969c29/2?token-time=2145916800&token-hash=mgPdX9TqZxEg4TTPuc477dxhIgYk9246qafjWZEqZ7g%3D" alt="Melilot"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/3384329/8b713330cb27404ea6e9fac50ff96efe/1?token-time=2145916800&token-hash=0eu4-m1gTWA9PhptVZt6rdKcusqcD7RB87rJT23VVFI%3D" alt="べすれい"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12021162/963128bb8d14476dbd8407943db8f31a/1?token-time=2145916800&token-hash=GgJ_NmUB6_nnRNLVGUWjV-WX91On7BOu59LKncYV9fE%3D" alt="gutfuckllc"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/11357794/923ce94cd8c44ba788ee931907881839/1?token-time=2145916800&token-hash=I8lJVM8LeW6TSo5W6uIIRZ42cw83zp1wK_FsbzY0mcQ%3D" alt="mydarkstar"></td>
-<td><img src="https://c8.patreon.com/2/100/12718187" alt="Peter G."></td>
 </tr><tr>
+<td><a href="https://www.patreon.com/weepjp">weep</a></td>
+<td><a href="https://www.patreon.com/user?u=13376668">Arctic</a></td>
 <td><a href="https://www.patreon.com/negao">negao</a></td>
 <td><a href="https://www.patreon.com/user?u=12913507">Melilot</a></td>
 <td><a href="https://www.patreon.com/user?u=3384329">べすれい</a></td>
 <td><a href="https://www.patreon.com/gutfuckllc">gutfuckllc</a></td>
 <td><a href="https://www.patreon.com/mydarkstar">mydarkstar</a></td>
-<td><a href="https://www.patreon.com/user?u=12718187">Peter G.</a></td>
 </tr></table>
 <table><tr>
+<td><img src="https://c8.patreon.com/2/100/12718187" alt="Peter G."></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/13039004/509d0c412eb14ae08d6a812a3054f7d6/1?token-time=2145916800&token-hash=zwSu01tOtn5xTUucDZHuPsCxF2HBEMVs9ROJKTlEV_o%3D" alt="nemu"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/3?token-time=2145916800&token-hash=qsdn0-e6yLaLI6hUX9JAkyTR6a5UdnSp7T1foniBvGQ%3D" alt="YUKIMOCHI"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/8241184/39e18850e87a449e9c9a71acb3310ebd/2?token-time=2145916800&token-hash=iUXOQzRyJDv3PJxwS7Mjwg1459dzh2trOq6NFtXu_OM%3D" alt="Acid Chicken"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/13034746/c711c7f58e204ecfbc2fd646bc8a4eee/1?token-time=2145916800&token-hash=UERBN4OyP7Nh5XwwdDg0N0IE5cD6_qUQMO81Z5Wizso%3D" alt="Hiratake"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/10789744/97175095d8f04c0f86225ff47cb98d40/1?token-time=2145916800&token-hash=P4BIzCX2I1CkEP66ottfhsC8Wr6BUSamjA-vq3pLqFI%3D" alt="Naoki Hirayama"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/4503830/ccf2cc867ea64de0b524bb2e24b9a1cb/1?token-time=2145916800&token-hash=S1zP0QyLU52Dqq6dtc9qNYyWfW86XrYHiR4NMbeOrnA%3D" alt="dansup"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/619786/32cf01444db24e578cd1982c197f6fc6/1?token-time=2145916800&token-hash=tB1e_r8RlZ5sFL0KV_e8dugapxatNBRK1Z3h67TO1g8%3D" alt="Gargron"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/5731881/4b6038e6cda34c04b83a5fcce3806a93/1?token-time=2145916800&token-hash=VZUtwrjQa8Jml4twCjHYQQZ64wHEY4oIlGl7Kc-VYUQ%3D" alt="Nokotaro Takeda"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12531784/93a45137841849329ba692da92ac7c60/1?token-time=2145916800&token-hash=tMosUojzUYJCH_3t--tvYA-SMCyrS__hzSndyaRSnbo%3D" alt="Takashi Shibuya"></td>
 </tr><tr>
+<td><a href="https://www.patreon.com/user?u=12718187">Peter G.</a></td>
 <td><a href="https://www.patreon.com/user?u=13039004">nemu</a></td>
 <td><a href="https://www.patreon.com/yukimochi">YUKIMOCHI</a></td>
 <td><a href="https://www.patreon.com/acid_chicken">Acid Chicken</a></td>
 <td><a href="https://www.patreon.com/hiratake">Hiratake</a></td>
 <td><a href="https://www.patreon.com/spinlock">Naoki Hirayama</a></td>
 <td><a href="https://www.patreon.com/dansup">dansup</a></td>
+</tr></table>
+<table><tr>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/619786/32cf01444db24e578cd1982c197f6fc6/1?token-time=2145916800&token-hash=tB1e_r8RlZ5sFL0KV_e8dugapxatNBRK1Z3h67TO1g8%3D" alt="Gargron"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/5731881/4b6038e6cda34c04b83a5fcce3806a93/1?token-time=2145916800&token-hash=VZUtwrjQa8Jml4twCjHYQQZ64wHEY4oIlGl7Kc-VYUQ%3D" alt="Nokotaro Takeda"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12531784/93a45137841849329ba692da92ac7c60/1?token-time=2145916800&token-hash=tMosUojzUYJCH_3t--tvYA-SMCyrS__hzSndyaRSnbo%3D" alt="Takashi Shibuya"></td>
+</tr><tr>
 <td><a href="https://www.patreon.com/mastodon">Gargron</a></td>
 <td><a href="https://www.patreon.com/takenoko">Nokotaro Takeda</a></td>
 <td><a href="https://www.patreon.com/user?u=12531784">Takashi Shibuya</a></td>
 </tr></table>
-<table><tr>
-</tr><tr>
-</tr></table>
 
-**Last updated:** Wed, 31 Oct 2018 23:21:06 UTC
+**Last updated:** Sat, 01 Dec 2018 22:05:05 UTC
 <!-- PATREON_END -->
 
 :four_leaf_clover: Copyright

assets/favicon/favicon.svg

@@ -1,108 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="512"
-   height="512"
-   viewBox="0 0 135.46667 135.46667"
-   version="1.1"
    id="svg8"
-   inkscape:version="0.92.1 r15371"
-   sodipodi:docname="favicon.svg"
-   inkscape:export-filename="C:\Users\syuilo\projects\misskey\assets\favicon\16.png"
-   inkscape:export-xdpi="3"
-   inkscape:export-ydpi="3">
+   version="1.1"
+   viewBox="0 0 135.46667 135.46667"
+   height="512"
+   width="512">
   <defs
-     id="defs2">
-    <inkscape:path-effect
-       effect="simplify"
-       id="path-effect5115"
-       is_visible="true"
-       steps="1"
-       threshold="0.000408163"
-       smooth_angles="360"
-       helper_size="0"
-       simplify_individual_paths="false"
-       simplify_just_coalesce="false"
-       simplifyindividualpaths="false"
-       simplifyJustCoalesce="false" />
-    <inkscape:path-effect
-       effect="simplify"
-       id="path-effect5111"
-       is_visible="true"
-       steps="1"
-       threshold="0.000408163"
-       smooth_angles="360"
-       helper_size="0"
-       simplify_individual_paths="false"
-       simplify_just_coalesce="false"
-       simplifyindividualpaths="false"
-       simplifyJustCoalesce="false" />
-    <inkscape:path-effect
-       effect="simplify"
-       id="path-effect5104"
-       is_visible="true"
-       steps="1"
-       threshold="0.000408163"
-       smooth_angles="360"
-       helper_size="0"
-       simplify_individual_paths="false"
-       simplify_just_coalesce="false"
-       simplifyindividualpaths="false"
-       simplifyJustCoalesce="false" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="15.466544"
-     inkscape:cy="235.92965"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4502"
-     showgrid="true"
-     units="px"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-center="true"
-     inkscape:snap-page="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1027"
-     inkscape:window-x="-8"
-     inkscape:window-y="1072"
-     inkscape:window-maximized="1"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-midpoints="true"
-     inkscape:object-paths="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     objecttolerance="1"
-     guidetolerance="1"
-     inkscape:snap-nodes="false"
-     inkscape:snap-others="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4504"
-       spacingx="4.2333334"
-       spacingy="4.2333334"
-       empcolor="#ff3fff"
-       empopacity="0.25098039"
-       empspacing="4" />
-  </sodipodi:namedview>
+     id="defs2" />
   <metadata
      id="metadata5">
     <rdf:RDF>
@@ -116,32 +25,27 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="レイヤー 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-30.809093,-111.78601)">
+     style="fill:#2fa3bc;fill-opacity:1"
+     transform="translate(-30.809093,-111.78601)"
+     id="layer1">
     <g
-       id="g4502"
-       transform="matrix(1.096096,0,0,1.096096,-2.960633,-44.023579)">
+       style="fill:#2fa3bc;fill-opacity:1"
+       transform="matrix(1.096096,0,0,1.096096,-2.960633,-44.023579)"
+       id="g4502">
       <g
-         style="fill:#2fa1bb;fill-opacity:1"
-         id="g5125">
+         id="g5125"
+         transform="translate(-1.3333333e-6,-1.3439941e-6)"
+         style="fill:#2fa3bc;fill-opacity:1">
         <g
-           transform="matrix(0.91391326,0,0,0.91391326,7.9719907,17.595761)"
+           aria-label="Mi"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:141.03404236px;line-height:476.69509888px;font-family:'OTADESIGN Rounded';-inkscape-font-specification:'OTADESIGN Rounded';letter-spacing:0px;word-spacing:0px;fill:#2fa3bc;fill-opacity:1;stroke:none;stroke-width:0.28950602px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
            id="text4489"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:141.03404236px;line-height:476.69509888px;font-family:'OTADESIGN Rounded';-inkscape-font-specification:'OTADESIGN Rounded';letter-spacing:0px;word-spacing:0px;fill:#2fa1bb;fill-opacity:1;stroke:none;stroke-width:0.28950602px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           aria-label="Mi">
+           transform="matrix(0.91391326,0,0,0.91391326,7.9719907,17.595761)">
           <path
-             sodipodi:nodetypes="zccssscssccscczzzccsccsscscsccz"
-             inkscape:connector-curvature="0"
              id="path5210"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'OTADESIGN Rounded';-inkscape-font-specification:'OTADESIGN Rounded';fill:#2fa1bb;fill-opacity:1;stroke-width:0.28950602px"
-             d="m 75.196381,231.17126 c -5.855419,0.0202 -10.885068,-3.50766 -13.2572,-7.61584 -1.266603,-1.79454 -3.772419,-2.43291 -3.807919,0 v 11.2332 c 0,4.51309 -1.645397,8.41504 -4.936191,11.70583 -3.196772,3.19677 -7.098714,4.79516 -11.705826,4.79516 -4.513089,0 -8.415031,-1.59839 -11.705825,-4.79516 -3.196772,-3.29079 -4.795158,-7.19274 -4.795158,-11.70583 v -61.7729 c 0,-3.47884 0.987238,-6.6286 2.961715,-9.44928 2.068499,-2.91471 4.701135,-4.9362 7.897906,-6.06447 1.786431,-0.65816 3.666885,-0.98724 5.641362,-0.98724 5.077225,0 9.308247,1.97448 12.693064,5.92343 1.786431,1.97448 2.820681,3.00873 3.102749,3.10275 0,0 13.408119,16.21319 13.78421,16.49526 0.376091,0.28206 1.480789,2.43848 4.127113,2.43848 2.646324,0 3.89218,-2.15642 4.26827,-2.43848 0.376091,-0.28207 13.784088,-16.49526 13.784088,-16.49526 0.09402,0.094 1.081261,-0.94022 2.961715,-3.10275 3.478837,-3.94895 7.756866,-5.92343 12.834096,-5.92343 1.88045,0 3.76091,0.32908 5.64136,0.98724 3.19677,1.12827 5.7824,3.14976 7.75688,6.06447 2.06849,2.82068 3.10274,5.97044 3.10274,9.44928 v 61.7729 c 0,4.51309 -1.6454,8.41504 -4.93619,11.70583 -3.19677,3.19677 -7.09871,4.79516 -11.70582,4.79516 -4.51309,0 -8.41504,-1.59839 -11.705828,-4.79516 -3.196772,-3.29079 -4.795158,-7.19274 -4.795158,-11.70583 v -11.2332 c -0.277898,-3.06563 -2.987588,-1.13379 -3.948953,0 -2.538613,4.70114 -7.401781,7.59567 -13.2572,7.61584 z" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path5212"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'OTADESIGN Rounded';-inkscape-font-specification:'OTADESIGN Rounded';fill:#2fa1bb;fill-opacity:1;stroke-width:0.28950602px"
-             d="m 145.83461,185.00361 q -5.92343,0 -10.15445,-4.08999 -4.08999,-4.23102 -4.08999,-10.15445 0,-5.92343 4.08999,-10.01342 4.23102,-4.23102 10.15445,-4.23102 5.92343,0 10.15445,4.23102 4.23102,4.08999 4.23102,10.01342 0,5.92343 -4.23102,10.15445 -4.23102,4.08999 -10.15445,4.08999 z m 0.14103,2.82068 q 5.92343,0 10.01342,4.23102 4.23102,4.23102 4.23102,10.15445 v 34.83541 q 0,5.92343 -4.23102,10.15445 -4.08999,4.08999 -10.01342,4.08999 -5.92343,0 -10.15445,-4.08999 -4.23102,-4.23102 -4.23102,-10.15445 v -34.83541 q 0,-5.92343 4.23102,-10.15445 4.23102,-4.23102 10.15445,-4.23102 z" />
+             transform="matrix(0.26412464,0,0,0.26412464,24.988264,136.28626)"
+             d="m 62.474609,76.585938 c -7.47555,0 -14.595784,1.246427 -21.359375,3.738281 C 29.011968,84.595952 19.044417,92.249798 11.212891,103.28516 3.7373405,113.96451 0,125.88934 0,139.06055 v 233.8789 c 0,17.08697 6.0510264,31.85913 18.154297,44.31836 12.459246,12.10327 27.233346,18.15625 44.320312,18.15625 17.442947,0 32.215089,-6.05298 44.318361,-18.15625 12.45925,-12.45923 18.68945,-27.23139 18.68945,-44.31836 V 330.4082 c 0.13441,-9.21122 9.6225,-6.79429 14.41797,0 8.98111,15.55395 28.02226,28.91242 50.19141,28.83594 22.16915,-0.0764 40.58194,-11.03699 50.19336,-28.83594 3.63981,-4.29263 13.89902,-11.60675 14.95117,0 v 42.53125 c 0,17.08697 6.05102,31.85913 18.15429,44.31836 12.45923,12.10327 27.23335,18.15625 44.32032,18.15625 17.44294,0 32.21509,-6.05298 44.31836,-18.15625 12.45923,-12.45923 18.68945,-27.23139 18.68945,-44.31836 v -233.8789 c 0,-13.17121 -3.9146,-25.09604 -11.74609,-35.77539 -7.47557,-11.035362 -17.26588,-18.689208 -29.36914,-22.960941 -7.11956,-2.491854 -14.23982,-3.738281 -21.35938,-3.738281 -19.22286,0 -35.41865,7.476649 -48.58984,22.427734 l -63.40235,74.199218 c -1.42391,1.06791 -6.14093,9.23242 -16.16015,9.23242 -10.01923,0 -14.20109,-8.16451 -15.625,-9.23242 L 110.53125,99.013672 C 97.716024,84.062587 81.697447,76.585938 62.474609,76.585938 Z m 395.060551,0 c -14.9511,-10e-7 -27.76596,5.340179 -38.44532,16.019531 -10.32338,10.323381 -15.48437,22.961011 -15.48437,37.912111 0,14.9511 5.16099,27.76596 15.48437,38.44531 10.67936,10.32338 23.49422,15.48633 38.44532,15.48633 14.95109,0 27.76596,-5.16295 38.44531,-15.48633 C 506.65982,158.28354 512,145.46868 512,130.51758 512,115.56648 506.65982,102.92885 495.98047,92.605469 485.30112,81.926117 472.48625,76.585938 457.53516,76.585938 Z m 0.5332,118.541012 c -14.9511,0 -27.76596,5.34018 -38.44531,16.01953 -10.67936,10.67936 -16.01758,23.49422 -16.01758,38.44532 v 131.89062 c 0,14.9511 5.33822,27.76596 16.01758,38.44531 10.67935,10.32339 23.49421,15.48633 38.44531,15.48633 14.9511,0 27.58873,-5.16294 37.91211,-15.48633 C 506.65982,409.24838 512,396.43352 512,381.48242 V 249.5918 c 0,-14.9511 -5.34018,-27.76596 -16.01953,-38.44532 -10.32338,-10.67935 -22.96101,-16.01953 -37.91211,-16.01953 z"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'OTADESIGN Rounded';-inkscape-font-specification:'OTADESIGN Rounded';fill:#2fa3bc;fill-opacity:1;stroke-width:1.09609616px" />
         </g>
       </g>
     </g>

assets/mi.svg

@@ -1,108 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="512"
-   height="512"
-   viewBox="0 0 135.46667 135.46667"
-   version="1.1"
    id="svg8"
-   inkscape:version="0.92.1 r15371"
-   sodipodi:docname="mi.svg"
-   inkscape:export-filename="C:\Users\syuilo\projects\misskey\assets\favicon\32.png"
-   inkscape:export-xdpi="6"
-   inkscape:export-ydpi="6">
+   version="1.1"
+   viewBox="0 0 135.46667 135.46667"
+   height="512"
+   width="512">
   <defs
-     id="defs2">
-    <inkscape:path-effect
-       effect="simplify"
-       id="path-effect5115"
-       is_visible="true"
-       steps="1"
-       threshold="0.000408163"
-       smooth_angles="360"
-       helper_size="0"
-       simplify_individual_paths="false"
-       simplify_just_coalesce="false"
-       simplifyindividualpaths="false"
-       simplifyJustCoalesce="false" />
-    <inkscape:path-effect
-       effect="simplify"
-       id="path-effect5111"
-       is_visible="true"
-       steps="1"
-       threshold="0.000408163"
-       smooth_angles="360"
-       helper_size="0"
-       simplify_individual_paths="false"
-       simplify_just_coalesce="false"
-       simplifyindividualpaths="false"
-       simplifyJustCoalesce="false" />
-    <inkscape:path-effect
-       effect="simplify"
-       id="path-effect5104"
-       is_visible="true"
-       steps="1"
-       threshold="0.000408163"
-       smooth_angles="360"
-       helper_size="0"
-       simplify_individual_paths="false"
-       simplify_just_coalesce="false"
-       simplifyindividualpaths="false"
-       simplifyJustCoalesce="false" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="232.39583"
-     inkscape:cy="251.50613"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4502"
-     showgrid="true"
-     units="px"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-center="true"
-     inkscape:snap-page="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1027"
-     inkscape:window-x="-8"
-     inkscape:window-y="1072"
-     inkscape:window-maximized="1"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-midpoints="true"
-     inkscape:object-paths="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     objecttolerance="1"
-     guidetolerance="1"
-     inkscape:snap-nodes="false"
-     inkscape:snap-others="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4504"
-       spacingx="4.2333334"
-       spacingy="4.2333334"
-       empcolor="#ff3fff"
-       empopacity="0.25098039"
-       empspacing="4" />
-  </sodipodi:namedview>
+     id="defs2" />
   <metadata
      id="metadata5">
     <rdf:RDF>
@@ -111,32 +20,30 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="レイヤー 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-30.809093,-111.78601)">
+     transform="translate(-30.809093,-111.78601)"
+     id="layer1">
     <g
-       id="g4502"
-       transform="matrix(1.096096,0,0,1.096096,-2.960633,-44.023579)">
+       transform="matrix(1.096096,0,0,1.096096,-2.960633,-44.023579)"
+       id="g4502">
       <g
-         style="fill:#000000;fill-opacity:1"
+         id="g5125"
          transform="translate(-1.3333333e-6,-1.3439941e-6)"
-         id="g5125">
+         style="fill:#000000;fill-opacity:1">
         <g
-           transform="matrix(0.91391326,0,0,0.91391326,7.9719907,17.595761)"
-           id="text4489"
+           aria-label="Mi"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:141.03404236px;line-height:476.69509888px;font-family:'OTADESIGN Rounded';-inkscape-font-specification:'OTADESIGN Rounded';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.28950602px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           aria-label="Mi">
+           id="text4489"
+           transform="matrix(0.91391326,0,0,0.91391326,7.9719907,17.595761)">
           <path
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'OTADESIGN Rounded';-inkscape-font-specification:'OTADESIGN Rounded';fill:#000000;fill-opacity:1;stroke-width:1.09609616px"
-             d="M 62.474609 76.585938 C 54.999059 76.585938 47.878825 77.832365 41.115234 80.324219 C 29.011968 84.595952 19.044417 92.249798 11.212891 103.28516 C 3.7373405 113.96451 0 125.88934 0 139.06055 L 0 372.93945 C 0 390.02642 6.0510264 404.79858 18.154297 417.25781 C 30.613543 429.36108 45.387643 435.41406 62.474609 435.41406 C 79.917556 435.41406 94.689698 429.36108 106.79297 417.25781 C 119.25222 404.79858 125.48242 390.02642 125.48242 372.93945 L 125.48242 330.4082 C 125.61683 321.19698 135.10492 323.61391 139.90039 330.4082 C 148.8815 345.96215 167.92265 359.32062 190.0918 359.24414 C 212.26095 359.16778 230.67374 348.20715 240.28516 330.4082 C 243.92497 326.11557 254.18418 318.80145 255.23633 330.4082 L 255.23633 372.93945 C 255.23633 390.02642 261.28735 404.79858 273.39062 417.25781 C 285.84985 429.36108 300.62397 435.41406 317.71094 435.41406 C 335.15388 435.41406 349.92603 429.36108 362.0293 417.25781 C 374.48853 404.79858 380.71875 390.02642 380.71875 372.93945 L 380.71875 139.06055 C 380.71875 125.88934 376.80415 113.96451 368.97266 103.28516 C 361.49709 92.249798 351.70678 84.595952 339.60352 80.324219 C 332.48396 77.832365 325.3637 76.585938 318.24414 76.585938 C 299.02128 76.585938 282.82549 84.062587 269.6543 99.013672 C 262.53473 107.20121 258.79542 111.11761 258.43945 110.76172 C 258.43945 110.76172 207.67587 172.14495 206.25195 173.21289 C 204.82804 174.2808 200.11102 182.44531 190.0918 182.44531 C 180.07257 182.44531 175.89071 174.2808 174.4668 173.21289 C 173.04288 172.14495 122.2793 110.76172 122.2793 110.76172 C 121.21136 110.40575 117.29484 106.48923 110.53125 99.013672 C 97.716024 84.062587 81.697447 76.585938 62.474609 76.585938 z M 457.53516 76.585938 C 442.58406 76.585937 429.7692 81.926117 419.08984 92.605469 C 408.76646 102.92885 403.60547 115.56648 403.60547 130.51758 C 403.60547 145.46868 408.76646 158.28354 419.08984 168.96289 C 429.7692 179.28627 442.58406 184.44922 457.53516 184.44922 C 472.48625 184.44922 485.30112 179.28627 495.98047 168.96289 C 506.65982 158.28354 512 145.46868 512 130.51758 C 512 115.56648 506.65982 102.92885 495.98047 92.605469 C 485.30112 81.926117 472.48625 76.585938 457.53516 76.585938 z M 458.06836 195.12695 C 443.11726 195.12695 430.3024 200.46713 419.62305 211.14648 C 408.94369 221.82584 403.60547 234.6407 403.60547 249.5918 L 403.60547 381.48242 C 403.60547 396.43352 408.94369 409.24838 419.62305 419.92773 C 430.3024 430.25112 443.11726 435.41406 458.06836 435.41406 C 473.01946 435.41406 485.65709 430.25112 495.98047 419.92773 C 506.65982 409.24838 512 396.43352 512 381.48242 L 512 249.5918 C 512 234.6407 506.65982 221.82584 495.98047 211.14648 C 485.65709 200.46713 473.01946 195.12695 458.06836 195.12695 z "
+             id="path5210"
              transform="matrix(0.26412464,0,0,0.26412464,24.988264,136.28626)"
-             id="path5210" />
+             d="m 62.474609,76.585938 c -7.47555,0 -14.595784,1.246427 -21.359375,3.738281 C 29.011968,84.595952 19.044417,92.249798 11.212891,103.28516 3.7373405,113.96451 0,125.88934 0,139.06055 v 233.8789 c 0,17.08697 6.0510264,31.85913 18.154297,44.31836 12.459246,12.10327 27.233346,18.15625 44.320312,18.15625 17.442947,0 32.215089,-6.05298 44.318361,-18.15625 12.45925,-12.45923 18.68945,-27.23139 18.68945,-44.31836 V 330.4082 c 0.13441,-9.21122 9.6225,-6.79429 14.41797,0 8.98111,15.55395 28.02226,28.91242 50.19141,28.83594 22.16915,-0.0764 40.58194,-11.03699 50.19336,-28.83594 3.63981,-4.29263 13.89902,-11.60675 14.95117,0 v 42.53125 c 0,17.08697 6.05102,31.85913 18.15429,44.31836 12.45923,12.10327 27.23335,18.15625 44.32032,18.15625 17.44294,0 32.21509,-6.05298 44.31836,-18.15625 12.45923,-12.45923 18.68945,-27.23139 18.68945,-44.31836 v -233.8789 c 0,-13.17121 -3.9146,-25.09604 -11.74609,-35.77539 -7.47557,-11.035362 -17.26588,-18.689208 -29.36914,-22.960941 -7.11956,-2.491854 -14.23982,-3.738281 -21.35938,-3.738281 -19.22286,0 -35.41865,7.476649 -48.58984,22.427734 l -63.40235,74.199218 c -1.42391,1.06791 -6.14093,9.23242 -16.16015,9.23242 -10.01923,0 -14.20109,-8.16451 -15.625,-9.23242 L 110.53125,99.013672 C 97.716024,84.062587 81.697447,76.585938 62.474609,76.585938 Z m 395.060551,0 c -14.9511,-10e-7 -27.76596,5.340179 -38.44532,16.019531 -10.32338,10.323381 -15.48437,22.961011 -15.48437,37.912111 0,14.9511 5.16099,27.76596 15.48437,38.44531 10.67936,10.32338 23.49422,15.48633 38.44532,15.48633 14.95109,0 27.76596,-5.16295 38.44531,-15.48633 C 506.65982,158.28354 512,145.46868 512,130.51758 512,115.56648 506.65982,102.92885 495.98047,92.605469 485.30112,81.926117 472.48625,76.585938 457.53516,76.585938 Z m 0.5332,118.541012 c -14.9511,0 -27.76596,5.34018 -38.44531,16.01953 -10.67936,10.67936 -16.01758,23.49422 -16.01758,38.44532 v 131.89062 c 0,14.9511 5.33822,27.76596 16.01758,38.44531 10.67935,10.32339 23.49421,15.48633 38.44531,15.48633 14.9511,0 27.58873,-5.16294 37.91211,-15.48633 C 506.65982,409.24838 512,396.43352 512,381.48242 V 249.5918 c 0,-14.9511 -5.34018,-27.76596 -16.01953,-38.44532 -10.32338,-10.67935 -22.96101,-16.01953 -37.91211,-16.01953 z"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'OTADESIGN Rounded';-inkscape-font-specification:'OTADESIGN Rounded';fill:#000000;fill-opacity:1;stroke-width:1.09609616px" />
         </g>
       </g>
     </g>

cli/reset-password.js

@@ -1,29 +0,0 @@
-const mongo = require('mongodb');
-const bcrypt = require('bcryptjs');
-const User = require('../built/models/user').default;
-
-const args = process.argv.slice(2);
-
-const user = args[0];
-
-const q = user.startsWith('@') ? {
-	username: user.split('@')[1],
-	host: user.split('@')[2] || null
-} : { _id: new mongo.ObjectID(user) };
-
-console.log(`Resetting password for ${user}...`);
-
-const passwd = 'yo';
-
-// Generate hash of password
-const hash = bcrypt.hashSync(passwd);
-
-User.update(q, {
-	$set: {
-		password: hash
-	}
-}).then(() => {
-	console.log(`Password of ${user} is now '${passwd}'`);
-}, e => {
-	console.error(e);
-});

cli/suspend.js

@@ -1,23 +0,0 @@
-const mongo = require('mongodb');
-const User = require('../built/models/user').default;
-
-const args = process.argv.slice(2);
-
-const user = args[0];
-
-const q = user.startsWith('@') ? {
-	username: user.split('@')[1],
-	host: user.split('@')[2] || null
-} : { _id: new mongo.ObjectID(user) };
-
-console.log(`Suspending ${user}...`);
-
-User.update(q, {
-	$set: {
-		isSuspended: true
-	}
-}).then(() => {
-	console.log(`Suspended ${user}`);
-}, e => {
-	console.error(e);
-});

docs/manage.en.md

@@ -8,28 +8,11 @@ coming soon
 node cli/mark-admin (User-ID or Username)
 ```
 
-## Mark as 'verified' user
-``` shell
-node cli/mark-verified (User-ID or Username)
-```
-
-## Suspend users
-``` shell
-node cli/suspend (User-ID or Username)
-```
 e.g.
 ``` shell
-# Use id
-node cli/suspend 57d01a501fdf2d07be417afe
+# By id
+node cli/mark-admin 57d01a501fdf2d07be417afe
 
-# Use username
+# By username
 node cli/suspend @syuilo
-
-# Use username (remote)
-node cli/suspend @syuilo@misskey.xyz
-```
-
-## Reset password
-``` shell
-node cli/reset-password (User-ID or Username)
 ```

docs/manage.ja.md

@@ -8,28 +8,11 @@ coming soon
 node cli/mark-admin (ユーザーID または ユーザー名)
 ```
 
-## 'verified'ユーザーを設定する
-``` shell
-node cli/mark-verified (ユーザーID または ユーザー名)
-```
-
-## ユーザーを凍結する
-``` shell
-node cli/suspend (ユーザーID または ユーザー名)
-```
 例:
 ``` shell
 # ユーザーID
-node cli/suspend 57d01a501fdf2d07be417afe
+node cli/mark-admin 57d01a501fdf2d07be417afe
 
 # ユーザー名
-node cli/suspend @syuilo
-
-# ユーザー名 (リモート)
-node cli/suspend @syuilo@misskey.xyz
-```
-
-## ユーザーのパスワードをリセットする
-``` shell
-node cli/reset-password (ユーザーID または ユーザー名)
+node cli/mark-admin @syuilo
 ```

locales/ca-ES.yml

@@ -26,6 +26,7 @@ common:
   close: "閉じる"
   do-not-copy-paste: "ここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。"
   load-more: "もっと読み込む"
+  enter-password: "パスワードを入力してください"
   got-it: "わかった"
   customization-tips:
     title: "カスタマイズのヒント"
@@ -438,6 +439,13 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
   count: "{}人が投稿"
   empty: "トレンドなし"
+common/views/components/language-settings.vue:
+  title: "表示言語"
+  pick-language: "言語を選択"
+  recommended: "推奨"
+  auto: "自動"
+  specify-language: "言語を指定"
+  info: "変更はページの再度読み込み後に反映されます。"
 common/views/components/profile-editor.vue:
   title: "プロフィール"
   name: "名前"
@@ -457,6 +465,10 @@ common/views/components/profile-editor.vue:
   saved: "プロフィールを保存しました"
   uploading: "アップロード中"
   upload-failed: "アップロードに失敗しました"
+  email: "メール設定"
+  email-address: "メールアドレス"
+  email-verified: "メールアドレスが確認されました"
+  email-not-verified: "メールアドレスが確認されていません。メールボックスをご確認ください。"
 common/views/widgets/broadcast.vue:
   fetching: "確認中"
   no-broadcasts: "お知らせはありません"
@@ -731,6 +743,8 @@ desktop/views/components/settings.vue:
   note-visibility: "投稿の公開範囲"
   default-note-visibility: "デフォルトの公開範囲"
   remember-note-visibility: "投稿の公開範囲を記憶する"
+  web-search-engine: "ウェブ検索エンジン"
+  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
   auto-popout: "ウィンドウの自動ポップアウト"
   auto-popout-desc: "ウィンドウが開かれるとき、ポップアウト(ブラウザ外に切り離す)可能なら自動でポップアウトします。この設定はブラウザに記憶されます。"
   advanced: "詳細設定"
@@ -767,12 +781,6 @@ desktop/views/components/settings.vue:
   enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
   volume: "ボリューム"
   test: "テスト"
-  language: "言語"
-  pick-language: "言語を選択"
-  recommended: "推奨"
-  auto: "自動"
-  specify-language: "言語を指定"
-  language-desc: "変更はページの再度読み込み後に反映されます。"
   cache: "キャッシュ"
   clean-cache: "クリーンアップ"
   cache-warn: "クリーンアップを行うと、ブラウザに記憶されたアカウント情報のキャッシュ、書きかけの投稿・返信・メッセージ、およびその他のデータ(設定情報含む)が削除されます。クリーンアップを行った後はページを再度読み込みする必要があります。"
@@ -966,17 +974,17 @@ admin/views/instance.vue:
   recaptcha-site-key: "reCAPTCHA site key"
   recaptcha-secret-key: "reCAPTCHA secret key"
   twitter-integration-config: "Twitter連携の設定"
-  twitter-integration-info: "コールバックURLは /api/tw/cb に設定します。"
+  twitter-integration-info: "コールバックURLは {url} に設定します。"
   enable-twitter-integration: "Twitter連携を有効にする"
   twitter-integration-consumer-key: "Consumer key"
   twitter-integration-consumer-secret: "Consumer secret"
   github-integration-config: "GitHub連携の設定"
-  github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
+  github-integration-info: "コールバックURLは {url} に設定します。"
   enable-github-integration: "GitHub連携を有効にする"
   github-integration-client-id: "Client ID"
   github-integration-client-secret: "Client Secret"
   discord-integration-config: "Discord連携の設定"
-  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
+  discord-integration-info: "コールバックURLは {url} に設定します。"
   enable-discord-integration: "Discord連携を有効にする"
   discord-integration-client-id: "Client ID"
   discord-integration-client-secret: "Client Secret"
@@ -991,6 +999,22 @@ admin/views/instance.vue:
   invite: "招待"
   save: "保存"
   saved: "保存しました"
+  user-recommendation-config: "おすすめユーザー"
+  enable-external-user-recommendation: "外部ユーザーレコメンデーションを有効にする"
+  external-user-recommendation-engine: "エンジン"
+  external-user-recommendation-engine-desc: "例: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
+  external-user-recommendation-timeout: "タイムアウト"
+  external-user-recommendation-timeout-desc: "ミリ秒単位 (例: 300000)"
+  email-config: "メールサーバーの設定"
+  email-config-info: "メールアドレス確認やパスワードリセットの際に使われます。"
+  enable-email: "メール配信を有効にする"
+  email: "メールアドレス"
+  smtp-secure: "SMTP接続に暗黙的なSSL/TLSを使用する"
+  smtp-secure-info: "STARTTLS使用時はオフにします。"
+  smtp-host: "SMTPホスト"
+  smtp-port: "SMTPポート"
+  smtp-user: "SMTPユーザー"
+  smtp-pass: "SMTPパスワード"
 admin/views/charts.vue:
   title: "チャート"
   per-day: "1日ごと"
@@ -1017,18 +1041,35 @@ admin/views/charts.vue:
     network-time: "応答時間"
     network-usage: "通信量"
 admin/views/users.vue:
-  suspend-user: "ユーザーの凍結"
+  operation: "操作"
+  username-or-userid: "ユーザー名またはユーザーID"
+  user-not-found: "ユーザーが見つかりません"
+  lookup: "照会"
+  reset-password: "パスワードをリセット"
+  password-updated: "パスワードは現在「{password}」です"
   suspend: "凍結"
   suspended: "凍結しました"
-  unsuspend-user: "ユーザーの凍結の解除"
   unsuspend: "凍結の解除"
   unsuspended: "凍結を解除しました"
-  verify-user: "ユーザーの公式アカウント設定"
   verify: "公式アカウントにする"
   verified: "公式アカウントにしました"
-  unverify-user: "ユーザーの公式アカウント解除"
   unverify: "公式アカウントを解除する"
   unverified: "公式アカウントを解除しました"
+  users:
+    title: "ユーザー"
+    sort:
+      title: "ソート"
+      createdAtAsc: "登録日時が古い順"
+      createdAtDesc: "登録日時が新しい順"
+      updatedAtAsc: "更新日時が古い順"
+      updatedAtDesc: "更新日時が新しい順"
+    origin:
+      title: "オリジン"
+      combined: "ローカル+リモート"
+      local: "ローカル"
+      remote: "リモート"
+    createdAt: "登録日時"
+    updatedAt: "更新日時"
 admin/views/moderators.vue:
   add-moderator:
     title: "モデレーターの登録"
@@ -1321,11 +1362,6 @@ mobile/views/pages/selectdrive.vue:
   select-file: "ファイルを選択"
 mobile/views/pages/settings.vue:
   signed-in-as: "{}としてサインイン中"
-  lang: "言語"
-  lang-tip: "変更はページの再読み込み後に反映されます。"
-  recommended: "推奨"
-  auto: "自動"
-  specify-language: "言語を指定"
   design: "デザインと表示"
   dark-mode: "ダークモード"
   i-am-under-limited-internet: "私は通信を制限されている"
@@ -1348,6 +1384,8 @@ mobile/views/pages/settings.vue:
   note-visibility: "投稿の公開範囲"
   default-note-visibility: "デフォルトの公開範囲"
   remember-note-visibility: "投稿の公開範囲を記憶する"
+  web-search-engine: "ウェブ検索エンジン"
+  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
   disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
   load-raw-images: "添付された画像を高画質で表示する"
   load-remote-media: "リモートサーバーのメディアを表示する"
@@ -1392,6 +1430,9 @@ mobile/views/pages/user.vue:
   block: "ブロック"
   unblock: "ブロック解除"
   years-old: "{age}歳"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  list-pushed: "{user}を{list}に追加しました"
 mobile/views/pages/user/home.vue:
   recent-notes: "最近の投稿"
   images: "画像"

locales/de-DE.yml

@@ -26,6 +26,7 @@ common:
   close: "Schließen"
   do-not-copy-paste: "ここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。"
   load-more: "もっと読み込む"
+  enter-password: "パスワードを入力してください"
   got-it: "Verstanden!"
   customization-tips:
     title: "Anpassung-Tipps"
@@ -438,6 +439,13 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
   count: "{}人が投稿"
   empty: "トレンドなし"
+common/views/components/language-settings.vue:
+  title: "表示言語"
+  pick-language: "言語を選択"
+  recommended: "推奨"
+  auto: "自動"
+  specify-language: "言語を指定"
+  info: "変更はページの再度読み込み後に反映されます。"
 common/views/components/profile-editor.vue:
   title: "プロフィール"
   name: "名前"
@@ -457,6 +465,10 @@ common/views/components/profile-editor.vue:
   saved: "プロフィールを保存しました"
   uploading: "アップロード中"
   upload-failed: "アップロードに失敗しました"
+  email: "メール設定"
+  email-address: "メールアドレス"
+  email-verified: "メールアドレスが確認されました"
+  email-not-verified: "メールアドレスが確認されていません。メールボックスをご確認ください。"
 common/views/widgets/broadcast.vue:
   fetching: "Laden"
   no-broadcasts: "Keine Broadcasts"
@@ -731,6 +743,8 @@ desktop/views/components/settings.vue:
   note-visibility: "投稿の公開範囲"
   default-note-visibility: "デフォルトの公開範囲"
   remember-note-visibility: "投稿の公開範囲を記憶する"
+  web-search-engine: "ウェブ検索エンジン"
+  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
   auto-popout: "Automatische Pop-out Fenster"
   auto-popout-desc: "Pop-out ein offenes Fenster wenn möglich. Diese Einstellung wird im Browser gespeichert."
   advanced: "Erweiterte Einstellungen"
@@ -767,12 +781,6 @@ desktop/views/components/settings.vue:
   enable-sounds-desc: "Spiel einen Ton ab beim Erhalten eines Beitrags bzw. einer Nachricht. Diese Einstellung wird im Browser gespeichert."
   volume: "Lautstärke"
   test: "Test"
-  language: "Sprache"
-  pick-language: "Sprache auswählen"
-  recommended: "Empfohlen"
-  auto: "Automatisch"
-  specify-language: "Sprache auswählen"
-  language-desc: "変更はページの再度読み込み後に反映されます。"
   cache: "キャッシュ"
   clean-cache: "クリーンアップ"
   cache-warn: "Der Cache deines Benutzerkontos (Info, Beiträge, Antworten, Direktnachrichten, Einstellungen), die lokal im Browser gespeichert sind werden gelöscht.\nDu musst die Seite aktualisieren nachdem du aufgeräumt hast."
@@ -966,17 +974,17 @@ admin/views/instance.vue:
   recaptcha-site-key: "reCAPTCHA site key"
   recaptcha-secret-key: "reCAPTCHA secret key"
   twitter-integration-config: "Twitter連携の設定"
-  twitter-integration-info: "コールバックURLは /api/tw/cb に設定します。"
+  twitter-integration-info: "コールバックURLは {url} に設定します。"
   enable-twitter-integration: "Twitter連携を有効にする"
   twitter-integration-consumer-key: "Consumer key"
   twitter-integration-consumer-secret: "Consumer secret"
   github-integration-config: "GitHub連携の設定"
-  github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
+  github-integration-info: "コールバックURLは {url} に設定します。"
   enable-github-integration: "GitHub連携を有効にする"
   github-integration-client-id: "Client ID"
   github-integration-client-secret: "Client Secret"
   discord-integration-config: "Discord連携の設定"
-  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
+  discord-integration-info: "コールバックURLは {url} に設定します。"
   enable-discord-integration: "Discord連携を有効にする"
   discord-integration-client-id: "Client ID"
   discord-integration-client-secret: "Client Secret"
@@ -991,6 +999,22 @@ admin/views/instance.vue:
   invite: "招待"
   save: "保存"
   saved: "保存しました"
+  user-recommendation-config: "おすすめユーザー"
+  enable-external-user-recommendation: "外部ユーザーレコメンデーションを有効にする"
+  external-user-recommendation-engine: "エンジン"
+  external-user-recommendation-engine-desc: "例: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
+  external-user-recommendation-timeout: "タイムアウト"
+  external-user-recommendation-timeout-desc: "ミリ秒単位 (例: 300000)"
+  email-config: "メールサーバーの設定"
+  email-config-info: "メールアドレス確認やパスワードリセットの際に使われます。"
+  enable-email: "メール配信を有効にする"
+  email: "メールアドレス"
+  smtp-secure: "SMTP接続に暗黙的なSSL/TLSを使用する"
+  smtp-secure-info: "STARTTLS使用時はオフにします。"
+  smtp-host: "SMTPホスト"
+  smtp-port: "SMTPポート"
+  smtp-user: "SMTPユーザー"
+  smtp-pass: "SMTPパスワード"
 admin/views/charts.vue:
   title: "チャート"
   per-day: "1日ごと"
@@ -1017,18 +1041,35 @@ admin/views/charts.vue:
     network-time: "応答時間"
     network-usage: "通信量"
 admin/views/users.vue:
-  suspend-user: "ユーザーの凍結"
+  operation: "操作"
+  username-or-userid: "ユーザー名またはユーザーID"
+  user-not-found: "ユーザーが見つかりません"
+  lookup: "照会"
+  reset-password: "パスワードをリセット"
+  password-updated: "パスワードは現在「{password}」です"
   suspend: "凍結"
   suspended: "凍結しました"
-  unsuspend-user: "ユーザーの凍結の解除"
   unsuspend: "凍結の解除"
   unsuspended: "凍結を解除しました"
-  verify-user: "ユーザーの公式アカウント設定"
   verify: "公式アカウントにする"
   verified: "公式アカウントにしました"
-  unverify-user: "ユーザーの公式アカウント解除"
   unverify: "公式アカウントを解除する"
   unverified: "公式アカウントを解除しました"
+  users:
+    title: "ユーザー"
+    sort:
+      title: "ソート"
+      createdAtAsc: "登録日時が古い順"
+      createdAtDesc: "登録日時が新しい順"
+      updatedAtAsc: "更新日時が古い順"
+      updatedAtDesc: "更新日時が新しい順"
+    origin:
+      title: "オリジン"
+      combined: "ローカル+リモート"
+      local: "ローカル"
+      remote: "リモート"
+    createdAt: "登録日時"
+    updatedAt: "更新日時"
 admin/views/moderators.vue:
   add-moderator:
     title: "モデレーターの登録"
@@ -1321,11 +1362,6 @@ mobile/views/pages/selectdrive.vue:
   select-file: "ファイルを選択"
 mobile/views/pages/settings.vue:
   signed-in-as: "{}としてサインイン中"
-  lang: "言語"
-  lang-tip: "変更はページの再読み込み後に反映されます。"
-  recommended: "推奨"
-  auto: "自動"
-  specify-language: "Sprache auswählen"
   design: "デザインと表示"
   dark-mode: "ダークモード"
   i-am-under-limited-internet: "私は通信を制限されている"
@@ -1348,6 +1384,8 @@ mobile/views/pages/settings.vue:
   note-visibility: "投稿の公開範囲"
   default-note-visibility: "デフォルトの公開範囲"
   remember-note-visibility: "投稿の公開範囲を記憶する"
+  web-search-engine: "ウェブ検索エンジン"
+  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
   disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
   load-raw-images: "添付された画像を高画質で表示する"
   load-remote-media: "リモートサーバーのメディアを表示する"
@@ -1392,6 +1430,9 @@ mobile/views/pages/user.vue:
   block: "ブロック"
   unblock: "ブロック解除"
   years-old: "{age}歳"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  list-pushed: "{user}を{list}に追加しました"
 mobile/views/pages/user/home.vue:
   recent-notes: "最近の投稿"
   images: "画像"

locales/en-US.yml

@@ -26,6 +26,7 @@ common:
   close: "Close"
   do-not-copy-paste: "Please do not enter or paste the code here. Account may be compromised."
   load-more: "Load more"
+  enter-password: "Please enter the Password"
   got-it: "Got it!"
   customization-tips:
     title: "Customization tips"
@@ -90,9 +91,9 @@ common:
     specified: "Direct"
     specified-desc: "Post to specified users only"
     private: "Private"
-    local-public: "Local (Public)"
-    local-home: "Local (Home)"
-    local-followers: "Local (Followers)"
+    local-public: "Public (Only local)"
+    local-home: "Home (Only local)"
+    local-followers: "Followers (Only local)"
   note-placeholders:
     a: "What are you doing?"
     b: "What's happening?"
@@ -119,7 +120,7 @@ common:
   reduce-motion: "Reduce motion in UI"
   this-setting-is-this-device-only: "Only for this device"
   use-os-default-emojis: "Use the OS default Emojis"
-  do-not-use-in-production: 'As this is for development, do not use this in production.'
+  do-not-use-in-production: 'This is a development build. Do not use in production.'
   is-remote-user: "This user information is copied."
   is-remote-post: "This post information is a copy."
   view-on-remote: "View it on remote"
@@ -208,7 +209,7 @@ common/views/components/games/reversi/reversi.index.vue:
   invitations: "You’ve got an invitation!"
   my-games: "My game"
   all-games: "All games"
-  enter-username: "Enter a username"
+  enter-username: "Please enter username"
   game-state:
     ended: "Finished"
     playing: "In Progress"
@@ -219,7 +220,7 @@ common/views/components/games/reversi/reversi.room.vue:
   black-or-white: "Black/White"
   black-is: "Black is {}"
   rules: "Rules"
-  is-llotheo: "The lesser side wins"
+  is-llotheo: "The lesser one wins(Llotheo)"
   looped-map: "Looped map"
   can-put-everywhere: "Can put everywhere"
   settings-of-the-bot: "Bot settings"
@@ -267,7 +268,7 @@ common/views/components/theme.vue:
   install: "Install"
   installed: "\"{}\" has been installed"
   create-a-theme: "Create a theme"
-  save-created-theme: "Save a theme"
+  save-created-theme: "Save theme"
   primary-color: "Primary color"
   secondary-color: "Secondary color"
   text-color: "Text color"
@@ -366,8 +367,8 @@ common/views/components/signin.vue:
   signin: "Sign in"
   or: "Or"
   signin-with-twitter: "Log in with Twitter"
-  signin-with-github: "Log in with GitHub"
-  signin-with-discord: "Login with Discord"
+  signin-with-github: "Sign in with GitHub"
+  signin-with-discord: "Sign in with Discord"
   login-failed: "Log in failed. Make sure you have entered your correct username and password."
 common/views/components/signup.vue:
   invitation-code: "Invitation code"
@@ -433,11 +434,18 @@ common/views/components/visibility-chooser.vue:
   private: "Private"
   local-public: "Local (Public)"
   local-public-desc: "Do not publish to remote"
-  local-home: "Local (Home)"
-  local-followers: "Local (Followers)"
+  local-home: "Home (Only local)"
+  local-followers: "Followers (Only local)"
 common/views/components/trends.vue:
   count: "{} users mentioned"
   empty: "No popular hashtag trends"
+common/views/components/language-settings.vue:
+  title: "Display Language"
+  pick-language: "Select a language"
+  recommended: "Recommended"
+  auto: "Auto"
+  specify-language: "Specify language"
+  info: "You need to reload the page for the changes to take effect."
 common/views/components/profile-editor.vue:
   title: "Profile"
   name: "Name"
@@ -445,20 +453,24 @@ common/views/components/profile-editor.vue:
   location: "Location"
   description: "About me"
   birthday: "Birthday"
-  avatar: "Avatar"
+  avatar: "Icon"
   banner: "Banner"
   is-cat: "This account is a Cat"
   is-bot: "This account is a Bot"
   is-locked: "Follower requests require approval"
   careful-bot: "Follower requests from bots require approval"
-  advanced: "Advanced"
+  advanced: "Other"
   privacy: "Privacy"
-  save: "Update profile"
+  save: "Save"
   saved: "Profile updated successfully"
   uploading: "Uploading"
   upload-failed: "Failed to upload"
+  email: "Email settings"
+  email-address: "Email Address"
+  email-verified: "Your email has been verified."
+  email-not-verified: "Email address is not confirmed. Please check your inbox."
 common/views/widgets/broadcast.vue:
-  fetching: "Fetching"
+  fetching: "Checking"
   no-broadcasts: "No announcements"
   have-a-nice-day: "Have a nice day!"
   next: "Next"
@@ -731,6 +743,8 @@ desktop/views/components/settings.vue:
   note-visibility: "Post visibility"
   default-note-visibility: "Default visibility"
   remember-note-visibility: "Remember post visibility"
+  web-search-engine: "Web search engine"
+  web-search-engine-desc: "Example: https://www.google.com/?#q={{query}}"
   auto-popout: "Auto pop-out window"
   auto-popout-desc: "If it's possible, pop-out display will be used instead of opening a new window. This setting is stored in your browser."
   advanced: "Advanced settings"
@@ -767,12 +781,6 @@ desktop/views/components/settings.vue:
   enable-sounds-desc: "Play a sound when you receive a post/message. This setting is stored in the browser."
   volume: "Volume"
   test: "Test"
-  language: "Language"
-  pick-language: "Select a language"
-  recommended: "Recommended"
-  auto: "Automatic"
-  specify-language: "Specify language"
-  language-desc: "You need to reload the page for the changes to take effect."
   cache: "Cache"
   clean-cache: "Clear cache"
   cache-warn: "The cache of account info/posts/replies/messages/settings stored in the browser will be deleted. You need to reload the page after cleaning up."
@@ -966,17 +974,17 @@ admin/views/instance.vue:
   recaptcha-site-key: "reCAPTCHA site key"
   recaptcha-secret-key: "reCAPTCHA secret key"
   twitter-integration-config: "Settings of connecting to Twitter"
-  twitter-integration-info: "The callback URL is set on /api/tw/cb."
+  twitter-integration-info: "The callback URL is set on {url}."
   enable-twitter-integration: "Enable connection to Twitter"
   twitter-integration-consumer-key: "Consumer key"
   twitter-integration-consumer-secret: "Consumer Secret"
   github-integration-config: "Setting of connecting to GitHub"
-  github-integration-info: "The callback URL is set on /api/gh/cb."
+  github-integration-info: "The callback URL is set on {url}."
   enable-github-integration: "Enable connection to GitHub"
   github-integration-client-id: "Client ID"
   github-integration-client-secret: "Client Secret"
   discord-integration-config: "Setting of Discord Integration"
-  discord-integration-info: "The callback URL is set on /api/dc/cb."
+  discord-integration-info: "The callback URL is set on {url}."
   enable-discord-integration: "Enable Discord connection"
   discord-integration-client-id: "Client ID"
   discord-integration-client-secret: "Client Secret"
@@ -991,6 +999,22 @@ admin/views/instance.vue:
   invite: "Invite"
   save: "Save"
   saved: "Saved"
+  user-recommendation-config: "Recommended users"
+  enable-external-user-recommendation: "Enable to external user recommendation"
+  external-user-recommendation-engine: "Engine"
+  external-user-recommendation-engine-desc: "Example : https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
+  external-user-recommendation-timeout: "Timeout"
+  external-user-recommendation-timeout-desc: "Number of milliseconds (ex. 300,000)"
+  email-config: "Email server settings"
+  email-config-info: "Used to confirm email and password reset etc."
+  enable-email: "Enable email delivery"
+  email: "Email Address"
+  smtp-secure: "Use implicit SSL/TLS in the SMTP connection"
+  smtp-secure-info: "Turn off STARTTLS when used that."
+  smtp-host: "SMTP Host"
+  smtp-port: "SMTP Port"
+  smtp-user: "SMTP User"
+  smtp-pass: "SMTP Password"
 admin/views/charts.vue:
   title: "Chart"
   per-day: "per Day"
@@ -1017,18 +1041,35 @@ admin/views/charts.vue:
     network-time: "Response time"
     network-usage: "Traffic"
 admin/views/users.vue:
-  suspend-user: "Suspend a user"
+  operation: "Operations"
+  username-or-userid: "Username or user ID"
+  user-not-found: "User not found"
+  lookup: "Look up"
+  reset-password: "Reset password"
+  password-updated: "The password is now \"{password}\""
   suspend: "Suspend"
   suspended: "Successfully suspended."
-  unsuspend-user: "Unsuspend users"
   unsuspend: "Unsuspend"
   unsuspended: "The user has successfully unsuspended."
-  verify-user: "User account verification settings"
   verify: "Verify account"
   verified: "The account is now being verified"
-  unverify-user: "User account unverification settings"
   unverify: "Unverify account"
   unverified: "The account is now being unverified"
+  users:
+    title: "Users"
+    sort:
+      title: "Sort"
+      createdAtAsc: "Date Registered (Ascending)"
+      createdAtDesc: "Date Registered (Descending)"
+      updatedAtAsc: "Last Updated (Ascending)"
+      updatedAtDesc: "Last Updated (Descending)"
+    origin:
+      title: "Origin"
+      combined: "Local + Remote"
+      local: "Local"
+      remote: "Remote"
+    createdAt: "Created at"
+    updatedAt: "Updated at"
 admin/views/moderators.vue:
   add-moderator:
     title: "Register Moderator"
@@ -1051,7 +1092,7 @@ admin/views/emoji.vue:
     remove: "Remove"
   updated: "Updated"
   remove-emoji:
-    are-you-sure: "Delete \"%1$s\"?"
+    are-you-sure: "Delete \"$1\"?"
     removed: "Deleted"
 admin/views/announcements.vue:
   announcements: "Announcements"
@@ -1062,7 +1103,7 @@ admin/views/announcements.vue:
   text: "Content"
   saved: "Saved"
   _remove:
-    are-you-sure: "Delete \"%1$s\"?"
+    are-you-sure: "Delete \"$1\"?"
     removed: "Deleted"
 admin/views/hashtags.vue:
   hided-tags: "Hidden Tags"
@@ -1321,11 +1362,6 @@ mobile/views/pages/selectdrive.vue:
   select-file: "Choose files"
 mobile/views/pages/settings.vue:
   signed-in-as: "Signed in as {}"
-  lang: "Language"
-  lang-tip: "You will need to reload the page for the changes to take effect."
-  recommended: "Recommended"
-  auto: "Auto"
-  specify-language: "Select your language"
   design: "Design and display"
   dark-mode: "Dark Mode"
   i-am-under-limited-internet: "I'm in limited bandwidth"
@@ -1348,6 +1384,8 @@ mobile/views/pages/settings.vue:
   note-visibility: "Post visibility"
   default-note-visibility: "Default visibility"
   remember-note-visibility: "Remember post visibility"
+  web-search-engine: "Web search engine"
+  web-search-engine-desc: "Example: https://www.google.com/?#q={{query}}"
   disable-via-mobile: "Don't mark the post as 'from mobile'"
   load-raw-images: "Show attached images in original quality"
   load-remote-media: "Show media from a remote server"
@@ -1392,6 +1430,9 @@ mobile/views/pages/user.vue:
   block: "Block"
   unblock: "Unblock"
   years-old: "{age} years old"
+  push-to-list: "Add to list"
+  select-list: "Select a list"
+  list-pushed: "Successfully added {user} to {list}."
 mobile/views/pages/user/home.vue:
   recent-notes: "Recent notes"
   images: "Images"

locales/es-ES.yml

@@ -26,6 +26,7 @@ common:
   close: "Cerrar"
   do-not-copy-paste: "Por favor no copies código aquí. Tu cuenta puede resultar comprometida."
   load-more: "もっと読み込む"
+  enter-password: "パスワードを入力してください"
   got-it: "¡Listo!"
   customization-tips:
     title: "Consejos de personalización"
@@ -438,6 +439,13 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
   count: "{}人が投稿"
   empty: "トレンドなし"
+common/views/components/language-settings.vue:
+  title: "表示言語"
+  pick-language: "言語を選択"
+  recommended: "推奨"
+  auto: "自動"
+  specify-language: "言語を指定"
+  info: "変更はページの再度読み込み後に反映されます。"
 common/views/components/profile-editor.vue:
   title: "プロフィール"
   name: "名前"
@@ -457,6 +465,10 @@ common/views/components/profile-editor.vue:
   saved: "プロフィールを保存しました"
   uploading: "アップロード中"
   upload-failed: "アップロードに失敗しました"
+  email: "メール設定"
+  email-address: "メールアドレス"
+  email-verified: "メールアドレスが確認されました"
+  email-not-verified: "メールアドレスが確認されていません。メールボックスをご確認ください。"
 common/views/widgets/broadcast.vue:
   fetching: "Recuperando"
   no-broadcasts: "Sin emisión"
@@ -731,6 +743,8 @@ desktop/views/components/settings.vue:
   note-visibility: "投稿の公開範囲"
   default-note-visibility: "デフォルトの公開範囲"
   remember-note-visibility: "投稿の公開範囲を記憶する"
+  web-search-engine: "ウェブ検索エンジン"
+  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
   auto-popout: "Ventana emergente automática"
   auto-popout-desc: "Muestra una ventana emergente si es posible. Esta configuración depende del navegador."
   advanced: "Configuración avanzada"
@@ -767,12 +781,6 @@ desktop/views/components/settings.vue:
   enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
   volume: "ボリューム"
   test: "テスト"
-  language: "言語"
-  pick-language: "言語を選択"
-  recommended: "推奨"
-  auto: "自動"
-  specify-language: "言語を指定"
-  language-desc: "変更はページの再度読み込み後に反映されます。"
   cache: "キャッシュ"
   clean-cache: "クリーンアップ"
   cache-warn: "クリーンアップを行うと、ブラウザに記憶されたアカウント情報のキャッシュ、書きかけの投稿・返信・メッセージ、およびその他のデータ(設定情報含む)が削除されます。クリーンアップを行った後はページを再度読み込みする必要があります。"
@@ -966,17 +974,17 @@ admin/views/instance.vue:
   recaptcha-site-key: "reCAPTCHA site key"
   recaptcha-secret-key: "reCAPTCHA secret key"
   twitter-integration-config: "Twitter連携の設定"
-  twitter-integration-info: "コールバックURLは /api/tw/cb に設定します。"
+  twitter-integration-info: "コールバックURLは {url} に設定します。"
   enable-twitter-integration: "Twitter連携を有効にする"
   twitter-integration-consumer-key: "Consumer key"
   twitter-integration-consumer-secret: "Consumer secret"
   github-integration-config: "GitHub連携の設定"
-  github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
+  github-integration-info: "コールバックURLは {url} に設定します。"
   enable-github-integration: "GitHub連携を有効にする"
   github-integration-client-id: "Client ID"
   github-integration-client-secret: "Client Secret"
   discord-integration-config: "Discord連携の設定"
-  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
+  discord-integration-info: "コールバックURLは {url} に設定します。"
   enable-discord-integration: "Discord連携を有効にする"
   discord-integration-client-id: "Client ID"
   discord-integration-client-secret: "Client Secret"
@@ -991,6 +999,22 @@ admin/views/instance.vue:
   invite: "招待"
   save: "保存"
   saved: "保存しました"
+  user-recommendation-config: "おすすめユーザー"
+  enable-external-user-recommendation: "外部ユーザーレコメンデーションを有効にする"
+  external-user-recommendation-engine: "エンジン"
+  external-user-recommendation-engine-desc: "例: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
+  external-user-recommendation-timeout: "タイムアウト"
+  external-user-recommendation-timeout-desc: "ミリ秒単位 (例: 300000)"
+  email-config: "メールサーバーの設定"
+  email-config-info: "メールアドレス確認やパスワードリセットの際に使われます。"
+  enable-email: "メール配信を有効にする"
+  email: "メールアドレス"
+  smtp-secure: "SMTP接続に暗黙的なSSL/TLSを使用する"
+  smtp-secure-info: "STARTTLS使用時はオフにします。"
+  smtp-host: "SMTPホスト"
+  smtp-port: "SMTPポート"
+  smtp-user: "SMTPユーザー"
+  smtp-pass: "SMTPパスワード"
 admin/views/charts.vue:
   title: "チャート"
   per-day: "1日ごと"
@@ -1017,18 +1041,35 @@ admin/views/charts.vue:
     network-time: "応答時間"
     network-usage: "通信量"
 admin/views/users.vue:
-  suspend-user: "ユーザーの凍結"
+  operation: "操作"
+  username-or-userid: "ユーザー名またはユーザーID"
+  user-not-found: "ユーザーが見つかりません"
+  lookup: "照会"
+  reset-password: "パスワードをリセット"
+  password-updated: "パスワードは現在「{password}」です"
   suspend: "凍結"
   suspended: "凍結しました"
-  unsuspend-user: "ユーザーの凍結の解除"
   unsuspend: "凍結の解除"
   unsuspended: "凍結を解除しました"
-  verify-user: "ユーザーの公式アカウント設定"
   verify: "公式アカウントにする"
   verified: "公式アカウントにしました"
-  unverify-user: "ユーザーの公式アカウント解除"
   unverify: "公式アカウントを解除する"
   unverified: "公式アカウントを解除しました"
+  users:
+    title: "ユーザー"
+    sort:
+      title: "ソート"
+      createdAtAsc: "登録日時が古い順"
+      createdAtDesc: "登録日時が新しい順"
+      updatedAtAsc: "更新日時が古い順"
+      updatedAtDesc: "更新日時が新しい順"
+    origin:
+      title: "オリジン"
+      combined: "ローカル+リモート"
+      local: "ローカル"
+      remote: "リモート"
+    createdAt: "登録日時"
+    updatedAt: "更新日時"
 admin/views/moderators.vue:
   add-moderator:
     title: "モデレーターの登録"
@@ -1321,11 +1362,6 @@ mobile/views/pages/selectdrive.vue:
   select-file: "ファイルを選択"
 mobile/views/pages/settings.vue:
   signed-in-as: "{}としてサインイン中"
-  lang: "言語"
-  lang-tip: "変更はページの再読み込み後に反映されます。"
-  recommended: "推奨"
-  auto: "自動"
-  specify-language: "言語を指定"
   design: "デザインと表示"
   dark-mode: "ダークモード"
   i-am-under-limited-internet: "私は通信を制限されている"
@@ -1348,6 +1384,8 @@ mobile/views/pages/settings.vue:
   note-visibility: "投稿の公開範囲"
   default-note-visibility: "デフォルトの公開範囲"
   remember-note-visibility: "投稿の公開範囲を記憶する"
+  web-search-engine: "ウェブ検索エンジン"
+  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
   disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
   load-raw-images: "添付された画像を高画質で表示する"
   load-remote-media: "リモートサーバーのメディアを表示する"
@@ -1392,6 +1430,9 @@ mobile/views/pages/user.vue:
   block: "ブロック"
   unblock: "ブロック解除"
   years-old: "{age}歳"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  list-pushed: "{user}を{list}に追加しました"
 mobile/views/pages/user/home.vue:
   recent-notes: "最近の投稿"
   images: "画像"

locales/fr-FR.yml

@@ -18,7 +18,7 @@ common:
     ui-desc: "どのようなUIが使いやすいかは人それぞれです。だから、Misskeyは自由度の高いUIを持っています。レイアウトやデザインを調整したり、カスタマイズ可能な様々なウィジェットを配置したりして、自分だけのホームを作ってください。"
     drive: "Drive"
     drive-desc: "以前投稿したことのある画像をまた投稿したくなったことはありませんか？もしくは、アップロードしたファイルをフォルダ分けして整理したくなったことはありませんか？Misskeyの根幹に組み込まれたドライブ機能によってそれらが解決します。ファイルの共有も簡単です。"
-    outro: "他にもMisskeyにしかない機能はまだまだあるので、ぜひあなた自身の目で確かめてください。Misskeyは分散型SNSなので、このインスタンスが気に入らなければ他のインスタンスを試すこともできます。それでは、GLHF!"
+    outro: "Découvrez vous-même les fonctionnalités de Misskey. Étant donné que Misskey est un réseaux social fédéré, vous pouvez essayer d’autres instances afin de trouver vos ami·e·s si la présente instance ne vous correspond pas. Bonne chance et amusez-vous bien !"
   adblock:
     detected: "Veuillez désactiver votre bloqueur de publicités"
     warning: "<strong>Misskey n’utilise pas de publicités</strong>, mais quelques options peuvent être non disponibles ou fonctionneraient mal si un bloqueur de publicités est activé."
@@ -26,6 +26,7 @@ common:
   close: "Fermer"
   do-not-copy-paste: "Veuillez ne pas entrer ou coller le code ici. Le compte peut être compromis."
   load-more: "Charger plus"
+  enter-password: "Veuillez entrer le mot de passe"
   got-it: "J’ai compris !"
   customization-tips:
     title: "Conseils de personnalisation"
@@ -123,7 +124,7 @@ common:
   is-remote-user: "Ces informations appartiennent à un·e utilisateur·rice distant·e."
   is-remote-post: "Ceci est une publication distante."
   view-on-remote: " Consulter le profil complet"
-  renoted-by: "{user}がRenote"
+  renoted-by: "Renoté par {user}"
   error:
     title: 'Une erreur est survenue'
     retry: 'Réessayer'
@@ -432,12 +433,19 @@ common/views/components/visibility-chooser.vue:
   specified-desc: "Publier uniquement aux utilisateurs·rices mentionné·e·s"
   private: "Privé"
   local-public: "Local (Public)"
-  local-public-desc: "リモートへは公開しない"
+  local-public-desc: "Ne pas publier pour les distants"
   local-home: "Accueil (local uniquement)"
   local-followers: "Local (Abonnés)"
 common/views/components/trends.vue:
   count: "{} utilisateurs·rices mentionnés·es"
   empty: "Aucune tendance"
+common/views/components/language-settings.vue:
+  title: "Langue "
+  pick-language: "Sélectionner une langue"
+  recommended: "Recommandé"
+  auto: "Automatique"
+  specify-language: "Spécifier la langue"
+  info: "Le rechargement de la page est requis afin d'appliquer les modifications."
 common/views/components/profile-editor.vue:
   title: "Profil"
   name: "Nom"
@@ -457,6 +465,10 @@ common/views/components/profile-editor.vue:
   saved: "Profil mis à jour avec succès"
   uploading: "En cours d'envoi …"
   upload-failed: "Échec de l'envoi"
+  email: "Paramètres de messagerie"
+  email-address: "Adresse de courrier électronique"
+  email-verified: "L’adresse du courrier électronique a été vérifiée."
+  email-not-verified: "Adresse de courriel n’est pas confirmée. Veuillez vérifier votre boite de réception."
 common/views/widgets/broadcast.vue:
   fetching: "Récupération"
   no-broadcasts: "Aucune annonce"
@@ -731,6 +743,8 @@ desktop/views/components/settings.vue:
   note-visibility: "Visibilité de la publication"
   default-note-visibility: "Visibilité par défaut"
   remember-note-visibility: "Se souvenir du mode de visibilité de la publication"
+  web-search-engine: "Moteur de recherche Web"
+  web-search-engine-desc: "Exemple : https://www.google.com/?#q={{query}}"
   auto-popout: "Fenêtre contextuelle automatique"
   auto-popout-desc: "ウィンドウが開かれるとき、ポップアウト(ブラウザ外に切り離す)可能なら自動でポップアウトします。この設定はブラウザに記憶されます。"
   advanced: "Paramètres avancés"
@@ -767,12 +781,6 @@ desktop/views/components/settings.vue:
   enable-sounds-desc: "Jouer un son lorsque vous recevez un message. Ce paramètre est sauvegardé dans le navigateur."
   volume: "Volume"
   test: "Test"
-  language: "Langue"
-  pick-language: "Sélectionner une langue"
-  recommended: "Recommandé"
-  auto: "Automatique"
-  specify-language: "Spécifier la langue"
-  language-desc: "Le rechargement de la page est requis afin d'appliquer les modifications."
   cache: "Cache"
   clean-cache: "Nettoyage"
   cache-warn: "Le nettoyage du cache du compte supprime les informations stockées dans le navigateur comme les messages, les réponses ainsi que d’autres données (y compris les paramètres de configuration). Après le nettoyage, vous devez recharger la page."
@@ -966,17 +974,17 @@ admin/views/instance.vue:
   recaptcha-site-key: "Clé reCAPTCHA du site"
   recaptcha-secret-key: "Clé secrète reCAPTCHA"
   twitter-integration-config: "Paramètres de connexion à Twitter"
-  twitter-integration-info: "L’URL callback est définit sur /api/tw/cb"
+  twitter-integration-info: "コールバックURLは {url} に設定します。"
   enable-twitter-integration: "Activer la connection à Twitter"
   twitter-integration-consumer-key: "Clé du consommateur"
   twitter-integration-consumer-secret: "Secret du consommateur"
   github-integration-config: "Paramètres d’authentification GitHub"
-  github-integration-info: "L’URL callback est définit sur /api/gh/cb"
+  github-integration-info: "コールバックURLは {url} に設定します。"
   enable-github-integration: "Activer l’authentification avec Github"
   github-integration-client-id: "ID client"
   github-integration-client-secret: "Secret client"
   discord-integration-config: "Paramètres d’authentification Discord"
-  discord-integration-info: "L’URL callback est définit sur /api/dc/cb"
+  discord-integration-info: "コールバックURLは {url} に設定します。"
   enable-discord-integration: "Activer l’authentification avec Discord"
   discord-integration-client-id: "ID client"
   discord-integration-client-secret: "Secret client"
@@ -991,6 +999,22 @@ admin/views/instance.vue:
   invite: "Inviter"
   save: "Sauvegarder"
   saved: "Enregistré"
+  user-recommendation-config: "Utilisateur·rice·s"
+  enable-external-user-recommendation: "Activer la recommandation des utilisateur·trice·s distant·e·s"
+  external-user-recommendation-engine: "Moteur"
+  external-user-recommendation-engine-desc: "Exemple : https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
+  external-user-recommendation-timeout: "Délai d’expiration"
+  external-user-recommendation-timeout-desc: "En millisecondes (par exemple : 300000)"
+  email-config: "Paramètres du serveur de messagerie"
+  email-config-info: "Utilisé pour confirmer votre adresse de courrier électronique et la réinitialisation de votre mot de passe."
+  enable-email: "Activation de la distribution du courrier"
+  email: "Adresse de courrier électronique"
+  smtp-secure: "Utiliser SSL/TLS implicitement dans la connexion SMTP"
+  smtp-secure-info: "Désactiver STARTTLS lorsque celui-ci est utilisé."
+  smtp-host: "Hôte SMTP"
+  smtp-port: "Port SMTP"
+  smtp-user: "Utilisateur SMTP"
+  smtp-pass: "Mot de passe SMTP"
 admin/views/charts.vue:
   title: "Graph"
   per-day: "par jour"
@@ -1017,18 +1041,35 @@ admin/views/charts.vue:
     network-time: "Temps de réponse"
     network-usage: "Traffic"
 admin/views/users.vue:
-  suspend-user: "Suspendre un·e utilisateur·rice"
+  operation: "Actions"
+  username-or-userid: "Nom d’utilisateur·rice ou ID utilisateur"
+  user-not-found: "Utilisateur·rice non trouvé·e"
+  lookup: "Recherche"
+  reset-password: "Réinitialiser mot de passe"
+  password-updated: "Le mot de passe est « {password} »"
   suspend: "Suspendre"
   suspended: "Suspendu·e avec succès."
-  unsuspend-user: "Lever la suspension d’utilisateur·rice·s"
   unsuspend: "Suspension levée"
   unsuspended: "La suspension de l’utilisateur·rice a été levée avec succès"
-  verify-user: "Paramètres de vérification du compte utilisateur"
   verify: "Vérification du compte"
   verified: "Le compte a été vérifié"
-  unverify-user: "Paramètres de non-vérification du compte utilisateur"
   unverify: "Ôter la vérification du compte"
   unverified: "Ce compte n'est plus vérifié"
+  users:
+    title: "Utilisateur·rice·s"
+    sort:
+      title: "Trier par"
+      createdAtAsc: "Date d’inscription (Ascendant)"
+      createdAtDesc: "Date d’inscription (Descendant)"
+      updatedAtAsc: "Mis à jour récemment (Ascendant)"
+      updatedAtDesc: "更新日時が新しい順"
+    origin:
+      title: "Origine"
+      combined: "Locaux + distants"
+      local: "Locaux"
+      remote: "Distants"
+    createdAt: "Créé le"
+    updatedAt: "Mis à jour le"
 admin/views/moderators.vue:
   add-moderator:
     title: "Ajout d’un modérateur"
@@ -1265,7 +1306,7 @@ mobile/views/components/ui.nav.vue:
   admin: "Admin"
   about: "À propos de Misskey"
 mobile/views/components/user-timeline.vue:
-  no-notes: "Cette utilisateur semble n'avoir rien poster pour le moment"
+  no-notes: "Il semble que cet·te utilisateur·rice n’a rien publié pour le moment."
   no-notes-with-media: "Aucune notes avec des médias"
 mobile/views/components/users-list.vue:
   all: "Tout"
@@ -1321,11 +1362,6 @@ mobile/views/pages/selectdrive.vue:
   select-file: "Choisissez un fichier"
 mobile/views/pages/settings.vue:
   signed-in-as: "Connecté·e en tant que {}"
-  lang: "Langue"
-  lang-tip: "Le rechargement de la page est requis afin d'appliquer les modifications."
-  recommended: "Recommandé"
-  auto: "Automatique"
-  specify-language: "Sélectionnez votre langue"
   design: "Affichage et design"
   dark-mode: "Mode nuit"
   i-am-under-limited-internet: "J'ai un accès Internet limité"
@@ -1348,6 +1384,8 @@ mobile/views/pages/settings.vue:
   note-visibility: "Visibilité de la publication"
   default-note-visibility: "Visibilité par défaut"
   remember-note-visibility: "Se souvenir du mode de visibilité de la publication"
+  web-search-engine: "Moteur de recherche Web"
+  web-search-engine-desc: "Exemple : https://www.google.com/?#q={{query}}"
   disable-via-mobile: "Ne pas mentionner que ma publication provient d'un 'périphérique mobile'"
   load-raw-images: "Afficher les photos jointes en haute qualité"
   load-remote-media: "Afficher les médias sur le serveur distant"
@@ -1392,6 +1430,9 @@ mobile/views/pages/user.vue:
   block: "Bloquer"
   unblock: "Débloquer"
   years-old: "{age} ans"
+  push-to-list: "Ajouter à la liste"
+  select-list: "Sélectionnez une liste"
+  list-pushed: "Vous avez ajouté {user} à la liste {list} avec succès."
 mobile/views/pages/user/home.vue:
   recent-notes: "Notes récentes"
   images: "Images"

locales/index.js

@@ -5,7 +5,7 @@
 const fs = require('fs');
 const yaml = require('js-yaml');
 
-const langs = ['de-DE', 'en-US', 'fr-FR', 'ja-JP', 'ja-KS', 'pl-PL', 'es-ES', 'nl-NL', 'zh-CN'];
+const langs = ['de-DE', 'en-US', 'fr-FR', 'ja-JP', 'ja-KS', 'pl-PL', 'es-ES', 'nl-NL', 'zh-CN', 'ko-KR'];
 
 const loadLocale = lang => yaml.safeLoad(fs.readFileSync(`${__dirname}/${lang}.yml`, 'utf-8'));
 const locales = langs.map(lang => ({ [lang]: loadLocale(lang) }));

locales/it-IT.yml

@@ -26,6 +26,7 @@ common:
   close: "閉じる"
   do-not-copy-paste: "ここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。"
   load-more: "もっと読み込む"
+  enter-password: "パスワードを入力してください"
   got-it: "わかった"
   customization-tips:
     title: "カスタマイズのヒント"
@@ -438,6 +439,13 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
   count: "{}人が投稿"
   empty: "トレンドなし"
+common/views/components/language-settings.vue:
+  title: "表示言語"
+  pick-language: "言語を選択"
+  recommended: "推奨"
+  auto: "自動"
+  specify-language: "言語を指定"
+  info: "変更はページの再度読み込み後に反映されます。"
 common/views/components/profile-editor.vue:
   title: "プロフィール"
   name: "名前"
@@ -457,6 +465,10 @@ common/views/components/profile-editor.vue:
   saved: "プロフィールを保存しました"
   uploading: "アップロード中"
   upload-failed: "アップロードに失敗しました"
+  email: "メール設定"
+  email-address: "メールアドレス"
+  email-verified: "メールアドレスが確認されました"
+  email-not-verified: "メールアドレスが確認されていません。メールボックスをご確認ください。"
 common/views/widgets/broadcast.vue:
   fetching: "確認中"
   no-broadcasts: "お知らせはありません"
@@ -731,6 +743,8 @@ desktop/views/components/settings.vue:
   note-visibility: "投稿の公開範囲"
   default-note-visibility: "デフォルトの公開範囲"
   remember-note-visibility: "投稿の公開範囲を記憶する"
+  web-search-engine: "ウェブ検索エンジン"
+  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
   auto-popout: "ウィンドウの自動ポップアウト"
   auto-popout-desc: "ウィンドウが開かれるとき、ポップアウト(ブラウザ外に切り離す)可能なら自動でポップアウトします。この設定はブラウザに記憶されます。"
   advanced: "詳細設定"
@@ -767,12 +781,6 @@ desktop/views/components/settings.vue:
   enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
   volume: "ボリューム"
   test: "テスト"
-  language: "言語"
-  pick-language: "言語を選択"
-  recommended: "推奨"
-  auto: "自動"
-  specify-language: "言語を指定"
-  language-desc: "変更はページの再度読み込み後に反映されます。"
   cache: "キャッシュ"
   clean-cache: "クリーンアップ"
   cache-warn: "クリーンアップを行うと、ブラウザに記憶されたアカウント情報のキャッシュ、書きかけの投稿・返信・メッセージ、およびその他のデータ(設定情報含む)が削除されます。クリーンアップを行った後はページを再度読み込みする必要があります。"
@@ -966,17 +974,17 @@ admin/views/instance.vue:
   recaptcha-site-key: "reCAPTCHA site key"
   recaptcha-secret-key: "reCAPTCHA secret key"
   twitter-integration-config: "Twitter連携の設定"
-  twitter-integration-info: "コールバックURLは /api/tw/cb に設定します。"
+  twitter-integration-info: "コールバックURLは {url} に設定します。"
   enable-twitter-integration: "Twitter連携を有効にする"
   twitter-integration-consumer-key: "Consumer key"
   twitter-integration-consumer-secret: "Consumer secret"
   github-integration-config: "GitHub連携の設定"
-  github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
+  github-integration-info: "コールバックURLは {url} に設定します。"
   enable-github-integration: "GitHub連携を有効にする"
   github-integration-client-id: "Client ID"
   github-integration-client-secret: "Client Secret"
   discord-integration-config: "Discord連携の設定"
-  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
+  discord-integration-info: "コールバックURLは {url} に設定します。"
   enable-discord-integration: "Discord連携を有効にする"
   discord-integration-client-id: "Client ID"
   discord-integration-client-secret: "Client Secret"
@@ -991,6 +999,22 @@ admin/views/instance.vue:
   invite: "招待"
   save: "保存"
   saved: "保存しました"
+  user-recommendation-config: "おすすめユーザー"
+  enable-external-user-recommendation: "外部ユーザーレコメンデーションを有効にする"
+  external-user-recommendation-engine: "エンジン"
+  external-user-recommendation-engine-desc: "例: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
+  external-user-recommendation-timeout: "タイムアウト"
+  external-user-recommendation-timeout-desc: "ミリ秒単位 (例: 300000)"
+  email-config: "メールサーバーの設定"
+  email-config-info: "メールアドレス確認やパスワードリセットの際に使われます。"
+  enable-email: "メール配信を有効にする"
+  email: "メールアドレス"
+  smtp-secure: "SMTP接続に暗黙的なSSL/TLSを使用する"
+  smtp-secure-info: "STARTTLS使用時はオフにします。"
+  smtp-host: "SMTPホスト"
+  smtp-port: "SMTPポート"
+  smtp-user: "SMTPユーザー"
+  smtp-pass: "SMTPパスワード"
 admin/views/charts.vue:
   title: "チャート"
   per-day: "1日ごと"
@@ -1017,18 +1041,35 @@ admin/views/charts.vue:
     network-time: "応答時間"
     network-usage: "通信量"
 admin/views/users.vue:
-  suspend-user: "ユーザーの凍結"
+  operation: "操作"
+  username-or-userid: "ユーザー名またはユーザーID"
+  user-not-found: "ユーザーが見つかりません"
+  lookup: "照会"
+  reset-password: "パスワードをリセット"
+  password-updated: "パスワードは現在「{password}」です"
   suspend: "凍結"
   suspended: "凍結しました"
-  unsuspend-user: "ユーザーの凍結の解除"
   unsuspend: "凍結の解除"
   unsuspended: "凍結を解除しました"
-  verify-user: "ユーザーの公式アカウント設定"
   verify: "公式アカウントにする"
   verified: "公式アカウントにしました"
-  unverify-user: "ユーザーの公式アカウント解除"
   unverify: "公式アカウントを解除する"
   unverified: "公式アカウントを解除しました"
+  users:
+    title: "ユーザー"
+    sort:
+      title: "ソート"
+      createdAtAsc: "登録日時が古い順"
+      createdAtDesc: "登録日時が新しい順"
+      updatedAtAsc: "更新日時が古い順"
+      updatedAtDesc: "更新日時が新しい順"
+    origin:
+      title: "オリジン"
+      combined: "ローカル+リモート"
+      local: "ローカル"
+      remote: "リモート"
+    createdAt: "登録日時"
+    updatedAt: "更新日時"
 admin/views/moderators.vue:
   add-moderator:
     title: "モデレーターの登録"
@@ -1321,11 +1362,6 @@ mobile/views/pages/selectdrive.vue:
   select-file: "ファイルを選択"
 mobile/views/pages/settings.vue:
   signed-in-as: "{}としてサインイン中"
-  lang: "言語"
-  lang-tip: "変更はページの再読み込み後に反映されます。"
-  recommended: "推奨"
-  auto: "自動"
-  specify-language: "言語を指定"
   design: "デザインと表示"
   dark-mode: "ダークモード"
   i-am-under-limited-internet: "私は通信を制限されている"
@@ -1348,6 +1384,8 @@ mobile/views/pages/settings.vue:
   note-visibility: "投稿の公開範囲"
   default-note-visibility: "デフォルトの公開範囲"
   remember-note-visibility: "投稿の公開範囲を記憶する"
+  web-search-engine: "ウェブ検索エンジン"
+  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
   disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
   load-raw-images: "添付された画像を高画質で表示する"
   load-remote-media: "リモートサーバーのメディアを表示する"
@@ -1392,6 +1430,9 @@ mobile/views/pages/user.vue:
   block: "ブロック"
   unblock: "ブロック解除"
   years-old: "{age}歳"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  list-pushed: "{user}を{list}に追加しました"
 mobile/views/pages/user/home.vue:
   recent-notes: "最近の投稿"
   images: "画像"

locales/ja-JP.yml

@@ -26,6 +26,7 @@ common:
   close: "閉じる"
   do-not-copy-paste: "ここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。"
   load-more: "もっと読み込む"
+  enter-password: "パスワードを入力してください"
 
   got-it: "わかった"
   customization-tips:
@@ -117,9 +118,11 @@ common:
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
   i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+  use-white-black-reversi-stones: "リバーシに白黒の石を使う"
   use-contrast-reversi-stones: "リバーシのアイコンにコントラストを付ける"
   verified-user: "公式アカウント"
   disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
+  suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
   always-show-nsfw: "常に閲覧注意のメディアを表示する"
   always-mark-nsfw: "常にメディアを閲覧注意として投稿"
   show-full-acct: "ユーザー名のホストを省略しない"
@@ -170,7 +173,6 @@ common:
     polls: "アンケート"
     post-form: "投稿フォーム"
     server: "サーバー情報"
-    donation: "寄付のお願い"
     nav: "ナビゲーション"
     tips: "ヒント"
     hashtags: "ハッシュタグ"
@@ -439,13 +441,11 @@ common/views/components/stream-indicator.vue:
   reconnecting: "再接続中"
   connected: "接続完了"
 
-common/views/components/twitter-setting.vue:
-  description: "お使いのTwitterアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでTwitterアカウント情報が表示されるようになったり、Twitterを用いた便利なサインインを利用できるようになります。"
-  connected-to: "次のTwitterアカウントに接続されています"
-  detail: "詳細..."
-  reconnect: "再接続する"
-  connect: "Twitterと接続する"
+common/views/components/integration-settings.vue:
+  title: "サービス連携"
+  connect: "接続する"
   disconnect: "切断する"
+  connected-to: "次のアカウントに接続されています"
 
 common/views/components/github-setting.vue:
   description: "お使いのGitHubアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでGitHubアカウント情報が表示されるようになったり、GitHubを用いた便利なサインインを利用できるようになります。"
@@ -484,12 +484,21 @@ common/views/components/trends.vue:
   count: "{}人が投稿"
   empty: "トレンドなし"
 
+common/views/components/language-settings.vue:
+  title: "表示言語"
+  pick-language: "言語を選択"
+  recommended: "推奨"
+  auto: "自動"
+  specify-language: "言語を指定"
+  info: "変更はページの再度読み込み後に反映されます。"
+
 common/views/components/profile-editor.vue:
   title: "プロフィール"
   name: "名前"
   account: "アカウント"
   location: "場所"
   description: "自己紹介"
+  language: "言語"
   birthday: "誕生日"
   avatar: "アイコン"
   banner: "バナー"
@@ -503,6 +512,10 @@ common/views/components/profile-editor.vue:
   saved: "プロフィールを保存しました"
   uploading: "アップロード中"
   upload-failed: "アップロードに失敗しました"
+  email: "メール設定"
+  email-address: "メールアドレス"
+  email-verified: "メールアドレスが確認されました"
+  email-not-verified: "メールアドレスが確認されていません。メールボックスをご確認ください。"
 
 common/views/widgets/broadcast.vue:
   fetching: "確認中"
@@ -518,10 +531,6 @@ common/views/widgets/calendar.vue:
   this-month: "今月:"
   this-year: "今年:"
 
-common/views/widgets/donation.vue:
-  title: "寄付のお願い"
-  text: "Misskeyの運営にはドメイン、サーバー等のコストが掛かります。Misskeyは広告を掲載したりしないため、収入を皆様からの寄付に頼っています。もしご興味があれば、{}までご連絡ください。ご協力ありがとうございます。"
-
 common/views/widgets/photo-stream.vue:
   title: "フォトストリーム"
   no-photos: "写真はありません"
@@ -824,6 +833,8 @@ desktop/views/components/settings.vue:
   note-visibility: "投稿の公開範囲"
   default-note-visibility: "デフォルトの公開範囲"
   remember-note-visibility: "投稿の公開範囲を記憶する"
+  web-search-engine: "ウェブ検索エンジン"
+  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
   auto-popout: "ウィンドウの自動ポップアウト"
   auto-popout-desc: "ウィンドウが開かれるとき、ポップアウト(ブラウザ外に切り離す)可能なら自動でポップアウトします。この設定はブラウザに記憶されます。"
   advanced: "詳細設定"
@@ -844,7 +855,6 @@ desktop/views/components/settings.vue:
   circle-icons: "円形のアイコンを使用"
   contrasted-acct: "ユーザー名にコントラストを付ける"
   post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
-  suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
   show-clock-on-header: "右上に時計を表示する"
   show-reply-target: "リプライ先を表示する"
   timeline: "タイムライン"
@@ -853,9 +863,16 @@ desktop/views/components/settings.vue:
   show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
   show-maps: "マップの自動展開"
   remain-deleted-note: "削除された投稿を表示し続ける"
-  deck-column-align: "デッキのカラムの位置"
+  deck-column-align: "デッキのカラムの配置"
   deck-column-align-center: "中央"
   deck-column-align-left: "左"
+  deck-column-align-flexible: "フレキシブル"
+  deck-column-width: "デッキのカラムの幅"
+  deck-column-width-narrow: "狭"
+  deck-column-width-narrower: "やや狭"
+  deck-column-width-normal: "普通"
+  deck-column-width-wider: "やや広"
+  deck-column-width-wide: "広"
 
   sound: "サウンド"
   enable-sounds: "サウンドを有効にする"
@@ -863,13 +880,6 @@ desktop/views/components/settings.vue:
   volume: "ボリューム"
   test: "テスト"
 
-  language: "言語"
-  pick-language: "言語を選択"
-  recommended: "推奨"
-  auto: "自動"
-  specify-language: "言語を指定"
-  language-desc: "変更はページの再度読み込み後に反映されます。"
-
   cache: "キャッシュ"
   clean-cache: "クリーンアップ"
   cache-warn: "クリーンアップを行うと、ブラウザに記憶されたアカウント情報のキャッシュ、書きかけの投稿・返信・メッセージ、およびその他のデータ(設定情報含む)が削除されます。クリーンアップを行った後はページを再度読み込みする必要があります。"
@@ -1092,17 +1102,17 @@ admin/views/instance.vue:
   recaptcha-site-key: "reCAPTCHA site key"
   recaptcha-secret-key: "reCAPTCHA secret key"
   twitter-integration-config: "Twitter連携の設定"
-  twitter-integration-info: "コールバックURLは /api/tw/cb に設定します。"
+  twitter-integration-info: "コールバックURLは {url} に設定します。"
   enable-twitter-integration: "Twitter連携を有効にする"
   twitter-integration-consumer-key: "Consumer key"
   twitter-integration-consumer-secret: "Consumer secret"
   github-integration-config: "GitHub連携の設定"
-  github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
+  github-integration-info: "コールバックURLは {url} に設定します。"
   enable-github-integration: "GitHub連携を有効にする"
   github-integration-client-id: "Client ID"
   github-integration-client-secret: "Client Secret"
   discord-integration-config: "Discord連携の設定"
-  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
+  discord-integration-info: "コールバックURLは {url} に設定します。"
   enable-discord-integration: "Discord連携を有効にする"
   discord-integration-client-id: "Client ID"
   discord-integration-client-secret: "Client Secret"
@@ -1117,6 +1127,22 @@ admin/views/instance.vue:
   invite: "招待"
   save: "保存"
   saved: "保存しました"
+  user-recommendation-config: "おすすめユーザー"
+  enable-external-user-recommendation: "外部ユーザーレコメンデーションを有効にする"
+  external-user-recommendation-engine: "エンジン"
+  external-user-recommendation-engine-desc: "例: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
+  external-user-recommendation-timeout: "タイムアウト"
+  external-user-recommendation-timeout-desc: "ミリ秒単位 (例: 300000)"
+  email-config: "メールサーバーの設定"
+  email-config-info: "メールアドレス確認やパスワードリセットの際に使われます。"
+  enable-email: "メール配信を有効にする"
+  email: "メールアドレス"
+  smtp-secure: "SMTP接続に暗黙的なSSL/TLSを使用する"
+  smtp-secure-info: "STARTTLS使用時はオフにします。"
+  smtp-host: "SMTPホスト"
+  smtp-port: "SMTPポート"
+  smtp-user: "SMTPユーザー"
+  smtp-pass: "SMTPパスワード"
 
 admin/views/charts.vue:
   title: "チャート"
@@ -1145,18 +1171,35 @@ admin/views/charts.vue:
     network-usage: "通信量"
 
 admin/views/users.vue:
-  suspend-user: "ユーザーの凍結"
+  operation: "操作"
+  username-or-userid: "ユーザー名またはユーザーID"
+  user-not-found: "ユーザーが見つかりません"
+  lookup: "照会"
+  reset-password: "パスワードをリセット"
+  password-updated: "パスワードは現在「{password}」です"
   suspend: "凍結"
   suspended: "凍結しました"
-  unsuspend-user: "ユーザーの凍結の解除"
   unsuspend: "凍結の解除"
   unsuspended: "凍結を解除しました"
-  verify-user: "ユーザーの公式アカウント設定"
   verify: "公式アカウントにする"
   verified: "公式アカウントにしました"
-  unverify-user: "ユーザーの公式アカウント解除"
   unverify: "公式アカウントを解除する"
   unverified: "公式アカウントを解除しました"
+  users:
+    title: "ユーザー"
+    sort:
+      title: "ソート"
+      createdAtAsc: "登録日時が古い順"
+      createdAtDesc: "登録日時が新しい順"
+      updatedAtAsc: "更新日時が古い順"
+      updatedAtDesc: "更新日時が新しい順"
+    origin:
+      title: "オリジン"
+      combined: "ローカル+リモート"
+      local: "ローカル"
+      remote: "リモート"
+    createdAt: "登録日時"
+    updatedAt: "更新日時"
 
 admin/views/moderators.vue:
   add-moderator:
@@ -1514,11 +1557,6 @@ mobile/views/pages/selectdrive.vue:
 
 mobile/views/pages/settings.vue:
   signed-in-as: "{}としてサインイン中"
-  lang: "言語"
-  lang-tip: "変更はページの再読み込み後に反映されます。"
-  recommended: "推奨"
-  auto: "自動"
-  specify-language: "言語を指定"
   design: "デザインと表示"
   dark-mode: "ダークモード"
   i-am-under-limited-internet: "私は通信を制限されている"
@@ -1541,21 +1579,11 @@ mobile/views/pages/settings.vue:
   note-visibility: "投稿の公開範囲"
   default-note-visibility: "デフォルトの公開範囲"
   remember-note-visibility: "投稿の公開範囲を記憶する"
+  web-search-engine: "ウェブ検索エンジン"
+  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
   disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
   load-raw-images: "添付された画像を高画質で表示する"
   load-remote-media: "リモートサーバーのメディアを表示する"
-  twitter: "Twitter連携"
-  twitter-connect: "Twitterアカウントに接続する"
-  twitter-reconnect: "再接続する"
-  twitter-disconnect: "切断する"
-  github: "GitHub連携"
-  github-connect: "GitHubアカウントに接続する"
-  github-reconnect: "再接続する"
-  github-disconnect: "切断する"
-  discord: "Discord連携"
-  discord-connect: "Discordアカウントに接続する"
-  discord-reconnect: "再接続する"
-  discord-disconnect: "切断する"
   update: "Misskey Update"
   version: "バージョン:"
   latest-version: "最新のバージョン:"
@@ -1586,6 +1614,9 @@ mobile/views/pages/user.vue:
   block: "ブロック"
   unblock: "ブロック解除"
   years-old: "{age}歳"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  list-pushed: "{user}を{list}に追加しました"
 
 mobile/views/pages/user/home.vue:
   recent-notes: "最近の投稿"

locales/ja-KS.yml

@@ -26,6 +26,7 @@ common:
   close: "さいなら"
   do-not-copy-paste: "ここにコードを入力したり張り付けたりせんといてください。アカウントが不正利用されるかも分からん。知らんけど。"
   load-more: "もっと読み込む"
+  enter-password: "パスワードを入力してください"
   got-it: "ほい"
   customization-tips:
     title: "カスタマイズのヒント"
@@ -438,6 +439,13 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
   count: "{}人が投稿"
   empty: "流行は自分で作るんや"
+common/views/components/language-settings.vue:
+  title: "表示言語"
+  pick-language: "言語を選択"
+  recommended: "推奨"
+  auto: "自動"
+  specify-language: "言語を指定"
+  info: "変更はページの再度読み込み後に反映されます。"
 common/views/components/profile-editor.vue:
   title: "プロフィール"
   name: "名前"
@@ -457,6 +465,10 @@ common/views/components/profile-editor.vue:
   saved: "プロフィールを保存したで"
   uploading: "アップロードしとります"
   upload-failed: "これアップロードでけへんわ"
+  email: "メール設定"
+  email-address: "メールアドレス"
+  email-verified: "メールアドレスが確認されました"
+  email-not-verified: "メールアドレスが確認されていません。メールボックスをご確認ください。"
 common/views/widgets/broadcast.vue:
   fetching: "見てみるわ…"
   no-broadcasts: "お知らせはあらへんで"
@@ -731,6 +743,8 @@ desktop/views/components/settings.vue:
   note-visibility: "投稿の公開範囲"
   default-note-visibility: "もとからの公開範囲"
   remember-note-visibility: "投稿の公開範囲おぼえといて"
+  web-search-engine: "ウェブ検索エンジン"
+  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
   auto-popout: "ウィンドウの自動ポップアウト"
   auto-popout-desc: "ウィンドウが開かれるとき、ポップアウト(ブラウザ外に切り離す)可能なら自動でポップアウトすんで。この設定はブラウザに記憶されんで。"
   advanced: "もっと設定"
@@ -767,12 +781,6 @@ desktop/views/components/settings.vue:
   enable-sounds-desc: "投稿やメッセージもろたとき、音鳴らしたるわ。大丈夫や、この設定はブラウザが覚えてくれとる。"
   volume: "ボリューム"
   test: "テスト"
-  language: "言語"
-  pick-language: "言語選んでや"
-  recommended: "おすすめ"
-  auto: "自動"
-  specify-language: "言語選んでくれ"
-  language-desc: "変更はページの再度読み込み後に反映されんで。"
   cache: "キャッシュ"
   clean-cache: "お掃除"
   cache-warn: "お掃除するとな、ブラウザが覚えてくれとるアカウントのあれこれや書きかけの投稿・返信・メッセージや設定情報なんかのデータが全部飛んでいくんや。これやったらページ再読込しといてな。"
@@ -966,17 +974,17 @@ admin/views/instance.vue:
   recaptcha-site-key: "reCAPTCHA site key"
   recaptcha-secret-key: "reCAPTCHA secret key"
   twitter-integration-config: "Twitter連携の設定"
-  twitter-integration-info: "コールバックURLは /api/tw/cb に設定します。"
+  twitter-integration-info: "コールバックURLは {url} に設定します。"
   enable-twitter-integration: "Twitter連携を有効にする"
   twitter-integration-consumer-key: "Consumer key"
   twitter-integration-consumer-secret: "Consumer secret"
   github-integration-config: "GitHub連携の設定"
-  github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
+  github-integration-info: "コールバックURLは {url} に設定します。"
   enable-github-integration: "GitHub連携を有効にする"
   github-integration-client-id: "Client ID"
   github-integration-client-secret: "Client Secret"
   discord-integration-config: "Discord連携の設定"
-  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
+  discord-integration-info: "コールバックURLは {url} に設定します。"
   enable-discord-integration: "Discord連携を有効にする"
   discord-integration-client-id: "Client ID"
   discord-integration-client-secret: "Client Secret"
@@ -991,6 +999,22 @@ admin/views/instance.vue:
   invite: "招待"
   save: "保存"
   saved: "保存しました"
+  user-recommendation-config: "おすすめユーザー"
+  enable-external-user-recommendation: "外部ユーザーレコメンデーションを有効にする"
+  external-user-recommendation-engine: "エンジン"
+  external-user-recommendation-engine-desc: "例: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
+  external-user-recommendation-timeout: "タイムアウト"
+  external-user-recommendation-timeout-desc: "ミリ秒単位 (例: 300000)"
+  email-config: "メールサーバーの設定"
+  email-config-info: "メールアドレス確認やパスワードリセットの際に使われます。"
+  enable-email: "メール配信を有効にする"
+  email: "メールアドレス"
+  smtp-secure: "SMTP接続に暗黙的なSSL/TLSを使用する"
+  smtp-secure-info: "STARTTLS使用時はオフにします。"
+  smtp-host: "SMTPホスト"
+  smtp-port: "SMTPポート"
+  smtp-user: "SMTPユーザー"
+  smtp-pass: "SMTPパスワード"
 admin/views/charts.vue:
   title: "チャート"
   per-day: "1日ごと"
@@ -1017,18 +1041,35 @@ admin/views/charts.vue:
     network-time: "応答時間"
     network-usage: "通信量"
 admin/views/users.vue:
-  suspend-user: "ユーザーの凍結"
+  operation: "操作"
+  username-or-userid: "ユーザー名またはユーザーID"
+  user-not-found: "ユーザーが見つかりません"
+  lookup: "照会"
+  reset-password: "パスワードをリセット"
+  password-updated: "パスワードは現在「{password}」です"
   suspend: "凍結"
   suspended: "凍結しました"
-  unsuspend-user: "ユーザーの凍結の解除"
   unsuspend: "凍結の解除"
   unsuspended: "凍結を解除しました"
-  verify-user: "ユーザーの公式アカウント設定"
   verify: "公式アカウントにする"
   verified: "公式アカウントにしました"
-  unverify-user: "ユーザーの公式アカウント解除"
   unverify: "公式アカウントを解除する"
   unverified: "公式アカウントを解除しました"
+  users:
+    title: "ユーザー"
+    sort:
+      title: "ソート"
+      createdAtAsc: "登録日時が古い順"
+      createdAtDesc: "登録日時が新しい順"
+      updatedAtAsc: "更新日時が古い順"
+      updatedAtDesc: "更新日時が新しい順"
+    origin:
+      title: "オリジン"
+      combined: "ローカル+リモート"
+      local: "ローカル"
+      remote: "リモート"
+    createdAt: "登録日時"
+    updatedAt: "更新日時"
 admin/views/moderators.vue:
   add-moderator:
     title: "モデレーターの登録"
@@ -1321,11 +1362,6 @@ mobile/views/pages/selectdrive.vue:
   select-file: "ファイル選んでや"
 mobile/views/pages/settings.vue:
   signed-in-as: "あんたは橋の下で拾った{}や！"
-  lang: "言語"
-  lang-tip: "ページもっぺん読み込んだら反映したるで。"
-  recommended: "これええで"
-  auto: "勝手にやる"
-  specify-language: "言語選びや"
   design: "見た感じ"
   dark-mode: "ナイトゲームや！"
   i-am-under-limited-internet: "電波と阪神がザコいんや"
@@ -1348,6 +1384,8 @@ mobile/views/pages/settings.vue:
   note-visibility: "投稿の公開範囲"
   default-note-visibility: "もとからの公開範囲"
   remember-note-visibility: "投稿の公開範囲おぼえといて"
+  web-search-engine: "ウェブ検索エンジン"
+  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
   disable-via-mobile: "「モバイルからの投稿」フラグなんて要らんわ"
   load-raw-images: "添付された画像もべっぴんさんのままにしといてな"
   load-remote-media: "東京とか、リモートサーバーのメディアも見せてや"
@@ -1392,6 +1430,9 @@ mobile/views/pages/user.vue:
   block: "ブロック"
   unblock: "ブロックやめたる"
   years-old: "{age}歳"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  list-pushed: "{user}を{list}に追加しました"
 mobile/views/pages/user/home.vue:
   recent-notes: "最近儲かりまっか？"
   images: "画像"

locales/nl-NL.yml

@@ -26,6 +26,7 @@ common:
   close: "閉じる"
   do-not-copy-paste: "ここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。"
   load-more: "もっと読み込む"
+  enter-password: "パスワードを入力してください"
   got-it: "わかった"
   customization-tips:
     title: "カスタマイズのヒント"
@@ -438,6 +439,13 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
   count: "{}人が投稿"
   empty: "トレンドなし"
+common/views/components/language-settings.vue:
+  title: "表示言語"
+  pick-language: "言語を選択"
+  recommended: "推奨"
+  auto: "自動"
+  specify-language: "言語を指定"
+  info: "変更はページの再度読み込み後に反映されます。"
 common/views/components/profile-editor.vue:
   title: "プロフィール"
   name: "名前"
@@ -457,6 +465,10 @@ common/views/components/profile-editor.vue:
   saved: "プロフィールを保存しました"
   uploading: "アップロード中"
   upload-failed: "アップロードに失敗しました"
+  email: "メール設定"
+  email-address: "メールアドレス"
+  email-verified: "メールアドレスが確認されました"
+  email-not-verified: "メールアドレスが確認されていません。メールボックスをご確認ください。"
 common/views/widgets/broadcast.vue:
   fetching: "Bezig met ophalen"
   no-broadcasts: "Geen uitzendingen"
@@ -731,6 +743,8 @@ desktop/views/components/settings.vue:
   note-visibility: "投稿の公開範囲"
   default-note-visibility: "デフォルトの公開範囲"
   remember-note-visibility: "投稿の公開範囲を記憶する"
+  web-search-engine: "ウェブ検索エンジン"
+  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
   auto-popout: "Venster automatisch uitvouwen"
   auto-popout-desc: "Venster uitvouwen, indien mogelijk. Deze instelling wordt opgeslagen in je browser."
   advanced: "Geavanceerde instellingen"
@@ -767,12 +781,6 @@ desktop/views/components/settings.vue:
   enable-sounds-desc: "Een geluid afspelen bij het ontvangen van een bericht. Deze instelling wordt opgeslagen in je browser."
   volume: "Volume"
   test: "Testen"
-  language: "Taal"
-  pick-language: "Selecteer een taal"
-  recommended: "Aanbevolen"
-  auto: "Automatisch"
-  specify-language: "Taal opgeven"
-  language-desc: "Je moet de pagina herladen om de wijzigingen toe te passen."
   cache: "Cache"
   clean-cache: "Opschonen"
   cache-warn: "De cache van je accountinformatie/berichten/antwoorden/instellingen wordt verwijderd. Je moet de pagina herladen na het opschonen."
@@ -966,17 +974,17 @@ admin/views/instance.vue:
   recaptcha-site-key: "reCAPTCHA site key"
   recaptcha-secret-key: "reCAPTCHA secret key"
   twitter-integration-config: "Twitter連携の設定"
-  twitter-integration-info: "コールバックURLは /api/tw/cb に設定します。"
+  twitter-integration-info: "コールバックURLは {url} に設定します。"
   enable-twitter-integration: "Twitter連携を有効にする"
   twitter-integration-consumer-key: "Consumer key"
   twitter-integration-consumer-secret: "Consumer secret"
   github-integration-config: "GitHub連携の設定"
-  github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
+  github-integration-info: "コールバックURLは {url} に設定します。"
   enable-github-integration: "GitHub連携を有効にする"
   github-integration-client-id: "Client ID"
   github-integration-client-secret: "Client Secret"
   discord-integration-config: "Discord連携の設定"
-  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
+  discord-integration-info: "コールバックURLは {url} に設定します。"
   enable-discord-integration: "Discord連携を有効にする"
   discord-integration-client-id: "Client ID"
   discord-integration-client-secret: "Client Secret"
@@ -991,6 +999,22 @@ admin/views/instance.vue:
   invite: "招待"
   save: "保存"
   saved: "保存しました"
+  user-recommendation-config: "おすすめユーザー"
+  enable-external-user-recommendation: "外部ユーザーレコメンデーションを有効にする"
+  external-user-recommendation-engine: "エンジン"
+  external-user-recommendation-engine-desc: "例: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
+  external-user-recommendation-timeout: "タイムアウト"
+  external-user-recommendation-timeout-desc: "ミリ秒単位 (例: 300000)"
+  email-config: "メールサーバーの設定"
+  email-config-info: "メールアドレス確認やパスワードリセットの際に使われます。"
+  enable-email: "メール配信を有効にする"
+  email: "メールアドレス"
+  smtp-secure: "SMTP接続に暗黙的なSSL/TLSを使用する"
+  smtp-secure-info: "STARTTLS使用時はオフにします。"
+  smtp-host: "SMTPホスト"
+  smtp-port: "SMTPポート"
+  smtp-user: "SMTPユーザー"
+  smtp-pass: "SMTPパスワード"
 admin/views/charts.vue:
   title: "チャート"
   per-day: "1日ごと"
@@ -1017,18 +1041,35 @@ admin/views/charts.vue:
     network-time: "応答時間"
     network-usage: "通信量"
 admin/views/users.vue:
-  suspend-user: "ユーザーの凍結"
+  operation: "操作"
+  username-or-userid: "ユーザー名またはユーザーID"
+  user-not-found: "ユーザーが見つかりません"
+  lookup: "照会"
+  reset-password: "パスワードをリセット"
+  password-updated: "パスワードは現在「{password}」です"
   suspend: "凍結"
   suspended: "凍結しました"
-  unsuspend-user: "ユーザーの凍結の解除"
   unsuspend: "凍結の解除"
   unsuspended: "凍結を解除しました"
-  verify-user: "ユーザーの公式アカウント設定"
   verify: "公式アカウントにする"
   verified: "公式アカウントにしました"
-  unverify-user: "ユーザーの公式アカウント解除"
   unverify: "公式アカウントを解除する"
   unverified: "公式アカウントを解除しました"
+  users:
+    title: "ユーザー"
+    sort:
+      title: "ソート"
+      createdAtAsc: "登録日時が古い順"
+      createdAtDesc: "登録日時が新しい順"
+      updatedAtAsc: "更新日時が古い順"
+      updatedAtDesc: "更新日時が新しい順"
+    origin:
+      title: "オリジン"
+      combined: "ローカル+リモート"
+      local: "ローカル"
+      remote: "リモート"
+    createdAt: "登録日時"
+    updatedAt: "更新日時"
 admin/views/moderators.vue:
   add-moderator:
     title: "モデレーターの登録"
@@ -1321,11 +1362,6 @@ mobile/views/pages/selectdrive.vue:
   select-file: "Kies een bestand"
 mobile/views/pages/settings.vue:
   signed-in-as: "Ingelogd als {}"
-  lang: "Taal"
-  lang-tip: "Je moet de pagina herladen om de wijzigingen toe te passen."
-  recommended: "Aanbevolen"
-  auto: "Automatisch"
-  specify-language: "Taal opgeven"
   design: "Ontwerp en weergave"
   dark-mode: "Donkere modus"
   i-am-under-limited-internet: "Ik heb beperkt internet"
@@ -1348,6 +1384,8 @@ mobile/views/pages/settings.vue:
   note-visibility: "投稿の公開範囲"
   default-note-visibility: "デフォルトの公開範囲"
   remember-note-visibility: "投稿の公開範囲を記憶する"
+  web-search-engine: "ウェブ検索エンジン"
+  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
   disable-via-mobile: "Zonder 'mobiele berichten'"
   load-raw-images: "添付された画像を高画質で表示する"
   load-remote-media: "リモートサーバーのメディアを表示する"
@@ -1392,6 +1430,9 @@ mobile/views/pages/user.vue:
   block: "ブロック"
   unblock: "ブロック解除"
   years-old: "{age}歳"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  list-pushed: "{user}を{list}に追加しました"
 mobile/views/pages/user/home.vue:
   recent-notes: "Recente notities"
   images: "Afbeeldingen"

locales/no-NO.yml

@@ -26,6 +26,7 @@ common:
   close: "Lukk"
   do-not-copy-paste: "ここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。"
   load-more: "もっと読み込む"
+  enter-password: "パスワードを入力してください"
   got-it: "Skjønner!"
   customization-tips:
     title: "カスタマイズのヒント"
@@ -438,6 +439,13 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
   count: "{}人が投稿"
   empty: "トレンドなし"
+common/views/components/language-settings.vue:
+  title: "表示言語"
+  pick-language: "言語を選択"
+  recommended: "推奨"
+  auto: "自動"
+  specify-language: "言語を指定"
+  info: "変更はページの再度読み込み後に反映されます。"
 common/views/components/profile-editor.vue:
   title: "プロフィール"
   name: "名前"
@@ -457,6 +465,10 @@ common/views/components/profile-editor.vue:
   saved: "プロフィールを保存しました"
   uploading: "アップロード中"
   upload-failed: "アップロードに失敗しました"
+  email: "メール設定"
+  email-address: "メールアドレス"
+  email-verified: "メールアドレスが確認されました"
+  email-not-verified: "メールアドレスが確認されていません。メールボックスをご確認ください。"
 common/views/widgets/broadcast.vue:
   fetching: "Henter"
   no-broadcasts: "お知らせはありません"
@@ -731,6 +743,8 @@ desktop/views/components/settings.vue:
   note-visibility: "投稿の公開範囲"
   default-note-visibility: "デフォルトの公開範囲"
   remember-note-visibility: "投稿の公開範囲を記憶する"
+  web-search-engine: "ウェブ検索エンジン"
+  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
   auto-popout: "ウィンドウの自動ポップアウト"
   auto-popout-desc: "ウィンドウが開かれるとき、ポップアウト(ブラウザ外に切り離す)可能なら自動でポップアウトします。この設定はブラウザに記憶されます。"
   advanced: "Avanserte innstillinger"
@@ -767,12 +781,6 @@ desktop/views/components/settings.vue:
   enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
   volume: "Volum"
   test: "Test"
-  language: "Språk"
-  pick-language: "Velg språk"
-  recommended: "Anbefalt"
-  auto: "Automatisk"
-  specify-language: "Angi språk"
-  language-desc: "変更はページの再度読み込み後に反映されます。"
   cache: "Hurtiglager"
   clean-cache: "クリーンアップ"
   cache-warn: "クリーンアップを行うと、ブラウザに記憶されたアカウント情報のキャッシュ、書きかけの投稿・返信・メッセージ、およびその他のデータ(設定情報含む)が削除されます。クリーンアップを行った後はページを再度読み込みする必要があります。"
@@ -966,17 +974,17 @@ admin/views/instance.vue:
   recaptcha-site-key: "reCAPTCHA site key"
   recaptcha-secret-key: "reCAPTCHA secret key"
   twitter-integration-config: "Twitter連携の設定"
-  twitter-integration-info: "コールバックURLは /api/tw/cb に設定します。"
+  twitter-integration-info: "コールバックURLは {url} に設定します。"
   enable-twitter-integration: "Twitter連携を有効にする"
   twitter-integration-consumer-key: "Consumer key"
   twitter-integration-consumer-secret: "Consumer secret"
   github-integration-config: "GitHub連携の設定"
-  github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
+  github-integration-info: "コールバックURLは {url} に設定します。"
   enable-github-integration: "GitHub連携を有効にする"
   github-integration-client-id: "Client ID"
   github-integration-client-secret: "Client Secret"
   discord-integration-config: "Discord連携の設定"
-  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
+  discord-integration-info: "コールバックURLは {url} に設定します。"
   enable-discord-integration: "Discord連携を有効にする"
   discord-integration-client-id: "Client ID"
   discord-integration-client-secret: "Client Secret"
@@ -991,6 +999,22 @@ admin/views/instance.vue:
   invite: "招待"
   save: "保存"
   saved: "保存しました"
+  user-recommendation-config: "おすすめユーザー"
+  enable-external-user-recommendation: "外部ユーザーレコメンデーションを有効にする"
+  external-user-recommendation-engine: "エンジン"
+  external-user-recommendation-engine-desc: "例: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
+  external-user-recommendation-timeout: "タイムアウト"
+  external-user-recommendation-timeout-desc: "ミリ秒単位 (例: 300000)"
+  email-config: "メールサーバーの設定"
+  email-config-info: "メールアドレス確認やパスワードリセットの際に使われます。"
+  enable-email: "メール配信を有効にする"
+  email: "メールアドレス"
+  smtp-secure: "SMTP接続に暗黙的なSSL/TLSを使用する"
+  smtp-secure-info: "STARTTLS使用時はオフにします。"
+  smtp-host: "SMTPホスト"
+  smtp-port: "SMTPポート"
+  smtp-user: "SMTPユーザー"
+  smtp-pass: "SMTPパスワード"
 admin/views/charts.vue:
   title: "チャート"
   per-day: "1日ごと"
@@ -1017,18 +1041,35 @@ admin/views/charts.vue:
     network-time: "応答時間"
     network-usage: "通信量"
 admin/views/users.vue:
-  suspend-user: "ユーザーの凍結"
+  operation: "操作"
+  username-or-userid: "ユーザー名またはユーザーID"
+  user-not-found: "ユーザーが見つかりません"
+  lookup: "照会"
+  reset-password: "パスワードをリセット"
+  password-updated: "パスワードは現在「{password}」です"
   suspend: "凍結"
   suspended: "凍結しました"
-  unsuspend-user: "ユーザーの凍結の解除"
   unsuspend: "凍結の解除"
   unsuspended: "凍結を解除しました"
-  verify-user: "ユーザーの公式アカウント設定"
   verify: "公式アカウントにする"
   verified: "公式アカウントにしました"
-  unverify-user: "ユーザーの公式アカウント解除"
   unverify: "公式アカウントを解除する"
   unverified: "公式アカウントを解除しました"
+  users:
+    title: "ユーザー"
+    sort:
+      title: "ソート"
+      createdAtAsc: "登録日時が古い順"
+      createdAtDesc: "登録日時が新しい順"
+      updatedAtAsc: "更新日時が古い順"
+      updatedAtDesc: "更新日時が新しい順"
+    origin:
+      title: "オリジン"
+      combined: "ローカル+リモート"
+      local: "ローカル"
+      remote: "リモート"
+    createdAt: "登録日時"
+    updatedAt: "更新日時"
 admin/views/moderators.vue:
   add-moderator:
     title: "モデレーターの登録"
@@ -1321,11 +1362,6 @@ mobile/views/pages/selectdrive.vue:
   select-file: "ファイルを選択"
 mobile/views/pages/settings.vue:
   signed-in-as: "{}としてサインイン中"
-  lang: "Språk"
-  lang-tip: "変更はページの再読み込み後に反映されます。"
-  recommended: "Anbefalt"
-  auto: "Automatisk"
-  specify-language: "Angi språk"
   design: "デザインと表示"
   dark-mode: "ダークモード"
   i-am-under-limited-internet: "私は通信を制限されている"
@@ -1348,6 +1384,8 @@ mobile/views/pages/settings.vue:
   note-visibility: "投稿の公開範囲"
   default-note-visibility: "デフォルトの公開範囲"
   remember-note-visibility: "投稿の公開範囲を記憶する"
+  web-search-engine: "ウェブ検索エンジン"
+  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
   disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
   load-raw-images: "添付された画像を高画質で表示する"
   load-remote-media: "リモートサーバーのメディアを表示する"
@@ -1392,6 +1430,9 @@ mobile/views/pages/user.vue:
   block: "ブロック"
   unblock: "ブロック解除"
   years-old: "{age}歳"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  list-pushed: "{user}を{list}に追加しました"
 mobile/views/pages/user/home.vue:
   recent-notes: "Nylige innlegg"
   images: "Bilder"

locales/pl-PL.yml

@@ -7,16 +7,16 @@ common:
   about-title: "⭐ Fediwersum"
   about: "Dziękujemy za znalezienie Misskey. Misskey jest <b>zdecentralizowaną platformą mikroblogową</b> powstałą na Ziemi. Ponieważ działa ona w Fediwersum (uniwersum, w którego skład wchodzi wiele sieci społecznościowych), jest ona połączona z innymi platformami społecznościowymi. Spróbujesz odpocząć od zatłoczoneo miasta i zanurzyć się w nowym Internecie?"
   intro:
-    title: "Misskeyって？"
+    title: "Czym jest Misskey?"
     about: "Misskeyはオープンソースの<b>分散型マイクロブログSNS</b>です。リッチで高度にカスタマイズできるUI、投稿へのリアクション、ファイルを一元管理できるドライブなど、先進的な機能を揃えています。また、Fediverseと呼ばれるネットワークに接続できるため、他のSNSともやり取りできます。例えば、あなたが何か投稿すると、その投稿はMisskeyだけでなく他のSNSにも伝わります。ちょうどある惑星から他の惑星に電波を発信している様子をイメージしてください。"
     features: "特徴"
     rich-contents: "投稿"
     rich-contents-desc: "自分の考え、話題の出来事、皆と共有したいことについて発信してください。必要であれば、様々な構文を使って投稿を装飾したり、好きな画像、動画などのファイルやアンケートを添付することもできます。"
-    reaction: "リアクション"
+    reaction: "Reakcje"
     reaction-desc: "あなたの気持ちを伝える最も簡単な方法です。Misskeyは、他のユーザーの投稿に様々なリアクションを付けることができます。いちどMisskeyのリアクション機能を体験してしまうと、もう「いいね」の概念しか存在しないSNSには戻れなくなるかもしれません。"
-    ui: "インターフェース"
+    ui: "Interfejs"
     ui-desc: "どのようなUIが使いやすいかは人それぞれです。だから、Misskeyは自由度の高いUIを持っています。レイアウトやデザインを調整したり、カスタマイズ可能な様々なウィジェットを配置したりして、自分だけのホームを作ってください。"
-    drive: "ドライブ"
+    drive: "Dysk"
     drive-desc: "以前投稿したことのある画像をまた投稿したくなったことはありませんか？もしくは、アップロードしたファイルをフォルダ分けして整理したくなったことはありませんか？Misskeyの根幹に組み込まれたドライブ機能によってそれらが解決します。ファイルの共有も簡単です。"
     outro: "他にもMisskeyにしかない機能はまだまだあるので、ぜひあなた自身の目で確かめてください。Misskeyは分散型SNSなので、このインスタンスが気に入らなければ他のインスタンスを試すこともできます。それでは、GLHF!"
   adblock:
@@ -26,6 +26,7 @@ common:
   close: "Zamknij"
   do-not-copy-paste: "ここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。"
   load-more: "もっと読み込む"
+  enter-password: "パスワードを入力してください"
   got-it: "Rozumiem!"
   customization-tips:
     title: "Wskazówki o dostosowywaniu"
@@ -52,7 +53,7 @@ common:
     years_ago: "{} lat temu"
   month-and-day: "{month}-{day}"
   trash: "Kosz"
-  drive: "ドライブ"
+  drive: "Dysk"
   messaging: "トーク"
   weekday-short:
     sunday: "N"
@@ -192,8 +193,8 @@ common/views/components/games/reversi/reversi.vue:
     waiting-for: "Oczekiwanie na {}"
     cancel: "Anuluj"
 common/views/components/games/reversi/reversi.game.vue:
-  surrender: "投了"
-  surrendered: "投了により"
+  surrender: "Poddaj się"
+  surrendered: "Przez poddanie się"
   is-llotheo: "石の少ない方が勝ち(ロセオ)"
   looped-map: "ループマップ"
   can-put-everywhere: "どこでも置けるモード"
@@ -293,8 +294,8 @@ common/views/components/theme.vue:
   import-by-code: "またはコードをペースト"
   theme-name-required: "テーマ名は必須です。"
 common/views/components/cw-button.vue:
-  hide: "隠す"
-  show: "もっと見る"
+  hide: "Ukryj"
+  show: "Pokaż więcej"
 common/views/components/messaging.vue:
   search-user: "Znajdź użytkownika"
   you: "Ty"
@@ -350,7 +351,7 @@ common/views/components/reaction-picker.vue:
   choose-reaction: "Wybierz reakcję"
 common/views/components/emoji-picker.vue:
   custom-emoji: "カスタム絵文字"
-  people: "人"
+  people: "Ludzie"
   animals-and-nature: "動物&自然"
   food-and-drink: "食べ物&飲み物"
   activity: "アクティビティ"
@@ -366,8 +367,8 @@ common/views/components/signin.vue:
   signin: "Zaloguj"
   or: "または"
   signin-with-twitter: "Zaloguj się za pomocą Twittera"
-  signin-with-github: "GitHubでログイン"
-  signin-with-discord: "Discordでログイン"
+  signin-with-github: "Zaloguj się za pomocą GitHuba"
+  signin-with-discord: "Zaloguj się za pomocą Discorda"
   login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 common/views/components/signup.vue:
   invitation-code: "招待コード"
@@ -438,6 +439,13 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
   count: "{}人が投稿"
   empty: "トレンドなし"
+common/views/components/language-settings.vue:
+  title: "表示言語"
+  pick-language: "言語を選択"
+  recommended: "推奨"
+  auto: "自動"
+  specify-language: "言語を指定"
+  info: "変更はページの再度読み込み後に反映されます。"
 common/views/components/profile-editor.vue:
   title: "プロフィール"
   name: "名前"
@@ -457,6 +465,10 @@ common/views/components/profile-editor.vue:
   saved: "プロフィールを保存しました"
   uploading: "アップロード中"
   upload-failed: "アップロードに失敗しました"
+  email: "メール設定"
+  email-address: "メールアドレス"
+  email-verified: "メールアドレスが確認されました"
+  email-not-verified: "メールアドレスが確認されていません。メールボックスをご確認ください。"
 common/views/widgets/broadcast.vue:
   fetching: "Sprawdzanie"
   no-broadcasts: "Brak transmisji"
@@ -731,6 +743,8 @@ desktop/views/components/settings.vue:
   note-visibility: "投稿の公開範囲"
   default-note-visibility: "デフォルトの公開範囲"
   remember-note-visibility: "投稿の公開範囲を記憶する"
+  web-search-engine: "ウェブ検索エンジン"
+  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
   auto-popout: "Automatycznie pojawiające się okna"
   auto-popout-desc: "ウィンドウが開かれるとき、ポップアウト(ブラウザ外に切り離す)可能なら自動でポップアウトします。この設定はブラウザに記憶されます。"
   advanced: "Ustawienia zaawansowane"
@@ -767,12 +781,6 @@ desktop/views/components/settings.vue:
   enable-sounds-desc: "Odtwarzaj dźwięk przy wstawianiu wpisów, wysyłaniu lub otrzymywaniu wiadomości. Opcja ta jest zapamiętywana przez przeglądarkę."
   volume: "Głośność"
   test: "Test"
-  language: "Język"
-  pick-language: "Wybierz język"
-  recommended: "Zalecane"
-  auto: "Automatycznie"
-  specify-language: "Wybierz język"
-  language-desc: "Aby zmiany zostały uwzględnione, odśwież stronę."
   cache: "Pamięć podręczna"
   clean-cache: "Wyczyść"
   cache-warn: "Pamięć podręczna informacji o koncie/wpisów/odpowiedzi/wiadomości/ustawień przechowywanych w przeglądarce zostanie usunięta. Będziesz musiał odświeżyć stronę po wyczyszczeniu."
@@ -932,7 +940,7 @@ admin/views/index.vue:
   moderators: "モデレーター"
   users: "ユーザー"
   federation: "連合"
-  announcements: "お知らせ"
+  announcements: "Ogłoszenia"
   hashtags: "ハッシュタグ"
   back-to-misskey: "Misskeyに戻る"
 admin/views/dashboard.vue:
@@ -966,17 +974,17 @@ admin/views/instance.vue:
   recaptcha-site-key: "reCAPTCHA site key"
   recaptcha-secret-key: "reCAPTCHA secret key"
   twitter-integration-config: "Twitter連携の設定"
-  twitter-integration-info: "コールバックURLは /api/tw/cb に設定します。"
+  twitter-integration-info: "コールバックURLは {url} に設定します。"
   enable-twitter-integration: "Twitter連携を有効にする"
   twitter-integration-consumer-key: "Consumer key"
   twitter-integration-consumer-secret: "Consumer secret"
   github-integration-config: "GitHub連携の設定"
-  github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
+  github-integration-info: "コールバックURLは {url} に設定します。"
   enable-github-integration: "GitHub連携を有効にする"
   github-integration-client-id: "Client ID"
   github-integration-client-secret: "Client Secret"
   discord-integration-config: "Discord連携の設定"
-  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
+  discord-integration-info: "コールバックURLは {url} に設定します。"
   enable-discord-integration: "Discord連携を有効にする"
   discord-integration-client-id: "Client ID"
   discord-integration-client-secret: "Client Secret"
@@ -991,6 +999,22 @@ admin/views/instance.vue:
   invite: "招待"
   save: "保存"
   saved: "保存しました"
+  user-recommendation-config: "おすすめユーザー"
+  enable-external-user-recommendation: "外部ユーザーレコメンデーションを有効にする"
+  external-user-recommendation-engine: "エンジン"
+  external-user-recommendation-engine-desc: "例: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
+  external-user-recommendation-timeout: "タイムアウト"
+  external-user-recommendation-timeout-desc: "ミリ秒単位 (例: 300000)"
+  email-config: "メールサーバーの設定"
+  email-config-info: "メールアドレス確認やパスワードリセットの際に使われます。"
+  enable-email: "メール配信を有効にする"
+  email: "メールアドレス"
+  smtp-secure: "SMTP接続に暗黙的なSSL/TLSを使用する"
+  smtp-secure-info: "STARTTLS使用時はオフにします。"
+  smtp-host: "SMTPホスト"
+  smtp-port: "SMTPポート"
+  smtp-user: "SMTPユーザー"
+  smtp-pass: "SMTPパスワード"
 admin/views/charts.vue:
   title: "チャート"
   per-day: "1日ごと"
@@ -1017,18 +1041,35 @@ admin/views/charts.vue:
     network-time: "応答時間"
     network-usage: "通信量"
 admin/views/users.vue:
-  suspend-user: "ユーザーの凍結"
+  operation: "操作"
+  username-or-userid: "ユーザー名またはユーザーID"
+  user-not-found: "ユーザーが見つかりません"
+  lookup: "照会"
+  reset-password: "パスワードをリセット"
+  password-updated: "パスワードは現在「{password}」です"
   suspend: "凍結"
   suspended: "凍結しました"
-  unsuspend-user: "ユーザーの凍結の解除"
   unsuspend: "凍結の解除"
   unsuspended: "凍結を解除しました"
-  verify-user: "ユーザーの公式アカウント設定"
   verify: "公式アカウントにする"
   verified: "公式アカウントにしました"
-  unverify-user: "ユーザーの公式アカウント解除"
   unverify: "公式アカウントを解除する"
   unverified: "公式アカウントを解除しました"
+  users:
+    title: "ユーザー"
+    sort:
+      title: "ソート"
+      createdAtAsc: "登録日時が古い順"
+      createdAtDesc: "登録日時が新しい順"
+      updatedAtAsc: "更新日時が古い順"
+      updatedAtDesc: "更新日時が新しい順"
+    origin:
+      title: "オリジン"
+      combined: "ローカル+リモート"
+      local: "ローカル"
+      remote: "リモート"
+    createdAt: "登録日時"
+    updatedAt: "更新日時"
 admin/views/moderators.vue:
   add-moderator:
     title: "モデレーターの登録"
@@ -1054,7 +1095,7 @@ admin/views/emoji.vue:
     are-you-sure: "「$1」を削除しますか？"
     removed: "削除しました"
 admin/views/announcements.vue:
-  announcements: "お知らせ"
+  announcements: "Ogłoszenia"
   save: "保存"
   remove: "削除"
   add: "追加"
@@ -1074,10 +1115,10 @@ desktop/views/pages/welcome.vue:
   signin-button: "Zaloguj się"
   signup-button: "Zarejestruj się"
   timeline: "Oś czasu"
-  announcements: "お知らせ"
-  photos: "最近の画像"
+  announcements: "Ogłoszenia"
+  photos: "Ostatnie obrazy"
   powered-by-misskey: "Oparto o <b>Misskey</b>."
-  info: "情報"
+  info: "Informacje"
 desktop/views/pages/drive.vue:
   title: "Dysk Misskey"
 desktop/views/pages/home-customize.vue:
@@ -1131,7 +1172,7 @@ desktop/views/pages/user/user.header.vue:
   following: "Śledzeni"
   followers: "Śledzący"
   is-bot: "To konto jest botem"
-  years-old: "{age}歳"
+  years-old: "{age} lat"
   year: "年"
   month: "月"
   day: "日"
@@ -1200,10 +1241,10 @@ mobile/views/components/media-video.vue:
   click-to-show: "Naciśnij aby wyświetlić"
 common/views/components/follow-button.vue:
   following: "フォロー中"
-  follow: "フォロー"
+  follow: "Śledź"
   request-pending: "フォロー許可待ち"
   follow-processing: "フォロー処理中"
-  follow-request: "フォロー申請"
+  follow-request: "Poproś o śledzenie"
 mobile/views/components/friends-maker.vue:
   title: "Zacznij śledzić ludzi takich jak Ty"
   empty: "Nie znaleziono podobnych użytkowników."
@@ -1321,11 +1362,6 @@ mobile/views/pages/selectdrive.vue:
   select-file: "Wybierz plik"
 mobile/views/pages/settings.vue:
   signed-in-as: "Zalogowany jako {}"
-  lang: "Język"
-  lang-tip: "Aby zmiany zostały uwzględnione, odśwież stronę."
-  recommended: "Zalecany"
-  auto: "Automatycznie"
-  specify-language: "Wybierz język"
   design: "Wygląd i wyświetlanie"
   dark-mode: "Tryb ciemny"
   i-am-under-limited-internet: "Ograniczaj zużycie transferu"
@@ -1348,6 +1384,8 @@ mobile/views/pages/settings.vue:
   note-visibility: "投稿の公開範囲"
   default-note-visibility: "デフォルトの公開範囲"
   remember-note-visibility: "投稿の公開範囲を記憶する"
+  web-search-engine: "ウェブ検索エンジン"
+  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
   disable-via-mobile: "Nie oznaczaj wpisów jako „wysłane z telefonu”"
   load-raw-images: "Wyświetlaj załączone zdjęcia w wysokiej jakości"
   load-remote-media: "Wyświetlaj zawartość multimedialną ze zdalnych serwerów"
@@ -1391,7 +1429,10 @@ mobile/views/pages/user.vue:
   unmute: "ミュート解除"
   block: "ブロック"
   unblock: "ブロック解除"
-  years-old: "{age}歳"
+  years-old: "{age} lat"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  list-pushed: "{user}を{list}に追加しました"
 mobile/views/pages/user/home.vue:
   recent-notes: "Ostatnie wpisy"
   images: "Zdjęcia"

locales/pt-PT.yml

@@ -26,6 +26,7 @@ common:
   close: "Fechar"
   do-not-copy-paste: "Por favor, não digite ou copie o código aqui. A conta pode ser comprometida."
   load-more: "もっと読み込む"
+  enter-password: "パスワードを入力してください"
   got-it: "Entendi!"
   customization-tips:
     title: "Dicas de personalização"
@@ -438,6 +439,13 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
   count: "{}人が投稿"
   empty: "トレンドなし"
+common/views/components/language-settings.vue:
+  title: "表示言語"
+  pick-language: "言語を選択"
+  recommended: "推奨"
+  auto: "自動"
+  specify-language: "言語を指定"
+  info: "変更はページの再度読み込み後に反映されます。"
 common/views/components/profile-editor.vue:
   title: "プロフィール"
   name: "名前"
@@ -457,6 +465,10 @@ common/views/components/profile-editor.vue:
   saved: "プロフィールを保存しました"
   uploading: "アップロード中"
   upload-failed: "アップロードに失敗しました"
+  email: "メール設定"
+  email-address: "メールアドレス"
+  email-verified: "メールアドレスが確認されました"
+  email-not-verified: "メールアドレスが確認されていません。メールボックスをご確認ください。"
 common/views/widgets/broadcast.vue:
   fetching: "確認中"
   no-broadcasts: "お知らせはありません"
@@ -731,6 +743,8 @@ desktop/views/components/settings.vue:
   note-visibility: "投稿の公開範囲"
   default-note-visibility: "デフォルトの公開範囲"
   remember-note-visibility: "投稿の公開範囲を記憶する"
+  web-search-engine: "ウェブ検索エンジン"
+  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
   auto-popout: "ウィンドウの自動ポップアウト"
   auto-popout-desc: "ウィンドウが開かれるとき、ポップアウト(ブラウザ外に切り離す)可能なら自動でポップアウトします。この設定はブラウザに記憶されます。"
   advanced: "詳細設定"
@@ -767,12 +781,6 @@ desktop/views/components/settings.vue:
   enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
   volume: "ボリューム"
   test: "テスト"
-  language: "言語"
-  pick-language: "言語を選択"
-  recommended: "推奨"
-  auto: "自動"
-  specify-language: "言語を指定"
-  language-desc: "変更はページの再度読み込み後に反映されます。"
   cache: "キャッシュ"
   clean-cache: "クリーンアップ"
   cache-warn: "クリーンアップを行うと、ブラウザに記憶されたアカウント情報のキャッシュ、書きかけの投稿・返信・メッセージ、およびその他のデータ(設定情報含む)が削除されます。クリーンアップを行った後はページを再度読み込みする必要があります。"
@@ -966,17 +974,17 @@ admin/views/instance.vue:
   recaptcha-site-key: "reCAPTCHA site key"
   recaptcha-secret-key: "reCAPTCHA secret key"
   twitter-integration-config: "Twitter連携の設定"
-  twitter-integration-info: "コールバックURLは /api/tw/cb に設定します。"
+  twitter-integration-info: "コールバックURLは {url} に設定します。"
   enable-twitter-integration: "Twitter連携を有効にする"
   twitter-integration-consumer-key: "Consumer key"
   twitter-integration-consumer-secret: "Consumer secret"
   github-integration-config: "GitHub連携の設定"
-  github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
+  github-integration-info: "コールバックURLは {url} に設定します。"
   enable-github-integration: "GitHub連携を有効にする"
   github-integration-client-id: "Client ID"
   github-integration-client-secret: "Client Secret"
   discord-integration-config: "Discord連携の設定"
-  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
+  discord-integration-info: "コールバックURLは {url} に設定します。"
   enable-discord-integration: "Discord連携を有効にする"
   discord-integration-client-id: "Client ID"
   discord-integration-client-secret: "Client Secret"
@@ -991,6 +999,22 @@ admin/views/instance.vue:
   invite: "招待"
   save: "保存"
   saved: "保存しました"
+  user-recommendation-config: "おすすめユーザー"
+  enable-external-user-recommendation: "外部ユーザーレコメンデーションを有効にする"
+  external-user-recommendation-engine: "エンジン"
+  external-user-recommendation-engine-desc: "例: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
+  external-user-recommendation-timeout: "タイムアウト"
+  external-user-recommendation-timeout-desc: "ミリ秒単位 (例: 300000)"
+  email-config: "メールサーバーの設定"
+  email-config-info: "メールアドレス確認やパスワードリセットの際に使われます。"
+  enable-email: "メール配信を有効にする"
+  email: "メールアドレス"
+  smtp-secure: "SMTP接続に暗黙的なSSL/TLSを使用する"
+  smtp-secure-info: "STARTTLS使用時はオフにします。"
+  smtp-host: "SMTPホスト"
+  smtp-port: "SMTPポート"
+  smtp-user: "SMTPユーザー"
+  smtp-pass: "SMTPパスワード"
 admin/views/charts.vue:
   title: "チャート"
   per-day: "1日ごと"
@@ -1017,18 +1041,35 @@ admin/views/charts.vue:
     network-time: "応答時間"
     network-usage: "通信量"
 admin/views/users.vue:
-  suspend-user: "ユーザーの凍結"
+  operation: "操作"
+  username-or-userid: "ユーザー名またはユーザーID"
+  user-not-found: "ユーザーが見つかりません"
+  lookup: "照会"
+  reset-password: "パスワードをリセット"
+  password-updated: "パスワードは現在「{password}」です"
   suspend: "凍結"
   suspended: "凍結しました"
-  unsuspend-user: "ユーザーの凍結の解除"
   unsuspend: "凍結の解除"
   unsuspended: "凍結を解除しました"
-  verify-user: "ユーザーの公式アカウント設定"
   verify: "公式アカウントにする"
   verified: "公式アカウントにしました"
-  unverify-user: "ユーザーの公式アカウント解除"
   unverify: "公式アカウントを解除する"
   unverified: "公式アカウントを解除しました"
+  users:
+    title: "ユーザー"
+    sort:
+      title: "ソート"
+      createdAtAsc: "登録日時が古い順"
+      createdAtDesc: "登録日時が新しい順"
+      updatedAtAsc: "更新日時が古い順"
+      updatedAtDesc: "更新日時が新しい順"
+    origin:
+      title: "オリジン"
+      combined: "ローカル+リモート"
+      local: "ローカル"
+      remote: "リモート"
+    createdAt: "登録日時"
+    updatedAt: "更新日時"
 admin/views/moderators.vue:
   add-moderator:
     title: "モデレーターの登録"
@@ -1321,11 +1362,6 @@ mobile/views/pages/selectdrive.vue:
   select-file: "ファイルを選択"
 mobile/views/pages/settings.vue:
   signed-in-as: "{}としてサインイン中"
-  lang: "言語"
-  lang-tip: "変更はページの再読み込み後に反映されます。"
-  recommended: "推奨"
-  auto: "自動"
-  specify-language: "言語を指定"
   design: "デザインと表示"
   dark-mode: "ダークモード"
   i-am-under-limited-internet: "私は通信を制限されている"
@@ -1348,6 +1384,8 @@ mobile/views/pages/settings.vue:
   note-visibility: "投稿の公開範囲"
   default-note-visibility: "デフォルトの公開範囲"
   remember-note-visibility: "投稿の公開範囲を記憶する"
+  web-search-engine: "ウェブ検索エンジン"
+  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
   disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
   load-raw-images: "添付された画像を高画質で表示する"
   load-remote-media: "リモートサーバーのメディアを表示する"
@@ -1392,6 +1430,9 @@ mobile/views/pages/user.vue:
   block: "ブロック"
   unblock: "ブロック解除"
   years-old: "{age}歳"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  list-pushed: "{user}を{list}に追加しました"
 mobile/views/pages/user/home.vue:
   recent-notes: "Notas recentes"
   images: "Imagens"

locales/ru-RU.yml

@@ -7,61 +7,62 @@ common:
   about-title: "Мы — ⭐ fediverse"
   about: "Спасибо, что нашли Misskey. Misskey — это <b>децентрализованная платформа для микроблоггинга</b> родом с планеты Земля. Поскольку она существует внутри Fediverse (вселенной различных социальных платформ), она связана с другими платформами. Отдохните от шума большого города — и познакомьтесь с новым интернетом."
   intro:
-    title: "Misskeyって？"
-    about: "Misskeyはオープンソースの<b>分散型マイクロブログSNS</b>です。リッチで高度にカスタマイズできるUI、投稿へのリアクション、ファイルを一元管理できるドライブなど、先進的な機能を揃えています。また、Fediverseと呼ばれるネットワークに接続できるため、他のSNSともやり取りできます。例えば、あなたが何か投稿すると、その投稿はMisskeyだけでなく他のSNSにも伝わります。ちょうどある惑星から他の惑星に電波を発信している様子をイメージしてください。"
-    features: "特徴"
-    rich-contents: "投稿"
-    rich-contents-desc: "自分の考え、話題の出来事、皆と共有したいことについて発信してください。必要であれば、様々な構文を使って投稿を装飾したり、好きな画像、動画などのファイルやアンケートを添付することもできます。"
-    reaction: "リアクション"
-    reaction-desc: "あなたの気持ちを伝える最も簡単な方法です。Misskeyは、他のユーザーの投稿に様々なリアクションを付けることができます。いちどMisskeyのリアクション機能を体験してしまうと、もう「いいね」の概念しか存在しないSNSには戻れなくなるかもしれません。"
-    ui: "インターフェース"
-    ui-desc: "どのようなUIが使いやすいかは人それぞれです。だから、Misskeyは自由度の高いUIを持っています。レイアウトやデザインを調整したり、カスタマイズ可能な様々なウィジェットを配置したりして、自分だけのホームを作ってください。"
-    drive: "ドライブ"
-    drive-desc: "以前投稿したことのある画像をまた投稿したくなったことはありませんか？もしくは、アップロードしたファイルをフォルダ分けして整理したくなったことはありませんか？Misskeyの根幹に組み込まれたドライブ機能によってそれらが解決します。ファイルの共有も簡単です。"
-    outro: "他にもMisskeyにしかない機能はまだまだあるので、ぜひあなた自身の目で確かめてください。Misskeyは分散型SNSなので、このインスタンスが気に入らなければ他のインスタンスを試すこともできます。それでは、GLHF!"
+    title: "Что такое Misskey?"
+    about: "Misskey - это <b>децентрализованный сервис микроблогинга</b> с открытым исходным кодом. Он имеет такие функции, как: навороченный, полностью настраиваемый пользовательский интерфейс, множество реакций на посты, бесплатное хранилище файлов с интегрированной системой управления и ещё куча передовых фишек. А ещё сетевая система под названием “Fediverse” позволяет нам общаться с пользователями других социальных сетей. Например, если ты что-нибудь запостишь, то твой пост будет отослан не только в Misskey, но ещё и mastodon. Просто представь, что планета посылает микроволны на другую планету для коммуникации."
+    features: "Особенности"
+    rich-contents: "Посты"
+    rich-contents-desc: "Просто выложи свою идею, актуальные темы и всё, что тебе хочется показать миру. Ты можешь декорировать свои слова, прикреплять свои любимые картинки, отправлять файлы с фильмами и создать голосование - это те вещи, которые ты можешь сделать с помощью Misskey!"
+    reaction: "Реакции"
+    reaction-desc: "Самый лёгкий способ выразить свои эмоции. Misskey позволяет добавлять различные виды реакций к постам других людей. Эмоциональный опыт из Misskey никогда не появится в других социальных сетях, позволяющих только жать “лайки”."
+    ui: "Интерфейс"
+    ui-desc: "Нет такого интерфейса, понравившегося всем. Поэтому у Misskey имеется пользовательский интерфейс, широко настраиваемый под ваши вкусы. Создай себе уникальную домашнюю страницу редактируя, подстраивая оформление ленты и размещая виджеты, которые тоже можно кастомизировать."
+    drive: "Хранилище файлов"
+    drive-desc: "Хотите запостить картинку, которую уже отправляли ранее? Хочется сортировать, переименовать и создать папку для ваших выложенных файлов? Тогда Misskey Drive - это лучшее решение для вас. Очень лёгкий способ делиться своими файлами онлайн."
+    outro: "Попробуйте будущие, уникальные для Misskey функции своими глазами! Если чувствуете, что это не в вашем вкусе, то попробуйте другие инстанции, ведь Misskey - это децентрализованная социальная сеть, так что ты можешь с лёгкостью найти себе товарищей. И наконец, GLHF!"
   adblock:
-    detected: "広告ブロッカーを無効にしてください"
-    warning: "<strong>Misskeyは広告を掲載していません</strong>が、広告をブロックする機能が有効だと一部の機能が利用できなかったり、不具合が発生する場合があります。"
-  application-authorization: "アプリの連携"
-  close: "閉じる"
-  do-not-copy-paste: "ここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。"
-  load-more: "もっと読み込む"
+    detected: "Пожалуйста, отключите блокировщик рекламы."
+    warning: "Некоторые функции перестанут быть доступными или будут работать неправильно, если включена блокировка рекламы. <strong>В Misskey нет рекламы</strong>."
+  application-authorization: "Авторизация приложений"
+  close: "Закрыть"
+  do-not-copy-paste: "Пожалуйста, не вводите и не вставляйте сюда код. Аккаунту может угрожать опасность."
+  load-more: "Загрузить больше"
+  enter-password: "パスワードを入力してください"
   got-it: "わかった"
   customization-tips:
     title: "カスタマイズのヒント"
     paragraph: "<p>ホームのカスタマイズでは、ウィジェットを追加/削除したり、ドラッグ&ドロップして並べ替えたりすることができます。</p><p>一部のウィジェットは、<strong><strong>右</strong>クリック</strong>することで表示を変更することができます。</p><p>ウィジェットを削除するには、ヘッダーの<strong>「ゴミ箱」</strong>と書かれたエリアにウィジェットをドラッグ&ドロップします。</p><p>カスタマイズを終了するには、右上の「完了」をクリックします。</p>"
     gotit: "Got it!"
   notification:
-    file-uploaded: "ファイルがアップロードされました"
-    message-from: "{}さんからメッセージ:"
-    reversi-invited: "対局への招待があります"
-    reversi-invited-by: "{}さんから"
+    file-uploaded: "Файл отправлен!"
+    message-from: "Сообщение от {}:"
+    reversi-invited: "Приглашён в игру"
+    reversi-invited-by: "Был приглашён {}:"
     notified-by: "{}さんから"
-    reply-from: "{}さんから返信:"
-    quoted-by: "{}さんが引用:"
+    reply-from: "Ответ от {}:"
+    quoted-by: "Цитировано {}:"
   time:
-    unknown: "なぞのじかん"
-    future: "未来"
-    just_now: "たった今"
-    seconds_ago: "{}秒前"
-    minutes_ago: "{}分前"
-    hours_ago: "{}時間前"
-    days_ago: "{}日前"
-    weeks_ago: "{}週間前"
-    months_ago: "{}ヶ月前"
-    years_ago: "{}年前"
-  month-and-day: "{month}月 {day}日"
-  trash: "ゴミ箱"
-  drive: "ドライブ"
-  messaging: "トーク"
+    unknown: "неизвестно"
+    future: "сейчас"
+    just_now: "сейчас"
+    seconds_ago: "{} секунд назад"
+    minutes_ago: "{} минут назад"
+    hours_ago: "{} часов назад"
+    days_ago: "{} дней назад"
+    weeks_ago: "{} недель назад"
+    months_ago: "{} месяцев назад"
+    years_ago: "{} лет назад"
+  month-and-day: "{day}.{month}"
+  trash: "Мусорное ведро"
+  drive: "Drive"
+  messaging: "Чат"
   weekday-short:
-    sunday: "日"
-    monday: "月"
-    tuesday: "火"
-    wednesday: "水"
-    thursday: "木"
-    friday: "金"
-    saturday: "土"
+    sunday: "Вс"
+    monday: "Пн"
+    tuesday: "Вт"
+    wednesday: "Ср"
+    thursday: "Чт"
+    friday: "Пт"
+    saturday: "Сб"
   weekday:
     sunday: "日曜日"
     monday: "月曜日"
@@ -111,60 +112,60 @@ common:
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
   use-contrast-reversi-stones: "リバーシのアイコンにコントラストを付ける"
   verified-user: "公式アカウント"
-  disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
-  always-show-nsfw: "常に閲覧注意のメディアを表示する"
-  always-mark-nsfw: "常にメディアを閲覧注意として投稿"
+  disable-animated-mfm: "Отключить анимированный текст в постах"
+  always-show-nsfw: "Всегда показывать NSFW контент"
+  always-mark-nsfw: "Всегда помечать посты с медиафайлами как NSFW"
   show-full-acct: "ユーザー名のホストを省略しない"
-  show-via: "viaを表示する"
-  reduce-motion: "UIの動きを減らす"
-  this-setting-is-this-device-only: "このデバイスのみ"
-  use-os-default-emojis: "OS標準の絵文字を使用"
-  do-not-use-in-production: 'これは開発ビルドです。本番環境で使用しないでください。'
+  show-via: "показать через"
+  reduce-motion: "Уменьшить движение в интерфейсе"
+  this-setting-is-this-device-only: "Только для этого устройства"
+  use-os-default-emojis: "Использовать стандартные Emoji из ОС"
+  do-not-use-in-production: 'Эта сборка для разработчиков. Не используйте в продакшне.'
   is-remote-user: "このユーザー情報はコピーです。"
   is-remote-post: "この投稿情報はコピーです。"
   view-on-remote: "正確な情報を見る"
   renoted-by: "{user}がRenote"
   error:
-    title: '問題が発生しました'
-    retry: 'やり直す'
+    title: 'Что-то пошло не так :('
+    retry: 'Повторить'
   reversi:
-    drawn: "引き分け"
-    my-turn: "あなたのターンです"
-    opponent-turn: "相手のターンです"
-    turn-of: "{name}のターンです"
-    past-turn-of: "{name}のターン"
-    won: "{name}の勝ち"
-    black: "黒"
-    white: "白"
-    total: "合計"
-    this-turn: "{count}ターン目"
+    drawn: "Ничья"
+    my-turn: "Ваш ход"
+    opponent-turn: "Ход оппонента"
+    turn-of: "Ход {name}"
+    past-turn-of: "Ход {name}"
+    won: "{name} победил"
+    black: "Чёрный"
+    white: "Белый"
+    total: "Всего"
+    this-turn: "Ход {count}"
   widgets:
-    analog-clock: "アナログ時計"
-    profile: "プロフィール"
-    calendar: "カレンダー"
-    timemachine: "カレンダー(タイムマシン)"
-    activity: "アクティビティ"
-    rss: "RSSリーダー"
-    memo: "付箋"
-    trends: "トレンド"
-    photo-stream: "フォトストリーム"
+    analog-clock: "Аналоговые часы"
+    profile: "Профиль"
+    calendar: "Календарь"
+    timemachine: "Календарь (машина времени)"
+    activity: "Активность"
+    rss: "Ридер RSS"
+    memo: "Заметка"
+    trends: "Популярное"
+    photo-stream: "Фотопоток"
     posts-monitor: "投稿チャート"
-    slideshow: "スライドショー"
-    version: "バージョン"
+    slideshow: "Слайдшоу"
+    version: "Версия"
     broadcast: "ブロードキャスト"
-    notifications: "通知"
-    users: "おすすめユーザー"
-    polls: "アンケート"
+    notifications: "Уведомления"
+    users: "Рекомендованные пользователи"
+    polls: "Голосования"
     post-form: "投稿フォーム"
-    server: "サーバー情報"
+    server: "Информация о сервере"
     donation: "寄付のお願い"
     nav: "ナビゲーション"
     tips: "ヒント"
-    hashtags: "ハッシュタグ"
-  dev: "アプリの作成に失敗しました。再度お試しください。"
-  ai-chan-kawaii: "藍ちゃかわいい"
+    hashtags: "Хэштеги"
+  dev: "Не удалось создать приложение. Пожалуйста, попробуйте ещё раз."
+  ai-chan-kawaii: "Ai-chan kawaii!"
 auth/views/form.vue:
-  share-access: "<i>{name}</i>があなたのアカウントにアクセスすることを許可しますか？"
+  share-access: "Вы разрешаете <i>{name}</i> получить доступ к вашему аккаунту?"
   permission-ask: "このアプリは次の権限を要求しています:"
   account-read: "アカウントの情報を見る。"
   account-write: "アカウントの情報を操作する。"
@@ -210,28 +211,28 @@ common/views/components/games/reversi/reversi.index.vue:
   all-games: "みんなの対局"
   enter-username: "ユーザー名を入力してください"
   game-state:
-    ended: "終了"
-    playing: "進行中"
+    ended: "Завершено"
+    playing: "В процессе"
 common/views/components/games/reversi/reversi.room.vue:
-  settings-of-the-game: "ゲームの設定"
+  settings-of-the-game: "Настройки игры"
   choose-map: "マップを選択"
-  random: "ランダム"
-  black-or-white: "先手/後手"
-  black-is: "{}が黒"
-  rules: "ルール"
+  random: "Случайно"
+  black-or-white: "Чёрные/Белые"
+  black-is: "{} ходит чёрными"
+  rules: "Правила"
   is-llotheo: "石の少ない方が勝ち(ロセオ)"
   looped-map: "ループマップ"
   can-put-everywhere: "どこでも置けるモード"
-  settings-of-the-bot: "Botの設定"
-  this-game-is-started-soon: "ゲームは数秒後に開始されます"
-  waiting-for-other: "相手の準備が完了するのを待っています"
+  settings-of-the-bot: "Настройки бота"
+  this-game-is-started-soon: "Игра вот-вот начнётся"
+  waiting-for-other: "Ожидание оппонента"
   waiting-for-me: "あなたの準備が完了するのを待っています"
   waiting-for-both: "準備中"
-  cancel: "キャンセル"
-  ready: "準備完了"
+  cancel: "Отмена"
+  ready: "Готов"
   cancel-ready: "準備続行"
 common/views/components/connect-failed.vue:
-  title: "サーバーに接続できません"
+  title: "Невозможно подключиться к серверу"
   description: "インターネット回線に問題があるか、サーバーがダウンまたはメンテナンスしている可能性があります。しばらくしてから{再度お試し}ください。"
   thanks: "いつもMisskeyをご利用いただきありがとうございます。"
   troubleshoot: "トラブルシュート"
@@ -438,6 +439,13 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
   count: "{}人が投稿"
   empty: "トレンドなし"
+common/views/components/language-settings.vue:
+  title: "表示言語"
+  pick-language: "言語を選択"
+  recommended: "推奨"
+  auto: "自動"
+  specify-language: "言語を指定"
+  info: "変更はページの再度読み込み後に反映されます。"
 common/views/components/profile-editor.vue:
   title: "プロフィール"
   name: "名前"
@@ -457,6 +465,10 @@ common/views/components/profile-editor.vue:
   saved: "プロフィールを保存しました"
   uploading: "アップロード中"
   upload-failed: "アップロードに失敗しました"
+  email: "メール設定"
+  email-address: "メールアドレス"
+  email-verified: "メールアドレスが確認されました"
+  email-not-verified: "メールアドレスが確認されていません。メールボックスをご確認ください。"
 common/views/widgets/broadcast.vue:
   fetching: "確認中"
   no-broadcasts: "お知らせはありません"
@@ -731,6 +743,8 @@ desktop/views/components/settings.vue:
   note-visibility: "投稿の公開範囲"
   default-note-visibility: "デフォルトの公開範囲"
   remember-note-visibility: "投稿の公開範囲を記憶する"
+  web-search-engine: "ウェブ検索エンジン"
+  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
   auto-popout: "ウィンドウの自動ポップアウト"
   auto-popout-desc: "ウィンドウが開かれるとき、ポップアウト(ブラウザ外に切り離す)可能なら自動でポップアウトします。この設定はブラウザに記憶されます。"
   advanced: "詳細設定"
@@ -767,12 +781,6 @@ desktop/views/components/settings.vue:
   enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
   volume: "ボリューム"
   test: "テスト"
-  language: "言語"
-  pick-language: "言語を選択"
-  recommended: "推奨"
-  auto: "自動"
-  specify-language: "言語を指定"
-  language-desc: "変更はページの再度読み込み後に反映されます。"
   cache: "キャッシュ"
   clean-cache: "クリーンアップ"
   cache-warn: "クリーンアップを行うと、ブラウザに記憶されたアカウント情報のキャッシュ、書きかけの投稿・返信・メッセージ、およびその他のデータ(設定情報含む)が削除されます。クリーンアップを行った後はページを再度読み込みする必要があります。"
@@ -966,17 +974,17 @@ admin/views/instance.vue:
   recaptcha-site-key: "reCAPTCHA site key"
   recaptcha-secret-key: "reCAPTCHA secret key"
   twitter-integration-config: "Twitter連携の設定"
-  twitter-integration-info: "コールバックURLは /api/tw/cb に設定します。"
+  twitter-integration-info: "コールバックURLは {url} に設定します。"
   enable-twitter-integration: "Twitter連携を有効にする"
   twitter-integration-consumer-key: "Consumer key"
   twitter-integration-consumer-secret: "Consumer secret"
   github-integration-config: "GitHub連携の設定"
-  github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
+  github-integration-info: "コールバックURLは {url} に設定します。"
   enable-github-integration: "GitHub連携を有効にする"
   github-integration-client-id: "Client ID"
   github-integration-client-secret: "Client Secret"
   discord-integration-config: "Discord連携の設定"
-  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
+  discord-integration-info: "コールバックURLは {url} に設定します。"
   enable-discord-integration: "Discord連携を有効にする"
   discord-integration-client-id: "Client ID"
   discord-integration-client-secret: "Client Secret"
@@ -991,6 +999,22 @@ admin/views/instance.vue:
   invite: "招待"
   save: "保存"
   saved: "保存しました"
+  user-recommendation-config: "おすすめユーザー"
+  enable-external-user-recommendation: "外部ユーザーレコメンデーションを有効にする"
+  external-user-recommendation-engine: "エンジン"
+  external-user-recommendation-engine-desc: "例: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
+  external-user-recommendation-timeout: "タイムアウト"
+  external-user-recommendation-timeout-desc: "ミリ秒単位 (例: 300000)"
+  email-config: "メールサーバーの設定"
+  email-config-info: "メールアドレス確認やパスワードリセットの際に使われます。"
+  enable-email: "メール配信を有効にする"
+  email: "メールアドレス"
+  smtp-secure: "SMTP接続に暗黙的なSSL/TLSを使用する"
+  smtp-secure-info: "STARTTLS使用時はオフにします。"
+  smtp-host: "SMTPホスト"
+  smtp-port: "SMTPポート"
+  smtp-user: "SMTPユーザー"
+  smtp-pass: "SMTPパスワード"
 admin/views/charts.vue:
   title: "チャート"
   per-day: "1日ごと"
@@ -1017,18 +1041,35 @@ admin/views/charts.vue:
     network-time: "応答時間"
     network-usage: "通信量"
 admin/views/users.vue:
-  suspend-user: "ユーザーの凍結"
+  operation: "操作"
+  username-or-userid: "ユーザー名またはユーザーID"
+  user-not-found: "ユーザーが見つかりません"
+  lookup: "照会"
+  reset-password: "パスワードをリセット"
+  password-updated: "パスワードは現在「{password}」です"
   suspend: "凍結"
   suspended: "凍結しました"
-  unsuspend-user: "ユーザーの凍結の解除"
   unsuspend: "凍結の解除"
   unsuspended: "凍結を解除しました"
-  verify-user: "ユーザーの公式アカウント設定"
   verify: "公式アカウントにする"
   verified: "公式アカウントにしました"
-  unverify-user: "ユーザーの公式アカウント解除"
   unverify: "公式アカウントを解除する"
   unverified: "公式アカウントを解除しました"
+  users:
+    title: "ユーザー"
+    sort:
+      title: "ソート"
+      createdAtAsc: "登録日時が古い順"
+      createdAtDesc: "登録日時が新しい順"
+      updatedAtAsc: "更新日時が古い順"
+      updatedAtDesc: "更新日時が新しい順"
+    origin:
+      title: "オリジン"
+      combined: "ローカル+リモート"
+      local: "ローカル"
+      remote: "リモート"
+    createdAt: "登録日時"
+    updatedAt: "更新日時"
 admin/views/moderators.vue:
   add-moderator:
     title: "モデレーターの登録"
@@ -1321,11 +1362,6 @@ mobile/views/pages/selectdrive.vue:
   select-file: "ファイルを選択"
 mobile/views/pages/settings.vue:
   signed-in-as: "{}としてサインイン中"
-  lang: "言語"
-  lang-tip: "変更はページの再読み込み後に反映されます。"
-  recommended: "推奨"
-  auto: "自動"
-  specify-language: "言語を指定"
   design: "デザインと表示"
   dark-mode: "ダークモード"
   i-am-under-limited-internet: "私は通信を制限されている"
@@ -1348,6 +1384,8 @@ mobile/views/pages/settings.vue:
   note-visibility: "投稿の公開範囲"
   default-note-visibility: "デフォルトの公開範囲"
   remember-note-visibility: "投稿の公開範囲を記憶する"
+  web-search-engine: "ウェブ検索エンジン"
+  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
   disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
   load-raw-images: "添付された画像を高画質で表示する"
   load-remote-media: "リモートサーバーのメディアを表示する"
@@ -1392,6 +1430,9 @@ mobile/views/pages/user.vue:
   block: "ブロック"
   unblock: "ブロック解除"
   years-old: "{age}歳"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  list-pushed: "{user}を{list}に追加しました"
 mobile/views/pages/user/home.vue:
   recent-notes: "最近の投稿"
   images: "画像"

locales/zh-CN.yml

@@ -26,6 +26,7 @@ common:
   close: "关闭"
   do-not-copy-paste: "请不要在这里输入或粘贴代码。您帐户可能会受到损害。"
   load-more: "加载更多"
+  enter-password: "请输入您的密码"
   got-it: "没问题"
   customization-tips:
     title: "客制化提示"
@@ -438,6 +439,13 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
   count: "{} 被提到"
   empty: "没有流行的标签"
+common/views/components/language-settings.vue:
+  title: "显示语言"
+  pick-language: "选择一个语言"
+  recommended: "推荐"
+  auto: "自动"
+  specify-language: "指定语言"
+  info: "你需要刷新这个页面来应用更改。"
 common/views/components/profile-editor.vue:
   title: "简况"
   name: "名称"
@@ -457,6 +465,10 @@ common/views/components/profile-editor.vue:
   saved: "更新配置文件成功"
   uploading: "正在上传"
   upload-failed: "上传失败"
+  email: "邮件设置"
+  email-address: "电子邮件地址"
+  email-verified: "电子邮件地址已验证"
+  email-not-verified: "电子邮件地址还没有验证哦, 请检查一下收信箱吧~"
 common/views/widgets/broadcast.vue:
   fetching: "确认中"
   no-broadcasts: "没有公告"
@@ -731,6 +743,8 @@ desktop/views/components/settings.vue:
   note-visibility: "帖子可见性"
   default-note-visibility: "默认可见性"
   remember-note-visibility: "记住帖子可见性"
+  web-search-engine: "搜索引擎"
+  web-search-engine-desc: "例如: https://www.google.com/?#q={{query}}"
   auto-popout: "自动弹出窗口"
   auto-popout-desc: "如果可用，将使用弹出显示而不是打开新窗口。 此设置存储在浏览器中。"
   advanced: "更多设置"
@@ -767,12 +781,6 @@ desktop/views/components/settings.vue:
   enable-sounds-desc: "收到帖子/留言时播放声音。 此设置将被存储在浏览器中。"
   volume: "音量"
   test: "测试"
-  language: "语言"
-  pick-language: "选择一个语言"
-  recommended: "推荐"
-  auto: "自动"
-  specify-language: "指定语言"
-  language-desc: "你需要刷新这个页面来应用更改。"
   cache: "缓存"
   clean-cache: "清除缓存"
   cache-warn: "将删除存储在浏览器中的帐户信息/帖子/回复/消息/设置的缓存。 清理完毕后需要刷新页面。"
@@ -966,17 +974,17 @@ admin/views/instance.vue:
   recaptcha-site-key: "reCAPTCHA site key"
   recaptcha-secret-key: "reCAPTCHA secret key"
   twitter-integration-config: "连接到Twitter的设置"
-  twitter-integration-info: "回调 URL 设置为 /api/tw/cb"
+  twitter-integration-info: "设置返回的URL{url}。"
   enable-twitter-integration: "启用连接到Twitter"
   twitter-integration-consumer-key: "Consumer key"
   twitter-integration-consumer-secret: "Consumer Secret"
   github-integration-config: "连接到GitHub设置"
-  github-integration-info: "回调 URL 设置为 /api/gh/cb"
+  github-integration-info: "设置返回的URL{url}。"
   enable-github-integration: "启用连接到GitHub"
   github-integration-client-id: "Client ID"
   github-integration-client-secret: "Client Secret"
   discord-integration-config: "设置 Discord Integration"
-  discord-integration-info: "回调 URL 设置为 /api/dc/cb"
+  discord-integration-info: "设置返回的URL{url}。"
   enable-discord-integration: "启用 Discord 连接"
   discord-integration-client-id: "Client ID"
   discord-integration-client-secret: "Client Secret"
@@ -991,6 +999,22 @@ admin/views/instance.vue:
   invite: "邀请"
   save: "保存"
   saved: "保存完毕"
+  user-recommendation-config: "推荐用户"
+  enable-external-user-recommendation: "启用外部用户推荐"
+  external-user-recommendation-engine: "引擎"
+  external-user-recommendation-engine-desc: "例如: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
+  external-user-recommendation-timeout: "超时"
+  external-user-recommendation-timeout-desc: "单位为毫秒 (例如：300000)"
+  email-config: "电子邮件服务器设置"
+  email-config-info: "用于确认电子邮件和密码重置等。"
+  enable-email: "启用电子邮件送递"
+  email: "电子邮件地址"
+  smtp-secure: "在 SMTP 连接中使用隐式 SSL / TLS"
+  smtp-secure-info: "使用时关闭 STARTTLS。"
+  smtp-host: "SMTP 服务器地址 (主机名)"
+  smtp-port: "SMTP 端口"
+  smtp-user: "SMTP 用户名"
+  smtp-pass: "SMTP 密码"
 admin/views/charts.vue:
   title: "历史记录"
   per-day: "每天"
@@ -1017,18 +1041,35 @@ admin/views/charts.vue:
     network-time: "响应时间"
     network-usage: "网络流量"
 admin/views/users.vue:
-  suspend-user: "冻结用户"
+  operation: "操作"
+  username-or-userid: "用户名或用户ID"
+  user-not-found: "用户不存在"
+  lookup: "订阅"
+  reset-password: "密码重置"
+  password-updated: "密码为「{password}」"
   suspend: "被冻结"
   suspended: "成功冻结用户"
-  unsuspend-user: "解除用户冻结"
   unsuspend: "已解除冻结"
   unsuspended: "已成功解除用户冻结"
-  verify-user: "用户账户认证设置"
   verify: "认证用户"
   verified: "此账户已被认证"
-  unverify-user: "用户账号解除认证设置"
   unverify: "解除账户认证"
   unverified: "该帐户未经认证"
+  users:
+    title: "用户"
+    sort:
+      title: "排序"
+      createdAtAsc: "注册时间从旧到新"
+      createdAtDesc: "注册时间从新到旧"
+      updatedAtAsc: "更新时间从旧到新"
+      updatedAtDesc: "更新时间从新到旧"
+    origin:
+      title: "源自"
+      combined: "本地+远程"
+      local: "本地"
+      remote: "远程"
+    createdAt: "注册日期"
+    updatedAt: "最后更新"
 admin/views/moderators.vue:
   add-moderator:
     title: "注册版主"
@@ -1321,11 +1362,6 @@ mobile/views/pages/selectdrive.vue:
   select-file: "选择文件"
 mobile/views/pages/settings.vue:
   signed-in-as: "以{}登录"
-  lang: "语言"
-  lang-tip: "你需要刷新这个页面来应用更改。"
-  recommended: "推荐"
-  auto: "自动"
-  specify-language: "选择语言"
   design: "设计与展示"
   dark-mode: "夜间模式"
   i-am-under-limited-internet: "我的带宽有限"
@@ -1348,6 +1384,8 @@ mobile/views/pages/settings.vue:
   note-visibility: "帖子可见性"
   default-note-visibility: "默认可见性"
   remember-note-visibility: "记住帖子可见性"
+  web-search-engine: "搜索引擎"
+  web-search-engine-desc: "例如: https://www.google.com/?#q={{query}}"
   disable-via-mobile: "不要将帖子标记为“来自手机”"
   load-raw-images: "以原始质量显示附加图像"
   load-remote-media: "显示来自远程服务器的媒体"
@@ -1392,6 +1430,9 @@ mobile/views/pages/user.vue:
   block: "屏蔽"
   unblock: "取消屏蔽"
   years-old: "{age}岁"
+  push-to-list: "添加至列表"
+  select-list: "选择一个列表"
+  list-pushed: "成功添加{user}到{list}"
 mobile/views/pages/user/home.vue:
   recent-notes: "最近的帖子"
   images: "图片"

package.json

@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "10.56.1",
-	"clientVersion": "2.0.11960",
+	"version": "10.62.0",
+	"clientVersion": "2.0.12431",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
@@ -34,8 +34,8 @@
 		"@types/debug": "0.0.31",
 		"@types/deep-equal": "1.0.1",
 		"@types/double-ended-queue": "2.1.0",
-		"@types/elasticsearch": "5.0.28",
-		"@types/file-type": "5.2.1",
+		"@types/elasticsearch": "5.0.29",
+		"@types/file-type": "5.2.2",
 		"@types/gulp": "3.8.36",
 		"@types/gulp-htmlmin": "1.3.32",
 		"@types/gulp-mocha": "0.0.32",
@@ -47,14 +47,14 @@
 		"@types/is-url": "1.2.28",
 		"@types/js-yaml": "3.11.2",
 		"@types/katex": "0.5.0",
-		"@types/koa": "2.0.46",
+		"@types/koa": "2.0.47",
 		"@types/koa-bodyparser": "5.0.1",
 		"@types/koa-compress": "2.0.8",
 		"@types/koa-favicon": "2.0.19",
 		"@types/koa-logger": "3.1.1",
 		"@types/koa-mount": "3.0.1",
 		"@types/koa-multer": "1.0.0",
-		"@types/koa-router": "7.0.33",
+		"@types/koa-router": "7.0.35",
 		"@types/koa-send": "4.1.1",
 		"@types/koa-views": "2.0.3",
 		"@types/koa__cors": "2.2.3",
@@ -63,14 +63,15 @@
 		"@types/mocha": "5.2.5",
 		"@types/mongodb": "3.1.14",
 		"@types/ms": "0.7.30",
-		"@types/node": "10.12.2",
+		"@types/node": "10.12.10",
+		"@types/nodemailer": "4.6.5",
 		"@types/oauth": "0.9.1",
 		"@types/parsimmon": "1.10.0",
 		"@types/portscanner": "2.1.0",
 		"@types/pug": "2.0.4",
 		"@types/qrcode": "1.3.0",
 		"@types/ratelimiter": "2.1.28",
-		"@types/redis": "2.8.7",
+		"@types/redis": "2.8.8",
 		"@types/request": "2.48.1",
 		"@types/request-promise-native": "1.0.15",
 		"@types/rimraf": "2.0.2",
@@ -78,7 +79,7 @@
 		"@types/sharp": "0.21.0",
 		"@types/showdown": "1.7.5",
 		"@types/speakeasy": "2.0.3",
-		"@types/systeminformation": "3.23.0",
+		"@types/systeminformation": "3.23.1",
 		"@types/tinycolor2": "1.4.1",
 		"@types/tmp": "0.0.33",
 		"@types/uuid": "3.4.4",
@@ -87,8 +88,8 @@
 		"@types/websocket": "0.0.40",
 		"@types/ws": "6.0.1",
 		"animejs": "2.2.0",
-		"apexcharts": "2.2.2",
-		"autobind-decorator": "2.2.1",
+		"apexcharts": "2.2.4",
+		"autobind-decorator": "2.3.1",
 		"autosize": "4.0.2",
 		"autwh": "0.1.0",
 		"bcryptjs": "2.4.3",
@@ -109,7 +110,7 @@
 		"diskusage": "0.2.5",
 		"double-ended-queue": "2.1.0-0",
 		"elasticsearch": "15.2.0",
-		"emojilib": "2.3.0",
+		"emojilib": "2.4.0",
 		"escape-regexp": "0.0.1",
 		"eslint": "5.8.0",
 		"eslint-plugin-vue": "4.7.1",
@@ -143,7 +144,7 @@
 		"json5": "2.1.0",
 		"json5-loader": "1.0.1",
 		"katex": "0.10.0",
-		"koa": "2.6.1",
+		"koa": "2.6.2",
 		"koa-bodyparser": "4.2.1",
 		"koa-compress": "3.0.0",
 		"koa-favicon": "2.0.1",
@@ -155,6 +156,7 @@
 		"koa-send": "5.0.0",
 		"koa-slow": "2.1.0",
 		"koa-views": "6.1.4",
+		"langmap": "0.0.16",
 		"loader-utils": "1.1.0",
 		"minio": "7.0.1",
 		"mkdirp": "0.5.1",
@@ -166,6 +168,7 @@
 		"ms": "2.1.1",
 		"nan": "2.11.1",
 		"nested-property": "0.0.7",
+		"nodemailer": "4.7.0",
 		"nprogress": "0.2.0",
 		"object-assign-deep": "0.4.0",
 		"on-build-webpack": "0.1.0",
@@ -201,17 +204,17 @@
 		"stylus": "0.54.5",
 		"stylus-loader": "3.0.2",
 		"summaly": "2.2.0",
-		"systeminformation": "3.47.0",
+		"systeminformation": "3.51.3",
 		"syuilo-password-strength": "0.0.1",
 		"terser-webpack-plugin": "1.1.0",
 		"textarea-caret": "3.1.0",
 		"tinycolor2": "1.4.1",
 		"tmp": "0.0.33",
-		"ts-loader": "5.3.0",
+		"ts-loader": "5.3.1",
 		"ts-node": "7.0.1",
 		"tslint": "5.10.0",
 		"typescript": "3.1.6",
-		"typescript-eslint-parser": "21.0.1",
+		"typescript-eslint-parser": "21.0.2",
 		"uglify-es": "3.3.9",
 		"url-loader": "1.1.2",
 		"uuid": "3.3.2",
@@ -220,24 +223,24 @@
 		"vue-color": "2.7.0",
 		"vue-content-loading": "1.5.3",
 		"vue-cropperjs": "2.2.2",
-		"vue-i18n": "8.3.1",
-		"vue-js-modal": "1.3.26",
+		"vue-i18n": "8.3.2",
+		"vue-js-modal": "1.3.27",
 		"vue-loader": "15.4.2",
 		"vue-marquee-text-component": "1.1.0",
-		"vue-router": "3.0.1",
+		"vue-router": "3.0.2",
 		"vue-style-loader": "4.1.2",
-		"vue-svg-inline-loader": "1.2.2",
+		"vue-svg-inline-loader": "1.2.4",
 		"vue-template-compiler": "2.5.17",
-		"vuedraggable": "2.16.0",
+		"vuedraggable": "2.17.0",
 		"vuewordcloud": "18.7.11",
 		"vuex": "3.0.1",
 		"vuex-persistedstate": "2.5.4",
 		"web-push": "3.3.3",
-		"webfinger.js": "2.6.6",
-		"webpack": "4.25.1",
+		"webfinger.js": "2.7.0",
+		"webpack": "4.26.1",
 		"webpack-cli": "3.1.2",
 		"websocket": "1.0.28",
-		"ws": "6.1.0",
+		"ws": "6.1.2",
 		"xev": "2.0.1"
 	}
 }

src/client/app/admin/views/announcements.vue

@@ -9,7 +9,7 @@
 			<ui-textarea v-model="announcement.text">
 				<span>{{ $t('text') }}</span>
 			</ui-textarea>
-			<ui-horizon-group>
+			<ui-horizon-group class="fit-bottom">
 				<ui-button @click="save()"><fa :icon="['far', 'save']"/> {{ $t('save') }}</ui-button>
 				<ui-button @click="remove(i)"><fa :icon="['far', 'trash-alt']"/> {{ $t('remove') }}</ui-button>
 			</ui-horizon-group>
@@ -48,15 +48,15 @@ export default Vue.extend({
 		},
 
 		remove(i) {
-			this.$root.alert({
+			this.$root.dialog({
 				type: 'warning',
 				text: this.$t('_remove.are-you-sure').replace('$1', this.announcements.find((_, j) => j == i).title),
 				showCancelButton: true
-			}).then(res => {
-				if (!res) return;
+			}).then(({ canceled }) => {
+				if (canceled) return;
 				this.announcements = this.announcements.filter((_, j) => j !== i);
 				this.save(true);
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'success',
 					text: this.$t('_remove.removed')
 				});
@@ -68,13 +68,13 @@ export default Vue.extend({
 				broadcasts: this.announcements
 			}).then(() => {
 				if (!silent) {
-					this.$root.alert({
+					this.$root.dialog({
 						type: 'success',
 						text: this.$t('saved')
 					});
 				}
 			}).catch(e => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'error',
 					text: e
 				});

src/client/app/admin/views/emoji.vue

@@ -38,7 +38,7 @@
 				<i slot="icon"><fa icon="link"/></i>
 				<span>{{ $t('add-emoji.url') }}</span>
 			</ui-input>
-			<ui-horizon-group>
+			<ui-horizon-group class="fit-bottom">
 				<ui-button @click="updateEmoji(emoji)"><fa :icon="['far', 'save']"/> {{ $t('emojis.update') }}</ui-button>
 				<ui-button @click="removeEmoji(emoji)"><fa :icon="['far', 'trash-alt']"/> {{ $t('emojis.remove') }}</ui-button>
 			</ui-horizon-group>
@@ -75,13 +75,13 @@ export default Vue.extend({
 				url: this.url,
 				aliases: this.aliases.split(' ').filter(x => x.length > 0)
 			}).then(() => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'success',
 					text: this.$t('add-emoji.added')
 				});
 				this.fetchEmojis();
 			}).catch(e => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'error',
 					text: e
 				});
@@ -103,12 +103,12 @@ export default Vue.extend({
 				url: emoji.url,
 				aliases: emoji.aliases.split(' ').filter(x => x.length > 0)
 			}).then(() => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'success',
 					text: this.$t('updated')
 				});
 			}).catch(e => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'error',
 					text: e
 				});
@@ -116,23 +116,23 @@ export default Vue.extend({
 		},
 
 		removeEmoji(emoji) {
-			this.$root.alert({
+			this.$root.dialog({
 				type: 'warning',
 				text: this.$t('remove-emoji.are-you-sure').replace('$1', emoji.name),
 				showCancelButton: true
-			}).then(res => {
-				if (!res) return;
+			}).then(({ canceled }) => {
+				if (canceled) return;
 
 				this.$root.api('admin/emoji/remove', {
 					id: emoji.id
 				}).then(() => {
-					this.$root.alert({
+					this.$root.dialog({
 						type: 'success',
 						text: this.$t('remove-emoji.removed')
 					});
 					this.fetchEmojis();
 				}).catch(e => {
-					this.$root.alert({
+					this.$root.dialog({
 						type: 'error',
 						text: e
 					});

src/client/app/admin/views/instance.vue

@@ -12,11 +12,15 @@
 		<section class="fit-bottom">
 			<header><fa :icon="faHeadset"/> {{ $t('maintainer-config') }}</header>
 			<ui-input v-model="maintainerName">{{ $t('maintainer-name') }}</ui-input>
-			<ui-input v-model="maintainerEmail" type="email"><i slot="icon"><fa :icon="['far', 'envelope']"/></i>{{ $t('maintainer-email') }}</ui-input>
+			<ui-input v-model="maintainerEmail" type="email"><i slot="icon"><fa :icon="farEnvelope"/></i>{{ $t('maintainer-email') }}</ui-input>
 		</section>
 		<section class="fit-top fit-bottom">
 			<ui-input v-model="maxNoteTextLength">{{ $t('max-note-text-length') }}</ui-input>
 		</section>
+		<section>
+			<ui-switch v-model="disableRegistration">{{ $t('disable-registration') }}</ui-switch>
+			<ui-switch v-model="disableLocalTimeline">{{ $t('disable-local-timeline') }}</ui-switch>
+		</section>
 		<section class="fit-bottom">
 			<header><fa icon="cloud"/> {{ $t('drive-config') }}</header>
 			<ui-switch v-model="cacheRemoteFiles">{{ $t('cache-remote-files') }}<span slot="desc">{{ $t('cache-remote-files-desc') }}</span></ui-switch>
@@ -37,10 +41,28 @@
 			<ui-info warn>{{ $t('proxy-account-warn') }}</ui-info>
 		</section>
 		<section>
-			<ui-switch v-model="disableRegistration">{{ $t('disable-registration') }}</ui-switch>
+			<header><fa :icon="farEnvelope"/> {{ $t('email-config') }}</header>
+			<ui-switch v-model="enableEmail">{{ $t('enable-email') }}<span slot="desc">{{ $t('email-config-info') }}</span></ui-switch>
+			<ui-input v-model="email" type="email" :disabled="!enableEmail">{{ $t('email') }}</ui-input>
+			<ui-horizon-group inputs>
+				<ui-input v-model="smtpHost" :disabled="!enableEmail">{{ $t('smtp-host') }}</ui-input>
+				<ui-input v-model="smtpPort" type="number" :disabled="!enableEmail">{{ $t('smtp-port') }}</ui-input>
+			</ui-horizon-group>
+			<ui-horizon-group inputs>
+				<ui-input v-model="smtpUser" :disabled="!enableEmail">{{ $t('smtp-user') }}</ui-input>
+				<ui-input v-model="smtpPass" :disabled="!enableEmail">{{ $t('smtp-pass') }}</ui-input>
+			</ui-horizon-group>
+			<ui-switch v-model="smtpSecure" :disabled="!enableEmail">{{ $t('smtp-secure') }}<span slot="desc">{{ $t('smtp-secure-info') }}</span></ui-switch>
 		</section>
 		<section>
-			<ui-switch v-model="disableLocalTimeline">{{ $t('disable-local-timeline') }}</ui-switch>
+			<header>summaly Proxy</header>
+			<ui-input v-model="summalyProxy">URL</ui-input>
+		</section>
+		<section>
+			<header><fa :icon="faUserPlus"/> {{ $t('user-recommendation-config') }}</header>
+			<ui-switch v-model="enableExternalUserRecommendation">{{ $t('enable-external-user-recommendation') }}</ui-switch>
+			<ui-input v-model="externalUserRecommendationEngine" :disabled="!enableExternalUserRecommendation">{{ $t('external-user-recommendation-engine') }}<span slot="desc">{{ $t('external-user-recommendation-engine-desc') }}</span></ui-input>
+			<ui-input v-model="externalUserRecommendationTimeout" type="number" :disabled="!enableExternalUserRecommendation">{{ $t('external-user-recommendation-timeout') }}<span slot="suffix">ms</span><span slot="desc">{{ $t('external-user-recommendation-timeout-desc') }}</span></ui-input>
 		</section>
 		<section>
 			<ui-button @click="updateMeta">{{ $t('save') }}</ui-button>
@@ -59,7 +81,7 @@
 		<div slot="title"><fa :icon="['fab', 'twitter']"/> {{ $t('twitter-integration-config') }}</div>
 		<section>
 			<ui-switch v-model="enableTwitterIntegration">{{ $t('enable-twitter-integration') }}</ui-switch>
-			<ui-info>{{ $t('twitter-integration-info') }}</ui-info>
+			<ui-info>{{ $t('twitter-integration-info', { url: `${url}/api/tw/cb` }) }}</ui-info>
 			<ui-input v-model="twitterConsumerKey" :disabled="!enableTwitterIntegration"><i slot="icon"><fa icon="key"/></i>{{ $t('twitter-integration-consumer-key') }}</ui-input>
 			<ui-input v-model="twitterConsumerSecret" :disabled="!enableTwitterIntegration"><i slot="icon"><fa icon="key"/></i>{{ $t('twitter-integration-consumer-secret') }}</ui-input>
 			<ui-button @click="updateMeta">{{ $t('save') }}</ui-button>
@@ -70,7 +92,7 @@
 		<div slot="title"><fa :icon="['fab', 'github']"/> {{ $t('github-integration-config') }}</div>
 		<section>
 			<ui-switch v-model="enableGithubIntegration">{{ $t('enable-github-integration') }}</ui-switch>
-			<ui-info>{{ $t('github-integration-info') }}</ui-info>
+			<ui-info>{{ $t('github-integration-info', { url: `${url}/api/gh/cb` }) }}</ui-info>
 			<ui-input v-model="githubClientId" :disabled="!enableGithubIntegration"><i slot="icon"><fa icon="key"/></i>{{ $t('github-integration-client-id') }}</ui-input>
 			<ui-input v-model="githubClientSecret" :disabled="!enableGithubIntegration"><i slot="icon"><fa icon="key"/></i>{{ $t('github-integration-client-secret') }}</ui-input>
 			<ui-button @click="updateMeta">{{ $t('save') }}</ui-button>
@@ -81,7 +103,7 @@
 		<div slot="title"><fa :icon="['fab', 'discord']"/> {{ $t('discord-integration-config') }}</div>
 		<section>
 			<ui-switch v-model="enableDiscordIntegration">{{ $t('enable-discord-integration') }}</ui-switch>
-			<ui-info>{{ $t('discord-integration-info') }}</ui-info>
+			<ui-info>{{ $t('discord-integration-info', { url: `${url}/api/dc/cb` }) }}</ui-info>
 			<ui-input v-model="discordClientId" :disabled="!enableDiscordIntegration"><i slot="icon"><fa icon="key"/></i>{{ $t('discord-integration-client-id') }}</ui-input>
 			<ui-input v-model="discordClientSecret" :disabled="!enableDiscordIntegration"><i slot="icon"><fa icon="key"/></i>{{ $t('discord-integration-client-secret') }}</ui-input>
 			<ui-button @click="updateMeta">{{ $t('save') }}</ui-button>
@@ -93,15 +115,17 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../i18n';
-import { host } from '../../config';
+import { url, host } from '../../config';
 import { toUnicode } from 'punycode';
-import { faHeadset, faShieldAlt, faGhost } from '@fortawesome/free-solid-svg-icons';
+import { faHeadset, faShieldAlt, faGhost, faUserPlus } from '@fortawesome/free-solid-svg-icons';
+import { faEnvelope as farEnvelope } from '@fortawesome/free-regular-svg-icons';
 
 export default Vue.extend({
 	i18n: i18n('admin/views/instance.vue'),
 
 	data() {
 		return {
+			url,
 			host: toUnicode(host),
 			maintainerName: null,
 			maintainerEmail: null,
@@ -129,7 +153,18 @@ export default Vue.extend({
 			discordClientSecret: null,
 			proxyAccount: null,
 			inviteCode: null,
-			faHeadset, faShieldAlt, faGhost
+			enableExternalUserRecommendation: false,
+			externalUserRecommendationEngine: null,
+			externalUserRecommendationTimeout: null,
+			summalyProxy: null,
+			enableEmail: false,
+			email: null,
+			smtpSecure: false,
+			smtpHost: null,
+			smtpPort: null,
+			smtpUser: null,
+			smtpPass: null,
+			faHeadset, faShieldAlt, faGhost, faUserPlus, farEnvelope
 		};
 	},
 
@@ -158,6 +193,17 @@ export default Vue.extend({
 			this.enableDiscordIntegration = meta.enableDiscordIntegration;
 			this.discordClientId = meta.discordClientId;
 			this.discordClientSecret = meta.discordClientSecret;
+			this.enableExternalUserRecommendation = meta.enableExternalUserRecommendation;
+			this.externalUserRecommendationEngine = meta.externalUserRecommendationEngine;
+			this.externalUserRecommendationTimeout = meta.externalUserRecommendationTimeout;
+			this.summalyProxy = meta.summalyProxy;
+			this.enableEmail = meta.enableEmail;
+			this.email = meta.email;
+			this.smtpSecure = meta.smtpSecure;
+			this.smtpHost = meta.smtpHost;
+			this.smtpPort = meta.smtpPort;
+			this.smtpUser = meta.smtpUser;
+			this.smtpPass = meta.smtpPass;
 		});
 	},
 
@@ -166,7 +212,7 @@ export default Vue.extend({
 			this.$root.api('admin/invite').then(x => {
 				this.inviteCode = x.code;
 			}).catch(e => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'error',
 					text: e
 				});
@@ -199,14 +245,25 @@ export default Vue.extend({
 				githubClientSecret: this.githubClientSecret,
 				enableDiscordIntegration: this.enableDiscordIntegration,
 				discordClientId: this.discordClientId,
-				discordClientSecret: this.discordClientSecret
+				discordClientSecret: this.discordClientSecret,
+				enableExternalUserRecommendation: this.enableExternalUserRecommendation,
+				externalUserRecommendationEngine: this.externalUserRecommendationEngine,
+				externalUserRecommendationTimeout: parseInt(this.externalUserRecommendationTimeout, 10),
+				summalyProxy: this.summalyProxy,
+				enableEmail: this.enableEmail,
+				email: this.email,
+				smtpSecure: this.smtpSecure,
+				smtpHost: this.smtpHost,
+				smtpPort: parseInt(this.smtpPort, 10),
+				smtpUser: this.smtpUser,
+				smtpPass: this.smtpPass
 			}).then(() => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'success',
 					text: this.$t('saved')
 				});
 			}).catch(e => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'error',
 					text: e
 				});

src/client/app/admin/views/moderators.vue

@@ -34,14 +34,14 @@ export default Vue.extend({
 			const process = async () => {
 				const user = await this.$root.api('users/show', parseAcct(this.username));
 				await this.$root.api('admin/moderators/add', { userId: user.id });
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'success',
 					text: this.$t('add-moderator.added')
 				});
 			};
 
 			await process().catch(e => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'error',
 					text: e.toString()
 				});

src/client/app/admin/views/users.vue

@@ -1,42 +1,63 @@
 <template>
 <div class="ucnffhbtogqgscfmqcymwmmupoknpfsw">
 	<ui-card>
-		<div slot="title">{{ $t('verify-user') }}</div>
+		<div slot="title"><fa :icon="faTerminal"/> {{ $t('operation') }}</div>
 		<section class="fit-top">
-			<ui-input v-model="verifyUsername" type="text">
-				<span slot="prefix">@</span>
+			<ui-input v-model="target" type="text">
+				<span>{{ $t('username-or-userid') }}</span>
 			</ui-input>
-			<ui-button @click="verifyUser" :disabled="verifying">{{ $t('verify') }}</ui-button>
+			<ui-button @click="resetPassword"><fa :icon="faKey"/> {{ $t('reset-password') }}</ui-button>
+			<ui-horizon-group>
+				<ui-button @click="verifyUser" :disabled="verifying"><fa :icon="faCertificate"/> {{ $t('verify') }}</ui-button>
+				<ui-button @click="unverifyUser" :disabled="unverifying">{{ $t('unverify') }}</ui-button>
+			</ui-horizon-group>
+			<ui-horizon-group>
+				<ui-button @click="suspendUser" :disabled="suspending"><fa :icon="faSnowflake"/> {{ $t('suspend') }}</ui-button>
+				<ui-button @click="unsuspendUser" :disabled="unsuspending">{{ $t('unsuspend') }}</ui-button>
+			</ui-horizon-group>
+			<ui-button @click="showUser"><fa :icon="faSearch"/> {{ $t('lookup') }}</ui-button>
+			<ui-textarea v-if="user" :value="user | json5" readonly tall style="margin-top:16px;"></ui-textarea>
 		</section>
 	</ui-card>
 
 	<ui-card>
-		<div slot="title">{{ $t('unverify-user') }}</div>
+		<div slot="title"><fa :icon="faUsers"/> {{ $t('users.title') }}</div>
 		<section class="fit-top">
-			<ui-input v-model="unverifyUsername" type="text">
-				<span slot="prefix">@</span>
-			</ui-input>
-			<ui-button @click="unverifyUser" :disabled="unverifying">{{ $t('unverify') }}</ui-button>
-		</section>
-	</ui-card>
-
-	<ui-card>
-		<div slot="title">{{ $t('suspend-user') }}</div>
-		<section class="fit-top">
-			<ui-input v-model="suspendUsername" type="text">
-				<span slot="prefix">@</span>
-			</ui-input>
-			<ui-button @click="suspendUser" :disabled="suspending">{{ $t('suspend') }}</ui-button>
-		</section>
-	</ui-card>
-
-	<ui-card>
-		<div slot="title">{{ $t('unsuspend-user') }}</div>
-		<section class="fit-top">
-			<ui-input v-model="unsuspendUsername" type="text">
-				<span slot="prefix">@</span>
-			</ui-input>
-			<ui-button @click="unsuspendUser" :disabled="unsuspending">{{ $t('unsuspend') }}</ui-button>
+			<ui-horizon-group inputs>
+				<ui-select v-model="sort">
+					<span slot="label">{{ $t('users.sort.title') }}</span>
+					<option value="-createdAt">{{ $t('users.sort.createdAtAsc') }}</option>
+					<option value="+createdAt">{{ $t('users.sort.createdAtDesc') }}</option>
+					<option value="-updatedAt">{{ $t('users.sort.updatedAtAsc') }}</option>
+					<option value="+updatedAt">{{ $t('users.sort.updatedAtDesc') }}</option>
+				</ui-select>
+				<ui-select v-model="origin">
+					<span slot="label">{{ $t('users.origin.title') }}</span>
+					<option value="combined">{{ $t('users.origin.combined') }}</option>
+					<option value="local">{{ $t('users.origin.local') }}</option>
+					<option value="remote">{{ $t('users.origin.remote') }}</option>
+				</ui-select>
+			</ui-horizon-group>
+			<div class="kofvwchc" v-for="user in users">
+				<div>
+					<a :href="user | userPage(null, true)">
+						<mk-avatar class="avatar" :user="user" :disable-link="true"/>
+					</a>
+				</div>
+				<div>
+					<header>
+						<b>{{ user | userName }}</b>
+						<span class="username">@{{ user | acct }}</span>
+					</header>
+					<div>
+						<span>{{ $t('users.updatedAt') }}: <mk-time :time="user.updatedAt" mode="detail"/></span>
+					</div>
+					<div>
+						<span>{{ $t('users.createdAt') }}: <mk-time :time="user.createdAt" mode="detail"/></span>
+					</div>
+				</div>
+			</div>
+			<ui-button v-if="existMore" @click="fetchUsers">{{ $t('@.load-more') }}</ui-button>
 		</section>
 	</ui-card>
 </div>
@@ -46,38 +67,98 @@
 import Vue from 'vue';
 import i18n from '../../i18n';
 import parseAcct from "../../../../misc/acct/parse";
+import { faCertificate, faUsers, faTerminal, faSearch, faKey } from '@fortawesome/free-solid-svg-icons';
+import { faSnowflake } from '@fortawesome/free-regular-svg-icons';
 
 export default Vue.extend({
 	i18n: i18n('admin/views/users.vue'),
 
 	data() {
 		return {
-			verifyUsername: null,
+			user: null,
+			target: null,
 			verifying: false,
-			unverifyUsername: null,
 			unverifying: false,
-			suspendUsername: null,
 			suspending: false,
-			unsuspendUsername: null,
-			unsuspending: false
+			unsuspending: false,
+			sort: '+createdAt',
+			origin: 'combined',
+			limit: 10,
+			offset: 0,
+			users: [],
+			existMore: false,
+			faTerminal, faCertificate, faUsers, faSnowflake, faSearch, faKey
 		};
 	},
 
+	watch: {
+		sort() {
+			this.users = [];
+			this.offset = 0;
+			this.fetchUsers();
+		},
+
+		origin() {
+			this.users = [];
+			this.offset = 0;
+			this.fetchUsers();
+		}
+	},
+
+	mounted() {
+		this.fetchUsers();
+	},
+
 	methods: {
+		async fetchUser() {
+			try {
+				return await this.$root.api('users/show', this.target.startsWith('@') ? parseAcct(this.target) : { userId: this.target });
+			} catch (e) {
+				if (e == 'user not found') {
+					this.$root.dialog({
+						type: 'error',
+						text: this.$t('user-not-found')
+					});
+				} else {
+					this.$root.dialog({
+						type: 'error',
+						text: e.toString()
+					});
+				}
+			}
+		},
+
+		async showUser() {
+			const user = await this.fetchUser();
+			this.$root.api('admin/show-user', { userId: user.id }).then(info => {
+				this.user = info;
+			});
+		},
+
+		async resetPassword() {
+			const user = await this.fetchUser();
+			this.$root.api('admin/reset-password', { userId: user.id }).then(res => {
+				this.$root.dialog({
+					type: 'success',
+					text: this.$t('password-updated', { password: res.password })
+				});
+			});
+		},
+
 		async verifyUser() {
 			this.verifying = true;
 
 			const process = async () => {
-				const user = await this.$root.api('users/show', parseAcct(this.verifyUsername));
+				const user = await this.fetchUser();
 				await this.$root.api('admin/verify-user', { userId: user.id });
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'success',
 					text: this.$t('verified')
 				});
 			};
 
 			await process().catch(e => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'error',
 					text: e.toString()
 				});
@@ -90,16 +171,16 @@ export default Vue.extend({
 			this.unverifying = true;
 
 			const process = async () => {
-				const user = await this.$root.api('users/show', parseAcct(this.unverifyUsername));
+				const user = await this.fetchUser();
 				await this.$root.api('admin/unverify-user', { userId: user.id });
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'success',
 					text: this.$t('unverified')
 				});
 			};
 
 			await process().catch(e => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'error',
 					text: e.toString()
 				});
@@ -112,16 +193,16 @@ export default Vue.extend({
 			this.suspending = true;
 
 			const process = async () => {
-				const user = await this.$root.api('users/show', parseAcct(this.suspendUsername));
+				const user = await this.fetchUser();
 				await this.$root.api('admin/suspend-user', { userId: user.id });
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'success',
 					text: this.$t('suspended')
 				});
 			};
 
 			await process().catch(e => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'error',
 					text: e.toString()
 				});
@@ -134,22 +215,40 @@ export default Vue.extend({
 			this.unsuspending = true;
 
 			const process = async () => {
-				const user = await this.$root.api('users/show', parseAcct(this.unsuspendUsername));
+				const user = await this.fetchUser();
 				await this.$root.api('admin/unsuspend-user', { userId: user.id });
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'success',
 					text: this.$t('unsuspended')
 				});
 			};
 
 			await process().catch(e => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'error',
 					text: e.toString()
 				});
 			});
 
 			this.unsuspending = false;
+		},
+
+		fetchUsers() {
+			this.$root.api('users', {
+				origin: this.origin,
+				sort: this.sort,
+				offset: this.offset,
+				limit: this.limit + 1
+			}).then(users => {
+				if (users.length == this.limit + 1) {
+					users.pop();
+					this.existMore = true;
+				} else {
+					this.existMore = false;
+				}
+				this.users = this.users.concat(users);
+				this.offset += this.limit;
+			});
 		}
 	}
 });
@@ -160,4 +259,24 @@ export default Vue.extend({
 	@media (min-width 500px)
 		padding 16px
 
+	.kofvwchc
+		display flex
+		padding 16px 0
+		border-top solid 1px var(--faceDivider)
+
+		> div:first-child
+			> a
+				> .avatar
+					width 64px
+					height 64px
+
+		> div:last-child
+			flex 1
+			padding-left 16px
+
+			> header
+				> .username
+					margin-left 8px
+					opacity 0.7
+
 </style>

src/client/app/common/scripts/check-for-update.ts

@@ -21,12 +21,12 @@ export default async function($root: any, force = false, silent = false) {
 			console.error(e);
 		}
 
-		if (!silent) {
-			$root.alert({
+		/*if (!silent) {
+			$root.dialog({
 				title: $root.$t('@.update-available-title'),
 				text: $root.$t('@.update-available', { newer, current })
 			});
-		}
+		}*/
 
 		return newer;
 	} else {

src/client/app/common/scripts/fuck-ad-block.ts

@@ -4,7 +4,7 @@ export default ($root: any) => {
 	require('fuckadblock');
 
 	function adBlockDetected() {
-		$root.alert({
+		$root.dialog({
 			title: $root.$t('@.adblock.detected'),
 			text: $root.$t('@.adblock.warning')
 		});

src/client/app/common/scripts/get-face.ts

@@ -2,7 +2,7 @@ const faces = [
 	'(=^・・^=)',
 	'v(\'ω\')v',
 	'🐡( \'-\' 🐡 )ﾌｸﾞﾊﾟﾝﾁ!!!!',
-	'🖕(´･_･`)🖕',
+	'✌️(´･_･`)✌️',
 	'(｡>﹏<｡)',
 	'(Δ・x・Δ)'
 ];

src/client/app/common/scripts/note-mixin.ts

@@ -78,9 +78,10 @@ export default (opts: Opts = {}) => ({
 		urls(): string[] {
 			if (this.appearNote.text) {
 				const ast = parse(this.appearNote.text);
+				// TODO: 再帰的にURL要素がないか調べる
 				return unique(ast
-					.filter(t => (t.type == 'url' || t.type == 'link') && !t.silent)
-					.map(t => t.url));
+					.filter(t => ((t.name == 'url' || t.name == 'link') && t.props.url && !t.props.silent))
+					.map(t => t.props.url));
 			} else {
 				return null;
 			}
@@ -141,7 +142,7 @@ export default (opts: Opts = {}) => ({
 			this.$root.api('notes/favorites/create', {
 				noteId: this.appearNote.id
 			}).then(() => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'success',
 					splash: true
 				});

src/client/app/common/scripts/should-mute-note.ts

@@ -20,7 +20,7 @@ export default function(me, settings, note) {
 		}
 	}
 
-	if (!isMyNote && note.text && settings.mutedWords.some(q => !q.some(word => !note.text.includes(word)))) {
+	if (!isMyNote && note.text && settings.mutedWords.some(q => q.length > 0 && !q.some(word => !note.text.includes(word)))) {
 		return true;
 	}
 

src/client/app/common/views/components/api-settings.vue

@@ -50,10 +50,13 @@ export default Vue.extend({
 
 	methods: {
 		regenerateToken() {
-			this.$input({
+			this.$root.dialog({
 				title: this.$t('enter-password'),
-				type: 'password'
-			}).then(password => {
+				input: {
+					type: 'password'
+				}
+			}).then(({ canceled, result: password }) => {
+				if (canceled) return;
 				this.$root.api('i/regenerate_token', {
 					password: password
 				});

src/client/app/common/views/components/autocomplete.vue

@@ -3,7 +3,9 @@
 	<ol class="users" ref="suggests" v-if="users.length > 0">
 		<li v-for="user in users" @click="complete(type, user)" @keydown="onKeydown" tabindex="-1">
 			<img class="avatar" :src="user.avatarUrl" alt=""/>
-			<span class="name">{{ user | userName }}</span>
+			<span class="name">
+				<mk-user-name :user="user"/>
+			</span>
 			<span class="username">@{{ user | acct }}</span>
 		</li>
 	</ol>
@@ -187,7 +189,8 @@ export default Vue.extend({
 				} else {
 					this.$root.api('users/search', {
 						query: this.q,
-						limit: 30
+						limit: 10,
+						detail: false
 					}).then(users => {
 						this.users = users;
 						this.fetching = false;

src/client/app/common/views/components/dialog.vue

@@ -2,12 +2,17 @@
 <div class="felqjxyj" :class="{ splash }">
 	<div class="bg" ref="bg" @click="onBgClick"></div>
 	<div class="main" ref="main">
-		<div class="icon" :class="type"><fa :icon="icon"/></div>
+		<div class="icon" v-if="!input && !select && !user" :class="type"><fa :icon="icon"/></div>
 		<header v-if="title" v-html="title"></header>
 		<div class="body" v-if="text" v-html="text"></div>
-		<ui-horizon-group no-grow class="buttons" v-if="!splash">
-			<ui-button @click="ok" primary autofocus>OK</ui-button>
-			<ui-button @click="cancel" v-if="showCancelButton">Cancel</ui-button>
+		<ui-input v-if="input" v-model="inputValue" autofocus :type="input.type || 'text'" :placeholder="input.placeholder" @keydown="onInputKeydown"></ui-input>
+		<ui-input v-if="user" v-model="userInputValue" autofocus @keydown="onInputKeydown"><span slot="prefix">@</span></ui-input>
+		<ui-select v-if="select" v-model="selectedValue">
+			<option v-for="item in select.items" :value="item.value">{{ item.text }}</option>
+		</ui-select>
+		<ui-horizon-group no-grow class="buttons fit-bottom" v-if="!splash">
+			<ui-button @click="ok" primary :autofocus="!input && !select && !user">OK</ui-button>
+			<ui-button @click="cancel" v-if="showCancelButton || input || select || user">Cancel</ui-button>
 		</ui-horizon-group>
 	</div>
 </div>
@@ -17,6 +22,7 @@
 import Vue from 'vue';
 import * as anime from 'animejs';
 import { faTimesCircle, faQuestionCircle } from '@fortawesome/free-regular-svg-icons';
+import parseAcct from "../../../../../misc/acct/parse";
 
 export default Vue.extend({
 	props: {
@@ -33,6 +39,15 @@ export default Vue.extend({
 			type: String,
 			required: false
 		},
+		input: {
+			required: false
+		},
+		select: {
+			required: false
+		},
+		user: {
+			required: false
+		},
 		showCancelButton: {
 			type: Boolean,
 			default: false
@@ -43,6 +58,14 @@ export default Vue.extend({
 		}
 	},
 
+	data() {
+		return {
+			inputValue: this.input && this.input.default ? this.input.default : null,
+			userInputValue: null,
+			selectedValue: null
+		};
+	},
+
 	computed: {
 		icon(): any {
 			switch (this.type) {
@@ -82,9 +105,21 @@ export default Vue.extend({
 	},
 
 	methods: {
-		ok() {
-			this.$emit('ok');
-			this.close();
+		async ok() {
+			if (this.user) {
+				const user = await this.$root.api('users/show', parseAcct(this.userInputValue));
+				if (user) {
+					this.$emit('ok', user);
+					this.close();
+				}
+			} else {
+				const result =
+					this.input ? this.inputValue :
+					this.select ? this.selectedValue :
+					true;
+				this.$emit('ok', result);
+				this.close();
+			}
 		},
 
 		cancel() {
@@ -114,6 +149,14 @@ export default Vue.extend({
 
 		onBgClick() {
 			this.cancel();
+		},
+
+		onInputKeydown(e) {
+			if (e.which == 13) { // Enter
+				e.preventDefault();
+				e.stopPropagation();
+				this.ok();
+			}
 		}
 	}
 });
@@ -180,8 +223,11 @@ export default Vue.extend({
 				display block
 				margin 0 auto
 
+			& + header
+				margin-top 16px
+
 		> header
-			margin 16px 0 8px 0
+			margin 0 0 8px 0
 			font-weight bold
 			font-size 20px
 

src/client/app/common/views/components/discord-setting.vue

@@ -1,64 +0,0 @@
-<template>
-<div class="mk-discord-setting">
-	<p>{{ $t('description') }}</p>
-	<p class="account" v-if="$store.state.i.discord" :title="`Discord ID: ${$store.state.i.discord.id}`">{{ $t('connected-to') }}: <a :href="`https://discordapp.com/users/${$store.state.i.discord.id}`" target="_blank">@{{ $store.state.i.discord.username }}#{{ $store.state.i.discord.discriminator }}</a></p>
-	<p>
-		<a :href="`${apiUrl}/connect/discord`" target="_blank" @click.prevent="connect">{{ $store.state.i.discord ? this.$t('reconnect') : this.$t('connect') }}</a>
-		<span v-if="$store.state.i.discord"> or </span>
-		<a :href="`${apiUrl}/disconnect/discord`" target="_blank" v-if="$store.state.i.discord" @click.prevent="disconnect">{{ $t('disconnect') }}</a>
-	</p>
-	<p class="id" v-if="$store.state.i.discord">Discord ID: {{ $store.state.i.discord.id }}</p>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-import i18n from '../../../i18n';
-import { apiUrl } from '../../../config';
-
-export default Vue.extend({
-	i18n: i18n('common/views/components/discord-setting.vue'),
-	data() {
-		return {
-			form: null,
-			apiUrl
-		};
-	},
-	mounted() {
-		this.$watch('$store.state.i', () => {
-			if (this.$store.state.i.discord && this.form)
-				this.form.close();
-		}, {
-			deep: true
-		});
-	},
-	methods: {
-		connect() {
-			this.form = window.open(apiUrl + '/connect/discord',
-				'discord_connect_window',
-				'height=570, width=520');
-		},
-
-		disconnect() {
-			window.open(apiUrl + '/disconnect/discord',
-				'discord_disconnect_window',
-				'height=570, width=520');
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-.mk-discord-setting
-	.account
-		border solid 1px #e1e8ed
-		border-radius 4px
-		padding 16px
-
-		a
-			font-weight bold
-			color inherit
-
-	.id
-		color #8899a6
-</style>

src/client/app/common/views/components/emoji.vue

@@ -1,5 +1,5 @@
 <template>
-<img v-if="customEmoji" class="fvgwvorwhxigeolkkrcderjzcawqrscl custom" :src="url" :alt="alt" :title="alt"/>
+<img v-if="customEmoji" class="fvgwvorwhxigeolkkrcderjzcawqrscl custom" :class="{ normal: normal }" :src="url" :alt="alt" :title="alt"/>
 <img v-else-if="char && !useOsDefaultEmojis" class="fvgwvorwhxigeolkkrcderjzcawqrscl" :src="url" :alt="alt" :title="alt"/>
 <span v-else-if="char && useOsDefaultEmojis">{{ char }}</span>
 <span v-else>:{{ name }}:</span>
@@ -20,6 +20,11 @@ export default Vue.extend({
 			type: String,
 			required: false
 		},
+		normal: {
+			type: Boolean,
+			required: false,
+			default: false
+		},
 		customEmojis: {
 			required: false,
 			default: () => []
@@ -83,4 +88,11 @@ export default Vue.extend({
 		&:hover
 			transform scale(1.2)
 
+		&.normal
+			height 1.25em
+			vertical-align -0.25em
+
+			&:hover
+				transform none
+
 </style>

src/client/app/common/views/components/games/reversi/reversi.game.vue

@@ -30,8 +30,14 @@
 						:class="{ empty: stone == null, none: o.map[i] == 'null', isEnded: game.isEnded, myTurn: !game.isEnded && isMyTurn, can: turnUser ? o.canPut(turnUser.id == blackUser.id, i) : null, prev: o.prevPos == i }"
 						@click="set(i)"
 						:title="`${String.fromCharCode(65 + o.transformPosToXy(i)[0])}${o.transformPosToXy(i)[1] + 1}`">
-					<img v-if="stone === true" :src="blackUser.avatarUrl" alt="black" :class="{ contrast: $store.state.settings.games.reversi.useContrastStones }">
-					<img v-if="stone === false" :src="whiteUser.avatarUrl" alt="white" :class="{ contrast: $store.state.settings.games.reversi.useContrastStones }">
+					<template v-if="!$store.state.settings.games.reversi.useWhiteBlackStones">
+						<img v-if="stone === true" :src="blackUser.avatarUrl" alt="black" :class="{ contrast: $store.state.settings.games.reversi.useContrastStones }">
+						<img v-if="stone === false" :src="whiteUser.avatarUrl" alt="white" :class="{ contrast: $store.state.settings.games.reversi.useContrastStones }">
+					</template>
+					<template v-if="$store.state.settings.games.reversi.useWhiteBlackStones">
+						<fa v-if="stone === true" :icon="fasCircle"/>
+						<fa v-if="stone === false" :icon="farCircle"/>
+					</template>
 				</div>
 			</div>
 			<div class="labels-y" v-if="this.$store.state.settings.games.reversi.showBoardLabels">
@@ -50,15 +56,13 @@
 	</div>
 
 	<div class="player" v-if="game.isEnded">
-		<div>
-			<button @click="logPos = 0" :disabled="logPos == 0"><fa icon="angle-double-left"/></button>
-			<button @click="logPos--" :disabled="logPos == 0"><fa icon="angle-left"/></button>
-		</div>
 		<span>{{ logPos }} / {{ logs.length }}</span>
-		<div>
-			<button @click="logPos++" :disabled="logPos == logs.length"><fa icon="angle-right"/></button>
-			<button @click="logPos = logs.length" :disabled="logPos == logs.length"><fa icon="angle-double-right"/></button>
-		</div>
+		<ui-horizon-group>
+			<ui-button @click="logPos = 0" :disabled="logPos == 0"><fa :icon="faAngleDoubleLeft"/></ui-button>
+			<ui-button @click="logPos--" :disabled="logPos == 0"><fa :icon="faAngleLeft"/></ui-button>
+			<ui-button @click="logPos++" :disabled="logPos == logs.length"><fa :icon="faAngleRight"/></ui-button>
+			<ui-button @click="logPos = logs.length" :disabled="logPos == logs.length"><fa :icon="faAngleDoubleRight"/></ui-button>
+		</ui-horizon-group>
 	</div>
 
 	<div class="info">
@@ -75,6 +79,9 @@ import i18n from '../../../../../i18n';
 import * as CRC32 from 'crc-32';
 import Reversi, { Color } from '../../../../../../../games/reversi/core';
 import { url } from '../../../../../config';
+import { faAngleDoubleLeft, faAngleLeft, faAngleRight, faAngleDoubleRight } from '@fortawesome/free-solid-svg-icons';
+import { faCircle as fasCircle } from '@fortawesome/free-solid-svg-icons';
+import { faCircle as farCircle } from '@fortawesome/free-regular-svg-icons';
 
 export default Vue.extend({
 	i18n: i18n('common/views/components/games/reversi/reversi.game.vue'),
@@ -99,7 +106,8 @@ export default Vue.extend({
 			o: null as Reversi,
 			logs: [],
 			logPos: 0,
-			pollingClock: null
+			pollingClock: null,
+			faAngleDoubleLeft, faAngleLeft, faAngleRight, faAngleDoubleRight, fasCircle, farCircle
 		};
 	},
 
@@ -412,6 +420,11 @@ export default Vue.extend({
 					&.none
 						border-color transparent !important
 
+					> svg
+						display block
+						width 100%
+						height 100%
+
 					> img
 						display block
 						width 100%
@@ -449,7 +462,9 @@ export default Vue.extend({
 		padding-bottom 16px
 
 	> .player
-		padding-bottom 32px
+		padding 0 16px 32px 16px
+		margin 0 auto
+		max-width 500px
 
 		> span
 			display inline-block

src/client/app/common/views/components/games/reversi/reversi.index.vue

@@ -99,23 +99,22 @@ export default Vue.extend({
 			this.$emit('go', game);
 		},
 
-		match() {
-			this.$input({
-				title: this.$t('enter-username')
-			}).then(username => {
-				this.$root.api('users/show', {
-					username
-				}).then(user => {
-					this.$root.api('games/reversi/match', {
-						userId: user.id
-					}).then(res => {
-						if (res == null) {
-							this.$emit('matching', user);
-						} else {
-							this.$emit('go', res);
-						}
-					});
-				});
+		async match() {
+			const { result: user } = await this.$root.dialog({
+				title: this.$t('enter-username'),
+				user: {
+					local: true
+				}
+			});
+			if (user == null) return;
+			this.$root.api('games/reversi/match', {
+				userId: user.id
+			}).then(res => {
+				if (res == null) {
+					this.$emit('matching', user);
+				} else {
+					this.$emit('go', res);
+				}
 			});
 		},
 

src/client/app/common/views/components/games/reversi/reversi.room.vue

@@ -22,8 +22,8 @@
 					<div v-for="(x, i) in game.settings.map.join('')"
 							:data-none="x == ' '"
 							@click="onPixelClick(i, x)">
-						<template v-if="x == 'b'"><template v-if="$store.state.device.darkmode"><fa :icon="['far', 'circle']"/></template><template v-else><fa icon="circle"/></template></template>
-						<template v-if="x == 'w'"><template v-if="$store.state.device.darkmode"><fa :icon="['far', 'circle']"/></template><template v-else><fa icon="circle"/></template></template>
+						<fa v-if="x == 'b'" :icon="fasCircle"/>
+						<fa v-if="x == 'w'" :icon="farCircle"/>
 					</div>
 				</div>
 			</div>
@@ -117,6 +117,8 @@
 import Vue from 'vue';
 import i18n from '../../../../../i18n';
 import * as maps from '../../../../../../../games/reversi/maps';
+import { faCircle as fasCircle } from '@fortawesome/free-solid-svg-icons';
+import { faCircle as farCircle } from '@fortawesome/free-regular-svg-icons';
 
 export default Vue.extend({
 	i18n: i18n('common/views/components/games/reversi/reversi.room.vue'),
@@ -129,7 +131,8 @@ export default Vue.extend({
 			mapName: maps.eighteight.name,
 			maps: maps,
 			form: null,
-			messages: []
+			messages: [],
+			fasCircle, farCircle
 		};
 	},
 

src/client/app/common/views/components/github-setting.vue

@@ -1,64 +0,0 @@
-<template>
-<div class="mk-github-setting">
-	<p>{{ $t('description') }}</p>
-	<p class="account" v-if="$store.state.i.github" :title="`GitHub ID: ${$store.state.i.github.id}`">{{ $t('connected-to') }}: <a :href="`https://github.com/${$store.state.i.github.login}`" target="_blank">@{{ $store.state.i.github.login }}</a></p>
-	<p>
-		<a :href="`${apiUrl}/connect/github`" target="_blank" @click.prevent="connect">{{ $store.state.i.github ? this.$t('reconnect') : this.$t('connect') }}</a>
-		<span v-if="$store.state.i.github"> or </span>
-		<a :href="`${apiUrl}/disconnect/github`" target="_blank" v-if="$store.state.i.github" @click.prevent="disconnect">{{ $t('disconnect') }}</a>
-	</p>
-	<p class="id" v-if="$store.state.i.github">GitHub ID: {{ $store.state.i.github.id }}</p>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-import i18n from '../../../i18n';
-import { apiUrl } from '../../../config';
-
-export default Vue.extend({
-	i18n: i18n('common/views/components/github-setting.vue'),
-	data() {
-		return {
-			form: null,
-			apiUrl
-		};
-	},
-	mounted() {
-		this.$watch('$store.state.i', () => {
-			if (this.$store.state.i.github && this.form)
-				this.form.close();
-		}, {
-			deep: true
-		});
-	},
-	methods: {
-		connect() {
-			this.form = window.open(apiUrl + '/connect/github',
-				'github_connect_window',
-				'height=570, width=520');
-		},
-
-		disconnect() {
-			window.open(apiUrl + '/disconnect/github',
-				'github_disconnect_window',
-				'height=570, width=520');
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-.mk-github-setting
-	.account
-		border solid 1px #e1e8ed
-		border-radius 4px
-		padding 16px
-
-		a
-			font-weight bold
-			color inherit
-
-	.id
-		color #8899a6
-</style>

src/client/app/common/views/components/google.vue

@@ -22,7 +22,10 @@ export default Vue.extend({
 	},
 	methods: {
 		search() {
-			window.open(`https://www.google.com/?#q=${this.query}`, '_blank');
+			const engine = this.$store.state.settings.webSearchEngine ||
+				'https://www.google.com/?#q={{query}}';
+			const url = engine.replace('{{query}}', this.query)
+			window.open(url, '_blank');
 		}
 	}
 });

src/client/app/common/views/components/index.ts

@@ -1,5 +1,6 @@
 import Vue from 'vue';
 
+import userName from './user-name.vue';
 import followButton from './follow-button.vue';
 import error from './error.vue';
 import noteSkeleton from './note-skeleton.vue';
@@ -44,6 +45,7 @@ import uiInfo from './ui/info.vue';
 import formButton from './ui/form/button.vue';
 import formRadio from './ui/form/radio.vue';
 
+Vue.component('mk-user-name', userName);
 Vue.component('mk-follow-button', followButton);
 Vue.component('mk-error', error);
 Vue.component('mk-note-skeleton', noteSkeleton);

src/client/app/common/views/components/integration-settings.vue

@@ -0,0 +1,96 @@
+<template>
+<ui-card>
+	<div slot="title"><fa icon="share-alt"/> {{ $t('title') }}</div>
+
+	<section>
+		<header><fa :icon="['fab', 'twitter']"/> Twitter</header>
+		<p v-if="$store.state.i.twitter">{{ $t('connected-to') }}: <a :href="`https://twitter.com/${$store.state.i.twitter.screenName}`" target="_blank">@{{ $store.state.i.twitter.screenName }}</a></p>
+		<ui-button v-if="$store.state.i.twitter" @click="disconnectTwitter">{{ $t('disconnect') }}</ui-button>
+		<ui-button v-else @click="connectTwitter">{{ $t('connect') }}</ui-button>
+	</section>
+
+	<section>
+		<header><fa :icon="['fab', 'discord']"/> Discord</header>
+		<p v-if="$store.state.i.discord">{{ $t('connected-to') }}: <a :href="`https://discordapp.com/users/${$store.state.i.discord.id}`" target="_blank">@{{ $store.state.i.discord.username }}#{{ $store.state.i.discord.discriminator }}</a></p>
+		<ui-button v-if="$store.state.i.discord" @click="disconnectDiscord">{{ $t('disconnect') }}</ui-button>
+		<ui-button v-else @click="connectDiscord">{{ $t('connect') }}</ui-button>
+	</section>
+
+	<section>
+		<header><fa :icon="['fab', 'github']"/> GitHub</header>
+		<p v-if="$store.state.i.github">{{ $t('connected-to') }}: <a :href="`https://github.com/${$store.state.i.github.login}`" target="_blank">@{{ $store.state.i.github.login }}</a></p>
+		<ui-button v-if="$store.state.i.github" @click="disconnectGithub">{{ $t('disconnect') }}</ui-button>
+		<ui-button v-else @click="connectGithub">{{ $t('connect') }}</ui-button>
+	</section>
+</ui-card>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../i18n';
+import { apiUrl } from '../../../config';
+
+export default Vue.extend({
+	i18n: i18n('common/views/components/integration-settings.vue'),
+
+	data() {
+		return {
+			apiUrl,
+			twitterForm: null,
+			discordForm: null,
+			githubForm: null,
+		};
+	},
+
+	mounted() {
+		this.$watch('$store.state.i', () => {
+			if (this.$store.state.i.twitter) {
+				if (this.twitterForm) this.twitterForm.close();
+			}
+		}, {
+			deep: true
+		});
+	},
+
+	methods: {
+		connectTwitter() {
+			this.twitterForm = window.open(apiUrl + '/connect/twitter',
+				'twitter_connect_window',
+				'height=570, width=520');
+		},
+
+		disconnectTwitter() {
+			window.open(apiUrl + '/disconnect/twitter',
+				'twitter_disconnect_window',
+				'height=570, width=520');
+		},
+
+		connectDiscord() {
+			this.discordForm = window.open(apiUrl + '/connect/discord',
+				'discord_connect_window',
+				'height=570, width=520');
+		},
+
+		disconnectDiscord() {
+			window.open(apiUrl + '/disconnect/discord',
+				'discord_disconnect_window',
+				'height=570, width=520');
+		},
+
+		connectGithub() {
+			this.githubForm = window.open(apiUrl + '/connect/github',
+				'github_connect_window',
+				'height=570, width=520');
+		},
+
+		disconnectGithub() {
+			window.open(apiUrl + '/disconnect/github',
+				'github_disconnect_window',
+				'height=570, width=520');
+		},
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+</style>

src/client/app/common/views/components/language-settings.vue

@@ -0,0 +1,54 @@
+<template>
+<ui-card>
+	<div slot="title"><fa icon="language"/> {{ $t('title') }}</div>
+
+	<section class="fit-top">
+		<ui-select v-model="lang" :placeholder="$t('pick-language')">
+			<optgroup :label="$t('recommended')">
+				<option value="">{{ $t('auto') }}</option>
+			</optgroup>
+
+			<optgroup :label="$t('specify-language')">
+				<option v-for="x in langs" :value="x[0]" :key="x[0]">{{ x[1] }}</option>
+			</optgroup>
+		</ui-select>
+		<ui-info>Current: <i>{{ currentLanguage }}</i></ui-info>
+		<ui-info warn>{{ $t('info') }}</ui-info>
+	</section>
+</ui-card>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../i18n';
+import { langs } from '../../../config';
+
+export default Vue.extend({
+	i18n: i18n('common/views/components/language-settings.vue'),
+
+	data() {
+		return {
+			langs,
+			currentLanguage: 'Unknown',
+		};
+	},
+
+	computed: {
+		lang: {
+			get() { return this.$store.state.device.lang; },
+			set(value) { this.$store.commit('device/set', { key: 'lang', value }); }
+		},
+	},
+
+	created() {
+		try {
+			const locale = JSON.parse(localStorage.getItem('locale') || "{}");
+			const localeKey = localStorage.getItem('localeKey');
+			this.currentLanguage = `${locale.meta.lang} (${localeKey})`;
+		} catch { }
+	},
+
+	methods: {
+	}
+});
+</script>

src/client/app/common/views/components/menu.vue

@@ -1,5 +1,5 @@
 <template>
-<div class="onchrpzrvnoruiaenfcqvccjfuupzzwv">
+<div class="onchrpzrvnoruiaenfcqvccjfuupzzwv" :class="{ big: $root.isMobile }">
 	<div class="backdrop" ref="backdrop" @click="close"></div>
 	<div class="popover" :class="{ hukidasi }" ref="popover">
 		<template v-for="item, i in items">
@@ -125,6 +125,11 @@ export default Vue.extend({
 
 	position initial
 
+	&.big
+		> .popover
+			> button
+				font-size 15px
+
 	> .backdrop
 		position fixed
 		top 0
@@ -180,6 +185,7 @@ export default Vue.extend({
 			padding 8px 16px
 			width 100%
 			color var(--popupFg)
+			white-space nowrap
 
 			&:hover
 				color var(--primaryForeground)

src/client/app/common/views/components/messaging-room.message.vue

@@ -51,8 +51,8 @@ export default Vue.extend({
 			if (this.message.text) {
 				const ast = parse(this.message.text);
 				return unique(ast
-					.filter(t => (t.type == 'url' || t.type == 'link') && !t.silent)
-					.map(t => t.url));
+					.filter(t => ((t.name == 'url' || t.name == 'link') && t.props.url && !t.silent))
+					.map(t => t.props.url));
 			} else {
 				return null;
 			}

src/client/app/common/views/components/messaging.vue

@@ -115,9 +115,11 @@ export default Vue.extend({
 			}
 			this.$root.api('users/search', {
 				query: this.q,
-				max: 5
+				localOnly: true,
+				limit: 10,
+				detail: false
 			}).then(users => {
-				this.result = users;
+				this.result = users.filter(user => user.id != this.$store.state.i.id);
 			});
 		},
 		navigate(user) {

src/client/app/common/views/components/mfm.ts

@@ -9,18 +9,18 @@ import MkGoogle from './google.vue';
 import { toUnicode } from 'punycode';
 import syntaxHighlight from '../../../../../mfm/syntax-highlight';
 
-function getText(tokens: Node[]): string {
-	let text = '';
+function getTextCount(tokens: Node[]): number {
+	let count = 0;
 	const extract = (tokens: Node[]) => {
 		tokens.filter(x => x.name === 'text').forEach(x => {
-			text += x.props.text;
+			count += length(x.props.text);
 		});
 		tokens.filter(x => x.children).forEach(x => {
 			extract(x.children);
 		});
 	};
 	extract(tokens);
-	return text;
+	return count;
 }
 
 function getChildrenCount(tokens: Node[]): number {
@@ -49,6 +49,10 @@ export default Vue.component('misskey-flavored-markdown', {
 			type: Boolean,
 			default: true
 		},
+		plainText: {
+			type: Boolean,
+			default: false
+		},
 		author: {
 			type: Object,
 			default: null
@@ -69,7 +73,7 @@ export default Vue.component('misskey-flavored-markdown', {
 
 		if (this.ast == null) {
 			// Parse text to ast
-			ast = parse(this.text);
+			ast = parse(this.text, this.plainText);
 		} else {
 			ast = this.ast as Node[];
 		}
@@ -96,9 +100,21 @@ export default Vue.component('misskey-flavored-markdown', {
 					return [createElement('b', genEl(token.children))];
 				}
 
+				case 'strike': {
+					return [createElement('del', genEl(token.children))];
+				}
+
+				case 'italic': {
+					return (createElement as any)('i', {
+						attrs: {
+							style: 'font-style: oblique;'
+						},
+					}, genEl(token.children));
+				}
+
 				case 'big': {
 					bigCount++;
-					const isLong = length(getText(token.children)) > 10 || getChildrenCount(token.children) > 5;
+					const isLong = getTextCount(token.children) > 10 || getChildrenCount(token.children) > 5;
 					const isMany = bigCount > 3;
 					return (createElement as any)('strong', {
 						attrs: {
@@ -111,9 +127,21 @@ export default Vue.component('misskey-flavored-markdown', {
 					}, genEl(token.children));
 				}
 
+				case 'small': {
+					return [createElement('small', genEl(token.children))];
+				}
+
+				case 'center': {
+					return [createElement('div', {
+						attrs: {
+							style: 'text-align:center;'
+						}
+					}, genEl(token.children))];
+				}
+
 				case 'motion': {
 					motionCount++;
-					const isLong = length(getText(token.children)) > 10 || getChildrenCount(token.children) > 5;
+					const isLong = getTextCount(token.children) > 10 || getChildrenCount(token.children) > 5;
 					const isMany = motionCount > 3;
 					return (createElement as any)('span', {
 						attrs: {
@@ -230,7 +258,8 @@ export default Vue.component('misskey-flavored-markdown', {
 							name: token.props.name
 						},
 						props: {
-							customEmojis: this.customEmojis || customEmojis
+							customEmojis: this.customEmojis || customEmojis,
+							normal: this.plainText
 						}
 					})];
 				}

src/client/app/common/views/components/misskey-flavored-markdown.vue

@@ -29,7 +29,7 @@ export default Vue.extend({
 
 	>>> .quote
 		margin 8px
-		padding 6px 12px
+		padding 6px 0 6px 12px
 		color var(--mfmQuote)
 		border-left solid 3px var(--mfmQuoteLine)
 
@@ -38,7 +38,7 @@ export default Vue.extend({
 		margin 0 0.5em
 		font-size 80%
 		color #525252
-		background #f8f8f8
+		background rgba(0, 0, 0, 0.05)
 		border-radius 2px
 
 	>>> pre > code

src/client/app/common/views/components/mute-and-block.vue

@@ -72,7 +72,7 @@ export default Vue.extend({
 
 	methods: {
 		save() {
-			this._mutedWords = this.mutedWords.split('\n').map(line => line.split(' '));
+			this._mutedWords = this.mutedWords.split('\n').map(line => line.split(' ').filter(x => x != ''));
 		}
 	}
 });

src/client/app/common/views/components/note-header.vue

@@ -1,7 +1,9 @@
 <template>
 <header class="bvonvjxbwzaiskogyhbwgyxvcgserpmu">
 	<mk-avatar class="avatar" :user="note.user" v-if="$store.state.device.postStyle == 'smart'"/>
-	<router-link class="name" :to="note.user | userPage" v-user-preview="note.user.id">{{ note.user | userName }}</router-link>
+	<router-link class="name" :to="note.user | userPage" v-user-preview="note.user.id">
+		<mk-user-name :user="note.user"/>
+	</router-link>
 	<span class="is-admin" v-if="note.user.isAdmin">admin</span>
 	<span class="is-bot" v-if="note.user.isBot">bot</span>
 	<span class="is-cat" v-if="note.user.isCat">cat</span>

src/client/app/common/views/components/note-menu.vue

@@ -78,7 +78,7 @@ export default Vue.extend({
 			this.$root.api('i/pin', {
 				noteId: this.note.id
 			}).then(() => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'success',
 					splash: true
 				});
@@ -95,12 +95,12 @@ export default Vue.extend({
 		},
 
 		del() {
-			this.$root.alert({
+			this.$root.dialog({
 				type: 'warning',
 				text: this.$t('delete-confirm'),
 				showCancelButton: true
-			}).then(res => {
-				if (!res) return;
+			}).then(({ canceled }) => {
+				if (canceled) return;
 
 				this.$root.api('notes/delete', {
 					noteId: this.note.id
@@ -114,7 +114,7 @@ export default Vue.extend({
 			this.$root.api('notes/favorites/create', {
 				noteId: this.note.id
 			}).then(() => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'success',
 					splash: true
 				});
@@ -126,7 +126,7 @@ export default Vue.extend({
 			this.$root.api('notes/favorites/delete', {
 				noteId: this.note.id
 			}).then(() => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'success',
 					splash: true
 				});

src/client/app/common/views/components/password-settings.vue

@@ -11,34 +11,43 @@ import i18n from '../../../i18n';
 export default Vue.extend({
 	i18n: i18n('common/views/components/password-settings.vue'),
 	methods: {
-		reset() {
-			this.$input({
+		async reset() {
+			const { canceled: canceled1, result: currentPassword } = await this.$root.dialog({
 				title: this.$t('enter-current-password'),
-				type: 'password'
-			}).then(currentPassword => {
-				this.$input({
-					title: this.$t('enter-new-password'),
+				input: {
 					type: 'password'
-				}).then(newPassword => {
-					this.$input({
-						title: this.$t('enter-new-password-again'),
-						type: 'password'
-					}).then(newPassword2 => {
-						if (newPassword !== newPassword2) {
-							this.$root.alert({
-								title: null,
-								text: this.$t('not-match')
-							});
-							return;
-						}
-						this.$root.api('i/change_password', {
-							currentPasword: currentPassword,
-							newPassword: newPassword
-						}).then(() => {
-							this.$notify(this.$t('changed'));
-						});
-					});
+				}
+			});
+			if (canceled1) return;
+
+			const { canceled: canceled2, result: newPassword } = await this.$root.dialog({
+				title: this.$t('enter-new-password'),
+				input: {
+					type: 'password'
+				}
+			});
+			if (canceled2) return;
+
+			const { canceled: canceled3, result: newPassword2 } = await this.$root.dialog({
+				title: this.$t('enter-new-password-again'),
+				input: {
+					type: 'password'
+				}
+			});
+			if (canceled3) return;
+
+			if (newPassword !== newPassword2) {
+				this.$root.dialog({
+					title: null,
+					text: this.$t('not-match')
 				});
+				return;
+			}
+			this.$root.api('i/change_password', {
+				currentPasword: currentPassword,
+				newPassword: newPassword
+			}).then(() => {
+				this.$notify(this.$t('changed'));
 			});
 		}
 	}

src/client/app/common/views/components/profile-editor.vue

@@ -32,6 +32,12 @@
 				<span>{{ $t('description') }}</span>
 			</ui-textarea>
 
+			<ui-select v-model="lang">
+				<span slot="label">{{ $t('language') }}</span>
+				<span slot="icon"><fa icon="language"/></span>
+				<option v-for="lang in unique(Object.values(langmap).map(x => x.nativeName)).map(name => Object.keys(langmap).find(k => langmap[k].nativeName == name))" :value="lang" :key="lang">{{ langmap[lang].nativeName }}</option>
+			</ui-select>
+
 			<ui-input type="file" @change="onAvatarChange">
 				<span>{{ $t('avatar') }}</span>
 				<span slot="icon"><fa icon="image"/></span>
@@ -66,6 +72,19 @@
 			<ui-switch v-model="carefulBot" @change="save(false)">{{ $t('careful-bot') }}</ui-switch>
 		</div>
 	</section>
+
+	<section v-if="enableEmail">
+		<header>{{ $t('email') }}</header>
+
+		<div>
+			<template v-if="$store.state.i.email != null">
+				<ui-info v-if="$store.state.i.emailVerified">{{ $t('email-verified') }}</ui-info>
+				<ui-info v-else warn>{{ $t('email-not-verified') }}</ui-info>
+			</template>
+			<ui-input v-model="email" type="email"><span>{{ $t('email-address') }}</span></ui-input>
+			<ui-button @click="updateEmail()">{{ $t('save') }}</ui-button>
+		</div>
+	</section>
 </ui-card>
 </template>
 
@@ -74,16 +93,24 @@ import Vue from 'vue';
 import i18n from '../../../i18n';
 import { apiUrl, host } from '../../../config';
 import { toUnicode } from 'punycode';
+import langmap from 'langmap';
+import { unique } from '../../../../../prelude/array';
 
 export default Vue.extend({
 	i18n: i18n('common/views/components/profile-editor.vue'),
+
 	data() {
 		return {
+			unique,
+			langmap,
 			host: toUnicode(host),
+			enableEmail: false,
+			email: null,
 			name: null,
 			username: null,
 			location: null,
 			description: null,
+			lang: null,
 			birthday: null,
 			avatarId: null,
 			bannerId: null,
@@ -113,10 +140,15 @@ export default Vue.extend({
 	},
 
 	created() {
-		this.name = this.$store.state.i.name || '';
+		this.$root.getMeta().then(meta => {
+			this.enableEmail = meta.enableEmail;
+		});
+		this.email = this.$store.state.i.email;
+		this.name = this.$store.state.i.name;
 		this.username = this.$store.state.i.username;
 		this.location = this.$store.state.i.profile.location;
 		this.description = this.$store.state.i.description;
+		this.lang = this.$store.state.i.lang;
 		this.birthday = this.$store.state.i.profile.birthday;
 		this.avatarId = this.$store.state.i.avatarId;
 		this.bannerId = this.$store.state.i.bannerId;
@@ -178,9 +210,10 @@ export default Vue.extend({
 				name: this.name || null,
 				location: this.location || null,
 				description: this.description || null,
+				lang: this.lang,
 				birthday: this.birthday || null,
-				avatarId: this.avatarId,
-				bannerId: this.bannerId,
+				avatarId: this.avatarId || undefined,
+				bannerId: this.bannerId || undefined,
 				isCat: !!this.isCat,
 				isBot: !!this.isBot,
 				isLocked: !!this.isLocked,
@@ -193,12 +226,27 @@ export default Vue.extend({
 				this.$store.state.i.bannerUrl = i.bannerUrl;
 
 				if (notify) {
-					this.$root.alert({
+					this.$root.dialog({
 						type: 'success',
 						text: this.$t('saved')
 					});
 				}
 			});
+		},
+
+		updateEmail() {
+			this.$root.dialog({
+				title: this.$t('@.enter-password'),
+				input: {
+					type: 'password'
+				}
+			}).then(({ canceled, result: password }) => {
+				if (canceled) return;
+				this.$root.api('i/update_email', {
+					password: password,
+					email: this.email == '' ? null : this.email
+				});
+			});
 		}
 	}
 });

src/client/app/common/views/components/renote.vue

@@ -3,7 +3,9 @@
 	<mk-avatar class="avatar" :user="note.user"/>
 	<fa icon="retweet"/>
 	<i18n path="@.renoted-by" tag="span">
-		<router-link class="name" :to="note.user | userPage" v-user-preview="note.userId" place="user">{{ note.user | userName }}</router-link>
+		<router-link class="name" :to="note.user | userPage" v-user-preview="note.userId" place="user">
+			<mk-user-name :user="note.user"/>
+		</router-link>
 	</i18n>
 	<div class="info">
 		<span class="mobile" v-if="note.viaMobile"><fa icon="mobile-alt"/></span>

src/client/app/common/views/components/signin.vue

@@ -67,7 +67,8 @@ export default Vue.extend({
 				username: this.username,
 				password: this.password,
 				token: this.user && this.user.twoFactorEnabled ? this.token : undefined
-			}, true).then(() => {
+			}, true).then(res => {
+				localStorage.setItem('i', res.i);
 				location.reload();
 			}).catch(() => {
 				alert(this.$t('login-failed'));

src/client/app/common/views/components/theme.vue

@@ -223,7 +223,7 @@ export default Vue.extend({
 			try {
 				theme = JSON5.parse(code);
 			} catch (e) {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'error',
 					text: this.$t('invalid-theme')
 				});
@@ -236,7 +236,7 @@ export default Vue.extend({
 			}
 
 			if (theme.id == null) {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'error',
 					text: this.$t('invalid-theme')
 				});
@@ -244,7 +244,7 @@ export default Vue.extend({
 			}
 
 			if (this.$store.state.device.themes.some(t => t.id == theme.id)) {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'info',
 					text: this.$t('already-installed')
 				});
@@ -256,7 +256,7 @@ export default Vue.extend({
 				key: 'themes', value: themes
 			});
 
-			this.$root.alert({
+			this.$root.dialog({
 				type: 'success',
 				text: this.$t('installed').replace('{}', theme.name)
 			});
@@ -269,7 +269,7 @@ export default Vue.extend({
 				key: 'themes', value: themes
 			});
 
-			this.$root.alert({
+			this.$root.dialog({
 				type: 'info',
 				text: this.$t('uninstalled').replace('{}', theme.name)
 			});
@@ -306,7 +306,7 @@ export default Vue.extend({
 			const theme = this.myTheme;
 
 			if (theme.name == null || theme.name.trim() == '') {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'warning',
 					text: this.$t('theme-name-required')
 				});
@@ -320,7 +320,7 @@ export default Vue.extend({
 				key: 'themes', value: themes
 			});
 
-			this.$root.alert({
+			this.$root.dialog({
 				type: 'success',
 				text: this.$t('saved')
 			});

src/client/app/common/views/components/twitter-setting.vue

@@ -1,65 +0,0 @@
-<template>
-<div class="mk-twitter-setting">
-	<p>{{ $t('description') }}</p>
-	<p class="account" v-if="$store.state.i.twitter" :title="`Twitter ID: ${$store.state.i.twitter.userId}`">{{ $t('connected-to') }}: <a :href="`https://twitter.com/${$store.state.i.twitter.screenName}`" target="_blank">@{{ $store.state.i.twitter.screenName }}</a></p>
-	<p>
-		<a :href="`${apiUrl}/connect/twitter`" target="_blank" @click.prevent="connect">{{ $store.state.i.twitter ? this.$t('reconnect') : this.$t('connect') }}</a>
-		<span v-if="$store.state.i.twitter"> or </span>
-		<a :href="`${apiUrl}/disconnect/twitter`" target="_blank" v-if="$store.state.i.twitter" @click.prevent="disconnect">{{ $t('disconnect') }}</a>
-	</p>
-	<p class="id" v-if="$store.state.i.twitter">Twitter ID: {{ $store.state.i.twitter.userId }}</p>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-import i18n from '../../../i18n';
-import { apiUrl } from '../../../config';
-
-export default Vue.extend({
-	i18n: i18n('common/views/components/twitter-setting.vue'),
-	data() {
-		return {
-			form: null,
-			apiUrl
-		};
-	},
-	mounted() {
-		this.$watch('$store.state.i', () => {
-			if (this.$store.state.i.twitter) {
-				if (this.form) this.form.close();
-			}
-		}, {
-			deep: true
-		});
-	},
-	methods: {
-		connect() {
-			this.form = window.open(apiUrl + '/connect/twitter',
-				'twitter_connect_window',
-				'height=570, width=520');
-		},
-
-		disconnect() {
-			window.open(apiUrl + '/disconnect/twitter',
-				'twitter_disconnect_window',
-				'height=570, width=520');
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-.mk-twitter-setting
-	.account
-		border solid 1px #e1e8ed
-		border-radius 4px
-		padding 16px
-
-		a
-			font-weight bold
-			color inherit
-
-	.id
-		color #8899a6
-</style>

src/client/app/common/views/components/ui/button.vue

@@ -4,8 +4,12 @@
 	:class="[styl, { inline, primary }]"
 	:type="type"
 	@click="$emit('click')"
+	@mousedown="onMousedown"
 >
-	<slot></slot>
+	<div ref="ripples" class="ripples"></div>
+	<div class="content">
+		<slot></slot>
+	</div>
 </component>
 </template>
 
@@ -56,6 +60,47 @@ export default Vue.extend({
 				this.$el.focus();
 			});
 		}
+	},
+	methods: {
+		onMousedown(e: MouseEvent) {
+			function distance(p, q) {
+				const sqrt = Math.sqrt, pow = Math.pow;
+				return sqrt(pow(p.x - q.x, 2) + pow(p.y - q.y, 2));
+			}
+
+			function calcCircleScale(boxW, boxH, circleCenterX, circleCenterY) {
+				const origin = {x: circleCenterX, y: circleCenterY};
+				const dist1 = distance({x: 0, y: 0}, origin);
+				const dist2 = distance({x: boxW, y: 0}, origin);
+				const dist3 = distance({x: 0, y: boxH}, origin);
+				const dist4 = distance({x: boxW, y: boxH }, origin);
+				return Math.max(dist1, dist2, dist3, dist4) * 2;
+			}
+
+			const rect = e.target.getBoundingClientRect();
+
+			const ripple = document.createElement('div');
+			ripple.style.top = (e.clientY - rect.top - 1).toString() + 'px';
+			ripple.style.left = (e.clientX - rect.left - 1).toString() + 'px';
+
+			this.$refs.ripples.appendChild(ripple);
+
+			const circleCenterX = e.clientX - rect.left;
+			const circleCenterY = e.clientY - rect.top;
+
+			const scale = calcCircleScale(e.target.clientWidth, e.target.clientHeight, circleCenterX, circleCenterY);
+
+			setTimeout(() => {
+				ripple.style.transform = 'scale(' + (scale / 2) + ')';
+			}, 1);
+			setTimeout(() => {
+				ripple.style.transition = 'all 1s ease';
+				ripple.style.opacity = '0';
+			}, 1000);
+			setTimeout(() => {
+				if (this.$refs.ripples) this.$refs.ripples.removeChild(ripple);
+			}, 2000);
+		}
 	}
 });
 </script>
@@ -79,6 +124,10 @@ export default Vue.extend({
 
 	*
 		pointer-events none
+		user-select none
+
+	&:disabled
+		opacity 0.7
 
 	&:focus
 		&:after
@@ -107,30 +156,56 @@ export default Vue.extend({
 		color var(--text)
 		background var(--buttonBg)
 
-		&:hover
+		&:not(:disabled):hover
 			background var(--buttonHoverBg)
 
-		&:active
+		&:not(:disabled):active
 			background var(--buttonActiveBg)
 
 		&.primary
 			color var(--primaryForeground)
 			background var(--primary)
 
-			&:hover
+			&:not(:disabled):hover
 				background var(--primaryLighten5)
 
-			&:active
+			&:not(:disabled):active
 				background var(--primaryDarken5)
 
 	&:not(.fill)
 		color var(--primary)
 		background none
 
-		&:hover
+		&:not(:disabled):hover
 			color var(--primaryDarken5)
 
-		&:active
+		&:not(:disabled):active
 			background var(--primaryAlpha03)
 
+	> .ripples
+		position absolute
+		z-index 0
+		top 0
+		left 0
+		width 100%
+		height 100%
+		border-radius 6px
+		overflow hidden
+
+		>>> div
+			position absolute
+			width 2px
+			height 2px
+			border-radius 100%
+			background rgba(0, 0, 0, 0.1)
+			opacity 1
+			transform scale(1)
+			transition all 0.5s cubic-bezier(0, .5, .5, 1)
+
+	&.primary > .ripples >>> div
+		background rgba(0, 0, 0, 0.15)
+
+	> .content
+		z-index 1
+
 </style>

src/client/app/common/views/components/ui/card.vue

@@ -22,6 +22,7 @@ export default Vue.extend({
 <style lang="stylus" scoped>
 .ui-card
 	margin 16px
+	max-width 850px
 	color var(--faceText)
 	background var(--face)
 	border-radius var(--round)

src/client/app/common/views/components/ui/horizon-group.vue

@@ -27,15 +27,25 @@ export default Vue.extend({
 
 <style lang="stylus" scoped>
 .vnxwkwuf
+	margin 16px 0
+
 	&.inputs
 		margin 32px 0
 
+	&.fit-top
+		margin-top 0
+
+	&.fit-bottom
+		margin-bottom 0
+
 	&:not(.noGrow)
 		display flex
 
 		> *
 			flex 1
+			min-width 0 !important
 
 	> *:not(:last-child)
-		margin-right 16px
+		margin-right 16px !important
+
 </style>

src/client/app/common/views/components/ui/input.vue

@@ -9,27 +9,32 @@
 		<div class="prefix" ref="prefix"><slot name="prefix"></slot></div>
 		<template v-if="type != 'file'">
 			<input ref="input"
-					:type="type"
-					v-model="v"
-					:disabled="disabled"
-					:required="required"
-					:readonly="readonly"
-					:pattern="pattern"
-					:autocomplete="autocomplete"
-					:spellcheck="spellcheck"
-					@focus="focused = true"
-					@blur="focused = false">
+				:type="type"
+				v-model="v"
+				:disabled="disabled"
+				:required="required"
+				:readonly="readonly"
+				:placeholder="placeholder"
+				:pattern="pattern"
+				:autocomplete="autocomplete"
+				:spellcheck="spellcheck"
+				@focus="focused = true"
+				@blur="focused = false"
+				@keydown="$emit('keydown', $event)"
+			>
 		</template>
 		<template v-else>
 			<input ref="input"
-					type="text"
-					:value="placeholder"
-					readonly
-					@click="chooseFile">
+				type="text"
+				:value="filePlaceholder"
+				readonly
+				@click="chooseFile"
+			>
 			<input ref="file"
-					type="file"
-					:value="value"
-					@change="onChangeFile">
+				type="file"
+				:value="value"
+				@change="onChangeFile"
+			>
 		</template>
 		<div class="suffix" ref="suffix"><slot name="suffix"></slot></div>
 	</div>
@@ -71,6 +76,15 @@ export default Vue.extend({
 			type: String,
 			required: false
 		},
+		placeholder: {
+			type: String,
+			required: false
+		},
+		autofocus: {
+			type: Boolean,
+			required: false,
+			default: false
+		},
 		autocomplete: {
 			required: false
 		},
@@ -106,7 +120,7 @@ export default Vue.extend({
 		filled(): boolean {
 			return this.v != '' && this.v != null;
 		},
-		placeholder(): string {
+		filePlaceholder(): string {
 			if (this.type != 'file') return null;
 			if (this.v == null) return null;
 
@@ -139,6 +153,12 @@ export default Vue.extend({
 		}
 	},
 	mounted() {
+		if (this.autofocus) {
+			this.$nextTick(() => {
+				this.$refs.input.focus();
+			});
+		}
+
 		this.$nextTick(() => {
 			if (this.$refs.prefix) {
 				this.$refs.label.style.left = (this.$refs.prefix.offsetLeft + this.$refs.prefix.offsetWidth) + 'px';
@@ -325,6 +345,9 @@ root(fill)
 		margin 6px 0
 		font-size 13px
 
+		&:empty
+			display none
+
 		*
 			margin 0
 

src/client/app/common/views/components/ui/select.vue

@@ -1,15 +1,17 @@
 <template>
-<div class="ui-select" :class="[{ focused, filled }, styl]">
+<div class="ui-select" :class="[{ focused, disabled, filled, inline }, styl]">
 	<div class="icon" ref="icon"><slot name="icon"></slot></div>
 	<div class="input" @click="focus">
 		<span class="label" ref="label"><slot name="label"></slot></span>
 		<div class="prefix" ref="prefix"><slot name="prefix"></slot></div>
 		<select ref="input"
-				:value="v"
-				:required="required"
-				@input="$emit('input', $event.target.value)"
-				@focus="focused = true"
-				@blur="focused = false">
+			:value="v"
+			:required="required"
+			:disabled="disabled"
+			@input="$emit('input', $event.target.value)"
+			@focus="focused = true"
+			@blur="focused = false"
+		>
 			<slot></slot>
 		</select>
 		<div class="suffix"><slot name="suffix"></slot></div>
@@ -22,6 +24,11 @@
 import Vue from 'vue';
 
 export default Vue.extend({
+	inject: {
+		horizonGrouped: {
+			default: false
+		}
+	},
 	props: {
 		value: {
 			required: false
@@ -30,11 +37,22 @@ export default Vue.extend({
 			type: Boolean,
 			required: false
 		},
+		disabled: {
+			type: Boolean,
+			required: false
+		},
 		styl: {
 			type: String,
 			required: false,
 			default: 'line'
-		}
+		},
+		inline: {
+			type: Boolean,
+			required: false,
+			default(): boolean {
+				return this.horizonGrouped;
+			}
+		},
 	},
 	data() {
 		return {
@@ -76,7 +94,7 @@ root(fill)
 		width 24px
 		text-align center
 		line-height 32px
-		color rgba(#000, 0.54)
+		color var(--inputLabel)
 
 		&:not(:empty) + .input
 			margin-left 28px
@@ -122,7 +140,7 @@ root(fill)
 			transition-duration 0.3s
 			font-size 16px
 			line-height 32px
-			color rgba(#000, 0.54)
+			color var(--inputLabel)
 			pointer-events none
 			//will-change transform
 			transform-origin top left
@@ -171,6 +189,9 @@ root(fill)
 		margin 6px 0
 		font-size 13px
 
+		&:empty
+			display none
+
 		*
 			margin 0
 
@@ -200,4 +221,14 @@ root(fill)
 	&:not(.fill)
 		root(false)
 
+	&.inline
+		display inline-block
+		margin 0
+
+	&.disabled
+		opacity 0.7
+
+		&, *
+			cursor not-allowed !important
+
 </style>

src/client/app/common/views/components/ui/switch.vue

@@ -123,7 +123,7 @@ export default Vue.extend({
 		> span
 			display block
 			line-height 20px
-			color currentColor
+			color var(--text)
 			transition inherit
 
 		> p

src/client/app/common/views/components/user-name.vue

@@ -0,0 +1,16 @@
+<template>
+<misskey-flavored-markdown :text="user.name || user.username" :should-break="false" :plain-text="true" :custom-emojis="user.emojis"/>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	props: {
+		user: {
+			type: Object,
+			required: true
+		}
+	}
+});
+</script>

src/client/app/common/views/components/welcome-timeline.vue

@@ -5,7 +5,9 @@
 			<mk-avatar class="avatar" :user="note.user" target="_blank"/>
 			<div class="body">
 				<header>
-					<router-link class="name" :to="note.user | userPage" v-user-preview="note.user.id">{{ note.user | userName }}</router-link>
+					<router-link class="name" :to="note.user | userPage" v-user-preview="note.user.id">
+						<mk-user-name :user="note.user"/>
+					</router-link>
 					<span class="username">@{{ note.user | acct }}</span>
 					<div class="info">
 						<router-link class="created-at" :to="note | notePage">

src/client/app/common/views/filters/index.ts

@@ -1,3 +1,10 @@
+import Vue from 'vue';
+import * as JSON5 from 'json5';
+
+Vue.filter('json5', x => {
+	return JSON5.stringify(x, null, 2);
+});
+
 require('./bytes');
 require('./number');
 require('./user');

src/client/app/common/views/filters/user.ts

@@ -1,6 +1,7 @@
 import Vue from 'vue';
 import getAcct from '../../../../../misc/acct/render';
 import getUserName from '../../../../../misc/get-user-name';
+import { url } from '../../../config';
 
 Vue.filter('acct', user => {
 	return getAcct(user);
@@ -10,6 +11,6 @@ Vue.filter('userName', user => {
 	return getUserName(user);
 });
 
-Vue.filter('userPage', (user, path?) => {
-	return `/@${Vue.filter('acct')(user)}${(path ? `/${path}` : '')}`;
+Vue.filter('userPage', (user, path?, absolute = false) => {
+	return `${absolute ? url : ''}/@${Vue.filter('acct')(user)}${(path ? `/${path}` : '')}`;
 });

src/client/app/common/views/pages/follow.vue

@@ -6,10 +6,12 @@
 		<div class="banner" :style="bannerStyle"></div>
 		<mk-avatar class="avatar" :user="user" :disable-preview="true"/>
 		<div class="body">
-			<router-link :to="user | userPage" class="name">{{ user | userName }}</router-link>
+			<router-link :to="user | userPage" class="name">
+				<mk-user-name :user="user"/>
+			</router-link>
 			<span class="username">@{{ user | acct }}</span>
 			<div class="description">
-				<misskey-flavored-markdown v-if="user.description" :text="user.description" :author="user" :i="$store.state.i"/>
+				<misskey-flavored-markdown v-if="user.description" :text="user.description" :author="user" :i="$store.state.i" :custom-emojis="user.emojis"/>
 			</div>
 		</div>
 	</main>

src/client/app/common/views/widgets/donation.vue

@@ -1,56 +0,0 @@
-<template>
-<div>
-	<mk-widget-container :show-header="false">
-		<article class="dolfvtibguprpxxhfndqaosjitixjohx">
-			<h1><fa icon="heart"/>{{ $t('title') }}</h1>
-			<p v-if="meta">
-				{{ this.$t('text').substr(0, this.$t('text').indexOf('{')) }}
-				<a :href="'mailto:' + meta.maintainer.email">{{ meta.maintainer.name }}</a>
-				{{ this.$t('text').substr(this.$t('text').indexOf('}') + 1) }}
-			</p>
-		</article>
-	</mk-widget-container>
-</div>
-</template>
-
-<script lang="ts">
-import define from '../../../common/define-widget';
-import i18n from '../../../i18n';
-
-export default define({
-	name: 'donation'
-}).extend({
-	i18n: i18n('common/views/widgets/donation.vue'),
-	data() {
-		return {
-			meta: null
-		};
-	},
-	created() {
-		this.$root.getMeta().then(meta => {
-			this.meta = meta;
-		});
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-.dolfvtibguprpxxhfndqaosjitixjohx
-	padding 20px
-	background var(--donationBg)
-	color var(--donationFg)
-
-	> h1
-		margin 0 0 5px 0
-		font-size 1em
-
-		> [data-icon]
-			margin-right 0.25em
-
-	> p
-		display block
-		z-index 1
-		margin 0
-		font-size 0.8em
-
-</style>

src/client/app/common/views/widgets/index.ts

@@ -11,7 +11,6 @@ import wCalendar from './calendar.vue';
 import wPhotoStream from './photo-stream.vue';
 import wSlideshow from './slideshow.vue';
 import wTips from './tips.vue';
-import wDonation from './donation.vue';
 import wNav from './nav.vue';
 import wHashtags from './hashtags.vue';
 
@@ -21,7 +20,6 @@ Vue.component('mkw-calendar', wCalendar);
 Vue.component('mkw-photo-stream', wPhotoStream);
 Vue.component('mkw-slideshow', wSlideshow);
 Vue.component('mkw-tips', wTips);
-Vue.component('mkw-donation', wDonation);
 Vue.component('mkw-broadcast', wBroadcast);
 Vue.component('mkw-server', wServer);
 Vue.component('mkw-posts-monitor', wPostsMonitor);

src/client/app/common/views/widgets/photo-stream.vue

@@ -10,7 +10,6 @@
 				:style="`background-image: url(${image.thumbnailUrl || image.url})`"
 				draggable="true"
 				@dragstart="onDragstart(image, $event)"
-				@dragend="onDragend"
 			></div>
 		</div>
 		<p :class="$style.empty" v-if="!fetching && images.length == 0">{{ $t('no-photos') }}</p>
@@ -78,10 +77,6 @@ export default define({
 			e.dataTransfer.effectAllowed = 'move';
 			e.dataTransfer.setData('mk_drive_file', JSON.stringify(file));
 		},
-
-		onDragend(e) {
-			this.browser.isDragSource = false;
-		},
 	}
 });
 </script>

src/client/app/desktop/api/update-avatar.ts

@@ -8,7 +8,7 @@ export default ($root: any) => {
 
 		const regex = RegExp('\.(jpg|jpeg|png|gif|webp|bmp|tiff)$');
 		if (!regex.test(file.name) ) {
-			$root.alert({
+			$root.dialog({
 				title: '%fa:info-circle% %i18n:desktop.invalid-filetype%',
 				text: null
 			});
@@ -87,7 +87,7 @@ export default ($root: any) => {
 				value: i.avatarUrl
 			});
 
-			$root.alert({
+			$root.dialog({
 				title: '%fa:info-circle% %i18n:desktop.avatar-updated%',
 				text: null
 			});

src/client/app/desktop/api/update-banner.ts

@@ -87,7 +87,7 @@ export default ($root: any) => {
 				value: i.bannerUrl
 			});
 
-			$root.alert({
+			$root.dialog({
 				title: '%fa:info-circle% %i18n:desktop.banner-updated%',
 				text: null
 			});

src/client/app/desktop/script.ts

@@ -34,7 +34,6 @@ import PostFormWindow from './views/components/post-form-window.vue';
 import RenoteFormWindow from './views/components/renote-form-window.vue';
 import MkChooseFileFromDriveWindow from './views/components/choose-file-from-drive-window.vue';
 import MkChooseFolderFromDriveWindow from './views/components/choose-folder-from-drive-window.vue';
-import InputDialog from './views/components/input-dialog.vue';
 import Notification from './views/components/ui-notification.vue';
 
 import { url } from '../config';
@@ -113,22 +112,6 @@ init(async (launch) => {
 				});
 			},
 
-			$input(opts) {
-				return new Promise<string>((res, rej) => {
-					const o = opts || {};
-					const d = this.$root.new(InputDialog, {
-						title: o.title,
-						placeholder: o.placeholder,
-						default: o.default,
-						type: o.type || 'text',
-						allowEmpty: o.allowEmpty
-					});
-					d.$once('done', text => {
-						res(text);
-					});
-				});
-			},
-
 			$notify(message) {
 				this.$root.new(Notification, {
 					message

src/client/app/desktop/views/components/drive.file.vue

@@ -148,12 +148,15 @@ export default Vue.extend({
 		},
 
 		rename() {
-			this.$input({
+			this.$root.dialog({
 				title: this.$t('contextmenu.rename-file'),
-				placeholder: this.$t('contextmenu.input-new-file-name'),
-				default: this.file.name,
-				allowEmpty: false
-			}).then(name => {
+				input: {
+					placeholder: this.$t('contextmenu.input-new-file-name'),
+					default: this.file.name,
+					allowEmpty: false
+				}
+			}).then(({ canceled, result: name }) => {
+				if (canceled) return;
 				this.$root.api('drive/files/update', {
 					fileId: this.file.id,
 					name: name
@@ -170,7 +173,7 @@ export default Vue.extend({
 
 		copyUrl() {
 			copyToClipboard(this.file.url);
-			this.$root.alert({
+			this.$root.dialog({
 				title: this.$t('contextmenu.copied'),
 				text: this.$t('contextmenu.copied-url-to-clipboard')
 			});

src/client/app/desktop/views/components/drive.folder.vue

@@ -155,7 +155,7 @@ export default Vue.extend({
 				}).catch(err => {
 					switch (err) {
 						case 'detected-circular-definition':
-							this.$root.alert({
+							this.$root.dialog({
 								title: this.$t('unable-to-process'),
 								text: this.$t('circular-reference-detected')
 							});
@@ -192,11 +192,14 @@ export default Vue.extend({
 		},
 
 		rename() {
-			this.$input({
+			this.$root.dialog({
 				title: this.$t('contextmenu.rename-folder'),
-				placeholder: this.$t('contextmenu.input-new-folder-name'),
-				default: this.folder.name
-			}).then(name => {
+				input: {
+					placeholder: this.$t('contextmenu.input-new-folder-name'),
+					default: this.folder.name
+				}
+			}).then(({ canceled, result: name }) => {
+				if (canceled) return;
 				this.$root.api('drive/folders/update', {
 					folderId: this.folder.id,
 					name: name

src/client/app/desktop/views/components/drive.vue

@@ -313,7 +313,7 @@ export default Vue.extend({
 				}).catch(err => {
 					switch (err) {
 						case 'detected-circular-definition':
-							this.$root.alert({
+							this.$root.dialog({
 								title: this.$t('unable-to-process'),
 								text: this.$t('circular-reference-detected')
 							});
@@ -331,16 +331,19 @@ export default Vue.extend({
 		},
 
 		urlUpload() {
-			this.$input({
+			this.$root.dialog({
 				title: this.$t('url-upload'),
-				placeholder: this.$t('url-of-file')
-			}).then(url => {
+				input: {
+					placeholder: this.$t('url-of-file')
+				}
+			}).then(({ canceled, result: url }) => {
+				if (canceled) return;
 				this.$root.api('drive/files/upload_from_url', {
 					url: url,
 					folderId: this.folder ? this.folder.id : undefined
 				});
 
-				this.$root.alert({
+				this.$root.dialog({
 					title: this.$t('url-upload-requested'),
 					text: this.$t('may-take-time')
 				});
@@ -348,10 +351,13 @@ export default Vue.extend({
 		},
 
 		createFolder() {
-			this.$input({
+			this.$root.dialog({
 				title: this.$t('create-folder'),
-				placeholder: this.$t('folder-name')
-			}).then(name => {
+				input: {
+					placeholder: this.$t('folder-name')
+				}
+			}).then(({ canceled, result: name }) => {
+				if (canceled) return;
 				this.$root.api('drive/folders/create', {
 					name: name,
 					parentId: this.folder ? this.folder.id : undefined

src/client/app/desktop/views/components/friends-maker.vue

@@ -5,7 +5,9 @@
 		<div class="user" v-for="user in users" :key="user.id">
 			<mk-avatar class="avatar" :user="user" target="_blank"/>
 			<div class="body">
-				<router-link class="name" :to="user | userPage" v-user-preview="user.id">{{ user | userName }}</router-link>
+				<router-link class="name" :to="user | userPage" v-user-preview="user.id">
+					<mk-user-name :user="user"/>
+				</router-link>
 				<p class="username">@{{ user | acct }}</p>
 			</div>
 		</div>