Skip to content

Commit 5a1dda8

Browse files
MarmadileManteaterMarmadileManteater
committed
Merge branch 'FreeTubeApp:development' into development
This is an automated nightly publish.
2 parents 70c1c03 + 1f28340 commit 5a1dda8

File tree

7 files changed

+55
-45
lines changed

7 files changed

+55
-45
lines changed

‎.babelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"@babel/env",
55
{
66
"targets": {
7-
"chrome": "96",
7+
"chrome": "104",
88
"node": 16
99
}
1010
}

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"copy-webpack-plugin": "^9.0.1",
9797
"cordova": "^11.0.0",
9898
"css-loader": "5.2.6",
99-
"electron": "^16.2.7",
99+
"electron": "^20.1.0",
100100
"electron-builder": "^23.0.3",
101101
"electron-builder-squirrel-windows": "^22.13.1",
102102
"electron-debug": "^3.2.0",

‎static/locales/en_GB.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ Settings:
166166
System Default: 'System Default'
167167
Light: 'Light'
168168
Dracula: 'Dracula'
169+
Catppuccin Mocha: Catppuccin Mocha
169170
Main Color Theme:
170171
Main Color Theme: 'Main colour theme'
171172
Red: 'Red'
@@ -191,6 +192,20 @@ Settings:
191192
Dracula Purple: 'Dracula Purple'
192193
Dracula Red: 'Dracula Red'
193194
Dracula Yellow: 'Dracula Yellow'
195+
Catppuccin Mocha Pink: Catppuccin Mocha Pink
196+
Catppuccin Mocha Sapphire: Catppuccin Mocha Sapphire
197+
Catppuccin Mocha Maroon: Catppuccin Mocha Maroon
198+
Catppuccin Mocha Mauve: Catppuccin Mocha Mauve
199+
Catppuccin Mocha Lavender: Catppuccin Mocha Lavender
200+
Catppuccin Mocha Blue: Catppuccin Mocha Blue
201+
Catppuccin Mocha Sky: Catppuccin Mocha Sky
202+
Catppuccin Mocha Teal: Catppuccin Mocha Teal
203+
Catppuccin Mocha Peach: Catppuccin Mocha Peach
204+
Catppuccin Mocha Red: Catppuccin Mocha Red
205+
Catppuccin Mocha Rosewater: Catppuccin Mocha Rosewater
206+
Catppuccin Mocha Flamingo: Catppuccin Mocha Flamingo
207+
Catppuccin Mocha Green: Catppuccin Mocha Green
208+
Catppuccin Mocha Yellow: Catppuccin Mocha Yellow
194209
Secondary Color Theme: 'Secondary Colour Theme'
195210
#* Main Color Theme
196211
UI Scale: UI Scale
@@ -254,6 +269,9 @@ Settings:
254269
Ignore Unsupported Action Warnings: Ignore Unsupported Action Warnings
255270
Custom External Player Executable: Custom External Player Executable
256271
Custom External Player Arguments: Custom External Player Arguments
272+
Players:
273+
None:
274+
Name: None
257275
Privacy Settings:
258276
Privacy Settings: 'Privacy Settings'
259277
Remember History: 'Remember History'

‎static/locales/fil.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,3 +447,6 @@ Canceled next video autoplay: ''
447447

448448
Yes: ''
449449
No: ''
450+
Download From Site: I-download mula sa website
451+
Open New Window: buksan ang bagong window
452+
New Window: bagong window

‎static/locales/pt.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,9 @@ Settings:
411411
Ignore Unsupported Action Warnings: Ignorar avisos sobre ações inválidas
412412
External Player: Leitor externo
413413
External Player Settings: Definições para leitores de vídeo externos
414+
Players:
415+
None:
416+
Name: Nenhum
414417
The app needs to restart for changes to take effect. Restart and apply change?: A
415418
aplicação precisa de reiniciar para que as alterações façam efeito. Reiniciar
416419
e aplicar as alterações?

‎static/locales/ru.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,7 @@ Comments:
723723
Load More Comments: 'Загрузить больше комментариев'
724724
There are no more comments for this video: К этому видео больше нет комментариев
725725
No more comments available: Больше комментариев нет
726-
Newest first: Сначала новые
726+
Newest first: Новым
727727
Top comments: Лучшим комментариям
728728
Sort by: Упорядочивать по
729729
Show More Replies: Показать больше ответов

‎yarn.lock

Lines changed: 28 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -913,7 +913,7 @@
913913
resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
914914
integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
915915

916-
"@electron/get@^1.13.0":
916+
"@electron/get@^1.14.1":
917917
version "1.14.1"
918918
resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz#16ba75f02dffb74c23965e72d617adc721d27f40"
919919
integrity sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw==
@@ -1312,10 +1312,10 @@
13121312
resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.33.tgz#3c1879b276dc63e73030bb91165e62a4509cd506"
13131313
integrity sha512-miWq2m2FiQZmaHfdZNcbpp9PuXg34W5JZ5CrJ/BaS70VuhoJENBEQybeiYSaPBRNq6KQGnjfEnc/F3PN++D+XQ==
13141314

1315-
"@types/node@^14.6.2":
1316-
version "14.18.18"
1317-
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.18.tgz#5c9503030df484ccffcbb935ea9a9e1d6fad1a20"
1318-
integrity sha512-B9EoJFjhqcQ9OmQrNorItO+OwEOORNn3S31WuiHvZY/dm9ajkB7AKD/8toessEtHHNL+58jofbq7hMMY9v4yig==
1315+
"@types/node@^16.11.26":
1316+
version "16.11.45"
1317+
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.45.tgz#155b13a33c665ef2b136f7f245fa525da419e810"
1318+
integrity sha512-3rKg/L5x0rofKuuUt5zlXzOnKyIHXmIu5R8A0TuNDMF2062/AOIDBciFIjToLEJ/9F9DzkHNot+BpNsMI1OLdQ==
13191319

13201320
"@types/plist@^3.0.1":
13211321
version "3.0.2"
@@ -1386,6 +1386,13 @@
13861386
dependencies:
13871387
"@types/yargs-parser" "*"
13881388

1389+
"@types/yauzl@^2.9.1":
1390+
version "2.10.0"
1391+
resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz#b3248295276cf8c6f153ebe6a9aba0c988cb2599"
1392+
integrity sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==
1393+
dependencies:
1394+
"@types/node" "*"
1395+
13891396
"@videojs/[email protected]":
13901397
version "2.13.1"
13911398
resolved "https://registry.yarnpkg.com/@videojs/http-streaming/-/http-streaming-2.13.1.tgz#b7688d91eec969181430e00868b514b16b3b21b7"
@@ -2526,16 +2533,6 @@ [email protected]:
25262533
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
25272534
integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
25282535

2529-
concat-stream@^1.6.2:
2530-
version "1.6.2"
2531-
resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
2532-
integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
2533-
dependencies:
2534-
buffer-from "^1.0.0"
2535-
inherits "^2.0.3"
2536-
readable-stream "^2.2.2"
2537-
typedarray "^0.0.6"
2538-
25392536
config-chain@^1.1.11:
25402537
version "1.1.13"
25412538
resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"
@@ -3108,14 +3105,14 @@ electron-to-chromium@^1.4.118:
31083105
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz#186180a45617283f1c012284458510cd99d6787f"
31093106
integrity sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==
31103107

3111-
electron@^16.2.7:
3112-
version "16.2.7"
3113-
resolved "https://registry.yarnpkg.com/electron/-/electron-16.2.7.tgz#945e35ad1625e604f10c124fb912d1e2b3018317"
3114-
integrity sha512-aZKF3b00+rqW/HGs8lJM5DhPNj+mOfCuhLSiFXV6J9dQCIRhctJTmToOrwXfbCxvXK8as8eQTNl5uSfnHmH6tA==
3108+
electron@^20.1.0:
3109+
version "20.1.0"
3110+
resolved "https://registry.yarnpkg.com/electron/-/electron-20.1.0.tgz#2de079adc551dadc21f11d12a37c70873b9ffb40"
3111+
integrity sha512-gzl6fdZe5g0qmzCC6Ejxa1Oa8eqUSxs4+QLtrM7SyEVp+mEPJAOoDe0xD8ayRQqeXTBxLK1LFrKtc4c98iufsg==
31153112
dependencies:
3116-
"@electron/get" "^1.13.0"
3117-
"@types/node" "^14.6.2"
3118-
extract-zip "^1.0.3"
3113+
"@electron/get" "^1.14.1"
3114+
"@types/node" "^16.11.26"
3115+
extract-zip "^2.0.1"
31193116

31203117
emoji-regex@^8.0.0:
31213118
version "8.0.0"
@@ -3558,15 +3555,16 @@ extend@~3.0.2:
35583555
resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
35593556
integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
35603557

3561-
extract-zip@^1.0.3:
3562-
version "1.7.0"
3563-
resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927"
3564-
integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==
3558+
extract-zip@^2.0.1:
3559+
version "2.0.1"
3560+
resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
3561+
integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==
35653562
dependencies:
3566-
concat-stream "^1.6.2"
3567-
debug "^2.6.9"
3568-
mkdirp "^0.5.4"
3563+
debug "^4.1.1"
3564+
get-stream "^5.1.0"
35693565
yauzl "^2.10.0"
3566+
optionalDependencies:
3567+
"@types/yauzl" "^2.9.1"
35703568

35713569
[email protected]:
35723570
version "1.3.0"
@@ -5147,13 +5145,6 @@ minimist@^1.2.0, minimist@^1.2.6:
51475145
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
51485146
integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
51495147

5150-
mkdirp@^0.5.4:
5151-
version "0.5.6"
5152-
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
5153-
integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
5154-
dependencies:
5155-
minimist "^1.2.6"
5156-
51575148
modify-filename@^1.1.0:
51585149
version "1.1.0"
51595150
resolved "https://registry.yarnpkg.com/modify-filename/-/modify-filename-1.1.0.tgz#9a2dec83806fbb2d975f22beec859ca26b393aa1"
@@ -5843,7 +5834,7 @@ read-pkg@^3.0.0:
58435834
normalize-package-data "^2.3.2"
58445835
path-type "^3.0.0"
58455836

5846-
readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.5, readable-stream@^2.2.2:
5837+
readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.5:
58475838
version "2.3.7"
58485839
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
58495840
integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -6855,11 +6846,6 @@ typedarray-to-buffer@^3.1.5:
68556846
dependencies:
68566847
is-typedarray "^1.0.0"
68576848

6858-
typedarray@^0.0.6:
6859-
version "0.0.6"
6860-
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
6861-
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
6862-
68636849
unbox-primitive@^1.0.2:
68646850
version "1.0.2"
68656851
resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"

0 commit comments

Comments
 (0)