From 09a3a977d737c885819e840f03b07658241c8b56 Mon Sep 17 00:00:00 2001
From: Satsuki Yanagi <17376330+u1-liquid@users.noreply.github.com>
Date: Fri, 7 Feb 2020 09:43:26 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=91=80=20(#5869)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/ja-JP.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 4d97952d96..3c4f92b2b5 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -28,7 +28,7 @@ gotIt: "わかった"
 cancel: "キャンセル"
 enterUsername: "ユーザー名を入力"
 renotedBy: "{user}がRenote"
-noNotes: ノートはありません"
+noNotes: "ノートはありません"
 noNotifications: "通知はありません"
 instance: "インスタンス"
 settings: "設定"

From 53bb5012b9401c9d989fb38a55c0704d7d5c7135 Mon Sep 17 00:00:00 2001
From: fuyu <54523771+mfmfuyu@users.noreply.github.com>
Date: Fri, 7 Feb 2020 11:39:44 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=E9=9D=9E=E3=83=AD=E3=82=B0=E3=82=A4?=
 =?UTF-8?q?=E3=83=B3=E6=99=82=E3=81=AB=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=8C?=
 =?UTF-8?q?=E7=99=BA=E7=94=9F=E3=81=97=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=20(#5872)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/client/app.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/client/app.vue b/src/client/app.vue
index 61fd1ec382..5237eef17a 100644
--- a/src/client/app.vue
+++ b/src/client/app.vue
@@ -248,6 +248,8 @@ export default Vue.extend({
 		// https://stackoverflow.com/questions/33891709/when-flexbox-items-wrap-in-column-mode-container-does-not-grow-its-width
 		if (this.enableWidgets) {
 			setInterval(() => {
+				if (!this.$refs.widgetsEditButton) return;
+
 				const width = this.$refs.widgetsEditButton.offsetLeft + 300;
 				this.$refs.widgets.style.width = width + 'px';
 			}, 1000);
@@ -258,7 +260,7 @@ export default Vue.extend({
 		help() {
 			this.$router.push('/docs/keyboard-shortcut');
 		},
-		
+
 		back() {
 			if (this.canBack) window.history.back();
 		},