TheDesk Usamin (18.11.4)

* New translations update.json (Hebrew)

* New translations update.json (Italian)

* New translations setting.json (Italian)

* New translations update.json (Hungarian)

* New translations setting.json (Hungarian)

* New translations setting.json (Hebrew)

* New translations update.json (Greek)

* New translations setting.json (Greek)

* New translations update.json (German)

* New translations setting.json (German)

* New translations update.json (Romanian)

* New translations setting.json (Romanian)

* New translations update.json (Portuguese, Brazilian)

* New translations setting.json (Portuguese, Brazilian)

* New translations setting.json (Norwegian)

* New translations update.json (Portuguese)

* New translations setting.json (Portuguese)

* New translations update.json (Polish)

* New translations setting.json (Polish)

* New translations update.json (Norwegian)

* New translations update.json (French)

* New translations update.json (Bulgarian)

* New translations update.json (Chinese Simplified)

* New translations setting.json (Chinese Simplified)

* New translations update.json (Catalan)

* New translations setting.json (Catalan)

* New translations setting.json (Bulgarian)

* New translations update.json (Arabic)

* New translations setting.json (Arabic)

* New translations setting.json (French)

* New translations update.json (Afrikaans)

* New translations setting.json (Afrikaans)

* New translations setting.json (Chinese Traditional)

* New translations update.json (Finnish)

* New translations setting.json (Finnish)

* New translations update.json (Dutch)

* New translations setting.json (Dutch)

* New translations setting.json (Czech)

* New translations update.json (Danish)

* New translations update.json (Czech)

* New translations setting.json (Danish)

* New translations update.json (Chinese Traditional)

* New translations update.json (Ukrainian)

* New translations setting.json (Turkish)

* New translations update.json (Turkish)

* New translations setting.json (Ukrainian)

* New translations update.json (Vietnamese)

* New translations setting.json (Vietnamese)

* New translations setting.json (English)

* New translations update.json (Swedish)

* New translations setting.json (Swedish)

* New translations setting.json (Russian)

* New translations update.json (Russian)

* New translations setting.json (Serbian (Cyrillic))

* New translations update.json (Serbian (Cyrillic))

* New translations setting.json (Spanish)

* New translations update.json (Spanish)

* New translations setting.json (Spanish, Argentina)

* New translations update.json (Spanish, Argentina)

* New translations update.json (English)

.gitignore

@@ -20,3 +20,5 @@ app/view/cs
 app/view/ps
 app/view/es-AR
 app/git
+*.code-workspace
+releasenote.md

.travis.yml

@@ -49,5 +49,5 @@ deploy:
   skip_cleanup: true
   on:
     repo: cutls/TheDesk
-    tags: true
-    all_branches: true
+branches:
+  only: "/^v?[0-9\\.]+/"

app/css/master.css

@@ -336,7 +336,7 @@ blockquote:before,
 #menu {
   position: fixed;
   z-index: 9999;
-  background-color: var(--box);
+  background-color: var(--postbox);
   width: 540px;
   top: calc(50% - 150px);
   left: calc(50% - 250px);
@@ -475,6 +475,12 @@ textarea {
 #src-contents svg {
   margin-right: 5px;
 }
+.contributor {
+  cursor: pointer;
+}
+.contributor img {
+  width: 1rem;
+}
 
 /*スクロールバー*/
 ::-webkit-scrollbar {

app/css/tl.css

@@ -227,6 +227,18 @@ iframe,
   grid-template-rows: auto 1.6rem 1fr auto 2.5rem;
   grid-template-areas: "notice notice notice" "icon display_name display_name" "space toot toot" "space additional additional" "vis actions side";
 }
+.hide-actions{
+  grid-template-rows: auto 1.6rem 1fr auto 0;
+}
+.hide-actions .area-actions{
+  display:none;
+}
+.hide-actions .area-vis{
+  display:none;
+}
+.hide-actions .area-side{
+  display:none;
+}
 .cvo h1,
 .cvo h2,
 .cvo h3,
@@ -325,6 +337,7 @@ iframe,
   margin: 2px;
   grid-area: side;
 }
+
 .quote-inline {
   display: none;
 }

app/css/userdata.css

@@ -4,6 +4,9 @@
   background-image: url("../../loading.svg");
   overflow-y: hidden;
 }
+#his-data .btn .material-icons{
+  float:left;
+}
 #his-data-content {
   display: flex;
   justify-content: center;
@@ -22,6 +25,7 @@
 }
 #his-float-data {
   height: 100%;
+  overflow-y: hidden;
 }
 #his-leftside {
   width: 500px;
@@ -60,10 +64,10 @@
   padding: 0;
   padding-left: 5px;
 }
-#his-data a span.ellipsis:after {
+.his-var-content a span.ellipsis:after {
   content: "...";
 }
-#his-data a:not(.mention) span:last-of-type {
+.his-var-content a:not(.mention) span:last-of-type {
   display: none;
 }
 #his-data a .rep_ct,
@@ -99,7 +103,8 @@
   width: 20px;
 }
 #his-plus-action .btn {
-  width: 170px;
+  padding-right: 5px;
+  padding-left: 5px;
 }
 .tabs {
   display: flex;
@@ -107,10 +112,30 @@
 .tabs .tab a {
   padding: 8px 12px;
 }
+#his-des {
+  max-height: 250px;
+  overflow-y: scroll;
+}
+#his-sign-action {
+  border: 1px solid;
+  border-radius: 5px;
+  display: flex;
+  align-items: center;
+  padding-left: 10px;
+  padding-right: 10px;
+  flex-wrap: wrap;
+}
+#his-sign-action .btn {
+  flex-basis: 31.2%;
+}
 #his-des .mention {
   color: #039be5;
   cursor: pointer;
 }
+#his-table{
+  max-height: 150px;
+  overflow-y: scroll;
+}
 #his-float-blocked {
   display: flex;
   justify-content: center;

app/js/common/keyshortcut.js

@@ -14,6 +14,17 @@ $(function ($) {
 		} else {
 			var wv = true;
 		}
+		//Enter
+		if (e.keyCode === 13) {
+			if($("#src").is(':focus')){
+				src()
+				return false;
+			}
+			if($("#list-add").is(':focus')){
+				makeNewList()
+				return false;
+			}
+		}
 		//Ctrl+Shift+Enter:Lgen
 		if (event.metaKey || event.ctrlKey && wv) {
 			if (event.shiftKey) {

app/js/common/modal.js

@@ -23,4 +23,7 @@ $(document).ready(function () {
   }
   );
   $('.collapsible').collapsible();
+  $('#videomodal').modal({
+    onCloseEnd: stopVideo
+  });
 });

app/js/common/version.js

@@ -1,5 +1,5 @@
 //バージョンチェッカー
-function verck(ver) {
+function verck(ver, jp) {
 	console.log("%c Welcome😊", "color: red;font-size:200%;")
 	var date = new Date();
 	var show = false
@@ -87,6 +87,11 @@ function verck(ver) {
 	}).then(function (mess) {
 		console.table(mess);
 		if (mess) {
+			//askjp_jp_ua: 2019年10月24日、mstdn.jpによるユーザーエージェントアクセス制限
+			if(jp && mess.jp_ua && !localStorage.getItem("askjp_jp_ua")){
+				localStorage.setItem("askjp_jp_ua", true)
+				$("#askjp_jp_ua").removeClass("hide")
+			}
 			var platform = localStorage.getItem("platform");
 			if (platform == "darwin") {
 				var newest = mess.desk_mac;

app/js/login/login.js

@@ -13,8 +13,7 @@ function ck() {
 	if (!main) {
 		localStorage.setItem("main", 0)
 	}
-	var domainz = localStorage.getItem("domain_0");
-	var at = localStorage.getItem("acct_0_at");
+	
 	//コード受信
 	if (location.search) {
 		var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
@@ -32,17 +31,21 @@ function ck() {
 		location.href = "acct.html?mode=first&code=true"
 	} else {
 		var obj = JSON.parse(multi);
+		var jp=false
 		Object.keys(obj).forEach(function (key) {
 			var acct = obj[key];
 			if (acct.domain) {
 				refresh(key, true)
 			}
+			if(acct.domain=="mstdn.jp"){
+				jp=true
+			}
 		});
 		if (obj[0].domain) {
 			$("#tl").show();
 			ticker();
 			multiSelector(false);
-			verck(ver);
+			verck(ver, jp);
 			$(".stw").show()
 			$("#something-wrong img").attr("src", "../../img/thinking.svg")
 		}
@@ -291,7 +294,12 @@ function refresh(target, loadskip) {
 		localStorage.setItem("user-id_" + target, json["id"]);
 		localStorage.setItem("prof_" + target, avatar);
 		localStorage.setItem("follow_" + target, json["following_count"]);
-		console.log(obj)
+		if(json["source"]["sensitive"]){
+			localStorage.setItem("nsfw_" + target, "true");
+		}else{
+			localStorage.removeItem("nsfw_" + target);
+		}
+		obj[target] = ref;
 		var json = JSON.stringify(obj);
 		localStorage.setItem("multi", json);
 		if (!loadskip) {

app/js/platform/end.js

@@ -18,12 +18,12 @@ $(document).on('click', 'a', e => {
 		//タグのURLぽかったら
 		var tags = [];
 		tags = url.match(
-			/https:\/\/([^+_]+)\/tags\/([-_.!~*\'()a-zA-Z0-9;\/?:\&=+\$,%#]+)/
+			/https:\/\/([^+_]+)\/tags\/([_a-zA-Z0-9\&=+\%]+)/
 		);
 		//メンションっぽかったら
 		var ats = [];
 		ats = url.match(
-			/https:\/\/([^+_]+)\/@([-_.!~*\'()a-zA-Z0-9;\/?:\&=+\$,%#@]+)/
+			/https:\/\/([^+_]+)\/@([_a-zA-Z0-9\&=+\%]+)/
 		);
 		if (toot) {
 			if (toot[1]) {
@@ -81,11 +81,8 @@ $(document).on('click', 'a', e => {
 
 //コピー
 function execCopy(string) {
-	var temp = $("#copy");
-	temp.val(string);
-	temp.select();
-	var result = document.execCommand('copy');
-	return result;
+	postMessage(["copy", string], "*")
+	return true;
 }
 function progshow(e) {
 	if (e.lengthComputable) {

app/js/platform/nano.js

@@ -1,7 +1,11 @@
 
 //TL取得
+var websocket;
 function tl(data) {
 	var tlid = 0;
+	if(websocket){
+		websocket.close()
+	}
 	var acct_id = $("#post-acct-sel").val();
 	var type = $("#type-sel").val();
 	var domain = localStorage.getItem("domain_" + acct_id);
@@ -28,9 +32,9 @@ function tl(data) {
 		var templete = parse([json[0]], '', acct_id, tlid);
 		$("#timeline_nano").html(templete);
 		jQuery("time.timeago").timeago();
+		$("#menu").addClass("hide");
 	});
 	//Streaming接続
-	var websocket = [];
 	var tlid = 0;
 	if (type == "home") {
 		var start = "wss://" + domain +
@@ -45,29 +49,26 @@ function tl(data) {
 		var start = "wss://" + domain +
 			"/api/v1/streaming/?stream=hashtag&tag=" + data + "&access_token=" + at;
 	}
-	var wsid = websocket.length;
-	websocket[wsid] = new WebSocket(start);
-	websocket[wsid].onopen = function (mess) {
+	websocket = new WebSocket(start);
+	websocket.onopen = function (mess) {
 		$("#notice_icon_" + tlid).removeClass("red-text");
 	}
-	websocket[wsid].onmessage = function (mess) {
+	websocket.onmessage = function (mess) {
 		var typeA = JSON.parse(mess.data).event;
-		if (typeA == "delete") {
-			var obj = JSON.parse(mess.data).payload;
-			$("[toot-id=" + JSON.parse(mess.data).payload + "]").hide();
-			$("[toot-id=" + JSON.parse(mess.data).payload + "]").remove();
-		} else if (typeA == "update") {
+		if (typeA == "update") {
 			var obj = JSON.parse(JSON.parse(mess.data).payload);
 			var templete = parse([obj], '', acct_id, tlid);
+			jQuery("time.timeago").timeago();
 			$("#timeline_nano").html(templete);
 		}
-		websocket[wsid].onclose = function (mess) {
-			console.error("Close Streaming API:" + type);
-		}
+		
 	}
-	websocket[wsid].onerror = function (error) {
+	websocket.onerror = function (error) {
 		console.error('WebSocket Error ' + error);
 	};
+	websocket.onclose = function (mess) {
+		console.error("Close Streaming API:" + type);
+	}
 }
 //TLのタイトル
 function cap(type, data) {
@@ -134,3 +135,122 @@ $(function ($) {
 		}
 	});
 });
+function set() {
+	$("#menu").toggleClass("hide");
+	if($("#menu").hasClass("hide")){
+		$("#setting").text("Setting")
+	}else{
+		$("#setting").text("Close")
+	}
+}
+
+var multi = localStorage.getItem("multi");
+if (!multi) {
+	var obj = [
+		{
+			at: localStorage.getItem(localStorage.getItem("domain_" + acct_id) + "_at"),
+			name: localStorage.getItem("name_" + acct_id),
+			domain: localStorage.getItem("domain_" + acct_id),
+			user: localStorage.getItem("user_" + acct_id),
+			prof: localStorage.getItem("prof_" + acct_id)
+		}
+	];
+	var json = JSON.stringify(obj);
+	localStorage.setItem("multi", json);
+} else {
+	var obj = JSON.parse(multi);
+}
+var templete;
+var last = localStorage.getItem("last-use");
+var sel;
+Object.keys(obj).forEach(function(key) {
+	var acct = obj[key];
+	var list = key * 1 + 1;
+	if (key == last) {
+		sel = "selected";
+	} else {
+		sel = "";
+	}
+	templete = '<option value="' + key + '" ' + sel + ">" + acct.user + "@" + acct.domain + "</option>";
+	$("#post-acct-sel").append(templete);
+});
+function mov() {
+	return false;
+}
+function resetmv() {
+	return false;
+}
+function post() {
+	var acct_id = $("#post-acct-sel").val();
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "https://" + domain + "/api/v1/statuses";
+	var str = $("#textarea").val();
+	var toot = {
+		status: str
+	};
+	var vis = loadVis(acct_id);
+	toot.visibility = vis;
+	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(JSON.stringify(toot));
+	httpreq.onreadystatechange = function() {
+		if (httpreq.readyState === 4) {
+			$("#textarea").val("");
+		}
+	};
+}
+function loadVis(acct_id) {
+	var vist = localStorage.getItem("vis");
+	if (!vist) {
+		return "public";
+	} else {
+		if (vist == "memory") {
+			var memory = localStorage.getItem("vis-memory-" + acct_id);
+			if (!memory) {
+				memory = "public";
+			}
+			return memory;
+		} else if (vist == "server" || vist == "useapi") {
+			var multi = localStorage.getItem("multi");
+			var obj = JSON.parse(multi);
+			var memory = obj[acct_id]["vis"];
+			if (!memory) {
+				memory = "public";
+			}
+			return memory;
+		} else {
+			return vist;
+		}
+	}
+}
+function loader(){
+	var acct_id = $("#post-acct-sel").val()
+	console.log(loadVis(acct_id))
+	$("#vis-sel").val(loadVis(acct_id));
+}
+loader()
+$("textarea").height(15); //init
+$("textarea").css("lineHeight", "1rem"); //init
+
+$("textarea").on("input", function(evt) {
+	if (evt.target.scrollHeight > evt.target.offsetHeight) {
+		$(evt.target).height(evt.target.scrollHeight);
+	} else {
+		var lineHeight = Number(
+			$(evt.target)
+				.css("lineHeight")
+				.split("px")[0]
+		);
+		while (true) {
+			$(evt.target).height($(evt.target).height() - lineHeight);
+			if (evt.target.scrollHeight > evt.target.offsetHeight) {
+				$(evt.target).height(evt.target.scrollHeight);
+				break;
+			}
+		}
+	}
+});

app/js/platform/preload.js

@@ -1,180 +1,188 @@
 var electron = require("electron");
 const shell = electron.shell;
 var ipc = electron.ipcRenderer;
-onmessage = function (e) {
-    if (e.data[0] == "openUrl") {
-        urls = e.data[1].match(/https?:\/\/(.+)/);
-        if (urls) {
-            shell.openExternal(e.data[1]);
-        }
-    } else if (e.data[0] == "sendSinmpleIpc") {
-        ipc.send(e.data[1], "")
-    } else if (e.data[0] == "dialogStore") {
-        ipc.send("dialogStore", e.data[1])
-    } else if (e.data[0] == "bmpImage") {
-        ipc.send('bmp-image', e.data[1]);
-    } else if (e.data[0] == "dialogCW") {
-        ipc.send("dialogCW", e.data[1])
-    } else if (e.data[0] == "nativeNotf") {
-        console.log(e.data[1])
-        ipc.send('native-notf', e.data[1]);
-    } else if (e.data[0] == "dialogClient") {
-        ipc.send("dialogClient", e.data[1])
-    } else if (e.data[0] == "generalDL") {
-        ipc.send('general-dl', e.data[1]);
-    } else if (e.data[0] == "openFinder") {
-        ipc.send('open-finder', e.data[1]);
-    } else if (e.data[0] == "columnDel") {
-        ipc.send('column-del', e.data[1]);
-    } else if (e.data[0] == "lang") {
-        ipc.send('lang', e.data[1]);
-    } else if (e.data[0] == "exportSettings") {
-        ipc.send('exportSettings', e.data[1]);
-    }  else if (e.data[0] == "exportSettingsCoreComplete") {
-        ipc.send('export', e.data[1]);
-    } else if (e.data[0] == "importSettings") {
-        ipc.send('importSettings', e.data[1]);
-    } else if (e.data[0] == "customSound") {
-        ipc.send('customSound', e.data[1]);
-    } else if (e.data[0] == "themeJsonDelete") {
-        ipc.send('theme-json-delete', e.data[1]);
-    } else if (e.data[0] == "themeJsonCreate") {
-        ipc.send('theme-json-create', e.data[1]);
-    } else if (e.data[0] == "themeJsonRequest") {
-        ipc.send('theme-json-request', e.data[1]);
-    } else if (e.data[0] == "ha") {
-        ipc.send('ha', e.data[1]);
-    } else if (e.data[0] == "aboutData") {
-        ipc.send('aboutData', "");
-    } else if (e.data[0] == "itunes") {
-        console.log("NowPlaying")
-        ipc.send("itunes", e.data[1])
-    } else if (e.data[0] == "themeCSSRequest") {
-        ipc.send('theme-css-request', e.data[1]);
-    } else if (e.data[0] == "customCSSRequest") {
-        ipc.send('custom-css-request', e.data[1]);
-    } else if (e.data[0] == "downloadButton") {
-        ipc.send('download-btn', e.data[1]);
-    } else if (e.data[0] == "nano") {
-        ipc.send('nano', null);
-    } else if (e.data[0] == "asReadComp") {
-        ipc.send('sendMarkersComplete', null);
-    }
-}
+onmessage = function(e) {
+	if (e.data[0] == "openUrl") {
+		urls = e.data[1].match(/https?:\/\/(.+)/);
+		if (urls) {
+			shell.openExternal(e.data[1]);
+		}
+	} else if (e.data[0] == "sendSinmpleIpc") {
+		ipc.send(e.data[1], "");
+	} else if (e.data[0] == "dialogStore") {
+		ipc.send("dialogStore", e.data[1]);
+	} else if (e.data[0] == "bmpImage") {
+		ipc.send("bmp-image", e.data[1]);
+	} else if (e.data[0] == "dialogCW") {
+		ipc.send("dialogCW", e.data[1]);
+	} else if (e.data[0] == "nativeNotf") {
+		console.log(e.data[1]);
+		ipc.send("native-notf", e.data[1]);
+	} else if (e.data[0] == "dialogClient") {
+		ipc.send("dialogClient", e.data[1]);
+	} else if (e.data[0] == "generalDL") {
+		ipc.send("general-dl", e.data[1]);
+	} else if (e.data[0] == "openFinder") {
+		ipc.send("open-finder", e.data[1]);
+	} else if (e.data[0] == "columnDel") {
+		ipc.send("column-del", e.data[1]);
+	} else if (e.data[0] == "lang") {
+		ipc.send("lang", e.data[1]);
+	} else if (e.data[0] == "exportSettings") {
+		ipc.send("exportSettings", e.data[1]);
+	} else if (e.data[0] == "exportSettingsCoreComplete") {
+		ipc.send("export", e.data[1]);
+	} else if (e.data[0] == "importSettings") {
+		ipc.send("importSettings", e.data[1]);
+	} else if (e.data[0] == "customSound") {
+		ipc.send("customSound", e.data[1]);
+	} else if (e.data[0] == "themeJsonDelete") {
+		ipc.send("theme-json-delete", e.data[1]);
+	} else if (e.data[0] == "themeJsonCreate") {
+		ipc.send("theme-json-create", e.data[1]);
+	} else if (e.data[0] == "themeJsonRequest") {
+		ipc.send("theme-json-request", e.data[1]);
+	} else if (e.data[0] == "ha") {
+		ipc.send("ha", e.data[1]);
+	} else if (e.data[0] == "ua") {
+		ipc.send("ua", e.data[1]);
+	} else if (e.data[0] == "aboutData") {
+		ipc.send("aboutData", "");
+	} else if (e.data[0] == "itunes") {
+		console.log("NowPlaying");
+		ipc.send("itunes", e.data[1]);
+	} else if (e.data[0] == "themeCSSRequest") {
+		ipc.send("theme-css-request", e.data[1]);
+	} else if (e.data[0] == "customCSSRequest") {
+		ipc.send("custom-css-request", e.data[1]);
+	} else if (e.data[0] == "downloadButton") {
+		ipc.send("download-btn", e.data[1]);
+	} else if (e.data[0] == "nano") {
+		ipc.send("nano", null);
+	} else if (e.data[0] == "asReadComp") {
+		ipc.send("sendMarkersComplete", null);
+	} else if (e.data[0] == "copy") {
+		ipc.send("copy", e.data[1]);
+	}
+};
 //version.js
-ipc.send("getPlatform", "")
-ipc.on('platform', function (event, args) {
-    localStorage.setItem("platform", args[0])
-    localStorage.setItem("bit", args[1])
-    localStorage.setItem("about", JSON.stringify([args[2], args[3], args[4], args[5]]))
-})
+ipc.send("getPlatform", "");
+ipc.on("platform", function(event, args) {
+	localStorage.setItem("platform", args[0]);
+	localStorage.setItem("bit", args[1]);
+	localStorage.setItem("about", JSON.stringify([args[2], args[3], args[4], args[5]]));
+});
 
-ipc.on('reload', function (event, arg) {
-    location.reload();
-})
+ipc.on("reload", function(event, arg) {
+	location.reload();
+});
 //Native Notf
-ipc.on('shownotf', function (event, args) {
-    if (args["type"] == "toot") {
-        postMessage(["details", [id, acct_id]], "*")
-    } else if (args["type"] == "userdata") {
-        postMessage(["udg", [user, acct_id]], "*")
-    }
-})
+ipc.on("shownotf", function(event, args) {
+	if (args["type"] == "toot") {
+		postMessage(["details", [id, acct_id]], "*");
+	} else if (args["type"] == "userdata") {
+		postMessage(["udg", [user, acct_id]], "*");
+	}
+});
 
 //first.js
-ipc.on('custom-css-response', function (event, arg) {
-    if (arg == "") { return false; }
-    var styleNode = document.createElement("style");
-    styleNode.setAttribute("type", "text/css")
+ipc.on("custom-css-response", function(event, arg) {
+	if (arg == "") {
+		return false;
+	}
+	var styleNode = document.createElement("style");
+	styleNode.setAttribute("type", "text/css");
 
-    var content = document.createTextNode(arg)
-    styleNode.append(content)
-    document.getElementsByTagName("head")[0].append(styleNode)
-})
-ipc.on('theme-css-response', function (event, arg) {
-    if (arg == "") { return false; }
-    var styleNode = document.createElement("style");
-    styleNode.setAttribute("type", "text/css")
+	var content = document.createTextNode(arg);
+	styleNode.append(content);
+	document.getElementsByTagName("head")[0].append(styleNode);
+});
+ipc.on("theme-css-response", function(event, arg) {
+	if (arg == "") {
+		return false;
+	}
+	var styleNode = document.createElement("style");
+	styleNode.setAttribute("type", "text/css");
 
-    var content = document.createTextNode(arg)
-    styleNode.append(content)
-    document.getElementsByTagName("head")[0].append(styleNode)
-})
+	var content = document.createTextNode(arg);
+	styleNode.append(content);
+	document.getElementsByTagName("head")[0].append(styleNode);
+});
 //img.js
-ipc.on('bmp-img-comp', function (event, b64) {
-    postMessage(["media", [b64[0], "image/png", b64[1]]], "*")
+ipc.on("bmp-img-comp", function(event, b64) {
+	postMessage(["media", [b64[0], "image/png", b64[1]]], "*");
 });
 //ui,img.js
-ipc.on('general-dl-prog', function (event, arg) {
-    console.log("Progress: " + arg);
-})
-ipc.on('general-dl-message', function (event, arg) {
-    var argC = arg.replace(/\\/g, "\\\\") + "\\\\.";
-    console.log("saved")
-    postMessage(["toastSaved", [arg, argC]], "*")
-})
+ipc.on("general-dl-prog", function(event, arg) {
+	console.log("Progress: " + arg);
+});
+ipc.on("general-dl-message", function(event, arg) {
+	var argC = arg.replace(/\\/g, "\\\\") + "\\\\.";
+	console.log("saved");
+	postMessage(["toastSaved", [arg, argC]], "*");
+});
 //setting.js
-ipc.on('langres', function (event, arg) {
-    location.href = "../" + arg + "/setting.html"
+ipc.on("langres", function(event, arg) {
+	location.href = "../" + arg + "/setting.html";
 });
-ipc.on('exportSettingsFile', function (event, arg) {
-    postMessage(["exportSettingsCore", arg], "*")
+ipc.on("exportSettingsFile", function(event, arg) {
+	postMessage(["exportSettingsCore", arg], "*");
 });
-ipc.on('exportAllComplete', function (event, arg) {
-    postMessage(["alert", "Complete"], "*")
+ipc.on("exportAllComplete", function(event, arg) {
+	postMessage(["alert", "Complete"], "*");
 });
-ipc.on('config', function (event, arg) {
-    postMessage(["importSettingsCore", arg], "*")
+ipc.on("config", function(event, arg) {
+	postMessage(["importSettingsCore", arg], "*");
 });
-ipc.on('savefolder', function (event, arg) {
-    localStorage.setItem("savefolder", arg);
+ipc.on("savefolder", function(event, arg) {
+	localStorage.setItem("savefolder", arg);
 });
-ipc.on('font-list', function (event, arg) {
-    postMessage(["fontList", arg], "*")
+ipc.on("font-list", function(event, arg) {
+	postMessage(["fontList", arg], "*");
 });
-ipc.on('customSoundRender', function (event, args) {
-    postMessage(["customSoundSave", [args[0], args[1]]], "*")
+ipc.on("customSoundRender", function(event, args) {
+	postMessage(["customSoundSave", [args[0], args[1]]], "*");
 });
-ipc.on('theme-json-list-response', function (event, args) {
-    postMessage(["ctLoadCore", args], "*")
+ipc.on("theme-json-list-response", function(event, args) {
+	postMessage(["ctLoadCore", args], "*");
 });
-ipc.on('theme-json-delete-complete', function (event, args) {
-    postMessage(["ctLoad", ""], "*")
+ipc.on("theme-json-delete-complete", function(event, args) {
+	postMessage(["ctLoad", ""], "*");
 });
-ipc.on('theme-json-response', function (event, args) {
-    postMessage(["customConnect", args], "*")
+ipc.on("theme-json-response", function(event, args) {
+	postMessage(["customConnect", args], "*");
 });
-ipc.on('theme-json-create-complete', function (event, args) {
-    postMessage(["clearCustomImport", ""], "*")
-    postMessage(["ctLoad", ""], "*")
+ipc.on("theme-json-create-complete", function(event, args) {
+	postMessage(["clearCustomImport", ""], "*");
+	postMessage(["ctLoad", ""], "*");
 });
 //spotify.js
-ipc.on('itunes-np', function (event, arg) {
-    postMessage(["npCore", arg], "*")
-})
+ipc.on("itunes-np", function(event, arg) {
+	postMessage(["npCore", arg], "*");
+});
 //tips.js
-ipc.on('memory', function (event, arg) {
-    var use = arg[0];
-    var cpu = arg[1];
-    var total = arg[2]
-    postMessage(["renderMem", [use, cpu, total]], "*")
-})
+ipc.on("memory", function(event, arg) {
+	var use = arg[0];
+	var cpu = arg[1];
+	var total = arg[2];
+	postMessage(["renderMem", [use, cpu, total]], "*");
+});
 //update.html
-ipc.on('prog', function (event, arg) {
-    postMessage(["updateProg", arg], "*")
-})
-ipc.on('mess', function (event, arg) {
-    postMessage(["updateMess", arg], "*")
-})
-ipc.on('asRead', function (event, arg) {
-    postMessage(["asRead", ""], "*")
-})
-ipc.on('asReadEnd', function (event, arg) {
-    postMessage(["asReadEnd", ""], "*")
-})
-var webviewDom = document.getElementById('webview');
+ipc.on("prog", function(event, arg) {
+	postMessage(["updateProg", arg], "*");
+});
+ipc.on("mess", function(event, arg) {
+	postMessage(["updateMess", arg], "*");
+});
+ipc.on("asRead", function(event, arg) {
+	postMessage(["asRead", ""], "*");
+});
+ipc.on("asReadEnd", function(event, arg) {
+	postMessage(["asReadEnd", ""], "*");
+});
+var webviewDom = document.getElementById("webview");
 if (webviewDom) {
-    webviewDom.addEventListener('new-window', function (e) {
-        shell.openExternal(e.url);
-    });
+	webviewDom.addEventListener("new-window", function(e) {
+		shell.openExternal(e.url);
+	});
 }

app/js/post/img.js

@@ -2,36 +2,35 @@
 var obj = $("body");
 var system;
 //ドラッグスタート
-obj.on('dragstart', function (e) {
-	system = "locked"
+obj.on("dragstart", function(e) {
+	system = "locked";
 });
 //何もなくファイルが通過
-obj.on('dragend', function (e) {
+obj.on("dragend", function(e) {
 	system = "";
 });
 //ドラッグファイルが画面上に
-obj.on('dragenter', function (e) {
+obj.on("dragenter", function(e) {
 	if (system != "locked") {
-		$("#drag").css('display', 'flex');
+		$("#drag").css("display", "flex");
 	}
-
 });
-$("body").on('dragover', function (e) {
+$("body").on("dragover", function(e) {
 	e.stopPropagation();
 	e.preventDefault();
 });
 //ドロップした
-$("body").on('drop', function (e) {
+$("body").on("drop", function(e) {
 	if (system != "locked") {
-		$("#drag").css('display', 'none');
+		$("#drag").css("display", "none");
 		e.preventDefault();
 		var files = e.originalEvent.dataTransfer.files;
 		pimg(files);
 	}
 });
 //何もなくファイルが通過
-$("#drag").on('dragleave', function (e) {
-	$("#drag").css('display', 'none');
+$("#drag").on("dragleave", function(e) {
+	$("#drag").css("display", "none");
 });
 
 //複数アップ
@@ -40,9 +39,8 @@ function pimg(files) {
 	for (i = 0; i < files.length; i++) {
 		var dot = files[i].path.match(/\.(.+)$/)[1];
 		if (dot == "bmp" || dot == "BMP") {
-			postMessage(["bmpImage", [files[i].path, i]], "*")
+			postMessage(["bmpImage", [files[i].path, i]], "*");
 			todo(lang.lang_progress);
-
 		} else {
 			handleFileUpload(files[i], obj, i);
 		}
@@ -50,21 +48,21 @@ function pimg(files) {
 }
 //ドラッグ・アンド・ドロップを終了
 function closedrop() {
-	$("#drag").css('display', 'none');
+	$("#drag").css("display", "none");
 }
 //ファイル選択
 function fileselect() {
-	postMessage(["sendSinmpleIpc", "file-select"], "*")
+	postMessage(["sendSinmpleIpc", "file-select"], "*");
 }
 
 //ファイル読み込み
 function handleFileUpload(files, obj, no) {
 	var fr = new FileReader();
-	fr.onload = function (evt) {
+	fr.onload = function(evt) {
 		var b64 = evt.target.result;
-		$('#b64-box').val(b64);
-		var ret = media(b64, files["type"], no)
-	}
+		$("#b64-box").val(b64);
+		var ret = media(b64, files["type"], no);
+	};
 	fr.readAsDataURL(files);
 	$("#mec").append(files["name"] + "/");
 }
@@ -79,7 +77,7 @@ function media(b64, type, no) {
 		r += c[Math.floor(Math.random() * cl)];
 	}
 	if ($("#media").val()) {
-		$("#media").val($("#media").val() + ',' + "tmp_" + r);
+		$("#media").val($("#media").val() + "," + "tmp_" + r);
 	} else {
 		$("#media").val("tmp_" + r);
 	}
@@ -89,14 +87,14 @@ function media(b64, type, no) {
 	todo("Image Upload...");
 	var media = toBlob(b64, type);
 	var fd = new FormData();
-	fd.append('file', media);
+	fd.append("file", media);
 	var acct_id = $("#post-acct-sel").val();
 	var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	var httpreq = new XMLHttpRequest();
 	if (localStorage.getItem("mode_" + domain) == "misskey") {
 		var start = "https://" + domain + "/api/drive/files/create";
-		httpreq.open('POST', start, true);
+		httpreq.open("POST", start, true);
 		httpreq.upload.addEventListener("progress", progshow, false);
 		httpreq.responseType = "json";
 		if ($("#nsfw").hasClass("nsfw-avail")) {
@@ -104,20 +102,20 @@ function media(b64, type, no) {
 		} else {
 			var nsfw = false;
 		}
-		var previewer = "url"
-		fd.append('i', at);
+		var previewer = "url";
+		fd.append("i", at);
 		//fd.append('isSensitive', nsfw);
 		httpreq.send(fd);
 	} else {
-		var previewer = "preview_url"
+		var previewer = "preview_url";
 		var start = "https://" + domain + "/api/v1/media";
-		httpreq.open('POST', start, true);
+		httpreq.open("POST", start, true);
 		httpreq.upload.addEventListener("progress", progshow, false);
 		httpreq.responseType = "json";
-		httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
+		httpreq.setRequestHeader("Authorization", "Bearer " + at);
 		httpreq.send(fd);
 	}
-	httpreq.onreadystatechange = function () {
+	httpreq.onreadystatechange = function() {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
 			if (!json.id) {
@@ -125,17 +123,17 @@ function media(b64, type, no) {
 				$("#imgup").text("");
 				$(".toot-btn-group").prop("disabled", false);
 				$("#post-acct-sel").prop("disabled", false);
-				$('select').formSelect();
+				$("select").formSelect();
 				$("#imgsel").show();
-				M.toast({ html: lang.lang_postimg_failupload, displayLength: 5000 })
-				return false
+				M.toast({ html: lang.lang_postimg_failupload, displayLength: 5000 });
+				return false;
 			}
 			var img = localStorage.getItem("img");
 			if (json.type.indexOf("image") != -1) {
-				var html = '<img src="' + json[previewer] + '" class="preview-img pointer" data-media="' + json["id"] + '" onclick="deleteImage(\'' + json["id"] + '\')" title="' + lang.lang_postimg_delete + '">';
-				$('#preview').append(html);
+				var html = '<img src="' + json[previewer] + '" class="preview-img pointer" data-media="' + json["id"] + '" oncontextmenu="deleteImage(\'' + json["id"] + "')\" onclick=\"altImage('" + acct_id + "','" + json["id"] + '\')" title="' + lang.lang_postimg_delete + '">';
+				$("#preview").append(html);
 			} else {
-				$('#preview').append(lang.lang_postimg_previewdis);
+				$("#preview").append(lang.lang_postimg_previewdis);
 			}
 			if (!img) {
 				var img = "no-act";
@@ -145,26 +143,30 @@ function media(b64, type, no) {
 				var regExp = new RegExp("tmp_" + r, "g");
 				mediav = mediav.replace(regExp, json["id"]);
 				$("#media").val(mediav);
-
 			}
 			if (img == "url") {
-				$("#textarea").val($("#textarea").val() + " " + json["text_url"])
+				$("#textarea").val($("#textarea").val() + " " + json["text_url"]);
 			}
 			todc();
+			if (localStorage.getItem("nsfw_" + acct_id)) {
+				$("#nsfw").addClass("yellow-text");
+				$("#nsfw").html("visibility");
+				$("#nsfw").addClass("nsfw-avail");
+			}
 			$(".toot-btn-group").prop("disabled", false);
-			$('select').formSelect();
+			$("select").formSelect();
 			$("#mec").text(lang.lang_there);
-			M.toast({ html: lang.lang_postimg_aftupload, displayLength: 1000 })
+			M.toast({ html: lang.lang_postimg_aftupload, displayLength: 1000 });
 			$("#imgup").text("");
 			$("#imgsel").show();
 			localStorage.removeItem("image");
 		}
-	}
+	};
 }
 
 //Base64からBlobへ
 function toBlob(base64, type) {
-	var bin = atob(base64.replace(/^.*,/, ''));
+	var bin = atob(base64.replace(/^.*,/, ""));
 	var buffer = new Uint8Array(bin.length);
 	for (var i = 0; i < bin.length; i++) {
 		buffer[i] = bin.charCodeAt(i);
@@ -182,14 +184,14 @@ function toBlob(base64, type) {
 }
 //画像を貼り付けたら…
 var element = document.querySelector("#textarea");
-element.addEventListener("paste", function (e) {
+element.addEventListener("paste", function(e) {
 	if (!e.clipboardData || !e.clipboardData.items) {
 		return true;
 	}
 	// DataTransferItemList に画像が含まれいない場合は終了する
-	var imageItems = [...e.clipboardData.items].filter(i => i.type.startsWith('image'));
+	var imageItems = [...e.clipboardData.items].filter(i => i.type.startsWith("image"));
 	if (imageItems.length == 0) {
-		console.warn("it is not image")
+		console.warn("it is not image");
 		return true;
 	}
 
@@ -200,7 +202,7 @@ element.addEventListener("paste", function (e) {
 
 	// FileReaderで読み込む
 	var fr = new FileReader();
-	fr.onload = function (e) {
+	fr.onload = function(e) {
 		// onload内ではe.target.resultにbase64が入っているのであとは煮るなり焼くなり
 		var base64 = e.target.result;
 		var mediav = $("#media").val();
@@ -208,7 +210,7 @@ element.addEventListener("paste", function (e) {
 			var i = mediav.split(",").length;
 		}
 		// DataTransferItem の type に mime tipes があるのでそれを使う
-		media(base64, imageType, i)
+		media(base64, imageType, i);
 	};
 	fr.readAsDataURL(imageFile);
 
@@ -217,13 +219,13 @@ element.addEventListener("paste", function (e) {
 function deleteImage(key) {
 	Swal.fire({
 		title: lang.lang_postimg_delete,
-		type: 'warning',
+		type: "warning",
 		showCancelButton: true,
-		confirmButtonColor: '#3085d6',
-		cancelButtonColor: '#d33',
+		confirmButtonColor: "#3085d6",
+		cancelButtonColor: "#d33",
 		confirmButtonText: lang.lang_yesno,
 		cancelButtonText: lang.lang_no
-	}).then((result) => {
+	}).then(result => {
 		if (result.value) {
 			var media = $("#media").val();
 			var arr = media.split(",");
@@ -234,8 +236,54 @@ function deleteImage(key) {
 				}
 			}
 			$("#media").val(arr.join(","));
-			$('#preview [data-media=' + key + ']').remove();
+			$("#preview [data-media=" + key + "]").remove();
 		}
-	})
+	});
+}
+function altImage(acct_id, id) {
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var start = "https://" + domain + "/api/v1/media/" + id;
 
-}
+	Swal.fire({
+		title: lang.lang_postimg_desc,
+		text: lang.lang_postimg_leadContext,
+		input: "text",
+		inputAttributes: {
+			autocapitalize: "off"
+		},
+		showCancelButton: true,
+		confirmButtonText: "Post",
+		showLoaderOnConfirm: true,
+		preConfirm: data => {
+			return fetch(start, {
+				method: "PUT",
+				headers: {
+					"content-type": "application/json",
+					Authorization: "Bearer " + at
+				},
+				body: JSON.stringify({
+					description: data
+				})
+			})
+				.then(function(response) {
+					return response.json();
+				})
+				.catch(function(error) {
+					todo(error);
+					console.error(error);
+				})
+				.then(function(json) {
+					console.log(json)
+					$("[data-media=" + id + "]").attr("title", data);
+				});
+		},
+		allowOutsideClick: () => !Swal.isLoading()
+	}).then(result => {
+		if (result.value) {
+			Swal.fire({
+				title: "Complete",
+			});
+		}
+	});
+}

app/js/post/post.js

@@ -288,10 +288,20 @@ function clear() {
 	if (localStorage.getItem("mainuse") == "main") {
 		$("#post-acct-sel").val(localStorage.getItem("main"));
 	}
+	$("#emoji").addClass("hide")
 	$('select').formSelect();
-	mdCheck()
-	$("#left-side").show();
 	$("#default-emoji").show();
 	$("#unreact").show();
 	$("#addreact").addClass("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
+	} else {
+		width = 300
+	}
+	$("#post-box").css("width", width)
+	mdCheck()
 }

app/js/post/suggest.js

@@ -57,7 +57,7 @@ input.addEventListener("focus", function () {
 					if (width) {
 						width = width.replace("px", "") * 1 + 200
 					} else {
-						width = 600
+						width = 500
 					}
 					$("#post-box").css("width", width + "px")
 					$("#poll").addClass("hide")
@@ -161,7 +161,7 @@ input.addEventListener("focus", function () {
 							if (width) {
 								width = width.replace("px", "") * 1 + 200
 							} else {
-								width = 600
+								width = 500
 							}
 							$("#post-box").css("width", width + "px")
 							$("#poll").addClass("hide")
@@ -186,7 +186,7 @@ input.addEventListener("focus", function () {
 						if (width) {
 							width = width.replace("px", "") * 1 + 200
 						} else {
-							width = 600
+							width = 500
 						}
 						$("#post-box").css("width", width + "px")
 						$("#suggest").html(accts);

app/js/tl/card.js

@@ -238,6 +238,7 @@ function cardCheck(tlid) {
 }
 
 function mov(id, tlid, type) {
+	var click = false
 	if (tlid == "notf") {
 		var tlide = "[data-notf=" + acct_id + "]";
 	} else if (tlid == "user") {
@@ -257,12 +258,21 @@ function mov(id, tlid, type) {
 		} else {
 			mouseover = "hide";
 		}
+		click=true
 	} else if (mouseover == "no") {
 		mouseover = "";
 	}
 	if (mouseover == "hide") {
-		$(tlide + " [toot-id=" + id + "] .area-actions").toggleClass("hide")
-		$(tlide + " [toot-id=" + id + "] .area-side").toggleClass("hide")
+		if(click){
+			$(tlide + " [toot-id=" + id + "]").toggleClass("hide-actions")
+		}else{
+			$(tlide + " [toot-id=" + id + "]").removeClass("hide-actions")
+		}
+		
+		//$(tlide + " [toot-id=" + id + "] .area-vis").toggleClass("hide")
+		//$(tlide + " [toot-id=" + id + "] .area-actions").toggleClass("hide")
+		//$(tlide + " [toot-id=" + id + "] .area-side").toggleClass("hide")
+	
 	}
 }
 
@@ -278,8 +288,10 @@ function resetmv(type) {
 		mouseover = "hide";
 	}
 	if (mouseover == "hide") {
-		$(".area-actions").addClass("hide");
-		$(".area-side").addClass("hide");
+		$(".cvo").addClass("hide-actions")
+		//$(".area-vis").addClass("hide");
+		//$(".area-actions").addClass("hide");
+		//$(".area-side").addClass("hide");
 	}
 
 }

app/js/tl/datails.js

@@ -520,7 +520,7 @@ function detEx(url, acct_id) {
 	}
 	var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
-	var start = "https://" + domain + "/api/v1/search?resolve=true&q=" + url
+	var start = "https://" + domain + "/api/v2/search?resolve=true&q=" + url
 	fetch(start, {
 		method: 'GET',
 		headers: {

app/js/tl/misskeyparse.js

@@ -268,19 +268,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 						body: toot.user.name + "(" + toot.user.username + ")" + what + "\n\n" + $.strip_tagstemp(toot.note.text),
 						icon: toot.user.avatarUrl
 					};
-					if (os == "darwin") {
-						var n = new Notification('TheDesk:' + domain, options);
-					} else {
-						var nativeNotfOpt = [
-							'TheDesk:' + domain,
-							toot.user.name + "(" + toot.user.username + ")" + what + "\n\n" + $.strip_tagstemp(toot.note.text),
-							toot.user.avatarUrl,
-							"toot",
-							acct_id,
-							toot.note.id
-						]
-						postMessage(["nativeNotf", nativeNotfOpt], "*")
-					}
+					var n = new Notification('TheDesk:' + domain, options);
 				}
 				if (localStorage.getItem("hasNotfC_" + acct_id) != "true") {
 					$(".notf-icon_" + acct_id).addClass("red-text");
@@ -917,19 +905,7 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
 					icon: toot.avatar
 				};
 				var domain = localStorage.getItem("domain_" + acct_id);
-				if (os == "darwin") {
-					var n = new Notification('TheDesk:' + domain, options);
-				} else {
-					var nativeNotfOpt = [
-						'TheDesk:' + domain,
-						toot.display_name + "(" + toot.acct + ")" + ftxt,
-						toot.avatar,
-						"userdata",
-						acct_id,
-						toot.id
-					]
-					postMessage(["nativeNotf", nativeNotfOpt], "*")
-				}
+				var n = new Notification('TheDesk:' + domain, options);
 			}
 		}
 		if (toot.name) {

app/js/tl/notification.js

@@ -63,12 +63,7 @@ function notfColumn(acct_id, tlid, sys) {
 							body: ct + lang.lang_notf_new,
 							icon: localStorage.getItem("prof_" + acct_id)
 						};
-						if (os == "darwin") {
-							var n = new Notification('TheDesk:' + domain, options);
-						} else {
-							var nativeNotfOpt = ['TheDesk:' + domain, ct + lang.lang_notf_new, localStorage.getItem("prof_" + acct_id)]
-							postMessage(["nativeNotf", nativeNotfOpt], "*")
-						}
+						var n = new Notification('TheDesk:' + domain, options);
 
 					}
 					if (localStorage.getItem("filter_" + acct_id) != "undefined") {
@@ -178,12 +173,7 @@ function notfCommon(acct_id, tlid, sys) {
 						body: ct + lang.lang_notf_new,
 						icon: localStorage.getItem("prof_" + acct_id)
 					};
-					if (os == "darwin") {
-						var n = new Notification('TheDesk:' + domain, options);
-					} else {
-						var nativeNotfOpt = ['TheDesk:' + domain, ct + lang.lang_notf_new, localStorage.getItem("prof_" + acct_id)]
-						postMessage(["nativeNotf", nativeNotfOpt], "*")
-					}
+					var n = new Notification('TheDesk:' + domain, options);
 
 				}
 				if (localStorage.getItem("filter_" + acct_id) != "undefined") {

app/js/ui/img.js

@@ -281,4 +281,7 @@ function dlImg() {
 }
 function openFinder(dir) {
 	postMessage(["openFinder", dir], "*")
+}
+function stopVideo(){
+	document.getElementById('video').pause()
 }

app/js/ui/layout.js

@@ -546,6 +546,7 @@ function coloradd(key, bg, txt) {
 	if (txt == "def") {
 		$("#menu_" + key).css("background-color", "");
 		$("#menu_" + key).css("color", "");
+		$("#menu_" + key + " .nex").css("color", "");
 	} else {
 		$("#menu_" + key).css('background-color', '#' + bg);
 		if (txt == "black") {

app/js/ui/post-box.js

@@ -55,6 +55,7 @@ function show() {
 	}
 	$('#post-box').fadeIn();
 	$('#textarea').characterCounter();
+	mdCheck()
 }
 
 $(function () {

app/js/ui/settings.js

@@ -14,6 +14,9 @@ var envView = new Vue({
 			if (ls == "ha") {
 				hardwareAcceleration(val)
 			}
+			if (ls == "ua_setting") {
+				useragent(val)
+			}
 			return true
 		}
 	}
@@ -71,7 +74,7 @@ var postView = new Vue({
 //設定ボタン押した。
 function settings() {
 	var cd = $("[name=theme]:checked").val();
-	var ct = $("[for=" + cd + "]").html();
+	var ct = $("[data-ct=" + cd + "]").html();
 	if (cd == "custom" && !$("#custom-sel-sel").val()) {
 		var theme = localStorage.getItem("theme");
 		if (!theme) {
@@ -258,12 +261,7 @@ function notftest() {
 		body: lang.lang_setting_notftest + '(' + lang.lang_setting_notftestprof + ')',
 		icon: localStorage.getItem("prof_0")
 	};
-	if (os == "darwin") {
-		var n = new Notification('TheDesk' + lang.lang_setting_notftest, options);
-	} else {
-		var nativeNotfOpt = ['TheDesk' + lang.lang_setting_notftest, lang.lang_setting_notftest + '(' + lang.lang_setting_notftestprof + ')', localStorage.getItem('prof_0'), "", ""]
-		postMessage(["nativeNotf", nativeNotfOpt], "*")
-	}
+	var n = new Notification('TheDesk' + lang.lang_setting_notftest, options);
 
 }
 function oks(no) {
@@ -523,14 +521,38 @@ function customComp() {
 	if (!secondaryC) { secondaryC = "rgb(255,255,255)" }
 	var textC = $("#color-picker2_value").val();
 	if (!textC) { textC = "rgb(255,255,255)" }
-	var accentC = $("#color-picker3_value").val();
-	if (!accentC) { accentC = "rgb(255,255,255)" }
 	var multi = localStorage.getItem("multi");
+	if($("#pickers").hasClass("advanceTheme")){
+		var accentC = $("#color-picker3_value").val();
+		if (!accentC) { accentC = null }
+		var activeC = $("#color-picker4_value").val();
+		if (!activeC) { activeC = null }
+		var modalC = $("#color-picker5_value").val();
+		if (!modalC) { modalC = null }
+		var bottomC = $("#color-picker6_value").val();
+		if (!bottomC) { bottomC = null }
+		var postboxC = $("#color-picker7_value").val();
+		if (!postboxC) { postboxC = null }
+		var subcolorC = $("#color-picker8_value").val();
+		if (!subcolorC) { subcolorC = null }
+		var advanceTheme = {
+			"TheDeskAccent": accentC,
+			"TheDeskActive": activeC,
+			"TheDeskModal": modalC,
+			"TheDeskBottom": bottomC,
+			"TheDeskPostbox": postboxC,
+			"TheDeskSubcolor": subcolorC
+		}
+	}else{
+		var advanceTheme = {}
+	}
+	
 	var my = JSON.parse(multi)[0].name;
 	var id = $("#custom-edit-sel").val();
 	if (id == "add_new") {
 		id = makeCID();
 	}
+	localStorage.setItem("customtheme-id", id)
 	var json = {
 		"name": nameC,
 		"author": my,
@@ -541,29 +563,21 @@ function customComp() {
 			"secondary": secondaryC,
 			"text": textC
 		},
-		"props": {
-			"TheDeskAccent": accentC
-		},
+		"props": advanceTheme,
 		"id": id
 	}
 	$("#custom_json").val(JSON.stringify(json));
-	themes();
+	themes("custom");
+	$("#custom").prop("checked", true);
 	$("#custom_name").val("");
 	$("#custom_desc").val("");
 	$("#dark").prop("checked", true);
 	$("#custom_json").val("");
-	$("#color-picker0-wrap").html('<div class="color-picker" id="color-picker0"></div>')
-	$("#color-picker1-wrap").html('<div class="color-picker" id="color-picker1"></div>')
-	$("#color-picker2-wrap").html('<div class="color-picker" id="color-picker2"></div>')
-	$("#color-picker3-wrap").html('<div class="color-picker" id="color-picker3"></div>')
-	$("#color-picker0_value").val("");
-	$("#color-picker1_value").val("");
-	$("#color-picker2_value").val("");
-	$("#color-picker3_value").val("");
-	pickerDefine(0, "fff");
-	pickerDefine(1, "fff");
-	pickerDefine(2, "fff");
-	pickerDefine(3, "fff");
+	for(var i =0;i <= 8; i++){
+		$("#color-picker" + i + "-wrap").html('<div class="color-picker" id="color-picker' + i + '"></div>')
+		$("#color-picker" + i + "_value").val("");
+		pickerDefine(i, "fff");
+	}
 	postMessage(["themeJsonCreate", JSON.stringify(json)], "*")
 }
 function deleteIt() {
@@ -572,18 +586,11 @@ function deleteIt() {
 	$("#custom_desc").val("");
 	$("#dark").prop("checked", true);
 	$("#custom_json").val("");
-	$("#color-picker0-wrap").html('<div class="color-picker" id="color-picker0"></div>')
-	$("#color-picker1-wrap").html('<div class="color-picker" id="color-picker1"></div>')
-	$("#color-picker2-wrap").html('<div class="color-picker" id="color-picker2"></div>')
-	$("#color-picker3-wrap").html('<div class="color-picker" id="color-picker3"></div>')
-	$("#color-picker0_value").val("");
-	$("#color-picker1_value").val("");
-	$("#color-picker2_value").val("");
-	$("#color-picker3_value").val("");
-	pickerDefine(0, "fff");
-	pickerDefine(1, "fff");
-	pickerDefine(2, "fff");
-	pickerDefine(3, "fff");
+	for(var i =0;i <= 8; i++){
+		$("#color-picker" + i + "-wrap").html('<div class="color-picker" id="color-picker' + i + '"></div>')
+		$("#color-picker" + i + "_value").val("");
+		pickerDefine(i, "fff");
+	}
 	postMessage(["themeJsonDelete", id], "*")
 }
 function ctLoad() {
@@ -615,49 +622,58 @@ function custom() {
 		$("#custom_desc").val("");
 		$("#dark").prop("checked", true);
 		$("#custom_json").val("");
-		$("#color-picker0-wrap").html('<div class="color-picker" id="color-picker0"></div>')
-		$("#color-picker1-wrap").html('<div class="color-picker" id="color-picker1"></div>')
-		$("#color-picker2-wrap").html('<div class="color-picker" id="color-picker2"></div>')
-		$("#color-picker3-wrap").html('<div class="color-picker" id="color-picker3"></div>')
-		$("#color-picker0_value").val("");
-		$("#color-picker1_value").val("");
-		$("#color-picker2_value").val("");
-		$("#color-picker3_value").val("");
-		pickerDefine(0, "fff");
-		pickerDefine(1, "fff");
-		pickerDefine(2, "fff");
-		pickerDefine(3, "fff");
+		for(var i =0;i <= 8; i++){
+			$("#color-picker" + i + "-wrap").html('<div class="color-picker" id="color-picker' + i + '"></div>')
+			$("#color-picker" + i + "_value").val("");
+			pickerDefine(i, "fff");
+		}
 		$("#delTheme").addClass("disabled")
 	} else {
 		$("#delTheme").removeClass("disabled")
 		postMessage(["themeJsonRequest", id], "*")
 	}
 }
-function customConnect(args) {
+function customConnect(raw) {
+	var args = raw[0]
 	$("#custom_name").val(args.name);
 	$("#custom_desc").val(args.desc);
 	$("#" + args.base).prop("checked", true);
+	//Primary
 	$("#color-picker0-wrap").html('<div class="color-picker" id="color-picker0"></div>')
 	pickerDefine(0, rgbToHex(args.vars.primary))
 	$("#color-picker0_value").val(args.vars.primary);
+	//Secondary
 	$("#color-picker1-wrap").html('<div class="color-picker" id="color-picker1"></div>')
 	pickerDefine(1, rgbToHex(args.vars.secondary))
 	$("#color-picker1_value").val(args.vars.secondary);
+	//Text
 	$("#color-picker2-wrap").html('<div class="color-picker" id="color-picker2"></div>')
 	$("#color-picker2_value").val(args.vars.text);
 	pickerDefine(2, rgbToHex(args.vars.text))
+	//TheDesk Only
+	advancedConncet(args, "TheDeskAccent", "secondary", 3)
+	advancedConncet(args, "TheDeskActive", "primary", 4)
+	advancedConncet(args, "TheDeskModal", "secondary", 5)
+	advancedConncet(args, "TheDeskBottom", "primary", 6)
+	advancedConncet(args, "TheDeskPostbox", "primary", 7)
+	advancedConncet(args, "TheDeskSubcolor", "primary", 8)
+	$("#custom_json").val(raw[1]);
+}
+function advancedConncet(args, tar, sub, i){
 	if (args.props) {
-		if (args.props.TheDeskAccent) {
-			var accent = args.props.TheDeskAccent;
+		if (args.props[tar]) {
+			var color = args.props[tar];
+			$("#pickers").addClass("advanceTheme")
+			$(".advanced").removeClass("hide")
 		} else {
-			var accent = args.vars.secondary;
+			var color = args.vars[sub];
 		}
 	} else {
-		var accent = args.vars.secondary;
+		var color = args.vars[sub];
 	}
-	$("#color-picker3-wrap").html('<div class="color-picker" id="color-picker3"></div>')
-	pickerDefine(3, rgbToHex(accent))
-	$("#custom_json").val(JSON.stringify(args));
+	$("#color-picker"+i+"-wrap").html('<div class="color-picker" id="color-picker'+i+'"></div>')
+	$("#color-picker"+i+"_value").val(color);
+	pickerDefine(i, rgbToHex(color))
 }
 function customImp() {
 	var json = $("#custom_import").val();
@@ -670,12 +686,19 @@ function customImp() {
 		})
 	}
 }
+function advanced(){
+	$(".advanced").toggleClass("hide")
+	$("#pickers").toggleClass("advanceTheme")
+}
 function clearCustomImport() {
 	$("#custom_import").val("");
 }
 function hardwareAcceleration(had) {
 	postMessage(["ha", had], "*")
 }
+function useragent(val){
+	postMessage(["ua", val], "*")
+}
 function customSound(key) {
 	postMessage(["customSound", key], "*")
 }
@@ -698,3 +721,41 @@ window.onload = function () {
 function asReadEnd() {
 	postMessage(["asReadComp", ""], "*")
 }
+function checkupd(){
+	var ver = localStorage.getItem("ver");
+	var start = "https://thedesk.top/ver.json";
+	fetch(start, {
+		method: 'GET'
+	}).then(function (response) {
+		return response.json();
+	}).catch(function (error) {
+		todo(error);
+		console.error(error);
+	}).then(function (mess) {
+		console.table(mess);
+		if (mess) {
+			var platform = localStorage.getItem("platform");
+			if (platform == "darwin") {
+				var newest = mess.desk_mac;
+			} else {
+				var newest = mess.desk;
+			}
+			if (newest == ver) {
+				Swal.fire({
+					type: 'info',
+					title: lang.lang_setting_noupd,
+					html: ver
+				})
+			} else if (ver.indexOf("beta") != -1 || winstore) {
+				Swal.fire({
+					type: 'info',
+					title: lang.lang_setting_thisisbeta,
+					html: ver
+				})
+			} else {
+				localStorage.removeItem("new-ver-skip")
+				location.href="index.html"
+			}
+		}
+	});
+}

app/js/ui/spotify.js

@@ -134,14 +134,18 @@ function npCore(arg) {
             media(arg.path, "image/png", "new");
         }
     } else if (platform == "darwin") {
-        if (flag && arg.existsArtwork) {
-            media(arg.artworks[0].data, "image/png", "new");
+        if (flag && arg.artwork) {
+            media(arg.artwork, "image/png", "new");
         }
     }
     var regExp = new RegExp("{song}", "g");
     content = content.replace(regExp, arg.name);
     var regExp = new RegExp("{album}", "g");
-    content = content.replace(regExp, arg.album);
+    if(arg.album){
+        if(arg.album.name){
+            content = content.replace(regExp, arg.album.name);
+        }
+    }
     var regExp = new RegExp("{artist}", "g");
     content = content.replace(regExp, arg.artist);
     var regExp = new RegExp("{url}", "g");

app/js/userdata/showOnTL.js

@@ -139,8 +139,10 @@ function udg(user, acct_id) {
 		$("#his-since").text(crat(json.created_at));
 		$("#his-openin").attr("data-href", json.url);
 		if (json.fields) {
+			var table =""
 			if (json.fields.length > 0) {
-				note = note + '<table id="his-field">'
+				$("#his-des").css("max-height", "250px");
+				table =  '<table id="his-field">'
 				for (var i = 0; i < json.fields.length; i++) {
 					var fname = json.fields[i].name;
 					var fval = json.fields[i].value;
@@ -151,16 +153,18 @@ function udg(user, acct_id) {
 						var when = "";
 						var color = "inherit"
 					}
-					note = note + '<tr><td class="his-field-title">' + twemoji.parse(escapeHTML(fname)) + '</td><td class="his-field-content" title="' + when + '" style="background-color:' + color + '">' + twemoji.parse(fval) + '</td></tr>';
+					table = table + '<tr><td class="his-field-title">' + escapeHTML(fname) + '</td><td class="his-field-content" title="' + when + '" style="background-color:' + color + '">' + fval + '</td></tr>';
 				}
-				note = note + '</table>'
+				table = table + '</table>'
 				$("#his-des").html(twemoji.parse(note));
 			} else {
-				$("#his-des").html(twemoji.parse(note));
+				$("#his-des").css("max-height", "400px");
 			}
-		} else {
-			$("#his-des").html(twemoji.parse(note));
+			$("#his-table").html(twemoji.parse(table));
+		}else {
+			$("#his-des").css("max-height", "400px");
 		}
+		$("#his-des").html(twemoji.parse(note));
 		if (json.bot) {
 			$("#his-bot").html(lang.lang_showontl_botacct);
 		}
@@ -305,10 +309,10 @@ function misskeyUdg(user, acct_id) {
 			if (json.isFollowing) {
 				//自分がフォローしている
 				$("#his-data").addClass("following");
-				$("#his-follow-btn").text(lang.lang_status_unfollow);
+				$("#his-follow-btn-text").text(lang.lang_status_unfollow);
 				hisList(user, acct_id);
 			} else {
-				$("#his-follow-btn").text(lang.lang_status_follow);
+				$("#his-follow-btn-text").text(lang.lang_status_follow);
 			}
 			if (json.isFollowed) {
 				//フォローされてる
@@ -317,9 +321,9 @@ function misskeyUdg(user, acct_id) {
 			$("#his-block-btn").hide();
 			if (json.isMuted) {
 				$("#his-data").addClass("muting");
-				$("#his-mute-btn").text(lang.lang_status_unmute);
+				$("#his-mute-btn-text").text(lang.lang_status_unmute);
 			} else {
-				$("#his-mute-btn").text(lang.lang_status_mute);
+				$("#his-mute-btn-text").text(lang.lang_status_mute);
 			}
 			$(".only-my-data").hide();
 			$(".only-his-data").show();
@@ -362,10 +366,10 @@ function relations(user, acct_id) {
 		if (json.following) {
 			//自分がフォローしている
 			$("#his-data").addClass("following");
-			$("#his-follow-btn").text(lang.lang_status_unfollow);
+			$("#his-follow-btn-text").text(lang.lang_status_unfollow);
 			hisList(user, acct_id);
 		} else {
-			$("#his-follow-btn").text(lang.lang_status_follow);
+			$("#his-follow-btn-text").text(lang.lang_status_follow);
 		}
 		if (json.followed_by) {
 			//フォローされてる
@@ -373,35 +377,35 @@ function relations(user, acct_id) {
 		}
 		if (json.blocking) {
 			$("#his-data").addClass("blocking");
-			$("#his-block-btn").text(lang.lang_status_unblock);
+			$("#his-block-btn-text").text(lang.lang_status_unblock);
 		} else {
-			$("#his-block-btn").text(lang.lang_status_block);
+			$("#his-block-btn-text").text(lang.lang_status_block);
 		}
 		if (json.muting) {
 			$("#his-data").addClass("muting");
-			$("#his-mute-btn").text(lang.lang_status_unmute);
+			$("#his-mute-btn-text").text(lang.lang_status_unmute);
 		} else {
-			$("#his-mute-btn").text(lang.lang_status_mute);
+			$("#his-mute-btn-text").text(lang.lang_status_mute);
 		}
 		if (json.muting_notifications) {
 			$("#his-data").addClass("mutingNotf");
-			$("#his-notf-btn").text(lang.lang_showontl_notf + lang.lang_status_unmute);
+			$("#his-notf-btn-text").text(lang.lang_showontl_notf + lang.lang_status_unmute);
 		} else {
-			$("#his-notf-btn").text(lang.lang_showontl_notf + lang.lang_status_mute);
+			$("#his-notf-btn-text").text(lang.lang_showontl_notf + lang.lang_status_mute);
 		}
 		if (json.domain_blocking) {
 			$("#his-data").addClass("blockingDom");
-			$("#his-domain-btn").text(lang.lang_showontl_domain + lang.lang_status_unblock);
+			$("#his-domain-btn-text").text(lang.lang_showontl_domain + lang.lang_status_unblock);
 		} else {
-			$("#his-domain-btn").text(lang.lang_showontl_domain + lang.lang_status_block);
+			$("#his-domain-btn-text").text(lang.lang_showontl_domain + lang.lang_status_block);
 		}
 		//Endorsed
 		if (json.endorsed) {
 			$("#his-end-btn").addClass("endorsed");
-			$("#his-end-btn").text(lang.lang_status_unendorse)
+			$("#his-end-btn-text").text(lang.lang_status_unendorse)
 		} else {
 			$("#his-end-btn").removeClass("endorsed");
-			$("#his-end-btn").text(lang.lang_status_endorse)
+			$("#his-end-btn-text").text(lang.lang_status_endorse)
 		}
 		//Blocked
 		if (json.blocked_by) {
@@ -452,6 +456,7 @@ function reset() {
 	$("#his-data").removeClass("mutingNotf");
 	$("#his-data").removeClass("blockingDom");
 	$("#his-end-btn").removeClass("endorsed");
+	$("#his-des").css("max-height", "250px");
 	$("#his-bot").html("");
 	$("#his-follow-btn").show();
 	$("#his-block-btn").show();
@@ -459,9 +464,9 @@ function reset() {
 	$("#his-notf-btn").show();
 	$("#his-domain-btn").show();
 	$("#his-emp-btn").show();
-	$("#his-follow-btn").text(lang.lang_status_follow);
-	$("#his-mute-btn").text(lang.lang_status_mute);
-	$("#his-block-btn").text(lang.lang_status_block);
+	$("#his-follow-btn-text").text(lang.lang_status_follow);
+	$("#his-mute-btn-text").text(lang.lang_status_mute);
+	$("#his-block-btn-text").text(lang.lang_status_block);
 	$("#his-notf-btn").text(lang.lang_showontl_notf + lang.lang_status_mute);
 	$("#his-domain-btn").text(lang.lang_showontl_domain + lang.lang_status_block);
 	$("#his-relation").text("");

app/main.js

@@ -1,17 +1,17 @@
 var dirname = __dirname;
-var dir = 'file://' + __dirname;
-var base = dir + '/view/';
+var dir = "file://" + __dirname;
+var base = dir + "/view/";
 // Electronのモジュール
 const electron = require("electron");
 const fs = require("fs");
-const language = require('./main/language.js');
-const css = require('./main/css.js');
-const dl = require('./main/dl.js');
-const img = require('./main/img.js');
-const np = require('./main/np.js');
-const systemFunc = require('./main/system.js');
-const Menu = electron.Menu
-const join = require('path').join;
+const language = require("./main/language.js");
+const css = require("./main/css.js");
+const dl = require("./main/dl.js");
+const img = require("./main/img.js");
+const np = require("./main/np.js");
+const systemFunc = require("./main/system.js");
+const Menu = electron.Menu;
+const join = require("path").join;
 
 // アプリケーションをコントロールするモジュール
 const app = electron.app;
@@ -21,56 +21,43 @@ const BrowserWindow = electron.BrowserWindow;
 let mainWindow;
 
 // アプリが多重起動しないようにする
-const gotTheLock = app.requestSingleInstanceLock()
+const gotTheLock = app.requestSingleInstanceLock();
 
 if (!gotTheLock) {
-	app.quit()
+	app.quit();
 } else {
-	app.on('second-instance', () => {
+	app.on("second-instance", () => {
 		// 多重起動を試みた場合、既に存在するウィンドウにフォーカスを移す
 		// Someone tried to run a second instance, we should focus our window.
 		if (mainWindow) {
-			if (mainWindow.isMinimized()) mainWindow.restore()
-			mainWindow.focus()
+			if (mainWindow.isMinimized()) mainWindow.restore();
+			mainWindow.focus();
 		}
-	})
+	});
 }
 
 if (process.argv.indexOf("--dev") === -1) {
 	var packaged = true;
 } else {
 	var packaged = false;
-	console.log(
-		"||\\\\\\ \n" +
-		"||||  \\\\\\\\ \n" +
-		"||||     \\\\\\\\ \n" +
-		"|||| Am I a \\\\\\\\ \n" +
-		"|||| cat? ^ ^   \\\\\\\\\\       _____ _          ____            _    \n" +
-		"||||     (.-.)   \\\\\\\\\\      |_   _| |__   ___|  _ \\  ___  ___| | __\n" +
-		"||||  ___>   )    |||||       | | | '_ \\ / _ \\ | | |/ _ \\/ __| |/ /\n" +
-		"|||| <   _  _)   //////       | | | | | |  __/ |_| |  __/\__ \\   < \n" +
-		"||||  |_||_|   /////          |_| |_| |_|\\___|____/ \\___||___/_|\\_\\ \n" +
-		"||||          /////         \n" +
-		"||||       /////\n" +
-		"||||     /////\n" +
-		"||||//////"
-	)
-	console.log("Welcome!")
+	console.log("||\\\\\\ \n" + "||||  \\\\\\\\ \n" + "||||     \\\\\\\\ \n" + "|||| Am I a \\\\\\\\ \n" + "|||| cat? ^ ^   \\\\\\\\\\       _____ _          ____            _    \n" + "||||     (.-.)   \\\\\\\\\\      |_   _| |__   ___|  _ \\  ___  ___| | __\n" + "||||  ___>   )    |||||       | | | '_ \\ / _ \\ | | |/ _ \\/ __| |/ /\n" + "|||| <   _  _)   //////       | | | | | |  __/ |_| |  __/__ \\   < \n" + "||||  |_||_|   /////          |_| |_| |_|\\___|____/ \\___||___/_|\\_\\ \n" + "||||          /////         \n" + "||||       /////\n" + "||||     /////\n" + "||||//////");
+	console.log("Welcome!");
 }
 var info_path = join(app.getPath("userData"), "window-size.json");
 var max_info_path = join(app.getPath("userData"), "max-window-size.json");
 var lang_path = join(app.getPath("userData"), "language");
 var ha_path = join(app.getPath("userData"), "hardwareAcceleration");
+var ua_path = join(app.getPath("userData"), "useragent");
 try {
-	fs.readFileSync(ha_path, 'utf8');
-	app.disableHardwareAcceleration()
+	fs.readFileSync(ha_path, "utf8");
+	app.disableHardwareAcceleration();
 	if (!packaged) console.log("disabled: Hardware Acceleration");
-} catch{
+} catch {
 	if (!packaged) console.log("enabled: Hardware Acceleration");
 }
 var window_size;
 try {
-	window_size = JSON.parse(fs.readFileSync(info_path, 'utf8'));
+	window_size = JSON.parse(fs.readFileSync(info_path, "utf8"));
 } catch (e) {
 	window_size = {
 		width: 1000,
@@ -79,41 +66,32 @@ try {
 }
 var max_window_size;
 try {
-	max_window_size = JSON.parse(fs.readFileSync(max_info_path, 'utf8'));
+	max_window_size = JSON.parse(fs.readFileSync(max_info_path, "utf8"));
 } catch (e) {
 	max_window_size = {
 		width: "string",
 		height: "string",
 		x: "string",
 		y: "string"
-
 	}; // デフォルトバリュー
 }
 function isFile(file) {
 	try {
 		fs.statSync(file);
-		return true
+		return true;
 	} catch (err) {
-		if (err.code === 'ENOENT') return false
+		if (err.code === "ENOENT") return false;
 	}
 }
 // 全てのウィンドウが閉じたら終了
-app.on('window-all-closed', function () {
-	if (process.platform != 'darwin') {
-		electron.session.defaultSession.clearCache(() => { })
-		app.quit();
-	}
-});
-// macOSでウィンドウを閉じた後に再度開けるようにする
-app.on('activate', function () {
-	if (mainWindow == null) {
-		createWindow();
-	}
+app.on("window-all-closed", function() {
+	electron.session.defaultSession.clearCache(() => {});
+	app.quit();
 });
 
 function createWindow() {
 	if (isFile(lang_path)) {
-		var lang = fs.readFileSync(lang_path, 'utf8');
+		var lang = fs.readFileSync(lang_path, "utf8");
 	} else {
 		var langs = app.getLocale();
 		console.log(langs);
@@ -128,7 +106,7 @@ function createWindow() {
 		} else {
 			lang = "en";
 		}
-		fs.mkdir(app.getPath("userData"), function (err) {
+		fs.mkdir(app.getPath("userData"), function(err) {
 			fs.writeFileSync(lang_path, lang);
 		});
 	}
@@ -145,8 +123,13 @@ function createWindow() {
 				contextIsolation: true,
 				preload: join(__dirname, "js", "platform", "preload.js")
 			},
-			width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, icon: __dirname + '/desk.png', show: false
-		}
+			width: window_size.width,
+			height: window_size.height,
+			x: window_size.x,
+			y: window_size.y,
+			icon: __dirname + "/desk.png",
+			show: false
+		};
 	} else if (platform == "win32") {
 		var arg = {
 			webPreferences: {
@@ -155,8 +138,13 @@ function createWindow() {
 				contextIsolation: true,
 				preload: join(__dirname, "js", "platform", "preload.js")
 			},
-			width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, simpleFullscreen: true, show: false
-		}
+			width: window_size.width,
+			height: window_size.height,
+			x: window_size.x,
+			y: window_size.y,
+			simpleFullscreen: true,
+			show: false
+		};
 	} else if (platform == "darwin") {
 		var arg = {
 			webPreferences: {
@@ -165,25 +153,30 @@ function createWindow() {
 				contextIsolation: true,
 				preload: join(__dirname, "js", "platform", "preload.js")
 			},
-			width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, simpleFullscreen: true, show: false
-		}
+			width: window_size.width,
+			height: window_size.height,
+			x: window_size.x,
+			y: window_size.y,
+			simpleFullscreen: true,
+			show: false
+		};
 	}
 	mainWindow = new BrowserWindow(arg);
-	mainWindow.once('page-title-updated', () => {
-		mainWindow.show()
+	mainWindow.once("page-title-updated", () => {
+		mainWindow.show();
 		if (window_size.max) {
 			mainWindow.maximize();
 		}
-	})
+	});
 	if (!packaged) mainWindow.toggleDevTools();
-	electron.session.defaultSession.clearCache(() => { })
+	electron.session.defaultSession.clearCache(() => {});
 	if (process.argv) {
 		if (process.argv[1]) {
 			var m = process.argv[1].match(/([a-zA-Z0-9]+)\/\?[a-zA-Z-0-9]+=(.+)/);
 			if (m) {
 				var mode = m[1];
 				var code = m[2];
-				var plus = '?mode=' + mode + '&code=' + code;
+				var plus = "?mode=" + mode + "&code=" + code;
 			} else {
 				var plus = "";
 			}
@@ -193,56 +186,65 @@ function createWindow() {
 	} else {
 		var plus = "";
 	}
-	mainWindow.loadURL(base + lang + '/index.html' + plus);
+	var ua;
+	try {
+		ua = fs.readFileSync(ua_path, "utf8");
+	} catch (e) {
+		//default UA Example:
+		// Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) thedesk/18.11.3 Chrome/76.0.3809.146 Electron/6.0.12 Safari/537.36
+		const crypto = require("crypto");
+		const N = 100;
+		var ua = "Mastodon client: "+crypto
+			.randomBytes(N)
+			.toString("base64")
+			.substring(0, N);
+	}
+	mainWindow.loadURL(base + lang + "/index.html" + plus, { userAgent: ua });
 	if (!window_size.x && !window_size.y) {
 		mainWindow.center();
 	}
 	// ウィンドウが閉じられたらアプリも終了
-	mainWindow.on('closed', function () {
+	mainWindow.on("closed", function() {
 		electron.ipcMain.removeAllListeners();
 		mainWindow = null;
 	});
-	closeArg = false
-	mainWindow.on('close', function (e, arg) {
-			writePos(mainWindow)
-			if(!closeArg){
-				e.preventDefault()
-			}
-			const promise = new Promise(function (resolve) {
-				mainWindow.webContents.send('asReadEnd', "")
-				setTimeout(function () { resolve() }, 3000)
-			})
-			promise.then((function (response) {
-				closeArg = true
-				mainWindow.close()
-			})
-			);
-	});
-	electron.ipcMain.on('sendMarkersComplete', function (e, arg) {
-		closeArg = true
-		mainWindow.close()
-	})
-	function writePos(mainWindow){
-		if (
-			max_window_size.width == mainWindow.getBounds().width &&
-			max_window_size.height == mainWindow.getBounds().height &&
-			max_window_size.x == mainWindow.getBounds().x &&
-			max_window_size.y == mainWindow.getBounds().y
-		) {
-			var size = { width: mainWindow.getBounds().width, height: mainWindow.getBounds().height, x: mainWindow.getBounds().x, y: mainWindow.getBounds().y, max: true }
-		} else {
-			var size = { width: mainWindow.getBounds().width, height: mainWindow.getBounds().height, x: mainWindow.getBounds().x, y: mainWindow.getBounds().y }
+	closeArg = false;
+	mainWindow.on("close", function(e, arg) {
+		writePos(mainWindow);
+		if (!closeArg) {
+			e.preventDefault();
 		}
-		fs.writeFileSync(info_path, JSON.stringify(size))
+		const promise = new Promise(function(resolve) {
+			mainWindow.webContents.send("asReadEnd", "");
+			setTimeout(function() {
+				resolve();
+			}, 3000);
+		});
+		promise.then(function(response) {
+			closeArg = true;
+			mainWindow.close();
+		});
+	});
+	electron.ipcMain.on("sendMarkersComplete", function(e, arg) {
+		closeArg = true;
+		mainWindow.close();
+	});
+	function writePos(mainWindow) {
+		if (max_window_size.width == mainWindow.getBounds().width && max_window_size.height == mainWindow.getBounds().height && max_window_size.x == mainWindow.getBounds().x && max_window_size.y == mainWindow.getBounds().y) {
+			var size = { width: mainWindow.getBounds().width, height: mainWindow.getBounds().height, x: mainWindow.getBounds().x, y: mainWindow.getBounds().y, max: true };
+		} else {
+			var size = { width: mainWindow.getBounds().width, height: mainWindow.getBounds().height, x: mainWindow.getBounds().x, y: mainWindow.getBounds().y };
+		}
+		fs.writeFileSync(info_path, JSON.stringify(size));
 	}
-	mainWindow.on('maximize', function () {
-		writePos(mainWindow)
+	mainWindow.on("maximize", function() {
+		writePos(mainWindow);
 		fs.writeFileSync(max_info_path, JSON.stringify(mainWindow.getBounds()));
 	});
-	mainWindow.on('minimize', function () {
-		writePos(mainWindow)
-		mainWindow.webContents.send('asRead', "")
-	})
+	mainWindow.on("minimize", function() {
+		writePos(mainWindow);
+		mainWindow.webContents.send("asRead", "");
+	});
 
 	var platform = process.platform;
 	var bit = process.arch;
@@ -257,34 +259,36 @@ function createWindow() {
 	np.TheDeskNowPlaying(mainWindow);
 	//その他system
 	systemFunc.system(mainWindow, dir, lang, dirname);
-	setInterval(function () { mouseTrack(mainWindow) }, 1000);
+	setInterval(function() {
+		mouseTrack(mainWindow);
+	}, 1000);
 }
-var x = 0
-var y = 0
-var unchanged = 0
-var locked = false
+var x = 0;
+var y = 0;
+var unchanged = 0;
+var locked = false;
 function mouseTrack(mainWindow) {
-	let mousePos = electron.screen.getCursorScreenPoint()
-	let xNow = mousePos.x
-	let yNow = mousePos.x
+	let mousePos = electron.screen.getCursorScreenPoint();
+	let xNow = mousePos.x;
+	let yNow = mousePos.x;
 	if (x != xNow || y != yNow) {
-		unchanged = 0
-		locked = false
+		unchanged = 0;
+		locked = false;
 	} else {
-		unchanged++
+		unchanged++;
 		if (unchanged > 60 && !locked) {
-			unchanged = 0
-			locked = true
-			mainWindow.webContents.send('asRead', "")
+			unchanged = 0;
+			locked = true;
+			mainWindow.webContents.send("asRead", "");
 		}
 	}
-	x = xNow
-	y = yNow
+	x = xNow;
+	y = yNow;
 }
 // Electronの初期化完了後に実行
-app.on('ready', createWindow);
-var onError = function (err, response) {
+app.on("ready", createWindow);
+var onError = function(err, response) {
 	console.error(err, response);
 };
 
-app.setAsDefaultProtocolClient('thedesk')
+app.setAsDefaultProtocolClient("thedesk");

app/main/css.js

@@ -23,7 +23,7 @@ function css(mainWindow) {
 	ipc.on('theme-json-create', function (e, arg) {
 		var themecss = join(app.getPath("userData"), JSON5.parse(arg)["id"] +
 			".thedesktheme");
-		fs.writeFileSync(themecss, JSON.stringify(JSON5.parse(arg)));
+		fs.writeFileSync(themecss, JSON5.stringify(JSON5.parse(arg)));
 		if (JSON5.parse(arg)["id"]) {
 			e.sender.webContents.send('theme-json-create-complete', "");
 		} else {
@@ -39,13 +39,14 @@ function css(mainWindow) {
 	})
 	ipc.on('theme-json-request', function (e, arg) {
 		var themecss = join(app.getPath("userData"), arg + ".thedesktheme");
-		var json = JSON.parse(fs.readFileSync(themecss, 'utf8'));
-		e.sender.webContents.send('theme-json-response', json);
+		var raw = fs.readFileSync(themecss, 'utf8')
+		var json = JSON5.parse(raw);
+		e.sender.webContents.send('theme-json-response', [json, raw]);
 	})
 	ipc.on('theme-css-request', function (e, arg) {
 		var themecss = join(app.getPath("userData"), arg + ".thedesktheme");
 		try {
-			var json = JSON.parse(fs.readFileSync(themecss, 'utf8'));
+			var json = JSON5.parse(fs.readFileSync(themecss, 'utf8'));
 
 			var primary = json.vars.primary;
 			var secondary = json.vars.secondary;
@@ -67,21 +68,52 @@ function css(mainWindow) {
 				if (json.props.TheDeskAccent) {
 					var emphasized = json.props.TheDeskAccent
 				} else {
-					var emphasized = secondary;
+					var emphasized = secondary
+				}
+				if (json.props.TheDeskActive) {
+					var active = json.props.TheDeskActive
+				} else {
+					var active = primary
+				}
+				if (json.props.TheDeskModal) {
+					var modal = json.props.TheDeskModal
+				} else {
+					var modal = secondary
+				}
+				if (json.props.TheDeskBottom) {
+					var bottom = json.props.TheDeskBottom
+				} else {
+					var bottom = primary
+				}
+				if (json.props.TheDeskPostbox) {
+					var postbox = json.props.TheDeskPostbox
+				} else {
+					var postbox = primary
+				}
+				if (json.props.TheDeskSubcolor) {
+					var subcolor = json.props.TheDeskSubcolor
+				} else {
+					var subcolor = primary
 				}
 			} else {
-				var emphasized = primary;
+				var emphasized = primary
+				var acs = secondary
+				var active = primary
+				var modal = secondary
+				var bottom = primary
+				var postbox = primary
+				var subcolor = primary
 			}
 
 			var css = ".customtheme {--bg:" + secondary + ";--drag:" + drag + ";" +
 				"--color:" + text + ";--beforehover:" + beforehover + ";--modal:" +
-				secondary + ";--subcolor:" + primary + ";--box:" + primary +
-				";--sidebar:" + primary + ";--shared:" + emphasized + ";" +
-				"--notfbox:" + secondary + ";--emphasized:" + primary + ";--his-data:" +
+				modal + ";--subcolor:" + subcolor + ";--box:" + subcolor +
+				";--sidebar:" + bottom + ";--shared:" + emphasized + ";" +
+				"--notfbox:" + secondary + ";--emphasized:" + active + ";--his-data:" +
 				secondary +
-				";--active:" + primary + ";--postbox:" + primary + ";--modalfooter:" +
+				";--active:" + active + ";--postbox:" + postbox + ";--modalfooter:" +
 				primary +
-				";--accentbtn:" + primary + ";--selected:" + selected + ";--selectedWithShare:" + selectedWithShare + "}"+
+				";--accentbtn:" + subcolor + ";--selected:" + selected + ";--selectedWithShare:" + selectedWithShare + "}"+
 				"--gray:" + gray + ";"+
 				".customtheme #imagemodal{background: url(\"../img/pixel.svg\");}";
 			e.sender.webContents.send('theme-css-response', css);
@@ -92,15 +124,19 @@ function css(mainWindow) {
 	})
 	ipc.on('theme-json-list', function (e, arg) {
 		fs.readdir(app.getPath("userData"), function (err, files) {
-			if (err) throw err;
+			if (err || !files) throw err;
 			var fileList = files.filter(function (file) {
-				var tfile = join(app.getPath("userData"), file);
-				return fs.statSync(tfile).isFile() && /.*\.thedesktheme$/.test(tfile); //絞り込み
+				if(file.match(/\.thedesktheme$/)){
+					var tfile = join(app.getPath("userData"), file)
+					return fs.statSync(tfile).isFile() && /.*\.thedesktheme$/.test(tfile)
+				}else{
+					return null
+				}
 			})
 			var themes = [];
 			for (var i = 0; i < fileList.length; i++) {
 				var themecss = join(app.getPath("userData"), fileList[i]);
-				var json = JSON.parse(fs.readFileSync(themecss, 'utf8'));
+				var json = JSON5.parse(fs.readFileSync(themecss, 'utf8'));
 				themes.push({
 					name: json.name,
 					id: json.id

app/main/np.js

@@ -15,7 +15,11 @@ function np(mainWindow) {
             if (platform == "darwin") {
                 try {
                     const nowplaying = require("itunes-nowplaying-mac");
-                    const value = await nowplaying.getRawData();
+                    let value = await nowplaying();
+
+                    const artwork = await nowplaying.getThumbnailBuffer(value.databaseID);
+                    const base64 = artwork.toString('base64');
+                    value.artwork = base64
                     e.sender.webContents.send('itunes-np', value);
                 } catch (error) {
                     // エラーを返す

app/main/system.js

@@ -6,41 +6,15 @@ function system(mainWindow, dir, lang, dirname) {
 	const fs = require("fs");
 	var JSON5 = require('json5');
 	var ipc = electron.ipcMain;
+	const clipboard = electron.clipboard;
 	var tmp_img = join(app.getPath("userData"), "tmp.png");
 	var ha_path = join(app.getPath("userData"), "hardwareAcceleration");
+	var ua_path = join(app.getPath("userData"), "useragent");
 	var lang_path = join(app.getPath("userData"), "language");
 	const BrowserWindow = electron.BrowserWindow;
 	const dialog = electron.dialog;
 	const os = require('os')
 	const language = require("../main/language.js");
-	ipc.on('native-notf', function (e, args) {
-
-		var platform = process.platform;
-		var bit = process.arch;
-		if (platform == "win32") {
-			const notifier = require('node-notifier')
-			var tmp_imge = tmp_img;
-			Jimp.read(args[2], function (err, lenna) {
-				if (!err && lenna) {
-					lenna.write(tmp_img);
-					var tmp_imge = tmp_img;
-				} else {
-					var tmp_imge = "";
-				}
-				notifier.notify({
-					appID: "top.thedesk",
-					message: args[1],
-					title: args[0],
-					icon: tmp_imge,
-					sound: false,
-					wait: true,
-				},
-					function (err, response) {
-						console.log(err, response)
-					});
-			});
-		}
-	});
 	//プラットフォーム
 	ipc.on('getPlatform', function (e, arg) {
 		try {
@@ -119,6 +93,15 @@ function system(mainWindow, dir, lang, dirname) {
 		app.relaunch()
 		app.exit()
 	})
+	ipc.on('ua', function (e, arg) {
+		if (arg == "") {
+			fs.unlink(ua_path, function (err) { });
+		} else {
+			fs.writeFileSync(ua_path, arg);
+		}
+		app.relaunch()
+		app.exit()
+	})
 
 	ipc.on('quit', (e, args) => {
 		app.quit();
@@ -162,14 +145,14 @@ function system(mainWindow, dir, lang, dirname) {
 				preload: join(dirname, "js", "platform", "preload.js")
 			},
 			width: 350,
-			height: 200,
+			height: 140,
 			"transparent": false, // ウィンドウの背景を透過
 			"frame": false, // 枠の無いウィンドウ
 			"resizable": false
 		});
 		nanowindow.loadURL(dir + '/nano.html');
 		nanowindow.setAlwaysOnTop(true);
-
+		//nanowindow.toggleDevTools()
 		nanowindow.setPosition(window_pos[0], window_pos[1]);
 		nanowindow.on('close', function () {
 			fs.writeFileSync(nano_info_path, JSON.stringify(nanowindow.getPosition()));
@@ -237,5 +220,9 @@ function system(mainWindow, dir, lang, dirname) {
 			e.sender.webContents.send('font-list', fonts_sorted);
 		});
 	});
+	//コピー
+	ipc.on('copy', (e, arg) => {
+		clipboard.writeText(arg)
+	});
 }
 exports.system = system;

app/nano.html

@@ -1,240 +1,155 @@
 <!DOCTYPE html>
 <html>
-
-<head>
-	<meta charset="utf-8">
-	<link href="./css/themes.css" type="text/css" rel="stylesheet">
-	<link href="./css/tl.css" type="text/css" rel="stylesheet">
-	<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-	<title>TheDesk Nano</title>
-	<style>
-		html {
-			-webkit-app-region: drag !important;
-			cursor: move !important;
-			width: 100vw;
-			height: 100vh;
-			overflow: hidden;
-			font-family: sans-serif;
-		}
-
-		body {
-			background-color: rgba(0, 0, 0, 0.1);
-			font-size: 11px;
-		}
-
-		#timeline_nano {
-			overflow-y: scroll;
-			overflow-x: hidden;
-			-webkit-app-region: no-drag;
-			max-height: 100px;
-		}
-
-		.user {
-			font-size: 12px;
-		}
-
-		select {
-			-webkit-app-region: no-drag;
-		}
-
-		button {
-			-webkit-app-region: no-drag;
-		}
-
-		textarea {
-			-webkit-app-region: no-drag;
-		}
-
-		::-webkit-scrollbar {
-			width: 5px;
-			height: 10px;
-			background: rgba(0, 0, 0, 0.05);
-		}
-
-		::-webkit-scrollbar-track {
-			-webkit-border-radius: 5px;
-			border-radius: 5px;
-		}
-
-		.area-actions {
-			display: none !important;
-		}
-
-		.area-date_via {
-			display: none !important;
-		}
-
-		.area-side {
-			display: none !important;
-		}
-
-		/* Handle */
-		::-webkit-scrollbar-thumb {
-			-webkit-border-radius: 5px;
-			border-radius: 5px;
-			background: rgba(0, 0, 0, 0.8);
-			-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5);
-		}
-
-		.blacktheme body {
-			color: white;
-			background-color: #212121;
-		}
-
-		.blacktheme button {
-			background-color: black;
-			color: white;
-		}
-
-		.blacktheme textarea,
-		.blacktheme select {
-			color: white;
-		}
-
-		.blacktheme select,
-		.blacktheme option {
-			background-color: black;
-		}
-	</style>
-</head>
-
-<body>
-	<script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script>
-	<script>
-		$.strip_tags = function (str, allowed) {
-			if (!str) {
-				return "";
+	<head>
+		<meta charset="utf-8" />
+		<link href="./css/themes.css" type="text/css" rel="stylesheet" />
+		<link href="./css/tl.css" type="text/css" rel="stylesheet" />
+		<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
+		<link href="./node_modules/@fortawesome/fontawesome-free/css/all.min.css" type="text/css" rel="stylesheet">
+		<title>TheDesk Nano</title>
+		<style>
+			html {
+				-webkit-app-region: drag !important;
+				cursor: move !important;
+				width: 100vw;
+				height: 100vh;
+				overflow: hidden;
+				font-family: sans-serif;
+				color: var(--color) !important;
 			}
-			allowed = (((allowed || '') + '').toLowerCase().match(/<[a-z][a-z0-9]*>/g) || [])
-				.join('');
-			var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>?/gi,
-				commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi;
-			return str.replace(commentsAndPhpTags, '').replace(tags, function ($0, $1) {
-				return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : '';
-			});
-		};
-		function escapeHTML(str) {
-			if (!str) {
-				return "";
-			}
-			return str.replace(/&/g, '&amp;')
-				.replace(/</g, '&lt;')
-				.replace(/>/g, '&gt;')
-				.replace(/"/g, '&quot;')
-				.replace(/'/g, '&#039;');
-		}
-	</script>
-	<script type="text/javascript" src="./js/platform/first-not-view.js"></script>
-	<select id="post-acct-sel" style="max-width:150px">
-	</select>
-	<select id="type-sel" style="max-width:60px">
-		<option value="local">Local</option>
-		<option value="home">Home</option>
-	</select><button onclick="tl()">Show</button><button onclick="window.close()">x</button><br>
-	<div id="timeline_nano">
 
-	</div>
-	<br>
-	<textarea id="textarea" style="width:80%; background-color:transparent"></textarea>
-	<button class="btn" onclick="post()">Post</button>
-	<script>
-		if (localStorage.getItem("lang")) {
-			var lang = localStorage.getItem("lang");
-		} else {
-			var lang = "ja";
-		}
-	</script>
-	<script src="https://twemoji.maxcdn.com/2/twemoji.min.js?2.7"></script>
-	<script type="text/javascript" src="./js/post/post.js"></script>
-	<script type="text/javascript" src="./js/post/use-txtbox.js"></script>
-	<script type="text/javascript" src="./js/tl/parse.js"></script>
-	<script type="text/javascript" src="./js/ui/theme.js"></script>
-	<script type="text/javascript" src="./js/tl/date.js"></script>
-	<script type="text/javascript" src="./js/common/time.js"></script>
-	<script type="text/javascript" src="./js/platform/nano.js"></script>
-	<script type="text/javascript" src="./js/platform/end.js"></script>
-	<script>
-		var multi = localStorage.getItem("multi");
-		if (!multi) {
-			var obj = [{
-				at: localStorage.getItem(localStorage.getItem("domain_" + acct_id) + "_at"),
-				name: localStorage.getItem("name_" + acct_id),
-				domain: localStorage.getItem("domain_" + acct_id),
-				user: localStorage.getItem("user_" + acct_id),
-				prof: localStorage.getItem("prof_" + acct_id)
-			}];
-			var json = JSON.stringify(obj);
-			localStorage.setItem("multi", json);
-		} else {
-			var obj = JSON.parse(multi);
-		}
-		var templete;
-		var last = localStorage.getItem("last-use");
-		var sel;
-		Object.keys(obj).forEach(function (key) {
-			var acct = obj[key];
-			var list = key * 1 + 1;
-			if (key == last) {
-				sel = "selected";
-			} else {
-				sel = "";
+			body {
+				background-color: rgba(0, 0, 0, 0.1);
+				font-size: 11px;
 			}
-			templete = '<option value="' + key + '" ' + sel + '>' + acct.user + '@' + acct.domain +
-				'</option>';
-			$("#post-acct-sel").append(templete);
-		});
-		function mov() {
-			return false;
-		}
-		function resetmv() {
-			return false;
-		}
-		function post() {
-			var acct_id = $("#post-acct-sel").val();
-			var domain = localStorage.getItem("domain_" + acct_id);
-			var at = localStorage.getItem("acct_" + acct_id + "_at");
-			var start = "https://" + domain + "/api/v1/statuses";
-			var str = $("#textarea").val();
-			var toot = {
-				status: str
+
+			#timeline_nano {
+				overflow-y: scroll;
+				overflow-x: hidden;
+				-webkit-app-region: no-drag;
+				max-height: 100px;
 			}
-			var vis = loadVis(acct_id)
-			toot.visibility = vis;
-			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(JSON.stringify(toot));
-			httpreq.onreadystatechange = function () {
-				if (httpreq.readyState === 4) {
-					$("#textarea").val("");
+
+			.user {
+				font-size: 12px;
+			}
+
+			select {
+				-webkit-app-region: no-drag;
+			}
+
+			button {
+				-webkit-app-region: no-drag;
+			}
+
+			textarea {
+				-webkit-app-region: no-drag;
+				color: var(--color) !important;
+			}
+
+			::-webkit-scrollbar {
+				width: 5px;
+				height: 10px;
+				background: rgba(0, 0, 0, 0.05);
+			}
+
+			::-webkit-scrollbar-track {
+				-webkit-border-radius: 5px;
+				border-radius: 5px;
+			}
+
+			.area-date_via {
+				display: none !important;
+			}
+
+			.area-side {
+				display: none !important;
+			}
+
+			/* Handle */
+			::-webkit-scrollbar-thumb {
+				-webkit-border-radius: 5px;
+				border-radius: 5px;
+				background: rgba(0, 0, 0, 0.8);
+				-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5);
+			}
+			.hide, .pin, .rep-btn, .tickers{
+				display: none;
+			}
+			.fas {
+				font-size: 1rem !important;
+			}
+			.cvo {
+				grid-template-rows: auto 1rem 1fr auto 2rem;
+			}
+		</style>
+	</head>
+
+	<body>
+		<script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script>
+		<script>
+			$.strip_tags = function(str, allowed) {
+				if (!str) {
+					return "";
 				}
-			}
-		}
-		function loadVis(acct_id) {
-			var vist = localStorage.getItem("vis");
-			console.log(vist);
-			if (!vist) {
-				return "public";
-			} else {
-				if (vist == "memory") {
-					var memory = localStorage.getItem("vis-memory-" + acct_id);
-					if (!memory) {
-						memory = "public";
-					}
-					return memory;
-				} else if (vist == "server") {
-					var multi = localStorage.getItem("multi");
-					var obj = JSON.parse(multi);
-					var memory = obj[acct_id]["vis"];
-					if (!memory) {
-						memory = "public";
-					}
-					return memory;
-				} else {
-					return vist;
+				allowed = (((allowed || "") + "").toLowerCase().match(/<[a-z][a-z0-9]*>/g) || []).join("");
+				var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>?/gi,
+					commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi;
+				return str.replace(commentsAndPhpTags, "").replace(tags, function($0, $1) {
+					return allowed.indexOf("<" + $1.toLowerCase() + ">") > -1 ? $0 : "";
+				});
+			};
+			function escapeHTML(str) {
+				if (!str) {
+					return "";
 				}
+				return str
+					.replace(/&/g, "&amp;")
+					.replace(/</g, "&lt;")
+					.replace(/>/g, "&gt;")
+					.replace(/"/g, "&quot;")
+					.replace(/'/g, "&#039;");
 			}
-		}
-	</script>
+		</script>
+		<script type="text/javascript" src="./js/platform/first-not-view.js"></script>
+		<div id="menu" class="hide">
+			TL and posting account<br>
+			<select id="post-acct-sel" style="max-width:150px"> </select><br>
+			TL type<br>
+			<select id="type-sel" style="max-width:60px" onchange="loader()">
+				<option value="local">Local</option>
+				<option value="home">Home</option> </select
+			><button onclick="tl()">Show</button><br>
+			Visibility<br>
+			<select id="vis-sel" style="max-width:60px">
+					<option value="public">Public</option>
+					<option value="unlisted">Unlisted</option>
+					<option value="private">Private</option>
+			</select>
+		</div>
+		<button onclick="set()" id="setting">Setting</button>
+		<textarea id="textarea" style="width:55%; background-color:transparent" placeholder="Post someyhing new"></textarea>
+		<button class="btn" onclick="post()">Post</button>
+		<button onclick="window.close()">x</button><br />
+		<div id="timeline_nano">Click "settings" to show TL</div>
+		<br />
+		<script>
+			if (localStorage.getItem("lang")) {
+				var lang = localStorage.getItem("lang");
+			} else {
+				var lang = "ja";
+			}
+		</script>
+		<script src="https://twemoji.maxcdn.com/2/twemoji.min.js?2.7"></script>
+		<script type="text/javascript" src="view/en/main.js"></script>
+		<script type="text/javascript" src="./js/post/status.js"></script>
+		<script type="text/javascript" src="./js/post/post.js"></script>
+		<script type="text/javascript" src="./js/post/use-txtbox.js"></script>
+		<script type="text/javascript" src="./js/tl/parse.js"></script>
+		<script type="text/javascript" src="./js/ui/theme.js"></script>
+		<script type="text/javascript" src="./js/tl/date.js"></script>
+		<script type="text/javascript" src="./js/common/time.js"></script>
+		<script type="text/javascript" src="./js/platform/nano.js"></script>
+		<script type="text/javascript" src="./js/platform/end.js"></script>
+	</body>
+</html>

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thedesk",
-  "version": "18.11.0",
+  "version": "18.11.4",
   "description": "TheDesk is a Mastodon client for PC.",
   "repository": "https://github.com/cutls/TheDesk",
   "main": "main.js",
@@ -9,6 +9,7 @@
     "construct": "cd view/make && node make --automatic && cd ../../",
     "dev": "electron ./ --dev",
     "dist": "build --linux snap",
+    "watchview": "node view/make/make.js --automatic --watch",
     "build:js": "node build.js",
     "build": "electron-builder",
     "build:all": "electron-builder --win --linux",
@@ -56,17 +57,17 @@
     "jquery-ui-dist": "^1.12.1",
     "json5": "^2.1.1",
     "materialize-css": "^1.0.0",
-    "node-notifier": "^6.0.0",
     "sumchecker": "^3.0.0",
-    "sweetalert2": "^8.18.0",
+    "sweetalert2": "^8.18.6",
     "vue": "^2.6.10"
   },
   "optionalDependencies": {
     "font-manager": "^0.3.0",
-    "itunes-nowplaying-mac": "kPherox/itunes-nowplaying-mac#get-artworks-base64"
+    "itunes-nowplaying-mac": "0.3.1"
   },
   "devDependencies": {
-    "electron": "^6.0.11",
+    "chokidar": "^3.2.2",
+    "electron": "^6.0.12",
     "electron-builder": "^21.1.5",
     "electron-rebuild": "^1.8.6",
     "readline-sync": "1.4.10"
@@ -107,7 +108,8 @@
       "icon": "build/icons",
       "target": [
         "zip",
-        "snap"
+        "snap",
+        "deb"
       ],
       "category": "Network"
     },

app/source/version.json

@@ -4,7 +4,8 @@
     "プロフィールディレクトリの表示",
     "ホワイトリスト式のトレンドタグ(3.0の機能)",
     "Featuredハッシュタグの追加",
-    "ホームタイムラインと通知タイムラインの未読管理"
+    "ホームタイムラインと通知タイムラインの未読管理",
+    "自分がどの選択肢に投票したかを表示"
   ],
   "2.9.3": [],
   "2.9.2": [],
@@ -18,7 +19,8 @@
     "アンケートの作成と投票",
     "keybase等のアカウント認証対応",
     "検索のオフセット等",
-    "ブロックされているアカウントを表示したときに「ブロックされています」と表示"
+    "ブロックされているアカウントを表示したときに「ブロックされています」と表示",
+    "公開範囲を指定してブースト"
   ],
   "2.7.4": [],
   "2.7.3": [],
@@ -73,7 +75,10 @@
   "1.6.1": [],
   "1.6.0": ["トゥートのピン留め"],
   "1.5.1": [],
-  "1.5.0": ["Mastodonのサーバー規定値による投稿範囲の変更"],
+  "1.5.0": [
+    "Mastodonのサーバー規定値による投稿範囲の変更",
+    "Mastodonのサーバー規定値による閲覧注意画像設定"
+  ],
   "1.4.7": [],
   "1.4.6": [],
   "1.4.5": [],
@@ -84,5 +89,6 @@
   "1.3.3": [],
   "1.3.2": [],
   "1.3.1": [],
-  "1.3.0": []
+  "1.3.0": [],
+  "oldest":[]
 }

app/view/make/acct.sample.html

@@ -131,8 +131,10 @@
             </div>
             <div id="auth" style="display:none">
                   @@codepastewarn@@<br>
-                  <input type="text" id="code" placeholder="@@codepaste@@">
+                  <input type="text" id="code" placeholder="@@codepaste@@" required>
                   <button class="btn waves-effect" onclick="code()">Auth</button><br>
+                  <br>
+                  <a onclick="atSetup()" class="pointer">@@accessTokenSetup@@</a>
                   <div id="compt" style="display:none">
                         <h5>ログイン前に必ずご確認ください</h5>
                         <span id="compt-instance"></span>はバージョンが<span id="compt-ver"></span>のため以下の機能がご利用いただけません。
@@ -144,8 +146,10 @@
                   <h5>AppSecret</h5>
                   @@misskeylogin@@<br>
                   <input type="hidden" id="misskey-url">
-                  <input type="text" id="misskey-key" placeholder="@@codepaste@@">
+                  <input type="text" id="misskey-key" placeholder="@@codepaste@@" required>
                   <button class="btn waves-effect" onclick="misskeyLogin()">Auth</button><br>
+                  <br>
+                  <a onclick="atSetup('misskey')" class="pointer">@@accessTokenSetup@@</a>
             </div>
       </div>
       <div class="hide-first">

app/view/make/index.sample.html

@@ -489,17 +489,36 @@
 								<div id="his-proof-prof"></div>
 							</div>
 							<div id="his-des" data-acct=""></div><br>
-							<div id="his-plus-action">
-								<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-emp-btn"
-									onclick="empUser()">@@empUser@@</a>
-								<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data"
-									id="his-end-btn" onclick="pinUser()">@@endorse@@</a><br>
-								<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-openin"
-									onclick="profbrws()">@@openinbrowser@@</a>
-								<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-my-data"
-									id="his-main-acct" onclick="setMain()"
-									style="width: calc(100% - 10px)">@@mainacct@@</a><br>
-							</div>
+							<div id="his-table"></div><br>
+							<div id="his-sign-action">
+									<a href="#!" class="waves-effect waves-green btn"
+										onclick="follow()" style="flex-basis: 100%" id="his-follow-btn"><i class="material-icons">people</i><span id="his-follow-btn-text">@@follow@@</span></a>
+									<a href="#!" class="waves-effect waves-green btn blue"
+										onclick="muteDo()" id="his-mute-btn"><i class="material-icons">voice_over_off</i><span id="his-mute-btn-text">@@mute@@</span></a>
+									<a href="#!" class="waves-effect waves-g
+									reen btn red"
+										onclick="block()" id="his-block-btn"><i class="material-icons ">block</i><span id="his-block-btn-text">@@block@@</span></a>
+									<a class="dropdown-trigger btn waves-effect grey" href="#" data-target="actiondropdown">
+											<i class="material-icons">more_vert</i>@@more@@</a>
+								</div>
+								<!-- Dropdown Structure -->
+							<ul id="actiondropdown" class="dropdown-content">
+									<li onclick="empUser()">
+										<a title="@@empUser@@"><i class="material-icons">highlight</i>@@empUser@@</a>
+									</li>
+									<li onclick="pinUser()" class="only-his-data">
+										<a title="@@endorse@@"><i
+												class="material-icons">thumb_up</i>@@endorse@@</a>
+									</li>
+									<li onclick="profbrws()" id="his-openin">
+										<a title="@@openinbrowser@@"><i
+												class="material-icons">open_in_browser</i>@@openinbrowser@@</a>
+									</li>
+									<li onclick="setMain()" class="only-my-data" id="his-main-acct">
+										<a title="@@mainacct@@"><i
+												class="material-icons">grade</i>@@mainacct@@</a>
+									</li>
+								</ul>
 						</div>
 					</div>
 					<div class="his-float" id="his-float-timeline">
@@ -661,12 +680,6 @@
 		<div class="modal-footer">
 			<button class="modal-action waves-effect waves-green btn-flat" id="his-history-btn"
 				onclick="historyShow()">@@historyBack@@</button>
-			<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-follow-btn"
-				onclick="follow()">@@follow@@</a>
-			<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-mute-btn"
-				onclick="muteDo()">@@mute@@</a>
-			<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-block-btn"
-				onclick="block()">@@block@@</a>
 			<a href="#!" class="modal-action waves-effect waves-green btn-flat" onclick="hisclose()">@@close@@</a>
 		</div>
 	</div>
@@ -711,6 +724,31 @@
 			<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">@@close@@</a>
 		</div>
 	</div>
+	<!--mstdn.jp useragent-->
+	<div id="askjp_jp_ua" class="hide" style="z-index:505;width:100vw;height:100vh; background-color: #530f0f;color:white;padding:20px;overflow-y:scroll;position:absolute;">
+		<p style="font-size:300%">【緊急】mstdn.jpへのアクセスについて</p><br>
+		<p style="font-size:200%">問題の概要</p>
+		<p>合同会社分散型ソーシャルネットワーク機構は非公開審査によってユーザーエージェントベースで個々のアプリに対してAPIへのアクセスを許可する方法を取っています。</p>
+		<p>TheDesk開発者はこれに強く反発し、TheDeskのユーザーエージェントをそのアプリからのアクセスであると特定することができない値にすることを決めました。</p>
+		<p>具体的には、"Mastodon client: [起動毎に変わる100文字の英数記号]"と設定しました。</p>
+		<p style="font-size:200%">ユーザーによる対策</p>
+		<p>このバージョンのTheDeskでは任意のユーザーエージェントを適用できます。「設定」内の「環境設定」で設定していただけます。<a href="setting.html">設定</a></p>
+		<p style="font-size:150%">1. 「TheDesk」を含む値に設定する</p>
+		<p>「設定」内の「環境設定」、「ユーザーエージェント」に「TheDesk」を含む値を入れてください。大文字小文字に注意してください。</p>
+		<p><b>懸念点</b></p>
+		<p>TheDesk開発者は合同会社分散型ソーシャルネットワーク機構に対しこの件についてメールで問い合わせを行っています(抗議ではありません)。問い合わせの過程でアプリ許可が取り消され、使用不能になる可能性があります。</p>
+		<p><u>ちなみに</u></p>
+		<p>合同会社分散型ソーシャルネットワーク機構はmstdn.jpのお知らせアカウントに対するリプライに書かれたサードパーティクライアントを「審査」の後許可するとトゥートし、複数ユーザーがTheDeskの名前を挙げました。
+			事実、トゥートの翌日までにTheDeskに対してアクセス許可が出されました。しかし、許可を出す際にTheDeskの標準ユーザーエージェントを機構は一切確認せず、「TheDesk」という文字列が入ったユーザーエージェントを一律で許可する設定にしたようです。
+			結果として実際の標準ユーザーエージェントはそれに合致せず、不許可のままとなっていました。前バージョンまでの標準ユーザーエージェントは、パッケージ名の都合上全て小文字の「thedesk」を採用していました。
+		</p>
+		<p style="font-size:150%">2. 「認定済み」クライアントの名前を含む値に設定する</p>
+		<p>「設定」内の「環境設定」、「ユーザーエージェント」に、<a href="https://mstdn.jp/about">mstdn.jpのトップページ</a>記載のアプリ名を含む値を入れてください。大文字小文字やスペースに注意してください。</p>
+		<p>「Mastodon日本鯖です．」と書かれた以降の一段を全てコピーして記載してもアクセス可能です。<u>これほどまでにユーザーエージェント制限は「抜け道」が多いのです。</u><a href="setting.html">設定</a></p>
+		<p><b>懸念点</b></p>
+		<p>その記載されたアプリと合同会社分散型ソーシャルネットワーク機構になんの関係があるかは知りませんが、どちらにしろ他のクライアントの名を借りてアクセスの許可をいただくというあまり道徳的によろしくない方法です。</p>
+		<button onclick="$('#askjp_jp_ua').addClass('hide')" class="btn waves-effect">閉じる</button>
+	</div>
 	<!-- Modal Structure Release Note-->
 	<div id="releasenote" class="modal modal-fixed-footer">
 		<div class="modal-content">
@@ -718,22 +756,30 @@
 			<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-Usamin_18-11-0" class="release-do" style="display:none; ">
-				<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
+			<div id="release-Usamin_18-11-4" class="release-do" style="display:none; ">><br>
 				<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
-				Pixiv Fanboxでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br>
+				Pixiv FanboxやPatreonでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br>
 				困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-				<h5>Release Note Usamin (18.11.0)</h5>
-				・設定やアカウントマネージャーでウィンドウを閉じるときに時間がかかる不具合を修正<br>
-				・公開範囲を指定してブースト<br>
-				・ストリーミングの再接続を無限に繰り返す不具合を修正<br>
-				・たまにアカウント選択とその左のアイコンが一致しないことがあったので修正<br>
-				・アルゼンチン方言スペイン語を追加<br>
-				・カスタム絵文字のカテゴリ分けを表示(絞り込みはまだ)<br>
-				・ログインするときにバージョンの制約で使用できない機能をリスト表示するように<br>
-				・トレンドタグのグラフのデザイン変更<br>
-				・開発ツールを自動で展開<br>
-				・棒読みちゃんと連携(要設定)<br>
+				<h5>Release Note Usamin (18.11.4)</h5>
+				・mstdn.jpのユーザーエージェント制限に対する抗議的処置
+				<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('osapon@mstdn.nere9.help','main')" class="contributor">
+					<img src="https://user-images.githubusercontent.com/17561618/66582531-eb906a80-ebbc-11e9-9969-7c245cb853c6.png">osapon
+				</a>
+				<a onclick="udgEx('hinketu@minohdon.jp','main')" class="contributor">
+					<img src="https://user-images.githubusercontent.com/17561618/67628814-f4688800-f8ae-11e9-8421-c3f891918f48.png">hinketu
+				</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>
+				・高速化など設定画面の改善
+				<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>
 			</div>
 			<div id="release-en" style="display:none">
 				<h5>Let's make it native!</h5>
@@ -1083,13 +1129,8 @@
 			あなたのMastodon, Misskeyライフを邪魔してしまって申し訳ありません。<br>
 			乞食のようなマネをしてご支援をお願いするのもどうかと思いますが、少々お時間をください。<br>
 			ご安心ください。インターネット上のフリー百科事典のような高圧的支援要求はいたしません。コーヒーも要求いたしません。<br>
-			あなたはMastodon, MisskeyクライアントにTheDeskを選びました。これは奇跡的なことです。今考えればブラウザからアクセスした方が良かったのではと感じることかと存じます。<br>
-			それでも、あなたはTheDeskを使っています。<br>
-			TheDeskは2018年1月13日に最初のバージョンが出ました。それから圧倒的な機能数でゴリ押しするクライアントになっています。<br>
-			新機能に追従を図るためのモチベーションもさることながら、安全対策上TheDeskは開発者の緊急メッセージを表示できる機能が備わっており、開発者が送信ボタンを押すとすべてのTheDeskユーザーに通知が行くようになっています。<br>
-			かつてこれによってバグ報告を行い、使用を自粛していただくこともありました。<br>
-			そのような機能を実装するために、Mastodonなどのインスタンスを運営するのと同じく有料のサーバーを運用しています。<br>
-			<b>全てのユーザーが安心してTheDeskを使っていただける環境のため</b>にも、ぜひご支援をご検討ください。<br>
+			(中略)<br>
+			<b>全てのユーザーが安心してTheDeskを使っていただける環境のため</b>にも、ぜひご支援をご検討ください。ご支援いただけなくても使用不可能になることは全くありません。<br>
 			<b>@@TheDeskDes@@</b>
 		</div>
 		<div id="support-btm-en" class="hide">

app/view/make/language/af-ZA/acct.json

@@ -18,5 +18,6 @@
     "ko": "",
     "thisismisskey": "Login as Misskey",
     "misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
-    "nodata": "No data"
+    "nodata": "No data",
+    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)"
 }

app/view/make/language/af-ZA/main.json

@@ -9,7 +9,7 @@
     "lang_edit": "Edit",
     "lang_del": "Delete",
     "lang_add": "Add",
-    "lang_fatalerroroccured": "Some errors are occured, please restart TheDesk.",
+    "lang_fatalerroroccured": "Error",
     "lang_speech": "Google US English",
     "lang_lang": "Language",
     "lang_langlocale": "English",
@@ -56,7 +56,9 @@
     "lang_postimg_previewdis": "cannot preview",
     "lang_postimg_aftupload": "You cannot change accounts after uploading.",
     "lang_postimg_failupload": "Failed",
-    "lang_postimg_delete": "Delete this image.",
+    "lang_postimg_delete": "Click to add description, right-click to delete this",
+    "lang_postimg_desc": "Description",
+    "lang_postimg_leadContext": "right-click the thumbnail to delete this",
     "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
     "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
     "lang_post_cwtitle": "Auto CW Alert",
@@ -247,5 +249,7 @@
     "lang_setting_notftest": " Notification test ",
     "lang_setting_notftestprof": "Your icon is shown.",
     "lang_setting_exportwarn": "Only important data will be exported. You must keep this data secure.",
-    "lang_setting_importwarn": "All data will be deleted."
+    "lang_setting_importwarn": "All data will be deleted.",
+    "lang_setting_noupd": "No available update",
+    "lang_setting_thisisbeta": "This is beta version. You have to update manually."
 }

app/view/make/language/af-ZA/setting.json

@@ -31,10 +31,19 @@
   "fontsize": "Font size",
   "savefolder": "Folder to save",
   "savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
+  "useragent": "User agent",
+  "useragentWarn": "Restart when changed",
   "absolute": "absolute value",
   "themeSel": "Select theme",
   "customtheme": "Edit and add custom themes",
   "customthemeDirection": "Color scheme",
+  "advanced": "Advanced options(6 additional colors)",
+  "advancedWarn": "Advanced options will be <i>null</i> if you set nothing, while basic 3 options will be white(<i>fff</i>). They(adv. options) will be reset if you saved with advanced panel closed.",
+  "active": "Background of Show or CW buttons, selected options...",
+  "modal": "Background of modals",
+  "bottom": "Background of bottom bar",
+  "postbox": "Background of post box and menu",
+  "subcolor": "Subcolor, has harmony with secondary color",
   "primary": "Background color",
   "secondarycolor": "Background of components",
   "text": "Text color",
@@ -145,11 +154,11 @@
   "linkwarn": "TheDesk save your data on thedesk.top server.",
   "connect": "Connect",
   "disconnect": "Disconnect",
-  "templeteedit": "Edit a template",
-  "templeteeditwarn": "",
-  "templete1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
-  "templete2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
-  "templete3": "",
+  "templateedit": "Edit a template",
+  "templateeditwarn": "",
+  "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
+  "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
+  "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",

app/view/make/language/af-ZA/update.json

@@ -2,15 +2,18 @@
     "updatehere": "Get latest TheDesk",
     "download": "Start",
     "portable": "Portable ver.",
-    "installer": "Installer ver.",
-    "snap": "Snap ver may be on Snapcraft",
-    "unrewrite": "Not rewrite",
+    "installer": "Installer(Recommended)",
+    "linux": "zip",
+    "linuxdeb": "deb(Recommended on buntu, Debian)",
+    "linuxsnap": "snap",
+    "snap": "Get it on Snapcraft",
     "sureupd": "You may lose a cool experience!",
     "skipupd": "Skip this update",
-    "nexttl": "Until next TL loading",
-    "nextver": "Until next version",
+    "nexttl": "Hidden until next TL loading",
+    "nextver": "Hidden until next version",
     "problem1": "Some problems?",
     "problem2": "Please download on <a href='https://thedesk.top'>Oficial HP</a>.",
     "continue": "Continue updating",
-    "dlnow": "Downloading..."
+    "dlnow": "Downloading...",
+    "checkWhatIsNew": "What is new?"
 }

app/view/make/language/ar-SA/acct.json

@@ -18,5 +18,6 @@
     "ko": "",
     "thisismisskey": "Login as Misskey",
     "misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
-    "nodata": "No data"
+    "nodata": "No data",
+    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)"
 }

app/view/make/language/ar-SA/main.json

@@ -9,7 +9,7 @@
     "lang_edit": "Edit",
     "lang_del": "Delete",
     "lang_add": "Add",
-    "lang_fatalerroroccured": "Some errors are occured, please restart TheDesk.",
+    "lang_fatalerroroccured": "Error",
     "lang_speech": "Google US English",
     "lang_lang": "Language",
     "lang_langlocale": "English",
@@ -56,7 +56,9 @@
     "lang_postimg_previewdis": "cannot preview",
     "lang_postimg_aftupload": "You cannot change accounts after uploading.",
     "lang_postimg_failupload": "Failed",
-    "lang_postimg_delete": "Delete this image.",
+    "lang_postimg_delete": "Click to add description, right-click to delete this",
+    "lang_postimg_desc": "Description",
+    "lang_postimg_leadContext": "right-click the thumbnail to delete this",
     "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
     "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
     "lang_post_cwtitle": "Auto CW Alert",
@@ -247,5 +249,7 @@
     "lang_setting_notftest": " Notification test ",
     "lang_setting_notftestprof": "Your icon is shown.",
     "lang_setting_exportwarn": "Only important data will be exported. You must keep this data secure.",
-    "lang_setting_importwarn": "All data will be deleted."
+    "lang_setting_importwarn": "All data will be deleted.",
+    "lang_setting_noupd": "No available update",
+    "lang_setting_thisisbeta": "This is beta version. You have to update manually."
 }

app/view/make/language/ar-SA/setting.json

@@ -31,10 +31,19 @@
   "fontsize": "Font size",
   "savefolder": "Folder to save",
   "savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
+  "useragent": "User agent",
+  "useragentWarn": "Restart when changed",
   "absolute": "absolute value",
   "themeSel": "Select theme",
   "customtheme": "Edit and add custom themes",
   "customthemeDirection": "Color scheme",
+  "advanced": "Advanced options(6 additional colors)",
+  "advancedWarn": "Advanced options will be <i>null</i> if you set nothing, while basic 3 options will be white(<i>fff</i>). They(adv. options) will be reset if you saved with advanced panel closed.",
+  "active": "Background of Show or CW buttons, selected options...",
+  "modal": "Background of modals",
+  "bottom": "Background of bottom bar",
+  "postbox": "Background of post box and menu",
+  "subcolor": "Subcolor, has harmony with secondary color",
   "primary": "Background color",
   "secondarycolor": "Background of components",
   "text": "Text color",
@@ -145,11 +154,11 @@
   "linkwarn": "TheDesk save your data on thedesk.top server.",
   "connect": "Connect",
   "disconnect": "Disconnect",
-  "templeteedit": "Edit a template",
-  "templeteeditwarn": "",
-  "templete1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
-  "templete2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
-  "templete3": "",
+  "templateedit": "Edit a template",
+  "templateeditwarn": "",
+  "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
+  "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
+  "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",

app/view/make/language/ar-SA/update.json

@@ -2,15 +2,18 @@
     "updatehere": "Get latest TheDesk",
     "download": "Start",
     "portable": "Portable ver.",
-    "installer": "Installer ver.",
-    "snap": "Snap ver may be on Snapcraft",
-    "unrewrite": "Not rewrite",
+    "installer": "Installer(Recommended)",
+    "linux": "zip",
+    "linuxdeb": "deb(Recommended on buntu, Debian)",
+    "linuxsnap": "snap",
+    "snap": "Get it on Snapcraft",
     "sureupd": "You may lose a cool experience!",
     "skipupd": "Skip this update",
-    "nexttl": "Until next TL loading",
-    "nextver": "Until next version",
+    "nexttl": "Hidden until next TL loading",
+    "nextver": "Hidden until next version",
     "problem1": "Some problems?",
     "problem2": "Please download on <a href='https://thedesk.top'>Oficial HP</a>.",
     "continue": "Continue updating",
-    "dlnow": "Downloading..."
+    "dlnow": "Downloading...",
+    "checkWhatIsNew": "What is new?"
 }

app/view/make/language/bg-BG/acct.json

@@ -18,5 +18,6 @@
     "ko": "",
     "thisismisskey": "Влезте като Misskey",
     "misskeylogin": "Прочетете <a href=\"https://thedesk.top/how-to-misskey-login.html\">Документацията</a>, за да влезете в Misskey.",
-    "nodata": "Няма данни"
+    "nodata": "Няма данни",
+    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)"
 }

app/view/make/language/bg-BG/index.json

@@ -169,7 +169,7 @@
     "directory": "Directory",
     "active": "Recently active",
     "newcomer": "New arrivals",
-    "local_only": "Local only",
+    "local_only": "Само местно",
     "demoBottomBtns": "Welcome guide",
     "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.",
     "acctManDesc": "Add more accounts and logout them.",

app/view/make/language/bg-BG/main.json

@@ -56,7 +56,9 @@
     "lang_postimg_previewdis": "не може да се визуализира",
     "lang_postimg_aftupload": "Не можете да променяте профилите след качването.",
     "lang_postimg_failupload": "Failed",
-    "lang_postimg_delete": "Изтрийте това изображение.",
+    "lang_postimg_delete": "Click to add description, right-click to delete this",
+    "lang_postimg_desc": "Description",
+    "lang_postimg_leadContext": "right-click the thumbnail to delete this",
     "lang_post_tagTL": "Тази раздумка не съдържа маркер по подразбиране. Тази раздумка няма да се показва в локалния TL. Продължавате?",
     "lang_post_tagVis": "Тази раздумка (не е \"публична\") не е показана с този етикет в ТЛ.",
     "lang_post_cwtitle": "Авто CW Сигнал",
@@ -77,21 +79,21 @@
     "lang_status_emphas": "'s toots are emphasized. Please reload after this action.",
     "lang_status_unemphas": "'s toots are not emphasized. Please reload after this action.",
     "lang_status_unendorse": "Not feature on profile",
-    "lang_status_endorse": "Feature on profile",
+    "lang_status_endorse": "Функция в профила",
     "lang_status_followers": "Followers",
     "lang_status_active": "Last status",
     "lang_suggest_nodata": "Please get emojis list in order to show suggestion.",
     "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
     "lang_cards_check": " check",
     "lang_cards_pip": "PiP mode",
-    "lang_details_nodata": "No data",
+    "lang_details_nodata": "Няма данни",
     "lang_details_filtered": "Filtered toot",
     "lang_details_embed": "Embed HTML is cliped.",
     "lang_details_url": "URL of this toot is cliped.",
     "lang_details_txt": "Content of this toot is cliped.",
-    "lang_filter_nodata": "No data",
+    "lang_filter_nodata": "Няма данни",
     "lang_filter_errordegree": "Please check a context",
-    "lang_list_nodata": "No data",
+    "lang_list_nodata": "Няма данни",
     "lang_list_show": "Show",
     "lang_list_users": "Users list",
     "lang_list_nouser": "No users in this list.",
@@ -123,7 +125,7 @@
     "lang_layout_reconnect": "Reconnect to streaming API",
     "lang_layout_headercolor": "Header color of this column",
     "lang_layout_nodata": "[No data]<br>F5/⌘+R to reload",
-    "lang_layout_dm": "Direct Message",
+    "lang_layout_dm": "Директни съобщения",
     "lang_layout_webviewmode": "Prefer WebView",
     "lang_excluded": "Excluded type of notification",
     "lang_layout_excludingbt": "Показване в BT режим (ИЗКЛ./Изключване BT/ Само в BT)",
@@ -150,7 +152,7 @@
     "lang_showontl_followed": "Following you",
     "lang_showontl_notf": "Notification ",
     "lang_showontl_domain": "Domain ",
-    "lang_showontl_listwarn": "Follow to add this user to lists.",
+    "lang_showontl_listwarn": "Следвайте, за да добавите този потребител към списъците.",
     "lang_showontl_verified": "This website is verified by owner at ",
     "lang_parse_mentioned": " replied to you",
     "lang_parse_faved": " favourited your toot",
@@ -161,7 +163,7 @@
     "lang_parse_cwshow": "Show",
     "lang_parse_fulltext": "Full size text:",
     "lang_parse_autofold": "Auto folded",
-    "lang_parse_more": "More",
+    "lang_parse_more": "Още",
     "lang_parse_url": "URL Analyzer",
     "lang_parse_tagTL": "Timeline of {{tag}}",
     "lang_parse_tagtoot": "Toot with {{tag}}",
@@ -201,8 +203,8 @@
     "lang_misskeyparse_reaction": "Reaction",
     "lang_misskeyparse_tagnostr": "No streaming API on Tag TLs",
     "lang_misskeyparse_listnostr": "No streaming API on List TLs",
-    "lang_misskeyparse_home": "Home",
-    "lang_misskeyparse_followers": "Follower",
+    "lang_misskeyparse_home": "Начало",
+    "lang_misskeyparse_followers": "Последователи",
     "lang_misskeyparse_specified": "Specified User",
     "lang_misskeyparse_qt": "Misskey renote(quote) mode:Ctrl+Shift+Enter to clear",
     "lang_misskeyparse_renoted": " renoted your following post.",
@@ -247,5 +249,7 @@
     "lang_setting_notftest": " Notification test ",
     "lang_setting_notftestprof": "Your icon is shown.",
     "lang_setting_exportwarn": "Only important data will be exported. You must keep this data secure.",
-    "lang_setting_importwarn": "Всички данни ще бъдат изтрити."
+    "lang_setting_importwarn": "Всички данни ще бъдат изтрити.",
+    "lang_setting_noupd": "No available update",
+    "lang_setting_thisisbeta": "This is beta version. You have to update manually."
 }

app/view/make/language/bg-BG/setting.json

@@ -31,10 +31,19 @@
   "fontsize": "Размер на шрифта",
   "savefolder": "Папка за запазване",
   "savefolderwarn": "TheDesk ще използва това местоназначение, когато се опитва да запази снимки или да прави екранни снимки.",
+  "useragent": "User agent",
+  "useragentWarn": "Restart when changed",
   "absolute": "абсолютна стойност",
   "themeSel": "Изберете тема",
   "customtheme": "Редактирайте и добавете персонализирани теми",
   "customthemeDirection": "Цветова схема",
+  "advanced": "Advanced options(6 additional colors)",
+  "advancedWarn": "Advanced options will be <i>null</i> if you set nothing, while basic 3 options will be white(<i>fff</i>). They(adv. options) will be reset if you saved with advanced panel closed.",
+  "active": "Background of Show or CW buttons, selected options...",
+  "modal": "Background of modals",
+  "bottom": "Background of bottom bar",
+  "postbox": "Background of post box and menu",
+  "subcolor": "Subcolor, has harmony with secondary color",
   "primary": "Цвят на фона",
   "secondarycolor": "Компоненти на фона",
   "text": "Цвят на текста",
@@ -81,7 +90,7 @@
   "autofoldwarn": "TheDesk does not collapse totes of 5 characters or less. Also, when collapsing, newlines are not shown. TheDesk count only newlines as the number of lines.",
   "lines": "lines",
   "letters": "букви",
-  "or": "or",
+  "or": "или",
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
   "ticker": "Enable #InstanceTicker",
@@ -145,11 +154,11 @@
   "linkwarn": "TheDesk save your data on thedesk.top server.",
   "connect": "Connect",
   "disconnect": "Disconnect",
-  "templeteedit": "Промяна на шаблон",
-  "templeteeditwarn": "",
-  "templete1": "Spotify:{song}:Име на песен/{album}:Име на албум/{artist}:Име на изпълнителя/{url}:URL адрес в Spotify",
-  "templete2": "macOS:{song}:Име на песен/{album}:Име на албум/{artist}:ме на изпълнител/композитор:{composer}/честота на излъчване: {hz}/битрейт:{bitRate}/жанр:{genre}",
-  "templete3": "",
+  "templateedit": "Edit a template",
+  "templateeditwarn": "",
+  "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
+  "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
+  "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",
@@ -164,7 +173,7 @@
   "test": "Test",
   "sample": "TheDesk is an open-source Mastodon client for PC.",
   "playstop": "Play/Stop",
-  "back": "Back",
+  "back": "Назад",
   "keyscs": "Keyboard shortcuts",
   "keyscr": "Jump to n(1-9)th column",
   "keynew": "Open toot box",
@@ -174,8 +183,8 @@
   "keyunread": "Make all notifications read",
   "keyesc": "Hide toot box",
   "keyf5": "Super Reload",
-  "keyclear": "Clear toot box",
-  "keyacctman": "Account Manager",
+  "keyclear": "Изчисти тоот кутията",
+  "keyacctman": "Мениджър на профила",
   "keyshowprof": "Show profile of selecting",
   "keyrow": "Show next or previous image",
   "keyzoom": "Mousewheel:Zoom a image",
@@ -186,10 +195,10 @@
   "keyselecttop": "Select the top & left(No.1 column) toot",
   "reset": "Reset(Danger)",
   "resetconfirm": "Изтриване на всички данни. Не можете да го отмените. Продължaвате?",
-  "about": "About TheDesk",
+  "about": "За TheDesk",
   "hp": "Website",
   "support": "Поддръжка",
-  "help": "Help",
+  "help": "Помощ",
   "sushi": "Give me a sushi!",
   "checkup": "Check update",
   "ossJP": ""

app/view/make/language/bg-BG/update.json

@@ -2,15 +2,18 @@
     "updatehere": "Get latest TheDesk",
     "download": "Start",
     "portable": "Portable ver.",
-    "installer": "Installer ver.",
-    "snap": "Snap ver may be on Snapcraft",
-    "unrewrite": "Not rewrite",
+    "installer": "Installer(Recommended)",
+    "linux": "zip",
+    "linuxdeb": "deb(Recommended on buntu, Debian)",
+    "linuxsnap": "snap",
+    "snap": "Get it on Snapcraft",
     "sureupd": "You may lose a cool experience!",
     "skipupd": "Skip this update",
-    "nexttl": "Until next TL loading",
-    "nextver": "Until next version",
+    "nexttl": "Hidden until next TL loading",
+    "nextver": "Hidden until next version",
     "problem1": "Some problems?",
     "problem2": "Please download on <a href=\"https://thedesk.top\">Oficial HP</a>.",
     "continue": "Continue updating",
-    "dlnow": "Downloading..."
+    "dlnow": "Downloading...",
+    "checkWhatIsNew": "What is new?"
 }

app/view/make/language/ca-ES/acct.json

@@ -18,5 +18,6 @@
     "ko": "",
     "thisismisskey": "Login as Misskey",
     "misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
-    "nodata": "No data"
+    "nodata": "No data",
+    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)"
 }

app/view/make/language/ca-ES/main.json

@@ -9,7 +9,7 @@
     "lang_edit": "Edit",
     "lang_del": "Delete",
     "lang_add": "Add",
-    "lang_fatalerroroccured": "Some errors are occured, please restart TheDesk.",
+    "lang_fatalerroroccured": "Error",
     "lang_speech": "Google US English",
     "lang_lang": "Language",
     "lang_langlocale": "English",
@@ -56,7 +56,9 @@
     "lang_postimg_previewdis": "cannot preview",
     "lang_postimg_aftupload": "You cannot change accounts after uploading.",
     "lang_postimg_failupload": "Failed",
-    "lang_postimg_delete": "Delete this image.",
+    "lang_postimg_delete": "Click to add description, right-click to delete this",
+    "lang_postimg_desc": "Description",
+    "lang_postimg_leadContext": "right-click the thumbnail to delete this",
     "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
     "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
     "lang_post_cwtitle": "Auto CW Alert",
@@ -247,5 +249,7 @@
     "lang_setting_notftest": " Notification test ",
     "lang_setting_notftestprof": "Your icon is shown.",
     "lang_setting_exportwarn": "Only important data will be exported. You must keep this data secure.",
-    "lang_setting_importwarn": "All data will be deleted."
+    "lang_setting_importwarn": "All data will be deleted.",
+    "lang_setting_noupd": "No available update",
+    "lang_setting_thisisbeta": "This is beta version. You have to update manually."
 }

app/view/make/language/ca-ES/setting.json

@@ -31,10 +31,19 @@
   "fontsize": "Font size",
   "savefolder": "Folder to save",
   "savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
+  "useragent": "User agent",
+  "useragentWarn": "Restart when changed",
   "absolute": "absolute value",
   "themeSel": "Select theme",
   "customtheme": "Edit and add custom themes",
   "customthemeDirection": "Color scheme",
+  "advanced": "Advanced options(6 additional colors)",
+  "advancedWarn": "Advanced options will be <i>null</i> if you set nothing, while basic 3 options will be white(<i>fff</i>). They(adv. options) will be reset if you saved with advanced panel closed.",
+  "active": "Background of Show or CW buttons, selected options...",
+  "modal": "Background of modals",
+  "bottom": "Background of bottom bar",
+  "postbox": "Background of post box and menu",
+  "subcolor": "Subcolor, has harmony with secondary color",
   "primary": "Background color",
   "secondarycolor": "Background of components",
   "text": "Text color",
@@ -145,11 +154,11 @@
   "linkwarn": "TheDesk save your data on thedesk.top server.",
   "connect": "Connect",
   "disconnect": "Disconnect",
-  "templeteedit": "Edit a template",
-  "templeteeditwarn": "",
-  "templete1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
-  "templete2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
-  "templete3": "",
+  "templateedit": "Edit a template",
+  "templateeditwarn": "",
+  "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
+  "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
+  "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",

app/view/make/language/ca-ES/update.json

@@ -2,15 +2,18 @@
     "updatehere": "Get latest TheDesk",
     "download": "Start",
     "portable": "Portable ver.",
-    "installer": "Installer ver.",
-    "snap": "Snap ver may be on Snapcraft",
-    "unrewrite": "Not rewrite",
+    "installer": "Installer(Recommended)",
+    "linux": "zip",
+    "linuxdeb": "deb(Recommended on buntu, Debian)",
+    "linuxsnap": "snap",
+    "snap": "Get it on Snapcraft",
     "sureupd": "You may lose a cool experience!",
     "skipupd": "Skip this update",
-    "nexttl": "Until next TL loading",
-    "nextver": "Until next version",
+    "nexttl": "Hidden until next TL loading",
+    "nextver": "Hidden until next version",
     "problem1": "Some problems?",
     "problem2": "Please download on <a href='https://thedesk.top'>Oficial HP</a>.",
     "continue": "Continue updating",
-    "dlnow": "Downloading..."
+    "dlnow": "Downloading...",
+    "checkWhatIsNew": "What is new?"
 }

app/view/make/language/cs-CZ/acct.json

@@ -18,5 +18,6 @@
     "ko": "",
     "thisismisskey": "Přihlásit jako Misskey",
     "misskeylogin": "Pro přihlášení do Misskey si přečtěte <a href=\"https://thedesk.top/how-to-misskey-login.html\">dokumentaci (ja)</a>.",
-    "nodata": "No data"
+    "nodata": "No data",
+    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)"
 }

app/view/make/language/cs-CZ/main.json

@@ -56,7 +56,9 @@
     "lang_postimg_previewdis": "nelze vytvořit náhled",
     "lang_postimg_aftupload": "Po nahrání nemůžete změnit účty.",
     "lang_postimg_failupload": "Failed",
-    "lang_postimg_delete": "Delete this image.",
+    "lang_postimg_delete": "Click to add description, right-click to delete this",
+    "lang_postimg_desc": "Description",
+    "lang_postimg_leadContext": "right-click the thumbnail to delete this",
     "lang_post_tagTL": "Tento toot neobsahuje výchozí hashtag. Tento toot nebude zobrazen na výchozí časové ose. Pokračovat?",
     "lang_post_tagVis": "Tento toot (ne „veřejný“ toot) není zobrazen na časové ose tohoto hashtagu.",
     "lang_post_cwtitle": "Automatické varování o obsahu",
@@ -247,5 +249,7 @@
     "lang_setting_notftest": " Test oznámení ",
     "lang_setting_notftestprof": "Vaše ikona je zobrazena.",
     "lang_setting_exportwarn": "Budou exportována pouze důležitá data. Tato data musíte udržet v bezpečí.",
-    "lang_setting_importwarn": "Všechna data budou smazána."
+    "lang_setting_importwarn": "Všechna data budou smazána.",
+    "lang_setting_noupd": "No available update",
+    "lang_setting_thisisbeta": "This is beta version. You have to update manually."
 }

app/view/make/language/cs-CZ/setting.json

@@ -31,10 +31,19 @@
   "fontsize": "Velikost písma",
   "savefolder": "Folder to save",
   "savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
+  "useragent": "User agent",
+  "useragentWarn": "Restart when changed",
   "absolute": "absolutní hodnota",
   "themeSel": "Vybrat motiv",
   "customtheme": "Edit and add custom themes",
   "customthemeDirection": "Color scheme",
+  "advanced": "Advanced options(6 additional colors)",
+  "advancedWarn": "Advanced options will be <i>null</i> if you set nothing, while basic 3 options will be white(<i>fff</i>). They(adv. options) will be reset if you saved with advanced panel closed.",
+  "active": "Background of Show or CW buttons, selected options...",
+  "modal": "Background of modals",
+  "bottom": "Background of bottom bar",
+  "postbox": "Background of post box and menu",
+  "subcolor": "Subcolor, has harmony with secondary color",
   "primary": "Background color",
   "secondarycolor": "Background of components",
   "text": "Text color",
@@ -145,11 +154,11 @@
   "linkwarn": "TheDesk save your data on thedesk.top server.",
   "connect": "Connect",
   "disconnect": "Disconnect",
-  "templeteedit": "Edit a template",
-  "templeteeditwarn": "",
-  "templete1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
-  "templete2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
-  "templete3": "",
+  "templateedit": "Edit a template",
+  "templateeditwarn": "",
+  "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
+  "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
+  "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",
@@ -180,9 +189,9 @@
   "keyrow": "Show next or previous image",
   "keyzoom": "Mousewheel:Zoom a image",
   "whenSelected": "When a toot is selected: ",
-  "fav": "Favourite this toot",
-  "bt": "Boost this toot",
-  "reply": "Reply to this toot",
+  "fav": "Oblíbit si tento toot",
+  "bt": "Boostnout tento toot",
+  "reply": "Odpovědět na tento toot",
   "keyselecttop": "Select the top & left(No.1 column) toot",
   "reset": "Reset(Danger)",
   "resetconfirm": "Delete all data. You cannot undo. Continue?",

app/view/make/language/cs-CZ/update.json

@@ -3,8 +3,10 @@
     "download": "Začít",
     "portable": "Přenosná verze",
     "installer": "Verze instalátoru",
+    "linux": "zip",
+    "linuxdeb": "deb(Recommended on buntu, Debian)",
+    "linuxsnap": "snap",
     "snap": "Verze Snap může být na Snapcraftu",
-    "unrewrite": "Nepřepisovat",
     "sureupd": "Můžete ztratit úžasné nové funkce!",
     "skipupd": "Přeskočit tuto aktualizaci",
     "nexttl": "Do dalšího načtení časové osy",
@@ -12,5 +14,6 @@
     "problem1": "Máte problémy?",
     "problem2": "Prosím stáhněte si aktualizaci na <a href=\"https://thedesk.top\">oficiální stránce</a>.",
     "continue": "Pokračovat v aktualizaci",
-    "dlnow": "Stahuji..."
+    "dlnow": "Stahuji...",
+    "checkWhatIsNew": "What is new?"
 }

app/view/make/language/da-DK/acct.json

@@ -18,5 +18,6 @@
     "ko": "",
     "thisismisskey": "Login as Misskey",
     "misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
-    "nodata": "No data"
+    "nodata": "No data",
+    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)"
 }

app/view/make/language/da-DK/main.json

@@ -9,7 +9,7 @@
     "lang_edit": "Edit",
     "lang_del": "Delete",
     "lang_add": "Add",
-    "lang_fatalerroroccured": "Some errors are occured, please restart TheDesk.",
+    "lang_fatalerroroccured": "Error",
     "lang_speech": "Google US English",
     "lang_lang": "Language",
     "lang_langlocale": "English",
@@ -56,7 +56,9 @@
     "lang_postimg_previewdis": "cannot preview",
     "lang_postimg_aftupload": "You cannot change accounts after uploading.",
     "lang_postimg_failupload": "Failed",
-    "lang_postimg_delete": "Delete this image.",
+    "lang_postimg_delete": "Click to add description, right-click to delete this",
+    "lang_postimg_desc": "Description",
+    "lang_postimg_leadContext": "right-click the thumbnail to delete this",
     "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
     "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
     "lang_post_cwtitle": "Auto CW Alert",
@@ -247,5 +249,7 @@
     "lang_setting_notftest": " Notification test ",
     "lang_setting_notftestprof": "Your icon is shown.",
     "lang_setting_exportwarn": "Only important data will be exported. You must keep this data secure.",
-    "lang_setting_importwarn": "All data will be deleted."
+    "lang_setting_importwarn": "All data will be deleted.",
+    "lang_setting_noupd": "No available update",
+    "lang_setting_thisisbeta": "This is beta version. You have to update manually."
 }

app/view/make/language/da-DK/setting.json

@@ -31,10 +31,19 @@
   "fontsize": "Font size",
   "savefolder": "Folder to save",
   "savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
+  "useragent": "User agent",
+  "useragentWarn": "Restart when changed",
   "absolute": "absolute value",
   "themeSel": "Select theme",
   "customtheme": "Edit and add custom themes",
   "customthemeDirection": "Color scheme",
+  "advanced": "Advanced options(6 additional colors)",
+  "advancedWarn": "Advanced options will be <i>null</i> if you set nothing, while basic 3 options will be white(<i>fff</i>). They(adv. options) will be reset if you saved with advanced panel closed.",
+  "active": "Background of Show or CW buttons, selected options...",
+  "modal": "Background of modals",
+  "bottom": "Background of bottom bar",
+  "postbox": "Background of post box and menu",
+  "subcolor": "Subcolor, has harmony with secondary color",
   "primary": "Background color",
   "secondarycolor": "Background of components",
   "text": "Text color",
@@ -145,11 +154,11 @@
   "linkwarn": "TheDesk save your data on thedesk.top server.",
   "connect": "Connect",
   "disconnect": "Disconnect",
-  "templeteedit": "Edit a template",
-  "templeteeditwarn": "",
-  "templete1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
-  "templete2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
-  "templete3": "",
+  "templateedit": "Edit a template",
+  "templateeditwarn": "",
+  "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
+  "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
+  "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",

app/view/make/language/da-DK/update.json

@@ -2,15 +2,18 @@
     "updatehere": "Get latest TheDesk",
     "download": "Start",
     "portable": "Portable ver.",
-    "installer": "Installer ver.",
-    "snap": "Snap ver may be on Snapcraft",
-    "unrewrite": "Not rewrite",
+    "installer": "Installer(Recommended)",
+    "linux": "zip",
+    "linuxdeb": "deb(Recommended on buntu, Debian)",
+    "linuxsnap": "snap",
+    "snap": "Get it on Snapcraft",
     "sureupd": "You may lose a cool experience!",
     "skipupd": "Skip this update",
-    "nexttl": "Until next TL loading",
-    "nextver": "Until next version",
+    "nexttl": "Hidden until next TL loading",
+    "nextver": "Hidden until next version",
     "problem1": "Some problems?",
     "problem2": "Please download on <a href='https://thedesk.top'>Oficial HP</a>.",
     "continue": "Continue updating",
-    "dlnow": "Downloading..."
+    "dlnow": "Downloading...",
+    "checkWhatIsNew": "What is new?"
 }

app/view/make/language/de-DE/acct.json

@@ -18,5 +18,6 @@
     "ko": "",
     "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"
+    "nodata": "Keine Daten",
+    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)"
 }

app/view/make/language/de-DE/index.json

@@ -169,7 +169,7 @@
     "directory": "Directory",
     "active": "Recently active",
     "newcomer": "New arrivals",
-    "local_only": "Local only",
+    "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.",

app/view/make/language/de-DE/main.json

@@ -56,7 +56,9 @@
     "lang_postimg_previewdis": "keine Vorschau",
     "lang_postimg_aftupload": "Sie können die Konten nach dem Hochladen nicht mehr ändern.",
     "lang_postimg_failupload": "Failed",
-    "lang_postimg_delete": "Dieses Bild löschen.",
+    "lang_postimg_delete": "Click to add description, right-click to delete this",
+    "lang_postimg_desc": "Description",
+    "lang_postimg_leadContext": "right-click the thumbnail to delete this",
     "lang_post_tagTL": "Dieses Tröt enthält keinen Standard-Tag. Er wird in dem lokalen Verlauf nicht angezeigt. Fortfahren?",
     "lang_post_tagVis": "Dieser Tröt (nicht 'öffentlicher' Tröt) wird nicht in diesem Tag-Verlauf angezeigt.",
     "lang_post_cwtitle": "Auto CW Alert",
@@ -247,5 +249,7 @@
     "lang_setting_notftest": " Benachrichtigungen testen ",
     "lang_setting_notftestprof": "Ihr Symbol wird angezeigt.",
     "lang_setting_exportwarn": "Nur wichtige Daten werden exportiert. Sie müssen diese Daten sichern.",
-    "lang_setting_importwarn": "Alle Daten werden gelöscht."
+    "lang_setting_importwarn": "Alle Daten werden gelöscht.",
+    "lang_setting_noupd": "No available update",
+    "lang_setting_thisisbeta": "This is beta version. You have to update manually."
 }

app/view/make/language/de-DE/setting.json

@@ -31,10 +31,19 @@
   "fontsize": "Schriftgröße",
   "savefolder": "Ordner zum Speichern",
   "savefolderwarn": "TheDesk verwendet diesen Ordner, wenn es versucht Bilder zu speichern oder Screenshots zu machen.",
+  "useragent": "User agent",
+  "useragentWarn": "Restart when changed",
   "absolute": "Absoluter Wert",
   "themeSel": "Design auswählen",
   "customtheme": "Bearbeiten und hinzufügen von eigenen Designs",
   "customthemeDirection": "Farbschema",
+  "advanced": "Advanced options(6 additional colors)",
+  "advancedWarn": "Advanced options will be <i>null</i> if you set nothing, while basic 3 options will be white(<i>fff</i>). They(adv. options) will be reset if you saved with advanced panel closed.",
+  "active": "Background of Show or CW buttons, selected options...",
+  "modal": "Background of modals",
+  "bottom": "Background of bottom bar",
+  "postbox": "Background of post box and menu",
+  "subcolor": "Subcolor, has harmony with secondary color",
   "primary": "Hintergrundfarbe",
   "secondarycolor": "Hintergrund der Komponenten",
   "text": "Textfarbe",
@@ -145,11 +154,11 @@
   "linkwarn": "TheDesk speichert Ihre Daten auf dem thedesk.top Server.",
   "connect": "Verbinden",
   "disconnect": "Trennen",
-  "templeteedit": "Vorlage Bearbeiten",
-  "templeteeditwarn": "",
-  "templete1": "Spotify:{song}:Lied/{album}:Album/{artist}:Künstler/{url}:URL zu Spotify",
-  "templete2": "macOS:{song}:Liedname/{album}:Albumname/{artist}:Artist/Komponist:{composer}/Spamplingrate:{hz}/Bitrate:{bitRate}/Genre:{genre}",
-  "templete3": "",
+  "templateedit": "Edit a template",
+  "templateeditwarn": "",
+  "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
+  "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
+  "template3": "",
   "postartwork": "Das Artwork von Spotify anhängen",
   "tts": "Einstellungen Vorlesefunktion",
   "bouyomi": "BouyomiChan connect",

app/view/make/language/de-DE/update.json

@@ -3,8 +3,10 @@
     "download": "Start",
     "portable": "Portable Version",
     "installer": "Installer Version",
+    "linux": "zip",
+    "linuxdeb": "deb(Recommended on buntu, Debian)",
+    "linuxsnap": "snap",
     "snap": "Snap-Version kann auf Snapcraft sein",
-    "unrewrite": "Nicht wieder fragen.",
     "sureupd": "Du kannst ein cooles Erlebnis verpassen!",
     "skipupd": "Update überspringen",
     "nexttl": "Bis zur nächsten Verlaufsaktualisierung",
@@ -12,5 +14,6 @@
     "problem1": "Gibt es Probleme?",
     "problem2": "Bitte von <a href=\"https://thedesk.top\">Offizielle Homepage</a> herunterladen.",
     "continue": "Aktualisieren fortsetzen",
-    "dlnow": "Herunterladen..."
+    "dlnow": "Herunterladen...",
+    "checkWhatIsNew": "What is new?"
 }

app/view/make/language/el-GR/acct.json

@@ -18,5 +18,6 @@
     "ko": "",
     "thisismisskey": "Login as Misskey",
     "misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
-    "nodata": "No data"
+    "nodata": "No data",
+    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)"
 }

app/view/make/language/el-GR/main.json

@@ -9,7 +9,7 @@
     "lang_edit": "Edit",
     "lang_del": "Delete",
     "lang_add": "Add",
-    "lang_fatalerroroccured": "Some errors are occured, please restart TheDesk.",
+    "lang_fatalerroroccured": "Error",
     "lang_speech": "Google US English",
     "lang_lang": "Language",
     "lang_langlocale": "English",
@@ -56,7 +56,9 @@
     "lang_postimg_previewdis": "cannot preview",
     "lang_postimg_aftupload": "You cannot change accounts after uploading.",
     "lang_postimg_failupload": "Failed",
-    "lang_postimg_delete": "Delete this image.",
+    "lang_postimg_delete": "Click to add description, right-click to delete this",
+    "lang_postimg_desc": "Description",
+    "lang_postimg_leadContext": "right-click the thumbnail to delete this",
     "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
     "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
     "lang_post_cwtitle": "Auto CW Alert",
@@ -247,5 +249,7 @@
     "lang_setting_notftest": " Notification test ",
     "lang_setting_notftestprof": "Your icon is shown.",
     "lang_setting_exportwarn": "Only important data will be exported. You must keep this data secure.",
-    "lang_setting_importwarn": "All data will be deleted."
+    "lang_setting_importwarn": "All data will be deleted.",
+    "lang_setting_noupd": "No available update",
+    "lang_setting_thisisbeta": "This is beta version. You have to update manually."
 }

app/view/make/language/el-GR/setting.json

@@ -31,10 +31,19 @@
   "fontsize": "Font size",
   "savefolder": "Folder to save",
   "savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
+  "useragent": "User agent",
+  "useragentWarn": "Restart when changed",
   "absolute": "absolute value",
   "themeSel": "Select theme",
   "customtheme": "Edit and add custom themes",
   "customthemeDirection": "Color scheme",
+  "advanced": "Advanced options(6 additional colors)",
+  "advancedWarn": "Advanced options will be <i>null</i> if you set nothing, while basic 3 options will be white(<i>fff</i>). They(adv. options) will be reset if you saved with advanced panel closed.",
+  "active": "Background of Show or CW buttons, selected options...",
+  "modal": "Background of modals",
+  "bottom": "Background of bottom bar",
+  "postbox": "Background of post box and menu",
+  "subcolor": "Subcolor, has harmony with secondary color",
   "primary": "Background color",
   "secondarycolor": "Background of components",
   "text": "Text color",
@@ -145,11 +154,11 @@
   "linkwarn": "TheDesk save your data on thedesk.top server.",
   "connect": "Connect",
   "disconnect": "Disconnect",
-  "templeteedit": "Edit a template",
-  "templeteeditwarn": "",
-  "templete1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
-  "templete2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
-  "templete3": "",
+  "templateedit": "Edit a template",
+  "templateeditwarn": "",
+  "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
+  "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
+  "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",

app/view/make/language/el-GR/update.json

@@ -2,15 +2,18 @@
     "updatehere": "Get latest TheDesk",
     "download": "Start",
     "portable": "Portable ver.",
-    "installer": "Installer ver.",
-    "snap": "Snap ver may be on Snapcraft",
-    "unrewrite": "Not rewrite",
+    "installer": "Installer(Recommended)",
+    "linux": "zip",
+    "linuxdeb": "deb(Recommended on buntu, Debian)",
+    "linuxsnap": "snap",
+    "snap": "Get it on Snapcraft",
     "sureupd": "You may lose a cool experience!",
     "skipupd": "Skip this update",
-    "nexttl": "Until next TL loading",
-    "nextver": "Until next version",
+    "nexttl": "Hidden until next TL loading",
+    "nextver": "Hidden until next version",
     "problem1": "Some problems?",
     "problem2": "Please download on <a href='https://thedesk.top'>Oficial HP</a>.",
     "continue": "Continue updating",
-    "dlnow": "Downloading..."
+    "dlnow": "Downloading...",
+    "checkWhatIsNew": "What is new?"
 }

app/view/make/language/en-US/acct.json

@@ -18,5 +18,6 @@
     "ko": "crwdns3050:0crwdne3050:0",
     "thisismisskey": "crwdns3052:0crwdne3052:0",
     "misskeylogin": "crwdns3054:0crwdne3054:0",
-    "nodata": "crwdns3056:0crwdne3056:0"
+    "nodata": "crwdns3056:0crwdne3056:0",
+    "accessTokenSetup": "crwdns4362:0crwdne4362:0"
 }

app/view/make/language/en-US/main.json

@@ -56,7 +56,9 @@
     "lang_postimg_previewdis": "crwdns3518:0crwdne3518:0",
     "lang_postimg_aftupload": "crwdns3520:0crwdne3520:0",
     "lang_postimg_failupload": "crwdns3522:0crwdne3522:0",
-    "lang_postimg_delete": "crwdns3524:0crwdne3524:0",
+    "lang_postimg_delete": "crwdns4350:0crwdne4350:0",
+    "lang_postimg_desc": "crwdns4352:0crwdne4352:0",
+    "lang_postimg_leadContext": "crwdns4354:0crwdne4354:0",
     "lang_post_tagTL": "crwdns3526:0crwdne3526:0",
     "lang_post_tagVis": "crwdns3528:0crwdne3528:0",
     "lang_post_cwtitle": "crwdns3530:0crwdne3530:0",
@@ -247,5 +249,7 @@
     "lang_setting_notftest": "crwdns3900:0crwdne3900:0",
     "lang_setting_notftestprof": "crwdns3902:0crwdne3902:0",
     "lang_setting_exportwarn": "crwdns3904:0crwdne3904:0",
-    "lang_setting_importwarn": "crwdns3906:0crwdne3906:0"
+    "lang_setting_importwarn": "crwdns3906:0crwdne3906:0",
+    "lang_setting_noupd": "crwdns4356:0crwdne4356:0",
+    "lang_setting_thisisbeta": "crwdns4358:0crwdne4358:0"
 }

app/view/make/language/en-US/setting.json

@@ -27,14 +27,23 @@
   "fixwidthwarn": "crwdns3958:0crwdne3958:0",
   "above": "crwdns3960:0crwdne3960:0",
   "font": "crwdns3962:0crwdne3962:0",
-  "fontwarn": "crwdns3964:0crwdne3964:0",
+  "fontwarn": "crwdns4360:0crwdne4360:0",
   "fontsize": "crwdns3966:0crwdne3966:0",
   "savefolder": "crwdns3968:0crwdne3968:0",
   "savefolderwarn": "crwdns3970:0crwdne3970:0",
+  "useragent": "crwdns4372:0crwdne4372:0",
+  "useragentWarn": "crwdns4374:0crwdne4374:0",
   "absolute": "crwdns3972:0crwdne3972:0",
   "themeSel": "crwdns3974:0crwdne3974:0",
   "customtheme": "crwdns3976:0crwdne3976:0",
   "customthemeDirection": "crwdns3978:0crwdne3978:0",
+  "advanced": "crwdns4326:0crwdne4326:0",
+  "advancedWarn": "crwdns4328:0crwdne4328:0",
+  "active": "crwdns4330:0crwdne4330:0",
+  "modal": "crwdns4332:0crwdne4332:0",
+  "bottom": "crwdns4334:0crwdne4334:0",
+  "postbox": "crwdns4336:0crwdne4336:0",
+  "subcolor": "crwdns4338:0crwdne4338:0",
   "primary": "crwdns3980:0crwdne3980:0",
   "secondarycolor": "crwdns3982:0crwdne3982:0",
   "text": "crwdns3984:0crwdne3984:0",
@@ -145,11 +154,11 @@
   "linkwarn": "crwdns4194:0crwdne4194:0",
   "connect": "crwdns4196:0crwdne4196:0",
   "disconnect": "crwdns4198:0crwdne4198:0",
-  "templeteedit": "crwdns4200:0crwdne4200:0",
-  "templeteeditwarn": "crwdns4202:0crwdne4202:0",
-  "templete1": "crwdns4204:0{song}crwdnd4204:0{album}crwdnd4204:0{artist}crwdnd4204:0{url}crwdne4204:0",
-  "templete2": "crwdns4206:0{song}crwdnd4206:0{album}crwdnd4206:0{artist}crwdnd4206:0{composer}crwdnd4206:0{hz}crwdnd4206:0{bitRate}crwdnd4206:0{genre}crwdne4206:0",
-  "templete3": "crwdns4208:0crwdne4208:0",
+  "templateedit": "crwdns4340:0crwdne4340:0",
+  "templateeditwarn": "crwdns4342:0crwdne4342:0",
+  "template1": "crwdns4344:0{song}crwdnd4344:0{album}crwdnd4344:0{artist}crwdnd4344:0{url}crwdne4344:0",
+  "template2": "crwdns4346:0{song}crwdnd4346:0{album}crwdnd4346:0{artist}crwdnd4346:0{composer}crwdnd4346:0{hz}crwdnd4346:0{bitRate}crwdnd4346:0{genre}crwdne4346:0",
+  "template3": "crwdns4348:0crwdne4348:0",
   "postartwork": "crwdns4210:0crwdne4210:0",
   "tts": "crwdns4212:0crwdne4212:0",
   "bouyomi": "crwdns4214:0crwdne4214:0",

app/view/make/language/en-US/update.json

@@ -3,8 +3,10 @@
     "download": "crwdns4298:0crwdne4298:0",
     "portable": "crwdns4300:0crwdne4300:0",
     "installer": "crwdns4302:0crwdne4302:0",
+    "linux": "crwdns4364:0crwdne4364:0",
+    "linuxdeb": "crwdns4366:0crwdne4366:0",
+    "linuxsnap": "crwdns4368:0crwdne4368:0",
     "snap": "crwdns4304:0crwdne4304:0",
-    "unrewrite": "crwdns4306:0crwdne4306:0",
     "sureupd": "crwdns4308:0crwdne4308:0",
     "skipupd": "crwdns4310:0crwdne4310:0",
     "nexttl": "crwdns4312:0crwdne4312:0",
@@ -12,5 +14,6 @@
     "problem1": "crwdns4316:0crwdne4316:0",
     "problem2": "crwdns4318:0crwdne4318:0",
     "continue": "crwdns4320:0crwdne4320:0",
-    "dlnow": "crwdns4322:0crwdne4322:0"
+    "dlnow": "crwdns4322:0crwdne4322:0",
+    "checkWhatIsNew": "crwdns4370:0crwdne4370:0"
 }

app/view/make/language/en/acct.json

@@ -18,5 +18,6 @@
     "ko":"",
     "thisismisskey":"Login as Misskey",
     "misskeylogin":"Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
-    "nodata":"No data"
+    "nodata":"No data",
+    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)"
 }

app/view/make/language/en/main.json

@@ -9,7 +9,7 @@
     "lang_edit": "Edit",
     "lang_del": "Delete",
     "lang_add": "Add",
-    "lang_fatalerroroccured": "Some errors are occured, please restart TheDesk.",
+    "lang_fatalerroroccured": "Error",
     "lang_speech": "Google US English",
     "lang_lang": "Language",
     "lang_langlocale": "English",
@@ -56,7 +56,9 @@
     "lang_postimg_previewdis": "cannot preview",
     "lang_postimg_aftupload": "You cannot change accounts after uploading.",
     "lang_postimg_failupload": "Failed",
-    "lang_postimg_delete": "Delete this image.",
+    "lang_postimg_delete": "Click to add description, right-click to delete this",
+    "lang_postimg_desc": "Description",
+    "lang_postimg_leadContext": "right-click the thumbnail to delete this",
     "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
     "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
     "lang_post_cwtitle": "Auto CW Alert",
@@ -247,5 +249,7 @@
     "lang_setting_notftest": " Notification test ",
     "lang_setting_notftestprof": "Your icon is shown.",
     "lang_setting_exportwarn": "Only important data will be exported. You must keep this data secure.",
-    "lang_setting_importwarn": "All data will be deleted."
+    "lang_setting_importwarn": "All data will be deleted.",
+    "lang_setting_noupd": "No available update",
+    "lang_setting_thisisbeta": "This is beta version. You have to update manually."
 }

app/view/make/language/en/setting.json

@@ -27,14 +27,23 @@
   "fixwidthwarn": "",
   "above": "above",
   "font": "Font",
-  "fontwarn": "Select your favorite font to 'Select'(Windows/ macOS only)",
+  "fontwarn": "Select your favorite font to 'Select'(On Linux, it may not work.)",
   "fontsize": "Font size",
   "savefolder": "Folder to save",
   "savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
+  "useragent":"User agent",
+  "useragentWarn":"Restart when changed",
   "absolute": "absolute value",
   "themeSel": "Select theme",
   "customtheme": "Edit and add custom themes",
   "customthemeDirection": "Color scheme",
+  "advanced":"Advanced options(6 additional colors)",
+  "advancedWarn":"Advanced options will be <i>null</i> if you set nothing, while basic 3 options will be white(<i>fff</i>). They(adv. options) will be reset if you saved with advanced panel closed.",
+  "active": "Background of Show or CW buttons, selected options...",
+  "modal": "Background of modals",
+  "bottom":"Background of bottom bar",
+  "postbox":"Background of post box and menu",
+  "subcolor":"Subcolor, has harmony with secondary color",
   "primary": "Background color",
   "secondarycolor": "Background of components",
   "text": "Text color",
@@ -145,11 +154,11 @@
   "linkwarn": "TheDesk save your data on thedesk.top server.",
   "connect": "Connect",
   "disconnect": "Disconnect",
-  "templeteedit": "Edit a template",
-  "templeteeditwarn": "",
-  "templete1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
-  "templete2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
-  "templete3": "",
+  "templateedit": "Edit a template",
+  "templateeditwarn": "",
+  "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
+  "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
+  "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",

app/view/make/language/en/update.json

@@ -2,15 +2,18 @@
     "updatehere":"Get latest TheDesk",
     "download":"Start",
     "portable":"Portable ver.",
-    "installer":"Installer ver.",
-    "snap":"Snap ver may be on Snapcraft",
-    "unrewrite":"Not rewrite",
+    "installer":"Installer(Recommended)",
+    "linux":"zip",
+    "linuxdeb":"deb(Recommended on buntu, Debian)",
+    "linuxsnap":"snap",
+    "snap":"Get it on Snapcraft",
     "sureupd":"You may lose a cool experience!",
     "skipupd":"Skip this update",
-    "nexttl":"Until next TL loading",
-    "nextver":"Until next version",
+    "nexttl":"Hidden until next TL loading",
+    "nextver":"Hidden until next version",
     "problem1":"Some problems?",
     "problem2":"Please download on <a href='https://thedesk.top'>Oficial HP</a>.",
     "continue":"Continue updating",
-    "dlnow":"Downloading..."
+    "dlnow":"Downloading...",
+    "checkWhatIsNew": "What is new?"
 }

app/view/make/language/es-AR/acct.json

@@ -18,5 +18,6 @@
     "ko": "",
     "thisismisskey": "Iniciar sesión con Misskey",
     "misskeylogin": "Leé <a href=\"https://docs.thedesk.top/\">la documentación (en japonés)</a> para usar Misskey.",
-    "nodata": "Sin datos"
+    "nodata": "Sin datos",
+    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)"
 }

app/view/make/language/es-AR/index.json

@@ -62,7 +62,7 @@
     "btedPeople": "Gente que lo retooteó",
     "useOtherAcct1": "Usar otra cuenta",
     "useOtherAcct2": ":Dejar de marcar como favorito y deshacer retoot están deshabilitados.",
-    "btWithVis": "Boost with visibility",
+    "btWithVis": "Retoots visibles",
     "reply": "Responder",
     "bt": "Retootear",
     "favRegist": "Marcar como favorito",

app/view/make/language/es-AR/main.json

@@ -52,11 +52,13 @@
     "lang_emoji_get": "Obtené emojis",
     "lang_emoji_custom": "Emojis personalizados",
     "lang_defaultemojis_text": "Emojis de {{cat}}",
-    "lang_emoji_uncat": "Uncategorized",
+    "lang_emoji_uncat": "Sin categoría",
     "lang_postimg_previewdis": "no se puede previsualizar",
     "lang_postimg_aftupload": "No podés cambiar cuentas después de subir.",
     "lang_postimg_failupload": "Falló",
-    "lang_postimg_delete": "Eliminar esta imagen.",
+    "lang_postimg_delete": "Hacé clic para agregar descripción, o clic secundario para eliminar esto",
+    "lang_postimg_desc": "Descripción",
+    "lang_postimg_leadContext": "hacé clic secundario sobre la miniatura para eliminar esto",
     "lang_post_tagTL": "Este toot no contiene una etiqueta predeterminada. Este toot no se mostrará en la línea temporal local. ¿Querés continuar?",
     "lang_post_tagVis": "Este toot (toot no público) no se muestra en la línea temporal de esta etiqueta.",
     "lang_post_cwtitle": "Alerta automática de Advertencia de contenido",
@@ -165,7 +167,7 @@
     "lang_parse_url": "Analizador de direcciones web",
     "lang_parse_tagTL": "Línea temporal de {{tag}}",
     "lang_parse_tagtoot": "Toot con {{tag}}",
-    "lang_parse_tagpin": "Pin {{tag}}",
+    "lang_parse_tagpin": "Fijar {{tag}}",
     "lang_parse_public": "Público",
     "lang_parse_unlisted": "Sin listar",
     "lang_parse_private": "Privado",
@@ -247,5 +249,7 @@
     "lang_setting_notftest": " Prueba de notificación ",
     "lang_setting_notftestprof": "Se muestra el ícono.",
     "lang_setting_exportwarn": "Sólo se exportará los datos importantes. Tenés que guardar esto en un lugar seguro.",
-    "lang_setting_importwarn": "Todos los datos serán eliminados."
+    "lang_setting_importwarn": "Todos los datos serán eliminados.",
+    "lang_setting_noupd": "No hay actualización disponible",
+    "lang_setting_thisisbeta": "Esta es una versión beta. Tenés que actualizar manualmente."
 }

app/view/make/language/es-AR/setting.json

@@ -31,10 +31,19 @@
   "fontsize": "Tamaño de tipografía",
   "savefolder": "Carpeta para guardar",
   "savefolderwarn": "TheDesk usa esta configuración para guardar imágenes en general y capturas de pantallas.",
+  "useragent": "User agent",
+  "useragentWarn": "Restart when changed",
   "absolute": "valor absoluto",
   "themeSel": "Seleccionar tema",
   "customtheme": "Editar y agregar temas personalizados",
   "customthemeDirection": "Esquema de colores",
+  "advanced": "Configuración avanzada (6 colores adicionales)",
+  "advancedWarn": "La configuración avanzada será <i>nula</i> si no establecés nada, mientras que la configuración básica será blanca (<i>fff</i>). La configuración avanzada será restablecida si se guarda con el panel cerrado.",
+  "active": "Fondo, botones de advertencia de contenido…",
+  "modal": "Fondo de modos",
+  "bottom": "Fondo de barra inferior",
+  "postbox": "Fondo de caja de publicación y menú",
+  "subcolor": "Subcolor, en armonía con el color secundario",
   "primary": "Color de fondo",
   "secondarycolor": "Fondo de componentes",
   "text": "Color del texto",
@@ -145,11 +154,11 @@
   "linkwarn": "TheDesk guarda tus datos en el servidor thedesk.top.",
   "connect": "Conectar",
   "disconnect": "Desconectar",
-  "templeteedit": "Editar una plantilla",
-  "templeteeditwarn": "",
-  "templete1": "Spotify: {artist}: nombre del artista // {song}: nombre del tema // {album}: nombre del álbum // {url}: dirección web a Spotify",
-  "templete2": "macOS: {artist}: nombre del artista // {song}: nombre del tema // {album}: nombre del álbum // {genre}: género // {composer}: compositor // {hz}: frecuencia de muestreo // {bitRate}: tasa de transferencia",
-  "templete3": "",
+  "templateedit": "Editar plantilla",
+  "templateeditwarn": "",
+  "template1": "Spotify: {artist}: nombre del artista // {song}: nombre del tema // {album}: nombre del álbum // {url}: dirección web a Spotify",
+  "template2": "macOS: {artist}: nombre del artista // {song}: nombre del tema // {album}: nombre del álbum // {genre}: género // {composer}: compositor // {hz}: frecuencia de muestreo // {bitRate}: tasa de transferencia",
+  "template3": "",
   "postartwork": "Adjuntar tapa desde Spotify",
   "tts": "Configuración de TTS (texto hablado)",
   "bouyomi": "Conectar BouyomiChan",

app/view/make/language/es-AR/update.json

@@ -3,8 +3,10 @@
     "download": "Comenzar",
     "portable": "Compilación portátil",
     "installer": "Compilación de instalación",
+    "linux": "zip",
+    "linuxdeb": "deb(Recommended on buntu, Debian)",
+    "linuxsnap": "snap",
     "snap": "La compilación Snap puede encontrarse en Snapcraft",
-    "unrewrite": "No reescribir",
     "sureupd": "¡Podrías perderte una experiencia copada!",
     "skipupd": "Saltar esta actualización",
     "nexttl": "Hasta el próximo refresco de la línea temporal",
@@ -12,5 +14,6 @@
     "problem1": "¿Tenés problemas?",
     "problem2": "Por favor, descargá desde <a href=\"https://thedesk.top/en/\">el sitio web oficial</a>.",
     "continue": "Continuar con la actualización",
-    "dlnow": "Descargando…"
+    "dlnow": "Descargando…",
+    "checkWhatIsNew": "What is new?"
 }

app/view/make/language/es-ES/acct.json

@@ -18,5 +18,6 @@
     "ko": "",
     "thisismisskey": "Login as Misskey",
     "misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
-    "nodata": "No data"
+    "nodata": "No data",
+    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)"
 }

app/view/make/language/es-ES/main.json

@@ -9,7 +9,7 @@
     "lang_edit": "Edit",
     "lang_del": "Delete",
     "lang_add": "Add",
-    "lang_fatalerroroccured": "Some errors are occured, please restart TheDesk.",
+    "lang_fatalerroroccured": "Error",
     "lang_speech": "Google US English",
     "lang_lang": "Language",
     "lang_langlocale": "English",
@@ -56,7 +56,9 @@
     "lang_postimg_previewdis": "cannot preview",
     "lang_postimg_aftupload": "You cannot change accounts after uploading.",
     "lang_postimg_failupload": "Failed",
-    "lang_postimg_delete": "Delete this image.",
+    "lang_postimg_delete": "Click to add description, right-click to delete this",
+    "lang_postimg_desc": "Description",
+    "lang_postimg_leadContext": "right-click the thumbnail to delete this",
     "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
     "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
     "lang_post_cwtitle": "Auto CW Alert",
@@ -247,5 +249,7 @@
     "lang_setting_notftest": " Notification test ",
     "lang_setting_notftestprof": "Your icon is shown.",
     "lang_setting_exportwarn": "Only important data will be exported. You must keep this data secure.",
-    "lang_setting_importwarn": "All data will be deleted."
+    "lang_setting_importwarn": "All data will be deleted.",
+    "lang_setting_noupd": "No available update",
+    "lang_setting_thisisbeta": "This is beta version. You have to update manually."
 }

app/view/make/language/es-ES/setting.json

@@ -31,10 +31,19 @@
   "fontsize": "Font size",
   "savefolder": "Folder to save",
   "savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
+  "useragent": "User agent",
+  "useragentWarn": "Restart when changed",
   "absolute": "absolute value",
   "themeSel": "Select theme",
   "customtheme": "Edit and add custom themes",
   "customthemeDirection": "Color scheme",
+  "advanced": "Advanced options(6 additional colors)",
+  "advancedWarn": "Advanced options will be <i>null</i> if you set nothing, while basic 3 options will be white(<i>fff</i>). They(adv. options) will be reset if you saved with advanced panel closed.",
+  "active": "Background of Show or CW buttons, selected options...",
+  "modal": "Background of modals",
+  "bottom": "Background of bottom bar",
+  "postbox": "Background of post box and menu",
+  "subcolor": "Subcolor, has harmony with secondary color",
   "primary": "Background color",
   "secondarycolor": "Background of components",
   "text": "Text color",
@@ -145,11 +154,11 @@
   "linkwarn": "TheDesk save your data on thedesk.top server.",
   "connect": "Connect",
   "disconnect": "Disconnect",
-  "templeteedit": "Edit a template",
-  "templeteeditwarn": "",
-  "templete1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
-  "templete2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
-  "templete3": "",
+  "templateedit": "Edit a template",
+  "templateeditwarn": "",
+  "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
+  "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
+  "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",

app/view/make/language/es-ES/update.json

@@ -2,15 +2,18 @@
     "updatehere": "Get latest TheDesk",
     "download": "Start",
     "portable": "Portable ver.",
-    "installer": "Installer ver.",
-    "snap": "Snap ver may be on Snapcraft",
-    "unrewrite": "Not rewrite",
+    "installer": "Installer(Recommended)",
+    "linux": "zip",
+    "linuxdeb": "deb(Recommended on buntu, Debian)",
+    "linuxsnap": "snap",
+    "snap": "Get it on Snapcraft",
     "sureupd": "You may lose a cool experience!",
     "skipupd": "Skip this update",
-    "nexttl": "Until next TL loading",
-    "nextver": "Until next version",
+    "nexttl": "Hidden until next TL loading",
+    "nextver": "Hidden until next version",
     "problem1": "Some problems?",
     "problem2": "Please download on <a href='https://thedesk.top'>Oficial HP</a>.",
     "continue": "Continue updating",
-    "dlnow": "Downloading..."
+    "dlnow": "Downloading...",
+    "checkWhatIsNew": "What is new?"
 }

app/view/make/language/fi-FI/acct.json

@@ -18,5 +18,6 @@
     "ko": "",
     "thisismisskey": "Login as Misskey",
     "misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
-    "nodata": "No data"
+    "nodata": "No data",
+    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)"
 }

app/view/make/language/fi-FI/main.json

@@ -9,7 +9,7 @@
     "lang_edit": "Edit",
     "lang_del": "Delete",
     "lang_add": "Add",
-    "lang_fatalerroroccured": "Some errors are occured, please restart TheDesk.",
+    "lang_fatalerroroccured": "Error",
     "lang_speech": "Google US English",
     "lang_lang": "Language",
     "lang_langlocale": "English",
@@ -56,7 +56,9 @@
     "lang_postimg_previewdis": "cannot preview",
     "lang_postimg_aftupload": "You cannot change accounts after uploading.",
     "lang_postimg_failupload": "Failed",
-    "lang_postimg_delete": "Delete this image.",
+    "lang_postimg_delete": "Click to add description, right-click to delete this",
+    "lang_postimg_desc": "Description",
+    "lang_postimg_leadContext": "right-click the thumbnail to delete this",
     "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
     "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
     "lang_post_cwtitle": "Auto CW Alert",
@@ -247,5 +249,7 @@
     "lang_setting_notftest": " Notification test ",
     "lang_setting_notftestprof": "Your icon is shown.",
     "lang_setting_exportwarn": "Only important data will be exported. You must keep this data secure.",
-    "lang_setting_importwarn": "All data will be deleted."
+    "lang_setting_importwarn": "All data will be deleted.",
+    "lang_setting_noupd": "No available update",
+    "lang_setting_thisisbeta": "This is beta version. You have to update manually."
 }

app/view/make/language/fi-FI/setting.json

@@ -31,10 +31,19 @@
   "fontsize": "Font size",
   "savefolder": "Folder to save",
   "savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
+  "useragent": "User agent",
+  "useragentWarn": "Restart when changed",
   "absolute": "absolute value",
   "themeSel": "Select theme",
   "customtheme": "Edit and add custom themes",
   "customthemeDirection": "Color scheme",
+  "advanced": "Advanced options(6 additional colors)",
+  "advancedWarn": "Advanced options will be <i>null</i> if you set nothing, while basic 3 options will be white(<i>fff</i>). They(adv. options) will be reset if you saved with advanced panel closed.",
+  "active": "Background of Show or CW buttons, selected options...",
+  "modal": "Background of modals",
+  "bottom": "Background of bottom bar",
+  "postbox": "Background of post box and menu",
+  "subcolor": "Subcolor, has harmony with secondary color",
   "primary": "Background color",
   "secondarycolor": "Background of components",
   "text": "Text color",
@@ -145,11 +154,11 @@
   "linkwarn": "TheDesk save your data on thedesk.top server.",
   "connect": "Connect",
   "disconnect": "Disconnect",
-  "templeteedit": "Edit a template",
-  "templeteeditwarn": "",
-  "templete1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
-  "templete2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
-  "templete3": "",
+  "templateedit": "Edit a template",
+  "templateeditwarn": "",
+  "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
+  "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
+  "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",

app/view/make/language/fi-FI/update.json

@@ -2,15 +2,18 @@
     "updatehere": "Get latest TheDesk",
     "download": "Start",
     "portable": "Portable ver.",
-    "installer": "Installer ver.",
-    "snap": "Snap ver may be on Snapcraft",
-    "unrewrite": "Not rewrite",
+    "installer": "Installer(Recommended)",
+    "linux": "zip",
+    "linuxdeb": "deb(Recommended on buntu, Debian)",
+    "linuxsnap": "snap",
+    "snap": "Get it on Snapcraft",
     "sureupd": "You may lose a cool experience!",
     "skipupd": "Skip this update",
-    "nexttl": "Until next TL loading",
-    "nextver": "Until next version",
+    "nexttl": "Hidden until next TL loading",
+    "nextver": "Hidden until next version",
     "problem1": "Some problems?",
     "problem2": "Please download on <a href='https://thedesk.top'>Oficial HP</a>.",
     "continue": "Continue updating",
-    "dlnow": "Downloading..."
+    "dlnow": "Downloading...",
+    "checkWhatIsNew": "What is new?"
 }

app/view/make/language/fr-FR/acct.json

@@ -18,5 +18,6 @@
     "ko": "",
     "thisismisskey": "Login as Misskey",
     "misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
-    "nodata": "No data"
+    "nodata": "No data",
+    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)"
 }

app/view/make/language/fr-FR/index.json

@@ -63,7 +63,7 @@
     "useOtherAcct1": "Use other account",
     "useOtherAcct2": ":unfav and unBT are disabled.",
     "btWithVis": "Boost with visibility",
-    "reply": "Reply",
+    "reply": "Répondre",
     "bt": "Boost",
     "favRegist": "Favourite",
     "openBrowser": "Open in browser",
@@ -83,7 +83,7 @@
     "mute": "Mute",
     "domainBlock": "Domain block",
     "editProf": "Modifier le profil",
-    "change": "Save",
+    "change": "Sauvegarder",
     "followReq": "Demandes de suivi",
     "likeHimOrHer": "Resembling",
     "endorse": "Recommander sur sa page",
@@ -131,7 +131,7 @@
     "search": "Search",
     "sortSet": "Sort",
     "selectAcct": "Select an account",
-    "listLocale": "List",
+    "listLocale": "Liste",
     "filterWord": "Filtering words",
     "degree": "Filter contexts",
     "conver": "Conversations",

app/view/make/language/fr-FR/main.json

@@ -9,7 +9,7 @@
     "lang_edit": "Modifier",
     "lang_del": "Supprimer",
     "lang_add": "Ajouter",
-    "lang_fatalerroroccured": "Some errors are occured, please restart TheDesk.",
+    "lang_fatalerroroccured": "Error",
     "lang_speech": "Google U.S en anglais",
     "lang_lang": "Langue",
     "lang_langlocale": "Anglais",
@@ -47,7 +47,7 @@
     "lang_manager_def": "Par défaut",
     "lang_manager_none": "Aucun",
     "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
-    "lang_manager_logout": "Logout",
+    "lang_manager_logout": "Se déconnecter",
     "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
     "lang_emoji_get": "Téléchargez les émojis",
     "lang_emoji_custom": "Émojis personnalisés",
@@ -56,7 +56,9 @@
     "lang_postimg_previewdis": "cannot preview",
     "lang_postimg_aftupload": "You cannot change accounts after uploading.",
     "lang_postimg_failupload": "Failed",
-    "lang_postimg_delete": "Delete this image.",
+    "lang_postimg_delete": "Click to add description, right-click to delete this",
+    "lang_postimg_desc": "Description",
+    "lang_postimg_leadContext": "right-click the thumbnail to delete this",
     "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
     "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
     "lang_post_cwtitle": "Auto CW Alert",
@@ -247,5 +249,7 @@
     "lang_setting_notftest": " Notification test ",
     "lang_setting_notftestprof": "Your icon is shown.",
     "lang_setting_exportwarn": "Only important data will be exported. You must keep this data secure.",
-    "lang_setting_importwarn": "Toutes les données seront supprimées."
+    "lang_setting_importwarn": "Toutes les données seront supprimées.",
+    "lang_setting_noupd": "No available update",
+    "lang_setting_thisisbeta": "This is beta version. You have to update manually."
 }

app/view/make/language/fr-FR/setting.json

@@ -3,8 +3,8 @@
   "set": "Sauvegarder",
   "yes": "Oui",
   "no": "Non",
-  "none": "None",
-  "default": "Default",
+  "none": "Aucun",
+  "default": "Par défaut",
   "change": "Modifier",
   "select": "Select",
   "env": "Préférences système",
@@ -31,10 +31,19 @@
   "fontsize": "Taille de la police de caractères",
   "savefolder": "Folder to save",
   "savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
+  "useragent": "User agent",
+  "useragentWarn": "Restart when changed",
   "absolute": "absolute value",
   "themeSel": "Select theme",
   "customtheme": "Edit and add custom themes",
   "customthemeDirection": "Color scheme",
+  "advanced": "Advanced options(6 additional colors)",
+  "advancedWarn": "Advanced options will be <i>null</i> if you set nothing, while basic 3 options will be white(<i>fff</i>). They(adv. options) will be reset if you saved with advanced panel closed.",
+  "active": "Background of Show or CW buttons, selected options...",
+  "modal": "Background of modals",
+  "bottom": "Background of bottom bar",
+  "postbox": "Background of post box and menu",
+  "subcolor": "Subcolor, has harmony with secondary color",
   "primary": "Background color",
   "secondarycolor": "Background of components",
   "text": "Text color",
@@ -44,7 +53,7 @@
   "desc": "About this theme",
   "customShare": "Share this code with other TheDesk. Do not share this code with MiAS.",
   "customImport": "Import of custom themes",
-  "delete": "Delete",
+  "delete": "Supprimer",
   "cImpWarn": "Get more themes on <a href=\"https://assets.msky.cafe/\" target=\"_blank\">MiAS</a>",
   "timeline": "Timeline Preferences",
   "timemode": "Format de l’heure",
@@ -145,11 +154,11 @@
   "linkwarn": "TheDesk save your data on thedesk.top server.",
   "connect": "Connect",
   "disconnect": "Disconnect",
-  "templeteedit": "Edit a template",
-  "templeteeditwarn": "",
-  "templete1": "Refer:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
-  "templete2": "iTunes NowPlaying:{url} is disabled, but composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre} are available.",
-  "templete3": "",
+  "templateedit": "Edit a template",
+  "templateeditwarn": "",
+  "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
+  "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
+  "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",
@@ -180,9 +189,9 @@
   "keyrow": "Show next or previous image",
   "keyzoom": "Mousewheel:Zoom a image",
   "whenSelected": "When a toot is selected: ",
-  "fav": "Favourite this toot",
-  "bt": "Boost this toot",
-  "reply": "Reply to this toot",
+  "fav": "Mettre ce pouet en favoris",
+  "bt": "Booster ce pouet",
+  "reply": "Répondre à ce pouet",
   "keyselecttop": "Select the top & left(No.1 column) toot",
   "reset": "Reset(Danger)",
   "resetconfirm": "Delete all data. You cannot undo. Continue?",

app/view/make/language/fr-FR/update.json

@@ -2,15 +2,18 @@
     "updatehere": "Téléchargez le dernier TheDesk",
     "download": "Démarrer",
     "portable": "Portable ver.",
-    "installer": "Installer ver.",
-    "snap": "Snap ver may be on Snapcraft",
-    "unrewrite": "Not rewrite",
+    "installer": "Installer(Recommended)",
+    "linux": "zip",
+    "linuxdeb": "deb(Recommended on buntu, Debian)",
+    "linuxsnap": "snap",
+    "snap": "Get it on Snapcraft",
     "sureupd": "You may lose a cool experience!",
     "skipupd": "Ignorer cette mise à jour",
-    "nexttl": "Until next TL loading",
-    "nextver": "Until next version",
+    "nexttl": "Hidden until next TL loading",
+    "nextver": "Hidden until next version",
     "problem1": "Some problems?",
     "problem2": "Please download on <a href=\"https://thedesk.top\">Oficial HP</a>.",
     "continue": "Continue updating",
-    "dlnow": "Downloading..."
+    "dlnow": "Downloading...",
+    "checkWhatIsNew": "What is new?"
 }

app/view/make/language/he-IL/acct.json

@@ -18,5 +18,6 @@
     "ko": "",
     "thisismisskey": "Login as Misskey",
     "misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
-    "nodata": "No data"
+    "nodata": "No data",
+    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)"
 }

app/view/make/language/he-IL/main.json

@@ -9,7 +9,7 @@
     "lang_edit": "Edit",
     "lang_del": "Delete",
     "lang_add": "Add",
-    "lang_fatalerroroccured": "Some errors are occured, please restart TheDesk.",
+    "lang_fatalerroroccured": "Error",
     "lang_speech": "Google US English",
     "lang_lang": "Language",
     "lang_langlocale": "English",
@@ -56,7 +56,9 @@
     "lang_postimg_previewdis": "cannot preview",
     "lang_postimg_aftupload": "You cannot change accounts after uploading.",
     "lang_postimg_failupload": "Failed",
-    "lang_postimg_delete": "Delete this image.",
+    "lang_postimg_delete": "Click to add description, right-click to delete this",
+    "lang_postimg_desc": "Description",
+    "lang_postimg_leadContext": "right-click the thumbnail to delete this",
     "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
     "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
     "lang_post_cwtitle": "Auto CW Alert",
@@ -247,5 +249,7 @@
     "lang_setting_notftest": " Notification test ",
     "lang_setting_notftestprof": "Your icon is shown.",
     "lang_setting_exportwarn": "Only important data will be exported. You must keep this data secure.",
-    "lang_setting_importwarn": "All data will be deleted."
+    "lang_setting_importwarn": "All data will be deleted.",
+    "lang_setting_noupd": "No available update",
+    "lang_setting_thisisbeta": "This is beta version. You have to update manually."
 }

app/view/make/language/he-IL/setting.json

@@ -31,10 +31,19 @@
   "fontsize": "Font size",
   "savefolder": "Folder to save",
   "savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
+  "useragent": "User agent",
+  "useragentWarn": "Restart when changed",
   "absolute": "absolute value",
   "themeSel": "Select theme",
   "customtheme": "Edit and add custom themes",
   "customthemeDirection": "Color scheme",
+  "advanced": "Advanced options(6 additional colors)",
+  "advancedWarn": "Advanced options will be <i>null</i> if you set nothing, while basic 3 options will be white(<i>fff</i>). They(adv. options) will be reset if you saved with advanced panel closed.",
+  "active": "Background of Show or CW buttons, selected options...",
+  "modal": "Background of modals",
+  "bottom": "Background of bottom bar",
+  "postbox": "Background of post box and menu",
+  "subcolor": "Subcolor, has harmony with secondary color",
   "primary": "Background color",
   "secondarycolor": "Background of components",
   "text": "Text color",
@@ -145,11 +154,11 @@
   "linkwarn": "TheDesk save your data on thedesk.top server.",
   "connect": "Connect",
   "disconnect": "Disconnect",
-  "templeteedit": "Edit a template",
-  "templeteeditwarn": "",
-  "templete1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
-  "templete2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
-  "templete3": "",
+  "templateedit": "Edit a template",
+  "templateeditwarn": "",
+  "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
+  "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
+  "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",