]> jfr.im git - yt-dlp.git/log
yt-dlp.git
3 years agomerge ytdl-master
Unknown [Mon, 14 Sep 2020 10:50:56 +0000 (12:50 +0200)] 
merge ytdl-master

3 years agoMerge pull request #105 from JensTimmerman/patch-3
Tom-Oliver Heidel [Mon, 14 Sep 2020 05:20:25 +0000 (07:20 +0200)] 
Merge pull request #105 from JensTimmerman/patch-3

Update README.md

3 years agorelease 2020.09.14
Sergey M․ [Sun, 13 Sep 2020 20:37:36 +0000 (03:37 +0700)] 
release 2020.09.14

3 years ago[ChangeLog] Actualize
Sergey M․ [Sun, 13 Sep 2020 20:35:18 +0000 (03:35 +0700)] 
[ChangeLog] Actualize
[ci skip]

3 years ago[postprocessor/embedthumbnail] Fix issues (closes #25717)
Sergey M․ [Sun, 13 Sep 2020 20:28:31 +0000 (03:28 +0700)] 
[postprocessor/embedthumbnail] Fix issues (closes #25717)
* Fix WebP with wrong extension processing
* Fix embedding of thumbnails with % character in path

3 years ago[postprocessor/embedthumbnail] Add support for non jpeg/png thumbnails (closes #25687)
Alex Merkel [Thu, 18 Jun 2020 20:36:44 +0000 (22:36 +0200)] 
[postprocessor/embedthumbnail] Add support for non jpeg/png thumbnails (closes #25687)

3 years agoUpdate README.md
Jens Timmerman [Sun, 13 Sep 2020 15:39:53 +0000 (17:39 +0200)] 
Update README.md

3 years ago[rtlnl] Extend _VALID_URL for new embed URL schema
Sergey M․ [Sun, 13 Sep 2020 14:42:06 +0000 (21:42 +0700)] 
[rtlnl] Extend _VALID_URL for new embed URL schema

3 years ago[rtlnl] Extend _VALID_URL (#26549) (closes #25821)
Derek Land [Sun, 13 Sep 2020 14:38:16 +0000 (16:38 +0200)] 
[rtlnl] Extend _VALID_URL (#26549) (closes #25821)

3 years ago[youtube] Fix empty description extraction (#26575) (closes #26006)
Daniel Peukert [Sun, 13 Sep 2020 14:23:21 +0000 (16:23 +0200)] 
[youtube] Fix empty description extraction (#26575) (closes #26006)

3 years ago[srgssr] Extend _VALID_URL (closes #26555, closes #26556, closes #26578)
Sergey M․ [Sun, 13 Sep 2020 14:07:25 +0000 (21:07 +0700)] 
[srgssr] Extend _VALID_URL (closes #26555, closes #26556, closes #26578)

3 years ago[googledrive] Use redirect URLs for source format (closes #18877, closes #23919,...
Sergey M․ [Sun, 13 Sep 2020 13:43:50 +0000 (20:43 +0700)] 
[googledrive] Use redirect URLs for source format (closes #18877, closes #23919, closes #24689, closes #26565)

3 years agoMerge pull request #102 from blackjack4494/gdcvault-fix
Tom-Oliver Heidel [Sun, 13 Sep 2020 13:22:33 +0000 (15:22 +0200)] 
Merge pull request #102 from blackjack4494/gdcvault-fix

[gdcvault] fix extractor

3 years agoflake8
Unknown [Sun, 13 Sep 2020 13:21:59 +0000 (15:21 +0200)] 
flake8

3 years ago[skip travis] bump version
Unknown [Sun, 13 Sep 2020 13:16:38 +0000 (15:16 +0200)] 
[skip travis] bump version

3 years ago[svtplay] Fix id extraction (closes #26576)
Sergey M․ [Sun, 13 Sep 2020 11:59:37 +0000 (18:59 +0700)] 
[svtplay] Fix id extraction (closes #26576)

3 years agoMerge pull request #96 from blackjack4494/kakao-new-apis
Tom-Oliver Heidel [Sun, 13 Sep 2020 10:47:12 +0000 (12:47 +0200)] 
Merge pull request #96 from blackjack4494/kakao-new-apis

[kakao] new apis

3 years agoMerge pull request #95 from blackjack4494/daserste-ndr
Tom-Oliver Heidel [Sun, 13 Sep 2020 10:36:17 +0000 (12:36 +0200)] 
Merge pull request #95 from blackjack4494/daserste-ndr

[ndr] support Daserste ndr

3 years ago[kakao] new apis
Unknown [Sun, 13 Sep 2020 10:31:36 +0000 (12:31 +0200)] 
[kakao] new apis

there are also ageLimit and GeoBlock attributes provided by api_json if needed

3 years ago[redbulltv] improve support for rebull.com TV localized URLS(#22063)
Remita Amine [Sun, 13 Sep 2020 10:26:11 +0000 (11:26 +0100)] 
[redbulltv] improve support for rebull.com TV localized URLS(#22063)

3 years agoMerge pull request #94 from blackjack4494/conv_subs_when_skipped
Tom-Oliver Heidel [Sun, 13 Sep 2020 09:17:11 +0000 (11:17 +0200)] 
Merge pull request #94 from blackjack4494/conv_subs_when_skipped

[youtube] Convert subs when download is skipped

3 years agoflake8
Unknown [Sun, 13 Sep 2020 09:08:02 +0000 (11:08 +0200)] 
flake8

3 years ago[youtube] convert subtitles with --skip-download
Unknown [Sun, 13 Sep 2020 09:03:48 +0000 (11:03 +0200)] 
[youtube] convert subtitles with --skip-download

3 years agoadd json3 back but don't use it as default.
Unknown [Sun, 13 Sep 2020 09:02:07 +0000 (11:02 +0200)] 
add json3 back but don't use it as default.

3 years agoexclude json3 for now
Unknown [Sun, 13 Sep 2020 07:22:24 +0000 (09:22 +0200)] 
exclude json3 for now

3 years ago[gdcvault] fix extractor
Unknown [Sat, 12 Sep 2020 23:04:02 +0000 (01:04 +0200)] 
[gdcvault] fix extractor

at least when not logged in?

3 years ago[skip travis] create faq.md
Tom-Oliver Heidel [Sat, 12 Sep 2020 22:47:45 +0000 (00:47 +0200)] 
[skip travis] create faq.md

how to redirect to another extractor

3 years ago[redbulltv] Add support for new redbull.com TV URLs(closes #22037)(closes #22063)
Remita Amine [Sat, 12 Sep 2020 18:20:53 +0000 (19:20 +0100)] 
[redbulltv] Add support for new redbull.com TV URLs(closes #22037)(closes #22063)

3 years ago[soundcloud] Reduce pagination limit to fix 502 Bad Gateway errors when listing a...
tfvlrue [Sat, 12 Sep 2020 09:35:11 +0000 (05:35 -0400)] 
[soundcloud] Reduce pagination limit to fix 502 Bad Gateway errors when listing a user's tracks. (#26557)

Per the documentation here https://developers.soundcloud.com/blog/offset-pagination-deprecated the maximum limit is 200, so let's respect that (even if a higher value sometimes works).

Co-authored-by: tfvlrue <tfvlrue>
3 years ago[skip travis] update supportedsites and make_win.bat
Unknown [Sat, 12 Sep 2020 06:22:59 +0000 (08:22 +0200)] 
[skip travis] update supportedsites and make_win.bat

3 years ago[skip travis] bump version
Unknown [Sat, 12 Sep 2020 04:17:02 +0000 (06:17 +0200)] 
[skip travis] bump version

3 years agoMerge branch 'skyme5-tiktok'
Tom-Oliver Heidel [Sat, 12 Sep 2020 03:51:27 +0000 (05:51 +0200)] 
Merge branch 'skyme5-tiktok'

3 years agoMerge branch 'tiktok' of https://github.com/skyme5/youtube-dl into skyme5-tiktok
Tom-Oliver Heidel [Sat, 12 Sep 2020 03:49:52 +0000 (05:49 +0200)] 
Merge branch 'tiktok' of https://github.com/skyme5/youtube-dl into skyme5-tiktok

3 years agoMerge branch 'lkho-pr/duboku'
Tom-Oliver Heidel [Sat, 12 Sep 2020 03:47:29 +0000 (05:47 +0200)] 
Merge branch 'lkho-pr/duboku'

3 years agoMerge branch 'pr/duboku' of https://github.com/lkho/youtube-dl into lkho-pr/duboku
Tom-Oliver Heidel [Sat, 12 Sep 2020 03:47:27 +0000 (05:47 +0200)] 
Merge branch 'pr/duboku' of https://github.com/lkho/youtube-dl into lkho-pr/duboku

3 years agoMerge branch 'hugohaa-alura'
Tom-Oliver Heidel [Sat, 12 Sep 2020 03:38:48 +0000 (05:38 +0200)] 
Merge branch 'hugohaa-alura'

3 years agoMerge branch 'alura' of https://github.com/hugohaa/youtube-dl into hugohaa-alura
Tom-Oliver Heidel [Sat, 12 Sep 2020 03:38:44 +0000 (05:38 +0200)] 
Merge branch 'alura' of https://github.com/hugohaa/youtube-dl into hugohaa-alura

3 years agoMerge branch 'adrianheine-26564'
Tom-Oliver Heidel [Sat, 12 Sep 2020 03:37:12 +0000 (05:37 +0200)] 
Merge branch 'adrianheine-26564'

3 years agoMerge branch '26564' of https://github.com/adrianheine/youtube-dl into adrianheine...
Tom-Oliver Heidel [Sat, 12 Sep 2020 03:37:08 +0000 (05:37 +0200)] 
Merge branch '26564' of https://github.com/adrianheine/youtube-dl into adrianheine-26564

3 years agoMerge branch 'ddland-master'
Tom-Oliver Heidel [Sat, 12 Sep 2020 03:35:10 +0000 (05:35 +0200)] 
Merge branch 'ddland-master'

3 years agoMerge branch 'master' of https://github.com/ddland/youtube-dl into ddland-master
Tom-Oliver Heidel [Sat, 12 Sep 2020 03:34:59 +0000 (05:34 +0200)] 
Merge branch 'master' of https://github.com/ddland/youtube-dl into ddland-master

3 years agoMerge branch 'nixxo-patch-2'
Tom-Oliver Heidel [Sat, 12 Sep 2020 03:33:31 +0000 (05:33 +0200)] 
Merge branch 'nixxo-patch-2'

3 years agoMerge branch 'patch-2' of https://github.com/nixxo/youtube-dl into nixxo-patch-2
Tom-Oliver Heidel [Sat, 12 Sep 2020 03:33:16 +0000 (05:33 +0200)] 
Merge branch 'patch-2' of https://github.com/nixxo/youtube-dl into nixxo-patch-2

3 years agoMerge remote-tracking branch 'origin/master'
Unknown [Sat, 12 Sep 2020 03:22:29 +0000 (05:22 +0200)] 
Merge remote-tracking branch 'origin/master'

3 years agoMerge branch 'fonkap-myvideo_ge'
Tom-Oliver Heidel [Sat, 12 Sep 2020 03:22:16 +0000 (05:22 +0200)] 
Merge branch 'fonkap-myvideo_ge'

3 years agoMerge branch 'myvideo_ge' of https://github.com/fonkap/youtube-dl into fonkap-myvideo_ge
Tom-Oliver Heidel [Sat, 12 Sep 2020 03:22:08 +0000 (05:22 +0200)] 
Merge branch 'myvideo_ge' of https://github.com/fonkap/youtube-dl into fonkap-myvideo_ge

3 years agoMerge pull request #69 from blackjack4494/viki-subtitles_and_more
Tom-Oliver Heidel [Sat, 12 Sep 2020 03:21:46 +0000 (05:21 +0200)] 
Merge pull request #69 from blackjack4494/viki-subtitles_and_more

[Viki] subtitles, formats

3 years agoMerge branch 'iamleot-rai-update'
Tom-Oliver Heidel [Sat, 12 Sep 2020 03:12:24 +0000 (05:12 +0200)] 
Merge branch 'iamleot-rai-update'

3 years agoMerge branch 'rai-update' of https://github.com/iamleot/youtube-dl into iamleot-rai...
Tom-Oliver Heidel [Sat, 12 Sep 2020 03:12:19 +0000 (05:12 +0200)] 
Merge branch 'rai-update' of https://github.com/iamleot/youtube-dl into iamleot-rai-update

3 years agoMerge branch 'JensTimmerman-JensTimmerman-patch-1'
Tom-Oliver Heidel [Sat, 12 Sep 2020 03:10:59 +0000 (05:10 +0200)] 
Merge branch 'JensTimmerman-JensTimmerman-patch-1'

3 years agoMerge branch 'JensTimmerman-patch-1' of https://github.com/JensTimmerman/youtube...
Tom-Oliver Heidel [Sat, 12 Sep 2020 03:10:55 +0000 (05:10 +0200)] 
Merge branch 'JensTimmerman-patch-1' of https://github.com/JensTimmerman/youtube-dl into JensTimmerman-JensTimmerman-patch-1

3 years agoMerge branch 'ytdl-org-master'
Unknown [Sat, 12 Sep 2020 03:08:57 +0000 (05:08 +0200)] 
Merge branch 'ytdl-org-master'

3 years agoMerge branch 'legraphista-fix/google-drive-cookie-issue'
Tom-Oliver Heidel [Sat, 12 Sep 2020 03:02:18 +0000 (05:02 +0200)] 
Merge branch 'legraphista-fix/google-drive-cookie-issue'

3 years agoMerge branch 'fix/google-drive-cookie-issue' of https://github.com/legraphista/youtub...
Tom-Oliver Heidel [Sat, 12 Sep 2020 03:02:08 +0000 (05:02 +0200)] 
Merge branch 'fix/google-drive-cookie-issue' of https://github.com/legraphista/youtube-dl into legraphista-fix/google-drive-cookie-issue

3 years ago[soundcloud] flake8
Unknown [Fri, 11 Sep 2020 23:17:16 +0000 (01:17 +0200)] 
[soundcloud] flake8

3 years ago[ndr-daserste] flake8
Unknown [Fri, 11 Sep 2020 23:12:39 +0000 (01:12 +0200)] 
[ndr-daserste] flake8

3 years ago[bitchute] Fix error for geoblocking
Adrian Heine [Fri, 11 Sep 2020 21:31:44 +0000 (23:31 +0200)] 
[bitchute] Fix error for geoblocking

Closes #26564.

3 years ago[daserste-ndr] dirty workaround
Unknown [Fri, 11 Sep 2020 01:20:44 +0000 (03:20 +0200)] 
[daserste-ndr] dirty workaround

what a mess..

3 years ago[viki] subtitles, formats
Unknown [Wed, 9 Sep 2020 19:20:13 +0000 (21:20 +0200)] 
[viki] subtitles, formats

3 years ago[soundcloud] playlist limit per page according to official docs
Unknown [Wed, 9 Sep 2020 16:24:20 +0000 (18:24 +0200)] 
[soundcloud] playlist limit per page according to official docs

https://github.com/ytdl-org/youtube-dl/pull/26557

3 years ago[duboku] change ext to mp4
lkho [Tue, 8 Sep 2020 19:15:08 +0000 (03:15 +0800)] 
[duboku] change ext to mp4

3 years agoMerge branch 'adrianheine-rutv'
Tom-Oliver Heidel [Tue, 8 Sep 2020 17:28:58 +0000 (19:28 +0200)] 
Merge branch 'adrianheine-rutv'

3 years agoMerge branch 'rutv' of https://github.com/adrianheine/youtube-dl into adrianheine...
Tom-Oliver Heidel [Tue, 8 Sep 2020 16:58:19 +0000 (18:58 +0200)] 
Merge branch 'rutv' of https://github.com/adrianheine/youtube-dl into adrianheine-rutv

3 years agoMerge branch 'adrianheine-magenta'
Tom-Oliver Heidel [Tue, 8 Sep 2020 16:49:48 +0000 (18:49 +0200)] 
Merge branch 'adrianheine-magenta'

3 years agoMerge branch 'magenta' of https://github.com/adrianheine/youtube-dl into adrianheine...
Tom-Oliver Heidel [Tue, 8 Sep 2020 16:49:11 +0000 (18:49 +0200)] 
Merge branch 'magenta' of https://github.com/adrianheine/youtube-dl into adrianheine-magenta

3 years agoMerge branch 'martin54-ard.py_add_playlist_support'
Tom-Oliver Heidel [Tue, 8 Sep 2020 16:31:57 +0000 (18:31 +0200)] 
Merge branch 'martin54-ard.py_add_playlist_support'

3 years agoMerge branch 'ard.py_add_playlist_support' of https://github.com/martin54/youtube...
Tom-Oliver Heidel [Tue, 8 Sep 2020 16:31:53 +0000 (18:31 +0200)] 
Merge branch 'ard.py_add_playlist_support' of https://github.com/martin54/youtube-dl into martin54-ard.py_add_playlist_support

3 years ago[skip travis] add gitter and license badge
Tom-Oliver Heidel [Tue, 8 Sep 2020 16:02:04 +0000 (18:02 +0200)] 
[skip travis] add gitter and license badge

3 years agoremoved trailing whitespace
Derek Land [Tue, 8 Sep 2020 11:32:46 +0000 (13:32 +0200)] 
removed trailing whitespace

3 years agowith old url pattern intact
Derek Land [Tue, 8 Sep 2020 11:14:16 +0000 (13:14 +0200)] 
with old url pattern intact

3 years agofixed change in rtl.nl url pattern
Derek Land [Tue, 8 Sep 2020 11:09:21 +0000 (13:09 +0200)] 
fixed change in rtl.nl url pattern

3 years ago[duboku] add referer header
lkho [Mon, 7 Sep 2020 13:03:39 +0000 (21:03 +0800)] 
[duboku] add referer header

3 years ago[mailru] fixed extraction
nixxo [Mon, 7 Sep 2020 12:21:21 +0000 (14:21 +0200)] 
[mailru] fixed extraction

improved valid_url regex to match more urls like
>https://my.mail.ru/mail/7bw7/video/embed/_myvideo/6778
>https://videoapi.my.mail.ru/videos/embed/mail/7bw7/_myvideo/6778.html
previously not matched.

Fixed json extraction to download metadata and video url.

3 years agorelease 2020.09.06
Sergey M․ [Sun, 6 Sep 2020 06:00:41 +0000 (13:00 +0700)] 
release 2020.09.06

3 years ago[ChangeLog] Actualize
Sergey M․ [Sun, 6 Sep 2020 05:57:56 +0000 (12:57 +0700)] 
[ChangeLog] Actualize
[ci skip]

3 years ago[nrktv:episode] Improve video id extraction (closes #25594, closes #26369, closes...
Sergey M․ [Sun, 6 Sep 2020 05:42:57 +0000 (12:42 +0700)] 
[nrktv:episode] Improve video id extraction (closes #25594, closes #26369, closes #26409)

3 years ago[skip travis] bump version
Unknown [Sun, 6 Sep 2020 05:36:49 +0000 (07:36 +0200)] 
[skip travis] bump version

3 years ago[youtube] Fix age gate content detection (#26100) (closes #26152, closes #26311,...
random-nick [Sun, 6 Sep 2020 04:44:53 +0000 (04:44 +0000)] 
[youtube] Fix age gate content detection (#26100) (closes #26152, closes #26311, closes #26384)

3 years ago[youtube:user] Extend _VALID_URL (closes #26443)
Sergey M․ [Sun, 6 Sep 2020 04:31:28 +0000 (11:31 +0700)] 
[youtube:user] Extend _VALID_URL (closes #26443)

3 years ago[skip travis] exe related
Unknown [Sun, 6 Sep 2020 04:20:23 +0000 (06:20 +0200)] 
[skip travis] exe related

3 years ago[utils] Recognize wav mimetype (closes #26463)
Sergey M․ [Sun, 6 Sep 2020 04:19:53 +0000 (11:19 +0700)] 
[utils] Recognize wav mimetype (closes #26463)

3 years ago[xhamster] Improve initials regex (#26526) (closes #26353)
TheRealDude2 [Sun, 6 Sep 2020 04:10:27 +0000 (06:10 +0200)] 
[xhamster] Improve initials regex (#26526) (closes #26353)

3 years ago[svtplay] Fix svt id extraction (closes #26425, closes #26428, closes #26438)
Sergey M․ [Sun, 6 Sep 2020 03:45:57 +0000 (10:45 +0700)] 
[svtplay] Fix svt id extraction (closes #26425, closes #26428, closes #26438)

3 years ago[twitch] Rework extractors (closes #12297, closes #20414, closes #20604, closes ...
Sergey M․ [Sun, 6 Sep 2020 03:45:34 +0000 (10:45 +0700)] 
[twitch] Rework extractors (closes #12297, closes #20414, closes #20604, closes #21811, closes #21812, closes #22979, closes #24263, closes #25010, closes #25553, closes #25606)

* Switch to GraphQL.
+ Add support for collections.
+ Add support for clips and collections playlists.

3 years agoMerge branch 'julien-hadleyjack-ondemandkorea'
Tom-Oliver Heidel [Sun, 6 Sep 2020 02:02:47 +0000 (04:02 +0200)] 
Merge branch 'julien-hadleyjack-ondemandkorea'

3 years agoMerge branch 'ondemandkorea' of https://github.com/julien-hadleyjack/youtube-dl into...
Tom-Oliver Heidel [Sun, 6 Sep 2020 02:02:43 +0000 (04:02 +0200)] 
Merge branch 'ondemandkorea' of https://github.com/julien-hadleyjack/youtube-dl into julien-hadleyjack-ondemandkorea

3 years agoflake8 fix + soundcloud tests
Unknown [Sun, 6 Sep 2020 00:57:08 +0000 (02:57 +0200)] 
flake8 fix + soundcloud tests

3 years agoMerge branch 'MrDoritos-mkvthumbnail'
Tom-Oliver Heidel [Sun, 6 Sep 2020 00:43:42 +0000 (02:43 +0200)] 
Merge branch 'MrDoritos-mkvthumbnail'

3 years agoMerge branch 'mkvthumbnail' of https://github.com/MrDoritos/youtube-dl into MrDoritos...
Tom-Oliver Heidel [Sun, 6 Sep 2020 00:43:37 +0000 (02:43 +0200)] 
Merge branch 'mkvthumbnail' of https://github.com/MrDoritos/youtube-dl into MrDoritos-mkvthumbnail

3 years agoMerge branch 'adrianheine-abc'
Tom-Oliver Heidel [Sun, 6 Sep 2020 00:39:08 +0000 (02:39 +0200)] 
Merge branch 'adrianheine-abc'

3 years agoMerge branch 'abc' of https://github.com/adrianheine/youtube-dl into adrianheine-abc
Tom-Oliver Heidel [Sun, 6 Sep 2020 00:39:04 +0000 (02:39 +0200)] 
Merge branch 'abc' of https://github.com/adrianheine/youtube-dl into adrianheine-abc

3 years agoMerge remote-tracking branch 'origin/master'
Unknown [Sun, 6 Sep 2020 00:37:51 +0000 (02:37 +0200)] 
Merge remote-tracking branch 'origin/master'

3 years agoMerge pull request #48 from theincognito-inc/master
Tom-Oliver Heidel [Sun, 6 Sep 2020 00:28:53 +0000 (02:28 +0200)] 
Merge pull request #48 from theincognito-inc/master

[hotstar] Move to API v1

3 years agoMerge branch 'zubearc'
Tom-Oliver Heidel [Sat, 5 Sep 2020 23:52:42 +0000 (01:52 +0200)] 
Merge branch 'zubearc'

3 years agoMerge branch 'master' of https://github.com/zubearc/youtube-dl into zubearc
Tom-Oliver Heidel [Sat, 5 Sep 2020 23:52:20 +0000 (01:52 +0200)] 
Merge branch 'master' of https://github.com/zubearc/youtube-dl into zubearc

3 years ago[test/youtube] update subtitle tests
zubearc [Sat, 5 Sep 2020 21:54:19 +0000 (17:54 -0400)] 
[test/youtube] update subtitle tests

3 years ago[hotstar] Move to API v1
NotFound [Thu, 28 May 2020 14:22:25 +0000 (19:22 +0500)] 
[hotstar] Move to API v1

3 years agoMerge branch 'LucBerge-deezer'
Tom-Oliver Heidel [Sat, 5 Sep 2020 17:40:03 +0000 (19:40 +0200)] 
Merge branch 'LucBerge-deezer'

3 years agoMerge branch 'deezer' of https://github.com/LucBerge/youtube-dl into LucBerge-deezer
Tom-Oliver Heidel [Sat, 5 Sep 2020 17:40:01 +0000 (19:40 +0200)] 
Merge branch 'deezer' of https://github.com/LucBerge/youtube-dl into LucBerge-deezer

3 years agoMerge branch 'mrtnmtth-wdr-subtitles'
Tom-Oliver Heidel [Sat, 5 Sep 2020 17:37:47 +0000 (19:37 +0200)] 
Merge branch 'mrtnmtth-wdr-subtitles'