From f7be9e9143a4184632144604aba8ad26153fb061 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 6 Apr 2020 20:15:46 +0000 Subject: [PATCH 1/9] Bump json5 from 2.1.2 to 2.1.3 in /app Bumps [json5](https://github.com/json5/json5) from 2.1.2 to 2.1.3. - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/master/CHANGELOG.md) - [Commits](https://github.com/json5/json5/compare/v2.1.2...v2.1.3) Signed-off-by: dependabot-preview[bot] --- app/package.json | 2 +- app/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/package.json b/app/package.json index ed31a726..c909db04 100644 --- a/app/package.json +++ b/app/package.json @@ -57,7 +57,7 @@ "jimp": "^0.9.6", "jquery": "^3.4.1", "jquery-ui-dist": "^1.12.1", - "json5": "^2.1.2", + "json5": "^2.1.3", "lodash": "^4.17.15", "materialize-css": "git://github.com/cutls/materialize#v1-dev", "sumchecker": "^3.0.1", diff --git a/app/yarn.lock b/app/yarn.lock index fb515803..d551b7f2 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -1745,10 +1745,10 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= -json5@^2.1.0, json5@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.2.tgz#43ef1f0af9835dd624751a6b7fa48874fb2d608e" - integrity sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ== +json5@^2.1.0, json5@^2.1.3: + version "2.1.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43" + integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA== dependencies: minimist "^1.2.5" From 8e909cf3b2971d4d9061115498a597b15407e225 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 6 Apr 2020 20:16:21 +0000 Subject: [PATCH 2/9] Bump jimp from 0.9.6 to 0.10.1 in /app Bumps [jimp](https://github.com/oliver-moran/jimp) from 0.9.6 to 0.10.1. - [Release notes](https://github.com/oliver-moran/jimp/releases) - [Changelog](https://github.com/oliver-moran/jimp/blob/master/CHANGELOG.md) - [Commits](https://github.com/oliver-moran/jimp/compare/v0.9.6...v0.10.1) Signed-off-by: dependabot-preview[bot] --- app/package.json | 2 +- app/yarn.lock | 361 ++++++++++++++++++++++++++--------------------- 2 files changed, 202 insertions(+), 161 deletions(-) diff --git a/app/package.json b/app/package.json index ed31a726..1188e4f9 100644 --- a/app/package.json +++ b/app/package.json @@ -54,7 +54,7 @@ "@fortawesome/fontawesome-free": "^5.12.1", "custom-electron-titlebar": "^3.2.2-hotfix62", "electron-dl": "^3.0.0", - "jimp": "^0.9.6", + "jimp": "^0.10.1", "jquery": "^3.4.1", "jquery-ui-dist": "^1.12.1", "json5": "^2.1.2", diff --git a/app/yarn.lock b/app/yarn.lock index fb515803..0f124a61 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -42,23 +42,23 @@ resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.12.1.tgz#2a98fea9fbb8a606ddc79a4680034e9d5591c550" integrity sha512-ZtjIIFplxncqxvogq148C3hBLQE+W3iJ8E4UvJ09zIJUgzwLcROsWwFDErVSXY2Plzao5J9KUYNHKHMEUYDMKw== -"@jimp/bmp@^0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.9.6.tgz#379e261615d7c1f3b52af4d5a0f324666de53d7d" - integrity sha512-T2Fh/k/eN6cDyOx0KQ4y56FMLo8+mKNhBh7GXMQXLK2NNZ0ckpFo3VHDBZ3HnaFeVTZXF/atLiR9CfnXH+rLxA== +"@jimp/bmp@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.10.1.tgz#e42889f98b1a1ed1fedd1d5cbeaec6ce6a618a56" + integrity sha512-gy4ftMCgBZOx1e/Q+MaJlmU4qgqVqwGdf7G6byYTLEMUzzGK2Ipxf3nlXfkMOZqw7Bhc17zDnBIKluo7k0kX5Q== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.6" + "@jimp/utils" "^0.10.1" bmp-js "^0.1.0" core-js "^3.4.1" -"@jimp/core@^0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@jimp/core/-/core-0.9.6.tgz#a553f801bd436526d36e8982b99e58e8afc3d17a" - integrity sha512-sQO04S+HZNid68a9ehb4BC2lmW6iZ5JgU9tC+thC2Lhix+N/XKDJcBJ6HevbLgeTzuIAw24C5EKuUeO3C+rE5w== +"@jimp/core@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/core/-/core-0.10.1.tgz#9c7cee4a1a151786a53d6c5defb141f640396cf9" + integrity sha512-ChyLkGb1+x2mRpsdcnQuRNb523qVqUc7+zCbuO/VAMaqvbMKuRalVz3aHXcVwNi8vOAOgce4LOBT7kjdKTtR/w== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.6" + "@jimp/utils" "^0.10.1" any-base "^1.1.0" buffer "^5.2.0" core-js "^3.4.1" @@ -70,256 +70,297 @@ pixelmatch "^4.0.2" tinycolor2 "^1.4.1" -"@jimp/custom@^0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@jimp/custom/-/custom-0.9.6.tgz#3d8a19d6ed717f0f1aa3f1b8f42fa374f43bc715" - integrity sha512-ZYKgrBZVoQwvIGlQSO7MFmn7Jn8a9X5g1g+KOTDO9Q0s4vnxdPTtr/qUjG9QYX6zW/6AK4LaIsDinDrrKDnOag== +"@jimp/custom@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/custom/-/custom-0.10.1.tgz#1147f895272351adc3fd8192b73a2d4ccf563535" + integrity sha512-hiiOL5sGcV1p8hCFTabALUOmXs4VP9VwhfBZtsFueKGbwWz6dmaZvkMBsk3Mz1ukBP3xb09goWG+zAIdTm88fw== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/core" "^0.9.6" + "@jimp/core" "^0.10.1" core-js "^3.4.1" -"@jimp/gif@^0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@jimp/gif/-/gif-0.9.6.tgz#0a7b1e521daca635b02259f941bdb3600569d8e6" - integrity sha512-Z2muC2On8KHEVrWKCCM0L2eua9kw4bQETzT7gmVsizc8MXAKdS8AyVV9T3ZrImiI0o5UkAN/u0cPi1U2pSiD8Q== +"@jimp/gif@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/gif/-/gif-0.10.1.tgz#fc238448cd8e367f9d73ed98347b083f0e71a184" + integrity sha512-xJwZ6JI6+GmrgTw///YdV8GY1z2dp4AAxEdm/KPozTvS2rygC8OZJcTmlswFws0UCH43rKzJlQUXa4Jb3ybB6w== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.6" + "@jimp/utils" "^0.10.1" core-js "^3.4.1" omggif "^1.0.9" -"@jimp/jpeg@^0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@jimp/jpeg/-/jpeg-0.9.6.tgz#fb90bdc0111966987c5ba59cdca7040be86ead41" - integrity sha512-igSe0pIX3le/CKdvqW4vLXMxoFjTLjEaW6ZHt/h63OegaEa61TzJ2OM7j7DxrEHcMCMlkhUc9Bapk57MAefCTQ== +"@jimp/jpeg@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/jpeg/-/jpeg-0.10.1.tgz#93708ce2981772dd510670b78eacf703bb66a9f4" + integrity sha512-PXxrBWZNNGpm7PRpdi2jt9fpTpQwe2Gf4juwuHXP/dBFHLk3wiI/npKkVITplwzzoQ6D4N0cb279c9bOpuQeJQ== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.6" + "@jimp/utils" "^0.10.1" core-js "^3.4.1" jpeg-js "^0.3.4" -"@jimp/plugin-blit@^0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@jimp/plugin-blit/-/plugin-blit-0.9.6.tgz#7937e02e3514b95dbe4c70d444054847f6e9ce3c" - integrity sha512-zp7X6uDU1lCu44RaSY88aAvsSKbgqUrfDyWRX1wsamJvvZpRnp1WekWlGyydRtnlUBAGIpiHCHmyh/TJ2I4RWA== +"@jimp/plugin-blit@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-blit/-/plugin-blit-0.10.1.tgz#fcd2d031294faf6f932e96f151df4c82e2b90f89" + integrity sha512-53647EfRvPQJKQCMBc5AJGSZHyl6eueaOQq7PrfxEEq9Q3IjVcikAWYrZ4bHSZY7J12IIuz/5bSLJJZfegNQtA== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.6" + "@jimp/utils" "^0.10.1" core-js "^3.4.1" -"@jimp/plugin-blur@^0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@jimp/plugin-blur/-/plugin-blur-0.9.6.tgz#3d74b18c27e9eae11b956ffe26290ece6d250813" - integrity sha512-xEi63hvzewUp7kzw+PI3f9CIrgZbphLI4TDDHWNYuS70RvhTuplbR6RMHD/zFhosrANCkJGr5OZJlrJnsCg6ug== +"@jimp/plugin-blur@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-blur/-/plugin-blur-0.10.1.tgz#2f9f6e494183a4044cffb1883bbdff42aee914ea" + integrity sha512-0PzdzPGuv8RlhiMbLcM0tIekkHhuaPTY+frEWmO8BuCeqW9Tg9W4RxdwZtMqIVRG+kZBgyltYee31Q4JWlu9Hg== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.6" + "@jimp/utils" "^0.10.1" core-js "^3.4.1" -"@jimp/plugin-color@^0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@jimp/plugin-color/-/plugin-color-0.9.6.tgz#d0fca0ed4c2c48fd6f929ef4a03cebf9c1342e14" - integrity sha512-o1HSoqBVUUAsWbqSXnpiHU0atKWy/Q1GUbZ3F5GWt/0OSDyl9RWM82V9axT2vePZHInKjIaimhnx1gGj8bfxkQ== +"@jimp/plugin-circle@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-circle/-/plugin-circle-0.10.1.tgz#73184655fa0de586efbbda9675b3233fcd621a0a" + integrity sha512-sqiiEddN81N9xHZbPVjaJlbpQabaCeNGLW/x+0BfuNxnMPq7OkOx8IRpqIDYiGuuPhiR5hWxmmpws8ZAhjwsVw== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.6" + "@jimp/utils" "^0.10.1" + core-js "^3.4.1" + +"@jimp/plugin-color@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-color/-/plugin-color-0.10.1.tgz#1b80654cbf4cd0bf6663b5ca94aa7317b8827e3d" + integrity sha512-SmW2+hFtNmQ33WYVsgKvreS8peCc5qItAvqGR58lKNoIMEZSNpyGwIu9g83HtDIImGsXpz3DWGMR1h8sLYCFcQ== + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/utils" "^0.10.1" core-js "^3.4.1" tinycolor2 "^1.4.1" -"@jimp/plugin-contain@^0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@jimp/plugin-contain/-/plugin-contain-0.9.6.tgz#7d7bbd5e9c2fa4391a3d63620e13a28f51e1e7e8" - integrity sha512-Xz467EN1I104yranET4ff1ViVKMtwKLg1uRe8j3b5VOrjtiXpDbjirNZjP3HTlv8IEUreWNz4BK7ZtfHSptufA== +"@jimp/plugin-contain@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-contain/-/plugin-contain-0.10.1.tgz#ca998fff6622e64f9ff9a5e6e5685fa3730fc8d1" + integrity sha512-1PkmUPd5iAicAI7QjO9r1Mp/Ia7ElJPwXTCNLsQkDxYS/L4u7vQ0xCkQkokAeR49Ul3GTWLqj9paWr7VSBG9Fg== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.6" + "@jimp/utils" "^0.10.1" core-js "^3.4.1" -"@jimp/plugin-cover@^0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@jimp/plugin-cover/-/plugin-cover-0.9.6.tgz#2853de7f8302f655ae8e95f51ab25a0ed77e3756" - integrity sha512-Ocr27AvtvH4ZT/9EWZgT3+HQV9fG5njwh2CYMHbdpx09O62Asj6pZ4QI0kKzOcux1oLgv59l7a93pEfMOfkfwQ== +"@jimp/plugin-cover@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-cover/-/plugin-cover-0.10.1.tgz#12de082cec1de678623880ac3f82bcf89efea7cd" + integrity sha512-fCiz+ugrRwffNixUHFxtRKhTYm8sFAoYbNNzV0WdiG8dS0qhoYjbOJPtLcIw9CyJbMZ5eXjGOTxhTAGzBng9DA== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.6" + "@jimp/utils" "^0.10.1" core-js "^3.4.1" -"@jimp/plugin-crop@^0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@jimp/plugin-crop/-/plugin-crop-0.9.6.tgz#82e539af2a2417783abbd143124a57672ff4cc31" - integrity sha512-d9rNdmz3+eYLbSKcTyyp+b8Nmhf6HySnimDXlTej4UP6LDtkq2VAyVaJ12fz9x6dfd8qcXOBXMozSfNCcgpXYA== +"@jimp/plugin-crop@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-crop/-/plugin-crop-0.10.1.tgz#40f20d8adcf83a7dd49ce40468afe82df72e16c4" + integrity sha512-KjW+RuuNcsIvvNF1ejbBjcDNus/fLz69LGAU2gwhFzw7A0iOUEJJgTWzkGBLZ/YvUaWMDtPnznF3X3oYHeOj6A== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.6" + "@jimp/utils" "^0.10.1" core-js "^3.4.1" -"@jimp/plugin-displace@^0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@jimp/plugin-displace/-/plugin-displace-0.9.6.tgz#67564d081dc6b19007248ca222d025fd6f90c03b" - integrity sha512-SWpbrxiHmUYBVWtDDMjaG3eRDBASrTPaad7l07t73/+kmU6owAKWQW6KtVs05MYSJgXz7Ggdr0fhEn9AYLH1Rg== +"@jimp/plugin-displace@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-displace/-/plugin-displace-0.10.1.tgz#fcf683adc4b4bfdd27c77045fc2abeff6521669a" + integrity sha512-NUJcjMRb6iR9rwJSC7t8LMJgRs5Z0mzflYBymvttkjlcIoB4RPIOu3gWn5iT5IepB50YTy9zJuCaofMYn4DnaA== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.6" + "@jimp/utils" "^0.10.1" core-js "^3.4.1" -"@jimp/plugin-dither@^0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@jimp/plugin-dither/-/plugin-dither-0.9.6.tgz#dc48669cf51f3933761aa9137e99ebfa000b8cce" - integrity sha512-abm1GjfYK7ru/PoxH9fAUmhl+meHhGEClbVvjjMMe5g2S0BSTvMJl3SrkQD/FMkRLniaS/Qci6aQhIi+8rZmSw== +"@jimp/plugin-dither@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-dither/-/plugin-dither-0.10.1.tgz#c75650274b82c0b140f7b9db26167169729742a2" + integrity sha512-V/PCL44R16w5EDCgMvFXBaWFQ0f3LLDD3CQxJFOw6awswkP60m13nUUtWHm7QB54Gghhgk8JEOD/mZo6JsnaBg== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.6" + "@jimp/utils" "^0.10.1" core-js "^3.4.1" -"@jimp/plugin-flip@^0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@jimp/plugin-flip/-/plugin-flip-0.9.6.tgz#f81f9b886da8cd56e23dd04d5aa359f2b94f939e" - integrity sha512-KFZTzAzQQ5bct3ii7gysOhWrTKVdUOghkkoSzLi+14nO3uS/dxiu8fPeH1m683ligbdnuM/b22OuLwEwrboTHA== +"@jimp/plugin-fisheye@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-fisheye/-/plugin-fisheye-0.10.1.tgz#f482d913d00ef4149e7d4fcce517dd9acc564846" + integrity sha512-GgIAY6ryL+2RwRb6j+APo972f8VjftolnvjVM1ilxO4pdfJf7gdg3Bp4igka9fgW94BBgdJlCPUeWIVap3AYaA== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.6" + "@jimp/utils" "^0.10.1" core-js "^3.4.1" -"@jimp/plugin-gaussian@^0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.9.6.tgz#6c93897ee0ff979466184d7d0ec0fbc95c679be4" - integrity sha512-WXKLtJKWchXfWHT5HIOq1HkPKpbH7xBLWPgVRxw00NV/6I8v4xT63A7/Nag78m00JgjwwiE7eK2tLGDbbrPYig== +"@jimp/plugin-flip@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-flip/-/plugin-flip-0.10.1.tgz#e311365b859168b0bef338566868bab9d2ae397d" + integrity sha512-CkSwULwmVYOo6ZY/QnR0/mrfMaf/3g+sDo7osAHaf0GvuoIw76NSh6LwaANAsLZ9erknZ67XuqCjZWoMwNrbaw== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.6" + "@jimp/utils" "^0.10.1" core-js "^3.4.1" -"@jimp/plugin-invert@^0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@jimp/plugin-invert/-/plugin-invert-0.9.6.tgz#4b3fa7b81ea976b09b82b3db59ee00ac3093d2fd" - integrity sha512-Pab/cupZrYxeRp07N4L5a4C/3ksTN9k6Knm/o2G5C789OF0rYsGGLcnBR/6h69nPizRZHBYdXCEyXYgujlIFiw== +"@jimp/plugin-gaussian@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.10.1.tgz#9c409d7f455397d26acd953c5f03368018d0c38f" + integrity sha512-RnmIWUr9RB1RrgqXG2H7C3dyncak/D2CPoP2DehAgxxHprDdxm9HoFjhGQ9eh+Ygr0nXE7t2+fDE12U3VW3ApA== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.6" + "@jimp/utils" "^0.10.1" core-js "^3.4.1" -"@jimp/plugin-mask@^0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@jimp/plugin-mask/-/plugin-mask-0.9.6.tgz#d70be0030ab3294b191f5b487fb655d776820b19" - integrity sha512-ikypRoDJkbxXlo6gW+EZOcTiLDIt0DrPwOFMt1bvL8UV2QPgX+GJ685IYwhIfEhBf/GSNFgB/NYsVvuSufTGeg== +"@jimp/plugin-invert@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-invert/-/plugin-invert-0.10.1.tgz#cf5e711c1cd864bb4fc46bd00a8b2a40d5058a61" + integrity sha512-PpTUbnjsAkw0nZnbZWrKdsEW46MARhzzabBXy/XCjvutG3jzoO8EL19VeEtcrxBml9duJbaOzdzYmbFkQsNINQ== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.6" + "@jimp/utils" "^0.10.1" core-js "^3.4.1" -"@jimp/plugin-normalize@^0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@jimp/plugin-normalize/-/plugin-normalize-0.9.6.tgz#c9128412a53485d91236a1da241f3166e572be4a" - integrity sha512-V3GeuAJ1NeL7qsLoDjnypJq24RWDCwbXpKhtxB+Yg9zzgOCkmb041p7ysxbcpkuJsRpKLNABZeNCCqd83bRawA== +"@jimp/plugin-mask@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-mask/-/plugin-mask-0.10.1.tgz#4ed7ade8b37eca9493977703c26ad64e748460ad" + integrity sha512-Fm75MSucSGI19n9beXGVPSR98flXpzJLyOfSj0+zefXafrO+kmYO9eWtzNd3TE6jzyGe5y7mPJPHB0PWXKgw4g== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.6" + "@jimp/utils" "^0.10.1" core-js "^3.4.1" -"@jimp/plugin-print@^0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@jimp/plugin-print/-/plugin-print-0.9.6.tgz#fea31ffeafee18ae7b5cfd6fa131bb205abfee51" - integrity sha512-gKkqZZPQtMSufHOL0mtJm5d/KI2O6+0kUpOBVSYdGedtPXA61kmVnsOd3wwajIMlXA3E0bDxLXLdAguWqjjGgw== +"@jimp/plugin-normalize@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-normalize/-/plugin-normalize-0.10.1.tgz#fadd955754ea077afb0fb59352c54088a9ca0981" + integrity sha512-mxjRCmUB/yD973pgjAKb3HCYMyh1GvGtdo71+pJn+ChefvTJ0LDB1FknwTVjDtJuy4mBh0TkBqBp4PNAtdBL6w== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.6" + "@jimp/utils" "^0.10.1" + core-js "^3.4.1" + +"@jimp/plugin-print@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-print/-/plugin-print-0.10.1.tgz#d39a01b5bf8a3087e102637920672ff45f1e5047" + integrity sha512-eSPTbdES/ISR9nMHV8e449UMs0Dx0eY9OixU7gIYTDnTmnhyYXq9bqIY/IXqVU3fOj330MIpIpi6pavmtJXdLA== + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/utils" "^0.10.1" core-js "^3.4.1" load-bmfont "^1.4.0" -"@jimp/plugin-resize@^0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@jimp/plugin-resize/-/plugin-resize-0.9.6.tgz#7fb939c8a42e2a3639d661cc7ab24057598693bd" - integrity sha512-r5wJcVII7ZWMuY2l6WSbHPG6gKMFemtCHmJRXGUu+/ZhPGBz3IFluycBpHkWW3OB+jfvuyv1EGQWHU50N1l8Og== +"@jimp/plugin-resize@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-resize/-/plugin-resize-0.10.1.tgz#0a294b8dae1efd96ac53bdcd40f7ab58cc2e4f5e" + integrity sha512-aG42+tRmhAYKvybZteSD7s48dAcYSkipyM+e2aizRa0D0FHNIQlIHribiKfRTiX+ewx/fhHVu0vpFKOg0N2hDw== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.6" + "@jimp/utils" "^0.10.1" core-js "^3.4.1" -"@jimp/plugin-rotate@^0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@jimp/plugin-rotate/-/plugin-rotate-0.9.6.tgz#06d725155e5cdb615133f57a52f5a860a9d03f3e" - integrity sha512-B2nm/eO2nbvn1DgmnzMd79yt3V6kffhRNrKoo2VKcKFiVze1vGP3MD3fVyw5U1PeqwAFu7oTICFnCf9wKDWSqg== +"@jimp/plugin-rotate@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-rotate/-/plugin-rotate-0.10.1.tgz#4e0315cc582afdde90a4f8b56434046c49da015f" + integrity sha512-R+Qpb3cwKl6L5m9RUkJatY5D5JuPg/uUfFbdFPaBhc5infC46Rsyt0j923eUyXkisechRDmzoTbG3fcc1MjzSA== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.6" + "@jimp/utils" "^0.10.1" core-js "^3.4.1" -"@jimp/plugin-scale@^0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@jimp/plugin-scale/-/plugin-scale-0.9.6.tgz#3fa939c1a4f44383e12afeb7c434eb41f20e4a1c" - integrity sha512-DLsLB5S3mh9+TZY5ycwfLgOJvUcoS7bP0Mi3I8vE1J91qmA+TXoWFFgrIVgnEPw5jSKzNTt8WhykQ0x2lKXncw== +"@jimp/plugin-scale@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-scale/-/plugin-scale-0.10.1.tgz#e5cf6150867738c5c4fa9e04f125a9d714b21b67" + integrity sha512-MKmW3Rr0sSApglUYFqJ8LgGy9Nm9w2oRgSB2twxA5bp1waM9fdOILcRyEnltwHIIDSoyR0me8XmpuwpyqaqSdA== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.6" + "@jimp/utils" "^0.10.1" core-js "^3.4.1" -"@jimp/plugins@^0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@jimp/plugins/-/plugins-0.9.6.tgz#a1cfdf9f3e1adf5b124686486343888a16c8fd27" - integrity sha512-eQI29e+K+3L/fb5GbPgsBdoftvaYetSOO2RL5z+Gjk6R4EF4QFRo63YcFl+f72Kc1b0JTOoDxClvn/s5GMV0tg== +"@jimp/plugin-shadow@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-shadow/-/plugin-shadow-0.10.1.tgz#d564a1ac7552c2423fb4b41c4af78a84b8177032" + integrity sha512-H4JSVimD19vbFiX8SL3Ci5Htsbb3xG8zQrkjf+ui/2MXbeP0FyWlIv3g1Ahil4oE+5Wi4zbq20Dyba2GS4aINw== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/plugin-blit" "^0.9.6" - "@jimp/plugin-blur" "^0.9.6" - "@jimp/plugin-color" "^0.9.6" - "@jimp/plugin-contain" "^0.9.6" - "@jimp/plugin-cover" "^0.9.6" - "@jimp/plugin-crop" "^0.9.6" - "@jimp/plugin-displace" "^0.9.6" - "@jimp/plugin-dither" "^0.9.6" - "@jimp/plugin-flip" "^0.9.6" - "@jimp/plugin-gaussian" "^0.9.6" - "@jimp/plugin-invert" "^0.9.6" - "@jimp/plugin-mask" "^0.9.6" - "@jimp/plugin-normalize" "^0.9.6" - "@jimp/plugin-print" "^0.9.6" - "@jimp/plugin-resize" "^0.9.6" - "@jimp/plugin-rotate" "^0.9.6" - "@jimp/plugin-scale" "^0.9.6" + "@jimp/utils" "^0.10.1" + core-js "^3.4.1" + +"@jimp/plugin-threshold@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-threshold/-/plugin-threshold-0.10.1.tgz#4097c91aab749b140f7edc4c7066803a69bf9fb3" + integrity sha512-o2nBEz2tLvfYNMdac9qho5SrjFoBfbJow8PWXMWz14N6zLKIw4DQT+inSbEKxbxlqKseds3zUsOIM+0hLbSDeQ== + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/utils" "^0.10.1" + core-js "^3.4.1" + +"@jimp/plugins@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/plugins/-/plugins-0.10.1.tgz#e9a126bbed7058e6351d08454249a7934d4bd69c" + integrity sha512-gpdoh7XITd33ZClObVKYV8ASpZnrwebNuY4C5njeJfLxfyRQ2wSK9TDAb/5OYcyrbMDIqBaKLg9AXHPBphwXtg== + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/plugin-blit" "^0.10.1" + "@jimp/plugin-blur" "^0.10.1" + "@jimp/plugin-circle" "^0.10.1" + "@jimp/plugin-color" "^0.10.1" + "@jimp/plugin-contain" "^0.10.1" + "@jimp/plugin-cover" "^0.10.1" + "@jimp/plugin-crop" "^0.10.1" + "@jimp/plugin-displace" "^0.10.1" + "@jimp/plugin-dither" "^0.10.1" + "@jimp/plugin-fisheye" "^0.10.1" + "@jimp/plugin-flip" "^0.10.1" + "@jimp/plugin-gaussian" "^0.10.1" + "@jimp/plugin-invert" "^0.10.1" + "@jimp/plugin-mask" "^0.10.1" + "@jimp/plugin-normalize" "^0.10.1" + "@jimp/plugin-print" "^0.10.1" + "@jimp/plugin-resize" "^0.10.1" + "@jimp/plugin-rotate" "^0.10.1" + "@jimp/plugin-scale" "^0.10.1" + "@jimp/plugin-shadow" "^0.10.1" + "@jimp/plugin-threshold" "^0.10.1" core-js "^3.4.1" timm "^1.6.1" -"@jimp/png@^0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@jimp/png/-/png-0.9.6.tgz#00ed7e6fb783b94f2f1a9fadf9a42bd75f70cc7f" - integrity sha512-9vhOG2xylcDqPbBf4lzpa2Sa1WNJrEZNGvPvWcM+XVhqYa8+DJBLYkoBlpI/qWIYA+eVWDnLF3ygtGj8CElICw== +"@jimp/png@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/png/-/png-0.10.1.tgz#aff93621b278bca73e46bf951d2e44b1381c5139" + integrity sha512-/2CUaOjbq5GVaXKRGzM4nhhFpnVdWNazsuVZ3Et8sgMxJxep7v6k2hmvL8rr0/A4UPPWzEbFsagz/YBbN9fANw== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.6" + "@jimp/utils" "^0.10.1" core-js "^3.4.1" pngjs "^3.3.3" -"@jimp/tiff@^0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@jimp/tiff/-/tiff-0.9.6.tgz#9ff12122e727ee15f27f40a710516102a636f66b" - integrity sha512-pKKEMqPzX9ak8mek2iVVoW34+h/TSWUyI4NjbYWJMQ2WExfuvEJvLocy9Q9xi6HqRuJmUxgNIiC5iZM1PDEEfg== +"@jimp/tiff@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/tiff/-/tiff-0.10.1.tgz#602e5d7c3434094e5e29642659af2f5da0061e12" + integrity sha512-lvCzid4RwCZr/Zz3W4xTD/UKe4xjVdPk2dGGozrW0Puo2TCz5L+ghXYEWxzoj/rm/wOFmQbaYdopv0UQ72HqWw== dependencies: "@babel/runtime" "^7.7.2" core-js "^3.4.1" utif "^2.0.1" -"@jimp/types@^0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@jimp/types/-/types-0.9.6.tgz#7be7f415ad93be733387c03b8a228c587a868a18" - integrity sha512-PSjdbLZ8d50En+Wf1XkWFfrXaf/GqyrxxgIwFWPbL+wrW4pmbYovfxSLCY61s8INsOFOft9dzzllhLBtg1aQ6A== +"@jimp/types@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/types/-/types-0.10.1.tgz#7cbeff8b189b2d7c49b8f8bdaee4d6c814d8e4ff" + integrity sha512-PaPhpeHE41Yn6myvnHmrb1FNvn+XmF+EpizhP8JR3DmyveUPblrssM8qA5iMe+Q+wG3vJ02LHNgbfFCUYJr3zA== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/bmp" "^0.9.6" - "@jimp/gif" "^0.9.6" - "@jimp/jpeg" "^0.9.6" - "@jimp/png" "^0.9.6" - "@jimp/tiff" "^0.9.6" + "@jimp/bmp" "^0.10.1" + "@jimp/gif" "^0.10.1" + "@jimp/jpeg" "^0.10.1" + "@jimp/png" "^0.10.1" + "@jimp/tiff" "^0.10.1" core-js "^3.4.1" timm "^1.6.1" -"@jimp/utils@^0.9.6": - version "0.9.6" - resolved "https://registry.yarnpkg.com/@jimp/utils/-/utils-0.9.6.tgz#a3e6c29e835e2b9ea9f3899c9d3d230dc63bd518" - integrity sha512-kzxcp0i4ecSdMXFEmtH+NYdBQysINEUTsrjm7v0zH8t/uwaEMOG46I16wo/iPBXJkUeNdL2rbXoGoxxoeSfrrA== +"@jimp/utils@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@jimp/utils/-/utils-0.10.1.tgz#35187bd28268dbb4cfc2b07c71e59f6be0303bf8" + integrity sha512-Q0ZT2FGPQo3lXkUheAsg0dVWo0Ko+vYCVJLEUxQMxmPiDLUquE22iya+tMONPOaRj1GG3cznaSqaEHDNgoyYbw== dependencies: "@babel/runtime" "^7.7.2" core-js "^3.4.1" + regenerator-runtime "^0.13.3" "@sindresorhus/is@^0.14.0": version "0.14.0" @@ -1685,15 +1726,15 @@ itunes-nowplaying-mac@0.3.1: resolved "https://registry.yarnpkg.com/itunes-nowplaying-mac/-/itunes-nowplaying-mac-0.3.1.tgz#3f5ee853aef843e66c20ae10b9439303bc1a4986" integrity sha512-kZ/ef1rMzl/CMc1RBh3z99wqijxQgz5Vn1gLCrE1OqRwj9bq2vbgeIqWjJC8iDWZHRolizdTPfKMAbp8yKYFTQ== -jimp@^0.9.6: - version "0.9.6" - resolved "https://registry.yarnpkg.com/jimp/-/jimp-0.9.6.tgz#abf381daf193a4fa335cb4ee0e22948049251eb9" - integrity sha512-DBDHYeNVqVpoPkcvo0PKTNGvD+i7NYvkKTsl0I3k7ql36uN8wGTptRg0HtgQyYE/bhGSLI6Lq5qLwewaOPXNfg== +jimp@^0.10.1: + version "0.10.1" + resolved "https://registry.yarnpkg.com/jimp/-/jimp-0.10.1.tgz#052fbf00fd955ada1bfc0f9c3a16d4980bd3178a" + integrity sha512-dRs9hdUXseS7y214GxZxeLiXNQZUXnjdzv9I5+FVWAnyK0bdIGgjUn5WLuNF4uAKkzIH3cFA24EbviOlBIpRDg== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/custom" "^0.9.6" - "@jimp/plugins" "^0.9.6" - "@jimp/types" "^0.9.6" + "@jimp/custom" "^0.10.1" + "@jimp/plugins" "^0.10.1" + "@jimp/types" "^0.10.1" core-js "^3.4.1" regenerator-runtime "^0.13.3" From 0014890881f70ef1b2e263e3be73a605ea640340 Mon Sep 17 00:00:00 2001 From: cutls Date: Tue, 7 Apr 2020 12:52:42 +0900 Subject: [PATCH 3/9] Fix: hidden titlebar with frameless mode on macOS --- app/main.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/main.js b/app/main.js index faa3be90..eb1a748f 100644 --- a/app/main.js +++ b/app/main.js @@ -102,8 +102,10 @@ try { var frameRaw = fs.readFileSync(frame_path, 'utf8') if(frameRaw == 'false') { var frame = false + var frameTitle = 'hidden' } else { var frame = true + var frameTitle = 'default' } } catch { var frame = true @@ -186,6 +188,7 @@ function createWindow() { y: window_size.y, simpleFullscreen: true, show: false, + titleBarStyle: frameTitle, frame: frame, } } From 7822b2c7400a714f46d5cd351f9da64cd17b3281 Mon Sep 17 00:00:00 2001 From: cutls Date: Tue, 7 Apr 2020 13:02:20 +0900 Subject: [PATCH 4/9] Fix: CW toggle --- app/js/post/secure.js | 6 +++--- app/js/tl/misskeyparse.js | 12 +++++------- app/js/tl/parse.js | 10 +++++----- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/app/js/post/secure.js b/app/js/post/secure.js index ce66d7f6..9440344b 100644 --- a/app/js/post/secure.js +++ b/app/js/post/secure.js @@ -96,9 +96,9 @@ function cw() { } } //TLでコンテントワーニングを表示トグル -function cw_show(id) { - $('.cw_hide_' + id).toggleClass('cw') - $('.cw-long-' + id).toggleClass('hide') +function cw_show(e) { + $(e).parent().parent().find('.cw_hide').toggleClass('cw') + $(e).parent().find('.cw_long').toggleClass('hide') } $(function() { $('#cw-text').on('change', function(event) { diff --git a/app/js/tl/misskeyparse.js b/app/js/tl/misskeyparse.js index 3e1731e5..32e95077 100644 --- a/app/js/tl/misskeyparse.js +++ b/app/js/tl/misskeyparse.js @@ -360,22 +360,20 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) { if ((toot.cw || toot.cw == "") && cw) { var content = escapeHTML(toot.text); var spoil = escapeHTMLtemp(toot.cw); - var spoiler = "cw cw_hide_" + toot.id; + var spoiler = "cw cw_hide"; var api_spoil = "gray"; - var spoiler_show = '' + lang.lang_parse_cwshow + '
'; + var spoiler_show = '' + lang.lang_parse_cwshow + '
'; } else { var ct1 = nl2br(toot.text).split('
').length - 2; var ct2 = nl2br(toot.text).split('
').length - 2; if (ct1 > ct2) { var ct = ct1; } else { var ct = ct2; } if ((sent < ct && $.mb_strlen($.strip_tagstemp(toot.text)) > 5) || ($.strip_tagstemp(toot.text).length > ltr && $.mb_strlen($.strip_tagstemp(toot.text)) > 5)) { var content = '' + lang.lang_parse_fulltext + '
' + escapeHTMLtemp(toot.text) - var spoil = '' + $.mb_substr($.strip_tagstemp( + var spoil = '' + $.mb_substr($.strip_tagstemp( toot.text), 0, 100) + '' + lang.lang_parse_autofold + ''; - var spoiler = "cw cw_hide_" + toot.id; - var spoiler_show = '' + lang.lang_parse_more + '
'; + var spoiler = "cw cw_hide"; + var spoiler_show = '' + lang.lang_parse_more + '
'; } else { var content = escapeHTMLtemp(toot.text); if (toot.cw) { diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js index f065e7ed..607b1212 100644 --- a/app/js/tl/parse.js +++ b/app/js/tl/parse.js @@ -516,9 +516,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) { } if (toot.spoiler_text && cw) { var spoil = escapeHTML(toot.spoiler_text) - var spoiler = 'cw cw_hide_' + toot.id + var spoiler = 'cw cw_hide' var api_spoil = 'gray' - var spoiler_show = `${lang.lang_parse_cwshow}
` + var spoiler_show = `${lang.lang_parse_cwshow}
` } else { if (content) { var ct1 = content.split('

').length + content.split('
').length - 2 @@ -538,14 +538,14 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) { ($.mb_strlen($.strip_tags(content)) > ltr && $.mb_strlen($.strip_tags(content)) > 5) ) { var content = `${lang.lang_parse_fulltext}
` + content - var spoil = `${$.mb_substr( + var spoil = `${$.mb_substr( $.strip_tags(content), 0, 100 )} ${lang.lang_parse_autofold}` - var spoiler = 'cw cw_hide_' + toot.id - var spoiler_show = ` + var spoiler = 'cw cw_hide' + var spoiler_show = ` ${lang.lang_parse_more}
` } else { From 6fbfdf0323aca8cb40de26755597f7da45c7d5e5 Mon Sep 17 00:00:00 2001 From: cutls Date: Tue, 7 Apr 2020 13:20:50 +0900 Subject: [PATCH 5/9] Fix: cannot list fonts up --- app/js/ui/settings.js | 6 ++--- app/main/system.js | 9 ++++--- app/package.json | 2 +- app/yarn.lock | 56 +++++++++++++++++++++++++++++++++---------- 4 files changed, 52 insertions(+), 21 deletions(-) diff --git a/app/js/ui/settings.js b/app/js/ui/settings.js index b3f17063..92e91b86 100644 --- a/app/js/ui/settings.js +++ b/app/js/ui/settings.js @@ -507,11 +507,11 @@ function fontList(arg) { var font = arg[i] $('#fonts').append( '
' + - font.family + + font + '
' ) } diff --git a/app/main/system.js b/app/main/system.js index fa7f3556..7f5cedd8 100644 --- a/app/main/system.js +++ b/app/main/system.js @@ -242,11 +242,10 @@ function system(mainWindow, dir, lang, dirname) { fn(data); // ソート後の配列を返す } ipc.on("fonts", (e, arg) => { - const fm = require("font-manager"); - var fonts = fm.getAvailableFontsSync(); - object_array_sort(fonts, "family", "asc", function(fonts_sorted) { - e.sender.webContents.send("font-list", fonts_sorted); - }); + var SystemFonts = require('system-font-families').default; + var fm = new SystemFonts(); + const fontList = fm.getFontsSync(); + e.sender.webContents.send("font-list", fontList); }); //コピー ipc.on("copy", (e, arg) => { diff --git a/app/package.json b/app/package.json index 85cb3fb2..f2c24b1e 100644 --- a/app/package.json +++ b/app/package.json @@ -62,10 +62,10 @@ "materialize-css": "git://github.com/cutls/materialize#v1-dev", "sumchecker": "^3.0.1", "sweetalert2": "^9.10.3", + "system-font-families": "^0.4.1", "vue": "^2.6.11" }, "optionalDependencies": { - "font-manager": "0.3.0", "itunes-nowplaying-mac": "0.3.1" }, "devDependencies": { diff --git a/app/yarn.lock b/app/yarn.lock index 82fcd1d4..ac45b923 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -523,6 +523,23 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ== +babel-polyfill@^6.23.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153" + integrity sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM= + dependencies: + babel-runtime "^6.26.0" + core-js "^2.5.0" + regenerator-runtime "^0.10.5" + +babel-runtime@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" + integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= + dependencies: + core-js "^2.4.0" + regenerator-runtime "^0.11.0" + balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" @@ -837,6 +854,11 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0: resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= +core-js@^2.4.0, core-js@^2.5.0: + version "2.6.11" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c" + integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg== + core-js@^3.4.0, core-js@^3.4.1: version "3.6.4" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz#440a83536b458114b9cb2ac1580ba377dc470647" @@ -1240,13 +1262,6 @@ find-up@^3.0.0: dependencies: locate-path "^3.0.0" -font-manager@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/font-manager/-/font-manager-0.3.0.tgz#9efdc13e521a3d8752e7ab56c3938818043a311f" - integrity sha512-6N3pzO+9kxE3yD9c4VN7reg5fqgFvjcUdxZmwauRzsExaeKRu0APfEi3DOISFakokybgKlZcLFQHawwc2TMpQQ== - dependencies: - nan ">=2.10.0" - for-each@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" @@ -1965,11 +1980,6 @@ ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -nan@>=2.10.0: - version "2.14.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" - integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== - node-abi@^2.11.0: version "2.12.0" resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.12.0.tgz#40e9cfabdda1837863fa825e7dfa0b15686adf6f" @@ -2378,6 +2388,16 @@ readline-sync@1.4.10: resolved "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.10.tgz#41df7fbb4b6312d673011594145705bf56d8873b" integrity sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw== +regenerator-runtime@^0.10.5: + version "0.10.5" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658" + integrity sha1-M2w+/BIgrc7dosn6tntaeVWjNlg= + +regenerator-runtime@^0.11.0: + version "0.11.1" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" + integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== + regenerator-runtime@^0.13.2, regenerator-runtime@^0.13.3: version "0.13.3" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5" @@ -2760,6 +2780,14 @@ sweetalert2@^9.10.3: resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-9.10.3.tgz#e2e420173b2dd4133a20023174ad6636a90b6061" integrity sha512-i/lDlar8sSH+/YEQ25NXcs0ASB8Upl4JJqKgFHcDtk62vts2hK6i+iOjyCw02s6feS3Qum+MrOHmZNJPFL/g2g== +system-font-families@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/system-font-families/-/system-font-families-0.4.1.tgz#ea35b06989629603010c0ed02d4ba264bfa3e374" + integrity sha512-XQK5qAYsbEI6SkCEwezRDsPV44T2G4NNQ/xcx7D/8XM3S+rqYlNxsGcLT7vO6vdT4hc/mlRef7S6+KGIetTwdg== + dependencies: + babel-polyfill "^6.23.0" + ttfinfo "https://github.com/rBurgett/ttfinfo.git" + tar@^4.4.12: version "4.4.13" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" @@ -2830,6 +2858,10 @@ tslib@^1.9.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== +"ttfinfo@https://github.com/rBurgett/ttfinfo.git": + version "0.2.0" + resolved "https://github.com/rBurgett/ttfinfo.git#f00e43e2a6d4c8a12a677df20b7804492d50863c" + tunnel-agent@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" From 429a5c764f79087f055610ef9dad685b0c8ac80e Mon Sep 17 00:00:00 2001 From: cutls Date: Tue, 7 Apr 2020 14:00:20 +0900 Subject: [PATCH 6/9] Add, Fix: percent, versioning, start --- app/main/dl.js | 47 +++++++++++------------ app/view/make/language/en/setting.json | 3 +- app/view/make/language/ja-KS/setting.json | 1 + app/view/make/language/ja/setting.json | 1 + app/view/make/make.js | 2 +- app/view/make/setting.sample.js | 10 +++++ app/view/make/update.sample.html | 35 +++++++++++++---- 7 files changed, 65 insertions(+), 34 deletions(-) diff --git a/app/main/dl.js b/app/main/dl.js index affae9f1..9fc233dc 100644 --- a/app/main/dl.js +++ b/app/main/dl.js @@ -34,11 +34,12 @@ function dl(mainWindow, lang_path, base, dirname) { } }) //アプデDL - ipc.on('download-btn', (e, args) => { + ipc.on('download-btn', async (e, args) => { function dl(url, file, dir, e) { e.sender.webContents.send('mess', 'ダウンロードを開始します。') const opts = { directory: dir, + filename: file, openFolderWhenDone: true, onProgress: function(event) { e.sender.webContents.send('prog', event) @@ -54,29 +55,27 @@ function dl(mainWindow, lang_path, base, dirname) { } var platform = process.platform var bit = process.arch - dialog.showSaveDialog( - null, - { - title: 'Save', - defaultPath: app.getPath('home') + '/' + args[1] - }, - savedFiles => { - console.log(savedFiles) - if (!savedFiles) { - return false - } - if (platform == 'win32') { - var m = savedFiles.match(/(.+)\\(.+)$/) - } else { - var m = savedFiles.match(/(.+)\/(.+)$/) - } - //console.log(m); - if (isExistFile(savedFiles)) { - fs.unlinkSync(savedFiles) - } - dl(args[0], args[1], m[1], e) - } - ) + var options = { + title: 'Save', + defaultPath: app.getPath('home') + '/' + args[1] + } + const file = await dialog.showSaveDialog(null, options) + const savedFiles = file.filePath + console.log(savedFiles) + if (!savedFiles) { + return false + } + if (platform == 'win32') { + var m = savedFiles.match(/(.+)\\(.+)$/) + } else { + var m = savedFiles.match(/(.+)\/(.+)$/) + } + //console.log(m); + if (isExistFile(savedFiles)) { + fs.unlinkSync(savedFiles) + } + console.log(m) + dl(args[0], m[2], m[1], e) }) function isExistFile(file) { diff --git a/app/view/make/language/en/setting.json b/app/view/make/language/en/setting.json index 89485722..32fb0243 100644 --- a/app/view/make/language/en/setting.json +++ b/app/view/make/language/en/setting.json @@ -18,7 +18,7 @@ "hardwareAcceleration": "Disable hardware acceleration", "hardwareAccelerationWarn": "Auto restarted", "theme": "Themes", - "popup": "Popup notification(on Windows)", + "popup": "Popup notification", "popupwarn": "Hide to set \"0\"", "s": "sec", "nativenotf": "Native notification", @@ -38,6 +38,7 @@ "useragentWarn":"Restart when changed", "frame": "Window frame", "frameWarn": "If 'off', the window looks cool.", + "downloadWin": "Versioning(o Windows downloader)", "absolute": "absolute value", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.", diff --git a/app/view/make/language/ja-KS/setting.json b/app/view/make/language/ja-KS/setting.json index 0e129112..c49527a1 100644 --- a/app/view/make/language/ja-KS/setting.json +++ b/app/view/make/language/ja-KS/setting.json @@ -37,6 +37,7 @@ "useragentWarn":"再起動すんで。", "frame": "ウィンドウのフレーム", "frameWarn": "フレーム無しやとタイトルバーがシュッとするで。再起動すんで。", + "downloadWin": "バージョニングする(Windowsのダウンローダ)", "absolute": "絶対指定", "srcUrl": "検索エンジン", "srcUrlWarn": "{q}が検索文字列になるで。", diff --git a/app/view/make/language/ja/setting.json b/app/view/make/language/ja/setting.json index 09f39af3..89284559 100644 --- a/app/view/make/language/ja/setting.json +++ b/app/view/make/language/ja/setting.json @@ -38,6 +38,7 @@ "useragentWarn":"再起動します。", "frame": "ウィンドウのフレーム", "frameWarn": "フレーム無しだと、タイトルバーのデザインがクールになります。再起動します。", + "downloadWin": "バージョニングする(Windowsのダウンローダ)", "absolute": "絶対指定", "srcUrl": "検索エンジン", "srcUrlWarn": "{q}が検索文字列に置換されます。", diff --git a/app/view/make/make.js b/app/view/make/make.js index ae0ee4cd..496a624c 100644 --- a/app/view/make/make.js +++ b/app/view/make/make.js @@ -1,4 +1,4 @@ -let ver = '20.2.0 (Kawaii)' +let ver = '20.2.1 (Kawaii)' if (process.argv.indexOf('--automatic') === -1) { let input = require('readline-sync').question('version string [empty: ' + ver + ' (default)]? ') if (input) { diff --git a/app/view/make/setting.sample.js b/app/view/make/setting.sample.js index 61812942..c544d649 100644 --- a/app/view/make/setting.sample.js +++ b/app/view/make/setting.sample.js @@ -162,6 +162,16 @@ var envConstruction = [ } ] } + },{ + id: 'download', + storage: 'dl-win', + checkbox: true, + setValue: 'no', + text: { + head: '@@downloadWin@@', + desc: 'ex: TheDesk-1.0.0-setup.exe', + checkbox: yesno + } } ] var tlConstruction = [ diff --git a/app/view/make/update.sample.html b/app/view/make/update.sample.html index 72ba4e4b..ce64cfdf 100644 --- a/app/view/make/update.sample.html +++ b/app/view/make/update.sample.html @@ -166,22 +166,42 @@ if (sel == "install") { if (bit == "x64") { var url = json["winx64"]; - var file = "TheDesk-setup.exe"; + if(localStorage.getItem("dl-win") == "yes") { + var file = "TheDesk-" + json.unique + "-setup.exe"; + } else { + var file = "TheDesk-setup.exe"; + } } else if (bit == "ia32") { var url = json["winia32"]; - var file = "TheDesk-setup-ia32.exe"; + if(localStorage.getItem("dl-win") == "yes") { + var file = "TheDesk-" + json.unique + "-setup-ia32.exe"; + } else { + var file = "TheDesk-setup-ia32.exe"; + } } } else if (sel == "portable") { if (bit == "x64") { var url = json["winx64p"]; - var file = "TheDesk.exe"; + if(localStorage.getItem("dl-win") == "yes") { + var file = "TheDesk-" + json.unique + ".exe"; + } else { + var file = "TheDesk.exe"; + } } else if (bit == "ia32") { var url = json["winia32p"]; - var file = "TheDesk-ia32.exe"; + if(localStorage.getItem("dl-win") == "yes") { + var file = "TheDesk-" + json.unique + "-ia32.exe"; + } else { + var file = "TheDesk-ia32.exe"; + } } } else if (sel == "linux") { var url = json["linuxx64"]; - var file = "thedesk.zip"; + if(localStorage.getItem("dl-win") == "yes") { + var file = "thedesk-" + json.unique_linux + ".zip"; + } else { + var file = "thedesk.zip"; + } } else if (sel == "linuxdeb") { var url = json["linuxdeb"]; var file = "thedesk_" + json.unique_linux + "_amd64.deb"; @@ -199,9 +219,8 @@ postMessage(["sendSinmpleIpc", "quit"], "*"); } function updateProg(arg) { - console.log(arg); - $(".determinate").css("width", arg * 100 + "%"); - $("#prog").text(Math.floor(arg * 100) + "%"); + $(".determinate").css("width", arg.percent * 100 + "%"); + $("#prog").text(Math.floor(arg.percent * 100) + "%"); } function updateMess(arg) { console.log(arg); From 50a2ce1470b390d4cad3aaf8c3c0dcc9fa1e864f Mon Sep 17 00:00:00 2001 From: cutls Date: Tue, 7 Apr 2020 14:40:27 +0900 Subject: [PATCH 7/9] Add: #208 Apple Music artwork request --- app/js/ui/spotify.js | 17 ++++++++++++++++- app/view/make/make.js | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/js/ui/spotify.js b/app/js/ui/spotify.js index e52d1d4b..1f0bad09 100644 --- a/app/js/ui/spotify.js +++ b/app/js/ui/spotify.js @@ -124,7 +124,7 @@ function nowplaying(mode) { postMessage(["itunes", ""], "*"); } } -function npCore(arg) { +async function npCore(arg) { console.table(arg); var content = localStorage.getItem("np-temp"); if (!content || content == "" || content == "null") { @@ -139,6 +139,9 @@ function npCore(arg) { } else if (platform == "darwin") { if (flag && arg.artwork) { media(arg.artwork, "image/png", "new"); + } else if (flag) { + var q = arg.artist + ' ' + arg.album.name + ' ' + arg.name + postMessage(["bmpImage", [await getUnknownAA(q), 0]], "*"); } } var regExp = new RegExp("{song}", "g"); @@ -183,3 +186,15 @@ if (location.search) { } else { } } +async function getUnknownAA(q) { + const start = 'https://itunes.apple.com/search?term=' + q + '&country=JP&entity=song' + let promise = await fetch(start, { + method: 'GET' + }) + const json = await promise.json() + if(!json.resultCount) { + return [] + } + const data = json.results + return data[0].artworkUrl100 +} \ No newline at end of file diff --git a/app/view/make/make.js b/app/view/make/make.js index 496a624c..ae0ee4cd 100644 --- a/app/view/make/make.js +++ b/app/view/make/make.js @@ -1,4 +1,4 @@ -let ver = '20.2.1 (Kawaii)' +let ver = '20.2.0 (Kawaii)' if (process.argv.indexOf('--automatic') === -1) { let input = require('readline-sync').question('version string [empty: ' + ver + ' (default)]? ') if (input) { From 73a57c86cbcb96a25e9c524b79a7dd964f682b02 Mon Sep 17 00:00:00 2001 From: cutls Date: Tue, 7 Apr 2020 14:58:30 +0900 Subject: [PATCH 8/9] use API #208 --- app/js/ui/spotify.js | 12 +++++++++++- app/view/make/language/en/setting.json | 2 ++ app/view/make/language/ja-KS/setting.json | 2 ++ app/view/make/language/ja/setting.json | 4 +++- app/view/make/setting.sample.html | 13 ++++++++++++- 5 files changed, 30 insertions(+), 3 deletions(-) diff --git a/app/js/ui/spotify.js b/app/js/ui/spotify.js index 1f0bad09..ba88850b 100644 --- a/app/js/ui/spotify.js +++ b/app/js/ui/spotify.js @@ -53,6 +53,16 @@ function spotifyFlagSave() { M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 }); } } +function aMusicFlagSave() { + var awk = $("[name=amw]:checked").val(); + if (awk == "yes") { + localStorage.setItem("complete-artwork", "yes"); + M.toast({ html: lang.lang_spotify_img, displayLength: 3000 }); + } else { + localStorage.removeItem("complete-artwork"); + M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 }); + } +} function nowplaying(mode) { if (mode == "spotify") { var start = "https://thedesk.top/now-playing?at=" + localStorage.getItem("spotify") + "&rt=" + localStorage.getItem("spotify-refresh"); @@ -139,7 +149,7 @@ async function npCore(arg) { } else if (platform == "darwin") { if (flag && arg.artwork) { media(arg.artwork, "image/png", "new"); - } else if (flag) { + } else if (flag && localStorage.getItem('complete-artwork')) { var q = arg.artist + ' ' + arg.album.name + ' ' + arg.name postMessage(["bmpImage", [await getUnknownAA(q), 0]], "*"); } diff --git a/app/view/make/language/en/setting.json b/app/view/make/language/en/setting.json index 32fb0243..028e78f3 100644 --- a/app/view/make/language/en/setting.json +++ b/app/view/make/language/en/setting.json @@ -173,6 +173,8 @@ "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}", "template3": "", "postartwork": "Attach an Artwork of Spotify", + "searchArtwork": "If the song has no artwork, automatic complete it(macOS)", + "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.", "tts": "TTS(text to speech) Preferences", "bouyomi": "BouyomiChan connect", "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin", diff --git a/app/view/make/language/ja-KS/setting.json b/app/view/make/language/ja-KS/setting.json index c49527a1..7c5d3df6 100644 --- a/app/view/make/language/ja-KS/setting.json +++ b/app/view/make/language/ja-KS/setting.json @@ -171,6 +171,8 @@ "template2": "macOS:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/作曲家{composer}/サンプルレート{hz}/ビットレート{bitRate}/ジャンル{genre}", "template3": "", "postartwork": "アルバムアートワークを付ける(Spotify)", + "searchArtwork": "アルバムアートワークが無い時補完する(macOS)", + "searchArtworkWarn": "アルバムアートワークが見つからん時には、APIを使うて適切やと推定されるアートワークをつけとくで。気に入らない場合はアップロード完了後にアルバムアートワークを副ボタンのクリック(右クリック)をしたら消せるで。", "tts": "読み上げの設定", "bouyomi": "棒読みちゃん連携", "bouyomiWarn": "「棒読みちゃん用のWebSocket受付プラグイン」が要るで。", diff --git a/app/view/make/language/ja/setting.json b/app/view/make/language/ja/setting.json index 89284559..94513901 100644 --- a/app/view/make/language/ja/setting.json +++ b/app/view/make/language/ja/setting.json @@ -172,7 +172,9 @@ "template1": "Spotify:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/{url}:各曲のSpotifyのURL", "template2": "macOS:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/作曲家{composer}/サンプルレート{hz}/ビットレート{bitRate}/ジャンル{genre}", "template3": "", - "postartwork": "アルバムアートワークを添付する(Spotify)", + "postartwork": "アルバムアートワークを添付する", + "searchArtwork": "アルバムアートワークが無い時補完する(macOS)", + "searchArtworkWarn": "アルバムアートワークが無い場合、APIを使用して適切だと推定されるアートワークを添付します。気に入らない場合はアップロード完了後にアルバムアートワークを副ボタンのクリック(右クリック)をして削除してください。", "tts": "読み上げの設定", "bouyomi": "棒読みちゃん連携", "bouyomiWarn": "「棒読みちゃん用のWebSocket受付プラグイン」が必要です。", diff --git a/app/view/make/setting.sample.html b/app/view/make/setting.sample.html index 7cd46b36..b73a6ff7 100644 --- a/app/view/make/setting.sample.html +++ b/app/view/make/setting.sample.html @@ -417,7 +417,18 @@ value="no" /> @@no@@ - +
@@searchArtwork@@
+ @@searchArtworkWarn@@
+ +
From bae2d84d81d64bfa85273d742e36cf43249f9d20 Mon Sep 17 00:00:00 2001 From: Cutls Date: Tue, 7 Apr 2020 14:58:55 +0900 Subject: [PATCH 9/9] New Crowdin translations (#261) * New translations setting.json (Russian) * New translations setting.json (Portuguese) * New translations setting.json (Romanian) * New translations setting.json (Portuguese, Brazilian) * New translations setting.json (Polish) * New translations setting.json (Norwegian) * New translations setting.json (Italian) * New translations setting.json (Serbian (Cyrillic)) * New translations setting.json (Vietnamese) * New translations setting.json (Ukrainian) * New translations setting.json (Turkish) * New translations setting.json (Swedish) * New translations setting.json (Spanish, Argentina) * New translations setting.json (Spanish) * New translations setting.json (Hungarian) * New translations setting.json (Chinese Traditional) * New translations setting.json (Chinese Simplified) * New translations setting.json (Catalan) * New translations setting.json (Bulgarian) * New translations setting.json (Arabic) * New translations setting.json (Afrikaans) * New translations setting.json (Czech) * New translations setting.json (Hebrew) * New translations setting.json (Greek) * New translations setting.json (German) * New translations setting.json (French) * New translations setting.json (Finnish) * New translations setting.json (Dutch) * New translations setting.json (Danish) * New translations setting.json (English) --- app/view/make/language/af-ZA/setting.json | 3 ++- app/view/make/language/ar-SA/setting.json | 3 ++- app/view/make/language/bg-BG/setting.json | 1 + app/view/make/language/ca-ES/setting.json | 3 ++- app/view/make/language/cs-CZ/setting.json | 1 + app/view/make/language/da-DK/setting.json | 3 ++- app/view/make/language/de-DE/setting.json | 1 + app/view/make/language/el-GR/setting.json | 3 ++- app/view/make/language/en-US/setting.json | 1 + app/view/make/language/es-AR/setting.json | 1 + app/view/make/language/es-ES/setting.json | 1 + app/view/make/language/fi-FI/setting.json | 3 ++- app/view/make/language/fr-FR/setting.json | 3 ++- app/view/make/language/he-IL/setting.json | 3 ++- app/view/make/language/hu-HU/setting.json | 3 ++- app/view/make/language/it-IT/setting.json | 3 ++- app/view/make/language/nl-NL/setting.json | 3 ++- app/view/make/language/no-NO/setting.json | 3 ++- app/view/make/language/pl-PL/setting.json | 3 ++- app/view/make/language/pt-BR/setting.json | 3 ++- app/view/make/language/pt-PT/setting.json | 3 ++- app/view/make/language/ro-RO/setting.json | 3 ++- app/view/make/language/ru-RU/setting.json | 1 + app/view/make/language/sr-SP/setting.json | 3 ++- app/view/make/language/sv-SE/setting.json | 3 ++- app/view/make/language/tr-TR/setting.json | 3 ++- app/view/make/language/uk-UA/setting.json | 3 ++- app/view/make/language/vi-VN/setting.json | 3 ++- app/view/make/language/zh-CN/setting.json | 1 + app/view/make/language/zh-TW/setting.json | 3 ++- 30 files changed, 52 insertions(+), 22 deletions(-) diff --git a/app/view/make/language/af-ZA/setting.json b/app/view/make/language/af-ZA/setting.json index e103afd9..602b7160 100644 --- a/app/view/make/language/af-ZA/setting.json +++ b/app/view/make/language/af-ZA/setting.json @@ -18,7 +18,7 @@ "hardwareAcceleration": "Disable hardware acceleration", "hardwareAccelerationWarn": "Auto restarted", "theme": "Themes", - "popup": "Popup notification(on Windows)", + "popup": "Popup notification", "popupwarn": "Hide to set \"0\"", "s": "sec", "nativenotf": "Native notification", @@ -38,6 +38,7 @@ "useragentWarn": "Restart when changed", "frame": "Window frame", "frameWarn": "If 'off', the window looks cool.", + "downloadWin": "Versioning(o Windows downloader)", "absolute": "absolute value", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.", diff --git a/app/view/make/language/ar-SA/setting.json b/app/view/make/language/ar-SA/setting.json index e103afd9..602b7160 100644 --- a/app/view/make/language/ar-SA/setting.json +++ b/app/view/make/language/ar-SA/setting.json @@ -18,7 +18,7 @@ "hardwareAcceleration": "Disable hardware acceleration", "hardwareAccelerationWarn": "Auto restarted", "theme": "Themes", - "popup": "Popup notification(on Windows)", + "popup": "Popup notification", "popupwarn": "Hide to set \"0\"", "s": "sec", "nativenotf": "Native notification", @@ -38,6 +38,7 @@ "useragentWarn": "Restart when changed", "frame": "Window frame", "frameWarn": "If 'off', the window looks cool.", + "downloadWin": "Versioning(o Windows downloader)", "absolute": "absolute value", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.", diff --git a/app/view/make/language/bg-BG/setting.json b/app/view/make/language/bg-BG/setting.json index ea06cd8c..956274bf 100644 --- a/app/view/make/language/bg-BG/setting.json +++ b/app/view/make/language/bg-BG/setting.json @@ -38,6 +38,7 @@ "useragentWarn": "Restart when changed", "frame": "Window frame", "frameWarn": "If 'off', the window looks cool.", + "downloadWin": "Versioning(o Windows downloader)", "absolute": "абсолютна стойност", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.", diff --git a/app/view/make/language/ca-ES/setting.json b/app/view/make/language/ca-ES/setting.json index e103afd9..602b7160 100644 --- a/app/view/make/language/ca-ES/setting.json +++ b/app/view/make/language/ca-ES/setting.json @@ -18,7 +18,7 @@ "hardwareAcceleration": "Disable hardware acceleration", "hardwareAccelerationWarn": "Auto restarted", "theme": "Themes", - "popup": "Popup notification(on Windows)", + "popup": "Popup notification", "popupwarn": "Hide to set \"0\"", "s": "sec", "nativenotf": "Native notification", @@ -38,6 +38,7 @@ "useragentWarn": "Restart when changed", "frame": "Window frame", "frameWarn": "If 'off', the window looks cool.", + "downloadWin": "Versioning(o Windows downloader)", "absolute": "absolute value", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.", diff --git a/app/view/make/language/cs-CZ/setting.json b/app/view/make/language/cs-CZ/setting.json index 27e80cd7..b6e71d73 100644 --- a/app/view/make/language/cs-CZ/setting.json +++ b/app/view/make/language/cs-CZ/setting.json @@ -38,6 +38,7 @@ "useragentWarn": "Restart when changed", "frame": "Window frame", "frameWarn": "If 'off', the window looks cool.", + "downloadWin": "Versioning(o Windows downloader)", "absolute": "absolutní hodnota", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.", diff --git a/app/view/make/language/da-DK/setting.json b/app/view/make/language/da-DK/setting.json index e103afd9..602b7160 100644 --- a/app/view/make/language/da-DK/setting.json +++ b/app/view/make/language/da-DK/setting.json @@ -18,7 +18,7 @@ "hardwareAcceleration": "Disable hardware acceleration", "hardwareAccelerationWarn": "Auto restarted", "theme": "Themes", - "popup": "Popup notification(on Windows)", + "popup": "Popup notification", "popupwarn": "Hide to set \"0\"", "s": "sec", "nativenotf": "Native notification", @@ -38,6 +38,7 @@ "useragentWarn": "Restart when changed", "frame": "Window frame", "frameWarn": "If 'off', the window looks cool.", + "downloadWin": "Versioning(o Windows downloader)", "absolute": "absolute value", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.", diff --git a/app/view/make/language/de-DE/setting.json b/app/view/make/language/de-DE/setting.json index 0345b099..4fa2916f 100644 --- a/app/view/make/language/de-DE/setting.json +++ b/app/view/make/language/de-DE/setting.json @@ -38,6 +38,7 @@ "useragentWarn": "Restart when changed", "frame": "Window frame", "frameWarn": "If 'off', the window looks cool.", + "downloadWin": "Versioning(o Windows downloader)", "absolute": "Absoluter Wert", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.", diff --git a/app/view/make/language/el-GR/setting.json b/app/view/make/language/el-GR/setting.json index e103afd9..602b7160 100644 --- a/app/view/make/language/el-GR/setting.json +++ b/app/view/make/language/el-GR/setting.json @@ -18,7 +18,7 @@ "hardwareAcceleration": "Disable hardware acceleration", "hardwareAccelerationWarn": "Auto restarted", "theme": "Themes", - "popup": "Popup notification(on Windows)", + "popup": "Popup notification", "popupwarn": "Hide to set \"0\"", "s": "sec", "nativenotf": "Native notification", @@ -38,6 +38,7 @@ "useragentWarn": "Restart when changed", "frame": "Window frame", "frameWarn": "If 'off', the window looks cool.", + "downloadWin": "Versioning(o Windows downloader)", "absolute": "absolute value", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.", diff --git a/app/view/make/language/en-US/setting.json b/app/view/make/language/en-US/setting.json index e20e169e..1bb11f62 100644 --- a/app/view/make/language/en-US/setting.json +++ b/app/view/make/language/en-US/setting.json @@ -38,6 +38,7 @@ "useragentWarn": "crwdns4374:0crwdne4374:0", "frame": "crwdns4462:0crwdne4462:0", "frameWarn": "crwdns4464:0crwdne4464:0", + "downloadWin": "crwdns4470:0crwdne4470:0", "absolute": "crwdns3972:0crwdne3972:0", "srcUrl": "crwdns4455:0crwdne4455:0", "srcUrlWarn": "crwdns4457:0{q}crwdne4457:0", diff --git a/app/view/make/language/es-AR/setting.json b/app/view/make/language/es-AR/setting.json index ab9ba9b5..f51b1f2c 100644 --- a/app/view/make/language/es-AR/setting.json +++ b/app/view/make/language/es-AR/setting.json @@ -38,6 +38,7 @@ "useragentWarn": "Reiniciar cuando se cambie", "frame": "Window frame", "frameWarn": "If 'off', the window looks cool.", + "downloadWin": "Versioning(o Windows downloader)", "absolute": "valor absoluto", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.", diff --git a/app/view/make/language/es-ES/setting.json b/app/view/make/language/es-ES/setting.json index 4aa9fba4..e200efc5 100644 --- a/app/view/make/language/es-ES/setting.json +++ b/app/view/make/language/es-ES/setting.json @@ -38,6 +38,7 @@ "useragentWarn": "Reiniciar al cambiar", "frame": "Window frame", "frameWarn": "If 'off', the window looks cool.", + "downloadWin": "Versioning(o Windows downloader)", "absolute": "valor absoluto", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.", diff --git a/app/view/make/language/fi-FI/setting.json b/app/view/make/language/fi-FI/setting.json index e103afd9..602b7160 100644 --- a/app/view/make/language/fi-FI/setting.json +++ b/app/view/make/language/fi-FI/setting.json @@ -18,7 +18,7 @@ "hardwareAcceleration": "Disable hardware acceleration", "hardwareAccelerationWarn": "Auto restarted", "theme": "Themes", - "popup": "Popup notification(on Windows)", + "popup": "Popup notification", "popupwarn": "Hide to set \"0\"", "s": "sec", "nativenotf": "Native notification", @@ -38,6 +38,7 @@ "useragentWarn": "Restart when changed", "frame": "Window frame", "frameWarn": "If 'off', the window looks cool.", + "downloadWin": "Versioning(o Windows downloader)", "absolute": "absolute value", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.", diff --git a/app/view/make/language/fr-FR/setting.json b/app/view/make/language/fr-FR/setting.json index e9c92178..67a1cce0 100644 --- a/app/view/make/language/fr-FR/setting.json +++ b/app/view/make/language/fr-FR/setting.json @@ -18,7 +18,7 @@ "hardwareAcceleration": "Disable hardware acceleration", "hardwareAccelerationWarn": "Auto restarted", "theme": "Thèmes", - "popup": "Popup notification(on Windows)", + "popup": "Popup notification", "popupwarn": "Hide to set \"0\"", "s": "sec", "nativenotf": "Native notification", @@ -38,6 +38,7 @@ "useragentWarn": "Restart when changed", "frame": "Window frame", "frameWarn": "If 'off', the window looks cool.", + "downloadWin": "Versioning(o Windows downloader)", "absolute": "absolute value", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.", diff --git a/app/view/make/language/he-IL/setting.json b/app/view/make/language/he-IL/setting.json index e103afd9..602b7160 100644 --- a/app/view/make/language/he-IL/setting.json +++ b/app/view/make/language/he-IL/setting.json @@ -18,7 +18,7 @@ "hardwareAcceleration": "Disable hardware acceleration", "hardwareAccelerationWarn": "Auto restarted", "theme": "Themes", - "popup": "Popup notification(on Windows)", + "popup": "Popup notification", "popupwarn": "Hide to set \"0\"", "s": "sec", "nativenotf": "Native notification", @@ -38,6 +38,7 @@ "useragentWarn": "Restart when changed", "frame": "Window frame", "frameWarn": "If 'off', the window looks cool.", + "downloadWin": "Versioning(o Windows downloader)", "absolute": "absolute value", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.", diff --git a/app/view/make/language/hu-HU/setting.json b/app/view/make/language/hu-HU/setting.json index e103afd9..602b7160 100644 --- a/app/view/make/language/hu-HU/setting.json +++ b/app/view/make/language/hu-HU/setting.json @@ -18,7 +18,7 @@ "hardwareAcceleration": "Disable hardware acceleration", "hardwareAccelerationWarn": "Auto restarted", "theme": "Themes", - "popup": "Popup notification(on Windows)", + "popup": "Popup notification", "popupwarn": "Hide to set \"0\"", "s": "sec", "nativenotf": "Native notification", @@ -38,6 +38,7 @@ "useragentWarn": "Restart when changed", "frame": "Window frame", "frameWarn": "If 'off', the window looks cool.", + "downloadWin": "Versioning(o Windows downloader)", "absolute": "absolute value", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.", diff --git a/app/view/make/language/it-IT/setting.json b/app/view/make/language/it-IT/setting.json index e103afd9..602b7160 100644 --- a/app/view/make/language/it-IT/setting.json +++ b/app/view/make/language/it-IT/setting.json @@ -18,7 +18,7 @@ "hardwareAcceleration": "Disable hardware acceleration", "hardwareAccelerationWarn": "Auto restarted", "theme": "Themes", - "popup": "Popup notification(on Windows)", + "popup": "Popup notification", "popupwarn": "Hide to set \"0\"", "s": "sec", "nativenotf": "Native notification", @@ -38,6 +38,7 @@ "useragentWarn": "Restart when changed", "frame": "Window frame", "frameWarn": "If 'off', the window looks cool.", + "downloadWin": "Versioning(o Windows downloader)", "absolute": "absolute value", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.", diff --git a/app/view/make/language/nl-NL/setting.json b/app/view/make/language/nl-NL/setting.json index e103afd9..602b7160 100644 --- a/app/view/make/language/nl-NL/setting.json +++ b/app/view/make/language/nl-NL/setting.json @@ -18,7 +18,7 @@ "hardwareAcceleration": "Disable hardware acceleration", "hardwareAccelerationWarn": "Auto restarted", "theme": "Themes", - "popup": "Popup notification(on Windows)", + "popup": "Popup notification", "popupwarn": "Hide to set \"0\"", "s": "sec", "nativenotf": "Native notification", @@ -38,6 +38,7 @@ "useragentWarn": "Restart when changed", "frame": "Window frame", "frameWarn": "If 'off', the window looks cool.", + "downloadWin": "Versioning(o Windows downloader)", "absolute": "absolute value", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.", diff --git a/app/view/make/language/no-NO/setting.json b/app/view/make/language/no-NO/setting.json index d7e588d5..013449d8 100644 --- a/app/view/make/language/no-NO/setting.json +++ b/app/view/make/language/no-NO/setting.json @@ -18,7 +18,7 @@ "hardwareAcceleration": "Slå av maskinvareakselerasjon", "hardwareAccelerationWarn": "Auto restarted", "theme": "Temaer", - "popup": "Popup notification(on Windows)", + "popup": "Popup notification", "popupwarn": "Hide to set \"0\"", "s": "sec", "nativenotf": "Native notification", @@ -38,6 +38,7 @@ "useragentWarn": "Restart when changed", "frame": "Window frame", "frameWarn": "If 'off', the window looks cool.", + "downloadWin": "Versioning(o Windows downloader)", "absolute": "absolute value", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.", diff --git a/app/view/make/language/pl-PL/setting.json b/app/view/make/language/pl-PL/setting.json index e103afd9..602b7160 100644 --- a/app/view/make/language/pl-PL/setting.json +++ b/app/view/make/language/pl-PL/setting.json @@ -18,7 +18,7 @@ "hardwareAcceleration": "Disable hardware acceleration", "hardwareAccelerationWarn": "Auto restarted", "theme": "Themes", - "popup": "Popup notification(on Windows)", + "popup": "Popup notification", "popupwarn": "Hide to set \"0\"", "s": "sec", "nativenotf": "Native notification", @@ -38,6 +38,7 @@ "useragentWarn": "Restart when changed", "frame": "Window frame", "frameWarn": "If 'off', the window looks cool.", + "downloadWin": "Versioning(o Windows downloader)", "absolute": "absolute value", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.", diff --git a/app/view/make/language/pt-BR/setting.json b/app/view/make/language/pt-BR/setting.json index e103afd9..602b7160 100644 --- a/app/view/make/language/pt-BR/setting.json +++ b/app/view/make/language/pt-BR/setting.json @@ -18,7 +18,7 @@ "hardwareAcceleration": "Disable hardware acceleration", "hardwareAccelerationWarn": "Auto restarted", "theme": "Themes", - "popup": "Popup notification(on Windows)", + "popup": "Popup notification", "popupwarn": "Hide to set \"0\"", "s": "sec", "nativenotf": "Native notification", @@ -38,6 +38,7 @@ "useragentWarn": "Restart when changed", "frame": "Window frame", "frameWarn": "If 'off', the window looks cool.", + "downloadWin": "Versioning(o Windows downloader)", "absolute": "absolute value", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.", diff --git a/app/view/make/language/pt-PT/setting.json b/app/view/make/language/pt-PT/setting.json index e103afd9..602b7160 100644 --- a/app/view/make/language/pt-PT/setting.json +++ b/app/view/make/language/pt-PT/setting.json @@ -18,7 +18,7 @@ "hardwareAcceleration": "Disable hardware acceleration", "hardwareAccelerationWarn": "Auto restarted", "theme": "Themes", - "popup": "Popup notification(on Windows)", + "popup": "Popup notification", "popupwarn": "Hide to set \"0\"", "s": "sec", "nativenotf": "Native notification", @@ -38,6 +38,7 @@ "useragentWarn": "Restart when changed", "frame": "Window frame", "frameWarn": "If 'off', the window looks cool.", + "downloadWin": "Versioning(o Windows downloader)", "absolute": "absolute value", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.", diff --git a/app/view/make/language/ro-RO/setting.json b/app/view/make/language/ro-RO/setting.json index e103afd9..602b7160 100644 --- a/app/view/make/language/ro-RO/setting.json +++ b/app/view/make/language/ro-RO/setting.json @@ -18,7 +18,7 @@ "hardwareAcceleration": "Disable hardware acceleration", "hardwareAccelerationWarn": "Auto restarted", "theme": "Themes", - "popup": "Popup notification(on Windows)", + "popup": "Popup notification", "popupwarn": "Hide to set \"0\"", "s": "sec", "nativenotf": "Native notification", @@ -38,6 +38,7 @@ "useragentWarn": "Restart when changed", "frame": "Window frame", "frameWarn": "If 'off', the window looks cool.", + "downloadWin": "Versioning(o Windows downloader)", "absolute": "absolute value", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.", diff --git a/app/view/make/language/ru-RU/setting.json b/app/view/make/language/ru-RU/setting.json index a806d452..9a744a0c 100644 --- a/app/view/make/language/ru-RU/setting.json +++ b/app/view/make/language/ru-RU/setting.json @@ -38,6 +38,7 @@ "useragentWarn": "Перезапустить, когда изменилось", "frame": "Window frame", "frameWarn": "If 'off', the window looks cool.", + "downloadWin": "Versioning(o Windows downloader)", "absolute": "абсолютное значение", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.", diff --git a/app/view/make/language/sr-SP/setting.json b/app/view/make/language/sr-SP/setting.json index e103afd9..602b7160 100644 --- a/app/view/make/language/sr-SP/setting.json +++ b/app/view/make/language/sr-SP/setting.json @@ -18,7 +18,7 @@ "hardwareAcceleration": "Disable hardware acceleration", "hardwareAccelerationWarn": "Auto restarted", "theme": "Themes", - "popup": "Popup notification(on Windows)", + "popup": "Popup notification", "popupwarn": "Hide to set \"0\"", "s": "sec", "nativenotf": "Native notification", @@ -38,6 +38,7 @@ "useragentWarn": "Restart when changed", "frame": "Window frame", "frameWarn": "If 'off', the window looks cool.", + "downloadWin": "Versioning(o Windows downloader)", "absolute": "absolute value", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.", diff --git a/app/view/make/language/sv-SE/setting.json b/app/view/make/language/sv-SE/setting.json index e103afd9..602b7160 100644 --- a/app/view/make/language/sv-SE/setting.json +++ b/app/view/make/language/sv-SE/setting.json @@ -18,7 +18,7 @@ "hardwareAcceleration": "Disable hardware acceleration", "hardwareAccelerationWarn": "Auto restarted", "theme": "Themes", - "popup": "Popup notification(on Windows)", + "popup": "Popup notification", "popupwarn": "Hide to set \"0\"", "s": "sec", "nativenotf": "Native notification", @@ -38,6 +38,7 @@ "useragentWarn": "Restart when changed", "frame": "Window frame", "frameWarn": "If 'off', the window looks cool.", + "downloadWin": "Versioning(o Windows downloader)", "absolute": "absolute value", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.", diff --git a/app/view/make/language/tr-TR/setting.json b/app/view/make/language/tr-TR/setting.json index e103afd9..602b7160 100644 --- a/app/view/make/language/tr-TR/setting.json +++ b/app/view/make/language/tr-TR/setting.json @@ -18,7 +18,7 @@ "hardwareAcceleration": "Disable hardware acceleration", "hardwareAccelerationWarn": "Auto restarted", "theme": "Themes", - "popup": "Popup notification(on Windows)", + "popup": "Popup notification", "popupwarn": "Hide to set \"0\"", "s": "sec", "nativenotf": "Native notification", @@ -38,6 +38,7 @@ "useragentWarn": "Restart when changed", "frame": "Window frame", "frameWarn": "If 'off', the window looks cool.", + "downloadWin": "Versioning(o Windows downloader)", "absolute": "absolute value", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.", diff --git a/app/view/make/language/uk-UA/setting.json b/app/view/make/language/uk-UA/setting.json index e103afd9..602b7160 100644 --- a/app/view/make/language/uk-UA/setting.json +++ b/app/view/make/language/uk-UA/setting.json @@ -18,7 +18,7 @@ "hardwareAcceleration": "Disable hardware acceleration", "hardwareAccelerationWarn": "Auto restarted", "theme": "Themes", - "popup": "Popup notification(on Windows)", + "popup": "Popup notification", "popupwarn": "Hide to set \"0\"", "s": "sec", "nativenotf": "Native notification", @@ -38,6 +38,7 @@ "useragentWarn": "Restart when changed", "frame": "Window frame", "frameWarn": "If 'off', the window looks cool.", + "downloadWin": "Versioning(o Windows downloader)", "absolute": "absolute value", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.", diff --git a/app/view/make/language/vi-VN/setting.json b/app/view/make/language/vi-VN/setting.json index e103afd9..602b7160 100644 --- a/app/view/make/language/vi-VN/setting.json +++ b/app/view/make/language/vi-VN/setting.json @@ -18,7 +18,7 @@ "hardwareAcceleration": "Disable hardware acceleration", "hardwareAccelerationWarn": "Auto restarted", "theme": "Themes", - "popup": "Popup notification(on Windows)", + "popup": "Popup notification", "popupwarn": "Hide to set \"0\"", "s": "sec", "nativenotf": "Native notification", @@ -38,6 +38,7 @@ "useragentWarn": "Restart when changed", "frame": "Window frame", "frameWarn": "If 'off', the window looks cool.", + "downloadWin": "Versioning(o Windows downloader)", "absolute": "absolute value", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.", diff --git a/app/view/make/language/zh-CN/setting.json b/app/view/make/language/zh-CN/setting.json index bb9afd50..4dbe15e2 100644 --- a/app/view/make/language/zh-CN/setting.json +++ b/app/view/make/language/zh-CN/setting.json @@ -38,6 +38,7 @@ "useragentWarn": "Restart when changed", "frame": "Window frame", "frameWarn": "If 'off', the window looks cool.", + "downloadWin": "Versioning(o Windows downloader)", "absolute": "absolute value", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.", diff --git a/app/view/make/language/zh-TW/setting.json b/app/view/make/language/zh-TW/setting.json index e103afd9..602b7160 100644 --- a/app/view/make/language/zh-TW/setting.json +++ b/app/view/make/language/zh-TW/setting.json @@ -18,7 +18,7 @@ "hardwareAcceleration": "Disable hardware acceleration", "hardwareAccelerationWarn": "Auto restarted", "theme": "Themes", - "popup": "Popup notification(on Windows)", + "popup": "Popup notification", "popupwarn": "Hide to set \"0\"", "s": "sec", "nativenotf": "Native notification", @@ -38,6 +38,7 @@ "useragentWarn": "Restart when changed", "frame": "Window frame", "frameWarn": "If 'off', the window looks cool.", + "downloadWin": "Versioning(o Windows downloader)", "absolute": "absolute value", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.",