Merge pull request #7519 from barlik/master

Clarify that automatic subtitles are generated.
This commit is contained in:
Sergey M 2015-11-19 22:44:08 +06:00
commit f270cf1a26
3 changed files with 4 additions and 4 deletions

View file

@ -329,8 +329,8 @@ ## Video Format Options:
## Subtitle Options: ## Subtitle Options:
--write-sub Write subtitle file --write-sub Write subtitle file
--write-auto-sub Write automatic subtitle file (YouTube --write-auto-sub Write automatically generated subtitle file
only) (YouTube only)
--all-subs Download all the available subtitles of the --all-subs Download all the available subtitles of the
video video
--list-subs List all available subtitles for the video --list-subs List all available subtitles for the video

View file

@ -156,7 +156,7 @@ class YoutubeDL(object):
writethumbnail: Write the thumbnail image to a file writethumbnail: Write the thumbnail image to a file
write_all_thumbnails: Write all thumbnail formats to files write_all_thumbnails: Write all thumbnail formats to files
writesubtitles: Write the video subtitles to a file writesubtitles: Write the video subtitles to a file
writeautomaticsub: Write the automatic subtitles to a file writeautomaticsub: Write the automatically generated subtitles to a file
allsubtitles: Downloads all the subtitles of the video allsubtitles: Downloads all the subtitles of the video
(requires writesubtitles or writeautomaticsub) (requires writesubtitles or writeautomaticsub)
listsubtitles: Lists all available subtitles for the video listsubtitles: Lists all available subtitles for the video

View file

@ -363,7 +363,7 @@ def _hide_login_info(opts):
subtitles.add_option( subtitles.add_option(
'--write-auto-sub', '--write-automatic-sub', '--write-auto-sub', '--write-automatic-sub',
action='store_true', dest='writeautomaticsub', default=False, action='store_true', dest='writeautomaticsub', default=False,
help='Write automatic subtitle file (YouTube only)') help='Write automatically generated subtitle file (YouTube only)')
subtitles.add_option( subtitles.add_option(
'--all-subs', '--all-subs',
action='store_true', dest='allsubtitles', default=False, action='store_true', dest='allsubtitles', default=False,