Merge branch 'master' of github.com:cutls/TheDesk

* New translations setting.json (French)

* New translations setting.json (French)

* New translations setting.json (French)

* New translations setting.json (French)

* New translations main.json (Portuguese)

* New translations main.json (Swedish)

* New translations index.json (Swedish)

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

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

* New translations main.json (Russian)

* New translations index.json (Russian)

* New translations index.json (Portuguese)

* New translations main.json (Polish)

* New translations index.json (Polish)

* New translations main.json (Norwegian)

* New translations index.json (Norwegian)

* New translations main.json (Dutch)

* New translations index.json (Turkish)

* New translations index.json (English)

* New translations main.json (Spanish, Argentina)

* New translations index.json (Spanish, Argentina)

* New translations main.json (Portuguese, Brazilian)

* New translations index.json (Portuguese, Brazilian)

* New translations main.json (Vietnamese)

* New translations index.json (Vietnamese)

* New translations main.json (Turkish)

* New translations main.json (Chinese Traditional)

* New translations index.json (Chinese Traditional)

* New translations main.json (Chinese Simplified)

* New translations index.json (Chinese Simplified)

* New translations main.json (Ukrainian)

* New translations index.json (Ukrainian)

* New translations index.json (Dutch)

* New translations index.json (Romanian)

* New translations main.json (Catalan)

* New translations index.json (Catalan)

* New translations main.json (Bulgarian)

* New translations index.json (Bulgarian)

* New translations main.json (Arabic)

* New translations index.json (Arabic)

* New translations main.json (Afrikaans)

* New translations index.json (Czech)

* New translations index.json (Afrikaans)

* New translations main.json (Spanish)

* New translations index.json (Spanish)

* New translations main.json (French)

* New translations index.json (French)

* New translations main.json (Romanian)

* New translations main.json (Czech)

* New translations main.json (Italian)

* New translations index.json (Finnish)

* New translations index.json (Italian)

* New translations main.json (Hungarian)

* New translations index.json (Hungarian)

* New translations main.json (Hebrew)

* New translations index.json (Hebrew)

* New translations main.json (Finnish)

* New translations main.json (Greek)

* New translations index.json (Greek)

* New translations main.json (German)

* New translations index.json (German)

* New translations main.json (Danish)

* New translations index.json (Danish)

* New translations main.json (English)

* New translations main.json (Swedish)

* New translations index.json (Swedish)

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

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

* New translations main.json (Russian)

* New translations index.json (Russian)

* New translations main.json (Portuguese)

* New translations index.json (Portuguese)

* New translations main.json (Polish)

* New translations index.json (Polish)

* New translations main.json (Norwegian)

* New translations index.json (Norwegian)

* New translations main.json (Dutch)

* New translations index.json (Turkish)

* New translations index.json (English)

* New translations main.json (Spanish, Argentina)

* New translations index.json (Spanish, Argentina)

* New translations main.json (Portuguese, Brazilian)

* New translations index.json (Portuguese, Brazilian)

* New translations main.json (Vietnamese)

* New translations index.json (Vietnamese)

* New translations main.json (Turkish)

* New translations main.json (Chinese Traditional)

* New translations index.json (Chinese Traditional)

* New translations main.json (Chinese Simplified)

* New translations index.json (Chinese Simplified)

* New translations main.json (Ukrainian)

* New translations index.json (Ukrainian)

* New translations index.json (Dutch)

* New translations index.json (Romanian)

* New translations main.json (Catalan)

* New translations index.json (Catalan)

* New translations main.json (Bulgarian)

* New translations index.json (Bulgarian)

* New translations main.json (Arabic)

* New translations index.json (Arabic)

* New translations main.json (Afrikaans)

* New translations index.json (Czech)

* New translations index.json (Afrikaans)

* New translations main.json (Spanish)

* New translations index.json (Spanish)

* New translations main.json (French)

* New translations index.json (French)

* New translations main.json (Romanian)

* New translations main.json (Czech)

* New translations main.json (Italian)

* New translations index.json (Finnish)

* New translations index.json (Italian)

* New translations main.json (Hungarian)

* New translations index.json (Hungarian)

* New translations main.json (Hebrew)

* New translations index.json (Hebrew)

* New translations main.json (Finnish)

* New translations main.json (Greek)

* New translations index.json (Greek)

* New translations main.json (German)

* New translations index.json (German)

* New translations main.json (Danish)

* New translations index.json (Danish)

* New translations main.json (English)

.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

@@ -6,7 +6,7 @@ language: node_js
 env:
   - YARN_GPG=no
 node_js:
-- '10.15.2'
+- '12.17.0'
 cache:
   yarn: true
 script: node -v
@@ -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,14 +14,15 @@ 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;
 }
-.btn, .btn-flat {
+.btn,
+.btn-flat {
 	font-size: 1.1rem;
 	margin: 0.4rem;
 	text-transform: none;
@@ -232,7 +233,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 +244,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 +255,7 @@ blockquote:before,
 #pip {
 	z-index: 504;
 	width: 418px;
-	background-color: var(--subcolor);
+	background-color: var(--thirdColor);
 	position: absolute;
 }
 .pip-bottom {
@@ -315,10 +316,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 +333,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 +381,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 +412,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 +439,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 +460,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 +486,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 +544,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 +627,29 @@ textarea {
 .dropdown-content.header:hover {
 	background-color: white;
 }
+button {
+	font-family: inherit !important;
+}
+.via-dropdown {
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	overflow-x: hidden;
+}
+#re-online {
+	background-color: rgb(38, 92, 153);
+	position: fixed;
+	width: 100vw;
+	height: 2rem;
+	padding: 0.25rem;
+	color: white;
+	z-index: 1000;
+}
+#offline {
+	background-color: rgb(153, 38, 38);
+	position: fixed;
+	width: 100vw;
+	height: 2rem;
+	padding: 0.25rem;
+	color: white;
+	z-index: 999;
+}

app/css/post.css

@@ -64,9 +64,10 @@ textarea {
 }
 #emoji {
 }
-#suggest {
+#suggest, #draft {
 	max-height: 23rem;
 	overflow-y: scroll;
+	overflow-x: hidden;
 }
 #emoji-list {
 	width: 100%;
@@ -86,7 +87,7 @@ textarea {
 	max-height: 7.7rem;
 }
 #default-emoji a {
-	color: var(--color);
+	color: var(--text);
 	margin-right: 0.15rem;
 }
 .character-counter {
@@ -126,8 +127,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,11 +1,11 @@
 /*アイコンをクリックした時とかにでてくるユーザーデータ*/
 #his-data {
 	background-repeat: no-repeat;
-  background-image: url("../img/loading.svg");
+	background-image: url('../img/loading.svg');
 	overflow-y: hidden;
 }
-#his-data .btn .material-icons{
+#his-data .btn .material-icons {
-  float:left;
+	float: left;
 }
 #his-data-content {
 	display: flex;
@@ -15,7 +15,6 @@
 	font-size: 1.5rem;
 }
 #his-prof {
-  float: left;
 	width: 7.7rem;
 	margin-right: 0.4rem;
 }
@@ -26,16 +25,20 @@
 #his-float-data {
 	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;
+  min-width: calc(100% - 29.4rem);
 	height: 100%;
 	overflow-y: hidden;
 }
 #his-basic-prof {
+  display: flex;
 	min-height: 10rem;
 }
 #his-field {
@@ -61,7 +64,7 @@
 	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;
@@ -90,10 +93,10 @@
 	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 {
@@ -123,13 +126,16 @@
 	flex-wrap: wrap;
 }
 #his-sign-action .btn {
-  flex-basis: 31.2%;
+	flex-basis: calc(50% - 10.6px);
+}
+#his-sign-action .dropdown-trigger {
+	flex-basis: 100%;
 }
 #his-des .mention {
 	color: #039be5;
 	cursor: pointer;
 }
-#his-table{
+#his-table {
 	max-height: 11.538rem;
 	overflow-y: scroll;
 }
@@ -140,12 +146,17 @@
 	font-size: 2rem;
 	height: 100%;
 }
-#hisdropdown{
+#hisdropdown {
 	background-color: var(--bg);
 }
 #hisdropdown li a {
 	color: white;
 }
-#hisdropdown li:hover{
+#hisdropdown li:hover {
 	background-color: var(--active);
 }
+#his-data-title {
+	width: 100%;
+	text-align: center;
+	font-size: 1.5rem;
+}

app/js/common/keyshortcut.js

@@ -227,7 +227,8 @@ $(function($) {
 				var acct_id = $('#timeline_' + selectedColumn).attr('data-acct')
 				var ats_cm = $('.selectedToot .rep-btn').attr('data-men')
 				var mode = $('.selectedToot .rep-btn').attr('data-visen')
-				re(id, ats_cm, acct_id, mode)
+				var cwTxt = $('#cw-text').val()
+				re(id, ats_cm, acct_id, mode, cwTxt)
 				return false
 			}
 		}

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') {
@@ -216,3 +216,15 @@ if(pwa) {
 		}
 	}
 }
+const connection = function (event) {
+	console.log(navigator.onLine, 'network state')
+	if(!navigator.onLine) {
+		$('#re-online').addClass('hide')
+		$('#offline').removeClass('hide')
+	} else if(!$('#offline').hasClass('hide')) {
+		$('#offline').addClass('hide')
+		$('#re-online').removeClass('hide')
+	}
+}
+window.onoffline = connection
+window.ononline = connection

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/emoji.js

@@ -23,6 +23,7 @@ function emojiToggle(reaction) {
 		}
 		$('#post-box').css('width', width + 'px')
 		$('#suggest').html('')
+		$('#draft').html('')
 		if (!localStorage.getItem('emojis_' + acct_id)) {
 			var html = `<button class="btn waves-effect green" style="width:100%; padding:0; margin-top:0;" onclick="emojiGet('true');">${lang.lang_emoji_get}</button>`
 			$('#emoji-list').html(html)
@@ -31,10 +32,12 @@ function emojiToggle(reaction) {
 		}
 	} else {
 		$('#poll').addClass('hide')
+		$('#draft').addClass('hide')
 		$('#right-side').hide()
 		$('#right-side').css('width', '300px')
 		$('#emoji').addClass('hide')
 		$('#suggest').html('')
+		$('#draft').html('')
 		$('#left-side').css('width', '100%')
 		var width = localStorage.getItem('postbox-width')
 		if (width) {

app/js/post/post.js

@@ -9,7 +9,16 @@ function sec() {
 	}
 	post(null, mode)
 }
-function post(mode, postvis) {
+function post(mode, postvis, dry) {
+	if(!navigator.onLine && !dry) {
+		draftToggle(true)
+		addToDraft()
+		M.toast({
+			html: lang.lang_post_offline,
+			displayLength: 3000
+		})
+		return false
+	}
 	if ($('#toot-post-btn').prop('disabled')) {
 		return false
 	}
@@ -122,7 +131,7 @@ function post(mode, postvis) {
 		console.log('This toot will be posted at:' + scheduled)
 		schedule()
 		toot.scheduled_at = scheduled
-		if($('#sch-box').hasClass('expire')) {
+		if ($('#sch-box').hasClass('expire')) {
 			toot.scheduled_at = null
 			toot.expires_at = scheduled
 		}
@@ -131,7 +140,7 @@ function post(mode, postvis) {
 	}
 	if (!$('#poll').hasClass('hide')) {
 		var options = []
-		$('.mastodon-choice').map(function() {
+		$('.mastodon-choice').map(function () {
 			var choice = $(this).val()
 			if (choice != '') {
 				options.push(choice)
@@ -159,6 +168,13 @@ function post(mode, postvis) {
 		}
 	}
 	console.table(toot)
+	if (dry) {
+		$('#ideKey').val('')
+		$('.toot-btn-group').prop('disabled', false)
+		todc()
+		toot['TheDeskAcctId'] = acct_id
+		return toot
+	}
 	var httpreq = new XMLHttpRequest()
 	httpreq.open('POST', start, true)
 	httpreq.setRequestHeader('Content-Type', 'application/json')
@@ -166,11 +182,11 @@ function post(mode, postvis) {
 	httpreq.setRequestHeader('Idempotency-Key', ideKey)
 	httpreq.responseType = 'json'
 	httpreq.send(JSON.stringify(toot))
-	httpreq.onreadystatechange = function() {
+	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response
 			if (this.status !== 200) {
-				if(media && this.status == 422) {
+				if (media && this.status == 422) {
 					$('#ideKey').val('')
 					$('.toot-btn-group').prop('disabled', false)
 					alertProcessUnfinished()
@@ -201,7 +217,7 @@ function post(mode, postvis) {
 }
 function expPostMode() {
 	$('#sch-box').toggleClass('expire')
-	if($('#sch-box').hasClass('expire')) {
+	if ($('#sch-box').hasClass('expire')) {
 		Swal.fire({
 			type: 'info',
 			title: 'Expiring toot On'
@@ -270,7 +286,7 @@ function misskeyPost() {
 	httpreq.setRequestHeader('Content-Type', 'application/json')
 	httpreq.responseType = 'json'
 	httpreq.send(JSON.stringify(toot))
-	httpreq.onreadystatechange = function() {
+	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			if (str.indexOf(localStorage.getItem('stable')) == -1) {
 				localStorage.removeItem('stable')
@@ -339,7 +355,7 @@ function clear() {
 	$('#mins_poll').val(6)
 	$('#poll').addClass('hide')
 	$('#pollsta').text(lang.lang_no)
-	$('.mastodon-choice').map(function() {
+	$('.mastodon-choice').map(function () {
 		$(this).val('')
 	})
 	localStorage.removeItem('image')

app/js/post/secure.js

@@ -79,8 +79,8 @@ function loadVis() {
 loadVis()
 
 //コンテントワーニング
-function cw() {
+function cw(force) {
-	if ($('#cw').hasClass('cw-avail')) {
+	if ($('#cw').hasClass('cw-avail') || !force) {
 		$('#cw-text').val()
 		$('#cw-text').hide()
 		$('#cw').removeClass('yellow-text')
@@ -100,8 +100,8 @@ function cw_show(e) {
 	$(e).parent().parent().find('.cw_hide').toggleClass('cw')
 	$(e).parent().find('.cw_long').toggleClass('hide')
 }
-$(function() {
+$(function () {
-	$('#cw-text').on('change', function(event) {
+	$('#cw-text').on('change', function (event) {
 		var acct_id = $('#post-acct-sel').val()
 		var domain = localStorage.getItem('domain_' + acct_id)
 		var cwlen = $('#cw-text').val().length
@@ -126,3 +126,79 @@ function schedule() {
 		$('#sch-box').addClass('sch-avail')
 	}
 }
+
+//下書き機能
+function draftToggle(force) {
+	if ($('#draft').hasClass('hide') || force) {
+		$('#draft').removeClass('hide')
+		$('#right-side').show()
+		$('#right-side').css('width', '300px')
+		$('#left-side').css('width', 'calc(100% - 300px)')
+		var width = localStorage.getItem('postbox-width')
+		if (width) {
+			width = width.replace('px', '') * 1 + 300
+		} else {
+			width = 600
+		}
+		$('#post-box').css('width', width + 'px')
+		$('#suggest').html('')
+		$('#draft').html('')
+		draftDraw()
+	} else {
+		$('#poll').addClass('hide')
+		$('#draft').addClass('hide')
+		$('#right-side').hide()
+		$('#right-side').css('width', '300px')
+		$('#emoji').addClass('hide')
+		$('#suggest').html('')
+		$('#draft').html('')
+		$('#left-side').css('width', '100%')
+		var width = localStorage.getItem('postbox-width')
+		if (width) {
+			width = width.replace('px', '') * 1
+		} else {
+			width = 300
+		}
+		$('#post-box').css('width', width + 'px')
+	}
+}
+function draftDraw() {
+	var draft = localStorage.getItem('draft')
+	var html = `<button class="btn waves-effect green" style="width:100%; padding:0; margin-top:0;" onclick="addToDraft();">${lang.lang_secure_draft}</button>`
+	if (draft) {
+		var draftObj = JSON.parse(draft)
+		for (let i = 0; i < draftObj.length; i++) {
+			var toot = draftObj[i]
+			html = html + `<div class="tootInDraft">
+				<i class="waves-effect gray material-icons" onclick="useThisDraft(${i})" title="${lang.lang_secure_userThis}">reply</i>
+				<i class="waves-effect gray material-icons" onclick="deleteThisDraft(${i})" title="${lang.lang_secure_deleteThis}">cancel</i>
+				${escapeHTML(toot.status).replace(/\n/, '').substr(0, 10)}
+			</div>`
+		}
+	}
+	$('#draft').html(html)
+}
+function addToDraft() {
+	var json = post(null, null, true)
+	var draft = localStorage.getItem('draft')
+	var draftObj = []
+	if (draft) draftObj = JSON.parse(draft)
+	draftObj.push(json)
+	draft = JSON.stringify(draftObj)
+	localStorage.setItem('draft', draft)
+	draftDraw()
+}
+function useThisDraft(i) {
+	var draft = localStorage.getItem('draft')
+	var draftObj = JSON.parse(draft)
+	draftToPost(draftObj[i], draftObj[i]['TheDeskAcctId'], 0)
+	draftToggle()
+}
+function deleteThisDraft(i) {
+	var draft = localStorage.getItem('draft')
+	var draftObj = JSON.parse(draft)
+	draftObj.splice(i, 1)
+	draft = JSON.stringify(draftObj)
+	localStorage.setItem('draft', draft)
+	draftDraw()
+}

app/js/post/status.js

@@ -15,7 +15,7 @@ function fav(id, acct_id, remote) {
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
 	httpreq.responseType = 'json'
 	httpreq.send()
-	httpreq.onreadystatechange = function() {
+	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response
 			if (this.status !== 200) {
@@ -75,7 +75,7 @@ function rt(id, acct_id, remote, vis) {
 	} else {
 		httpreq.send()
 	}
-	httpreq.onreadystatechange = function() {
+	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response
 			if (this.status !== 200) {
@@ -131,7 +131,7 @@ function bkm(id, acct_id, tlid) {
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
 	httpreq.responseType = 'json'
 	httpreq.send()
-	httpreq.onreadystatechange = function() {
+	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response
 			if (this.status !== 200) {
@@ -160,7 +160,7 @@ function bkm(id, acct_id, tlid) {
 
 //フォロー
 async function follow(acct_id, resolve) {
-	if($('#his-data').hasClass('locked')) {
+	if ($('#his-data').hasClass('locked')) {
 		locked = true
 	} else {
 		locked = false
@@ -200,7 +200,7 @@ async function follow(acct_id, resolve) {
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
 	httpreq.responseType = 'json'
 	httpreq.send(JSON.stringify(ent))
-	httpreq.onreadystatechange = function() {
+	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response
 			if (this.status !== 200) {
@@ -212,7 +212,7 @@ async function follow(acct_id, resolve) {
 				$('#his-follow-btn-text').text(lang.lang_status_follow)
 			} else {
 				$('#his-data').addClass('following')
-				if(locked) {
+				if (locked) {
 					$('#his-follow-btn-text').text(lang.lang_status_requesting)
 				} else {
 					$('#his-follow-btn-text').text(lang.lang_status_unfollow)
@@ -278,7 +278,7 @@ function block(acct_id) {
 			httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
 			httpreq.responseType = 'json'
 			httpreq.send()
-			httpreq.onreadystatechange = function() {
+			httpreq.onreadystatechange = function () {
 				if (httpreq.readyState === 4) {
 					if (this.status !== 200) {
 						setLog(start, this.status, this.response)
@@ -338,7 +338,7 @@ function muteDo(acct_id) {
 			httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
 			httpreq.responseType = 'json'
 			httpreq.send(rq)
-			httpreq.onreadystatechange = function() {
+			httpreq.onreadystatechange = function () {
 				if (httpreq.readyState === 4) {
 					if (this.status !== 200) {
 						setLog(start, this.status, this.response)
@@ -378,7 +378,7 @@ function del(id, acct_id) {
 		httpreq.responseType = 'json'
 		httpreq.send()
 	}
-	httpreq.onreadystatechange = function() {
+	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			if (this.status !== 200) {
 				setLog(start, this.status, this.response)
@@ -420,18 +420,26 @@ function redraft(id, acct_id) {
 				httpreq.responseType = 'json'
 				httpreq.send()
 			}
-			httpreq.onreadystatechange = function() {
+			httpreq.onreadystatechange = function () {
 				if (httpreq.readyState === 4) {
 					if (this.status !== 200) {
 						setLog(start, this.status, this.response)
 					}
 					var json = httpreq.response
+					draftToPost(json, acct_id, id)
+				}
+			}
+		}
+	})
+}
+function draftToPost(json, acct_id, id) {
 	$('#post-acct-sel').prop('disabled', true)
 	$('#post-acct-sel').val(acct_id)
 	$('select').formSelect()
 	mdCheck()
 	var medias = $('[toot-id=' + id + ']').attr('data-medias')
-					var mediack = json.media_attachments[0]
+	mediack = null
+	if(json.media_attachments) mediack = json.media_attachments[0]
 	//メディアがあれば
 	var media_ids = []
 	if (mediack) {
@@ -448,16 +456,16 @@ function redraft(id, acct_id) {
 			}
 		}
 	}
-					var vismode = $('[toot-id=' + id + '] .vis-data').attr('data-vis')
+	var vismode = json.visibility
 	vis(vismode)
-					var medias = media_ids.join(',');
+	var medias = media_ids.join(',')
 	$('#media').val(medias)
 	localStorage.setItem('nohide', true)
 	show()
 	if (json.text) {
 		var html = json.text
 	} else {
-						var html = $('[toot-id=' + id + '] .toot').html()
+		var html = json.status
 		html = html.replace(/^<p>(.+)<\/p>$/, '$1')
 		html = html.replace(/<br\s?\/?>/, '\n')
 		html = html.replace(/<p>/, '\n')
@@ -467,7 +475,7 @@ function redraft(id, acct_id) {
 	}
 	$('#textarea').val(html)
 	if (json.spoiler_text) {
-						cw()
+		cw(true)
 		$('#cw-text').val(json.spoiler_text)
 	}
 	if (json.sensitive) {
@@ -478,10 +486,6 @@ function redraft(id, acct_id) {
 	if (json.in_reply_to_id) {
 		$('#reply').val(json.in_reply_to_id)
 	}
-				}
-			}
-		}
-	})
 }
 //ピン留め
 function pin(id, acct_id) {
@@ -499,7 +503,7 @@ function pin(id, acct_id) {
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
 	httpreq.responseType = 'json'
 	httpreq.send()
-	httpreq.onreadystatechange = function() {
+	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response
 			if (this.status !== 200) {
@@ -530,7 +534,7 @@ function request(id, flag, acct_id) {
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
 	httpreq.responseType = 'json'
 	httpreq.send()
-	httpreq.onreadystatechange = function() {
+	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response
 			if (this.status !== 200) {
@@ -556,7 +560,7 @@ function domainblock(add, flag, acct_id) {
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
 	httpreq.responseType = 'json'
 	httpreq.send()
-	httpreq.onreadystatechange = function() {
+	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response
 			if (this.status !== 200) {
@@ -583,7 +587,7 @@ function empUser() {
 		M.toast({ html: id + lang.lang_status_emphas, displayLength: 4000 })
 	} else {
 		var can
-		Object.keys(obj).forEach(function(key) {
+		Object.keys(obj).forEach(function (key) {
 			var usT = obj[key]
 			if (usT != id && !can) {
 				can = false
@@ -615,7 +619,7 @@ function pinUser() {
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
 	httpreq.responseType = 'json'
 	httpreq.send()
-	httpreq.onreadystatechange = function() {
+	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response
 			if (this.status !== 200) {
@@ -651,20 +655,20 @@ function staEx(mode) {
 			Authorization: 'Bearer ' + at
 		}
 	})
-		.then(function(response) {
+		.then(function (response) {
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function(error) {
+		.catch(function (error) {
 			todo(error)
 			setLog(start, 'JSON', error)
 			console.error(error)
 		})
-		.then(function(json) {
+		.then(function (json) {
 			if (json.statuses) {
 				if (json.statuses[0]) {
 					var id = json.statuses[0].id
@@ -680,37 +684,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/post/suggest.js

@@ -18,7 +18,7 @@ input.addEventListener(
 			var new_val = input.value
 			if (new_val == '') {
 				$('#suggest').html('')
-				if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide')) {
+				if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide') && $('#draft').hasClass('hide')) {
 					$('#right-side').hide()
 					$('#right-side').css('width', '300px')
 					$('#left-side').css('width', '100%')
@@ -41,7 +41,7 @@ input.addEventListener(
 					var q = acct[1]
 				} else {
 					$('#suggest').html('')
-					if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide')) {
+					if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide') && $('#draft').hasClass('hide')) {
 						$('#right-side').hide()
 						$('#right-side').css('width', '300px')
 						$('#left-side').css('width', '100%')
@@ -138,6 +138,7 @@ input.addEventListener(
 									$('#post-box').css('width', width + 'px')
 									$('#poll').addClass('hide')
 									$('#emoji').addClass('hide')
+									$('#draft').addClass('hide')
 								}
 							} else if (json.accounts[0] && acct[1]) {
 								var accts = ''
@@ -165,8 +166,9 @@ input.addEventListener(
 								$('#suggest').html(accts)
 								$('#poll').addClass('hide')
 								$('#emoji').addClass('hide')
+								$('#draft').addClass('hide')
 							} else {
-								if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide')) {
+								if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide') && $('#draft').hasClass('hide')) {
 									$('#right-side').hide()
 									$('#right-side').css('width', '300px')
 									$('#left-side').css('width', '100%')
@@ -226,7 +228,7 @@ function tagInsert(code, del) {
 	}
 	sentence = before + word + after
 	textarea.value = sentence
-	if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide')) {
+	if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide') && $('#draft').hasClass('hide')) {
 		$('#right-side').hide()
 		$('#right-side').css('width', '300px')
 		$('#left-side').css('width', '50%')

app/js/post/use-txtbox.js

@@ -1,5 +1,5 @@
 /*リプライ*/
-function re(id, ats_cm, acct_id, mode) {
+function re(id, ats_cm, acct_id, mode, cwTxt) {
 	clear()
 	var ats = ats_cm.split(',')
 	localStorage.setItem('nohide', true)
@@ -25,13 +25,18 @@ function re(id, ats_cm, acct_id, mode) {
 	}
 	$('#acct-sel-prof').attr('src', profimg)
 	vis(mode)
+	if(localStorage.getItem('cw-continue') == 'yes') {
+		cw(true)
+		$('#cw-text').val(cwTxt)
+	}
 }
 function reEx(id) {
 	$('#tootmodal').modal('close')
 	var at = $('#tootmodal').attr('data-user')
 	var acct_id = $('#status-acct-sel').val()
 	var mode = $('#tootmodal .vis-data').attr('data-vis')
-	re(id, at, acct_id, mode)
+	var cwTxt = $('#cw-text').val()
+	re(id, at, acct_id, mode, cwTxt)
 }
 //引用
 function qt(id, acct_id, at, url) {

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>
@@ -1087,7 +1085,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						</a>
 					</div>
 					<div class="action ${disp['re']} ${noauth}">
-						<a onclick="re('${toot.id}','${to_mention}','${acct_id}','${visen}')" 
+						<a onclick="re('${toot.id}','${to_mention}','${acct_id}','${visen}','${escapeHTML(toot.spoiler_text)}')" 
 							class="waves-effect waves-dark btn-flat actct rep-btn"
 							data-men="${to_mention}" data-visen="${visen}" style="padding:0" title="${lang.lang_parse_replyto}">
 								<i class="fas fa-share"></i>
@@ -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') location.reload()
+		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') location.reload()
+		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/poll.js

@@ -25,6 +25,7 @@ function pollToggle() {
 		}
 		$('#post-box').css('width', width + 'px')
 		$('#emoji').addClass('hide')
+		$('#draft').addClass('hide')
 		$('#poll').addClass('hide')
 		$('#pollsta').text(lang.lang_no)
 	}

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

@@ -101,7 +101,7 @@ if (location.search) {
 		$('.mini-btn').text('expand_less')
 	}
 }
-window.onload = initPostbox
+window.onload = function () { initPostbox(); connection() }
 function initPostbox() {
 	$('#posttgl').click(function (e) {
 		if (!$('#post-box').hasClass('appear')) {
@@ -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
-			},
-		},
-		strings: {
-			save: 'Save', // Default for save button
-			clear: 'Clear', // Default for clear button
-		},
-	})
-	pickr.on('change', (...args) => {
-		var rgb = 'rgb(' + args[0].toRGBA()[0] + ',' + args[0].toRGBA()[1] + ',' + args[0].toRGBA()[2] + ')'
-		$('#color-picker' + i + '_value').val(rgb)
 				})
+				break
+			}
+			color = $(`#color-picker${i}_value`).val()
+			break
+		}
+		i++
+	}
+	if(!color) return false
+	for (tag of props) {
+		if(tag == to) {
+			$(`#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 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')) {
 	var accentC = $('#color-picker3_value').val()
-		if (!accentC) {
+	var multi = localStorage.getItem('multi')
-			accentC = null
+	let advanced = [
-		}
+		'modal', 'modalFooter', 'third', 'forth',
-		var activeC = $('#color-picker4_value').val()
+		'bottom', 'emphasized', 'postbox', 'active',
-		if (!activeC) {
+		'selected', 'selectedWithShared'
-			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 = {}
+	let i = 4
+	for (tag of advanced) {
+		let used = $(`#use-color_${i}`).prop('checked')
+		if (used) {
+			advanceTheme[tag] = $(`#color-picker${i}_value`).val()
+		}
+		i++
 	}
 
 	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)
+	]
+	let i = 4
+	for (tag of advanced) {
+		if (args.advanced[tag]) {
+			$(`#color-picker${i}_value`).val(args.advanced[tag])
+
+		}
+		$(`#use-color_${i}`).prop('checked', true)
+		i++
+	}
 	$('#custom_json').val(raw[1])
-}
+	if(args.default) {
-function advancedConncet(args, tar, sub, i) {
+		$('#delTheme').addClass('disabled')
-	if (args.props) {
-		if (args.props[tar]) {
-			var color = args.props[tar]
-			$('#pickers').addClass('advanceTheme')
-			$('.advanced').removeClass('hide')
-		} else {
-			var color = args.vars[sub]
 	}
-	} else {
-		var color = args.vars[sub]
-	}
-	$('#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,23 +31,131 @@ function css(mainWindow) {
 		}
 	})
 	ipc.on('theme-json-delete', function (e, arg) {
-		var themecss = join(app.getPath("userData"), arg + ".thedesktheme");
+		try{
+			var themecss = join(app.getPath("userData"), arg);
 			console.log(themecss);
 			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 themecss = join(app.getAppPath(), '/source/themes', arg)
 			var raw = fs.readFileSync(themecss, 'utf8')
-		var json = JSON5.parse(raw);
+			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'))
+		}
 
+		try {
+			var css
+			if (json.version) {
+				var bg = json.primary.background
+				var subcolor = json.primary.subcolor
+				var text = json.primary.text
+				var accent = json.primary.accent
+				if (json.base == "light") {
+					var drag = "rgba(255, 255, 255, 0.8)";
+					var beforehover = "#757575";
+					var selected = "#3f3f3f"
+					var selectedWithShare = "#b2babd"
+					var gray = "#757575"
+					var hisData = 'rgba(255, 255, 255, 0.9)'
+				} else {
+					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.advanced) {
+					json.advanced = {}
+				}
+				if (json.advanced.modal) {
+					var modal = json.advanced.modal
+				} else {
+					var modal = bg
+				}
+				if (json.advanced.modalFooter) {
+					var modalFooter = json.advanced.modalFooter
+				} else {
+					var modalFooter = bg
+					if (modal != bg) modalFooter = modal
+				}
+				if (json.advanced.thirdColor) {
+					var thirdColor = json.advanced.thirdColor
+				} else {
+					var thirdColor = subcolor
+				}
+				if (json.advanced.forthColor) {
+					var forthColor = json.advanced.forthColor
+				} else {
+					var forthColor = subcolor
+					if (thirdColor != subcolor) forthColor = thirdColor
+				}
+				if (json.advanced.bottom) {
+					var bottom = json.advanced.bottom
+				} else {
+					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
+				}
+
+				var css = ":root {--bg:" + bg + ";--drag:" + drag + ";" +
+					"--text:" + text + ";--beforehover:" + beforehover + ";--modal:" +
+					modal + ";--thirdColor:" + thirdColor + ";--subcolor:" + forthColor +
+					";--bottom:" + bottom + ";--accent:" + accent + ";" + ";--emphasized:" + emphasized + ";--his-data:" +
+					hisData +
+					";--active:" + active + ";--postbox:" + postbox + ";--modalfooter:" +
+					modalFooter + ";--selected:" + selected + ";--selectedWithShare:" + selectedWithShare +
+					";--gray:" + gray + ";}" +
+					".customtheme #imagemodal{background: url(\"../img/pixel.svg\");}";
+			} else {
+				var css = compatibleTheme(json)
+			}
+			e.sender.webContents.send('theme-css-response', css);
+		} catch (e) {
+			var css = "";
+		}
+
+	})
+	function compatibleTheme(json) {
 		var primary = json.vars.primary;
 		var secondary = json.vars.secondary;
 		var text = json.vars.text;
@@ -64,34 +172,34 @@ function css(mainWindow) {
 			var selectedWithShare = "#003a30"
 			var gray = "#cccccc"
 		}
-			if (json.props) {
+		if (json.advanced) {
-				if (json.props.TheDeskAccent) {
+			if (json.advanced.TheDeskAccent) {
-					var emphasized = json.props.TheDeskAccent
+				var emphasized = json.advanced.TheDeskAccent
 			} else {
 				var emphasized = secondary
 			}
-				if (json.props.TheDeskActive) {
+			if (json.advanced.TheDeskActive) {
-					var active = json.props.TheDeskActive
+				var active = json.advanced.TheDeskActive
 			} else {
 				var active = primary
 			}
-				if (json.props.TheDeskModal) {
+			if (json.advanced.TheDeskModal) {
-					var modal = json.props.TheDeskModal
+				var modal = json.advanced.TheDeskModal
 			} else {
 				var modal = secondary
 			}
-				if (json.props.TheDeskBottom) {
+			if (json.advanced.TheDeskBottom) {
-					var bottom = json.props.TheDeskBottom
+				var bottom = json.advanced.TheDeskBottom
 			} else {
 				var bottom = primary
 			}
-				if (json.props.TheDeskPostbox) {
+			if (json.advanced.TheDeskPostbox) {
-					var postbox = json.props.TheDeskPostbox
+				var postbox = json.advanced.TheDeskPostbox
 			} else {
 				var postbox = primary
 			}
-				if (json.props.TheDeskSubcolor) {
+			if (json.advanced.TheDeskSubcolor) {
-					var subcolor = json.props.TheDeskSubcolor
+				var subcolor = json.advanced.TheDeskSubcolor
 			} else {
 				var subcolor = primary
 			}
@@ -106,44 +214,63 @@ function css(mainWindow) {
 		}
 
 		var css = ".customtheme {--bg:" + secondary + ";--drag:" + drag + ";" +
-				"--color:" + text + ";--beforehover:" + beforehover + ";--modal:" +
+			"--text:" + text + ";--beforehover:" + beforehover + ";--modal:" +
-				modal + ";--subcolor:" + subcolor + ";--box:" + subcolor +
+			modal + ";--thirdColor:" + subcolor + ";--subcolor:" + subcolor +
-				";--sidebar:" + bottom + ";--shared:" + emphasized + ";" +
+			";--bottom:" + bottom + ";--accent:" + emphasized + ";" +
-				"--notfbox:" + secondary + ";--emphasized:" + active + ";--his-data:" +
+			"--subcolor:" + secondary + ";--emphasized:" + active + ";--his-data:" +
 			secondary +
 			";--active:" + active + ";--postbox:" + postbox + ";--modalfooter:" +
 			primary +
-				";--accentbtn:" + subcolor + ";--selected:" + selected + ";--selectedWithShare:" + selectedWithShare + "}"+
+			";--active:" + subcolor + ";--selected:" + selected + ";--selectedWithShare:" + selectedWithShare + "}" +
-				"--gray:" + gray + ";"+
+			"--gray:" + gray + ";" +
 			".customtheme #imagemodal{background: url(\"../img/pixel.svg\");}";
-			e.sender.webContents.send('theme-css-response', css);
+		return css
-		} catch (e) {
-			var css = "";
 	}
-
-	})
 	ipc.on('theme-json-list', function (e, arg) {
-		fs.readdir(app.getPath("userData"), function (err, files) {
+		var files1 = fs.readdirSync(join(app.getAppPath(), '/source/themes'))
-			if (err || !files) throw err;
+		var file1List = files1.filter(function (file) {
-			var fileList = files.filter(function (file) {
+			if (file.match(/\.thedesktheme$/)) {
-				if(file.match(/\.thedesktheme$/)){
+				var tfile = join(app.getAppPath(), '/source/themes', file)
-					var tfile = join(app.getPath("userData"), file)
 				return fs.statSync(tfile).isFile() && /.*\.thedesktheme$/.test(tfile)
-				}else{
+			} else {
 				return null
 			}
 		})
 		var themes = [];
-			for (var i = 0; i < fileList.length; i++) {
+		for (var i = 0; i < file1List.length; i++) {
-				var themecss = join(app.getPath("userData"), fileList[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
+				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/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.1",
+    "version": "21.3.0",
     "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": [
@@ -54,29 +59,28 @@
     ],
     "license": "GPL-3.0",
     "dependencies": {
-        "@fortawesome/fontawesome-free": "^5.14.0",
+        "@fortawesome/fontawesome-free": "^5.15.1",
-        "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.10.0",
         "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.3",
-        "electron": "^9.1.1",
+        "electron": "^10.1.5",
-        "electron-builder": "^22.7.0",
+        "electron-builder": "^22.9.1",
-        "electron-rebuild": "^1.11.0",
+        "electron-rebuild": "^2.3.2",
-        "eslint": "^7.6.0",
+        "eslint": "^7.13.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

@@ -1,5 +1,7 @@
 {
     "draghere": "Drag here to upload",
+    "nowOffline": "OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet",
+    "reOnline": "Now we are in the Internet, you should reload...",
     "close": "Close",
     "webSrc": "Search on Web",
     "tsSrc": "Search on tootsearch",
@@ -45,6 +47,7 @@
     "thingsEmoji": "Emojis of tools",
     "symbolEmoji": "Emojis of symbols",
     "flagsEmoji": "Emojis of flags",
+    "draft": "Draft",
     "poll": "Poll",
     "pollDdisabled": "Polls: Disabled",
     "pollProvider": "Provider of Poll",
@@ -130,7 +133,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

@@ -71,6 +71,7 @@
     "lang_post_btn3": "Continue to post",
     "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
     "lang_post_retry": "Retry",
+    "lang_post_offline": "Add to the drafts because of offline",
     "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
     "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
     "lang_status_follow": "Follow",
@@ -87,6 +88,9 @@
     "lang_status_endorse": "Feature on profile",
     "lang_status_followers": "Followers",
     "lang_status_active": "Last status",
+    "lang_secure_draft": "Add to draft",
+    "lang_secure_useThis": "Use this",
+    "lang_secure_deleteThis": "Delete this",
     "lang_suggest_nodata": "Please get emojis list in order to show suggestion.",
     "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
     "lang_cards_check": " check",
@@ -131,13 +135,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 +230,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 +245,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

@@ -1,5 +1,7 @@
 {
     "draghere": "Drag here to upload",
+    "nowOffline": "OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet",
+    "reOnline": "Now we are in the Internet, you should reload...",
     "close": "Close",
     "webSrc": "Search on Web",
     "tsSrc": "Search on tootsearch",
@@ -45,6 +47,7 @@
     "thingsEmoji": "Emojis of tools",
     "symbolEmoji": "Emojis of symbols",
     "flagsEmoji": "Emojis of flags",
+    "draft": "Draft",
     "poll": "Poll",
     "pollDdisabled": "Polls: Disabled",
     "pollProvider": "Provider of Poll",
@@ -130,7 +133,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

@@ -71,6 +71,7 @@
     "lang_post_btn3": "Continue to post",
     "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
     "lang_post_retry": "Retry",
+    "lang_post_offline": "Add to the drafts because of offline",
     "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
     "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
     "lang_status_follow": "Follow",
@@ -87,6 +88,9 @@
     "lang_status_endorse": "Feature on profile",
     "lang_status_followers": "Followers",
     "lang_status_active": "Last status",
+    "lang_secure_draft": "Add to draft",
+    "lang_secure_useThis": "Use this",
+    "lang_secure_deleteThis": "Delete this",
     "lang_suggest_nodata": "Please get emojis list in order to show suggestion.",
     "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
     "lang_cards_check": " check",
@@ -131,13 +135,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 +230,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 +245,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/index.json

@@ -1,5 +1,7 @@
 {
     "draghere": "Плъзнете тук за да качите",
+    "nowOffline": "OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet",
+    "reOnline": "Now we are in the Internet, you should reload...",
     "close": "Затвори",
     "webSrc": "Search on Web",
     "tsSrc": "Search on tootsearch",
@@ -45,6 +47,7 @@
     "thingsEmoji": "Емоти с инструменти",
     "symbolEmoji": "Емоти със символи",
     "flagsEmoji": "Емоти с флагове",
+    "draft": "Draft",
     "poll": "Анкета",
     "pollDdisabled": "Анкети: Деактивирани",
     "pollProvider": "Доставчик на Анкета",

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

@@ -71,6 +71,7 @@
     "lang_post_btn3": "Продължете към публикуването",
     "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
     "lang_post_retry": "Retry",
+    "lang_post_offline": "Add to the drafts because of offline",
     "lang_status_favWarn": "Ще отнеме минута раздумката отдалечено да стане любима.",
     "lang_status_btWarn": "Ще отнеме минута раздумката отдалечено да бъде подсилена.",
     "lang_status_follow": "Следване",
@@ -87,6 +88,9 @@
     "lang_status_endorse": "Функция в профила",
     "lang_status_followers": "Последователи",
     "lang_status_active": "Последно състояние",
+    "lang_secure_draft": "Add to draft",
+    "lang_secure_useThis": "Use this",
+    "lang_secure_deleteThis": "Изтрийте тази раздумка",
     "lang_suggest_nodata": "Моля, вземете списък с емотикони за да покажете състояние.",
     "lang_usetxtbox_reply": "Режим на отговор. Ctrl+Shift+C за изчистване.",
     "lang_cards_check": " проверка",
@@ -136,7 +140,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 +230,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 +245,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

@@ -1,5 +1,7 @@
 {
     "draghere": "Drag here to upload",
+    "nowOffline": "OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet",
+    "reOnline": "Now we are in the Internet, you should reload...",
     "close": "Close",
     "webSrc": "Search on Web",
     "tsSrc": "Search on tootsearch",
@@ -45,6 +47,7 @@
     "thingsEmoji": "Emojis of tools",
     "symbolEmoji": "Emojis of symbols",
     "flagsEmoji": "Emojis of flags",
+    "draft": "Draft",
     "poll": "Poll",
     "pollDdisabled": "Polls: Disabled",
     "pollProvider": "Provider of Poll",
@@ -130,7 +133,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

@@ -71,6 +71,7 @@
     "lang_post_btn3": "Continue to post",
     "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
     "lang_post_retry": "Retry",
+    "lang_post_offline": "Add to the drafts because of offline",
     "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
     "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
     "lang_status_follow": "Follow",
@@ -87,6 +88,9 @@
     "lang_status_endorse": "Feature on profile",
     "lang_status_followers": "Followers",
     "lang_status_active": "Last status",
+    "lang_secure_draft": "Add to draft",
+    "lang_secure_useThis": "Use this",
+    "lang_secure_deleteThis": "Delete this",
     "lang_suggest_nodata": "Please get emojis list in order to show suggestion.",
     "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
     "lang_cards_check": " check",
@@ -131,13 +135,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 +230,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 +245,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/index.json

@@ -1,5 +1,7 @@
 {
     "draghere": "Přetáhněte sem pro nahrání",
+    "nowOffline": "OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet",
+    "reOnline": "Now we are in the Internet, you should reload...",
     "close": "Zavřít",
     "webSrc": "Search on Web",
     "tsSrc": "Search on tootsearch",
@@ -45,6 +47,7 @@
     "thingsEmoji": "Emojis of tools",
     "symbolEmoji": "Emojis of symbols",
     "flagsEmoji": "Emojis of flags",
+    "draft": "Draft",
     "poll": "Anketa",
     "pollDdisabled": "Polls: Disabled",
     "pollProvider": "Provider of Poll",

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

@@ -71,6 +71,7 @@
     "lang_post_btn3": "Pokračovat k přispívání",
     "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
     "lang_post_retry": "Retry",
+    "lang_post_offline": "Add to the drafts because of offline",
     "lang_status_favWarn": "Oblíbení vzdáleného tootu bude chvíli trvat.",
     "lang_status_btWarn": "Boostnutí vzdáleného tootu bude chvíli trvat.",
     "lang_status_follow": "Sledovat",
@@ -87,6 +88,9 @@
     "lang_status_endorse": "Představit na profilu",
     "lang_status_followers": "Followers",
     "lang_status_active": "Last status",
+    "lang_secure_draft": "Add to draft",
+    "lang_secure_useThis": "Use this",
+    "lang_secure_deleteThis": "Smazat tento toot",
     "lang_suggest_nodata": "Pro zobrazení návrhu prosím získejte seznam emoji.",
     "lang_usetxtbox_reply": "Režim odpovězení. Pro vymazání stiskněte Ctrl+Shift+C.",
     "lang_cards_check": " kontrolovat",
@@ -136,7 +140,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 +230,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 +245,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

@@ -1,5 +1,7 @@
 {
     "draghere": "Drag here to upload",
+    "nowOffline": "OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet",
+    "reOnline": "Now we are in the Internet, you should reload...",
     "close": "Close",
     "webSrc": "Search on Web",
     "tsSrc": "Search on tootsearch",
@@ -45,6 +47,7 @@
     "thingsEmoji": "Emojis of tools",
     "symbolEmoji": "Emojis of symbols",
     "flagsEmoji": "Emojis of flags",
+    "draft": "Draft",
     "poll": "Poll",
     "pollDdisabled": "Polls: Disabled",
     "pollProvider": "Provider of Poll",
@@ -130,7 +133,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

@@ -71,6 +71,7 @@
     "lang_post_btn3": "Continue to post",
     "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
     "lang_post_retry": "Retry",
+    "lang_post_offline": "Add to the drafts because of offline",
     "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
     "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
     "lang_status_follow": "Follow",
@@ -87,6 +88,9 @@
     "lang_status_endorse": "Feature on profile",
     "lang_status_followers": "Followers",
     "lang_status_active": "Last status",
+    "lang_secure_draft": "Add to draft",
+    "lang_secure_useThis": "Use this",
+    "lang_secure_deleteThis": "Delete this",
     "lang_suggest_nodata": "Please get emojis list in order to show suggestion.",
     "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
     "lang_cards_check": " check",
@@ -131,13 +135,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 +230,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 +245,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

@@ -1,5 +1,7 @@
 {
     "draghere": "Zum Hochladen hier her ziehen",
+    "nowOffline": "OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet",
+    "reOnline": "Now we are in the Internet, you should reload...",
     "close": "Schließen",
     "webSrc": "Suche im Internet",
     "tsSrc": "Bei Tootsearch suchen",
@@ -20,8 +22,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",
@@ -45,6 +47,7 @@
     "thingsEmoji": "Emojis vom Werkzeugen",
     "symbolEmoji": "Emojis von Symbolen",
     "flagsEmoji": "Emojis der Flaggen",
+    "draft": "Draft",
     "poll": "Umfrage",
     "pollDdisabled": "Umfragen: Deaktiviert",
     "pollProvider": "Anbieter von Umfragen",
@@ -75,7 +78,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 +142,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 +187,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

@@ -71,6 +71,7 @@
     "lang_post_btn3": "Weiter mit Senden",
     "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
     "lang_post_retry": "Retry",
+    "lang_post_offline": "Add to the drafts because of offline",
     "lang_status_favWarn": "Es braucht einen Moment, um ein entferntes Tröt zu favorisieren.",
     "lang_status_btWarn": "Es braucht einen Moment, um ein entferntes Tröt zu verstärken.",
     "lang_status_follow": "Folgen",
@@ -87,6 +88,9 @@
     "lang_status_endorse": "Auf dem Profil zeigen",
     "lang_status_followers": "Folgende",
     "lang_status_active": "Letzter Status",
+    "lang_secure_draft": "Add to draft",
+    "lang_secure_useThis": "Use this",
+    "lang_secure_deleteThis": "Diesen Tröt löschen",
     "lang_suggest_nodata": "Please get emojis list in order to show suggestion.",
     "lang_usetxtbox_reply": "Antwortmodus. Strg+Umschalt+C zum Löschen.",
     "lang_cards_check": " überprüfen",
@@ -136,7 +140,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 +230,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 +245,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

@@ -1,5 +1,7 @@
 {
     "draghere": "Drag here to upload",
+    "nowOffline": "OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet",
+    "reOnline": "Now we are in the Internet, you should reload...",
     "close": "Close",
     "webSrc": "Search on Web",
     "tsSrc": "Search on tootsearch",
@@ -45,6 +47,7 @@
     "thingsEmoji": "Emojis of tools",
     "symbolEmoji": "Emojis of symbols",
     "flagsEmoji": "Emojis of flags",
+    "draft": "Draft",
     "poll": "Poll",
     "pollDdisabled": "Polls: Disabled",
     "pollProvider": "Provider of Poll",
@@ -130,7 +133,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

@@ -71,6 +71,7 @@
     "lang_post_btn3": "Continue to post",
     "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
     "lang_post_retry": "Retry",
+    "lang_post_offline": "Add to the drafts because of offline",
     "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
     "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
     "lang_status_follow": "Follow",
@@ -87,6 +88,9 @@
     "lang_status_endorse": "Feature on profile",
     "lang_status_followers": "Followers",
     "lang_status_active": "Last status",
+    "lang_secure_draft": "Add to draft",
+    "lang_secure_useThis": "Use this",
+    "lang_secure_deleteThis": "Delete this",
     "lang_suggest_nodata": "Please get emojis list in order to show suggestion.",
     "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
     "lang_cards_check": " check",
@@ -131,13 +135,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 +230,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 +245,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/index.json

@@ -1,5 +1,7 @@
 {
     "draghere": "crwdns3058:0crwdne3058:0",
+    "nowOffline": "crwdns4548:0crwdne4548:0",
+    "reOnline": "crwdns4550:0crwdne4550:0",
     "close": "crwdns3060:0crwdne3060:0",
     "webSrc": "crwdns4451:0crwdne4451:0",
     "tsSrc": "crwdns4453:0crwdne4453:0",
@@ -45,6 +47,7 @@
     "thingsEmoji": "crwdns3140:0crwdne3140:0",
     "symbolEmoji": "crwdns3142:0crwdne3142:0",
     "flagsEmoji": "crwdns3144:0crwdne3144:0",
+    "draft": "crwdns4540:0crwdne4540:0",
     "poll": "crwdns3146:0crwdne3146:0",
     "pollDdisabled": "crwdns3148:0crwdne3148:0",
     "pollProvider": "crwdns3150:0crwdne3150:0",

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

@@ -71,6 +71,7 @@
     "lang_post_btn3": "crwdns3538:0crwdne3538:0",
     "lang_post_unfinishedMedia": "crwdns4480:0crwdne4480:0",
     "lang_post_retry": "crwdns4482:0crwdne4482:0",
+    "lang_post_offline": "crwdns4552:0crwdne4552:0",
     "lang_status_favWarn": "crwdns3540:0crwdne3540:0",
     "lang_status_btWarn": "crwdns3542:0crwdne3542:0",
     "lang_status_follow": "crwdns3544:0crwdne3544:0",
@@ -87,6 +88,9 @@
     "lang_status_endorse": "crwdns3566:0crwdne3566:0",
     "lang_status_followers": "crwdns3568:0crwdne3568:0",
     "lang_status_active": "crwdns3570:0crwdne3570:0",
+    "lang_secure_draft": "crwdns4542:0crwdne4542:0",
+    "lang_secure_useThis": "crwdns4544:0crwdne4544:0",
+    "lang_secure_deleteThis": "crwdns4546:0crwdne4546:0",
     "lang_suggest_nodata": "crwdns3572:0crwdne3572:0",
     "lang_usetxtbox_reply": "crwdns3574:0crwdne3574:0",
     "lang_cards_check": "crwdns3576:0crwdne3576:0",
@@ -136,7 +140,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 +230,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 +245,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/index.json

@@ -1,5 +1,7 @@
 {
     "draghere":"Drag here to upload",
+    "nowOffline":"OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet",
+    "reOnline":"Now we are in the Internet, you should reload...",
     "close":"Close",
     "webSrc": "Search on Web",
     "tsSrc": "Search on tootsearch",
@@ -45,6 +47,7 @@
     "thingsEmoji":"Emojis of tools",
     "symbolEmoji":"Emojis of symbols",
     "flagsEmoji":"Emojis of flags",
+    "draft": "Draft",
     "poll":"Poll",
     "pollDdisabled":"Polls: Disabled",
     "pollProvider":"Provider of Poll",

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

@@ -71,6 +71,7 @@
     "lang_post_btn3": "Continue to post",
     "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
     "lang_post_retry": "Retry",
+    "lang_post_offline": "Add to the drafts because of offline",
     "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
     "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
     "lang_status_follow": "Follow",
@@ -87,6 +88,9 @@
     "lang_status_endorse": "Feature on profile",
     "lang_status_followers": "Followers",
     "lang_status_active": "Last status",
+    "lang_secure_draft": "Add to draft",
+    "lang_secure_useThis": "Use this",
+    "lang_secure_deleteThis": "Delete this",
     "lang_suggest_nodata": "Please get emojis list in order to show suggestion.",
     "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
     "lang_cards_check": " check",
@@ -131,13 +135,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 +230,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 +245,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,10 @@
 {
     "draghere": "Arrastrá y soltá acá para subir",
+    "nowOffline": "OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet",
+    "reOnline": "Now we are in the Internet, you should reload...",
     "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",
@@ -45,6 +47,7 @@
     "thingsEmoji": "Herramientas",
     "symbolEmoji": "Símbolos",
     "flagsEmoji": "Banderas",
+    "draft": "Draft",
     "poll": "Encuesta",
     "pollDdisabled": "Encuestas: deshabilitadas",
     "pollProvider": "Proveedor de encuesta",
@@ -75,7 +78,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 +133,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 +142,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 +181,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,9 @@
     "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_post_offline": "Add to the drafts because of offline",
     "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",
@@ -87,6 +88,9 @@
     "lang_status_endorse": "Destacado en el perfil",
     "lang_status_followers": "Seguidores",
     "lang_status_active": "Último estado",
+    "lang_secure_draft": "Add to draft",
+    "lang_secure_useThis": "Use this",
+    "lang_secure_deleteThis": "Eliminar este toot",
     "lang_suggest_nodata": "Por favor, obtené la lista de emojis para mostrar sugerencias.",
     "lang_usetxtbox_reply": "Modo de respuesta. \"Ctrl\" + \"Mayús\" + \"C\" para limpiar.",
     "lang_cards_check": " comprobado",
@@ -127,7 +131,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 +140,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 +152,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 +174,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 +182,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 +229,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 +245,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

@@ -1,5 +1,7 @@
 {
     "draghere": "Drag here to upload",
+    "nowOffline": "OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet",
+    "reOnline": "Now we are in the Internet, you should reload...",
     "close": "Close",
     "webSrc": "Search on Web",
     "tsSrc": "Search on tootsearch",
@@ -45,6 +47,7 @@
     "thingsEmoji": "Emojis of tools",
     "symbolEmoji": "Emojis of symbols",
     "flagsEmoji": "Emojis of flags",
+    "draft": "Draft",
     "poll": "Poll",
     "pollDdisabled": "Polls: Disabled",
     "pollProvider": "Provider of Poll",
@@ -130,7 +133,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

@@ -71,6 +71,7 @@
     "lang_post_btn3": "Continue to post",
     "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
     "lang_post_retry": "Retry",
+    "lang_post_offline": "Add to the drafts because of offline",
     "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
     "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
     "lang_status_follow": "Follow",
@@ -87,6 +88,9 @@
     "lang_status_endorse": "Feature on profile",
     "lang_status_followers": "Followers",
     "lang_status_active": "Last status",
+    "lang_secure_draft": "Add to draft",
+    "lang_secure_useThis": "Use this",
+    "lang_secure_deleteThis": "Delete this",
     "lang_suggest_nodata": "Please get emojis list in order to show suggestion.",
     "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
     "lang_cards_check": " check",
@@ -131,13 +135,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 +230,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 +245,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

@@ -1,5 +1,7 @@
 {
     "draghere": "Drag here to upload",
+    "nowOffline": "OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet",
+    "reOnline": "Now we are in the Internet, you should reload...",
     "close": "Close",
     "webSrc": "Search on Web",
     "tsSrc": "Search on tootsearch",
@@ -45,6 +47,7 @@
     "thingsEmoji": "Emojis of tools",
     "symbolEmoji": "Emojis of symbols",
     "flagsEmoji": "Emojis of flags",
+    "draft": "Draft",
     "poll": "Poll",
     "pollDdisabled": "Polls: Disabled",
     "pollProvider": "Provider of Poll",
@@ -130,7 +133,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

@@ -71,6 +71,7 @@
     "lang_post_btn3": "Continue to post",
     "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
     "lang_post_retry": "Retry",
+    "lang_post_offline": "Add to the drafts because of offline",
     "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
     "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
     "lang_status_follow": "Follow",
@@ -87,6 +88,9 @@
     "lang_status_endorse": "Feature on profile",
     "lang_status_followers": "Followers",
     "lang_status_active": "Last status",
+    "lang_secure_draft": "Add to draft",
+    "lang_secure_useThis": "Use this",
+    "lang_secure_deleteThis": "Delete this",
     "lang_suggest_nodata": "Please get emojis list in order to show suggestion.",
     "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
     "lang_cards_check": " check",
@@ -131,13 +135,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 +230,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 +245,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

@@ -1,5 +1,7 @@
 {
     "draghere": "Faites glisser ici pour transférer",
+    "nowOffline": "OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet",
+    "reOnline": "Now we are in the Internet, you should reload...",
     "close": "Fermer",
     "webSrc": "Search on Web",
     "tsSrc": "Search on tootsearch",
@@ -45,6 +47,7 @@
     "thingsEmoji": "Emojis of tools",
     "symbolEmoji": "Emojis of symbols",
     "flagsEmoji": "Emojis of flags",
+    "draft": "Draft",
     "poll": "Poll",
     "pollDdisabled": "Polls: Disabled",
     "pollProvider": "Provider of Poll",
@@ -130,7 +133,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

@@ -71,6 +71,7 @@
     "lang_post_btn3": "Continue to post",
     "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
     "lang_post_retry": "Retry",
+    "lang_post_offline": "Add to the drafts because of offline",
     "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
     "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
     "lang_status_follow": "Suivre",
@@ -87,6 +88,9 @@
     "lang_status_endorse": "Recommander sur son profile",
     "lang_status_followers": "Followers",
     "lang_status_active": "Last status",
+    "lang_secure_draft": "Add to draft",
+    "lang_secure_useThis": "Use this",
+    "lang_secure_deleteThis": "Supprimer ce pouet",
     "lang_suggest_nodata": "Please get emojis list in order to show suggestion.",
     "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
     "lang_cards_check": " check",
@@ -136,8 +140,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 +230,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 +245,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

@@ -5,60 +5,68 @@
   "no": "Non",
   "none": "Aucun",
   "show": "Show",
-  "hide": "Hide",
+  "hide": "Cacher",
   "default": "Par défaut",
   "change": "Modifier",
-  "select": "Select",
+  "select": "Sélectionner",
   "env": "Préférences système",
   "setlang": "Langues",
-  "backup": "Import and export of preferences",
+  "backup": "Importer et exporter les préférences",
-  "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": "Si vous avez une erreur lorsque vous choisissez le fichier, veuillez coller les chaînes affichées lorsque vous ouvrez le fichier et cliquez sur Importer",
   "import": "Importer",
   "export": "Exporter",
-  "hardwareAcceleration": "Disable hardware acceleration",
+  "hardwareAcceleration": "Désactiver l'accélération matérielle",
-  "hardwareAccelerationWarn": "Auto restarted",
+  "hardwareAccelerationWarn": "Redémarrage Automatique",
   "theme": "Thèmes",
-  "popup": "Popup notification",
+  "popup": "Notification pop-up",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
-  "nnwarn": "This does not work on Windows Portable ver.",
+  "nnwarn": "Cela ne fonctionne pas sur la version portable pour Windows.",
   "nntest": "Notification test",
-  "minwidth": "Minimam width of columns",
+  "width": "Largeur des colonnes",
-  "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",
+  "fixwidth": "Largeur minimale du navigateur TweetDeck",
   "fixwidthwarn": "",
+  "margin": "Marge entre les timelines",
   "above": "above",
   "font": "Police de caractères",
   "fontwarn": "Select your favorite font to 'Select'",
   "fontsize": "Taille de la police de caractères",
   "savefolder": "Folder to save",
-  "savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
+  "savefolderwarn": "TheDesk utilise cette valeur lorsqu'il tente d'enregistrer des photos ou de prendre des captures d'écran.",
   "useragent": "User agent",
   "useragentWarn": "Restart when changed",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
   "downloadWin": "Versioning(o Windows downloader)",
-  "absolute": "absolute value",
+  "absolute": "valeur absolue",
-  "srcUrl": "Search engine",
+  "srcUrl": "Moteur de recherche",
   "srcUrlWarn": "{q} will be replaced to query.",
-  "themeSel": "Select theme",
+  "themeSel": "Sélectionner un thème",
-  "customtheme": "Edit and add custom themes",
+  "customtheme": "Modifier et ajouter des thèmes",
-  "customthemeDirection": "Color scheme",
+  "customthemeDirection": "Jeu de couleurs",
-  "advanced": "Advanced options(6 additional colors)",
+  "advanced": "Options avancées",
-  "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": "Copier depuis",
-  "bottom": "Background of bottom bar",
+  "bg": "Couleur de l'arrière-plan",
-  "postbox": "Background of post box and menu",
+  "subcolor": "Distinguishable from background",
-  "subcolor": "Subcolor, has harmony with secondary color",
+  "text": "Couleur du texte",
-  "primary": "Background color",
-  "secondarycolor": "Background of components",
-  "text": "Text color",
   "accent": "Background of boosts",
-  "add_new": "Add new",
+  "modal": "Background of modal window",
-  "name": "Name",
+  "modalFooter": "Background of modal window's footer",
-  "desc": "About this theme",
+  "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": "Ajouter",
+  "name": "Nom",
+  "desc": "À propos de ce thème",
   "customShare": "Share this code with other TheDesk. Do not share this code with MiAS.",
   "customImport": "Import of custom themes",
   "delete": "Supprimer",
@@ -87,7 +95,7 @@
   "boxno": "Open after posting",
   "tag": "Tag TL Search",
   "tagfed": "Use federated network",
-  "taglocal": "Use local network",
+  "taglocal": "Utiliser le réseau local",
   "via": "Afficher via",
   "mouseover": "Hide action buttons without mouseover",
   "mouseoverwarn": "You may feel 'mouseover' is unconfortable:(",
@@ -95,30 +103,30 @@
   "mvclick": "Cliquez pour afficher",
   "notfmarker": "Show Notification marker, red colored bell and counter(if you show a notification column.)",
   "autofold": "Auto folding",
-  "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.",
+  "autofoldwarn": "TheDesk ne réduit pas les toots de 5 caractères ou moins. Si réduit, les retours à la ligne ne sont pas affichés. TheDesk compte uniquement les retours à la ligne comme le nombre de lignes.",
-  "lines": "lines",
+  "lines": "lignes",
-  "letters": "letters",
+  "letters": "lettres",
   "or": "ou",
-  "imgheight": "Height of images",
+  "imgheight": "Hauteur des images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
-  "ticker": "Enable #InstanceTicker",
+  "ticker": "Activer 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",
+  "animation": "Animation des timelines",
   "markers": "Markers(mark as read) on HTL and notifications",
   "markerswarn": "Mastodon 3.0~. Shared on WebUI and third-party supported clients.",
-  "remote_img": "Get images from the remote server",
+  "remote_img": "Récupérer les images depuis le serveur distant",
   "remote_imgWarn": "All previews are got from your loginned cache server.",
-  "replySound": "Sound(Reply)",
+  "replySound": "Son (Réponse)",
-  "favSound": "Sound(Fav)",
+  "favSound": "Son (Fav)",
-  "btSound": "Sound(Boost)",
+  "btSound": "Son (Boost)",
-  "followSound": "Sound(Follow)",
+  "followSound": "Son (Follow)",
-  "customSound": "Custom sound",
+  "customSound": "Son personnalisé",
   "post": "Posting Preferences",
-  "autocw": "Alert before posting a long toot.",
+  "autocw": "Alerte avant de poster un long toot.",
-  "autocwwarn": "Show dialog whether you make too-long text hidden.",
+  "autocwwarn": "Afficher la boîte de dialogue si vous cachez un texte trop long.",
-  "defaultcw": "Default warining text",
+  "defaultcw": "Texte d'avertissement par défaut",
   "cws": "Always CW set",
-  "defaultvis": "Default visibility",
+  "defaultvis": "Visibilité par défaut",
   "public": "Public",
   "unlisted": "Non listé",
   "private": "Privé",
@@ -129,12 +137,12 @@
   "showurl": "Insert media URL",
   "nourl": "Insert nothig",
   "disabled": "Désactivé",
-  "quote": "Quote format",
+  "quote": "Format des citations",
-  "simple": "Only URL",
+  "simple": "URL uniquement",
   "mention": "URL and acct(mention to the user)",
   "full": "URL, text and acct(mention to the user)",
   "notqt": "Disabled(Hide buttons on TLs)",
-  "apiQuote": "API(only some instances)",
+  "apiQuote": "API (seulement certaines instances)",
   "showBookmarkAction": "Show a bookmarking toot button",
   "main": "Default accounts of actions",
   "mainwarn": "Main account can be set on Account Manager.",
@@ -145,7 +153,7 @@
   "nothing": "Hidden",
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
-  "uploadCrop": "Auto scale to fit",
+  "uploadCrop": "Ajuster automatiquement la taille",
   "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.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
@@ -164,17 +172,17 @@
   "spotifynote1": "Click ",
   "spotifynote2": "icon to NowPlaying",
   "link": "Account Connection",
-  "linkwarn": "TheDesk save your data on thedesk.top server.",
+  "linkwarn": "TheDesk enregistre vos données sur le serveur thedesk.top.",
-  "connect": "Connect",
+  "connect": "Se connecter",
-  "disconnect": "Disconnect",
+  "disconnect": "Se déconnecter",
   "lastFmWarn": "User name...(empty to disconnect) You cannot hide your recent play log at last.fm privacy settings.",
-  "templateedit": "Edit a template",
+  "templateedit": "Modifier un modèle",
   "templateeditwarn": "",
   "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
   "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
   "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
-  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
+  "searchArtwork": "Si la chanson n'a pas d'illustration, la compléter automatiquement (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.",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",
@@ -185,32 +193,32 @@
   "pitchwarn": "0-100(default:50)",
   "vol": "Volume",
   "volwarn": "0-100(default:100)",
-  "volwarn80": "0-100(default:80)",
+  "volwarn80": "0-100 (par défaut:80)",
   "test": "Test",
-  "sample": "TheDesk is an open-source Mastodon client for PC.",
+  "sample": "TheDesk est un client Mastodon open-source pour PC.",
-  "playstop": "Play/Stop",
+  "playstop": "Jouer/Arrêter",
   "back": "Retour",
   "keyscs": "Raccourcis clavier",
   "keyscr": "Jump to n(1-9)th column",
   "keynew": "Open toot box",
   "keytoggle": "Toggle toot box",
-  "keypost": "Post",
+  "keypost": "Publier",
   "keysecpost": "Post(secondary toot)",
-  "keyunread": "Make all notifications read",
+  "keyunread": "Marquer toutes les notifications comme lues",
   "keyesc": "Hide toot box",
   "keyf5": "Super Reload",
   "keyclear": "Clear toot box",
   "keyacctman": "Account Manager",
   "keyshowprof": "Show profile of selecting",
-  "keyrow": "Show next or previous image",
+  "keyrow": "Montrer l'image précédente ou suivante",
-  "keyzoom": "Mousewheel:Zoom a image",
+  "keyzoom": "Molette de la souris : Zoomer sur l'image",
-  "whenSelected": "When a toot is selected: ",
+  "whenSelected": "Quand un toot est sélectionné : ",
   "fav": "Mettre ce pouet en favoris",
   "bt": "Booster ce pouet",
   "reply": "Répondre à ce pouet",
-  "keyselecttop": "Select the top & left(No.1 column) toot",
+  "keyselecttop": "Sélectionner la colonne de toot en haut à gauche (colonne numéro 1)",
-  "reset": "Reset(Danger)",
+  "reset": "Réinitialiser (Danger)",
-  "resetconfirm": "Delete all data. You cannot undo. Continue?",
+  "resetconfirm": "Supprimer toutes les données. Vous ne pouvez pas annuler. Continuer ?",
   "about": "About TheDesk",
   "hp": "Site Web",
   "support": "Assistance",

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

@@ -1,5 +1,7 @@
 {
     "draghere": "Drag here to upload",
+    "nowOffline": "OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet",
+    "reOnline": "Now we are in the Internet, you should reload...",
     "close": "Close",
     "webSrc": "Search on Web",
     "tsSrc": "Search on tootsearch",
@@ -45,6 +47,7 @@
     "thingsEmoji": "Emojis of tools",
     "symbolEmoji": "Emojis of symbols",
     "flagsEmoji": "Emojis of flags",
+    "draft": "Draft",
     "poll": "Poll",
     "pollDdisabled": "Polls: Disabled",
     "pollProvider": "Provider of Poll",
@@ -130,7 +133,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

@@ -71,6 +71,7 @@
     "lang_post_btn3": "Continue to post",
     "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
     "lang_post_retry": "Retry",
+    "lang_post_offline": "Add to the drafts because of offline",
     "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
     "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
     "lang_status_follow": "Follow",
@@ -87,6 +88,9 @@
     "lang_status_endorse": "Feature on profile",
     "lang_status_followers": "Followers",
     "lang_status_active": "Last status",
+    "lang_secure_draft": "Add to draft",
+    "lang_secure_useThis": "Use this",
+    "lang_secure_deleteThis": "Delete this",
     "lang_suggest_nodata": "Please get emojis list in order to show suggestion.",
     "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
     "lang_cards_check": " check",
@@ -131,13 +135,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 +230,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 +245,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

@@ -1,5 +1,7 @@
 {
     "draghere": "Drag here to upload",
+    "nowOffline": "OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet",
+    "reOnline": "Now we are in the Internet, you should reload...",
     "close": "Close",
     "webSrc": "Search on Web",
     "tsSrc": "Search on tootsearch",
@@ -45,6 +47,7 @@
     "thingsEmoji": "Emojis of tools",
     "symbolEmoji": "Emojis of symbols",
     "flagsEmoji": "Emojis of flags",
+    "draft": "Draft",
     "poll": "Poll",
     "pollDdisabled": "Polls: Disabled",
     "pollProvider": "Provider of Poll",
@@ -130,7 +133,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",