Merge branch 'master' of https://github.com/syuilo/misskey

2.17.0
Merge pull request #1645 from syuilo/l10n_master
2018-05-25 21:21:45 +09:00 · 2018-05-25 21:21:37 +09:00 · 2018-05-25 21:21:13 +09:00 · 2018-05-25 21:20:32 +09:00 · 2018-05-25 21:05:16 +09:00 · 2018-05-25 20:53:27 +09:00
73 changed files with 1920 additions and 837 deletions
--- a/.eslintrc
+++ b/.eslintrc
@ -22,6 +22,7 @@
 	"globals": {
 		"ENV": true,
 		"VERSION": true,
-		"API": true
+		"API": true,
+		"LANGS": true
 	}
 }
--- a/.gitignore
+++ b/.gitignore
@ -5,6 +5,7 @@
 /build
 /built
 /data
+/.cache-loader
 npm-debug.log
 *.pem
 run.bat
--- a/.travis.yml
+++ b/.travis.yml
@ -4,6 +4,10 @@
 notifications:
  email: false

+branches:
+  except:
+    - l10n_master
+
 language: node_js

 node_js:
--- a/assets/title-dark.svg
+++ b/assets/title-dark.svg
@ -0,0 +1,140 @@
+<?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="614.71039"
+   height="205.08009"
+   viewBox="0 0 162.64213 54.260776"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="misskey.svg"
+   inkscape:export-filename="C:\Users\Takumiya_Cho\Desktop\misskey.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <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-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="0.9899495"
+     inkscape:cx="370.82839"
+     inkscape:cy="79.043895"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     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="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="1072"
+     inkscape:window-maximized="1"
+     inkscape:object-paths="true"
+     inkscape:bbox-paths="true"
+     fit-margin-top="50"
+     fit-margin-left="50"
+     fit-margin-bottom="20"
+     fit-margin-right="50" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="レイヤー 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-11.097531,-173.29664)">
+    <g
+       transform="matrix(0.28612302,0,0,0.28612302,17.176981,141.74334)"
+       id="text4489-6"
+       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:#fff;fill-opacity:1;stroke:none;stroke-width:0.92471898px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       aria-label="Mi">
+      <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:#fff;fill-opacity:1;stroke-width:0.92471898px"
+         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:#fff;fill-opacity:1;stroke-width:0.92471898px"
+         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" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       id="path5199"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:136.34428406px;font-family:'OTADESIGN Rounded';-inkscape-font-specification:'OTADESIGN Rounded';letter-spacing:0px;word-spacing:0px;fill:#fff;fill-opacity:1;stroke:none;stroke-width:0.26458335px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 72.022691,200.53715 q 0.968125,0.24203 2.420312,0.5244 2.420313,0.40339 3.791824,1.29083 2.581666,1.69422 2.581666,5.08266 0,2.74302 -1.815234,4.47758 -2.097604,2.01693 -5.849089,2.01693 -2.743021,0 -6.131458,-0.76644 -1.089141,-0.24203 -1.774896,-1.08914 -0.645417,-0.84711 -0.645417,-1.89591 0,-1.29083 0.887448,-2.17828 0.927786,-0.92779 2.178281,-0.92779 0.363047,0 0.685756,0.0807 1.169817,0.24203 4.477578,0.60508 0.443724,0 0.968125,-0.0403 0.201693,0 0.201693,-0.24203 0.04034,-0.20169 -0.242032,-0.28237 -1.37151,-0.24203 -2.541328,-0.5244 -1.331172,-0.28237 -1.895911,-0.48406 -1.12948,-0.32271 -1.895912,-0.84711 -2.581667,-1.69422 -2.622005,-5.08266 0,-2.70268 1.855573,-4.47758 2.258958,-2.17828 6.413828,-1.97659 2.783359,0.12102 5.566719,0.7261 1.048802,0.24203 1.734557,1.08914 0.685756,0.84711 0.685756,1.93625 0,1.25049 -0.927787,2.17828 -0.887448,0.88745 -2.178281,0.88745 -0.322709,0 -0.645417,-0.0807 -1.169818,-0.24203 -4.517917,-0.56474 -0.403385,-0.0403 -0.766432,0 -0.322708,0.0403 -0.322708,0.24203 0.04034,0.24203 0.322708,0.32271 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path5201"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:136.34428406px;font-family:'OTADESIGN Rounded';-inkscape-font-specification:'OTADESIGN Rounded';letter-spacing:0px;word-spacing:0px;fill:#fff;fill-opacity:1;stroke:none;stroke-width:0.26458335px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 89.577027,200.53715 q 0.968125,0.24203 2.420312,0.5244 2.420313,0.40339 3.791823,1.29083 2.581667,1.69422 2.581667,5.08266 0,2.74302 -1.815234,4.47758 -2.097604,2.01693 -5.849089,2.01693 -2.743021,0 -6.131458,-0.76644 -1.089141,-0.24203 -1.774896,-1.08914 -0.645417,-0.84711 -0.645417,-1.89591 0,-1.29083 0.887448,-2.17828 0.927786,-0.92779 2.178281,-0.92779 0.363047,0 0.685755,0.0807 1.169818,0.24203 4.477579,0.60508 0.443724,0 0.968125,-0.0403 0.201692,0 0.201692,-0.24203 0.04034,-0.20169 -0.242031,-0.28237 -1.37151,-0.24203 -2.541328,-0.5244 -1.331172,-0.28237 -1.895912,-0.48406 -1.129479,-0.32271 -1.895911,-0.84711 -2.581667,-1.69422 -2.622005,-5.08266 0,-2.70268 1.855573,-4.47758 2.258958,-2.17828 6.413828,-1.97659 2.783359,0.12102 5.566719,0.7261 1.048802,0.24203 1.734557,1.08914 0.685755,0.84711 0.685755,1.93625 0,1.25049 -0.927786,2.17828 -0.887448,0.88745 -2.178281,0.88745 -0.322709,0 -0.645417,-0.0807 -1.169818,-0.24203 -4.517917,-0.56474 -0.403385,-0.0403 -0.766432,0 -0.322708,0.0403 -0.322708,0.24203 0.04034,0.24203 0.322708,0.32271 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path5203"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:136.34428406px;font-family:'OTADESIGN Rounded';-inkscape-font-specification:'OTADESIGN Rounded';letter-spacing:0px;word-spacing:0px;fill:#fff;fill-opacity:1;stroke:none;stroke-width:0.26458335px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 115.65209,203.87137 q 0.12101,0.0807 2.86404,2.78336 1.25049,1.21016 1.25049,2.94471 0,1.61354 -1.16982,2.86404 -1.16982,1.21016 -2.90437,1.21016 -1.65388,0 -2.86404,-1.16982 l -4.03385,-3.91284 q -0.16136,-0.12102 -0.32271,-0.12102 -0.32271,0 -0.32271,1.21016 0,1.69422 -1.21016,2.90438 -1.21015,1.16981 -2.90437,1.16981 -1.69422,0 -2.90438,-1.16981 -1.169807,-1.21016 -1.169807,-2.90438 v -18.79776 q 0,-1.69422 1.169807,-2.86404 1.21016,-1.21015 2.90438,-1.21015 1.69422,0 2.90437,1.21015 1.21016,1.16982 1.21016,2.86404 v 6.29281 q 0,0.40339 0.28237,0.5244 0.24203,0.12102 0.5244,-0.0807 0.16135,-0.0807 4.84063,-3.18675 1.0488,-0.64542 2.25895,-0.64542 2.21862,0 3.42878,1.81524 0.64542,1.0488 0.64542,2.25896 0,2.21862 -1.81524,3.42877 l -2.54133,1.61354 v 0.0403 l -0.0807,0.0403 q -0.56474,0.36305 -0.0403,0.88745 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path5205"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:136.34428406px;font-family:'OTADESIGN Rounded';-inkscape-font-specification:'OTADESIGN Rounded';letter-spacing:0px;word-spacing:0px;fill:#fff;fill-opacity:1;stroke:none;stroke-width:0.26458335px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 131.25181,213.92955 q -4.19521,0 -7.18026,-2.94472 -2.94472,-2.98505 -2.94472,-7.18026 0,-4.15487 2.94472,-7.09958 2.98505,-2.98505 7.18026,-2.98505 4.15487,0 6.97857,2.78335 0.92778,0.92779 0.92778,2.25896 0,1.33118 -0.92778,2.25896 l -4.67928,4.63893 q -1.00846,1.00847 -2.01692,1.00847 -1.45219,0 -2.25896,-0.80677 -0.80677,-0.80677 -0.80677,-2.13795 0,-1.29083 0.92778,-2.21862 l 0.80678,-0.84711 q 0.16135,-0.12101 0.0807,-0.24203 -0.12101,-0.0807 -0.32271,-0.0403 -0.80677,0.20169 -1.37151,0.80677 -1.12948,1.08914 -1.12948,2.622 0,1.5732 1.08915,2.70268 1.12947,1.08914 2.70268,1.08914 1.53286,0 2.622,-1.12947 0.92779,-0.92779 2.25896,-0.92779 1.33117,0 2.25896,0.92779 0.92779,0.92778 0.92779,2.25895 0,1.33118 -0.92779,2.25896 -2.98505,2.94472 -7.13992,2.94472 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path5207"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:136.34428406px;font-family:'OTADESIGN Rounded';-inkscape-font-specification:'OTADESIGN Rounded';letter-spacing:0px;word-spacing:0px;fill:#fff;fill-opacity:1;stroke:none;stroke-width:0.26458335px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 160.51049,198.1433 v 5.60705 q 0,0.56474 -0.0807,1.21016 v 7.38195 q 0,4.51792 -2.74302,7.2206 -2.70268,2.70269 -7.30128,2.70269 -2.66234,0 -4.80028,-1.00847 -2.13795,-0.96812 -2.13795,-3.3481 0,-0.80677 0.36305,-1.53286 0.96812,-2.17828 3.3481,-2.17828 0.56474,0 1.5732,0.32271 1.00847,0.3227 1.65388,0.3227 1.69422,0 2.21862,-0.72609 0.20169,-0.28237 0.0807,-0.44372 -0.16136,-0.24204 -0.56474,-0.16136 -0.68576,0.12102 -1.49253,0.12102 -4.07419,0 -6.97856,-2.90438 -2.90438,-2.90437 -2.90438,-6.97857 v -5.60705 q 0,-1.69422 1.16982,-2.86404 1.21015,-1.21016 2.90437,-1.21016 1.69422,0 2.90438,1.21016 1.21015,1.16982 1.21015,2.86404 v 5.60705 q 0,0.68576 0.48407,1.21016 0.5244,0.48406 1.21015,0.48406 0.7261,0 1.21016,-0.48406 0.48406,-0.5244 0.48406,-1.21016 v -5.60705 q 0,-1.69422 1.21016,-2.86404 1.21015,-1.21016 2.90437,-1.21016 1.69422,0 2.86404,1.21016 1.21016,1.16982 1.21016,2.86404 z" />
+  </g>
+</svg>
--- a/cli/clean-cached-remote-files.js
+++ b/cli/clean-cached-remote-files.js
@ -8,7 +8,8 @@ const { default: User } = require('../built/models/user');
 const q = {
 	'metadata._user.host': {
 		$ne: null
-	}
+	},
+	'metadata.isMetaOnly': false
 };

 async function main() {
@ -56,8 +57,7 @@ async function main() {

 					DriveFile.update({ _id: file._id }, {
 						$set: {
-							'metadata.deletedAt': new Date(),
-							'metadata.isExpired': true
+							'metadata.isMetaOnly': true
 						}
 					})
 				]).then(async () => {
--- a/docs/setup.en.md
+++ b/docs/setup.en.md
@ -43,13 +43,7 @@ Please install and setup these softwares:

 *4.* Prepare configuration
 ----------------------------------------------------------------
-1. Copy `example.yml` of `.config` directory
-2. Rename it to `default.yml`
-3. Edit it
-
---
-
-Or you can generate config file via `npm run config` command.
+You need to generate config file via `npm run config` command.

 *5.* Build Misskey
 ----------------------------------------------------------------
--- a/docs/setup.ja.md
+++ b/docs/setup.ja.md
@ -43,18 +43,14 @@ web-push generate-vapid-keys

 *4.* 設定ファイルを用意する
 ----------------------------------------------------------------
-1. `.config`ディレクトリ内の`example.yml`をコピー
-2. `default.yml`にリネーム
-3. 編集する
-
---
-
-または、`npm run config`コマンドを利用して、ガイドに従って情報を
-入力して設定ファイルを生成することもできます。
+`npm run config`コマンドを利用して、ガイドに従って情報を入力してください。

 *5.* Misskeyのビルド
 ----------------------------------------------------------------
-1. `npm run build`
+1. `npm install -g node-gyp`
+2. `node-gyp configure`
+3. `node-gyp build`
+4. `npm run build`

 *6.* 以上です！
 ----------------------------------------------------------------
@ -78,4 +74,4 @@ VPSなどでビルドする時は、もしかしたらメモリが足りなく
 3. npm run webpack
 4. built/client をサーバーにアップロードする
 5. サーバー上で、npm run gulp
-6. 完了
+6. 完了
--- a/locales/de.yml
+++ b/locales/de.yml
@ -1,7 +1,7 @@
 ---
 meta:
  lang: "Deutsch"
-  divider: ""
+  divider: " "
 common:
  misskey: "Teile alles mit anderen mithilfe von Misskey"
  time:
@ -165,15 +165,15 @@ common/views/widgets/photo-stream.vue:
 common/views/widgets/server.vue:
  title: "Serverinformationen"
  toggle: "Sicht umschalten"
-commons/views/widgets/visibility-chooser.vue:
-  public: "Öffentlich"
-  home: "Home"
-  home-desc: "Nur an dieser Stelle sichtbar"
-  followers: "Follower"
-  followers-desc: "Nur für diejenigen sichtbar, die dir folgen"
-  specified: "Direkt"
-  specified-desc: "Nur für bestimmte Benutzer"
-  private: "Privat"
+common/views/widgets/visibility-chooser.vue:
+  public: "公開"
+  home: "ホーム"
+  home-desc: "ホームタイムラインにのみ公開"
+  followers: "フォロワー"
+  followers-desc: "自分のフォロワーにのみ公開"
+  specified: "ダイレクト"
+  specified-desc: "指定したユーザーにのみ公開"
+  private: "非公開"
 desktop/views/components/activity.chart.vue:
  total: "Schwarz ... komplett"
  notes: "Blau ... Hinweise"
@ -304,7 +304,7 @@ desktop/views/components/messaging-window.vue:
 desktop/views/components/note-detail.vue:
  more: "Lade weitere Konversationen"
  private: "(Dieser Post ist privat)"
-  is-renote: "がRenote"
+  reposted-by: "{}がRenote"
  location: "Ort"
  renote: "Anmerkung"
  add-reaction: "Reaktion hinzufügen"
@ -475,6 +475,8 @@ desktop/views/components/settings.profile.vue:
  description: "自己紹介"
  birthday: "誕生日"
  save: "Profil aktualisieren"
+  is-bot: "このアカウントはBotです"
+  is-cat: "このアカウントはCatです"
 desktop/views/components/sub-note-content.vue:
  hidden: "(この投稿は非公開です)"
  media: "つのメディア"
@ -521,6 +523,12 @@ desktop/views/components/users-list-item.vue:
 desktop/views/components/window.vue:
  popout: "ポップアウト"
  close: "閉じる"
+desktop/views/pages/welcome.vue:
+  signin: "ログイン"
+  signup: "新規登録"
+  signin-button: "やってる"
+  signup-button: "やる"
+  timeline: "タイムライン"
 desktop/views/pages/drive.vue:
  title: "Misskey Drive"
 desktop/views/pages/favorites.vue:
@ -660,7 +668,9 @@ mobile/views/pages/followers.vue:
 mobile/views/pages/following.vue:
  following-of: "{}のフォロー"
 mobile/views/pages/home.vue:
-  timeline: "タイムライン"
+  home: "ホーム"
+  local: "ローカル"
+  global: "グローバル"
 mobile/views/pages/messaging.vue:
  messaging: "メッセージ"
 mobile/views/pages/messaging-room.vue:
@ -674,7 +684,6 @@ mobile/views/pages/notifications.vue:
  read-all: "すべての通知を既読にしますか？"
 mobile/views/pages/settings/settings.profile.vue:
  title: "プロフィール"
-  will-be-published: "※公開されます"
  name: "名前"
  account: "アカウント"
  location: "場所"
@ -682,7 +691,7 @@ mobile/views/pages/settings/settings.profile.vue:
  birthday: "誕生日"
  avatar: "アイコン"
  banner: "バナー"
-  is-bot: "このアカウントはBotです"
+  is-cat: "このアカウントはCatです"
  save: "保存"
  saved: "プロフィールを保存しました"
  uploading: "アップロード中"
@ -713,6 +722,8 @@ mobile/views/pages/settings.vue:
  behavior: "動作"
  fetch-on-scroll: "スクロールで自動読み込み"
  disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
+  load-raw-images: "添付された画像を高画質で表示する"
+  load-remote-media: "リモートサーバーのメディアを表示する"
  twitter: "Twitter連携"
  twitter-connect: "Twitterアカウントに接続する"
  twitter-reconnect: "再接続する"
--- a/locales/en.yml
+++ b/locales/en.yml
@ -56,9 +56,9 @@ common/views/components/connect-failed.troubleshooter.vue:
  no-network-desc: "Please make sure you are connected to the Network."
  no-internet: "There is no Internet connection"
  no-internet-desc: "Please make sure you are connected to the Internet."
-  no-server: "Unable to connect to the server"
-  no-server-desc: "The network connection of your PC is normal, but you could not connect to Misskey's server. There is a possibility that the server is either down or under maintenance, please try again later."
-  success: "Successfully connected to Misskey's server"
+  no-server: "Unable to connect to the Misskey server"
+  no-server-desc: "The network connection of your PC is normal, but you could not connect to the Misskey server. There is a possibility that the server is either down or under maintenance, please try again later."
+  success: "Successfully connected to the Misskey server"
  success-desc: "It seems to be able to connect. Please reload the page."
  flush: "Clean cache"
  set-version: "Specify version"
@ -121,7 +121,7 @@ common/views/components/signup.vue:
  unavailable: "Unavailable"
  error: "Network error"
  invalid-format: "Only use letters, numbers and -."
-  too-short: "Please enter at least 1 character！"
+  too-short: "Please enter at least 1 character!"
  too-long: "Please enter up to 20 characters."
  password: "Password"
  password-placeholder: "We recommend more than 8 characters."
@ -165,14 +165,14 @@ common/views/widgets/photo-stream.vue:
 common/views/widgets/server.vue:
  title: "Server info"
  toggle: "Toggle views"
-commons/views/widgets/visibility-chooser.vue:
+common/views/widgets/visibility-chooser.vue:
  public: "Public"
  home: "Home"
-  home-desc: "ホームタイムラインにのみ公開"
+  home-desc: "Post to the home timeline only"
  followers: "Followers"
-  followers-desc: "自分のフォロワーにのみ公開"
+  followers-desc: "Post to followers only"
  specified: "Direct"
-  specified-desc: "指定したユーザーにのみ公開"
+  specified-desc: "Post to specified users only"
  private: "Private"
 desktop/views/components/activity.chart.vue:
  total: "Black ... Total"
@ -188,7 +188,7 @@ desktop/views/components/calendar.vue:
  next: "Next month"
  go: "Click to naviguate"
 desktop/views/components/choose-file-from-drive-window.vue:
-  choose-file: "ファイル選択中"
+  choose-file: "Choosing files"
  upload: "Upload files from your PC"
  cancel: "Cancel"
  ok: "OK"
@ -264,7 +264,7 @@ desktop/views/components/following-window.vue:
 desktop/views/components/following.vue:
  empty: "You don’t follow anyone."
 desktop/views/components/friends-maker.vue:
-  title: "気になるユーザーをフォロー:"
+  title: "Recommended users:"
  empty: "Similar users weren’t found."
  fetching: "Loading…"
  refresh: "More"
@ -304,10 +304,10 @@ desktop/views/components/messaging-window.vue:
 desktop/views/components/note-detail.vue:
  more: "Load more conversations"
  private: "(this post is private)"
-  is-renote: "がRenote"
+  reposted-by: "Renoted by {}"
  location: "Location"
  renote: "Renote"
-  add-reaction: "リアクション"
+  add-reaction: "Add a reaction"
 desktop/views/components/note-detail.sub.vue:
  private: "(this post is private)"
 desktop/views/components/notes.note.vue:
@ -417,8 +417,8 @@ desktop/views/components/settings.vue:
  update-checking: "Checking for updates"
  do-update: "Check for update"
  update-settings: "Advanced settings"
-  prevent-update: "アップデートを延期する(非推奨)"
-  prevent-update-desc: "この設定をオンにしてもアップデートが反映される場合があります。この設定はこのデバイスのみ有効です。"
+  prevent-update: "Postpone updates (not recommended)"
+  prevent-update-desc: "You may reflect updates even if you select this setting. This setting is valid only this device."
  no-updates: "No updates available"
  no-updates-desc: "Your Misskey is up to date."
  update-available: "New version is available!"
@ -475,6 +475,8 @@ desktop/views/components/settings.profile.vue:
  description: "Description"
  birthday: "Birthday"
  save: "Update profile"
+  is-bot: "This account is a Bot"
+  is-cat: "This account is a Cat"
 desktop/views/components/sub-note-content.vue:
  hidden: "(this post is private)"
  media: " media"
@ -521,6 +523,12 @@ desktop/views/components/users-list-item.vue:
 desktop/views/components/window.vue:
  popout: "Popout"
  close: "Close"
+desktop/views/pages/welcome.vue:
+  signin: "Log In"
+  signup: "Sign up"
+  signin-button: "Log in"
+  signup-button: "Sign up"
+  timeline: "Timeline"
 desktop/views/pages/drive.vue:
  title: "Misskey Drive"
 desktop/views/pages/favorites.vue:
@ -660,7 +668,9 @@ mobile/views/pages/followers.vue:
 mobile/views/pages/following.vue:
  following-of: "Following of {}"
 mobile/views/pages/home.vue:
-  timeline: "Timeline"
+  home: "Home"
+  local: "Local"
+  global: "Global"
 mobile/views/pages/messaging.vue:
  messaging: "Messaging"
 mobile/views/pages/messaging-room.vue:
@ -674,7 +684,6 @@ mobile/views/pages/notifications.vue:
  read-all: "Are you sure you want to mark all unread notifications as read?"
 mobile/views/pages/settings/settings.profile.vue:
  title: "Profile"
-  will-be-published: "※公開されます"
  name: "Name"
  account: "Account"
  location: "Location"
@ -682,7 +691,7 @@ mobile/views/pages/settings/settings.profile.vue:
  birthday: "Birthday"
  avatar: "Avatar"
  banner: "Banner"
-  is-bot: "This account is a Bot"
+  is-cat: "This account is a Cat"
  save: "Update profile"
  saved: "Profile updated successfully"
  uploading: "Uploading"
@ -713,6 +722,8 @@ mobile/views/pages/settings.vue:
  behavior: "Behavior"
  fetch-on-scroll: "Fetch on scroll"
  disable-via-mobile: "Without the \"mobile posts\" flag"
+  load-raw-images: "Show attached pictures in high-quality"
+  load-remote-media: "Show media on a remote server"
  twitter: "Twitter integration"
  twitter-connect: "Connect to your Twitter account"
  twitter-reconnect: "Reconnect"
--- a/locales/es.yml
+++ b/locales/es.yml
@ -165,7 +165,7 @@ common/views/widgets/photo-stream.vue:
 common/views/widgets/server.vue:
  title: "サーバー情報"
  toggle: "表示を切り替え"
-commons/views/widgets/visibility-chooser.vue:
+common/views/widgets/visibility-chooser.vue:
  public: "公開"
  home: "ホーム"
  home-desc: "ホームタイムラインにのみ公開"
@ -304,7 +304,7 @@ desktop/views/components/messaging-window.vue:
 desktop/views/components/note-detail.vue:
  more: "会話をもっと読み込む"
  private: "(この投稿は非公開です)"
-  is-renote: "がRenote"
+  reposted-by: "{}がRenote"
  location: "位置情報"
  renote: "Renote"
  add-reaction: "リアクション"
@ -475,6 +475,8 @@ desktop/views/components/settings.profile.vue:
  description: "自己紹介"
  birthday: "誕生日"
  save: "保存"
+  is-bot: "このアカウントはBotです"
+  is-cat: "このアカウントはCatです"
 desktop/views/components/sub-note-content.vue:
  hidden: "(この投稿は非公開です)"
  media: "つのメディア"
@ -521,6 +523,12 @@ desktop/views/components/users-list-item.vue:
 desktop/views/components/window.vue:
  popout: "ポップアウト"
  close: "閉じる"
+desktop/views/pages/welcome.vue:
+  signin: "ログイン"
+  signup: "新規登録"
+  signin-button: "やってる"
+  signup-button: "やる"
+  timeline: "タイムライン"
 desktop/views/pages/drive.vue:
  title: "Misskey Drive"
 desktop/views/pages/favorites.vue:
@ -660,7 +668,9 @@ mobile/views/pages/followers.vue:
 mobile/views/pages/following.vue:
  following-of: "{}のフォロー"
 mobile/views/pages/home.vue:
-  timeline: "タイムライン"
+  home: "ホーム"
+  local: "ローカル"
+  global: "グローバル"
 mobile/views/pages/messaging.vue:
  messaging: "メッセージ"
 mobile/views/pages/messaging-room.vue:
@ -674,7 +684,6 @@ mobile/views/pages/notifications.vue:
  read-all: "すべての通知を既読にしますか？"
 mobile/views/pages/settings/settings.profile.vue:
  title: "プロフィール"
-  will-be-published: "※公開されます"
  name: "名前"
  account: "アカウント"
  location: "場所"
@ -682,7 +691,7 @@ mobile/views/pages/settings/settings.profile.vue:
  birthday: "誕生日"
  avatar: "アイコン"
  banner: "バナー"
-  is-bot: "このアカウントはBotです"
+  is-cat: "このアカウントはCatです"
  save: "保存"
  saved: "プロフィールを保存しました"
  uploading: "アップロード中"
@ -713,6 +722,8 @@ mobile/views/pages/settings.vue:
  behavior: "動作"
  fetch-on-scroll: "スクロールで自動読み込み"
  disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
+  load-raw-images: "添付された画像を高画質で表示する"
+  load-remote-media: "リモートサーバーのメディアを表示する"
  twitter: "Twitter連携"
  twitter-connect: "Twitterアカウントに接続する"
  twitter-reconnect: "再接続する"
--- a/locales/fr.yml
+++ b/locales/fr.yml
@ -1,7 +1,7 @@
 ---
 meta:
-  lang: "日本語"
-  divider: ""
+  lang: "Français"
+  divider: " "
 common:
  misskey: "Partagez avec les autres en utilisant Misskey"
  time:
@ -165,7 +165,7 @@ common/views/widgets/photo-stream.vue:
 common/views/widgets/server.vue:
  title: "Info sur le serveur"
  toggle: "Afficher les vues"
-commons/views/widgets/visibility-chooser.vue:
+common/views/widgets/visibility-chooser.vue:
  public: "公開"
  home: "ホーム"
  home-desc: "ホームタイムラインにのみ公開"
@ -304,7 +304,7 @@ desktop/views/components/messaging-window.vue:
 desktop/views/components/note-detail.vue:
  more: "会話をもっと読み込む"
  private: "(この投稿は非公開です)"
-  is-renote: "がRenote"
+  reposted-by: "{}がRenote"
  location: "位置情報"
  renote: "Renote"
  add-reaction: "リアクション"
@ -475,6 +475,8 @@ desktop/views/components/settings.profile.vue:
  description: "Description"
  birthday: "Date de naissance"
  save: "Mettre à jour le profil"
+  is-bot: "このアカウントはBotです"
+  is-cat: "このアカウントはCatです"
 desktop/views/components/sub-note-content.vue:
  hidden: "(この投稿は非公開です)"
  media: "つのメディア"
@ -521,6 +523,12 @@ desktop/views/components/users-list-item.vue:
 desktop/views/components/window.vue:
  popout: "ポップアウト"
  close: "閉じる"
+desktop/views/pages/welcome.vue:
+  signin: "ログイン"
+  signup: "新規登録"
+  signin-button: "やってる"
+  signup-button: "やる"
+  timeline: "タイムライン"
 desktop/views/pages/drive.vue:
  title: "Misskey Drive"
 desktop/views/pages/favorites.vue:
@ -660,7 +668,9 @@ mobile/views/pages/followers.vue:
 mobile/views/pages/following.vue:
  following-of: "Abonnements de {}"
 mobile/views/pages/home.vue:
-  timeline: "Fil d'actualité"
+  home: "ホーム"
+  local: "ローカル"
+  global: "グローバル"
 mobile/views/pages/messaging.vue:
  messaging: "Messagerie"
 mobile/views/pages/messaging-room.vue:
@ -674,7 +684,6 @@ mobile/views/pages/notifications.vue:
  read-all: "Êtes vous sûr de vouloir marqués toutes les notifications non-lus en tant que lus?"
 mobile/views/pages/settings/settings.profile.vue:
  title: "プロフィール"
-  will-be-published: "※公開されます"
  name: "名前"
  account: "アカウント"
  location: "場所"
@ -682,7 +691,7 @@ mobile/views/pages/settings/settings.profile.vue:
  birthday: "誕生日"
  avatar: "アイコン"
  banner: "バナー"
-  is-bot: "このアカウントはBotです"
+  is-cat: "このアカウントはCatです"
  save: "保存"
  saved: "プロフィールを保存しました"
  uploading: "アップロード中"
@ -713,6 +722,8 @@ mobile/views/pages/settings.vue:
  behavior: "動作"
  fetch-on-scroll: "スクロールで自動読み込み"
  disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
+  load-raw-images: "添付された画像を高画質で表示する"
+  load-remote-media: "リモートサーバーのメディアを表示する"
  twitter: "Twitter連携"
  twitter-connect: "Twitterアカウントに接続する"
  twitter-reconnect: "再接続する"
--- a/locales/it.yml
+++ b/locales/it.yml
@ -165,7 +165,7 @@ common/views/widgets/photo-stream.vue:
 common/views/widgets/server.vue:
  title: "サーバー情報"
  toggle: "表示を切り替え"
-commons/views/widgets/visibility-chooser.vue:
+common/views/widgets/visibility-chooser.vue:
  public: "公開"
  home: "ホーム"
  home-desc: "ホームタイムラインにのみ公開"
@ -304,7 +304,7 @@ desktop/views/components/messaging-window.vue:
 desktop/views/components/note-detail.vue:
  more: "会話をもっと読み込む"
  private: "(この投稿は非公開です)"
-  is-renote: "がRenote"
+  reposted-by: "{}がRenote"
  location: "位置情報"
  renote: "Renote"
  add-reaction: "リアクション"
@ -475,6 +475,8 @@ desktop/views/components/settings.profile.vue:
  description: "自己紹介"
  birthday: "誕生日"
  save: "保存"
+  is-bot: "このアカウントはBotです"
+  is-cat: "このアカウントはCatです"
 desktop/views/components/sub-note-content.vue:
  hidden: "(この投稿は非公開です)"
  media: "つのメディア"
@ -521,6 +523,12 @@ desktop/views/components/users-list-item.vue:
 desktop/views/components/window.vue:
  popout: "ポップアウト"
  close: "閉じる"
+desktop/views/pages/welcome.vue:
+  signin: "ログイン"
+  signup: "新規登録"
+  signin-button: "やってる"
+  signup-button: "やる"
+  timeline: "タイムライン"
 desktop/views/pages/drive.vue:
  title: "Misskey Drive"
 desktop/views/pages/favorites.vue:
@ -660,7 +668,9 @@ mobile/views/pages/followers.vue:
 mobile/views/pages/following.vue:
  following-of: "{}のフォロー"
 mobile/views/pages/home.vue:
-  timeline: "タイムライン"
+  home: "ホーム"
+  local: "ローカル"
+  global: "グローバル"
 mobile/views/pages/messaging.vue:
  messaging: "メッセージ"
 mobile/views/pages/messaging-room.vue:
@ -674,7 +684,6 @@ mobile/views/pages/notifications.vue:
  read-all: "すべての通知を既読にしますか？"
 mobile/views/pages/settings/settings.profile.vue:
  title: "プロフィール"
-  will-be-published: "※公開されます"
  name: "名前"
  account: "アカウント"
  location: "場所"
@ -682,7 +691,7 @@ mobile/views/pages/settings/settings.profile.vue:
  birthday: "誕生日"
  avatar: "アイコン"
  banner: "バナー"
-  is-bot: "このアカウントはBotです"
+  is-cat: "このアカウントはCatです"
  save: "保存"
  saved: "プロフィールを保存しました"
  uploading: "アップロード中"
@ -713,6 +722,8 @@ mobile/views/pages/settings.vue:
  behavior: "動作"
  fetch-on-scroll: "スクロールで自動読み込み"
  disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
+  load-raw-images: "添付された画像を高画質で表示する"
+  load-remote-media: "リモートサーバーのメディアを表示する"
  twitter: "Twitter連携"
  twitter-connect: "Twitterアカウントに接続する"
  twitter-reconnect: "再接続する"
--- a/locales/ja.yml
+++ b/locales/ja.yml
@ -191,7 +191,7 @@ common/views/widgets/server.vue:
  title: "サーバー情報"
  toggle: "表示を切り替え"

-commons/views/widgets/visibility-chooser.vue:
+common/views/widgets/visibility-chooser.vue:
  public: "公開"
  home: "ホーム"
  home-desc: "ホームタイムラインにのみ公開"
@ -353,7 +353,7 @@ desktop/views/components/messaging-window.vue:
 desktop/views/components/note-detail.vue:
  more: "会話をもっと読み込む"
  private: "(この投稿は非公開です)"
-  is-renote: "がRenote"
+  reposted-by: "{}がRenote"
  location: "位置情報"
  renote: "Renote"
  add-reaction: "リアクション"
@ -550,6 +550,8 @@ desktop/views/components/settings.profile.vue:
  description: "自己紹介"
  birthday: "誕生日"
  save: "保存"
+  is-bot: "このアカウントはBotです"
+  is-cat: "このアカウントはCatです"

 desktop/views/components/sub-note-content.vue:
  hidden: "(この投稿は非公開です)"
@ -610,6 +612,13 @@ desktop/views/components/window.vue:
  popout: "ポップアウト"
  close: "閉じる"

+desktop/views/pages/welcome.vue:
+  signin: "ログイン"
+  signup: "新規登録"
+  signin-button: "やってる"
+  signup-button: "やる"
+  timeline: "タイムライン"
+
 desktop/views/pages/drive.vue:
  title: "Misskey Drive"

@ -786,7 +795,9 @@ mobile/views/pages/following.vue:
  following-of: "{}のフォロー"

 mobile/views/pages/home.vue:
-  timeline: "タイムライン"
+  home: "ホーム"
+  local: "ローカル"
+  global: "グローバル"

 mobile/views/pages/messaging.vue:
  messaging: "メッセージ"
@ -805,7 +816,6 @@ mobile/views/pages/notifications.vue:

 mobile/views/pages/settings/settings.profile.vue:
  title: "プロフィール"
-  will-be-published: "※公開されます"
  name: "名前"
  account: "アカウント"
  location: "場所"
@ -813,7 +823,7 @@ mobile/views/pages/settings/settings.profile.vue:
  birthday: "誕生日"
  avatar: "アイコン"
  banner: "バナー"
-  is-bot: "このアカウントはBotです"
+  is-cat: "このアカウントはCatです"
  save: "保存"
  saved: "プロフィールを保存しました"
  uploading: "アップロード中"
@ -847,6 +857,8 @@ mobile/views/pages/settings.vue:
  behavior: "動作"
  fetch-on-scroll: "スクロールで自動読み込み"
  disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
+  load-raw-images: "添付された画像を高画質で表示する"
+  load-remote-media: "リモートサーバーのメディアを表示する"
  twitter: "Twitter連携"
  twitter-connect: "Twitterアカウントに接続する"
  twitter-reconnect: "再接続する"
--- a/locales/ko.yml
+++ b/locales/ko.yml
@ -165,7 +165,7 @@ common/views/widgets/photo-stream.vue:
 common/views/widgets/server.vue:
  title: "サーバー情報"
  toggle: "表示を切り替え"
-commons/views/widgets/visibility-chooser.vue:
+common/views/widgets/visibility-chooser.vue:
  public: "公開"
  home: "ホーム"
  home-desc: "ホームタイムラインにのみ公開"
@ -304,7 +304,7 @@ desktop/views/components/messaging-window.vue:
 desktop/views/components/note-detail.vue:
  more: "会話をもっと読み込む"
  private: "(この投稿は非公開です)"
-  is-renote: "がRenote"
+  reposted-by: "{}がRenote"
  location: "位置情報"
  renote: "Renote"
  add-reaction: "リアクション"
@ -475,6 +475,8 @@ desktop/views/components/settings.profile.vue:
  description: "自己紹介"
  birthday: "誕生日"
  save: "保存"
+  is-bot: "このアカウントはBotです"
+  is-cat: "このアカウントはCatです"
 desktop/views/components/sub-note-content.vue:
  hidden: "(この投稿は非公開です)"
  media: "つのメディア"
@ -521,6 +523,12 @@ desktop/views/components/users-list-item.vue:
 desktop/views/components/window.vue:
  popout: "ポップアウト"
  close: "閉じる"
+desktop/views/pages/welcome.vue:
+  signin: "ログイン"
+  signup: "新規登録"
+  signin-button: "やってる"
+  signup-button: "やる"
+  timeline: "タイムライン"
 desktop/views/pages/drive.vue:
  title: "Misskey Drive"
 desktop/views/pages/favorites.vue:
@ -660,7 +668,9 @@ mobile/views/pages/followers.vue:
 mobile/views/pages/following.vue:
  following-of: "{}のフォロー"
 mobile/views/pages/home.vue:
-  timeline: "タイムライン"
+  home: "ホーム"
+  local: "ローカル"
+  global: "グローバル"
 mobile/views/pages/messaging.vue:
  messaging: "メッセージ"
 mobile/views/pages/messaging-room.vue:
@ -674,7 +684,6 @@ mobile/views/pages/notifications.vue:
  read-all: "すべての通知を既読にしますか？"
 mobile/views/pages/settings/settings.profile.vue:
  title: "プロフィール"
-  will-be-published: "※公開されます"
  name: "名前"
  account: "アカウント"
  location: "場所"
@ -682,7 +691,7 @@ mobile/views/pages/settings/settings.profile.vue:
  birthday: "誕生日"
  avatar: "アイコン"
  banner: "バナー"
-  is-bot: "このアカウントはBotです"
+  is-cat: "このアカウントはCatです"
  save: "保存"
  saved: "プロフィールを保存しました"
  uploading: "アップロード中"
@ -713,6 +722,8 @@ mobile/views/pages/settings.vue:
  behavior: "動作"
  fetch-on-scroll: "スクロールで自動読み込み"
  disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
+  load-raw-images: "添付された画像を高画質で表示する"
+  load-remote-media: "リモートサーバーのメディアを表示する"
  twitter: "Twitter連携"
  twitter-connect: "Twitterアカウントに接続する"
  twitter-reconnect: "再接続する"
--- a/locales/pl.yml
+++ b/locales/pl.yml
@ -1,7 +1,7 @@
 ---
 meta:
-  lang: "japoński"
-  divider: ""
+  lang: "język polski"
+  divider: " "
 common:
  misskey: "Dziel się zawartością z innymi korzystając z Misskey."
  time:
@ -165,7 +165,7 @@ common/views/widgets/photo-stream.vue:
 common/views/widgets/server.vue:
  title: "Informacje o serwerze"
  toggle: "Przełącz widok"
-commons/views/widgets/visibility-chooser.vue:
+common/views/widgets/visibility-chooser.vue:
  public: "Publiczny"
  home: "Lokalny"
  home-desc: "Widoczny tylko na tej instancji"
@ -304,7 +304,7 @@ desktop/views/components/messaging-window.vue:
 desktop/views/components/note-detail.vue:
  more: "Załaduj więcej konwersacji"
  private: "(ten wpis jest prywatny)"
-  is-renote: "がRenote"
+  reposted-by: "{}がRenote"
  location: "Informacje o lokalizacji"
  renote: "Przeredaguj"
  add-reaction: "Dodaj reakcję"
@ -475,6 +475,8 @@ desktop/views/components/settings.profile.vue:
  description: "Opis"
  birthday: "Data urodzenia"
  save: "Aktualizuj profil"
+  is-bot: "このアカウントはBotです"
+  is-cat: "このアカウントはCatです"
 desktop/views/components/sub-note-content.vue:
  hidden: "(この投稿は非公開です)"
  media: "つのメディア"
@ -521,12 +523,18 @@ desktop/views/components/users-list-item.vue:
 desktop/views/components/window.vue:
  popout: "ポップアウト"
  close: "閉じる"
+desktop/views/pages/welcome.vue:
+  signin: "ログイン"
+  signup: "新規登録"
+  signin-button: "やってる"
+  signup-button: "やる"
+  timeline: "タイムライン"
 desktop/views/pages/drive.vue:
-  title: "Misskey Drive"
+  title: "Dysk Misskey"
 desktop/views/pages/favorites.vue:
-  more: "さらに読み込む"
+  more: "Załaduj więcej"
 desktop/views/pages/home-customize.vue:
-  title: "ホームのカスタマイズ"
+  title: "Dostosuj stronę główną"
 desktop/views/pages/note.vue:
  prev: "Poprzedni wpis"
  next: "Następny wpis"
@ -536,9 +544,9 @@ desktop/views/pages/selectdrive.vue:
  cancel: "Anuluj"
  upload: "Wyślij pliki z Twojego komputera"
 desktop/views/pages/user-list.users.vue:
-  users: "ユーザー"
-  add-user: "ユーザーを追加"
-  username: "ユーザー名"
+  users: "Użytkownicy"
+  add-user: "Dodaj użytkownika"
+  username: "Nazwa użytkownika"
 desktop/views/pages/user/user.followers-you-know.vue:
  title: "Śledzący których znasz"
  loading: "Ładowanie"
@ -566,10 +574,10 @@ desktop/views/pages/user/user.profile.vue:
  muted: "Wyciszyłeś"
  unmute: "Cofnij wyciszenie"
 desktop/views/pages/user/user.timeline.vue:
-  default: "投稿"
-  with-replies: "投稿と返信"
-  with-media: "メディア"
-  empty: "このユーザーはまだ何も投稿していないようです。"
+  default: "Wpisy"
+  with-replies: "Wpisy i odpowiedzi"
+  with-media: "Zawartość multimedialna"
+  empty: "Ten użytkownik nie umieścił jeszcze niczego."
 desktop/views/widgets/messaging.vue:
  title: "Wiadomości"
 desktop/views/widgets/notifications.vue:
@ -584,8 +592,8 @@ desktop/views/widgets/post-form.vue:
  note: "Wpis"
  placeholder: "Co się dzieje?"
 desktop/views/widgets/profile.vue:
-  update-banner: "クリックでバナー編集"
-  update-avatar: "クリックでアバター編集"
+  update-banner: "Naciśnij, aby zmienić baner"
+  update-avatar: "Naciśnij, aby zmienić awatar"
 desktop/views/widgets/trends.vue:
  title: "Na czasie"
  refresh: "Pokaż inne"
@ -660,33 +668,34 @@ mobile/views/pages/followers.vue:
 mobile/views/pages/following.vue:
  following-of: "Śledzeni przez {}"
 mobile/views/pages/home.vue:
-  timeline: "Oś czasu"
+  home: "ホーム"
+  local: "ローカル"
+  global: "グローバル"
 mobile/views/pages/messaging.vue:
  messaging: "Wiadomości"
 mobile/views/pages/messaging-room.vue:
  messaging: "Wiadomości"
 mobile/views/pages/note.vue:
-  title: "Wyślij"
+  title: "Wpis"
  prev: "Poprzedni wpis"
  next: "Następny wpis"
 mobile/views/pages/notifications.vue:
  notifications: "Powiadomienia"
  read-all: "Czy na pewno chcesz oznaczyć wszystkie powiadomienia jako przeczytane?"
 mobile/views/pages/settings/settings.profile.vue:
-  title: "プロフィール"
-  will-be-published: "※公開されます"
-  name: "名前"
-  account: "アカウント"
-  location: "場所"
-  description: "自己紹介"
-  birthday: "誕生日"
-  avatar: "アイコン"
-  banner: "バナー"
-  is-bot: "このアカウントはBotです"
-  save: "保存"
-  saved: "プロフィールを保存しました"
-  uploading: "アップロード中"
-  upload-failed: "アップロードに失敗しました"
+  title: "Profil"
+  name: "Nazwa"
+  account: "Konto"
+  location: "Lokalizacja"
+  description: "Opis"
+  birthday: "Data urodzenia"
+  avatar: "Awatar"
+  banner: "Baner"
+  is-cat: "このアカウントはCatです"
+  save: "Aktualizuj profil"
+  saved: "Pomyślnie zaktualizowano profil"
+  uploading: "Wysyłanie"
+  upload-failed: "Wysyłanie nie powiodło się"
 mobile/views/pages/search.vue:
  search: "Szukaj"
  empty: "Nie znaleziono wpisów zawierających '{}'"
@ -707,12 +716,14 @@ mobile/views/pages/settings.vue:
  show-reply-target: "Pokazuj cel odpowiedzi"
  show-my-renotes: "自分の行ったRenoteを表示する"
  show-renoted-my-notes: "Renoteされた自分の投稿を表示する"
-  post-style: "投稿の表示スタイル"
-  post-style-standard: "標準"
+  post-style: "Styl wpisów"
+  post-style-standard: "Standardowy"
  post-style-smart: "スマート"
  behavior: "Zachowanie"
  fetch-on-scroll: "Automatycznie ładuj po przeciągnięciu w dół"
  disable-via-mobile: "Nie oznaczaj wpisów jako „wysłane z telefonu”"
+  load-raw-images: "添付された画像を高画質で表示する"
+  load-remote-media: "リモートサーバーのメディアを表示する"
  twitter: "Połączenie z Twitterem"
  twitter-connect: "Połącz z Twitterem"
  twitter-reconnect: "Połącz ponownie"
--- a/locales/pt.yml
+++ b/locales/pt.yml
@ -0,0 +1,789 @@
+---
+meta:
+  lang: "Português"
+  divider: ""
+common:
+  misskey: "Misskeyで皆と共有しよう。"
+  time:
+    unknown: "なぞのじかん"
+    future: "未来"
+    just_now: "たった今"
+    seconds_ago: "{}秒前"
+    minutes_ago: "{}分前"
+    hours_ago: "{}時間前"
+    days_ago: "{}日前"
+    weeks_ago: "{}週間前"
+    months_ago: "{}ヶ月前"
+    years_ago: "{}年前"
+  weekday-short:
+    sunday: "日"
+    monday: "月"
+    tuesday: "火"
+    wednesday: "水"
+    thursday: "木"
+    friday: "金"
+    saturday: "土"
+  reactions:
+    like: "いいね"
+    love: "しゅき"
+    laugh: "笑"
+    hmm: "ふぅ～む"
+    surprise: "わお"
+    congrats: "おめでとう"
+    angry: "おこ"
+    confused: "こまこまのこまり"
+    pudding: "Pudding"
+  delete: "削除"
+  loading: "読み込み中"
+  ok: "わかった"
+  update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
+  my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
+common/views/components/connect-failed.vue:
+  title: "サーバーに接続できません"
+  description: "インターネット回線に問題があるか、サーバーがダウンまたはメンテナンスしている可能性があります。しばらくしてから{再度お試し}ください。"
+  thanks: "いつもMisskeyをご利用いただきありがとうございます。"
+  troubleshoot: "トラブルシュート"
+common/views/components/connect-failed.troubleshooter.vue:
+  title: "トラブルシューティング"
+  network: "ネットワーク接続"
+  checking-network: "ネットワーク接続を確認中"
+  internet: "インターネット接続"
+  checking-internet: "インターネット接続を確認中"
+  server: "サーバー接続"
+  checking-server: "サーバー接続を確認中"
+  finding: "問題を調べています"
+  no-network: "ネットワークに接続されていません"
+  no-network-desc: "お使いのPCのネットワーク接続が正常か確認してください。"
+  no-internet: "インターネットに接続されていません"
+  no-internet-desc: "ネットワークには接続されていますが、インターネットには接続されていないようです。お使いのPCのインターネット接続が正常か確認してください。"
+  no-server: "Misskeyのサーバーに接続できません"
+  no-server-desc: "お使いのPCのインターネット接続は正常ですが、Misskeyのサーバーには接続できませんでした。サーバーがダウンまたはメンテナンスしている可能性があるので、しばらくしてから再度御アクセスください。"
+  success: "Misskeyのサーバーに接続できました"
+  success-desc: "正常に接続できるようです。ページを再度読み込みしてください。"
+  flush: "キャッシュの削除"
+  set-version: "バージョン指定"
+common/views/components/messaging.vue:
+  search-user: "ユーザーを探す"
+  you: "あなた"
+  no-history: "履歴はありません"
+common/views/components/messaging-room.vue:
+  empty: "このユーザーと話したことはありません"
+  more: "もっと読む"
+  no-history: "これより過去の履歴はありません"
+  resize-form: "ドラッグしてフォームの広さを調整"
+  new-message: "新しいメッセージがあります"
+common/views/components/messaging-room.form.vue:
+  input-message-here: "ここにメッセージを入力"
+  send: "送信"
+  attach-from-local: "PCからファイルを添付する"
+  attach-from-drive: "ドライブからファイルを添付する"
+common/views/components/messaging-room.message.vue:
+  is-read: "既読"
+  deleted: "このメッセージは削除されました"
+common/views/components/nav.vue:
+  about: "Misskeyについて"
+  stats: "統計"
+  status: "ステータス"
+  wiki: "Wiki"
+  donors: "ドナー"
+  repository: "リポジトリ"
+  develop: "開発者"
+  feedback: "フィードバック"
+common/views/components/note-menu.vue:
+  favorite: "お気に入り"
+  pin: "ピン留め"
+  remote: "投稿元で見る"
+common/views/components/poll.vue:
+  vote-to: "「{}」に投票する"
+  vote-count: "{}票"
+  total-users: "{}人が投票"
+  vote: "投票する"
+  show-result: "結果を見る"
+  voted: "投票済み"
+common/views/components/poll-editor.vue:
+  no-only-one-choice: "投票には、選択肢が最低2つ必要です"
+  choice-n: "選択肢{}"
+  remove: "この選択肢を削除"
+  add: "+選択肢を追加"
+  destroy: "投票を破棄"
+common/views/components/reaction-picker.vue:
+  choose-reaction: "リアクションを選択"
+common/views/components/signin.vue:
+  username: "ユーザー名"
+  password: "パスワード"
+  token: "トークン"
+  signing-in: "やってます..."
+  signin: "サインイン"
+common/views/components/signup.vue:
+  username: "ユーザー名"
+  checking: "確認しています..."
+  available: "利用できます"
+  unavailable: "既に利用されています"
+  error: "通信エラー"
+  invalid-format: "a~z、A~Z、0~9、_が使えます"
+  too-short: "1文字以上でお願いします！"
+  too-long: "20文字以内でお願いします"
+  password: "パスワード"
+  password-placeholder: "8文字以上を推奨します"
+  weak-password: "弱いパスワード"
+  normal-password: "まあまあのパスワード"
+  strong-password: "強いパスワード"
+  retype: "再入力"
+  retype-placeholder: "確認のため再入力してください"
+  password-matched: "確認されました"
+  password-not-matched: "一致していません"
+  recaptcha: "認証"
+  create: "アカウント作成"
+  some-error: "何らかの原因によりアカウントの作成に失敗しました。再度お試しください。"
+common/views/components/special-message.vue:
+  new-year: "Happy New Year!"
+  christmas: "Merry Christmas!"
+common/views/components/stream-indicator.vue:
+  connecting: "接続中"
+  reconnecting: "再接続中"
+  connected: "接続完了"
+common/views/components/twitter-setting.vue:
+  description: "お使いのTwitterアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでTwitterアカウント情報が表示されるようになったり、Twitterを用いた便利なサインインを利用できるようになります。"
+  connected-to: "次のTwitterアカウントに接続されています"
+  detail: "詳細..."
+  reconnect: "再接続する"
+  connect: "Twitterと接続する"
+  disconnect: "切断する"
+common/views/components/uploader.vue:
+  waiting: "待機中"
+common/views/widgets/broadcast.vue:
+  fetching: "確認中"
+  no-broadcasts: "お知らせはありません"
+  have-a-nice-day: "良い一日を！"
+  next: "次"
+common/views/widgets/donation.vue:
+  title: "寄付のお願い"
+  text: "Misskeyの運営にはドメイン、サーバー等のコストが掛かります。Misskeyは広告を掲載したりしないため、収入を皆様からの寄付に頼っています。もしご興味があれば、{}までご連絡ください。ご協力ありがとうございます。"
+common/views/widgets/photo-stream.vue:
+  title: "フォトストリーム"
+  no-photos: "写真はありません"
+common/views/widgets/server.vue:
+  title: "サーバー情報"
+  toggle: "表示を切り替え"
+common/views/widgets/visibility-chooser.vue:
+  public: "公開"
+  home: "ホーム"
+  home-desc: "ホームタイムラインにのみ公開"
+  followers: "フォロワー"
+  followers-desc: "自分のフォロワーにのみ公開"
+  specified: "ダイレクト"
+  specified-desc: "指定したユーザーにのみ公開"
+  private: "非公開"
+desktop/views/components/activity.chart.vue:
+  total: "Black ... Total"
+  notes: "Blue ... Notes"
+  replies: "Red ... Replies"
+  renotes: "Green ... Renotes"
+desktop/views/components/activity.vue:
+  title: "アクティビティ"
+  toggle: "表示を切り替え"
+desktop/views/components/calendar.vue:
+  title: "{1}年 {2}月"
+  prev: "前の月"
+  next: "次の月"
+  go: "クリックして時間遡行"
+desktop/views/components/choose-file-from-drive-window.vue:
+  choose-file: "ファイル選択中"
+  upload: "PCからドライブにファイルをアップロード"
+  cancel: "キャンセル"
+  ok: "決定"
+  choose-prompt: "ファイルを選択"
+desktop/views/components/choose-folder-from-drive-window.vue:
+  cancel: "キャンセル"
+  ok: "決定"
+  choose-prompt: "フォルダを選択"
+desktop/views/components/crop-window.vue:
+  skip: "クロップをスキップ"
+  cancel: "キャンセル"
+  ok: "決定"
+desktop/views/components/drive-window.vue:
+  used: "使用中"
+  drive: "ドライブ"
+desktop/views/components/drive.file.vue:
+  avatar: "アイコン"
+  banner: "バナー"
+  contextmenu:
+    rename: "名前を変更"
+    copy-url: "URLをコピー"
+    download: "ダウンロード"
+    else-files: "その他..."
+    set-as-avatar: "アイコンに設定"
+    set-as-banner: "バナーに設定"
+    open-in-app: "アプリで開く"
+    add-app: "アプリを追加"
+    rename-file: "ファイル名の変更"
+    input-new-file-name: "新しいファイル名を入力してください"
+    copied: "コピー完了"
+    copied-url-to-clipboard: "URLをクリップボードにコピーしました"
+desktop/views/components/drive.folder.vue:
+  unable-to-process: "操作を完了できません"
+  circular-reference-detected: "移動先のフォルダーは、移動するフォルダーのサブフォルダーです。"
+  unhandled-error: "不明なエラー"
+  contextmenu:
+    move-to-this-folder: "このフォルダへ移動"
+    show-in-new-window: "新しいウィンドウで表示"
+    rename: "名前を変更"
+    rename-folder: "フォルダ名の変更"
+    input-new-folder-name: "新しいフォルダ名を入力してください"
+desktop/views/components/drive.nav-folder.vue:
+  drive: "ドライブ"
+desktop/views/components/drive.vue:
+  search: "検索"
+  load-more: "もっと読み込む"
+  empty-draghover: "ドロップですか？いいですよ、ボクはカワイイですからね"
+  empty-drive: "ドライブには何もありません。"
+  empty-drive-description: "右クリックして「ファイルをアップロード」を選んだり、ファイルをドラッグ&ドロップすることでもアップロードできます。"
+  empty-folder: "このフォルダーは空です"
+  unable-to-process: "操作を完了できません"
+  circular-reference-detected: "移動先のフォルダーは、移動するフォルダーのサブフォルダーです。"
+  unhandled-error: "不明なエラー"
+  url-upload: "URLアップロード"
+  url-of-file: "アップロードしたいファイルのURL"
+  url-upload-requested: "アップロードをリクエストしました"
+  may-take-time: "アップロードが完了するまで時間がかかる場合があります。"
+  create-folder: "フォルダー作成"
+  folder-name: "フォルダー名"
+  contextmenu:
+    create-folder: "フォルダーを作成"
+    upload: "ファイルをアップロード"
+    url-upload: "URLからアップロード"
+desktop/views/components/follow-button.vue:
+  unfollow: "フォロー解除"
+  follow: "フォローする"
+desktop/views/components/followers-window.vue:
+  followers: "{} のフォロワー"
+desktop/views/components/followers.vue:
+  empty: "フォロワーはいないようです。"
+desktop/views/components/following-window.vue:
+  following: "{} のフォロー"
+desktop/views/components/following.vue:
+  empty: "フォロー中のユーザーはいないようです。"
+desktop/views/components/friends-maker.vue:
+  title: "気になるユーザーをフォロー:"
+  empty: "おすすめのユーザーは見つかりませんでした。"
+  fetching: "読み込んでいます"
+  refresh: "もっと見る"
+  close: "閉じる"
+desktop/views/components/game-window.vue:
+  game: "オセロ"
+desktop/views/components/home.vue:
+  done: "完了"
+  add-widget: "ウィジェットを追加:"
+  profile: "プロフィール"
+  calendar: "カレンダー"
+  timemachine: "カレンダー(タイムマシン)"
+  activity: "アクティビティ"
+  rss: "RSSリーダー"
+  trends: "トレンド"
+  photostream: "フォトストリーム"
+  slideshow: "スライドショー"
+  version: "バージョン"
+  broadcast: "ブロードキャスト"
+  notifications: "通知"
+  users: "おすすめユーザー"
+  polls: "投票"
+  post-form: "投稿フォーム"
+  messaging: "メッセージ"
+  server: "サーバー情報"
+  donation: "寄付のお願い"
+  nav: "ナビゲーション"
+  tips: "ヒント"
+  add: "追加"
+desktop/views/input-dialog.vue:
+  cancel: "キャンセル"
+  ok: "決定"
+desktop/views/components/messaging-room-window.vue:
+  title: "メッセージ:"
+desktop/views/components/messaging-window.vue:
+  title: "メッセージ"
+desktop/views/components/note-detail.vue:
+  more: "会話をもっと読み込む"
+  private: "(この投稿は非公開です)"
+  reposted-by: "{}がRenote"
+  location: "位置情報"
+  renote: "Renote"
+  add-reaction: "リアクション"
+desktop/views/components/note-detail.sub.vue:
+  private: "(この投稿は非公開です)"
+desktop/views/components/notes.note.vue:
+  reposted-by: "{}がRenote"
+  reply: "返信"
+  renote: "Renote"
+  add-reaction: "リアクション"
+  detail: "詳細"
+desktop/views/components/notes.vue:
+  error: "読み込みに失敗しました。"
+  retry: "リトライ"
+desktop/views/components/notifications.vue:
+  more: "もっと見る"
+  empty: "ありません！"
+desktop/views/components/post-form.vue:
+  note-placeholder: "いまどうしてる？"
+  reply-placeholder: "この投稿への返信..."
+  quote-placeholder: "この投稿を引用..."
+  note: "投稿"
+  reply: "返信"
+  renote: "Renote"
+  posted: "投稿しました！"
+  replied: "返信しました！"
+  reposted: "Renoteしました！"
+  note-failed: "投稿に失敗しました"
+  reply-failed: "返信に失敗しました"
+  renote-failed: "Renoteに失敗しました"
+  posting: "投稿中"
+  attach-media-from-local: "PCからメディアを添付"
+  attach-media-from-drive: "ドライブからメディアを添付"
+  attach-cancel: "添付取り消し"
+  insert-a-kao: "v(‘ω’)v"
+  create-poll: "投票を作成"
+  text-remain: "残り{}文字"
+desktop/views/components/post-form-window.vue:
+  note: "新規投稿"
+  reply: "返信"
+  attaches: "添付: {}メディア"
+  uploading-media: "{}個のメディアをアップロード中"
+desktop/views/components/progress-dialog.vue:
+  waiting: "待機中"
+desktop/views/components/renote-form.vue:
+  quote: "引用する..."
+  cancel: "キャンセル"
+  renote: "Renote"
+  reposting: "しています..."
+  success: "Renoteしました！"
+  failure: "Renoteに失敗しました"
+desktop/views/components/renote-form-window.vue:
+  title: "この投稿をRenoteしますか？"
+desktop/views/components/settings.vue:
+  profile: "プロフィール"
+  notification: "通知"
+  apps: "アプリ"
+  mute: "ミュート"
+  drive: "ドライブ"
+  security: "セキュリティ"
+  signin: "サインイン履歴"
+  password: "パスワード"
+  2fa: "二段階認証"
+  other: "その他"
+  license: "ライセンス"
+  behaviour: "動作"
+  fetch-on-scroll: "スクロールで自動読み込み"
+  fetch-on-scroll-desc: "ページを下までスクロールしたときに自動で追加のコンテンツを読み込みます。"
+  auto-popout: "ウィンドウの自動ポップアウト"
+  auto-popout-desc: "ウィンドウが開かれるとき、ポップアウト(ブラウザ外に切り離す)可能なら自動でポップアウトします。この設定はブラウザに記憶されます。"
+  advanced: "詳細設定"
+  api-via-stream: "ストリームを経由したAPIリクエスト"
+  api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
+  display: "デザインと表示"
+  customize: "ホームをカスタマイズ"
+  dark-mode: "ダークモード"
+  circle-icons: "円形のアイコンを使用"
+  gradient-window-header: "ウィンドウのタイトルバーにグラデーションを使用"
+  post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
+  show-reply-target: "リプライ先を表示する"
+  show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
+  show-renoted-my-notes: "Renoteされた自分の投稿をタイムラインに表示する"
+  show-maps: "マップの自動展開"
+  show-maps-desc: "位置情報が添付された投稿のマップを自動的に展開します。"
+  sound: "サウンド"
+  enable-sounds: "サウンドを有効にする"
+  enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
+  volume: "ボリューム"
+  test: "テスト"
+  mobile: "モバイル"
+  disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
+  language: "言語"
+  pick-language: "言語を選択"
+  recommended: "推奨"
+  auto: "自動"
+  specify-language: "言語を指定"
+  language-desc: "変更はページの再度読み込み後に反映されます。"
+  cache: "キャッシュ"
+  clean-cache: "クリーンアップ"
+  cache-warn: "クリーンアップを行うと、ブラウザに記憶されたアカウント情報のキャッシュ、書きかけの投稿・返信・メッセージ、およびその他のデータ(設定情報含む)が削除されます。クリーンアップを行った後はページを再度読み込みする必要があります。"
+  cache-cleared: "キャッシュを削除しました"
+  cache-cleared-desc: "ページを再度読み込みしてください。"
+  auto-watch: "投稿の自動ウォッチ"
+  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
+  about: "Misskeyについて"
+  operator: "このサーバーの運営者"
+  update: "Misskey Update"
+  version: "バージョン:"
+  latest-version: "最新のバージョン:"
+  update-checking: "アップデートを確認中"
+  do-update: "アップデートを確認"
+  update-settings: "詳細設定"
+  prevent-update: "アップデートを延期する(非推奨)"
+  prevent-update-desc: "この設定をオンにしてもアップデートが反映される場合があります。この設定はこのデバイスのみ有効です。"
+  no-updates: "利用可能な更新はありません"
+  no-updates-desc: "お使いのMisskeyは最新です。"
+  update-available: "新しいバージョンが利用可能です"
+  update-available-desc: "ページを再度読み込みすると更新が適用されます。"
+  advanced-settings: "高度な設定"
+  debug-mode: "デバッグモードを有効にする"
+  debug-mode-desc: "この設定はブラウザに記憶されます。"
+  experimental: "実験的機能を有効にする"
+  experimental-desc: "実験的機能を有効にするとMisskeyの動作が不安定になる可能性があります。この設定はブラウザに記憶されます。"
+  tools: "ツール"
+  task-manager: "タスクマネージャ"
+  third-parties: "サードパーティ"
+desktop/views/components/settings.2fa.vue:
+  intro: "二段階認証を設定すると、サインイン時にパスワードだけでなく、予め登録しておいた物理的なデバイス(例えばあなたのスマートフォンなど)も必要になり、よりセキュリティが向上します。"
+  detail: "詳細..."
+  url: "https://www.google.co.jp/intl/ja/landing/2step/"
+  caution: "登録したデバイスを紛失するなどした場合、Misskeyにサインインできなくなりますのでご注意ください。"
+  register: "デバイスを登録する"
+  already-registered: "既に設定は完了しています。"
+  unregister: "設定を解除"
+  unregistered: "二段階認証が無効になりました。"
+  enter-password: "パスワードを入力してください"
+  authenticator: "まず、Google Authenticatorをお使いのデバイスにインストールします:"
+  howtoinstall: "インストール方法はこちら"
+  scan: "次に、表示されているQRコードをスキャンします:"
+  done: "お使いのデバイスに表示されているトークンを入力して完了します:"
+  submit: "完了"
+  success: "設定が完了しました！"
+  failed: "設定に失敗しました。トークンに誤りがないかご確認ください。"
+  info: "次回サインインからは、同様にパスワードに加えてデバイスに表示されているトークンを入力します。"
+desktop/views/components/settings.api.vue:
+  intro: "APIを利用するには、上記のトークンを「i」というキーでパラメータに付加してリクエストします。"
+  caution: "アカウントを不正利用される可能性があるため、このトークンは第三者に教えないでください(アプリなどにも入力しないでください)。"
+  regeneration-of-token: "万が一このトークンが漏れたりその可能性がある場合はトークンを再生成できます。"
+  regenerate-token: "トークンを再生成"
+  token: "Token:"
+  enter-password: "パスワードを入力してください"
+desktop/views/components/settings.app.vue:
+  no-apps: "連携しているアプリケーションはありません"
+desktop/views/components/settings.mute.vue:
+  no-users: "ミュートしているユーザーはいません"
+desktop/views/components/settings.password.vue:
+  reset: "パスワードを変更する"
+  enter-current-password: "現在のパスワードを入力してください"
+  enter-new-password: "新しいパスワードを入力してください"
+  enter-new-password-again: "もう一度新しいパスワードを入力してください"
+  not-match: "新しいパスワードが一致しません"
+  changed: "パスワードを変更しました"
+desktop/views/components/settings.profile.vue:
+  avatar: "アイコン"
+  choice-avatar: "画像を選択"
+  name: "名前"
+  location: "場所"
+  description: "自己紹介"
+  birthday: "誕生日"
+  save: "保存"
+  is-bot: "このアカウントはBotです"
+  is-cat: "このアカウントはCatです"
+desktop/views/components/sub-note-content.vue:
+  hidden: "(この投稿は非公開です)"
+  media: "つのメディア"
+  poll: "投票"
+desktop/views/components/taskmanager.vue:
+  title: "タスクマネージャ"
+desktop/views/components/timeline.vue:
+  home: "ホーム"
+  local: "ローカル"
+  global: "グローバル"
+  list: "リスト"
+desktop/views/components/ui.header.account.vue:
+  profile: "プロフィール"
+  drive: "ドライブ"
+  favorites: "お気に入り"
+  lists: "リスト"
+  customize: "カスタマイズ"
+  settings: "設定"
+  signout: "サインアウト"
+  dark: "闇に飲まれる"
+desktop/views/components/ui.header.nav.vue:
+  home: "ホーム"
+  messaging: "メッセージ"
+  game: "ゲーム"
+desktop/views/components/ui.header.notifications.vue:
+  title: "通知"
+desktop/views/components/ui.header.post.vue:
+  post: "新規投稿"
+desktop/views/components/ui.header.search.vue:
+  placeholder: "検索"
+desktop/views/components/user-lists-window.vue:
+  create-list: "リストを作成"
+desktop/views/components/user-preview.vue:
+  notes: "投稿"
+  following: "フォロー"
+  followers: "フォロワー"
+desktop/views/components/users-list.vue:
+  all: "すべて"
+  iknow: "知り合い"
+  load-more: "もっと"
+  fetching: "読み込んでいます"
+desktop/views/components/users-list-item.vue:
+  followed: "フォローされています"
+desktop/views/components/window.vue:
+  popout: "ポップアウト"
+  close: "閉じる"
+desktop/views/pages/welcome.vue:
+  signin: "ログイン"
+  signup: "新規登録"
+  signin-button: "やってる"
+  signup-button: "やる"
+  timeline: "タイムライン"
+desktop/views/pages/drive.vue:
+  title: "Misskey Drive"
+desktop/views/pages/favorites.vue:
+  more: "さらに読み込む"
+desktop/views/pages/home-customize.vue:
+  title: "ホームのカスタマイズ"
+desktop/views/pages/note.vue:
+  prev: "前の投稿"
+  next: "次の投稿"
+desktop/views/pages/selectdrive.vue:
+  title: "ファイルを選択してください"
+  ok: "決定"
+  cancel: "キャンセル"
+  upload: "PCからドライブにファイルをアップロード"
+desktop/views/pages/user-list.users.vue:
+  users: "ユーザー"
+  add-user: "ユーザーを追加"
+  username: "ユーザー名"
+desktop/views/pages/user/user.followers-you-know.vue:
+  title: "知り合いのフォロワー"
+  loading: "読み込み中"
+  no-users: "知り合いのフォロワーはいません"
+desktop/views/pages/user/user.friends.vue:
+  title: "よく話すユーザー"
+  loading: "読み込み中"
+  no-users: "よく話すユーザーはいません"
+desktop/views/pages/user/user.header.vue:
+  is-suspended: "このユーザーは凍結されています。"
+  is-remote: "このユーザーはリモートユーザーです。"
+  view-remote: "正確な情報を見る"
+desktop/views/pages/user/user.home.vue:
+  last-used-at: "最終アクセス"
+desktop/views/pages/user/user.photos.vue:
+  title: "フォト"
+  loading: "読み込み中"
+  no-photos: "写真はありません"
+desktop/views/pages/user/user.profile.vue:
+  follows-you: "フォローされています"
+  stalk: "ストークする"
+  stalking: "ストーキングしています"
+  unstalk: "ストーク解除"
+  mute: "ミュートする"
+  muted: "ミュートしています"
+  unmute: "ミュート解除"
+desktop/views/pages/user/user.timeline.vue:
+  default: "投稿"
+  with-replies: "投稿と返信"
+  with-media: "メディア"
+  empty: "このユーザーはまだ何も投稿していないようです。"
+desktop/views/widgets/messaging.vue:
+  title: "メッセージ"
+desktop/views/widgets/notifications.vue:
+  title: "通知"
+  settings: "通知の設定"
+desktop/views/widgets/polls.vue:
+  title: "投票"
+  refresh: "他を見る"
+  nothing: "ありません！"
+desktop/views/widgets/post-form.vue:
+  title: "投稿"
+  note: "投稿"
+  placeholder: "いまどうしてる？"
+desktop/views/widgets/profile.vue:
+  update-banner: "クリックでバナー編集"
+  update-avatar: "クリックでアバター編集"
+desktop/views/widgets/trends.vue:
+  title: "トレンド"
+  refresh: "他を見る"
+  nothing: "ありません！"
+desktop/views/widgets/users.vue:
+  title: "おすすめユーザー"
+  refresh: "他を見る"
+  no-one: "いません！"
+mobile/views/components/drive.vue:
+  drive: "ドライブ"
+  used: "使用中"
+  folder-count: "フォルダ"
+  count-separator: "、"
+  file-count: "ファイル"
+  load-more: "もっと読み込む"
+  nothing-in-drive: "ドライブには何もありません"
+  folder-is-empty: "このフォルダは空です"
+mobile/views/components/drive-file-chooser.vue:
+  select-file: "ファイルを選択"
+mobile/views/components/drive-folder-chooser.vue:
+  select-folder: "フォルダーを選択"
+mobile/views/components/drive.file-detail.vue:
+  download: "ダウンロード"
+  rename: "名前を変更"
+  move: "移動"
+  hash: "ハッシュ (md5)"
+  exif: "EXIF"
+mobile/views/components/follow-button.vue:
+  follow: "フォロー"
+  unfollow: "フォロー解除"
+mobile/views/components/note.vue:
+  reposted-by: "{}がRenote"
+mobile/views/components/note-detail.vue:
+  reply: "返信"
+  reaction: "リアクション"
+mobile/views/components/notifications.vue:
+  more: "もっと見る"
+  empty: "ありません！"
+mobile/views/components/post-form.vue:
+  submit: "投稿"
+  reply: "返信"
+  renote: "Renote"
+  renote-placeholder: "この投稿を引用... (オプション)"
+  reply-placeholder: "この投稿への返信..."
+  note-placeholder: "いまどうしてる？"
+mobile/views/components/sub-note-content.vue:
+  media-count: "{}個のメディア"
+  poll: "投票"
+mobile/views/components/timeline.vue:
+  empty: "投稿がありません"
+  load-more: "もっと"
+mobile/views/components/ui.nav.vue:
+  home: "ホーム"
+  notifications: "通知"
+  messaging: "メッセージ"
+  search: "検索"
+  drive: "ドライブ"
+  settings: "設定"
+  about: "Misskeyについて"
+mobile/views/components/user-timeline.vue:
+  no-notes: "このユーザーは投稿していないようです。"
+  no-notes-with-media: "メディア付き投稿はありません。"
+  load-more: "もっと"
+mobile/views/components/users-list.vue:
+  all: "すべて"
+  known: "知り合い"
+  load-more: "もっと"
+mobile/views/pages/drive.vue:
+  drive: "ドライブ"
+mobile/views/pages/followers.vue:
+  followers-of: "{}のフォロワー"
+mobile/views/pages/following.vue:
+  following-of: "{}のフォロー"
+mobile/views/pages/home.vue:
+  home: "ホーム"
+  local: "ローカル"
+  global: "グローバル"
+mobile/views/pages/messaging.vue:
+  messaging: "メッセージ"
+mobile/views/pages/messaging-room.vue:
+  messaging: "メッセージ"
+mobile/views/pages/note.vue:
+  title: "投稿"
+  prev: "前の投稿"
+  next: "次の投稿"
+mobile/views/pages/notifications.vue:
+  notifications: "通知"
+  read-all: "すべての通知を既読にしますか？"
+mobile/views/pages/settings/settings.profile.vue:
+  title: "プロフィール"
+  name: "名前"
+  account: "アカウント"
+  location: "場所"
+  description: "自己紹介"
+  birthday: "誕生日"
+  avatar: "アイコン"
+  banner: "バナー"
+  is-cat: "このアカウントはCatです"
+  save: "保存"
+  saved: "プロフィールを保存しました"
+  uploading: "アップロード中"
+  upload-failed: "アップロードに失敗しました"
+mobile/views/pages/search.vue:
+  search: "検索"
+  empty: "「{}」に関する投稿は見つかりませんでした。"
+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: "私は通信を制限されている"
+  circle-icons: "円形のアイコンを使用"
+  timeline: "タイムライン"
+  show-reply-target: "リプライ先を表示する"
+  show-my-renotes: "自分の行ったRenoteを表示する"
+  show-renoted-my-notes: "Renoteされた自分の投稿を表示する"
+  post-style: "投稿の表示スタイル"
+  post-style-standard: "標準"
+  post-style-smart: "スマート"
+  behavior: "動作"
+  fetch-on-scroll: "スクロールで自動読み込み"
+  disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
+  load-raw-images: "添付された画像を高画質で表示する"
+  load-remote-media: "リモートサーバーのメディアを表示する"
+  twitter: "Twitter連携"
+  twitter-connect: "Twitterアカウントに接続する"
+  twitter-reconnect: "再接続する"
+  twitter-disconnect: "切断する"
+  update: "Misskey Update"
+  version: "バージョン:"
+  latest-version: "最新のバージョン:"
+  update-checking: "アップデートを確認中"
+  check-for-updates: "アップデートを確認"
+  no-updates: "利用可能な更新はありません"
+  no-updates-desc: "お使いのMisskeyは最新です。"
+  update-available: "新しいバージョンが利用可能です"
+  update-available-desc: "ページを再度読み込みすると更新が適用されます。"
+  settings: "設定"
+  signout: "サインアウト"
+mobile/views/pages/user.vue:
+  follows-you: "フォローされています"
+  following: "フォロー"
+  followers: "フォロワー"
+  notes: "投稿"
+  overview: "概要"
+  timeline: "タイムライン"
+  media: "メディア"
+  is-suspended: "このユーザーは凍結されています。"
+  is-remote: "このユーザーはリモートユーザーです。"
+  view-remote: "正確な情報を見る"
+mobile/views/pages/user/home.vue:
+  recent-notes: "最近の投稿"
+  images: "画像"
+  activity: "アクティビティ"
+  keywords: "キーワード"
+  domains: "頻出ドメイン"
+  frequently-replied-users: "よく会話するユーザー"
+  followers-you-know: "知り合いのフォロワー"
+  last-used-at: "最終ログイン"
+mobile/views/pages/user/home.followers-you-know.vue:
+  loading: "読み込み中"
+  no-users: "知り合いのユーザーはいません"
+mobile/views/pages/user/home.friends.vue:
+  loading: "読み込み中"
+  no-users: "よく会話するユーザーはいません"
+mobile/views/pages/user/home.notes.vue:
+  loading: "読み込み中"
+  no-notes: "投稿はありません"
+mobile/views/pages/user/home.photos.vue:
+  loading: "読み込み中"
+  no-photos: "写真はありません"
+docs:
+  edit-this-page-on-github: "間違いや改善点を見つけましたか？"
+  edit-this-page-on-github-link: "このページをGitHubで編集"
+  api:
+    entities:
+      properties: "プロパティ"
+    endpoints:
+      params: "パラメータ"
+      res: "レスポンス"
+    props:
+      name: "名前"
+      type: "型"
+      optional: "オプション"
+      description: "説明"
+      yes: "はい"
+      no: "いいえ"
--- a/locales/ru.yml
+++ b/locales/ru.yml
@ -1,7 +1,7 @@
 ---
 meta:
-  lang: "日本語"
-  divider: ""
+  lang: "Русский язык"
+  divider: " "
 common:
  misskey: "Misskeyで皆と共有しよう。"
  time:
@ -165,7 +165,7 @@ common/views/widgets/photo-stream.vue:
 common/views/widgets/server.vue:
  title: "サーバー情報"
  toggle: "表示を切り替え"
-commons/views/widgets/visibility-chooser.vue:
+common/views/widgets/visibility-chooser.vue:
  public: "公開"
  home: "ホーム"
  home-desc: "ホームタイムラインにのみ公開"
@ -304,7 +304,7 @@ desktop/views/components/messaging-window.vue:
 desktop/views/components/note-detail.vue:
  more: "会話をもっと読み込む"
  private: "(この投稿は非公開です)"
-  is-renote: "がRenote"
+  reposted-by: "{}がRenote"
  location: "位置情報"
  renote: "Renote"
  add-reaction: "リアクション"
@ -475,6 +475,8 @@ desktop/views/components/settings.profile.vue:
  description: "自己紹介"
  birthday: "誕生日"
  save: "保存"
+  is-bot: "このアカウントはBotです"
+  is-cat: "このアカウントはCatです"
 desktop/views/components/sub-note-content.vue:
  hidden: "(この投稿は非公開です)"
  media: "つのメディア"
@ -521,6 +523,12 @@ desktop/views/components/users-list-item.vue:
 desktop/views/components/window.vue:
  popout: "ポップアウト"
  close: "閉じる"
+desktop/views/pages/welcome.vue:
+  signin: "ログイン"
+  signup: "新規登録"
+  signin-button: "やってる"
+  signup-button: "やる"
+  timeline: "タイムライン"
 desktop/views/pages/drive.vue:
  title: "Misskey Drive"
 desktop/views/pages/favorites.vue:
@ -660,7 +668,9 @@ mobile/views/pages/followers.vue:
 mobile/views/pages/following.vue:
  following-of: "{}のフォロー"
 mobile/views/pages/home.vue:
-  timeline: "タイムライン"
+  home: "ホーム"
+  local: "ローカル"
+  global: "グローバル"
 mobile/views/pages/messaging.vue:
  messaging: "メッセージ"
 mobile/views/pages/messaging-room.vue:
@ -674,7 +684,6 @@ mobile/views/pages/notifications.vue:
  read-all: "すべての通知を既読にしますか？"
 mobile/views/pages/settings/settings.profile.vue:
  title: "プロフィール"
-  will-be-published: "※公開されます"
  name: "名前"
  account: "アカウント"
  location: "場所"
@ -682,7 +691,7 @@ mobile/views/pages/settings/settings.profile.vue:
  birthday: "誕生日"
  avatar: "アイコン"
  banner: "バナー"
-  is-bot: "このアカウントはBotです"
+  is-cat: "このアカウントはCatです"
  save: "保存"
  saved: "プロフィールを保存しました"
  uploading: "アップロード中"
@ -713,6 +722,8 @@ mobile/views/pages/settings.vue:
  behavior: "動作"
  fetch-on-scroll: "スクロールで自動読み込み"
  disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
+  load-raw-images: "添付された画像を高画質で表示する"
+  load-remote-media: "リモートサーバーのメディアを表示する"
  twitter: "Twitter連携"
  twitter-connect: "Twitterアカウントに接続する"
  twitter-reconnect: "再接続する"
--- a/locales/zh.yml
+++ b/locales/zh.yml
@ -1,6 +1,6 @@
 ---
 meta:
-  lang: "日本語"
+  lang: "中文(简体)"
  divider: ""
 common:
  misskey: "Misskeyで皆と共有しよう。"
@ -165,7 +165,7 @@ common/views/widgets/photo-stream.vue:
 common/views/widgets/server.vue:
  title: "サーバー情報"
  toggle: "表示を切り替え"
-commons/views/widgets/visibility-chooser.vue:
+common/views/widgets/visibility-chooser.vue:
  public: "公開"
  home: "ホーム"
  home-desc: "ホームタイムラインにのみ公開"
@ -304,7 +304,7 @@ desktop/views/components/messaging-window.vue:
 desktop/views/components/note-detail.vue:
  more: "会話をもっと読み込む"
  private: "(この投稿は非公開です)"
-  is-renote: "がRenote"
+  reposted-by: "{}がRenote"
  location: "位置情報"
  renote: "Renote"
  add-reaction: "リアクション"
@ -475,6 +475,8 @@ desktop/views/components/settings.profile.vue:
  description: "自己紹介"
  birthday: "誕生日"
  save: "保存"
+  is-bot: "このアカウントはBotです"
+  is-cat: "このアカウントはCatです"
 desktop/views/components/sub-note-content.vue:
  hidden: "(この投稿は非公開です)"
  media: "つのメディア"
@ -521,6 +523,12 @@ desktop/views/components/users-list-item.vue:
 desktop/views/components/window.vue:
  popout: "ポップアウト"
  close: "閉じる"
+desktop/views/pages/welcome.vue:
+  signin: "ログイン"
+  signup: "新規登録"
+  signin-button: "やってる"
+  signup-button: "やる"
+  timeline: "タイムライン"
 desktop/views/pages/drive.vue:
  title: "Misskey Drive"
 desktop/views/pages/favorites.vue:
@ -660,7 +668,9 @@ mobile/views/pages/followers.vue:
 mobile/views/pages/following.vue:
  following-of: "{}のフォロー"
 mobile/views/pages/home.vue:
-  timeline: "タイムライン"
+  home: "ホーム"
+  local: "ローカル"
+  global: "グローバル"
 mobile/views/pages/messaging.vue:
  messaging: "メッセージ"
 mobile/views/pages/messaging-room.vue:
@ -674,7 +684,6 @@ mobile/views/pages/notifications.vue:
  read-all: "すべての通知を既読にしますか？"
 mobile/views/pages/settings/settings.profile.vue:
  title: "プロフィール"
-  will-be-published: "※公開されます"
  name: "名前"
  account: "アカウント"
  location: "場所"
@ -682,7 +691,7 @@ mobile/views/pages/settings/settings.profile.vue:
  birthday: "誕生日"
  avatar: "アイコン"
  banner: "バナー"
-  is-bot: "このアカウントはBotです"
+  is-cat: "このアカウントはCatです"
  save: "保存"
  saved: "プロフィールを保存しました"
  uploading: "アップロード中"
@ -713,6 +722,8 @@ mobile/views/pages/settings.vue:
  behavior: "動作"
  fetch-on-scroll: "スクロールで自動読み込み"
  disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
+  load-raw-images: "添付された画像を高画質で表示する"
+  load-remote-media: "リモートサーバーのメディアを表示する"
  twitter: "Twitter連携"
  twitter-connect: "Twitterアカウントに接続する"
  twitter-reconnect: "再接続する"
--- a/package.json
+++ b/package.json
@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "2.13.0",
-	"clientVersion": "1.0.5576",
+	"version": "2.17.0",
+	"clientVersion": "1.0.5731",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
--- a/src/client/app/boot.js
+++ b/src/client/app/boot.js
@ -18,6 +18,14 @@
 		return;
 	}

+	//#region Load settings
+	let settings = null;
+	const vuex = localStorage.getItem('vuex');
+	if (vuex) {
+		settings = JSON.parse(vuex);
+	}
+	//#endregion
+
 	// Get the current url information
 	const url = new URL(location.href);

@ -35,14 +43,9 @@
 	// The default language is English
 	if (!LANGS.includes(lang)) lang = 'en';

-	const vuex = localStorage.getItem('vuex');
-	if (vuex) {
-		const data = JSON.parse(vuex);
-		if (data.device.lang) lang = data.device.lang;
+	if (settings) {
+		if (settings.device.lang) lang = settings.device.lang;
 	}
-
-	const storedLang = localStorage.getItem('lang');
-	if (storedLang) lang = storedLang;
 	//#endregion

 	// Detect the user agent
@ -71,8 +74,10 @@
 	}

 	// Dark/Light
-	if (localStorage.getItem('darkmode') == 'true') {
-		document.documentElement.setAttribute('data-darkmode', 'true');
+	if (settings) {
+		if (settings.device.darkmode) {
+			document.documentElement.setAttribute('data-darkmode', 'true');
+		}
 	}

 	// Script version
--- a/src/client/app/common/views/components/avatar.vue
+++ b/src/client/app/common/views/components/avatar.vue
@ -26,7 +26,11 @@ export default Vue.extend({
 		},
 		style(): any {
 			return {
-				backgroundColor: this.user.avatarColor && this.user.avatarColor.length == 3 ? `rgb(${ this.user.avatarColor.join(',') })` : null,
+				backgroundColor: this.lightmode
+					? `rgb(${ this.user.avatarColor.slice(0, 3).join(',') })`
+					: this.user.avatarColor && this.user.avatarColor.length == 3
+						? `rgb(${ this.user.avatarColor.join(',') })`
+						: null,
 				backgroundImage: this.lightmode ? null : `url(${ this.user.avatarUrl }?thumbnail)`,
 				borderRadius: (this as any).clientSettings.circleIcons ? '100%' : null
 			};
--- a/src/client/app/common/views/components/connect-failed.vue
+++ b/src/client/app/common/views/components/connect-failed.vue
@ -28,7 +28,7 @@ export default Vue.extend({
 	},
 	mounted() {
 		document.title = 'Oops!';
-		document.documentElement.style.background = '#f8f8f8';
+		document.documentElement.style.setProperty('background', '#f8f8f8', 'important');
 	},
 	methods: {
 		reload() {
--- a/src/client/app/common/views/components/messaging-room.form.vue
+++ b/src/client/app/common/views/components/messaging-room.form.vue
@ -197,7 +197,7 @@ export default Vue.extend({
 <style lang="stylus" scoped>
@import '~const.styl'

-.mk-messaging-form
+root(isDark)
 	> textarea
 		cursor auto
 		display block
@ -209,10 +209,10 @@ export default Vue.extend({
 		padding 8px
 		resize none
 		font-size 1em
-		color #000
+		color isDark ? #fff : #000
 		outline none
 		border none
-		border-top solid 1px #eee
+		border-top solid 1px isDark ? #4b5056 : #eee
 		border-radius 0
 		box-shadow none
 		background transparent
@ -302,4 +302,10 @@ export default Vue.extend({
 	input[type=file]
 		display none

+.mk-messaging-form[data-darkmode]
+	root(true)
+
+.mk-messaging-form:not([data-darkmode])
+	root(false)
+
 </style>
--- a/src/client/app/common/views/components/messaging-room.message.vue
+++ b/src/client/app/common/views/components/messaging-room.message.vue
@ -59,8 +59,10 @@ export default Vue.extend({
 </script>

 <style lang="stylus" scoped>
-.message
-	$me-balloon-color = #23A7B6
+@import '~const.styl'
+
+root(isDark)
+	$me-balloon-color = $theme-color

 	padding 10px 12px 10px 12px
 	background-color transparent
@ -126,7 +128,7 @@ export default Vue.extend({
 				bottom -4px
 				left -12px
 				margin 0
-				color rgba(#000, 0.5)
+				color isDark ? rgba(#fff, 0.5) : rgba(#000, 0.5)
 				font-size 11px

 			> .content
@ -187,7 +189,7 @@ export default Vue.extend({
 			display block
 			margin 2px 0 0 0
 			font-size 10px
-			color rgba(#000, 0.4)
+			color isDark ? rgba(#fff, 0.4) : rgba(#000, 0.4)

 			> [data-fa]
 				margin-left 4px
@ -200,8 +202,9 @@ export default Vue.extend({
 			padding-left 66px

 			> .balloon
+				$color = isDark ? #2d3338 : #eee
 				float left
-				background #eee
+				background $color

 				&[data-no-text]
 					background transparent
@ -209,10 +212,15 @@ export default Vue.extend({
 				&:not([data-no-text]):before
 					left -14px
 					border-top solid 8px transparent
-					border-right solid 8px #eee
+					border-right solid 8px $color
 					border-bottom solid 8px transparent
 					border-left solid 8px transparent

+				> .content
+					> .text
+						if isDark
+							color #fff
+
 			> footer
 				text-align left

@ -241,7 +249,7 @@ export default Vue.extend({
 				> .content

 					> p.is-deleted
-						color rgba(255, 255, 255, 0.5)
+						color rgba(#fff, 0.5)

 					> .text >>>
 						&, *
@ -254,4 +262,10 @@ export default Vue.extend({
 		> .baloon
 			opacity 0.5

+.message[data-darkmode]
+	root(true)
+
+.message:not([data-darkmode])
+	root(false)
+
 </style>
--- a/src/client/app/common/views/components/messaging-room.vue
+++ b/src/client/app/common/views/components/messaging-room.vue
@ -18,7 +18,11 @@
 		</template>
 	</div>
 	<footer>
-		<div ref="notifications" class="notifications"></div>
+		<transition name="fade">
+			<div class="new-message" v-show="showIndicator">
+				<button @click="onIndicatorClick">%fa:arrow-circle-down%%i18n:@new-message%</button>
+			</div>
+		</transition>
 		<x-form :user="user" ref="form"/>
 	</footer>
 </div>
@ -45,7 +49,9 @@ export default Vue.extend({
 			fetchingMoreMessages: false,
 			messages: [],
 			existMoreMessages: false,
-			connection: null
+			connection: null,
+			showIndicator: false,
+			timer: null
 		};
 	},

@ -172,7 +178,7 @@ export default Vue.extend({
 				});
 			} else if (message.userId != (this as any).os.i.id) {
 				// Notify
-				this.notify('%i18n:@new-message%');
+				this.notifyNewMessage();
 			}
 		},

@ -205,18 +211,18 @@ export default Vue.extend({
 			}
 		},

-		notify(message) {
-			const n = document.createElement('p') as any;
-			n.innerHTML = '%fa:arrow-circle-down%' + message;
-			n.onclick = () => {
-				this.scrollToBottom();
-				n.parentNode.removeChild(n);
-			};
-			(this.$refs.notifications as any).appendChild(n);
+		onIndicatorClick() {
+			this.showIndicator = false;
+			this.scrollToBottom();
+		},

-			setTimeout(() => {
-				n.style.opacity = 0;
-				setTimeout(() => n.parentNode.removeChild(n), 1000);
+		notifyNewMessage() {
+			this.showIndicator = true;
+
+			if (this.timer) clearTimeout(this.timer);
+
+			this.timer = setTimeout(() => {
+				this.showIndicator = false;
 			}, 4000);
 		},

@ -238,11 +244,12 @@ export default Vue.extend({
 <style lang="stylus" scoped>
@import '~const.styl'

-.mk-messaging-room
+root(isDark)
 	display flex
 	flex 1
 	flex-direction column
 	height 100%
+	background isDark ? #191b22 : #fff

 	> .stream
 		width 100%
@ -267,7 +274,7 @@ export default Vue.extend({
 			padding 16px 8px 8px 8px
 			text-align center
 			font-size 0.8em
-			color rgba(#000, 0.4)
+			color rgba(isDark ? #fff : #000, 0.4)

 			[data-fa]
 				margin-right 4px
@ -278,7 +285,7 @@ export default Vue.extend({
 			padding 16px
 			text-align center
 			font-size 0.8em
-			color rgba(#000, 0.4)
+			color rgba(isDark ? #fff : #000, 0.4)

 			[data-fa]
 				margin-right 4px
@ -322,7 +329,7 @@ export default Vue.extend({
 				left 0
 				right 0
 				margin 0 auto
-				background rgba(#000, 0.1)
+				background rgba(isDark ? #fff : #000, 0.1)

 			> span
 				display inline-block
@ -330,8 +337,8 @@ export default Vue.extend({
 				padding 0 16px
 				//font-weight bold
 				line-height 32px
-				color rgba(#000, 0.3)
-				background #fff
+				color rgba(isDark ? #fff : #000, 0.3)
+				background isDark ? #191b22 : #fff

 	> footer
 		position -webkit-sticky
@ -342,30 +349,32 @@ export default Vue.extend({
 		max-width 600px
 		margin 0 auto
 		padding 0
-		background rgba(255, 255, 255, 0.95)
+		background rgba(isDark ? #282c37 : #fff, 0.95)
 		background-clip content-box

-		> .notifications
+		> .new-message
 			position absolute
 			top -48px
 			width 100%
 			padding 8px 0
 			text-align center

-			&:empty
-				display none
-
-			> p
+			> button
 				display inline-block
 				margin 0
-				padding 0 12px 0 28px
+				padding 0 12px 0 30px
 				cursor pointer
 				line-height 32px
 				font-size 12px
 				color $theme-color-foreground
 				background $theme-color
 				border-radius 16px
-				transition opacity 1s ease
+
+				&:hover
+					background lighten($theme-color, 10%)
+
+				&:active
+					background darken($theme-color, 10%)

 				> [data-fa]
 					position absolute
@ -374,4 +383,17 @@ export default Vue.extend({
 					line-height 32px
 					font-size 16px

+.fade-enter-active, .fade-leave-active
+	transition opacity 0.1s
+
+.fade-enter, .fade-leave-to
+	transition opacity 0.5s
+	opacity 0
+
+.mk-messaging-room[data-darkmode]
+	root(true)
+
+.mk-messaging-room:not([data-darkmode])
+	root(false)
+
 </style>
--- a/src/client/app/common/views/components/welcome-timeline.vue
+++ b/src/client/app/common/views/components/welcome-timeline.vue
@ -37,6 +37,7 @@ export default Vue.extend({
 		fetch(cb?) {
 			this.fetching = true;
 			(this as any).api('notes', {
+				local: true,
 				reply: false,
 				renote: false,
 				media: false,
@ -52,15 +53,15 @@ export default Vue.extend({
 </script>

 <style lang="stylus" scoped>
-.mk-welcome-timeline
-	background #fff
+root(isDark)
+	background isDark ? #282C37 : #fff

 	> div
 		padding 16px
 		overflow-wrap break-word
 		font-size .9em
-		color #4C4C4C
-		border-bottom 1px solid rgba(#000, 0.05)
+		color isDark ? #fff : #4C4C4C
+		border-bottom 1px solid isDark ? rgba(#000, 0.1) : rgba(#000, 0.05)

 		&:after
 			content ""
@ -95,17 +96,23 @@ export default Vue.extend({
 					overflow hidden
 					font-weight bold
 					text-overflow ellipsis
-					color #627079
+					color isDark ? #fff : #627079

 				> .username
 					margin 0 .5em 0 0
-					color #ccc
+					color isDark ? #606984 : #ccc

 				> .info
 					margin-left auto
 					font-size 0.9em

 					> .created-at
-						color #c0c0c0
+						color isDark ? #606984 : #c0c0c0
+
+.mk-welcome-timeline[data-darkmode]
+	root(true)
+
+.mk-welcome-timeline:not([data-darkmode])
+	root(false)

 </style>
--- a/src/client/app/desktop/views/components/followers-window.vue
+++ b/src/client/app/desktop/views/components/followers-window.vue
@ -1,7 +1,7 @@
 <template>
 <mk-window width="400px" height="550px" @closed="$destroy">
 	<span slot="header" :class="$style.header">
-		<img :src="`${user.avatarUrl}?thumbnail&size=64`" alt=""/>%i18n:@followers%.replace('{}', {{ user | userName }})
+		<img :src="`${user.avatarUrl}?thumbnail&size=64`" alt=""/>{{ '%i18n:@followers%'.replace('{}', name) }}
 	</span>
 	<mk-followers :user="user"/>
 </mk-window>
@ -11,7 +11,12 @@
 import Vue from 'vue';

 export default Vue.extend({
-	props: ['user']
+	props: ['user'],
+	computed: {
+		name(): string {
+			return Vue.filter('userName')(this.user);
+		}
+	}
 });
 </script>

--- a/src/client/app/desktop/views/components/following-window.vue
+++ b/src/client/app/desktop/views/components/following-window.vue
@ -1,7 +1,7 @@
 <template>
 <mk-window width="400px" height="550px" @closed="$destroy">
 	<span slot="header" :class="$style.header">
-		<img :src="`${user.avatarUrl}?thumbnail&size=64`" alt=""/>%i18n:@following%.replace('{}', {{ user | userName }})
+		<img :src="`${user.avatarUrl}?thumbnail&size=64`" alt=""/>{{ '%i18n:@following%'.replace('{}', name) }}
 	</span>
 	<mk-following :user="user"/>
 </mk-window>
@ -11,7 +11,12 @@
 import Vue from 'vue';

 export default Vue.extend({
-	props: ['user']
+	props: ['user'],
+	computed: {
+		name(): string {
+			return Vue.filter('userName')(this.user);
+		}
+	}
 });
 </script>

--- a/src/client/app/desktop/views/components/note-detail.vue
+++ b/src/client/app/desktop/views/components/note-detail.vue
@ -2,16 +2,16 @@
 <div class="mk-note-detail" :title="title">
 	<button
 		class="read-more"
-		v-if="p.reply && p.reply.replyId && context.length == 0"
+		v-if="p.reply && p.reply.replyId && conversation.length == 0"
 		title="%i18n:@more%"
-		@click="fetchContext"
-		:disabled="contextFetching"
+		@click="fetchConversation"
+		:disabled="conversationFetching"
 	>
-		<template v-if="!contextFetching">%fa:ellipsis-v%</template>
-		<template v-if="contextFetching">%fa:spinner .pulse%</template>
+		<template v-if="!conversationFetching">%fa:ellipsis-v%</template>
+		<template v-if="conversationFetching">%fa:spinner .pulse%</template>
 	</button>
-	<div class="context">
-		<x-sub v-for="note in context" :key="note.id" :note="note"/>
+	<div class="conversation">
+		<x-sub v-for="note in conversation" :key="note.id" :note="note"/>
 	</div>
 	<div class="reply-to" v-if="p.reply">
 		<x-sub :note="p.reply"/>
@ -21,7 +21,10 @@
 			<mk-avatar class="avatar" :user="note.user"/>
 			%fa:retweet%
 			<router-link class="name" :href="note.user | userPage">{{ note.user | userName }}</router-link>
-			%i18n:@is-renote%
+			<span>{{ '%i18n:@reposted-by%'.substr(0, '%i18n:@reposted-by%'.indexOf('{')) }}</span>
+			<a class="name" :href="note.user | userPage" v-user-preview="note.userId">{{ note.user | userName }}</a>
+			<span>{{ '%i18n:@reposted-by%'.substr('%i18n:@reposted-by%'.indexOf('}') + 1) }}</span>
+			<mk-time :time="note.createdAt"/>
 		</p>
 	</div>
 	<article>
@ -104,8 +107,8 @@ export default Vue.extend({

 	data() {
 		return {
-			context: [],
-			contextFetching: false,
+			conversation: [],
+			conversationFetching: false,
 			replies: []
 		};
 	},
@ -173,15 +176,15 @@ export default Vue.extend({
 	},

 	methods: {
-		fetchContext() {
-			this.contextFetching = true;
+		fetchConversation() {
+			this.conversationFetching = true;

-			// Fetch context
-			(this as any).api('notes/context', {
+			// Fetch conversation
+			(this as any).api('notes/conversation', {
 				noteId: this.p.replyId
-			}).then(context => {
-				this.contextFetching = false;
-				this.context = context.reverse();
+			}).then(conversation => {
+				this.conversationFetching = false;
+				this.conversation = conversation.reverse();
 			});
 		},
 		reply() {
@ -246,7 +249,7 @@ root(isDark)
 		&:disabled
 			color isDark ? #21242b : #ccc

-	> .context
+	> .conversation
 		> *
 			border-bottom 1px solid isDark ? #1c2023 : #eef0f2

--- a/src/client/app/desktop/views/components/notes.note.sub.vue
+++ b/src/client/app/desktop/views/components/notes.note.sub.vue
@ -4,6 +4,9 @@
 	<div class="main">
 		<header>
 			<router-link class="name" :to="note.user | userPage" v-user-preview="note.userId">{{ note.user | userName }}</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>
 			<span class="username"><mk-acct :user="note.user"/></span>
 			<div class="info">
 				<span class="mobile" v-if="note.viaMobile">%fa:mobile-alt%</span>
@ -68,7 +71,6 @@ root(isDark)
 			align-items baseline
 			margin-bottom 2px
 			white-space nowrap
-			line-height 21px

 			> .name
 				display block
@ -84,6 +86,20 @@ root(isDark)
 				&:hover
 					text-decoration underline

+			> .is-admin
+			> .is-bot
+			> .is-cat
+				margin 0 0.5em 0 0
+				padding 1px 5px
+				font-size 10px
+				color isDark ? #758188 : #aaa
+				border solid 1px isDark ? #57616f : #ddd
+				border-radius 3px
+
+				&.is-admin
+					border-color isDark ? #d42c41 : #f56a7b
+					color isDark ? #d42c41 : #f56a7b
+
 			> .username
 				margin 0 .5em 0 0
 				color isDark ? #606984 : #d1d8da
--- a/src/client/app/desktop/views/components/notes.note.vue
+++ b/src/client/app/desktop/views/components/notes.note.vue
@ -16,7 +16,9 @@
 		<div class="main">
 			<header>
 				<router-link class="name" :to="p.user | userPage" v-user-preview="p.user.id">{{ p.user | userName }}</router-link>
-				<span class="is-bot" v-if="p.user.host === null && p.user.isBot">bot</span>
+				<span class="is-admin" v-if="p.user.isAdmin">admin</span>
+				<span class="is-bot" v-if="p.user.isBot">bot</span>
+				<span class="is-cat" v-if="p.user.isCat">cat</span>
 				<span class="username"><mk-acct :user="p.user"/></span>
 				<div class="info">
 					<span class="app" v-if="p.app">via <b>{{ p.app.name }}</b></span>
@ -430,7 +432,9 @@ root(isDark)
 					&:hover
 						text-decoration underline

+				> .is-admin
 				> .is-bot
+				> .is-cat
 					margin 0 .5em 0 0
 					padding 1px 6px
 					font-size 12px
@ -438,6 +442,10 @@ root(isDark)
 					border solid 1px isDark ? #57616f : #ddd
 					border-radius 3px

+					&.is-admin
+						border-color isDark ? #d42c41 : #f56a7b
+						color isDark ? #d42c41 : #f56a7b
+
 				> .username
 					margin 0 .5em 0 0
 					overflow hidden
--- a/src/client/app/desktop/views/components/settings.profile.vue
+++ b/src/client/app/desktop/views/components/settings.profile.vue
@ -24,7 +24,8 @@
 	<button class="ui primary" @click="save">%i18n:@save%</button>
 	<section>
 		<h2>その他</h2>
-		<mk-switch v-model="os.i.isBot" @change="onChangeIsBot" text="このアカウントはbotです"/>
+		<mk-switch v-model="os.i.isBot" @change="onChangeIsBot" text="%i18n:@is-bot%"/>
+		<mk-switch v-model="os.i.isCat" @change="onChangeIsCat" text="%i18n:@is-cat%"/>
 	</section>
 </div>
 </template>
@ -65,6 +66,11 @@ export default Vue.extend({
 			(this as any).api('i/update', {
 				isBot: (this as any).os.i.isBot
 			});
+		},
+		onChangeIsCat() {
+			(this as any).api('i/update', {
+				isCat: (this as any).os.i.isCat
+			});
 		}
 	}
 });
--- a/src/client/app/desktop/views/components/settings.vue
+++ b/src/client/app/desktop/views/components/settings.vue
@ -227,8 +227,7 @@ export default Vue.extend({
 			version,
 			langs,
 			latestVersion: undefined,
-			checkingForUpdate: false,
-			darkmode: localStorage.getItem('darkmode') == 'true'
+			checkingForUpdate: false
 		};
 	},
 	computed: {
@ -246,6 +245,11 @@ export default Vue.extend({
 			set(value) { this.$store.commit('device/set', { key: 'autoPopout', value }); }
 		},

+		darkmode: {
+			get() { return this.$store.state.device.darkmode; },
+			set(value) { this.$store.commit('device/set', { key: 'darkmode', value }); }
+		},
+
 		enableSounds: {
 			get() { return this.$store.state.device.enableSounds; },
 			set(value) { this.$store.commit('device/set', { key: 'enableSounds', value }); }
@ -276,11 +280,6 @@ export default Vue.extend({
 			set(value) { this.$store.commit('device/set', { key: 'enableExperimentalFeatures', value }); }
 		}
 	},
-	watch: {
-		darkmode() {
-			(this as any)._updateDarkmode_(this.darkmode);
-		}
-	},
 	created() {
 		(this as any).os.getMeta().then(meta => {
 			this.meta = meta;
--- a/src/client/app/desktop/views/components/ui.header.account.vue
+++ b/src/client/app/desktop/views/components/ui.header.account.vue
@ -35,7 +35,7 @@
 			</ul>
 			<ul>
 				<li @click="dark">
-					<p><span>%i18n:@dark%</span><template v-if="_darkmode_">%fa:moon%</template><template v-else>%fa:R moon%</template></p>
+					<p><span>%i18n:@dark%</span><template v-if="$store.state.device.darkmode">%fa:moon%</template><template v-else>%fa:R moon%</template></p>
 				</li>
 			</ul>
 		</div>
@ -99,7 +99,10 @@ export default Vue.extend({
 			(this as any).os.signout();
 		},
 		dark() {
-			(this as any)._updateDarkmode_(!(this as any)._darkmode_);
+			this.$store.commit('device/set', {
+				key: 'darkmode',
+				value: !this.$store.state.device.darkmode
+			});
 		}
 	}
 });
--- a/src/client/app/desktop/views/components/user-lists-window.vue
+++ b/src/client/app/desktop/views/components/user-lists-window.vue
@ -2,7 +2,7 @@
 <mk-window ref="window" is-modal width="450px" height="500px" @closed="$destroy">
 	<span slot="header">%fa:list% リスト</span>

-	<div data-id="6e4caea3-d8f9-4ab7-96de-ab67fe8d5c82" :data-darkmode="_darkmode_">
+	<div data-id="6e4caea3-d8f9-4ab7-96de-ab67fe8d5c82" :data-darkmode="$store.state.device.darkmode">
 		<button class="ui" @click="add">%i18n:@create-list%</button>
 		<a v-for="list in lists" :key="list.id" @click="choice(list)">{{ list.title }}</a>
 	</div>
--- a/src/client/app/desktop/views/components/window.vue
+++ b/src/client/app/desktop/views/components/window.vue
@ -95,7 +95,7 @@ export default Vue.extend({
 	},

 	created() {
-		if (this.$store.state.device.autoPopout && this.popoutUrl) {
+		if ((this as any).os.store.state.device.autoPopout && this.popoutUrl) {
 			this.popout();
 			this.preventMount = true;
 		} else {
--- a/src/client/app/desktop/views/pages/messaging-room.vue
+++ b/src/client/app/desktop/views/pages/messaging-room.vue
@ -21,10 +21,21 @@ export default Vue.extend({
 		$route: 'fetch'
 	},
 	created() {
+		const applyBg = v =>
+			document.documentElement.style.setProperty('background', v ? '#191b22' : '#fff', 'important');
+
+		applyBg(this.$store.state.device.darkmode);
+
+		this.unwatchDarkmode = this.$store.watch(s => {
+			return s.device.darkmode;
+		}, applyBg);
+
 		this.fetch();
 	},
-	mounted() {
-		document.documentElement.style.background = '#fff';
+	beforeDestroy() {
+		document.documentElement.style.removeProperty('background');
+		document.documentElement.style.removeProperty('background-color'); // for safari's bug
+		this.unwatchDarkmode();
 	},
 	methods: {
 		fetch() {
@ -50,6 +61,5 @@ export default Vue.extend({
 	flex 1
 	flex-direction column
 	min-height 100%
-	background #fff

 </style>
--- a/src/client/app/desktop/views/pages/welcome.vue
+++ b/src/client/app/desktop/views/pages/welcome.vue
@ -1,23 +1,16 @@
 <template>
 <div class="mk-welcome">
+	<button @click="dark">
+		<template v-if="$store.state.device.darkmode">%fa:moon%</template>
+		<template v-else>%fa:R moon%</template>
+	</button>
 	<main>
-		<div class="top">
-			<div>
-				<div>
-					<h1>Share<br><span ref="share">Everything!</span><span class="cursor">_</span></h1>
-					<p>ようこそ！ <b>Misskey</b>はTwitter風ミニブログSNSです。思ったことや皆と共有したいことを投稿しましょう。タイムラインを見れば、皆の関心事をすぐにチェックすることもできます。<a :href="aboutUrl">詳しく...</a></p>
-					<p><button class="signup" @click="signup">はじめる</button><button class="signin" @click="signin">ログイン</button></p>
-					<div class="users">
-						<mk-avatar class="avatar" v-for="user in users" :key="user.id" :user="user"/>
-					</div>
-				</div>
-				<div>
-					<div>
-						<header>%fa:comments R% タイムライン<div><span></span><span></span><span></span></div></header>
-						<mk-welcome-timeline/>
-					</div>
-				</div>
-			</div>
+		<img :src="$store.state.device.darkmode ? 'assets/title-dark.svg' : 'assets/title.svg'" alt="Misskey">
+		<p><button class="signup" @click="signup">%i18n:@signup-button%</button><button class="signin" @click="signin">%i18n:@signin-button%</button></p>
+
+		<div class="tl">
+			<header>%fa:comments R% %i18n:@timeline%<div><span></span><span></span><span></span></div></header>
+			<mk-welcome-timeline/>
 		</div>
 	</main>
 	<mk-forkit/>
@ -28,11 +21,11 @@
 		</div>
 	</footer>
 	<modal name="signup" width="500px" height="auto" scrollable>
-		<header :class="$style.signupFormHeader">新規登録</header>
+		<header :class="$style.signupFormHeader">%i18n:@signup%</header>
 		<mk-signup :class="$style.signupForm"/>
 	</modal>
 	<modal name="signin" width="500px" height="auto" scrollable>
-		<header :class="$style.signinFormHeader">ログイン</header>
+		<header :class="$style.signinFormHeader">%i18n:@signin%</header>
 		<mk-signin :class="$style.signinForm"/>
 	</modal>
 </div>
@ -42,64 +35,25 @@
 import Vue from 'vue';
 import { docsUrl, copyright, lang } from '../../../config';

-const shares = [
-	'Everything!',
-	'Webpages',
-	'Photos',
-	'Interests',
-	'Favorites'
-];
-
 export default Vue.extend({
 	data() {
 		return {
 			aboutUrl: `${docsUrl}/${lang}/about`,
-			copyright,
-			users: [],
-			clock: null,
-			i: 0
+			copyright
 		};
 	},
-	mounted() {
-		(this as any).api('users', {
-			sort: '+follower',
-			limit: 20
-		}).then(users => {
-			this.users = users;
-		});
-
-		this.clock = setInterval(() => {
-			if (++this.i == shares.length) this.i = 0;
-			const speed = 70;
-			const text = (this.$refs.share as any).innerText;
-			for (let i = 0; i < text.length; i++) {
-				setTimeout(() => {
-					if (this.$refs.share) {
-						(this.$refs.share as any).innerText = text.substr(0, text.length - i);
-					}
-				}, i * speed)
-			}
-			setTimeout(() => {
-				const newText = shares[this.i];
-				for (let i = 0; i <= newText.length; i++) {
-					setTimeout(() => {
-						if (this.$refs.share) {
-							(this.$refs.share as any).innerText = newText.substr(0, i);
-						}
-					}, i * speed)
-				}
-			}, text.length * speed);
-		}, 4000);
-	},
-	beforeDestroy() {
-		clearInterval(this.clock);
-	},
 	methods: {
 		signup() {
 			this.$modal.show('signup');
 		},
 		signin() {
 			this.$modal.show('signin');
+		},
+		dark() {
+			this.$store.commit('device/set', {
+				key: 'darkmode',
+				value: !this.$store.state.device.darkmode
+			});
 		}
 	}
 });
@ -115,161 +69,107 @@ export default Vue.extend({
 <style lang="stylus" scoped>
@import '~const.styl'

-@import url('https://fonts.googleapis.com/css?family=Sarpanch:700')
-
-.mk-welcome
+root(isDark)
 	display flex
 	flex-direction column
 	flex 1
-	$width = 1000px

-	background linear-gradient(to bottom, #1e1d65, #bd6659)
-	//background-image url('/assets/welcome-bg.svg')
-	background-size cover
-	background-position top center
-
-	&:before
-		content ""
-		display block
-		position fixed
-		bottom 0
+	> button
+		position absolute
+		z-index 1
+		top 0
 		left 0
-		width 100%
-		height 100%
-		background-image url('/assets/welcome-fg.svg')
-		background-size cover
-		background-position bottom center
+		padding 16px
+		font-size 18px
+		color isDark ? #fff : #555

 	> main
-		display flex
 		flex 1
+		padding 64px 0 0 0
+		text-align center
+		color isDark ? #9aa4b3 : #555

-		> .top
-			display flex
-			width 100%
+		> img
+			width 350px

-			> div
-				display flex
-				max-width $width + 64px
-				margin 0 auto
-				padding 80px 32px 0 32px
+		> p
+			margin 8px 0
+			line-height 2em

-				> *
-					margin-bottom 48px
+			button
+				padding 8px 16px
+				font-size inherit

-				> div:first-child
-					margin-right 48px
-					color #fff
-					text-shadow 0 0 12px #172062
+			.signup
+				color $theme-color
+				border solid 2px $theme-color
+				border-radius 4px

-					> h1
-						margin 0
-						font-weight bold
-						//font-variant small-caps
-						letter-spacing 12px
-						font-family 'Sarpanch', sans-serif
-						font-size 42px
-						line-height 48px
+				&:focus
+					box-shadow 0 0 0 3px rgba($theme-color, 0.2)

-						> .cursor
-							animation cursor 1s infinite linear both
+				&:hover
+					color $theme-color-foreground
+					background $theme-color

-							@keyframes cursor
-								0%
-									opacity 1
-								50%
-									opacity 0
+				&:active
+					color $theme-color-foreground
+					background darken($theme-color, 10%)
+					border-color darken($theme-color, 10%)

-					> p
-						margin 1em 0
-						line-height 2em
+			.signin
+				&:hover
+					color isDark ? #fff : #000

-					button
-						padding 8px 16px
-						font-size inherit
+		> .tl
+			margin 32px auto 0 auto
+			width 410px
+			text-align left
+			background isDark ? #313543 : #fff
+			border-radius 8px
+			box-shadow 0 8px 32px rgba(#000, 0.15)
+			overflow hidden

-					.signup
-						color $theme-color
-						border solid 2px $theme-color
-						border-radius 4px
+			> header
+				z-index 1
+				padding 12px 16px
+				color isDark ? #e3e5e8 : #888d94
+				box-shadow 0 1px 0px rgba(#000, 0.1)

-						&:focus
-							box-shadow 0 0 0 3px rgba($theme-color, 0.2)
+				> div
+					position absolute
+					top 0
+					right 0
+					padding inherit

-						&:hover
-							color $theme-color-foreground
-							background $theme-color
+					> span
+						display inline-block
+						height 11px
+						width 11px
+						margin-left 6px
+						border-radius 100%
+						vertical-align middle

-						&:active
-							color $theme-color-foreground
-							background darken($theme-color, 10%)
-							border-color darken($theme-color, 10%)
+						&:nth-child(1)
+							background #5BCC8B

-					.signin
-						&:hover
-							color #fff
+						&:nth-child(2)
+							background #E6BB46

-					> .users
-						margin 16px 0 0 0
+						&:nth-child(3)
+							background #DF7065

-						> *
-							display inline-block
-							margin 4px
-							width 38px
-							height 38px
-							border-radius 6px
-
-				> div:last-child
-
-					> div
-						width 410px
-						background #fff
-						border-radius 8px
-						box-shadow 0 0 0 12px rgba(#000, 0.1)
-						overflow hidden
-
-						> header
-							z-index 1
-							padding 12px 16px
-							color #888d94
-							box-shadow 0 1px 0px rgba(#000, 0.1)
-
-							> div
-								position absolute
-								top 0
-								right 0
-								padding inherit
-
-								> span
-									display inline-block
-									height 11px
-									width 11px
-									margin-left 6px
-									background #ccc
-									border-radius 100%
-									vertical-align middle
-
-									&:nth-child(1)
-										background #5BCC8B
-
-									&:nth-child(2)
-										background #E6BB46
-
-									&:nth-child(3)
-										background #DF7065
-
-						> .mk-welcome-timeline
-							max-height 350px
-							overflow auto
+			> .mk-welcome-timeline
+				max-height 350px
+				overflow auto

 	> footer
 		font-size 12px
-		color #949ea5
+		color isDark ? #949ea5 : #737c82

 		> div
-			max-width $width
 			margin 0 auto
-			padding 0 0 42px 0
+			padding 64px
 			text-align center

 			> .c
@ -277,6 +177,12 @@ export default Vue.extend({
 				font-size 10px
 				opacity 0.7

+.mk-welcome[data-darkmode]
+	root(true)
+
+.mk-welcome:not([data-darkmode])
+	root(false)
+
 </style>

 <style lang="stylus" module>
--- a/src/client/app/desktop/views/widgets/polls.vue
+++ b/src/client/app/desktop/views/widgets/polls.vue
@ -4,7 +4,7 @@
 		<template slot="header">%fa:chart-pie%%i18n:@title%</template>
 		<button slot="func" title="%i18n:@refresh%" @click="fetch">%fa:sync%</button>

-		<div class="mkw-polls--body" :data-darkmode="_darkmode_">
+		<div class="mkw-polls--body" :data-darkmode="$store.state.device.darkmode">
 			<div class="poll" v-if="!fetching && poll != null">
 				<p v-if="poll.text"><router-link to="poll | notePage">{{ poll.text }}</router-link></p>
 				<p v-if="!poll.text"><router-link to="poll | notePage">%fa:link%</router-link></p>
--- a/src/client/app/init.ts
+++ b/src/client/app/init.ts
@ -49,48 +49,6 @@ Vue.mixin({
 	}
 });

-// Dark/Light
-const bus = new Vue();
-Vue.mixin({
-	data() {
-		return {
-			_darkmode_: localStorage.getItem('darkmode') == 'true'
-		};
-	},
-	beforeCreate() {
-		// なぜか警告が出るので
-		this._darkmode_ = localStorage.getItem('darkmode') == 'true';
-	},
-	beforeDestroy() {
-		bus.$off('updated', this._onDarkmodeUpdated_);
-	},
-	mounted() {
-		this._onDarkmodeUpdated_(this._darkmode_);
-		bus.$on('updated', this._onDarkmodeUpdated_);
-	},
-	methods: {
-		_updateDarkmode_(v) {
-			localStorage.setItem('darkmode', v.toString());
-			if (v) {
-				document.documentElement.setAttribute('data-darkmode', 'true');
-			} else {
-				document.documentElement.removeAttribute('data-darkmode');
-			}
-			bus.$emit('updated', v);
-		},
-		_onDarkmodeUpdated_(v) {
-			if (!this.$el || !this.$el.setAttribute) return;
-			if (v) {
-				this.$el.setAttribute('data-darkmode', 'true');
-			} else {
-				this.$el.removeAttribute('data-darkmode');
-			}
-			this._darkmode_ = v;
-			this.$forceUpdate();
-		}
-	}
-});
-
 /**
 * APP ENTRY POINT!
 */
@ -141,6 +99,45 @@ export default (callback: (launch: (router: VueRouter, api?: (os: MiOS) => API)
 		const launch = (router: VueRouter, api?: (os: MiOS) => API) => {
 			os.apis = api ? api(os) : null;

+			//#region Dark/Light
+			Vue.mixin({
+				data() {
+					return {
+						_unwatchDarkmode_: null
+					};
+				},
+				mounted() {
+					const apply = v => {
+						if (this.$el.setAttribute == null) return;
+						if (v) {
+							this.$el.setAttribute('data-darkmode', 'true');
+						} else {
+							this.$el.removeAttribute('data-darkmode');
+						}
+					};
+
+					apply(os.store.state.device.darkmode);
+
+					this._unwatchDarkmode_ = os.store.watch(s => {
+						return s.device.darkmode;
+					}, apply);
+				},
+				beforeDestroy() {
+					this._unwatchDarkmode_();
+				}
+			});
+
+			os.store.watch(s => {
+				return s.device.darkmode;
+			}, v => {
+				if (v) {
+					document.documentElement.setAttribute('data-darkmode', 'true');
+				} else {
+					document.documentElement.removeAttribute('data-darkmode');
+				}
+			});
+			//#endregion
+
 			Vue.mixin({
 				data() {
 					return {
--- a/src/client/app/mobile/script.ts
+++ b/src/client/app/mobile/script.ts
@ -70,7 +70,7 @@ init((launch) => {
 		routes: [
 			{ path: '/', name: 'index', component: MkIndex },
 			{ path: '/signup', name: 'signup', component: MkSignup },
-			{ path: '/i/settings', component: MkSettings },
+			{ path: '/i/settings', name: 'settings', component: MkSettings },
 			{ path: '/i/notifications', name: 'notifications', component: MkNotifications },
 			{ path: '/i/widgets', name: 'widgets', component: MkWidgets },
 			{ path: '/i/messaging', name: 'messaging', component: MkMessaging },
--- a/src/client/app/mobile/views/components/media-image.vue
+++ b/src/client/app/mobile/views/components/media-image.vue
@ -16,13 +16,18 @@ export default Vue.extend({
 		}
 	},
 	computed: {
-		lightmode(): boolean {
-			return this.$store.state.device.lightmode;
-		},
 		style(): any {
+			let url = `url(${this.image.url}?thumbnail)`;
+
+			if (this.$store.state.device.loadRemoteMedia || this.$store.state.device.lightmode) {
+				url = null;
+			} else if (this.raw || this.$store.state.device.loadRawImages) {
+				url = `url(${this.image.url})`;
+			}
+
 			return {
 				'background-color': this.image.properties.avgColor && this.image.properties.avgColor.length == 3 ? `rgb(${this.image.properties.avgColor.join(',')})` : 'transparent',
-				'background-image': this.lightmode ? null : this.raw ? `url(${this.image.url})` : `url(${this.image.url}?thumbnail&size=512)`
+				'background-image': url
 			};
 		}
 	}
--- a/src/client/app/mobile/views/components/note-detail.vue
+++ b/src/client/app/mobile/views/components/note-detail.vue
@ -2,15 +2,15 @@
 <div class="mk-note-detail">
 	<button
 		class="more"
-		v-if="p.reply && p.reply.replyId && context.length == 0"
-		@click="fetchContext"
-		:disabled="fetchingContext"
+		v-if="p.reply && p.reply.replyId && conversation.length == 0"
+		@click="fetchConversation"
+		:disabled="conversationFetching"
 	>
-		<template v-if="!contextFetching">%fa:ellipsis-v%</template>
-		<template v-if="contextFetching">%fa:spinner .pulse%</template>
+		<template v-if="!conversationFetching">%fa:ellipsis-v%</template>
+		<template v-if="conversationFetching">%fa:spinner .pulse%</template>
 	</button>
-	<div class="context">
-		<x-sub v-for="note in context" :key="note.id" :note="note"/>
+	<div class="conversation">
+		<x-sub v-for="note in conversation" :key="note.id" :note="note"/>
 	</div>
 	<div class="reply-to" v-if="p.reply">
 		<x-sub :note="p.reply"/>
@ -99,8 +99,8 @@ export default Vue.extend({

 	data() {
 		return {
-			context: [],
-			contextFetching: false,
+			conversation: [],
+			conversationFetching: false,
 			replies: []
 		};
 	},
@ -166,14 +166,14 @@ export default Vue.extend({

 	methods: {
 		fetchContext() {
-			this.contextFetching = true;
+			this.conversationFetching = true;

-			// Fetch context
-			(this as any).api('notes/context', {
+			// Fetch conversation
+			(this as any).api('notes/conversation', {
 				noteId: this.p.replyId
-			}).then(context => {
-				this.contextFetching = false;
-				this.context = context.reverse();
+			}).then(conversation => {
+				this.conversationFetching = false;
+				this.conversation = conversation.reverse();
 			});
 		},
 		reply() {
@ -245,7 +245,7 @@ root(isDark)
 		&:disabled
 			color #ccc

-	> .context
+	> .conversation
 		> *
 			border-bottom 1px solid isDark ? #1c2023 : #eef0f2

--- a/src/client/app/mobile/views/components/note.sub.vue
+++ b/src/client/app/mobile/views/components/note.sub.vue
@ -1,9 +1,13 @@
 <template>
-<div class="sub">
-	<mk-avatar class="avatar" :user="note.user"/>
+<div class="sub" :class="{ smart: $store.state.device.postStyle == 'smart' }">
+	<mk-avatar class="avatar" :user="note.user" v-if="$store.state.device.postStyle != 'smart'"/>
 	<div class="main">
 		<header>
+			<mk-avatar class="avatar" :user="note.user" v-if="$store.state.device.postStyle == 'smart'"/>
 			<router-link class="name" :to="note.user | userPage">{{ note.user | userName }}</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>
 			<span class="username"><mk-acct :user="note.user"/></span>
 			<div class="info">
 				<span class="mobile" v-if="note.viaMobile">%fa:mobile-alt%</span>
@ -42,6 +46,13 @@ root(isDark)
 	@media (min-width 600px)
 		padding 24px 32px

+	&.smart
+		> .main
+			width 100%
+
+			> header
+				align-items center
+
 	&:after
 		content ""
 		display block
@ -73,6 +84,13 @@ root(isDark)
 			margin-bottom 2px
 			white-space nowrap

+			> .avatar
+				flex-shrink 0
+				margin-right 8px
+				width 18px
+				height 18px
+				border-radius 100%
+
 			> .name
 				display block
 				margin 0 0.5em 0 0
@ -88,6 +106,20 @@ root(isDark)
 				&:hover
 					text-decoration underline

+			> .is-admin
+			> .is-bot
+			> .is-cat
+				margin 0 0.5em 0 0
+				padding 1px 5px
+				font-size 10px
+				color isDark ? #758188 : #aaa
+				border solid 1px isDark ? #57616f : #ddd
+				border-radius 3px
+
+				&.is-admin
+					border-color isDark ? #d42c41 : #f56a7b
+					color isDark ? #d42c41 : #f56a7b
+
 			> .username
 				text-align left
 				margin 0
--- a/src/client/app/mobile/views/components/note.vue
+++ b/src/client/app/mobile/views/components/note.vue
@ -17,7 +17,9 @@
 			<header>
 				<mk-avatar class="avatar" :user="p.user" v-if="$store.state.device.postStyle == 'smart'"/>
 				<router-link class="name" :to="p.user | userPage">{{ p.user | userName }}</router-link>
-				<span class="is-bot" v-if="p.user.host === null && p.user.isBot">bot</span>
+				<span class="is-admin" v-if="p.user.isAdmin">admin</span>
+				<span class="is-bot" v-if="p.user.isBot">bot</span>
+				<span class="is-cat" v-if="p.user.isCat">cat</span>
 				<span class="username"><mk-acct :user="p.user"/></span>
 				<div class="info">
 					<span class="mobile" v-if="p.viaMobile">%fa:mobile-alt%</span>
@ -288,6 +290,7 @@ root(isDark)
 			padding 16px 32px

 		.avatar
+			flex-shrink 0
 			display inline-block
 			width 20px
 			height 20px
@ -367,6 +370,7 @@ root(isDark)
 					margin-bottom 2px

 				> .avatar
+					flex-shrink 0
 					margin-right 8px
 					width 20px
 					height 20px
@ -385,7 +389,9 @@ root(isDark)
 					&:hover
 						text-decoration underline

+				> .is-admin
 				> .is-bot
+				> .is-cat
 					margin 0 0.5em 0 0
 					padding 1px 6px
 					font-size 12px
@ -393,6 +399,10 @@ root(isDark)
 					border solid 1px isDark ? #57616f : #ddd
 					border-radius 3px

+					&.is-admin
+						border-color isDark ? #d42c41 : #f56a7b
+						color isDark ? #d42c41 : #f56a7b
+
 				> .username
 					margin 0 0.5em 0 0
 					overflow hidden
--- a/src/client/app/mobile/views/components/ui.nav.vue
+++ b/src/client/app/mobile/views/components/ui.nav.vue
@ -28,8 +28,8 @@
 					<li><a @click="search">%fa:search%%i18n:@search%%fa:angle-right%</a></li>
 				</ul>
 				<ul>
-					<li><router-link to="/i/settings">%fa:cog%%i18n:@settings%%fa:angle-right%</router-link></li>
-					<li @click="dark"><p><template v-if="_darkmode_">%fa:moon%</template><template v-else>%fa:R moon%</template><span>ダークモード</span></p></li>
+					<li><router-link to="/i/settings" :data-active="$route.name == 'settings'">%fa:cog%%i18n:@settings%%fa:angle-right%</router-link></li>
+					<li @click="dark"><p><template v-if="$store.state.device.darkmode">%fa:moon%</template><template v-else>%fa:R moon%</template><span>ダークモード</span></p></li>
 				</ul>
 			</div>
 			<a :href="aboutUrl"><p class="about">%i18n:@about%</p></a>
@ -117,7 +117,10 @@ export default Vue.extend({
 			this.hasGameInvitations = false;
 		},
 		dark() {
-			(this as any)._updateDarkmode_(!(this as any)._darkmode_);
+			this.$store.commit('device/set', {
+				key: 'darkmode',
+				value: !this.$store.state.device.darkmode
+			});
 		}
 	}
 });
--- a/src/client/app/mobile/views/pages/home.vue
+++ b/src/client/app/mobile/views/pages/home.vue
@ -2,9 +2,9 @@
 <mk-ui>
 	<span slot="header" @click="showNav = true">
 		<span>
-			<span v-if="src == 'home'">%fa:home%ホーム</span>
-			<span v-if="src == 'local'">%fa:R comments%ローカル</span>
-			<span v-if="src == 'global'">%fa:globe%グローバル</span>
+			<span v-if="src == 'home'">%fa:home%%i18n:@home%</span>
+			<span v-if="src == 'local'">%fa:R comments%%i18n:@local%</span>
+			<span v-if="src == 'global'">%fa:globe%%i18n:@global%</span>
 			<span v-if="src.startsWith('list')">%fa:list%{{ list.title }}</span>
 		</span>
 		<span style="margin-left:8px">
@ -17,14 +17,14 @@
 		<button @click="fn">%fa:pencil-alt%</button>
 	</template>

-	<main :data-darkmode="_darkmode_">
+	<main :data-darkmode="$store.state.device.darkmode">
 		<div class="nav" v-if="showNav">
 			<div class="bg" @click="showNav = false"></div>
 			<div class="body">
 				<div>
-					<span :data-active="src == 'home'" @click="src = 'home'">%fa:home% ホーム</span>
-					<span :data-active="src == 'local'" @click="src = 'local'">%fa:R comments% ローカル</span>
-					<span :data-active="src == 'global'" @click="src = 'global'">%fa:globe% グローバル</span>
+					<span :data-active="src == 'home'" @click="src = 'home'">%fa:home% %i18n:@home%</span>
+					<span :data-active="src == 'local'" @click="src = 'local'">%fa:R comments% %i18n:@local%</span>
+					<span :data-active="src == 'global'" @click="src = 'global'">%fa:globe% %i18n:@global%</span>
 					<template v-if="lists">
 						<span v-for="l in lists" :data-active="src == 'list:' + l.id" @click="src = 'list:' + l.id; list = l" :key="l.id">%fa:list% {{ l.title }}</span>
 					</template>
--- a/src/client/app/mobile/views/pages/messaging-room.vue
+++ b/src/client/app/mobile/views/pages/messaging-room.vue
@ -16,16 +16,30 @@ export default Vue.extend({
 	data() {
 		return {
 			fetching: true,
-			user: null
+			user: null,
+			unwatchDarkmode: null
 		};
 	},
 	watch: {
 		$route: 'fetch'
 	},
 	created() {
-		document.documentElement.style.background = '#fff';
+		const applyBg = v =>
+			document.documentElement.style.setProperty('background', v ? '#191b22' : '#fff', 'important');
+
+		applyBg(this.$store.state.device.darkmode);
+
+		this.unwatchDarkmode = this.$store.watch(s => {
+			return s.device.darkmode;
+		}, applyBg);
+
 		this.fetch();
 	},
+	beforeDestroy() {
+		document.documentElement.style.removeProperty('background');
+		document.documentElement.style.removeProperty('background-color'); // for safari's bug
+		this.unwatchDarkmode();
+	},
 	methods: {
 		fetch() {
 			this.fetching = true;
@ -39,4 +53,3 @@ export default Vue.extend({
 	}
 });
 </script>
-
--- a/src/client/app/mobile/views/pages/messaging.vue
+++ b/src/client/app/mobile/views/pages/messaging.vue
@ -12,7 +12,6 @@ import getAcct from '../../../../../acct/render';
 export default Vue.extend({
 	mounted() {
 		document.title = 'Misskey %i18n:@messaging%';
-		document.documentElement.style.background = '#fff';
 	},
 	methods: {
 		navigate(user) {
--- a/src/client/app/mobile/views/pages/settings.vue
+++ b/src/client/app/mobile/views/pages/settings.vue
@ -59,6 +59,14 @@
 						<md-switch v-model="clientSettings.disableViaMobile" @change="onChangeDisableViaMobile">%i18n:@disable-via-mobile%</md-switch>
 					</div>

+					<div>
+						<md-switch v-model="loadRawImages">%i18n:@load-raw-images%</md-switch>
+					</div>
+
+					<div>
+						<md-switch v-model="clientSettings.loadRemoteMedia" @change="onChangeLoadRemoteMedia">%i18n:@load-remote-media%</md-switch>
+					</div>
+
 					<div>
 						<md-switch v-model="lightmode">%i18n:@i-am-under-limited-internet%</md-switch>
 					</div>
@ -141,7 +149,6 @@ export default Vue.extend({
 			version,
 			codename,
 			langs,
-			darkmode: localStorage.getItem('darkmode') == 'true',
 			latestVersion: undefined,
 			checkingForUpdate: false
 		};
@ -152,6 +159,11 @@ export default Vue.extend({
 			return Vue.filter('userName')((this as any).os.i);
 		},

+		darkmode: {
+			get() { return this.$store.state.device.darkmode; },
+			set(value) { this.$store.commit('device/set', { key: 'darkmode', value }); }
+		},
+
 		postStyle: {
 			get() { return this.$store.state.device.postStyle; },
 			set(value) { this.$store.commit('device/set', { key: 'postStyle', value }); }
@ -162,18 +174,17 @@ export default Vue.extend({
 			set(value) { this.$store.commit('device/set', { key: 'lightmode', value }); }
 		},

+		loadRawImages: {
+			get() { return this.$store.state.device.loadRawImages; },
+			set(value) { this.$store.commit('device/set', { key: 'loadRawImages', value }); }
+		},
+
 		lang: {
 			get() { return this.$store.state.device.lang; },
 			set(value) { this.$store.commit('device/set', { key: 'lang', value }); }
 		},
 	},

-	watch: {
-		darkmode() {
-			(this as any)._updateDarkmode_(this.darkmode);
-		}
-	},
-
 	mounted() {
 		document.title = 'Misskey | %i18n:@settings%';
 	},
@ -197,6 +208,13 @@ export default Vue.extend({
 			});
 		},

+		onChangeLoadRemoteMedia(v) {
+			this.$store.dispatch('settings/set', {
+				key: 'loadRemoteMedia',
+				value: v
+			});
+		},
+
 		onChangeCircleIcons(v) {
 			this.$store.dispatch('settings/set', {
 				key: 'circleIcons',
--- a/src/client/app/mobile/views/pages/settings/settings.profile.vue
+++ b/src/client/app/mobile/views/pages/settings/settings.profile.vue
@ -27,7 +27,6 @@
 				<md-icon>%fa:birthday-cake%</md-icon>
 				<label>%i18n:@birthday%</label>
 				<md-input type="date" v-model="birthday" :disabled="saving"/>
-				<span class="md-helper-text">%i18n:@will-be-published%</span>
 			</md-field>

 			<md-field>
@ -50,7 +49,7 @@
 					md-content="%18n:!@uploading%"/>

 			<div>
-				<md-switch v-model="os.i.isBot" @change="onChangeIsBot">%i18n:@is-bot%</md-switch>
+				<md-switch v-model="isCat">%i18n:@is-cat%</md-switch>
 			</div>
 		</md-card-content>

@ -75,6 +74,8 @@ export default Vue.extend({
 			birthday: null,
 			avatarId: null,
 			bannerId: null,
+			isBot: false,
+			isCat: false,
 			saving: false,
 			uploading: false
 		};
@ -88,15 +89,11 @@ export default Vue.extend({
 		this.birthday = (this as any).os.i.profile.birthday;
 		this.avatarId = (this as any).os.i.avatarId;
 		this.bannerId = (this as any).os.i.bannerId;
+		this.isBot = (this as any).os.i.isBot;
+		this.isCat = (this as any).os.i.isCat;
 	},

 	methods: {
-		onChangeIsBot() {
-			(this as any).api('i/update', {
-				isBot: (this as any).os.i.isBot
-			});
-		},
-
 		onAvatarChange([file]) {
 			this.uploading = true;

@ -150,7 +147,9 @@ export default Vue.extend({
 				description: this.description || null,
 				birthday: this.birthday || null,
 				avatarId: this.avatarId,
-				bannerId: this.bannerId
+				bannerId: this.bannerId,
+				isBot: this.isBot,
+				isCat: this.isCat
 			}).then(i => {
 				this.saving = false;
 				(this as any).os.i.avatarId = i.avatarId;
--- a/src/client/app/mobile/views/pages/user.vue
+++ b/src/client/app/mobile/views/pages/user.vue
@ -1,7 +1,7 @@
 <template>
 <mk-ui>
 	<template slot="header" v-if="!fetching"><img :src="`${user.avatarUrl}?thumbnail&size=64`" alt="">{{ user | userName }}</template>
-	<main v-if="!fetching" :data-darkmode="_darkmode_">
+	<main v-if="!fetching" :data-darkmode="$store.state.device.darkmode">
 		<div class="is-suspended" v-if="user.isSuspended"><p>%fa:exclamation-triangle% %i18n:@is-suspended%</p></div>
 		<div class="is-remote" v-if="user.host != null"><p>%fa:exclamation-triangle% %i18n:@is-remote%<a :href="user.url || user.uri" target="_blank">%i18n:@view-remote%</a></p></div>
 		<header>
--- a/src/client/app/store.ts
+++ b/src/client/app/store.ts
@ -13,18 +13,22 @@ const defaultSettings = {
 	gradientWindowHeader: false,
 	showReplyTarget: true,
 	showMyRenotes: true,
-	showRenotedMyNotes: true
+	showRenotedMyNotes: true,
+	loadRemoteMedia: true,
+	disableViaMobile: false
 };

 const defaultDeviceSettings = {
 	apiViaStream: true,
 	autoPopout: false,
+	darkmode: false,
 	enableSounds: true,
 	soundVolume: 0.5,
 	lang: null,
 	preventUpdate: false,
 	debug: false,
 	lightmode: false,
+	loadRawImages: false,
 	postStyle: 'standard'
 };

--- a/src/client/assets/title.svg
+++ b/src/client/assets/title.svg
@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="レイヤー_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-	 y="0px" width="256px" height="256px" viewBox="0 0 256 256" enable-background="new 0 0 256 256" xml:space="preserve">
-<circle fill="#2B2F2D" cx="128" cy="153.6" r="19.201"/>
-<circle fill="#2B2F2D" cx="51.2" cy="153.6" r="19.2"/>
-<circle fill="#2B2F2D" cx="204.8" cy="153.6" r="19.2"/>
-<polyline fill="none" stroke="#2B2F2D" stroke-width="16" stroke-linejoin="round" stroke-miterlimit="10" points="51.2,153.6 
-	89.601,102.4 128,153.6 166.4,102.4 204.799,153.6 "/>
-<circle fill="#2B2F2D" cx="89.6" cy="102.4" r="19.2"/>
-<circle fill="#2B2F2D" cx="166.4" cy="102.4" r="19.199"/>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
--- a/src/client/assets/version.html
+++ b/src/client/assets/version.html
@ -10,11 +10,6 @@
 				localStorage.setItem('v', v);
 			}

-			const lang = window.prompt('Enter language (optional):');
-			if (lang && lang.length > 0) {
-				localStorage.setItem('lang', lang);
-			}
-
 			setTimeout(() => {
 				location.href = '/';
 			}, 500);
--- a/src/config/types.ts
+++ b/src/config/types.ts
@ -41,6 +41,8 @@ export type Source = {
 		secret_key: string;
 	};

+	preventCacheRemoteFiles: boolean;
+
 	/**
 	 * ゴーストアカウントのID
 	 */
--- a/src/models/drive-file.ts
+++ b/src/models/drive-file.ts
@ -32,7 +32,7 @@ export type IMetadata = {
 	uri?: string;
 	url?: string;
 	deletedAt?: Date;
-	isExpired?: boolean;
+	isMetaOnly?: boolean;
 };

 export type IDriveFile = {
@ -155,7 +155,8 @@ export const pack = (
 	_target = Object.assign(_target, _file.metadata);

 	_target.src = _file.metadata.url;
-	_target.url = `${config.drive_url}/${_target.id}/${encodeURIComponent(_target.name)}`;
+	_target.url = _file.metadata.isMetaOnly ? _file.metadata.url : `${config.drive_url}/${_target.id}/${encodeURIComponent(_target.name)}`;
+	_target.isRemote = _file.metadata.isMetaOnly;

 	if (_target.properties == null) _target.properties = {};

--- a/src/models/note.ts
+++ b/src/models/note.ts
@ -324,6 +324,10 @@ export const pack = async (
 	// resolve promises in _note object
 	_note = await rap(_note);

+	if (_note.user.isCat && _note.text) {
+		_note.text = _note.text.replace(/な/g, 'にゃ').replace(/ナ/g, 'ニャ');
+	}
+
 	if (hide) {
 		_note.mediaIds = [];
 		_note.text = null;
--- a/src/models/user.ts
+++ b/src/models/user.ts
@ -77,6 +77,7 @@ export interface ILocalUser extends IUserBase {
 	};
 	lastUsedAt: Date;
 	isBot: boolean;
+	isCat: boolean;
 	isPro: boolean;
 	twoFactorSecret: string;
 	twoFactorEnabled: boolean;
--- a/src/server/api/common/read-notification.ts
+++ b/src/server/api/common/read-notification.ts
@ -1,6 +1,7 @@
 import * as mongo from 'mongodb';
 import { default as Notification, INotification } from '../../../models/notification';
 import publishUserStream from '../../../publishers/stream';
+import Mute from '../../../models/mute';

 /**
 * Mark as read notification(s)
@ -26,6 +27,11 @@ export default (
 				? [new mongo.ObjectID(message)]
 				: [(message as INotification)._id];

+	const mute = await Mute.find({
+		muterId: userId
+	});
+	const mutedUserIds = mute.map(m => m.muteeId);
+
 	// Update documents
 	await Notification.update({
 		_id: { $in: ids },
@ -42,6 +48,9 @@ export default (
 	const count = await Notification
 		.count({
 			notifieeId: userId,
+			notifierId: {
+				$nin: mutedUserIds
+			},
 			isRead: false
 		}, {
 			limit: 1
--- a/src/server/api/endpoints.ts
+++ b/src/server/api/endpoints.ts
@ -482,7 +482,7 @@ const endpoints: Endpoint[] = [
 		name: 'notes/replies'
 	},
 	{
-		name: 'notes/context'
+		name: 'notes/conversation'
 	},
 	{
 		name: 'notes/create',
--- a/src/server/api/endpoints/drive/files/create.ts
+++ b/src/server/api/endpoints/drive/files/create.ts
@ -1,6 +1,7 @@
 /**
 * Module dependencies
 */
+import * as fs from 'fs';
 import $ from 'cafy'; import ID from '../../../../../cafy-id';
 import { validateFileName, pack } from '../../../../../models/drive-file';
 import create from '../../../../../services/drive/add-file';
@ -32,15 +33,23 @@ module.exports = async (file, params, user): Promise<any> => {
 	const [folderId = null, folderIdErr] = $.type(ID).optional().nullable().get(params.folderId);
 	if (folderIdErr) throw 'invalid folderId param';

+	function cleanup() {
+		fs.unlink(file.path, () => {});
+	}
+
 	try {
 		// Create file
 		const driveFile = await create(user, file.path, name, null, folderId);

+		cleanup();
+
 		// Serialize
 		return pack(driveFile);
 	} catch (e) {
 		console.error(e);

+		cleanup();
+
 		throw e;
 	}
 };
--- a/src/server/api/endpoints/i/notifications.ts
+++ b/src/server/api/endpoints/i/notifications.ts
@ -96,8 +96,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 		});

 	// Serialize
-	res(await Promise.all(notifications.map(async notification =>
-		await pack(notification))));
+	res(await Promise.all(notifications.map(notification => pack(notification))));

 	// Mark as read all
 	if (notifications.length > 0 && markAsRead) {
--- a/src/server/api/endpoints/i/update.ts
+++ b/src/server/api/endpoints/i/update.ts
@ -47,6 +47,11 @@ module.exports = async (params, user, app) => new Promise(async (res, rej) => {
 	if (isBotErr) return rej('invalid isBot param');
 	if (isBot != null) user.isBot = isBot;

+	// Get 'isCat' parameter
+	const [isCat, isCatErr] = $.bool.optional().get(params.isCat);
+	if (isCatErr) return rej('invalid isCat param');
+	if (isCat != null) user.isCat = isCat;
+
 	// Get 'autoWatch' parameter
 	const [autoWatch, autoWatchErr] = $.bool.optional().get(params.autoWatch);
 	if (autoWatchErr) return rej('invalid autoWatch param');
@ -82,6 +87,7 @@ module.exports = async (params, user, app) => new Promise(async (res, rej) => {
 			bannerColor: user.bannerColor,
 			profile: user.profile,
 			isBot: user.isBot,
+			isCat: user.isCat,
 			settings: user.settings
 		}
 	});
--- a/src/server/api/endpoints/notes.ts
+++ b/src/server/api/endpoints/notes.ts
@ -8,6 +8,10 @@ import Note, { pack } from '../../../models/note';
 * Get all notes
 */
 module.exports = (params) => new Promise(async (res, rej) => {
+	// Get 'local' parameter
+	const [local, localErr] = $.bool.optional().get(params.local);
+	if (localErr) return rej('invalid local param');
+
 	// Get 'reply' parameter
 	const [reply, replyErr] = $.bool.optional().get(params.reply);
 	if (replyErr) return rej('invalid reply param');
@ -61,6 +65,10 @@ module.exports = (params) => new Promise(async (res, rej) => {
 		};
 	}

+	if (local) {
+		query['_user.host'] = null;
+	}
+
 	if (reply != undefined) {
 		query.replyId = reply ? { $exists: true, $ne: null } : null;
 	}
--- a/src/server/api/endpoints/notes/conversation.ts
+++ b/src/server/api/endpoints/notes/conversation.ts
@ -5,11 +5,7 @@ import $ from 'cafy'; import ID from '../../../../cafy-id';
 import Note, { pack } from '../../../../models/note';

 /**
- * Show a context of a note
- *
- * @param {any} params
- * @param {any} user
- * @return {Promise<any>}
+ * Show conversation of a note
 */
 module.exports = (params, user) => new Promise(async (res, rej) => {
 	// Get 'noteId' parameter
@ -33,7 +29,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 		return rej('note not found');
 	}

-	const context = [];
+	const conversation = [];
 	let i = 0;

 	async function get(id) {
@ -41,10 +37,10 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 		const p = await Note.findOne({ _id: id });

 		if (i > offset) {
-			context.push(p);
+			conversation.push(p);
 		}

-		if (context.length == limit) {
+		if (conversation.length == limit) {
 			return;
 		}

@ -58,6 +54,5 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	}

 	// Serialize
-	res(await Promise.all(context.map(async note =>
-		await pack(note, user))));
+	res(await Promise.all(conversation.map(note => pack(note, user))));
 });
--- a/src/server/api/endpoints/notifications/get_unread_count.ts
+++ b/src/server/api/endpoints/notifications/get_unread_count.ts
@ -9,8 +9,7 @@ import Mute from '../../../../models/mute';
 */
 module.exports = (params, user) => new Promise(async (res, rej) => {
 	const mute = await Mute.find({
-		muterId: user._id,
-		deletedAt: { $exists: false }
+		muterId: user._id
 	});
 	const mutedUserIds = mute.map(m => m.muteeId);

--- a/src/server/file/send-drive-file.ts
+++ b/src/server/file/send-drive-file.ts
@ -33,11 +33,12 @@ export default async function(ctx: Koa.Context) {

 	if (file.metadata.deletedAt) {
 		ctx.status = 410;
-		if (file.metadata.isExpired) {
-			await send(ctx, '/cache-expired.png', { root: assets });
-		} else {
-			await send(ctx, '/tombstone.png', { root: assets });
-		}
+		await send(ctx, '/tombstone.png', { root: assets });
+		return;
+	}
+
+	if (file.metadata.isMetaOnly) {
+		ctx.status = 204;
 		return;
 	}

--- a/src/server/index.ts
+++ b/src/server/index.ts
@ -4,8 +4,7 @@

 import * as fs from 'fs';
 import * as http from 'http';
-import * as https from 'https';
-//import * as http2 from 'http2';
+import * as http2 from 'http2';
 import * as zlib from 'zlib';
 import * as Koa from 'koa';
 import * as Router from 'koa-router';
@ -68,8 +67,7 @@ function createServer() {
 			certs[k] = fs.readFileSync(config.https[k]);
 		});
 		certs['allowHTTP1'] = true;
-		//return http2.createSecureServer(certs, app.callback());
-		return https.createServer(certs, app.callback());
+		return http2.createSecureServer(certs, app.callback());
 	} else {
 		return http.createServer(app.callback());
 	}
--- a/src/server/web/index.ts
+++ b/src/server/web/index.ts
@ -49,8 +49,8 @@ const router = new Router();
 //#region static assets

 router.get('/assets/*', async ctx => {
-	// 無圧縮スクリプトを用意するのは大変なので一時的に無効化
-	const path = process.env.NODE_ENV == 'production' ? ctx.path.replace('raw.js', 'min.js') : ctx.path.replace('min.js', 'raw.js');
+	// 互換性のため
+	const path = ctx.path.replace('.raw.js', '.js').replace('.min.js', '.js');
 	await send(ctx, path, {
 		root: client,
 		maxage: ms('7 days'),
--- a/src/services/drive/add-file.ts
+++ b/src/services/drive/add-file.ts
@ -1,6 +1,5 @@
 import { Buffer } from 'buffer';
 import * as fs from 'fs';
-import * as tmp from 'tmp';
 import * as stream from 'stream';

 import * as mongodb from 'mongodb';
@ -14,8 +13,7 @@ import DriveFile, { IMetadata, getDriveFileBucket, IDriveFile, DriveFileChunk }
 import DriveFolder from '../../models/drive-folder';
 import { pack } from '../../models/drive-file';
 import event, { publishDriveStream } from '../../publishers/stream';
-import getAcct from '../../acct/render';
-import { IUser, isLocalUser, isRemoteUser } from '../../models/user';
+import { isLocalUser, IRemoteUser } from '../../models/user';
 import DriveFileThumbnail, { getDriveFileThumbnailBucket, DriveFileThumbnailChunk } from '../../models/drive-file-thumbnail';
 import genThumbnail from '../../drive/gen-thumbnail';

@ -25,13 +23,6 @@ const gm = _gm.subClass({

 const log = debug('misskey:drive:add-file');

-const tmpFile = (): Promise<[string, any]> => new Promise((resolve, reject) => {
-	tmp.file((e, path, fd, cleanup) => {
-		if (e) return reject(e);
-		resolve([path, cleanup]);
-	});
-});
-
 const writeChunks = (name: string, readable: stream.Readable, type: string, metadata: any) =>
 	getDriveFileBucket()
 		.then(bucket => new Promise((resolve, reject) => {
@ -55,64 +46,115 @@ const writeThumbnailChunks = (name: string, readable: stream.Readable, originalI
 			readable.pipe(writeStream);
 		}));

-const addFile = async (
-	user: IUser,
+async function deleteOldFile(user: IRemoteUser) {
+	const oldFile = await DriveFile.findOne({
+		_id: {
+			$nin: [user.avatarId, user.bannerId]
+		}
+	}, {
+		sort: {
+			_id: 1
+		}
+	});
+
+	if (oldFile) {
+		// チャンクをすべて削除
+		DriveFileChunk.remove({
+			files_id: oldFile._id
+		});
+
+		DriveFile.update({ _id: oldFile._id }, {
+			$set: {
+				'metadata.deletedAt': new Date(),
+				'metadata.isExpired': true
+			}
+		});
+
+		//#region サムネイルもあれば削除
+		const thumbnail = await DriveFileThumbnail.findOne({
+			'metadata.originalId': oldFile._id
+		});
+
+		if (thumbnail) {
+			DriveFileThumbnailChunk.remove({
+				files_id: thumbnail._id
+			});
+
+			DriveFileThumbnail.remove({ _id: thumbnail._id });
+		}
+		//#endregion
+	}
+}
+
+/**
+ * Add file to drive
+ *
+ * @param user User who wish to add file
+ * @param path File path
+ * @param name Name
+ * @param comment Comment
+ * @param folderId Folder ID
+ * @param force If set to true, forcibly upload the file even if there is a file with the same hash.
+ * @return Created drive file
+ */
+export default async function(
+	user: any,
 	path: string,
 	name: string = null,
 	comment: string = null,
 	folderId: mongodb.ObjectID = null,
 	force: boolean = false,
+	metaOnly: boolean = false,
 	url: string = null,
 	uri: string = null
-): Promise<IDriveFile> => {
-	log(`registering ${name} (user: ${getAcct(user)}, path: ${path})`);
-
-	// Calculate hash, get content type and get file size
-	const [hash, [mime, ext], size] = await Promise.all([
-		// hash
-		((): Promise<string> => new Promise((res, rej) => {
-			const readable = fs.createReadStream(path);
-			const hash = crypto.createHash('md5');
-			const chunks = [];
-			readable
-				.on('error', rej)
-				.pipe(hash)
-				.on('error', rej)
-				.on('data', (chunk) => chunks.push(chunk))
-				.on('end', () => {
-					const buffer = Buffer.concat(chunks);
-					res(buffer.toString('hex'));
-				});
-		}))(),
-		// mime
-		((): Promise<[string, string | null]> => new Promise((res, rej) => {
-			const readable = fs.createReadStream(path);
-			readable
-				.on('error', rej)
-				.once('data', (buffer: Buffer) => {
-					readable.destroy();
-					const type = fileType(buffer);
-					if (type) {
-						return res([type.mime, type.ext]);
-					} else {
-						// 種類が同定できなかったら application/octet-stream にする
-						return res(['application/octet-stream', null]);
-					}
-				});
-		}))(),
-		// size
-		((): Promise<number> => new Promise((res, rej) => {
-			fs.stat(path, (err, stats) => {
-				if (err) return rej(err);
-				res(stats.size);
+): Promise<IDriveFile> {
+	// Calc md5 hash
+	const calcHash = new Promise<string>((res, rej) => {
+		const readable = fs.createReadStream(path);
+		const hash = crypto.createHash('md5');
+		const chunks = [];
+		readable
+			.on('error', rej)
+			.pipe(hash)
+			.on('error', rej)
+			.on('data', chunk => chunks.push(chunk))
+			.on('end', () => {
+				const buffer = Buffer.concat(chunks);
+				res(buffer.toString('hex'));
 			});
-		}))()
-	]);
+	});
+
+	// Detect content type
+	const detectMime = new Promise<[string, string]>((res, rej) => {
+		const readable = fs.createReadStream(path);
+		readable
+			.on('error', rej)
+			.once('data', (buffer: Buffer) => {
+				readable.destroy();
+				const type = fileType(buffer);
+				if (type) {
+					res([type.mime, type.ext]);
+				} else {
+					// 種類が同定できなかったら application/octet-stream にする
+					res(['application/octet-stream', null]);
+				}
+			});
+	});
+
+	// Get file size
+	const getFileSize = new Promise<number>((res, rej) => {
+		fs.stat(path, (err, stats) => {
+			if (err) return rej(err);
+			res(stats.size);
+		});
+	});
+
+	const [hash, [mime, ext], size] = await Promise.all([calcHash, detectMime, getFileSize]);

 	log(`hash: ${hash}, mime: ${mime}, ext: ${ext}, size: ${size}`);

 	// detect name
-	const detectedName: string = name || (ext ? `untitled.${ext}` : 'untitled');
+	const detectedName = name || (ext ? `untitled.${ext}` : 'untitled');

 	if (!force) {
 		// Check if there is a file with the same hash
@ -125,26 +167,72 @@ const addFile = async (
 		if (much !== null) {
 			log('file with same hash is found');
 			return much;
-		} else {
-			log('file with same hash is not found');
 		}
 	}

-	const [wh, averageColor, folder] = await Promise.all([
-		// Width and height (when image)
-		(async () => {
-			// 画像かどうか
-			if (!/^image\/.*$/.test(mime)) {
-				return null;
+	//#region Check drive usage
+	if (!metaOnly) {
+		const usage = await DriveFile
+			.aggregate([{
+				$match: {
+					'metadata.userId': user._id,
+					'metadata.deletedAt': { $exists: false }
+				}
+			}, {
+				$project: {
+					length: true
+				}
+			}, {
+				$group: {
+					_id: null,
+					usage: { $sum: '$length' }
+				}
+			}])
+			.then((aggregates: any[]) => {
+				if (aggregates.length > 0) {
+					return aggregates[0].usage;
+				}
+				return 0;
+			});
+
+		log(`drive usage is ${usage}`);
+
+		// If usage limit exceeded
+		if (usage + size > user.driveCapacity) {
+			if (isLocalUser(user)) {
+				throw 'no-free-space';
+			} else {
+				// (アバターまたはバナーを含まず)最も古いファイルを削除する
+				deleteOldFile(user);
 			}
+		}
+	}
+	//#endregion

-			const imageType = mime.split('/')[1];
+	const fetchFolder = async () => {
+		if (!folderId) {
+			return null;
+		}

-			// 画像でもPNGかJPEGかGIFでないならスキップ
-			if (imageType != 'png' && imageType != 'jpeg' && imageType != 'gif') {
-				return null;
-			}
+		const driveFolder = await DriveFolder.findOne({
+			_id: folderId,
+			userId: user._id
+		});

+		if (driveFolder == null) throw 'folder-not-found';
+
+		return driveFolder;
+	};
+
+	const properties = {};
+
+	let propPromises = [];
+
+	const isImage = ['image/jpeg', 'image/gif', 'image/png'].includes(mime);
+
+	if (isImage) {
+		// Calc width and height
+		const calcWh = async () => {
 			log('calculate image width and height...');

 			// Calculate width and height
@ -153,22 +241,12 @@ const addFile = async (

 			log(`image width and height is calculated: ${size.width}, ${size.height}`);

-			return [size.width, size.height];
-		})(),
-		// average color (when image)
-		(async () => {
-			// 画像かどうか
-			if (!/^image\/.*$/.test(mime)) {
-				return null;
-			}
-
-			const imageType = mime.split('/')[1];
-
-			// 画像でもPNGかJPEGでないならスキップ
-			if (imageType != 'png' && imageType != 'jpeg') {
-				return null;
-			}
+			properties['width'] = size.width;
+			properties['height'] = size.height;
+		};

+		// Calc average color
+		const calcAvg = async () => {
 			log('calculate average color...');

 			const info = await prominence(gm(fs.createReadStream(path), name)).identify();
@ -185,111 +263,15 @@ const addFile = async (

 			log(`average color is calculated: ${r}, ${g}, ${b}`);

-			return isTransparent ? [r, g, b, 255] : [r, g, b];
-		})(),
-		// folder
-		(async () => {
-			if (!folderId) {
-				return null;
-			}
-			const driveFolder = await DriveFolder.findOne({
-				_id: folderId,
-				userId: user._id
-			});
-			if (!driveFolder) {
-				throw 'folder-not-found';
-			}
-			return driveFolder;
-		})(),
-		// usage checker
-		(async () => {
-			// Calculate drive usage
-			const usage = await DriveFile
-				.aggregate([{
-					$match: {
-						'metadata.userId': user._id,
-						'metadata.deletedAt': { $exists: false }
-					}
-				}, {
-					$project: {
-						length: true
-					}
-				}, {
-					$group: {
-						_id: null,
-						usage: { $sum: '$length' }
-					}
-				}])
-				.then((aggregates: any[]) => {
-					if (aggregates.length > 0) {
-						return aggregates[0].usage;
-					}
-					return 0;
-				});
+			const value = isTransparent ? [r, g, b, 255] : [r, g, b];

-			log(`drive usage is ${usage}`);
+			properties['avgColor'] = value;
+		};

-			// If usage limit exceeded
-			if (usage + size > user.driveCapacity) {
-				if (isLocalUser(user)) {
-					throw 'no-free-space';
-				} else {
-					//#region (アバターまたはバナーを含まず)最も古いファイルを削除する
-					const oldFile = await DriveFile.findOne({
-						_id: {
-							$nin: [user.avatarId, user.bannerId]
-						}
-					}, {
-						sort: {
-							_id: 1
-						}
-					});
-
-					if (oldFile) {
-						// チャンクをすべて削除
-						DriveFileChunk.remove({
-							files_id: oldFile._id
-						});
-
-						DriveFile.update({ _id: oldFile._id }, {
-							$set: {
-								'metadata.deletedAt': new Date(),
-								'metadata.isExpired': true
-							}
-						});
-
-						//#region サムネイルもあれば削除
-						const thumbnail = await DriveFileThumbnail.findOne({
-							'metadata.originalId': oldFile._id
-						});
-
-						if (thumbnail) {
-							DriveFileThumbnailChunk.remove({
-								files_id: thumbnail._id
-							});
-
-							DriveFileThumbnail.remove({ _id: thumbnail._id });
-						}
-						//#endregion
-					}
-					//#endregion
-				}
-			}
-		})()
-	]);
-
-	const readable = fs.createReadStream(path);
-
-	const properties = {};
-
-	if (wh) {
-		properties['width'] = wh[0];
-		properties['height'] = wh[1];
+		propPromises = [calcWh(), calcAvg()];
 	}

-	if (averageColor) {
-		properties['avgColor'] = averageColor;
-	}
+	const [folder] = await Promise.all([fetchFolder(), propPromises]);

 	const metadata = {
 		userId: user._id,
@ -298,7 +280,8 @@ const addFile = async (
 		},
 		folderId: folder !== null ? folder._id : null,
 		comment: comment,
-		properties: properties
+		properties: properties,
+		isMetaOnly: metaOnly
 	} as IMetadata;

 	if (url !== null) {
@ -309,74 +292,35 @@ const addFile = async (
 		metadata.uri = uri;
 	}

-	const file = await (writeChunks(detectedName, readable, mime, metadata) as Promise<IDriveFile>);
+	const driveFile = metaOnly
+		? await DriveFile.insert({
+			length: 0,
+			uploadDate: new Date(),
+			md5: hash,
+			filename: detectedName,
+			metadata: metadata,
+			contentType: mime
+		})
+		: await (writeChunks(detectedName, fs.createReadStream(path), mime, metadata) as Promise<IDriveFile>);

-	try {
-		const thumb = await genThumbnail(file);
-		if (thumb) {
-			await writeThumbnailChunks(detectedName, thumb, file._id);
+	log(`drive file has been created ${driveFile._id}`);
+
+	pack(driveFile).then(packedFile => {
+		// Publish drive_file_created event
+		event(user._id, 'drive_file_created', packedFile);
+		publishDriveStream(user._id, 'file_created', packedFile);
+	});
+
+	if (!metaOnly) {
+		try {
+			const thumb = await genThumbnail(driveFile);
+			if (thumb) {
+				await writeThumbnailChunks(detectedName, thumb, driveFile._id);
+			}
+		} catch (e) {
+			// noop
 		}
-	} catch (e) {
-		// noop
 	}

-	return file;
-};
-
-/**
- * Add file to drive
- *
- * @param user User who wish to add file
- * @param file File path or readableStream
- * @param comment Comment
- * @param type File type
- * @param folderId Folder ID
- * @param force If set to true, forcibly upload the file even if there is a file with the same hash.
- * @return Object that represents added file
- */
-export default (user: any, file: string | stream.Readable, ...args) => new Promise<any>((resolve, reject) => {
-	const isStream = typeof file === 'object' && typeof file.read === 'function';
-
-	// Get file path
-	new Promise<[string, any]>((res, rej) => {
-		if (typeof file === 'string') {
-			res([file, null]);
-		} else if (isStream) {
-			tmpFile()
-				.then(([path, cleanup]) => {
-					const readable: stream.Readable = file;
-					const writable = fs.createWriteStream(path);
-					readable
-						.on('error', rej)
-						.on('end', () => {
-							res([path, cleanup]);
-						})
-						.pipe(writable)
-						.on('error', rej);
-				})
-				.catch(rej);
-		} else {
-			rej(new Error('un-compatible file.'));
-		}
-	})
-	.then(([path, cleanup]) => new Promise<IDriveFile>((res, rej) => {
-		addFile(user, path, ...args)
-			.then(file => {
-				res(file);
-				if (cleanup) cleanup();
-			})
-			.catch(rej);
-	}))
-	.then(file => {
-		log(`drive file has been created ${file._id}`);
-
-		resolve(file);
-
-		pack(file).then(packedFile => {
-			// Publish drive_file_created event
-			event(user._id, 'drive_file_created', packedFile);
-			publishDriveStream(user._id, 'file_created', packedFile);
-		});
-	})
-	.catch(reject);
-});
+	return driveFile;
+}
--- a/src/services/drive/upload-from-url.ts
+++ b/src/services/drive/upload-from-url.ts
@ -1,14 +1,17 @@
+import * as fs from 'fs';
 import * as URL from 'url';
-import { IDriveFile, validateFileName } from '../../models/drive-file';
-import create from './add-file';
+
 import * as debug from 'debug';
 import * as tmp from 'tmp';
-import * as fs from 'fs';
 import * as request from 'request';

+import { IDriveFile, validateFileName } from '../../models/drive-file';
+import create from './add-file';
+import config from '../../config';
+
 const log = debug('misskey:drive:upload-from-url');

-export default async (url, user, folderId = null, uri = null): Promise<IDriveFile> => {
+export default async (url: string, user, folderId = null, uri: string = null): Promise<IDriveFile> => {
 	log(`REQUESTED: ${url}`);

 	let name = URL.parse(url).pathname.split('/').pop();
@ -43,7 +46,7 @@ export default async (url, user, folderId = null, uri = null): Promise<IDriveFil
 	let error;

 	try {
-		driveFile = await create(user, path, name, null, folderId, false, url, uri);
+		driveFile = await create(user, path, name, null, folderId, false, config.preventCacheRemoteFiles, url, uri);
 		log(`created: ${driveFile._id}`);
 	} catch (e) {
 		error = e;
--- a/webpack.config.ts
+++ b/webpack.config.ts
@ -233,15 +233,14 @@ module.exports = {
 			}, {
 				loader: 'replace',
 				query: {
-					search: i18nPattern.toString(),
-					replace: 'i18nReplacement',
-					i18n: true
-				}
-			}, {
-				loader: 'replace',
-				query: {
-					search: faPattern.toString(),
-					replace: 'faReplacement'
+					qs: [{
+						search: i18nPattern.toString(),
+						replace: 'i18nReplacement',
+						i18n: true
+					}, {
+						search: faPattern.toString(),
+						replace: 'faReplacement'
+					}]
 				}
 			}]
 		}]
Author	SHA1	Message	Date
syuilo	ccbcc2a738	Merge branch 'master' of https://github.com/syuilo/misskey	2018-05-25 21:21:45 +09:00
syuilo	07e1882401	2.17.0	2018-05-25 21:21:37 +09:00
syuilo	e56589d19e	Merge pull request #1645 from syuilo/l10n_master New Crowdin translations	2018-05-25 21:21:13 +09:00
syuilo	bfb5367d27	New translations ja.yml (English)	2018-05-25 21:20:32 +09:00
syuilo	712c0ef27d	Refactor: Use better english	2018-05-25 21:05:16 +09:00
syuilo	94b2ddef45	oops	2018-05-25 20:53:27 +09:00
syuilo	b84a83adf4	New translations ja.yml (Portuguese)	2018-05-25 20:52:27 +09:00
syuilo	c8514f58c6	New translations ja.yml (Korean)	2018-05-25 20:52:25 +09:00
syuilo	841ddb036b	New translations ja.yml (Polish)	2018-05-25 20:52:23 +09:00
syuilo	982a37a413	New translations ja.yml (Chinese Simplified)	2018-05-25 20:52:21 +09:00
syuilo	741af7cce5	New translations ja.yml (Italian)	2018-05-25 20:52:19 +09:00
syuilo	9954080672	New translations ja.yml (Russian)	2018-05-25 20:52:17 +09:00
syuilo	f47f4b4a5c	New translations ja.yml (English)	2018-05-25 20:52:14 +09:00
syuilo	1a3fab9cd9	New translations ja.yml (Spanish)	2018-05-25 20:52:11 +09:00
syuilo	b683bf6f18	New translations ja.yml (German)	2018-05-25 20:52:09 +09:00
syuilo	976ae1bf44	New translations ja.yml (French)	2018-05-25 20:52:06 +09:00
syuilo	ffc63383dc	i18n	2018-05-25 20:44:06 +09:00
syuilo	c6ea6de5c2	Fix bug	2018-05-25 20:41:07 +09:00
syuilo	fe812530d8	New translations ja.yml (English)	2018-05-25 20:31:35 +09:00
syuilo	75d07175ae	New translations ja.yml (Portuguese)	2018-05-25 20:26:11 +09:00
syuilo	544580bd8b	New translations ja.yml (Korean)	2018-05-25 20:26:09 +09:00
syuilo	d30d307f80	New translations ja.yml (Polish)	2018-05-25 20:26:06 +09:00
syuilo	5ccdfe258c	New translations ja.yml (Chinese Simplified)	2018-05-25 20:26:04 +09:00
syuilo	8f8b550608	New translations ja.yml (Italian)	2018-05-25 20:26:02 +09:00
syuilo	7836d0b059	New translations ja.yml (Russian)	2018-05-25 20:25:59 +09:00
syuilo	4b9cbe9ca7	New translations ja.yml (English)	2018-05-25 20:25:57 +09:00
syuilo	034b223f8f	New translations ja.yml (Spanish)	2018-05-25 20:25:55 +09:00
syuilo	f87326620b	New translations ja.yml (German)	2018-05-25 20:25:53 +09:00
syuilo	b4a526ed18	New translations ja.yml (French)	2018-05-25 20:25:51 +09:00
syuilo	410cc171c6	✌️	2018-05-25 20:23:36 +09:00
syuilo	558b897700	リモートサーバーのファイルをデータベースに保存せず、クライアントで直接表示させられるように	2018-05-25 20:19:14 +09:00
syuilo	e804757d83	Update gitignore	2018-05-25 18:41:59 +09:00
syuilo	bd434ed02d	Refactor and some fixes	2018-05-25 18:41:49 +09:00
syuilo	df89f5c8b8	Update welcome.vue	2018-05-25 15:06:35 +09:00
syuilo	3aebd8311f	Merge pull request #1644 from syuilo/l10n_master New Crowdin translations	2018-05-24 22:55:35 +09:00
syuilo	f025296331	Enable HTTP/2	2018-05-24 22:21:10 +09:00
syuilo	1a58a962bb	New translations ja.yml (Portuguese)	2018-05-24 17:21:50 +09:00
syuilo	079d6b0de8	New translations ja.yml (English)	2018-05-24 14:21:58 +09:00
syuilo	321841101b	2.16.8	2018-05-24 09:48:30 +09:00
syuilo	8071ca0d66	Merge branch 'master' of https://github.com/syuilo/misskey	2018-05-24 09:48:05 +09:00
syuilo	c1141c5267	Fix bug	2018-05-24 09:48:02 +09:00
syuilo	f1fdd4524d	Update messaging-room.vue	2018-05-24 09:00:16 +09:00
syuilo	02dd2c7f1a	Update messaging-room.vue	2018-05-24 09:00:02 +09:00
syuilo	fc3a323a21	Fix bug	2018-05-24 06:34:46 +09:00
syuilo	d92f501b50	2.16.7	2018-05-24 06:22:20 +09:00
syuilo	be408ba6ea	Fix	2018-05-24 06:22:10 +09:00
syuilo	c81a204e0c	2.16.6	2018-05-24 06:21:04 +09:00
syuilo	fce1d619e8	Fix bug	2018-05-24 06:20:36 +09:00
syuilo	3e146d5f94	2.16.5	2018-05-24 06:09:24 +09:00
syuilo	cb5c0ac2f5	Fix bug	2018-05-24 06:08:23 +09:00
syuilo	4798657b70	Refactor	2018-05-24 05:57:27 +09:00
syuilo	f565e60bcf	Darken	2018-05-24 05:46:09 +09:00
syuilo	89461c598f	Refactor	2018-05-24 05:28:46 +09:00
syuilo	b320d08a5e	🎨	2018-05-24 04:56:58 +09:00
syuilo	a930d4fc7b	Fix bug	2018-05-24 04:55:29 +09:00
syuilo	d42197fc2e	Merge pull request #1642 from syuilo/l10n_master New Crowdin translations	2018-05-23 20:52:32 +09:00
syuilo	2d3138af76	New translations ja.yml (English)	2018-05-23 20:51:44 +09:00
syuilo	4ee4b6f332	Update docs	2018-05-23 19:03:25 +09:00
syuilo	fc6c048fad	Update setup.ja.md	2018-05-23 19:00:23 +09:00
syuilo	dae9c4288d	2.16.4	2018-05-23 16:00:08 +09:00
syuilo	9f37149369	🎨	2018-05-23 15:58:53 +09:00
syuilo	e476647ab8	🎨	2018-05-23 15:48:41 +09:00
syuilo	eb23be979c	oops	2018-05-23 15:47:51 +09:00
syuilo	6d9d6a6779	oops	2018-05-23 15:46:20 +09:00
syuilo	1c0cb1ae71	2.16.3	2018-05-23 15:27:31 +09:00
syuilo	0ba5dc3900	Only show local posts in the timeline of top page	2018-05-23 15:25:15 +09:00
syuilo	872717feeb	Merge pull request #1638 from syuilo/l10n_master New Crowdin translations	2018-05-23 14:07:36 +09:00
syuilo	85b51f06a4	New translations ja.yml (English)	2018-05-23 14:01:15 +09:00
syuilo	94df60d054	Merge pull request #1637 from syuilo/l10n_master New Crowdin translations	2018-05-23 13:51:19 +09:00
syuilo	7395284480	New translations ja.yml (English)	2018-05-23 13:50:54 +09:00
syuilo	b537fa5467	Merge pull request #1636 from syuilo/l10n_master New Crowdin translations	2018-05-22 23:55:42 +09:00
syuilo	dca58c20d2	New translations ja.yml (Chinese Simplified)	2018-05-22 23:54:36 +09:00
syuilo	0a3030f7d0	New translations ja.yml (English)	2018-05-22 19:35:05 +09:00
syuilo	81cc6f3104	2.16.2	2018-05-22 18:20:49 +09:00
syuilo	cc0b9c6933	oops	2018-05-22 18:19:02 +09:00
syuilo	5671f1c6a4	2.16.1	2018-05-22 11:47:23 +09:00
syuilo	89dee86f39	Fix bug and remove unnecessary query	2018-05-22 11:45:49 +09:00
syuilo	b414068ada	Refactor	2018-05-22 11:39:48 +09:00
syuilo	3be7952e9f	Improve avatar rendering	2018-05-22 11:34:40 +09:00
syuilo	137b5da4aa	Fix bug	2018-05-22 11:31:06 +09:00
syuilo	2ee1639acb	Merge pull request #1631 from syuilo/l10n_master New Crowdin translations	2018-05-22 07:13:58 +09:00
syuilo	a05b184595	New translations ja.yml (Polish)	2018-05-22 06:00:58 +09:00
syuilo	f3bacae1dc	2.16.0	2018-05-21 21:52:10 +09:00
syuilo	af5fb99fe6	Merge pull request #1629 from syuilo/l10n_master New Crowdin translations	2018-05-21 21:51:39 +09:00
syuilo	0ebe4ad7a3	New translations ja.yml (English)	2018-05-21 21:51:24 +09:00
syuilo	0cf99037c8	Merge pull request #1628 from syuilo/l10n_master New Crowdin translations	2018-05-21 21:41:46 +09:00
syuilo	b913debc57	New translations ja.yml (Korean)	2018-05-21 21:41:26 +09:00
syuilo	abe3f1f5e9	New translations ja.yml (Polish)	2018-05-21 21:41:23 +09:00
syuilo	d30b88364c	New translations ja.yml (Chinese Simplified)	2018-05-21 21:41:21 +09:00
syuilo	4840b7acf7	New translations ja.yml (Italian)	2018-05-21 21:41:19 +09:00
syuilo	f5bac11fae	New translations ja.yml (Russian)	2018-05-21 21:41:17 +09:00
syuilo	68a70a94fc	New translations ja.yml (English)	2018-05-21 21:41:15 +09:00
syuilo	bf7436ddf8	New translations ja.yml (Spanish)	2018-05-21 21:41:13 +09:00
syuilo	b99155a084	New translations ja.yml (German)	2018-05-21 21:41:11 +09:00
syuilo	027e62a6ea	New translations ja.yml (French)	2018-05-21 21:41:08 +09:00
syuilo	c6b6c8afbd	Clean up	2018-05-21 21:41:06 +09:00
syuilo	1236a09247	New welcome page	2018-05-21 21:39:46 +09:00
syuilo	6a4d38045e	Merge branch 'master' of https://github.com/syuilo/misskey	2018-05-21 20:54:54 +09:00
syuilo	281aed2797	Fix bug	2018-05-21 20:54:52 +09:00
syuilo	3e47f9943a	Merge pull request #1627 from syuilo/l10n_master New Crowdin translations	2018-05-21 20:36:36 +09:00
syuilo	f6d27dd17d	[travis] Ignore l10n_master	2018-05-21 20:36:14 +09:00
syuilo	073704c7af	New translations ja.yml (Korean)	2018-05-21 20:31:48 +09:00
syuilo	809db02ca2	New translations ja.yml (Polish)	2018-05-21 20:31:47 +09:00
syuilo	2e45ff6a32	New translations ja.yml (Chinese Simplified)	2018-05-21 20:31:45 +09:00
syuilo	02d6974be9	New translations ja.yml (Italian)	2018-05-21 20:31:43 +09:00
syuilo	e530afb2fe	New translations ja.yml (Russian)	2018-05-21 20:31:41 +09:00
syuilo	dba15f0e8b	New translations ja.yml (English)	2018-05-21 20:31:39 +09:00
syuilo	8f771c60c5	New translations ja.yml (Spanish)	2018-05-21 20:31:37 +09:00
syuilo	d9b1ca8c48	New translations ja.yml (German)	2018-05-21 20:31:35 +09:00
syuilo	9e247c119a	New translations ja.yml (French)	2018-05-21 20:31:33 +09:00
syuilo	08b5e21e96	✌️	2018-05-21 20:30:42 +09:00
syuilo	2101d3aa5b	Update locales	2018-05-21 20:28:33 +09:00
syuilo	aa80fb5d4a	2.15.0	2018-05-21 15:18:27 +09:00
syuilo	63727f6514	Merge pull request #1626 from syuilo/l10n_master New Crowdin translations	2018-05-21 15:11:13 +09:00
syuilo	ade35cbb2d	New translations ja.yml (Korean)	2018-05-21 15:10:59 +09:00
syuilo	6ec9059ccc	New translations ja.yml (Polish)	2018-05-21 15:10:57 +09:00
syuilo	c93d1711cf	New translations ja.yml (Chinese Simplified)	2018-05-21 15:10:55 +09:00
syuilo	e734ad0413	New translations ja.yml (Italian)	2018-05-21 15:10:54 +09:00
syuilo	047dee3a70	New translations ja.yml (Russian)	2018-05-21 15:10:52 +09:00
syuilo	8c76089caf	New translations ja.yml (English)	2018-05-21 15:10:50 +09:00
syuilo	ab6cf2dba3	New translations ja.yml (Spanish)	2018-05-21 15:10:48 +09:00
syuilo	65a309e605	New translations ja.yml (German)	2018-05-21 15:10:46 +09:00
syuilo	f37e713640	New translations ja.yml (French)	2018-05-21 15:10:44 +09:00
syuilo	bc1e9245bd	✌️	2018-05-21 15:00:42 +09:00
syuilo	2fa82bde16	🎨	2018-05-21 14:57:27 +09:00
syuilo	140249172c	Display isAdmin badge	2018-05-21 14:47:21 +09:00
syuilo	9677d1288a	2.14.0	2018-05-21 11:16:17 +09:00
syuilo	133ae7d171	Merge pull request #1625 from syuilo/l10n_master New Crowdin translations	2018-05-21 11:15:45 +09:00
syuilo	5b92a43361	Fix bug	2018-05-21 11:14:57 +09:00
syuilo	b839bf6918	New translations ja.yml (Korean)	2018-05-21 11:11:10 +09:00
syuilo	7ea4ba1d5a	New translations ja.yml (Polish)	2018-05-21 11:11:08 +09:00
syuilo	f000dbd657	New translations ja.yml (Chinese Simplified)	2018-05-21 11:11:06 +09:00
syuilo	36e4a24527	New translations ja.yml (Italian)	2018-05-21 11:11:04 +09:00
syuilo	861cc83014	New translations ja.yml (Russian)	2018-05-21 11:11:02 +09:00
syuilo	d2b273dc3b	New translations ja.yml (English)	2018-05-21 11:11:00 +09:00
syuilo	e49ad120f3	New translations ja.yml (Spanish)	2018-05-21 11:10:58 +09:00
syuilo	6f441f35ec	New translations ja.yml (German)	2018-05-21 11:10:56 +09:00
syuilo	14a5c429bb	New translations ja.yml (French)	2018-05-21 11:10:54 +09:00
syuilo	100125ad5a	Fix bug	2018-05-21 11:08:14 +09:00
syuilo	f8c414aafc	#1621	2018-05-21 11:08:08 +09:00
syuilo	14aedb07aa	Update .eslintrc	2018-05-21 10:35:42 +09:00
syuilo	40b01e0ad3	Merge pull request #1624 from syuilo/l10n_master New Crowdin translations	2018-05-21 09:31:11 +09:00
syuilo	f9f6718174	New translations ja.yml (Korean)	2018-05-21 09:30:52 +09:00
syuilo	c41723b09f	New translations ja.yml (Polish)	2018-05-21 09:30:50 +09:00
syuilo	1b6effd369	New translations ja.yml (Chinese Simplified)	2018-05-21 09:30:49 +09:00
syuilo	1bbf7a45a8	New translations ja.yml (Italian)	2018-05-21 09:30:47 +09:00
syuilo	0a5e021128	New translations ja.yml (Russian)	2018-05-21 09:30:45 +09:00
syuilo	52ebde60fc	New translations ja.yml (English)	2018-05-21 09:30:43 +09:00
syuilo	c77cf79f5d	New translations ja.yml (Spanish)	2018-05-21 09:30:41 +09:00
syuilo	1233abe5b0	New translations ja.yml (German)	2018-05-21 09:30:39 +09:00
syuilo	f2f2b09ff1	New translations ja.yml (French)	2018-05-21 09:30:36 +09:00
syuilo	5bf87b7efe	Merge pull request #1623 from syuilo/l10n_master New Crowdin translations	2018-05-21 09:27:57 +09:00
syuilo	526321adb6	Merge pull request #1622 from m4sk1n/master fix typo	2018-05-21 09:27:25 +09:00
syuilo	f816daa59e	New translations ja.yml (Polish)	2018-05-21 05:50:41 +09:00
syuilo	5d6f75ec05	New translations ja.yml (Polish)	2018-05-21 05:41:13 +09:00
Marcin Mikołajczak	28994d001c	fix typo Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-05-20 22:37:03 +02:00