TheDesk 21.2.4 (Mayu)

New Crowdin updates

.gitignore

@@ -20,6 +20,7 @@ app/view/bg
 app/view/cs
 app/view/ps
 app/view/es-AR
+app/view/it-IT
 app/git
 *.code-workspace
 releasenote.md

.travis.yml

@@ -15,6 +15,20 @@ before_deploy:
   - cd app
   - VERSION=$(cat package.json | grep version | head -1 | awk -F= "{ print $2 }" | sed 's/[version:,\",]//g' | tr -d '[[:space:]]')
   - yarn install --no-lockfile --prod
+  - yarn construct:store
+  - if [ "$TRAVIS_OS_NAME" = "osx" ];then electron-builder --mac -p never;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ];then cd ../build;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ];then mv *.dmg TheDesk-$VERSION-store.dmg;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ];then cd ../app;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ];then electron-builder --linux snap:x64 -p never;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ];then cd ../build;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ];then mv *.snap TheDesk-$VERSION-store.snap;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ];then cd ../app;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "windows" ];then yarn add electron-builder;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "windows" ];then electron-builder --win appx:x64 -p never ;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "windows" ];then cd ../build;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "windows" ];then mv *.appx TheDesk-$VERSION-store.appx;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "windows" ];then cd ../app;else :;fi
   - yarn construct
   - if [ "$TRAVIS_OS_NAME" = "osx" ];then electron-builder --mac -p never;else :;fi
   - if [ "$TRAVIS_OS_NAME" = "linux" ];then electron-builder --linux --x64 -p never;else :;fi
@@ -22,7 +36,6 @@ before_deploy:
   - if [ "$TRAVIS_OS_NAME" = "linux" ];then ls;else :;fi
   - if [ "$TRAVIS_OS_NAME" = "linux" ];then mv thedesk-*.zip thedesk.zip;else :;fi
   - if [ "$TRAVIS_OS_NAME" = "linux" ];then cd ../app;else :;fi
-  - if [ "$TRAVIS_OS_NAME" = "windows" ];then yarn add electron-builder;else :;fi
   - if [ "$TRAVIS_OS_NAME" = "windows" ];then electron-builder --win --ia32 -p never;else :;fi
   - if [ "$TRAVIS_OS_NAME" = "windows" ];then cd ../build;else :;fi
   - if [ "$TRAVIS_OS_NAME" = "windows" ];then ls;else :;fi

README.md

@@ -13,6 +13,9 @@ Mastodon/Misskey client for PC(Windows/Linux/macOS)
   
 Download:[TheDesk](https://thedesk.top) [![check](https://status.cutls.com/badge/?site=thedesk.top)](https://status.cutls.com)
 
+On GitHub Releases, `-store.*` assets are made for some application store or manager(Snapcraft, Homebrew, Microsoft Store). 
+They do not check the latest version(Which you can get the latest ver or not depends on the store)
+
 <a href="https://www.patreon.com/cutls"><img src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" alt="Become a Patron!" width="160"></a>  
 <a href="https://liberapay.com/cutls/donate"><img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg"></a>
 ![Screenshots1](https://thedesk.top/img/scr1.png)  
@@ -147,7 +150,7 @@ macOS
 
 ### PWA support
 
-TheDesk is a wed-based app, so you can run it on a browser. Of course, the main stream is as Electron. Some features won't work as well as Electron.
+TheDesk is a web-based app, so you can run it on a browser. Of course, the main stream is as Electron. Some features won't work as well as Electron.
 
 You can run `npm run build:pwa` to build as PWA, including `manifest.json` and the ServiceWorker.
 

README_ja.md

@@ -14,6 +14,8 @@ Download:[TheDesk](https://thedesk.top) [![check](https://status.cutls.com/badge
 
 [Pixiv FANBOX](https://www.pixiv.net/fanbox/creator/28105985)
 
+`-store.*`とあるアセットはストアやパッケージマネージャ向けのもので、アップデートの確認をソフト本体で行いません。
+
 ![Screenshots1](https://thedesk.top/img/scr1.png)  
 
 ## ライセンス

app/css/master.css

@@ -6,7 +6,7 @@ body {
 	user-select: none;
 	cursor: default;
 	height: 100vh;
-	color: var(--color);
+	color: var(--text);
 }
 html {
 	font-size: 13px;
@@ -14,9 +14,9 @@ html {
 .titlebar,
 .menubar-menu-container,
 .action-menu-item {
-	background-color: var(--notfbox) !important;
+	background-color: var(--subcolor) !important;
 	filter: brightness(110%) !important;
-	color: var(--color) !important;
+	color: var(--text) !important;
 }
 .action-menu-item:hover {
 	filter: brightness(80%) !important;
@@ -232,7 +232,7 @@ blockquote:before,
 	height: calc(100vh - 3rem);
 	background-color: var(--bg);
 	filter: brightness(50%);
-	color: var(--color);
+	color: var(--text);
 	z-index: 99999;
 	justify-content: center;
 	align-items: center;
@@ -243,7 +243,7 @@ blockquote:before,
 	width: 100vw;
 	height: 100vh;
 	background-color: var(--bg);
-	color: var(--color);
+	color: var(--text);
 	z-index: 99999;
 	justify-content: center;
 	align-items: center;
@@ -254,7 +254,7 @@ blockquote:before,
 #pip {
 	z-index: 504;
 	width: 418px;
-	background-color: var(--subcolor);
+	background-color: var(--thirdColor);
 	position: absolute;
 }
 .pip-bottom {
@@ -315,10 +315,10 @@ blockquote:before,
 }
 .collapsible-header,
 .tabs {
-	background-color: var(--subcolor);
+	background-color: var(--thirdColor);
 }
 .collapsible-header:focus {
-	background-color: var(--subcolor) !important;
+	background-color: var(--thirdColor) !important;
 }
 .modal-footer {
 	background-color: var(--modalfooter) !important;
@@ -332,12 +332,25 @@ blockquote:before,
 }
 .release-do {
 	border: solid 2px;
-	border-color: var(--color);
+	border-color: var(--text);
 	padding: 5px;
 }
 #pickers {
 	display: flex;
 	flex-wrap: wrap;
+	flex-direction: column;
+}
+input[type="color"] {
+	-webkit-appearance: none;
+	border: none;
+	width: 32px;
+	height: 32px;
+}
+input[type="color"]::-webkit-color-swatch-wrapper {
+	padding: 0;
+}
+input[type="color"]::-webkit-color-swatch {
+	border: none;
 }
 #menu {
 	position: fixed;
@@ -367,7 +380,7 @@ blockquote:before,
 	display: flex;
 	align-items: center;
 	cursor: pointer;
-	color: var(--color);
+	color: var(--text);
 }
 #left-menu a:hover {
 	background-color: var(--beforehover);
@@ -398,7 +411,7 @@ blockquote:before,
 	width: 13rem;
 	height: 3.1rem;
 	cursor: pointer;
-	color: var(--color);
+	color: var(--text);
 }
 #tltype .type span {
 	width: calc(100% - 2.3rem);
@@ -425,7 +438,7 @@ blockquote:before,
 	text-align: center;
 	width: calc(100% + 0.8rem);
 	border-radius: 5px;
-	background-color: var(--box);
+	background-color: var(--subcolor);
 	filter: brightness(80%);
 	margin-left: -0.4rem;
 	margin-right: -0.4rem;
@@ -446,7 +459,7 @@ blockquote:before,
 	position: fixed;
 	bottom: -300px;
 	width: 100vw;
-	background-color: var(--box);
+	background-color: var(--subcolor);
 	z-index: 9999;
 	padding: 0.8rem;
 	display: grid;
@@ -472,16 +485,16 @@ blockquote:before,
 }
 input,
 textarea {
-	color: var(--color);
+	color: var(--text);
 	font-size: 1rem !important;
 	font-family: inherit;
 }
 .swal2-popup {
-	background-color: var(--notfbox) !important;
+	background-color: var(--subcolor) !important;
 }
 .swal2-title,
 .swal2-content {
-	color: var(--color) !important;
+	color: var(--text) !important;
 }
 #src-contents svg {
 	margin-right: 0.4rem;
@@ -530,7 +543,7 @@ textarea {
 	left: calc(50vw - 11.53rem);
 	width: 23rem;
 	max-width: 100%;
-	background-color: var(--box);
+	background-color: var(--subcolor);
 	z-index: 501;
 	padding: 0.4rem;
 }
@@ -613,3 +626,11 @@ textarea {
 .dropdown-content.header:hover {
 	background-color: white;
 }
+button {
+	font-family: inherit !important;
+}
+.via-dropdown {
+	text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow-x: hidden;
+}

app/css/post.css

@@ -86,7 +86,7 @@ textarea {
 	max-height: 7.7rem;
 }
 #default-emoji a {
-	color: var(--color);
+	color: var(--text);
 	margin-right: 0.15rem;
 }
 .character-counter {
@@ -126,8 +126,8 @@ textarea {
 }
 #posttgl,
 #toot-post-btn {
-	background-color: var(--accentbtn);
+	background-color: var(--active);
-	color: var(--color);
+	color: var(--text);
 }
 /*mini*/
 .mini-post .mize {

app/css/sort.css

@@ -5,7 +5,7 @@
   background-color: var(--modalfooter);
   margin: 0.4rem;
   border-radius: 0.4rem;
-  color: var(--color);
+  color: var(--text);
   padding: 3px;
   display: grid;
   grid-template-columns: 3.3rem 1fr 4.6rem;

app/css/themes.css

@@ -1,192 +1,22 @@
 :root {
-  --bg: white;
-  --drag: rgba(255, 255, 255, 0.8);
-  --color: black;
-  --beforehover: #757575;
-  --modal: white;
-  --subcolor: #e0e0e0;
-  --box: white;
-  --sidebar: #eeeeee;
-  --shared: #cfd8dc;
-  --notfbox: white;
-  --emphasized: #81c784;
-  --his-data: rgba(255, 255, 255, 0.9);
-  --active: #e6ee9c;
-  --postbox: white;
-  --modalfooter: #fafafa;
-  --accentbtn: #009688;
-  --selected: #c0c0c0;
-  --selectedWithShare: #b2babd;
-  --gray: #757575;
-}
-#imagemodal {
-  background: url("../img/pixel.white.svg");
-}
-.blacktheme {
   --bg: #212121;
   --drag: rgba(0, 0, 0, 0.8);
-  --color: white;
+  --text: white;
   --beforehover: #9e9e9e;
   --modal: black;
-  --subcolor: #212121;
+  --thirdColor: #212121;
-  --box: #424242;
+  --bottom: #424242;
-  --sidebar: #424242;
+  --accent: #004d40;
-  --shared: #004d40;
+  --subcolor: #333333;
-  --notfbox: #333333;
   --emphasized: #4e342e;
   --his-data: rgba(0, 0, 0, 0.8);
-  --active: #757575;
   --postbox: #424242;
   --modalfooter: #212121;
-  --accentbtn: #3f51b5;
+  --active: #3f51b5;
   --selected: #3f3f3f;
   --selectedWithShare: #003a30;
   --gray: #cccccc;
 }
-.blacktheme #imagemodal {
+#imagemodal {
   background: url("../img/pixel.svg");
 }
-.indigotheme {
-  --bg: #031833;
-  --drag: rgba(0, 0, 0, 0.8);
-  --color: white;
-  --beforehover: #9e9e9e;
-  --modal: #0d1351;
-  --subcolor: #0d1351;
-  --shared: #004d40;
-  --box: #0d1351;
-  --sidebar: #0d1351;
-  --notfbox: #0d47a1;
-  --emphasized: #4e342e;
-  --his-data: rgba(13, 19, 81, 0.8);
-  --active: #757575;
-  --postbox: #1a237e;
-  --modalfooter: #031833;
-  --accentbtn: #00acc1;
-  --selected: #214f8a;
-  --selectedWithShare: #003a30;
-  --gray: #cccccc ;
-}
-.indigotheme #imagemodal {
-  background: url("../img/pixel.svg");
-}
-.browntheme {
-  --bg: #261411;
-  --drag: rgba(0, 0, 0, 0.8);
-  --color: white;
-  --beforehover: #9e9e9e;
-  --modal: #261411;
-  --subcolor: #4e342e;
-  --shared: #004d40;
-  --box: #4e342e;
-  --sidebar: #4e342e;
-  --notfbox: #4e342e;
-  --emphasized: #0d47a1;
-  --his-data: rgba(62, 39, 35, 0.8);
-  --active: #757575;
-  --postbox: #4e342e;
-  --modalfooter: #261411;
-  --accentbtn: #827717;
-  --selected: #6d352b;
-  --selectedWithShare: #003a30;
-  --gray: #cccccc;
-}
-.browntheme #imagemodal {
-  background: url("../img/pixel.svg");
-}
-.greentheme {
-  --bg: #c8e6c9;
-  --drag: rgba(255, 255, 255, 0.8);
-  --color: black;
-  --beforehover: #757575;
-  --modal: #81c784;
-  --subcolor: #a5d6a7;
-  --box: #81c784;
-  --sidebar: #c5e1a5;
-  --shared: #ffcc80;
-  --notfbox: #a5d6a7;
-  --emphasized: #9e9d24;
-  --his-data: rgba(255, 255, 255, 0.9);
-  --active: #e6ee9c;
-  --postbox: #a5d6a7;
-  --modalfooter: #81c784;
-  --accentbtn: #33691e;
-  --selected: #78c17a;
-  --selectedWithShare: #caa266;
-  --gray: #757575;
-}
-.greentheme #imagemodal {
-  background: url("../img/pixel.white.svg");
-}
-.bluetheme {
-  --bg: #c9e1ec;
-  --drag: rgba(255, 255, 255, 0.8);
-  --color: black;
-  --beforehover: #757575;
-  --modal: #b2ebf2;
-  --subcolor: #90caf9;
-  --box: #90caf9;
-  --sidebar: #b6e6f5;
-  --shared: #e0ffe4;
-  --notfbox: #90caf9;
-  --emphasized: #c5e1a5;
-  --his-data: rgba(255, 255, 255, 0.9);
-  --active: #b39ddb;
-  --postbox: #dff1ff;
-  --modalfooter: #2196f3;
-  --accentbtn: #2f7bb7;
-  --selected: #9dcade;
-  --selectedWithShare: #c1dac4;
-  --gray: #757575;
-}
-.bluetheme #imagemodal {
-  background: url("../img/pixel.white.svg");
-}
-.polartheme {
-  --bg: #2e3440;
-  --drag: rgba(0, 0, 0, 0.8);
-  --color: white;
-  --beforehover: #8d94a0;
-  --modal: #3b4252;
-  --subcolor: #434c5e;
-  --box: #4c566a;
-  --sidebar: #3b4252;
-  --shared: #2d3b58;
-  --notfbox: #2a3857;
-  --emphasized: #2f4b86;
-  --his-data: rgba(0, 0, 0, 0.8);
-  --active: #2a3857;
-  --postbox: #434c5e;
-  --modalfooter: #485166;
-  --accentbtn: #2f4b86;
-  --selected: #464f61;
-  --selectedWithShare: #3e527e;
-  --gray: #cccccc;
-}
-.polartheme #imagemodal {
-  background: url("../img/pixel.svg");
-}
-.snowtheme {
-  --bg: #eceff4;
-  --drag: rgba(255, 255, 255, 0.8);
-  --color: #36425a;
-  --beforehover: #344058;
-  --modal: #e5e9f0;
-  --subcolor: #d8dee9;
-  --box: #c0c8d6;
-  --sidebar: #eeeeee;
-  --shared: #c3d4e6;
-  --notfbox: #d8dee9;
-  --emphasized: #88c0d0;
-  --his-data: rgba(255, 255, 255, 0.9);
-  --active: #8fbcbb;
-  --postbox: #d8dee9;
-  --modalfooter: #b2bed4;
-  --accentbtn: #81a1c1;
-  --selected: #b4bdd0;
-  --selectedWithShare: #a3afbb;
-  --gray: #5c6c8c;
-}
-.snowtheme #imagemodal {
-  background: url("../img/pixel.white.svg");
-}

app/css/tl.css

@@ -18,7 +18,7 @@
 	padding: 0.23rem;
 	padding-right: 0;
 	padding-left: 3rem;
-	background-color: var(--sidebar);
+	background-color: var(--bottom);
 	display: flex;
 	justify-content: space-between;
 	flex-wrap: wrap;
@@ -62,7 +62,7 @@
 }
 #bottom a,
 #demogroup a {
-	color: var(--color);
+	color: var(--text);
 }
 #bottom i {
 	font-size: 2.3rem;
@@ -93,7 +93,7 @@
 	display: grid;
 	grid-template-columns: 3rem 2.3rem 2.5fr 1fr 4.6rem;
 	grid-template-rows: 1.7rem 1.5rem;
-	grid-template-areas: 'cover name name artist refresh' 'cover progress progress progress time';
+	grid-template-areas: 'cover name name name refresh' 'cover progress progress progress time';
 }
 #spot-refresh {
 	grid-area: refresh;
@@ -108,18 +108,12 @@
 	overflow: hidden;
 	line-height: 1.92rem;
 }
-#spot-artist {
-	grid-area: artist;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-	overflow: hidden;
-	line-height: 1.92rem;
-}
 #spot-img {
 	width: 90%;
 }
 #spot-time {
 	grid-area: time;
+	line-height: 0.5rem;
 }
 .progress {
 	grid-area: progress;
@@ -436,7 +430,7 @@ iframe,
 }
 
 .btn-flat {
-	color: var(--color);
+	color: var(--text);
 }
 .area-side i {
 	margin-left: 0.75rem;
@@ -455,44 +449,15 @@ iframe,
 	color: var(--beforehover);
 }
 .actct:hover {
-	color: var(--color);
+	color: var(--text);
 	transition: 0.5s;
 }
-#contextWrap {
+.contextMenu.dropdown-content {
-	position: fixed;
+	padding-top: 5px;
-	width: 199vw;
+	overflow-y: hidden;
-	height: 100vh;
+	left: calc(100% - 200px) !important;
-	z-index: 100;
+	width: 200px !important;
 }
-.contextMenu {
-	position: fixed;
-	background-color: var(--box);
-	z-index: 9999;
-	border-radius: 0.4rem;
-	padding: 0.4rem;
-}
-.contextMenu.bottom:before {
-	content: '';
-	position: absolute;
-	top: 100%;
-	right: 2rem;
-	border: 1.2rem solid transparent;
-	border-top: 1.2rem solid var(--box);
-}
-.contextMenu.top:before {
-	content: '';
-	position: absolute;
-	top: -2.3rem;
-	right: 2rem;
-	border: 1.5rem solid transparent;
-	border-bottom: 1.5rem solid var(--box);
-}
-.contextMenu .btn-flat {
-	text-transform: none !important;
-	width: 100%;
-	text-align: left;
-}
-
 .gray {
 	color: var(--gray);
 }
@@ -531,7 +496,7 @@ iframe,
 	user-select: none;
 }
 .cbadge-hover {
-	color: var(--color);
+	color: var(--text);
 	background-color: transparent;
 }
 .cbadge-hover:hover {
@@ -547,7 +512,7 @@ p:not(:last-child) {
 	margin-bottom: 0.76rem;
 }
 .shared {
-	background-color: var(--shared);
+	background-color: var(--accent);
 }
 .emphasized {
 	background-color: var(--emphasized);
@@ -557,7 +522,7 @@ p:not(:last-child) {
 }
 .notice-box {
 	top: 0;
-	background-color: var(--notfbox);
+	background-color: var(--subcolor);
 	filter: brightness(110%);
 	position: relative;
 	margin-right: 0.7rem;
@@ -626,7 +591,7 @@ p:not(:last-child) {
 .notf-box {
 	position: fixed;
 	right: 5.4rem;
-	background-color: var(--box);
+	background-color: var(--subcolor);
 	border: thin solid gray;
 	z-index: 501;
 	width: 30rem;
@@ -663,14 +628,29 @@ p:not(:last-child) {
 	box-shadow: 0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12),
 		0 5px 5px -3px rgba(0, 0, 0, 0.3), 0px -10px 10px 0px rgba(0, 0, 0, 0.3) inset;
 }
+.notf-indv-box label span {
+	padding-left: 23px !important;
+	margin-right: 5px;
+}
+.notf-indv-box .setting {
+	font-size: 1rem;
+	width: calc(25% - 3px);
+	text-align: left;
+	padding: 5px;
+	height: 70px;
+}
+.notf-exclude-btn:hover {
+	background-color: inherit !important;
+	border: 1px solid;
+}
 .type-b {
 	display: none;
 }
 .modal-footer {
-	background-color: var(--box);
+	background-color: var(--subcolor);
 }
 .ballons {
-	background-color: var(--box);
+	background-color: var(--subcolor);
 	position: absolute;
 	bottom: 0px;
 	right: 0px;
@@ -728,11 +708,11 @@ p:not(:last-child) {
 	transition-duration: 0.5s;
 }
 .votebtn:hover {
-	background-color: var(--color);
+	background-color: var(--text);
 }
 .leadPoll {
 	position: absolute;
-	background-color: var(--box);
+	background-color: var(--subcolor);
 	height: 1.5rem;
 	border-radius: 0.23rem;
 }
@@ -794,11 +774,11 @@ audio {
 .cw_btn {
 	margin: 0.23rem;
 	background-color: var(--emphasized);
-	color: var(--color);
+	color: var(--text);
 	padding-left: 0.23rem;
 	padding-right: 0.23rem;
 	border-radius: 0.23rem;
-	border: 1px solid var(--color);
+	border: 1px solid var(--text);
 	user-select: none;
 }
 .vis-data {
@@ -888,7 +868,7 @@ audio {
 	cursor: pointer;
 	border: solid 1px;
 	padding-left: 0.15rem;
-	background-color: var(--notfbox);
+	background-color: var(--subcolor);
 	border-radius: 0.15rem;
 }
 .announReaction img {

app/css/userdata.css

@@ -1,151 +1,159 @@
 /*アイコンをクリックした時とかにでてくるユーザーデータ*/
 #his-data {
-  background-repeat: no-repeat;
+	background-repeat: no-repeat;
-  background-image: url("../img/loading.svg");
+	background-image: url('../img/loading.svg');
-  overflow-y: hidden;
+	overflow-y: hidden;
 }
-#his-data .btn .material-icons{
+#his-data .btn .material-icons {
-  float:left;
+	float: left;
 }
 #his-data-content {
-  display: flex;
+	display: flex;
-  justify-content: center;
+	justify-content: center;
 }
 #his-name {
-  font-size: 1.5rem;
+	font-size: 1.5rem;
 }
 #his-prof {
-  float: left;
+	width: 7.7rem;
-  width: 7.7rem;
+	margin-right: 0.4rem;
-  margin-right: 0.4rem;
 }
 .his-float {
-  overflow-y: scroll;
+	overflow-y: scroll;
-  padding: 0.4rem;
+	padding: 0.4rem;
 }
 #his-float-data {
-  height: 100%;
+	height: 100%;
   overflow-y: hidden;
+  
 }
 #his-leftside {
-  width: 38.4rem;
+  width: 28.4rem;
+  max-width: 30vw;
 }
 #his-float-timeline {
-  max-width: 59.6rem;
+  max-width: 47.5rem;
-  height: 100%;
+  min-width: calc(100% - 29.4rem);
-  overflow-y: hidden;
+	height: 100%;
+	overflow-y: hidden;
 }
 #his-basic-prof {
-  min-height: 10rem;
+  display: flex;
+	min-height: 10rem;
 }
 #his-field {
-  vertical-align: baseline;
+	vertical-align: baseline;
-  text-align: center;
+	text-align: center;
-  padding: 0;
+	padding: 0;
 }
 #his-field tr {
-  height: 1.5rem;
+	height: 1.5rem;
 }
 .his-field-title {
-  height: 1.5rem;
+	height: 1.5rem;
-  padding: 0;
+	padding: 0;
-  background-color: #757575;
+	background-color: #757575;
-  text-align: center;
+	text-align: center;
-  padding: 0.4rem;
+	padding: 0.4rem;
-  margin-bottom: 1px;
+	margin-bottom: 1px;
-  width: 30%;
+	width: 30%;
 }
 .his-field-content {
-  height: 1.5rem;
+	height: 1.5rem;
-  padding: 0;
+	padding: 0;
-  padding-left: 0.4rem;
+	padding-left: 0.4rem;
 }
 .his-var-content a span.ellipsis:after {
-  content: "...";
+	content: '...';
 }
 .his-var-content a:not(.mention) span:last-of-type {
-  display: none;
+	display: none;
 }
 #his-data a .rep_ct,
 #his-data a .rt_ct,
 #his-data a .fav_ct {
-  display: inline !important;
+	display: inline !important;
 }
 #his-data-show {
-  margin: 1.5rem;
+	margin: 1.5rem;
-  margin-left: 3.8rem;
+	margin-left: 3.8rem;
-  margin-right: 3.8rem;
+	margin-right: 3.8rem;
-  background-color: var(--his-data);
+	background-color: var(--his-data);
-  height: calc(100% - 1.5rem);
+	height: calc(100% - 1.5rem);
-  margin-bottom: 0;
+	margin-bottom: 0;
-  padding: 0.4rem;
+	padding: 0.4rem;
 }
 #his-data-wrap {
-  display: flex;
+	display: flex;
 }
 .his-var-content {
-  overflow-y: scroll;
+	overflow-y: scroll;
-  overflow-x: hidden;
+	overflow-x: hidden;
-  height: calc(100% - 3.4rem);
+	height: calc(100% - 3.4rem);
-  padding-bottom: 60px;
+	padding-bottom: 60px;
 }
 #my-data-nav .btn {
-  width: 10.7rem;
+	width: 10.6rem;
 }
-.active-back {
+#my-data-nav .active-back {
-  background-color: var(--active);
+	display: none;
 }
 #his-name .emojione,
 #his-name .emoji-img {
-  width: 1.538rem;
+	width: 1.538rem;
 }
 #his-plus-action .btn {
-  padding-right: 0.4rem;
+	padding-right: 0.4rem;
-  padding-left: 0.4rem;
+	padding-left: 0.4rem;
 }
 .tabs {
-  display: flex;
+	display: flex;
 }
 .tabs .tab a {
-  padding: 0.6rem 0.9rem;
+	padding: 0.6rem 0.9rem;
 }
 #his-des {
-  max-height: 17.7rem;
+	max-height: 17.7rem;
-  overflow-y: scroll;
+	overflow-y: scroll;
 }
 #his-sign-action {
-  border: 1px solid;
+	border: 1px solid;
-  border-radius: 0.4rem;
+	border-radius: 0.4rem;
-  display: flex;
+	display: flex;
-  align-items: center;
+	align-items: center;
-  padding-left: 0.75rem;
+	padding-left: 0.75rem;
-  padding-right: 0.75rem;
+	padding-right: 0.75rem;
-  flex-wrap: wrap;
+	flex-wrap: wrap;
 }
 #his-sign-action .btn {
-  flex-basis: 31.2%;
+	flex-basis: calc(50% - 10.6px);
 }
 #his-des .mention {
-  color: #039be5;
+	color: #039be5;
-  cursor: pointer;
+	cursor: pointer;
 }
-#his-table{
+#his-table {
-  max-height: 11.538rem;
+	max-height: 11.538rem;
-  overflow-y: scroll;
+	overflow-y: scroll;
 }
 #his-float-blocked {
-  display: flex;
+	display: flex;
-  justify-content: center;
+	justify-content: center;
-  align-items: center;
+	align-items: center;
-  font-size: 2rem;
+	font-size: 2rem;
-  height: 100%;
+	height: 100%;
 }
-#hisdropdown{
+#hisdropdown {
-  background-color: var(--bg);
+	background-color: var(--bg);
 }
 #hisdropdown li a {
-  color: white;
+	color: white;
 }
-#hisdropdown li:hover{
+#hisdropdown li:hover {
-  background-color: var(--active);
+	background-color: var(--active);
+}
+#his-data-title {
+	width: 100%;
+	text-align: center;
+	font-size: 1.5rem;
 }

app/js/common/version.js

@@ -1,5 +1,6 @@
 //バージョンチェッカー
 function verck(ver, jp) {
+	if (store) return false
 	console.log('%c Welcome😊 ' + ver, 'color: red;font-size:200%;')
 	$('body').addClass(localStorage.getItem('platform'))
 	var date = new Date()
@@ -327,82 +328,8 @@ function closeSupport() {
 		}
 	)
 }
-function storeDialog(platform, ver) {
-	if($('body').hasClass('accessibility')) return false
-	if (platform == 'win32') {
-		var mes = lang.lang_version_platform
-	} else if (platform == 'linux') {
-		var mes = lang.lang_version_platform_linux
-	} else if (platform == 'darwin') {
-		var mes = lang.lang_version_platform_mac
-	} else {
-		var mes = false
-	}
-	if (mes) {
-		Swal.fire({
-			title: 'Select your platform',
-			text: mes,
-			type: 'info',
-			showCancelButton: true,
-			confirmButtonColor: '#3085d6',
-			cancelButtonColor: '#3085d6',
-			confirmButtonText: lang.lang_no,
-			cancelButtonText: lang.lang_yesno
-		}).then(result => {
-			//逆にしてる
-			if (!result.value) {
-				localStorage.setItem('winstore', 'winstore')
-			} else {
-				localStorage.setItem('winstore', 'localinstall')
-			}
-			localStorage.setItem('ver', ver)
-			showVer = true
-			if(pwa) return false
-			console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
-			$(document).ready(function() {
-				$('#releasenote').modal('open')
-				verp = ver.replace('(', '')
-				verp = verp.replace('.', '-')
-				verp = verp.replace('.', '-')
-				verp = verp.replace('[', '-')
-				verp = verp.replace(']', '')
-				verp = verp.replace(')', '')
-				verp = verp.replace(' ', '_')
-				console.log('%c ' + verp, 'color: red;font-size:200%;')
-				if (lang.language == 'ja') {
-					$('#release-' + verp).show()
-				} else {
-					$('#release-en').show()
-				}
-			})
-		})
-	} else {
-		localStorage.setItem('ver', ver)
-			showVer = true
-			console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
-			$(document).ready(function() {
-				if(pwa) return false
-				$('#releasenote').modal('open')
-				verp = ver.replace('(', '')
-				verp = verp.replace('.', '-')
-				verp = verp.replace('.', '-')
-				verp = verp.replace('[', '-')
-				verp = verp.replace(']', '')
-				verp = verp.replace(')', '')
-				verp = verp.replace(' ', '_')
-				console.log('%c ' + verp, 'color: red;font-size:200%;')
-				if (lang.language == 'ja') {
-					$('#release-' + verp).show()
-				} else {
-					$('#release-en').show()
-				}
-			})
-	}
-	
-}
 function closeStart() {
 	$('#start').css('display', 'none')
 	var platform = localStorage.getItem('platform')
 	var ver = localStorage.getItem('ver')
-	storeDialog(platform, ver)
 }

app/js/platform/end.js

@@ -170,7 +170,7 @@ onmessage = function(e) {
 	} else if (e.data[0] == 'npCore') {
 		npCore(e.data[1])
 	} else if (e.data[0] == 'renderMem') {
-		renderMem(e.data[1][0], e.data[1][1], e.data[1][2])
+		renderMem(e.data[1][0], e.data[1][1], e.data[1][2], e.data[1][3], e.data[1][4])
 	} else if (e.data[0] == 'updateProg') {
 		updateProg(e.data[1])
 	} else if (e.data[0] == 'updateMess') {

app/js/platform/first.js

@@ -1,11 +1,11 @@
-$.strip_tags = function(str, allowed) {
+$.strip_tags = function (str, allowed) {
 	if (!str) {
 		return ''
 	}
 	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 str.replace(commentsAndPhpTags, '').replace(tags, function ($0, $1) {
 		return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : ''
 	})
 }
@@ -88,17 +88,18 @@ function formattimeutc(date) {
 }
 postMessage(['sendSinmpleIpc', 'custom-css-request'], '*')
 function makeCID() {
-	return (
+	let chars = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".split("")
-		randomStr(8) +
+	for (let i = 0, len = chars.length; i < len; i++) {
-		'-' +
+		switch (chars[i]) {
-		randomStr(4) +
+			case "x":
-		'-' +
+				chars[i] = Math.floor(Math.random() * 16).toString(16)
-		randomStr(4) +
+				break
-		'-' +
+			case "y":
-		randomStr(4) +
+				chars[i] = (Math.floor(Math.random() * 4) + 8).toString(16)
-		'-' +
+				break
-		randomStr(12)
+		}
-	)
+	}
+	return chars.join("")
 }
 function randomStr(l) {
 	// 生成する文字列に含める文字セット
@@ -147,15 +148,15 @@ function rgbToHex(color) {
 	console.error(color + ':第1引数はRGB形式で入力')
 }
 /*マルチバイト用切り出し*/
-$.isSurrogatePear = function(upper, lower) {
+$.isSurrogatePear = function (upper, lower) {
 	return 0xd800 <= upper && upper <= 0xdbff && 0xdc00 <= lower && lower <= 0xdfff
 }
-$.mb_strlen = function(str) {
+$.mb_strlen = function (str) {
 	var splitter = new GraphemeSplitter()
 	var arr = splitter.splitGraphemes(str)
 	return arr.length
 }
-$.mb_substr = function(str, begin, end) {
+$.mb_substr = function (str, begin, end) {
 	//配列にする
 	var splitter = new GraphemeSplitter()
 	var arr = splitter.splitGraphemes(str)
@@ -175,7 +176,7 @@ function object_array_sort(data, key, order, fn) {
 		num_a = 1
 		num_b = -1
 	}
-	data = data.sort(function(a, b) {
+	data = data.sort(function (a, b) {
 		var x = a[key]
 		var y = b[key]
 		if (x > y) return num_a

app/js/platform/preload.js

@@ -2,25 +2,9 @@ var electron = require('electron')
 const shell = electron.shell
 var ipc = electron.ipcRenderer
 //title bar
-const customTitlebar = require('custom-electron-titlebar')
 window.addEventListener('DOMContentLoaded', () => {
 	document.title = 'TheDesk'
 	ipc.send('acsCheck', '')
-	ipc.send('frameCheck', '')
-	ipc.on('frame', function(event, args) {
-		const file = location.href.substr(-10)
-		if (
-			file == 'index.html' ||
-			file == '/acct.html' ||
-			file == 'tting.html'
-		) {
-			new customTitlebar.Titlebar({
-				backgroundColor: customTitlebar.Color.fromHex('#000'),
-				titleHorizontalAlignment: 'right',
-				icon: '../../img/desk.png'
-			})
-		}
-		})
 })
 
 onmessage = function(e) {
@@ -207,6 +191,7 @@ ipc.on('theme-json-response', function(event, args) {
 	postMessage(['customConnect', args], '*')
 })
 ipc.on('theme-json-create-complete', function(event, args) {
+	if(args != '') alert(args)
 	postMessage(['clearCustomImport', ''], '*')
 	postMessage(['ctLoad', ''], '*')
 })
@@ -219,7 +204,7 @@ ipc.on('memory', function(event, arg) {
 	var use = arg[0]
 	var cpu = arg[1]
 	var total = arg[2]
-	postMessage(['renderMem', [use, cpu, total]], '*')
+	postMessage(['renderMem', [use, cpu, total, arg[3], arg[4]]], '*')
 })
 //log
 ipc.on('logData', function(event, args) {

app/js/post/status.js

@@ -680,37 +680,9 @@ function staEx(mode) {
 		})
 	return
 }
-function toggleAction(elem, ct) {
+function toggleAction(id) {
-	var height = ct * 39 + 6
+	const elm = document.getElementById(id)
-	var cont = elem.parents('.cvo').find('.contextMenu')
+	const instance = M.Dropdown.init(elm);
-	if (cont.hasClass('hide')) {
+	console.log(instance.isOpen)
-		$('#contextWrap').removeClass('hide')
+	instance.open()
-		var left = elem.offset().left + 60
-		var top = elem.offset().top - height
-		if (top < 75) {
-			top = elem.offset().top + 45
-			cont.removeClass('bottom')
-			cont.addClass('top')
-		} else {
-			top = elem.offset().top - 105
-			cont.removeClass('top')
-			cont.addClass('bottom')
-		}
-		if (elem.parents('.cvo').attr('id') == 'toot-this') {
-			console.log($('#toot-this').offset().top, elem.offset().top)
-			left = $('#toot-this').offset().left + elem.offset().left + 10
-			top = $('#toot-this').offset().top - $('#toot-this').height() - height + 25
-		}
-		cont.css('top', top + 'px')
-		cont.css('right', `calc(100vw - ${left}px)`)
-		cont.removeClass('hide')
-		elem
-			.parents('.cvo')
-			.find('.act-icon')
-			.text('expand_less')
-	} else {
-		$('#contextWrap').addClass('hide')
-		$('.contextMenu').addClass('hide')
-		$('.act-icon').text('expand_more')
-	}
 }

app/js/tl/card.js

@@ -335,6 +335,13 @@ function cardCheck(tlid) {
 }
 
 function mov(id, tlid, type) {
+	const dropdownTrigger = `dropdown_${tlid}_${id}`
+	const elm = document.getElementById(dropdownTrigger)
+	const instance = M.Dropdown.getInstance(elm)
+	if(instance) {
+		if(instance.isOpen) return false
+	}
+	
 	var click = false
 	if (tlid == 'notf') {
 		var tlide = '[data-notf=' + acct_id + ']'
@@ -361,9 +368,9 @@ function mov(id, tlid, type) {
 	}
 	if (mouseover == 'hide') {
 		if (click) {
-			$(tlide + ' [toot-id=' + id + ']').toggleClass('hide-actions')
+			$(tlide + ' [unique-id=' + id + ']').toggleClass('hide-actions')
 		} else {
-			$(tlide + ' [toot-id=' + id + ']').removeClass('hide-actions')
+			$(tlide + ' [unique-id=' + id + ']').removeClass('hide-actions')
 		}
 
 		//$(tlide + " [toot-id=" + id + "] .area-vis").toggleClass("hide")

app/js/tl/mix.js

@@ -19,20 +19,20 @@ async function mixtl(acct_id, tlid, type, delc, voice) {
 	additional(acct_id, tlid)
 	jQuery('time.timeago').timeago()
 	todc()
-	if(mastodonBaseWsStatus[domain] == 'cannnotopen') {
+	if(mastodonBaseWsStatus[domain] == 'cannotuse') {
 		mixre(acct_id, tlid, 'mix', mute, voice, '')
-	} else if(mastodonBaseWs[domain] == 'undetected') {
+	} else if (mastodonBaseWsStatus[domain] == 'undetected' || mastodonBaseWsStatus[domain] == 'connecting') {
 		const mbws = setInterval(function () {
-			if(mastodonBaseWsStatus[domain] == 'cannnotopen') {
+			if(mastodonBaseWsStatus[domain] == 'cannotuse') {
 				mixre(acct_id, tlid, 'mix', mute, voice, '')
 				clearInterval(mbws)
 			} else if(mastodonBaseWsStatus[domain] == 'available') {
-				mastodonBaseWs[domain].send(`{"type":"subscribe","stream":"public:local"}`)
+				mastodonBaseWs[domain].send(JSON.stringify({type: 'subscribe', stream: 'public:local'}))
 				clearInterval(mbws)
 			}
 		}, 1000)
 	} else if(mastodonBaseWsStatus[domain] == 'available') {
-		mastodonBaseWs[domain].send(`{"type":"subscribe","stream":"public:local"}`)
+		mastodonBaseWs[domain].send(JSON.stringify({type: 'subscribe', stream: 'public:local'}))
 	}
 	
 	$(window).scrollTop(0)

app/js/tl/notification.js

@@ -116,7 +116,7 @@ function notfColumn(acct_id, tlid, sys) {
 		var start = 'wss://' + domain + '/?i=' + at
 	}
 }
-function notfCommon(acct_id, tlid, sys) {
+function notfCommon(acct_id, tlid, sys, stream) {
 	todo('Notifications Loading...')
 	var native = localStorage.getItem('nativenotf')
 	var at = localStorage.getItem('acct_' + acct_id + '_at')
@@ -147,6 +147,10 @@ function notfCommon(acct_id, tlid, sys) {
 			}
 		}
 	}
+	if(stream == 'only') {
+		notfWS(misskey, acct_id, tlid, domain, at)
+		return false
+	}
 	fetch(start, i)
 		.then(function(response) {
 			console.log('header to get param:' + response.headers.get('link'))
@@ -203,10 +207,11 @@ function notfCommon(acct_id, tlid, sys) {
 			}
 			$('#notf-box').addClass('fetched')
 			todc()
-			notfWS(misskey, acct_id, tlid, domain, at)
+			if(stream != 'no') notfWS(misskey, acct_id, tlid, domain, at)
 		})
 }
 function notfWS(misskey, acct_id, tlid, domain, at) {
+	if(mastodonBaseWsStatus[domain] == 'available') return false
 	if (!misskey) {
 		if (localStorage.getItem('streaming_' + acct_id)) {
 			var wss = localStorage.getItem('streaming_' + acct_id)
@@ -258,7 +263,7 @@ function notfWS(misskey, acct_id, tlid, domain, at) {
 			}
 		}
 		websocketNotf[acct_id].onerror = function(error) {
-			console.error('WebSocket Error ' + error)
+			console.error('WebSocket Error ', error)
 			errorct++
 			console.log(errorct)
 			if (errorct < 3) {
@@ -266,7 +271,7 @@ function notfWS(misskey, acct_id, tlid, domain, at) {
 			}
 		}
 		websocketNotf[acct_id].onclose = function(error) {
-			console.error('WebSocket Close ' + error)
+			console.error('WebSocket Close ', error)
 			errorct++
 			console.log(errorct)
 			if (errorct < 3) {

app/js/tl/parse.js

@@ -224,7 +224,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				}
 				var emoji_url = `
 					<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
-						alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
+						alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');" loading="lazy">
 				`
 				var regExp = new RegExp(':' + shortcode + ':', 'g')
 				dis_name = dis_name.replace(regExp, emoji_url)
@@ -241,7 +241,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				noticeavatar = toot.account.avatar_static
 			}
 			noticeavatar = `<a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="udg">
-					<img draggable="false" src="${noticeavatar}" width="20" class="notf-icon prof-img" user="${toot.account.acct}" alt="">
+					<img draggable="false" src="${noticeavatar}" width="20" class="notf-icon prof-img" user="${toot.account.acct}" alt="" loading="lazy">
 				</a>`
 			if (toot.type == 'mention') {
 				var what = lang.lang_parse_mentioned
@@ -379,7 +379,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					}
 					var emoji_url = `
 						<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
-							alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
+							alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');" loading="lazy">
 					`
 					var regExp = new RegExp(':' + shortcode + ':', 'g')
 					dis_name = dis_name.replace(regExp, emoji_url)
@@ -395,7 +395,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				}
 				noticeavatar = `<a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="udg" aria-hidden="true">
 						<img draggable="false" src="${noticeavatar}" width="20" class="notf-icon prof-img" 
-							user="${toot.account.acct}" onerror="this.src=\'../../img/loading.svg\'">
+							user="${toot.account.acct}" onerror="this.src=\'../../img/loading.svg\'" loading="lazy">
 					</a>`
 				var rebtxt = lang.lang_parse_btedsimple
 				var rticon = 'fa-retweet light-blue-text'
@@ -436,7 +436,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						}
 						var emoji_url = `
 							<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
-								alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
+								alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');" loading="lazy">
 						`
 						var regExp = new RegExp(':' + shortcode + ':', 'g')
 						dis_name = dis_name.replace(regExp, emoji_url)
@@ -652,7 +652,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 										id="${id}-image-${key2}" data-url="${url}" data-original="${remote_url}" data-type="${media.type}" 
 										class="img-parsed img-link" style="width:calc(${cwdt}% - 1px); height:${imh};">
 									<img draggable="false" src="${purl}" class="${sense} toot-img pointer" 
-										onerror="this.src=\'../../img/loading.svg\'" title="${escapeHTML(desc)}" alt="${escapeHTML(desc)}">
+										onerror="this.src=\'../../img/loading.svg\'" title="${escapeHTML(desc)}" alt="${escapeHTML(desc)}" loading="lazy">
 									${nsfwmes}
 								</a>`
 						}
@@ -855,7 +855,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					}
 					var emoji_url = `
 						<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
-							alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
+							alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');" loading="lazy">
 					`
 					var regExp = new RegExp(':' + shortcode + ':', 'g')
 					content = content.replace(regExp, emoji_url)
@@ -875,7 +875,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					var emoji = toot.profile_emojis[keynico]
 					var shortcode = emoji.shortcode
 					var emoji_url = `<img draggable="false" src="${emoji.url}" class="emoji-img" data-emoji="${shortcode}" alt=" :${shortcode}: "
-							 title="${shortcode}" onclick="this.classList.toggle(\'bigemoji\');">`
+							 title="${shortcode}" onclick="this.classList.toggle(\'bigemoji\');" loading="lazy">`
 					var regExp = new RegExp(':' + shortcode + ':', 'g')
 					content = content.replace(regExp, emoji_url)
 					spoil = spoil.replace(regExp, emoji_url)
@@ -901,12 +901,10 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			}
 			//日本語じゃない
 			if (toot.language != lang.language && toot.language) {
-				var trans = `<div class="">
+				var trans = `<li onclick="trans('${toot.language}','${lang.language}', $(this))" 
-						<a onclick="trans('${toot.language}','${lang.language}', $(this))" 
+							 style="padding:0">
-							class="waves-effect waves-dark btn-flat actct" style="padding:0">
 								<i class="material-icons" aria-hidden="true">g_translate</i>${lang.lang_parse_trans}
-						</a>
+					</li>`
-					</div>`
 			} else {
 				var trans = ''
 			}
@@ -964,7 +962,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 								};width:100%; height:0.9rem; font-size:0.8rem;" class="tickers">
 									<img draggable="false" src="${
 								value.favicon
-								}" style="height:100%;" onerror="this.src=\'../../img/loading.svg\'">
+								}" style="height:100%;" onerror="this.src=\'../../img/loading.svg\'" loading="lazy">
 									<span style="position:relative; top:-0.2rem;">${escapeHTML(value.name)}</span>
 								</div>`
 							break
@@ -986,7 +984,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 							<a onclick="udg('${toot.quote.account.id}','${acct_id}');" user="${
 						toot.quote.account.acct
 						}" class="udg">
-								<img draggable="false" src="${toot.quote.account.avatar}">
+								<img draggable="false" src="${toot.quote.account.avatar}" loading="lazy">
 							</a>
 						</div>
 						<div class="renote-user">
@@ -1034,15 +1032,15 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					'unix'
 				)}"
 					${if_notf}
-					onmouseover="mov('${toot.id}','${tlid}','mv')"
+					onmouseover="mov('${uniqueid}','${tlid}','mv')"
-					onclick="mov('${toot.id}','${tlid}','cl')"
+					onclick="mov('${uniqueid}','${tlid}','cl')"
 					onmouseout="resetmv('mv')"
 				>
 				<div class="area-notice grid"><span class="gray sharesta">${notice}${home}</span></div>
 				<div class="area-icon grid">
 					<a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="udg">
 						<img draggable="false" src="${avatar}" width="40" class="prof-img"
-							user="${toot.account.acct}" onerror="this.src='../../img/loading.svg'" alt="" />
+							user="${toot.account.acct}" onerror="this.src='../../img/loading.svg'" alt="" loading="lazy" />
 					</a>
 					${noticeavatar}
 				</div>
@@ -1132,8 +1130,8 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				</div>
 				<div class="area-side">
 					<div class="action ${noauth}">
-						<a onclick="toggleAction($(this), ${menuct})" 
+						<a onclick="toggleAction('trigger_${tlid}_${uniqueid}')" data-target="dropdown_${tlid}_${uniqueid}"
-							class="ctxMenu waves-effect waves-dark btn-flat" style="padding:0">
+							class="ctxMenu waves-effect waves-dark btn-flat" style="padding:0" id="trigger_${tlid}_${uniqueid}">
 							<i class="text-darken-3 material-icons act-icon" aria-hidden="true">expand_more</i>
 							<span class="voice">Other actions</span>
 						</a>
@@ -1146,45 +1144,32 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						<span class="voice">${lang.lang_parse_detail}</span>
 					</div>
 				</div>
-				<div class="contextMenu hide z-depth-4">
+				<ul class="dropdown-content contextMenu" id="dropdown_${tlid}_${uniqueid}">
-					<div class="${viashow}">
+					<li class="${viashow} via-dropdown" onclick="client('${$.strip_tags(via)}')" title="${lang.lang_parse_clientop}">
-						via ${escapeHTML(via)}<br>
+						via ${escapeHTML(via)}</a>
-						<a onclick="client('${$.strip_tags(via)}')" class="pointer">${lang.lang_parse_clientop}</a>
+					</li>
-					</div>
 					<div>
-					<button onclick="bkm('${uniqueid}','${acct_id}','${tlid}')"
+					<li onclick="bkm('${uniqueid}','${acct_id}','${tlid}')"
-						class="waves-effect waves-dark btn-flat actct bkm-btn" style="padding:0">
+						class="bkm-btn bkmStr_${uniqueid}" style="padding:0">
-						<i class="fas text-darken-3 fa-bookmark bkm_${toot.id} ${if_bkm}"></i>
+						<i class="fas text-darken-3 fa-bookmark bkm_${toot.id} ${if_bkm}"></i>${bkmStr}
-						<span class="bkmStr_${uniqueid}">${bkmStr}</span>
+					</li>
-					</button>
+					<li class="${if_mine}" onclick="del('${uniqueid}','${acct_id}')"
-					</div>
-					<div class="${if_mine}">
-						<button onclick="del('${uniqueid}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
 							style="padding:0">
 							<i class="fas fa-trash"></i>${lang.lang_parse_del}
-						</button>
+					</li>
-					</div>
+					<li class="${if_mine}" onclick="pin('${uniqueid}','${acct_id}')" style="padding:0" class="pinStr_${uniqueid}">
-					<div class="${if_mine}">
+							<i class="fas fa-map-pin pin_${uniqueid} ${if_pin}"></i>${pinStr}
-						<button onclick="pin('${uniqueid}','${acct_id}')" class="waves-effect waves-dark btn-flat actct" style="padding:0">
+					</li>
-							<i class="fas fa-map-pin pin_${uniqueid} ${if_pin}"></i>
+					<li class="${if_mine}"  onclick="redraft('${uniqueid}','${acct_id}')"
-							<span class="pinStr_${uniqueid}">${pinStr}</span>
-						</button>
-					</div>
-					<div class="${if_mine}">
-						<button onclick="redraft('${uniqueid}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
 							style="padding:0">
 							<i class="material-icons" aria-hidden="true">redo</i>${lang.lang_parse_redraft}
-						</button>
+					</li>
-					</div>
 					${trans}
-					<div>
+					<li onclick="postMessage(['openUrl', '${toot.url}'], '*')"
-					<button onclick="postMessage(['openUrl', '${toot.url}'], '*')"
+						 style="padding:0">
-						class="waves-effect waves-dark btn-flat actct" style="padding:0">
+						<i class="fas text-darken-3 fa-globe"></i>${lang.lang_parse_link}
-						<i class="fas text-darken-3 fa-globe"></i>
+					</li>
-						${lang.lang_parse_link}
+				</ul>
-					</button>
-					</div>
-				</div>
 			</div>
 			`
 		}
@@ -1295,7 +1280,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 						}
 						var emoji_url = `
 							<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
-								alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
+								alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');" loading="lazy">
 						`
 						var regExp = new RegExp(':' + shortcode + ':', 'g')
 						dis_name = dis_name.replace(regExp, emoji_url)
@@ -1338,6 +1323,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 							user="${toot.acct}"
 							onerror="this.src='../../img/loading.svg'"
 							alt=""
+							loading="lazy"
 						/>
 					</a></div>
 					<div class="area-display_name">
@@ -1371,7 +1357,6 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 }
 //クライアントダイアログ
 function client(name) {
-	$('#contextWrap').addClass('hide')
 	if (name != 'Unknown') {
 		//聞く
 		Swal.fire({
@@ -1529,7 +1514,7 @@ function pollParse(poll, acct_id, emojis) {
 				}
 				var emoji_url = `
 			<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
-				alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
+				alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');" loading="lazy">
 		`
 				var regExp = new RegExp(':' + shortcode + ':', 'g')
 				choiceText = choiceText.replace(regExp, emoji_url)
@@ -1564,18 +1549,24 @@ function pollParse(poll, acct_id, emojis) {
 var mastodonBaseWs = {}
 var mastodonBaseWsStatus = {}
 function mastodonBaseStreaming(acct_id) {
+	console.log('start to connect mastodonBaseStreaming of ' + acct_id)
+	notfCommon(acct_id, 0, null, 'no')
 	const domain = localStorage.getItem(`domain_${acct_id}`)
-	if(mastodonBaseWsStatus[domain]) return
+	if (mastodonBaseWsStatus[domain]) return
 	mastodonBaseWsStatus[domain] = 'undetected'
 	const at = localStorage.getItem(`acct_${acct_id}_at`)
-	const start = `wss://${domain}/api/v1/streaming/?access_token=${at}`
+	let wss = 'wss://' + domain
+	if (localStorage.getItem('streaming_' + acct_id)) {
+		wss = localStorage.getItem('streaming_' + acct_id)
+	}
+	const start = `${wss}/api/v1/streaming/?access_token=${at}`
 	mastodonBaseWs[domain] = new WebSocket(start)
 	mastodonBaseWs[domain].onopen = function () {
 		mastodonBaseWsStatus[domain] = 'connecting'
 		setTimeout(function () {
 			mastodonBaseWsStatus[domain] = 'available'
 		}, 3000)
-		mastodonBaseWs[domain].send(`{"type":"subscribe","stream":"user"}`)
+		mastodonBaseWs[domain].send(JSON.stringify({type: 'subscribe', stream: 'user'}))
 		$('.notice_icon_acct_' + acct_id).removeClass('red-text')
 	}
 	mastodonBaseWs[domain].onmessage = function (mess) {
@@ -1618,10 +1609,21 @@ function mastodonBaseStreaming(acct_id) {
 		}
 	}
 	mastodonBaseWs[domain].onerror = function (error) {
-		notf(acct_id, 0) //fallback
+		notfCommon(acct_id, 0, null, 'only') //fallback
 		console.error("Error closing " + domain)
 		console.error(error)
-		if (mastodonBaseWsStatus[domain] == 'available') alert(domain)
+		if (mastodonBaseWsStatus[domain] == 'available') {
+			/*M.toast({
+				html:
+					`${lang.lang_parse_disconnected}<button class="btn-flat toast-action" onclick="location.reload()">${lang.lang_layout_reconnect}</button>`,
+				completeCallback: function () {
+					parseColumn()
+
+				},
+				displayLength: 3000
+			})*/
+			parseColumn()
+		}
 		mastodonBaseWsStatus[domain] = 'cannotuse'
 		setTimeout(function () {
 			mastodonBaseWsStatus[domain] = 'cannotuse'
@@ -1630,9 +1632,20 @@ function mastodonBaseStreaming(acct_id) {
 		return false
 	}
 	mastodonBaseWs[domain].onclose = function () {
-		notf(acct_id, 0) //fallback
+		notfCommon(acct_id, 0, null, 'only') //fallback
 		console.warn("Closing " + domain)
-		if (mastodonBaseWsStatus[domain] == 'available') alert(domain)
+		if (mastodonBaseWsStatus[domain] == 'available') {
+			/*M.toast({
+				html:
+					`${lang.lang_parse_disconnected}<button class="btn-flat toast-action" onclick="location.reload()">${lang.lang_layout_reconnect}</button>`,
+				completeCallback: function () {
+					parseColumn()
+
+				},
+				displayLength: 3000
+			})*/
+			parseColumn()
+		}
 		mastodonBaseWs[domain] = false
 		mastodonBaseWsStatus[domain] = 'cannotuse'
 		setTimeout(function () {
@@ -1676,10 +1689,11 @@ function getTlMeta(type, data, num, status) {
 	const columns = localStorage.getItem('column')
 	const obj = JSON.parse(columns)
 	let ret = []
-	let i = 0
+	let i = -1
 	switch (type) {
 		case 'user':
 			for (const tl of obj) {
+				i++
 				if (tl.domain != acct_id) continue
 				if (tl.type == 'mix' || tl.type == 'home') {
 					let voice = false
@@ -1691,11 +1705,11 @@ function getTlMeta(type, data, num, status) {
 						acct_id: tl.domain
 					})
 				}
-				i++
 			}
 			break
 		case 'public:local':
 			for (const tl of obj) {
+				i++
 				if (tl.domain != acct_id) continue
 				if (tl.type == 'mix' || tl.type == 'local') {
 					let voice = false
@@ -1707,11 +1721,11 @@ function getTlMeta(type, data, num, status) {
 						acct_id: tl.domain
 					})
 				}
-				i++
 			}
 			break
 		case 'public:local:media':
 			for (const tl of obj) {
+				i++
 				if (tl.domain != acct_id) continue
 				if (tl.type == 'local-media') {
 					let voice = false
@@ -1723,13 +1737,14 @@ function getTlMeta(type, data, num, status) {
 						acct_id: tl.domain
 					})
 				}
-				i++
 			}
 			break;
 		case 'public':
 			for (const tl of obj) {
+				i++
 				if (tl.domain != acct_id) continue
 				if (tl.type == 'pub') {
+					console.log(i, tl)
 					let voice = false
 					if (localStorage.getItem('voice_' + i)) voice = true
 					ret.push({
@@ -1739,11 +1754,11 @@ function getTlMeta(type, data, num, status) {
 						acct_id: tl.domain
 					})
 				}
-				i++
 			}
 			break;
 		case 'public:media':
 			for (const tl of obj) {
+				i++
 				if (tl.domain != acct_id) continue
 				if (tl.type == 'pub-media') {
 					let voice = false
@@ -1755,11 +1770,11 @@ function getTlMeta(type, data, num, status) {
 						acct_id: tl.domain
 					})
 				}
-				i++
 			}
 			break;
 		case 'list':
 			for (const tl of obj) {
+				i++
 				if (tl.domain != acct_id) continue
 				if (tl.type == 'list' && tl.data == data[1]) {
 					let voice = false
@@ -1771,11 +1786,11 @@ function getTlMeta(type, data, num, status) {
 						acct_id: tl.domain
 					})
 				}
-				i++
 			}
 			break;
 		case 'direct':
 			for (const tl of obj) {
+				i++
 				if (tl.domain != acct_id) continue
 				if (tl.type == 'dm') {
 					let voice = false
@@ -1787,11 +1802,11 @@ function getTlMeta(type, data, num, status) {
 						acct_id: tl.domain
 					})
 				}
-				i++
 			}
 			break;
 		case 'hashtag':
 			for (const tl of obj) {
+				i++
 				if (tl.domain != acct_id) continue
 				const columnDataRaw = tl.data
 				let columnData
@@ -1831,7 +1846,6 @@ function getTlMeta(type, data, num, status) {
 						acct_id: tl.domain
 					})
 				}
-				i++
 			}
 			break;
 		default:

app/js/tl/src.js

@@ -219,9 +219,9 @@ function moreTs(tlid, q) {
 function graphDraw(tag, acct_id) {
 	var tags = ''
 	var his = tag.history
-	return graphDrawCore(his, tag)
+	return graphDrawCore(his, tag, acct_id)
 }
-function graphDrawCore(his, tag) {
+function graphDrawCore(his, tag, acct_id) {
 	var max = Math.max.apply(null, [
 		his[0].uses,
 		his[1].uses,
@@ -307,7 +307,7 @@ function trend() {
 			Object.keys(json).forEach(function(keye) {
 				var tag = json[keye]
 				var his = tag.history
-				tags = graphDrawCore(his, tag)
+				tags = graphDrawCore(his, tag, acct_id)
 
 				$('#src-contents').append(tags)
 			})

app/js/tl/tl.js

@@ -278,7 +278,7 @@ function stremaingSubscribe(type, acct_id, data, unsubscribe) {
 	else if (type === 'pub') { stream = 'public' }
 	else if (type === 'pub-media') { stream = 'public:media' }
 	else if (type === 'list') {
-		mastodonBaseWs[domain].send(`{"type":"${command}","stream":"list","list":"${data}"}`)
+		mastodonBaseWs[domain].send(JSON.stringify({type: command, stream: 'list', list: data}))
 		return true
 	} else if (type === 'tag') {
 		let arr = []
@@ -288,11 +288,11 @@ function stremaingSubscribe(type, acct_id, data, unsubscribe) {
 		if (data.any) arr = arr.concat(data.any.split(','))
 		if (data.all) arr = arr.concat(data.all.split(','))
 		for (const tag of arr) {
-			mastodonBaseWs[domain].send(`{"type":"${command}","stream":"hashtag","tag":"${tag}"}`)
+			mastodonBaseWs[domain].send(JSON.stringify({type: command, stream: 'hashtag', tag: tag}))
 		}
 		return true
 	}
-	mastodonBaseWs[domain].send(`{"type":"${command}","stream":"${stream}"`)
+	mastodonBaseWs[domain].send(JSON.stringify({type: command, stream: stream}))
 }
 function oldStreaming(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 	var misskey = false

app/js/ui/layout.js

@@ -149,7 +149,6 @@ function parseColumn(target, dontclose) {
 				icnsert = ' style="color: #' + ichex + '" '
 			}
 		}
-		console.log(acct)
 		if (acctlist[acct.domain]) {
 			if (acctlist[acct.domain].background != 'def') {
 				insert = insert + ' border-bottom:medium solid #' + acctlist[acct.domain].background + ';'
@@ -229,65 +228,63 @@ function parseColumn(target, dontclose) {
 				var animecss = ''
 			}
 			var unread = `<a id="unread_${key}" onclick="showUnread('${key}','${acct.type}','${acct.domain}')"
-					 class="setting nex" title="${lang.lang_layout_unread}">
+					 class="setting nex waves-effect" title="${lang.lang_layout_unread}">
-					<i class="material-icons waves-effect nex">more</i>
+					<i class="material-icons waves-effect nex">more</i><br />${lang.lang_layout_unread}
-				</a>${lang.lang_layout_unread}<br>`
+				</a>`
 			var notfDomain = acct.domain
 			var notfKey = key
 			var if_tag = ''
 			var if_tag_btn = ''
 			if (acct.type == 'notf') {
 				var exclude =
-					lang.lang_excluded +
+					`<div style="border: 1px solid; padding: 5px; margin-top: 5px; margin-bottom: 5px;">${lang.lang_layout_excluded}:<br>
-					`:<br>
 					<label>
 						<input type="checkbox" class="filled-in" id="exc-reply-${key}" ${excludeCk(key, 'mention')} />
 						<span>
-							<i class="fas fa-share exc-icons"></i>
+							${lang.lang_layout_mention}
 						</span>
 					</label>
 					<label>
 						<input type="checkbox" class="filled-in" id="exc-fav-${key}" ${excludeCk(key, 'favourite')} />
 						<span>
-							<i class="fas fa-star exc-icons"></i>
+						${lang.lang_layout_fav}
 						</span>
 					</label> 
 					<label>
 						<input type="checkbox" class="filled-in" id="exc-bt-${key}" ${excludeCk(key, 'reblog')} />
 						<span>
-							<i class="fas fa-retweet exc-icons"></i>
+						${lang.lang_layout_bt}
 						</span>
 					</label>
 					<label>
 						<input type="checkbox" class="filled-in" id="exc-follow-${key}" ${excludeCk(key, 'follow')} />
 						<span>
-							<i class="fas fa-users exc-icons"></i>
+						${lang.lang_status_follow}
 						</span>
 					</label> 
 					<label>
 						<input type="checkbox" class="filled-in" id="exc-poll-${key}" ${excludeCk(key, 'poll')} />
 						<span>
-							<i class="fas fa-tasks exc-icons"></i>
+						${lang.lang_layout_poll}
 						</span>
-					</label> 
+					</label> <br />
-					<button class="btn waves-effect" style="width:60px; padding:0;" onclick="exclude('${key}')">Filter</button>`
+					<button class="btn btn-flat waves-effect notf-exclude-btn waves-light" style="width:calc(50% - 11px); padding:0;" onclick="exclude('${key}')">Filter</button>`
 				if (checkNotfFilter(key)) {
 					exclude =
 						exclude +
-						`<button class="btn red waves-effect" style="width:60px; padding:0;" onclick="resetNotfFilter('${key}')">
+						`<button class="btn btn-flat red-text waves-effect notf-exclude-btn waves-light" style="width:calc(50% - 11px); padding:0;" onclick="resetNotfFilter('${key}')">
 							Clear all
 						</button>`
 				}
-				exclude = exclude + '<br>'
+				exclude = exclude + '</div>'
 				notfDomain = 'dummy'
 				notfKey = 'dummy'
 			} else if (acct.type == 'home') {
-				var exclude = `<a onclick="ebtToggle('${key}')" class="setting nex">
+				var exclude = `<a onclick="ebtToggle('${key}')" class="setting nex waves-effect">
-						<i class="fas fa-retweet waves-effect nex" title="${lang.lang_layout_excludingbt}" style="font-size:24px"></i>
+						<i class="fas fa-retweet nex" title="${lang.lang_layout_excludingbt}" style="font-size: 24px"></i>
-						<span id="sta-bt-${key}">Off</span>
+						<span id="sta-bt-${key}">Off</span><br />
-					</a>
 					${lang.lang_layout_excludingbt}
-					<br>`
+					</a>`
 			} else if (acct.type == 'tag') {
 				if (acct.data.name) {
 					var name = acct.data.name
@@ -336,15 +333,13 @@ function parseColumn(target, dontclose) {
 					var basehtml = `<div style="${css}" class="box ${animecss}" id="timeline_box_${basekey}_parentBox"></div>`
 					$('#timeline-container').append(basehtml)
 				}
-				var left_hold = `<a onclick="leftFoldSet('${key}')" class="setting nex">
+				var left_hold = `<a onclick="leftFoldSet('${key}')" class="setting nex waves-effect">
-						<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftFold}">view_agenda</i>
+						<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftFold}">view_agenda</i><br />
-					</a>
+					${lang.lang_layout_leftFold}</a>`
-					${lang.lang_layout_leftFold}<br>`
 			} else {
-				var left_hold = `<a onclick="leftFoldRemove('${key}')" class="setting nex">
+				var left_hold = `<a onclick="leftFoldRemove('${key}')" class="setting nex waves-effect">
-						<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftUnfold}">view_column</i>
+						<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftUnfold}">view_column</i><br />
-					</a>
+					${lang.lang_layout_leftUnfold}</a>`
-					${lang.lang_layout_leftUnfold}<br>`
 			}
 			if (key === 0) {
 				left_hold = ''
@@ -363,16 +358,15 @@ function parseColumn(target, dontclose) {
 				var addHeight = ''
 			}
 			if (acct.type != 'pub' && acct.type != 'pub-media') {
-				console.log(acct.type, key)
+				var mediaFil = `<a onclick="mediaToggle('${key}')" class="setting nex waves-effect">
-				var mediaFil = `<a onclick="mediaToggle('${key}')" class="setting nex">
+					<i class="material-icons nex" title="${lang.lang_layout_mediafil}">perm_media</i>
-					<i class="material-icons waves-effect nex" title="${lang.lang_layout_mediafil}">perm_media</i>
+					<span id="sta-media-${key}">On</span><br />
-					<span id="sta-media-${key}">On</span>
+				${lang.lang_layout_mediafil}</a>`
-				</a>${lang.lang_layout_mediafil}`
 			} else {
-				var mediaFil = `<a onclick="remoteOnly('${key}','${acct.type}')" class="setting nex">
+				var mediaFil = `<a onclick="remoteOnly('${key}','${acct.type}')" class="setting nex waves-effect">
-					<i class="material-icons waves-effect nex" title="${lang.lang_layout_remoteOnly}">perm_media</i>
+					<i class="material-icons nex" title="${lang.lang_layout_remoteOnly}">perm_media</i><br />
 					<span id="sta-remote-${key}">Off</span>
-				</a>${lang.lang_layout_remoteOnly}`
+				${lang.lang_layout_remoteOnly}</a>`
 			}
 			var html = `
 				<div class="boxIn" id="timeline_box_${key}_box" tlid="${key}" data-acct="${acct.domain}" style="${addHeight}">
@@ -426,28 +420,25 @@ function parseColumn(target, dontclose) {
 					</div>
 				</div>
 				<div class="column-hide notf-indv-box" id="util-box_${key}" style="padding:5px;">
+					${exclude}
 					${unread}
-					${exclude}${left_hold}
+					${left_hold}
-					${mediaFil}<br>
+					${mediaFil}
-					<a onclick="cardToggle('${key}')" class="setting nex">
+					<a onclick="cardToggle('${key}')" class="setting nex waves-effect">
-						<i class="material-icons waves-effect nex" title="${lang.lang_layout_linkanades}">link</i>
+						<i class="material-icons nex" title="${lang.lang_layout_linkanades}">link</i>
-						<span id="sta-card-${key}">On</span>
+						<span id="sta-card-${key}">On</span><br />
-					</a>
 					${lang.lang_layout_linkana}
-					<br>
-					<a onclick="voiceToggle('${key}')" class="setting nex">
-						<i class="material-icons waves-effect nex" title="${lang.lang_layout_tts}">hearing</i>
-						<span id="sta-voice-${key}">On</span>
 					</a>
+					<a onclick="voiceToggle('${key}')" class="setting nex waves-effect">
+						<i class="material-icons nex" title="${lang.lang_layout_tts}">hearing</i>
+						<span id="sta-voice-${key}">On</span><br />
 					${lang.lang_layout_tts}
-					TL<br>
+					TL</a>
-					<a onclick="columnReload('${key}','${acct.type}')" class="setting nex ${if_misskey_hide}">
+					<a onclick="columnReload('${key}','${acct.type}')" class="setting nex ${if_misskey_hide} waves-effect">
-						<i class="material-icons waves-effect nex" title="${lang.lang_layout_reconnect}">refresh</i>
+						<i class="material-icons nex" title="${lang.lang_layout_reconnect}">refresh</i>
-					</a>
+					<br />
-					<span>
 						${lang.lang_layout_reconnect}
-					</span>
+					</a><br />
-					<br>
 					${lang.lang_layout_headercolor}
 					<br>
 					<div id="picker_${key}" class="color-picker"></div>

app/js/ui/post-box.js

@@ -126,11 +126,6 @@ function initPostbox() {
 		localStorage.removeItem('nohide')
 		srcBox('close')
 	})
-	$('#contextWrap').click(function (e) {
-		$('#contextWrap').addClass('hide')
-		$('.contextMenu').addClass('hide')
-		$('.act-icon').text('expand_more')
-	})
 	$('#textarea,#cw-text').focusout(function (e) {
 		localStorage.setItem('nohide', true)
 		var countup = function () {

app/js/ui/settings.js

@@ -80,22 +80,6 @@ var postView = new Vue({
 })
 //設定ボタン押した。
 function settings() {
-	var cd = $('[name=theme]:checked').val()
-	var ct = $('[data-ct=' + cd + ']').html()
-	if (cd == 'custom' && !$('#custom-sel-sel').val()) {
-		var theme = localStorage.getItem('theme')
-		if (!theme) {
-			var theme = 'white'
-		}
-		$('#' + theme).prop('checked', true)
-	} else {
-		if (cd != localStorage.getItem('theme')) {
-			M.toast({ html: lang.lang_setting_theme.replace('{{set}}', ct), displayLength: 3000 })
-		}
-		//テーマはこの場で設定
-		themes(cd)
-		localStorage.setItem('theme', cd)
-	}
 	var fontd = $('#font').val()
 	if (fontd) {
 		if (fontd != localStorage.getItem('font')) {
@@ -167,10 +151,10 @@ function load() {
 		var font = ''
 	}
 	$('#font').val(font)
-	$('#c1-file').text(localStorage.getItem('custom1'))
+	$('#c1-file').text(localStorage.getItem('custom1') != 'null' ? localStorage.getItem('custom1') : '')
-	$('#c2-file').text(localStorage.getItem('custom2'))
+	$('#c2-file').text(localStorage.getItem('custom2') != 'null' ? localStorage.getItem('custom2') : '')
-	$('#c3-file').text(localStorage.getItem('custom3'))
+	$('#c3-file').text(localStorage.getItem('custom3') != 'null' ? localStorage.getItem('custom3') : '')
-	$('#c4-file').text(localStorage.getItem('custom4'))
+	$('#c4-file').text(localStorage.getItem('custom4') != 'null' ? localStorage.getItem('custom4') : '')
 	var cvol = localStorage.getItem('customVol')
 	if (cvol) {
 		$('#soundvol').val(cvol * 100)
@@ -508,35 +492,39 @@ function fontList(arg) {
 function insertFont(name) {
 	$('#font').val(name)
 }
-$('.color-picker').each(function (i, elem) {
+function copyColor(from, to) {
-	pickerDefine(i, 'fff')
+	let props = [
-})
+		'background', 'subcolor', 'text', 'accent',
-function pickerDefine(i, color) {
+		'modal', 'modalFooter', 'third', 'forth',
-	var pickr = new Pickr({
+		'bottom', 'emphasized', 'postbox', 'active',
-		el: '#color-picker' + i,
+		'selected', 'selectedWithShared'
-		default: color,
+	]
-		showAlways: true,
+	let i = 0
-		appendToBody: true,
+	let color
-		closeWithKey: 'Escape',
+	for (tag of props) {
-		comparison: false,
+		if(tag == from) {
-		components: {
+			let used = $(`#use-color_${i}`).prop('checked')
-			preview: true, // Left side color comparison
+			if(!used) {
-			opacity: false, // Opacity slider
+				Swal.fire({
-			hue: true, // Hue slider
+					type: 'error',
-			interaction: {
+					title: 'Not checked',
-				rgba: false, // rgba option (red green blue and alpha)
+				})
-				input: true, // input / output element
+				break
-			},
+			}
-		},
+			color = $(`#color-picker${i}_value`).val()
-		strings: {
+			break
-			save: 'Save', // Default for save button
+		}
-			clear: 'Clear', // Default for clear button
+		i++
-		},
+	}
-	})
+	if(!color) return false
-	pickr.on('change', (...args) => {
+	for (tag of props) {
-		var rgb = 'rgb(' + args[0].toRGBA()[0] + ',' + args[0].toRGBA()[1] + ',' + args[0].toRGBA()[2] + ')'
+		if(tag == to) {
-		$('#color-picker' + i + '_value').val(rgb)
+			$(`#color-picker${i}_value`).val(color)
-	})
+			$(`#use-color_${i}`).prop('checked', true)
+			break
+		}
+		i++
+	}
 }
 function customComp() {
 	var nameC = $('#custom_name').val()
@@ -544,59 +532,32 @@ function customComp() {
 		return false
 	}
 	var descC = $('#custom_desc').val()
-	var primaryC = $('#color-picker0_value').val()
+	var bgC = $('#color-picker0_value').val()
-	if (!primaryC) {
+	var subcolorC = $('#color-picker2_value').val()
-		primaryC = 'rgb(255,255,255)'
+	var textC = $('#color-picker1_value').val()
-	}
+	var accentC = $('#color-picker3_value').val()
-	var secondaryC = $('#color-picker1_value').val()
-	if (!secondaryC) {
-		secondaryC = 'rgb(255,255,255)'
-	}
-	var textC = $('#color-picker2_value').val()
-	if (!textC) {
-		textC = 'rgb(255,255,255)'
-	}
 	var multi = localStorage.getItem('multi')
-	if ($('#pickers').hasClass('advanceTheme')) {
+	let advanced = [
-		var accentC = $('#color-picker3_value').val()
+		'modal', 'modalFooter', 'third', 'forth',
-		if (!accentC) {
+		'bottom', 'emphasized', 'postbox', 'active',
-			accentC = null
+		'selected', 'selectedWithShared'
+	]
+	var advanceTheme = {}
+	let i = 4
+	for (tag of advanced) {
+		let used = $(`#use-color_${i}`).prop('checked')
+		if (used) {
+			advanceTheme[tag] = $(`#color-picker${i}_value`).val()
 		}
-		var activeC = $('#color-picker4_value').val()
+		i++
-		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') {
+	const defaults = [
+		'black','blue','brown','green','indigo','polar','snow','white'
+	]
+	if (id == 'add_new' || defaults.includes(id)) {
 		id = makeCID()
 	}
 	localStorage.setItem('customtheme-id', id)
@@ -605,26 +566,48 @@ function customComp() {
 		author: my,
 		desc: descC,
 		base: $('[name=direction]:checked').val(),
-		vars: {
+		primary: {
-			primary: primaryC,
+			background: bgC,
-			secondary: secondaryC,
+			subcolor: subcolorC,
 			text: textC,
+			accent: accentC
 		},
-		props: advanceTheme,
+		advanced: advanceTheme,
 		id: id,
+		version: '2'
 	}
 	$('#custom_json').val(JSON.stringify(json))
-	themes('custom')
+	let timerInterval
-	$('#custom').prop('checked', true)
+	Swal.fire({
-	$('#custom_name').val('')
+		title: 'Saving...',
-	$('#custom_desc').val('')
+		html: '',
-	$('#dark').prop('checked', true)
+		timer: 1000,
-	$('#custom_json').val('')
+		timerProgressBar: true,
-	for (var i = 0; i <= 8; i++) {
+		onBeforeOpen: () => {
-		$('#color-picker' + i + '-wrap').html('<div class="color-picker" id="color-picker' + i + '"></div>')
+			Swal.showLoading()
-		$('#color-picker' + i + '_value').val('')
+		},
-		pickerDefine(i, 'fff')
+		onClose: () => {
-	}
+			clearInterval(timerInterval)
+		}
+	}).then((result) => {
+		themes()
+		ctLoad()
+		Swal.fire({
+			title: 'Refreshing...',
+			html: '',
+			timer: 1000,
+			timerProgressBar: true,
+			onBeforeOpen: () => {
+				Swal.showLoading()
+			},
+			onClose: () => {
+				clearInterval(timerInterval)
+			}
+		}).then((result) => {
+			$('#custom-edit-sel').val(id)
+			$('select').formSelect()
+		})
+	})
 	postMessage(['themeJsonCreate', JSON.stringify(json)], '*')
 }
 function deleteIt() {
@@ -633,34 +616,34 @@ function deleteIt() {
 	$('#custom_desc').val('')
 	$('#dark').prop('checked', true)
 	$('#custom_json').val('')
-	for (var i = 0; i <= 8; i++) {
+	for (var i = 0; i <= 13; i++) {
-		$('#color-picker' + i + '-wrap').html('<div class="color-picker" id="color-picker' + i + '"></div>')
+		if (i >= 4) $(`#use-color_${i}`).prop('checked', false)
 		$('#color-picker' + i + '_value').val('')
-		pickerDefine(i, 'fff')
 	}
-	postMessage(['themeJsonDelete', id], '*')
+	postMessage(['themeJsonDelete', id + '.thedesktheme'], '*')
 }
 function ctLoad() {
 	postMessage(['sendSinmpleIpc', 'theme-json-list'], '*')
 }
 function ctLoadCore(args) {
-	var templete = ''
+	var template = ''
+	var editTemplate = ''
 	Object.keys(args).forEach(function (key) {
 		var theme = args[key]
 		var themeid = theme.id
-		templete = templete + '<option value="' + themeid + '">' + theme.name + '</option>'
+		template = template + `<option value="${themeid}">${theme.name}${theme.compatible ? `(${lang.lang_setting_compat})` : ''}</option>`
+		if (!theme.compatible) editTemplate = editTemplate + `<option value="${themeid}">${theme.name}</option>`
 	})
-	if (args[0]) {
+	$('#custom-sel-sel').html(template)
-		localStorage.setItem('customtheme-id', args[0].id)
+	editTemplate = '<option value="add_new">' + $('#edit-selector').attr('data-add') + '</option>' + editTemplate
-	}
+	$('#custom-edit-sel').html(editTemplate)
-	$('#custom-sel-sel').html(templete)
+	$('#custom-sel-sel').val(localStorage.getItem('customtheme-id'))
-	templete = '<option value="add_new">' + $('#edit-selector').attr('data-add') + '</option>' + templete
-	$('#custom-edit-sel').html(templete)
 	$('select').formSelect()
 }
 function customSel() {
 	var id = $('#custom-sel-sel').val()
 	localStorage.setItem('customtheme-id', id)
+	themes(id)
 }
 function custom() {
 	var id = $('#custom-edit-sel').val()
@@ -669,58 +652,47 @@ function custom() {
 		$('#custom_desc').val('')
 		$('#dark').prop('checked', true)
 		$('#custom_json').val('')
-		for (var i = 0; i <= 8; i++) {
+		for (var i = 0; i <= 13; i++) {
-			$('#color-picker' + i + '-wrap').html('<div class="color-picker" id="color-picker' + i + '"></div>')
+			if (i >= 4) $(`#use-color_${i}`).prop('checked', false)
 			$('#color-picker' + i + '_value').val('')
-			pickerDefine(i, 'fff')
 		}
 		$('#delTheme').addClass('disabled')
 	} else {
 		$('#delTheme').removeClass('disabled')
-		postMessage(['themeJsonRequest', id], '*')
+		postMessage(['themeJsonRequest', id + '.thedesktheme'], '*')
 	}
 }
 function customConnect(raw) {
 	var args = raw[0]
-	$('#custom_name').val(args.name)
+	$('#custom_name').val(`${args.name} ${args.default ? 'Customed' : ''}`)
-	$('#custom_desc').val(args.desc)
+	$('#custom_desc').val(args.default ? 'TheDesk default theme with some changes by user' : args.desc)
 	$('#' + args.base).prop('checked', true)
-	//Primary
+	//Background
-	$('#color-picker0-wrap').html('<div class="color-picker" id="color-picker0"></div>')
+	$('#color-picker0_value').val(args.primary.background)
-	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-picker1_value').val(args.primary.text)
-	$('#color-picker2_value').val(args.vars.text)
+	//Subcolor
-	pickerDefine(2, rgbToHex(args.vars.text))
+	$('#color-picker2_value').val(args.primary.subcolor)
-	//TheDesk Only
+	//Accent
-	advancedConncet(args, 'TheDeskAccent', 'secondary', 3)
+	$('#color-picker3_value').val(args.primary.accent)
-	advancedConncet(args, 'TheDeskActive', 'primary', 4)
+	let advanced = [
-	advancedConncet(args, 'TheDeskModal', 'secondary', 5)
+		'modal', 'modalFooter', 'third', 'forth',
-	advancedConncet(args, 'TheDeskBottom', 'primary', 6)
+		'bottom', 'emphasized', 'postbox', 'active',
-	advancedConncet(args, 'TheDeskPostbox', 'primary', 7)
+		'selected', 'selectedWithShared'
-	advancedConncet(args, 'TheDeskSubcolor', 'primary', 8)
+	]
-	$('#custom_json').val(raw[1])
+	let i = 4
-}
+	for (tag of advanced) {
-function advancedConncet(args, tar, sub, i) {
+		if (args.advanced[tag]) {
-	if (args.props) {
+			$(`#color-picker${i}_value`).val(args.advanced[tag])
-		if (args.props[tar]) {
+
-			var color = args.props[tar]
-			$('#pickers').addClass('advanceTheme')
-			$('.advanced').removeClass('hide')
-		} else {
-			var color = args.vars[sub]
 		}
-	} else {
+		$(`#use-color_${i}`).prop('checked', true)
-		var color = args.vars[sub]
+		i++
+	}
+	$('#custom_json').val(raw[1])
+	if(args.default) {
+		$('#delTheme').addClass('disabled')
 	}
-	$('#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()
@@ -754,7 +726,7 @@ function customSound(key) {
 }
 function customSoundSave(key, file) {
 	localStorage.setItem('custom' + key, file)
-	$('#c1-file').text(file)
+	$(`#c${key}-file`).text(file)
 }
 window.onload = function () {
 	//最初に読む
@@ -832,3 +804,5 @@ function lastFmSet() {
 	}
 	M.toast({ html: 'Complete: last.fm', displayLength: 3000 })
 }
+
+function stopVideo() { return false }

app/js/ui/theme.js

@@ -1,35 +1,20 @@
 //テーマ適用
 function themes(theme) {
 	if (!theme) {
-		var theme = localStorage.getItem('theme')
+		var theme = localStorage.getItem('customtheme-id')
 		if (!theme) {
-			var theme = 'black'
+			localStorage.setItem('customtheme-id', 'black')
-			localStorage.setItem('theme', 'black')
+			theme = 'black'
 		}
 	}
+	postMessage(['themeCSSRequest', theme + '.thedesktheme'], '*')
 	var el = document.getElementsByTagName('html')[0]
-
+	el.style.backgroundColor = 'var(--bg)'
-	el.classList.remove('indigotheme')
-	el.classList.remove('greentheme')
-	el.classList.remove('browntheme')
-	el.classList.remove('blacktheme')
-	el.classList.remove('bluetheme')
-	el.classList.remove('polartheme')
-	el.classList.remove('snowtheme')
-	el.classList.remove('customtheme')
-	el.classList.add(theme + 'theme')
 	var font = localStorage.getItem('font')
-	if (font) {
+	if(font) {
-		font = font.replace(/"(.+)"/, '$1')
+		el.style.fontFamily = font
-		el.style.fontFamily = '"' + font + '"'
 	} else {
 		el.style.fontFamily = ''
 	}
-	if (theme == 'custom') {
-		if (localStorage.getItem('customtheme-id')) {
-			postMessage(['themeCSSRequest', localStorage.getItem('customtheme-id')], '*')
-		}
-	}
-	el.style.backgroundColor = 'var(--bg)'
 }
 themes()

app/js/ui/tips.js

@@ -63,16 +63,21 @@ function tips(mode) {
 function startmem() {
 	postMessage(['sendSinmpleIpc', 'startmem'], '*')
 }
-function renderMem(use, cpu, total) {
+function renderMem(use, cpu, total, core, uptime) {
+	let day = Math.floor(uptime / 60 / 60 / 24)
+	let hour = Math.floor(uptime / 60 /60 % 24)
+	if(hour < 10) hour = '0' + hour
+	let min = Math.floor(uptime / 60 % 60)
+	if(min < 10) min = '0' + min
+	let sec = Math.floor(uptime % 60)
+	if(sec < 10) sec = '0' + sec
+	let time = `${day ? day + ' days ' : ''}${hour ? hour + ':' : ''}${min}:${sec}`
+	//Intel
+	cpu = cpu.replace('Intel(R)', '').replace('(TM)', '').replace(' CPU', '')
+	//AMD
+	cpu = cpu.replace('AMD ', '').replace(/\s[0-9]{1,3}-Core\sProcessor/, '')
 	$('#tips-text').html(
-		escapeHTML(cpu) +
+		`${escapeHTML(cpu)} x ${core}<br />RAM: ${Math.floor(use / 1024 / 1024 / 102.4) / 10}/${Math.floor(total / 1024 / 1024 / 102.4) / 10}GB(${Math.floor((use / total) * 100)}%) UP:${time}`
-			'<br>Memory:' +
-			Math.floor(use / 1024 / 1024 / 102.4) / 10 +
-			'/' +
-			Math.floor(total / 1024 / 1024 / 102.4) / 10 +
-			'GB(' +
-			Math.floor((use / total) * 100) +
-			'%)'
 	)
 }
 //トレンドタグ
@@ -196,12 +201,10 @@ function spotifytips() {
 						<i class="material-icons pointer" onclick="nowplaying('spotify');show()" style="font-size:20px">send</i>
 					</div>
 					<div id="spot-cover">
-						<img src="${img}" id="spot-img">
+						<img src="${img}" id="spot-img" draggable="false">
 					</div>
 					<div id="spot-name">
 						${escapeHTML(item.name)}
-					</div>
-					<div id="spot-artist">
 						<span class="gray sml" id="spot-art">${artisttxt}</span>
 					</div>
 					<div id="spot-time">

app/js/userdata/his-data.js

@@ -204,7 +204,7 @@ function flw(user, more, acct_id) {
 				let link
 				if (linkHeader) {
 					console.log(linkHeader)
-					link = linkHeader.match(/[?&]{1}max_id=([0-9]+)/)[1]
+					try {link = linkHeader.match(/[?&]{1}max_id=([0-9]+)/)[1] }catch{}
 					console.log(link)
 				}
 				$("#his-follow-list-contents").attr('max-id', link)
@@ -313,7 +313,7 @@ function fer(user, more, acct_id) {
 				let link
 				if (linkHeader) {
 					console.log(linkHeader)
-					link = linkHeader.match(/[?&]{1}max_id=([0-9]+)/)[1]
+					try {link = linkHeader.match(/[?&]{1}max_id=([0-9]+)/)[1] }catch{}
 					console.log(link)
 				}
 				$("#his-follower-list-contents").attr('max-id', link)
@@ -354,7 +354,7 @@ function fer(user, more, acct_id) {
 			let link
 			if (linkHeader) {
 				console.log(linkHeader)
-				link = linkHeader.match(/[?&]{1}max_id=([0-9]+)/)[1]
+				try {link = linkHeader.match(/[?&]{1}max_id=([0-9]+)/)[1] }catch{}
 				console.log(link)
 			}
 			$("#his-follower-list-contents").attr('max-id', link)
@@ -403,7 +403,7 @@ function showFav(more, acct_id) {
 				let link
 				if (linkHeader) {
 					console.log(linkHeader)
-					link = linkHeader.match(/[?&]{1}max_id=([0-9]+)/)[1]
+					try {link = linkHeader.match(/[?&]{1}max_id=([0-9]+)/)[1] }catch{}
 					console.log(link)
 				}
 				var template = parse(json, "", acct_id, "user")

app/js/userdata/showOnTL.js

@@ -554,6 +554,8 @@ function reset() {
 $("#my-data-nav .anc-link").on("click", function() {
 	var target = $(this).attr("go")
 	if (target) {
+		const title = $(this).html()
+		$('#his-data-title').html(title)
 		$("#my-data-nav .anc-link").removeClass("active-back")
 		$(this).addClass("active-back")
 		$(target).show()

app/main.js

@@ -124,7 +124,6 @@ function createWindow() {
 	var max_info_path = join(app.getPath('userData'), 'max-window-size.json')
 	var ha_path = join(app.getPath('userData'), 'hardwareAcceleration')
 	var ua_path = join(app.getPath('userData'), 'useragent')
-	var frame_path = join(app.getPath('userData'), 'frame')
 	try {
 		fs.readFileSync(ha_path, 'utf8')
 		app.disableHardwareAcceleration()
@@ -152,19 +151,6 @@ function createWindow() {
 			y: 'string',
 		} // デフォルトバリュー
 	}
-
-	try {
-		var frameRaw = fs.readFileSync(frame_path, 'utf8')
-		if (frameRaw == 'false') {
-			var frame = false
-			var frameTitle = 'hidden'
-		} else {
-			var frame = true
-			var frameTitle = 'default'
-		}
-	} catch {
-		var frame = true
-	}
 	// メイン画面の表示。ウィンドウの幅、高さを指定できる
 	var platform = process.platform
 	var bit = process.arch
@@ -173,6 +159,7 @@ function createWindow() {
 			webviewTag: true,
 			nodeIntegration: false,
 			contextIsolation: true,
+			spellcheck: false,
 			preload: join(__dirname, 'js', 'platform', 'preload.js'),
 		},
 		width: window_size.width,
@@ -180,7 +167,6 @@ function createWindow() {
 		x: window_size.x,
 		y: window_size.y,
 		show: false,
-		frame: frame,
 	}
 	if (platform == 'linux') {
 		arg.resizable = true
@@ -189,7 +175,6 @@ function createWindow() {
 		arg.simpleFullscreen = true
 	} else if (platform == 'darwin') {
 		arg.simpleFullscreen = true
-		arg.titleBarStyle = frameTitle
 	}
 	mainWindow = new BrowserWindow(arg)
 	mainWindow.once('page-title-updated', () => {
@@ -293,10 +278,7 @@ function createWindow() {
 
 	var platform = process.platform
 	var bit = process.arch
-	Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir, dirname, frame)))
+	Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir, dirname)))
-	if (!frame) {
-		mainWindow.setMenu(null)
-	}
 	//CSS
 	css.css(mainWindow)
 	//アップデータとダウンロード

app/main/css.js

@@ -31,119 +31,246 @@ function css(mainWindow) {
 		}
 	})
 	ipc.on('theme-json-delete', function (e, arg) {
-		var themecss = join(app.getPath("userData"), arg + ".thedesktheme");
+		try{
-		console.log(themecss);
+			var themecss = join(app.getPath("userData"), arg);
-		fs.unlink(themecss, function (err) {
+			console.log(themecss);
-			e.sender.webContents.send('theme-json-delete-complete', "");
+			fs.unlink(themecss, function (err) {
-		});
+				e.sender.webContents.send('theme-json-delete-complete', "");
+			});
+		} catch {
+			e.sender.webContents.send('theme-json-delete-complete', 'cannot delete');
+		}
+		
 	})
 	ipc.on('theme-json-request', function (e, arg) {
-		var themecss = join(app.getPath("userData"), arg + ".thedesktheme");
+		try {
-		var raw = fs.readFileSync(themecss, 'utf8')
+			var themecss = join(app.getAppPath(), '/source/themes', arg)
-		var json = JSON5.parse(raw);
+			var raw = fs.readFileSync(themecss, 'utf8')
+			var json = JSON5.parse(raw)
+		} catch {
+			var themecss = join(app.getPath("userData"), arg)
+			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 = JSON5.parse(fs.readFileSync(themecss, 'utf8'));
+			var themecss = join(app.getAppPath(), '/source/themes', arg)
+			var json = JSON5.parse(fs.readFileSync(themecss, 'utf8'))
+		} catch {
+			var themecss = join(app.getPath("userData"), arg)
+			var json = JSON5.parse(fs.readFileSync(themecss, 'utf8'))
+		}
 
-			var primary = json.vars.primary;
+		try {
-			var secondary = json.vars.secondary;
+			var css
-			var text = json.vars.text;
+			if (json.version) {
-			if (json.base == "light") {
+				var bg = json.primary.background
-				var drag = "rgba(255, 255, 255, 0.8)";
+				var subcolor = json.primary.subcolor
-				var beforehover = "#757575";
+				var text = json.primary.text
-				var selected = "#3f3f3f"
+				var accent = json.primary.accent
-				var selectedWithShare = "#b2babd"
+				if (json.base == "light") {
-				var gray = "#757575"
+					var drag = "rgba(255, 255, 255, 0.8)";
-			} else {
+					var beforehover = "#757575";
-				var drag = "rgba(0, 0, 0, 0.8)";
+					var selected = "#3f3f3f"
-				var beforehover = "#9e9e9e";
+					var selectedWithShare = "#b2babd"
-				var selected = "#c0c0c0"
+					var gray = "#757575"
-				var selectedWithShare = "#003a30"
+					var hisData = 'rgba(255, 255, 255, 0.9)'
-				var gray = "#cccccc"
-			}
-			if (json.props) {
-				if (json.props.TheDeskAccent) {
-					var emphasized = json.props.TheDeskAccent
 				} else {
-					var emphasized = secondary
+					var drag = "rgba(0, 0, 0, 0.8)";
+					var beforehover = "#9e9e9e";
+					var selected = "#c0c0c0"
+					var selectedWithShare = "#003a30"
+					var gray = "#cccccc"
+					var hisData = 'rgba(0, 0, 0, 0.8)'
 				}
-				if (json.props.TheDeskActive) {
+				if (!json.advanced) {
-					var active = json.props.TheDeskActive
+					json.advanced = {}
+				}
+				if (json.advanced.modal) {
+					var modal = json.advanced.modal
 				} else {
-					var active = primary
+					var modal = bg
 				}
-				if (json.props.TheDeskModal) {
+				if (json.advanced.modalFooter) {
-					var modal = json.props.TheDeskModal
+					var modalFooter = json.advanced.modalFooter
 				} else {
-					var modal = secondary
+					var modalFooter = bg
+					if (modal != bg) modalFooter = modal
 				}
-				if (json.props.TheDeskBottom) {
+				if (json.advanced.thirdColor) {
-					var bottom = json.props.TheDeskBottom
+					var thirdColor = json.advanced.thirdColor
 				} else {
-					var bottom = primary
+					var thirdColor = subcolor
 				}
-				if (json.props.TheDeskPostbox) {
+				if (json.advanced.forthColor) {
-					var postbox = json.props.TheDeskPostbox
+					var forthColor = json.advanced.forthColor
 				} else {
-					var postbox = primary
+					var forthColor = subcolor
+					if (thirdColor != subcolor) forthColor = thirdColor
 				}
-				if (json.props.TheDeskSubcolor) {
+				if (json.advanced.bottom) {
-					var subcolor = json.props.TheDeskSubcolor
+					var bottom = json.advanced.bottom
 				} else {
-					var subcolor = primary
+					var bottom = subcolor
+				}
+				if (json.advanced.emphasized) {
+					var emphasized = json.advanced.emphasized
+				} else {
+					var emphasized = accent
+				}
+				if (json.advanced.postbox) {
+					var postbox = json.advanced.postbox
+				} else {
+					var postbox = subcolor
+				}
+				if (json.advanced.active) {
+					var active = json.advanced.active
+				} else {
+					var active = accent
+				}
+				if (json.advanced.selected) {
+					var selected = json.advanced.selected
+				}
+				if (json.advanced.selectedWithShare) {
+					var selectedWithShare = json.advanced.selectedWithShare
 				}
-			} else {
-				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 + ";" +
+				var css = ":root {--bg:" + bg + ";--drag:" + drag + ";" +
-				"--color:" + text + ";--beforehover:" + beforehover + ";--modal:" +
+					"--text:" + text + ";--beforehover:" + beforehover + ";--modal:" +
-				modal + ";--subcolor:" + subcolor + ";--box:" + subcolor +
+					modal + ";--thirdColor:" + thirdColor + ";--subcolor:" + forthColor +
-				";--sidebar:" + bottom + ";--shared:" + emphasized + ";" +
+					";--bottom:" + bottom + ";--accent:" + accent + ";" + ";--emphasized:" + emphasized + ";--his-data:" +
-				"--notfbox:" + secondary + ";--emphasized:" + active + ";--his-data:" +
+					hisData +
-				secondary +
+					";--active:" + active + ";--postbox:" + postbox + ";--modalfooter:" +
-				";--active:" + active + ";--postbox:" + postbox + ";--modalfooter:" +
+					modalFooter + ";--selected:" + selected + ";--selectedWithShare:" + selectedWithShare +
-				primary +
+					";--gray:" + gray + ";}" +
-				";--accentbtn:" + subcolor + ";--selected:" + selected + ";--selectedWithShare:" + selectedWithShare + "}"+
+					".customtheme #imagemodal{background: url(\"../img/pixel.svg\");}";
-				"--gray:" + gray + ";"+
+			} else {
-				".customtheme #imagemodal{background: url(\"../img/pixel.svg\");}";
+				var css = compatibleTheme(json)
+			}
 			e.sender.webContents.send('theme-css-response', css);
 		} catch (e) {
 			var css = "";
 		}
 
 	})
-	ipc.on('theme-json-list', function (e, arg) {
+	function compatibleTheme(json) {
-		fs.readdir(app.getPath("userData"), function (err, files) {
+		var primary = json.vars.primary;
-			if (err || !files) throw err;
+		var secondary = json.vars.secondary;
-			var fileList = files.filter(function (file) {
+		var text = json.vars.text;
-				if(file.match(/\.thedesktheme$/)){
+		if (json.base == "light") {
-					var tfile = join(app.getPath("userData"), file)
+			var drag = "rgba(255, 255, 255, 0.8)";
-					return fs.statSync(tfile).isFile() && /.*\.thedesktheme$/.test(tfile)
+			var beforehover = "#757575";
-				}else{
+			var selected = "#3f3f3f"
-					return null
+			var selectedWithShare = "#b2babd"
-				}
+			var gray = "#757575"
-			})
+		} else {
-			var themes = [];
+			var drag = "rgba(0, 0, 0, 0.8)";
-			for (var i = 0; i < fileList.length; i++) {
+			var beforehover = "#9e9e9e";
-				var themecss = join(app.getPath("userData"), fileList[i]);
+			var selected = "#c0c0c0"
-				var json = JSON5.parse(fs.readFileSync(themecss, 'utf8'));
+			var selectedWithShare = "#003a30"
-				themes.push({
+			var gray = "#cccccc"
-					name: json.name,
+		}
-					id: json.id
+		if (json.advanced) {
-				})
+			if (json.advanced.TheDeskAccent) {
+				var emphasized = json.advanced.TheDeskAccent
+			} else {
+				var emphasized = secondary
 			}
-			e.sender.webContents.send('theme-json-list-response', themes);
+			if (json.advanced.TheDeskActive) {
-		});
+				var active = json.advanced.TheDeskActive
+			} else {
+				var active = primary
+			}
+			if (json.advanced.TheDeskModal) {
+				var modal = json.advanced.TheDeskModal
+			} else {
+				var modal = secondary
+			}
+			if (json.advanced.TheDeskBottom) {
+				var bottom = json.advanced.TheDeskBottom
+			} else {
+				var bottom = primary
+			}
+			if (json.advanced.TheDeskPostbox) {
+				var postbox = json.advanced.TheDeskPostbox
+			} else {
+				var postbox = primary
+			}
+			if (json.advanced.TheDeskSubcolor) {
+				var subcolor = json.advanced.TheDeskSubcolor
+			} else {
+				var subcolor = primary
+			}
+		} else {
+			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 + ";" +
+			"--text:" + text + ";--beforehover:" + beforehover + ";--modal:" +
+			modal + ";--thirdColor:" + subcolor + ";--subcolor:" + subcolor +
+			";--bottom:" + bottom + ";--accent:" + emphasized + ";" +
+			"--subcolor:" + secondary + ";--emphasized:" + active + ";--his-data:" +
+			secondary +
+			";--active:" + active + ";--postbox:" + postbox + ";--modalfooter:" +
+			primary +
+			";--active:" + subcolor + ";--selected:" + selected + ";--selectedWithShare:" + selectedWithShare + "}" +
+			"--gray:" + gray + ";" +
+			".customtheme #imagemodal{background: url(\"../img/pixel.svg\");}";
+		return css
+	}
+	ipc.on('theme-json-list', function (e, arg) {
+		var files1 = fs.readdirSync(join(app.getAppPath(), '/source/themes'))
+		var file1List = files1.filter(function (file) {
+			if (file.match(/\.thedesktheme$/)) {
+				var tfile = join(app.getAppPath(), '/source/themes', file)
+				return fs.statSync(tfile).isFile() && /.*\.thedesktheme$/.test(tfile)
+			} else {
+				return null
+			}
+		})
+		var themes = [];
+		for (var i = 0; i < file1List.length; i++) {
+			var themecss = join(app.getAppPath(), '/source/themes', file1List[i]);
+			var json = JSON5.parse(fs.readFileSync(themecss, 'utf8'));
+			let compat = true
+			if (json.version) compat = false
+			themes.push({
+				name: json.name,
+				id: json.id,
+				compatible: compat,
+				default: true
+			})
+		}
+		var files2 = fs.readdirSync(app.getPath("userData"))
+		var file2List = files2.filter(function (file) {
+			if (file.match(/\.thedesktheme$/)) {
+				var tfile = join(app.getPath("userData"), file)
+				return fs.statSync(tfile).isFile() && /.*\.thedesktheme$/.test(tfile)
+			} else {
+				return null
+			}
+		})
+		for (var i = 0; i < file2List.length; i++) {
+			var themecss = join(app.getPath("userData"), file2List[i]);
+			var json = JSON5.parse(fs.readFileSync(themecss, 'utf8'));
+			let compat = true
+			if (json.version) compat = false
+			themes.push({
+				name: json.name,
+				id: json.id,
+				compatible: compat,
+				default: false
+			})
+		}
+		e.sender.webContents.send('theme-json-list-response', themes);
 	})
 }
 exports.css = css;

app/main/language.js

@@ -1,5 +1,5 @@
 // Create the Application's main menu
-function templete(lang, mainWindow, packaged, dir, dirname, frame) {
+function templete(lang, mainWindow, packaged, dir, dirname) {
     //フレーム
     if(lang !="ja" && lang != "en"){
         lang = "en"
@@ -9,11 +9,6 @@ function templete(lang, mainWindow, packaged, dir, dirname, frame) {
     const app = electron.app;
     const BrowserWindow = electron.BrowserWindow;
     const join = require('path').join;
-    ipc.on("frameCheck", function(e, arg) {
-		if(!frame) {
-            e.sender.webContents.send("frame", "");
-        }
-	});
     const dict = {
         "application": {
             "ja": "アプリケーション",

app/main/system.js

@@ -188,8 +188,8 @@ function system(mainWindow, dir, lang, dirname) {
 	})
 	function mems() {
 		var mem = os.totalmem() - os.freemem()
-		if (mainWindow) {
+		if (mainWindow && event.webContents) {
-			event.webContents.send('memory', [mem, os.cpus()[0].model, os.totalmem()])
+			event.webContents.send('memory', [mem, os.cpus()[0].model, os.totalmem(), os.cpus().length, os.uptime()])
 		}
 	}
 	ipc.on('endmem', (e, arg) => {

app/maxim.ja.json

@@ -51,5 +51,9 @@
     "トゥートした後ボックスを閉じるとかそのままにしておくとかは、設定で変えられます。",
     "OpenStickerへの登録データ募集中",
     "Microsoft Store版のアップデートは向こうに止められてます",
+    "いのちの輝き版ロゴ",
+    "いのちの輝き版ロゴ",
+    "いのちの輝き版ロゴ",
+    "いのちの輝き版ロゴ",
     "いのちの輝き版ロゴ"
-    ]
+]

app/nano.html

@@ -16,7 +16,7 @@
 				height: 100vh;
 				overflow: hidden;
 				font-family: sans-serif;
-				color: var(--color) !important;
+				color: var(--text) !important;
 			}
 
 			body {
@@ -45,7 +45,7 @@
 
 			textarea {
 				-webkit-app-region: no-drag;
-				color: var(--color) !important;
+				color: var(--text) !important;
 			}
 
 			::-webkit-scrollbar {

app/package.json

@@ -1,6 +1,6 @@
 {
     "name": "thedesk",
-    "version": "21.1.0",
+    "version": "21.2.4",
     "codename": "Mayu",
     "description": "TheDesk is a Mastodon client for PC.",
     "repository": "https://github.com/cutls/TheDesk",
@@ -8,15 +8,20 @@
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
         "construct": "cd view/make && node make --automatic && cd ../../",
+        "construct:store": "cd view/make && node make --automatic --store && cd ../../",
         "dev": "npx electron ./ --dev",
         "dist": "build --linux snap",
         "watchview": "node view/make/make.js --automatic --watch",
         "build:js": "node build.js",
         "build": "node view/make/make.js --automatic && npx electron-builder",
-        "build:all": "npx electron-builder --win --linux",
-        "build:win": "npx electron-builder --win",
         "build:pwa": "node view/make/make.js --automatic --pwa",
-        "lint:fix": "eslint js --fix" ,
+        "build:win:web": "node view/make/make.js --automatic && npx electron-builder --win",
+        "build:win:msstore": "node view/make/make.js --automatic --store && npx electron-builder --win appx",
+        "build:linux:web": "node view/make/make.js --automatic && npx electron-builder --linux",
+        "build:linux:snapstore": "node view/make/make.js --automatic --store && npx electron-builder --linux",
+        "build:mac:web": "node view/make/make.js --automatic && npx electron-builder --mac",
+        "build:mac:homebrew": "node view/make/make.js --automatic --store && npx electron-builder --mac",
+        "lint:fix": "eslint js --fix",
         "lint": "eslint js"
     },
     "keywords": [
@@ -55,28 +60,27 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@fortawesome/fontawesome-free": "^5.14.0",
-        "custom-electron-titlebar": "^3.2.3",
+        "electron-dl": "^3.0.2",
-        "electron-dl": "^3.0.1",
+        "jimp": "^0.16.1",
-        "jimp": "^0.14.0",
         "jquery": "^3.5.1",
         "jquery-ui-dist": "^1.12.1",
         "json5": "^2.1.3",
-        "lodash": "^4.17.19",
+        "lodash": "^4.17.20",
         "materialize-css": "git://github.com/cutls/materialize#v1-dev",
         "sumchecker": "^3.0.1",
-        "sweetalert2": "^9.17.0",
+        "sweetalert2": "^10.3.5",
         "system-font-families": "^0.4.1",
-        "vue": "^2.6.11"
+        "vue": "^2.6.12"
     },
     "optionalDependencies": {
         "itunes-nowplaying-mac": "0.3.1"
     },
     "devDependencies": {
-        "chokidar": "^3.4.1",
+        "chokidar": "^3.4.2",
-        "electron": "^9.1.1",
+        "electron": "^10.1.2",
-        "electron-builder": "^22.7.0",
+        "electron-builder": "^22.8.1",
-        "electron-rebuild": "^1.11.0",
+        "electron-rebuild": "^2.0.3",
-        "eslint": "^7.6.0",
+        "eslint": "^7.9.0",
         "readline-sync": "1.4.10"
     },
     "build": {
@@ -92,8 +96,8 @@
             "icon": "build/thedesk.ico",
             "target": [
                 "nsis",
-                "portable",
+                "appx",
-                "appx"
+                "portable"
             ]
         },
         "appx": {
@@ -115,6 +119,7 @@
             "icon": "build/icons",
             "target": [
                 "zip",
+                "appImage",
                 "snap",
                 "deb"
             ],

app/source/themes/black.thedesktheme

@@ -0,0 +1,27 @@
+{
+	name: 'Black',
+	author: 'TheDesk',
+	desc: 'TheDesk Default Theme',
+	base: 'dark',
+	primary: {
+		background: '#212121',
+		subcolor: '#424242',
+		text: '#fff',
+		accent: '#004d40',
+	},
+	advanced: {
+		modal: '#000',
+		modalFooter: '#212121',
+		third: '#212121',
+		forth: '#333333',
+		bottom: '#424242',
+		emphasized: '#4e342e',
+		postbox: '#424242',
+		active: '#3f51b5',
+		selected: '#3f3f3f',
+		selectedWithShared: '#003a30',
+	},
+	id: 'black',
+	version: '2',
+	default: true
+}

app/source/themes/blue.thedesktheme

@@ -0,0 +1,27 @@
+{
+	name: 'Blue',
+	author: 'TheDesk',
+	desc: 'TheDesk Default Theme',
+	base: 'light',
+	primary: {
+		background: '#c9e1ec',
+		subcolor: '#dff1ff',
+		text: '#000',
+		accent: '#e0ffe4',
+	},
+	advanced: {
+		modal: '#b2ebf2',
+		modalFooter: '#2196f3',
+		third: '#90caf9',
+		forth: '#90caf9',
+		bottom: '#b6e6f5',
+		emphasized: '#c5e1a5',
+		postbox: '#dff1ff',
+		active: '#2f7bb7',
+		selected: '#9dcade',
+		selectedWithShared: '#c1dac4',
+	},
+	id: 'blue',
+	version: '2',
+	default: true
+}

app/source/themes/brown.thedesktheme

@@ -0,0 +1,27 @@
+{
+	name: 'Brown',
+	author: 'TheDesk',
+	desc: 'TheDesk Default Theme',
+	base: 'dark',
+	primary: {
+		background: '#261411',
+		subcolor: '#4e342e',
+		text: '#fff',
+		accent: '#004d40',
+	},
+	advanced: {
+		modal: '#261411',
+		modalFooter: '#261411',
+		third: '#4e342e',
+		forth: '#4e342e',
+		bottom: '#4e342e',
+		emphasized: '#0d47a1',
+		postbox: '#4e342e',
+		active: '#827717',
+		selected: '#6d352b',
+		selectedWithShared: '#003a30',
+	},
+	id: 'brown',
+	version: '2',
+	default: true
+}

app/source/themes/green.thedesktheme

@@ -0,0 +1,27 @@
+{
+	name: 'Green',
+	author: 'TheDesk',
+	desc: 'TheDesk Default Theme',
+	base: 'light',
+	primary: {
+		background: '#c8e6c9',
+		subcolor: '#a5d6a7',
+		text: '#000',
+		accent: '#ffcc80',
+	},
+	advanced: {
+		modal: '#81c784',
+		modalFooter: '#81c784',
+		third: '#a5d6a7',
+		forth: '#81c784',
+		bottom: '#c5e1a5',
+		emphasized: '#9e9d24',
+		postbox: '#a5d6a7',
+		active: '#33691e',
+		selected: '#78c17a',
+		selectedWithShared: '#caa266',
+	},
+	id: 'green',
+	version: '2',
+	default: true
+}

app/source/themes/indigo.thedesktheme

@@ -0,0 +1,27 @@
+{
+	name: 'Indigo',
+	author: 'TheDesk',
+	desc: 'TheDesk Default Theme',
+	base: 'dark',
+	primary: {
+		background: '#031833',
+		subcolor: '#1a237e',
+		text: '#fff',
+		accent: '#004d40',
+	},
+	advanced: {
+		modal: '#0d1351',
+		modalFooter: '#031833',
+		third: '#0d1351',
+		forth: '#0d47a1',
+		bottom: '#0d1351',
+		emphasized: '#4e342e',
+		postbox: '#1a237e',
+		active: '#00acc1',
+		selected: '#214f8a',
+		selectedWithShared: '#003a30',
+	},
+	id: 'indigo',
+	version: '2',
+	default: true
+}

app/source/themes/polar.thedesktheme

@@ -0,0 +1,27 @@
+{
+	name: 'Polar Night',
+	author: 'TheDesk',
+	desc: 'TheDesk Default Theme',
+	base: 'dark',
+	primary: {
+		background: '#2e3440',
+		subcolor: '#434c5e',
+		text: '#ffffff',
+		accent: '#2d3b58',
+	},
+	advanced: {
+		modal: '#3b4252',
+		modalFooter: '#485166',
+		third: '#434c5e',
+		forth: '#4c566a',
+		bottom: '#3b4252',
+		emphasized: '#2f4b86',
+		postbox: '#434c5e',
+		active: '#2f4b86',
+		selected: '#464f61',
+		selectedWithShared: '#3e527e',
+	},
+	id: 'polar',
+	version: '2',
+	default: true
+}

app/source/themes/snow.thedesktheme

@@ -0,0 +1,27 @@
+{
+	name: 'Snow Storm',
+	author: 'TheDesk',
+	desc: 'TheDesk Default Theme',
+	base: 'light',
+	primary: {
+		background: '#eceff4',
+		subcolor: '#d8dee9',
+		text: '#36425a',
+		accent: '#c3d4e6',
+	},
+	advanced: {
+		modal: '#e5e9f0',
+		modalFooter: '#b2bed4',
+		third: '#d8dee9',
+		forth: '#4c566a',
+		bottom: '#eeeeee',
+		emphasized: '#88c0d0',
+		postbox: '#d8dee9',
+		active: '#81a1c1',
+		selected: '#b4bdd0',
+		selectedWithShared: '#a3afbb',
+	},
+	id: 'snow',
+	version: '2',
+	default: true
+}

app/source/themes/white.thedesktheme

@@ -0,0 +1,27 @@
+{
+	name: 'White',
+	author: 'TheDesk',
+	desc: 'TheDesk Default Theme',
+	base: 'light',
+	primary: {
+		background: '#fff',
+		subcolor: '#fff',
+		text: '#000',
+		accent: '#cfd8dc',
+	},
+	advanced: {
+		modal: '#fff',
+		modalFooter: '#fafafa',
+		third: '#e0e0e0',
+		forth: '#fff',
+		bottom: '#eeeeee',
+		emphasized: '#81c784',
+		postbox: '#fff',
+		active: '#009688',
+		selected: '#c0c0c0',
+		selectedWithShared: '#b2babd',
+	},
+	id: 'white',
+	version: '2',
+	default: true
+}

app/view/make/acct.sample.html

@@ -3,12 +3,12 @@
 	<head>
 		<title>Account Manager - TheDesk</title>
 		<meta content="width=device-width,initial-scale=1.0" name="viewport" />
+		<link href="../../css/themes.css" type="text/css" rel="stylesheet">
 		<link
 			href="../../@@node_base@@/materialize-css/dist/css/materialize.css"
 			type="text/css"
 			rel="stylesheet"
 		/>
-		<link href="../../css/themes.css" type="text/css" rel="stylesheet" />
 		<link href="../../css/master.css" type="text/css" rel="stylesheet" />
 		<link href="../../css/tl.css" rel="stylesheet" type="text/css" />
 		<link href="../../css/userdata.css" rel="stylesheet" type="text/css" />
@@ -26,7 +26,7 @@
 		</script>
 		<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
 		@@comment-end@@
-		@@pwa@@
+		@@pwa@@ @@store@@
 	</head>
 
 	<body id="mainView" class="@@pwaClass@@">

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

@@ -130,7 +130,7 @@
     "notf": "Notifications",
     "bookmark": "Bookmarks",
     "showThisTL": "Show this TL:",
-    "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
+    "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>).",
     "add": "Add",
     "search": "Search",
     "sortSet": "Sort",

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

@@ -131,13 +131,17 @@
     "lang_layout_linkana": "Auto Link Analyzer",
     "lang_layout_linkanades": "Auto link analyzer",
     "lang_layout_tts": "Text to speech ",
-    "lang_layout_reconnect": "Reload this column",
+    "lang_layout_reconnect": "Reload",
     "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_webviewmode": "Prefer WebView",
-    "lang_excluded": "Excluded type of notification",
+    "lang_layout_excluded": "Excluded type of notification",
-    "lang_layout_excludingbt": "Show BT mode(OFF/Exclude BT/Only BT)",
+    "lang_layout_mention": "Mentions",
+    "lang_layout_fav": "Favourites",
+    "lang_layout_bt": "Boosts",
+    "lang_layout_poll": "Polls",
+    "lang_layout_excludingbt": "Show BT mode",
     "lang_layout_leftFold": "Stack to the left",
     "lang_layout_leftUnfold": "Dock on the right",
     "lang_layout_deleteColumn": "Delete this column",
@@ -222,6 +226,7 @@
     "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
     "lang_parse_hidden": "Unvisible quoted toot",
+    "lang_parse_disconnected": "Streaming has been disconnected(retry after 3s)",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",
     "lang_misskeyparse_reaction": "Reaction",
@@ -236,6 +241,7 @@
     "lang_misskeyparse_reacted": " reacted your following post.",
     "lang_setting_time": "Time format:{{set}}",
     "lang_setting_theme": "Theme:{{set}}",
+    "lang_setting_compat": "Compatible",
     "lang_setting_nsfw": "Sensitive media:{{set}}",
     "lang_setting_cw": "CW:{{set}}",
     "lang_setting_cwtext": "Default CW text:{{set}}",

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

@@ -24,10 +24,11 @@
   "nativenotf": "Native notification",
   "nnwarn": "This does not work on Windows Portable ver.",
   "nntest": "Notification test",
-  "minwidth": "Minimum width of columns",
+  "width": "Width of columns",
-  "minwidthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
+  "widthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
   "fixwidth": "Minimum width of TweetDeck browser",
   "fixwidthwarn": "",
+  "margin": "Margin between timelines",
   "above": "above",
   "font": "Font",
   "fontwarn": "Select your favorite font to 'Select'(Windows/ macOS only)",
@@ -43,19 +44,26 @@
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",
   "themeSel": "Select theme",
-  "customtheme": "Edit and add custom themes",
+  "customtheme": "Edit and add themes",
   "customthemeDirection": "Color scheme",
-  "advanced": "Advanced options(6 additional colors)",
+  "advanced": "Advanced options",
-  "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.",
+  "advancedWarn": "",
-  "active": "Background of Show or CW buttons, selected options...",
+  "use": "Use this",
-  "modal": "Background of modals",
+  "copyFrom": "Copy from",
-  "bottom": "Background of bottom bar",
+  "bg": "Background color",
-  "postbox": "Background of post box and menu",
+  "subcolor": "Distinguishable from background",
-  "subcolor": "Subcolor, has harmony with secondary color",
-  "primary": "Background color",
-  "secondarycolor": "Background of components",
   "text": "Text color",
   "accent": "Background of boosts",
+  "modal": "Background of modal window",
+  "modalFooter": "Background of modal window's footer",
+  "thirdColor": "Backgroud of tag buttons, etc(near to Background)",
+  "forthColor": "Title bar(same scheme to Background)",
+  "bottom": "Background of menu-bar at bottom of window",
+  "emphasized": "Emphasized toot's background",
+  "postbox": "Background of post-box and menu",
+  "active": "Background of 'active' elements",
+  "selected": "Background of selected with arrow keys",
+  "selectedWithShare": "Background of selected with arrow keys(boosted toots)",
   "add_new": "Add new",
   "name": "Name",
   "desc": "About this theme",
@@ -101,8 +109,8 @@
   "or": "or",
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
-  "ticker": "Enable #InstanceTicker",
+  "ticker": "Enable OpenSticker",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://github.com/MiyonMiyon/InstanceTicker_List\">About #InstanceTicker</a> (c)2018-2020 MiyonMiyon. Released under the MIT License.",
+  "tickerwarn": "Show the instance name and favicon of tooters <a href=\"https://opensticker.0px.io\">About OpenSticker</a>",
   "animation": "Animation of timelines",
   "markers": "Markers(mark as read) on HTL and notifications",
   "markerswarn": "Mastodon 3.0~. Shared on WebUI and third-party supported clients.",

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

@@ -130,7 +130,7 @@
     "notf": "Notifications",
     "bookmark": "Bookmarks",
     "showThisTL": "Show this TL:",
-    "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
+    "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>).",
     "add": "Add",
     "search": "Search",
     "sortSet": "Sort",

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

@@ -131,13 +131,17 @@
     "lang_layout_linkana": "Auto Link Analyzer",
     "lang_layout_linkanades": "Auto link analyzer",
     "lang_layout_tts": "Text to speech ",
-    "lang_layout_reconnect": "Reload this column",
+    "lang_layout_reconnect": "Reload",
     "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_webviewmode": "Prefer WebView",
-    "lang_excluded": "Excluded type of notification",
+    "lang_layout_excluded": "Excluded type of notification",
-    "lang_layout_excludingbt": "Show BT mode(OFF/Exclude BT/Only BT)",
+    "lang_layout_mention": "Mentions",
+    "lang_layout_fav": "Favourites",
+    "lang_layout_bt": "Boosts",
+    "lang_layout_poll": "Polls",
+    "lang_layout_excludingbt": "Show BT mode",
     "lang_layout_leftFold": "Stack to the left",
     "lang_layout_leftUnfold": "Dock on the right",
     "lang_layout_deleteColumn": "Delete this column",
@@ -222,6 +226,7 @@
     "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
     "lang_parse_hidden": "Unvisible quoted toot",
+    "lang_parse_disconnected": "Streaming has been disconnected(retry after 3s)",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",
     "lang_misskeyparse_reaction": "Reaction",
@@ -236,6 +241,7 @@
     "lang_misskeyparse_reacted": " reacted your following post.",
     "lang_setting_time": "Time format:{{set}}",
     "lang_setting_theme": "Theme:{{set}}",
+    "lang_setting_compat": "Compatible",
     "lang_setting_nsfw": "Sensitive media:{{set}}",
     "lang_setting_cw": "CW:{{set}}",
     "lang_setting_cwtext": "Default CW text:{{set}}",

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

@@ -24,10 +24,11 @@
   "nativenotf": "Native notification",
   "nnwarn": "This does not work on Windows Portable ver.",
   "nntest": "Notification test",
-  "minwidth": "Minimum width of columns",
+  "width": "Width of columns",
-  "minwidthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
+  "widthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
   "fixwidth": "Minimum width of TweetDeck browser",
   "fixwidthwarn": "",
+  "margin": "Margin between timelines",
   "above": "above",
   "font": "Font",
   "fontwarn": "Select your favorite font to 'Select'(Windows/ macOS only)",
@@ -43,19 +44,26 @@
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",
   "themeSel": "Select theme",
-  "customtheme": "Edit and add custom themes",
+  "customtheme": "Edit and add themes",
   "customthemeDirection": "Color scheme",
-  "advanced": "Advanced options(6 additional colors)",
+  "advanced": "Advanced options",
-  "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.",
+  "advancedWarn": "",
-  "active": "Background of Show or CW buttons, selected options...",
+  "use": "Use this",
-  "modal": "Background of modals",
+  "copyFrom": "Copy from",
-  "bottom": "Background of bottom bar",
+  "bg": "Background color",
-  "postbox": "Background of post box and menu",
+  "subcolor": "Distinguishable from background",
-  "subcolor": "Subcolor, has harmony with secondary color",
-  "primary": "Background color",
-  "secondarycolor": "Background of components",
   "text": "Text color",
   "accent": "Background of boosts",
+  "modal": "Background of modal window",
+  "modalFooter": "Background of modal window's footer",
+  "thirdColor": "Backgroud of tag buttons, etc(near to Background)",
+  "forthColor": "Title bar(same scheme to Background)",
+  "bottom": "Background of menu-bar at bottom of window",
+  "emphasized": "Emphasized toot's background",
+  "postbox": "Background of post-box and menu",
+  "active": "Background of 'active' elements",
+  "selected": "Background of selected with arrow keys",
+  "selectedWithShare": "Background of selected with arrow keys(boosted toots)",
   "add_new": "Add new",
   "name": "Name",
   "desc": "About this theme",
@@ -101,8 +109,8 @@
   "or": "or",
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
-  "ticker": "Enable #InstanceTicker",
+  "ticker": "Enable OpenSticker",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://github.com/MiyonMiyon/InstanceTicker_List\">About #InstanceTicker</a> (c)2018-2020 MiyonMiyon. Released under the MIT License.",
+  "tickerwarn": "Show the instance name and favicon of tooters <a href=\"https://opensticker.0px.io\">About OpenSticker</a>",
   "animation": "Animation of timelines",
   "markers": "Markers(mark as read) on HTL and notifications",
   "markerswarn": "Mastodon 3.0~. Shared on WebUI and third-party supported clients.",

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

@@ -136,7 +136,11 @@
     "lang_layout_nodata": "[Няма данни]<br>F5/⌘+R за презареждане",
     "lang_layout_dm": "Директни съобщения",
     "lang_layout_webviewmode": "Предпочитания за WebView",
-    "lang_excluded": "Изключване на вид уведомление",
+    "lang_layout_excluded": "Excluded type of notification",
+    "lang_layout_mention": "Mentions",
+    "lang_layout_fav": "Favourites",
+    "lang_layout_bt": "Boosts",
+    "lang_layout_poll": "Polls",
     "lang_layout_excludingbt": "Показване в BT режим (ИЗКЛ./Изключване BT/ Само в BT)",
     "lang_layout_leftFold": "Стъпка наляво",
     "lang_layout_leftUnfold": "Док отдясно",
@@ -222,6 +226,7 @@
     "lang_parse_html": "Показване на вграденият HTML код",
     "lang_parse_notffilter": "Показване на известията от този потребител",
     "lang_parse_hidden": "Unvisible quoted toot",
+    "lang_parse_disconnected": "Streaming has been disconnected(retry after 3s)",
     "lang_misskeyparse_renote": "Повторно публикуване",
     "lang_misskeyparse_renoteqt": "Повторна бележка",
     "lang_misskeyparse_reaction": "Реакция",
@@ -236,6 +241,7 @@
     "lang_misskeyparse_reacted": " реагирали на следващата ви публикация.",
     "lang_setting_time": "Времеви формат:{{set}}",
     "lang_setting_theme": "Тема:{{set}}",
+    "lang_setting_compat": "Compatible",
     "lang_setting_nsfw": "NSFW:{{set}}",
     "lang_setting_cw": "CW:{{set}}",
     "lang_setting_cwtext": "Default CW text:{{set}}",

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

@@ -24,10 +24,11 @@
   "nativenotf": "Вътрешно уведомяване",
   "nnwarn": "Това не работи в Windows Portable вер.",
   "nntest": "Тест за уведомяване",
-  "minwidth": "Минимална ширина на колоните",
+  "width": "Width of columns",
-  "minwidthwarn": "Лентата за превъртане ще се покаже, когато размерът на прозореца е по-голям от размера на колони.",
+  "widthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
   "fixwidth": "Минимална ширина на браузъра TweetDeck",
   "fixwidthwarn": "",
+  "margin": "Margin between timelines",
   "above": "над",
   "font": "Шрифт",
   "fontwarn": "Изберете любимия си шрифт с „Избор“ (само за Windows / macOS)",
@@ -45,17 +46,24 @@
   "themeSel": "Изберете тема",
   "customtheme": "Редактирайте и добавете персонализирани теми",
   "customthemeDirection": "Цветова схема",
-  "advanced": "Advanced options(6 additional colors)",
+  "advanced": "Advanced options",
-  "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.",
+  "advancedWarn": "",
-  "active": "Background of Show or CW buttons, selected options...",
+  "use": "Use this",
-  "modal": "Background of modals",
+  "copyFrom": "Copy from",
-  "bottom": "Background of bottom bar",
+  "bg": "Background color",
-  "postbox": "Background of post box and menu",
+  "subcolor": "Distinguishable from background",
-  "subcolor": "Subcolor, has harmony with secondary color",
-  "primary": "Цвят на фона",
-  "secondarycolor": "Компоненти на фона",
   "text": "Цвят на текста",
   "accent": "Фон на подсилването",
+  "modal": "Background of modal window",
+  "modalFooter": "Background of modal window's footer",
+  "thirdColor": "Backgroud of tag buttons, etc(near to Background)",
+  "forthColor": "Title bar(same scheme to Background)",
+  "bottom": "Background of menu-bar at bottom of window",
+  "emphasized": "Emphasized toot's background",
+  "postbox": "Background of post-box and menu",
+  "active": "Background of 'active' elements",
+  "selected": "Background of selected with arrow keys",
+  "selectedWithShare": "Background of selected with arrow keys(boosted toots)",
   "add_new": "Добавяне на нов",
   "name": "Име",
   "desc": "Относно тази тема",
@@ -101,7 +109,7 @@
   "or": "или",
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
-  "ticker": "Enable #InstanceTicker",
+  "ticker": "Enable OpenSticker",
   "tickerwarn": "Show colorful stickers about the server. <a href=\"https://cdn.weep.me/mastodon/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
   "animation": "Анимация на времевата линия",
   "markers": "Markers(mark as read) on HTL and notifications",

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

@@ -130,7 +130,7 @@
     "notf": "Notifications",
     "bookmark": "Bookmarks",
     "showThisTL": "Show this TL:",
-    "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
+    "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>).",
     "add": "Add",
     "search": "Search",
     "sortSet": "Sort",

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

@@ -131,13 +131,17 @@
     "lang_layout_linkana": "Auto Link Analyzer",
     "lang_layout_linkanades": "Auto link analyzer",
     "lang_layout_tts": "Text to speech ",
-    "lang_layout_reconnect": "Reload this column",
+    "lang_layout_reconnect": "Reload",
     "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_webviewmode": "Prefer WebView",
-    "lang_excluded": "Excluded type of notification",
+    "lang_layout_excluded": "Excluded type of notification",
-    "lang_layout_excludingbt": "Show BT mode(OFF/Exclude BT/Only BT)",
+    "lang_layout_mention": "Mentions",
+    "lang_layout_fav": "Favourites",
+    "lang_layout_bt": "Boosts",
+    "lang_layout_poll": "Polls",
+    "lang_layout_excludingbt": "Show BT mode",
     "lang_layout_leftFold": "Stack to the left",
     "lang_layout_leftUnfold": "Dock on the right",
     "lang_layout_deleteColumn": "Delete this column",
@@ -222,6 +226,7 @@
     "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
     "lang_parse_hidden": "Unvisible quoted toot",
+    "lang_parse_disconnected": "Streaming has been disconnected(retry after 3s)",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",
     "lang_misskeyparse_reaction": "Reaction",
@@ -236,6 +241,7 @@
     "lang_misskeyparse_reacted": " reacted your following post.",
     "lang_setting_time": "Time format:{{set}}",
     "lang_setting_theme": "Theme:{{set}}",
+    "lang_setting_compat": "Compatible",
     "lang_setting_nsfw": "Sensitive media:{{set}}",
     "lang_setting_cw": "CW:{{set}}",
     "lang_setting_cwtext": "Default CW text:{{set}}",

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

@@ -24,10 +24,11 @@
   "nativenotf": "Native notification",
   "nnwarn": "This does not work on Windows Portable ver.",
   "nntest": "Notification test",
-  "minwidth": "Minimum width of columns",
+  "width": "Width of columns",
-  "minwidthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
+  "widthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
   "fixwidth": "Minimum width of TweetDeck browser",
   "fixwidthwarn": "",
+  "margin": "Margin between timelines",
   "above": "above",
   "font": "Font",
   "fontwarn": "Select your favorite font to 'Select'(Windows/ macOS only)",
@@ -43,19 +44,26 @@
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",
   "themeSel": "Select theme",
-  "customtheme": "Edit and add custom themes",
+  "customtheme": "Edit and add themes",
   "customthemeDirection": "Color scheme",
-  "advanced": "Advanced options(6 additional colors)",
+  "advanced": "Advanced options",
-  "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.",
+  "advancedWarn": "",
-  "active": "Background of Show or CW buttons, selected options...",
+  "use": "Use this",
-  "modal": "Background of modals",
+  "copyFrom": "Copy from",
-  "bottom": "Background of bottom bar",
+  "bg": "Background color",
-  "postbox": "Background of post box and menu",
+  "subcolor": "Distinguishable from background",
-  "subcolor": "Subcolor, has harmony with secondary color",
-  "primary": "Background color",
-  "secondarycolor": "Background of components",
   "text": "Text color",
   "accent": "Background of boosts",
+  "modal": "Background of modal window",
+  "modalFooter": "Background of modal window's footer",
+  "thirdColor": "Backgroud of tag buttons, etc(near to Background)",
+  "forthColor": "Title bar(same scheme to Background)",
+  "bottom": "Background of menu-bar at bottom of window",
+  "emphasized": "Emphasized toot's background",
+  "postbox": "Background of post-box and menu",
+  "active": "Background of 'active' elements",
+  "selected": "Background of selected with arrow keys",
+  "selectedWithShare": "Background of selected with arrow keys(boosted toots)",
   "add_new": "Add new",
   "name": "Name",
   "desc": "About this theme",
@@ -101,8 +109,8 @@
   "or": "or",
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
-  "ticker": "Enable #InstanceTicker",
+  "ticker": "Enable OpenSticker",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://github.com/MiyonMiyon/InstanceTicker_List\">About #InstanceTicker</a> (c)2018-2020 MiyonMiyon. Released under the MIT License.",
+  "tickerwarn": "Show the instance name and favicon of tooters <a href=\"https://opensticker.0px.io\">About OpenSticker</a>",
   "animation": "Animation of timelines",
   "markers": "Markers(mark as read) on HTL and notifications",
   "markerswarn": "Mastodon 3.0~. Shared on WebUI and third-party supported clients.",

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

@@ -136,7 +136,11 @@
     "lang_layout_nodata": "[Žádná data]<br>Obnovte stránku klávesami F5/⌘+R",
     "lang_layout_dm": "Přímá zpráva",
     "lang_layout_webviewmode": "Preferovat WebView",
-    "lang_excluded": "Excluded type of notification",
+    "lang_layout_excluded": "Excluded type of notification",
+    "lang_layout_mention": "Mentions",
+    "lang_layout_fav": "Favourites",
+    "lang_layout_bt": "Boosts",
+    "lang_layout_poll": "Polls",
     "lang_layout_excludingbt": "Show BT mode(OFF/Exclude BT/Only BT)",
     "lang_layout_leftFold": "Stack to the left",
     "lang_layout_leftUnfold": "Dock on the right",
@@ -222,6 +226,7 @@
     "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
     "lang_parse_hidden": "Unvisible quoted toot",
+    "lang_parse_disconnected": "Streaming has been disconnected(retry after 3s)",
     "lang_misskeyparse_renote": "Znovusdílení",
     "lang_misskeyparse_renoteqt": "Renotování",
     "lang_misskeyparse_reaction": "Reakce",
@@ -236,6 +241,7 @@
     "lang_misskeyparse_reacted": " reagoval/a na váš následující příspěvek.",
     "lang_setting_time": "Časový formát: {{set}}",
     "lang_setting_theme": "Motiv: {{set}}",
+    "lang_setting_compat": "Compatible",
     "lang_setting_nsfw": "Citlivý obsah: {{set}}",
     "lang_setting_cw": "Varování: {{set}}",
     "lang_setting_cwtext": "Výchozí text varování: {{set}}",

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

@@ -24,10 +24,11 @@
   "nativenotf": "Native notification",
   "nnwarn": "This does not work on Windows Portable ver.",
   "nntest": "Odskoušet oznámení",
-  "minwidth": "Minimum width of columns",
+  "width": "Width of columns",
-  "minwidthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
+  "widthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
   "fixwidth": "Minimální šířka TweetDeck prohlížeče",
   "fixwidthwarn": "",
+  "margin": "Margin between timelines",
   "above": "above",
   "font": "Písmo",
   "fontwarn": "Select your favorite font to 'Select'(Windows/ macOS only)",
@@ -45,17 +46,24 @@
   "themeSel": "Vybrat motiv",
   "customtheme": "Edit and add custom themes",
   "customthemeDirection": "Color scheme",
-  "advanced": "Advanced options(6 additional colors)",
+  "advanced": "Advanced options",
-  "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.",
+  "advancedWarn": "",
-  "active": "Background of Show or CW buttons, selected options...",
+  "use": "Use this",
-  "modal": "Background of modals",
+  "copyFrom": "Copy from",
-  "bottom": "Background of bottom bar",
+  "bg": "Background color",
-  "postbox": "Background of post box and menu",
+  "subcolor": "Distinguishable from background",
-  "subcolor": "Subcolor, has harmony with secondary color",
-  "primary": "Background color",
-  "secondarycolor": "Background of components",
   "text": "Text color",
   "accent": "Background of boosts",
+  "modal": "Background of modal window",
+  "modalFooter": "Background of modal window's footer",
+  "thirdColor": "Backgroud of tag buttons, etc(near to Background)",
+  "forthColor": "Title bar(same scheme to Background)",
+  "bottom": "Background of menu-bar at bottom of window",
+  "emphasized": "Emphasized toot's background",
+  "postbox": "Background of post-box and menu",
+  "active": "Background of 'active' elements",
+  "selected": "Background of selected with arrow keys",
+  "selectedWithShare": "Background of selected with arrow keys(boosted toots)",
   "add_new": "Add new",
   "name": "Name",
   "desc": "About this theme",

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

@@ -130,7 +130,7 @@
     "notf": "Notifications",
     "bookmark": "Bookmarks",
     "showThisTL": "Show this TL:",
-    "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
+    "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>).",
     "add": "Add",
     "search": "Search",
     "sortSet": "Sort",

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

@@ -131,13 +131,17 @@
     "lang_layout_linkana": "Auto Link Analyzer",
     "lang_layout_linkanades": "Auto link analyzer",
     "lang_layout_tts": "Text to speech ",
-    "lang_layout_reconnect": "Reload this column",
+    "lang_layout_reconnect": "Reload",
     "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_webviewmode": "Prefer WebView",
-    "lang_excluded": "Excluded type of notification",
+    "lang_layout_excluded": "Excluded type of notification",
-    "lang_layout_excludingbt": "Show BT mode(OFF/Exclude BT/Only BT)",
+    "lang_layout_mention": "Mentions",
+    "lang_layout_fav": "Favourites",
+    "lang_layout_bt": "Boosts",
+    "lang_layout_poll": "Polls",
+    "lang_layout_excludingbt": "Show BT mode",
     "lang_layout_leftFold": "Stack to the left",
     "lang_layout_leftUnfold": "Dock on the right",
     "lang_layout_deleteColumn": "Delete this column",
@@ -222,6 +226,7 @@
     "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
     "lang_parse_hidden": "Unvisible quoted toot",
+    "lang_parse_disconnected": "Streaming has been disconnected(retry after 3s)",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",
     "lang_misskeyparse_reaction": "Reaction",
@@ -236,6 +241,7 @@
     "lang_misskeyparse_reacted": " reacted your following post.",
     "lang_setting_time": "Time format:{{set}}",
     "lang_setting_theme": "Theme:{{set}}",
+    "lang_setting_compat": "Compatible",
     "lang_setting_nsfw": "Sensitive media:{{set}}",
     "lang_setting_cw": "CW:{{set}}",
     "lang_setting_cwtext": "Default CW text:{{set}}",

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

@@ -24,10 +24,11 @@
   "nativenotf": "Native notification",
   "nnwarn": "This does not work on Windows Portable ver.",
   "nntest": "Notification test",
-  "minwidth": "Minimum width of columns",
+  "width": "Width of columns",
-  "minwidthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
+  "widthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
   "fixwidth": "Minimum width of TweetDeck browser",
   "fixwidthwarn": "",
+  "margin": "Margin between timelines",
   "above": "above",
   "font": "Font",
   "fontwarn": "Select your favorite font to 'Select'(Windows/ macOS only)",
@@ -43,19 +44,26 @@
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",
   "themeSel": "Select theme",
-  "customtheme": "Edit and add custom themes",
+  "customtheme": "Edit and add themes",
   "customthemeDirection": "Color scheme",
-  "advanced": "Advanced options(6 additional colors)",
+  "advanced": "Advanced options",
-  "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.",
+  "advancedWarn": "",
-  "active": "Background of Show or CW buttons, selected options...",
+  "use": "Use this",
-  "modal": "Background of modals",
+  "copyFrom": "Copy from",
-  "bottom": "Background of bottom bar",
+  "bg": "Background color",
-  "postbox": "Background of post box and menu",
+  "subcolor": "Distinguishable from background",
-  "subcolor": "Subcolor, has harmony with secondary color",
-  "primary": "Background color",
-  "secondarycolor": "Background of components",
   "text": "Text color",
   "accent": "Background of boosts",
+  "modal": "Background of modal window",
+  "modalFooter": "Background of modal window's footer",
+  "thirdColor": "Backgroud of tag buttons, etc(near to Background)",
+  "forthColor": "Title bar(same scheme to Background)",
+  "bottom": "Background of menu-bar at bottom of window",
+  "emphasized": "Emphasized toot's background",
+  "postbox": "Background of post-box and menu",
+  "active": "Background of 'active' elements",
+  "selected": "Background of selected with arrow keys",
+  "selectedWithShare": "Background of selected with arrow keys(boosted toots)",
   "add_new": "Add new",
   "name": "Name",
   "desc": "About this theme",
@@ -101,8 +109,8 @@
   "or": "or",
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
-  "ticker": "Enable #InstanceTicker",
+  "ticker": "Enable OpenSticker",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://github.com/MiyonMiyon/InstanceTicker_List\">About #InstanceTicker</a> (c)2018-2020 MiyonMiyon. Released under the MIT License.",
+  "tickerwarn": "Show the instance name and favicon of tooters <a href=\"https://opensticker.0px.io\">About OpenSticker</a>",
   "animation": "Animation of timelines",
   "markers": "Markers(mark as read) on HTL and notifications",
   "markerswarn": "Mastodon 3.0~. Shared on WebUI and third-party supported clients.",

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

@@ -1,8 +1,8 @@
 {
-    "list": "Accountliste",
+    "list": "Konten",
     "back": "Zurück",
     "add": "Konto hinzufügen",
-    "addAcct": "Fill the instance domain (like mastodon.social)",
+    "addAcct": "Geben Sie die Instanz-Domain ein (wie mastodon.social)",
     "codesetupwarn": "Check if TheDesk is not working on Windows, you want to login Pleroma servers, you cannot login when it checked.",
     "codesetup": "Code-Setup",
     "mainacct": "Hauptkonto",
@@ -21,5 +21,5 @@
     "misskeylogin": "Lies die <a href=\"https://thedesk.top/how-to-misskey-login.html\">Doku (japanisch)</a> um dich bei Misskey einzuloggen.",
     "nodata": "Keine Daten",
     "accessTokenSetup": "Benutze Zugangs-Token zum Anmelden (Klicke nach Ausfüllen nicht den Code, sondern den Access-Token im Kästchen: Erweitert)",
-    "haveExported": "Having the exported file of TheDesk, click here to jump setting page"
+    "haveExported": "Haben Sie eine exportierte Datei von TheDesk, klicken Sie hier für die Einstellungen"
 }

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

@@ -20,8 +20,8 @@
     "yes": "Ja",
     "temp": "Dateien anhängen",
     "nothing": "Keine",
-    "stamp": "Stamp",
+    "stamp": "Stempel",
-    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
+    "stampWarn": "Ihr acct(aa@bb.cc) wird rechts unten des hochgeladenen Bildes gedruckt",
     "vis": "Status Privatsphäre anpassen",
     "cwtext": "Warntext",
     "selectVis": "Status Privatsphäre anpassen",
@@ -75,7 +75,7 @@
     "toots": "Tröts",
     "follow": "Folgen",
     "follower": "Abonnenten",
-    "utlColumn": "Show as a column",
+    "utlColumn": "Als Spalte anzeigen",
     "timeline": "Verlauf",
     "operateOtherAcct": "Cross-Account",
     "list": "Liste",
@@ -139,7 +139,7 @@
     "filterWord": "Filterwörter",
     "degree": "Kontexte filtern",
     "conver": "Gespräche",
-    "prof": "Profiles",
+    "prof": "Profile",
     "option": "Einstellungen",
     "matchWord": "Ganze Wörter",
     "warnMatchWord": "Schön für lateinische Sprachen",
@@ -184,5 +184,5 @@
     "acctManDesc": "Fügen Sie weitere Konten hinzu und loggen Sie sie aus.",
     "settingDesc": "Hier sind sehr, sehr viele Einstellungen. Du könntest gar nicht alles ausprobieren!",
     "nanoDescPlus": "Mini-Fenster-Klient (experimentell)",
-    "menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
+    "menuDesc": "Alle täglichen TheDesk und Mastodon-Einstellungen wie <b>hinzufügen und sortieren von Spalten</b>, <b>Liste und Filter prüfen</b>."
 }

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

@@ -136,7 +136,11 @@
     "lang_layout_nodata": "[Keine Daten]<br>F5/⌘+R zum Neu laden",
     "lang_layout_dm": "Direkte Nachricht",
     "lang_layout_webviewmode": "Web-Ansicht bevorzugen",
-    "lang_excluded": "Ausgeschlossene Benachrichtigungsart",
+    "lang_layout_excluded": "Excluded type of notification",
+    "lang_layout_mention": "Mentions",
+    "lang_layout_fav": "Favourites",
+    "lang_layout_bt": "Boosts",
+    "lang_layout_poll": "Polls",
     "lang_layout_excludingbt": "BT-Modus anzeigen (aus/kein BT/Nur BT)",
     "lang_layout_leftFold": "Nach links Stapeln",
     "lang_layout_leftUnfold": "Rechts Anheften",
@@ -222,6 +226,7 @@
     "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Benachrichtigungen dieses Benutzers anzeigen",
     "lang_parse_hidden": "Unvisible quoted toot",
+    "lang_parse_disconnected": "Streaming has been disconnected(retry after 3s)",
     "lang_misskeyparse_renote": "Weiterleiten",
     "lang_misskeyparse_renoteqt": "Renote",
     "lang_misskeyparse_reaction": "Reaktion",
@@ -236,6 +241,7 @@
     "lang_misskeyparse_reacted": " hat auf Ihren folgenden Beitrag reagiert.",
     "lang_setting_time": "Zeitformat:{{set}}",
     "lang_setting_theme": "Design:{{set}}",
+    "lang_setting_compat": "Compatible",
     "lang_setting_nsfw": "NSFW:{{set}}",
     "lang_setting_cw": "NSFW:{{set}}",
     "lang_setting_cwtext": "Standard-NSFW-Text:{{set}}",

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

@@ -13,8 +13,8 @@
   "setlang": "Sprachen",
   "backup": "Import und Export von Einstellungen",
   "backupWarn": "If you got a error when you choose the file, please paste the strings printed when you open the file and click import",
-  "import": "Import",
+  "import": "Importieren",
-  "export": "Export",
+  "export": "Exportieren",
   "hardwareAcceleration": "Hardwarebeschleunigung deaktivieren",
   "hardwareAccelerationWarn": "Automatischer Neustart",
   "theme": "Designs",
@@ -24,38 +24,46 @@
   "nativenotf": "System Benachrichtigungen",
   "nnwarn": "Dies funktioniert nicht mit der Portablen Windows Version.",
   "nntest": "Benachrichtigungen testen",
-  "minwidth": "Minimale Breite der Spalten",
+  "width": "Spaltenbreite",
-  "minwidthwarn": "Die Scroll-Leiste wird angezeigt, wenn Spalten breiter als das Fenster sind.",
+  "widthwarn": "Die Bildlaufleiste wird angezeigt, wenn die Fenstergröße größer als die Spaltenanzahl ist.",
   "fixwidth": "Minimale Breite des TweetDeck-Browsers",
   "fixwidthwarn": "",
+  "margin": "Abstand zwischen Zeitleisten",
   "above": "über",
   "font": "Schriftart",
   "fontwarn": "Wählen Sie Ihre Lieblingsschrift. 'Select'(nur Windows/ macOS)",
   "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",
+  "useragent": "User-Agent",
-  "useragentWarn": "Restart when changed",
+  "useragentWarn": "Neustart bei Änderung",
-  "frame": "Window frame",
+  "frame": "Fensterrahmen",
   "frameWarn": "If 'off', the window looks cool.",
   "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "Absoluter Wert",
-  "srcUrl": "Search engine",
+  "srcUrl": "Suchmaschine",
   "srcUrlWarn": "{q} will be replaced to query.",
   "themeSel": "Design auswählen",
   "customtheme": "Bearbeiten und hinzufügen von eigenen Designs",
   "customthemeDirection": "Farbschema",
-  "advanced": "Advanced options(6 additional colors)",
+  "advanced": "Erweiterte Einstellungen",
-  "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.",
+  "advancedWarn": "",
-  "active": "Background of Show or CW buttons, selected options...",
+  "use": "Use this",
-  "modal": "Background of modals",
+  "copyFrom": "Kopieren von",
-  "bottom": "Background of bottom bar",
+  "bg": "Hintergrundfarbe",
-  "postbox": "Background of post box and menu",
+  "subcolor": "Distinguishable from background",
-  "subcolor": "Subcolor, has harmony with secondary color",
-  "primary": "Hintergrundfarbe",
-  "secondarycolor": "Hintergrund der Komponenten",
   "text": "Textfarbe",
   "accent": "Hintergrund des Boosts",
+  "modal": "Background of modal window",
+  "modalFooter": "Background of modal window's footer",
+  "thirdColor": "Backgroud of tag buttons, etc(near to Background)",
+  "forthColor": "Title bar(same scheme to Background)",
+  "bottom": "Background of menu-bar at bottom of window",
+  "emphasized": "Emphasized toot's background",
+  "postbox": "Background of post-box and menu",
+  "active": "Background of 'active' elements",
+  "selected": "Background of selected with arrow keys",
+  "selectedWithShare": "Background of selected with arrow keys(boosted toots)",
   "add_new": "Neues hinzufügen",
   "name": "Name",
   "desc": "Über dieses Design",

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

@@ -130,7 +130,7 @@
     "notf": "Notifications",
     "bookmark": "Bookmarks",
     "showThisTL": "Show this TL:",
-    "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
+    "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>).",
     "add": "Add",
     "search": "Search",
     "sortSet": "Sort",

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

@@ -131,13 +131,17 @@
     "lang_layout_linkana": "Auto Link Analyzer",
     "lang_layout_linkanades": "Auto link analyzer",
     "lang_layout_tts": "Text to speech ",
-    "lang_layout_reconnect": "Reload this column",
+    "lang_layout_reconnect": "Reload",
     "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_webviewmode": "Prefer WebView",
-    "lang_excluded": "Excluded type of notification",
+    "lang_layout_excluded": "Excluded type of notification",
-    "lang_layout_excludingbt": "Show BT mode(OFF/Exclude BT/Only BT)",
+    "lang_layout_mention": "Mentions",
+    "lang_layout_fav": "Favourites",
+    "lang_layout_bt": "Boosts",
+    "lang_layout_poll": "Polls",
+    "lang_layout_excludingbt": "Show BT mode",
     "lang_layout_leftFold": "Stack to the left",
     "lang_layout_leftUnfold": "Dock on the right",
     "lang_layout_deleteColumn": "Delete this column",
@@ -222,6 +226,7 @@
     "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
     "lang_parse_hidden": "Unvisible quoted toot",
+    "lang_parse_disconnected": "Streaming has been disconnected(retry after 3s)",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",
     "lang_misskeyparse_reaction": "Reaction",
@@ -236,6 +241,7 @@
     "lang_misskeyparse_reacted": " reacted your following post.",
     "lang_setting_time": "Time format:{{set}}",
     "lang_setting_theme": "Theme:{{set}}",
+    "lang_setting_compat": "Compatible",
     "lang_setting_nsfw": "Sensitive media:{{set}}",
     "lang_setting_cw": "CW:{{set}}",
     "lang_setting_cwtext": "Default CW text:{{set}}",

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

@@ -24,10 +24,11 @@
   "nativenotf": "Native notification",
   "nnwarn": "This does not work on Windows Portable ver.",
   "nntest": "Notification test",
-  "minwidth": "Minimum width of columns",
+  "width": "Width of columns",
-  "minwidthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
+  "widthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
   "fixwidth": "Minimum width of TweetDeck browser",
   "fixwidthwarn": "",
+  "margin": "Margin between timelines",
   "above": "above",
   "font": "Font",
   "fontwarn": "Select your favorite font to 'Select'(Windows/ macOS only)",
@@ -43,19 +44,26 @@
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",
   "themeSel": "Select theme",
-  "customtheme": "Edit and add custom themes",
+  "customtheme": "Edit and add themes",
   "customthemeDirection": "Color scheme",
-  "advanced": "Advanced options(6 additional colors)",
+  "advanced": "Advanced options",
-  "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.",
+  "advancedWarn": "",
-  "active": "Background of Show or CW buttons, selected options...",
+  "use": "Use this",
-  "modal": "Background of modals",
+  "copyFrom": "Copy from",
-  "bottom": "Background of bottom bar",
+  "bg": "Background color",
-  "postbox": "Background of post box and menu",
+  "subcolor": "Distinguishable from background",
-  "subcolor": "Subcolor, has harmony with secondary color",
-  "primary": "Background color",
-  "secondarycolor": "Background of components",
   "text": "Text color",
   "accent": "Background of boosts",
+  "modal": "Background of modal window",
+  "modalFooter": "Background of modal window's footer",
+  "thirdColor": "Backgroud of tag buttons, etc(near to Background)",
+  "forthColor": "Title bar(same scheme to Background)",
+  "bottom": "Background of menu-bar at bottom of window",
+  "emphasized": "Emphasized toot's background",
+  "postbox": "Background of post-box and menu",
+  "active": "Background of 'active' elements",
+  "selected": "Background of selected with arrow keys",
+  "selectedWithShare": "Background of selected with arrow keys(boosted toots)",
   "add_new": "Add new",
   "name": "Name",
   "desc": "About this theme",
@@ -101,8 +109,8 @@
   "or": "or",
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
-  "ticker": "Enable #InstanceTicker",
+  "ticker": "Enable OpenSticker",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://github.com/MiyonMiyon/InstanceTicker_List\">About #InstanceTicker</a> (c)2018-2020 MiyonMiyon. Released under the MIT License.",
+  "tickerwarn": "Show the instance name and favicon of tooters <a href=\"https://opensticker.0px.io\">About OpenSticker</a>",
   "animation": "Animation of timelines",
   "markers": "Markers(mark as read) on HTL and notifications",
   "markerswarn": "Mastodon 3.0~. Shared on WebUI and third-party supported clients.",

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

@@ -136,7 +136,11 @@
     "lang_layout_nodata": "crwdns3656:0crwdne3656:0",
     "lang_layout_dm": "crwdns3658:0crwdne3658:0",
     "lang_layout_webviewmode": "crwdns3660:0crwdne3660:0",
-    "lang_excluded": "crwdns3662:0crwdne3662:0",
+    "lang_layout_excluded": "crwdns4508:0crwdne4508:0",
+    "lang_layout_mention": "crwdns4510:0crwdne4510:0",
+    "lang_layout_fav": "crwdns4512:0crwdne4512:0",
+    "lang_layout_bt": "crwdns4514:0crwdne4514:0",
+    "lang_layout_poll": "crwdns4516:0crwdne4516:0",
     "lang_layout_excludingbt": "crwdns3664:0crwdne3664:0",
     "lang_layout_leftFold": "crwdns3666:0crwdne3666:0",
     "lang_layout_leftUnfold": "crwdns3668:0crwdne3668:0",
@@ -222,6 +226,7 @@
     "lang_parse_html": "crwdns4388:0crwdne4388:0",
     "lang_parse_notffilter": "crwdns3802:0crwdne3802:0",
     "lang_parse_hidden": "crwdns4498:0crwdne4498:0",
+    "lang_parse_disconnected": "crwdns4538:0crwdne4538:0",
     "lang_misskeyparse_renote": "crwdns3804:0crwdne3804:0",
     "lang_misskeyparse_renoteqt": "crwdns3806:0crwdne3806:0",
     "lang_misskeyparse_reaction": "crwdns3808:0crwdne3808:0",
@@ -236,6 +241,7 @@
     "lang_misskeyparse_reacted": "crwdns3826:0crwdne3826:0",
     "lang_setting_time": "crwdns3828:0{{set}}crwdne3828:0",
     "lang_setting_theme": "crwdns3830:0{{set}}crwdne3830:0",
+    "lang_setting_compat": "crwdns4518:0crwdne4518:0",
     "lang_setting_nsfw": "crwdns3832:0{{set}}crwdne3832:0",
     "lang_setting_cw": "crwdns3834:0{{set}}crwdne3834:0",
     "lang_setting_cwtext": "crwdns3836:0{{set}}crwdne3836:0",

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

@@ -24,10 +24,11 @@
   "nativenotf": "crwdns3946:0crwdne3946:0",
   "nnwarn": "crwdns3948:0crwdne3948:0",
   "nntest": "crwdns3950:0crwdne3950:0",
-  "minwidth": "crwdns3952:0crwdne3952:0",
+  "width": "crwdns4502:0crwdne4502:0",
-  "minwidthwarn": "crwdns3954:0crwdne3954:0",
+  "widthwarn": "crwdns4504:0crwdne4504:0",
   "fixwidth": "crwdns3956:0crwdne3956:0",
   "fixwidthwarn": "crwdns3958:0crwdne3958:0",
+  "margin": "crwdns4506:0crwdne4506:0",
   "above": "crwdns3960:0crwdne3960:0",
   "font": "crwdns3962:0crwdne3962:0",
   "fontwarn": "crwdns4360:0crwdne4360:0",
@@ -47,15 +48,22 @@
   "customthemeDirection": "crwdns3978:0crwdne3978:0",
   "advanced": "crwdns4326:0crwdne4326:0",
   "advancedWarn": "crwdns4328:0crwdne4328:0",
-  "active": "crwdns4330:0crwdne4330:0",
+  "use": "crwdns4520:0crwdne4520:0",
-  "modal": "crwdns4332:0crwdne4332:0",
+  "copyFrom": "crwdns4522:0crwdne4522:0",
-  "bottom": "crwdns4334:0crwdne4334:0",
+  "bg": "crwdns4524:0crwdne4524:0",
-  "postbox": "crwdns4336:0crwdne4336:0",
   "subcolor": "crwdns4338:0crwdne4338:0",
-  "primary": "crwdns3980:0crwdne3980:0",
-  "secondarycolor": "crwdns3982:0crwdne3982:0",
   "text": "crwdns3984:0crwdne3984:0",
   "accent": "crwdns3986:0crwdne3986:0",
+  "modal": "crwdns4332:0crwdne4332:0",
+  "modalFooter": "crwdns4526:0crwdne4526:0",
+  "thirdColor": "crwdns4528:0crwdne4528:0",
+  "forthColor": "crwdns4530:0crwdne4530:0",
+  "bottom": "crwdns4334:0crwdne4334:0",
+  "emphasized": "crwdns4532:0crwdne4532:0",
+  "postbox": "crwdns4336:0crwdne4336:0",
+  "active": "crwdns4330:0crwdne4330:0",
+  "selected": "crwdns4534:0crwdne4534:0",
+  "selectedWithShare": "crwdns4536:0crwdne4536:0",
   "add_new": "crwdns3988:0crwdne3988:0",
   "name": "crwdns3990:0crwdne3990:0",
   "desc": "crwdns3992:0crwdne3992:0",

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

@@ -131,13 +131,17 @@
     "lang_layout_linkana": "Auto Link Analyzer",
     "lang_layout_linkanades": "Auto link analyzer",
     "lang_layout_tts": "Text to speech ",
-    "lang_layout_reconnect": "Reload this column",
+    "lang_layout_reconnect": "Reload",
     "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_webviewmode": "Prefer WebView",
-    "lang_excluded": "Excluded type of notification",
+    "lang_layout_excluded": "Excluded type of notification",
-    "lang_layout_excludingbt": "Show BT mode(OFF/Exclude BT/Only BT)",
+    "lang_layout_mention": "Mentions",
+    "lang_layout_fav": "Favourites",
+    "lang_layout_bt": "Boosts",
+    "lang_layout_poll": "Polls",
+    "lang_layout_excludingbt": "Show BT mode",
     "lang_layout_leftFold": "Stack to the left",
     "lang_layout_leftUnfold": "Dock on the right",
     "lang_layout_deleteColumn": "Delete this column",
@@ -222,6 +226,7 @@
     "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
     "lang_parse_hidden": "Unvisible quoted toot",
+    "lang_parse_disconnected": "Streaming has been disconnected(retry after 3s)",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",
     "lang_misskeyparse_reaction": "Reaction",
@@ -236,6 +241,7 @@
     "lang_misskeyparse_reacted": " reacted your following post.",
     "lang_setting_time": "Time format:{{set}}",
     "lang_setting_theme": "Theme:{{set}}",
+    "lang_setting_compat": "Compatible",
     "lang_setting_nsfw": "Sensitive media:{{set}}",
     "lang_setting_cw": "CW:{{set}}",
     "lang_setting_cwtext": "Default CW text:{{set}}",

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

@@ -44,19 +44,26 @@
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",
   "themeSel": "Select theme",
-  "customtheme": "Edit and add custom themes",
+  "customtheme": "Edit and add themes",
   "customthemeDirection": "Color scheme",
-  "advanced":"Advanced options(6 additional colors)",
+  "advanced":"Advanced options",
-  "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.",
+  "advancedWarn":"",
-  "active": "Background of Show or CW buttons, selected options...",
+  "use": "Use this",
-  "modal": "Background of modals",
+  "copyFrom": "Copy from",
-  "bottom":"Background of bottom bar",
+  "bg": "Background color",
-  "postbox":"Background of post box and menu",
+  "subcolor":"Distinguishable from background",
-  "subcolor":"Subcolor, has harmony with secondary color",
-  "primary": "Background color",
-  "secondarycolor": "Background of components",
   "text": "Text color",
   "accent": "Background of boosts",
+  "modal": "Background of modal window",
+  "modalFooter": "Background of modal window's footer",
+  "thirdColor": "Backgroud of tag buttons, etc(near to Background)",
+  "forthColor": "Title bar(same scheme to Background)",
+  "bottom":"Background of menu-bar at bottom of window",
+  "emphasized": "Emphasized toot's background",
+  "postbox":"Background of post-box and menu",
+  "active": "Background of 'active' elements",
+  "selected": "Background of selected with arrow keys",
+  "selectedWithShare": "Background of selected with arrow keys(boosted toots)",
   "add_new": "Add new",
   "name": "Name",
   "desc": "About this theme",

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

@@ -2,7 +2,7 @@
     "list": "Lista de cuentas",
     "back": "Volver",
     "add": "Agregar una cuenta",
-    "addAcct": "Fill the instance domain (like mastodon.social)",
+    "addAcct": "Ingresá el dominio de la instancia (ej. mastodon.social)",
     "codesetupwarn": "No seleccionar para saltar el pegado de código (iniciá sesión de Mastodon en Windows o macOS) (Recomendado: pcheck)",
     "codesetup": "Configuración de código",
     "mainacct": "Establecer una cuenta",
@@ -20,6 +20,6 @@
     "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",
-    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)",
+    "accessTokenSetup": "Usar token de acceso para iniciar sesión (hacer clic después de completar no el código sino el token de acceso en la casilla: Avanzado)",
-    "haveExported": "Having the exported file of TheDesk, click here to jump setting page"
+    "haveExported": "Teniendo el archivo exportado de TheDesk, hacé clic acá para ir a la página de opciones"
 }

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

@@ -1,8 +1,8 @@
 {
     "draghere": "Arrastrá y soltá acá para subir",
     "close": "Cerrar",
-    "webSrc": "Search on Web",
+    "webSrc": "Buscar en la Web",
-    "tsSrc": "Search on tootsearch",
+    "tsSrc": "Buscar en tootsearch",
     "showSelectProf": "Mostrar perfil de la cuenta seleccionada",
     "closethisbox": "Cerrar esta caja",
     "toot": "Tootear",
@@ -75,7 +75,7 @@
     "toots": "Toots",
     "follow": "Seguir",
     "follower": "Seguidor",
-    "utlColumn": "Show as a column",
+    "utlColumn": "Mostrar como columna",
     "timeline": "Línea temporal",
     "operateOtherAcct": "Cuenta cruzada",
     "list": "Enlistar",
@@ -130,7 +130,7 @@
     "notf": "Notificaciones",
     "bookmark": "Marcadores",
     "showThisTL": "Mostrar esta línea temporal:",
-    "webviewWarn": "TweetDeck con TJDeck personalizado (<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Código</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Los atajos de teclado te irritarán. Cuando lo sientas, revisá \"Preferir WebView\" en la parte superior de la columna.",
+    "webviewWarn": "TweetDeck con TJDeck personalizado (<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Código</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Los atajos de teclado te irritarán. Cuando lo sientas, revisá 'Preferir WebView' en la parte superior de la columna.",
     "add": "Agregar",
     "search": "Buscar",
     "sortSet": "Ordenar",
@@ -139,7 +139,7 @@
     "filterWord": "Palabras filtradas",
     "degree": "Filtrar contextos",
     "conver": "Conversaciones",
-    "prof": "Profiles",
+    "prof": "Perfiles",
     "option": "Configuración",
     "matchWord": "Palabra completa",
     "warnMatchWord": "Útil para lenguas romances",
@@ -178,11 +178,11 @@
     "active": "Recientemente activo",
     "newcomer": "Recién llegados",
     "local_only": "Sólo local",
-    "menu": "Menu",
+    "menu": "Menú",
     "demoBottomBtns": "Guía de bienvenida",
     "lookAtBottom": "Mirá en la parte inferior de esta ventana. Acá tenés algunas sugerencias.",
     "acctManDesc": "Agregá más cuentas y administralas.",
     "settingDesc": "Muchas configuraciones. ¡No vas a poder con todas!",
     "nanoDescPlus": "Miniventana (experimental)",
-    "menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
+    "menuDesc": "Toda la configuración diaria de TheDesk y Mastodon, como <b>agregar y ordenar columnas</b> y <b>revisión de listas y filtros</b>."
 }

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

@@ -60,8 +60,8 @@
     "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_syncDetail": "Upload media synchronously",
+    "lang_post_syncDetail": "Subir multimedia sincrónicamente",
-    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
+    "lang_post_syncDetailText": "Hacé clic en cada ícono de la imagen para obtener la miniatura. Si podés obtenerla, el archivo multimedia que subiste se procesó completamente.",
     "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",
@@ -69,8 +69,8 @@
     "lang_post_btn1": "Cancelar (no se enviará)",
     "lang_post_btn2": "Crear el texto oculto automáticamente",
     "lang_post_btn3": "Continuar con el envío",
-    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
+    "lang_post_unfinishedMedia": "El servidor no ha terminado de procesar tu archivo. Volvé a intentarlo.",
-    "lang_post_retry": "Retry",
+    "lang_post_retry": "Reintentar",
     "lang_status_favWarn": "Llevará un minuto marcar un toot remoto como favorito.",
     "lang_status_btWarn": "Llevará un minuto retootear un toot remoto.",
     "lang_status_follow": "Seguir",
@@ -127,7 +127,7 @@
     "lang_layout_delthis": "Quitar esta columna",
     "lang_layout_setthis": "Configuración de esta columna",
     "lang_layout_mediafil": "Filtro de medio",
-    "lang_layout_remoteOnly": "Remote only",
+    "lang_layout_remoteOnly": "Solo remoto",
     "lang_layout_linkana": "Analizador automático de enlace",
     "lang_layout_linkanades": "Analizador automático de enlace",
     "lang_layout_tts": "Texto hablado ",
@@ -136,7 +136,11 @@
     "lang_layout_nodata": "[Sin datos]<br>F5/⌘+R para refrescar",
     "lang_layout_dm": "Mensaje directo",
     "lang_layout_webviewmode": "Preferir WebView",
-    "lang_excluded": "Tipo de notificación excluida",
+    "lang_layout_excluded": "Excluded type of notification",
+    "lang_layout_mention": "Mentions",
+    "lang_layout_fav": "Favourites",
+    "lang_layout_bt": "Boosts",
+    "lang_layout_poll": "Polls",
     "lang_layout_excludingbt": "Mostrar modo de retoot (DESACTIVADO / Excluir retoots / Sólo retoots)",
     "lang_layout_leftFold": "Pegar a la izquierda",
     "lang_layout_leftUnfold": "Colocar en la derecha",
@@ -144,7 +148,7 @@
     "lang_layout_deleteColumnDesc": "Eliminar esta columna",
     "lang_layout_unread": "Sin leer",
     "lang_layout_tagManager": "Administrador de etiqueta de línea temporal",
-    "lang_layout_announ": "Announcement: the counter is the number of your unread announcements. If not shown, it means announcements are all marked as read.",
+    "lang_layout_announ": "Anuncio: el contador es el número de tus anuncios no leídos. Si no se muestra, significa que todos los anuncios están marcados como leídos.",
     "lang_sort_gothis": "Ir a esta columna",
     "lang_sort_remthis": "Eliminar esta columna",
     "lang_spotify_img": "Adjuntar la tapa del álbum",
@@ -166,7 +170,7 @@
     "lang_showontl_domain": "Dominio ",
     "lang_showontl_listwarn": "Seguí a este usuario para agregarlo a las listas.",
     "lang_showontl_verified": "Este sitio web está verificado por su propietario en ",
-    "lang_status_requesting": "Requesting",
+    "lang_status_requesting": "Solicitando",
     "lang_parse_mentioned": " te respondió",
     "lang_parse_faved": " marcó tu toot como favorito",
     "lang_parse_bted": " retooteó tu toot",
@@ -174,7 +178,7 @@
     "lang_parse_polled": " hizo una encuesta",
     "lang_parse_notftime": "Enviado el",
     "lang_parse_cwshow": "Mostrar",
-    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
+    "lang_parse_cwshow_acc": "Esta es una publicación con advertencia de contenido. Hacé clic para mostrar todo el contenido",
     "lang_parse_fulltext": "Tamaño de texto:",
     "lang_parse_autofold": "Colapsado automáticamente",
     "lang_parse_more": "Más",
@@ -221,7 +225,8 @@
     "lang_parse_nsfw": "medios sensibles",
     "lang_parse_html": "Mostrar HTML insertado",
     "lang_parse_notffilter": "Mostrar notificaciones de este usuario",
-    "lang_parse_hidden": "Unvisible quoted toot",
+    "lang_parse_hidden": "Toot citado no visible",
+    "lang_parse_disconnected": "Streaming has been disconnected(retry after 3s)",
     "lang_misskeyparse_renote": "Republicar",
     "lang_misskeyparse_renoteqt": "Renovar",
     "lang_misskeyparse_reaction": "Reacción",
@@ -236,6 +241,7 @@
     "lang_misskeyparse_reacted": " reaccionó a tu siguiente entrada.",
     "lang_setting_time": "Formato de tiempo: {{set}}",
     "lang_setting_theme": "Tema: {{set}}",
+    "lang_setting_compat": "Compatible",
     "lang_setting_nsfw": "Medios sensibles: {{set}}",
     "lang_setting_cw": "Advertencia de contenido: {{set}}",
     "lang_setting_cwtext": "Texto predeterminado de advertencia de contenido: {{set}}",

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

@@ -5,7 +5,7 @@
   "no": "No",
   "none": "Ninguno",
   "show": "Mostrar",
-  "hide": "Hide",
+  "hide": "Ocultar",
   "default": "Predeterminado",
   "change": "Cambiar",
   "select": "Seleccionar",
@@ -24,10 +24,11 @@
   "nativenotf": "Notificación nativa",
   "nnwarn": "Esto no funciona en la compilación portátil para Windows.",
   "nntest": "Prueba de notificación",
-  "minwidth": "Ancho mínimo de las columnas",
+  "width": "Width of columns",
-  "minwidthwarn": "La barra de desplazamiento se mostrará cuando el tamaño de la ventana sea mayor que el de las columnas.",
+  "widthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
   "fixwidth": "Ancho mínimo del explorador de TweetDeck",
   "fixwidthwarn": "",
+  "margin": "Margin between timelines",
   "above": "por encima",
   "font": "Tipografía",
   "fontwarn": "Seleccioná tu tipografía favorita (sólo para Windows y macOS)",
@@ -36,26 +37,33 @@
   "savefolderwarn": "TheDesk usa esta configuración para guardar imágenes en general y capturas de pantallas.",
   "useragent": "Cadena de agente de usuario",
   "useragentWarn": "Reiniciar cuando se cambie",
-  "frame": "Window frame",
+  "frame": "Marco de ventana",
-  "frameWarn": "If 'off', the window looks cool.",
+  "frameWarn": "Si está 'desactivado', la ventana se ve piola.",
-  "downloadWin": "Versioning(o Windows downloader)",
+  "downloadWin": "Versión (o Descargador de Windows)",
   "absolute": "valor absoluto",
-  "srcUrl": "Search engine",
+  "srcUrl": "Motor de búsqueda",
-  "srcUrlWarn": "{q} will be replaced to query.",
+  "srcUrlWarn": "{q} será reemplazado a la consulta.",
   "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…",
+  "use": "Use this",
-  "modal": "Fondo de modos",
+  "copyFrom": "Copy from",
-  "bottom": "Fondo de barra inferior",
+  "bg": "Background color",
-  "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",
   "accent": "Fondo de retoots",
+  "modal": "Fondo de modos",
+  "modalFooter": "Background of modal window's footer",
+  "thirdColor": "Backgroud of tag buttons, etc(near to Background)",
+  "forthColor": "Title bar(same scheme to Background)",
+  "bottom": "Fondo de barra inferior",
+  "emphasized": "Emphasized toot's background",
+  "postbox": "Fondo de caja de publicación y menú",
+  "active": "Fondo, botones de advertencia de contenido…",
+  "selected": "Background of selected with arrow keys",
+  "selectedWithShare": "Background of selected with arrow keys(boosted toots)",
   "add_new": "Agregar nuevo",
   "name": "Nombre",
   "desc": "Acerca de este tema",
@@ -167,15 +175,15 @@
   "linkwarn": "TheDesk guarda tus datos en el servidor thedesk.top.",
   "connect": "Conectar",
   "disconnect": "Desconectar",
-  "lastFmWarn": "User name...(empty to disconnect) You cannot hide your recent play log at last.fm privacy settings.",
+  "lastFmWarn": "Nombre de usuario...(deje vacío para desconectarse) No puede ocultar su registro de reproducción reciente en la configuración de privacidad de last.fm.",
   "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",
-  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
+  "searchArtwork": "Si la canción no tiene ilustraciones, se completará automáticamente (macOS)",
-  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
+  "searchArtworkWarn": "Si estás escuchando una canción sin ilustraciones, se conseguirá una que se vea bien desde la API. Si no te gusta la ilustración completada, puedes hacer clic derecho en ella para eliminarla.",
   "tts": "Configuración de TTS (texto hablado)",
   "bouyomi": "Conectar BouyomiChan",
   "bouyomiWarn": "Requiere: Plugin WebSocket de BouyomiChan",

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

@@ -130,7 +130,7 @@
     "notf": "Notifications",
     "bookmark": "Bookmarks",
     "showThisTL": "Show this TL:",
-    "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
+    "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>).",
     "add": "Add",
     "search": "Search",
     "sortSet": "Sort",

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

@@ -131,13 +131,17 @@
     "lang_layout_linkana": "Auto Link Analyzer",
     "lang_layout_linkanades": "Auto link analyzer",
     "lang_layout_tts": "Text to speech ",
-    "lang_layout_reconnect": "Reload this column",
+    "lang_layout_reconnect": "Reload",
     "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_webviewmode": "Prefer WebView",
-    "lang_excluded": "Excluded type of notification",
+    "lang_layout_excluded": "Excluded type of notification",
-    "lang_layout_excludingbt": "Show BT mode(OFF/Exclude BT/Only BT)",
+    "lang_layout_mention": "Mentions",
+    "lang_layout_fav": "Favourites",
+    "lang_layout_bt": "Boosts",
+    "lang_layout_poll": "Polls",
+    "lang_layout_excludingbt": "Show BT mode",
     "lang_layout_leftFold": "Stack to the left",
     "lang_layout_leftUnfold": "Dock on the right",
     "lang_layout_deleteColumn": "Delete this column",
@@ -222,6 +226,7 @@
     "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
     "lang_parse_hidden": "Unvisible quoted toot",
+    "lang_parse_disconnected": "Streaming has been disconnected(retry after 3s)",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",
     "lang_misskeyparse_reaction": "Reaction",
@@ -236,6 +241,7 @@
     "lang_misskeyparse_reacted": " reacted your following post.",
     "lang_setting_time": "Time format:{{set}}",
     "lang_setting_theme": "Theme:{{set}}",
+    "lang_setting_compat": "Compatible",
     "lang_setting_nsfw": "Sensitive media:{{set}}",
     "lang_setting_cw": "CW:{{set}}",
     "lang_setting_cwtext": "Default CW text:{{set}}",

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

@@ -24,10 +24,11 @@
   "nativenotf": "Notificación nativa",
   "nnwarn": "Esto no funciona en la versión portable para Windows.",
   "nntest": "Prueba de notificación",
-  "minwidth": "Ancho mínimo de columnas",
+  "width": "Width of columns",
-  "minwidthwarn": "La barra de desplazamiento se mostrará cuando el tamaño de la ventana sea mayor que el de las columnas.",
+  "widthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
   "fixwidth": "Ancho mínimo del navegador TweetDeck",
   "fixwidthwarn": "",
+  "margin": "Margin between timelines",
   "above": "arriba",
   "font": "Fuente",
   "fontwarn": "Select your favorite font to 'Select'(Windows/ macOS only)",
@@ -46,16 +47,23 @@
   "customtheme": "Editar y añadir temas personalizados",
   "customthemeDirection": "Esquema de colores",
   "advanced": "Opciones avanzadas (6 colores adicionales)",
-  "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.",
+  "advancedWarn": "",
-  "active": "Background of Show or CW buttons, selected options...",
+  "use": "Use this",
-  "modal": "Background of modals",
+  "copyFrom": "Copy from",
-  "bottom": "Background of bottom bar",
+  "bg": "Background color",
-  "postbox": "Background of post box and menu",
+  "subcolor": "Distinguishable from background",
-  "subcolor": "Subcolor, has harmony with secondary color",
-  "primary": "Background color",
-  "secondarycolor": "Background of components",
   "text": "Text color",
   "accent": "Background of boosts",
+  "modal": "Background of modal window",
+  "modalFooter": "Background of modal window's footer",
+  "thirdColor": "Backgroud of tag buttons, etc(near to Background)",
+  "forthColor": "Title bar(same scheme to Background)",
+  "bottom": "Background of menu-bar at bottom of window",
+  "emphasized": "Emphasized toot's background",
+  "postbox": "Background of post-box and menu",
+  "active": "Background of 'active' elements",
+  "selected": "Background of selected with arrow keys",
+  "selectedWithShare": "Background of selected with arrow keys(boosted toots)",
   "add_new": "Add new",
   "name": "Name",
   "desc": "About this theme",
@@ -101,8 +109,8 @@
   "or": "or",
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
-  "ticker": "Enable #InstanceTicker",
+  "ticker": "Enable OpenSticker",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://github.com/MiyonMiyon/InstanceTicker_List\">About #InstanceTicker</a> (c)2018-2020 MiyonMiyon. Released under the MIT License.",
+  "tickerwarn": "Show the instance name and favicon of tooters <a href=\"https://opensticker.0px.io\">About OpenSticker</a>",
   "animation": "Animation of timelines",
   "markers": "Markers(mark as read) on HTL and notifications",
   "markerswarn": "Mastodon 3.0~. Shared on WebUI and third-party supported clients.",

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

@@ -130,7 +130,7 @@
     "notf": "Notifications",
     "bookmark": "Bookmarks",
     "showThisTL": "Show this TL:",
-    "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
+    "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>).",
     "add": "Add",
     "search": "Search",
     "sortSet": "Sort",

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

@@ -131,13 +131,17 @@
     "lang_layout_linkana": "Auto Link Analyzer",
     "lang_layout_linkanades": "Auto link analyzer",
     "lang_layout_tts": "Text to speech ",
-    "lang_layout_reconnect": "Reload this column",
+    "lang_layout_reconnect": "Reload",
     "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_webviewmode": "Prefer WebView",
-    "lang_excluded": "Excluded type of notification",
+    "lang_layout_excluded": "Excluded type of notification",
-    "lang_layout_excludingbt": "Show BT mode(OFF/Exclude BT/Only BT)",
+    "lang_layout_mention": "Mentions",
+    "lang_layout_fav": "Favourites",
+    "lang_layout_bt": "Boosts",
+    "lang_layout_poll": "Polls",
+    "lang_layout_excludingbt": "Show BT mode",
     "lang_layout_leftFold": "Stack to the left",
     "lang_layout_leftUnfold": "Dock on the right",
     "lang_layout_deleteColumn": "Delete this column",
@@ -222,6 +226,7 @@
     "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
     "lang_parse_hidden": "Unvisible quoted toot",
+    "lang_parse_disconnected": "Streaming has been disconnected(retry after 3s)",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",
     "lang_misskeyparse_reaction": "Reaction",
@@ -236,6 +241,7 @@
     "lang_misskeyparse_reacted": " reacted your following post.",
     "lang_setting_time": "Time format:{{set}}",
     "lang_setting_theme": "Theme:{{set}}",
+    "lang_setting_compat": "Compatible",
     "lang_setting_nsfw": "Sensitive media:{{set}}",
     "lang_setting_cw": "CW:{{set}}",
     "lang_setting_cwtext": "Default CW text:{{set}}",

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

@@ -24,10 +24,11 @@
   "nativenotf": "Native notification",
   "nnwarn": "This does not work on Windows Portable ver.",
   "nntest": "Notification test",
-  "minwidth": "Minimum width of columns",
+  "width": "Width of columns",
-  "minwidthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
+  "widthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
   "fixwidth": "Minimum width of TweetDeck browser",
   "fixwidthwarn": "",
+  "margin": "Margin between timelines",
   "above": "above",
   "font": "Font",
   "fontwarn": "Select your favorite font to 'Select'(Windows/ macOS only)",
@@ -43,19 +44,26 @@
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",
   "themeSel": "Select theme",
-  "customtheme": "Edit and add custom themes",
+  "customtheme": "Edit and add themes",
   "customthemeDirection": "Color scheme",
-  "advanced": "Advanced options(6 additional colors)",
+  "advanced": "Advanced options",
-  "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.",
+  "advancedWarn": "",
-  "active": "Background of Show or CW buttons, selected options...",
+  "use": "Use this",
-  "modal": "Background of modals",
+  "copyFrom": "Copy from",
-  "bottom": "Background of bottom bar",
+  "bg": "Background color",
-  "postbox": "Background of post box and menu",
+  "subcolor": "Distinguishable from background",
-  "subcolor": "Subcolor, has harmony with secondary color",
-  "primary": "Background color",
-  "secondarycolor": "Background of components",
   "text": "Text color",
   "accent": "Background of boosts",
+  "modal": "Background of modal window",
+  "modalFooter": "Background of modal window's footer",
+  "thirdColor": "Backgroud of tag buttons, etc(near to Background)",
+  "forthColor": "Title bar(same scheme to Background)",
+  "bottom": "Background of menu-bar at bottom of window",
+  "emphasized": "Emphasized toot's background",
+  "postbox": "Background of post-box and menu",
+  "active": "Background of 'active' elements",
+  "selected": "Background of selected with arrow keys",
+  "selectedWithShare": "Background of selected with arrow keys(boosted toots)",
   "add_new": "Add new",
   "name": "Name",
   "desc": "About this theme",
@@ -101,8 +109,8 @@
   "or": "or",
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
-  "ticker": "Enable #InstanceTicker",
+  "ticker": "Enable OpenSticker",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://github.com/MiyonMiyon/InstanceTicker_List\">About #InstanceTicker</a> (c)2018-2020 MiyonMiyon. Released under the MIT License.",
+  "tickerwarn": "Show the instance name and favicon of tooters <a href=\"https://opensticker.0px.io\">About OpenSticker</a>",
   "animation": "Animation of timelines",
   "markers": "Markers(mark as read) on HTL and notifications",
   "markerswarn": "Mastodon 3.0~. Shared on WebUI and third-party supported clients.",

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

@@ -130,7 +130,7 @@
     "notf": "Notifications",
     "bookmark": "Bookmarks",
     "showThisTL": "Show this TL:",
-    "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
+    "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>).",
     "add": "Add",
     "search": "Search",
     "sortSet": "Sort",

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

@@ -136,8 +136,12 @@
     "lang_layout_nodata": "[No data]<br>F5/⌘+R to reload",
     "lang_layout_dm": "Message direct",
     "lang_layout_webviewmode": "Prefer WebView",
-    "lang_excluded": "Excluded type of notification",
+    "lang_layout_excluded": "Excluded type of notification",
-    "lang_layout_excludingbt": "Show BT mode(OFF/Exclude BT/Only BT)",
+    "lang_layout_mention": "Mentions",
+    "lang_layout_fav": "Favourites",
+    "lang_layout_bt": "Boosts",
+    "lang_layout_poll": "Polls",
+    "lang_layout_excludingbt": "Show BT mode",
     "lang_layout_leftFold": "Stack to the left",
     "lang_layout_leftUnfold": "Dock on the right",
     "lang_layout_deleteColumn": "Delete this column",
@@ -222,6 +226,7 @@
     "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
     "lang_parse_hidden": "Unvisible quoted toot",
+    "lang_parse_disconnected": "Streaming has been disconnected(retry after 3s)",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",
     "lang_misskeyparse_reaction": "Réaction",
@@ -236,6 +241,7 @@
     "lang_misskeyparse_reacted": " reacted your following post.",
     "lang_setting_time": "Time format:{{set}}",
     "lang_setting_theme": "Thème : {{set}}",
+    "lang_setting_compat": "Compatible",
     "lang_setting_nsfw": "NSFW:{{set}}",
     "lang_setting_cw": "CW:{{set}}",
     "lang_setting_cwtext": "Default CW text:{{set}}",

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

@@ -24,10 +24,11 @@
   "nativenotf": "Native notification",
   "nnwarn": "This does not work on Windows Portable ver.",
   "nntest": "Notification test",
-  "minwidth": "Minimam width of columns",
+  "width": "Width of columns",
-  "minwidthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
+  "widthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
   "fixwidth": "Minimum width of TweetDeck browser",
   "fixwidthwarn": "",
+  "margin": "Margin between timelines",
   "above": "above",
   "font": "Police de caractères",
   "fontwarn": "Select your favorite font to 'Select'",
@@ -43,19 +44,26 @@
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",
   "themeSel": "Select theme",
-  "customtheme": "Edit and add custom themes",
+  "customtheme": "Edit and add themes",
   "customthemeDirection": "Color scheme",
-  "advanced": "Advanced options(6 additional colors)",
+  "advanced": "Advanced options",
-  "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.",
+  "advancedWarn": "",
-  "active": "Background of Show or CW buttons, selected options...",
+  "use": "Use this",
-  "modal": "Background of modals",
+  "copyFrom": "Copy from",
-  "bottom": "Background of bottom bar",
+  "bg": "Background color",
-  "postbox": "Background of post box and menu",
+  "subcolor": "Distinguishable from background",
-  "subcolor": "Subcolor, has harmony with secondary color",
-  "primary": "Background color",
-  "secondarycolor": "Background of components",
   "text": "Text color",
   "accent": "Background of boosts",
+  "modal": "Background of modal window",
+  "modalFooter": "Background of modal window's footer",
+  "thirdColor": "Backgroud of tag buttons, etc(near to Background)",
+  "forthColor": "Title bar(same scheme to Background)",
+  "bottom": "Background of menu-bar at bottom of window",
+  "emphasized": "Emphasized toot's background",
+  "postbox": "Background of post-box and menu",
+  "active": "Background of 'active' elements",
+  "selected": "Background of selected with arrow keys",
+  "selectedWithShare": "Background of selected with arrow keys(boosted toots)",
   "add_new": "Add new",
   "name": "Name",
   "desc": "About this theme",
@@ -101,7 +109,7 @@
   "or": "ou",
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
-  "ticker": "Enable #InstanceTicker",
+  "ticker": "Enable OpenSticker",
   "tickerwarn": "Show colorful stickers about tooters' server. <a href=\"https://cdn.weep.me/mastodon/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
   "animation": "Animation of timelines",
   "markers": "Markers(mark as read) on HTL and notifications",

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

@@ -130,7 +130,7 @@
     "notf": "Notifications",
     "bookmark": "Bookmarks",
     "showThisTL": "Show this TL:",
-    "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
+    "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>).",
     "add": "Add",
     "search": "Search",
     "sortSet": "Sort",

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

@@ -131,13 +131,17 @@
     "lang_layout_linkana": "Auto Link Analyzer",
     "lang_layout_linkanades": "Auto link analyzer",
     "lang_layout_tts": "Text to speech ",
-    "lang_layout_reconnect": "Reload this column",
+    "lang_layout_reconnect": "Reload",
     "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_webviewmode": "Prefer WebView",
-    "lang_excluded": "Excluded type of notification",
+    "lang_layout_excluded": "Excluded type of notification",
-    "lang_layout_excludingbt": "Show BT mode(OFF/Exclude BT/Only BT)",
+    "lang_layout_mention": "Mentions",
+    "lang_layout_fav": "Favourites",
+    "lang_layout_bt": "Boosts",
+    "lang_layout_poll": "Polls",
+    "lang_layout_excludingbt": "Show BT mode",
     "lang_layout_leftFold": "Stack to the left",
     "lang_layout_leftUnfold": "Dock on the right",
     "lang_layout_deleteColumn": "Delete this column",
@@ -222,6 +226,7 @@
     "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
     "lang_parse_hidden": "Unvisible quoted toot",
+    "lang_parse_disconnected": "Streaming has been disconnected(retry after 3s)",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",
     "lang_misskeyparse_reaction": "Reaction",
@@ -236,6 +241,7 @@
     "lang_misskeyparse_reacted": " reacted your following post.",
     "lang_setting_time": "Time format:{{set}}",
     "lang_setting_theme": "Theme:{{set}}",
+    "lang_setting_compat": "Compatible",
     "lang_setting_nsfw": "Sensitive media:{{set}}",
     "lang_setting_cw": "CW:{{set}}",
     "lang_setting_cwtext": "Default CW text:{{set}}",

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

@@ -24,10 +24,11 @@
   "nativenotf": "Native notification",
   "nnwarn": "This does not work on Windows Portable ver.",
   "nntest": "Notification test",
-  "minwidth": "Minimum width of columns",
+  "width": "Width of columns",
-  "minwidthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
+  "widthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
   "fixwidth": "Minimum width of TweetDeck browser",
   "fixwidthwarn": "",
+  "margin": "Margin between timelines",
   "above": "above",
   "font": "Font",
   "fontwarn": "Select your favorite font to 'Select'(Windows/ macOS only)",
@@ -43,19 +44,26 @@
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",
   "themeSel": "Select theme",
-  "customtheme": "Edit and add custom themes",
+  "customtheme": "Edit and add themes",
   "customthemeDirection": "Color scheme",
-  "advanced": "Advanced options(6 additional colors)",
+  "advanced": "Advanced options",
-  "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.",
+  "advancedWarn": "",
-  "active": "Background of Show or CW buttons, selected options...",
+  "use": "Use this",
-  "modal": "Background of modals",
+  "copyFrom": "Copy from",
-  "bottom": "Background of bottom bar",
+  "bg": "Background color",
-  "postbox": "Background of post box and menu",
+  "subcolor": "Distinguishable from background",
-  "subcolor": "Subcolor, has harmony with secondary color",
-  "primary": "Background color",
-  "secondarycolor": "Background of components",
   "text": "Text color",
   "accent": "Background of boosts",
+  "modal": "Background of modal window",
+  "modalFooter": "Background of modal window's footer",
+  "thirdColor": "Backgroud of tag buttons, etc(near to Background)",
+  "forthColor": "Title bar(same scheme to Background)",
+  "bottom": "Background of menu-bar at bottom of window",
+  "emphasized": "Emphasized toot's background",
+  "postbox": "Background of post-box and menu",
+  "active": "Background of 'active' elements",
+  "selected": "Background of selected with arrow keys",
+  "selectedWithShare": "Background of selected with arrow keys(boosted toots)",
   "add_new": "Add new",
   "name": "Name",
   "desc": "About this theme",
@@ -101,8 +109,8 @@
   "or": "or",
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
-  "ticker": "Enable #InstanceTicker",
+  "ticker": "Enable OpenSticker",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://github.com/MiyonMiyon/InstanceTicker_List\">About #InstanceTicker</a> (c)2018-2020 MiyonMiyon. Released under the MIT License.",
+  "tickerwarn": "Show the instance name and favicon of tooters <a href=\"https://opensticker.0px.io\">About OpenSticker</a>",
   "animation": "Animation of timelines",
   "markers": "Markers(mark as read) on HTL and notifications",
   "markerswarn": "Mastodon 3.0~. Shared on WebUI and third-party supported clients.",

app/view/make/language/hu-HU/index.json

@@ -130,7 +130,7 @@
     "notf": "Notifications",
     "bookmark": "Bookmarks",
     "showThisTL": "Show this TL:",
-    "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
+    "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>).",
     "add": "Add",
     "search": "Search",
     "sortSet": "Sort",

app/view/make/language/hu-HU/main.json

@@ -131,13 +131,17 @@
     "lang_layout_linkana": "Auto Link Analyzer",
     "lang_layout_linkanades": "Auto link analyzer",
     "lang_layout_tts": "Text to speech ",
-    "lang_layout_reconnect": "Reload this column",
+    "lang_layout_reconnect": "Reload",
     "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_webviewmode": "Prefer WebView",
-    "lang_excluded": "Excluded type of notification",
+    "lang_layout_excluded": "Excluded type of notification",
-    "lang_layout_excludingbt": "Show BT mode(OFF/Exclude BT/Only BT)",
+    "lang_layout_mention": "Mentions",
+    "lang_layout_fav": "Favourites",
+    "lang_layout_bt": "Boosts",
+    "lang_layout_poll": "Polls",
+    "lang_layout_excludingbt": "Show BT mode",
     "lang_layout_leftFold": "Stack to the left",
     "lang_layout_leftUnfold": "Dock on the right",
     "lang_layout_deleteColumn": "Delete this column",
@@ -222,6 +226,7 @@
     "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
     "lang_parse_hidden": "Unvisible quoted toot",
+    "lang_parse_disconnected": "Streaming has been disconnected(retry after 3s)",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",
     "lang_misskeyparse_reaction": "Reaction",
@@ -236,6 +241,7 @@
     "lang_misskeyparse_reacted": " reacted your following post.",
     "lang_setting_time": "Time format:{{set}}",
     "lang_setting_theme": "Theme:{{set}}",
+    "lang_setting_compat": "Compatible",
     "lang_setting_nsfw": "Sensitive media:{{set}}",
     "lang_setting_cw": "CW:{{set}}",
     "lang_setting_cwtext": "Default CW text:{{set}}",

app/view/make/language/hu-HU/setting.json

@@ -24,10 +24,11 @@
   "nativenotf": "Native notification",
   "nnwarn": "This does not work on Windows Portable ver.",
   "nntest": "Notification test",
-  "minwidth": "Minimum width of columns",
+  "width": "Width of columns",
-  "minwidthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
+  "widthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
   "fixwidth": "Minimum width of TweetDeck browser",
   "fixwidthwarn": "",
+  "margin": "Margin between timelines",
   "above": "above",
   "font": "Font",
   "fontwarn": "Select your favorite font to 'Select'(Windows/ macOS only)",
@@ -43,19 +44,26 @@
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",
   "themeSel": "Select theme",
-  "customtheme": "Edit and add custom themes",
+  "customtheme": "Edit and add themes",
   "customthemeDirection": "Color scheme",
-  "advanced": "Advanced options(6 additional colors)",
+  "advanced": "Advanced options",
-  "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.",
+  "advancedWarn": "",
-  "active": "Background of Show or CW buttons, selected options...",
+  "use": "Use this",
-  "modal": "Background of modals",
+  "copyFrom": "Copy from",
-  "bottom": "Background of bottom bar",
+  "bg": "Background color",
-  "postbox": "Background of post box and menu",
+  "subcolor": "Distinguishable from background",
-  "subcolor": "Subcolor, has harmony with secondary color",
-  "primary": "Background color",
-  "secondarycolor": "Background of components",
   "text": "Text color",
   "accent": "Background of boosts",
+  "modal": "Background of modal window",
+  "modalFooter": "Background of modal window's footer",
+  "thirdColor": "Backgroud of tag buttons, etc(near to Background)",
+  "forthColor": "Title bar(same scheme to Background)",
+  "bottom": "Background of menu-bar at bottom of window",
+  "emphasized": "Emphasized toot's background",
+  "postbox": "Background of post-box and menu",
+  "active": "Background of 'active' elements",
+  "selected": "Background of selected with arrow keys",
+  "selectedWithShare": "Background of selected with arrow keys(boosted toots)",
   "add_new": "Add new",
   "name": "Name",
   "desc": "About this theme",
@@ -101,8 +109,8 @@
   "or": "or",
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
-  "ticker": "Enable #InstanceTicker",
+  "ticker": "Enable OpenSticker",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://github.com/MiyonMiyon/InstanceTicker_List\">About #InstanceTicker</a> (c)2018-2020 MiyonMiyon. Released under the MIT License.",
+  "tickerwarn": "Show the instance name and favicon of tooters <a href=\"https://opensticker.0px.io\">About OpenSticker</a>",
   "animation": "Animation of timelines",
   "markers": "Markers(mark as read) on HTL and notifications",
   "markerswarn": "Mastodon 3.0~. Shared on WebUI and third-party supported clients.",

app/view/make/language/it-IT/acct.json

@@ -1,25 +1,25 @@
 {
-    "list": "List of accounts",
+    "list": "Elenco degli account",
-    "back": "Back",
+    "back": "Indietro",
-    "add": "Add an account",
+    "add": "Aggiungi un account",
-    "addAcct": "Fill the instance domain (like mastodon.social)",
+    "addAcct": "Riempi il dominio dell'istanza (come mastodon.social)",
-    "codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
+    "codesetupwarn": "Deseleziona per saltare il codice di pasiting.(login a Mastodon su Windows o macOS) (Consigliato: pcheck)",
-    "codesetup": "Code setup",
+    "codesetup": "Impostazione codice",
-    "mainacct": "Main an account",
+    "mainacct": "Principale un account",
-    "selacct": "Select an account",
+    "selacct": "Seleziona un account",
-    "codepastewarn": "Paste the code and close browser.",
+    "codepastewarn": "Incolla il codice e chiudi il browser.",
-    "codepaste": "Code",
+    "codepaste": "Codice",
-    "domain": "Domain",
+    "domain": "Dominio",
-    "connect": "Federated servers",
+    "connect": "Server federati",
     "toots": "Toots",
-    "users": "Users",
+    "users": "Utenti",
-    "users2": "users",
+    "users2": "utenti",
-    "safety": "Connection",
+    "safety": "Connessione",
-    "ver": "Mastodon version",
+    "ver": "Versione di Mastodon",
     "ko": "",
-    "thisismisskey": "Login as Misskey",
+    "thisismisskey": "Accedi come Misskey",
-    "misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
+    "misskeylogin": "Leggi <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> per accedere a Misskey.",
-    "nodata": "No data",
+    "nodata": "Nessun dato",
-    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)",
+    "accessTokenSetup": "Usa il token di accesso per effettuare il login (clicca dopo aver riempito non il codice ma il token di accesso nella scatola: Avanzato)",
-    "haveExported": "Having the exported file of TheDesk, click here to jump setting page"
+    "haveExported": "Avendo il file esportato di TheDesk, clicca qui per saltare la pagina di impostazione"
 }

app/view/make/language/it-IT/index.json

@@ -1,188 +1,188 @@
 {
-    "draghere": "Drag here to upload",
+    "draghere": "Trascina qui per caricare",
-    "close": "Close",
+    "close": "Chiudi",
-    "webSrc": "Search on Web",
+    "webSrc": "Cerca sul Web",
-    "tsSrc": "Search on tootsearch",
+    "tsSrc": "Cerca su tootsearch",
-    "showSelectProf": "Show profile of the selecting account",
+    "showSelectProf": "Mostra il profilo dell'account selezionato",
-    "closethisbox": "Close this box",
+    "closethisbox": "Chiudi questa casella",
     "toot": "Toot",
-    "post-new": "Post new",
+    "post-new": "Pubblica nuovo",
-    "nsfwDes": "Mark media as sensitive",
+    "nsfwDes": "Segna il media come sensibile",
-    "cwDes": "Hide text behind warning",
+    "cwDes": "Nascondi il testo dietro l'avviso",
-    "selfile": "Attach..",
+    "selfile": "Allegato..",
     "insertEmoji": "Emojis",
-    "schedule": "Scheduled toot",
+    "schedule": "Toot programmato",
-    "postat": "Post at",
+    "postat": "Posta a",
-    "scheduleWarn": "2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)",
+    "scheduleWarn": "2.7.0~ Intervallo minimo di tempo:5min(l'orologio sul server potrebbe non essere accurato.)",
-    "clearToot": "Clear toot box",
+    "clearToot": "Svuota casella toot",
-    "replyMode": "Reply",
+    "replyMode": "Rispondi",
     "no": "No",
-    "yes": "Yes",
+    "yes": "Sì",
-    "temp": "Attaching files",
+    "temp": "Allegare file",
-    "nothing": "None",
+    "nothing": "Nessuno",
-    "stamp": "Stamp",
+    "stamp": "Timbro",
-    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
+    "stampWarn": "Il tuo acct(aa@bb.cc) è stampato sul fondo destro dell'immagine caricata",
-    "vis": "Adjust status privacy",
+    "vis": "Regola la privacy di stato",
-    "cwtext": "Warning text",
+    "cwtext": "Testo dell'avviso",
-    "selectVis": "Adjust status privacy",
+    "selectVis": "Regola la privacy di stato",
     "publicJP": "",
     "unlistedJP": "",
     "privateJP": "",
-    "localJP": "Local only",
+    "localJP": "Solo locale",
-    "sectoot": "Secondary Toot",
+    "sectoot": "Radice Secondario",
     "directJP": "",
     "emojiWarn": "",
-    "emojiInsertWarn": "Some emojis are not able to be inserted.",
+    "emojiInsertWarn": "Alcuni emoji non possono essere inseriti.",
-    "refreshEmoji": "Refresh emojis list",
+    "refreshEmoji": "Aggiorna elenco emoji",
-    "closeThisBox": "Close this box",
+    "closeThisBox": "Chiudi questa casella",
-    "showThisEmoji": " are shown.",
+    "showThisEmoji": " sono mostrati.",
-    "customEmoji": "Custom emojis",
+    "customEmoji": "Emoji personalizzate",
-    "peopleEmoji": "Emojis of people",
+    "peopleEmoji": "Emoji delle persone",
-    "natureEmoji": "Emojis of nature",
+    "natureEmoji": "Emoji della natura",
-    "foodEmoji": "Emojis of foods",
+    "foodEmoji": "Emoji degli alimenti",
-    "activityEmoji": "Emojis of activities",
+    "activityEmoji": "Emoji delle attività",
-    "placeEmoji": "Emojis of places",
+    "placeEmoji": "Emoji di luoghi",
-    "thingsEmoji": "Emojis of tools",
+    "thingsEmoji": "Emoji di strumenti",
-    "symbolEmoji": "Emojis of symbols",
+    "symbolEmoji": "Emoji di simboli",
-    "flagsEmoji": "Emojis of flags",
+    "flagsEmoji": "Emoji delle bandiere",
-    "poll": "Poll",
+    "poll": "Sondaggio",
-    "pollDdisabled": "Polls: Disabled",
+    "pollDdisabled": "Sondaggi: Disabilitato",
-    "pollProvider": "Provider of Poll",
+    "pollProvider": "Fornitore del sondaggio",
-    "polluntil": "Hide 'votes' count until people vote it.",
+    "polluntil": "Nascondi il conteggio dei 'voti' fino al voto della gente.",
-    "choice": "Choice",
+    "choice": "Scelta",
-    "pollmulti": "Multiple select",
+    "pollmulti": "Selezione multipla",
-    "expires_in": "Expires in...(sec)",
+    "expires_in": "Scade in...(sec)",
-    "contextBefore": "Context before this toot",
+    "contextBefore": "Contesto prima di questo toot",
-    "thisToot": "This toot",
+    "thisToot": "Questo toot",
-    "contextAfter": "Context after this toot",
+    "contextAfter": "Contesto dopo questo toot",
-    "beforeLTL": "Local TL before this toot",
+    "beforeLTL": "TL locale prima di questo toot",
-    "beforeUTL": "User TL before this toot",
+    "beforeUTL": "TL utente prima di questo toot",
-    "afterLTL": "Local TL after this toot)",
+    "afterLTL": "TL locale dopo questo toot)",
-    "afterUTL": "User TL before this toot",
+    "afterUTL": "TL utente prima di questo toot",
-    "afterFTL": "Federated TL after this toot",
+    "afterFTL": "Federato TL dopo questo toot",
-    "favedPeople": "People who favourited it",
+    "favedPeople": "Persone che lo hanno favorito",
-    "btedPeople": "People who boosted it",
+    "btedPeople": "Persone che lo hanno potenziato",
-    "useOtherAcct1": "Use other account",
+    "useOtherAcct1": "Usa un altro account",
-    "useOtherAcct2": ":unfav and unBT are disabled.",
+    "useOtherAcct2": ":unfav e unBT sono disabilitati.",
-    "btWithVis": "Boost with visibility",
+    "btWithVis": "Potenziamento con visibilità",
-    "reply": "Reply",
+    "reply": "Rispondi",
     "bt": "Boost",
-    "favRegist": "Favourite",
+    "favRegist": "Preferito",
-    "openBrowser": "Open in browser",
+    "openBrowser": "Apri nel browser",
-    "screenshot": "Take a screenshot",
+    "screenshot": "Cattura una schermata",
-    "copyURL": "Copy the URL",
+    "copyURL": "Copia l'URL",
-    "embed": "Embed",
+    "embed": "Incorpora",
     "toots": "Toots",
-    "follow": "Follow",
+    "follow": "Segui",
     "follower": "Follower",
-    "utlColumn": "Show as a column",
+    "utlColumn": "Mostra come colonna",
     "timeline": "Timeline",
     "operateOtherAcct": "Cross-account",
-    "list": "List",
+    "list": "Elenco",
-    "makeNew": "Save",
+    "makeNew": "Salva",
-    "blocks": "Blocks",
+    "blocks": "Blocchi",
-    "mutes": "Mutes",
+    "mutes": "Muti",
-    "block": "Block",
+    "block": "Blocca",
-    "mute": "Mute",
+    "mute": "Silenzia",
-    "domainBlock": "Domain block",
+    "domainBlock": "Blocco di dominio",
-    "editProf": "Edit profile",
+    "editProf": "Modifica profilo",
-    "change": "Save",
+    "change": "Salva",
-    "followReq": "Follow requests",
+    "followReq": "Segui le richieste",
-    "likeHimOrHer": "Resembling",
+    "likeHimOrHer": "Rassomigliante",
-    "endorse": "Feature on profile",
+    "endorse": "Caratteristica sul profilo",
-    "openinbrowser": "Open in browser",
+    "openinbrowser": "Apri nel browser",
-    "mainacct": "Set it an main account",
+    "mainacct": "Imposta un account principale",
-    "frc": "Suggest",
+    "frc": "Suggerisci",
-    "more": "More",
+    "more": "Altro",
-    "revoverJP": " to ",
+    "revoverJP": " a ",
-    "warnUseOtherAcct": "(Unable to unfollow)",
+    "warnUseOtherAcct": "(Impossibile non seguire)",
     "revoverJPde": "",
-    "or": "or",
+    "or": "o",
-    "openProf": "Show profile",
+    "openProf": "Mostra profilo",
-    "warnListRegist": "Follow to add this user to lists.",
+    "warnListRegist": "Segui per aggiungere questo utente alle liste.",
-    "blockDomain": "Add blocking domain",
+    "blockDomain": "Aggiungi dominio di blocco",
-    "name": "Display name",
+    "name": "Nome visualizzato",
-    "note": "Note",
+    "note": "Nota",
-    "editProfImg": "Change avataor",
+    "editProfImg": "Cambia avataor",
-    "editHeader": "Change header image",
+    "editHeader": "Cambia immagine intestazione",
-    "blocked": "You are blocked. Why?",
+    "blocked": "Sei bloccato. Perché?",
-    "likeUserDes": "Get people resembling this user.",
+    "likeUserDes": "Fai rassomigliare a questo utente.",
-    "get": "Get",
+    "get": "Ottieni",
-    "historyBack": "Back",
+    "historyBack": "Indietro",
-    "empUser": "Emphasize this user",
+    "empUser": "Sottolinea questo utente",
-    "supportme": "Support TheDesk!",
+    "supportme": "Supporta TheDesk!",
-    "TheDeskDes": "TheDesk has no ad, you need no charge to unlock premium features. We need your friendly support!",
+    "TheDeskDes": "TheDesk non ha annunci, non hai bisogno di alcun costo per sbloccare le funzioni premium. Abbiamo bisogno del tuo supporto amichevole!",
-    "PatreonSupport": "Support on Patreon",
+    "PatreonSupport": "Sostegno su Patreon",
-    "PixivSupport": "Support on Pixiv FANBOX",
+    "PixivSupport": "Supporto su Pixiv FANBOX",
-    "AWLSupport": "Amazon Wish List",
+    "AWLSupport": "Lista Dei Desideri Amazon",
-    "SendAmazonGift1": "Give me Amazon Gift Card:",
+    "SendAmazonGift1": "Dammi Amazon Gift Card:",
     "SendAmazonGift2": "",
-    "monthly": "Monthly",
+    "monthly": "Mensile",
-    "once": "Once",
+    "once": "Una Volta",
-    "local": "Local",
+    "local": "Locale",
-    "localMedia": "Local(Media)",
+    "localMedia": "Locale(Media)",
-    "home": "Home",
+    "home": "Principale",
-    "fed": "Federated",
+    "fed": "Federato",
-    "fedMedia": "Federated(Media)",
+    "fedMedia": "Federato(Media)",
-    "dm": "Direct Message",
+    "dm": "Messaggio Diretto",
-    "integratedTLDes": "Integrated(Local/Home)",
+    "integratedTLDes": "Integrato(Locale/Principale)",
-    "localPlusDes": "LTL+Reply+BT",
+    "localPlusDes": "LTL+Rispondi+BT",
-    "notf": "Notifications",
+    "notf": "Notifiche",
-    "bookmark": "Bookmarks",
+    "bookmark": "Segnalibri",
-    "showThisTL": "Show this TL:",
+    "showThisTL": "Mostra questo TL:",
-    "webviewWarn": "TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
+    "webviewWarn": "TweetDeck con TJDeck personalizzato (<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>).",
-    "add": "Add",
+    "add": "Aggiungi",
-    "search": "Search",
+    "search": "Cerca",
-    "sortSet": "Sort",
+    "sortSet": "Ordina",
-    "selectAcct": "Account(Scroll to show all)",
+    "selectAcct": "Account(Scorri per mostrare tutto)",
-    "listLocale": "List",
+    "listLocale": "Elenco",
-    "filterWord": "Filtering words",
+    "filterWord": "Filtrare parole",
-    "degree": "Filter contexts",
+    "degree": "Filtra contesti",
-    "conver": "Conversations",
+    "conver": "Conversazioni",
-    "prof": "Profiles",
+    "prof": "Profili",
-    "option": "Options",
+    "option": "Opzioni",
-    "matchWord": "Whole word",
+    "matchWord": "Intera parola",
-    "warnMatchWord": "Nice for Latin language",
+    "warnMatchWord": "Bello per la lingua latina",
-    "except": "Drop instead of hide",
+    "except": "Rilascia invece di nascondere",
-    "exceptWorn": "Filtered toots will disappear irreversibly, even if filter is later removed",
+    "exceptWorn": "I toot filtrati scompariranno irreversibilmente, anche se il filtro viene rimosso in seguito",
-    "avalableBefore": "Expire after",
+    "avalableBefore": "Scade dopo",
-    "warnAvBefore": "Unset or \"0\" means \"Never\"",
+    "warnAvBefore": "Azzera o \"0\" significa \"Mai\"",
-    "warnAvBefore2": "This value may contain some error",
+    "warnAvBefore2": "Questo valore può contenere qualche errore",
-    "unlimited": "Never",
+    "unlimited": "Mai",
-    "days": "day(s)",
+    "days": "giorno(i)",
-    "hours": "hour(s)",
+    "hours": "ora(e)",
-    "mins": "minute(s)",
+    "mins": "minuto(i)",
-    "secs": "second(s)",
+    "secs": "secondo(i)",
-    "warnOnIntegratedTL": "Integrated TL/Plus TL will hide both Home-filtering words and Local-filtering words.",
+    "warnOnIntegratedTL": "TL/Plus TL integrato nasconderà sia le parole di filtraggio Home-che le parole di filtraggio locale.",
-    "helloTheDesk": "Internal error: please clear all data(at setting page) <b>All data will be deleted.</b>",
+    "helloTheDesk": "Errore interno: cancella tutti i dati (alla pagina di impostazione) <b>Tutti i dati verranno eliminati.</b>",
-    "addColumn": "Add a column",
+    "addColumn": "Aggiungi colonna",
-    "sortColumns": "Sort",
+    "sortColumns": "Ordina",
-    "acctMan": "Account Manager",
+    "acctMan": "Gestione account",
-    "filter": "Filter",
+    "filter": "Filtro",
-    "setting": "Preferences",
+    "setting": "Preferenze",
-    "reverse": "Toot button layout reverse",
+    "reverse": "Layout pulsante Toot inverso",
-    "f5": "Reload TL",
+    "f5": "Ricarica TL",
-    "nanoDes": "The smallest Mastodon,",
+    "nanoDes": "Il più piccolo Mastodon,",
-    "verTips": "Version",
+    "verTips": "Versione",
-    "clockTips": "Clock",
+    "clockTips": "Orologio",
-    "ramTips": "RAM status",
+    "ramTips": "Stato della RAM",
-    "changeTips": "Change Tips",
+    "changeTips": "Cambia Suggerimenti",
-    "helpAndLogs": "Help & Log",
+    "helpAndLogs": "Aiuto & Log",
-    "help": "Help",
+    "help": "Aiuto",
-    "contactwithlog": "If you tell me bugs(not working or something) with this log, I can detect what is wrong more easily.",
+    "contactwithlog": "Se mi dici dei bug (non funzionanti o qualcosa) con questo registro, posso rilevare cosa è sbagliato più facilmente.",
-    "about": "About TheDesk",
+    "about": "Informazioni Su TheDesk",
-    "hereAddColumns": "<- Add TL",
+    "hereAddColumns": "<- Aggiungi TL",
-    "foundBug": "I found a bug",
+    "foundBug": "Ho trovato un bug",
-    "show": "Show",
+    "show": "Mostra",
     "directory": "Directory",
-    "active": "Recently active",
+    "active": "Recentemente attivo",
-    "newcomer": "New arrivals",
+    "newcomer": "Nuovi arrivi",
-    "local_only": "Local only",
+    "local_only": "Solo locale",
     "menu": "Menu",
-    "demoBottomBtns": "Welcome guide",
+    "demoBottomBtns": "Guida di benvenuto",
-    "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.",
+    "lookAtBottom": "Guarda la parte inferiore di questa finestra. Ecco alcuni suggerimenti al riguardo.",
-    "acctManDesc": "Add more accounts and logout them.",
+    "acctManDesc": "Aggiungere più account e disconnetterli.",
-    "settingDesc": "Many and many preferences here. You will couldn't check it all!",
+    "settingDesc": "Molte e molte preferenze qui. Non è stato possibile controllare tutto!",
-    "nanoDescPlus": "Mini window client(experimental)",
+    "nanoDescPlus": "Mini window client (sperimentale)",
-    "menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
+    "menuDesc": "Tutte le registrazioni quotidiane TheDesk e Mastodon come <b>aggiungi e ordina colonne</b>, <b>lista e controllo filtro</b>."
 }

app/view/make/language/it-IT/main.json

@@ -1,21 +1,21 @@
 {
-    "language": "en",
+    "language": "it",
     "lang_toot": "Toot",
-    "lang_there": "Yes",
+    "lang_there": "Sì",
-    "lang_nothing": "None",
+    "lang_nothing": "Nessuno",
-    "lang_yesno": "Yes",
+    "lang_yesno": "Sì",
     "lang_no": "No",
-    "lang_progress": "Wait...",
+    "lang_progress": "Attendere...",
-    "lang_edit": "Edit",
+    "lang_edit": "Modifica",
-    "lang_del": "Delete",
+    "lang_del": "Elimina",
-    "lang_add": "Add",
+    "lang_add": "Aggiungi",
-    "lang_fatalerroroccured": "Error",
+    "lang_fatalerroroccured": "Errore",
-    "lang_speech": "Google US English",
+    "lang_speech": "Google US Inglese",
-    "lang_lang": "Language",
+    "lang_lang": "Lingua",
-    "lang_langlocale": "English",
+    "lang_langlocale": "Italiano",
-    "lang_back": "Back",
+    "lang_back": "Indietro",
-    "lang_set": "Set",
+    "lang_set": "Imposta",
-    "lang_langadd": "Translate TheDesk to other languages or proofread TheDesk on <a href=\"https://github.com/cutls/TheDesk\" target=\"_blank\">GitHub</a>. TheDesk needs your help.",
+    "lang_langadd": "Traduci TheDesk in altre lingue o rileggi TheDesk su <a href=\"https://github.com/cutls/TheDesk\" target=\"_blank\">GitHub</a>. TheDesk ha bisogno del tuo aiuto.",
     "lang_time_prefixAgo": null,
     "lang_time_prefixFromNow": null,
     "lang_time_suffixAgo": null,
@@ -27,253 +27,259 @@
     "lang_time_hour": "1 h",
     "lang_time_hours": "%d h",
     "lang_time_day": "1 d",
-    "lang_time_days": "%d d",
+    "lang_time_days": "%d g",
-    "lang_time_month": "1 month",
+    "lang_time_month": "1 mese",
-    "lang_time_months": "%d months",
+    "lang_time_months": "%d mesi",
     "lang_time_year": "y",
     "lang_time_years": "%d y",
-    "lang_version_usever": "No update is found({{ver}})",
+    "lang_version_usever": "Nessun aggiornamento trovato({{ver}})",
-    "lang_version_skipver": "Update was ignored.",
+    "lang_version_skipver": "L'aggiornamento è stato ignorato.",
-    "lang_version_platform": "Do you want auto-updates?(users installed on Microsoft Store select 'No')",
+    "lang_version_platform": "Vuoi aggiornamenti automatici?(Gli utenti installati su Microsoft Store selezionano 'No')",
-    "lang_version_platform_linux": "Do you want auto-updates?(users installed on Snapcraft select 'No')",
+    "lang_version_platform_linux": "Vuoi aggiornamenti automatici?(utenti installati su Snapcraft seleziona 'No')",
-    "lang_version_platform_mac": "Do you want auto-updates?(Homebrew Cask users select 'No')",
+    "lang_version_platform_mac": "Vuoi aggiornamenti automatici?(Gli utenti di Cask ebrew selezionano 'No')",
-    "lang_login_noauth": "Show TL of unlogined accounts",
+    "lang_login_noauth": "Mostra TL degli account non registrati",
-    "lang_manager_info": "About this instance",
+    "lang_manager_info": "Informazioni su questa istanza",
-    "lang_manager_refresh": "Refresh",
+    "lang_manager_refresh": "Aggiorna",
-    "lang_manager_delete": "Logout",
+    "lang_manager_delete": "Esci",
-    "lang_manager_color": "Account Color",
+    "lang_manager_color": "Colore Account",
-    "lang_manager_confirm": "is about to logout. Continue?",
+    "lang_manager_confirm": "sta per uscire. Continuare?",
-    "lang_manager_mainAcct": "Done:choose main account",
+    "lang_manager_mainAcct": "Fatto:scegli l'account principale",
-    "lang_manager_def": "Default",
+    "lang_manager_def": "Predefinito",
-    "lang_manager_none": "None",
+    "lang_manager_none": "Nessuno",
-    "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
+    "lang_manager_godev": "Apri DevCenter di Misskey. Mostriamo anche un documento ufficiale da riferire.",
-    "lang_manager_logout": "Logout",
+    "lang_manager_logout": "Esci",
-    "lang_manager_maxChars": "Max chars of toots",
+    "lang_manager_maxChars": "Max caratteri dei toot",
-    "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
+    "lang_bbmd_misskey": "TheDesk considera \"@\" come risposta, ma mettere altri parametri. Non elencato su Mastodon significa Home su Misskey.",
-    "lang_emoji_get": "Get emojis",
+    "lang_emoji_get": "Ottieni emoji",
-    "lang_emoji_custom": "Custom emojis",
+    "lang_emoji_custom": "Emoji personalizzate",
-    "lang_defaultemojis_text": "Emojis about {{cat}}",
+    "lang_defaultemojis_text": "Emoji circa {{cat}}",
-    "lang_emoji_uncat": "Uncategorized",
+    "lang_emoji_uncat": "Senza categoria",
-    "lang_postimg_previewdis": "cannot preview",
+    "lang_postimg_previewdis": "impossibile visualizzare l'anteprima",
-    "lang_postimg_aftupload": "You cannot change accounts after uploading.",
+    "lang_postimg_aftupload": "Non puoi cambiare account dopo il caricamento.",
-    "lang_postimg_failupload": "Failed",
+    "lang_postimg_failupload": "Fallito",
-    "lang_postimg_delete": "Click to add description, right-click to delete this",
+    "lang_postimg_delete": "Fare clic per aggiungere la descrizione, fare clic col tasto destro per eliminare questo",
-    "lang_postimg_desc": "Description",
+    "lang_postimg_desc": "Descrizione",
-    "lang_postimg_leadContext": "right-click the thumbnail to delete this",
+    "lang_postimg_leadContext": "fare clic con il pulsante destro del mouse per eliminare",
-    "lang_post_syncDetail": "Upload media synchronously",
+    "lang_post_syncDetail": "Carica media in modo sincrono",
-    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
+    "lang_post_syncDetailText": "Fare clic sull'icona di ogni immagine per ottenere la miniatura. Se è possibile ottenere, i supporti caricati sono completamente elaborati.",
-    "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
+    "lang_post_tagTL": "Questo toot non contiene un tag predefinito. Questo toot non sarà mostrato su Local TL. Continuare?",
-    "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
+    "lang_post_tagVis": "Questo toot(non 'public') non è mostrato sul TL di questo tag.",
     "lang_post_cwtitle": "Auto CW Alert",
-    "lang_post_cwtxt": "You are about to post longer toot than you set.\nWarning text:",
+    "lang_post_cwtxt": "Stai per pubblicare un toot più lungo di quello impostato.\nTesto di avvertimento:",
-    "lang_post_btn1": "Cancel (will not post)",
+    "lang_post_btn1": "Annulla (non invierà)",
-    "lang_post_btn2": "Make text hidden automatically",
+    "lang_post_btn2": "Rendi il testo nascosto automaticamente",
-    "lang_post_btn3": "Continue to post",
+    "lang_post_btn3": "Continua a pubblicare",
-    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
+    "lang_post_unfinishedMedia": "Il server non ha finito di elaborare il tuo supporto. Riprova.",
-    "lang_post_retry": "Retry",
+    "lang_post_retry": "Riprova",
-    "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
+    "lang_status_favWarn": "Ci vorrà un miunte per preferire un toot remoto.",
-    "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
+    "lang_status_btWarn": "Ci vorrà un miunte per aumentare un toot remoto.",
-    "lang_status_follow": "Follow",
+    "lang_status_follow": "Segui",
-    "lang_status_unfollow": "Unfollow",
+    "lang_status_unfollow": "Non Segui",
-    "lang_status_block": "Block",
+    "lang_status_block": "Blocca",
-    "lang_status_unblock": "Unblock",
+    "lang_status_unblock": "Sblocca",
-    "lang_status_mute": "Mute",
+    "lang_status_mute": "Silenzia",
-    "lang_status_unmute": "Unmute",
+    "lang_status_unmute": "Riattiva",
-    "lang_status_redraftTitle": "Delete & redraft",
+    "lang_status_redraftTitle": "Elimina & riabbozza",
-    "lang_status_redraft": "Continue to delete & redraft? You lose statuses of this toot. This fanction may contain some bugs. Images of this toot will be deleted on older than Mastodon 2.4.1.",
+    "lang_status_redraft": "Continua a eliminare & riformulare? Perdi gli stati di questo toot. Questa fanteria può contenere alcuni bug. Le immagini di questo toot saranno cancellate su più vecchio di Mastodon 2.4.1.",
-    "lang_status_emphas": "'s toots are emphasized. Please reload after this action.",
+    "lang_status_emphas": "toots sono enfatizzati. Si prega di ricaricare dopo questa azione.",
-    "lang_status_unemphas": "'s toots are not emphasized. Please reload after this action.",
+    "lang_status_unemphas": "toots non sono enfatizzati. Si prega di ricaricare dopo questa azione.",
-    "lang_status_unendorse": "Not feature on profile",
+    "lang_status_unendorse": "Non è presente sul profilo",
-    "lang_status_endorse": "Feature on profile",
+    "lang_status_endorse": "Caratteristica sul profilo",
-    "lang_status_followers": "Followers",
+    "lang_status_followers": "Follower",
-    "lang_status_active": "Last status",
+    "lang_status_active": "Ultimo stato",
-    "lang_suggest_nodata": "Please get emojis list in order to show suggestion.",
+    "lang_suggest_nodata": "Si prega di ottenere l'elenco delle emoji per mostrare il suggerimento.",
-    "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
+    "lang_usetxtbox_reply": "Modalità di risposta. Ctrl+Maiusc+C per cancellare.",
-    "lang_cards_check": " check",
+    "lang_cards_check": " controlla",
-    "lang_cards_pip": "PiP mode",
+    "lang_cards_pip": "Modalità PiP",
     "lang_cards_trusted": "Trusted embed HTML by TheDesk(Twitter, nicovideo, YouTube, Spotify, twitcasing)",
-    "lang_cards_untrusted": "Untrusted embed HTML by TheDesk",
+    "lang_cards_untrusted": "HTML incorporato non fidato di TheDesk",
-    "lang_details_nodata": "No data",
+    "lang_details_nodata": "Nessun dato",
-    "lang_details_filtered": "Filtered toot",
+    "lang_details_filtered": "Radice filtrata",
-    "lang_details_embed": "Embed HTML is cliped.",
+    "lang_details_embed": "HTML incorporato è sotto la lente.",
-    "lang_details_url": "URL of this toot is cliped.",
+    "lang_details_url": "L'URL di questo toot è sotto la lente.",
-    "lang_details_txt": "Content of this toot is cliped.",
+    "lang_details_txt": "Il contenuto di questo toot è ritagliato.",
-    "lang_filter_nodata": "No data",
+    "lang_filter_nodata": "Nessun dato",
-    "lang_filter_errordegree": "Please check a context",
+    "lang_filter_errordegree": "Si prega di controllare un contesto",
-    "lang_list_nodata": "No data",
+    "lang_list_nodata": "Nessun dato",
-    "lang_list_show": "Show",
+    "lang_list_show": "Mostra",
-    "lang_list_users": "Users list",
+    "lang_list_users": "Elenco utenti",
-    "lang_list_nouser": "No users in this list.",
+    "lang_list_nouser": "Nessun utente in questa lista.",
-    "lang_list_add": "Add to the list",
+    "lang_list_add": "Aggiungi alla lista",
-    "lang_list_add_misskey": "(perhaps this user has been listed)",
+    "lang_list_add_misskey": "(forse questo utente è stato elencato)",
-    "lang_list_remove": "Remove from the list",
+    "lang_list_remove": "Rimuovi dalla lista",
-    "lang_notf_new": " new notifications",
+    "lang_notf_new": " nuove notifiche",
-    "lang_speech_refresh": "Save value about TTS config",
+    "lang_speech_refresh": "Salva valore sulla configurazione TTS",
-    "lang_src_ts": "chronological order",
+    "lang_src_ts": "ordine cronologico",
-    "lang_src_people": " people toot",
+    "lang_src_people": " toot di persone",
-    "lang_tags_always": "Always toots with ",
+    "lang_tags_always": "Sempre i toot con ",
-    "lang_tags_realtime": "Tag-stream toot",
+    "lang_tags_realtime": "Toot del Tag-stream",
     "lang_tags_tagunpin": "Unpin {{tag}}",
-    "lang_tags_unrealtime": "Disable TsT",
+    "lang_tags_unrealtime": "Disabilita TsT",
-    "lang_tags_tagwarn": "Auto complete {{tag}}, if toot without {{tag}}",
+    "lang_tags_tagwarn": "Completamento automatico di {{tag}}, se toot senza {{tag}}",
     "lang_tl_media": "Media",
-    "lang_tl_reconnect": "Reconnect to streaming API",
+    "lang_tl_reconnect": "Riconnetti all'API di streaming",
-    "lang_tl_postmarkers_title": "Process...",
+    "lang_tl_postmarkers_title": "Elabora...",
-    "lang_tl_postmarkers": "POST markers data. Please wait",
+    "lang_tl_postmarkers": "Dati dei marcatori POST. Attendere prego",
-    "lang_img_DLDone": "Downloaded:",
+    "lang_img_DLDone": "Scaricato:",
-    "lang_img_copyDone": "Copied: URL of this image",
+    "lang_img_copyDone": "Copiato: URL di questa immagine",
-    "lang_layout_gotop": "Go top of this column. When icon is red, this column cannot connect straming API. Please reload.",
+    "lang_layout_gotop": "Vai in cima a questa colonna. Quando l'icona è rossa, questa colonna non può collegare l'API di stringa. Si prega di ricaricare.",
-    "lang_layout_thisacct": "{{notf}} of this account",
+    "lang_layout_thisacct": "{{notf}} di questo account",
-    "lang_layout_delthis": "Remove this column",
+    "lang_layout_delthis": "Rimuovi questa colonna",
-    "lang_layout_setthis": "Preferences of this column",
+    "lang_layout_setthis": "Preferenze di questa colonna",
-    "lang_layout_mediafil": "Media filtering",
+    "lang_layout_mediafil": "Filtro multimediale",
-    "lang_layout_remoteOnly": "Remote only",
+    "lang_layout_remoteOnly": "Solo remoto",
-    "lang_layout_linkana": "Auto Link Analyzer",
+    "lang_layout_linkana": "Analizzatore Di Collegamenti Automatici",
-    "lang_layout_linkanades": "Auto link analyzer",
+    "lang_layout_linkanades": "Analizzatore di collegamenti automatici",
-    "lang_layout_tts": "Text to speech ",
+    "lang_layout_tts": "Testo a discorso ",
-    "lang_layout_reconnect": "Reload this column",
+    "lang_layout_reconnect": "Ricarica",
-    "lang_layout_headercolor": "Header color of this column",
+    "lang_layout_headercolor": "Colore intestazione di questa colonna",
-    "lang_layout_nodata": "[No data]<br>F5/⌘+R to reload",
+    "lang_layout_nodata": "[Nessun dato]<br>F5/<unk> +R per ricaricare",
-    "lang_layout_dm": "Direct Message",
+    "lang_layout_dm": "Messaggio Diretto",
-    "lang_layout_webviewmode": "Prefer WebView",
+    "lang_layout_webviewmode": "Preferisci WebView",
-    "lang_excluded": "Excluded type of notification",
+    "lang_layout_excluded": "Tipo di notifica escluso",
-    "lang_layout_excludingbt": "Show BT mode(OFF/Exclude BT/Only BT)",
+    "lang_layout_mention": "Menzioni",
-    "lang_layout_leftFold": "Stack to the left",
+    "lang_layout_fav": "Preferito",
-    "lang_layout_leftUnfold": "Dock on the right",
+    "lang_layout_bt": "Potenziamenti",
-    "lang_layout_deleteColumn": "Delete this column",
+    "lang_layout_poll": "Sondaggi",
-    "lang_layout_deleteColumnDesc": "Delete this column",
+    "lang_layout_excludingbt": "Mostra modalità BT",
-    "lang_layout_unread": "Unread",
+    "lang_layout_leftFold": "Pila a sinistra",
-    "lang_layout_tagManager": "Tag timeline manager",
+    "lang_layout_leftUnfold": "Aggancia a destra",
-    "lang_layout_announ": "Announcement: the counter is the number of your unread announcements. If not shown, it means announcements are all marked as read.",
+    "lang_layout_deleteColumn": "Elimina questa colonna",
-    "lang_sort_gothis": "Go to this column",
+    "lang_layout_deleteColumnDesc": "Elimina questa colonna",
-    "lang_sort_remthis": "Delete this column",
+    "lang_layout_unread": "Non Letta",
-    "lang_spotify_img": "Attach an album artwork",
+    "lang_layout_tagManager": "Gestore timeline tag",
-    "lang_spotify_imgno": "Not attach an album artwork",
+    "lang_layout_announ": "Annuncio: il contatore è il numero dei tuoi annunci non letti. Se non mostrato, significa che gli annunci sono tutti contrassegnati come letti.",
-    "lang_spotify_acct": "Connect TheDesk to Spotify",
+    "lang_sort_gothis": "Vai a questa colonna",
-    "lang_spotify_np": "Done:templete of NowPlaying",
+    "lang_sort_remthis": "Elimina questa colonna",
+    "lang_spotify_img": "Allega una copertina album",
+    "lang_spotify_imgno": "Non allegare una copertina album",
+    "lang_spotify_acct": "Collega TheDesk a Spotify",
+    "lang_spotify_np": "Fatto:templete of NowPlaying",
     "lang_setting_npprovide": "NowPlaying provider:{{set}}",
-    "lang_hisdata_frcreq": "Required Mastodon 2.4.3 and above",
+    "lang_hisdata_frcreq": "Mastodon richiesto 2.4.3 e oltre",
-    "lang_hisdata_frcwarn": "Unfollow accounts will be shown.",
+    "lang_hisdata_frcwarn": "Verranno mostrati gli account non seguenti.",
-    "lang_hisdata_taketime": "It will take 30s ~ several minutes",
+    "lang_hisdata_taketime": "Ci vorranno 30 ~ diversi minuti",
-    "lang_hisdata_notonmisskey": "Misskey is unable to request.",
+    "lang_hisdata_notonmisskey": "Misskey non è possibile richiedere.",
-    "lang_hisdata_key": "This user is proofed by {{set}}",
+    "lang_hisdata_key": "Questo utente è verificato da {{set}}",
-    "lang_showontl_movetxt": "This account was moved",
+    "lang_showontl_movetxt": "Questo account è stato spostato",
-    "lang_showontl_movebtn": "Continue on the new account",
+    "lang_showontl_movebtn": "Continua sul nuovo account",
     "lang_showontl_botacct": "[bot]",
-    "lang_showontl_followed": "Following you",
+    "lang_showontl_followed": "Seguendoti",
-    "lang_parse_request": "Follow request",
+    "lang_parse_request": "Segui la richiesta",
-    "lang_showontl_notf": "Notification ",
+    "lang_showontl_notf": "Notifica ",
-    "lang_showontl_domain": "Domain ",
+    "lang_showontl_domain": "Dominio ",
-    "lang_showontl_listwarn": "Follow to add this user to lists.",
+    "lang_showontl_listwarn": "Segui per aggiungere questo utente alle liste.",
-    "lang_showontl_verified": "This website is verified by owner at ",
+    "lang_showontl_verified": "Questo sito web è verificato dal proprietario a ",
-    "lang_status_requesting": "Requesting",
+    "lang_status_requesting": "Richiesta",
-    "lang_parse_mentioned": " replied to you",
+    "lang_parse_mentioned": " ti ha risposto",
-    "lang_parse_faved": " favourited your toot",
+    "lang_parse_faved": " favorito il tuo toot",
-    "lang_parse_bted": " boosted your toot",
+    "lang_parse_bted": " potenziato il tuo toot",
-    "lang_parse_btedsimple": " boosted",
+    "lang_parse_btedsimple": " potenziato",
-    "lang_parse_polled": "'s poll",
+    "lang_parse_polled": "del sondaggio",
-    "lang_parse_notftime": "Actioned at",
+    "lang_parse_notftime": "Aggiunto il",
-    "lang_parse_cwshow": "Show",
+    "lang_parse_cwshow": "Mostra",
-    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
+    "lang_parse_cwshow_acc": "Questo è un post con avviso di contenuto. fare clic per mostrare l'intero contenuto",
-    "lang_parse_fulltext": "Full size text:",
+    "lang_parse_fulltext": "Testo di dimensione completa:",
-    "lang_parse_autofold": "Auto folded",
+    "lang_parse_autofold": "Ripiegamento automatico",
-    "lang_parse_more": "More",
+    "lang_parse_more": "Altro",
-    "lang_parse_url": "URL Analyzer",
+    "lang_parse_url": "Analizzatore URL",
-    "lang_parse_tagTL": "Timeline of {{tag}}",
+    "lang_parse_tagTL": "Timeline di {{tag}}",
-    "lang_parse_tagtoot": "Toot with {{tag}}",
+    "lang_parse_tagtoot": "Toot con {{tag}}",
     "lang_parse_tagpin": "Pin {{tag}}",
-    "lang_parse_public": "Public",
+    "lang_parse_public": "Pubblico",
-    "lang_parse_unlisted": "Unlisted",
+    "lang_parse_unlisted": "Non Elencato",
-    "lang_parse_private": "Private",
+    "lang_parse_private": "Privato",
-    "lang_parse_direct": "Direct",
+    "lang_parse_direct": "Diretto",
-    "lang_parse_clickcopy": "Click to copy text of this toot",
+    "lang_parse_clickcopy": "Fare clic per copiare il testo di questo toot",
-    "lang_parse_clickcopyurl": "Click to copy URL of this toot",
+    "lang_parse_clickcopyurl": "Fare clic per copiare l'URL di questo toot",
-    "lang_parse_trans": "Translate to English",
+    "lang_parse_trans": "Traduci in inglese",
-    "lang_parse_replyto": "Reply to this toot",
+    "lang_parse_replyto": "Rispondi a questo toot",
-    "lang_parse_bt": "Boost this toot",
+    "lang_parse_bt": "Migliora questo toot",
-    "lang_parse_fav": "Favourite this toot",
+    "lang_parse_fav": "Preferito questo toot",
-    "lang_parse_quote": "Quote this toot",
+    "lang_parse_quote": "Citate questo toot",
-    "lang_parse_bookmark": "Bookmark this",
+    "lang_parse_bookmark": "Segnalibro questo",
-    "lang_parse_unbookmark": "Unbookmark this",
+    "lang_parse_unbookmark": "Deseleziona questo",
-    "lang_parse_del": "Delete this",
+    "lang_parse_del": "Elimina questo",
-    "lang_parse_pin": "Pin this",
+    "lang_parse_pin": "Pin questo",
-    "lang_parse_unpin": "Unpin this",
+    "lang_parse_unpin": "Sblocca questo",
-    "lang_parse_link": "Open in a browser",
+    "lang_parse_link": "Apri in un browser",
-    "lang_parse_det": "Details via your main account.",
+    "lang_parse_det": "Dettagli tramite il tuo account principale.",
-    "lang_parse_detail": "Details",
+    "lang_parse_detail": "Dettagli",
-    "lang_parse_redraft": "Delete & re-draft",
+    "lang_parse_redraft": "Elimina & ribozza",
-    "lang_parse_followed": "Followed you",
+    "lang_parse_followed": "Ti ha seguito",
-    "lang_parse_moved": "Moved to...",
+    "lang_parse_moved": "Spostato in...",
-    "lang_parse_clientop": "Operation of this client",
+    "lang_parse_clientop": "Funzionamento di questo client",
-    "lang_parse_clienttxt": " will be",
+    "lang_parse_clienttxt": " sarà",
-    "lang_parse_clientno": "done nothing",
+    "lang_parse_clientno": "niente di fatto",
-    "lang_parse_clientemp": "emphasized(/not emphasized)",
+    "lang_parse_clientemp": "sottolineato(/non sottolineato)",
-    "lang_parse_clientmute": "muted",
+    "lang_parse_clientmute": "silenziato",
-    "lang_parse_mute": " will be muted. You can remove on preferences.",
+    "lang_parse_mute": " sarà disattivato. Puoi rimuovere sulle preferenze.",
-    "lang_parse_voted": "(Voted)",
+    "lang_parse_voted": "(Votato)",
-    "lang_parse_myvote": "(My own poll)",
+    "lang_parse_myvote": "(Il mio sondaggio)",
-    "lang_parse_vote": "Vote",
+    "lang_parse_vote": "Voto",
-    "lang_parse_unvoted": "Show the result without voting",
+    "lang_parse_unvoted": "Mostra il risultato senza voto",
-    "lang_parse_endedvote": "Expired",
+    "lang_parse_endedvote": "Scaduto",
-    "lang_parse_people": "people",
+    "lang_parse_people": "persone",
-    "lang_parse_thread": "Show thread",
+    "lang_parse_thread": "Mostra thread",
-    "lang_parse_unknown": "Attached file",
+    "lang_parse_unknown": "File allegato",
-    "lang_parse_nsfw": "sensitive media",
+    "lang_parse_nsfw": "media sensibili",
-    "lang_parse_html": "Show embed HTML",
+    "lang_parse_html": "Mostra HTML incorporato",
-    "lang_parse_notffilter": "Show this user's notifications",
+    "lang_parse_notffilter": "Mostra le notifiche di questo utente",
-    "lang_parse_hidden": "Unvisible quoted toot",
+    "lang_parse_hidden": "Toot quotato non visibile",
+    "lang_parse_disconnected": "Lo streaming è stato disconnesso (riprova dopo 3s)",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",
-    "lang_misskeyparse_reaction": "Reaction",
+    "lang_misskeyparse_reaction": "Reazione",
-    "lang_misskeyparse_tagnostr": "No streaming API on Tag TLs",
+    "lang_misskeyparse_tagnostr": "Nessuna API di streaming su Tag TLs",
-    "lang_misskeyparse_listnostr": "No streaming API on List TLs",
+    "lang_misskeyparse_listnostr": "Nessuna API di streaming sulle LTL della lista",
-    "lang_misskeyparse_home": "Home",
+    "lang_misskeyparse_home": "Principale",
     "lang_misskeyparse_followers": "Follower",
-    "lang_misskeyparse_specified": "Specified User",
+    "lang_misskeyparse_specified": "Utente Specificato",
-    "lang_misskeyparse_qt": "Misskey renote(quote) mode:Ctrl+Shift+Enter to clear",
+    "lang_misskeyparse_qt": "Modalità di rinote(citazione):Ctrl+Maiusc+Invio per pulire",
-    "lang_misskeyparse_renoted": " renoted your following post.",
+    "lang_misskeyparse_renoted": " ha rinominato il tuo post seguente.",
-    "lang_misskeyparse_quoted": " quoted your following post.",
+    "lang_misskeyparse_quoted": " ha citato il tuo post seguente.",
-    "lang_misskeyparse_reacted": " reacted your following post.",
+    "lang_misskeyparse_reacted": " ha reagito al seguente post.",
-    "lang_setting_time": "Time format:{{set}}",
+    "lang_setting_time": "Formato orario:{{set}}",
-    "lang_setting_theme": "Theme:{{set}}",
+    "lang_setting_theme": "Tema:{{set}}",
-    "lang_setting_nsfw": "Sensitive media:{{set}}",
+    "lang_setting_compat": "Compatibile",
+    "lang_setting_nsfw": "Media sensibili:{{set}}",
     "lang_setting_cw": "CW:{{set}}",
-    "lang_setting_cwtext": "Default CW text:{{set}}",
+    "lang_setting_cwtext": "Testo CW predefinito:{{set}}",
-    "lang_setting_cws": "Always CW on:{{set}}",
+    "lang_setting_cws": "CW sempre il:{{set}}",
-    "lang_setting_rp": "Reply counter:{{set}}",
+    "lang_setting_rp": "Contatore risposte:{{set}}",
     "lang_setting_vis": "Default visibility:{{set}}",
-    "lang_setting_popup": "Popup notification:{{set}}",
+    "lang_setting_popup": "Notifica popup:{{set}}",
     "lang_setting_off": "Off",
     "lang_setting_s": "s",
-    "lang_setting_box": "Default toot box action:{{set}}",
+    "lang_setting_box": "Azione predefinita del toot box:{{set}}",
     "lang_setting_gif": "GIF:{{set}}",
-    "lang_setting_selt": "Auto fold:{{set1}} lines and above, {{set2}} letters and above",
+    "lang_setting_selt": "Ripiegamento automatico:{{set1}} linee e superiori, {{set2}} lettere e superiori",
-    "lang_setting_autocw": "Auto CW:{{set1}} lines and above, {{set2}} letters and above",
+    "lang_setting_autocw": "Auto CW:{{set1}} righe e superiori, {{set2}} lettere e superiori",
-    "lang_setting_width": "Minimam width:{{set}}",
+    "lang_setting_width": "Larghezza minima:{{set}}",
-    "lang_setting_fixwidth": "TweetDeck fixed width:{{set}}px",
+    "lang_setting_fixwidth": "Larghezza fissa TweetDeck:{{set}}px",
-    "lang_setting_img": "After posting an image:{{set}}",
+    "lang_setting_img": "Dopo aver postato un'immagine:{{set}}",
-    "lang_setting_font": "Fonts:{{set}}",
+    "lang_setting_font": "Caratteri:{{set}}",
-    "lang_setting_default": "default font",
+    "lang_setting_default": "carattere predefinito",
-    "lang_setting_size": "Font size:{{set}}px",
+    "lang_setting_size": "Dimensione carattere:{{set}}px",
-    "lang_setting_imgheight": "Image height:{{set}}px",
+    "lang_setting_imgheight": "Altezza immagine:{{set}}px",
     "lang_setting_ticker": "#InstanceTicker:{{set}}px",
-    "lang_setting_animation": "Animation: {{set}}",
+    "lang_setting_animation": "Animazione: {{set}}",
     "lang_setting_tag": "Tag TL:{{set}}",
-    "lang_setting_boxConfirm": "Post box:{{set}}",
+    "lang_setting_boxConfirm": "Casella postale:{{set}}",
-    "lang_setting_ul": "Native locale:{{set}}",
+    "lang_setting_ul": "Locale nativo:{{set}}",
-    "lang_setting_notf": "Native notification:{{set}}",
+    "lang_setting_notf": "Notifica nativa:{{set}}",
-    "lang_setting_quote": "Quote format:{{set}}",
+    "lang_setting_quote": "Formato preventivo:{{set}}",
     "lang_setting_via": "Via:{{set}}",
-    "lang_setting_mov": "Action buttons hiding:{{set}}",
+    "lang_setting_mov": "Pulsanti di azione nascosti:{{set}}",
-    "lang_setting_setasread": "Notification markers:{{set}}",
+    "lang_setting_setasread": "Marcatori di notifiche:{{set}}",
-    "lang_setting_main": "Default account:{{set}}",
+    "lang_setting_main": "Account predefinito:{{set}}",
-    "lang_setting_sec": "Secondary toot button:{{set}}",
+    "lang_setting_sec": "Pulsante radice secondario:{{set}}",
-    "lang_setting_ksref": "Keyboard shortcuts are refreshed.",
+    "lang_setting_ksref": "Le scorciatoie da tastiera sono aggiornate.",
-    "lang_setting_nomuting": "No client is muted.",
+    "lang_setting_nomuting": "Nessun client è silenziato.",
-    "lang_setting_notftest": " Notification test ",
+    "lang_setting_notftest": " Test di notifica ",
-    "lang_setting_notftestprof": "Your icon is shown.",
+    "lang_setting_notftestprof": "La tua icona è mostrata.",
-    "lang_setting_exportwarn": "Only important data will be exported. You must keep this data secure.",
+    "lang_setting_exportwarn": "Verranno esportati solo dati importanti. È necessario mantenere questi dati al sicuro.",
-    "lang_setting_importwarn": "All data will be deleted.",
+    "lang_setting_importwarn": "Tutti i dati verranno eliminati.",
-    "lang_setting_noupd": "No available update",
+    "lang_setting_noupd": "Nessun aggiornamento disponibile",
-    "lang_setting_thisisbeta": "This is beta version. You have to update manually."
+    "lang_setting_thisisbeta": "Questa è la versione beta. È necessario aggiornare manualmente."
 }

app/view/make/language/it-IT/setting.json

@@ -1,221 +1,229 @@
 {
-  "setting": "Preferences",
+  "setting": "Preferenze",
-  "set": "Save",
+  "set": "Salva",
-  "yes": "Yes",
+  "yes": "Sì",
   "no": "No",
-  "none": "None",
+  "none": "Nessuno",
-  "show": "Show",
+  "show": "Mostra",
-  "hide": "Hide",
+  "hide": "Nascondi",
-  "default": "Default",
+  "default": "Predefinito",
-  "change": "Change",
+  "change": "Cambia",
-  "select": "Select",
+  "select": "Seleziona",
-  "env": "System Preferences",
+  "env": "Preferenze Di Sistema",
-  "setlang": "Languages",
+  "setlang": "Lingue",
-  "backup": "Import and export of preferences",
+  "backup": "Importazione ed esportazione delle preferenze",
-  "backupWarn": "If you got a error when you choose the file, please paste the strings printed when you open the file and click import",
+  "backupWarn": "Se hai un errore quando scegli il file, incolla le stringhe stampate quando apri il file e fai clic su importazione",
-  "import": "Import",
+  "import": "Importa",
-  "export": "Export",
+  "export": "Esporta",
-  "hardwareAcceleration": "Disable hardware acceleration",
+  "hardwareAcceleration": "Disabilita accelerazione hardware",
-  "hardwareAccelerationWarn": "Auto restarted",
+  "hardwareAccelerationWarn": "Riavvio automatico",
-  "theme": "Themes",
+  "theme": "Temi",
-  "popup": "Popup notification",
+  "popup": "Notifica popup",
-  "popupwarn": "Hide to set \"0\"",
+  "popupwarn": "Nascondi per impostare \"0\"",
   "s": "sec",
-  "nativenotf": "Native notification",
+  "nativenotf": "Notifica nativa",
-  "nnwarn": "This does not work on Windows Portable ver.",
+  "nnwarn": "Questo non funziona su Windows Portable vers.",
-  "nntest": "Notification test",
+  "nntest": "Test di notifica",
-  "minwidth": "Minimum width of columns",
+  "width": "Larghezza delle colonne",
-  "minwidthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
+  "widthwarn": "La barra di scorrimento verrà mostrata quando la dimensione della finestra è superiore a quella delle colonne.",
-  "fixwidth": "Minimum width of TweetDeck browser",
+  "fixwidth": "Larghezza minima del browser TweetDeck",
   "fixwidthwarn": "",
-  "above": "above",
+  "margin": "Margine tra le timeline",
+  "above": "sopra",
   "font": "Font",
   "fontwarn": "Select your favorite font to 'Select'(Windows/ macOS only)",
-  "fontsize": "Font size",
+  "fontsize": "Dimensione del font",
-  "savefolder": "Folder to save",
+  "savefolder": "Cartella da salvare",
-  "savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
+  "savefolderwarn": "TheDesk utilizza questo valore quando tenta di salvare le immagini o scattare screenshot.",
   "useragent": "User agent",
-  "useragentWarn": "Restart when changed",
+  "useragentWarn": "Riavvia quando cambiato",
-  "frame": "Window frame",
+  "frame": "Riquadro della finestra",
-  "frameWarn": "If 'off', the window looks cool.",
+  "frameWarn": "Se 'off', la finestra sembra figa.",
-  "downloadWin": "Versioning(o Windows downloader)",
+  "downloadWin": "Versioning(o downloader di Windows)",
-  "absolute": "absolute value",
+  "absolute": "valore assoluto",
-  "srcUrl": "Search engine",
+  "srcUrl": "Motore di ricerca",
-  "srcUrlWarn": "{q} will be replaced to query.",
+  "srcUrlWarn": "{q} sarà sostituito dalla query.",
-  "themeSel": "Select theme",
+  "themeSel": "Seleziona tema",
-  "customtheme": "Edit and add custom themes",
+  "customtheme": "Modifica e aggiungi temi",
-  "customthemeDirection": "Color scheme",
+  "customthemeDirection": "Schema colori",
-  "advanced": "Advanced options(6 additional colors)",
+  "advanced": "Opzioni avanzate",
-  "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.",
+  "advancedWarn": "",
-  "active": "Background of Show or CW buttons, selected options...",
+  "use": "Usa questo",
-  "modal": "Background of modals",
+  "copyFrom": "Copia da",
-  "bottom": "Background of bottom bar",
+  "bg": "Colore di sfondo",
-  "postbox": "Background of post box and menu",
+  "subcolor": "Distinguibile dallo sfondo",
-  "subcolor": "Subcolor, has harmony with secondary color",
+  "text": "Colore testo",
-  "primary": "Background color",
+  "accent": "Sfondo dei potenziamenti",
-  "secondarycolor": "Background of components",
+  "modal": "Sfondo della finestra modale",
-  "text": "Text color",
+  "modalFooter": "Sfondo del piè di pagina della finestra modale",
-  "accent": "Background of boosts",
+  "thirdColor": "Backgroud di pulsanti tag, ecc(vicino a Sfondo)",
-  "add_new": "Add new",
+  "forthColor": "Barra del titolo (stesso schema sullo sfondo)",
-  "name": "Name",
+  "bottom": "Sfondo della barra dei menu in fondo alla finestra",
-  "desc": "About this theme",
+  "emphasized": "Sfondo del toot enfatizzato",
-  "customShare": "Share this code with other TheDesk. Do not share this code with MiAS.",
+  "postbox": "Sfondo del post box e menu",
-  "customImport": "Import of custom themes",
+  "active": "Sfondo degli elementi 'attivi'",
-  "delete": "Delete",
+  "selected": "Sfondo dei tasti freccia selezionati",
-  "cImpWarn": "Get more themes on <a href=\"https://assets.msky.cafe/\" target=\"_blank\">MiAS</a>",
+  "selectedWithShare": "Sfondo dei tasti freccia selezionati (toot potenziati)",
-  "timeline": "Timeline Preferences",
+  "add_new": "Aggiungi nuovo",
-  "timemode": "Time format",
+  "name": "Nome",
-  "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
+  "desc": "Informazioni su questo tema",
-  "absolutetime": "Absolute format:\"23:25:21\",\"2017/12/30 23:59:00\"",
+  "customShare": "Condividi questo codice con altri TheDesk. Non condividere questo codice con MiAS.",
-  "mixtime": "Mixed format:toots posted today are relative-format, others are absolute-format.",
+  "customImport": "Importa temi personalizzati",
-  "relativesel": "Relative",
+  "delete": "Elimina",
-  "absolutesel": "Absolute",
+  "cImpWarn": "Ottieni altri temi su <a href=\"https://assets.msky.cafe/\" target=\"_blank\">MiAS</a>",
-  "doublesel": "Both relative and absolute",
+  "timeline": "Preferenze Della Timeline",
-  "mixsel": "Mixed",
+  "timemode": "Formato orario",
-  "locale": "Server's unique locale",
+  "relativetime": "Formato relativo:\"1 minuti fa\",\"3 giorni fa\"",
-  "localewarn": "This value is available on some Japanese servers",
+  "absolutetime": "Formato assoluto:\"23:25:21\",\"2017/12/30 23:59:00\"",
-  "nswf": "Hide Mark sensitive pictures",
+  "mixtime": "Formato misto: i toot pubblicati oggi sono in formato relativo, altri sono in formato assoluto.",
-  "nsfwwarn": "Strong blur effect",
+  "relativesel": "Relativo",
-  "cw": "Hide CW contents",
+  "absolutesel": "Assoluto",
-  "replyct": "Reply counter style",
+  "doublesel": "Sia relativo che assoluto",
-  "replyct_hidden": "Show 1+ if the replies are more than 1.",
+  "mixsel": "Misto",
-  "replyct_full": "Show full count(1,2...)",
+  "locale": "Localizzazione univoca del server",
-  "gif": "Animated GIF images animation",
+  "localewarn": "Questo valore è disponibile su alcuni server giapponesi",
-  "box": "Action of posting-box",
+  "nswf": "Nascondi le immagini sensibili ai segni",
-  "boxyes": "Folding",
+  "nsfwwarn": "Forte effetto sfocatura",
-  "boxabs": "Absolutely open",
+  "cw": "Nascondi contenuti CW",
-  "boxno": "Open after posting",
+  "replyct": "Stile contatore risposta",
-  "tag": "Tag TL Search",
+  "replyct_hidden": "Mostra 1+ se le risposte sono più di 1.",
-  "tagfed": "Use federated network",
+  "replyct_full": "Mostra il conteggio completo(1,2...)",
-  "taglocal": "Use local network",
+  "gif": "Animazione immagini GIF animate",
-  "via": "Show via",
+  "box": "Azione del distacco",
-  "mouseover": "Hide action buttons without mouseover",
+  "boxyes": "Pieghevole",
-  "mouseoverwarn": "You may feel 'mouseover' is unconfortable:(",
+  "boxabs": "Assolutamente aperto",
-  "mv": "Mouseover to show",
+  "boxno": "Apri dopo la pubblicazione",
-  "mvclick": "Click to show",
+  "tag": "Ricerca Tag TL",
-  "notfmarker": "Show Notification marker, red colored bell and counter(if you show a notification column.)",
+  "tagfed": "Usa rete federata",
-  "autofold": "Auto folding",
+  "taglocal": "Usa rete locale",
-  "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.",
+  "via": "Mostra tramite",
-  "lines": "lines",
+  "mouseover": "Nascondi i pulsanti azione senza passaggio del mouse",
-  "letters": "letters",
+  "mouseoverwarn": "Il 'passaggio del mouse' può essere non confortevole:(",
-  "or": "or",
+  "mv": "Passaggio del mouse per mostrare",
-  "imgheight": "Height of images",
+  "mvclick": "Clicca per mostrare",
-  "imgheightwarn": "Option:Set \"full\" to uncrop.",
+  "notfmarker": "Mostra marcatore di notifiche, campana di colore rosso e contatore (se si mostra una colonna di notifiche)",
-  "ticker": "Enable #InstanceTicker",
+  "autofold": "Ripiegamento automatico",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://github.com/MiyonMiyon/InstanceTicker_List\">About #InstanceTicker</a> (c)2018-2020 MiyonMiyon. Released under the MIT License.",
+  "autofoldwarn": "TheDesk non collassa totes di 5 caratteri o meno. Inoltre, quando si crolla, le newlines non sono mostrate. Il conteggio del Desk solo le newline come numero di linee.",
-  "animation": "Animation of timelines",
+  "lines": "linee",
-  "markers": "Markers(mark as read) on HTL and notifications",
+  "letters": "lettere",
-  "markerswarn": "Mastodon 3.0~. Shared on WebUI and third-party supported clients.",
+  "or": "o",
-  "remote_img": "Get images from the remote server",
+  "imgheight": "Altezza delle immagini",
-  "remote_imgWarn": "All previews are got from your loginned cache server.",
+  "imgheightwarn": "Opzione:Imposta \"pieno\" per smontare.",
-  "replySound": "Sound(Reply)",
+  "ticker": "Abilita OpenSticker",
-  "favSound": "Sound(Fav)",
+  "tickerwarn": "Mostra il nome dell'istanza e la favicon dei tooter <a href=\"https://opensticker.0px.io\">Informazioni su OpenSticker</a>",
-  "btSound": "Sound(Boost)",
+  "animation": "Animazione delle timeline",
-  "followSound": "Sound(Follow)",
+  "markers": "Marcatori (contrassegnare come letto) su HTL e notifiche",
-  "customSound": "Custom sound",
+  "markerswarn": "Mastodon 3.0~. Condiviso su WebUI e client supportati da terze parti.",
-  "post": "Posting Preferences",
+  "remote_img": "Ottieni immagini dal server remoto",
-  "autocw": "Alert before posting a long toot.",
+  "remote_imgWarn": "Tutte le anteprime sono ottenute dal server cache loginato.",
-  "autocwwarn": "Show dialog whether you make too-long text hidden.",
+  "replySound": "Suono(Rispondi)",
-  "defaultcw": "Default warining text",
+  "favSound": "Suono (Fav)",
-  "cws": "Always CW set",
+  "btSound": "Suono (Boost)",
-  "defaultvis": "Default visibility",
+  "followSound": "Suoni (Follow)",
-  "public": "Public",
+  "customSound": "Suono personalizzato",
-  "unlisted": "Unlisted",
+  "post": "Preferenze Di Pubblicazione",
-  "private": "Private",
+  "autocw": "Avverti prima di postare un lungo toot.",
-  "direct": "Direct",
+  "autocwwarn": "Mostra la finestra di dialogo se rendi nascosto un testo troppo lungo.",
-  "memory": "Memory(memorized as each server)",
+  "defaultcw": "Testo di avvertimento predefinito",
-  "useapi": "Default of your visibility(Set on preferences of Mastodon server)",
+  "cws": "Sempre CW impostato",
-  "postimg": "Posting images preferences",
+  "defaultvis": "Visibilità di default",
-  "showurl": "Insert media URL",
+  "public": "Pubblico",
-  "nourl": "Insert nothig",
+  "unlisted": "Non Elencato",
-  "disabled": "Disabled",
+  "private": "Privato",
-  "quote": "Quote format",
+  "direct": "Diretto",
-  "simple": "Only URL",
+  "memory": "Memoria (memorizzata come ogni server)",
-  "mention": "URL and acct(mention to the user)",
+  "useapi": "Predefinito della Sua visibilità(Imposta sulle preferenze del server Mastodon)",
-  "full": "URL, text and acct(mention to the user)",
+  "postimg": "Pubblicazione delle preferenze delle immagini",
-  "notqt": "Disabled(Hide buttons on TLs)",
+  "showurl": "Inserisci URL media",
-  "apiQuote": "API(only some instances)",
+  "nourl": "Non aggiungere niente",
-  "showBookmarkAction": "Show a bookmarking toot button",
+  "disabled": "Disattivato",
-  "main": "Default accounts of actions",
+  "quote": "Formato di citazione",
-  "mainwarn": "Main account can be set on Account Manager.",
+  "simple": "Solo URL",
-  "lastacct": "Account you used recently",
+  "mention": "URL e acct(menzione all'utente)",
-  "usemainacct": "Main account",
+  "full": "URL, testo e acct(menzione all'utente)",
-  "secondary": "Secondary Toot Button",
+  "notqt": "Disattivato(Migliore sui TL)",
-  "secwarn": "Toot with other visibility setting",
+  "apiQuote": "API(solo alcuni casi)",
-  "nothing": "Hidden",
+  "showBookmarkAction": "Mostra un pulsante toot per segnalibri",
-  "localonly": "Local Only",
+  "main": "Account predefiniti delle azioni",
-  "zeroWidthEmoji": "Zero-width space when inserting emojis",
+  "mainwarn": "L'account principale può essere impostato su Account Manager.",
-  "uploadCrop": "Auto scale to fit",
+  "lastacct": "Account utilizzato di recente",
-  "uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Notice: if you post an animated picture like GIF, it will be converted static one.",
+  "usemainacct": "Account principale",
-  "keysc": "Keyboard shortcut Preferences",
+  "secondary": "Pulsante Toot secondario",
-  "iks": "Easy inserter",
+  "secwarn": "Toot con altre impostazioni di visibilità",
-  "okswarn": "You can insert any letters and emojis with only 3 keys",
+  "nothing": "Nascosto",
-  "muteemp": "Mute & Emphasis Preferences",
+  "localonly": "Solo Locale",
-  "climute": "Client Mute",
+  "zeroWidthEmoji": "Spazio larghezza zero quando si inseriscono emoji",
-  "cliemp": "Client Emphasis",
+  "uploadCrop": "Scala automatica per adattarsi",
-  "cliwarn": "Click client name on toots to toggle mute and emphasis.",
+  "uploadCropWarn": "Max px lato lungo. Le immagini caricate vengono convertite in JPEG (da JPEG) o PNG (da altri). Imposta 0 e le immagini non saranno ridimensionate. Attenzione: se si pubblica un'immagine animata come GIF, verrà convertita una immagine statica.",
-  "enter": "Enter to set",
+  "keysc": "Preferenze scorciatoia tastiera",
-  "wordmute": "Words Mute",
+  "iks": "Inseritore facile",
-  "wordemp": "Words Emphasis",
+  "okswarn": "È possibile inserire qualsiasi lettera ed emoji con solo 3 tasti",
-  "useremp": "Users Emphasis",
+  "muteemp": "Preferenze Di Muto & Emphasis",
-  "useerempwarn": "Set on users data modals.",
+  "climute": "Silenzia Client",
-  "empcolorwarn": "Use this color to emphasis",
+  "cliemp": "Emfasi del client",
-  "spotify": "Spotify and NowPlaying Preferences",
+  "cliwarn": "Fare clic sul nome del client sui toot per attivare o disattivare l'audio e l'enfasi.",
-  "spotifynote1": "Click ",
+  "enter": "Inserisci da impostare",
-  "spotifynote2": "icon to NowPlaying",
+  "wordmute": "Parole Mute",
-  "link": "Account Connection",
+  "wordemp": "Parole Enfatizzate",
-  "linkwarn": "TheDesk save your data on thedesk.top server.",
+  "useremp": "Enfasi Degli Utenti",
-  "connect": "Connect",
+  "useerempwarn": "Imposta sulle modalità dati degli utenti.",
-  "disconnect": "Disconnect",
+  "empcolorwarn": "Usa questo colore per enfatizzare",
-  "lastFmWarn": "User name...(empty to disconnect) You cannot hide your recent play log at last.fm privacy settings.",
+  "spotify": "Preferenze di Spotify e NowPlaying",
-  "templateedit": "Edit a template",
+  "spotifynote1": "Clic ",
+  "spotifynote2": "icona su NowPlaying",
+  "link": "Connessione Account",
+  "linkwarn": "TheDesk salva i tuoi dati sul server thedesk.top.",
+  "connect": "Connetti",
+  "disconnect": "Disconnetti",
+  "lastFmWarn": "Nome utente...(vuoto per disconnettersi) Non puoi nascondere il tuo recente log di riproduzione alle impostazioni di privacy last.fm.",
+  "templateedit": "Modifica un modello",
   "templateeditwarn": "",
-  "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
+  "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL per Spotify",
-  "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
+  "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genere:{genre}",
   "template3": "",
-  "postartwork": "Attach an Artwork of Spotify",
+  "postartwork": "Allega una grafica di Spotify",
-  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
+  "searchArtwork": "Se il brano non ha nessuna grafica, completalo automaticamente (macOS)",
-  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
+  "searchArtworkWarn": "Se si esegue ora una canzone senza grafica, ottieni una che sembra bella attraverso API. Se non ti piace la grafica completata, puoi cliccare con il tasto destro del mouse per eliminarla.",
-  "tts": "TTS(text to speech) Preferences",
+  "tts": "Preferenze di TTS(testo a voce)",
-  "bouyomi": "BouyomiChan connect",
+  "bouyomi": "Connessione BouyomiChan",
-  "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",
+  "bouyomiWarn": "Requisito: BouyomiChan WebSocket Plugin",
-  "speed": "Speed",
+  "speed": "Velocità",
   "speedwarn": "1-100(default:10)",
-  "pitch": "Pitch",
+  "pitch": "Tono",
   "pitchwarn": "0-100(default:50)",
   "vol": "Volume",
   "volwarn": "0-100(default:100)",
   "volwarn80": "0-100(default:80)",
-  "test": "Test",
+  "test": "Prova",
-  "sample": "TheDesk is an open-source Mastodon client for PC.",
+  "sample": "TheDesk è un client Mastodon open source per PC.",
-  "playstop": "Play/Stop",
+  "playstop": "Riproduci/Ferma",
-  "back": "Back",
+  "back": "Indietro",
-  "keyscs": "Keyboard shortcuts",
+  "keyscs": "Scorciatoie da tastiera",
-  "keyscr": "Jump to n(1-9)th column",
+  "keyscr": "Vai alla colonna n(1-9)th",
-  "keynew": "Open toot box",
+  "keynew": "Apri casella toot",
-  "keytoggle": "Toggle toot box",
+  "keytoggle": "Attiva/Disattiva casella di avvio",
   "keypost": "Post",
-  "keysecpost": "Post(secondary toot)",
+  "keysecpost": "Post(toot secondario)",
-  "keyunread": "Make all notifications read",
+  "keyunread": "Leggi tutte le notifiche",
-  "keyesc": "Hide toot box",
+  "keyesc": "Nascondi toot box",
-  "keyf5": "Super Reload",
+  "keyf5": "Super Ricarica",
-  "keyclear": "Clear toot box",
+  "keyclear": "Svuota casella toot",
-  "keyacctman": "Account Manager",
+  "keyacctman": "Gestione account",
-  "keyshowprof": "Show profile of selecting",
+  "keyshowprof": "Mostra il profilo di selezione",
-  "keyrow": "Show next or previous image",
+  "keyrow": "Mostra l'immagine successiva o precedente",
-  "keyzoom": "Mousewheel:Zoom a image",
+  "keyzoom": "Mousewheel:Zoom immagine",
-  "whenSelected": "When a toot is selected: ",
+  "whenSelected": "Quando un toot è selezionato: ",
-  "fav": "Favourite this toot",
+  "fav": "Preferito questo toot",
-  "bt": "Boost this toot",
+  "bt": "Migliora questo toot",
-  "reply": "Reply to this toot",
+  "reply": "Rispondi a questo toot",
-  "keyselecttop": "Select the top & left(No.1 column) toot",
+  "keyselecttop": "Seleziona la colonna in alto a sinistra (No.1) toot",
-  "reset": "Reset(Danger)",
+  "reset": "Reset(Pericolo)",
-  "resetconfirm": "Delete all data. You cannot undo. Continue?",
+  "resetconfirm": "Eliminare tutti i dati. Non puoi annullare. Continuare?",
-  "about": "About TheDesk",
+  "about": "Informazioni Su TheDesk",
-  "hp": "Website",
+  "hp": "Sito web",
-  "support": "Support",
+  "support": "Supporto",
-  "help": "Help",
+  "help": "Aiuto",
-  "sushi": "Give me a sushi!",
+  "sushi": "Dammi un sushi!",
-  "checkup": "Check update",
+  "checkup": "Verifica gli aggiornamenti",
   "ossJP": ""
 }

app/view/make/language/it-IT/update.json

@@ -1,19 +1,19 @@
 {
-    "updatehere": "Get latest TheDesk",
+    "updatehere": "Ottieni l'ultimo TheDesk",
-    "download": "Start",
+    "download": "Inizia",
-    "portable": "Portable ver.",
+    "portable": "Ver. Portatile.",
-    "installer": "Installer(Recommended)",
+    "installer": "Installer(Consigliato)",
     "linux": "zip",
-    "linuxdeb": "deb(Recommended on buntu, Debian)",
+    "linuxdeb": "deb(Consigliato su buntu, Debian)",
     "linuxsnap": "snap",
-    "snap": "Get it on Snapcraft",
+    "snap": "Ottienilo su Snapcraft",
-    "sureupd": "You may lose a cool experience!",
+    "sureupd": "Potresti perdere un'esperienza fresca!",
-    "skipupd": "Skip this update",
+    "skipupd": "Salta questo aggiornamento",
-    "nexttl": "Hidden until next TL loading",
+    "nexttl": "Nascosto fino al prossimo caricamento TL",
-    "nextver": "Hidden until next version",
+    "nextver": "Nascosto fino alla prossima versione",
-    "problem1": "Some problems?",
+    "problem1": "Alcuni problemi?",
-    "problem2": "Please download on <a href='https://thedesk.top'>Oficial HP</a>.",
+    "problem2": "Scarica su <a href='https://thedesk.top'>Oficial HP</a>.",
-    "continue": "Continue updating",
+    "continue": "Continua l'aggiornamento",
-    "dlnow": "Downloading...",
+    "dlnow": "Scaricamento...",
-    "checkWhatIsNew": "What is new?"
+    "checkWhatIsNew": "Che cosa è nuovo?"
 }

app/view/make/language/ja-KS/main.json

@@ -130,13 +130,17 @@
     "lang_layout_linkanades": "リンクの解析を切り替え",
     "lang_layout_remoteOnly": "リモートのみ",
     "lang_layout_tts": "読み上げ",
-    "lang_layout_reconnect": "カラム再読込",
+    "lang_layout_reconnect": "再読込",
     "lang_layout_headercolor": "TLヘッダーカラー",
     "lang_layout_nodata": "[トゥートあらへん]<br>F5/⌘+Rで再読込してみて。",
     "lang_layout_dm": "ダイレクトメッセージ",
     "lang_layout_webviewmode": "WebView優先",
-    "lang_excluded": "見せへん通知",
+    "lang_layout_excluded": "見せへん通知",
-    "lang_layout_excludingbt": "BT表示(OFF/BT除外/BTだけ)",
+    "lang_layout_mention": "メンション",
+    "lang_layout_fav": "お気に入り",
+    "lang_layout_bt": "ブースト",
+    "lang_layout_poll": "投票",
+    "lang_layout_excludingbt": "BT表示",
     "lang_layout_leftFold": "左へ重ねる",
     "lang_layout_leftUnfold": "右へ出す",
     "lang_layout_deleteColumn": "カラム削除",
@@ -217,6 +221,7 @@
     "lang_parse_nsfw": "閲覧注意",
     "lang_parse_html": "埋め込みを表示",
     "lang_parse_notffilter": "このユーザーの通知だけ見る",
+    "lang_parse_disconnected": "ストリーミングがなんかおかしいねん(3秒後にもっかいやってみる)",
     "lang_misskeyparse_renote": "再投稿",
     "lang_misskeyparse_renoteqt": "引用",
     "lang_misskeyparse_reaction": "リアクション",
@@ -230,6 +235,7 @@
     "lang_misskeyparse_quoted": "が引用",
     "lang_misskeyparse_reacted": "がリアクション",
     "lang_setting_time": "時間設定を{{set}}に設定したで。",
+    "lang_setting_compat": "互換テーマ",
     "lang_setting_theme": "テーマ設定を{{set}}に設定したで。",
     "lang_setting_nsfw": "画像表示設定を{{set}}に設定したで。",
     "lang_setting_cw": "テキスト表示設定を{{set}}に設定したで。",

app/view/make/language/ja-KS/setting.json

@@ -43,19 +43,26 @@
   "srcUrl": "検索エンジン",
   "srcUrlWarn": "{q}が検索文字列になるで。",
   "themeSel": "テーマの選択",
-  "customtheme": "カスタムテーマの作成・編集",
+  "customtheme": "テーマの作成・編集",
   "customthemeDirection": "色の系統",
-  "advanced":"拡張項目(6つ)を開く",
+  "advanced":"拡張項目を開く",
-  "advancedWarn":"拡張項目は設定せんと「指定なし」に、基本3項目は白(fff)になるで。拡張項目を閉じた状態で「変更」すると拡張項目は消してまうで。",
+  "advancedWarn":"",
-  "primary": "全体の背景色など",
+  "use": "使用",
-  "secondarycolor": "補助要素に使われる背景色",
+  "copyFrom": "設定をコピー",
+  "bg": "全体の背景色など",
+  "subcolor":"各要素に使われる背景と区別できる色",
   "text": "テキストの色",
   "accent": "ブーストの背景色など",
-  "active": "CWボタンやメニュー選択時の背景色",
   "modal": "モーダルウィンドウの背景色",
+  "modalFooter": "モーダルウィンドウのフッターの背景色",
+  "thirdColor": "タブボタンの背景色等(ほぼ背景色)",
+  "forthColor": "リアクションボタンやタイトルバーの色等(背景色と同系)",
   "bottom":"下のメニューバーの背景色",
+  "emphasized": "強調されたトゥートの背景色",
   "postbox":"投稿ボックスやメニューの色",
-  "subcolor":"背景に準ずる色",
+  "active": "CWボタンやメニュー選択時の背景色",
+  "selected": "矢印キーでトゥートを選択したときの背景色",
+  "selectedWithShare": "矢印キーでBTされたトゥートを選択したときの背景色",
   "add_new": "新規作成",
   "name": "名前",
   "desc": "説明",

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

@@ -132,13 +132,17 @@
     "lang_layout_linkana": "リンク解析",
     "lang_layout_linkanades": "リンクの解析を切り替え",
     "lang_layout_tts": "読み上げ",
-    "lang_layout_reconnect": "カラム再読込",
+    "lang_layout_reconnect": "再読込",
     "lang_layout_headercolor": "TLヘッダーカラー",
     "lang_layout_nodata": "[ここにトゥートはありません。]<br>F5/⌘+Rで再読込できます。",
     "lang_layout_dm": "ダイレクトメッセージ",
     "lang_layout_webviewmode": "WebView優先",
-    "lang_excluded": "除外する通知",
+    "lang_layout_excluded": "除外する通知",
-    "lang_layout_excludingbt": "BT表示(OFF/BT除外/BTのみ)",
+    "lang_layout_mention": "メンション",
+    "lang_layout_fav": "お気に入り",
+    "lang_layout_bt": "ブースト",
+    "lang_layout_poll": "投票",
+    "lang_layout_excludingbt": "BT表示",
     "lang_layout_leftFold": "左へ重ねる",
     "lang_layout_leftUnfold": "右へ出す",
     "lang_layout_deleteColumn": "カラム削除",
@@ -223,6 +227,7 @@
     "lang_parse_html": "埋め込みを表示",
     "lang_parse_hidden": "ミュートされた引用トゥート",
     "lang_parse_notffilter": "このユーザーの通知のみを表示",
+    "lang_parse_disconnected": "ストリーミングから切断されました(3秒後に再試行)",
     "lang_misskeyparse_renote": "再投稿",
     "lang_misskeyparse_renoteqt": "引用",
     "lang_misskeyparse_reaction": "リアクション",
@@ -237,6 +242,7 @@
     "lang_misskeyparse_reacted": "がリアクション",
     "lang_setting_time": "時間設定を{{set}}に設定しました。",
     "lang_setting_theme": "テーマ設定を{{set}}に設定しました。",
+    "lang_setting_compat": "互換テーマ",
     "lang_setting_nsfw": "画像表示設定を{{set}}に設定しました。",
     "lang_setting_cw": "テキスト表示設定を{{set}}に設定しました。",
     "lang_setting_cwtext": "デフォルトの警告文を「{{set}}」に設定しました。",