From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 15 Oct 2013 02:52:07 +0000 (+0200)
Subject: Merge remote-tracking branch 'alphapapa/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=f219743e33a9a640bfc3845d74282774e51e1ad4

Merge remote-tracking branch 'alphapapa/master'
---

f219743e33a9a640bfc3845d74282774e51e1ad4
diff --cc youtube_dl/__init__.py
index 5248a92c7,250cf62f8..472ae9c0c
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@@ -245,29 -185,30 +245,29 @@@ def parseOpts(overrideArguments=None)
              action='store', dest='format_limit', metavar='FORMAT', help='highest quality format to download')
      video_format.add_option('-F', '--list-formats',
              action='store_true', dest='listformats', help='list all available formats (currently youtube only)')
 -    video_format.add_option('--write-sub', '--write-srt',
 +
 +    subtitles.add_option('--write-sub', '--write-srt',
              action='store_true', dest='writesubtitles',
 -            help='write subtitle file (currently youtube only)', default=False)
 -    video_format.add_option('--write-auto-sub', '--write-automatic-sub',
 +            help='write subtitle file', default=False)
 +    subtitles.add_option('--write-auto-sub', '--write-automatic-sub',
              action='store_true', dest='writeautomaticsub',
 -            help='write automatic subtitle file (currently youtube only)', default=False)
 -    video_format.add_option('--only-sub',
 -            action='store_true', dest='skip_download',
 -            help='[deprecated] alias of --skip-download', default=False)
 -    video_format.add_option('--all-subs',
 +            help='write automatic subtitle file (youtube only)', default=False)
 +    subtitles.add_option('--all-subs',
              action='store_true', dest='allsubtitles',
 -            help='downloads all the available subtitles of the video (currently youtube only)', default=False)
 -    video_format.add_option('--list-subs',
 +            help='downloads all the available subtitles of the video', default=False)
 +    subtitles.add_option('--list-subs',
              action='store_true', dest='listsubtitles',
 -            help='lists all available subtitles for the video (currently youtube only)', default=False)
 -    video_format.add_option('--sub-format',
 +            help='lists all available subtitles for the video', default=False)
 +    subtitles.add_option('--sub-format',
              action='store', dest='subtitlesformat', metavar='FORMAT',
 -            help='subtitle format [srt/sbv/vtt] (default=srt) (currently youtube only)', default='srt')
 -    video_format.add_option('--sub-lang', '--srt-lang',
 -            action='store', dest='subtitleslang', metavar='LANG',
 -            help='language of the subtitles to download (optional) use IETF language tags like \'en\'')
 +            help='subtitle format (default=srt) ([sbv/vtt] youtube only)', default='srt')
 +    subtitles.add_option('--sub-lang', '--sub-langs', '--srt-lang',
 +            action='callback', dest='subtitleslangs', metavar='LANGS', type='str',
 +            default=[], callback=_comma_separated_values_options_callback,
 +            help='languages of the subtitles to download (optional) separated by commas, use IETF language tags like \'en,pt\'')
  
      downloader.add_option('-r', '--rate-limit',
-             dest='ratelimit', metavar='LIMIT', help='maximum download rate (e.g. 50k or 44.6m)')
+             dest='ratelimit', metavar='LIMIT', help='maximum download rate in bytes per second (e.g. 50k or 44.6m)')
      downloader.add_option('-R', '--retries',
              dest='retries', metavar='RETRIES', help='number of retries (default is %default)', default=10)
      downloader.add_option('--buffer-size',