TheDesk20.0.3 (Kawaii)

details
Around bookmark
2019-11-16 14:15:45 +09:00 · 2019-11-16 13:40:35 +09:00 · 2019-11-16 13:36:16 +09:00 · 2019-11-16 04:58:37 +09:00 · 2019-11-16 03:42:23 +09:00 · 2019-11-16 00:02:03 +09:00
54 changed files with 2106 additions and 1007 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ app/node_modules
 app/js/login/tkn.js
 app/view/en
 app/view/ja
+app/view/ja-KS
 app/view/de
 app/view/bg
 app/view/cs
--- a/app/css/master.css
+++ b/app/css/master.css
@@ -180,26 +180,6 @@ blockquote:before,
  right: 0;
  top: 0;
 }
-.twitter-tweet {
-  color: black;
-  background-color: #fff;
-  padding: 1em 1em 1em;
-  position: relative;
-  border-top-left-radius: 10px;
-  border-bottom-right-radius: 10px;
-  border-bottom-left-radius: 10px;
-  border-left: 5px solid #0c7abf;
-}
-.twitter-tweet :before {
-  content: "From Twitter";
-  font-size: 1.8rem;
-  line-height: 1em;
-  font-family: Open Sans;
-  color: #999;
-  position: absolute;
-  right: 0;
-  top: 0;
-}
 .pixiv-post {
  color: black;
  background-color: #fff;
--- a/app/css/tl.css
+++ b/app/css/tl.css
@@ -415,6 +415,40 @@ iframe,
 	color: var(--color);
 	transition: 0.5s;
 }
+#contextWrap {
+	position: fixed;
+	width: 199vw;
+	height: 100vh;
+	z-index: 100;
+}
+.contextMenu {
+	position: fixed;
+	background-color: var(--box);
+	z-index: 9999;
+	border-radius: 5px;
+	padding: 5px;
+}
+.contextMenu.bottom:before {
+	content: '';
+	position: absolute;
+	top: 100%;
+	right: 27px;
+	border: 15px solid transparent;
+	border-top: 15px solid var(--box);
+}
+.contextMenu.top:before {
+	content: '';
+	position: absolute;
+	top: -30px;
+	right: 27px;
+	border: 15px solid transparent;
+	border-bottom: 15px solid var(--box);
+}
+.contextMenu .btn-flat {
+	text-transform: none !important;
+	width: 100%;
+	text-align: left;
+}

 .gray {
 	color: var(--gray);
--- a/app/js/login/login.js
+++ b/app/js/login/login.js
@@ -2,128 +2,137 @@
 //最初に読むやつ
 //アスタルテ判定初期化

-localStorage.removeItem("kirishima");
-localStorage.removeItem("quoters");
-localStorage.removeItem("imas");
-localStorage.removeItem("image");
-localStorage.removeItem("stable");
-localStorage.setItem("mode_misskey.xyz", "misskey");
+localStorage.removeItem('kirishima')
+localStorage.removeItem('quoters')
+localStorage.removeItem('imas')
+localStorage.removeItem('image')
+localStorage.removeItem('stable')
+localStorage.setItem('mode_misskey.xyz', 'misskey')
 function ck() {
-	var main = localStorage.getItem("main");
+	var main = localStorage.getItem('main')
 	if (!main) {
-		localStorage.setItem("main", 0);
+		localStorage.setItem('main', 0)
 	}

 	//コード受信
 	if (location.search) {
-		var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
-		var mode = m[1];
-		var codex = m[2];
-		if (mode == "manager" || mode == "login") {
-			code(codex, mode);
+		var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/)
+		var mode = m[1]
+		var codex = m[2]
+		if (mode == 'manager' || mode == 'login') {
+			code(codex, mode)
 		} else {
 		}
 	}
-	var multi = localStorage.getItem("multi");
-	if (!multi || multi == "[]") {
-		var date = new Date();
-		localStorage.setItem("showSupportMe", date.getMonth() + 2);
-		location.href = "acct.html?mode=first&code=true";
+	var multi = localStorage.getItem('multi')
+	if (!multi || multi == '[]') {
+		var date = new Date()
+		localStorage.setItem('showSupportMe', date.getMonth() + 2)
+		location.href = 'acct.html?mode=first&code=true'
 	} else {
-		var obj = JSON.parse(multi);
-		var jp = false;
+		var obj = JSON.parse(multi)
+		var jp = false
 		Object.keys(obj).forEach(function(key) {
-			var acct = obj[key];
+			var acct = obj[key]
 			if (acct.domain) {
-				refresh(key, true);
+				refresh(key, true)
 			}
-			if (acct.domain == "mstdn.jp") {
-				jp = true;
+			if (acct.domain == 'mstdn.jp') {
+				jp = true
 			}
-		});
+		})
 		if (obj[0].domain) {
-			$("#tl").show();
-			ticker();
-			multiSelector(false);
-			verck(ver, jp);
-			$(".stw").show();
-			$("#something-wrong img").attr("src", "../../img/thinking.svg");
+			$('#tl').show()
+			ticker()
+			multiSelector(false)
+			verck(ver, jp)
+			$('.stw').show()
+			$('#something-wrong img').attr('src', '../../img/thinking.svg')
 		}
 	}
 }
-ck();
+ck()

 //ログインポップアップ
 function login(url) {
-	if ($("#linux:checked").val() == "on") {
-		var red = "urn:ietf:wg:oauth:2.0:oob";
+	if ($('#linux:checked').val() == 'on') {
+		var red = 'urn:ietf:wg:oauth:2.0:oob'
 	} else {
-		var red = "thedesk://login";
+		var red = 'thedesk://login'
 	}
-	localStorage.setItem("redirect", red);
-	var start = "https://" + url + "/api/v1/apps";
-	var httpreq = new XMLHttpRequest();
-	httpreq.open("POST", start, true);
-	httpreq.setRequestHeader("Content-Type", "application/json");
-	httpreq.responseType = "json";
+	localStorage.setItem('redirect', red)
+	var start = 'https://' + url + '/api/v1/apps'
+	var httpreq = new XMLHttpRequest()
+	httpreq.open('POST', start, true)
+	httpreq.setRequestHeader('Content-Type', 'application/json')
+	httpreq.responseType = 'json'
 	httpreq.send(
 		JSON.stringify({
-			scopes: "read write follow",
-			client_name: "TheDesk(PC)",
+			scopes: 'read write follow',
+			client_name: 'TheDesk(PC)',
 			redirect_uris: red,
-			website: "https://thedesk.top"
+			website: 'https://thedesk.top'
 		})
-	);
+	)
 	httpreq.onreadystatechange = function() {
 		if (httpreq.readyState === 4) {
-			var json = httpreq.response;
+			var json = httpreq.response
 			if (this.status !== 200) {
-				setLog(start, this.status, json);
+				setLog(start, this.status, json)
 			}
-			var auth = "https://" + url + "/oauth/authorize?client_id=" + json["client_id"] + "&client_secret=" + json["client_secret"] + "&response_type=code&redirect_uri=" + red + "&scope=read+write+follow";
-			localStorage.setItem("domain_" + acct_id, url);
-			localStorage.setItem("client_id", json["client_id"]);
-			localStorage.setItem("client_secret", json["client_secret"]);
-			$("#auth").show();
-			$("#masara").hide();
-			postMessage(["openUrl", auth], "*");
+			var auth =
+				'https://' +
+				url +
+				'/oauth/authorize?client_id=' +
+				json['client_id'] +
+				'&client_secret=' +
+				json['client_secret'] +
+				'&response_type=code&redirect_uri=' +
+				red +
+				'&scope=read+write+follow'
+			localStorage.setItem('domain_' + acct_id, url)
+			localStorage.setItem('client_id', json['client_id'])
+			localStorage.setItem('client_secret', json['client_secret'])
+			$('#auth').show()
+			$('#masara').hide()
+			postMessage(['openUrl', auth], '*')

-			if ($("#linux:checked").val() == "on") {
+			if ($('#linux:checked').val() == 'on') {
 			} else {
-				postMessage(["sendSinmpleIpc", "quit"], "*");
+				postMessage(['sendSinmpleIpc', 'quit'], '*')
 			}
 		}
-	};
+	}
 }

 //テキストボックスにURL入れた
 function instance() {
-	var url = $("#url").val();
-	login(url);
+	var url = $('#url').val()
+	login(url)
 }

 //コードを入れた後認証
 function code(code, mode) {
-	var red = localStorage.getItem("redirect");
-	localStorage.removeItem("redirect");
+	var red = localStorage.getItem('redirect')
+	localStorage.removeItem('redirect')
 	if (!code) {
-		var code = $("#code").val();
+		var code = $('#code').val()
 	}
-	if (localStorage.getItem("domain_tmp")) {
-		var url = localStorage.getItem("domain_tmp");
+	if (localStorage.getItem('domain_tmp')) {
+		var url = localStorage.getItem('domain_tmp')
 	} else {
-		var url = localStorage.getItem("domain_" + acct_id);
+		var url = localStorage.getItem('domain_' + acct_id)
 	}
-	var start = "https://" + url + "/oauth/token";
-	var id = localStorage.getItem("client_id");
-	var secret = localStorage.getItem("client_secret");
+	var start = 'https://' + url + '/oauth/token'
+	var id = localStorage.getItem('client_id')
+	var secret = localStorage.getItem('client_secret')
 	fetch(start, {
-		method: "POST",
+		method: 'POST',
 		headers: {
-			"content-type": "application/json"
+			'content-type': 'application/json'
 		},
 		body: JSON.stringify({
-			grant_type: "authorization_code",
+			grant_type: 'authorization_code',
 			redirect_uri: red,
 			client_id: id,
 			client_secret: secret,
@@ -133,451 +142,472 @@ function code(code, mode) {
 		.then(function(response) {
 			if (!response.ok) {
 				response.text().then(function(text) {
-					setLog(response.url, response.status, text);
-				});
+					setLog(response.url, response.status, text)
+				})
 			}
-			return response.json();
+			return response.json()
 		})
 		.catch(function(error) {
-			todo(error);
-			setLog(start, "JSON", error);
-			console.error(error);
+			todo(error)
+			setLog(start, 'JSON', error)
+			console.error(error)
 		})
 		.then(function(json) {
-			todo(json);
-			if (json["access_token"]) {
-				localStorage.setItem(url + "_at", json["access_token"]);
-				if (mode == "manager") {
-					getdataAdv(url, json["access_token"]);
+			todo(json)
+			if (json['access_token']) {
+				localStorage.setItem(url + '_at', json['access_token'])
+				if (mode == 'manager') {
+					getdataAdv(url, json['access_token'])
 				} else {
-					getdata();
+					getdata()
 				}
 			}
-		});
+		})
 }

 //ユーザーデータ取得(最初)
 function getdata() {
-	var acct_id = 0;
-	var domain = localStorage.getItem("domain_" + acct_id);
-	var at = localStorage.getItem("acct_" + acct_id + "_at");
-	var start = "https://" + domain + "/api/v1/accounts/verify_credentials";
+	var acct_id = 0
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var start = 'https://' + domain + '/api/v1/accounts/verify_credentials'
 	fetch(start, {
-		method: "GET",
+		method: 'GET',
 		headers: {
-			"content-type": "application/json",
-			Authorization: "Bearer " + at
+			'content-type': 'application/json',
+			Authorization: 'Bearer ' + at
 		}
 	})
 		.then(function(response) {
 			if (!response.ok) {
 				response.text().then(function(text) {
-					setLog(response.url, response.status, text);
-				});
+					setLog(response.url, response.status, text)
+				})
 			}
-			return response.json();
+			return response.json()
 		})
 		.catch(function(error) {
-			todo(error);
-			setLog(start, "JSON", error);
-			console.error(error);
+			todo(error)
+			setLog(start, 'JSON', error)
+			console.error(error)
 		})
 		.then(function(json) {
 			if (json.error) {
-				console.error("Error:" + json.error);
-				M.toast({ html: lang.lang_fatalerroroccured + "Error:" + json.error, displayLength: 5000 });
-				return;
+				console.error('Error:' + json.error)
+				M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
+				return
 			}
-			var avatar = json["avatar"];
+			var avatar = json['avatar']
 			//missingがmissingなやつ
-			if (avatar == "/avatars/original/missing.png") {
-				avatar = "./img/missing.svg";
+			if (avatar == '/avatars/original/missing.png') {
+				avatar = './img/missing.svg'
 			}
 			var obj = [
 				{
 					at: at,
-					name: json["display_name"],
+					name: json['display_name'],
 					domain: domain,
-					user: json["acct"],
+					user: json['acct'],
 					prof: avatar,
-					id: json["id"],
-					vis: json["source"]["privacy"]
+					id: json['id'],
+					vis: json['source']['privacy']
 				}
-			];
-			var json = JSON.stringify(obj);
-			localStorage.setItem("multi", json);
-			localStorage.setItem("name_" + acct_id, json["display_name"]);
-			localStorage.setItem("user_" + acct_id, json["acct"]);
-			localStorage.setItem("user-id_" + acct_id, json["id"]);
-			localStorage.setItem("prof_" + acct_id, avatar);
-			$("#masara").hide();
-			$("#auth").hide();
-			$("#tl").show();
-			parseColumn();
-			ckdb();
-		});
+			]
+			var json = JSON.stringify(obj)
+			localStorage.setItem('multi', json)
+			localStorage.setItem('name_' + acct_id, json['display_name'])
+			localStorage.setItem('user_' + acct_id, json['acct'])
+			localStorage.setItem('user-id_' + acct_id, json['id'])
+			localStorage.setItem('prof_' + acct_id, avatar)
+			$('#masara').hide()
+			$('#auth').hide()
+			$('#tl').show()
+			parseColumn()
+			ckdb()
+		})
 }
 //ユーザーデータ取得(追加)
 function getdataAdv(domain, at) {
-	var start = "https://" + domain + "/api/v1/accounts/verify_credentials";
+	var start = 'https://' + domain + '/api/v1/accounts/verify_credentials'
 	fetch(start, {
-		method: "GET",
+		method: 'GET',
 		headers: {
-			"content-type": "application/json",
-			Authorization: "Bearer " + at
+			'content-type': 'application/json',
+			Authorization: 'Bearer ' + at
 		}
 	})
 		.then(function(response) {
 			if (!response.ok) {
 				response.text().then(function(text) {
-					setLog(response.url, response.status, text);
-				});
+					setLog(response.url, response.status, text)
+				})
 			}
-			return response.json();
+			return response.json()
 		})
 		.catch(function(error) {
-			todo(error);
-			setLog(start, "JSON", error);
-			console.error(error);
+			todo(error)
+			setLog(start, 'JSON', error)
+			console.error(error)
 		})
 		.then(function(json) {
 			if (json.error) {
-				console.error("Error:" + json.error);
-				M.toast({ html: lang.lang_fatalerroroccured + "Error:" + json.error, displayLength: 5000 });
-				return;
+				console.error('Error:' + json.error)
+				M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
+				return
 			}
-			var avatar = json["avatar"];
+			var avatar = json['avatar']
 			//missingがmissingなやつ
-			if (avatar == "/avatars/original/missing.png") {
-				avatar = "../../img/missing.svg";
+			if (avatar == '/avatars/original/missing.png') {
+				avatar = '../../img/missing.svg'
 			}
-			if (json["source"]["privacy"]) {
-				var priv = json["source"]["privacy"];
+			if (json['source']['privacy']) {
+				var priv = json['source']['privacy']
 			} else {
-				var priv = "public";
+				var priv = 'public'
 			}
 			var add = {
 				at: at,
-				name: json["display_name"],
+				name: json['display_name'],
 				domain: domain,
-				user: json["acct"],
+				user: json['acct'],
 				prof: avatar,
-				id: json["id"],
+				id: json['id'],
 				vis: priv
-			};
-			var multi = localStorage.getItem("multi");
-			var obj = JSON.parse(multi);
-			var target = obj.lengtth;
-			obj.push(add);
-			localStorage.setItem("name_" + target, json["display_name"]);
-			localStorage.setItem("user_" + target, json["acct"]);
-			localStorage.setItem("user-id_" + target, json["id"]);
-			localStorage.setItem("prof_" + target, avatar);
-			var json = JSON.stringify(obj);
-			localStorage.setItem("multi", json);
-			location.href = "index.html";
-		});
+			}
+			var multi = localStorage.getItem('multi')
+			var obj = JSON.parse(multi)
+			var target = obj.lengtth
+			obj.push(add)
+			localStorage.setItem('name_' + target, json['display_name'])
+			localStorage.setItem('user_' + target, json['acct'])
+			localStorage.setItem('user-id_' + target, json['id'])
+			localStorage.setItem('prof_' + target, avatar)
+			var json = JSON.stringify(obj)
+			localStorage.setItem('multi', json)
+			location.href = 'index.html'
+		})
 }
 //ユーザーデータ更新
 function refresh(target, loadskip) {
-	var multi = localStorage.getItem("multi");
-	var obj = JSON.parse(multi);
-	if (obj[target].mode == "misskey") {
-		return;
+	var multi = localStorage.getItem('multi')
+	var obj = JSON.parse(multi)
+	if (obj[target].mode == 'misskey') {
+		return
 	}
-	var start = "https://" + obj[target].domain + "/api/v1/accounts/verify_credentials";
+	var start = 'https://' + obj[target].domain + '/api/v1/accounts/verify_credentials'
 	fetch(start, {
-		method: "GET",
+		method: 'GET',
 		headers: {
-			"content-type": "application/json",
-			Authorization: "Bearer " + obj[target].at
+			'content-type': 'application/json',
+			Authorization: 'Bearer ' + obj[target].at
 		}
 	})
 		.then(function(response) {
 			if (!response.ok) {
 				response.text().then(function(text) {
-					setLog(response.url, response.status, text);
-				});
+					setLog(response.url, response.status, text)
+				})
 			}
-			return response.json();
+			return response.json()
 		})
 		.catch(function(error) {
-			todo(error);
-			setLog(start, "JSON", error);
-			console.error(error);
+			todo(error)
+			setLog(start, 'JSON', error)
+			console.error(error)
 		})
 		.then(function(json) {
 			if (json.error) {
-				console.error("Error:" + json.error);
-				M.toast({ html: lang.lang_fatalerroroccured + "Error:" + json.error, displayLength: 5000 });
-				return;
+				console.error('Error:' + json.error)
+				M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
+				return
 			}
-			var avatar = json["avatar"];
+			var avatar = json['avatar']
 			//missingがmissingなやつ
-			if (avatar == "/avatars/original/missing.png" || !avatar) {
-				avatar = "./img/missing.svg";
+			if (avatar == '/avatars/original/missing.png' || !avatar) {
+				avatar = './img/missing.svg'
 			}
 			var ref = {
 				at: obj[target].at,
-				name: json["display_name"],
+				name: json['display_name'],
 				domain: obj[target].domain,
-				user: json["acct"],
+				user: json['acct'],
 				prof: avatar,
-				id: json["id"],
-				vis: json["source"]["privacy"]
-			};
-			localStorage.setItem("name_" + target, json["display_name"]);
-			localStorage.setItem("user_" + target, json["acct"]);
-			localStorage.setItem("user-id_" + target, json["id"]);
-			localStorage.setItem("prof_" + target, avatar);
-			localStorage.setItem("follow_" + target, json["following_count"]);
-			if (json["source"]["sensitive"]) {
-				localStorage.setItem("nsfw_" + target, "true");
+				id: json['id'],
+				vis: json['source']['privacy']
+			}
+			if (obj[target].background) {
+				ref.background = obj[target].background
+			}
+			if (obj[target].text) {
+				ref.text = obj[target].text
+			}
+			localStorage.setItem('name_' + target, json['display_name'])
+			localStorage.setItem('user_' + target, json['acct'])
+			localStorage.setItem('user-id_' + target, json['id'])
+			localStorage.setItem('prof_' + target, avatar)
+			localStorage.setItem('follow_' + target, json['following_count'])
+			if (json['source']['sensitive']) {
+				localStorage.setItem('nsfw_' + target, 'true')
 			} else {
-				localStorage.removeItem("nsfw_" + target);
+				localStorage.removeItem('nsfw_' + target)
 			}
-			obj[target] = ref;
-			var json = JSON.stringify(obj);
-			localStorage.setItem("multi", json);
+			obj[target] = ref
+			var json = JSON.stringify(obj)
+			localStorage.setItem('multi', json)
 			if (!loadskip) {
-				load();
+				load()
 			}
-		});
+		})
 }
 //MarkdownやBBCodeの対応、文字数制限をチェック
 //絶対ストリーミングを閉じさせないマン
 function ckdb(acct_id) {
-	var domain = localStorage.getItem("domain_" + acct_id);
-	localStorage.removeItem("home_" + acct_id);
-	localStorage.removeItem("bb_" + acct_id);
-	localStorage.removeItem("md_" + acct_id);
-	localStorage.removeItem("local_" + acct_id);
-	localStorage.removeItem("public_" + acct_id);
-	localStorage.removeItem("notification_" + acct_id);
-	localStorage.removeItem("post_" + acct_id);
-	localStorage.removeItem("fav_" + acct_id);
-	localStorage.removeItem("bt_" + acct_id);
-	localStorage.removeItem("followlocale_" + acct_id);
-	if (domain == "kirishima.cloud") {
-		localStorage.setItem("kirishima", "true");
-	} else if (domain == "imastodon.net") {
-		localStorage.setItem("imas", "true");
-		$(".imasonly").show();
+	var domain = localStorage.getItem('domain_' + acct_id)
+	localStorage.removeItem('home_' + acct_id)
+	localStorage.removeItem('bb_' + acct_id)
+	localStorage.removeItem('md_' + acct_id)
+	localStorage.removeItem('local_' + acct_id)
+	localStorage.removeItem('public_' + acct_id)
+	localStorage.removeItem('notification_' + acct_id)
+	localStorage.removeItem('post_' + acct_id)
+	localStorage.removeItem('fav_' + acct_id)
+	localStorage.removeItem('bt_' + acct_id)
+	localStorage.removeItem('followlocale_' + acct_id)
+	if (domain == 'kirishima.cloud') {
+		localStorage.setItem('kirishima', 'true')
+	} else if (domain == 'imastodon.net') {
+		localStorage.setItem('imas', 'true')
+		$('.imasonly').show()
 	}
-	var at = localStorage.getItem("acct_" + acct_id + "_at");
-	var bbcode = domain + "_bbcode";
-	var letters = domain + "_letters";
-	var quoteMarker = domain + "_quote";
-	if (localStorage.getItem("instance")) {
-		var json = JSON.parse(localStorage.getItem("instance"));
-		if (json[quoteMarker] == "enabled") {
-			localStorage.setItem("quoters", "true");
-			localStorage.setItem("quote_" + acct_id, "true");
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var bbcode = domain + '_bbcode'
+	var letters = domain + '_letters'
+	var quoteMarker = domain + '_quote'
+	if (localStorage.getItem('instance')) {
+		var json = JSON.parse(localStorage.getItem('instance'))
+		if (json[quoteMarker] == 'enabled') {
+			localStorage.setItem('quoters', 'true')
+			localStorage.setItem('quote_' + acct_id, 'true')
 		}
 		if (json[bbcode]) {
-			if (json[bbcode] == "enabled") {
-				localStorage.setItem("bb_" + acct_id, "true");
+			if (json[bbcode] == 'enabled') {
+				localStorage.setItem('bb_' + acct_id, 'true')
 			} else {
-				localStorage.removeItem("bb_" + acct_id);
-				$("[data-activates='bbcode']").addClass("disabled");
-				$("[data-activates='bbcode']").prop("disabled", true);
+				localStorage.removeItem('bb_' + acct_id)
+				$("[data-activates='bbcode']").addClass('disabled')
+				$("[data-activates='bbcode']").prop('disabled', true)
 			}
 		} else {
-			localStorage.removeItem("bb_" + acct_id);
-			$("[data-activates='bbcode']").addClass("disabled");
-			$("[data-activates='bbcode']").addClass("disabled", true);
+			localStorage.removeItem('bb_' + acct_id)
+			$("[data-activates='bbcode']").addClass('disabled')
+			$("[data-activates='bbcode']").addClass('disabled', true)
 		}

-		if (json[domain + "_markdown"] == "enabled") {
-			localStorage.setItem("md_" + acct_id, "true");
-			$(".markdown").show();
+		if (json[domain + '_markdown'] == 'enabled') {
+			localStorage.setItem('md_' + acct_id, 'true')
+			$('.markdown').show()
 		} else {
-			$(".anti-markdown").hide();
-			$(".markdown").hide();
-			localStorage.removeItem("bb_" + acct_id);
+			$('.anti-markdown').hide()
+			$('.markdown').hide()
+			localStorage.removeItem('bb_' + acct_id)
 		}
-		if (json[domain + "_home"]) {
-			localStorage.setItem("home_" + acct_id, json[domain + "_home"]);
+		if (json[domain + '_home']) {
+			localStorage.setItem('home_' + acct_id, json[domain + '_home'])
 		}
-		if (json[domain + "_local"]) {
-			localStorage.setItem("local_" + acct_id, json[domain + "_local"]);
+		if (json[domain + '_local']) {
+			localStorage.setItem('local_' + acct_id, json[domain + '_local'])
 		}
-		if (json[domain + "_public"]) {
-			localStorage.setItem("public_" + acct_id, json[domain + "_public"]);
+		if (json[domain + '_public']) {
+			localStorage.setItem('public_' + acct_id, json[domain + '_public'])
 		}
-		if (json[domain + "_notification"]) {
-			localStorage.setItem("notification_" + acct_id, json[domain + "_notification"]);
+		if (json[domain + '_notification']) {
+			localStorage.setItem('notification_' + acct_id, json[domain + '_notification'])
 		}
-		if (json[domain + "_post"]) {
-			localStorage.setItem("post_" + acct_id, json[domain + "_post"]);
+		if (json[domain + '_post']) {
+			localStorage.setItem('post_' + acct_id, json[domain + '_post'])
 		}
-		if (json[domain + "_fav"]) {
-			localStorage.setItem("fav_" + acct_id, json[domain + "_fav"]);
+		if (json[domain + '_fav']) {
+			localStorage.setItem('fav_' + acct_id, json[domain + '_fav'])
 		}
-		if (json[domain + "_bt"]) {
-			localStorage.setItem("bt_" + acct_id, json[domain + "_bt"]);
+		if (json[domain + '_bt']) {
+			localStorage.setItem('bt_' + acct_id, json[domain + '_bt'])
 		}
-		if (json[domain + "_follow"]) {
-			localStorage.setItem("followlocale_" + acct_id, json[domain + "_follow"]);
+		if (json[domain + '_follow']) {
+			localStorage.setItem('followlocale_' + acct_id, json[domain + '_follow'])
 		}
 	}
-	if (localStorage.getItem("mode_" + domain) != "misskey") {
-		var start = "https://" + domain + "/api/v1/instance";
+	if (localStorage.getItem('mode_' + domain) != 'misskey') {
+		var start = 'https://' + domain + '/api/v1/instance'
 		fetch(start, {
-			method: "GET",
+			method: 'GET',
 			headers: {
-				"content-type": "application/json"
+				'content-type': 'application/json'
 			}
 		})
 			.then(function(response) {
-				return response.json();
+				return response.json()
 			})
 			.catch(function(error) {
-				console.error(error);
+				console.error(error)
 			})
 			.then(function(json) {
 				if (json.error) {
-					console.error(json.error);
-					return;
+					console.error(json.error)
+					return
 				}
 				if (json) {
-					if (json["max_toot_chars"]) {
-						localStorage.setItem("letters_" + acct_id, json["max_toot_chars"]);
+					if (json['max_toot_chars']) {
+						localStorage.setItem('letters_' + acct_id, json['max_toot_chars'])
 					}
-					if (json["urls"]["streaming_api"]) {
-						localStorage.setItem("streaming_" + acct_id, json["urls"]["streaming_api"]);
+					if (json['urls']['streaming_api']) {
+						localStorage.setItem('streaming_' + acct_id, json['urls']['streaming_api'])
 					} else {
-						localStorage.removeItem("streaming_" + acct_id);
+						localStorage.removeItem('streaming_' + acct_id)
 					}
 				}
-			});
+			})
 	} else {
 	}
 }

 //アカウントを選択…を実装
 function multiSelector(parseC) {
-	var multi = localStorage.getItem("multi");
+	var multi = localStorage.getItem('multi')
 	if (!multi) {
-		var obj = [];
-		var json = JSON.stringify(obj);
-		localStorage.setItem("multi", json);
+		var obj = []
+		var json = JSON.stringify(obj)
+		localStorage.setItem('multi', json)
 	} else {
-		var obj = JSON.parse(multi);
+		var obj = JSON.parse(multi)
 	}
-	var templete;
-	if (localStorage.getItem("mainuse") == "main") {
-		var last = localStorage.getItem("main");
-	} else if (localStorage.getItem("last-use")) {
-		var last = localStorage.getItem("last-use");
-		if (last == "webview" || last == "noauth") {
-			last = "0";
+	var templete
+	if (localStorage.getItem('mainuse') == 'main') {
+		var last = localStorage.getItem('main')
+	} else if (localStorage.getItem('last-use')) {
+		var last = localStorage.getItem('last-use')
+		if (last == 'webview' || last == 'noauth') {
+			last = '0'
 		}
 	} else {
-		var last = "0";
+		var last = '0'
 	}
-	last = last + "";
-	var sel;
+	last = last + ''
+	var sel
 	if (obj.length < 1) {
-		$("#src-acct-sel").html('<option value="tootsearch">Tootsearch</option>');
-		$("#add-acct-sel").html('<option value="noauth">' + lang.lang_login_noauth + "</option>");
+		$('#src-acct-sel').html('<option value="tootsearch">Tootsearch</option>')
+		$('#add-acct-sel').html('<option value="noauth">' + lang.lang_login_noauth + '</option>')
 	} else {
 		Object.keys(obj).forEach(function(key) {
-			var acct = obj[key];
-			var list = key * 1 + 1;
-			if (key + "" === last) {
-				sel = "selected";
-				var domain = acct.domain;
-				localStorage.setItem("domain_" + key, domain);
-				if (idata[domain + "_letters"]) {
-					$("#textarea").attr("data-length", idata[domain + "_letters"]);
+			var acct = obj[key]
+			var list = key * 1 + 1
+			if (key + '' === last) {
+				sel = 'selected'
+				var domain = acct.domain
+				localStorage.setItem('domain_' + key, domain)
+				if (idata[domain + '_letters']) {
+					$('#textarea').attr('data-length', idata[domain + '_letters'])
 				} else {
-					var maxletters = localStorage.getItem("letters_" + key);
+					var maxletters = localStorage.getItem('letters_' + key)
 					if (maxletters > 0) {
-						$("#textarea").attr("data-length", maxletters);
+						$('#textarea').attr('data-length', maxletters)
 					} else {
-						$("#textarea").attr("data-length", 500);
+						$('#textarea').attr('data-length', 500)
 					}
 				}
-				if (idata[domain + "_glitch"]) {
-					$("#local-button").removeClass("hide");
+				if (idata[domain + '_glitch']) {
+					$('#local-button').removeClass('hide')
 				}
-				var profimg = acct.prof;
+				var profimg = acct.prof
 				//localStorage.setItem("prof_" + key, profimg);
 				if (!profimg) {
-					profimg = "../../img/missing.svg";
+					profimg = '../../img/missing.svg'
 				}
-				$("#acct-sel-prof").attr("src", profimg);
+				$('#acct-sel-prof').attr('src', profimg)
 				if (domain) {
-					var cc = "(" + domain + ")";
+					var cc = '(' + domain + ')'
 				} else {
-					var cc = "";
+					var cc = ''
 				}
-				$("#toot-post-btn").text(lang.lang_toot + cc);
-				if (acct.background && acct.background != "def" && acct.text && acct.text != "def") {
-					$("#toot-post-btn").removeClass("indigo");
-					$("#toot-post-btn").css("background-color", "#" + acct.background);
-					$("#toot-post-btn").css("color", acct.text);
+				$('#toot-post-btn').text(lang.lang_toot + cc)
+				if (acct.background && acct.background != 'def' && acct.text && acct.text != 'def') {
+					$('#toot-post-btn').removeClass('indigo')
+					$('#toot-post-btn').css('background-color', '#' + acct.background)
+					$('#toot-post-btn').css('color', acct.text)
 				} else {
 				}
-				if (domain == "kirishima.cloud") {
-					$("#faicon-btn").show();
+				if (domain == 'kirishima.cloud') {
+					$('#faicon-btn').show()
 				} else {
-					$("#faicon-btn").hide();
+					$('#faicon-btn').hide()
 				}
-				if (domain == "imastodon.net") {
-					trendTag();
+				if (domain == 'imastodon.net') {
+					trendTag()
 				} else {
-					$("#trendtag").html("");
+					$('#trendtag').html('')
 				}
 			} else {
-				sel = "";
+				sel = ''
 			}
-			templete = '<option value="' + key + '" data-icon="' + acct.prof + '" class="left circle" ' + sel + ">" + acct.user + "@" + acct.domain + "</option>";
-			$(".acct-sel").append(templete);
-		});
-		$("#src-acct-sel").append('<option value="tootsearch">Tootsearch</option>');
-		$("#add-acct-sel").append('<option value="noauth">' + lang.lang_login_noauth + '</option><option value="webview">Twitter</option>');
-		$("#dir-acct-sel").append('<option value="noauth">' + lang.lang_login_noauth + "</option>");
+			templete =
+				'<option value="' +
+				key +
+				'" data-icon="' +
+				acct.prof +
+				'" class="left circle" ' +
+				sel +
+				'>' +
+				acct.user +
+				'@' +
+				acct.domain +
+				'</option>'
+			$('.acct-sel').append(templete)
+		})
+		$('#src-acct-sel').append('<option value="tootsearch">Tootsearch</option>')
+		$('#add-acct-sel').append(
+			'<option value="noauth">' +
+				lang.lang_login_noauth +
+				'</option><option value="webview">Twitter</option>'
+		)
+		$('#dir-acct-sel').append('<option value="noauth">' + lang.lang_login_noauth + '</option>')
 	}
-	$("select").formSelect();
+	$('select').formSelect()
 	if (!parseC) {
-		parseColumn(null, true);
+		parseColumn(null, true)
 	}
 }

 //バージョンエンコ
 function enc(ver) {
-	var ver = ver.replace(/\s/g, "");
-	var ver = ver.replace(/\(/g, "-");
-	var ver = ver.replace(/\)/g, "");
-	var ver = ver.replace(/\[/g, "_");
-	var ver = ver.replace(/\]/g, "");
-	return ver;
+	var ver = ver.replace(/\s/g, '')
+	var ver = ver.replace(/\(/g, '-')
+	var ver = ver.replace(/\)/g, '')
+	var ver = ver.replace(/\[/g, '_')
+	var ver = ver.replace(/\]/g, '')
+	return ver
 }
 //インスタンスティッカー
 function ticker() {
-	var start = "https://toot.app/toot/";
+	var start = 'https://toot.app/toot/'
 	fetch(start, {
-		method: "GET",
+		method: 'GET',
 		headers: {
-			"content-type": "application/json"
+			'content-type': 'application/json'
 		}
 	})
 		.then(function(response) {
 			if (!response.ok) {
 				response.text().then(function(text) {
-					setLog(response.url, response.status, text);
-				});
+					setLog(response.url, response.status, text)
+				})
 			}
-			return response.json();
+			return response.json()
 		})
 		.catch(function(error) {
-			console.error(error);
+			console.error(error)
 		})
 		.then(function(json) {
 			if (json) {
-				localStorage.setItem("ticker", JSON.stringify(json));
+				localStorage.setItem('ticker', JSON.stringify(json))
 			}
-		});
+		})
 }
--- a/app/js/login/manager.js
+++ b/app/js/login/manager.js
@@ -862,6 +862,12 @@ function refresh(target) {
 				id: json['id'],
 				vis: json['source']['privacy']
 			}
+			if (obj[target].background) {
+				ref.background = obj[target].background
+			}
+			if (obj[target].text) {
+				ref.text = obj[target].text
+			}
 			localStorage.setItem('name_' + target, json['display_name'])
 			localStorage.setItem('user_' + target, json['acct'])
 			localStorage.setItem('user-id_' + target, json['id'])
--- a/app/js/platform/first.js
+++ b/app/js/platform/first.js
@@ -152,33 +152,21 @@ $.isSurrogatePear = function(upper, lower) {
 	return 0xd800 <= upper && upper <= 0xdbff && 0xdc00 <= lower && lower <= 0xdfff
 }
 $.mb_strlen = function(str) {
-	var ret = 0
-	for (var i = 0; i < str.length; i++, ret++) {
-		var upper = str.charCodeAt(i)
-		var lower = str.length > i + 1 ? str.charCodeAt(i + 1) : 0
-		if ($.isSurrogatePear(upper, lower)) {
-			i++
-		}
-	}
-	return ret
+	var splitter = new GraphemeSplitter()
+	var arr = splitter.splitGraphemes(str)
+	return arr.length
 }
 $.mb_substr = function(str, begin, end) {
-	var ret = ''
-	for (var i = 0, len = 0; i < str.length; i++, len++) {
-		var upper = str.charCodeAt(i)
-		var lower = str.length > i + 1 ? str.charCodeAt(i + 1) : 0
-		var s = ''
-		if ($.isSurrogatePear(upper, lower)) {
-			i++
-			s = String.fromCharCode(upper, lower)
-		} else {
-			s = String.fromCharCode(upper)
-		}
-		if (begin <= len && len < end) {
-			ret += s
+	//配列にする
+	var splitter = new GraphemeSplitter()
+	var arr = splitter.splitGraphemes(str)
+	var newarr = []
+	for(var i = 0; i < arr.length; i++){
+		if(i >= begin && i <= end){
+			newarr.push(arr[i])
 		}
 	}
-	return ret
+	return newarr.join('')
 }
 //ソートするやつ
 function object_array_sort(data, key, order, fn) {
--- a/app/js/post/status.js
+++ b/app/js/post/status.js
@@ -115,6 +115,48 @@ function boostWith(vis) {
 	var acct_id = $('#tootmodal').attr('data-acct')
 	rt(id, acct_id, false, vis)
 }
+//ブックマーク
+function bkm(id, acct_id, tlid) {
+	if ($('#pub_' + id).hasClass('bkmed')) {
+		var flag = 'unbookmark'
+	} else {
+		var flag = 'bookmark'
+	}
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var start = 'https://' + domain + '/api/v1/statuses/' + id + '/' + flag
+	var httpreq = new XMLHttpRequest()
+	httpreq.open('POST', start, true)
+	httpreq.setRequestHeader('Content-Type', 'application/json')
+	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+	httpreq.responseType = 'json'
+	httpreq.send()
+	httpreq.onreadystatechange = function() {
+		if (httpreq.readyState === 4) {
+			var json = httpreq.response
+			if (this.status !== 200) {
+				setLog(start, this.status, json)
+			}
+			if (json.reblog) {
+				json = json.reblog
+			}
+			var fav = json.favourites_count
+				$('[toot-id=' + id + '] .fav_ct').text(fav)
+				$('[toot-id=' + id + '] .rt_ct').text(json.reblogs_count)
+				if (flag == 'unbookmark') {
+					$('.bkmStr_' + id).text(lang.lang_parse_bookmark)
+					$('.bkm_' + id).removeClass('red-text')
+					$('[toot-id=' + id + ']').removeClass('bkmed')
+				} else {
+					$('.bkmStr_' + id).text(lang.lang_parse_unbookmark)
+					$('.bkm_' + id).addClass('red-text')
+					$('[toot-id=' + id + ']').addClass('bkmed')
+				}
+				var tlidTar = $(`.bookmark-timeline[data-acct=${acct_id}]`).attr('tlid')
+				columnReload(tlidTar,'bookmark')
+		}
+	}
+}

 //フォロー
 async function follow(acct_id, resolve) {
@@ -406,12 +448,14 @@ function pin(id, acct_id) {
 				setLog(start, this.status, this.response)
 			}
 			console.log(['Success: pinned', json])
-			if ($('[toot-id=' + id + ']').hasClass('pined')) {
+			if (flag == 'unpin') {
 				$('[toot-id=' + id + ']').removeClass('pined')
 				$('.pin_' + id).removeClass('blue-text')
+				$('.pinStr_' + id).text(lang.lang_parse_pin)
 			} else {
 				$('[toot-id=' + id + ']').addClass('pined')
 				$('.pin_' + id).addClass('blue-text')
+				$('.pinStr_' + id).text(lang.lang_parse_unpin)
 			}
 		}
 	}
@@ -574,23 +618,35 @@ function staEx(mode) {
 		})
 	return
 }
-function toggleAction(id, tlid, acct_id) {
-	if (tlid == 'notf') {
-		var tlide = '[data-acct=' + acct_id + '] .notf-timeline'
-	} else if (tlid == 'user') {
-		var tlide = '#his-tl-contents'
+function toggleAction(elem, height) {
+	var cont = elem.parents('.cvo').find('.contextMenu')
+	if (cont.hasClass('hide')) {
+		$('#contextWrap').removeClass('hide')
+		var left = elem.offset().left + 60
+		var top = elem.offset().top - height
+		if (top < 75) {
+			top = elem.offset().top + 45
+			cont.removeClass('bottom')
+			cont.addClass('top')
+		} else {
+			cont.removeClass('top')
+			cont.addClass('bottom')
+		}
+		if(elem.parents('.cvo').attr('id') == 'toot-this'){
+			console.log($('#toot-this').offset().top, elem.offset().top)
+			left = $('#toot-this').offset().left + elem.offset().left + 10
+			top = $('#toot-this').offset().top - $('#toot-this').height() -height + 25
+		}
+		cont.css('top', top + 'px')
+		cont.css('right', `calc(100vw - ${left}px)`)
+		cont.removeClass('hide')
+		elem
+			.parents('.cvo')
+			.find('.act-icon')
+			.text('expand_less')
 	} else {
-		var tlide = '[tlid=' + tlid + ']'
-	}
-	if (!$(tlide + ' [toot-id=' + id + ']').hasClass('ext-mode')) {
-		$(tlide + ' [toot-id=' + id + '] .type-a').hide()
-		$(tlide + ' [toot-id=' + id + '] .type-b').show()
-		$(tlide + ' [toot-id=' + id + ']').addClass('ext-mode')
-		$(tlide + ' [toot-id=' + id + '] .act-icon').text('expand_less')
-	} else {
-		$(tlide + ' [toot-id=' + id + '] .type-b').hide()
-		$(tlide + ' [toot-id=' + id + '] .type-a').show()
-		$(tlide + ' [toot-id=' + id + ']').removeClass('ext-mode')
-		$(tlide + ' [toot-id=' + id + '] .act-icon').text('expand_more')
+		$('#contextWrap').addClass('hide')
+		$('.contextMenu').addClass('hide')
+		$('.act-icon').text('expand_more')
 	}
 }
--- a/app/js/tl/card.js
+++ b/app/js/tl/card.js
@@ -218,71 +218,9 @@ function additionalIndv(tlid, acct_id, id) {
 					console.error(error)
 				})
 				.then(function(json) {
-					json = json.card
-					//このリンク鳥やんけ、ってとき
-					if (json.provider_name == 'Twitter') {
-						if (json.image) {
-							var twiImg = `
-								<br><img src="${json.image}" style="max-width:100%" 
-										onclick="imgv('twi_${id}',0,'twitter')" id="twi_${id}-image-0" 
-										data-url="${json.image}" 
-									data-type="image">
-								`
-						} else {
-							var twiImg = ''
-						}
-						$('[toot-id=' + id + '] .additional').html(`
-							<div class="twitter-tweet"><b>
-								${escapeHTML(json.author_name)}
-								</b><br>
-								${escapeHTML(json.description)}
-								${twiImg}
-								</div>
-						`)
-					} else if (json.provider_name == 'pixiv') {
-						if (json.image) {
-							var pxvImg = `
-							<br><img src="${json.image}" style="max-width:100%" 
-									onclick="imgv('pixiv_${id}',0,'pixiv')" id="pixiv_${id}-image-0" 
-									data-url="${json.embed_url}" 
-								data-type="image">
-							`
-						} else {
-							var pxvImg = ''
-						}
-						$('[toot-id=' + id + '] .additional').html(
-							`<div class="pixiv-post"><b><a href="
-								${json.author_url}
-								" target="_blank">
-								${escapeHTML(json.author_name)}
-								</a></b><br>
-								${escapeHTML(json.title)}
-								${pxvImg}
-								</div>`
-						)
-					} else {
-						if (json.title) {
-							$('[toot-id=' + id + '] .additional').html(
-								`<span class="gray">URL
-									${lang.lang_cards_check}
-									:<br>Title:
-									${escapeHTML(json.title)}
-									<br>
-									${escapeHTML(json.description)}
-									</span>`
-							)
-						}
-						if (json.html) {
-							$('[toot-id=' + id + '] .additional').html(
-								json.html +
-									`<i class="material-icons sml pointer" onclick="pip('
-									${id}
-									')" title="
-									${lang.lang_cards_pip}
-									">picture_in_picture_alt</i>`
-							)
-						}
-					}
+					cards = json.card
+					var analyze = cardHtml(cards, acct_id, id)
+					$('[toot-id=' + id + '] .additional').html(analyze)
 					if (json.title) {
 						$('[toot-id=' + id + '] a:not(.parsed)').addClass('parsed')
 						$('[toot-id=' + id + ']').addClass('parsed')
@@ -291,7 +229,127 @@ function additionalIndv(tlid, acct_id, id) {
 		}
 	}
 }
+function cardHtml(json, acct_id, id) {
+	var analyze = ''
+	var domain = json.url.match(/^https?:\/{2,}(.*?)(?:\/|\?|#|$)/)[1];
+	var ok = [
+		"pixiv.net",
+		"twitter.com",
+		"mobile.twitter.com",
+		"open.spotify.com",
+		"youtube.com",
+		"youtu.be",
+		"m.youtube.com",
+		"nicovideo.jp",
+		"twitcasting.tv"
+	]
+	var isHad = _.includes(ok, domain);
+	if (json.provider_name == 'pixiv') {
+		if (json.image) {
+			var pxvImg = `
+			<br><img src="${json.image}" style="max-width:100%" 
+					onclick="imgv('pixiv_${id}',0,'pixiv')" id="pixiv_${id}-image-0" 
+					data-url="${json.embed_url}" 
+				data-type="image">
+			`
+		} else {
+			var pxvImg = ''
+		}
+		analyze = `<div class="pixiv-post"><b><a href="
+				${json.author_url}
+				" target="_blank">
+				${escapeHTML(json.author_name)}
+				</a></b><br>
+				${escapeHTML(json.title)}
+				${pxvImg}
+				</div>`
+	} else {
+		if (json.title) {
+			analyze = `<span class="gray">URL
+					${lang.lang_cards_check}
+					:<br>Title:
+					${escapeHTML(json.title)}
+					<br>
+					${escapeHTML(json.description)}
+					</span>`
+		}

+		if (json.html || json.provider_name == 'Twitter') {
+			if(isHad) {
+				var prved = `<img class="emoji" draggable="false" alt="✅" 
+					src="https://twemoji.maxcdn.com/v/12.1.3/72x72/2705.png">`
+				var title = lang.lang_cards_transted
+			}else{
+				var prved = '<img class="emoji" draggable="false" alt="⚠️" src="https://twemoji.maxcdn.com/v/12.1.4/72x72/26a0.png">'
+				var title = lang.lang_cards_untransted
+			}
+			analyze =`<a onclick="cardHtmlShow('${acct_id}','${id}')" class="add-show pointer" title="${title}">
+			${lang.lang_parse_html}(${domain})${prved}
+			</a>${analyze}<br>`
+		}
+	}
+	return analyze
+}
+function cardHtmlShow(acct_id, id) {
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var text = $('[toot-id=' + id + '] .toot a').attr('href')
+	var urls = text.match(
+		/https?:\/\/([-a-zA-Z0-9@.]+)\/media\/([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/
+	)
+	var id = $('[toot-id=' + id + '] .toot a')
+		.parents('.cvo')
+		.attr('toot-id')
+	var start = 'https://' + domain + '/api/v1/statuses/' + id
+	fetch(start, {
+		method: 'GET',
+		headers: {
+			'content-type': 'application/json',
+			Authorization: 'Bearer ' + at
+		}
+		//body: JSON.stringify({})
+	})
+		.then(function(response) {
+			if (!response.ok) {
+				response.text().then(function(text) {
+					setLog(response.url, response.status, text)
+				})
+			}
+			return response.json()
+		})
+		.catch(function(error) {
+			todo(error)
+			setLog(start, 'JSON', error)
+			console.error(error)
+		})
+		.then(function(json) {
+			json = json.card
+			if (json.html) {
+				analyze =
+					json.html +
+					`<i class="material-icons sml pointer" onclick="pip('
+								${id}
+								')" title="
+								${lang.lang_cards_pip}
+								">picture_in_picture_alt</i>`
+			}
+			if (json.provider_name == 'Twitter') {
+				var url = json.author_url
+				var status = json.url.match(/^https:\/\/twitter.com\/[_a-zA-Z0-9-]+\/status\/([0-9]+)/);
+				if(status){
+					if(status.length > 0){
+						status = status[1]
+					}
+				}
+				url = url + '/status/' + status
+				analyze = `
+				<blockquote class="twitter-tweet" data-dnt="true"><strong>${json.author_name}</strong><br>${json.description}<a href="${url}">${json.url}</a></blockquote>
+				<script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script> 
+				`
+			}
+			$('[toot-id=' + id + '] .additional').html(analyze)
+		})
+}
 //各TL上方のLink[On/Off]
 function cardToggle(tlid) {
 	var card = localStorage.getItem('card_' + tlid)
--- a/app/js/tl/parse.js
+++ b/app/js/tl/parse.js
@@ -1,5 +1,6 @@
 //オブジェクトパーサー(トゥート)
 function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
+	var splitter = new GraphemeSplitter()
 	var templete = ''
 	if (obj[0]) {
 		if (tlid === 1) {
@@ -7,12 +8,12 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 		localStorage.setItem('lastunix_' + tlid, date(obj[0].created_at, 'unix'))
 	}

-	var actb = 're,rt,fav,qt,del,pin,red'
+	var actb = 're,rt,fav,qt,bkm'
 	if (actb) {
 		var actb = actb.split(',')
 		var disp = {}
 		for (var k = 0; k < actb.length; k++) {
-			if (k < 4) {
+			if (k < 5) {
 				var tp = 'type-a'
 			} else {
 				var tp = 'type-b'
@@ -34,6 +35,12 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			var qtClass = ''
 		}
 	}
+	var bkm = localStorage.getItem('bookmark')
+	if (bkm == 'no' || !bkm) {
+		var bkmClass = 'hide'
+	} else {
+		var bkmClass = ''
+	}
 	var datetype = localStorage.getItem('datetype')
 	var nsfwtype = localStorage.getItem('nsfw')
 	var sent = localStorage.getItem('sentence')
@@ -147,13 +154,13 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 		var wordmute = []
 	}
 	//via通知
-	var viashow = localStorage.getItem('viashow')
-	if (!viashow) {
-		viashow = 'via-hide'
-	}
-	if (viashow == 'hide') {
-		viashow = 'via-hide'
+	var viashowVal = localStorage.getItem('viashow')
+	if (viashowVal == 'yes') {
+		var viashowSet = true
+	} else {
+		var viashowSet = false
 	}
+	var viashow = ''
 	//認証なしTL
 	if (mix == 'noauth') {
 		var noauth = 'hide'
@@ -459,6 +466,11 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				var via = ''
 				viashow = 'hide'
 			} else {
+				if (viashowSet) {
+					viashow = ''
+				} else {
+					viashow = 'hide'
+				}
 				var via = escapeHTML(toot.application.name)
 				if (empCli) {
 					//強調チェック
@@ -500,9 +512,10 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				} else {
 					var ct = ct2
 				}
+
 				if (
 					(sent < ct && $.mb_strlen($.strip_tags(content)) > 5) ||
-					($.strip_tags(content).length > ltr && $.mb_strlen($.strip_tags(content)) > 5)
+					($.mb_strlen($.strip_tags(content)) > ltr && $.mb_strlen($.strip_tags(content)) > 5)
 				) {
 					var content = `<span class="gray">${lang.lang_parse_fulltext}</span><br>` + content
 					var spoil = `<span class="cw-long-${toot.id}">${$.mb_substr(
@@ -659,13 +672,13 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				mentions = '<div style="float:right">' + mentions + '</div>'
 			} else {
 				var to_mention = [toot.account.acct]
-				//メンションじゃなくてもlang_parse_thread
-				if (toot.in_reply_to_id) {
-					mentions = `<div style="float:right">
-							<a onclick="details('${toot.id}','${acct_id}','${tlid}')" class="pointer waves-effect">
-								${lang.lang_parse_thread}
-							</a></div>`
-				}
+			}
+			//メンションじゃなくてもlang_parse_thread
+			if (toot.in_reply_to_id) {
+				mentions = `<div style="float:right">
+						<a onclick="details('${toot.id}','${acct_id}','${tlid}')" class="pointer waves-effect">
+							${lang.lang_parse_thread}
+						</a></div>`
 			}
 			var tagck = toot.tags[0]
 			var tags = ''
@@ -731,7 +744,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			}
 			if (toot.account.acct == localStorage.getItem('user_' + acct_id)) {
 				var if_mine = ''
-				var mine_via = 'type-b'
+				var mine_via = ''
 				var can_rt = ''
 			} else {
 				var if_mine = 'hide'
@@ -754,9 +767,20 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			if (toot.pinned) {
 				var if_pin = 'blue-text'
 				var pin_app = 'pinnedToot'
+				var pinStr = lang.lang_parse_unpin
 			} else {
 				var if_pin = ''
 				var pin_app = ''
+				var pinStr = lang.lang_parse_pin
+			}
+			if (toot.bookmarked) {
+				var if_bkm = 'red-text'
+				var bkm_app = 'bkmed'
+				var bkmStr = lang.lang_parse_unbookmark
+			} else {
+				var if_bkm = ''
+				var bkm_app = ''
+				var bkmStr = lang.lang_parse_bookmark
 			}
 			//アニメ再生
 			if (gif == 'yes') {
@@ -849,10 +873,10 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			}
 			//日本語じゃない
 			if (toot.language != lang.language && toot.language) {
-				var trans = `<div class="action pin">
+				var trans = `<div class="">
 						<a onclick="trans('${toot.language}','${lang.language}')" 
-							class="waves-effect waves-dark btn-flat actct" style="padding:0" title="${lang.lang_parse_trans}">
-								<i class="material-icons">g_translate</i>
+							class="waves-effect waves-dark btn-flat actct" style="padding:0">
+								<i class="material-icons">g_translate</i>${lang.lang_parse_trans}
 						</a>
 					</div>`
 			} else {
@@ -861,29 +885,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			//Cards
 			if (!card && toot.card) {
 				var cards = toot.card
-				if (cards.provider_name == 'Twitter') {
-					if (cards.image) {
-						var twiImg = '<br><img draggable="false" src="' + cards.image + '">'
-					} else {
-						var twiImg = ''
-					}
-					analyze = `<blockquote class="twitter-tweet">
-							<b>${escapeHTML(cards.author_name)}</b><br>
-							${escapeHTML(cards.description)}${twiImg}
-						</blockquote>`
-				}
-				if (cards.title) {
-					analyze = `<span class="gray">
-							URL${lang.lang_cards_check}:<br>
-							Title:${escapeHTML(cards.title)}<br>
-							${escapeHTML(cards.description)}
-						</span>`
-				}
-				if (cards.html) {
-					analyze =
-						cards.html +
-						`<i class="material-icons" onclick="pip('${id}')" title="${lang.lang_cards_pip}">picture_in_picture_alt</i>`
-				}
+				analyze = cardHtml(cards, acct_id, id)
 			}
 			//Ticker
 			var tickerdom = ''
@@ -945,11 +947,25 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						</div>
 					</div>`
 			}
+			//menuは何個？
+			var menuct = 2
+			if (viashow != 'hide') {
+				menuct++
+			}
+			if (if_mine != 'hide') {
+				menuct = menuct + 3
+			}
+			if (noauth == 'hide') {
+				menuct = 0
+			}
+			if (trans != '') {
+				menuct++
+			}
 			templete =
 				templete +
 				`<div
 					id="pub_${toot.id}"
-					class="cvo ${mouseover} ${boostback} ${fav_app} ${rt_app} ${pin_app} ${hasmedia} ${animecss}"
+					class="cvo ${mouseover} ${boostback} ${fav_app} ${rt_app} ${pin_app} ${bkm_app} ${hasmedia} ${animecss}"
 					toot-id="${id}" unique-id="${uniqueid}" data-medias="${media_ids}" unixtime="${date(
 					obj[key].created_at,
 					'unix'
@@ -959,15 +975,15 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					onclick="mov('${toot.id}','${tlid}','cl')"
 					onmouseout="resetmv('mv')"
 				>
-				<div class="area-notice"><span class="gray sharesta">${notice}${home}</span></div>
-				<div class="area-icon">
+				<div class="area-notice grid"><span class="gray sharesta">${notice}${home}</span></div>
+				<div class="area-icon grid">
 					<a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="udg">
 						<img draggable="false" src="${avatar}" width="40" class="prof-img"
 							user="${toot.account.acct}" onerror="this.src='../../img/loading.svg'"/>
 					</a>
 					${noticeavatar}
 				</div>
-				<div class="area-display_name">
+				<div class="area-display_name grid">
 					<div class="flex-name">
 						<span class="user">${dis_name}</span>
 						<span class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis; cursor:text;">
@@ -981,7 +997,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						</span>
 					</div>
 				</div>
-				<div class="area-toot">
+				<div class="area-toot grid">
 					${tickerdom}
 					<span class="${api_spoil} cw_text_${toot.id}">
 						<span class="cw_text">${spoil}</span>
@@ -990,12 +1006,12 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					<div class="toot ${spoiler}">${content}</div>
 					${poll}${viewer}
 				</div>
-				<div class="area-additional">
+				<div class="area-additional grid">
 					<span class="additional">${analyze}</span>
 					${mentions}${tags}
 				</div>
-				<div class="area-vis">${vis}</div>
-				<div class="area-actions">
+				<div class="area-vis grid">${vis}</div>
+				<div class="area-actions grid">
 					<div class="action ${antinoauth}">
 						<a onclick="detEx('${toot.url}','main')" class="waves-effect waves-dark details" style="padding:0">
 							${lang.lang_parse_det}
@@ -1028,6 +1044,13 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 							<i class="text-darken-3 fas fa-quote-right"></i>
 						</a>
 					</div>
+					<div class="action ${disp['bkm']} ${noauth} ${bkmClass}">
+						<a onclick="bkm('${toot.id}','${acct_id}','${tlid}')"
+							class="waves-effect waves-dark btn-flat actct bkm-btn" style="padding:0"
+							title="${lang.lang_parse_bookmark}">
+							<i class="fas text-darken-3 fa-bookmark bkm_${toot.id} ${if_bkm}"></i>
+					</a>
+					</div>
 					<div class="action ${disp['fav']} ${noauth}">
 						<a onclick="fav('${uniqueid}','${acct_id}','${tlid}')"
 							class="waves-effect waves-dark btn-flat actct fav-btn" style="padding:0"
@@ -1036,42 +1059,60 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 							<span class="fav_ct">${toot.favourites_count}</span>
 						</a>
 					</div>
-					<div class="${if_mine} action ${disp['del']} ${noauth}">
-						<a onclick="del('${toot.id}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
-							style="padding:0" title="${lang.lang_parse_del}">
-							<i class="fas fa-trash"></i>
-						</a>
-					</div>
-					<div class="${if_mine} action pin ${disp['pin']} ${noauth}">
-							<a onclick="pin('${
-								toot.id
-							}','${acct_id}')" class="waves-effect waves-dark btn-flat actct" style="padding:0"
-								title="${lang.lang_parse_pin}">
-								<i class="fas fa-map-pin pin_${toot.id} ${if_pin}"></i>
-							</a>
-					</div>
-					<div class="${if_mine} action ${disp['red']} ${noauth}">
-							<a onclick="redraft('${toot.id}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
-								style="padding:0" title="${lang.lang_parse_redraft}">
-								<i class="material-icons">redo</i>
-							</a>
-					</div>
-					${trans}
 				</div>
 				<div class="area-side">
-					<span class="cbadge viabadge waves-effect ${viashow} ${mine_via}" style="max-width:60px;"
-						onclick="client('${$.strip_tags(via)}')" title="via ${$.strip_tags(via)}">${via}</span>
-					<div class="action ${if_mine} ${noauth}">
-						<a onclick="toggleAction('${
-							toot.id
-						}','${tlid}','${acct_id}')" class="waves-effect waves-dark btn-flat" style="padding:0">
+					<div class="action ${noauth}">
+						<a onclick="toggleAction($(this), ${menuct * 39 + 6})" 
+							class="ctxMenu waves-effect waves-dark btn-flat" style="padding:0">
 							<i class="text-darken-3 material-icons act-icon">expand_more</i>
 						</a>
 					</div>
 					<div class="action ${noauth}">
-							<a onclick="details('${toot.id}','${acct_id}','${tlid}','normal')"
-								class="waves-effect waves-dark btn-flat details ${dmHide}" style="padding:0">
-								<i class="text-darken-3 material-icons">more_vert</i></a>
+						<a onclick="details('${toot.id}','${acct_id}','${tlid}','normal')"
+							class="waves-effect waves-dark btn-flat details ${dmHide}" style="padding:0"
+							title="${lang.lang_parse_detail}">
+						<i class="text-darken-3 material-icons">menu_open</i></a>
+					</div>
+				</div>
+				<div class="contextMenu hide z-depth-4">
+					<div class="${viashow}">
+						via ${escapeHTML(via)}<br>
+						<a onclick="client('${$.strip_tags(via)}')" class="pointer">${lang.lang_parse_clientop}</a>
+					</div>
+					<div>
+					<button onclick="bkm('${toot.id}','${acct_id}','${tlid}')"
+						class="waves-effect waves-dark btn-flat actct bkm-btn" style="padding:0">
+						<i class="fas text-darken-3 fa-bookmark bkm_${toot.id} ${if_bkm}"></i>
+						<span class="bkmStr_${toot.id}">${bkmStr}</span>
+					</button>
+					</div>
+					<div class="${if_mine}">
+						<button onclick="del('${toot.id}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
+							style="padding:0">
+							<i class="fas fa-trash"></i>${lang.lang_parse_del}
+						</button>
+					</div>
+					<div class="${if_mine}">
+						<button onclick="pin('${
+							toot.id
+						}','${acct_id}')" class="waves-effect waves-dark btn-flat actct" style="padding:0">
+							<i class="fas fa-map-pin pin_${toot.id} ${if_pin}"></i>
+							<span class="pinStr_${toot.id}">${pinStr}</span>
+						</button>
+					</div>
+					<div class="${if_mine}">
+						<button onclick="redraft('${toot.id}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
+							style="padding:0">
+							<i class="material-icons">redo</i>${lang.lang_parse_redraft}
+						</button>
+					</div>
+					${trans}
+					<div>
+					<button onclick="postMessage(['openUrl', '${toot.url}'], '*')"
+						class="waves-effect waves-dark btn-flat actct" style="padding:0">
+						<i class="fas text-darken-3 fa-globe"></i>
+						${lang.lang_parse_link}
+					</button>
 					</div>
 				</div>
 			</div>
@@ -1097,7 +1138,6 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 	Object.keys(obj).forEach(function(key) {
 		var toot = obj[key]
 		if (toot) {
-			console.log(['Parsing', toot])
 			if (!toot.username) {
 				var raw = toot
 				toot = toot.account
@@ -1113,8 +1153,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 					var locked = ''
 				}
 				if (auth == 'request') {
-					var authhtml =
-						`<i class="material-icons gray pointer" onclick="request('${toot.id}','authorize','${acct_id}')" title="Accept">
+					var authhtml = `<i class="material-icons gray pointer" onclick="request('${toot.id}','authorize','${acct_id}')" title="Accept">
 							person_add
 						</i>　
 						<i class="material-icons gray pointer" onclick="request('${toot.id}','reject','${acct_id}')" title="Reject">
@@ -1185,11 +1224,9 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 					var avatar = '../../img/missing.svg'
 				}
 				if (tlid == 'dir' && acct_id == 'noauth') {
-					var udg =
-						`<a onclick="udgEx('${toot.url}','main');" user="${toot.acct}" class="udg">`
+					var udg = `<a onclick="udgEx('${toot.url}','main');" user="${toot.acct}" class="udg">`
 				} else {
-					var udg =
-						`<a onclick="udg('${toot.id}','${acct_id}');" user="${toot.acct}" class="udg">`
+					var udg = `<a onclick="udg('${toot.id}','${acct_id}');" user="${toot.acct}" class="udg">`
 				}
 				var latest = date(toot.last_status_at, 'relative')
 				if (toot.last_status_at) {
@@ -1244,6 +1281,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 }
 //クライアントダイアログ
 function client(name) {
+	$('#contextWrap').addClass('hide')
 	if (name != 'Unknown') {
 		//聞く
 		Swal.fire({
@@ -1320,8 +1358,7 @@ function pollParse(poll, acct_id) {
 		var myvote = lang.lang_parse_endedvote
 		var result_hide = ''
 	} else {
-		var myvote =
-			`<a onclick="voteMastodon('${acct_id}','${poll.id}')" class="votebtn">${lang.lang_parse_vote}</a><br>`
+		var myvote = `<a onclick="voteMastodon('${acct_id}','${poll.id}')" class="votebtn">${lang.lang_parse_vote}</a><br>`
 		if (choices[0].votes_count === 0 || choices[0].votes_count > 0) {
 			myvote =
 				myvote +
@@ -1361,10 +1398,9 @@ function pollParse(poll, acct_id) {
 				${voteit}
 			</div>`
 	})
-	pollHtml =
-		`<div class="vote_${acct_id}_${poll.id}">
+	pollHtml = `<div class="vote_${acct_id}_${poll.id}">
 			${pollHtml}${myvote}
-			<a onclick="voteMastodonrefresh(${acct_id}','${poll.id}')" class="pointer">
+			<a onclick="voteMastodonrefresh('${acct_id}','${poll.id}')" class="pointer">
 				${lang.lang_manager_refresh}
 			</a>
 			<span class="cbadge cbadge-hover" title="${date(poll.expires_at, 'absolute')}">
--- a/app/js/tl/tl.js
+++ b/app/js/tl/tl.js
@@ -56,14 +56,15 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		)
 		$('#notice_icon_' + tlid).text('notifications')
 		return
-	} /*else if (type == "dm") {
-		//DMなら飛ばす
-		dm(acct_id, tlid, "plus",delc,voice);
-		$("#notice_" + tlid).text(cap(type, data, acct_id) + "(" + localStorage.getItem(
-			"user_" + acct_id) + "@" + domain + ")");
-			$("#notice_icon_" + tlid).text("mail_outline");
-		return;
-	}*/
+	} else if (type == 'bookmark') {
+		//ブックマークなら飛ばす
+		getBookmark(acct_id, tlid)
+		$('#notice_' + tlid).text(
+			cap(type, data, acct_id) + '(' + localStorage.getItem('user_' + acct_id) + '@' + domain + ')'
+		)
+		$('#notice_icon_' + tlid).text('bookmark')
+		return
+	}
 	localStorage.setItem('now', type)
 	todo(cap(type) + ' TL Loading...')
 	var at = localStorage.getItem('acct_' + acct_id + '_at')
@@ -267,12 +268,6 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 			} else {
 				var typeA = JSON.parse(mess.data).event
 				if (typeA == 'delete') {
-					var del = localStorage.getItem('delete')
-					if (del > 10) {
-						reconnector(tlid, type, acct_id, data)
-					} else {
-						localStorage.setItem('delete', del * 1 + 1)
-					}
 					var obj = JSON.parse(mess.data).payload
 					if (delc == 'true') {
 						$('#timeline_' + tlid + ' [toot-id=' + JSON.parse(mess.data).payload + ']').addClass(
@@ -286,7 +281,6 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 						$('[toot-id=' + JSON.parse(mess.data).payload + ']').remove()
 					}
 				} else if (typeA == 'update' || typeA == 'conversation') {
-					localStorage.removeItem('delete')
 					if (!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) {
 						//markers show中はダメ
 						var obj = JSON.parse(JSON.parse(mess.data).payload)
@@ -394,6 +388,9 @@ function moreload(type, tlid) {
 			var data = obj[tlid].data
 			moreTs(tlid, data)
 			return
+		} else if (type == 'bookmark') {
+			getBookmark(acct_id, tlid, true)
+			return
 		}
 		moreloading = true
 		localStorage.setItem('now', type)
@@ -715,6 +712,8 @@ function cap(type, data, acct_id) {
 		var response = 'Twitter'
 	} else if (type == 'tootsearch') {
 		var response = 'tootsearch(' + escapeHTML(data) + ')'
+	} else if (type == 'bookmark') {
+		var response = 'Bookmarks'
 	}
 	return response
 }
@@ -737,6 +736,8 @@ function com(type, data) {
 		return 'list/' + data + '?'
 	} else if (type == 'dm') {
 		return 'direct?'
+	} else if (type == 'bookmark') {
+		return 'bookmarks?'
 	}
 }
 //Misskey
@@ -807,31 +808,11 @@ function icon(type) {
 		var response = 'language'
 	} else if (type == 'tootsearch') {
 		var response = 'search'
+	} else if (type == 'bookmark') {
+		var response = 'bookmark'
 	}
 	return response
 }
-function strAlive() {
-	var date = new Date()
-	var a = date.getTime()
-	var unix = Math.floor(a / 1000)
-	var col = localStorage.getItem('column')
-	if (col) {
-		var obj = JSON.parse(col)
-		Object.keys(obj).forEach(function(key) {
-			if ($('#notice_icon_' + key).hasClass('red-text')) {
-				var type = obj[key].type
-				var acct_id = obj[key].domain
-				var data = obj[key].data
-				reconnector(key, type, acct_id, data, 'error')
-			}
-		})
-	}
-	return
-}
-
-function strAliveInt() {
-	setTimeout(strAlive, 10000)
-}
 function reconnector(tlid, type, acct_id, data, mode) {
 	console.log('%c Reconnector:' + mode + '(timeline' + tlid + ')', 'color:pink')
 	if (type == 'mix' || type == 'integrated' || type == 'plus') {
@@ -864,6 +845,9 @@ function reconnector(tlid, type, acct_id, data, mode) {
 function columnReload(tlid, type) {
 	$('#notice_icon_' + tlid).addClass('red-text')
 	$('#unread_' + tlid + ' .material-icons').removeClass('teal-text')
+	var multi = localStorage.getItem('column')
+	var obj = JSON.parse(multi)
+	var acct_id = obj[tlid].domain
 	if (type == 'mix' || type == 'integrated' || type == 'plus') {
 		if (localStorage.getItem('voice_' + tlid)) {
 			var voice = true
@@ -879,6 +863,9 @@ function columnReload(tlid, type) {
 	} else if (type == 'notf') {
 		$('#notice_icon_' + tlid).removeClass('red-text')
 		notfColumn(acct_id, tlid, '')
+	} else if (type == 'bookmark') {
+		$('#notice_icon_' + tlid).removeClass('red-text')
+		getBookmark(acct_id, tlid, false)
 	} else {
 		var wss = localStorage.getItem('wss_' + tlid)
 		websocket[wss].close()
@@ -891,7 +878,6 @@ function columnReload(tlid, type) {
 		parseColumn(tlid)
 	}
 }
-strAliveInt()
 //Markers
 function getMarker(tlid, type, acct_id) {
 	var domain = localStorage.getItem('domain_' + acct_id)
@@ -1132,3 +1118,52 @@ function asReadEnd() {
 		postMessage(['asReadComp', ''], '*')
 	}
 }
+//ブックマーク
+function getBookmark(acct_id, tlid, more) {
+	moreloading = true
+	console.log(acct_id, tlid, more)
+	if (more) {
+		var sid = $('#timeline_' + tlid + ' .notif-marker')
+			.last()
+			.attr('data-maxid')
+		var ad = '?max_id=' + sid
+	} else {
+		var ad = ''
+	}
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var start = 'https://' + domain + '/api/v1/bookmarks' + ad
+	var httpreq = new XMLHttpRequest()
+	httpreq.open('GET', start, true)
+	httpreq.setRequestHeader('Content-Type', 'application/json')
+	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+	httpreq.responseType = 'json'
+	httpreq.send()
+	httpreq.onreadystatechange = function() {
+		if (httpreq.readyState === 4) {
+			var json = httpreq.response
+			if (this.status !== 200) {
+				setLog(start, this.status, this.response)
+			}
+			var max_ids = httpreq.getResponseHeader('link')
+			var max_id = 0
+			if (max_ids) {
+				max_ids = max_ids.match(/[?&]{1}max_id=([0-9]+)/)
+				if (max_ids) {
+					max_id = max_ids[1]
+				}
+			}
+			var templete = parse(json, 'bookmark', acct_id, tlid, -1, null)
+			templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>'
+			if (more) {
+				$('#timeline_' + tlid).append(templete)
+			} else {
+				$('#timeline_' + tlid).html(templete)
+			}
+			$('#landing_' + tlid).hide()
+			jQuery('time.timeago').timeago()
+			moreloading = false
+			todc()
+		}
+	}
+}
--- a/app/js/ui/layout.js
+++ b/app/js/ui/layout.js
@@ -202,7 +202,29 @@ function parseColumn(target, dontclose) {
 				animecss,
 				acct.data
 			)
-		} else {
+		}  else if (acct.type == 'bookmark') {
+			if (!acct.left_fold) {
+				basekey = key
+			}
+
+			var anime = localStorage.getItem('animation')
+			if (anime == 'yes' || !anime) {
+				var animecss = 'box-anime'
+			} else {
+				var animecss = ''
+			}
+			unstreamingTL(
+				acct.type,
+				key,
+				basekey,
+				insert,
+				icnsert,
+				acct.left_fold,
+				css,
+				animecss,
+				acct.domain
+			)
+		}else {
 			var anime = localStorage.getItem('animation')
 			if (anime == 'yes' || !anime) {
 				var animecss = 'box-anime'
@@ -214,6 +236,8 @@ function parseColumn(target, dontclose) {
 					 class="setting nex" title="${lang.lang_layout_unread}">
 					<i class="material-icons waves-effect nex">more</i>
 				</a>`
+				var notfDomain = acct.domain
+				var notfKey = key
 			if (acct.type == 'notf') {
 				var exclude =
 					lang.lang_excluded +
@@ -257,6 +281,8 @@ function parseColumn(target, dontclose) {
 						</button>`
 				}
 				exclude = exclude + '<br>'
+				notfDomain = "dummy"
+				notfKey = "dummy"
 			} else if (acct.type == 'home') {
 				var exclude =
 					`<a onclick="ebtToggle('${key}')" class="setting nex">
@@ -353,8 +379,8 @@ function parseColumn(target, dontclose) {
 						</a>
 					</div>
 				</div>
-				<div class="column-hide notf-indv-box z-depth-4" id="notf-box_${key}">
-					<div id="notifications_${key}" data-notf="${acct.domain}" data-type="notf" class="notf-timeline">
+				<div class="column-hide notf-indv-box z-depth-4" id="notf-box_${notfKey}">
+					<div id="notifications_${notfKey}" data-notf="${notfDomain}" data-type="notf" class="notf-timeline">
 					</div>
 				</div>
 				<div class="column-hide notf-indv-box" id="util-box_${key}" style="padding:5px;">
@@ -724,105 +750,73 @@ function webviewParse(url, key, insert, icnsert, css) {
 		</div>`
 	return html
 }
-function unstreamingTL(type, key, basekey, insert, icnsert, left_fold, css, animecss, q) {
+function unstreamingTL(type, key, basekey, insert, icnsert, left_fold, css, animecss, data) {
+	//type名が関数名
 	if (!left_fold) {
 		var basehtml =
-			'<div style="' +
-			css +
-			'" class="box ' +
-			animecss +
-			'" id="timeline_box_' +
-			basekey +
-			'_parentBox"></div>'
+			`<div style="${css}" class="box ${animecss}" id="timeline_box_${basekey}_parentBox"></div>`
 		$('#timeline-container').append(basehtml)
 		var left_hold =
-			'<a onclick="leftFoldSet(' +
-			key +
-			')" class="setting nex"><i class="material-icons waves-effect nex" title="' +
-			lang.lang_layout_leftFold +
-			'">view_agenda</i></a>' +
-			lang.lang_layout_leftFold +
-			'</span><br>'
+			`<a onclick="leftFoldSet('${key}')" class="setting nex">
+				<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftFold}">view_agenda</i>
+			</a>
+			${lang.lang_layout_leftFold}
+			</span><br>`
 	} else {
 		var left_hold =
-			'<a onclick="leftFoldRemove(' +
-			key +
-			')" class="setting nex"><i class="material-icons waves-effect nex" title="' +
-			lang.lang_layout_leftUnfold +
-			'">view_column</i></a>' +
-			lang.lang_layout_leftUnfold +
-			'</span><br>'
+			`<a onclick="leftFoldRemove('${key}')" class="setting nex">
+				<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftUnfold}">view_column</i>
+			</a>
+			${lang.lang_layout_leftUnfold}
+			</span><br>`
 	}
 	var html =
-		'<div class="boxIn" id="timeline_box_' +
-		key +
-		'_box" tlid="' +
-		key +
-		'"><div class="notice-box z-depth-2" id="menu_' +
-		key +
-		'" style="' +
-		insert +
-		' ">' +
-		'<div class="area-notice"><i class="material-icons waves-effect" id="notice_icon_' +
-		key +
-		'" style="font-size:40px; padding-top:25%;" onclick="tootsearch(' +
-		key +
-		",'" +
-		q +
-		'\');" title="' +
-		lang.lang_layout_gotop +
-		'"></i></div>' +
-		'<div class="area-notice_name"><span id="notice_' +
-		key +
-		'" class="tl-title"></span></div>' +
-		'<div class="area-a1"></div><div class="area-sta"></div>' +
-		'<div class="area-a2"><a onclick="removeColumn(' +
-		key +
-		')" class="setting nex"><i class="material-icons waves-effect nex" title="' +
-		lang.lang_layout_delthis +
-		'"' +
-		icnsert +
-		'>cancel</i></a></div>' +
-		'<div class="area-a3"><a onclick="setToggle(' +
-		key +
-		')" class="setting nex" title="' +
-		lang.lang_layout_setthis +
-		'"' +
-		icnsert +
-		'><i class="material-icons waves-effect nex">settings</i></a></div></div>' +
-		'<div class="column-hide notf-indv-box" id="util-box_' +
-		key +
-		'" style="padding:5px;">' +
-		left_hold +
-		'<a onclick="mediaToggle(' +
-		key +
-		')" class="setting nex"><i class="material-icons waves-effect nex" title="' +
-		lang.lang_layout_mediafil +
-		'">perm_media</i><span id="sta-media-' +
-		key +
-		'">On</span></a>' +
-		lang.lang_layout_mediafil +
-		'<br>' +
-		lang.lang_layout_headercolor +
-		'<br><div id="picker_' +
-		key +
-		'" class="color-picker"></div></div><div class="tl-box" tlid="' +
-		key +
-		'"><div id="timeline_' +
-		key +
-		'" class="tl ' +
-		type +
-		'-timeline " tlid="' +
-		key +
-		'" data-type="' +
-		type +
-		'" data-acct="nostr"><div id="landing_' +
-		key +
-		'" style="text-align:center">' +
-		lang.lang_layout_nodata +
-		'</div></div></div>'
+		`<div class="boxIn" id="timeline_box_${key}_box" tlid="${key}">
+			<div class="notice-box z-depth-2" id="menu_${key}" style="${insert} ">
+				<div class="area-notice">
+					<i class="material-icons waves-effect" id="notice_icon_${key}" style="font-size:40px; padding-top:25%;" 
+						onclick="${type}('${key}','${data}');" title="${lang.lang_layout_gotop}"></i>
+				</div>
+				<div class="area-notice_name">
+					<span id="notice_${key}" class="tl-title"></span>
+				</div>
+				<div class="area-a1"></div>
+				<div class="area-sta"></div>
+				<div class="area-a2">
+					<a onclick="removeColumn('${key}')" class="setting nex">
+						<i class="material-icons waves-effect nex" title="${lang.lang_layout_delthis}"${icnsert}>cancel</i>
+					</a>
+				</div>
+				<div class="area-a3">
+					<a onclick="setToggle('${key}')" class="setting nex" title="${lang.lang_layout_setthis}" ${icnsert}>
+						<i class="material-icons waves-effect nex">settings</i>
+					</a>
+				</div>
+			</div>
+		<div class="column-hide notf-indv-box" id="util-box_${key}" style="padding:5px;">
+			${left_hold}
+			<a onclick="mediaToggle('${key}')" class="setting nex">
+				<i class="material-icons waves-effect nex" title="${lang.lang_layout_mediafil}">perm_media</i>
+				<span id="sta-media-${key}">On</span>
+			</a>
+			${lang.lang_layout_mediafil}<br>
+			${lang.lang_layout_headercolor}<br>
+			<div id="picker_${key}" class="color-picker"></div>
+		</div>
+		<div class="tl-box" tlid="${key}">
+			<div id="timeline_${key}" class="tl ${type}-timeline" tlid="${key}" data-type="${type}" data-acct="${data}">
+				<div id="landing_${key}" style="text-align:center">
+					${lang.lang_layout_nodata}
+				</div>
+			</div>
+		</div>`
 	$('#timeline_box_' + basekey + '_parentBox').append(html)
-	tootsearch(key, q)
+	if(type == 'tootsearch'){
+		tootsearch(key, data)
+	}else if(type == 'bookmark'){
+		console.log(key, data)
+		bookmark(key, data)
+	}
 	cardCheck(key)
 	ebtCheck(key)
 	mediaCheck(key)
@@ -830,6 +824,15 @@ function unstreamingTL(type, key, basekey, insert, icnsert, left_fold, css, anim
 	voiceCheck(key)
 	return true
 }
+function bookmark(key, data){
+	console.log(key, data)
+	if (localStorage.getItem('voice_' + key)) {
+		var voice = true
+	} else {
+		var voice = false
+	}
+	tl('bookmark', '', data, key, 'false', voice, '')
+}
 function leftFoldSet(key) {
 	var multi = localStorage.getItem('column')
 	var obj = JSON.parse(multi)
--- a/app/js/ui/post-box.js
+++ b/app/js/ui/post-box.js
@@ -1,135 +1,140 @@
 /*ささやきボックス(Cr民並感)*/
 //✕隠す
 function hide() {
-	$("#right-side").hide()
-	$("#right-side").css("width", "300px")
-	$("#left-side").css("width", "100%")
-	var width = localStorage.getItem("postbox-width");
-	if(width){
-		width = width.replace("px", "") * 1
+	$('#right-side').hide()
+	$('#right-side').css('width', '300px')
+	$('#left-side').css('width', '100%')
+	var width = localStorage.getItem('postbox-width')
+	if (width) {
+		width = width.replace('px', '') * 1
 	} else {
 		width = 300
 	}
-	$("#post-box").css("width", width)
+	$('#post-box').css('width', width)
 	$('#post-box').fadeOut()
-	$("#post-box").removeClass("appear")
-	$("#emoji").addClass("hide")
-	$("#left-side").show();
-	$("#default-emoji").show();
-	$("#unreact").show();
-	$("#addreact").addClass("hide");
+	$('#post-box').removeClass('appear')
+	$('#emoji').addClass('hide')
+	$('#left-side').show()
+	$('#default-emoji').show()
+	$('#unreact').show()
+	$('#addreact').addClass('hide')
 }
 //最小化
 function mini() {
-	$("body").toggleClass("mini-post");
-	if ($("body").hasClass("mini-post")) {
-		$(".mini-btn").text("expand_less");
+	$('body').toggleClass('mini-post')
+	if ($('body').hasClass('mini-post')) {
+		$('.mini-btn').text('expand_less')
 	} else {
-		$(".mini-btn").text("expand_more");
+		$('.mini-btn').text('expand_more')
 	}
 }
 //最小化時に展開
 function show() {
-	$("#post-box").addClass("appear")
-	$("#textarea").focus();
-	console.log("show" + localStorage.getItem("postbox-left"));
-	var left = localStorage.getItem("postbox-left");
+	$('#post-box').addClass('appear')
+	$('#textarea').focus()
+	console.log('show' + localStorage.getItem('postbox-left'))
+	var left = localStorage.getItem('postbox-left')
 	if (left > $('body').width() - $('#post-box').width()) {
-		left = $('body').width() - $('#post-box').width();
+		left = $('body').width() - $('#post-box').width()
 	} else if (left < 0) {
-		left = 0;
+		left = 0
 	}
-	var top = localStorage.getItem("postbox-top");
+	var top = localStorage.getItem('postbox-top')
 	if (top > $('body').height() - $('#post-box').height()) {
-		top = $('body').height() - $('#post-box').height();
+		top = $('body').height() - $('#post-box').height()
 	} else if (top < 0) {
-		top = 0;
+		top = 0
 	}
-	$('#post-box').css("left", left + "px")
-	$('#post-box').css("top", top + "px")
-	var width = localStorage.getItem("postbox-width");
+	$('#post-box').css('left', left + 'px')
+	$('#post-box').css('top', top + 'px')
+	var width = localStorage.getItem('postbox-width')
 	if (width) {
-		$('#post-box').css("width", width + "px")
+		$('#post-box').css('width', width + 'px')
 	} else {
-		$('#post-box').css("width", "300px")
+		$('#post-box').css('width', '300px')
 	}
-	$('#post-box').fadeIn();
-	$('#textarea').characterCounter();
+	$('#post-box').fadeIn()
+	$('#textarea').characterCounter()
 	mdCheck()
 }

-$(function () {
-	$("#post-box").draggable({
-		handle: "#post-bar",
-		stop: function () {
-			var left = $('#post-box').offset().left;
+$(function() {
+	$('#post-box').draggable({
+		handle: '#post-bar',
+		stop: function() {
+			var left = $('#post-box').offset().left
 			if (left > $('body').width() - $('#post-box').width()) {
-				left = $('body').width() - $('#post-box').width();
+				left = $('body').width() - $('#post-box').width()
 			} else if (left < 0) {
-				left = 0;
+				left = 0
 			}
-			var top = $('#post-box').offset().top;
+			var top = $('#post-box').offset().top
 			if (top > $('body').height() - $('#post-box').height()) {
-				top = $('body').height() - $('#post-box').height();
+				top = $('body').height() - $('#post-box').height()
 			} else if (top < 0) {
-				top = 0;
+				top = 0
 			}
-			localStorage.setItem("postbox-left", left);
-			localStorage.setItem("postbox-top", top);
+			localStorage.setItem('postbox-left', left)
+			localStorage.setItem('postbox-top', top)
 		}
-	});
-	$("#post-box").resizable({
+	})
+	$('#post-box').resizable({
 		minHeight: 150,
 		minWidth: 100,
-		stop: function (event, ui) {
-			$("#textarea").blur()
-			localStorage.setItem("postbox-width", ui.size.width);
+		stop: function(event, ui) {
+			$('#textarea').blur()
+			localStorage.setItem('postbox-width', ui.size.width)
 		}
-	});
-});
+	})
+})

 //コード受信
 if (location.search) {
-	var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
-	var mode = m[1];
-	var codex = m[2];
-	if (mode == "share") {
-		$('textarea').focus();
-		$("#textarea").val(decodeURI(codex));
-		show();
-		$("body").removeClass("mini-post");
-		$(".mini-btn").text("expand_less");
+	var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/)
+	var mode = m[1]
+	var codex = m[2]
+	if (mode == 'share') {
+		$('textarea').focus()
+		$('#textarea').val(decodeURI(codex))
+		show()
+		$('body').removeClass('mini-post')
+		$('.mini-btn').text('expand_less')
 	}
 }
-$('#posttgl').click(function (e) {
-	if (!$('#post-box').hasClass("appear")) {
-		show();
+$('#posttgl').click(function(e) {
+	if (!$('#post-box').hasClass('appear')) {
+		show()
 	} else {
-		hide();
+		hide()
 	}
-	$('.cvo').removeClass("selectedToot")
+	$('.cvo').removeClass('selectedToot')
 	selectedColumn = 0
 	selectedToot = 0
-});
+})

-$("#timeline-container,#group").click(function (e) {
-	if (localStorage.getItem("box") != "absolute") {
-		if ($('#post-box').hasClass("appear") && !localStorage.getItem("nohide")) {
-			hide();
+$('#timeline-container,#group').click(function(e) {
+	if (localStorage.getItem('box') != 'absolute') {
+		if ($('#post-box').hasClass('appear') && !localStorage.getItem('nohide')) {
+			hide()
 		}
 	}
-	$('.cvo').removeClass("selectedToot")
+	$('.cvo').removeClass('selectedToot')
 	selectedColumn = 0
 	selectedToot = 0
-	localStorage.removeItem("nohide")
-});
-$('#textarea,#cw-text').focusout(function (e) {
-	localStorage.setItem("nohide", true)
-	var countup = function () {
-		localStorage.removeItem("nohide")
+	localStorage.removeItem('nohide')
+})
+$('#contextWrap').click(function(e) {
+	$('#contextWrap').addClass('hide')
+	$('.contextMenu').addClass('hide')
+	$('.act-icon').text('expand_more')
+})
+$('#textarea,#cw-text').focusout(function(e) {
+	localStorage.setItem('nohide', true)
+	var countup = function() {
+		localStorage.removeItem('nohide')
 	}
 	//setTimeout(remove, 100);
-	$('.cvo').removeClass("selectedToot")
+	$('.cvo').removeClass('selectedToot')
 	selectedColumn = 0
 	selectedToot = 0
-});
+})
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
  "name": "thedesk",
-  "version": "20.0.1",
+  "version": "20.0.3",
  "description": "TheDesk is a Mastodon client for PC.",
  "repository": "https://github.com/cutls/TheDesk",
  "main": "main.js",
@@ -55,11 +55,11 @@
    "jimp": "^0.8.4",
    "jquery": "^3.4.1",
    "jquery-ui-dist": "^1.12.1",
+    "materialize-css": "git://github.com/cutls/materialize",
    "json5": "^2.1.1",
    "lodash": "^4.17.15",
-    "materialize-css": "^1.0.0",
    "sumchecker": "^3.0.0",
-    "sweetalert2": "^8.18.6",
+    "sweetalert2": "^9.3.4",
    "vue": "^2.6.10"
  },
  "optionalDependencies": {
@@ -67,9 +67,9 @@
    "itunes-nowplaying-mac": "0.3.1"
  },
  "devDependencies": {
-    "chokidar": "^3.2.3",
+    "chokidar": "^3.3.0",
    "electron": "^6.0.12",
-    "electron-builder": "^21.1.5",
+    "electron-builder": "^22.1.0",
    "electron-rebuild": "^1.8.6",
    "readline-sync": "1.4.10"
  },
--- a/app/view/make/index.sample.html
+++ b/app/view/make/index.sample.html
@@ -84,6 +84,7 @@
 			</div>
 		</div>
 	</div>
+	<div id="contextWrap" class="hide"></div>
 	<div id="post-box" class="z-depth-5">
 		<div id="post-bar" class="drag-bar"><span id="unreact">@@post-new@@</span><span id="addreact"
 				class="hide">Reaction</span></div>
@@ -760,47 +761,28 @@
 			<a href="https://thedesk.top" target="_blank">HP</a><br>
 			<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
 			<br>
-			<div id="release-20-0-1_Kawaii" class="release-do" style="display:none; ">><br>
+			<div id="release-20-0-3_Kawaii" class="release-do" style="display:none; ">><br>
 				<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
 				Pixiv FanboxやPatreonでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br>
 				困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-				<h5>Release Note 20.0.1 (Kawaii)</h5>
-				・緊急DoS対策(Spotify Tips)
+				<h5>Release Note 20.0.3 (Kawaii)</h5>
+				・ブックマーク機能(master)
 				<a onclick="udgEx('Cutls@cutls.com','main')" class="contributor">
 					<img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">Cutls
 				</a><br>
-				<h5>Release Note 20.0.0 (Kawaii)</h5>
-				・コードがKawaii感じ(Prettier)になりました
+				・コンテキストメニュー
 				<a onclick="udgEx('Cutls@cutls.com','main')" class="contributor">
 					<img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">Cutls
 				</a><br>
-				・リクエストエラーログ表示(例えばTLが表示されないのが、TheDeskが悪いのかサーバーが悪いのかなどがわかる)
-				<a onclick="udgEx('Cutls@cutls.com','main')" class="contributor">
-					<img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">Cutls
-				</a>
-				<br>
-				・他のアカウントでフォローが上手く行かない不具合の修正
-				<a onclick="udgEx('micchan83@fedibird.com','main')" class="contributor">
-					<img src="https://user-images.githubusercontent.com/17561618/67261210-a46a7980-f4da-11e9-9c9c-704757d3b1a7.png">micchan83
-				</a>
-				<a onclick="udgEx('noellabo@fedibird.com','main')" class="contributor">
-					<img src="https://user-images.githubusercontent.com/17561618/68497129-345c4180-0297-11ea-8001-1853bc0c84b8.png">noellabo
-				</a>
+				・日本語(関西)を追加したで
 				<a onclick="udgEx('Cutls@cutls.com','main')" class="contributor">
 					<img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">Cutls
 				</a><br>
-				・Integrated TLについて改善
+				・カードの埋め込みHTMLを自動で展開しないように。セキュリティ対策。YouTube, ニコ動, Spotify, Twitcastingのみ表示
 				<a onclick="udgEx('Cutls@cutls.com','main')" class="contributor">
 					<img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">Cutls
 				</a><br>
-				・イメージビューアのソースを自サーバーキャッシュかリモートかを選べるように。自鯖のCDN代圧縮に2mmくらい役立つかも
-				<a onclick="udgEx('Cutls@cutls.com','main')" class="contributor">
-					<img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">Cutls
-				</a><br>
-				・画像URLのコピー
-				<a onclick="udgEx('Zergling_man@openweb.social','main')" class="contributor">
-					<img src="https://user-images.githubusercontent.com/17561618/68497404-cebc8500-0297-11ea-8b21-99c6a40ecde0.png">Zergling_man
-				</a>
+				・Twitterの埋め込みをAPI展開するようにした
 				<a onclick="udgEx('Cutls@cutls.com','main')" class="contributor">
 					<img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">Cutls
 				</a><br>
@@ -913,6 +895,9 @@
 								<div class="type waves-effect" data-type="notf">
 									<div><i class="material-icons">notifications</i></div><span>@@notf@@</span>
 								</div>
+								<div class="type waves-effect" data-type="bookmark">
+									<div><i class="material-icons">bookmark</i></div><span>@@bookmark@@</span>
+								</div>
 							</div>
 						</div>
 						<div id="noauth" class="hide">@@showThisTL@@
@@ -1208,6 +1193,7 @@
 	<!--JS-->
 	<script type="text/javascript" src="../../node_modules/jquery/dist/jquery.js"></script>
 	<script type="text/javascript" src="../../js/platform/first.js"></script>
+	<script type="text/javascript" src="../../node_modules/grapheme-splitter/index.js"></script>
 	<script type="text/javascript" src="../../node_modules/materialize-css/dist/js/materialize.js"></script>
 	<script type="text/javascript" src="../../node_modules/lodash/lodash.min.js"></script>
 	<script type="text/javascript" src="main.js"></script>
@@ -1219,17 +1205,15 @@
 	<script type="text/javascript" src="../../node_modules/jquery-ui-dist/jquery-ui.min.js"></script>
 	<script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>
 	<script type="text/javascript" src="../../js/platform/punycode.js"></script>
-
-
 	<script type="text/javascript" src="../../js/ui/tips.js"></script>
 	<script src="https://twemoji.maxcdn.com/2/twemoji.min.js?2.7"></script>
 	<script type="text/javascript" src="../../js/common/about.js"></script>
-	<script type="text/javascript" src="../../js/tl/parse.js"></script>
 	<script type="text/javascript" src="../../js/tl/misskeyparse.js"></script>
 	<script type="text/javascript" src="../../js/tl/dm.js"></script>
 	<script type="text/javascript" src="../../js/ui/scroll.js"></script>
 	<script type="text/javascript" src="../../js/tl/tl.js"></script>
 	<script type="text/javascript" src="../../js/tl/card.js"></script>
+	<script type="text/javascript" src="../../js/tl/parse.js"></script>
 	<script type="text/javascript" src="../../js/tl/poll.js"></script>
 	<script type="text/javascript" src="../../js/tl/date.js"></script>
 	<script type="text/javascript" src="../../js/tl/notification.js"></script>
--- a/app/view/make/language/af-ZA/index.json
+++ b/app/view/make/language/af-ZA/index.json
@@ -68,7 +68,7 @@
    "favRegist": "Favourite",
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
-    "copyURL": "Copy URL of this toot",
+    "copyURL": "Copy the URL",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
--- a/app/view/make/language/ar-SA/index.json
+++ b/app/view/make/language/ar-SA/index.json
@@ -68,7 +68,7 @@
    "favRegist": "Favourite",
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
-    "copyURL": "Copy URL of this toot",
+    "copyURL": "Copy the URL",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
--- a/app/view/make/language/ca-ES/index.json
+++ b/app/view/make/language/ca-ES/index.json
@@ -68,7 +68,7 @@
    "favRegist": "Favourite",
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
-    "copyURL": "Copy URL of this toot",
+    "copyURL": "Copy the URL",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
--- a/app/view/make/language/da-DK/index.json
+++ b/app/view/make/language/da-DK/index.json
@@ -68,7 +68,7 @@
    "favRegist": "Favourite",
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
-    "copyURL": "Copy URL of this toot",
+    "copyURL": "Copy the URL",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
--- a/app/view/make/language/de-DE/acct.json
+++ b/app/view/make/language/de-DE/acct.json
@@ -1,5 +1,5 @@
 {
-    "list": "Konten",
+    "list": "Accountliste",
    "back": "Zurück",
    "add": "Konto hinzufügen",
    "codesetupwarn": "Check if TheDesk is not working on Windows, you want to login Pleroma servers, you cannot login when it checked.",
@@ -8,9 +8,9 @@
    "selacct": "Konto auswählen",
    "codepastewarn": "Fügen Sie den Code ein und schließen Sie den Browser.",
    "codepaste": "Code",
-    "domain": "Domain",
+    "domain": "Domäne",
    "connect": "Föderierte Server",
-    "toots": "Toots",
+    "toots": "Tröts",
    "users": "Nutzer",
    "users2": "Nutzer",
    "safety": "Verbindung",
@@ -19,5 +19,5 @@
    "thisismisskey": "Als Misskey anmelden",
    "misskeylogin": "Lies die <a href=\"https://thedesk.top/how-to-misskey-login.html\">Doku (japanisch)</a> um dich bei Misskey einzuloggen.",
    "nodata": "Keine Daten",
-    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)"
+    "accessTokenSetup": "Benutze Zugangs-Token zum Anmelden (Klicke nach Ausfüllen nicht den Code, sondern den Access-Token im Kästchen: Erweitert)"
 }
--- a/app/view/make/language/de-DE/index.json
+++ b/app/view/make/language/de-DE/index.json
@@ -10,15 +10,15 @@
    "selfile": "Anhängen...",
    "insertEmoji": "Emojis",
    "NPSpotify": "Wird gerade gespielt (Spotify)",
-    "NPiTunes": "Wird gerade gespielt(macOS)",
+    "NPiTunes": "Wird gerade wiedergegeben(macOS)",
    "schedule": "Geplanter Tröt",
    "postat": "Senden um",
-    "scheduleWarn": "2.7.0~ Mindestzeitraum: von 5min(Uhr auf dem Server ist möglicherweise ungenau.)",
+    "scheduleWarn": "2.7.0~ Mindestzeitabstand: von 5min(Uhr auf dem Server ist möglicherweise ungenau.)",
    "clearToot": "Eingabe löschen",
    "replyMode": "Antworten",
    "no": "Nein",
    "yes": "Ja",
-    "temp": "Hinzugefügte Inhalte",
+    "temp": "Dateien anhängen",
    "nothing": "Keine",
    "vis": "Adjust status privacy",
    "cwtext": "Warntext",
@@ -61,8 +61,8 @@
    "favedPeople": "Leute, die es bevorzugt haben",
    "btedPeople": "Leute, die es verstärkt haben",
    "useOtherAcct1": "Anderes Konto verwenden",
-    "useOtherAcct2": ":unfav and unBT are disabled.",
-    "btWithVis": "Boost with visibility",
+    "useOtherAcct2": ":unfav und unBT sind deaktiviert.",
+    "btWithVis": "Boost mit Sichtbarkeit",
    "reply": "Antworten",
    "bt": "Verstärkung",
    "favRegist": "Favoriten",
@@ -81,29 +81,29 @@
    "mutes": "Stumm geschaltet",
    "block": "Blockieren",
    "mute": "Stummschalten",
-    "domainBlock": "Domain block",
+    "domainBlock": "Domänenblockade",
    "editProf": "Profil bearbeiten",
    "change": "Speichern",
    "followReq": "Anfragen folgen",
-    "likeHimOrHer": "Resembling",
+    "likeHimOrHer": "ähnlich wie",
    "endorse": "Auf dem Profil zeigen",
    "openinbrowser": "Im Browser öffnen",
    "mainacct": "Im Hauptkonto einstellen",
    "frc": "Vorschlagen",
    "more": "Mehr",
    "revoverJP": " an ",
-    "warnUseOtherAcct": "(Unable to unfollow)",
+    "warnUseOtherAcct": "(Kann nicht entfolgen)",
    "revoverJPde": "",
    "or": "oder",
    "openProf": "Benutzerprofil",
    "warnListRegist": "Folgen, um diesen Benutzer zu Listen hinzuzufügen.",
-    "blockDomain": "Add blocking domain",
+    "blockDomain": "Sperrdomain hinzufügen",
    "name": "Anzeigename",
    "note": "Notiz",
    "editProfImg": "Avatar ändern",
-    "editHeader": "Change header image",
+    "editHeader": "Kopfzeilenbild ändern",
    "blocked": "Sie sind blockiert. Warum?",
-    "likeUserDes": "Get people resembling this user.",
+    "likeUserDes": "Hole Leute die diesem Nutzer ähneln.",
    "get": "Holen",
    "historyBack": "Zurück",
    "empUser": "Diesen Benutzer hervorheben",
@@ -126,7 +126,7 @@
    "localPlusDes": "Integrated(Local and replies and BT on Home)",
    "notf": "Benachrichtigungen",
    "showThisTL": "Verlauf anzeigen:",
-    "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
+    "webviewWarn": "TweetDeck mit angepassten TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Tastaturkürzel werden Sie irritieren. Wenn Sie wollen, können Sie \"WebView bevorzugen\" oberhalb der Spalte aktivieren.",
    "add": "Hinzufügen",
    "search": "Suche",
    "sortSet": "Sortieren",
@@ -142,13 +142,13 @@
    "exceptWorn": "Gefilterte Toots verschwinden unwiderruflich, auch wenn der Filter später entfernt wird",
    "avalableBefore": "Verfällt nach",
    "warnAvBefore": "Nicht gesetzt oder \"0\" bedeutet \"Nie\"",
-    "warnAvBefore2": "This value may contain some error",
+    "warnAvBefore2": "Dieser Wert kann einen Fehler enthalten",
    "unlimited": "Niemals",
    "days": "Tag(e)",
    "hours": "Stunde(n)",
    "mins": "Minute(n)",
    "secs": "Sekunde(n)",
-    "warnOnIntegratedTL": "Integrated TL/Plus TL will hide both Home-filtering words and Local-filtering words.",
+    "warnOnIntegratedTL": "Integrierte TL/Plus TL verbirgt sowohl Home-Filter-Wörter als auch Lokal-Filter-Wörter.",
    "helloTheDesk": "Interner Fehler: Bitte löschen Sie alle Daten (auf der Einstellungsseite) <b>Alle Daten werden gelöscht.</b>",
    "addColumn": "Spalte hinzufügen",
    "sortColumns": "Sortieren",
@@ -157,25 +157,25 @@
    "setting": "Einstellungen",
    "reverse": "Tröt-Button Seite tauschen",
    "f5": "Verlauf neu laden",
-    "nanoDes": "The smallest Mastodon,",
+    "nanoDes": "Das kleinste Mastodon,",
    "verTips": "Version",
    "clockTips": "Uhr",
    "ramTips": "RAM-Status",
    "changeTips": "Tipps ändern",
-    "helpAndLogs": "Help & Log",
+    "helpAndLogs": "Hilfe & Log",
    "help": "Hilfe",
-    "contactwithlog": "If you tell me bugs(not working or something) with this log, I can detect what is wrong more easily.",
+    "contactwithlog": "Wenn Sie mir mit diesem Log Fehler (Funktionsunfähigkeit oder ähnliches) zeigen, kann ich leichter erkennen, was falsch ist.",
    "about": "Über TheDesk",
    "hereAddColumns": "<- Neuer Verlauf",
-    "show": "Show",
-    "directory": "Directory",
-    "active": "Recently active",
-    "newcomer": "New arrivals",
+    "show": "Zeige",
+    "directory": "Verzeichnis",
+    "active": "Kürzlich aktiv",
+    "newcomer": "Neu eingetroffen",
    "local_only": "Nur lokal",
-    "demoBottomBtns": "Welcome guide",
-    "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.",
-    "acctManDesc": "Add more accounts and logout them.",
+    "demoBottomBtns": "Willkommensguide",
+    "lookAtBottom": "Schauen Sie sich den unteren Teil des Fensters an. Hier sind einige Tipps darüber.",
+    "acctManDesc": "Fügen Sie weitere Konten hinzu und loggen Sie sie aus.",
    "settingDesc": "Many and many preferences here. You will couldn't check it all!",
-    "nanoDescPlus": "Mini window client(experimental)",
+    "nanoDescPlus": "Mini-Fenster-Klient (experimentell)",
    "listDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
 }
--- a/app/view/make/language/el-GR/index.json
+++ b/app/view/make/language/el-GR/index.json
@@ -68,7 +68,7 @@
    "favRegist": "Favourite",
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
-    "copyURL": "Copy URL of this toot",
+    "copyURL": "Copy the URL",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
--- a/app/view/make/language/en/index.json
+++ b/app/view/make/language/en/index.json
@@ -68,7 +68,7 @@
    "favRegist":"Favourite",
    "openBrowser":"Open in browser",
    "screenshot":"Take a screenshot",
-    "copyURL":"Copy URL of this toot",
+    "copyURL":"Copy the URL",
    "embed":"Embed",
    "toots":"Toots",
    "follow":"Follow",
@@ -125,6 +125,7 @@
    "integratedTLDes":"Integrated(Local/Home)",
    "localPlusDes":"LTL+Reply+BT",
    "notf":"Notifications",
+    "bookmark": "Bookmarks",
    "showThisTL":"Show this TL:",
    "webviewWarn":"TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
    "add":"Add",
--- a/app/view/make/language/en/main.json
+++ b/app/view/make/language/en/main.json
@@ -86,6 +86,8 @@
    "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
    "lang_cards_check": " check",
    "lang_cards_pip": "PiP mode",
+    "lang_cards_trasted": "Trusted embed HTML by TheDesk(Twitter, nicovideo, YouTube, Spotify, twitcasing)",
+    "lang_cards_untransted": "Untrusted embed HTML by TheDesk",
    "lang_details_nodata": "No data",
    "lang_details_filtered": "Filtered toot",
    "lang_details_embed": "Embed HTML is cliped.",
@@ -180,9 +182,14 @@
    "lang_parse_bt": "Boost this toot",
    "lang_parse_fav": "Favourite this toot",
    "lang_parse_quote": "Quote this toot",
-    "lang_parse_del": "Delete this toot",
-    "lang_parse_pin": "Pin this toot",
+    "lang_parse_bookmark": "Bookmark this",
+    "lang_parse_unbookmark": "Unbookmark this",
+    "lang_parse_del": "Delete this",
+    "lang_parse_pin": "Pin this",
+    "lang_parse_unpin": "Unpin this",
+    "lang_parse_link": "Open in a browser",
    "lang_parse_det": "Details via your main account.",
+    "lang_parse_detail": "Details",
    "lang_parse_redraft": "Delete & re-draft",
    "lang_parse_followed": "Followed you",
    "lang_parse_clientop": "Operation of this client",
@@ -198,6 +205,7 @@
    "lang_parse_thread": "Show thread",
    "lang_parse_unknown": "Attached file",
    "lang_parse_nsfw": "sensitive media",
+    "lang_parse_html": "Show embed HTML",
    "lang_parse_notffilter": "Show this user's notifications",
    "lang_misskeyparse_renote": "Repost",
    "lang_misskeyparse_renoteqt": "Renote",
--- a/app/view/make/language/en/setting.json
+++ b/app/view/make/language/en/setting.json
@@ -127,6 +127,7 @@
  "full": "URL, text and acct(mention to the user)",
  "notqt": "Disabled(Hide buttons on TLs)",
  "apiQuote": "API(only some instances)",
+  "showBookmarkAction": "Show a bookmarking toot button",
  "main": "Default accounts of actions",
  "mainwarn": "Main account can be set on Account Manager.",
  "lastacct": "Account you used recently",
--- a/app/view/make/language/es-ES/index.json
+++ b/app/view/make/language/es-ES/index.json
@@ -68,7 +68,7 @@
    "favRegist": "Favourite",
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
-    "copyURL": "Copy URL of this toot",
+    "copyURL": "Copy the URL",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
--- a/app/view/make/language/fi-FI/index.json
+++ b/app/view/make/language/fi-FI/index.json
@@ -68,7 +68,7 @@
    "favRegist": "Favourite",
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
-    "copyURL": "Copy URL of this toot",
+    "copyURL": "Copy the URL",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
--- a/app/view/make/language/fr-FR/index.json
+++ b/app/view/make/language/fr-FR/index.json
@@ -68,7 +68,7 @@
    "favRegist": "Favourite",
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
-    "copyURL": "Copy URL of this toot",
+    "copyURL": "Copy the URL",
    "embed": "Embed",
    "toots": "Pouets",
    "follow": "Follow",
--- a/app/view/make/language/he-IL/index.json
+++ b/app/view/make/language/he-IL/index.json
@@ -68,7 +68,7 @@
    "favRegist": "Favourite",
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
-    "copyURL": "Copy URL of this toot",
+    "copyURL": "Copy the URL",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
--- a/app/view/make/language/hu-HU/index.json
+++ b/app/view/make/language/hu-HU/index.json
@@ -68,7 +68,7 @@
    "favRegist": "Favourite",
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
-    "copyURL": "Copy URL of this toot",
+    "copyURL": "Copy the URL",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
--- a/app/view/make/language/it-IT/index.json
+++ b/app/view/make/language/it-IT/index.json
@@ -68,7 +68,7 @@
    "favRegist": "Favourite",
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
-    "copyURL": "Copy URL of this toot",
+    "copyURL": "Copy the URL",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
--- a/app/view/make/language/ja-KS/acct.json
+++ b/app/view/make/language/ja-KS/acct.json
@@ -0,0 +1,23 @@
+{
+    "list":"アカウント一覧",
+    "back":"戻る",
+    "add":"アカウントを追加",
+    "codesetupwarn":"チェック外したらコード貼っ付けんでもよくなる(<u>Mastodon</u>にWindowsやmacOSからログインするとき)失敗する場合は諦めて入れてや",
+    "codesetup":"コードセットアップ",
+    "mainacct":"メインアカウント",
+    "selacct":"アカウントを選択",
+    "codepastewarn":"コードはここに貼っ付けて。ログインウィンドウは閉じてもうてもええで。",
+    "codepaste":"コードを入力",
+    "domain":"ドメイン名",
+    "connect":"接続サーバー数",
+    "toots":"トゥート数",
+    "users":"ユーザー数",
+    "users2":"人",
+    "safety":"コネクション",
+    "ver":"Mastodonバージョン",
+    "ko":"個",
+    "thisismisskey":"これはMisskeyや",
+    "misskeylogin":"",
+    "nodata":"アカウントあらへん",
+    "accessTokenSetup": "アクセストークン使うてもいけるで(コードの代わりにアクセストークンを入れてクリックしてな: 一見さんお断り)"
+}
--- a/app/view/make/language/ja-KS/index.json
+++ b/app/view/make/language/ja-KS/index.json
@@ -0,0 +1,182 @@
+{
+    "draghere":"ドラッグしてみ？(ドラッグしたらすぐアップロードされるで)",
+    "close":"Close",
+    "showSelectProf":"このアカウントのプロフィール出す",
+    "closethisbox":"このボックスなおす",
+    "post-new":"投稿",
+    "toot":"トゥート",
+    "nsfwDes":"画像を見たらあかんやつにする",
+    "cwDes":"コンテンツワーニング(ほんまに見るんか？って聞く)",
+    "selfile":"ファイル選ぶ",
+    "insertEmoji":"絵文字入れる",
+    "NPSpotify":"NowPlaying(Spotify)",
+    "NPiTunes":"NowPlaying(macOS)",
+    "schedule":"時間指定投稿",
+    "postat":"時間指定投稿",
+    "scheduleWarn":"2.7.0~ 5分は待ってな。サーバーの時計おうてるかは知らんで。",
+    "clearToot":"トゥートボックスのクリア",
+    "replyMode":"返信モード",
+    "no":"いいえ",
+    "yes":"はい",
+    "temp":"添付ファイル",
+    "nothing":"なし",
+    "vis":"公開範囲",
+    "cwtext":"警告文",
+    "selectVis":"公開範囲指定",
+    "publicJP":"公開",
+    "unlistedJP":"未収載",
+    "privateJP":"非公開",
+    "localJP":"ローカル限定",
+    "directJP":"ダイレクト",
+    "sectoot":"こっちでもトゥート",
+    "emojiWarn":"サーバーちゃうかったら絵文字もちゃうで。",
+    "emojiInsertWarn":"入力できん絵文字もあるけどしゃーない。",
+    "refreshEmoji":"絵文字更新",
+    "closeThisBox":"ボックスなおす",
+    "showThisEmoji":"一覧を表示中",
+    "customEmoji":"カスタム絵文字",
+    "peopleEmoji":"ひと",
+    "natureEmoji":"自然",
+    "foodEmoji":"食べ物",
+    "activityEmoji":"活動",
+    "placeEmoji":"場所",
+    "thingsEmoji":"もの",
+    "symbolEmoji":"記号",
+    "flagsEmoji":"国旗",
+    "poll":"アンケート",
+    "pollDdisabled":"アンケート付けへん",
+    "pollProvider":"アンケートのプロバイダ",
+    "choice":"選択肢",
+    "polluntil":"あんたが投票するまで票数教えへん",
+    "pollmulti":"複数選択を許可",
+    "expires_in":"有効期限(秒)",
+    "contextBefore":"これより前の会話",
+    "thisToot":"対象のトゥート",
+    "contextAfter":"これより後の会話",
+    "beforeLTL":"これより前のLocal TL(誰にエアリプしてん)",
+    "beforeUTL":"これより前のユーザーTL(誰のトゥート言及してんねん)",
+    "afterLTL":"これより後のLocal TL(誰のトゥート言及してんねん)",
+    "afterUTL":"これより後のユーザーTL(誰のトゥート言及してんねん)",
+    "afterFTL":"これより後の連合TL(誰のトゥート言及してんねん)",
+    "favedPeople":"誰がお気に入りに登録してるんや",
+    "btedPeople":"誰がお気に入りブーストしたんや",
+    "useOtherAcct1":"他のアカウント使う",
+    "useOtherAcct2":"の解除はできひん",
+    "btWithVis": "公開範囲も決めてからブースト",
+    "reply":"返信",
+    "bt":"ブースト",
+    "favRegist":"お気に入り",
+    "openBrowser":"ブラウザで開く",
+    "screenshot":"スクリーンショット",
+    "copyURL":"URLをコピー",
+    "embed":"埋め込む",
+    "toots":"トゥート",
+    "follow":"フォロー",
+    "follower":"フォロワー",
+    "timeline":"タイムライン",
+    "operateOtherAcct":"他のアカウント使うて何かする",
+    "list":"リスト",
+    "makeNew":"新しいやつ",
+    "blocks":"ブロック",
+    "mutes":"ミュート",
+    "block":"ブロック",
+    "mute":"ミュート",
+    "domainBlock":"ドメインブロック",
+    "editProf":"プロフィールいらう",
+    "change":"変更",
+    "followReq":"フォローリクエスト",
+    "likeHimOrHer":"似とうユーザー",
+    "frc":"あんたにおすすめ",
+    "more":"他無いんか？",
+    "endorse":"紹介したる",
+    "openinbrowser":"ブラウザで開く",
+    "mainacct":"メインアカウントに設定",
+    "revoverJP":"する",
+    "warnUseOtherAcct":"(解除はでけへん。)",
+    "revoverJPde":"で",
+    "or":"それか",
+    "openProf":"プロフィール出す",
+    "warnListRegist":"リストに入れたかったらまずフォローせなあかん。",
+    "blockDomain":"ブロックするドメイン",
+    "name":"名前",
+    "note":"自己紹介",
+    "editProfImg":"アバター変える",
+    "editHeader":"ヘッダー変える",
+    "blocked":"なんでか知らんけどブロックされとるわ",
+    "likeUserDes":"あんたと似とうユーザーを発掘すんで。",
+    "get":"取得",
+    "historyBack":"一つ前のユーザーデータ",
+    "empUser":"ユーザー強調",
+    "supportme":"支援してくれんか？",
+    "TheDeskDes":"TheDeskは営利目的ちゃうし、有料機能や広告は一切あらへん。<br>せやけど君らが支援してくれとうからTheDeskは続いてるんや。ほんまありがとうな。",
+    "PatreonSupport":"Patreonで支援",
+    "PixivSupport":"Pixiv FANBOXで支援",
+    "AWLSupport":"Amazonほしいものリスト",
+    "SendAmazonGift1":"",
+    "SendAmazonGift2":"にAmazonギフトカードを送る",
+    "monthly":"月額支援(大歓迎)",
+    "once":"一度限りの支援(めっちゃ歓迎)",
+    "local":"ローカル",
+    "localMedia":"ローカル(メディア)",
+    "home":"ホーム",
+    "fed":"連合",
+    "fedMedia":"連合(メディア)",
+    "dm":"ダイレクトメッセージ",
+    "integratedTLDes":"統合(ローカルとホーム)",
+    "localPlusDes":"統合(LTL+BT+返信)",
+    "notf":"通知",
+    "showThisTL":"表示するタイムライン",
+    "webviewWarn":"TweetDeckを出すで。TJDeckをカスタムしたものが読み込まれる(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>)。キーボードショートカットと干渉しはるから、文字入れる時はカラムの「WebView優先」にチェック入れてからしてな。",
+    "add":"追加",
+    "search":"検索",
+    "sortSet":"並べ替え設定",
+    "selectAcct":"選択(スクロールして全選択肢表示)",
+    "filterWord":"フィルターワード",
+    "listLocale":"一覧",
+    "degree":"適応範囲",
+    "conver":"会話",
+    "option":"オプション",
+    "matchWord":"単語マッチ",
+    "warnMatchWord":"非ラテン系の文字列では「単語マッチ」はせん方がええで。(これはフリかも知れん)",
+    "except":"除外",
+    "exceptWorn":"「除外」にしてもうたらマッチしたトゥートはフィルター解除しても二度と表示されへん。",
+    "avalableBefore":"有効期限(あと)",
+    "warnAvBefore":"未指定(または0分)で「無期限」や",
+    "warnAvBefore2":"この数字はそんなに正確ちゃうで",
+    "unlimited":"無期限",
+    "days":"日",
+    "hours":"時間",
+    "mins":"分",
+    "secs":"秒",
+    "warnOnIntegratedTL":"Integrated TL/Plus TLは、公開/ホームのフィルターワードをどっちも合わせて処理するで",
+    "helloTheDesk":"やってもうた…再読込して治らんかったら初期化(全データ削除)してな…(予め設定をエクスポートしとくんやで)",
+    "addColumn":"カラム追加",
+    "sortColumns":"カラム一覧/並べ替え",
+    "acctMan":"アカウントマネージャー",
+    "filter":"フィルター",
+    "setting":"設定",
+    "reverse":"トゥートボタンの左右入れ替え",
+    "f5":"TL再読込",
+    "nanoDes":"めっちゃ小さいマストドン。",
+    "verTips":"バージョン",
+    "clockTips":"時計",
+    "ramTips":"システムメモリ容量",
+    "changeTips":"Tips変更",
+    "helpAndLogs":"ヘルプとログ",
+    "help":"ヘルプ",
+    "contactwithlog":"なんか知らんけど動かんとかそういうのを開発者のお兄さんお姉さんに言うときは下のログのそこらへんの時間に起きたなぁってのを拾って連絡するとなんかの助けになるかも知れん。ついでやけどこのウィンドウ全体を横に引き伸ばしたらいい感じに見れるで",
+    "about":"このソフトについて",
+    "hereAddColumns":"←ここからTL追加",
+    "show": "表示",
+    "directory": "ディレクトリ",
+    "active": "最新活動順",
+    "newcomer": "新規順",
+    "local_only": "ローカルだけ",
+    "menu": "メニュー",
+    "demoBottomBtns": "チュートリアル",
+    "lookAtBottom": "画面下のアイコン群を見てみ。こんなんある思うけどとりあえずバァーっと説明してくで",
+    "acctManDesc": "アカウントに関することは全部ここ見てな。たくさんアカウント使うたりログアウトするときとか。各アカウントに好きな色設定して彩るんや",
+    "settingDesc": "設定はここや。数え切れんほどあるわ。(フィルターの管理などMastodon本体の設定はここちゃうで)",
+    "nanoDescPlus": "めっちゃ小さいMastodonクライアント。(試しに付けてみただけや)",
+    "menuDesc": "<u>カラム追加や並び変え</u>、<u>リストやフィルター</u>、<u>検索</u>などはここや。とりあえずここ見たらだいたいできる。"
+}
--- a/app/view/make/language/ja-KS/main.json
+++ b/app/view/make/language/ja-KS/main.json
@@ -0,0 +1,259 @@
+{
+    "language": "ja",
+    "lang_toot": "トゥート",
+    "lang_there": "あり",
+    "lang_nothing": "なし",
+    "lang_yesno": "はい",
+    "lang_no": "いいえ",
+    "lang_progress": "処理中",
+    "lang_edit": "編集",
+    "lang_del": "削除",
+    "lang_add": "追加",
+    "lang_fatalerroroccured": "あ、やってもうた。これヤバいやつや",
+    "lang_speech": "Google 日本語",
+    "lang_lang": "言語",
+    "lang_langlocale": "日本語(関西)",
+    "lang_back": "戻る",
+    "lang_set": "設定",
+    "lang_langadd": "<a href=\"https://github.com/cutls/TheDesk\" target=\"_blank\">GitHub</a>から翻訳してな。日本の方言はあらへんけど。",
+    "lang_time_prefixAgo": null,
+    "lang_time_prefixFromNow": "今から",
+    "lang_time_suffixAgo": "",
+    "lang_time_suffixFromNow": "",
+    "lang_time_inPast": "",
+    "lang_time_seconds": "%d秒前",
+    "lang_time_minute": "1分前",
+    "lang_time_minutes": "%d分前",
+    "lang_time_hour": "1時間前",
+    "lang_time_hours": "%d時間前",
+    "lang_time_day": "昨日",
+    "lang_time_days": "%d日前",
+    "lang_time_month": "昨月",
+    "lang_time_months": "%dヶ月前",
+    "lang_time_year": "去年",
+    "lang_time_years": "%d年前",
+    "lang_version_usever": "心配せんでええ。{{ver}}は最新や。",
+    "lang_version_skipver": "アップデートをスキップしてもうた。",
+    "lang_version_platform": "このソフトウェアMicrosoft Storeからダウンロードしたんか？普通はホームページからインストールするし「いいえ」でええんやけど。「はい」にしたらMicrosoft StoreはんがアップデートするからTheDeskはアップデートせえへん？とか言わへんようになる。",
+    "lang_version_platform_linux": "このソフトウェアSnapcraftからダウンロードしたんか？普通はホームページからインストールするし「いいえ」でええんやけど。「はい」にしたらSnapcraftはんがアップデートするからTheDeskはアップデートせえへん？とか言わへんようになる。",
+    "lang_version_platform_mac": "このソフトウェアHomebrew caskからダウンロードしたんか？普通はホームページからインストールするし「いいえ」でええんやけど。「はい」にしたらHomebrew caskはんがアップデートするからTheDeskはアップデートせえへん？とか言わへんようになる。",
+    "lang_login_noauth": "認証せんと見る",
+    "lang_manager_info": "インスタンス情報",
+    "lang_manager_refresh": "情報更新",
+    "lang_manager_delete": "削除",
+    "lang_manager_color": "アカウントカラー選ぶ",
+    "lang_manager_confirm": "を消すで。",
+    "lang_manager_mainAcct": "メインアカウント設定したで。",
+    "lang_manager_def": "既定",
+    "lang_manager_none": "なし",
+    "lang_manager_godev": "",
+    "lang_manager_logout": "ログアウト",
+    "lang_bbmd_misskey": "TheDeskのMisskeyは、@を返信として扱うけんど、全ての@はなおされて別パラメータになってまう。ついでに、「未収載」は「ホーム」扱いや。",
+    "lang_emoji_get": "絵文字リスト引っ張ってくる",
+    "lang_emoji_custom": "カスタム絵文字",
+    "lang_defaultemojis_text": "{{cat}}の絵文字",
+    "lang_emoji_uncat": "未分類",
+    "lang_postimg_previewdis": "プレビューできへん。",
+    "lang_postimg_aftupload": "アップロードしたらアカウントは切り替えられへん。",
+    "lang_postimg_failupload": "アップロードできんかったわ。",
+    "lang_postimg_delete": "クリック: 画像に説明付ける/右クリック: 削除",
+    "lang_postimg_desc": "説明",
+    "lang_postimg_leadContext": "画像を削除するんやったら右クリック",
+    "lang_post_tagTL": "デフォルトタグ無いしこのまま投稿するとローカルには表示されへんで。",
+    "lang_post_tagVis": "公開範囲が「公開」以外やったら、タグTLには出えへんで。(一部インスタンスを除く)",
+    "lang_post_cwtitle": "長文投稿の警告",
+    "lang_post_cwtxt": "指定文字数、行数を超えるトゥートをしようとしてんねんけどどうする？CW付ける？\n自動CWのタイトル:",
+    "lang_post_btn1": "キャンセル(投稿せえへん)",
+    "lang_post_btn2": "CW付けてこのまま投稿",
+    "lang_post_btn3": "これはええねん(そのまま投稿)",
+    "lang_status_favWarn": "お気に入り登録したんやけどインスタンスがちゃうときは時間がかかるで、知らんけど。",
+    "lang_status_btWarn": "ブーストしたんやけどインスタンスがちゃうときは時間がかかるで、知らんけど。",
+    "lang_status_follow": "フォロー",
+    "lang_status_unfollow": "フォロー解除",
+    "lang_status_block": "ブロック",
+    "lang_status_unblock": "ブロック解除",
+    "lang_status_mute": "ミュート",
+    "lang_status_unmute": "ミュート解除",
+    "lang_status_redraftTitle": "いっぺん消してもっぺん編集",
+    "lang_status_redraft": "いっぺん消してもっぺん編集する？そのトゥートの全てのデータが無くなってまうけど。この機能はベータ版やで。画像はv2.4.1以上やないと無理やで。",
+    "lang_status_emphas": "を強調したで。リロードしてな。",
+    "lang_status_unemphas": "を強調解除したで。リロードしてな。",
+    "lang_status_unendorse": "紹介解除",
+    "lang_status_endorse": "プロフで紹介する",
+    "lang_status_followers": "フォロワー",
+    "lang_status_active": "最新トゥート",
+    "lang_suggest_nodata": "サジェストしたいんやけど、絵文字リストを取得してくれへん？",
+    "lang_usetxtbox_reply": "返信モードや。やめるときはCtrl+Shift+Cな。",
+    "lang_cards_check": "チェック",
+    "lang_cards_pip": "ながら観モード",
+    "lang_cards_transted": "TheDeskがええで言うた埋め込みHTMLです(Twitter, nicovideo, YouTube, Spotify, twitcasting)",
+    "lang_cards_untransted": "TheDeskはこの埋め込みURLほんまに大丈夫か自信ないけど",
+    "lang_details_nodata": "データなし",
+    "lang_details_filtered": "フィルターされたで。",
+    "lang_details_embed": "埋め込みHTMLがコピーされたで。",
+    "lang_details_url": "トゥートURLがコピーされたで。",
+    "lang_details_txt": "トゥート本文がコピーされたで。",
+    "lang_filter_nodata": "フィルターは無いで",
+    "lang_filter_errordegree": "適応範囲は一つ以上チェックせなあかんで。",
+    "lang_list_nodata": "リストは無いで",
+    "lang_list_show": "表示",
+    "lang_list_users": "ユーザー一覧",
+    "lang_list_nouser": "ユーザーはおらんで",
+    "lang_list_add": "リストに追加",
+    "lang_list_add_misskey": "(重複追加になってるかもしれん)",
+    "lang_list_remove": "リストから消す",
+    "lang_notf_new": "件の新しい通知",
+    "lang_speech_refresh": "音声読み上げ設定を更新したで。",
+    "lang_src_ts": "時系列",
+    "lang_src_people": "人がトゥート",
+    "lang_tags_always": "常に",
+    "lang_tags_realtime": "実況",
+    "lang_tags_tagunpin": "{{tag}}をよく使うタグから消す",
+    "lang_tags_unrealtime": "実況解除",
+    "lang_tags_tagwarn": "{{tag}}がないときは自動でタグ付けるで。",
+    "lang_tl_media": "メディア",
+    "lang_tl_reconnect": "Streamingに再接続や",
+    "lang_tl_postmarkers_title": "処理中",
+    "lang_tl_postmarkers": "未読マーカー送信してるしちょっと待ってな…",
+    "lang_img_DLDone": "ダウンロード先:",
+    "lang_img_copyDone": "画像のURLをコピーしたで",
+    "lang_layout_gotop": "一番上へ。アイコンが赤のときはストリーミングに接続できてへんしF5で再読込やってみて。",
+    "lang_layout_thisacct": "このアカウントの{{notf}}",
+    "lang_layout_delthis": "このカラムを削除",
+    "lang_layout_setthis": "このカラムの設定",
+    "lang_layout_mediafil": "メディアフィルター",
+    "lang_layout_linkana": "リンク解析",
+    "lang_layout_linkanades": "リンクの解析を切り替え",
+    "lang_layout_tts": "読み上げ",
+    "lang_layout_reconnect": "カラム再読込",
+    "lang_layout_headercolor": "TLヘッダーカラー",
+    "lang_layout_nodata": "[トゥートあらへん]<br>F5/⌘+Rで再読込してみて。",
+    "lang_layout_dm": "ダイレクトメッセージ",
+    "lang_layout_webviewmode": "WebView優先",
+    "lang_excluded": "見せへん通知",
+    "lang_layout_excludingbt": "BT表示(OFF/BT除外/BTだけ)",
+    "lang_layout_leftFold": "左へ重ねる",
+    "lang_layout_leftUnfold": "右へ出す",
+    "lang_layout_deleteColumn": "カラム削除",
+    "lang_layout_deleteColumnDesc": "カラムを削除してええ？",
+    "lang_layout_unread": "未読",
+    "lang_sort_gothis": "このカラムへ",
+    "lang_sort_remthis": "このカラムを消す",
+    "lang_spotify_img": "アルバムアートワークを付けるで。",
+    "lang_spotify_imgno": "アルバムアートワークを付けへんで。",
+    "lang_spotify_acct": "まずアカウント連携をしてな",
+    "lang_spotify_np": "NowPlayingするときのやつを変えたで",
+    "lang_setting_npprovide": "NowPlayingのソースを{{set}}にしたで",
+    "lang_hisdata_frcreq": "Mastodon 2.4.3~だけやで",
+    "lang_hisdata_frcwarn": "非フォローやけど絡みある人らや。",
+    "lang_hisdata_taketime": "30秒から数分かかることがあるで",
+    "lang_hisdata_notonmisskey": "このシステムはMisskeyにはあらへん。",
+    "lang_hisdata_key": "こいつは{{set}}が信じれるって言うてるし信じたってな",
+    "lang_showontl_movetxt": "このアカウントはお引っ越ししたで",
+    "lang_showontl_movebtn": "移行先を見る",
+    "lang_showontl_botacct": "botアカウント",
+    "lang_showontl_followed": "フォローしてもろてる",
+    "lang_showontl_notf": "通知",
+    "lang_showontl_domain": "ドメイン",
+    "lang_showontl_listwarn": "リストに追加すんにはまずフォローしてな。",
+    "lang_showontl_verified": "このサイトはこの人のやつやってわかってる。",
+    "lang_parse_mentioned": "が返信したで",
+    "lang_parse_faved": "がお気に入り登録したで",
+    "lang_parse_bted": "がブーストしたで",
+    "lang_parse_btedsimple": "がブースト",
+    "lang_parse_polled": "のアンケート",
+    "lang_parse_notftime": "通知された時間",
+    "lang_parse_cwshow": "見る",
+    "lang_parse_fulltext": "以下全文",
+    "lang_parse_autofold": "自動折り畳み",
+    "lang_parse_more": "もっと見せてや",
+    "lang_parse_url": "URL解析",
+    "lang_parse_tagTL": "{{tag}}のタイムライン",
+    "lang_parse_tagtoot": "{{tag}}でトゥート",
+    "lang_parse_tagpin": "{{tag}}をよく使うタグへ",
+    "lang_parse_public": "公開",
+    "lang_parse_unlisted": "未収載",
+    "lang_parse_private": "非公開",
+    "lang_parse_direct": "ダイレクト",
+    "lang_parse_clickcopy": "クリックして本文をコピー",
+    "lang_parse_clickcopyurl": "クリックしてトゥートURLをコピー",
+    "lang_parse_trans": "このトゥートを標準語に翻訳",
+    "lang_parse_replyto": "このトゥートに返信",
+    "lang_parse_bt": "このトゥートをブースト",
+    "lang_parse_fav": "このトゥートをお気に入り登録",
+    "lang_parse_quote": "このトゥートを引用",
+    "lang_parse_del": "このトゥートを削除",
+    "lang_parse_pin": "このトゥートをピン留め",
+    "lang_parse_det": "詳細(メインアカウント経由)",
+    "lang_parse_redraft": "このトゥートを削除して再編集",
+    "lang_parse_followed": "フォローしてもろた。",
+    "lang_parse_clientop": "クライアント操作",
+    "lang_parse_clienttxt": " どうする？",
+    "lang_parse_clientno": "何もせえへん",
+    "lang_parse_clientemp": "強調表示/解除",
+    "lang_parse_clientmute": "ミュート",
+    "lang_parse_mute": "ミュートするけど設定から解除できんで。",
+    "lang_parse_voted": "投票済みや",
+    "lang_parse_vote": "投票",
+    "lang_parse_unvoted": "結果だけチラ見や",
+    "lang_parse_endedvote": "終了済み",
+    "lang_parse_thread": "会話を表示",
+    "lang_parse_unknown": "添付ファイル",
+    "lang_parse_nsfw": "閲覧注意",
+    "lang_parse_html": "埋め込みを表示",
+    "lang_parse_notffilter": "このユーザーの通知だけ見る",
+    "lang_misskeyparse_renote": "再投稿",
+    "lang_misskeyparse_renoteqt": "引用",
+    "lang_misskeyparse_reaction": "リアクション",
+    "lang_misskeyparse_tagnostr": "タグTLはストリーミング無いで。",
+    "lang_misskeyparse_listnostr": "リストTLはストリーミング無いで。",
+    "lang_misskeyparse_home": "ホーム",
+    "lang_misskeyparse_followers": "フォロワー",
+    "lang_misskeyparse_specified": "ユーザー指定",
+    "lang_misskeyparse_qt": "MisskeyのRenote(引用モード)中:Ctrl+Shift+Cでクリア",
+    "lang_misskeyparse_renoted": "がRepost",
+    "lang_misskeyparse_quoted": "が引用",
+    "lang_misskeyparse_reacted": "がリアクション",
+    "lang_setting_time": "時間設定を{{set}}に設定したで。",
+    "lang_setting_theme": "テーマ設定を{{set}}に設定したで。",
+    "lang_setting_nsfw": "画像表示設定を{{set}}に設定したで。",
+    "lang_setting_cw": "テキスト表示設定を{{set}}に設定したで。",
+    "lang_setting_cwtext": "デフォルトの警告文を「{{set}}に設定したで。",
+    "lang_setting_cws": "標準でCW:{{set}}",
+    "lang_setting_rp": "リプライ数表示:{{set}}",
+    "lang_setting_vis": "デフォルトの公開設定を{{set}}に設定したで。",
+    "lang_setting_popup": "ポップアップお知らせを{{set}}に設定したで。",
+    "lang_setting_off": "オフ",
+    "lang_setting_s": "秒",
+    "lang_setting_box": "デフォルトでのボックスの挙動を{{set}}に設定したで。",
+    "lang_setting_gif": "アイコンアニメーション再生を{{set}}に設定したで。",
+    "lang_setting_selt": "{{set1}}行以上または{{set2}}文字以上でテキストを隠すで。",
+    "lang_setting_autocw": "{{set1}}行以上または{{set2}}文字以上で警告を表示すんで。",
+    "lang_setting_width": "横幅最低を{{set}}pxに設定したで。",
+    "lang_setting_fixwidth": "TweetDeckの横幅を{{set}}pxに設定したで。",
+    "lang_setting_img": "画像投稿後の設定を「{{set}}に設定したで。",
+    "lang_setting_font": "フォントを{{set}}に設定したで。",
+    "lang_setting_default": "デフォルト",
+    "lang_setting_size": "フォントサイズを{{set}}pxに設定したで。",
+    "lang_setting_imgheight": "画像高さを{{set}}pxに設定したで。",
+    "lang_setting_ticker": "#InstanceTicker使用を{{set}}に設定したで。",
+    "lang_setting_animation": "アニメーションを{{set}}に設定したで。",
+    "lang_setting_tag": "タグの取得範囲を「{{set}}に設定したで。",
+    "lang_setting_boxConfirm": "投稿ボックスを{{set}}",
+    "lang_setting_ul": "独自ロケール設定を{{set}}に設定したで。",
+    "lang_setting_notf": "ネイティブ通知を{{set}}に設定したで。",
+    "lang_setting_quote": "引用形式を{{set}}に設定したで。",
+    "lang_setting_via": "via表示を{{set}}に設定したで。",
+    "lang_setting_mov": "アクションボタン非表示を{{set}}に設定したで。",
+    "lang_setting_setasread": "通知カラム存在時新着非表示を{{set}}に設定したで。",
+    "lang_setting_main": "起動時・投稿時のアカウントを{{set}}に設定したで。",
+    "lang_setting_sec": "セカンダリートゥートボタン:{{set}}",
+    "lang_setting_ksref": "キーボードショートカットを設定したで。",
+    "lang_setting_nomuting": "ミュートしているクライアントは無いで。",
+    "lang_setting_notftest": "通知テスト",
+    "lang_setting_notftestprof": "アイコンはあんたのアカウントのやつや。",
+    "lang_setting_exportwarn": "重要なデータだけエクスポートすんで。エクスポートされたデータは他の人に見せたらあかんで(これはフリちゃうで)。全ての認証データが入ってるからな、ほんまやで。",
+    "lang_setting_importwarn": "全てのデータが無くなってまうで。",
+    "lang_setting_noupd": "あんたのTheDeskは最新や！",
+    "lang_setting_thisisbeta": "あんたのTheDeskはベータ版やし、アップデートは手動でせなあかん。"
+}
--- a/app/view/make/language/ja-KS/setting.json
+++ b/app/view/make/language/ja-KS/setting.json
@@ -0,0 +1,207 @@
+{
+  "setting": "設定",
+  "set": "設定",
+  "yes": "はい",
+  "no": "いいえ",
+  "none": "なし",
+  "default": "既定",
+  "change": "変更",
+  "select": "選択",
+  "env": "環境設定",
+  "setlang": "言語",
+  "backup": "設定のインポートとエクスポート",
+  "import": "インポート",
+  "export": "エクスポート",
+  "hardwareAcceleration": "ハードウェアアクセラレーションの無効化",
+  "hardwareAccelerationWarn": "表示(特に設定画面)があかんときは「はい」を選んでな。再起動入るで。",
+  "theme": "テーマの設定",
+  "popup": "新規通知のポップアップお知らせの表示秒数",
+  "popupwarn": "0にしたら出さへん",
+  "s": "秒",
+  "nativenotf": "ネイティブ通知設定",
+  "nnwarn": "Portableバージョンでは表示できんかも知れん。",
+  "nntest": "通知テスト",
+  "minwidth": "マルチカラムの最低横幅",
+  "minwidthwarn": "画面全体の横幅÷コラム数で計算してそれ超してもうたら横スクロール入るで。",
+  "fixwidth": "TweetDeckの限定の最低横幅",
+  "fixwidthwarn": "",
+  "above": "以上",
+  "font": "フォント",
+  "fontwarn": "「選択」を押してフォントを選んでな。(Linuxでは動かんかもしれん。)",
+  "fontsize": "フォントサイズ",
+  "savefolder": "デフォルトの保存先",
+  "savefolderwarn": "画像ダウンロードやスクリーンショットはここに保存や。",
+  "useragent":"ユーザーエージェント",
+  "useragentWarn":"再起動すんで。",
+  "absolute": "絶対指定",
+  "themeSel": "テーマの選択",
+  "customtheme": "カスタムテーマの作成・編集",
+  "customthemeDirection": "色の系統",
+  "advanced":"拡張項目(6つ)を開く",
+  "advancedWarn":"拡張項目は設定せんと「指定なし」に、基本3項目は白(fff)になるで。拡張項目を閉じた状態で「変更」すると拡張項目は消してまうで。",
+  "primary": "全体の背景色など",
+  "secondarycolor": "補助要素に使われる背景色",
+  "text": "テキストの色",
+  "accent": "ブーストの背景色など",
+  "active": "CWボタンやメニュー選択時の背景色",
+  "modal": "モーダルウィンドウの背景色",
+  "bottom":"下のメニューバーの背景色",
+  "postbox":"投稿ボックスやメニューの色",
+  "subcolor":"背景に準ずる色",
+  "add_new": "新規作成",
+  "name": "名前",
+  "desc": "説明",
+  "customShare": "このコードは他のTheDeskなどとシェアできるけこのコードをMiASに貼るのはあかん。詳細:<a href=\"https://thedesk.top/mias.html\" target=\"_blank\">テーマ互換性</a>",
+  "customImport": "カスタムテーマのインポート",
+  "delete": "削除",
+  "cImpWarn": "<a href=\"https://assets.msky.cafe/\" target=\"_blank\">MiAS</a>上の80を超えるテーマを張っ付けることもできる。",
+  "timeline": "タイムラインの設定",
+  "timemode": "時間表記設定",
+  "relativetime": "相対時間の例:\"1分前\",\"3日前\"",
+  "absolutetime": "絶対時間の例\"23:25:21\",\"2017年12月30日 23:59:00\"",
+  "mixtime": "混合表示は、当日のトゥートのみ相対、それ以外は絶対で表示 ",
+  "relativesel": "相対時間",
+  "absolutesel": "絶対時間",
+  "doublesel": "両方表示",
+  "mixsel": "混合表示",
+  "locale": "独自ロケールを使用",
+  "localewarn": "対応サーバーではそのサーバーにあわせた言語表示ができるで。",
+  "nswf": "見たあかん言われてる画像は隠す",
+  "nsfwwarn": "結構強いぼかしがかかるで。",
+  "cw": "見る前に警告出すように言われてるやつ(CW)を隠す",
+  "replyct": "リプライ数表示",
+  "replyct_hidden": "2以上のとき1+と表示",
+  "replyct_full": "完全に表示",
+  "gif": "アイコンのアニメーションを再生する",
+  "box": "投稿ボックスの挙動",
+  "boxyes": "たたむ",
+  "boxabs": "枠外クリックしても消えへん(起動時に展開)",
+  "boxno": "投稿後も隠れへん",
+  "tag": "タグタイムラインの表示範囲",
+  "tagfed": "接続しているサーバー",
+  "taglocal": "検索対象のサーバーのみ",
+  "via": "viaを表示する",
+  "mouseover": "アクションメニューを非表示",
+  "mouseoverwarn": "「マウスオーバー」はちょっとあかんやつかもしれん。",
+  "mv": "マウスオーバーで表示",
+  "mvclick": "クリックで表示",
+  "notfmarker": "通知を開いとったら、通知新着お知らせを出す",
+  "autofold": "指定行数以上を折りたたむ",
+  "autofoldwarn": "5文字以下のトゥートはどちらにしろ折りたたまんし、折りたたみ時は改行は描画されん。改行だけ行数とカウントするで。",
+  "lines": "行",
+  "letters": "文字",
+  "or": "または",
+  "imgheight": "画像の高さ",
+  "imgheightwarn": "オプション:「full」と指定すると全ての画像をクロップせず全部出すで。",
+  "ticker": "#InstanceTickerを使う",
+  "tickerwarn": "トゥートした人の所属サーバーをわかりやすく彩ります(自サーバー以外のトゥート向け)。<a href=\"https://https://wee.jp/\">#InstanceTickerについて</a> Copyright 2018 weepjp, kyori19.",
+  "animation": "タイムラインのアニメーション",
+  "markers": "ホームと通知の未読管理",
+  "markerswarn": "Mastodon 3.0相当以上。WebUIと対応クライアントで共有するやつや。",
+  "remote_img": "画像をリモートから取得",
+  "remote_imgWarn": "プレビューはログインサーバーのキャッシュからどちらにしろ取得する。ビューワーのみに適用されるで。",
+  "replySound": "リプライの通知音",
+  "favSound": "お気に入り登録の通知音",
+  "btSound": "ブーストの通知音",
+  "followSound": "フォローの通知音",
+  "customSound": "カスタム通知音",
+  "post": "投稿設定",
+  "autocw": "長文投稿時に警告",
+  "autocwwarn": "下で指定した以上のトゥートを投稿しよ思ったらCWするかのダイアログが出るで。",
+  "defaultcw": "デフォルトの警告文",
+  "cws": "標準でCWを設定",
+  "defaultvis": "デフォルトの公開設定",
+  "public": "公開(Public)",
+  "unlisted": "未収載(Unlisted)",
+  "private": "非公開(Private)",
+  "direct": "ダイレクト(Direct)",
+  "memory": "前回の投稿設定を記憶する(サーバーごとに覚えとくで)",
+  "useapi": "マストドンアカウント設定の既定値",
+  "postimg": "画像投稿設定",
+  "showurl": "画像を投稿し、画像のURLを最後に表示",
+  "nourl": "画像を投稿するがURLは出さへん",
+  "disabled": "あかん",
+  "quote": "引用形式",
+  "simple": "URLのみ",
+  "mention": "URLとアカウント名(相手に通知)",
+  "full": "本文・URL・アカウント名",
+  "notqt": "使わない(TL上にボタンも出さん)",
+  "apiQuote": "パラメーター(対応インスタンス)",
+  "main": "投稿後や起動時のアカウント",
+  "mainwarn": "メインアカウントはアカウント設定で選んどいてな。投稿以外のアカウント選択もこれ使うで。",
+  "lastacct": "最後に使用したアカウント",
+  "usemainacct": "メインアカウント",
+  "secondary": "も一個トゥートボタン",
+  "secwarn": "公開範囲の変更とトゥートを一発でできるやつ。セカンダリートゥートボタン。",
+  "nothing": "表示しない",
+  "localonly": "ローカル限定",
+  "zeroWidthEmoji": "絵文字にゼロ幅スペースを使う",
+  "keysc": "キーボードショートカットの設定",
+  "iks": "簡単文字入力",
+  "okswarn": "絵文字やタグ、&gt;BTなどを登録しておくとすぐに使えてええ感じや。",
+  "muteemp": "ミュート・強調の設定",
+  "climute": "クライアントミュート",
+  "cliemp": "クライアント強調",
+  "cliwarn": "各トゥートのクライアントをクリックすると設定できるで。",
+  "enter": "Enterで確定",
+  "wordmute": "ワードミュート",
+  "wordemp": "ワード強調",
+  "useremp": "ユーザー強調",
+  "useerempwarn": "各ユーザーのデータ表示画面で設定できるで。",
+  "empcolorwarn": "強調色(テーマによって全然ちゃうで。)",
+  "spotify": "SpotifyとNowPlayingの設定",
+  "spotifynote1": "",
+  "spotifynote2": "ボタンから簡単にNowPlayingができんで。",
+  "link": "アカウントの連携",
+  "linkwarn": "APIの性質上，thedesk.topへもアクセスするけどしゃーない。",
+  "connect": "接続",
+  "disconnect": "切断",
+  "templateedit": "テンプレートの編集",
+  "templateeditwarn": "以下を編集してテンプレートを変更できんで。",
+  "template1": "Spotify:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/{url}:各曲のSpotifyのURL",
+  "template2": "macOS:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/作曲家{composer}/サンプルレート{hz}/ビットレート{bitRate}/ジャンル{genre}",
+  "template3": "",
+  "postartwork": "アルバムアートワークを付ける(Spotify)",
+  "tts": "読み上げの設定",
+  "bouyomi": "棒読みちゃん連携",
+  "bouyomiWarn": "「棒読みちゃん用のWebSocket受付プラグイン」が要るで。",
+  "speed": "速さ",
+  "speedwarn": "1-100まで、デフォルトは10。",
+  "pitch": "高さ",
+  "pitchwarn": "0-100まで、デフォルトは50。(大きくなるほど高い)",
+  "vol": "音量",
+  "volwarn": "0-100まで、デフォルトは100。",
+  "volwarn80": "0-100まで、デフォルトは80。",
+  "test": "テスト",
+  "sample": "これはテスト音声やけど、やっぱりTheDeskはええクライアントや思わへんか？思わん？ならええわ。",
+  "playstop": "再生/停止",
+  "back": "戻る",
+  "keyscs": "キーボードショートカット一覧",
+  "keyscr": "1番目～9番目のTLにスクロール",
+  "keynew": "投稿パネルを開く",
+  "keytoggle": "投稿パネルを開閉",
+  "keypost": "投稿",
+  "keysecpost": "投稿(セカンダリートゥート)",
+  "keyunread": "全ての通知を既読にする",
+  "keyesc": "投稿パネルを消す",
+  "keyf5": "スーパーリロード",
+  "keyclear": "入力内容を消す",
+  "keyacctman": "アカウントマネージャ",
+  "keyshowprof": "現在選択中のプロフィール",
+  "keyrow": "イメージビューワー起動時に画像切り替え",
+  "keyzoom": "マウスホイール:イメージビューワー時に拡大縮小",
+  "whenSelected": "選択時",
+  "fav": "お気に入り登録",
+  "bt": "ブースト",
+  "reply": "返信",
+  "keyselecttop":"一番上の一番左のトゥートを選択",
+  "reset": "初期化",
+  "resetconfirm": "全てのデータを消してまうで。この操作は取り消せへんで。",
+  "about": "このソフトについて",
+  "hp": "公式HP",
+  "support": "支援",
+  "help": "ヘルプ",
+  "sushi": "寿司を投げる",
+  "checkup": "アップデートを確認",
+  "ossJP": "(オープンソースライセンス)"
+}
--- a/app/view/make/language/ja-KS/update.json
+++ b/app/view/make/language/ja-KS/update.json
@@ -0,0 +1,19 @@
+{
+    "updatehere":"アップデートあんで",
+    "download":"開始",
+    "portable":"ポータブル版",
+    "installer":"インストーラー版(推奨)",
+    "linux":"zip版",
+    "linuxdeb":"deb版(対応の場合推奨)",
+    "linuxsnap":"snap版",
+    "snap":"snap版はSnapcraft等よりDLしてな。",
+    "sureupd":"アップデートは必ずしてな",
+    "skipupd":"アップデートをスキップする",
+    "nexttl":"次回TL表示時までスキップ",
+    "nextver":"次のバージョンが出るまでスキップ",
+    "problem1":"あかんか？",
+    "problem2":"<a href='https://thedesk.top'>公式HP</a>からやってみてな。",
+    "continue":"アップデートを続行",
+    "dlnow":"ダウンロード中",
+    "checkWhatIsNew": "アップデート内容"
+}
--- a/app/view/make/language/ja/index.json
+++ b/app/view/make/language/ja/index.json
@@ -125,6 +125,7 @@
    "integratedTLDes":"統合(ローカルとホーム)",
    "localPlusDes":"統合(LTL+BT+返信)",
    "notf":"通知",
+    "bookmark": "ブックマーク",
    "showThisTL":"表示するタイムライン",
    "webviewWarn":"TweetDeckを表示します。TJDeckをカスタムしたものが読み込まれます(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>)。キーボードショートカットが邪魔をするので、文字入力時はカラムの「WebView優先」にチェックを入れてください。",
    "add":"追加",
--- a/app/view/make/language/ja/main.json
+++ b/app/view/make/language/ja/main.json
@@ -86,6 +86,8 @@
    "lang_usetxtbox_reply": "返信モードです。クリアするときはCtrl+Shift+Cを押してください。",
    "lang_cards_check": "チェック",
    "lang_cards_pip": "ながら観モード",
+    "lang_cards_transted": "TheDeskが認証した埋め込みHTMLです(Twitter, nicovideo, YouTube, Spotify, twitcasting)",
+    "lang_cards_untransted": "TheDeskはこの埋め込みURLの安全性を確認していません",
    "lang_details_nodata": "データなし",
    "lang_details_filtered": "フィルターされました。",
    "lang_details_embed": "埋め込みHTMLがコピーされました。",
@@ -179,11 +181,16 @@
    "lang_parse_replyto": "このトゥートに返信",
    "lang_parse_bt": "このトゥートをブースト",
    "lang_parse_fav": "このトゥートをお気に入り登録",
+    "lang_parse_bookmark": "ブックマークに追加",
+    "lang_parse_unbookmark": "ブックマークから削除",
    "lang_parse_quote": "このトゥートを引用",
-    "lang_parse_del": "このトゥートを削除",
-    "lang_parse_pin": "このトゥートをピン留め",
+    "lang_parse_del": "削除",
+    "lang_parse_pin": "ピン留めする",
+    "lang_parse_unpin": "ピン留めを解除する",
+    "lang_parse_link": "ブラウザで開く",
+    "lang_parse_detail": "詳細",
    "lang_parse_det": "詳細(メインアカウント経由)",
-    "lang_parse_redraft": "このトゥートを削除して再編集",
+    "lang_parse_redraft": "削除して再編集",
    "lang_parse_followed": "フォローされました。",
    "lang_parse_clientop": "クライアント操作",
    "lang_parse_clienttxt": " に対する処理を選択してください。",
@@ -198,6 +205,7 @@
    "lang_parse_thread": "会話を表示",
    "lang_parse_unknown": "添付ファイル",
    "lang_parse_nsfw": "閲覧注意",
+    "lang_parse_html": "埋め込みを表示",
    "lang_parse_notffilter": "このユーザーの通知のみを表示",
    "lang_misskeyparse_renote": "再投稿",
    "lang_misskeyparse_renoteqt": "引用",
--- a/app/view/make/language/ja/setting.json
+++ b/app/view/make/language/ja/setting.json
@@ -127,6 +127,7 @@
  "full": "本文・URL・アカウント名",
  "notqt": "使わない(TL上にボタンも表示されません)",
  "apiQuote": "パラメーター(対応インスタンス)",
+  "showBookmarkAction": "アクションボタンとしてブックマークを表示する",
  "main": "投稿後や起動時のアカウント",
  "mainwarn": "メインアカウントはアカウント設定で指定できます。投稿以外のアカウント選択にも影響します。",
  "lastacct": "最後に使用したアカウント",
--- a/app/view/make/language/nl-NL/index.json
+++ b/app/view/make/language/nl-NL/index.json
@@ -68,7 +68,7 @@
    "favRegist": "Favourite",
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
-    "copyURL": "Copy URL of this toot",
+    "copyURL": "Copy the URL",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
--- a/app/view/make/language/no-NO/index.json
+++ b/app/view/make/language/no-NO/index.json
@@ -68,7 +68,7 @@
    "favRegist": "Favourite",
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
-    "copyURL": "Copy URL of this toot",
+    "copyURL": "Copy the URL",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
--- a/app/view/make/language/pl-PL/index.json
+++ b/app/view/make/language/pl-PL/index.json
@@ -68,7 +68,7 @@
    "favRegist": "Favourite",
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
-    "copyURL": "Copy URL of this toot",
+    "copyURL": "Copy the URL",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
--- a/app/view/make/language/pt-BR/index.json
+++ b/app/view/make/language/pt-BR/index.json
@@ -68,7 +68,7 @@
    "favRegist": "Favourite",
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
-    "copyURL": "Copy URL of this toot",
+    "copyURL": "Copy the URL",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
--- a/app/view/make/language/pt-PT/index.json
+++ b/app/view/make/language/pt-PT/index.json
@@ -68,7 +68,7 @@
    "favRegist": "Favourite",
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
-    "copyURL": "Copy URL of this toot",
+    "copyURL": "Copy the URL",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
--- a/app/view/make/language/ro-RO/index.json
+++ b/app/view/make/language/ro-RO/index.json
@@ -68,7 +68,7 @@
    "favRegist": "Favourite",
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
-    "copyURL": "Copy URL of this toot",
+    "copyURL": "Copy the URL",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
--- a/app/view/make/language/ru-RU/index.json
+++ b/app/view/make/language/ru-RU/index.json
@@ -68,7 +68,7 @@
    "favRegist": "Favourite",
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
-    "copyURL": "Copy URL of this toot",
+    "copyURL": "Copy the URL",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
--- a/app/view/make/language/sr-SP/index.json
+++ b/app/view/make/language/sr-SP/index.json
@@ -68,7 +68,7 @@
    "favRegist": "Favourite",
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
-    "copyURL": "Copy URL of this toot",
+    "copyURL": "Copy the URL",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
--- a/app/view/make/language/sv-SE/index.json
+++ b/app/view/make/language/sv-SE/index.json
@@ -68,7 +68,7 @@
    "favRegist": "Favourite",
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
-    "copyURL": "Copy URL of this toot",
+    "copyURL": "Copy the URL",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
--- a/app/view/make/language/tr-TR/index.json
+++ b/app/view/make/language/tr-TR/index.json
@@ -68,7 +68,7 @@
    "favRegist": "Favourite",
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
-    "copyURL": "Copy URL of this toot",
+    "copyURL": "Copy the URL",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
--- a/app/view/make/language/uk-UA/index.json
+++ b/app/view/make/language/uk-UA/index.json
@@ -68,7 +68,7 @@
    "favRegist": "Favourite",
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
-    "copyURL": "Copy URL of this toot",
+    "copyURL": "Copy the URL",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
--- a/app/view/make/language/vi-VN/index.json
+++ b/app/view/make/language/vi-VN/index.json
@@ -68,7 +68,7 @@
    "favRegist": "Favourite",
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
-    "copyURL": "Copy URL of this toot",
+    "copyURL": "Copy the URL",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
--- a/app/view/make/language/zh-TW/index.json
+++ b/app/view/make/language/zh-TW/index.json
@@ -68,7 +68,7 @@
    "favRegist": "Favourite",
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
-    "copyURL": "Copy URL of this toot",
+    "copyURL": "Copy the URL",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
--- a/app/view/make/make.js
+++ b/app/view/make/make.js
@@ -1,115 +1,164 @@
-let ver = "20.0.1 (Kawaii)";
-if (process.argv.indexOf("--automatic") === -1) {
-    let input = require("readline-sync").question("version string [empty: " + ver + " (default)]? ");
-    if (input) {
-        ver = input;
-    }
-    //var basefile="../../"
+let ver = '20.0.3 (Kawaii)'
+if (process.argv.indexOf('--automatic') === -1) {
+	let input = require('readline-sync').question('version string [empty: ' + ver + ' (default)]? ')
+	if (input) {
+		ver = input
+	}
+	//var basefile="../../"
 } else {
-    //var basefile="./"
+	//var basefile="./"
 }
 //const { app } = require('electron');
-const path = require('path');
-const basefile = path.join(__dirname, "../../")
+const path = require('path')
+const basefile = path.join(__dirname, '../../')
 function main(ver, basefile) {
-	const fs = require("fs");
-	const execSync = require("child_process").execSync;
-	let gitHash = execSync("git rev-parse HEAD")
+	const fs = require('fs')
+	const execSync = require('child_process').execSync
+	let gitHash = execSync('git rev-parse HEAD')
 		.toString()
-		.trim();
-    fs.writeFileSync(basefile + "git", gitHash);
-	console.log("Constructing view files " + ver + ": make sure to update package.json");
-	const langs = ["ja", "en", "bg", "cs", "de", "es-AR", "ps"];
-	const langsh = ["日本語", "English", "български", "Česky", "Deutsch", "Spanish, Argentina", "Crowdin translate system(beta)"];
-	const simples = ["acct", "index", "setting", "update", "setting"];
-	const samples = ["acct.sample.html", "index.sample.html", "setting.sample.html", "update.sample.html", "setting.sample.js"];
-	const pages = ["acct.html", "index.html", "setting.html", "update.html", "setting.vue.js"];
-	let langstr = "";
-	let refKey = [];
-	const enJson=JSON.parse(fs.readFileSync(basefile + "view/make/language/en/main.json", "utf8"))
+		.trim()
+	fs.writeFileSync(basefile + 'git', gitHash)
+	console.log('Constructing view files ' + ver + ': make sure to update package.json')
+	const langs = ['ja', 'ja-KS', 'en', 'bg', 'cs', 'de', 'es-AR', 'ps']
+	const langsh = [
+		'日本語',
+		'日本語(関西)',
+		'English',
+		'български',
+		'Česky',
+		'Deutsch',
+		'Spanish, Argentina',
+		'Crowdin translate system(beta)'
+	]
+	const simples = ['acct', 'index', 'setting', 'update', 'setting']
+	const samples = [
+		'acct.sample.html',
+		'index.sample.html',
+		'setting.sample.html',
+		'update.sample.html',
+		'setting.sample.js'
+	]
+	const pages = ['acct.html', 'index.html', 'setting.html', 'update.html', 'setting.vue.js']
+	let langstr = ''
+	let refKey = []
+	const enJson = JSON.parse(fs.readFileSync(basefile + 'view/make/language/en/main.json', 'utf8'))
+	const jaJson = JSON.parse(fs.readFileSync(basefile + 'view/make/language/ja/main.json', 'utf8'))
 	for (let n = 0; n < langs.length; n++) {
-		let lang = langs[n];
-		let targetDir = basefile + "view/" + lang;
+		let lang = langs[n]
+		let targetDir = basefile + 'view/' + lang
 		if (!fs.existsSync(targetDir)) {
-			fs.mkdirSync(targetDir);
+			fs.mkdirSync(targetDir)
 		}
-		langstr = langstr + "<a onclick=\"changelang('" + lang + '\')" class="pointer" style="margin:4px;border: 1px solid var(--color); padding: 3px">' + langsh[n] + "</a>";
-		let mainJson=JSON.parse(fs.readFileSync(basefile + "view/make/language/" + lang + "/main.json", "utf8"))
-		if(lang != "en"){
-			Object.keys(enJson).forEach(function(key) {
-				if(!mainJson[key]){
-					mainJson[key]=enJson[key]
+		langstr =
+			langstr +
+			'<a onclick="changelang(\'' +
+			lang +
+			'\')" class="pointer" style="margin:4px;border: 1px solid var(--color); padding: 3px">' +
+			langsh[n] +
+			'</a>'
+		let mainJson = JSON.parse(
+			fs.readFileSync(basefile + 'view/make/language/' + lang + '/main.json', 'utf8')
+		)
+		if (lang == 'ja-KS') {
+			Object.keys(jaJson).forEach(function(key) {
+				if (!mainJson[key]) {
+					mainJson[key] = jaJson[key]
 				}
-			});
+			})
+		} else if (lang != 'en') {
+			Object.keys(enJson).forEach(function(key) {
+				if (!mainJson[key]) {
+					mainJson[key] = enJson[key]
+				}
+			})
 		}
-		fs.writeFileSync(basefile + "view/" + lang + "/main.js", JSON.stringify(mainJson).replace(/^{/, "var lang = {"));
+		fs.writeFileSync(
+			basefile + 'view/' + lang + '/main.js',
+			JSON.stringify(mainJson).replace(/^{/, 'var lang = {')
+		)
 	}
 	for (let i = 0; i < samples.length; i++) {
-		let sample = samples[i];
-		let sourceParent = fs.readFileSync(basefile +"view/make/" +sample, "utf8");
-		let englishRefer = JSON.parse(fs.readFileSync(basefile +"view/make/language/en/" + simples[i] + ".json", "utf8"));
+		let sample = samples[i]
+		let sourceParent = fs.readFileSync(basefile + 'view/make/' + sample, 'utf8')
+		let englishRefer = JSON.parse(
+			fs.readFileSync(basefile + 'view/make/language/en/' + simples[i] + '.json', 'utf8')
+		)
+		let jaRefer = JSON.parse(
+			fs.readFileSync(basefile + 'view/make/language/ja/' + simples[i] + '.json', 'utf8')
+		)
 		for (let j = 0; j < langs.length; j++) {
-			let source = sourceParent;
-			let lang = langs[j];
-			let target = JSON.parse(fs.readFileSync(basefile +"view/make/language/" + lang + "/" + simples[i] + ".json", "utf8"));
-			if (lang == "ja") {
+			let source = sourceParent
+			let lang = langs[j]
+			let target = JSON.parse(
+				fs.readFileSync(
+					basefile + 'view/make/language/' + lang + '/' + simples[i] + '.json',
+					'utf8'
+				)
+			)
+			if (lang == 'ja') {
 				Object.keys(target).forEach(function(key) {
-					refKey.push(key);
-					let str = target[key];
-					if (pages[i] == "setting.vue.js") {
-						str = str.replace(/"/g, '\\"');
+					refKey.push(key)
+					let str = target[key]
+					if (pages[i] == 'setting.vue.js') {
+						str = str.replace(/'/g, '\\')
 					}
-					var regExp = new RegExp("@@" + key + "@@", "g");
-					source = source.replace(regExp, str);
-				});
+					var regExp = new RegExp('@@' + key + '@@', 'g')
+					source = source.replace(regExp, str)
+				})
 			} else {
 				for (let k = 0; k < refKey.length; k++) {
-					let tarKey = refKey[k];
+					let tarKey = refKey[k]
 					if (target[tarKey]) {
-						var str = target[tarKey];
+						var str = target[tarKey]
 					} else {
-						var str = englishRefer[tarKey];
-					}
-					if (pages[i] == "setting.vue.js") {
-						if (str) {
-							str = str.replace(/"/g, '\\"');
+						if (lang == 'ja-KS') {
+							var str = jaRefer[tarKey]
+						} else {
+							var str = englishRefer[tarKey]
 						}
 					}
-					var regExp = new RegExp("@@" + tarKey + "@@", "g");
-					source = source.replace(regExp, str);
+					if (pages[i] == 'setting.vue.js') {
+						if (str) {
+							str = str.replace(/'/g, '\\')
+						}
+					}
+					var regExp = new RegExp('@@' + tarKey + '@@', 'g')
+					source = source.replace(regExp, str)
 				}
 			}
-			if (lang == "ps") {
-				source = source.replace(/@@comment-start@@/g, "");
-				source = source.replace(/@@comment-end@@/g, "");
+			if (lang == 'ps') {
+				source = source.replace(/@@comment-start@@/g, '')
+				source = source.replace(/@@comment-end@@/g, '')
 			} else {
-				source = source.replace(/@@comment-start@@/g, "<!--");
-				source = source.replace(/@@comment-end@@/g, "-->");
+				source = source.replace(/@@comment-start@@/g, '<!--')
+				source = source.replace(/@@comment-end@@/g, '-->')
 			}
-			source = source.replace(/@@versionLetter@@/g, ver);
-			source = source.replace(/@@gitHash@@/g, gitHash);
-			source = source.replace(/@@gitHashShort@@/g, gitHash.slice(0, 7));
-			source = source.replace(/@@lang@@/g, lang);
-			source = source.replace(/@@langlist@@/g, langstr);
-			fs.writeFileSync(basefile +"view/" + lang + "/" + pages[i], source);
+			source = source.replace(/@@versionLetter@@/g, ver)
+			source = source.replace(/@@gitHash@@/g, gitHash)
+			source = source.replace(/@@gitHashShort@@/g, gitHash.slice(0, 7))
+			source = source.replace(/@@lang@@/g, lang)
+			source = source.replace(/@@langlist@@/g, langstr)
+			fs.writeFileSync(basefile + 'view/' + lang + '/' + pages[i], source)
 		}
 	}
 }
-main(ver, basefile);
+main(ver, basefile)

 //if --watch, to yarn dev
-if (process.argv.indexOf("--watch") !== -1) {
-    const chokidar = require("chokidar");
-    console.log("watch mode(not hot-watch): when construction files are changed, refresh view files but not reload. Please reload manually.")
-	const watcher = chokidar.watch(basefile +"view/make", {
-		ignored: "view/make/make.js",
+if (process.argv.indexOf('--watch') !== -1) {
+	const chokidar = require('chokidar')
+	console.log(
+		'watch mode(not hot-watch): when construction files are changed, refresh view files but not reload. Please reload manually.'
+	)
+	const watcher = chokidar.watch(basefile + 'view/make', {
+		ignored: 'view/make/make.js',
 		persistent: true
-	});
-	watcher.on("ready", function() {
-		console.log("watching...");
-		watcher.on("change", function(path) {
-			console.log(path + " changed.");
-			main(ver, basefile);
-		});
-	});
+	})
+	watcher.on('ready', function() {
+		console.log('watching...')
+		watcher.on('change', function(path) {
+			console.log(path + ' changed.')
+			main(ver, basefile)
+		})
+	})
 }
--- a/app/view/make/setting.sample.js
+++ b/app/view/make/setting.sample.js
@@ -371,6 +371,17 @@ var tlConstruction = [
 			checkbox: yesno
 		}
 	},
+	{
+		id: 'bkm',
+		storage: 'bookmark',
+		checkbox: true,
+		setValue: 'no',
+		text: {
+			head: '@@showBookmarkAction@@',
+			desc: '',
+			checkbox: yesno
+		}
+	},
 	{
 		id: 'replySound',
 		storage: 'replySound',
--- a/app/yarn.lock
+++ b/app/yarn.lock
@@ -284,15 +284,15 @@
  dependencies:
    defer-to-connect "^1.0.1"

-"@types/debug@^4.1.4":
+"@types/debug@^4.1.4", "@types/debug@^4.1.5":
  version "4.1.5"
  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd"
  integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ==

 "@types/node@^10.12.18":
-  version "10.14.22"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.22.tgz#34bcdf6b6cb5fc0db33d24816ad9d3ece22feea4"
-  integrity sha512-9taxKC944BqoTVjE+UT3pQH0nHZlTvITwfsOZqyc+R3sfJuxaTtxWjfn1K2UlxyPcKHf0rnaXcVFrS9F9vf0bw==
+  version "10.17.5"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.5.tgz#c1920150f7b90708a7d0f3add12a06bc9123c055"
+  integrity sha512-RElZIr/7JreF1eY6oD5RF3kpmdcreuQPjg5ri4oQ5g9sq7YWU8HkfB3eH8GwAwxf5OaCh0VPi7r4N/yoTGelrA==

 abbrev@1:
  version "1.1.1"
@@ -361,7 +361,40 @@ app-builder-bin@3.4.3:
  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.4.3.tgz#58a74193eb882f029be6b7f0cd3f0c6805927a6b"
  integrity sha512-qMhayIwi3juerQEVJMQ76trObEbfQT0nhUdxZz9a26/3NLT3pE6awmQ8S1cEnrGugaaM5gYqR8OElcDezfmEsg==

-app-builder-lib@21.2.0, app-builder-lib@~21.2.0:
+app-builder-bin@3.4.4:
+  version "3.4.4"
+  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.4.4.tgz#6f244edb7bd5e482defc472ef0c15692b569f211"
+  integrity sha512-Xib+wgdK+8zZhbZr5pma3pNB23Y4JRY5Yt6h8peou6MTFSQzXdIkqalh/ezy9SMLuS43S4b0s7jTVAmUs8WVmA==
+
+app-builder-lib@22.1.0:
+  version "22.1.0"
+  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.1.0.tgz#6df869d882406f34b4b02cab4c3ddb7926e420ec"
+  integrity sha512-jDTfWsVS/MePO4FexqiSQcsWM9Yfr81ETIYbmVbKmW05o0dn9k1DvMOMoLb0kTLQpW+pWBVvGMAOPfk68HnBrg==
+  dependencies:
+    "7zip-bin" "~5.0.3"
+    "@develar/schema-utils" "~2.1.0"
+    async-exit-hook "^2.0.1"
+    bluebird-lst "^1.0.9"
+    builder-util "22.1.0"
+    builder-util-runtime "8.4.0"
+    chromium-pickle-js "^0.2.0"
+    debug "^4.1.1"
+    ejs "^2.7.1"
+    electron-publish "22.1.0"
+    fs-extra "^8.1.0"
+    hosted-git-info "^3.0.0"
+    is-ci "^2.0.0"
+    isbinaryfile "^4.0.2"
+    js-yaml "^3.13.1"
+    lazy-val "^1.0.4"
+    minimatch "^3.0.4"
+    normalize-package-data "^2.5.0"
+    read-config-file "5.0.0"
+    sanitize-filename "^1.6.3"
+    semver "^6.3.0"
+    temp-file "^3.3.4"
+
+app-builder-lib@~21.2.0:
  version "21.2.0"
  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-21.2.0.tgz#fa1d1604601431e2c3476857e9b9b61d33ad26cc"
  integrity sha512-aOX/nv77/Bti6NymJDg7p9T067xD8m1ipIEJR7B4Mm1GsJWpMm9PZdXtCRiMNRjHtQS5KIljT0g17781y6qn5A==
@@ -540,6 +573,14 @@ builder-util-runtime@8.3.0:
    debug "^4.1.1"
    sax "^1.2.4"

+builder-util-runtime@8.4.0:
+  version "8.4.0"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.4.0.tgz#3163fffc078e6b8f3dd5b6eb12a8345573590682"
+  integrity sha512-CJB/eKfPf2vHrkmirF5eicVnbDCkMBbwd5tRYlTlgud16zFeqD7QmrVUAOEXdnsrcNkiLg9dbuUsQKtl/AwsYQ==
+  dependencies:
+    debug "^4.1.1"
+    sax "^1.2.4"
+
 builder-util@21.2.0, builder-util@~21.2.0:
  version "21.2.0"
  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-21.2.0.tgz#aba721190e4e841009d9fb4b88f1130ed616522f"
@@ -559,6 +600,25 @@ builder-util@21.2.0, builder-util@~21.2.0:
    stat-mode "^0.3.0"
    temp-file "^3.3.4"

+builder-util@22.1.0, builder-util@~22.1.0:
+  version "22.1.0"
+  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.1.0.tgz#2b33145d053778e95389d5aee659256ebdb1c2ca"
+  integrity sha512-BPvpWvxQ5XOzm2WepIgmOAyo2IyaM/Bd1LJmeTYy5CtknNAtxgmAPQJfCHCikMKKQA4Obz/KYecXQiGpGJ2ThA==
+  dependencies:
+    "7zip-bin" "~5.0.3"
+    "@types/debug" "^4.1.5"
+    app-builder-bin "3.4.4"
+    bluebird-lst "^1.0.9"
+    builder-util-runtime "8.4.0"
+    chalk "^2.4.2"
+    debug "^4.1.1"
+    fs-extra "^8.1.0"
+    is-ci "^2.0.0"
+    js-yaml "^3.13.1"
+    source-map-support "^0.5.13"
+    stat-mode "^0.3.0"
+    temp-file "^3.3.4"
+
 cacheable-request@^6.0.0:
  version "6.1.0"
  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
@@ -604,10 +664,10 @@ chalk@^2.0.1, chalk@^2.4.2:
    escape-string-regexp "^1.0.5"
    supports-color "^5.3.0"

-chokidar@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.2.3.tgz#b9270a565d14f02f6bfdd537a6a2bbf5549b8c8c"
-  integrity sha512-GtrxGuRf6bzHQmXWRepvsGnXpkQkVU+D2/9a7dAe4a7v1NhrfZOZ2oKf76M3nOs46fFYL8D+Q8JYA4GYeJ8Cjw==
+chokidar@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.0.tgz#12c0714668c55800f659e262d4962a97faf554a6"
+  integrity sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==
  dependencies:
    anymatch "~3.1.1"
    braces "~3.0.2"
@@ -817,9 +877,9 @@ defaults@^1.0.3:
    clone "^1.0.2"

 defer-to-connect@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.0.2.tgz#4bae758a314b034ae33902b5aac25a8dd6a8633e"
-  integrity sha512-k09hcQcTDY+cwgiwa6PYKLm3jlagNzQ+RSvhjzESOGOx+MNOuXkxTfEvPrO1IOQ81tArCFYQgi631clB70RpQw==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.0.tgz#b41bd7efa8508cef13f8456975f7a278c72833fd"
+  integrity sha512-WE2sZoctWm/v4smfCAdjYbrfS55JiMRdlY9ZubFhsYbteCK9+BvAx4YV7nPjYM6ZnX5BcoVKwfmyx9sIFTgQMQ==

 define-properties@^1.1.2, define-properties@^1.1.3:
  version "1.1.3"
@@ -891,29 +951,29 @@ ecc-jsbn@~0.1.1:
    jsbn "~0.1.0"
    safer-buffer "^2.1.0"

-ejs@^2.6.2:
+ejs@^2.6.2, ejs@^2.7.1:
  version "2.7.1"
  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.1.tgz#5b5ab57f718b79d4aca9254457afecd36fa80228"
  integrity sha512-kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ==

-electron-builder@^21.1.5:
-  version "21.2.0"
-  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-21.2.0.tgz#b68ec4def713fc0b8602654ce842f972432f50c5"
-  integrity sha512-x8EXrqFbAb2L3N22YlGar3dGh8vwptbB3ovo3OF6K7NTpcsmM2zEoJv7GhFyX73rNzSG2HaWpXwGAtOp2JWiEw==
+electron-builder@^22.1.0:
+  version "22.1.0"
+  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.1.0.tgz#65b23411e3c39a83b52743ed18980b97f8314d50"
+  integrity sha512-uu2W9BLG38D0i2PG6dHupmOYc+q/TRL+Ztf8xitqK+2Quq33PFbeN0ipfySuVEDg4I6whDRBOgxBEWwnUYqZZQ==
  dependencies:
-    app-builder-lib "21.2.0"
+    app-builder-lib "22.1.0"
    bluebird-lst "^1.0.9"
-    builder-util "21.2.0"
-    builder-util-runtime "8.3.0"
+    builder-util "22.1.0"
+    builder-util-runtime "8.4.0"
    chalk "^2.4.2"
    dmg-builder "21.2.0"
    fs-extra "^8.1.0"
    is-ci "^2.0.0"
    lazy-val "^1.0.4"
    read-config-file "5.0.0"
-    sanitize-filename "^1.6.2"
+    sanitize-filename "^1.6.3"
    update-notifier "^3.0.1"
-    yargs "^13.3.0"
+    yargs "^14.0.0"

 electron-dl@^1.14.0:
  version "1.14.0"
@@ -952,6 +1012,19 @@ electron-publish@21.2.0:
    lazy-val "^1.0.4"
    mime "^2.4.4"

+electron-publish@22.1.0:
+  version "22.1.0"
+  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.1.0.tgz#730ee3801e47acdbb1c81ed7fc4ebc6b30d2a8aa"
+  integrity sha512-jHjMCaL2dFU+iOq8wW568F59+DW1jFJGT3vc2xqm9iXyZ8gWlQ+NVve4bq9HZG7m4iNqWbGw9StmZcOzmIBxMQ==
+  dependencies:
+    bluebird-lst "^1.0.9"
+    builder-util "~22.1.0"
+    builder-util-runtime "8.4.0"
+    chalk "^2.4.2"
+    fs-extra "^8.1.0"
+    lazy-val "^1.0.4"
+    mime "^2.4.4"
+
 electron-rebuild@^1.8.6:
  version "1.8.6"
  resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-1.8.6.tgz#4454ef5517c0588aef9bca0d923ff5633000b949"
@@ -968,9 +1041,9 @@ electron-rebuild@^1.8.6:
    yargs "^13.2.4"

 electron@^6.0.12:
-  version "6.0.12"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-6.0.12.tgz#85bf0061e32f660256cfde95488f1cb75253bc94"
-  integrity sha512-70ODZa1RP6K0gE9IV9YLCXPSyhLjXksCuYSSPb3MljbfwfHo5uE6X0CGxzm+54YuPdE2e7EPnWZxOOsJYrS5iQ==
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-6.1.4.tgz#21cbcf5de74a0e284621dce1b8c0fe092c146c2d"
+  integrity sha512-QUN59E0dPmkAEYi+OU0jJG6tIAi8VDJpsHLRmdyL62oAuT3+CWJ/gefmNwAWQsIpNj/DieVTn5h+/t/Hke4T+Q==
  dependencies:
    "@types/node" "^10.12.18"
    electron-download "^4.1.0"
@@ -1017,9 +1090,9 @@ es-abstract@^1.13.0, es-abstract@^1.5.1:
    string.prototype.trimright "^2.1.0"

 es-to-primitive@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
-  integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
+  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
  dependencies:
    is-callable "^1.1.4"
    is-date-object "^1.0.1"
@@ -1205,9 +1278,9 @@ fs.realpath@^1.0.0:
  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=

 fsevents@~2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.1.tgz#74c64e21df71721845d0c44fe54b7f56b82995a9"
-  integrity sha512-4FRPXWETxtigtJW/gxzEDsX1LVbPAM93VleB83kZB+ellqbHMkyt2aJfuzNLRvFPnGi6bcE5SvfxgbXPeKteJw==
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805"
+  integrity sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==

 function-bind@^1.1.1:
  version "1.1.1"
@@ -1272,9 +1345,9 @@ glob-parent@~5.1.0:
    is-glob "^4.0.1"

 glob@^7.0.3, glob@^7.1.3:
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
-  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
  dependencies:
    fs.realpath "^1.0.0"
    inflight "^1.0.4"
@@ -1316,9 +1389,14 @@ got@^9.6.0:
    url-parse-lax "^3.0.0"

 graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"
-  integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
+  integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
+
+grapheme-splitter@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
+  integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==

 har-schema@^2.0.0:
  version "2.0.0"
@@ -1365,6 +1443,13 @@ hosted-git-info@^2.1.4, hosted-git-info@^2.7.1:
  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c"
  integrity sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==

+hosted-git-info@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.2.tgz#8b7e3bd114b59b51786f8bade0f39ddc80275a97"
+  integrity sha512-ezZMWtHXm7Eb7Rq4Mwnx2vs79WUx2QmRg3+ZqeGroKzfDO+EprOcgRPYghsOP9JuYBfK18VojmRTGCg8Ma+ktw==
+  dependencies:
+    lru-cache "^5.1.1"
+
 http-cache-semantics@^4.0.0:
  version "4.0.3"
  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz#495704773277eeef6e43f9ab2c2c7d259dda25c5"
@@ -1768,6 +1853,13 @@ lru-cache@^4.0.1:
    pseudomap "^1.0.2"
    yallist "^2.1.2"

+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+  dependencies:
+    yallist "^3.0.2"
+
 make-dir@^1.0.0:
  version "1.3.0"
  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -1780,10 +1872,11 @@ map-obj@^1.0.0, map-obj@^1.0.1:
  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=

-materialize-css@^1.0.0:
+"materialize-css@git://github.com/cutls/materialize":
  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/materialize-css/-/materialize-css-1.0.0.tgz#8d5db1c4a81c6d65f3b2e2ca83a8e08daa24d1be"
-  integrity sha512-4/oecXl8y/1i8RDZvyvwAICyqwNoKU4or5uf8uoAd74k76KzZ0Llym4zhJ5lLNUskcqjO0AuMcvNyDkpz8Z6zw==
+  resolved "git://github.com/cutls/materialize#2387ea3897c3378fbcd65d0563538287e16df48f"
+  dependencies:
+    grapheme-splitter "^1.0.4"

 meow@^3.1.0:
  version "3.7.0"
@@ -1801,22 +1894,17 @@ meow@^3.1.0:
    redent "^1.0.0"
    trim-newlines "^1.0.0"

-mime-db@1.40.0:
-  version "1.40.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
-  integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
-
-mime-db@^1.28.0:
+mime-db@1.42.0, mime-db@^1.28.0:
  version "1.42.0"
  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.42.0.tgz#3e252907b4c7adb906597b4b65636272cf9e7bac"
  integrity sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ==

 mime-types@^2.1.12, mime-types@~2.1.19:
-  version "2.1.24"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
-  integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
+  version "2.1.25"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.25.tgz#39772d46621f93e2a80a856c53b86a62156a6437"
+  integrity sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==
  dependencies:
-    mime-db "1.40.0"
+    mime-db "1.42.0"

 mime@^1.3.4:
  version "1.6.0"
@@ -1905,9 +1993,9 @@ nan@>=2.10.0:
  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==

 node-abi@^2.9.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.11.0.tgz#b7dce18815057544a049be5ae75cd1fdc2e9ea59"
-  integrity sha512-kuy/aEg75u40v378WRllQ4ZexaXJiCvB68D2scDXclp/I4cRq6togpbOoKhmN07tns9Zldu51NNERo0wehfX9g==
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.12.0.tgz#40e9cfabdda1837863fa825e7dfa0b15686adf6f"
+  integrity sha512-VhPBXCIcvmo/5K8HPmnWJyyhvgKxnHTUMXR/XwGHV68+wrgkzST4UmQrY/XszSWA5dtnXpNp528zkcyJ/pzVcw==
  dependencies:
    semver "^5.4.1"

@@ -2001,9 +2089,9 @@ object-assign@^4.0.1, object-assign@^4.1.0:
  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=

 object-inspect@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b"
-  integrity sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
+  integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==

 object-keys@^1.0.12, object-keys@^1.1.1:
  version "1.1.1"
@@ -2188,9 +2276,9 @@ phin@^2.9.1:
  integrity sha512-CzFr90qM24ju5f88quFC/6qohjC144rehe5n6DH900lgXmUe86+xCKc10ev56gRKC4/BkHUoG4uSiQgBiIXwDA==

 picomatch@^2.0.4:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.0.7.tgz#514169d8c7cd0bdbeecc8a2609e34a7163de69f6"
-  integrity sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.1.1.tgz#ecdfbea7704adb5fe6fb47f9866c4c0e15e905c5"
+  integrity sha512-OYMyqkKzK7blWO/+XZYP6w8hH0LDvkBvdvKukti+7kqYFCiEAk+gI3DWnryapc0Dau05ugGTy0foQ6mqn4AHYA==

 pify@^2.0.0:
  version "2.3.0"
@@ -2491,7 +2579,7 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1:
  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==

-sanitize-filename@^1.6.2:
+sanitize-filename@^1.6.2, sanitize-filename@^1.6.3:
  version "1.6.3"
  resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378"
  integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==
@@ -2569,9 +2657,9 @@ sort-keys@^1.0.0:
    is-plain-obj "^1.0.0"

 source-map-support@^0.5.13:
-  version "0.5.13"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
-  integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
+  version "0.5.16"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
+  integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
  dependencies:
    buffer-from "^1.0.0"
    source-map "^0.6.0"
@@ -2775,10 +2863,10 @@ supports-color@^5.3.0:
  dependencies:
    has-flag "^3.0.0"

-sweetalert2@^8.18.6:
-  version "8.18.6"
-  resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-8.18.6.tgz#9df053369cb2b4ae0b955280505bf0cad0f8c4fe"
-  integrity sha512-6Jio6FH3p5hm+VHYN8mUyGhGozVo+r+eJtkUC/+bvSpXss84hcMRXNqKQs+J1+LWPy2DT7ozdyVXaVY6sMnm+w==
+sweetalert2@^9.3.4:
+  version "9.3.5"
+  resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-9.3.5.tgz#54ef40a2750c52dd59b7d070bae01dee01cdf268"
+  integrity sha512-AlITkIVaNVu0T9MJmCTyTpCTmozpe+bZG9qTPBHpReoHluA2qyaWDoIvAZLj4NIKsAyH63gno1OLIRynYDS9sA==

 tar@^4.4.12:
  version "4.4.13"
@@ -3106,7 +3194,7 @@ yallist@^2.1.2:
  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=

-yallist@^3.0.0, yallist@^3.0.3:
+yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
  version "3.1.1"
  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
@@ -3119,7 +3207,15 @@ yargs-parser@^13.1.1:
    camelcase "^5.0.0"
    decamelize "^1.2.0"

-yargs@^13.2.4, yargs@^13.3.0:
+yargs-parser@^15.0.0:
+  version "15.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.0.tgz#cdd7a97490ec836195f59f3f4dbe5ea9e8f75f08"
+  integrity sha512-xLTUnCMc4JhxrPEPUYD5IBR1mWCK/aT6+RJ/K29JY2y1vD+FhtgKK0AXRWvI262q3QSffAQuTouFIKUuHX89wQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
+yargs@^13.2.4:
  version "13.3.0"
  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83"
  integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==
@@ -3135,6 +3231,23 @@ yargs@^13.2.4, yargs@^13.3.0:
    y18n "^4.0.0"
    yargs-parser "^13.1.1"

+yargs@^14.0.0:
+  version "14.2.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.2.0.tgz#f116a9242c4ed8668790b40759b4906c276e76c3"
+  integrity sha512-/is78VKbKs70bVZH7w4YaZea6xcJWOAwkhbR0CFuZBmYtfTYF0xjGJF43AYd8g2Uii1yJwmS5GR2vBmrc32sbg==
+  dependencies:
+    cliui "^5.0.0"
+    decamelize "^1.2.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^15.0.0"
+
 yauzl@2.4.1:
  version "2.4.1"
  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005"
Author	SHA1	Message	Date
cutls	83bd9499fd	TheDesk20.0.3 (Kawaii)	2019-11-16 14:15:45 +09:00
cutls	d3911792ec	details	2019-11-16 13:40:35 +09:00
cutls	5c49715298	Around bookmark	2019-11-16 13:36:16 +09:00
cutls	2b3feb40ad	Add bookmark TL	2019-11-16 04:58:37 +09:00
cutls	f7dbeaef84	Add dropdown and bookmark	2019-11-16 03:42:23 +09:00
cutls	31472e3206	gitignore	2019-11-16 00:02:03 +09:00
cutls	2e88a8e0c3	Add: Japanese(Kansai) locale	2019-11-16 00:01:54 +09:00
cutls	224d762bc6	Add twitcasting	2019-11-14 02:48:49 +09:00
cutls	2fa1299391	To improve and secure cards...	2019-11-14 02:42:06 +09:00
cutls	dad459694c	Merge branch 'master' of github.com:cutls/TheDesk	2019-11-14 01:42:20 +09:00
cutls	c2fa24c956	Fix: thread	2019-11-14 01:42:09 +09:00
dependabot-preview[bot]	e55ea3bd0c	Bump electron-builder from 21.2.0 to 22.1.0 in /app (#154 ) Bumps [electron-builder](https://github.com/electron-userland/electron-builder) from 21.2.0 to 22.1.0. - [Release notes](https://github.com/electron-userland/electron-builder/releases) - [Changelog](https://github.com/electron-userland/electron-builder/blob/master/CHANGELOG.md) - [Commits](https://github.com/electron-userland/electron-builder/compare/v21.2.0...v22.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-11-14 00:53:45 +09:00
dependabot-preview[bot]	ae9e6c4a56	Bump chokidar from 3.2.3 to 3.3.0 in /app (#157 ) Bumps [chokidar](https://github.com/paulmillr/chokidar) from 3.2.3 to 3.3.0. - [Release notes](https://github.com/paulmillr/chokidar/releases) - [Commits](https://github.com/paulmillr/chokidar/compare/3.2.3...3.3.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-11-14 00:53:31 +09:00
dependabot-preview[bot]	2a5bb034ab	Bump materialize-css from `2387ea3` to `e3eb698` in /app (#169 ) Bumps [materialize-css](https://github.com/cutls/materialize) from `2387ea3` to `e3eb698`. - [Release notes](https://github.com/cutls/materialize/releases) - [Commits](`2387ea3897...e3eb698a07`) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-11-14 00:52:42 +09:00
dependabot-preview[bot]	49f190a471	Bump sweetalert2 from 8.18.6 to 9.3.4 in /app (#170 ) Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 8.18.6 to 9.3.4. - [Release notes](https://github.com/sweetalert2/sweetalert2/releases) - [Changelog](https://github.com/sweetalert2/sweetalert2/blob/master/CHANGELOG.md) - [Commits](https://github.com/sweetalert2/sweetalert2/compare/v8.18.6...v9.3.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-11-14 00:52:19 +09:00
Cutls	3f5a870877	New Crowdin translations (#167 ) * New translations index.json (Russian) * New translations index.json (Romanian) * New translations index.json (Portuguese, Brazilian) * New translations index.json (Portuguese) * New translations index.json (Polish) * New translations index.json (Norwegian) * New translations index.json (Serbian (Cyrillic)) * New translations index.json (Italian) * New translations index.json (Vietnamese) * New translations index.json (Ukrainian) * New translations index.json (Turkish) * New translations index.json (Swedish) * New translations index.json (Spanish) * New translations index.json (Afrikaans) * New translations index.json (Chinese Traditional) * New translations index.json (Danish) * New translations index.json (Catalan) * New translations index.json (Arabic) * New translations index.json (Hungarian) * New translations index.json (Hebrew) * New translations index.json (Greek) * New translations index.json (French) * New translations index.json (Finnish) * New translations index.json (Dutch) * New translations acct.json (German) * New translations index.json (German) * New translations index.json (German) * New translations index.json (German) * New translations index.json (German)	2019-11-14 00:51:39 +09:00
cutls	fd3cf1eb9f	TheDesk 20.0.2 (Kawaii)	2019-11-12 00:59:07 +09:00
cutls	9a49979dcb	Reconnecting overflow	2019-11-12 00:55:32 +09:00
cutls	6a11099b50	Error on en setting	2019-11-12 00:55:21 +09:00
cutls	5c5c57739a	Copy the URL	2019-11-12 00:16:48 +09:00
cutls	8e663391b9	For grapheme cluster compt	2019-11-11 01:20:51 +09:00
cutls	85ccbd1382	For emoji counting	2019-11-11 01:06:46 +09:00
cutls	542ee57f93	Fix: the account color pref. is sometimes losted	2019-11-10 20:37:13 +09:00