update window

* New translations setting.json (Romanian)

* New translations setting.json (Portuguese, Brazilian)

* New translations setting.json (Portuguese)

* New translations setting.json (Polish)

* New translations setting.json (Norwegian)

* New translations setting.json (Italian)

* New translations setting.json (Hungarian)

* New translations setting.json (Russian)

* New translations setting.json (Vietnamese)

* New translations setting.json (Ukrainian)

* New translations setting.json (Turkish)

* New translations setting.json (Swedish)

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

* New translations setting.json (Chinese Traditional)

* New translations setting.json (Catalan)

* New translations setting.json (Arabic)

* New translations setting.json (Afrikaans)

* New translations setting.json (Spanish)

* New translations setting.json (Hebrew)

* New translations setting.json (Greek)

* New translations setting.json (Finnish)

* New translations setting.json (Dutch)

* New translations setting.json (Danish)

app/css/acct.css

@@ -0,0 +1,76 @@
+.acct {
+	display: flex;
+	justify-content: space-around;
+}
+
+.card {
+	width: 400px;
+	background-color: #494949;
+	margin: 10px;
+}
+
+body,
+html {
+	overflow-y: scroll;
+}
+
+#acct-list {
+	display: flex;
+	flex-wrap: wrap;
+	color: white;
+	align-items: flex-start;
+}
+
+.lts {
+	font-size: 150%;
+}
+
+.colorsel {
+	display: flex;
+}
+
+.card .colorsel div:not(.exc) {
+	width: 20px;
+	height: 20px;
+}
+
+.card .colorsel div.exc {
+	width: 40px;
+	height: 20px;
+}
+
+.first {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+
+.first .hide-first {
+	display: none;
+}
+
+#compt {
+	margin-top: 20px;
+	margin-bottom: 50px;
+	border: 1px solid;
+	border: 1px solid;
+	padding: 5px;
+}
+
+#compt li {
+	list-style-type: disc;
+	margin-left: 20px;
+}
+
+#domain-list {
+    width: 500px;
+    max-width: 100%;
+}
+
+i.left {
+    margin-right: 5px;
+}
+
+#domain-list .title {
+   font-size: 1.3rem;
+}

app/css/master.css

@@ -1,544 +1,564 @@
 /*共通CSS*/
 html,
 body {
-  /*transform: translate3d(0,0,0);*/
+	/*transform: translate3d(0,0,0);*/
-  overflow: hidden;
+	overflow: hidden;
-  user-select: none;
+	user-select: none;
-  cursor: default;
+	cursor: default;
-  font-size: 13px;
+	font-size: 13px;
-  height: 100vh;
+	height: 100vh;
-  color: var(--color);
+	color: var(--color);
 }
 .btn {
-  margin: 5px;
+	margin: 5px;
-  text-transform: none;
+	text-transform: none;
 }
 .markdown {
-  display: none;
+	display: none;
 }
 help {
-  display: none;
+	display: none;
 }
 .show-help {
-  display: inline;
+	display: inline;
 }
 option {
-  display: none;
+	display: none;
 }
 #mainView {
-  padding: 10px;
+	padding: 10px;
-  overflow: scroll;
+	overflow: scroll;
-  height: auto;
+	height: auto;
 }
 #message {
-  display: none;
+	display: none;
-  position: fixed;
+	position: fixed;
-  bottom: 0;
+	bottom: 0;
-  left: 0;
+	left: 0;
-  background-color: black;
+	background-color: black;
-  color: white;
+	color: white;
-  z-index: 9999;
+	z-index: 9999;
 }
 #imagemodal,
 #videomodal {
-  display: none;
+	display: none;
-  max-width: 100vw;
+	max-width: 100vw;
-  max-height: 100vh;
+	max-height: 100vh;
-  position: fixed;
+	position: fixed;
-  z-index: 9;
+	z-index: 9;
-  top: 0 !important;
+	top: 0 !important;
 }
 #videomodal,
 #tootmodal {
-  background-color: var(--modal);
+	background-color: var(--modal);
 }
 #imagemodal .modal-content {
-  overflow: hidden;
+	overflow: hidden;
-  padding: 0;
+	padding: 0;
 }
 #imagemodal .modal-footer {
-  overflow-x: scroll;
+	overflow-x: scroll;
-  overflow-y: hidden;
+	overflow-y: hidden;
 }
 
 #imagewrap {
-  width: 100%;
+	width: 100%;
-  height: 100%;
+	height: 100%;
 }
 .pointer {
-  cursor: pointer;
+	cursor: pointer;
 }
 .badge {
-  min-width: 0 !important;
+	min-width: 0 !important;
-  margin-left: 5px !important;
+	margin-left: 5px !important;
 }
 .unvisible {
-  opacity: 0;
+	opacity: 0;
 }
 .bbcode-pulse-loadings,
 .bbcode-pulse-loading,
 .fa-pulse {
-  display: inline-block;
+	display: inline-block;
-  animation-duration: 3s;
+	animation-duration: 3s;
-  animation-fill-mode: both;
+	animation-fill-mode: both;
-  animation-iteration-count: infinite;
+	animation-iteration-count: infinite;
-  animation-name: pulse;
+	animation-name: pulse;
 }
 @keyframes pulse {
-  from,
+	from,
-  50%,
+	50%,
-  to {
+	to {
-    opacity: 1;
+		opacity: 1;
-  }
+	}
-  25%,
+	25%,
-  75% {
+	75% {
-    opacity: 0;
+		opacity: 0;
-  }
+	}
 }
 @keyframes shake {
-  from,
+	from,
-  to {
+	to {
-    -webkit-transform: translate3d(0, 0, 0);
+		-webkit-transform: translate3d(0, 0, 0);
-    transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
-  }
+	}
 
-  10%,
+	10%,
-  30%,
+	30%,
-  50%,
+	50%,
-  70%,
+	70%,
-  90% {
+	90% {
-    -webkit-transform: translate3d(-10px, 0, 0);
+		-webkit-transform: translate3d(-10px, 0, 0);
-    transform: translate3d(-10px, 0, 0);
+		transform: translate3d(-10px, 0, 0);
-  }
+	}
 
-  20%,
+	20%,
-  40%,
+	40%,
-  60%,
+	60%,
-  80% {
+	80% {
-    -webkit-transform: translate3d(10px, 0, 0);
+		-webkit-transform: translate3d(10px, 0, 0);
-    transform: translate3d(10px, 0, 0);
+		transform: translate3d(10px, 0, 0);
-  }
+	}
 }
 
 .shake {
-  display: inline-block;
+	display: inline-block;
-  animation-duration: 1s;
+	animation-duration: 1s;
-  animation-fill-mode: both;
+	animation-fill-mode: both;
-  animation-iteration-count: infinite;
+	animation-iteration-count: infinite;
-  animation-name: shake;
+	animation-name: shake;
 }
 code:before,
 .pre:before {
-  content: "Code";
+	content: 'Code';
-  font-size: 1.8rem;
+	font-size: 1.8rem;
-  line-height: 1em;
+	line-height: 1em;
-  font-family: monospace, monospace;
+	font-family: monospace, monospace;
-  color: #999;
+	color: #999;
-  position: absolute;
+	position: absolute;
-  right: 0;
+	right: 0;
-  top: 0;
+	top: 0;
 }
 code,
 pre {
-  color: white;
+	color: white;
-  display: block;
+	display: block;
-  border-left: 5px solid;
+	border-left: 5px solid;
-  border-color: #079903;
+	border-color: #079903;
-  padding-left: 10px;
+	padding-left: 10px;
-  margin-top: 5px;
+	margin-top: 5px;
-  margin-bottom: 5px;
+	margin-bottom: 5px;
-  margin-left: 5px;
+	margin-left: 5px;
-  background-color: #000;
+	background-color: #000;
-  padding: 1em 1em 1em;
+	padding: 1em 1em 1em;
-  position: relative;
+	position: relative;
-  border-top-left-radius: 10px;
+	border-top-left-radius: 10px;
-  border-bottom-right-radius: 10px;
+	border-bottom-right-radius: 10px;
-  border-bottom-left-radius: 10px;
+	border-bottom-left-radius: 10px;
 }
 blockquote,
 .quote p {
-  margin: 0;
+	margin: 0;
 }
 blockquote,
 .quote {
-  color: black;
+	color: black;
-  background-color: #ddd;
+	background-color: #ddd;
-  padding: 1em 1em 1em;
+	padding: 1em 1em 1em;
-  position: relative;
+	position: relative;
-  border-top-left-radius: 10px;
+	border-top-left-radius: 10px;
-  border-bottom-right-radius: 10px;
+	border-bottom-right-radius: 10px;
-  border-bottom-left-radius: 10px;
+	border-bottom-left-radius: 10px;
 }
 blockquote:before,
 .quote:before {
-  content: "Quote";
+	content: 'Quote';
-  font-size: 1.8rem;
+	font-size: 1.8rem;
-  line-height: 1em;
+	line-height: 1em;
-  font-family: Open Sans, cursive;
+	font-family: Open Sans, cursive;
-  color: #999;
+	color: #999;
-  position: absolute;
+	position: absolute;
-  right: 0;
+	right: 0;
-  top: 0;
+	top: 0;
 }
 .pixiv-post {
-  color: black;
+	color: black;
-  background-color: #fff;
+	background-color: #fff;
-  padding: 1em 1em 1em;
+	padding: 1em 1em 1em;
-  position: relative;
+	position: relative;
-  border-top-left-radius: 10px;
+	border-top-left-radius: 10px;
-  border-bottom-right-radius: 10px;
+	border-bottom-right-radius: 10px;
-  border-bottom-left-radius: 10px;
+	border-bottom-left-radius: 10px;
-  border-left: 5px solid #0096fa;
+	border-left: 5px solid #0096fa;
 }
 .pixiv-post :before {
-  content: "From Pixiv";
+	content: 'From Pixiv';
-  font-size: 1.8rem;
+	font-size: 1.8rem;
-  line-height: 1em;
+	line-height: 1em;
-  font-family: Open Sans;
+	font-family: Open Sans;
-  color: #999;
+	color: #999;
-  position: absolute;
+	position: absolute;
-  right: 0;
+	right: 0;
-  top: 0;
+	top: 0;
 }
 #start {
-  display: none;
+	display: none;
-  position: fixed;
+	position: fixed;
-  width: 100vw;
+	width: 100vw;
-  height: calc(100vh - 40px);
+	height: calc(100vh - 40px);
-  background-color: var(--bg);
+	background-color: var(--bg);
-  color: var(--color);
+	color: var(--color);
-  z-index: 99999;
+	z-index: 99999;
-  justify-content: center;
+	justify-content: center;
-  align-items: center;
+	align-items: center;
 }
 #drag {
-  display: none;
+	display: none;
-  position: fixed;
+	position: fixed;
-  width: 100vw;
+	width: 100vw;
-  height: 100vh;
+	height: 100vh;
-  background-color: var(--bg);
+	background-color: var(--bg);
-  color: var(--color);
+	color: var(--color);
-  z-index: 99999;
+	z-index: 99999;
-  justify-content: center;
+	justify-content: center;
-  align-items: center;
+	align-items: center;
 }
 #drag-content {
-  font-size: 2rem;
+	font-size: 2rem;
 }
 #pip {
-  z-index: 504;
+	z-index: 504;
-  width: 418px;
+	width: 418px;
-  background-color: var(--subcolor);
+	background-color: var(--subcolor);
-  position: absolute;
+	position: absolute;
 }
 .pip-bottom {
-  bottom: 10px;
+	bottom: 10px;
 }
 .pip-left {
-  left: 10px;
+	left: 10px;
 }
 .pip-top {
-  top: 10px;
+	top: 10px;
 }
 .pip-right {
-  right: 10px;
+	right: 10px;
 }
 #pip-content .material-icons {
-  display: none;
+	display: none;
 }
 .big-text {
-  font-size: 1.2rem;
+	font-size: 1.2rem;
 }
 #releasenote {
-  background-color: var(--modal);
+	background-color: var(--modal);
 }
 #releasenote li {
-  list-style-type: disc;
+	list-style-type: disc;
 }
 @media only screen and (min-width: 993px) {
-  #toast-container {
+	#toast-container {
-    top: auto;
+		top: auto;
-    right: auto;
+		right: auto;
-    bottom: 5%;
+		bottom: 5%;
-    left: 4%;
+		left: 4%;
-    max-width: 86%;
+		max-width: 86%;
-  }
+	}
 }
 .show {
-  animation: show 0.2s linear 0s;
+	animation: show 0.2s linear 0s;
 }
 @keyframes show {
-  from {
+	from {
-    opacity: 0;
+		opacity: 0;
-  }
+	}
-  to {
+	to {
-    opacity: 1;
+		opacity: 1;
-  }
+	}
 }
 .hide-anime {
-  animation: hide 0.2s linear 0s;
+	animation: hide 0.2s linear 0s;
-  display: none;
+	display: none;
 }
 @keyframes hide {
-  from {
+	from {
-    opacity: 1;
+		opacity: 1;
-  }
+	}
-  to {
+	to {
-    opacity: 0;
+		opacity: 0;
-  }
+	}
 }
 .collapsible-header,
 .tabs {
-  background-color: var(--subcolor);
+	background-color: var(--subcolor);
 }
 .collapsible-header:focus {
-  background-color: var(--subcolor) !important;
+	background-color: var(--subcolor) !important;
 }
 .modal-footer {
-  background-color: var(--modalfooter) !important;
+	background-color: var(--modalfooter) !important;
 }
 .font {
-  font-size: 1.5rem;
+	font-size: 1.5rem;
-  margin-bottom: 5px;
+	margin-bottom: 5px;
 }
 .font:hover {
-  background-color: #999;
+	background-color: #999;
 }
 .release-do {
-  border: solid 2px;
+	border: solid 2px;
-  border-color: var(--color);
+	border-color: var(--color);
-  padding: 5px;
+	padding: 5px;
 }
 #pickers {
-  display: flex;
+	display: flex;
-  flex-wrap: wrap;
+	flex-wrap: wrap;
 }
 #menu {
-  position: fixed;
+	position: fixed;
-  z-index: 9999;
+	z-index: 9999;
-  background-color: var(--postbox);
+	background-color: var(--postbox);
-  width: 540px;
+	width: 540px;
-  top: calc(50% - 150px);
+	top: calc(50% - 150px);
-  left: calc(50% - 250px);
+	left: calc(50% - 250px);
-  padding: 5px;
+	padding: 5px;
-  border: thin solid gray;
+	border: thin solid gray;
-  border-radius: 5px;
+	border-radius: 5px;
-  overflow: hidden;
+	overflow: hidden;
 }
 #menu-wrapper {
-  margin-left: -5px;
+	margin-left: -5px;
-  display: flex;
+	display: flex;
-  height: calc(100% - 3.5rem);
+	height: calc(100% - 3.5rem);
-  overflow: hidden;
+	overflow: hidden;
 }
 #left-menu {
-  width: 230px;
+	width: 230px;
 }
 #left-menu div {
-  padding-left: 5px;
+	padding-left: 5px;
-  width: 100%;
+	width: 100%;
-  height: 50px;
+	height: 50px;
-  display: flex;
+	display: flex;
-  align-items: center;
+	align-items: center;
-  cursor: pointer;
+	cursor: pointer;
 }
 #left-menu div:hover {
-  background-color: var(--beforehover);
+	background-color: var(--beforehover);
 }
 #left-menu span {
-  margin-left: 5px;
+	margin-left: 5px;
 }
 #left-menu div.active {
-  background-color: var(--emphasized);
+	background-color: var(--emphasized);
 }
 #right-menu {
-  width: 100%;
+	width: 100%;
-  overflow-y: scroll;
+	overflow-y: scroll;
-  overflow-x: hidden;
+	overflow-x: hidden;
-  padding: 5px;
+	padding: 5px;
 }
 #tltype {
-  display: flex;
+	display: flex;
-  flex-wrap: wrap;
+	flex-wrap: wrap;
 }
 #tltype .type {
-  display: flex;
+	display: flex;
-  flex-wrap: wrap;
+	flex-wrap: wrap;
-  align-items: center;
+	align-items: center;
-  width: 170px;
+	width: 170px;
-  height: 40px;
+	height: 40px;
-  cursor: pointer;
+	cursor: pointer;
 }
 #tltype .type span {
-  width: calc(100% - 30px);
+	width: calc(100% - 30px);
 }
 #tltype .type:hover {
-  background-color: var(--beforehover);
+	background-color: var(--beforehover);
 }
 #tltype .active {
-  background-color: var(--emphasized);
+	background-color: var(--emphasized);
 }
 #tltype i {
-  font-size: 30px;
+	font-size: 30px;
 }
 #tltype i.sub-icon {
-  font-size: 20px;
+	font-size: 20px;
-  position: absolute;
+	position: absolute;
-  color: var(--beforehover);
+	color: var(--beforehover);
-  left: 10px;
+	left: 10px;
-  bottom: 5px;
+	bottom: 5px;
-  background-color: #fff;
+	background-color: #fff;
 }
 .drag-bar {
-  cursor: move;
+	cursor: move;
-  text-align: center;
+	text-align: center;
-  width: calc(100% + 10px);
+	width: calc(100% + 10px);
-  border-radius: 5px;
+	border-radius: 5px;
-  background-color: var(--box);
+	background-color: var(--box);
-  filter: brightness(80%);
+	filter: brightness(80%);
-  margin-left: -5px;
+	margin-left: -5px;
-  margin-right: -5px;
+	margin-right: -5px;
-  margin-top: -5px;
+	margin-top: -5px;
-  font-size: 16px;
+	font-size: 16px;
-  padding: 4px;
+	padding: 4px;
 }
 #something-wrong {
-  flex-direction: column;
+	flex-direction: column;
-  width: 100%;
+	width: 100%;
-  height: 100%;
+	height: 100%;
-  position: absolute;
+	position: absolute;
-  display: flex;
+	display: flex;
-  justify-content: center;
+	justify-content: center;
-  align-items: center;
+	align-items: center;
 }
 #support-btm {
-  position: fixed;
+	position: fixed;
-  bottom: -300px;
+	bottom: -300px;
-  width: 100vw;
+	width: 100vw;
-  background-color: var(--box);
+	background-color: var(--box);
-  z-index: 9999;
+	z-index: 9999;
-  padding: 10px;
+	padding: 10px;
-  display: grid;
+	display: grid;
-  grid-template-columns: 3fr 1fr 1fr;
+	grid-template-columns: 3fr 1fr 1fr;
-  grid-template-rows: 1fr 36px;
+	grid-template-rows: 1fr 36px;
-  grid-template-areas: "note middle right" "note close close";
+	grid-template-areas: 'note middle right' 'note close close';
 }
 #support-btm-en,
 #support-btm-ja {
-  grid-area: note;
+	grid-area: note;
 }
 #support-btm-middle {
-  grid-area: middle;
+	grid-area: middle;
 }
 #support-btm-right {
-  grid-area: right;
+	grid-area: right;
 }
 #support-btm-close {
-  grid-area: close;
+	grid-area: close;
 }
 .select-wrapper .dropdown-content {
-  width: 250px !important;
+	width: 250px !important;
 }
 input,
 textarea {
-  color: var(--color);
+	color: var(--color);
-  font-size: 1rem !important;
+	font-size: 1rem !important;
-  font-family: inherit;
+	font-family: inherit;
 }
 .swal2-popup {
-  background-color: var(--notfbox) !important;
+	background-color: var(--notfbox) !important;
 }
 .swal2-title,
 .swal2-content {
-  color: var(--color) !important;
+	color: var(--color) !important;
 }
 #src-contents svg {
-  margin-right: 5px;
+	margin-right: 5px;
 }
 .contributor {
-  cursor: pointer;
+	cursor: pointer;
 }
 .contributor img {
-  width: 1rem;
+	width: 1rem;
 }
-.tagComp{
+.tagComp {
-  display: grid;
+	display: grid;
-  grid-template-columns: 60px 80px 1fr;
+	grid-template-columns: 60px 80px 1fr;
-  grid-template-rows: 1fr 1fr;
+	grid-template-rows: 1fr 1fr;
-  grid-template-areas: "svg toot user" "svg toot tag" "svg toots tag";
+	grid-template-areas: 'svg toot user' 'svg toot tag' 'svg toots tag';
-  border-top: dotted 0.5px var(--gray);
+	border-top: dotted 0.5px var(--gray);
-  padding: 5px
+	padding: 5px;
 }
 .tagCompSvg {
-  grid-area: svg;
+	grid-area: svg;
 }
 .tagCompToot {
-  grid-area: toot;
+	grid-area: toot;
-  text-align: center;
+	text-align: center;
 }
 .tagCompToots {
-  grid-area: toots;
+	grid-area: toots;
-  text-align: center;
+	text-align: center;
 }
 .tagCompUser {
-  grid-area: user;
+	grid-area: user;
 }
 .tagCompTag {
-  grid-area: tag;
+	grid-area: tag;
-  padding-top: 10px;
+	padding-top: 10px;
-  white-space: nowrap;
+	white-space: nowrap;
 	text-overflow: ellipsis;
 	overflow: hidden;
 }
+#sabakanMark {
+	background-color: var(--emphasized);
+}
+#pageSrc {
+	position: fixed;
+	top: 0;
+	left: calc(50vw - 150px);
+	width: 300px;
+	max-width: 100%;
+	background-color: var(--box);
+  z-index: 501;
+  padding: 5px;
+}
+#pageSrcInput {
+  width: 160px;
+}
+
+@media (max-width: 500px) {
+	#pageSrc {
+		left: 0;
+	}
+}
 
 /*スクロールバー*/
 ::-webkit-scrollbar {
-  width: 5px;
+	width: 5px;
-  height: 10px;
+	height: 10px;
-  background: rgba(0, 0, 0, 0.05);
+	background: rgba(0, 0, 0, 0.05);
 }
 ::-webkit-scrollbar-track {
-  -webkit-border-radius: 5px;
+	-webkit-border-radius: 5px;
-  border-radius: 5px;
+	border-radius: 5px;
 }
 /* Handle */
 ::-webkit-scrollbar-thumb {
-  -webkit-border-radius: 5px;
+	-webkit-border-radius: 5px;
-  border-radius: 5px;
+	border-radius: 5px;
-  background: #607d8b;
+	background: #607d8b;
-  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5);
+	-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5);
 }
 /* Web Fonts */
 @font-face {
-  font-family: "Open Sans";
+	font-family: 'Open Sans';
-  font-style: normal;
+	font-style: normal;
-  font-weight: 300;
+	font-weight: 300;
-  src: local("Open Sans Light"), local("OpenSans-Light"),
+	src: local('Open Sans Light'), local('OpenSans-Light'),
-    url(https://fonts.gstatic.com/s/opensans/v17/mem5YaGs126MiZpBA-UN_r8OUuhp.woff2)
+		url(https://fonts.gstatic.com/s/opensans/v17/mem5YaGs126MiZpBA-UN_r8OUuhp.woff2) format('woff2');
-      format("woff2");
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F,
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
+		U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-    U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215,
-    U+FEFF, U+FFFD;
 }
 @font-face {
-  font-family: "Material Icons";
+	font-family: 'Material Icons';
-  font-style: normal;
+	font-style: normal;
-  font-weight: 400;
+	font-weight: 400;
-  src: url(https://fonts.gstatic.com/s/materialicons/v48/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2)
+	src: url(https://fonts.gstatic.com/s/materialicons/v48/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2)
-    format("woff2");
+		format('woff2');
 }
 .material-icons {
-  font-family: "Material Icons";
+	font-family: 'Material Icons';
-  font-weight: normal;
+	font-weight: normal;
-  font-style: normal;
+	font-style: normal;
-  font-size: 24px;
+	font-size: 24px;
-  line-height: 1;
+	line-height: 1;
-  letter-spacing: normal;
+	letter-spacing: normal;
-  text-transform: none;
+	text-transform: none;
-  display: inline-block;
+	display: inline-block;
-  white-space: nowrap;
+	white-space: nowrap;
-  word-wrap: normal;
+	word-wrap: normal;
-  direction: ltr;
+	direction: ltr;
-  -webkit-font-feature-settings: "liga";
+	-webkit-font-feature-settings: 'liga';
-  -webkit-font-smoothing: antialiased;
+	-webkit-font-smoothing: antialiased;
 }

app/css/tl.css

@@ -374,6 +374,31 @@ iframe,
 	grid-area: side;
 }
 
+.cusr {
+	user-select: text;
+	padding-left: 5px;
+	border-bottom: 0.5px solid;
+	padding-right: 2px;
+	word-break: break-word;
+	width: 100%;
+	display: grid;
+	grid-template-columns: 43px 2fr 1fr;
+	grid-template-rows: auto 1.6rem 2fr auto;
+	grid-template-areas: 'notice notice notice' 'icon display_name display_name' 'space status status' 'space actions actions';
+}
+
+.area-status {
+	grid-area: status;
+	display: flex;
+	flex-wrap: wrap;
+	margin-bottom: 5px;
+}
+
+.cusr .cbadge {
+	margin-top: 6px;
+	margin-left: 6px;
+}
+
 .quote-inline {
 	display: none;
 }
@@ -534,7 +559,7 @@ p:not(:last-child) {
 	z-index: 500;
 	padding: 5px;
 	display: grid;
-	grid-template-columns: 40px 1fr 1fr 24px;
+	grid-template-columns: 40px 60px 1fr 24px;
 	grid-template-rows: 30px 30px;
 	grid-template-areas: 'notice notice_name notice_name a2' 'notice a1 sta a3' 'notf-box notf-box notf-box notf-box';
 }
@@ -760,6 +785,7 @@ audio {
 	padding-right: 3px;
 	border-radius: 3px;
 	border: 1px solid var(--color);
+	user-select: none;
 }
 .vis-data {
 	font-size: 1rem !important;
@@ -836,3 +862,31 @@ audio {
 .box .ui-resizable-se {
 	display: none !important;
 }
+.announcement {
+	padding: 5px;
+	border-bottom: 1px solid;
+}
+.announReaction {
+	width: 35px;
+	height: 1.7rem;
+	font-size: 1.1rem;
+	margin: 3px;
+	cursor: pointer;
+	border: solid 1px;
+	padding-left: 2px;
+	background-color: var(--notfbox);
+	border-radius: 2px;
+}
+.announReaction img {
+	position: relative;
+	top: 3px;
+}
+.announReaction.reactioned {
+	background-color: var(--emphasized);
+}
+.announReaction.add {
+	width: 19px;
+}
+.reactionsPack {
+	display: flex;
+}

app/index.html

@@ -0,0 +1,7 @@
+<!doctype html>
+<html>
+    <head>
+        <meta http-equiv=”refresh” content=”0;URL=’./view/ja'” />
+        <script>location.href = './view/ja';</script>
+    </head>
+</html>

app/js/common/keyshortcut.js

@@ -1,191 +1,197 @@
 selectedColumn = 0
 selectedToot = 0
-$(function ($) {
+$(function($) {
 	//キーボードショートカット
-	$(window).keydown(function (e) {
+	$(window).keydown(function(e) {
-		var hasFocus = $('input').is(':focus');
+		var hasFocus = $('input').is(':focus')
-		var hasFocus2 = $('textarea').is(':focus');
+		var hasFocus2 = $('textarea').is(':focus')
-		if (document.getElementById("webview")) {
+		if (document.getElementById('webview')) {
-			if ($("#webviewsel:checked").val()) {
+			if ($('#webviewsel:checked').val()) {
-				var wv = false;
+				var wv = false
 			} else {
-				var wv = true;
+				var wv = true
 			}
 		} else {
-			var wv = true;
+			var wv = true
 		}
 		//Enter
 		if (e.keyCode === 13) {
-			if($("#src").is(':focus')){
+			if ($('#src').is(':focus')) {
 				src()
-				return false;
+				return false
 			}
-			if($("#list-add").is(':focus')){
+			if ($('#list-add').is(':focus')) {
 				makeNewList()
-				return false;
+				return false
 			}
 		}
 		//Ctrl+Shift+Enter:Lgen
-		if (event.metaKey || event.ctrlKey && wv) {
+		if (event.metaKey || (event.ctrlKey && wv)) {
 			if (event.shiftKey) {
 				if (e.keyCode === 13) {
-					post('local');
+					post('local')
-					return false;
+					return false
 				}
 			}
 		}
 		//Ctrl+Enter:投稿
-		if (event.metaKey || event.ctrlKey && wv) {
+		if (event.metaKey || (event.ctrlKey && wv)) {
 			if (e.keyCode === 13) {
-				post();
+				post()
-				return false;
+				return false
 			}
 		}
 		//Alt+Enter:セカンダリー
-		if (event.metaKey || event.altKey && wv) {
+		if (event.metaKey || (event.altKey && wv)) {
 			if (e.keyCode === 13) {
-				sec();
+				sec()
-				return false;
+				return false
 			}
 		}
 		//Esc:消す
 		if (e.keyCode === 27 && wv) {
-			hide();
+			hide()
-			return false;
+			return false
 		}
 		//F5リロード
 		if (e.keyCode === 116 && wv) {
-			location.href = "index.html";
+			location.href = 'index.html'
-			return false;
+			return false
 		}
 		//Ctrl+Sift+C:全消し
-		if (((event.metaKey || event.ctrlKey) && event.shiftKey) && wv) {
+		if ((event.metaKey || event.ctrlKey) && event.shiftKey && wv) {
 			if (e.keyCode === 67) {
-				clear();
+				clear()
-				return false;
+				return false
 			}
 		}
 		//Ctrl+Sift+N:NowPlaying
-		if (((event.metaKey || event.ctrlKey) && event.shiftKey) && wv) {
+		if ((event.metaKey || event.ctrlKey) && event.shiftKey && wv) {
 			if (e.keyCode === 78) {
-				show();
+				show()
 				nowplaying()
-				return false;
+				return false
 			}
 		}
 		//input/textareaにフォーカスなし時
-		if ((!hasFocus && !hasFocus2) && wv) {
+		if (!hasFocus && !hasFocus2 && wv) {
 			if (!wv) {
-				return true;
+				return true
 			}
 			//Ctrl+V:いつもの
 			if (event.metaKey || event.ctrlKey) {
 				if (e.keyCode === 86) {
-					show();
+					show()
+				}
+			}
+			//Ctrl+F:検索
+			if (event.metaKey || event.ctrlKey) {
+				if (e.keyCode === 70) {
+					srcBox()
 				}
 			}
 			//X:開閉
 			if (e.keyCode === 88) {
-				if (!$("#post-box").hasClass("appear")) {
+				if (!$('#post-box').hasClass('appear')) {
-					show();
+					show()
-					$('textarea').focus();
+					$('textarea').focus()
 				} else {
-					hide();
+					hide()
 				}
-				return false;
+				return false
 			}
 			//N:新トゥート
 			if (e.keyCode === 78) {
-				if (!$("#post-box").hasClass("appear")) {
+				if (!$('#post-box').hasClass('appear')) {
-					show();
+					show()
 				}
-				$('textarea').focus();
+				$('textarea').focus()
-				return false;
+				return false
 			}
 			//Ctrl+E:全ての通知未読を既読にする
 			if (event.metaKey || event.ctrlKey) {
 				if (e.keyCode === 69) {
-					allNotfRead();
+					allNotfRead()
-					return false;
+					return false
 				}
 			}
 			//Ctrl+Space:読み込み
 			if (event.metaKey || event.ctrlKey) {
 				if (e.keyCode === 32) {
-					parseColumn();
+					parseColumn()
-					return false;
+					return false
 				}
 			}
 			//Ctrl+Sift+S:設定
 			if ((event.metaKey || event.ctrlKey) && event.shiftKey) {
 				if (e.keyCode === 83) {
-					location.href = "setting.html";
+					location.href = 'setting.html'
-					return false;
+					return false
 				}
 			}
 			//Ctrl+Sift+M:アカマネ
 			if ((event.metaKey || event.ctrlKey) && event.shiftKey) {
 				if (e.keyCode === 77) {
-					location.href = "acct.html";
+					location.href = 'acct.html'
-					return false;
+					return false
 				}
 			}
 			//Ctrl+Sift+P:プロフ
 			if ((event.metaKey || event.ctrlKey) && event.shiftKey) {
 				if (e.keyCode === 80) {
 					profShow()
-					return false;
+					return false
 				}
 			}
 			//数字:TL
 			if (event.metaKey || event.ctrlKey) {
 				if (e.keyCode >= 49 && e.keyCode <= 57) {
-					var kz = e.keyCode - 49;
+					var kz = e.keyCode - 49
-					goColumn(kz);
+					goColumn(kz)
-					return false;
+					return false
 				}
 			}
 			//矢印:選択
-			if (e.code == "ArrowLeft") {
+			if (e.code == 'ArrowLeft') {
 				//left
-				if ($("#imagemodal").hasClass("open")) {
+				if ($('#imagemodal').hasClass('open')) {
-					imgCont('prev');
+					imgCont('prev')
-					return false;
+					return false
 				}
 				if (selectedColumn > 0) {
 					selectedColumn--
 				}
 				tootSelector(selectedColumn, selectedToot)
-				return false;
+				return false
-			} else if (e.code == "ArrowUp") {
+			} else if (e.code == 'ArrowUp') {
 				//up
-				if ($("#imagemodal").hasClass("open")) {
+				if ($('#imagemodal').hasClass('open')) {
-					return false;
+					return false
 				}
 				if (selectedToot > 0) {
 					selectedToot--
 				}
 				tootSelector(selectedColumn, selectedToot)
-				return false;
+				return false
-			} else if (e.code == "ArrowRight") {
+			} else if (e.code == 'ArrowRight') {
 				//right
-				if ($("#imagemodal").hasClass("open")) {
+				if ($('#imagemodal').hasClass('open')) {
-					imgCont('next');
+					imgCont('next')
-					return false;
+					return false
 				}
-				if (selectedColumn < $(".tl-box").length - 1) {
+				if (selectedColumn < $('.tl-box').length - 1) {
 					selectedColumn++
 				}
 				tootSelector(selectedColumn, selectedToot)
-				return false;
+				return false
-			} else if (e.code == "ArrowDown") {
+			} else if (e.code == 'ArrowDown') {
 				//down
-				if ($("#imagemodal").hasClass("open")) {
+				if ($('#imagemodal').hasClass('open')) {
-					return false;
+					return false
 				}
 				selectedToot++
 				tootSelector(selectedColumn, selectedToot)
-				return false;
+				return false
 			}
 			//Ctrl+U:0,0選択
 			if (event.ctrlKey || event.metaKey) {
@@ -193,29 +199,29 @@ $(function ($) {
 					selectedToot = 0
 					selectedColumn = 0
 					tootSelector(0, 0)
-					return false;
+					return false
 				}
 			}
 			//選択時
 			if (e.keyCode == 70) {
-				var id = $(".selectedToot").attr('unique-id')
+				var id = $('.selectedToot').attr('unique-id')
-				var acct_id = $('#timeline_' + selectedColumn).attr("data-acct")
+				var acct_id = $('#timeline_' + selectedColumn).attr('data-acct')
 				fav(id, acct_id, false)
-				return false;
+				return false
 			}
 			if (e.keyCode == 66) {
-				var id = $(".selectedToot").attr('unique-id')
+				var id = $('.selectedToot').attr('unique-id')
-				var acct_id = $('#timeline_' + selectedColumn).attr("data-acct")
+				var acct_id = $('#timeline_' + selectedColumn).attr('data-acct')
 				rt(id, acct_id, false)
-				return false;
+				return false
 			}
 			if (e.keyCode == 82) {
-				var id = $(".selectedToot").attr('unique-id')
+				var id = $('.selectedToot').attr('unique-id')
-				var acct_id = $('#timeline_' + selectedColumn).attr("data-acct")
+				var acct_id = $('#timeline_' + selectedColumn).attr('data-acct')
-				var ats_cm = $('.selectedToot .rep-btn').attr("data-men")
+				var ats_cm = $('.selectedToot .rep-btn').attr('data-men')
-				var mode = $('.selectedToot .rep-btn').attr("data-visen")
+				var mode = $('.selectedToot .rep-btn').attr('data-visen')
 				re(id, ats_cm, acct_id, mode)
-				return false;
+				return false
 			}
 		}
 		//textareaフォーカス時
@@ -224,23 +230,27 @@ $(function ($) {
 				//C+S+(No):ワンクリ
 				if ((event.metaKey || event.ctrlKey) && event.shiftKey) {
 					if (e.keyCode >= 49 && e.keyCode <= 51) {
-						var no = e.keyCode - 48;
+						var no = e.keyCode - 48
-						if (localStorage.getItem("oks-" + no)) { $("#textarea").val($("#textarea").val() + localStorage.getItem("oks-" + no)) }
+						if (localStorage.getItem('oks-' + no)) {
-						return false;
+							$('#textarea').val($('#textarea').val() + localStorage.getItem('oks-' + no))
+						}
+						return false
 					}
 				}
 			}
 		}
-	});
+	})
 	//クリアボタン
-	$("#clear").click(function () {
+	$('#clear').click(function() {
-		clear();
+		clear()
-	});
+	})
-});
+})
 //選択する
 function tootSelector(column, toot) {
-	$('.cvo').removeClass("selectedToot")
+	$('.cvo').removeClass('selectedToot')
-	$('#timeline_' + column + ' .cvo').eq(toot).addClass("selectedToot")
+	$('#timeline_' + column + ' .cvo')
+		.eq(toot)
+		.addClass('selectedToot')
 	var scr = $('.tl-box[tlid=' + column + ']').scrollTop()
 	var elem = $('.selectedToot').offset().top
 	var top = elem - $('.tl-box').height() + scr
@@ -255,4 +265,4 @@ function tootSelector(column, toot) {
 			$('.tl-box[tlid=' + column + ']').animate({ scrollTop: to })
 		}
 	}
-}
+}

app/js/common/version.js

@@ -329,43 +329,68 @@ function storeDialog(platform, ver) {
 		var mes = lang.lang_version_platform_linux
 	} else if (platform == 'darwin') {
 		var mes = lang.lang_version_platform_mac
+	} else {
+		var mes = false
 	}
-	Swal.fire({
+	if (mes) {
-		title: 'Select your platform',
+		Swal.fire({
-		text: mes,
+			title: 'Select your platform',
-		type: 'info',
+			text: mes,
-		showCancelButton: true,
+			type: 'info',
-		confirmButtonColor: '#3085d6',
+			showCancelButton: true,
-		cancelButtonColor: '#3085d6',
+			confirmButtonColor: '#3085d6',
-		confirmButtonText: lang.lang_no,
+			cancelButtonColor: '#3085d6',
-		cancelButtonText: lang.lang_yesno
+			confirmButtonText: lang.lang_no,
-	}).then(result => {
+			cancelButtonText: lang.lang_yesno
-		//逆にしてる
+		}).then(result => {
-		if (!result.value) {
+			//逆にしてる
-			localStorage.setItem('winstore', 'winstore')
+			if (!result.value) {
-		} else {
+				localStorage.setItem('winstore', 'winstore')
-			localStorage.setItem('winstore', 'localinstall')
-		}
-		localStorage.setItem('ver', ver)
-		show = true
-		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()
+				localStorage.setItem('winstore', 'localinstall')
 			}
+			localStorage.setItem('ver', ver)
+			show = true
+			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)
+			show = true
+			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()
+				}
+			})
+	}
+	
 }
 function closeStart() {
 	$('#start').css('display', 'none')

app/js/emoji/default-emoji.js

@@ -1,84 +1,105 @@
-var defaultemojiList = ["activity", "flag", "food", "nature", "object", "people", "place", "symbol"];
+var defaultemojiList = ['activity', 'flag', 'food', 'nature', 'object', 'people', 'place', 'symbol']
 var defaultemoji = {
-    activity: activity,
+	activity: activity,
-    flag: flag,
+	flag: flag,
-    food: food,
+	food: food,
-    nature: nature,
+	nature: nature,
-    object: object,
+	object: object,
-    people: people,
+	people: people,
-    place: place,
+	place: place,
-    symbol: symbol
+	symbol: symbol
-};
+}
-if (lang == "ja") {
+if (lang == 'ja') {
-    var defaultemojiname = {
+	var defaultemojiname = {
-        activity: "活動",
+		activity: '活動',
-        flag: "国旗",
+		flag: '国旗',
-        food: "食べ物",
+		food: '食べ物',
-        nature: "自然",
+		nature: '自然',
-        object: "もの",
+		object: 'もの',
-        people: "ひと",
+		people: 'ひと',
-        place: "場所",
+		place: '場所',
-        symbol: "記号"
+		symbol: '記号'
-    };
+	}
 } else {
-    var defaultemojiname = {
+	var defaultemojiname = {
-        activity: "Activities",
+		activity: 'Activities',
-        flag: "Flags",
+		flag: 'Flags',
-        food: "Foods",
+		food: 'Foods',
-        nature: "Nature",
+		nature: 'Nature',
-        object: "Tools",
+		object: 'Tools',
-        people: "People",
+		people: 'People',
-        place: "Places",
+		place: 'Places',
-        symbol: "Symbols"
+		symbol: 'Symbols'
-    };
+	}
 }
 
 function defaultEmoji(target) {
-    var json = defaultemoji[target];
+    var announcement = false
-    var emojis = "";
+    if ($('#media').val() == 'announcement') {
-    Object.keys(json).forEach(function (key) {
+        announcement = true
-        var emoji = json[key];
+    }
-        emojis = emojis + '<a onclick="defEmoji(\'' + emoji["shortcode"] + '\')" class="pointer"><span style="width: 20px; height: 20px; display: inline-block; background-image: url(\'../../img/sheet.png\'); background-size: 4900%; background-position: ' + emoji["css"] + ';"></span></a>';
+	var json = defaultemoji[target]
-    });
+	var emojis = ''
-    $("#emoji-list").html(emojis);
+	Object.keys(json).forEach(function(key) {
-    $("#now-emoji").text(lang.lang_defaultemojis_text.replace("{{cat}}", defaultemojiname[target]));
+        var emoji = json[key]
-    $(".emoji-control").addClass("hide");
+        if (announcement) {
+            var def = `<a onclick="emojiReactionDef('${emoji['shortcode']}')" class="pointer">`
+        } else {
+            var def = `<a onclick="defEmoji('${emoji['shortcode']}')" class="pointer">`
+        }
+		emojis =
+			emojis +
+			`${def}
+            <span style="
+                width: 20px; height: 20px; display: inline-block; background-image: url('../../img/sheet.png'); background-size: 4900%;
+                 background-position:${emoji['css']};"></span>
+            </a>`
+	})
+	$('#emoji-list').html(emojis)
+	$('#now-emoji').text(lang.lang_defaultemojis_text.replace('{{cat}}', defaultemojiname[target]))
+	$('.emoji-control').addClass('hide')
 }
 function customEmoji() {
-    $("#emoji-suggest").val("");
+	$('#emoji-suggest').val('')
-    $(".emoji-control").removeClass("hide");
+	$('.emoji-control').removeClass('hide')
-    emojiList('home')
+	emojiList('home')
 }
 function defEmoji(target) {
-    var selin = $("#textarea").prop('selectionStart');
+	var selin = $('#textarea').prop('selectionStart')
-    if (!selin) {
+	if (!selin) {
-        selin = 0;
+		selin = 0
-    }
+	}
-    var emojiraw = newpack.filter(function (item, index) {
+	var emojiraw = newpack.filter(function(item, index) {
-        if (item.short_name == target) return true;
+		if (item.short_name == target) return true
-    });
+	})
-    var hex = emojiraw[0].unified.split("-");
+	var hex = emojiraw[0].unified.split('-')
-    if (hex.length === 2) {
+	if (hex.length === 2) {
-        emoji = twemoji.convert.fromCodePoint(hex[0]) + twemoji.convert.fromCodePoint(hex[1]);
+		emoji = twemoji.convert.fromCodePoint(hex[0]) + twemoji.convert.fromCodePoint(hex[1])
-    } else {
+	} else {
-        emoji = twemoji.convert.fromCodePoint(hex[0]);
+		emoji = twemoji.convert.fromCodePoint(hex[0])
-    }
+	}
-    var now = $("#textarea").val();
+	var now = $('#textarea').val()
-    var before = now.substr(0, selin);
+	var before = now.substr(0, selin)
-    var after = now.substr(selin, now.length);
+	var after = now.substr(selin, now.length)
-    newt = before + emoji + after;
+	newt = before + emoji + after
-    $("#textarea").val(newt);
+	$('#textarea').val(newt)
-    $("#textarea").focus();
+	$('#textarea').focus()
 }
 function faicon() {
-    var json = faicons;
+	var json = faicons
-    var emojis = "";
+	var emojis = ''
-    Object.keys(json).forEach(function (key) {
+	Object.keys(json).forEach(function(key) {
-        var emoji = json[key];
+		var emoji = json[key]
-        var eje = emoji.replace(/fa-/g, "");
+		var eje = emoji.replace(/fa-/g, '')
-        emojis = emojis + '<a onclick="emojiInsert(\'[faicon]' + eje + '[/faicon]\')" class="pointer white-text" style="font-size:24px"><i class="fa ' + emoji + '"></i></a>';
+		emojis =
-    });
+			emojis +
-    $("#emoji-list").html(emojis);
+			'<a onclick="emojiInsert(\'[faicon]' +
-    $("#now-emoji").text("faicon");
+			eje +
-    $(".emoji-control").addClass("hide");
+			'[/faicon]\')" class="pointer white-text" style="font-size:24px"><i class="fa ' +
-}
+			emoji +
+			'"></i></a>'
+	})
+	$('#emoji-list').html(emojis)
+	$('#now-emoji').text('faicon')
+	$('.emoji-control').addClass('hide')
+}

app/js/login/manager.js

@@ -33,7 +33,9 @@ function load() {
 	}
 
 	console.table(obj)
+	var domains = []
 	var templete
+	$('#acct-list').html('')
 	Object.keys(obj).forEach(function(key) {
 		var acct = obj[key]
 		var list = key * 1 + 1
@@ -47,6 +49,7 @@ function load() {
 		} else {
 			var name = acct.user
 		}
+		domains.push(acct.domain)
 		templete = `
 		<div id="acct_${key}" class="card" ${style}>
 			<div class="card-content ">
@@ -54,15 +57,12 @@ function load() {
 				<span class="card-title">${name}</span>${escapeHTML(acct.user)}@${acct.domain}
 			</div>
 			<div class="card-action">
-				<a class="waves-effect disTar pointer white-text" onclick="data('${acct.domain}')">
+				<button class="btn-flat waves-effect disTar pointer  white-text" onclick="refresh('${key}')">
-					<i class="material-icons">info</i>${lang.lang_manager_info}
+					<i class="material-icons left">refresh</i>${lang.lang_manager_refresh}
-				</a>
+				</button>
-				<a class="waves-effect disTar pointer  white-text" onclick="refresh('${key}')">
+				<button class="btn-flat waves-effect disTar pointer red-text" onclick="multiDel('${key}')">
-					<i class="material-icons">refresh</i>${lang.lang_manager_refresh}
+					<i class="material-icons left">delete</i>${lang.lang_manager_delete}
-				</a>
+				</button><br />${lang.lang_manager_color}
-				<a class="waves-effect disTar pointer red-text" onclick="multiDel('${key}')">
-					<i class="material-icons">delete</i>${lang.lang_manager_delete}"
-				</a><br />${lang.lang_manager_color}
 				<div id="colorsel_${key}" class="colorsel"></div>
 			</div>
 		</div>
@@ -70,6 +70,30 @@ function load() {
 		$('#acct-list').append(templete)
 		colorpicker(key)
 	})
+	domains = _.uniq(domains)
+	$('#domain-list').html('')
+	Object.keys(domains).forEach(function(key2) {
+		var domain = domains[key2]
+		if (localStorage.getItem('letters_' + key2)) {
+			var maxChars = localStorage.getItem('letters_' + key2)
+		} else {
+			var maxChars = 500
+		}
+		var templete = `
+	<li class="collection-item transparent">
+		<div>
+			<p class="title">${domain}</p>
+			${lang.lang_manager_maxChars}　<input style="width: 100px" value="${maxChars}" id="maxChars${key2}">
+			<button class="btn-flat waves-effect" onclick="maxChars('${domain}', '${key2}')">
+				<i class="material-icons">send</i>
+			</button>
+			<button class="btn-flat waves-effect secondary-content" onclick="data('${domain}', '${key2}')">
+				<i class="material-icons left">info</i>${lang.lang_manager_info}
+			</button>
+		</div></li>
+		`
+		$('#domain-list').append(templete)
+	})
 	multisel()
 	var acctN = localStorage.getItem('acct')
 	if (!acctN) {
@@ -82,9 +106,35 @@ function load() {
 //最初に読む
 load()
 support()
-
+function maxChars(domain, uid) {
+	var value = $('#maxChars' + uid).val()
+	if(value*1 < 1 || !Number.isInteger(value*1)) {
+		Swal.fire({
+			type: 'error',
+			title: 'Error'
+		})
+		return false
+	}
+	var multi = localStorage.getItem('multi')
+	if (!multi) {
+		var obj = []
+	} else {
+		var obj = JSON.parse(multi)
+	}
+	if (obj[0]) {
+		if (!obj[0].at) {
+			obj = []
+			localStorage.removeItem('multi')
+		}
+	}
+	Object.keys(obj).forEach(function(key) {
+		if(obj[key].domain == domain) localStorage.setItem('letters_' + key, value)
+	})
+	console.log('#maxChars' + uid, value)
+	load()
+}
 //instances.social/instances API
-function data(domain) {
+async function data(domain, acct_id) {
 	$('#ins-upd').text('Loading...')
 	$('#ins-add').text('Loading...')
 	$('#ins-connect').text('Loading...')
@@ -96,7 +146,7 @@ function data(domain) {
 	$('#ins-name').text('Loading...')
 	$('#ins-prof').attr('src', '../../img/loading.svg')
 	var start = 'https://instances.social/api/1.0/instances/show?name=' + domain
-	fetch(start, {
+	let promise = await fetch(start, {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
@@ -104,74 +154,42 @@ function data(domain) {
 				'Bearer tC8F6xWGWBUwGScyNevYlx62iO6fdQ4oIK0ad68Oo7ZKB8GQdGpjW9TKxBnIh8grAhvd5rw3iyP9JPamoDpeLQdz62EToPJUW99hDx8rfuJfGdjQuimZPTbIOx0woA5M'
 		}
 	})
-		.then(function(response) {
+	var json = await promise.json()
-			if (!response.ok) {
+	$('#ins-name').text(json.name)
-				response.text().then(function(text) {
+	$('#ins-upd').text(date(json.checked_at, 'full'))
-					setLog(response.url, response.status, text)
+	$('#ins-add').text(date(json.added_at, 'full'))
-				})
+	$('#ins-connect').text(json.connections)
-			}
+	$('#ins-toot').text(json.statuses)
-			return response.json()
+	$('#ins-sys').text(date(json.updated_at, 'full'))
-		})
+	$('#ins-per').text(json.uptime * 100)
-		.catch(function(error) {
+	$('#ins-user').text(json.users)
-			todo(error)
+	$('#ins-ver').text(json.version)
-			setLog(start, 'JSON', error)
-			console.error(error)
-		})
-		.then(function(json) {
-			if (!json.error) {
-				$('#ins-name').text(json.name)
-				$('#ins-upd').text(date(json.checked_at, 'full'))
-				$('#ins-add').text(date(json.added_at, 'full'))
-				$('#ins-connect').text(json.connections)
-				$('#ins-toot').text(json.statuses)
-				$('#ins-sys').text(date(json.updated_at, 'full'))
-				$('#ins-per').text(json.uptime * 100)
-				$('#ins-user').text(json.users)
-				$('#ins-ver').text(json.version)
-			} else {
-				console.error(json.error)
-			}
-		})
 	var start = 'https://' + domain + '/api/v1/instance'
-	fetch(start, {
+	let promise2 = await fetch(start, {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json'
 		}
 	})
-		.then(function(response) {
+	var json = await promise2.json()
-			if (!response.ok) {
+	$('#ins-title').text(json.title)
-				response.text().then(function(text) {
+	$('#ins-desc').html(json.description)
-					setLog(response.url, response.status, text)
+	$('#ins-email').text(json.email)
-				})
+	$('#ins-toot').text(json.stats.status_count)
-			}
+	$('#ins-user').text(json.stats.user_count)
-			return response.json()
+	$('#ins-ver').text(json.version)
-		})
+	$('#ins-prof').attr('src', json.thumbnail)
-		.catch(function(error) {
+	$('#ins-admin').text(
-			todo(error)
+		escapeHTML(json.contact_account.display_name) + '(' + json.contact_account.acct + ')'
-			setLog(start, 'JSON', error)
+	)
-			console.error(error)
+	$('#ins-admin').attr(
-		})
+		'href',
-		.then(function(json) {
+		'index.html?mode=user&code=' + json.contact_account.username + '@' + domain
-			if (!json.error) {
+	)
-				$('#ins-title').text(json.title)
+	if (json['max_toot_chars']) {
-				$('#ins-desc').html(json.description)
+		localStorage.setItem('letters_' + acct_id, json['max_toot_chars'])
-				$('#ins-email').text(json.email)
+		load()
-				$('#ins-toot').text(json.stats.status_count)
+	}
-				$('#ins-user').text(json.stats.user_count)
-				$('#ins-ver').text(json.version)
-				$('#ins-prof').attr('src', json.thumbnail)
-				$('#ins-admin').text(
-					escapeHTML(json.contact_account.display_name) + '(' + json.contact_account.acct + ')'
-				)
-				$('#ins-admin').attr(
-					'href',
-					'index.html?mode=user&code=' + json.contact_account.username + '@' + domain
-				)
-			} else {
-				console.error(json.error)
-			}
-		})
 }
 
 //アカウントデータ　消す

app/js/platform/end.js

@@ -46,10 +46,17 @@ $(document).on('click', 'a', e => {
 					udgEx(url, 'main')
 					return false
 				} else {
-					postMessage(['openUrl', url], '*')
+					if(pwa) {
+						return true
+					} else {
+						postMessage(['openUrl', url], '*')
+					}
 				}
 			}
 		} else {
+			if(pwa) {
+				return true
+			}
 			//hrefがhttp/httpsならブラウザで
 			if (urls) {
 				if (urls[0]) {
@@ -190,3 +197,23 @@ onmessage = function(e) {
 		})
 	}
 }
+/* PWA */
+if(pwa) {
+	function postMessage(e) {
+		if (e[0] == 'openUrl') {
+			urls = e[1].match(/https?:\/\/(.+)/)
+			if (urls) {
+				Swal.fire({
+					title: 'Open URL',
+					icon: 'info',
+					html:
+					  `If you are OK, click: <a href="${urls[0]}" target="_blank" class="btn waves-effect">Here</a>`,
+					showCloseButton: false,
+					showCancelButton: true,
+					focusConfirm: false,
+					confirmButtonText: 'Close'
+				  })
+			}
+		}
+	}
+}

app/js/post/bb-md.js

@@ -50,7 +50,12 @@ function mdCheck() {
 	if (idata[domain + '_letters']) {
 		$('#textarea').attr('data-length', idata[domain + '_letters'])
 	} else {
-		$('#textarea').attr('data-length', 500)
+		var maxletters = localStorage.getItem('letters_' + acct_id)
+		if (maxletters > 0) {
+			$('#textarea').attr('data-length', maxletters)
+		} else {
+			$('#textarea').attr('data-length', 500)
+		}
 	}
 	if (idata[domain + '_glitch'] === 'true') {
 		$('#local-button').removeClass('hide')

app/js/post/emoji.js

@@ -193,7 +193,15 @@ function emojiGet(parse, started) {
 function emojiList(target, reaction) {
 	$('#now-emoji').text(lang.lang_emoji_custom)
 	var acct_id = $('#post-acct-sel').val()
-	if (reaction && localStorage.getItem('emojiReaction_' + acct_id) != 'true') {
+	if(reaction && $('#media').val() == 'misskey') {
+		var misskeyReact = true
+	} else {
+		var misskeyReact = false
+	}
+	if (
+		misskeyReact &&
+		localStorage.getItem('emojiReaction_' + acct_id) != 'true'
+	) {
 		console.error('Disabled')
 		clear()
 		hide()
@@ -263,9 +271,20 @@ function emojiList(target, reaction) {
 		var emoji = obj[i]
 		if (emoji) {
 			if (reaction) {
-				html =
+				if (emoji.divider) {
-					html +
+					html = html + '<p style="margin-bottom:0">' + emoji.cat + '</p>'
-					`<a onclick="emojiReaction(':${emoji.shortcode}:')" class="pointer"><img src="${emoji.url}" width="20" title="${emoji.shortcode}"></a>`
+				} else {
+					if (emoji.listed) {
+						if(misskeyReact) {
+							var shortcode = `:${emoji.shortcode}:`
+						} else {
+							var shortcode = emoji.shortcode
+						}
+						html =
+							html +
+							`<a onclick="emojiReaction('${shortcode}')" class="pointer"><img src="${emoji.url}" width="20" title="${emoji.shortcode}"></a>`
+					}
+				}
 			} else {
 				if (emoji.divider) {
 					html = html + '<p style="margin-bottom:0">' + emoji.cat + '</p>'

app/js/post/img.js

@@ -94,7 +94,6 @@ function media(b64, type, no, stamped) {
 		postMessage(['stampImage', [b64, user + '@' + domain]], '*')
 		return false
 	}
-	console.log(b64)
 	var l = 4
 	var c = 'abcdefghijklmnopqrstuvwxyz0123456789'
 	var cl = c.length
@@ -143,6 +142,12 @@ function media(b64, type, no, stamped) {
 			var json = httpreq.response
 			if (this.status !== 200) {
 				setLog(start, this.status, json)
+				$('.toot-btn-group').prop('disabled', false)
+				$('select').formSelect()
+				$('#mec').text(lang.lang_there)
+				M.toast({ html: this.status + ':' +json, displayLength: 2000 })
+				$('#imgup').text('')
+				$('#imgsel').show()
 			}
 			if (!json.id) {
 				todc()

app/js/post/misskeystatus.js

@@ -116,6 +116,7 @@ function reactiontoggle(id, acct_id, tlid) {
 //reactioncustom
 function reactioncustom(acct_id, id) {
 	$('#reply').val(id)
+	$('#media').val('misskey')
 	$('#unreact').hide()
 	$('#addreact').removeClass('hide')
 	$('#post-acct-sel').val(acct_id)
@@ -186,9 +187,14 @@ function reactRefreshCore(json) {
 	}
 }
 function emojiReaction(emoji) {
+	var media = $('#media').val()
 	var acct_id = $('#post-acct-sel').val()
 	var id = $('#reply').val()
-	reaction(emoji, id, acct_id, null)
+	if(media == 'announcement') {
+		announReaction(id, acct_id, 0, false, emoji)
+	} else {
+		reaction(emoji, id, acct_id, null)
+	}
 	clear()
 	hide()
 }

app/js/tl/announParse.js

@@ -0,0 +1,145 @@
+function announParse(obj, acct_id, tlid) {
+	var template = ''
+	var datetype = localStorage.getItem('datetype')
+	var gif = localStorage.getItem('gif')
+	//Ticker
+	var tickerck = localStorage.getItem('ticker_ok')
+	if (tickerck == 'yes') {
+		var ticker = true
+	} else if (!ticker || ticker == 'no') {
+		var ticker = false
+	}
+	if (!datetype) {
+		datetype = 'absolute'
+	}
+	if (!gif) {
+		var gif = 'yes'
+	}
+	Object.keys(obj).forEach(function(key) {
+		var toot = obj[key]
+		var content = toot.content
+		if (toot.emojis) {
+			Object.keys(toot.emojis).forEach(function(key1) {
+				var emoji = toot.emojis[key1]
+				var shortcode = emoji.shortcode
+				if (gif == 'yes') {
+					var emoSource = emoji.url
+				} else {
+					var emoSource = emoji.static_url
+				}
+				var emoji_url = `
+					<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
+						alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
+				`
+				var regExp = new RegExp(':' + shortcode + ':', 'g')
+				content = content.replace(regExp, emoji_url)
+			})
+		}
+		content = twemoji.parse(content)
+		var reactions = ''
+		//既存のリアクション
+		if (toot.reactions) {
+			Object.keys(toot.reactions).forEach(function(key2) {
+				var reaction = toot.reactions[key2]
+				//普通の絵文字 or カスタム絵文字 は文字数判断。ただしスコットランド国旗みたいなやべぇやつに注意
+				var splitter = new GraphemeSplitter()
+				if (splitter.splitGraphemes(reaction.name).length > 1) {
+					//カスタム絵文字
+					var shortcode = reaction.shortcode
+					if (gif == 'yes') {
+						var emoSource = reaction.url
+					} else {
+						var emoSource = reaction.static_url
+					}
+					var emoji_url = `
+					<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
+                        alt=" :${shortcode}: " title="${shortcode}">`
+				} else {
+					emoji_url = twemoji.parse(reaction.name)
+				}
+				var addClass = ''
+				if (reaction.me) {
+					addClass = 'reactioned'
+				}
+				reactions =
+					reactions +
+                    `<div class="announReaction ${addClass}" onclick="announReaction('${toot.id}', '${acct_id}', '${tlid}', ${reaction.me},'${reaction.name}')">
+                        ${emoji_url} ${reaction.count}
+                    </div>`
+			})
+		}
+		if (toot.ends_at) {
+			var ended = `<div class="announReaction" title="${date(toot.ends_at, 'absolute')}" style="width: auto; cursor: default;">
+            <i class="fas fa-arrow-right"></i>
+            ${date(toot.ends_at, datetype)}
+        </div>`
+		} else {
+			var ended = ''
+		}
+
+		template =
+			template +
+			`<div class="announcement" data-id="${toot.id}">
+            ${content}
+            <div class="reactionsPack">
+                ${reactions}
+                <div class="announReaction add" onclick="announReactionNew('${toot.id}', '${acct_id}', '${tlid}')"><i class="fas fa-plus"></i></div>
+                ${ended}
+            </div>
+        </div>`
+	})
+	return template
+}
+function announReaction(id, acct_id, tlid, del, name) {
+    var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var start = 'https://' + domain + '/api/v1/announcements/' + id + '/reactions/' + encodeURIComponent(name)
+    var httpreq = new XMLHttpRequest()
+    if(del) {
+        var method = 'DELETE'
+    } else {
+        var method = 'PUT'
+    }
+	httpreq.open(method, start, true)
+	httpreq.setRequestHeader('Content-Type', 'application/json')
+	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+	httpreq.responseType = 'json'
+	httpreq.send()
+	httpreq.onreadystatechange = function() {
+		if (httpreq.readyState === 4) {
+			var json = httpreq.response
+			if (this.status !== 200) {
+				setLog(start, this.status, this.response)
+			}
+			announ(acct_id, tlid)
+		}
+	}
+}
+function announReactionNew(id, acct_id, tlid) {
+    $('#reply').val(id)
+	$('#media').val('announcement')
+	$('#unreact').hide()
+	$('#addreact').removeClass('hide')
+	$('#post-acct-sel').val(acct_id)
+	$('select').formSelect()
+	localStorage.setItem('nohide', true)
+	show()
+	emojiToggle(true)
+	$('#left-side').hide()
+}
+function emojiReactionDef(target) {
+    var emojiraw = newpack.filter(function(item, index) {
+		if (item.short_name == target) return true
+	})
+	var hex = emojiraw[0].unified.split('-')
+	if (hex.length === 2) {
+		emoji = twemoji.convert.fromCodePoint(hex[0]) + twemoji.convert.fromCodePoint(hex[1])
+	} else {
+		emoji = twemoji.convert.fromCodePoint(hex[0])
+    }
+	var acct_id = $('#post-acct-sel').val()
+	var id = $('#reply').val()
+	announReaction(id, acct_id, 0, false, emoji)
+	clear()
+	hide()
+}

app/js/tl/misskeyparse.js

@@ -880,7 +880,7 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
 		}
 		var ftxt = lang.lang_parse_followed;
 		if (popup > 0 || popup == -1) {
-			var notftext = '<span class="cbadge"title="' + date(toot.createdAt,
+			var notftext = '<span class="cbadge" title="' + date(toot.createdAt,
 				'absolute') + '(' + lang.lang_parse_notftime + ')"><i class="far fa-clock"></i>' + date(toot.createdAt,
 					datetype) +
 				'</span>' + ftxt + '<br>';

app/js/tl/notification.js

@@ -70,12 +70,14 @@ function notfColumn(acct_id, tlid, sys) {
 					}
 					var mute = getFilterTypeByAcct(acct_id, 'notif')
 					//Pleromaにはmoveというtypeがあるらしい。何が互換APIじゃ
-					if (obj.type != 'follow' && obj.type != 'move') {
+					if (obj.type != 'follow' && obj.type != 'move' && obj.type != 'follow_request') {
 						if (misskey) {
 							templete = templete + misskeyParse([obj], 'notf', acct_id, tlid, -1, mute)
 						} else {
 							templete = templete + parse([obj], 'notf', acct_id, tlid, -1, mute)
 						}
+					} else if (obj.type == 'follow_request') {
+						templete = templete + userparse([obj.account], 'request', acct_id, tlid, -1)
 					} else {
 						if (misskey) {
 							templete = templete + misskeyUserparse([obj], 'notf', acct_id, tlid, -1, mute)
@@ -404,6 +406,11 @@ function notfCanceler(acct) {
 	localStorage.removeItem('notf-follow_' + acct)
 	$('.notf-follow_' + acct).addClass('hide')
 	$('.notf-icon_' + acct).removeClass('red-text')
+	var id = $('#announce_' + acct + ' .announcement').first().attr('data-id')
+	$('.notf-announ_' + acct + '_ct').text("")
+	if(id) {
+		localStorage.setItem('announ_' + acct, id)
+	}
 }
 function allNotfRead() {
 	var multi = localStorage.getItem('multi')

app/js/tl/parse.js

@@ -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="${desc}">
+										onerror="this.src=\'../../img/loading.svg\'" title="${escapeHTML(desc)}">
 									${nsfwmes}
 								</a>`
 						}
@@ -1060,7 +1060,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						</a>
 					</div>
 					<div class="action ${can_rt} ${disp['rt']} ${noauth}">
-						<a onclick="rt('${toot.id}','${acct_id}','${tlid}')" class="waves-effect waves-dark btn-flat actct bt-btn"
+						<a onclick="rt('${
+							toot.id
+						}','${acct_id}','${tlid}')" class="waves-effect waves-dark btn-flat actct bt-btn"
 							style="padding:0" title="${lang.lang_parse_bt}">
 							<i class="fas fa-retweet ${if_rt} rt_${toot.id}"></i>
 							<span class="rt_ct">${toot.reblogs_count}</span>
@@ -1199,6 +1201,8 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 					}
 				} else if (auth == 'moved') {
 					var ftxt = lang.lang_parse_moved
+				} else if (auth == 'request') {
+					var ftxt = lang.lang_parse_request
 				}
 				console.log(auth, ftxt)
 				if (popup > 0 || popup == -1 || notf) {
@@ -1281,7 +1285,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 				}
 				templete =
 					templete +
-					`<div class="cvo" style="padding-top:5px;" user-id="${toot.id}">
+					`<div class="cusr" style="padding-top:5px;" user-id="${toot.id}">
 					<div class="area-notice">${notftext}</div>
 					<div class="area-icon">
 						${udg}
@@ -1301,21 +1305,20 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 								class="sml gray"
 								style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;user-select:auto; cursor:text;"
 							>
-								@ ${toot.acct}${locked}</span
+								@ ${toot.acct}${locked}</span>
-							>
 						</div>
 					</div>
-					<div class="area-toot acct-note">
+					<div class="area-status">
-						${toot.note.replace(/<br\s?\/?>.+/g, '<span class="gray">...</span>')}
-					</div>
-					<div style="justify-content:space-around;top:5px" class="area-actions">
 						<div class="cbadge" style="width:100px;">
 							${lang.lang_status_follow}:${toot.following_count}
 						</div>
 						<div class="cbadge" style="width:100px;">
 							${lang.lang_status_followers}:${toot.followers_count}
 						</div>
-						${latesthtml}${authhtml}
+						${latesthtml}
+					</div>
+					<div class="area-actions" style="justify-content: flex-end;">
+						${authhtml}
 					</div>
 				</div>
 				`

app/js/tl/src.js

@@ -36,7 +36,7 @@ function src(mode, offset) {
 		var user = $('#his-data').attr('user-id')
 	}
 	if (!mode) {
-		var start = 'https://' + domain + '/api/v2/search?q=' + q + add
+		var start = 'https://' + domain + '/api/v2/search?resolve=true&q=' + encodeURIComponent(q) + add
 	} else {
 		var start = 'https://' + domain + '/api/v1/search?q=' + q
 	}
@@ -218,7 +218,7 @@ function graphDraw(tag, acct_id) {
 	var his = tag.history
 	return graphDrawCore(his, tag)
 }
-function graphDrawCore(his, tag){
+function graphDrawCore(his, tag) {
 	var max = Math.max.apply(null, [
 		his[0].uses,
 		his[1].uses,
@@ -252,7 +252,9 @@ function graphDrawCore(his, tag){
 					toot
 				</div>
 				<div class="tagCompTag">
-					<a onclick="tl('tag','${escapeHTML(tag.name)}','${acct_id}','add')" class="pointer" title="${escapeHTML(tag.name)}">
+					<a onclick="tl('tag','${escapeHTML(
+						tag.name
+					)}','${acct_id}','add')" class="pointer" title="${escapeHTML(tag.name)}">
 						#${escapeHTML(tag.name)}
 					</a>
 				</div>
@@ -308,3 +310,48 @@ function trend() {
 			})
 		})
 }
+function srcBox(mode) {
+	var selectedText = window.getSelection().toString()
+	if (mode == 'open') {
+		$('#pageSrc').removeClass('hide')
+	} else if (mode == 'close') {
+		if(!selectedText) {
+			$('#pageSrc').addClass('hide')
+			$('#pageSrc').removeClass('keep')
+		}
+	} else {
+		$('#pageSrc').toggleClass('hide')
+	}
+	if(!$('#pageSrc').hasClass('keep')) {
+		$('#pageSrcInput').val(selectedText)
+	}
+}
+$('#pageSrcInput').click(function() {
+	$('#pageSrc').addClass('keep')
+})
+$('#pageSrcInput').on('input', function(evt) {
+	if(!$('#pageSrcInput').val()) {
+		$('#pageSrc').removeClass('keep')
+	}
+})
+document.addEventListener('selectionchange', function() {
+	var selectedText = window.getSelection().toString()
+	if (selectedText && !$('input').is(':focus') && !$('textarea').is(':focus')) {
+		srcBox('open')
+	}
+})
+function doSrc(type) {
+	$('#pageSrc').addClass('hide')
+	$('#pageSrc').removeClass('keep')
+	var q = $('#pageSrcInput').val()
+	if(type == 'web') {
+		var start = localStorage.getItem('srcUrl')
+		if(!start) {
+			start = 'https://google.com/search?q={q}'
+		}
+		start = start.replace(/{q}/, q)
+		postMessage(["openUrl", start], "*")
+	} else if(type == 'ts') {
+		tsAdd(q)
+	}
+}

app/js/tl/tl.js

@@ -64,6 +64,9 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		)
 		$('#notice_icon_' + tlid).text('bookmark')
 		return
+	} else if (type == 'home') {
+		//ホームならお知らせ「も」取りに行く
+		announ(acct_id, tlid);
 	}
 	localStorage.setItem('now', type)
 	todo(cap(type) + ' TL Loading...')
@@ -311,6 +314,8 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 					}
 				} else if (typeA == 'filters_changed') {
 					filterUpdate(acct_id)
+				} else if (~typeA.indexOf('announcement')) {
+					announ(acct_id, tlid)
 				}
 			}
 		}
@@ -1167,3 +1172,42 @@ function getBookmark(acct_id, tlid, more) {
 		}
 	}
 }
+//Announcement
+function announ(acct_id, tlid) {
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var start = 'https://' + domain + '/api/v1/announcements'
+	var httpreq = new XMLHttpRequest()
+	httpreq.open('GET', start, true)
+	httpreq.setRequestHeader('Content-Type', 'application/json')
+	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+	httpreq.responseType = 'json'
+	httpreq.send()
+	httpreq.onreadystatechange = function() {
+		if (httpreq.readyState === 4) {
+			var json = httpreq.response
+			if (this.status !== 200) {
+				setLog(start, this.status, this.response)
+			}
+			if (json.length > 0) {
+				$('.notf-announ_' + acct_id).removeClass('hide')
+				var ct = 0
+				for (var i = 0; i < json.length; i++) {
+					if (localStorage.getItem('announ_' + acct_id) == json[i].id) {
+						break
+					}
+					ct++
+				}
+				if(ct > 0) {
+					$('.notf-announ_' + acct_id + '_ct').text(ct)
+				}
+			} else {
+				$('.notf-announ_' + acct_id).addClass('hide')
+			}
+			var templete = announParse(json, acct_id, tlid)
+			$('#announce_' + tlid).html(templete)
+			jQuery('time.timeago').timeago()
+			todc()
+		}
+	}
+}

app/js/ui/img.js

@@ -102,6 +102,13 @@ function imageXhr(id, key, murl) {
 		},
 		false
 	)
+	xhr.addEventListener(
+		'error',
+		function(event) {
+			$('#imgmodal').attr('src', murl)
+		},
+		false
+	)
 	xhr.onreadystatechange = function() {
 		if (this.readyState == 4 && this.status == 200) {
 			r = new FileReader()
@@ -112,6 +119,9 @@ function imageXhr(id, key, murl) {
 				var width
 				element.onload = function() {
 					var width = element.naturalWidth
+					if(width < 650) {
+						width = 650;
+					}
 					var height = element.naturalHeight
 					var windowH = $(window).height()
 					var windowW = $(window).width()

app/js/ui/layout.js

@@ -234,7 +234,7 @@ function parseColumn(target, dontclose) {
 			var unread = `<a id="unread_${key}" onclick="showUnread('${key}','${acct.type}','${acct.domain}')"
 					 class="setting nex" title="${lang.lang_layout_unread}">
 					<i class="material-icons waves-effect nex">more</i>
-				</a>`
+				</a>${lang.lang_layout_unread}<br>`
 			var notfDomain = acct.domain
 			var notfKey = key
 			var if_tag = ''
@@ -368,7 +368,11 @@ function parseColumn(target, dontclose) {
 							title="${unique_notf}" ${icnsert}>
 							<i class="material-icons waves-effect nex notf-icon_${acct.domain}">notifications</i>
 						</a>
-						${unread}
+						<span class="cbadge hide notf-announ_${acct.domain}" style="margin-right:0" 
+							onclick="notfToggle('${acct.domain}','${key}')" title="${lang.lang_layout_announ}">
+							<i class="fas fa-bullhorn"></i>
+							<span class="notf-announ_${acct.domain}_ct"></span>
+						</span>
 						${if_tag_btn}
 					</div>
 					<div class="area-sta">
@@ -389,10 +393,12 @@ function parseColumn(target, dontclose) {
 					</div>
 				</div>
 				<div class="column-hide notf-indv-box z-depth-4" id="notf-box_${notfKey}">
+					<div id="announce_${notfKey}" style="border: 1px solid"></div>
 					<div id="notifications_${notfKey}" data-notf="${notfDomain}" data-type="notf" class="notf-timeline">
 					</div>
 				</div>
 				<div class="column-hide notf-indv-box" id="util-box_${key}" style="padding:5px;">
+					${unread}
 					${exclude}${left_hold}
 					<a onclick="mediaToggle('${key}')" class="setting nex">
 						<i class="material-icons waves-effect nex" title="${lang.lang_layout_mediafil}">perm_media</i>

app/js/ui/post-box.js

@@ -122,6 +122,7 @@ $('#timeline-container,#group').click(function(e) {
 	selectedColumn = 0
 	selectedToot = 0
 	localStorage.removeItem('nohide')
+	srcBox('close')
 })
 $('#contextWrap').click(function(e) {
 	$('#contextWrap').addClass('hide')

app/js/ui/settings.js

@@ -787,6 +787,15 @@ function asReadEnd() {
 	postMessage(['asReadComp', ''], '*')
 }
 function checkupd() {
+	if (
+		localStorage.getItem('winstore') == 'brewcask' ||
+		localStorage.getItem('winstore') == 'snapcraft' ||
+		localStorage.getItem('winstore') == 'winstore'
+	) {
+		var winstore = true
+	} else {
+		var winstore = false
+	}
 	var ver = localStorage.getItem('ver')
 	var start = 'https://thedesk.top/ver.json'
 	fetch(start, {

app/js/ui/spotify.js

@@ -125,10 +125,6 @@ function nowplaying(mode) {
 	}
 }
 function npCore(arg) {
-	if (arg.cmd) {
-		console.error(arg);
-		return;
-	}
 	console.table(arg);
 	var content = localStorage.getItem("np-temp");
 	if (!content || content == "" || content == "null") {

app/js/ui/theme.js

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

app/main/np.js

@@ -1,36 +1,35 @@
 function np(mainWindow) {
-    const electron = require("electron");
+	const electron = require('electron')
-    const join = require('path').join;
+	const ipc = electron.ipcMain
-    const app = electron.app;
+	ipc.on('itunes', async (e, args) => {
-    const fs = require("fs");
+		console.log('Access')
-    var ipc = electron.ipcMain;
+		if (args[0] == 'set') {
-    ipc.on('itunes', async (e, args) => {
+		} else {
-        //Verified on Windows
+			var platform = process.platform
-        console.log("Access");
+			var bit = process.arch
-        if (args[0] == "set") {
+			if (platform == 'darwin') {
-            
+				try {
-        } else {
+					const nowplaying = require('itunes-nowplaying-mac')
-            var platform = process.platform;
+					let value = await nowplaying()
-            var bit = process.arch;
+					try {
-            if (platform == "darwin") {
+						const artwork = await nowplaying.getThumbnailBuffer(value.databaseID)
-                try {
+						if(artwork) {
-                    const nowplaying = require("itunes-nowplaying-mac");
+							const base64 = artwork.toString('base64')
-                    let value = await nowplaying();
+							value.artwork = base64
-
+							e.sender.webContents.send('itunes-np', value)
-                    const artwork = await nowplaying.getThumbnailBuffer(value.databaseID);
+						}
-                    const base64 = artwork.toString('base64');
+					} catch (error) {
-                    value.artwork = base64
+						console.error(error)
-                    e.sender.webContents.send('itunes-np', value);
+						e.sender.webContents.send('itunes-np', value)
-                } catch (error) {
+					}
-                    // エラーを返す
+					
-                    console.error(error);
+				} catch (error) {
-                    e.sender.webContents.send('itunes-np', error);
+					console.error(error)
-                }
+				}
-            } else {
+			} else {
-                
+			}
-            }
+		}
-        }
+    })
-
+    
-    });
 }
-exports.TheDeskNowPlaying = np;
+exports.TheDeskNowPlaying = np

app/manifest.json

@@ -0,0 +1,52 @@
+{
+  "name": "TheDesk",
+  "short_name": "TheDesk",
+  "theme_color": "#212121",
+  "background_color": "#212121",
+  "display": "standalone",
+  "Scope": "/",
+  "start_url": "/",
+  "icons": [
+    {
+      "src": "img/icons/icon-72x72.png",
+      "sizes": "72x72",
+      "type": "image/png"
+    },
+    {
+      "src": "img/icons/icon-96x96.png",
+      "sizes": "96x96",
+      "type": "image/png"
+    },
+    {
+      "src": "img/icons/icon-128x128.png",
+      "sizes": "128x128",
+      "type": "image/png"
+    },
+    {
+      "src": "img/icons/icon-144x144.png",
+      "sizes": "144x144",
+      "type": "image/png"
+    },
+    {
+      "src": "img/icons/icon-152x152.png",
+      "sizes": "152x152",
+      "type": "image/png"
+    },
+    {
+      "src": "img/icons/icon-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png"
+    },
+    {
+      "src": "img/icons/icon-384x384.png",
+      "sizes": "384x384",
+      "type": "image/png"
+    },
+    {
+      "src": "img/icons/icon-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    }
+  ],
+  "splash_pages": null
+}

app/package.json

@@ -1,19 +1,20 @@
 {
   "name": "thedesk",
-  "version": "20.1.0",
+  "version": "20.1.2",
   "description": "TheDesk is a Mastodon client for PC.",
   "repository": "https://github.com/cutls/TheDesk",
   "main": "main.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "construct": "cd view/make && node make --automatic && cd ../../",
-    "dev": "electron ./ --dev",
+    "dev": "npx electron ./ --dev",
     "dist": "build --linux snap",
     "watchview": "node view/make/make.js --automatic --watch",
     "build:js": "node build.js",
-    "build": "electron-builder",
+    "build": "node view/make/make.js --automatic && npx electron-builder",
-    "build:all": "electron-builder --win --linux",
+    "build:all": "npx electron-builder --win --linux",
-    "build:win": "electron-builder --win"
+    "build:win": "npx electron-builder --win",
+    "build:pwa": "node view/make/make.js --automatic --pwa"
   },
   "keywords": [
     "mastodon",
@@ -51,17 +52,15 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.11.2",
-    "electron-dl": "^1.14.0",
+    "electron-dl": "^3.0.0",
     "jimp": "^0.9.1",
     "jquery": "^3.4.1",
     "jquery-ui-dist": "^1.12.1",
     "materialize-css": "git://github.com/cutls/materialize",
     "json5": "^2.1.1",
     "lodash": "^4.17.15",
-    "sumchecker": "^3.0.0",
-    "sweetalert2": "^9.5.3",
     "sumchecker": "^3.0.1",
-    "sweetalert2": "^9.4.0",
+    "sweetalert2": "^9.5.4",
     "vue": "^2.6.10"
   },
   "optionalDependencies": {
@@ -70,7 +69,7 @@
   },
   "devDependencies": {
     "chokidar": "^3.3.0",
-    "electron": "^7.1.1",
+    "electron": "^7.1.8",
     "electron-builder": "^22.1.0",
     "electron-rebuild": "^1.8.8",
     "readline-sync": "1.4.10"

app/sw.pwa.js

@@ -0,0 +1,2 @@
+//PWA用
+self.addEventListener('fetch', function(e) {})

app/view/make/acct.sample.html

@@ -1,178 +1,147 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="@@lang@@">
+	<head>
+		<title>Account Manager - TheDesk</title>
+		<meta content="width=device-width,initial-scale=1.0" name="viewport" />
+		<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" />
+		<link
+			href="../../@@node_base@@/@fortawesome/fontawesome-free/css/all.min.css"
+			type="text/css"
+			rel="stylesheet"
+		/>
+		<link href="../../css/acct.css" rel="stylesheet" type="text/css" />
+		<meta charset="utf-8" />
+		@@comment-start@@
+		<script type="text/javascript">
+			var _jipt = []
+			_jipt.push(['project', 'thedesk'])
+		</script>
+		<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
+		@@comment-end@@
+		@@pwa@@
+	</head>
 
-<head>
+	<body id="mainView">
-      <title>Account Manager - TheDesk</title>
+		<script type="text/javascript" src="../../@@node_base@@/jquery/dist/jquery.js"></script>
-      <meta content="width=device-width,initial-scale=1.0" name="viewport">
+		<script type="text/javascript" src="../../js/platform/first.js"></script>
-      <link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
+		<script
-      <link href="../../css/themes.css" type="text/css" rel="stylesheet">
+			type="text/javascript"
-      <link href="../../css/master.css" type="text/css" rel="stylesheet">
+			src="../../@@node_base@@/materialize-css/dist/js/materialize.js"
-      <link href="../../css/tl.css" rel="stylesheet" type="text/css">
+		></script>
-      <link href="../../css/userdata.css" rel="stylesheet" type="text/css">
+		<script type="text/javascript" src="main.js"></script>
-      <link href="../../node_modules/@fortawesome/fontawesome-free/css/all.min.css" type="text/css" rel="stylesheet">
+		<script
-      <style>
+			type="text/javascript"
-            .acct {
+			src="../../@@node_base@@/sweetalert2/dist/sweetalert2.all.min.js"
-                  display: flex;
+		></script>
-                  justify-content: space-around;
+		<script>
-            }
+			var misskeytoken = false
-
+		</script>
-            .card {
+		<script type="text/javascript" src="../../js/common/time.js"></script>
-                  width: 400px;
+		<div class="hide-first">
-                  background-color: #9e9e9e;
+			<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"
-                  margin: 10px;
+				>@@back@@</a
-            }
+			><br />
-
+			<h5>@@list@@</h5>
-            body,
+			<div id="acct-list"></div>
-            html {
+			<div class="divider"></div>
-                  overflow-y: scroll;
+		</div>
-            }
+		<div>
-
+			<h5>@@add@@</h5>
-            #acct-list {
+			<br />
-                  display: flex;
+			<div id="add">
-                  flex-wrap: wrap;
+				<div class="row">
-                  color: white;
+					<div class="col s8">
-                  align-items: flex-start
+						<input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp" />
-            }
+						<div id="ins-suggest"></div>
-
+						@@codesetupwarn@@<br />
-            .lts {
+						<label>
-                  font-size: 150%
+							<input type="checkbox" class="filled-in" id="linux" />
-            }
+							<span>@@codesetup@@</span>
-
+						</label>
-            .colorsel {
+						<br />
-                  display: flex;
+						<label>
-            }
+							<input type="checkbox" class="filled-in" id="misskey" />
-
+							<span>@@thisismisskey@@</span> </label
-            .card .colorsel div:not(.exc) {
+						><br />
-                  width: 20px;
+						<button class="btn waves-effect" onclick="instance()">Login</button><br />
-                  height: 20px;
+					</div>
-            }
+					<div class="col s4">
-
+						<span style="font-family:Open Sans;">Supports</span>
-            .card .colorsel div.exc {
+						<div id="support" class="collection transparent"></div>
-                  width: 40px;
+					</div>
-                  height: 20px;
+				</div>
-            }
+			</div>
-
+			<div id="auth" style="display:none">
-            .first {
+				@@codepastewarn@@<br />
-                  display: flex;
+				<input type="text" id="code" placeholder="@@codepaste@@" required />
-                  justify-content: center;
+				<button class="btn waves-effect" onclick="code()">Auth</button><br />
-                  align-items: center
+				<br />
-            }
+				<a onclick="atSetup()" class="pointer">@@accessTokenSetup@@</a>
-
+				<div id="compt" style="display:none">
-            .first .hide-first {
+					<h5>ログイン前に必ずご確認ください</h5>
-                  display: none;
+					<span id="compt-instance"></span>はバージョンが<span id="compt-ver"></span
-            }
+					>のため以下の機能がご利用いただけません。
-
+					<span id="compt-warn" style="display:none"
-            #compt {
+						>また、このインスタンスはMastodonではなくそのAPI上の互換実装であり、TheDeskでは利用を想定していないため非保証となります。</span
-                  margin-top: 20px;
+					>
-                  margin-bottom: 50px;
+					<ul id="compt-list"></ul>
-                  border: 1px solid;
+				</div>
-                  border: 1px solid;
+			</div>
-                  padding: 5px;
+			<div id="misskeylogin" style="display:none">
-            }
+				<h5>AppSecret</h5>
-
+				@@misskeylogin@@<br />
-            #compt li {
+				<input type="hidden" id="misskey-url" />
-                  list-style-type: disc;
+				<input type="text" id="misskey-key" placeholder="@@codepaste@@" required />
-                  margin-left: 20px;
+				<button class="btn waves-effect" onclick="misskeyLogin()">Auth</button><br />
-            }
+				<br />
-      </style>
+				<a onclick="atSetup('misskey')" class="pointer">@@accessTokenSetup@@</a>
-      <meta charset="utf-8">
+			</div>
-      @@comment-start@@
+		</div>
-      <script type="text/javascript">
+		<div class="hide-first">
-            var _jipt = [];
+			<h5>@@mainacct@@</h5>
-            _jipt.push(['project', 'thedesk']);
+			<div class="input-field" style="width:300px">
-      </script>
+				<span data-trans="your_acct">@@selacct@@</span>
-      <script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
+				<br />
-      @@comment-end@@
+				<select
-</head>
+					id="main-acct-sel"
-
+					class="acct-sel"
-<body id="mainView">
+					style="color:black"
-      <script type="text/javascript" src="../../node_modules/jquery/dist/jquery.js"></script>
+					onchange="mainacct()"
-      <script type="text/javascript" src="../../js/platform/first.js"></script>
+				></select>
-      <script type="text/javascript" src="../../node_modules/materialize-css/dist/js/materialize.js"></script>
+				<label></label>
-      <script type="text/javascript" src="main.js"></script>
+			</div>
-      <script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>
+			<ul id="domain-list" class="collection transparent"></ul>
-      <script>
+			<div id="instance-data">
-            var misskeytoken = false;
+				Some instance data by
-      </script>
+				<a href="https://instances.social" target="_blank">instances.social API</a><br />
-      <script type="text/javascript" src="../../js/common/time.js"></script>
+				<h5 id="ins-title"></h5>
-      <div class="hide-first">
+				Administered by:<a id="ins-admin"></a><br />
-            <a href="index.html" class="btn waves-effect orange nex"
+				<span id="ins-desc"></span><br />
-                  style="width:100%; max-width:200px;">@@back@@</a><br>
+				<img src="../../img/loading.svg" id="ins-prof" width="200" /><br />
-            <h5>@@list@@</h5>
+				<br />
-            <div id="acct-list"></div>
+				@@domain@@:<span id="ins-name"></span><br />
-            <div class="divider"></div>
+				@@connect@@:<span id="ins-connect"></span>@@ko@@<br />
-      </div>
+				@@toots@@:<span id="ins-toot"></span>@@ko@@<br />
-      <div>
+				@@users@@:<span id="ins-user"></span>@@users@@<br />
-            <h5>@@add@@</h5><br>
+				@@safety@@:<span id="ins-per"></span>%<br />
-            <div id="add">
+				@@ver@@:<span id="ins-ver"></span>@<span id="ins-upd"></span><br />
-                  <div class="row">
+			</div>
-                        <div class="col s8">
+		</div>
-                              <input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp">
+		<script type="text/javascript" src="../../js/ui/theme.js"></script>
-                              <div id="ins-suggest"></div>
+		<script type="text/javascript" src="../../js/ui/tips.js"></script>
-                              @@codesetupwarn@@<br>
+		<script type="text/javascript" src="../../js/platform/end.js"></script>
-                              <label>
+		<script type="text/javascript" src="../../js/common/sha256.js"></script>
-                                    <input type="checkbox" class="filled-in" id="linux" />
+		<script type="text/javascript" src="../../@@node_base@@/lodash/lodash.min.js"></script>
-                                    <span>@@codesetup@@</span>
+		<script type="text/javascript" src="../../js/login/instance.js"></script>
-                              </label>
+		<script type="text/javascript" src="../../js/login/manager.js"></script>
-                              <br>
+		<script type="text/javascript" src="../../js/tl/date.js"></script>
-                              <label>
+	</body>
-                                    <input type="checkbox" class="filled-in" id="misskey" />
+</html>
-                                    <span>@@thisismisskey@@</span>
-                              </label><br>
-                              <button class="btn waves-effect" onclick="instance()">Login</button><br>
-                        </div>
-                        <div class="col s4">
-                              <span style="font-family:Open Sans;">Supports</span>
-                              <div id="support" class="collection transparent"></div>
-                        </div>
-                  </div>
-            </div>
-            <div id="auth" style="display:none">
-                  @@codepastewarn@@<br>
-                  <input type="text" id="code" placeholder="@@codepaste@@" required>
-                  <button class="btn waves-effect" onclick="code()">Auth</button><br>
-                  <br>
-                  <a onclick="atSetup()" class="pointer">@@accessTokenSetup@@</a>
-                  <div id="compt" style="display:none">
-                        <h5>ログイン前に必ずご確認ください</h5>
-                        <span id="compt-instance"></span>はバージョンが<span id="compt-ver"></span>のため以下の機能がご利用いただけません。
-                        <span id="compt-warn" style="display:none">また、このインスタンスはMastodonではなくそのAPI上の互換実装であり、TheDeskでは利用を想定していないため非保証となります。</span>
-                        <ul id="compt-list"></ul>
-                  </div>
-            </div>
-            <div id="misskeylogin" style="display:none">
-                  <h5>AppSecret</h5>
-                  @@misskeylogin@@<br>
-                  <input type="hidden" id="misskey-url">
-                  <input type="text" id="misskey-key" placeholder="@@codepaste@@" required>
-                  <button class="btn waves-effect" onclick="misskeyLogin()">Auth</button><br>
-                  <br>
-                  <a onclick="atSetup('misskey')" class="pointer">@@accessTokenSetup@@</a>
-            </div>
-      </div>
-      <div class="hide-first">
-            <h5>@@mainacct@@</h5>
-            <div class="input-field" style="width:300px"><span data-trans="your_acct">@@selacct@@</span>
-                  <br>
-                  <select id="main-acct-sel" class="acct-sel" style="color:black" onchange="mainacct()"></select>
-                  <label></label>
-            </div>
-            Some instance data by <a href="https://instances.social" target="_blank">instances.social API</a><br>
-            <h5 id="ins-title"></h5>
-            Administered by:<a id="ins-admin"></a><br>
-            <span id="ins-desc"></span><br>
-            <img src="../../img/loading.svg" id="ins-prof" width="200"><br>
-            <br>
-            @@domain@@:<span id="ins-name"></span><br>
-            @@connect@@:<span id="ins-connect"></span>@@ko@@<br>
-            @@toots@@:<span id="ins-toot"></span>@@ko@@<br>
-            @@users@@:<span id="ins-user"></span>@@users@@<br>
-            @@safety@@:<span id="ins-per"></span>%<br>
-            @@ver@@:<span id="ins-ver"></span>@<span id="ins-upd"></span><br>
-      </div>
-      <script type="text/javascript" src="../../js/ui/theme.js"></script>
-      <script type="text/javascript" src="../../js/platform/end.js"></script>
-      <script type="text/javascript" src="../../js/common/sha256.js"></script>
-      <script type="text/javascript" src="../../js/login/instance.js"></script>
-      <script type="text/javascript" src="../../js/login/manager.js"></script>
-      <script type="text/javascript" src="../../js/tl/date.js"></script>

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

@@ -20,6 +20,8 @@
     "yes": "Yes",
     "temp": "Attaching files",
     "nothing": "None",
+    "stamp": "Stamp",
+    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
     "vis": "Adjust status privacy",
     "cwtext": "Warning text",
     "selectVis": "Adjust status privacy",

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

@@ -48,6 +48,7 @@
     "lang_manager_none": "None",
     "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
     "lang_manager_logout": "Logout",
+    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
     "lang_emoji_get": "Get emojis",
     "lang_emoji_custom": "Custom emojis",
@@ -154,6 +155,7 @@
     "lang_showontl_movebtn": "Continue on the new account",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Following you",
+    "lang_parse_request": "Follow request",
     "lang_showontl_notf": "Notification ",
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
@@ -193,6 +195,7 @@
     "lang_parse_detail": "Details",
     "lang_parse_redraft": "Delete & re-draft",
     "lang_parse_followed": "Followed you",
+    "lang_parse_moved": "Moved to...",
     "lang_parse_clientop": "Operation of this client",
     "lang_parse_clienttxt": " will be",
     "lang_parse_clientno": "done nothing",

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

@@ -10,6 +10,7 @@
   "env": "System Preferences",
   "setlang": "Languages",
   "backup": "Import and export of preferences",
+  "backupWarn": "If you got a error when you choose the file, please paste the strings of file and click import",
   "import": "Import",
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
@@ -94,7 +95,7 @@
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
   "ticker": "Enable #InstanceTicker",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://wee.jp/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
+  "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.",
   "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.",
@@ -137,6 +138,8 @@
   "nothing": "Hidden",
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
+  "uploadCrop": "Auto scale to fit",
+  "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. Pay attention to GIF animation.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
   "okswarn": "You can insert any letters and emojis with only 3 keys",

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

@@ -20,6 +20,8 @@
     "yes": "Yes",
     "temp": "Attaching files",
     "nothing": "None",
+    "stamp": "Stamp",
+    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
     "vis": "Adjust status privacy",
     "cwtext": "Warning text",
     "selectVis": "Adjust status privacy",

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

@@ -48,6 +48,7 @@
     "lang_manager_none": "None",
     "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
     "lang_manager_logout": "Logout",
+    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
     "lang_emoji_get": "Get emojis",
     "lang_emoji_custom": "Custom emojis",
@@ -154,6 +155,7 @@
     "lang_showontl_movebtn": "Continue on the new account",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Following you",
+    "lang_parse_request": "Follow request",
     "lang_showontl_notf": "Notification ",
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
@@ -193,6 +195,7 @@
     "lang_parse_detail": "Details",
     "lang_parse_redraft": "Delete & re-draft",
     "lang_parse_followed": "Followed you",
+    "lang_parse_moved": "Moved to...",
     "lang_parse_clientop": "Operation of this client",
     "lang_parse_clienttxt": " will be",
     "lang_parse_clientno": "done nothing",

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

@@ -10,6 +10,7 @@
   "env": "System Preferences",
   "setlang": "Languages",
   "backup": "Import and export of preferences",
+  "backupWarn": "If you got a error when you choose the file, please paste the strings of file and click import",
   "import": "Import",
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
@@ -94,7 +95,7 @@
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
   "ticker": "Enable #InstanceTicker",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://wee.jp/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
+  "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.",
   "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.",
@@ -137,6 +138,8 @@
   "nothing": "Hidden",
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
+  "uploadCrop": "Auto scale to fit",
+  "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. Pay attention to GIF animation.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
   "okswarn": "You can insert any letters and emojis with only 3 keys",

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

@@ -20,6 +20,8 @@
     "yes": "Да",
     "temp": "Прикачени файлове",
     "nothing": "Няма",
+    "stamp": "Stamp",
+    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
     "vis": "Регулирайте поверителността на състоянието",
     "cwtext": "Текст за предупреждение",
     "selectVis": "Регулирайте поверителността на състоянието",
@@ -168,7 +170,7 @@
     "contactwithlog": "Ако ми кажете за грешки (нещо не работи или подобно) с този дневник, мога по-лесно да открия какво не е наред.",
     "about": "За TheDesk",
     "hereAddColumns": "<- Добави ТЛ",
-    "foundBug": "I found a bug",
+    "foundBug": "Намерена е грешка",
     "show": "Покажи",
     "directory": "Директория",
     "active": "Наскоро активен",

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

@@ -48,6 +48,7 @@
     "lang_manager_none": "Няма",
     "lang_manager_godev": "Отворете DevCenter на Misskey. Ние показваме официални документи, на които се позоваваме.",
     "lang_manager_logout": "Излизане",
+    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk разглежда \"@\" като отговор, но поставя друг параметър. Ако не е включено в Mastodon това означава, че е в Home на Misskey.",
     "lang_emoji_get": "Вземи емотикони",
     "lang_emoji_custom": "Персонализирани емотикони",
@@ -76,71 +77,71 @@
     "lang_status_unmute": "Със звук",
     "lang_status_redraftTitle": "Изтрий & върни",
     "lang_status_redraft": "Продължете да изтривате & преработвате? Ще изгубите статуса на тази раздумка. В тази функция може да се съдържат някои грешки. Снимките от тази раздумка ще бъдат изтрити на по-стари от Mastodon 2.4.1.",
-    "lang_status_emphas": "'s toots are emphasized. Please reload after this action.",
+    "lang_status_emphas": "toots са подчертани. Моля, презаредете след това действие.",
-    "lang_status_unemphas": "'s toots are not emphasized. Please reload after this action.",
+    "lang_status_unemphas": "toots не са подчертани. Моля, презаредете след това действие.",
-    "lang_status_unendorse": "Not feature on profile",
+    "lang_status_unendorse": "Не присъства в профила",
     "lang_status_endorse": "Функция в профила",
-    "lang_status_followers": "Followers",
+    "lang_status_followers": "Последователи",
-    "lang_status_active": "Last status",
+    "lang_status_active": "Последно състояние",
-    "lang_suggest_nodata": "Please get emojis list in order to show suggestion.",
+    "lang_suggest_nodata": "Моля, вземете списък с емотикони за да покажете състояние.",
-    "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
+    "lang_usetxtbox_reply": "Режим на отговор. Ctrl+Shift+C за изчистване.",
-    "lang_cards_check": " check",
+    "lang_cards_check": " проверка",
-    "lang_cards_pip": "PiP mode",
+    "lang_cards_pip": "PiP режим",
-    "lang_cards_trusted": "Trusted embed HTML by TheDesk(Twitter, nicovideo, YouTube, Spotify, twitcasing)",
+    "lang_cards_trusted": "Доверен вграден HTML от TheDesk (Twitter, nicovideo, YouTube, Spotify, twitcasing)",
-    "lang_cards_untrusted": "Untrusted embed HTML by TheDesk",
+    "lang_cards_untrusted": "Ненадеждно вграждане на HTML от TheDesk",
     "lang_details_nodata": "Няма данни",
-    "lang_details_filtered": "Filtered toot",
+    "lang_details_filtered": "Филтриране на toot",
-    "lang_details_embed": "Embed HTML is cliped.",
+    "lang_details_embed": "Вграденият HTML е изрязан.",
-    "lang_details_url": "URL of this toot is cliped.",
+    "lang_details_url": "URL адресът на този toot е изрязан.",
-    "lang_details_txt": "Content of this toot is cliped.",
+    "lang_details_txt": "Съдържанието на този toot е изрязано.",
     "lang_filter_nodata": "Няма данни",
-    "lang_filter_errordegree": "Please check a context",
+    "lang_filter_errordegree": "Моля, проверете контекстта",
     "lang_list_nodata": "Няма данни",
     "lang_list_show": "Покажи",
-    "lang_list_users": "Users list",
+    "lang_list_users": "Списък с потребители",
-    "lang_list_nouser": "No users in this list.",
+    "lang_list_nouser": "Няма потребители в този списък.",
-    "lang_list_add": "Add to the list",
+    "lang_list_add": "Добавяне към списъка",
-    "lang_list_add_misskey": "(perhaps this user has been listed)",
+    "lang_list_add_misskey": "(може би този потребител е добавен)",
-    "lang_list_remove": "Remove from the list",
+    "lang_list_remove": "Премахване от списъка",
-    "lang_notf_new": " new notifications",
+    "lang_notf_new": " нови известия",
-    "lang_speech_refresh": "Save value about TTS config",
+    "lang_speech_refresh": "Запазване на стойността за конфигурацията на TTS",
-    "lang_src_ts": "chronological order",
+    "lang_src_ts": "хронологичен ред",
-    "lang_src_people": " people toot",
+    "lang_src_people": " хора toot",
-    "lang_tags_always": "Always toots with ",
+    "lang_tags_always": "Винаги toots с ",
-    "lang_tags_realtime": "Tag-stream toot",
+    "lang_tags_realtime": "Tag-поток toot",
-    "lang_tags_tagunpin": "Unpin {{tag}}",
+    "lang_tags_tagunpin": "Разкачане на {{tag}}",
-    "lang_tags_unrealtime": "Disable TsT",
+    "lang_tags_unrealtime": "Деактивиране на TsT",
     "lang_tags_tagwarn": "Автоматично попълване на {{tag}}, ако раздумката няма {{tag}}",
-    "lang_tl_media": "Media",
+    "lang_tl_media": "Медия",
-    "lang_tl_reconnect": "Reconnect to streaming API",
+    "lang_tl_reconnect": "Свързване отново към API за стрийминг",
-    "lang_tl_postmarkers_title": "Process...",
+    "lang_tl_postmarkers_title": "В процес...",
-    "lang_tl_postmarkers": "POST markers data. Please wait",
+    "lang_tl_postmarkers": "Данни за POST маркери. Моля изчакайте",
-    "lang_img_DLDone": "Downloaded:",
+    "lang_img_DLDone": "Изтеглени:",
-    "lang_img_copyDone": "Copied: URL of this image",
+    "lang_img_copyDone": "Копирано: URL адреса на това изображение",
-    "lang_layout_gotop": "Go top of this column. When icon is red, this column cannot connect straming API. Please reload.",
+    "lang_layout_gotop": "Върнете се в горната част на тази колона. Когато иконата е червена, означава че тази колона не може да свърже API за споделане. Моля, презаредете.",
-    "lang_layout_thisacct": "{{notf}} of this account",
+    "lang_layout_thisacct": "{{notf}} от този акаунт",
-    "lang_layout_delthis": "Remove this column",
+    "lang_layout_delthis": "Премахване на тази колона",
-    "lang_layout_setthis": "Preferences of this column",
+    "lang_layout_setthis": "Предпочитания за тази колона",
-    "lang_layout_mediafil": "Media filtering",
+    "lang_layout_mediafil": "Филтриране на медиите",
-    "lang_layout_linkana": "Auto Link Analyzer",
+    "lang_layout_linkana": "Автоматичен анализатор на връзки",
-    "lang_layout_linkanades": "Auto link analyzer",
+    "lang_layout_linkanades": "Автоматичен анализатор на връзки",
-    "lang_layout_tts": "Text to speech ",
+    "lang_layout_tts": "Текст към говор ",
     "lang_layout_reconnect": "Reconnect to streaming API",
-    "lang_layout_headercolor": "Header color of this column",
+    "lang_layout_headercolor": "Цвят на заглавката на тази колона",
-    "lang_layout_nodata": "[No data]<br>F5/⌘+R to reload",
+    "lang_layout_nodata": "[Няма данни]<br>F5/⌘+R за презареждане",
     "lang_layout_dm": "Директни съобщения",
-    "lang_layout_webviewmode": "Prefer WebView",
+    "lang_layout_webviewmode": "Предпочитания за WebView",
-    "lang_excluded": "Excluded type of notification",
+    "lang_excluded": "Изключване на вид уведомление",
     "lang_layout_excludingbt": "Показване в BT режим (ИЗКЛ./Изключване BT/ Само в BT)",
     "lang_layout_leftFold": "Стъпка наляво",
     "lang_layout_leftUnfold": "Док отдясно",
     "lang_layout_deleteColumn": "Премахване на тази колона",
     "lang_layout_deleteColumnDesc": "Премахване на тази колона",
-    "lang_layout_unread": "Unread",
+    "lang_layout_unread": "Непрочетени",
-    "lang_layout_tagManager": "Tag timeline manager",
+    "lang_layout_tagManager": "Мениджър на таговете на времевата линия",
     "lang_sort_gothis": "Отидете в тази колона",
     "lang_sort_remthis": "Премахване на тази колона",
-    "lang_spotify_img": "Attach an album artwork",
+    "lang_spotify_img": "Добавете към албум произведенията на изкуството",
     "lang_spotify_imgno": "Not attach an album artwork",
     "lang_spotify_acct": "Connect TheDesk to Spotify",
     "lang_spotify_np": "Готово:шаблон на NowPlaying",
@@ -154,6 +155,7 @@
     "lang_showontl_movebtn": "Continue on the new account",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Following you",
+    "lang_parse_request": "Follow request",
     "lang_showontl_notf": "Notification ",
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Следвайте, за да добавите този потребител към списъците.",
@@ -193,37 +195,38 @@
     "lang_parse_detail": "Details",
     "lang_parse_redraft": "Изтрий & върни",
     "lang_parse_followed": "Followed you",
+    "lang_parse_moved": "Moved to...",
     "lang_parse_clientop": "Operation of this client",
     "lang_parse_clienttxt": " will be",
     "lang_parse_clientno": "done nothing",
     "lang_parse_clientemp": "emphasized(/not emphasized)",
-    "lang_parse_clientmute": "muted",
+    "lang_parse_clientmute": "без звук",
-    "lang_parse_mute": " will be muted. You can remove on preferences.",
+    "lang_parse_mute": " ще бъдат заглушени. Можете да ги премахнете от предпочитания.",
-    "lang_parse_voted": "(Voted)",
+    "lang_parse_voted": "(Гласуваха)",
-    "lang_parse_myvote": "(My own poll)",
+    "lang_parse_myvote": "(Моята собствена анкета)",
-    "lang_parse_vote": "Vote",
+    "lang_parse_vote": "Гласували",
-    "lang_parse_unvoted": "Show the result without voting",
+    "lang_parse_unvoted": "Показване на резултата без гласувалите",
-    "lang_parse_endedvote": "Expired",
+    "lang_parse_endedvote": "Изтекъл",
-    "lang_parse_people": "people",
+    "lang_parse_people": "човека",
-    "lang_parse_thread": "Show thread",
+    "lang_parse_thread": "Показване на нишката",
-    "lang_parse_unknown": "Attached file",
+    "lang_parse_unknown": "Прикачени файлове",
     "lang_parse_nsfw": "NSFW media",
-    "lang_parse_html": "Show embed HTML",
+    "lang_parse_html": "Показване на вграденият HTML код",
-    "lang_parse_notffilter": "Show this user's notifications",
+    "lang_parse_notffilter": "Показване на известията от този потребител",
-    "lang_misskeyparse_renote": "Repost",
+    "lang_misskeyparse_renote": "Повторно публикуване",
-    "lang_misskeyparse_renoteqt": "Renote",
+    "lang_misskeyparse_renoteqt": "Повторна бележка",
-    "lang_misskeyparse_reaction": "Reaction",
+    "lang_misskeyparse_reaction": "Реакция",
-    "lang_misskeyparse_tagnostr": "No streaming API on Tag TLs",
+    "lang_misskeyparse_tagnostr": "Няма стрийминг API за TLs маркери",
-    "lang_misskeyparse_listnostr": "No streaming API on List TLs",
+    "lang_misskeyparse_listnostr": "Няма стрийминг API за TLs списък",
     "lang_misskeyparse_home": "Начало",
     "lang_misskeyparse_followers": "Последователи",
-    "lang_misskeyparse_specified": "Specified User",
+    "lang_misskeyparse_specified": "Посочен потребител",
-    "lang_misskeyparse_qt": "Misskey renote(quote) mode:Ctrl+Shift+Enter to clear",
+    "lang_misskeyparse_qt": "Misskey в режим повторна бележка (цитат):Ctrl + Shift + Enter за изчистване",
-    "lang_misskeyparse_renoted": " renoted your following post.",
+    "lang_misskeyparse_renoted": " повторно отбелязали на вашата следваща публикация.",
-    "lang_misskeyparse_quoted": " quoted your following post.",
+    "lang_misskeyparse_quoted": " цитирали следващата ви публикация.",
-    "lang_misskeyparse_reacted": " reacted your following post.",
+    "lang_misskeyparse_reacted": " реагирали на следващата ви публикация.",
-    "lang_setting_time": "Time format:{{set}}",
+    "lang_setting_time": "Времеви формат:{{set}}",
-    "lang_setting_theme": "Theme:{{set}}",
+    "lang_setting_theme": "Тема:{{set}}",
     "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

@@ -10,6 +10,7 @@
   "env": "Системни предпочитания",
   "setlang": "Езици",
   "backup": "Внос и износ на предпочитания",
+  "backupWarn": "If you got a error when you choose the file, please paste the strings of file and click import",
   "import": "Внос",
   "export": "Износ",
   "hardwareAcceleration": "Деактивиране на хардуерното ускорение",
@@ -137,6 +138,8 @@
   "nothing": "Hidden",
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
+  "uploadCrop": "Auto scale to fit",
+  "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. Pay attention to GIF animation.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
   "okswarn": "Можете да вмъкнете всякакви букви и емотикони само с 3 клавиша",

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

@@ -20,6 +20,8 @@
     "yes": "Yes",
     "temp": "Attaching files",
     "nothing": "None",
+    "stamp": "Stamp",
+    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
     "vis": "Adjust status privacy",
     "cwtext": "Warning text",
     "selectVis": "Adjust status privacy",

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

@@ -48,6 +48,7 @@
     "lang_manager_none": "None",
     "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
     "lang_manager_logout": "Logout",
+    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
     "lang_emoji_get": "Get emojis",
     "lang_emoji_custom": "Custom emojis",
@@ -154,6 +155,7 @@
     "lang_showontl_movebtn": "Continue on the new account",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Following you",
+    "lang_parse_request": "Follow request",
     "lang_showontl_notf": "Notification ",
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
@@ -193,6 +195,7 @@
     "lang_parse_detail": "Details",
     "lang_parse_redraft": "Delete & re-draft",
     "lang_parse_followed": "Followed you",
+    "lang_parse_moved": "Moved to...",
     "lang_parse_clientop": "Operation of this client",
     "lang_parse_clienttxt": " will be",
     "lang_parse_clientno": "done nothing",

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

@@ -10,6 +10,7 @@
   "env": "System Preferences",
   "setlang": "Languages",
   "backup": "Import and export of preferences",
+  "backupWarn": "If you got a error when you choose the file, please paste the strings of file and click import",
   "import": "Import",
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
@@ -94,7 +95,7 @@
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
   "ticker": "Enable #InstanceTicker",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://wee.jp/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
+  "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.",
   "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.",
@@ -137,6 +138,8 @@
   "nothing": "Hidden",
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
+  "uploadCrop": "Auto scale to fit",
+  "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. Pay attention to GIF animation.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
   "okswarn": "You can insert any letters and emojis with only 3 keys",

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

@@ -20,6 +20,8 @@
     "yes": "Ano",
     "temp": "Přiložení souborů",
     "nothing": "Nic",
+    "stamp": "Stamp",
+    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
     "vis": "Upravit soukromí statusu",
     "cwtext": "Varovní text",
     "selectVis": "Upravit soukromí statusu",

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

@@ -48,6 +48,7 @@
     "lang_manager_none": "Žádný",
     "lang_manager_godev": "Otevřené vývojářské centrum softwaru Misskey. Zobrazujeme také oficiální dokumentaci.",
     "lang_manager_logout": "Logout",
+    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk považuje „@“ za odpověď, ale vkládá ho do jiných parametrů. „Neuvedeno“ na Mastodonu znamená „Domů“ na Misskey.",
     "lang_emoji_get": "Získat emoji",
     "lang_emoji_custom": "Vlastní emoji",
@@ -154,6 +155,7 @@
     "lang_showontl_movebtn": "Continue on the new account",
     "lang_showontl_botacct": "[robot]",
     "lang_showontl_followed": "Sledují vás",
+    "lang_parse_request": "Follow request",
     "lang_showontl_notf": "Oznámení ",
     "lang_showontl_domain": "Doména ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
@@ -193,6 +195,7 @@
     "lang_parse_detail": "Podrobnosti",
     "lang_parse_redraft": "Vymazat a přepsat",
     "lang_parse_followed": "vás nyní sleduje",
+    "lang_parse_moved": "Moved to...",
     "lang_parse_clientop": "Operace tohoto klienta",
     "lang_parse_clienttxt": " bude",
     "lang_parse_clientno": "nic nedělat",

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

@@ -10,6 +10,7 @@
   "env": "Systémové předvolby",
   "setlang": "Jazyky",
   "backup": "Import a export předvoleb",
+  "backupWarn": "If you got a error when you choose the file, please paste the strings of file and click import",
   "import": "Import",
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
@@ -137,6 +138,8 @@
   "nothing": "Hidden",
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
+  "uploadCrop": "Auto scale to fit",
+  "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. Pay attention to GIF animation.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
   "okswarn": "You can insert any letters and emojis with only 3 keys",

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

@@ -20,6 +20,8 @@
     "yes": "Yes",
     "temp": "Attaching files",
     "nothing": "None",
+    "stamp": "Stamp",
+    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
     "vis": "Adjust status privacy",
     "cwtext": "Warning text",
     "selectVis": "Adjust status privacy",

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

@@ -48,6 +48,7 @@
     "lang_manager_none": "None",
     "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
     "lang_manager_logout": "Logout",
+    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
     "lang_emoji_get": "Get emojis",
     "lang_emoji_custom": "Custom emojis",
@@ -154,6 +155,7 @@
     "lang_showontl_movebtn": "Continue on the new account",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Following you",
+    "lang_parse_request": "Follow request",
     "lang_showontl_notf": "Notification ",
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
@@ -193,6 +195,7 @@
     "lang_parse_detail": "Details",
     "lang_parse_redraft": "Delete & re-draft",
     "lang_parse_followed": "Followed you",
+    "lang_parse_moved": "Moved to...",
     "lang_parse_clientop": "Operation of this client",
     "lang_parse_clienttxt": " will be",
     "lang_parse_clientno": "done nothing",

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

@@ -10,6 +10,7 @@
   "env": "System Preferences",
   "setlang": "Languages",
   "backup": "Import and export of preferences",
+  "backupWarn": "If you got a error when you choose the file, please paste the strings of file and click import",
   "import": "Import",
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
@@ -94,7 +95,7 @@
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
   "ticker": "Enable #InstanceTicker",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://wee.jp/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
+  "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.",
   "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.",
@@ -137,6 +138,8 @@
   "nothing": "Hidden",
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
+  "uploadCrop": "Auto scale to fit",
+  "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. Pay attention to GIF animation.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
   "okswarn": "You can insert any letters and emojis with only 3 keys",

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

@@ -20,6 +20,8 @@
     "yes": "Ja",
     "temp": "Dateien anhängen",
     "nothing": "Keine",
+    "stamp": "Stamp",
+    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
     "vis": "Adjust status privacy",
     "cwtext": "Warntext",
     "selectVis": "Adjust status privacy",

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

@@ -48,6 +48,7 @@
     "lang_manager_none": "Ohne",
     "lang_manager_godev": "Öffnen Sie das DevCenter von Misskey. Wir zeigen auch ein offizielles Dokument als Referenz.",
     "lang_manager_logout": "Abmelden",
+    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk betrachtet \"@\" als Antwort, setzt aber einen anderen Parameter. Nicht auf Mastodon gelistet bedeutet Home on Misskey.",
     "lang_emoji_get": "Hole Emojis",
     "lang_emoji_custom": "Eigene Emojis",
@@ -154,6 +155,7 @@
     "lang_showontl_movebtn": "Auf dem neuen Konto fortfahren",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Folgt dir",
+    "lang_parse_request": "Follow request",
     "lang_showontl_notf": "Benachrichtigung ",
     "lang_showontl_domain": "Domäne ",
     "lang_showontl_listwarn": "Folgen, um diesen Benutzer zu Listen hinzuzufügen.",
@@ -193,6 +195,7 @@
     "lang_parse_detail": "Details",
     "lang_parse_redraft": "Löschen & Neuentwerfen",
     "lang_parse_followed": "Folgt dir",
+    "lang_parse_moved": "Moved to...",
     "lang_parse_clientop": "Aktion dieses Clients",
     "lang_parse_clienttxt": " wird",
     "lang_parse_clientno": "Nichts unternehmen",

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

@@ -10,6 +10,7 @@
   "env": "Systemeinstellungen",
   "setlang": "Sprachen",
   "backup": "Import und Export von Einstellungen",
+  "backupWarn": "If you got a error when you choose the file, please paste the strings of file and click import",
   "import": "Import",
   "export": "Export",
   "hardwareAcceleration": "Hardwarebeschleunigung deaktivieren",
@@ -137,6 +138,8 @@
   "nothing": "Versteckt",
   "localonly": "Nur lokal",
   "zeroWidthEmoji": "Emojis ohne Abstand Einfügen",
+  "uploadCrop": "Auto scale to fit",
+  "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. Pay attention to GIF animation.",
   "keysc": "Tastaturkürzel Einstellungen",
   "iks": "Schnell Einfügen",
   "okswarn": "Sie können Buchstaben und Emojis mit 3-Tasten-Kombination einfügen",

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

@@ -20,6 +20,8 @@
     "yes": "Yes",
     "temp": "Attaching files",
     "nothing": "None",
+    "stamp": "Stamp",
+    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
     "vis": "Adjust status privacy",
     "cwtext": "Warning text",
     "selectVis": "Adjust status privacy",

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

@@ -48,6 +48,7 @@
     "lang_manager_none": "None",
     "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
     "lang_manager_logout": "Logout",
+    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
     "lang_emoji_get": "Get emojis",
     "lang_emoji_custom": "Custom emojis",
@@ -154,6 +155,7 @@
     "lang_showontl_movebtn": "Continue on the new account",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Following you",
+    "lang_parse_request": "Follow request",
     "lang_showontl_notf": "Notification ",
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
@@ -193,6 +195,7 @@
     "lang_parse_detail": "Details",
     "lang_parse_redraft": "Delete & re-draft",
     "lang_parse_followed": "Followed you",
+    "lang_parse_moved": "Moved to...",
     "lang_parse_clientop": "Operation of this client",
     "lang_parse_clienttxt": " will be",
     "lang_parse_clientno": "done nothing",

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

@@ -10,6 +10,7 @@
   "env": "System Preferences",
   "setlang": "Languages",
   "backup": "Import and export of preferences",
+  "backupWarn": "If you got a error when you choose the file, please paste the strings of file and click import",
   "import": "Import",
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
@@ -94,7 +95,7 @@
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
   "ticker": "Enable #InstanceTicker",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://wee.jp/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
+  "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.",
   "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.",
@@ -137,6 +138,8 @@
   "nothing": "Hidden",
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
+  "uploadCrop": "Auto scale to fit",
+  "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. Pay attention to GIF animation.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
   "okswarn": "You can insert any letters and emojis with only 3 keys",

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

@@ -20,6 +20,8 @@
     "yes": "crwdns3094:0crwdne3094:0",
     "temp": "crwdns3096:0crwdne3096:0",
     "nothing": "crwdns3098:0crwdne3098:0",
+    "stamp": "crwdns4435:0crwdne4435:0",
+    "stampWarn": "crwdns4437:0crwdne4437:0",
     "vis": "crwdns3100:0crwdne3100:0",
     "cwtext": "crwdns3102:0crwdne3102:0",
     "selectVis": "crwdns3104:0crwdne3104:0",

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

@@ -48,6 +48,7 @@
     "lang_manager_none": "crwdns3502:0crwdne3502:0",
     "lang_manager_godev": "crwdns3504:0crwdne3504:0",
     "lang_manager_logout": "crwdns3506:0crwdne3506:0",
+    "lang_manager_maxChars": "crwdns4447:0crwdne4447:0",
     "lang_bbmd_misskey": "crwdns3508:0crwdne3508:0",
     "lang_emoji_get": "crwdns3510:0crwdne3510:0",
     "lang_emoji_custom": "crwdns3512:0crwdne3512:0",
@@ -154,6 +155,7 @@
     "lang_showontl_movebtn": "crwdns3702:0crwdne3702:0",
     "lang_showontl_botacct": "crwdns3704:0[bot]crwdne3704:0",
     "lang_showontl_followed": "crwdns3706:0crwdne3706:0",
+    "lang_parse_request": "crwdns4445:0crwdne4445:0",
     "lang_showontl_notf": "crwdns3708:0crwdne3708:0",
     "lang_showontl_domain": "crwdns3710:0crwdne3710:0",
     "lang_showontl_listwarn": "crwdns3712:0crwdne3712:0",
@@ -193,6 +195,7 @@
     "lang_parse_detail": "crwdns4406:0crwdne4406:0",
     "lang_parse_redraft": "crwdns3772:0crwdne3772:0",
     "lang_parse_followed": "crwdns3774:0crwdne3774:0",
+    "lang_parse_moved": "crwdns4433:0crwdne4433:0",
     "lang_parse_clientop": "crwdns3776:0crwdne3776:0",
     "lang_parse_clienttxt": "crwdns3778:0crwdne3778:0",
     "lang_parse_clientno": "crwdns3780:0crwdne3780:0",

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

@@ -10,6 +10,7 @@
   "env": "crwdns3924:0crwdne3924:0",
   "setlang": "crwdns3926:0crwdne3926:0",
   "backup": "crwdns3928:0crwdne3928:0",
+  "backupWarn": "crwdns4439:0crwdne4439:0",
   "import": "crwdns3930:0crwdne3930:0",
   "export": "crwdns3932:0crwdne3932:0",
   "hardwareAcceleration": "crwdns3934:0crwdne3934:0",
@@ -137,6 +138,8 @@
   "nothing": "crwdns4154:0crwdne4154:0",
   "localonly": "crwdns4156:0crwdne4156:0",
   "zeroWidthEmoji": "crwdns4158:0crwdne4158:0",
+  "uploadCrop": "crwdns4441:0crwdne4441:0",
+  "uploadCropWarn": "crwdns4443:0crwdne4443:0",
   "keysc": "crwdns4160:0crwdne4160:0",
   "iks": "crwdns4162:0crwdne4162:0",
   "okswarn": "crwdns4164:0crwdne4164:0",

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

@@ -1,6 +1,8 @@
 {
     "draghere":"Drag here to upload",
     "close":"Close",
+    "webSrc": "Search on Web",
+    "tsSrc": "Search on tootsearch",
     "showSelectProf":"Show profile of the selecting account",
     "closethisbox":"Close this box",
     "toot":"Toot",

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

@@ -48,6 +48,7 @@
     "lang_manager_none": "None",
     "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
     "lang_manager_logout": "Logout",
+    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
     "lang_emoji_get": "Get emojis",
     "lang_emoji_custom": "Custom emojis",
@@ -138,6 +139,7 @@
     "lang_layout_deleteColumnDesc": "Delete this column",
     "lang_layout_unread": "Unread",
     "lang_layout_tagManager": "Tag timeline manager",
+    "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_sort_gothis": "Go to this column",
     "lang_sort_remthis": "Delete this column",
     "lang_spotify_img": "Attach an album artwork",
@@ -154,6 +156,7 @@
     "lang_showontl_movebtn": "Continue on the new account",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Following you",
+    "lang_parse_request": "Follow request",
     "lang_showontl_notf": "Notification ",
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",

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

@@ -10,7 +10,7 @@
   "env": "System Preferences",
   "setlang": "Languages",
   "backup": "Import and export of preferences",
-  "backupWarn": "If you got a error when you choose the file, please paste the strings of file and click import",
+  "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",
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
@@ -35,6 +35,8 @@
   "useragent":"User agent",
   "useragentWarn":"Restart when changed",
   "absolute": "absolute value",
+  "srcUrl": "Search engine",
+  "srcUrlWarn": "{q} will be replaced to query.",
   "themeSel": "Select theme",
   "customtheme": "Edit and add custom themes",
   "customthemeDirection": "Color scheme",
@@ -95,7 +97,7 @@
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
   "ticker": "Enable #InstanceTicker",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://wee.jp/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
+  "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.",
   "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.",
@@ -139,7 +141,7 @@
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
   "uploadCrop": "Auto scale to fit",
-  "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. Pay attention to GIF animation.",
+  "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",
   "okswarn": "You can insert any letters and emojis with only 3 keys",

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

@@ -20,6 +20,8 @@
     "yes": "Sí",
     "temp": "Adjuntar archivos",
     "nothing": "Ninguno",
+    "stamp": "Stamp",
+    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
     "vis": "Establecer privacidad del estado",
     "cwtext": "Texto de advertencia",
     "selectVis": "Establecer estado de privacidad",
@@ -168,7 +170,7 @@
     "contactwithlog": "Si me comentás de estos errores (algo que funcione mal o que no funcione en absoluto) con este registro, puedo detectar lo que está mal más fácilmente.",
     "about": "Acerca de TheDesk",
     "hereAddColumns": "« Agregar línea temporal",
-    "foundBug": "I found a bug",
+    "foundBug": "Encontré un error",
     "show": "Mostrar",
     "directory": "Directorio",
     "active": "Recientemente activo",

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

@@ -48,6 +48,7 @@
     "lang_manager_none": "Nada",
     "lang_manager_godev": "Abrí DevCenter de Misskey. También mostramos documentos oficiales como referencia.",
     "lang_manager_logout": "Cerrar sesión",
+    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk considera \"@\" como respuesta, pero podés poner otro parámetro. \"No listado\" en Mastodon significa \"Principal\" en Misskey.",
     "lang_emoji_get": "Obtené emojis",
     "lang_emoji_custom": "Emojis personalizados",
@@ -137,7 +138,7 @@
     "lang_layout_deleteColumn": "Eliminar esta columna",
     "lang_layout_deleteColumnDesc": "Eliminar esta columna",
     "lang_layout_unread": "Sin leer",
-    "lang_layout_tagManager": "Tag timeline manager",
+    "lang_layout_tagManager": "Administrador de etiqueta de línea temporal",
     "lang_sort_gothis": "Ir a esta columna",
     "lang_sort_remthis": "Eliminar esta columna",
     "lang_spotify_img": "Adjuntar la tapa del álbum",
@@ -154,6 +155,7 @@
     "lang_showontl_movebtn": "Continuar en la nueva cuenta",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Te sigue",
+    "lang_parse_request": "Follow request",
     "lang_showontl_notf": "Notificación ",
     "lang_showontl_domain": "Dominio ",
     "lang_showontl_listwarn": "Seguí a este usuario para agregarlo a las listas.",
@@ -193,6 +195,7 @@
     "lang_parse_detail": "Detalles",
     "lang_parse_redraft": "Eliminar toot original y editarlo",
     "lang_parse_followed": "Te sigue",
+    "lang_parse_moved": "Moved to...",
     "lang_parse_clientop": "Función de este cliente",
     "lang_parse_clienttxt": " hará lo siguiente",
     "lang_parse_clientno": "nada",
@@ -200,11 +203,11 @@
     "lang_parse_clientmute": "silenciar",
     "lang_parse_mute": " será silenciado. Lo podés quitar en la configuración.",
     "lang_parse_voted": "Votado",
-    "lang_parse_myvote": "(My own poll)",
+    "lang_parse_myvote": "(Mi propia encuesta)",
     "lang_parse_vote": "Votar",
     "lang_parse_unvoted": "Mostrar el resultado sin votar",
     "lang_parse_endedvote": "Venció",
-    "lang_parse_people": "people",
+    "lang_parse_people": "gente",
     "lang_parse_thread": "Mostrar hilo",
     "lang_parse_unknown": "Archivo adjunto",
     "lang_parse_nsfw": "medios sensibles",

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

@@ -10,6 +10,7 @@
   "env": "Configuración del sistema",
   "setlang": "Idiomas",
   "backup": "Importación y exportación de la configuración",
+  "backupWarn": "If you got a error when you choose the file, please paste the strings of file and click import",
   "import": "Importar",
   "export": "Exportar",
   "hardwareAcceleration": "Deshabilitar la aceleración por hardware",
@@ -137,6 +138,8 @@
   "nothing": "Oculto",
   "localonly": "Sólo local",
   "zeroWidthEmoji": "No agregar espacio al insertar emojis",
+  "uploadCrop": "Auto scale to fit",
+  "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. Pay attention to GIF animation.",
   "keysc": "Configuración de atajos del teclado",
   "iks": "Inserción fácil",
   "okswarn": "Podés insertar cualquier letra y emoji con sólo 3 teclas",

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

@@ -1,23 +1,23 @@
 {
-    "list": "List of accounts",
+    "list": "Lista de cuentas",
-    "back": "Back",
+    "back": "Atrás",
-    "add": "Add an account",
+    "add": "Agregar una cuenta",
-    "codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
+    "codesetupwarn": "Desmarcarlo para omitir código de pegado. (iniciar sesión en Mastodon en Windows o macOS) (Recomendado: pcheck)",
-    "codesetup": "Code setup",
+    "codesetup": "Configuración de código",
-    "mainacct": "Main an account",
+    "mainacct": "Cuenta principal",
-    "selacct": "Select an account",
+    "selacct": "Seleccionar una cuenta",
-    "codepastewarn": "Paste the code and close browser.",
+    "codepastewarn": "Pegar el código y cerrar el navegador web.",
-    "codepaste": "Code",
+    "codepaste": "Código",
-    "domain": "Domain",
+    "domain": "Dominio",
-    "connect": "Federated servers",
+    "connect": "Servidores federados",
     "toots": "Toots",
-    "users": "Users",
+    "users": "Usuarios",
-    "users2": "users",
+    "users2": "usuarios",
-    "safety": "Connection",
+    "safety": "Conexión",
-    "ver": "Mastodon version",
+    "ver": "Versión de Mastodon",
     "ko": "",
-    "thisismisskey": "Login as Misskey",
+    "thisismisskey": "Iniciar sesión como Misskey",
-    "misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
+    "misskeylogin": "Leer <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> para iniciar sesión en Misskey.",
-    "nodata": "No data",
+    "nodata": "Sin datos",
-    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)"
+    "accessTokenSetup": "Usar el token de acceso para iniciar sesión (haga clic después de completar no el código si no el token de acceso en el casilla: avanzado)"
 }

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

@@ -20,6 +20,8 @@
     "yes": "Yes",
     "temp": "Attaching files",
     "nothing": "None",
+    "stamp": "Stamp",
+    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
     "vis": "Adjust status privacy",
     "cwtext": "Warning text",
     "selectVis": "Adjust status privacy",
@@ -105,7 +107,7 @@
     "blocked": "You are blocked. Why?",
     "likeUserDes": "Get people resembling this user.",
     "get": "Get",
-    "historyBack": "Back",
+    "historyBack": "Atrás",
     "empUser": "Emphasize this user",
     "supportme": "Support TheDesk!",
     "TheDeskDes": "TheDesk has no ad, you need no charge to unlock premium features. We need your friendly support!",

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

@@ -13,7 +13,7 @@
     "lang_speech": "Google US English",
     "lang_lang": "Language",
     "lang_langlocale": "English",
-    "lang_back": "Back",
+    "lang_back": "Atrás",
     "lang_set": "Set",
     "lang_langadd": "Translate TheDesk to other languages or proofread TheDesk on <a href=\"https://github.com/cutls/TheDesk\" target=\"_blank\">GitHub</a>. TheDesk needs your help.",
     "lang_time_prefixAgo": null,
@@ -48,6 +48,7 @@
     "lang_manager_none": "None",
     "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
     "lang_manager_logout": "Logout",
+    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
     "lang_emoji_get": "Get emojis",
     "lang_emoji_custom": "Custom emojis",
@@ -88,14 +89,14 @@
     "lang_cards_pip": "PiP mode",
     "lang_cards_trusted": "Trusted embed HTML by TheDesk(Twitter, nicovideo, YouTube, Spotify, twitcasing)",
     "lang_cards_untrusted": "Untrusted embed HTML by TheDesk",
-    "lang_details_nodata": "No data",
+    "lang_details_nodata": "Sin datos",
     "lang_details_filtered": "Filtered toot",
     "lang_details_embed": "Embed HTML is cliped.",
     "lang_details_url": "URL of this toot is cliped.",
     "lang_details_txt": "Content of this toot is cliped.",
-    "lang_filter_nodata": "No data",
+    "lang_filter_nodata": "Sin datos",
     "lang_filter_errordegree": "Please check a context",
-    "lang_list_nodata": "No data",
+    "lang_list_nodata": "Sin datos",
     "lang_list_show": "Show",
     "lang_list_users": "Users list",
     "lang_list_nouser": "No users in this list.",
@@ -154,6 +155,7 @@
     "lang_showontl_movebtn": "Continue on the new account",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Following you",
+    "lang_parse_request": "Follow request",
     "lang_showontl_notf": "Notification ",
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
@@ -193,6 +195,7 @@
     "lang_parse_detail": "Details",
     "lang_parse_redraft": "Delete & re-draft",
     "lang_parse_followed": "Followed you",
+    "lang_parse_moved": "Moved to...",
     "lang_parse_clientop": "Operation of this client",
     "lang_parse_clienttxt": " will be",
     "lang_parse_clientno": "done nothing",

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

@@ -5,39 +5,40 @@
   "no": "No",
   "none": "None",
   "default": "Default",
-  "change": "Change",
+  "change": "Cambiar",
-  "select": "Select",
+  "select": "Seleccionar",
-  "env": "System Preferences",
+  "env": "Preferencias del sistema",
-  "setlang": "Languages",
+  "setlang": "Idiomas",
-  "backup": "Import and export of preferences",
+  "backup": "Importación y exportación de la configuración",
-  "import": "Import",
+  "backupWarn": "If you got a error when you choose the file, please paste the strings of file and click import",
-  "export": "Export",
+  "import": "Importar",
-  "hardwareAcceleration": "Disable hardware acceleration",
+  "export": "Exportar",
-  "hardwareAccelerationWarn": "Auto restarted",
+  "hardwareAcceleration": "Deshabilitar la aceleración por hardware",
-  "theme": "Themes",
+  "hardwareAccelerationWarn": "Reinicio automático",
-  "popup": "Popup notification(on Windows)",
+  "theme": "Temas",
-  "popupwarn": "Hide to set \"0\"",
+  "popup": "Notificación emergente (en Windows)",
-  "s": "sec",
+  "popupwarn": "Ocultar para establecer \"0\"",
-  "nativenotf": "Native notification",
+  "s": "seg",
-  "nnwarn": "This does not work on Windows Portable ver.",
+  "nativenotf": "Notificación nativa",
-  "nntest": "Notification test",
+  "nnwarn": "Esto no funciona en la versión portable para Windows.",
-  "minwidth": "Minimum width of columns",
+  "nntest": "Prueba de notificación",
-  "minwidthwarn": "Scroll bar will be shown when your window size is more than ammounts of columns.",
+  "minwidth": "Ancho mínimo de columnas",
-  "fixwidth": "Minimum width of TweetDeck browser",
+  "minwidthwarn": "La barra de desplazamiento se mostrará cuando el tamaño de la ventana sea mayor que el de las columnas.",
+  "fixwidth": "Ancho mínimo del navegador TweetDeck",
   "fixwidthwarn": "",
-  "above": "above",
+  "above": "arriba",
-  "font": "Font",
+  "font": "Fuente",
   "fontwarn": "Select your favorite font to 'Select'(Windows/ macOS only)",
-  "fontsize": "Font size",
+  "fontsize": "Tamaño de fuente",
-  "savefolder": "Folder to save",
+  "savefolder": "Carpeta para guardar",
-  "savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
+  "savefolderwarn": "TheDesk utiliza este valor cuando intenta guardar fotos o tomar capturas de pantalla.",
-  "useragent": "User agent",
+  "useragent": "Agente de usuario",
-  "useragentWarn": "Restart when changed",
+  "useragentWarn": "Reiniciar al cambiar",
-  "absolute": "absolute value",
+  "absolute": "valor absoluto",
-  "themeSel": "Select theme",
+  "themeSel": "Seleccionar tema",
-  "customtheme": "Edit and add custom themes",
+  "customtheme": "Editar y añadir temas personalizados",
-  "customthemeDirection": "Color scheme",
+  "customthemeDirection": "Esquema de colores",
-  "advanced": "Advanced options(6 additional colors)",
+  "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.",
   "active": "Background of Show or CW buttons, selected options...",
   "modal": "Background of modals",
@@ -94,7 +95,7 @@
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
   "ticker": "Enable #InstanceTicker",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://wee.jp/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
+  "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.",
   "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.",
@@ -137,6 +138,8 @@
   "nothing": "Hidden",
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
+  "uploadCrop": "Auto scale to fit",
+  "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. Pay attention to GIF animation.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
   "okswarn": "You can insert any letters and emojis with only 3 keys",
@@ -176,7 +179,7 @@
   "test": "Test",
   "sample": "TheDesk is an open-source Mastodon client for PC.",
   "playstop": "Play/Stop",
-  "back": "Back",
+  "back": "Atrás",
   "keyscs": "Keyboard shortcuts",
   "keyscr": "Jump to n(1-9)th column",
   "keynew": "Open toot box",

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

@@ -20,6 +20,8 @@
     "yes": "Yes",
     "temp": "Attaching files",
     "nothing": "None",
+    "stamp": "Stamp",
+    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
     "vis": "Adjust status privacy",
     "cwtext": "Warning text",
     "selectVis": "Adjust status privacy",

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

@@ -48,6 +48,7 @@
     "lang_manager_none": "None",
     "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
     "lang_manager_logout": "Logout",
+    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
     "lang_emoji_get": "Get emojis",
     "lang_emoji_custom": "Custom emojis",
@@ -154,6 +155,7 @@
     "lang_showontl_movebtn": "Continue on the new account",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Following you",
+    "lang_parse_request": "Follow request",
     "lang_showontl_notf": "Notification ",
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
@@ -193,6 +195,7 @@
     "lang_parse_detail": "Details",
     "lang_parse_redraft": "Delete & re-draft",
     "lang_parse_followed": "Followed you",
+    "lang_parse_moved": "Moved to...",
     "lang_parse_clientop": "Operation of this client",
     "lang_parse_clienttxt": " will be",
     "lang_parse_clientno": "done nothing",

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

@@ -10,6 +10,7 @@
   "env": "System Preferences",
   "setlang": "Languages",
   "backup": "Import and export of preferences",
+  "backupWarn": "If you got a error when you choose the file, please paste the strings of file and click import",
   "import": "Import",
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
@@ -94,7 +95,7 @@
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
   "ticker": "Enable #InstanceTicker",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://wee.jp/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
+  "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.",
   "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.",
@@ -137,6 +138,8 @@
   "nothing": "Hidden",
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
+  "uploadCrop": "Auto scale to fit",
+  "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. Pay attention to GIF animation.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
   "okswarn": "You can insert any letters and emojis with only 3 keys",

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

@@ -20,6 +20,8 @@
     "yes": "Oui",
     "temp": "Attaching files",
     "nothing": "Aucun",
+    "stamp": "Stamp",
+    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
     "vis": "Adjust status privacy",
     "cwtext": "Warning text",
     "selectVis": "Adjust status privacy",

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

@@ -48,6 +48,7 @@
     "lang_manager_none": "Aucun",
     "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
     "lang_manager_logout": "Se déconnecter",
+    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
     "lang_emoji_get": "Téléchargez les émojis",
     "lang_emoji_custom": "Émojis personnalisés",
@@ -154,6 +155,7 @@
     "lang_showontl_movebtn": "Continuer sur le nouveau compte",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Vous suit",
+    "lang_parse_request": "Follow request",
     "lang_showontl_notf": "Notification ",
     "lang_showontl_domain": "Domaine ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
@@ -193,6 +195,7 @@
     "lang_parse_detail": "Details",
     "lang_parse_redraft": "Supprimer & reformuler",
     "lang_parse_followed": "Vous a suivi",
+    "lang_parse_moved": "Moved to...",
     "lang_parse_clientop": "Operation of this client",
     "lang_parse_clienttxt": " will be",
     "lang_parse_clientno": "done nothing",

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

@@ -10,6 +10,7 @@
   "env": "Préférences système",
   "setlang": "Langues",
   "backup": "Import and export of preferences",
+  "backupWarn": "If you got a error when you choose the file, please paste the strings of file and click import",
   "import": "Importer",
   "export": "Exporter",
   "hardwareAcceleration": "Disable hardware acceleration",
@@ -137,6 +138,8 @@
   "nothing": "Hidden",
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
+  "uploadCrop": "Auto scale to fit",
+  "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. Pay attention to GIF animation.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
   "okswarn": "You can insert any letters and emojis with only 3 keys",

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

@@ -20,6 +20,8 @@
     "yes": "Yes",
     "temp": "Attaching files",
     "nothing": "None",
+    "stamp": "Stamp",
+    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
     "vis": "Adjust status privacy",
     "cwtext": "Warning text",
     "selectVis": "Adjust status privacy",

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

@@ -48,6 +48,7 @@
     "lang_manager_none": "None",
     "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
     "lang_manager_logout": "Logout",
+    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
     "lang_emoji_get": "Get emojis",
     "lang_emoji_custom": "Custom emojis",
@@ -154,6 +155,7 @@
     "lang_showontl_movebtn": "Continue on the new account",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Following you",
+    "lang_parse_request": "Follow request",
     "lang_showontl_notf": "Notification ",
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
@@ -193,6 +195,7 @@
     "lang_parse_detail": "Details",
     "lang_parse_redraft": "Delete & re-draft",
     "lang_parse_followed": "Followed you",
+    "lang_parse_moved": "Moved to...",
     "lang_parse_clientop": "Operation of this client",
     "lang_parse_clienttxt": " will be",
     "lang_parse_clientno": "done nothing",

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

@@ -10,6 +10,7 @@
   "env": "System Preferences",
   "setlang": "Languages",
   "backup": "Import and export of preferences",
+  "backupWarn": "If you got a error when you choose the file, please paste the strings of file and click import",
   "import": "Import",
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
@@ -94,7 +95,7 @@
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
   "ticker": "Enable #InstanceTicker",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://wee.jp/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
+  "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.",
   "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.",
@@ -137,6 +138,8 @@
   "nothing": "Hidden",
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
+  "uploadCrop": "Auto scale to fit",
+  "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. Pay attention to GIF animation.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
   "okswarn": "You can insert any letters and emojis with only 3 keys",

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

@@ -20,6 +20,8 @@
     "yes": "Yes",
     "temp": "Attaching files",
     "nothing": "None",
+    "stamp": "Stamp",
+    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
     "vis": "Adjust status privacy",
     "cwtext": "Warning text",
     "selectVis": "Adjust status privacy",

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

@@ -48,6 +48,7 @@
     "lang_manager_none": "None",
     "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
     "lang_manager_logout": "Logout",
+    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
     "lang_emoji_get": "Get emojis",
     "lang_emoji_custom": "Custom emojis",
@@ -154,6 +155,7 @@
     "lang_showontl_movebtn": "Continue on the new account",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Following you",
+    "lang_parse_request": "Follow request",
     "lang_showontl_notf": "Notification ",
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
@@ -193,6 +195,7 @@
     "lang_parse_detail": "Details",
     "lang_parse_redraft": "Delete & re-draft",
     "lang_parse_followed": "Followed you",
+    "lang_parse_moved": "Moved to...",
     "lang_parse_clientop": "Operation of this client",
     "lang_parse_clienttxt": " will be",
     "lang_parse_clientno": "done nothing",

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

@@ -10,6 +10,7 @@
   "env": "System Preferences",
   "setlang": "Languages",
   "backup": "Import and export of preferences",
+  "backupWarn": "If you got a error when you choose the file, please paste the strings of file and click import",
   "import": "Import",
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
@@ -94,7 +95,7 @@
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
   "ticker": "Enable #InstanceTicker",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://wee.jp/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
+  "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.",
   "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.",
@@ -137,6 +138,8 @@
   "nothing": "Hidden",
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
+  "uploadCrop": "Auto scale to fit",
+  "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. Pay attention to GIF animation.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
   "okswarn": "You can insert any letters and emojis with only 3 keys",

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

@@ -20,6 +20,8 @@
     "yes": "Yes",
     "temp": "Attaching files",
     "nothing": "None",
+    "stamp": "Stamp",
+    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
     "vis": "Adjust status privacy",
     "cwtext": "Warning text",
     "selectVis": "Adjust status privacy",

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

@@ -48,6 +48,7 @@
     "lang_manager_none": "None",
     "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
     "lang_manager_logout": "Logout",
+    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
     "lang_emoji_get": "Get emojis",
     "lang_emoji_custom": "Custom emojis",
@@ -154,6 +155,7 @@
     "lang_showontl_movebtn": "Continue on the new account",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Following you",
+    "lang_parse_request": "Follow request",
     "lang_showontl_notf": "Notification ",
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
@@ -193,6 +195,7 @@
     "lang_parse_detail": "Details",
     "lang_parse_redraft": "Delete & re-draft",
     "lang_parse_followed": "Followed you",
+    "lang_parse_moved": "Moved to...",
     "lang_parse_clientop": "Operation of this client",
     "lang_parse_clienttxt": " will be",
     "lang_parse_clientno": "done nothing",

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

@@ -10,6 +10,7 @@
   "env": "System Preferences",
   "setlang": "Languages",
   "backup": "Import and export of preferences",
+  "backupWarn": "If you got a error when you choose the file, please paste the strings of file and click import",
   "import": "Import",
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
@@ -94,7 +95,7 @@
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
   "ticker": "Enable #InstanceTicker",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://wee.jp/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
+  "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.",
   "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.",
@@ -137,6 +138,8 @@
   "nothing": "Hidden",
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
+  "uploadCrop": "Auto scale to fit",
+  "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. Pay attention to GIF animation.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
   "okswarn": "You can insert any letters and emojis with only 3 keys",

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

@@ -1,6 +1,8 @@
 {
     "draghere":"ドラッグしてみ？(ドラッグしたらすぐアップロードされるで)",
     "close":"Close",
+    "webSrc": "Webでさがす",
+    "tsSrc": "tootsearchでさがす",
     "showSelectProf":"このアカウントのプロフィール出す",
     "closethisbox":"このボックスなおす",
     "post-new":"投稿",

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

@@ -138,6 +138,7 @@
     "lang_layout_deleteColumnDesc": "カラムを削除してええ？",
     "lang_layout_unread": "未読",
     "lang_layout_tagManager": "タグタイムラインをいじる",
+    "lang_layout_announ": "お知らせ: 数字は未読数や。表示されてんときはもう読んでしもたいうことやな。",
     "lang_sort_gothis": "このカラムへ",
     "lang_sort_remthis": "このカラムを消す",
     "lang_spotify_img": "アルバムアートワークを付けるで。",

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

@@ -34,6 +34,8 @@
   "useragent":"ユーザーエージェント",
   "useragentWarn":"再起動すんで。",
   "absolute": "絶対指定",
+  "srcUrl": "検索エンジン",
+  "srcUrlWarn": "{q}が検索文字列になるで。",
   "themeSel": "テーマの選択",
   "customtheme": "カスタムテーマの作成・編集",
   "customthemeDirection": "色の系統",
@@ -94,7 +96,7 @@
   "imgheight": "画像の高さ",
   "imgheightwarn": "オプション:「full」と指定すると全ての画像をクロップせず全部出すで。",
   "ticker": "#InstanceTickerを使う",
-  "tickerwarn": "トゥートした人の所属サーバーをわかりやすく彩ります(自サーバー以外のトゥート向け)。<a href=\"https://https://wee.jp/\">#InstanceTickerについて</a> Copyright 2018 weepjp, kyori19.",
+  "tickerwarn": "トゥートした人の所属サーバーをわかりやすく彩ります(自サーバー以外のトゥート向け)。<a href=\"https://github.com/MiyonMiyon/InstanceTicker_List\">#InstanceTickerってなんや？</a> (c)2018-2020 MiyonMiyon. Released under the MIT License.",
   "animation": "タイムラインのアニメーション",
   "markers": "ホームと通知の未読管理",
   "markerswarn": "Mastodon 3.0相当以上。WebUIと対応クライアントで共有するやつや。",

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

@@ -1,5 +1,7 @@
 {
     "draghere":"ここにドラッグして添付(ドラッグと同時にアップロードされます)",
+    "webSrc": "Webで検索",
+    "tsSrc": "tootsearchで検索",
     "close":"Close",
     "showSelectProf":"選択したアカウントのプロフィールを表示",
     "closethisbox":"このボックスを閉じる",

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

@@ -48,6 +48,7 @@
     "lang_manager_none": "なし",
     "lang_manager_godev": "MisskeyのDevセンターに移動します。同時に開かれるドキュメントを参考にログインしてください。",
     "lang_manager_logout": "ログアウト",
+    "lang_manager_maxChars": "投稿最大文字数",
     "lang_bbmd_misskey": "TheDeskにおけるMisskeyでは、@を返信として扱いますが、全ての@は消去され別パラメータに入力されます。また、「未収載」を「ホーム」として扱います。",
     "lang_emoji_get": "絵文字リストを取得",
     "lang_emoji_custom": "カスタム絵文字",
@@ -138,6 +139,7 @@
     "lang_layout_deleteColumnDesc": "カラムを削除しますか？",
     "lang_layout_unread": "未読",
     "lang_layout_tagManager": "タグタイムラインの編集",
+    "lang_layout_announ": "お知らせ: 数字は未読数を表します。表示されていない場合は全て既読です。",
     "lang_sort_gothis": "このカラムへ",
     "lang_sort_remthis": "このカラムを削除",
     "lang_spotify_img": "アルバムアートワークを添付します。",
@@ -154,6 +156,7 @@
     "lang_showontl_movebtn": "移行先を見る",
     "lang_showontl_botacct": "botアカウント",
     "lang_showontl_followed": "フォローされています",
+    "lang_parse_request": "フォローリクエスト",
     "lang_showontl_notf": "通知",
     "lang_showontl_domain": "ドメイン",
     "lang_showontl_listwarn": "リストに追加するためにはフォローが必要です。",

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

@@ -35,6 +35,8 @@
   "useragent":"ユーザーエージェント",
   "useragentWarn":"再起動します。",
   "absolute": "絶対指定",
+  "srcUrl": "検索エンジン",
+  "srcUrlWarn": "{q}が検索文字列に置換されます。",
   "themeSel": "テーマの選択",
   "customtheme": "カスタムテーマの作成・編集",
   "customthemeDirection": "色の系統",
@@ -95,7 +97,7 @@
   "imgheight": "画像の高さ",
   "imgheightwarn": "オプション:「full」と指定すると全ての画像をクロップしません。",
   "ticker": "#InstanceTickerを使う",
-  "tickerwarn": "トゥートした人の所属サーバーをわかりやすく彩ります(自サーバー以外のトゥート向け)。<a href=\"https://https://wee.jp/\">#InstanceTickerについて</a> Copyright 2018 weepjp, kyori19.",
+  "tickerwarn": "トゥートした人の所属サーバーをわかりやすく彩ります(自サーバー以外のトゥート向け)。<a href=\"https://github.com/MiyonMiyon/InstanceTicker_List\">#InstanceTickerについて</a> (c)2018-2020 MiyonMiyon. Released under the MIT License.",
   "animation": "タイムラインのアニメーション",
   "markers": "ホームと通知の未読管理",
   "markerswarn": "Mastodon 3.0相当以上。WebUIと対応クライアントで共有されます。",

app/view/make/language/nl-NL/index.json

@@ -20,6 +20,8 @@
     "yes": "Yes",
     "temp": "Attaching files",
     "nothing": "None",
+    "stamp": "Stamp",
+    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
     "vis": "Adjust status privacy",
     "cwtext": "Warning text",
     "selectVis": "Adjust status privacy",

app/view/make/language/nl-NL/main.json

@@ -48,6 +48,7 @@
     "lang_manager_none": "None",
     "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
     "lang_manager_logout": "Logout",
+    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
     "lang_emoji_get": "Get emojis",
     "lang_emoji_custom": "Custom emojis",
@@ -154,6 +155,7 @@
     "lang_showontl_movebtn": "Continue on the new account",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Following you",
+    "lang_parse_request": "Follow request",
     "lang_showontl_notf": "Notification ",
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
@@ -193,6 +195,7 @@
     "lang_parse_detail": "Details",
     "lang_parse_redraft": "Delete & re-draft",
     "lang_parse_followed": "Followed you",
+    "lang_parse_moved": "Moved to...",
     "lang_parse_clientop": "Operation of this client",
     "lang_parse_clienttxt": " will be",
     "lang_parse_clientno": "done nothing",

app/view/make/language/nl-NL/setting.json

@@ -10,6 +10,7 @@
   "env": "System Preferences",
   "setlang": "Languages",
   "backup": "Import and export of preferences",
+  "backupWarn": "If you got a error when you choose the file, please paste the strings of file and click import",
   "import": "Import",
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
@@ -94,7 +95,7 @@
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
   "ticker": "Enable #InstanceTicker",
-  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://wee.jp/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
+  "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.",
   "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.",
@@ -137,6 +138,8 @@
   "nothing": "Hidden",
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
+  "uploadCrop": "Auto scale to fit",
+  "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. Pay attention to GIF animation.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
   "okswarn": "You can insert any letters and emojis with only 3 keys",