v5.11.9

fix: remove sourcemaps from the output (#3710 )
Source Maps, while nice, aren't perfect and the ones we were outputting weren't right. Fixes #3701, #3106.
2016-10-25 18:14:29 +00:00 · 2016-10-24 21:08:41 -04:00 · 2016-10-24 18:25:46 -04:00 · 2016-10-17 18:35:59 +00:00 · 2016-10-17 14:13:38 -04:00 · 2016-09-28 18:40:33 +00:00
@@ -28,3 +28,5 @@ test/coverage/*
 .sass-cache

 dist/*
+
+.idea/
@@ -24,6 +24,8 @@
        "exports",
        "process",

+        "DOMException",
+
        "q",
        "asyncTest",
        "deepEqual",
@@ -23,3 +23,5 @@ sudo: false
 cache:
  directories:
    - node_modules
+addons:
+  firefox: latest
@@ -2,6 +2,261 @@ CHANGELOG
 =========

 ## HEAD (Unreleased)
+_(none)_
+
+--------------------
+
+## 5.11.9 (2016-10-25)
+* greenkeeper updated karma dependencies ([view](https://github.com/videojs/video.js/pull/3523))
+* update to latest uglify to fix preserve comments issue. Disable screw ie8 option. ([view](https://github.com/videojs/video.js/pull/3709))
+* remove sourcemap generation ([view](https://github.com/videojs/video.js/pull/3710))
+
+## 5.11.8 (2016-10-17)
+* @misteroneill restore timeupdate/loadedmetadata listeners for duration display ([view](https://github.com/videojs/video.js/pull/3682))
+
+## 5.11.7 (2016-09-28)
+* @gkatsev checked throwIfWhitespace first in hasElClass ([view](https://github.com/videojs/video.js/pull/3640))
+* @misteroneill pinned grunt-contrib-uglify to ~0.11 to pin uglify to ~2.6 ([view](https://github.com/videojs/video.js/pull/3634))
+* @gkatsev set playerId on new el created for movingMediaElementInDOM. Fixes #3283 ([view](https://github.com/videojs/video.js/pull/3648))
+
+## 5.11.6 (2016-08-25)
+* @imbcmdth Added exception handling to event dispatcher ([view](https://github.com/videojs/video.js/pull/3580))
+
+## 5.11.5 (2016-08-25)
+* @misteroneill fixed wrapping native and emulated MediaErrors ([view](https://github.com/videojs/video.js/pull/3562))
+* @snyderizer fixed switching between audio tracks. Fixes #3510 ([view](https://github.com/videojs/video.js/pull/3538))
+* @jbarabander added title attribute to audio button. Fixes #3528 ([view](https://github.com/videojs/video.js/pull/3565))
+* @misteroneill fixed IE8 media error test failure ([view](https://github.com/videojs/video.js/pull/3568))
+
+## 5.11.4 (2016-08-16)
+_(none)_
+
+## 5.11.3 (2016-08-15)
+* @vdeshpande fixed control text for fullscreen button ([view](https://github.com/videojs/video.js/pull/3485))
+* @mister-ben fixed android treating swipe as a tap ([view](https://github.com/videojs/video.js/pull/3514))
+* @mboles updated duration() method documentation ([view](https://github.com/videojs/video.js/pull/3515))
+* @mister-ben silenced chrome's play() request was interrupted by pause() error ([view](https://github.com/videojs/video.js/pull/3518))
+
+## 5.11.2 (2016-08-09)
+_(none)_
+
+## 5.11.1 (2016-08-08)
+* @vxsx fixed legend selector to be more specific. Fixes #3492 ([view](https://github.com/videojs/video.js/pull/3494))
+
+## 5.11.0 (2016-07-22)
+* @BrandonOCasey Document audio/video track usage ([view](https://github.com/videojs/video.js/pull/3295))
+* @hartman Correct documentation to refer to nativeTextTracks option ([view](https://github.com/videojs/video.js/pull/3309))
+* @nickygerritsen Also pass tech options to canHandleSource ([view](https://github.com/videojs/video.js/pull/3303))
+* @misteroneill Un-deprecate the videojs.players property ([view](https://github.com/videojs/video.js/pull/3299))
+* @nickygerritsen Add title to all clickable components ([view](https://github.com/videojs/video.js/pull/3296))
+* @nickygerritsen Update Dutch language file ([view](https://github.com/videojs/video.js/pull/3297))
+* @hartman Add descriptions and audio button to adaptive classes ([view](https://github.com/videojs/video.js/pull/3312))
+* @MattiasBuelens Retain details from tech error ([view](https://github.com/videojs/video.js/pull/3313))
+* @nickygerritsen Fix test for tooltips in IE8 ([view](https://github.com/videojs/video.js/pull/3327))
+* @mboles added loadstart event to jsdoc ([view](https://github.com/videojs/video.js/pull/3370))
+* @hartman added default print styling ([view](https://github.com/videojs/video.js/pull/3304))
+* @ldayananda updated videojs to not do anything if no src is set ([view](https://github.com/videojs/video.js/pull/3378))
+* @nickygerritsen removed unused tracks when changing sources. Fixes #3000 ([view](https://github.com/videojs/video.js/pull/3002))
+* @vit-koumar updated Flash tech to return Infinity from duration instead of -1 ([view](https://github.com/videojs/video.js/pull/3128))
+* @alex-phillips added ontextdata to Flash tech ([view](https://github.com/videojs/video.js/pull/2748))
+* @MattiasBuelens updated components to use durationchange only ([view](https://github.com/videojs/video.js/pull/3349))
+* @misteroneill improved Logging for IE < 11 ([view](https://github.com/videojs/video.js/pull/3356))
+* @vdeshpande updated control text of modal dialog ([view](https://github.com/videojs/video.js/pull/3400))
+* @ldayananda fixed mouse handling on menus by using mouseleave over mouseout ([view](https://github.com/videojs/video.js/pull/3404))
+* @mister-ben updated language to inherit correctly and respect the attribute on the player ([view](https://github.com/videojs/video.js/pull/3426))
+* @sashyro fixed nativeControlsForTouch option ([view](https://github.com/videojs/video.js/pull/3410))
+* @tbasse fixed techCall null check against tech ([view](https://github.com/videojs/video.js/pull/2676))
+* @rbran100 checked src and currentSrc in handleTechReady to work around mixed content issues in chrome ([view](https://github.com/videojs/video.js/pull/3287))
+* @OwenEdwards fixed caption settings dialog labels for accessibility ([view](https://github.com/videojs/video.js/pull/3281))
+* @OwenEdwards removed spurious head tags in the simple-embed example ([view](https://github.com/videojs/video.js/pull/3438))
+* @ntadej added a null check to errorDisplay usage ([view](https://github.com/videojs/video.js/pull/3440))
+* @misteroneill fixed logging issues on IE by separating fn.apply and stringify checks ([view](https://github.com/videojs/video.js/pull/3444))
+* @misteroneill fixed npm test from running coveralls locally ([view](https://github.com/videojs/video.js/pull/3449))
+* @gkatsev added es6-shim to tests. Fixes Flash duration test ([view](https://github.com/videojs/video.js/pull/3453))
+* @misteroneill corrects test assertions for older IEs in the log module ([view](https://github.com/videojs/video.js/pull/3454))
+* @gkatsev fixed setting lang by looping through loop element variable and not constant tag ([view](https://github.com/videojs/video.js/pull/3455))
+
+## 5.10.8 (2016-08-08)
+* @gkatsev re-published to make sure that the audio button has css
+
+## 5.10.7 (2016-06-27)
+* @gkatsev pinned node-sass to 3.4 ([view](https://github.com/videojs/video.js/pull/3401))
+* @mister-ben added try catch to volume and playbackrate checks. Fixes #3315 ([view](https://github.com/videojs/video.js/pull/3320))
+* @m14t removed unused loadEvent property in ControlBar options ([view](https://github.com/videojs/video.js/pull/3363))
+* @bklava updated pt-BR language file ([view](https://github.com/videojs/video.js/pull/3373))
+* @mister-ben updated menus to use default videojs font-family ([view](https://github.com/videojs/video.js/pull/3384))
+* @vdeshpande fixed chapters getting duplicated each time a track is loaded ([view](https://github.com/videojs/video.js/pull/3354))
+
+## 5.10.6 (2016-06-20)
+* @gkatsev fix not fully minified video.min.js file.
+
+## 5.10.5 (2016-06-07)
+* @gkatsev pinned dependencies to direct versions ([view](https://github.com/videojs/video.js/pull/3338))
+* @gkatsev fixed minified vjs in ie8 when initialized with id string ([view](https://github.com/videojs/video.js/pull/3357))
+* @IJsLauw fixed unhandled exception in deleting poster on ios7 ([view](https://github.com/videojs/video.js/pull/3337))
+
+## 5.10.4 (2016-05-31)
+* Patch release to fix dist on npm
+
+## 5.10.3 (2016-05-27)
+* @BrandonOCasey fixed source handlers being disposed multiple times when a video is put into the video element directly ([view](https://github.com/videojs/video.js/pull/3343))
+
+## 5.10.2 (2016-05-12)
+* @gkatsev nulled out currentSource_ in setSource ([view](https://github.com/videojs/video.js/pull/3314))
+
+## 5.10.1 (2016-05-03)
+* @nickygerritsen Pass tech options to source handlers ([view](https://github.com/videojs/video.js/pull/3245))
+* @gkatsev Use fonts 2.0 that do not require wrapping codepoints ([view](https://github.com/videojs/video.js/pull/3252))
+* @chrisauclair Make controls visible for accessibility reasons ([view](https://github.com/videojs/video.js/pull/3237))
+* @gkatsev updated text track documentation and crossorigin warning. Fixes #1888, #1958, #2628, #3202 ([view](https://github.com/videojs/video.js/pull/3256))
+* @BrandonOCasey added audio and video track support ([view](https://github.com/videojs/video.js/pull/3173))
+* @OwenEdwards added language attribute in HTML files for accessibility ([view](https://github.com/videojs/video.js/pull/3257))
+* @incompl clear currentSource_ after subsequent loadstarts ([view](https://github.com/videojs/video.js/pull/3285))
+* @forbesjo add an audio track selector menu button ([view](https://github.com/videojs/video.js/pull/3223))
+
+## 5.9.2 (2016-04-19)
+* @gkatsev grouped text track errors in the console, if we can ([view](https://github.com/videojs/video.js/pull/3259))
+
+## 5.9.1 (2016-04-19)
+* @benjipott updated IS_CHROME to not be true on MS Edge ([view](https://github.com/videojs/video.js/pull/3232))
+* @mister-ben blacklisted Chrome for Android for playback rate support ([view](https://github.com/videojs/video.js/pull/3246))
+* @gkatsev made the first emulated text track enabled by default ([view](https://github.com/videojs/video.js/pull/3248))
+* @gkatsev fixed removeRemoteTextTracks not working with return value from addRemoteTextTracks ([view](https://github.com/videojs/video.js/pull/3253))
+* @forbesjo added back the background color to the poster ([view](https://github.com/videojs/video.js/pull/3267))
+* @gkatsev fixed text track tests for older IEs ([view](https://github.com/videojs/video.js/pull/3269))
+
+## 5.9.0 (2016-04-05)
+* @gkatsev updated vjs to not add dynamic styles when VIDEOJS_NO_DYNAMIC_STYLE is set ([view](https://github.com/videojs/video.js/pull/3093))
+* @OwenEdwards added basic descriptions track support ([view](https://github.com/videojs/video.js/pull/3098))
+* @kamilbrenk Added lang
+* @arius28 added greek translation file (el.json) ([view](https://github.com/videojs/video.js/pull/3185))
+* @ricardosiri68 changed the relative sass paths ([view](https://github.com/videojs/video.js/pull/3147))
+* @gkatsev added an option to keep the tooltips inside the player bounds ([view](https://github.com/videojs/video.js/pull/3149))
+* @defli added currentWidth and currentHeight methods to the player ([view](https://github.com/videojs/video.js/pull/3144))
+* fix IE8 tests for VIDEOJS_NO_DYNAMIC_STYLE ([view](https://github.com/videojs/video.js/pull/3215))
+* @OwenEdwards fixed links adding extra tab stop with IE by removing anchor tags on videojs init ([view](https://github.com/videojs/video.js/pull/3194))
+* @scaryguy updated videojs cdn urls in the README ([view](https://github.com/videojs/video.js/pull/3195))
+* @mister-ben updated the time tooltips to use the chosen font family ([view](https://github.com/videojs/video.js/pull/3213))
+* @OwenEdwards improved handling of deprecated use of Button component ([view](https://github.com/videojs/video.js/pull/3236))
+* @forbesjo added chrome for PR tests ([view](https://github.com/videojs/video.js/pull/3235))
+* @MCGallaspy added vttjs to the self-hosting guide ([view](https://github.com/videojs/video.js/pull/3229))
+* @chrisauclair added ARIA region and label to player element ([view](https://github.com/videojs/video.js/pull/3227))
+* @andyearnshaw updated document event handlers to use el.ownerDocument ([view](https://github.com/videojs/video.js/pull/3230))
+
+## 5.8.8 (2016-04-04)
+* @vtytar fixed auto-setup failing if taking too long to load ([view](http://github.com/videojs/video.js/pull/3233))
+* @seescode fixed css failing on IE8 due to incorrect ie8 hack ([view](http://github.com/videojs/video.js/pull/3226))
+* @seescode fixed dragging on mute toggle changing the volume ([view](http://github.com/videojs/video.js/pull/3228))
+
+## 5.8.7 (2016-03-29)
+* @llun fixed menus from throwing when focused when empty ([view](https://github.com/videojs/video.js/pull/3218))
+* @mister-ben added dir=ltr to control bar and loading spinner ([view](https://github.com/videojs/video.js/pull/3221))
+* @avreg fixed notSupportedMessage saying video when meaning media ([view](https://github.com/videojs/video.js/pull/3222))
+* @mister-ben fixed missing native HTML5 tracks ([view](https://github.com/videojs/video.js/pull/3212))
+* @mister-ben updated Arabic language files ([view](https://github.com/videojs/video.js/pull/3225))
+
+## 5.8.6 (2016-03-25)
+* @misteroneill fixed typo and indenting in language files ([view](https://github.com/videojs/video.js/pull/3207))
+
+## 5.8.5 (2016-03-17)
+* @gkatsev cleared vttjs script handlers on dispose. Fixed tests ([view](https://github.com/videojs/video.js/pull/3189))
+
+## 5.8.4 (2016-03-17)
+* @gkatsev changed emulated tracks to in novtt to wait for vttjs to load or error before parsing ([view](https://github.com/videojs/video.js/pull/3181))
+
+## 5.8.3 (2016-03-10)
+* @gkatsev fixed keyboard control of menus with titles. Fixes #3164 ([view](https://github.com/videojs/video.js/pull/3165))
+
+## 5.8.2 (2016-03-09)
+* @gkatsev fixed chapters menu. Fixes #3062 ([view](https://github.com/videojs/video.js/pull/3163))
+
+## 5.8.1 (2016-03-07)
+* @gkatsev updated videojs badges in the README ([view](https://github.com/videojs/video.js/pull/3134))
+* @BrandonOCasey converted remaining text-track modules to ES6 ([view](https://github.com/videojs/video.js/pull/3130))
+* @gkatsev cleared waiting/spinner on timeupdate. Fixes #3124 ([view](https://github.com/videojs/video.js/pull/3138))
+* @BrandonOCasey updated text track unit tests to use full es6 syntax ([view](https://github.com/videojs/video.js/pull/3148))
+* @defli added missing var to sandbox index.html example ([view](https://github.com/videojs/video.js/pull/3155))
+* @defli fixed typo and updated Turkish translations ([view](https://github.com/videojs/video.js/pull/3156))
+* @OwenEdwards fixed menu closing on ios, specifically ipad ([view](https://github.com/videojs/video.js/pull/3158))
+
+## 5.8.0 (2016-02-19)
+* @gkatsev added issue and PR templates for github ([view](https://github.com/videojs/video.js/pull/3117))
+* @Nipoto added fa.json (farsi/persian lang file) ([view](https://github.com/videojs/video.js/pull/3116))
+* @forbesjo updated travis to use latest firefox ([view](https://github.com/videojs/video.js/pull/3112))
+* @Naouak updated time display to not change if values do not change ([view](https://github.com/videojs/video.js/pull/3101))
+* @forbesjo updated track settings to not fail restoring settings when localStorage is not available ([view](https://github.com/videojs/video.js/pull/3120))
+* @mister-ben Added en.json as localization template ([view](https://github.com/videojs/video.js/pull/3096))
+* @misteroneill added alt css as video-js-cdn.css ([view](https://github.com/videojs/video.js/pull/3118))
+
+## 5.7.1 (2016-02-11)
+* @alex-phillips fixed reference to videojs-vtt.js dependency ([view](https://github.com/videojs/video.js/pull/3080))
+* @gkatsev fixed minified videojs in IE8. Fixes #3064 and #3070 ([view](https://github.com/videojs/video.js/pull/3104))
+
+## 5.7.0 (2016-02-04)
+* @forbesjo updated emulated tracks to have listeners removed when they are removed ([view](https://github.com/videojs/video.js/pull/3046))
+* @incompl improved the UX of time tooltips ([view](https://github.com/videojs/video.js/pull/3060))
+* @gkatsev updated README to include links to plugins page and getting started and cleaner link to LICENSE ([view](https://github.com/videojs/video.js/pull/3066))
+* @hartman Corrected adaptive layout selectors to match their intent ([view](https://github.com/videojs/video.js/pull/2923))
+* @mister-ben updated Umuted to Unmute in lang files ([view](https://github.com/videojs/video.js/pull/3053))
+* @hartman updated fullscreen and time controls for more consistent widths ([view](https://github.com/videojs/video.js/pull/2893))
+* @hartman Set a min-width for the progress slider of 4em ([view](https://github.com/videojs/video.js/pull/2902))
+* @misteroneill fixed iphone useragent detection ([view](https://github.com/videojs/video.js/pull/3077))
+* @erikyuzwa added ability to add child component at specific index ([view](https://github.com/videojs/video.js/pull/2540))
+
+## 5.6.0 (2016-01-26)
+* @OwenEdwards added ClickableComponent. Fixed keyboard operation of buttons ([view](https://github.com/videojs/video.js/pull/3032))
+* @OwenEdwards Fixed menu keyboard access and ARIA labeling for screen readers ([view](https://github.com/videojs/video.js/pull/3033))
+* @OwenEdwards Fixed volume menu keyboard access ([view](https://github.com/videojs/video.js/pull/3034))
+* @mister-ben made $primary-foreground-color a !default sass var ([view](https://github.com/videojs/video.js/pull/3003))
+* @OwenEdwards fixed double-localization of mute toggle control text ([view](https://github.com/videojs/video.js/pull/3017))
+* @gkatsev checked muted status when updating volume bar level ([view](https://github.com/videojs/video.js/pull/3037))
+* @vitor-faiante updated the guides ([view](https://github.com/videojs/video.js/pull/2781))
+* @aril-spetalen added language support for Norwegian (nb and nn) ([view](https://github.com/videojs/video.js/pull/3021))
+* @CoWinkKeyDinkInc fixed table in Tracks guide. Replaced some single quotes with double quotes ([view](https://github.com/videojs/video.js/pull/2946))
+* @hubdotcom changed URLs in README to be protocol-relative ([view](https://github.com/videojs/video.js/pull/3040))
+* @gkatsev updated to latest videojs-ie8 shim ([view](https://github.com/videojs/video.js/pull/3042))
+
+## 5.5.3 (2016-01-15)
+* @gkasev updated vjs to correctly return already created player when given an element ([view](https://github.com/videojs/video.js/pull/3006))
+* @mister-ben updated CDN urls in setup guide ([view](https://github.com/videojs/video.js/pull/2984))
+* @rcrooks fixed a couple of docs link and a jsdoc comment ([view](https://github.com/videojs/video.js/pull/2987))
+
+## 5.5.2 (2016-01-14)
+* make sure that styleEl_ is in DOM before removing on dispose ([view](https://github.com/videojs/video.js/pull/3004))
+
+## 5.5.1 (2016-01-08)
+* @gkatsev fixed sass if else for icons ([view](https://github.com/videojs/video.js/pull/2988))
+
+## 5.5.0 (2016-01-07)
+* @hartman fixed usage of lighten in progress component. Fixes #2793 ([view](https://github.com/videojs/video.js/pull/2875))
+* @misteroneill exposed createEl on videojs ([view](https://github.com/videojs/video.js/pull/2926))
+* @huitsing updated docstrings for autoplay and loop methods ([view](https://github.com/videojs/video.js/pull/2960))
+* @rcrooks fixed some broken links in guides ([view](https://github.com/videojs/video.js/pull/2965))
+* @forbesjo fixed errorDisplay erroring on subsequent openings ([view](https://github.com/videojs/video.js/pull/2966))
+* @incompl updated build command in CONTRIBUTING.md ([view](https://github.com/videojs/video.js/pull/2967))
+* @forbesjo updated player to not autoplay if there is no source ([view](https://github.com/videojs/video.js/pull/2971))
+* @gkatsev updated css to have ascii codepoints for fonticons. Expose new scss file ([view](https://github.com/videojs/video.js/pull/2973))
+
+## 5.4.6 (2015-12-22)
+* @gkatsev fixed vertical slider alignment in volume menu button ([view](https://github.com/videojs/video.js/pull/2943))
+
+## 5.4.5 (2015-12-15)
+* @gkatsev added mouse/touch listeners to volume menu button ([view](https://github.com/videojs/video.js/pull/2638))
+* @gkatsev updated styles for inline menu and volume bar ([view](https://github.com/videojs/video.js/pull/2913))
+* @BrandonOCasey updated sandbox to to use newer CDN urls ([view](https://github.com/videojs/video.js/pull/2917))
+* @hartman updated options guide doc ([view](https://github.com/videojs/video.js/pull/2908))
+* @rcrooks fixed simple embed example ([view](https://github.com/videojs/video.js/pull/2915))
+
+## 5.4.4 (2015-12-09)
+* @gkatsev switched to use custom vtt.js from npm ([view](https://github.com/videojs/video.js/pull/2905))
+
+## 5.4.3 (2015-12-08)
+* @gkatsev updated options customizer and github-release options ([view](https://github.com/videojs/video.js/pull/2903))
+
+## 5.4.2 (2015-12-08)
+* @gkatsev updated grunt-release config ([view](https://github.com/videojs/video.js/pull/2900))
+
+## 5.4.1 (2015-12-08)
 * @misteroneill updated videojs-ie8 to 1.1.1 ([view](https://github.com/videojs/video.js/pull/2869))
 * @gkatsev added Player#tech. Fixes #2617 ([view](https://github.com/videojs/video.js/pull/2883))
 * @nick11703 changed multiline comments in sass with single-line comments ([view](https://github.com/videojs/video.js/pull/2827))
@@ -9,8 +264,7 @@ CHANGELOG
 * @chemoish emulated HTMLTrackElement to enable track load events ([view](https://github.com/videojs/video.js/pull/2804))
 * @gkatsev added nullcheck for cues in updateForTrack. Fixes #2870 ([view](https://github.com/videojs/video.js/pull/2896))
 * @gkatsev added ability to release next tag from master ([view](https://github.com/videojs/video.js/pull/2894))
-
--------------------
+* @gkatsev added chg- and github- release for next releases ([view](https://github.com/videojs/video.js/pull/2899))

 ## 5.3.0 (2015-11-25)
 * @forbesjo updated formatTime to not go negative ([view](https://github.com/videojs/video.js/pull/2821))
@@ -144,7 +144,7 @@ npm install
 Build a local copy of video.js and run tests

 ```bash
-grunt
+grunt dist
 grunt test
 ```

@@ -0,0 +1,32 @@
+## Description
+Briefly describe the issue.
+Include a [reduced test case](https://css-tricks.com/reduced-test-cases/), we have a [starter template](http://jsbin.com/axedog/edit?html,output) on JSBin you can use.
+
+## Steps to reproduce
+Explain in detail the exact steps necessary to reproduce the issue.
+
+1.
+2.
+3.
+
+## Results
+### Expected
+Please describe what you expected to see.
+
+### Actual
+Please describe what actually happened.
+
+### Error output
+If there are any errors at all, please include them here.
+
+## Additional Information
+Please include any additional information necessary here. Including the following:
+### versions
+#### videojs
+what version of videojs does this occur with?
+#### browsers
+what browser are affected?
+#### OSes
+what platforms (operating systems and devices) are affected?
+### plugins
+are any videojs plugins being used on the page? If so, please list them below.
@@ -0,0 +1,16 @@
+## Description
+Please describe the change as necessary.
+If it's a feature or enhancement please be as detailed as possible.
+If it's a bug fix, please link the issue that it fixes or describe the bug in as much detail.
+
+
+## Specific Changes proposed
+Please list the specific changes involved in this pull request.
+
+## Requirements Checklist
+- [ ] Feature implemented / Bug fixed
+- [ ] If necessary, more likely in a feature request than a bug fix
+  - [ ] Unit Tests updated or fixed
+  - [ ] Docs/guides updated
+  - [ ] Example created ([starter template on JSBin](http://jsbin.com/axedog/edit?html,output))
+- [ ] Reviewed by Two Core Contributors
@@ -1,27 +1,33 @@
 ![Video.js logo](http://videojs.com/img/logo.png)

-# [Video.js - HTML5 Video Player](http://videojs.com)  [![Build Status](https://travis-ci.org/videojs/video.js.svg?branch=master)](https://travis-ci.org/videojs/video.js)
+# [Video.js - HTML5 Video Player](http://videojs.com)
+[![Build Status](https://travis-ci.org/videojs/video.js.svg?branch=master)](https://travis-ci.org/videojs/video.js)
+[![Coverage Status](https://coveralls.io/repos/github/videojs/video.js/badge.svg?branch=master)](https://coveralls.io/github/videojs/video.js?branch=master)
+
+[![NPM](https://nodei.co/npm/video.js.png?downloads=true&downloadRank=true)](https://nodei.co/npm/video.js/)

 > Video.js is a web video player built from the ground up for an HTML5 world. It supports HTML5 and Flash video, as well as YouTube and Vimeo (through [plugins](https://github.com/videojs/video.js/wiki/Plugins)). It supports video playback on desktops and mobile devices. This project was started mid 2010, and the player is now used on over ~~50,000~~ ~~100,000~~ 200,000 websites.

 ## Quick start
-Thanks to the awesome folks over at [Fastly](http://www.fastly.com/), there's a free, CDN hosted version of Video.js that anyone can use. Simply add these includes to your document's
+Thanks to the awesome folks over at [Fastly](http://www.fastly.com/), there's a free, CDN hosted version of Video.js that anyone can use.
+Also, check out the [Getting Started](http://videojs.com/getting-started/) page on our website which has the latest urls as well.
+Simply add these includes to your document's
 `<head>`:

 ```html
-<link href="http://vjs.zencdn.net/5.0/video-js.min.css" rel="stylesheet">
-<script src="http://vjs.zencdn.net/5.0/video.min.js"></script>
+<link href="//vjs.zencdn.net/5.8/video-js.min.css" rel="stylesheet">
+<script src="//vjs.zencdn.net/5.8/video.min.js"></script>
 ```

 Then, whenever you want to use Video.js you can simply use the `<video>` element as your normally would, but with an additional `data-setup` attribute containing any Video.js options. These options
-can include any Video.js option plus potential [plugin](https://github.com/videojs/video.js/wiki/Plugins) options, just make sure they're valid JSON!
+can include any Video.js option plus potential [plugin](http://videojs.com/plugins/) options, just make sure they're valid JSON!

 ```html
 <video id="really-cool-video" class="video-js vjs-default-skin" controls
 preload="auto" width="640" height="264" poster="really-cool-video-poster.jpg"
 data-setup='{}'>
-  <source src="really-cool-video.mp4" type='video/mp4'>
-  <source src="really-cool-video.webm" type='video/webm'>
+  <source src="really-cool-video.mp4" type="video/mp4">
+  <source src="really-cool-video.webm" type="video/webm">
  <p class="vjs-no-js">
    To view this video please enable JavaScript, and consider upgrading to a web browser
    that <a href="http://videojs.com/html5-video-support/" target="_blank">supports HTML5 video</a>
@@ -55,5 +61,3 @@ To build your own custom version read the section on [contributing code](CONTRIB
 ## License

 Video.js is licensed under the Apache License, Version 2.0. [View the license file](LICENSE)
-
-Copyright 2014-2015 Brightcove, Inc.
@@ -1,3 +1,4 @@
+import {gruntCustomizer, gruntOptionsMaker} from './options-customizer.js';
 module.exports = function(grunt) {
  require('time-grunt')(grunt);

@@ -15,7 +16,6 @@ module.exports = function(grunt) {

  const browserifyGruntDefaults = {
    browserifyOptions: {
-      debug: true,
      standalone: 'videojs'
    },
    plugin: [
@@ -41,6 +41,19 @@ module.exports = function(grunt) {
    ]
  };

+  const githubReleaseDefaults = {
+    options: {
+      release: {
+        tag_name: 'v'+ version.full,
+        name: version.full,
+        body: require('chg').find(version.full).changesRaw
+      },
+    },
+    files: {
+      src: [`dist/video-js-${version.full}.zip`] // Files that you want to attach to Release
+    }
+  };
+
  /**
   * Customizes _.merge behavior in `browserifyGruntOptions` to concatenate
   * arrays. This can be overridden on a per-call basis to
@@ -52,11 +65,7 @@ module.exports = function(grunt) {
   * @param  {Mixed} sourceValue
   * @return {Object}
   */
-  function browserifyGruntCustomizer(objectValue, sourceValue) {
-    if (Array.isArray(objectValue)) {
-      return objectValue.concat(sourceValue);
-    }
-  }
+  const browserifyGruntCustomizer = gruntCustomizer;

  /**
   * Creates a unique object of Browserify Grunt task options.
@@ -70,9 +79,10 @@ module.exports = function(grunt) {
   *
   * @return {Object}
   */
-  function browserifyGruntOptions(options = null, customizer = browserifyGruntCustomizer) {
-    return _.merge({}, browserifyGruntDefaults, options, customizer);
-  }
+  const browserifyGruntOptions = gruntOptionsMaker(browserifyGruntDefaults, browserifyGruntCustomizer);
+
+  const githubReleaseCustomizer = gruntCustomizer;
+  const githubReleaseOptions = gruntOptionsMaker(githubReleaseDefaults, githubReleaseCustomizer);

  /**
   * Creates processor functions for license banners.
@@ -113,10 +123,8 @@ module.exports = function(grunt) {
    },
    uglify: {
      options: {
-        sourceMap: true,
-        sourceMapIn: 'build/temp/video.js.map',
-        sourceMapRoot: '../../src/js',
        preserveComments: 'some',
+        screwIE8: false,
        mangle: true,
        compress: {
          sequences: true,
@@ -138,9 +146,17 @@ module.exports = function(grunt) {
    },
    dist: {},
    watch: {
+      novtt: {
+        files: ['build/temp/video.js'],
+        tasks: ['concat:novtt']
+      },
+      minify: {
+        files: ['build/temp/video.js'],
+        tasks: ['uglify']
+      },
      skin: {
        files: ['src/css/**/*'],
-        tasks: 'sass'
+        tasks: ['sass']
      },
      jshint: {
        files: ['src/**/*', 'test/unit/**/*.js', 'Gruntfile.js'],
@@ -177,7 +193,7 @@ module.exports = function(grunt) {
      minify: {
        expand: true,
        cwd: 'build/temp/',
-        src: ['video-js.css'],
+        src: ['video-js.css', 'alt/video-js-cdn.css'],
        dest: 'build/temp/',
        ext: '.min.css'
      }
@@ -185,7 +201,8 @@ module.exports = function(grunt) {
    sass: {
      build: {
        files: {
-          'build/temp/video-js.css': 'src/css/video-js.scss'
+          'build/temp/video-js.css': 'src/css/vjs.scss',
+          'build/temp/alt/video-js-cdn.css': 'src/css/vjs-cdn.scss'
        }
      }
    },
@@ -294,16 +311,16 @@ module.exports = function(grunt) {
        auth: {
          user: process.env.VJS_GITHUB_USER,
          password: process.env.VJS_GITHUB_TOKEN
-        },
-        release: {
-          tag_name: 'v'+ version.full,
-          name: version.full,
-          body: require('chg').find(version.full).changesRaw
        }
      },
-      files: {
-        src: [`dist/video-js-${version.full}.zip`] // Files that you want to attach to Release
-      }
+      release: githubReleaseOptions(),
+      prerelease: githubReleaseOptions({
+        options: {
+          release: {
+            prerelease: true
+          }
+        }
+      })
    },
    browserify: {
      options: browserifyGruntOptions(),
@@ -316,7 +333,7 @@ module.exports = function(grunt) {
        options: browserifyGruntOptions({
          transform: [
            ['browserify-versionify', {
-              placeholder: '../node_modules/vtt.js/dist/vtt.js',
+              placeholder: '../node_modules/videojs-vtt.js/dist/vtt.js',
              version: 'https://cdn.rawgit.com/gkatsev/vtt.js/vjs-v0.12.1/dist/vtt.min.js'
            }],
          ]
@@ -355,14 +372,6 @@ module.exports = function(grunt) {
        }
      }
    },
-    exorcise: {
-      build: {
-        options: {},
-        files: {
-          'build/temp/video.js.map': ['build/temp/video.js'],
-        }
-      }
-    },
    coveralls: {
      options: {
        // warn instead of failing when coveralls errors
@@ -385,7 +394,7 @@ module.exports = function(grunt) {
        options: {
          separator: '\n',
        },
-        src: ['build/temp/video.js', 'node_modules/vtt.js/dist/vtt.js'],
+        src: ['build/temp/video.js', 'node_modules/videojs-vtt.js/dist/vtt.js'],
        dest: 'build/temp/video.js',
      },
    },
@@ -430,13 +439,13 @@ module.exports = function(grunt) {
  require('load-grunt-tasks')(grunt);
  grunt.loadNpmTasks('videojs-doc-generator');
  grunt.loadNpmTasks('chg');
+  grunt.loadNpmTasks('gkatsev-grunt-sass');

  const buildDependents = [
    'clean:build',

    'jshint',
    'browserify:build',
-    'exorcise:build',
    'concat:novtt',
    'concat:vtt',
    'usebanner:novtt',
@@ -468,10 +477,13 @@ module.exports = function(grunt) {
    'zip:dist'
  ]);

+  grunt.registerTask('skin', ['sass']);
+
  // Default task - build and test
  grunt.registerTask('default', ['test']);

-  grunt.registerTask('test', ['build', 'karma:defaults']);
+  // The test script includes coveralls only when the TRAVIS env var is set.
+  grunt.registerTask('test', ['build', 'karma:defaults'].concat(process.env.TRAVIS && 'coveralls').filter(Boolean));

  // Run while developing
  grunt.registerTask('dev', ['build', 'connect:dev', 'concurrent:watchSandbox']);
@@ -0,0 +1,49 @@
+import _ from 'lodash-compat';
+/**
+ * Customizes _.merge behavior in `gruntOptions` to concatenate
+ * arrays. This can be overridden on a per-call basis to
+ *
+ * @see https://lodash.com/docs#merge
+ * @function GruntCustomizer
+ * @private
+ * @param  {Mixed} objectValue
+ * @param  {Mixed} sourceValue
+ * @return {Object}
+ */
+function gruntCustomizer(objectValue, sourceValue) {
+  if (Array.isArray(objectValue)) {
+    return objectValue.concat(sourceValue);
+  }
+}
+
+/**
+ * Creates a gruntOptions instance for the specific defaultOptions and gruntCustomizer
+ *
+ * @function browserifyGruntOptions
+ * @private
+ * @param  {Object} [options]
+ * @param  {Function} [customizer=gruntCustomizer]
+ *         If the default array-concatenation behavior is not desireable,
+ *         pass _.noop or a unique customizer (https://lodash.com/docs#merge).
+ *
+ * @return {Function}
+ */
+function gruntOptionsMaker(defaultOptions, gruntCustomizer) {
+  /**
+   * Creates a unique object of Browserify Grunt task options.
+   *
+   * @function gruntOptions
+   * @private
+   * @param  {Object} [options]
+   * @param  {Function} [customizer=browserifyGruntCustomizer]
+   *         If the default array-concatenation behavior is not desireable,
+   *         pass _.noop or a unique customizer (https://lodash.com/docs#merge).
+   *
+   * @return {Object}
+   */
+  return function gruntOptions(options = null, customizer = gruntCustomizer) {
+    return _.merge({}, defaultOptions, options, customizer);
+  }
+};
+
+export { gruntCustomizer, gruntOptionsMaker };
@@ -1,7 +1,7 @@
 {
  "name": "video.js",
  "description": "An HTML5 and Flash video player with a common API and skin for both.",
-  "version": "5.4.0",
+  "version": "5.11.9",
  "keywords": [
    "videojs",
    "html5",
@@ -280,6 +280,7 @@
        [ "git checkout -b temp-release-branch master","Create a temporary branch for the dist" ],
        [ "grunt version:{{release_type}}",            "Bump package versions" ],
        [ "./build/bin/version",                       "Return the current VJS Version from the package.json file", "version" ],
+        [ "grunt chg-release:{{version}}",             "Update the changelog with the new release" ],
        [ "git commit -am 'v{{version}}'",             "Add and commit the package changes" ],
        [ "git checkout master",                       "Checkout the developmet branch" ],
        [ "git merge temp-release-branch",             "Merge package changes into the dev brach" ],
@@ -290,6 +291,7 @@
        [ "git commit -m 'v{{version}} dist'",         "Commit the dist changes" ],
        [ "git tag -a v{{version}} -m 'v{{version}}'", "Tag the release" ],
        [ "git push upstream --tags",                  "Push the new tag to the repo" ],
+        [ "grunt github-release:prerelease",           "Create a new pre-release on Github" ],
        [ "npm publish --tag next",                    "Publish to npm as 'next'" ],
        [ "git checkout master",                       "Checkout the developmet branch" ],
        [ "git branch -D temp-release-branch",         "Delete the temp release branch" ]
@@ -314,7 +316,7 @@
        [ "git tag -a v{{version}} -m 'v{{version}}'", "Tag the release" ],
        [ "git push upstream --tags",                  "Push the new tag to the repo" ],
        [ "npm publish",                               "Publish to npm" ],
-        [ "grunt github-release",                      "Create a new release on Github" ],
+        [ "grunt github-release:release",              "Create a new release on Github" ],
        [ "git checkout stable",                       "Checkout the developmet branch" ],
        [ "git branch -D temp-release-branch",         "Delete the temp release branch" ]
      ]
@@ -0,0 +1,330 @@
+WEBVTT
+
+1
+00:00:15.042 --> 00:00:18.625
+...إلى... إلى الشمال يمكن أن نرى
+...يمكن أن نرى الـ
+
+2
+00:00:18.750 --> 00:00:20.958
+...إلى اليمين يمكن أن نرى الـ
+
+3
+00:00:21.000 --> 00:00:23.125
+طاحنات الرؤوس...
+
+4
+00:00:23.208 --> 00:00:25.208
+كل شيئ آمن
+آمن كلية
+
+5
+00:00:26.333 --> 00:00:28.333
+إيمو ؟
+
+6
+00:00:28.875 --> 00:00:30.958
+! حذاري
+
+7
+00:00:47.125 --> 00:00:49.167
+هل أصبت ؟
+
+8
+00:00:52.125 --> 00:00:54.833
+...لا أظن ذلك
+وأنت ؟
+
+9
+00:00:55.625 --> 00:00:57.625
+أنا بخير
+
+10
+00:00:57.667 --> 00:01:01.667
+،قم يا إيمو
+المكان هنا غير آمن
+
+11
+00:01:02.208 --> 00:01:04.083
+لنذهب
+
+12
+00:01:04.167 --> 00:01:06.167
+وماذا بعد ؟
+
+13
+00:01:06.167 --> 00:01:08.583
+...سترى...  سترى
+
+14
+00:01:16.167 --> 00:01:18.375
+إيمو، من هنا
+
+15
+00:01:34.958 --> 00:01:37.000
+! إتبعني
+
+16
+00:02:11.125 --> 00:02:13.625
+! أسرع يا إيمو
+
+17
+00:02:48.375 --> 00:02:50.375
+! لست منتبها
+
+18
+00:02:50.750 --> 00:02:54.500
+...أريد فقط أن أجيب الـ
+الهاتف...
+
+19
+00:02:55.000 --> 00:02:58.500
+،إيمو، أنظر
+أقصد أنصت
+
+20
+00:02:59.750 --> 00:03:03.292
+عليك أن تتعلم الإصغاء
+
+21
+00:03:03.625 --> 00:03:05.917
+هذا ليس ضربا من اللهو
+
+22
+00:03:06.083 --> 00:03:09.958
+...إنك
+أقصد إننا قد نموت بسهولة في هذا المكان
+
+23
+00:03:10.208 --> 00:03:14.125
+...أنصت
+أنصت إلى أصوات الآلة
+
+24
+00:03:18.333 --> 00:03:20.417
+أنصت إلى نَفَسِك
+
+25
+00:04:27.208 --> 00:04:29.250
+ألا تمل أبدا من هذا ؟
+
+26
+00:04:29.583 --> 00:04:31.583
+أمل ؟!؟
+نعم -
+
+27
+00:04:31.750 --> 00:04:34.667
+إيمو؛ الآلة في دقتها... مثل الساعة
+
+28
+00:04:35.500 --> 00:04:37.708
+...حركة ناشزة واحدة قد
+
+29
+00:04:37.833 --> 00:04:39.875
+تطرحك معجونا
+
+30
+00:04:41.042 --> 00:04:43.083
+...أو ليست
+
+31
+00:04:43.125 --> 00:04:46.542
+! عجينة يا إيمو
+أ هذا ما تريد ؟ أن تصبح عجينة ؟
+
+32
+00:04:48.083 --> 00:04:50.083
+أيمو، أ هذا هدفك في الحياة ؟
+
+33
+00:04:50.583 --> 00:04:52.667
+أن تصير عجينة ؟
+
+34
+00:05:41.833 --> 00:05:43.875
+إيمو، أغمض عينيك
+
+35
+00:05:44.917 --> 00:05:47.000
+لماذا ؟
+! الآن -
+
+36
+00:05:53.750 --> 00:05:56.042
+حسن
+
+37
+00:05:59.542 --> 00:06:02.792
+ماذا ترى إلى شمالك يا إيمو ؟
+
+38
+00:06:04.417 --> 00:06:06.500
+لا شيئ
+حقا ؟ -
+
+39
+00:06:06.542 --> 00:06:08.625
+لا، لا شيئ البتة
+
+40
+00:06:08.625 --> 00:06:12.417
+وماذا ترى إلى جهتك اليمنى يا إيمو ؟
+
+41
+00:06:13.667 --> 00:06:17.833
+،نفس الشيئ يا بروغ
+! نفس الشيئ بالضبط؛ لا شيئ
+
+42
+00:06:17.875 --> 00:06:19.917
+عظيم
+
+43
+00:06:40.625 --> 00:06:42.958
+أنصت يا بروغ ! هل تسمع ذلك ؟
+
+44
+00:06:43.625 --> 00:06:45.625
+هل نستطيع الذهاب إلى هناك ؟
+
+45
+00:06:45.708 --> 00:06:47.792
+هناك ؟
+نعم -
+
+46
+00:06:47.833 --> 00:06:49.833
+إنه غير آمن يا إيمو
+
+47
+00:06:49.917 --> 00:06:52.500
+صدقني، إنه غير آمن
+
+48
+00:06:53.292 --> 00:06:55.375
+...لكن لعلي أستطيع
+
+49
+00:06:55.417 --> 00:06:57.417
+...لكن
+! لا -
+
+50
+00:06:57.667 --> 00:06:59.667
+! لا
+
+51
+00:07:00.875 --> 00:07:03.750
+هل من أسئلة أخرى يا إيمو ؟
+
+52
+00:07:04.250 --> 00:07:06.333
+لا
+
+53
+00:07:09.458 --> 00:07:11.542
+...إيمو
+نعم -
+
+54
+00:07:11.875 --> 00:07:13.958
+...لماذا يا إيمو... لماذا
+
+55
+00:07:15.292 --> 00:07:18.792
+لماذا لا تستطيع أن ترى حُسْن هذا المكان
+
+56
+00:07:18.833 --> 00:07:20.833
+...والطريقة التي يعمل بها
+
+57
+00:07:20.875 --> 00:07:24.000
+وكيف... وكيف أنه غاية في الكمال
+
+58
+00:07:24.083 --> 00:07:27.417
+! لا يا بروغ، لا أرى ذلك
+
+59
+00:07:27.542 --> 00:07:30.333
+لا أرى ذلك لأنه لا يوجد شيئ هناك
+
+60
+00:07:31.500 --> 00:07:35.333
+ثم لماذا يجب علي أن أسلم حياتي
+لشيئ لا وجود له ؟
+
+61
+00:07:35.583 --> 00:07:37.625
+هل يمكنك أن تخبرني ؟
+
+62
+00:07:37.708 --> 00:07:39.750
+! أجبني
+
+63
+00:07:43.208 --> 00:07:47.333
+...بروغ
+! أنت معتوه يا هذا
+
+64
+00:07:47.375 --> 00:07:49.417
+! إبعد عني
+
+65
+00:07:52.583 --> 00:07:55.083
+! لا يا إيمو ! إنه فخ
+
+66
+00:07:55.833 --> 00:07:57.875
+...إنه فخ
+
+67
+00:07:57.917 --> 00:08:01.750
+إلى جنبك الأيسر يمكنك أن ترى
+حدائق بابل المعلقة
+
+68
+00:08:02.250 --> 00:08:04.292
+هل تعجبك كفخ ؟
+
+69
+00:08:05.458 --> 00:08:07.542
+لا يا أيمو
+
+70
+00:08:09.417 --> 00:08:12.792
+...إلى جنبك الأيمن يمكنك رؤية
+حزر ماذا ؟
+
+71
+00:08:13.000 --> 00:08:15.042
+! عملاق رودس
+
+72
+00:08:15.125 --> 00:08:16.417
+! لا
+
+73
+00:08:16.458 --> 00:08:20.500
+،عملاق رودس
+وهو هنا خصيصا من أجلك يا بروغ
+
+74
+00:08:20.583 --> 00:08:22.583
+فقط من أجلك
+
+75
+00:08:51.333 --> 00:08:53.375
+إنه هناك
+
+76
+00:08:53.417 --> 00:08:55.500
+أنا أؤكد لك... إيمو
+
+77
+00:08:57.333 --> 00:09:00.000
+...إنه
@@ -0,0 +1,334 @@
+WEBVTT
+
+1
+00:00:15.000 --> 00:00:17.951
+At the left we can see...
+
+2
+00:00:18.166 --> 00:00:20.083
+At the right we can see the...
+
+3
+00:00:20.119 --> 00:00:21.962
+...the head-snarlers
+
+4
+00:00:21.999 --> 00:00:24.368
+Everything is safe.
+Perfectly safe.
+
+5
+00:00:24.582 --> 00:00:27.035
+Emo?
+
+6
+00:00:28.206 --> 00:00:29.996
+Watch out!
+
+7
+00:00:47.037 --> 00:00:48.494
+Are you hurt?
+
+8
+00:00:51.994 --> 00:00:53.949
+I don't think so.
+You?
+
+9
+00:00:55.160 --> 00:00:56.985
+I'm Ok.
+
+10
+00:00:57.118 --> 00:01:01.111
+Get up.
+Emo. it's not safe here.
+
+11
+00:01:02.034 --> 00:01:03.573
+Let's go.
+
+12
+00:01:03.610 --> 00:01:05.114
+What's next?
+
+13
+00:01:05.200 --> 00:01:09.146
+You'll see!
+
+14
+00:01:16.032 --> 00:01:18.022
+Emo.
+This way.
+
+15
+00:01:34.237 --> 00:01:35.481
+Follow me!
+
+16
+00:02:11.106 --> 00:02:12.480
+Hurry Emo!
+
+17
+00:02:48.059 --> 00:02:49.930
+You're not paying attention!
+
+18
+00:02:50.142 --> 00:02:54.052
+I just want to answer the...
+...phone.
+
+19
+00:02:54.974 --> 00:02:57.972
+Emo. look.
+I mean listen.
+
+20
+00:02:59.140 --> 00:03:02.008
+You have to learn to listen.
+
+21
+00:03:03.140 --> 00:03:04.965
+This is not some game.
+
+22
+00:03:05.056 --> 00:03:09.345
+You. I mean we.
+we could easily die out here.
+
+23
+00:03:10.014 --> 00:03:13.959
+Listen.
+listen to the sounds of the machine.
+
+24
+00:03:18.054 --> 00:03:20.009
+Listen to your breathing.
+
+25
+00:04:27.001 --> 00:04:28.956
+Well. don't you ever get tired of this?
+
+26
+00:04:29.084 --> 00:04:30.909
+Tired?!?
+
+27
+00:04:31.126 --> 00:04:34.491
+Emo. the machine is like clockwork.
+
+28
+00:04:35.083 --> 00:04:37.074
+One move out of place...
+
+29
+00:04:37.166 --> 00:04:39.121
+...and you're ground to a pulp.
+
+30
+00:04:40.958 --> 00:04:42.004
+But isn't it -
+
+31
+00:04:42.041 --> 00:04:46.034
+Pulp. Emo!
+Is that what you want. pulp?
+
+32
+00:04:47.040 --> 00:04:48.995
+Emo. your goal in life...
+
+33
+00:04:50.081 --> 00:04:51.953
+...pulp?
+
+34
+00:05:41.156 --> 00:05:43.028
+Emo. close your eyes.
+
+35
+00:05:44.156 --> 00:05:46.027
+Why?
+- Now!
+
+36
+00:05:51.155 --> 00:05:52.102
+Ok.
+
+37
+00:05:53.113 --> 00:05:54.688
+Good.
+
+38
+00:05:59.070 --> 00:06:02.103
+What do you see at your left side. Emo?
+
+39
+00:06:04.028 --> 00:06:05.899
+Nothing.
+- Really?
+
+40
+00:06:06.027 --> 00:06:07.105
+No. nothing at all.
+
+41
+00:06:07.944 --> 00:06:11.984
+And at your right.
+what do you see at your right side. Emo?
+
+42
+00:06:13.151 --> 00:06:16.102
+The same Proog. exactly the same...
+
+43
+00:06:16.942 --> 00:06:19.098
+...nothing!
+- Great.
+
+44
+00:06:40.105 --> 00:06:42.724
+Listen Proog! Do you hear that!
+
+45
+00:06:43.105 --> 00:06:44.894
+Can we go here?
+
+46
+00:06:44.979 --> 00:06:47.894
+There?
+It isn't safe. Emo.
+
+47
+00:06:49.145 --> 00:06:52.013
+But...
+- Trust me. it's not.
+
+48
+00:06:53.020 --> 00:06:54.145
+Maybe I could...
+
+49
+00:06:54.181 --> 00:06:55.969
+No.
+
+50
+00:06:57.102 --> 00:06:59.934
+NO!
+
+51
+00:07:00.144 --> 00:07:03.058
+Any further questions. Emo?
+
+52
+00:07:03.976 --> 00:07:05.090
+No.
+
+53
+00:07:09.059 --> 00:07:10.089
+Emo?
+
+54
+00:07:11.142 --> 00:07:13.058
+Emo. why...
+
+55
+00:07:13.095 --> 00:07:14.022
+Emo...
+
+56
+00:07:14.058 --> 00:07:18.003
+...why can't you see
+the beauty of this place?
+
+57
+00:07:18.141 --> 00:07:20.048
+The way it works.
+
+58
+00:07:20.140 --> 00:07:23.895
+How perfect it is.
+
+59
+00:07:23.932 --> 00:07:26.964
+No. Proog. I don't see.
+
+60
+00:07:27.056 --> 00:07:29.970
+I don't see because there's nothing there.
+
+61
+00:07:31.055 --> 00:07:34.965
+And why should I trust my
+life to something that isn't there?
+
+62
+00:07:35.055 --> 00:07:36.926
+Well can you tell me that?
+
+63
+00:07:37.054 --> 00:07:38.926
+Answer me!
+
+64
+00:07:42.970 --> 00:07:44.000
+Proog...
+
+65
+00:07:45.053 --> 00:07:46.985
+...you're a sick man!
+
+66
+00:07:47.022 --> 00:07:48.918
+Stay away from me!
+
+67
+00:07:52.052 --> 00:07:54.884
+No! Emo! It's a trap!
+
+68
+00:07:55.135 --> 00:07:56.931
+Hah. it's a trap.
+
+69
+00:07:56.968 --> 00:08:01.043
+At the left side you can see
+the hanging gardens of Babylon!
+
+70
+00:08:01.967 --> 00:08:03.957
+How's that for a trap?
+
+71
+00:08:05.050 --> 00:08:06.922
+No. Emo.
+
+72
+00:08:09.008 --> 00:08:12.088
+At the right side you can see...
+...well guess what...
+
+73
+00:08:12.924 --> 00:08:14.665
+...the colossus of Rhodes!
+
+74
+00:08:15.132 --> 00:08:16.053
+No!
+
+75
+00:08:16.090 --> 00:08:21.919
+The colossus of Rhodes
+and it is here just for you Proog.
+
+76
+00:08:51.001 --> 00:08:52.923
+It is there...
+
+77
+00:08:52.959 --> 00:08:56.040
+I'm telling you.
+Emo...
+
+78
+00:08:57.000 --> 00:08:59.867
+...it is.
@@ -0,0 +1,326 @@
+WEBVTT
+
+1
+00:00:15.042 --> 00:00:18.042
+左に見えるのは…
+
+2
+00:00:18.750 --> 00:00:20.333
+右に見えるのは…
+
+3
+00:00:20.417 --> 00:00:21.917
+…首刈り機
+
+4
+00:00:22.000 --> 00:00:24.625
+すべて安全
+完璧に安全だ
+
+5
+00:00:26.333 --> 00:00:27.333
+イーモ？
+
+6
+00:00:28.875 --> 00:00:30.250
+危ない！
+
+7
+00:00:47.125 --> 00:00:48.250
+ケガはないか？
+
+8
+00:00:51.917 --> 00:00:53.917
+ええ、多分…
+あなたは？
+
+9
+00:00:55.625 --> 00:00:57.125
+わしは平気だ
+
+10
+00:00:57.583 --> 00:01:01.667
+起きてくれイーモ
+ここは危ない
+
+11
+00:01:02.208 --> 00:01:03.667
+行こう
+
+12
+00:01:03.750 --> 00:01:04.917
+どこに？
+
+13
+00:01:05.875 --> 00:01:07.875
+すぐにわかるさ！
+
+14
+00:01:16.167 --> 00:01:18.375
+イーモ、こっちだ
+
+15
+00:01:34.958 --> 00:01:36.958
+ついて来るんだ！
+
+16
+00:02:11.583 --> 00:02:12.792
+イーモ、早く！
+
+17
+00:02:48.375 --> 00:02:50.083
+むやみにさわるな！
+
+18
+00:02:50.750 --> 00:02:54.500
+僕はただ、電話に
+…出ようと
+
+19
+00:02:55.000 --> 00:02:58.208
+イーモ、見るんだ…
+いや、聞いてくれ
+
+20
+00:02:59.750 --> 00:03:02.292
+君は「聞き方」を知る必要がある
+
+21
+00:03:03.625 --> 00:03:05.125
+これは遊びじゃない
+
+22
+00:03:06.167 --> 00:03:10.417
+我々はここでは
+たやすく死ぬ
+
+23
+00:03:11.208 --> 00:03:14.125
+機械の声を聞くんだ
+
+24
+00:03:18.333 --> 00:03:22.417
+君の息づかいを聞くんだ
+
+25
+00:04:27.208 --> 00:04:29.250
+そんなことして疲れない？
+
+26
+00:04:29.583 --> 00:04:31.083
+疲れる?!
+
+27
+00:04:31.750 --> 00:04:34.667
+この機械は非常に正確で
+
+28
+00:04:35.500 --> 00:04:37.708
+一つ間違えば…
+
+29
+00:04:37.833 --> 00:04:40.792
+…地面に落ちてバラバラだ
+
+30
+00:04:41.042 --> 00:04:42.375
+え、でも―
+
+31
+00:04:42.417 --> 00:04:46.542
+バラバラだぞ、イーモ！
+それでいいのか？
+
+32
+00:04:48.083 --> 00:04:50.000
+バラバラで死ぬんだぞ？
+
+33
+00:04:50.583 --> 00:04:52.250
+バラバラだ！
+
+34
+00:05:41.833 --> 00:05:43.458
+イーモ、目を閉じるんだ
+
+35
+00:05:44.917 --> 00:05:46.583
+なぜ？
+―早く！
+
+36
+00:05:53.750 --> 00:05:56.042
+それでいい
+
+37
+00:05:59.542 --> 00:06:03.792
+左に見えるものは何だ、イーモ？
+
+38
+00:06:04.417 --> 00:06:06.000
+え…何も
+―本当か？
+
+39
+00:06:06.333 --> 00:06:07.917
+全く何も
+
+40
+00:06:08.042 --> 00:06:12.833
+では右は
+何か見えるか、イーモ？
+
+41
+00:06:13.875 --> 00:06:16.917
+同じだよプルーグ、全く同じ…
+
+42
+00:06:17.083 --> 00:06:18.583
+何もない！
+
+43
+00:06:40.625 --> 00:06:43.208
+プルーグ！何か聞こえない？
+
+44
+00:06:43.625 --> 00:06:45.042
+あそこに行かないか？
+
+45
+00:06:45.208 --> 00:06:48.042
+あそこ？
+…安全じゃない
+
+46
+00:06:49.917 --> 00:06:52.500
+でも…
+―本当に危ないぞ
+
+47
+00:06:53.292 --> 00:06:54.792
+大丈夫だよ…
+
+48
+00:06:54.833 --> 00:06:56.333
+だめだ
+
+49
+00:06:57.667 --> 00:07:00.167
+だめだ！
+
+50
+00:07:00.875 --> 00:07:03.750
+まだ続ける気か、イーモ？
+
+51
+00:07:04.250 --> 00:07:05.917
+いいえ…
+
+52
+00:07:09.458 --> 00:07:10.833
+イーモ？
+
+53
+00:07:11.875 --> 00:07:13.542
+イーモ、なぜ…
+
+54
+00:07:13.583 --> 00:07:14.458
+イーモ…
+
+55
+00:07:14.500 --> 00:07:18.500
+…なぜここの美しさが
+見えない？
+
+56
+00:07:18.833 --> 00:07:20.750
+仕組みがこんなに…
+
+57
+00:07:20.875 --> 00:07:24.000
+こんなに完全なのに
+
+58
+00:07:24.083 --> 00:07:27.417
+もういいよ！プルーグ！
+
+59
+00:07:27.542 --> 00:07:30.333
+そこには何もないんだから
+
+60
+00:07:31.500 --> 00:07:35.333
+なぜ命を「ない」物に
+ゆだねなきゃ？
+
+61
+00:07:35.583 --> 00:07:37.125
+教えてくれないか？
+
+62
+00:07:37.500 --> 00:07:39.167
+さあ！
+
+63
+00:07:43.208 --> 00:07:44.583
+プルーグ…
+
+64
+00:07:45.500 --> 00:07:47.333
+あなたは病気なんだ
+
+65
+00:07:47.375 --> 00:07:49.208
+僕から離れてくれ
+
+66
+00:07:52.583 --> 00:07:55.083
+いかん！イーモ！ワナだ！
+
+67
+00:07:55.833 --> 00:07:57.167
+ワナだ？ ふーん
+
+68
+00:07:57.208 --> 00:08:01.750
+左に何が見える？
+バビロンの空中庭園！
+
+69
+00:08:02.250 --> 00:08:04.292
+これがワナとでも？
+
+70
+00:08:05.458 --> 00:08:07.125
+だめだ、イーモ
+
+71
+00:08:09.417 --> 00:08:12.792
+右にあるのは…
+…すごい！…
+
+72
+00:08:13.000 --> 00:08:14.750
+…ロードス島の巨像だ！
+
+73
+00:08:15.833 --> 00:08:16.708
+やめろ！
+
+74
+00:08:16.750 --> 00:08:22.167
+この巨像はあなたの物
+プルーグ、あなたのだよ
+
+75
+00:08:51.333 --> 00:08:53.167
+いってるじゃないか…
+
+76
+00:08:53.208 --> 00:08:55.500
+そこにあるって、イーモ…
+
+77
+00:08:57.333 --> 00:09:00.000
+…あるって
@@ -0,0 +1,356 @@
+WEBVTT
+
+1
+00:00:14.958 --> 00:00:17.833
+Слева мы видим...
+
+2
+00:00:18.458 --> 00:00:20.208
+справа мы видим...
+
+3
+00:00:20.333 --> 00:00:21.875
+...голово-клацов.
+
+4
+00:00:22.000 --> 00:00:24.583
+всё в порядке.
+в полном порядке.
+
+5
+00:00:26.333 --> 00:00:27.333
+Имо?
+
+6
+00:00:28.833 --> 00:00:30.250
+Осторожно!
+
+7
+00:00:47.125 --> 00:00:48.250
+Ты не ранен?
+
+8
+00:00:51.875 --> 00:00:53.875
+Вроде нет...
+а ты?
+
+9
+00:00:55.583 --> 00:00:57.125
+Я в порядке.
+
+10
+00:00:57.542 --> 00:01:01.625
+Вставай.
+Имо. здесь не безопасно.
+
+11
+00:01:02.208 --> 00:01:03.625
+Пойдём.
+
+12
+00:01:03.708 --> 00:01:05.708
+Что дальше?
+
+13
+00:01:05.833 --> 00:01:07.833
+Ты увидишь!
+
+14
+00:01:08.000 --> 00:01:08.833
+Ты увидишь...
+
+15
+00:01:16.167 --> 00:01:18.375
+Имо. сюда.
+
+16
+00:01:34.917 --> 00:01:35.750
+За мной!
+
+17
+00:02:11.542 --> 00:02:12.750
+Имо. быстрее!
+
+18
+00:02:48.375 --> 00:02:50.083
+Ты не обращаешь внимания!
+
+19
+00:02:50.708 --> 00:02:54.500
+Я только хотел ответить на ...
+...звонок.
+
+20
+00:02:55.000 --> 00:02:58.208
+Имо. смотри.
+то есть слушай...
+
+21
+00:02:59.708 --> 00:03:02.292
+Ты должен учиться слушать.
+
+22
+00:03:03.250 --> 00:03:05.333
+Это не какая-нибудь игра.
+
+23
+00:03:06.000 --> 00:03:08.833
+Ты. вернее мы. легко можем погибнуть здесь.
+
+24
+00:03:10.000 --> 00:03:11.167
+Слушай...
+
+25
+00:03:11.667 --> 00:03:14.125
+слушай звуки машины.
+
+26
+00:03:18.333 --> 00:03:20.417
+Слушай своё дыхание.
+
+27
+00:04:27.208 --> 00:04:29.250
+И не надоест тебе это?
+
+28
+00:04:29.542 --> 00:04:31.083
+Надоест?!?
+
+29
+00:04:31.708 --> 00:04:34.625
+Имо! Машина -
+она как часовой механизм.
+
+30
+00:04:35.500 --> 00:04:37.667
+Одно движение не туда...
+
+31
+00:04:37.792 --> 00:04:39.750
+...и тебя размелют в месиво!
+
+32
+00:04:41.042 --> 00:04:42.375
+А разве это не -
+
+33
+00:04:42.417 --> 00:04:46.500
+Месиво. Имо!
+ты этого хочешь? месиво?
+
+34
+00:04:48.083 --> 00:04:50.000
+Имо. твоя цель в жизни?
+
+35
+00:04:50.542 --> 00:04:52.250
+Месиво!
+
+36
+00:05:41.792 --> 00:05:43.458
+Имо. закрой глаза.
+
+37
+00:05:44.875 --> 00:05:46.542
+Зачем?
+- Ну же!
+
+38
+00:05:51.500 --> 00:05:52.333
+Ладно.
+
+39
+00:05:53.708 --> 00:05:56.042
+Хорошо.
+
+40
+00:05:59.500 --> 00:06:02.750
+Что ты видишь слева от себя. Имо?
+
+41
+00:06:04.417 --> 00:06:06.000
+Ничего.
+- Точно?
+
+42
+00:06:06.333 --> 00:06:07.875
+да. совсем ничего.
+
+43
+00:06:08.042 --> 00:06:12.708
+А справа от себя.
+что ты видишь справа от себя. Имо?
+
+44
+00:06:13.833 --> 00:06:16.875
+Да то же Пруг. в точности то же...
+
+45
+00:06:17.042 --> 00:06:18.500
+Ничего!
+
+46
+00:06:18.667 --> 00:06:19.500
+Прекрасно...
+
+47
+00:06:40.583 --> 00:06:42.917
+Прислушайся. Пруг! Ты слышишь это?
+
+48
+00:06:43.583 --> 00:06:45.042
+Может. мы пойдём туда?
+
+49
+00:06:45.208 --> 00:06:48.042
+Туда?
+Это не безопасно. Имо.
+
+50
+00:06:49.875 --> 00:06:52.500
+Но...
+- Поверь мне. это так.
+
+51
+00:06:53.292 --> 00:06:54.750
+Может я бы ...
+
+52
+00:06:54.792 --> 00:06:56.333
+Нет.
+
+53
+00:06:57.625 --> 00:06:59.583
+- Но...
+- НЕТ!
+
+54
+00:06:59.708 --> 00:07:00.833
+Нет!
+
+55
+00:07:00.833 --> 00:07:03.708
+Ещё вопросы. Имо?
+
+56
+00:07:04.250 --> 00:07:05.875
+Нет.
+
+57
+00:07:09.458 --> 00:07:10.792
+Имо?
+
+58
+00:07:11.833 --> 00:07:13.500
+Имо. почему...
+
+59
+00:07:13.542 --> 00:07:14.458
+Имо...
+
+60
+00:07:14.500 --> 00:07:18.500
+...почему? почему ты не видишь
+красоты этого места?
+
+61
+00:07:18.792 --> 00:07:20.708
+То как оно работает.
+
+62
+00:07:20.833 --> 00:07:24.000
+Как совершенно оно.
+
+63
+00:07:24.083 --> 00:07:27.417
+Нет. Пруг. я не вижу.
+
+64
+00:07:27.500 --> 00:07:30.333
+Я не вижу. потому что здесь ничего нет.
+
+65
+00:07:31.375 --> 00:07:35.333
+И почему я должен доверять свою жизнь
+чему-то. чего здесь нет?
+
+66
+00:07:35.542 --> 00:07:37.125
+это ты мне можешь сказать?
+
+67
+00:07:37.500 --> 00:07:39.167
+Ответь мне!
+
+68
+00:07:43.208 --> 00:07:44.542
+Пруг...
+
+69
+00:07:45.500 --> 00:07:47.333
+Ты просто больной!
+
+70
+00:07:47.375 --> 00:07:48.500
+Отстань от меня.
+
+71
+00:07:48.625 --> 00:07:49.917
+Имо...
+
+72
+00:07:52.542 --> 00:07:55.083
+Нет! Имо! Это ловушка!
+
+73
+00:07:55.792 --> 00:07:57.167
+Это ловушка!
+
+74
+00:07:57.208 --> 00:08:01.708
+Слева от себя вы можете увидеть
+Висящие сады Семирамиды!
+
+75
+00:08:02.250 --> 00:08:04.292
+Сойдёт за ловушку?
+
+76
+00:08:05.458 --> 00:08:07.125
+Нет. Имо.
+
+77
+00:08:09.417 --> 00:08:12.750
+Справа от себя вы можете увидеть...
+...угадай кого...
+
+78
+00:08:13.000 --> 00:08:14.708
+...Колосса Родосского!
+
+79
+00:08:15.500 --> 00:08:16.625
+Нет!
+
+80
+00:08:16.667 --> 00:08:21.125
+Колосс Родосский!
+И он здесь специально для тебя. Пруг.
+
+81
+00:08:21.167 --> 00:08:22.208
+Специально для тебя...
+
+82
+00:08:51.333 --> 00:08:53.167
+Она здесь есть!
+
+83
+00:08:53.208 --> 00:08:55.500
+Говорю тебе.
+Имо...
+
+84
+00:08:57.333 --> 00:09:00.000
+...она есть... есть...
@@ -0,0 +1,349 @@
+WEBVTT
+
+1
+00:00:15.042 --> 00:00:18.250
+Till vänster kan vi se...
+Ser vi...
+
+2
+00:00:18.708 --> 00:00:20.333
+Till höger ser vi...
+
+3
+00:00:20.417 --> 00:00:21.958
+...huvudkaparna.
+
+4
+00:00:22.000 --> 00:00:24.792
+Allt är säkert.
+alldeles ofarligt.
+
+5
+00:00:24.917 --> 00:00:26.833
+Emo?
+
+6
+00:00:28.750 --> 00:00:30.167
+Se upp!
+
+7
+00:00:46.708 --> 00:00:48.750
+Är du skadad?
+
+8
+00:00:51.875 --> 00:00:54.458
+Jag tror inte det...
+Är du?
+
+9
+00:00:55.292 --> 00:00:57.333
+Jag är ok.
+
+10
+00:00:57.542 --> 00:01:01.625
+Res dig upp Emo.
+Det är inte säkert här.
+
+11
+00:01:02.208 --> 00:01:03.625
+Kom så går vi.
+
+12
+00:01:03.708 --> 00:01:05.708
+Vad nu då?
+
+13
+00:01:05.833 --> 00:01:07.833
+Du får se...
+
+14
+00:01:08.042 --> 00:01:10.417
+Du får se.
+
+15
+00:01:15.958 --> 00:01:18.375
+Emo. den här vägen.
+
+16
+00:01:34.417 --> 00:01:36.750
+Följ efter mig!
+
+17
+00:02:11.250 --> 00:02:13.250
+Skynda dig. Emo!
+
+18
+00:02:48.375 --> 00:02:50.583
+Du är inte uppmärksam!
+
+19
+00:02:50.708 --> 00:02:54.500
+Jag vill bara svara...
+... i telefonen.
+
+20
+00:02:54.500 --> 00:02:58.208
+Emo. se här...
+Lyssna menar jag.
+
+21
+00:02:59.708 --> 00:03:02.292
+Du måste lära dig att lyssna.
+
+22
+00:03:03.292 --> 00:03:05.208
+Det här är ingen lek.
+
+23
+00:03:05.250 --> 00:03:08.917
+Du... Jag menar vi.
+vi skulle kunna dö här ute.
+
+24
+00:03:09.917 --> 00:03:11.417
+Lyssna...
+
+25
+00:03:11.708 --> 00:03:14.833
+Lyssna på ljuden från maskinen.
+
+26
+00:03:18.125 --> 00:03:21.417
+Lyssna på dina andetag.
+
+27
+00:04:26.625 --> 00:04:29.250
+Tröttnar du aldrig på det här?
+
+28
+00:04:29.542 --> 00:04:31.083
+Tröttnar!?
+
+29
+00:04:31.208 --> 00:04:33.458
+Emo. maskinen är som...
+
+30
+00:04:33.458 --> 00:04:35.333
+Som ett urverk.
+
+31
+00:04:35.417 --> 00:04:37.167
+Ett felsteg...
+
+32
+00:04:37.208 --> 00:04:39.750
+...och du blir krossad.
+
+33
+00:04:41.042 --> 00:04:42.292
+Men är det inte -
+
+34
+00:04:42.292 --> 00:04:47.000
+Krossad. Emo!
+Är det vad du vill bli? Krossad till mos?
+
+35
+00:04:47.500 --> 00:04:50.542
+Emo. är det ditt mål i livet?
+
+36
+00:04:50.667 --> 00:04:53.250
+Att bli mos!?
+
+37
+00:05:41.375 --> 00:05:43.458
+Emo. blunda.
+
+38
+00:05:44.375 --> 00:05:46.542
+Varför då?
+- Blunda!
+
+39
+00:05:51.292 --> 00:05:55.042
+Ok.
+- Bra.
+
+40
+00:05:59.500 --> 00:06:02.750
+Vad ser du till vänster om dig Emo?
+
+41
+00:06:04.125 --> 00:06:06.292
+Ingenting.
+- Säker?
+
+42
+00:06:06.333 --> 00:06:07.958
+Ingenting alls.
+
+43
+00:06:08.042 --> 00:06:12.625
+Jaså. och till höger om dig...
+Vad ser du där. Emo?
+
+44
+00:06:13.750 --> 00:06:15.583
+Samma där Proog...
+
+45
+00:06:15.583 --> 00:06:18.083
+Exakt samma där. ingenting!
+
+46
+00:06:18.083 --> 00:06:19.667
+Perfekt.
+
+47
+00:06:40.500 --> 00:06:42.917
+Lyssna Proog! Hör du?
+
+48
+00:06:43.500 --> 00:06:45.125
+Kan vi gå dit?
+
+49
+00:06:45.208 --> 00:06:48.125
+Gå dit?
+Det är inte tryggt.
+
+50
+00:06:49.583 --> 00:06:52.583
+Men. men...
+- Tro mig. det inte säkert.
+
+51
+00:06:53.000 --> 00:06:54.292
+Men kanske om jag -
+
+52
+00:06:54.292 --> 00:06:56.333
+Nej.
+
+53
+00:06:57.208 --> 00:07:00.167
+Men -
+- Nej. NEJ!
+
+54
+00:07:00.917 --> 00:07:03.792
+Några fler frågor Emo?
+
+55
+00:07:04.250 --> 00:07:05.875
+Nej.
+
+56
+00:07:09.542 --> 00:07:11.375
+Emo?
+- Ja?
+
+57
+00:07:11.542 --> 00:07:15.667
+Emo. varför...
+
+58
+00:07:15.792 --> 00:07:18.583
+Varför kan du inte se skönheten i det här?
+
+59
+00:07:18.792 --> 00:07:21.708
+Hur det fungerar.
+
+60
+00:07:21.833 --> 00:07:24.000
+Hur perfekt det är.
+
+61
+00:07:24.083 --> 00:07:27.333
+Nej Proog. jag kan inte se det.
+
+62
+00:07:27.333 --> 00:07:30.333
+Jag ser det inte. för det finns inget där.
+
+63
+00:07:31.292 --> 00:07:35.333
+Och varför skulle jag lägga mitt liv
+i händerna på något som inte finns?
+
+64
+00:07:35.333 --> 00:07:37.083
+Kan du berätta det för mig?
+- Emo...
+
+65
+00:07:37.083 --> 00:07:39.167
+Svara mig!
+
+66
+00:07:43.500 --> 00:07:45.208
+Proog...
+
+67
+00:07:45.208 --> 00:07:47.083
+Du är inte frisk!
+
+68
+00:07:47.167 --> 00:07:49.292
+Håll dig borta från mig!
+
+69
+00:07:52.292 --> 00:07:55.083
+Nej! Emo!
+Det är en fälla!
+
+70
+00:07:55.375 --> 00:07:57.208
+Heh. det är en fälla.
+
+71
+00:07:57.208 --> 00:08:01.708
+På vänster sida ser vi...
+Babylons hängande trädgårdar!
+
+72
+00:08:01.958 --> 00:08:04.000
+Vad sägs om den fällan?
+
+73
+00:08:05.458 --> 00:08:07.333
+Nej. Emo.
+
+74
+00:08:08.917 --> 00:08:12.667
+Till höger ser vi...
+Gissa!
+
+75
+00:08:12.750 --> 00:08:15.125
+Rhodos koloss!
+
+76
+00:08:15.375 --> 00:08:16.500
+Nej!
+
+77
+00:08:16.500 --> 00:08:20.250
+Kolossen på Rhodos!
+Och den är här för din skull. Proog...
+
+78
+00:08:20.250 --> 00:08:23.250
+Bara för din skull.
+
+79
+00:08:50.917 --> 00:08:53.250
+Den är där...
+
+80
+00:08:53.625 --> 00:08:56.417
+Tro mig.
+Emo...
+
+81
+00:08:57.000 --> 00:09:00.000
+Det är den.
+Det är den...
@@ -0,0 +1,44 @@
+WEBVTT
+
+NOTE Created by Owen Edwards 2015. http://creativecommons.org/licenses/by/2.5/
+NOTE Based on 'finalbreakdown.rtf', part of the prepoduction notes, which are:
+NOTE (c) Copyright 2006, Blender Foundation / 
+NOTE                     Netherlands Media Art Institute / 
+NOTE                     www.elephantsdream.org
+
+1
+00:00:00.000 --> 00:00:27.500
+Prologue
+
+2
+00:00:27.500 --> 00:01:10.000
+Switchboard trap
+
+3
+00:01:10.000 --> 00:03:25.000
+Telephone/Lecture
+
+4
+00:03:25.000 --> 00:04:52.000
+Typewriter
+
+5
+00:04:52.000 --> 00:06:19.500
+Proog shows Emo stuff
+
+6
+00:06:19.500 --> 00:07:09.000
+Which way
+
+7
+00:07:09.000 --> 00:07:45.000
+Emo flips out
+
+8
+00:07:45.000 --> 00:09:25.000
+Emo creates
+
+9
+00:09:25.000 --> 00:10:53.000
+Closing credits
+
@@ -0,0 +1,280 @@
+WEBVTT
+License: CC BY 4.0 http://creativecommons.org/licenses/by/4.0/
+Author: Silvia Pfeiffer
+
+1
+00:00:00.000 --> 00:00:05.000
+The orange open movie project presents
+
+2
+00:00:05.010 --> 00:00:12.000
+Introductory titles are showing on the background of a water pool with fishes swimming and mechanical objects lying on a stone floor.
+
+3
+00:00:12.010 --> 00:00:14.800
+elephants dream
+
+4
+00:00:26.100 --> 00:00:28.206
+Two people stand on a small bridge.
+
+5
+00:00:30.010 --> 00:00:40.000
+The old man, Proog, shoves the younger and less experienced Emo on the ground to save him from being mowed down by a barrage of jack plugs that whir back and forth between the two massive switch-board-like walls.
+
+6
+00:00:40.000 --> 00:00:47.000
+The plugs are oblivious of the two, endlessly channeling streams of bizarre sounds and data.
+
+7
+00:00:48.494 --> 00:00:51.994
+Emo sits on the bridge and checks his limbs.
+
+8
+00:01:09.150 --> 00:01:16.030
+After the squealing plugs move on, Proog makes sure that Emo is unharmed and urges him onwards through a crack in one of the plug-walls.
+
+9
+00:01:18.050 --> 00:01:24.000
+They walk through the narrow hall into a massive room that fades away into blackness on all sides.
+
+10
+00:01:24.050 --> 00:01:34.200
+Only one path is visible, suspended in mid-air that runs between thousands of dangling electric cables on which sit crowds of robin-like robotic birds.
+
+11
+00:01:36.000 --> 00:01:40.000
+As Proog and Emo enter the room, the birds begin to wake up and notice them.
+
+12
+00:01:42.000 --> 00:01:50.000
+Realizing the danger, Proog grabs Emo by the arm.
+
+13
+00:01:50.050 --> 00:02:00.000
+They run along the increasingly bizarre path as the birds begin to swarm.
+
+14
+00:02:00.050 --> 00:02:11.000
+All sound is blocked out by the birds which are making the same noises as the jack-plugs, garbled screaming and obscure sentences and static.
+
+15
+00:02:12.600 --> 00:02:17.000
+The path dead-ends, stopping in the middle of no-where above the infinite drop.
+
+16
+00:02:17.600 --> 00:02:22.000
+Proog turns around as the birds reach them and begin to dive-bomb at them.
+
+17
+00:02:22.600 --> 00:02:28.000
+At the last moment, Proog takes out an old candlestick phone and the birds dive into the speaker piece.
+
+18
+00:02:28.600 --> 00:02:31.000
+The screen cuts to black.
+
+19
+00:02:31.600 --> 00:02:38.000
+In the next scene, Proog stands at one end of a room, suspiciously watching what is probably the same candlestick phone, which is ringing.
+
+20
+00:02:38.500 --> 00:02:41.000
+Emo watches from the other side of the room.
+
+21
+00:02:41.500 --> 00:02:43.000
+The phone continues to ring.
+
+22
+00:02:43.500 --> 00:02:48.000
+After a while Emo approaches it to answer it, but Proog slaps his hand away.
+
+23
+00:02:57.972 --> 00:02:59.100
+Proog takes the ear-piece off the hook.
+
+24
+00:03:13.500 --> 00:03:18.054
+The phone speaker revealed a mass of clawed, fleshy polyps which scream and gibber obscenely.
+
+25
+00:03:25.000 --> 00:03:33.000
+There is a solemn silence as Emo looks around the room and the technical objects therein.
+
+26
+00:03:38.000 --> 00:03:44.000
+Emo laughs disbelievingly and Proog walks away.
+
+27
+00:03:46.000 --> 00:03:54.000
+In the next scene, the two enter another massive black room.
+
+28
+00:03:54.500 --> 00:04:04.000
+There is no path, the entry platform is the only structure that seems to be there except for another exit, lit distantly at the far side.
+
+29
+00:04:04.500 --> 00:04:14.000
+Proog takes a step forward into the void, and his feet are suddenly caught by giant typewriter arms that rocket up out of the blackness to catch his feet as he dances across mid-air.
+
+30
+00:04:14.500 --> 00:04:22.000
+Emo follows Proog with somewhat less enthusiasm as the older man leads the way.
+
+31
+00:04:52.000 --> 00:04:58.000
+They reach the end of the room and go through a hall into a small compartment.
+
+32
+00:05:02.000 --> 00:05:06.000
+Proog presses a button, and the door shuts.
+
+33
+00:05:06.500 --> 00:05:09.000
+It is an elevator.
+
+34
+00:05:09.500 --> 00:05:24.000
+The elevator lurches suddenly as it is grabbed by a giant mechanical arm and thrown upwards, rushing up through an ever-widening tunnel.
+
+35
+00:05:26.500 --> 00:05:32.000
+When it begins to slow down, another arm grabs the capsule and throws it even further up.
+
+36
+00:05:32.500 --> 00:05:40.000
+As it moves up, the walls unlock and fall away, leaving only the floor with the two on it, rushing higher and higher.
+
+37
+00:05:54.500 --> 00:05:59.000
+They exit the tunnel into a black sky and the platform reaches the peak of its arc.
+
+38
+00:06:19.500 --> 00:06:26.000
+The elevator begins to drop down another shaft, coming to rest as it slams into the floor of another room and bringing the two to a level stop.
+
+39
+00:06:26.500 --> 00:06:28.000
+A camera flashes.
+
+40
+00:06:28.010 --> 00:06:34.000
+They are in a large, dingy room filled with strange, generator-like devices and dotted with boxy holographic projectors.
+
+41
+00:06:34.500 --> 00:06:38.000
+One of them is projecting a portion of wall with a door in it right beside them.
+
+42
+00:06:38.500 --> 00:06:40.000
+The door seems harmless enough.
+
+43
+00:06:42.800 --> 00:06:45.100
+From behind the door comes light music.
+
+44
+00:06:56.000 --> 00:07:00.100
+Proog presses a button on his cane, which changes the holograph to another wall.
+
+45
+00:07:05.100 --> 00:07:11.000
+Proog finishes the wall, and boxes them into a Safe Room, out of the view of anything outside.
+
+46
+00:07:39.000 --> 00:07:42.500
+Proog slaps him, trying to bring him to his senses.
+
+47
+00:07:45.000 --> 00:07:52.000
+Emo storms away down the length of the room towards a wall he apparently cannot see and the wall begins to move, extending the length of the room.
+
+48
+00:08:00.000 --> 00:08:07.000
+The walls begin to discolour and mechanical roots start tearing through the walls to his left.
+
+49
+00:08:07.010 --> 00:08:09.000
+The roots move forwards toward Proog.
+
+50
+00:08:22.000 --> 00:08:31.000
+The rest of the safety wall crumples away as a pair of massive hands heave out of the ground and begin to attack.
+
+51
+00:08:31.010 --> 00:08:37.000
+Proog is knocked down by the shockwave, while Emo turns and begins to walk away, waving his finger around his temple in the 'crazy' sign.
+
+52
+00:08:37.010 --> 00:08:44.000
+In a last effort, Proog extricates himself from the tentacle roots, and cracks Emo over the back of the head with his cane.
+
+53
+00:08:44.500 --> 00:08:51.000
+As Emo collapses, everything falls away, and Proog and Emo are left in one tiny patch of light in the middle of blackness.
+
+54
+00:09:00.000 --> 00:09:20.000
+The scene fades to black while panning over a pile of tentacle roots lying on the ground.
+
+55
+00:09:26.000 --> 00:09:28.000
+Credits begin:
+
+56
+00:09:28.500 --> 00:09:35.000
+Orange Open Movie Team
+Director: Bassum Kurdali
+Art Director: Andreas Goralczyk
+
+57
+00:09:35.500 --> 00:09:39.000
+Music and Sound Design: Jan Morgenstern
+
+58
+00:09:39.500 --> 00:09:44.000
+Emo: Cas Jansen
+Proog: Tygo Gernandt
+
+59
+00:09:44.500 --> 00:09:50.000
+Screenplay: Pepijn Zwanenberg
+Original Concept & Scenario: Andreas Goralczyk, Bassam Kurdali, Ton Roosendaal
+
+60
+00:09:50.500 --> 00:10:24.000
+More people for
+Additional Artwork and Animation
+Texture Photography
+Software Development
+3D Modelling, Animation, Rendering, Compiling Software
+Special Thanks to Open Source Projects
+Rendering Services Provided
+Hardware  Sponsored
+Casting
+Sound FX, Foley, Dialogue Editing, Audio Mix and Post
+Voice Recording
+HDCam conversion
+Netherlands Media Art Institute Staff
+Blender Foundation Staff
+
+61
+00:10:24.500 --> 00:10:30.000
+Many Thanks to our Donation and DVD sponsors
+
+62
+00:10:30.500 --> 00:10:47.000
+Elephants Dream has been realised with financial support from
+The Netherlands Film Fund
+Mondriaan Foundation
+VSBfonds
+Uni-Verse / EU Sixth Framework Programme
+
+63
+00:10:47.500 --> 00:10:53.000
+Produced By
+Ton Roosendaal
+Copyright 2006
+Netherlands Media Art Institute / Montevideo
+Blender Foundation
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" />
+  <title>Video.js Text Descriptions, Chapters &amp; Captions Example</title>
+
+  <link href="../../video-js.css" rel="stylesheet" type="text/css">
+
+  <script src="../../video.js"></script>
+
+  <!-- Set the location of the flash SWF -->
+  <script>
+    videojs.setGlobalOptions({
+      flash: {
+        swf: '../../video-js.swf'
+      }
+    });
+  </script>
+
+</head>
+<body>
+  <p style="background-color:#eee; border: 1px solid #777; padding: 10px; font-size: .8em; line-height: 1.5em; font-family: Verdana, sans-serif;">This page demonstrates a text descriptions track (intended primarily for blind and visually impaired consumers of visual media)</p>
+
+  <!-- NOTE: we have to disable native Text Track support for the HTML5 tech,
+             since even HTML5 video players with native Text Track support
+             don't currently support 'description' text tracks in any
+             useful way! -->
+  <video id="example_video_1" class="video-js vjs-default-skin" controls preload="none" width="640" height="360"
+      data-setup='{ "html5" : { "nativeTextTracks" : false } }'>
+    <source src="https://archive.org/download/ElephantsDream/ed_hd.mp4" type="video/mp4">
+    <source src="https://archive.org/download/ElephantsDream/ed_hd.ogv" type="video/ogv">
+
+    <track kind="captions" src="captions.en.vtt" srclang="en" label="English" default></track><!-- Tracks need an ending tag thanks to IE9 -->
+    <track kind="captions" src="captions.sv.vtt" srclang="sv" label="Swedish"></track>
+    <track kind="captions" src="captions.ru.vtt" srclang="ru" label="Russian"></track>
+    <track kind="captions" src="captions.ja.vtt" srclang="ja" label="Japanese"></track>
+    <track kind="captions" src="captions.ar.vtt" srclang="ar" label="Arabic"></track>
+
+    <track kind="descriptions" src="descriptions.en.vtt" srclang="en" label="English"></track>
+
+    <track kind="chapters" src="chapters.en.vtt" srclang="en" label="English"></track>
+
+    <p class="vjs-no-js">To view this video please enable JavaScript, and consider upgrading to a web browser that <a href="http://videojs.com/html5-video-support/" target="_blank">supports HTML5 video</a></p>
+  </video>
+</body>
+</html>
@@ -1,37 +1,27 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
+
 <head>
-  <title>Video.js | HTML5 Video Player</title>

-  <!-- Chang URLs to wherever Video.js files will be hosted -->
-  <!-- Default URLs assume the examples folder is included alongside video.js -->
-  <link href="../../video-js.min.css" rel="stylesheet" type="text/css">
-
-  <!-- Include ES5 shim, sham and html5 shiv for ie8 support  -->
-  <!-- Exclude this if you don't need ie8 support -->
-  <script src="../../ie8/videojs-ie8.min.js"></script>
-
-  <!-- video.js must be in the <head> for older IEs to work. -->
-  <script src="../../video.min.js"></script>
-
-  <!-- Unless using the CDN hosted version, update the URL to the Flash SWF -->
-  <script>
-    videojs.options.flash.swf = "../../video-js.swf";
-  </script>
+    <title>Video.js | HTML5 Video Player</title>
+    <link href="http://vjs.zencdn.net/5.0.2/video-js.css" rel="stylesheet">
+    <script src="http://vjs.zencdn.net/ie8/1.1.0/videojs-ie8.min.js"></script>
+    <script src="http://vjs.zencdn.net/5.0.2/video.js"></script>

 </head>
+
 <body>

-  <video id="example_video_1" class="video-js vjs-default-skin" controls preload="none" width="640" height="264"
-      poster="http://video-js.zencoder.com/oceans-clip.png"
-      data-setup="{}">
-    <source src="http://video-js.zencoder.com/oceans-clip.mp4" type='video/mp4' />
-    <source src="http://video-js.zencoder.com/oceans-clip.webm" type='video/webm' />
-    <source src="http://video-js.zencoder.com/oceans-clip.ogv" type='video/ogg' />
-    <track kind="captions" src="../shared/example-captions.vtt" srclang="en" label="English"></track><!-- Tracks need an ending tag thanks to IE9 -->
-    <track kind="subtitles" src="../shared/example-captions.vtt" srclang="en" label="English"></track><!-- Tracks need an ending tag thanks to IE9 -->
+  <video id="example_video_1" class="video-js vjs-default-skin" controls preload="none" width="640" height="264" poster="http://vjs.zencdn.net/v/oceans.png" data-setup="{}">
+    <source src="http://vjs.zencdn.net/v/oceans.mp4" type="video/mp4">
+    <source src="http://vjs.zencdn.net/v/oceans.webm" type="video/webm">
+    <source src="http://vjs.zencdn.net/v/oceans.ogv" type="video/ogg">
+    <track kind="captions" src="../shared/example-captions.vtt" srclang="en" label="English"></track>
+    <!-- Tracks need an ending tag thanks to IE9 -->
+    <track kind="subtitles" src="../shared/example-captions.vtt" srclang="en" label="English"></track>
+    <!-- Tracks need an ending tag thanks to IE9 -->
    <p class="vjs-no-js">To view this video please enable JavaScript, and consider upgrading to a web browser that <a href="http://videojs.com/html5-video-support/" target="_blank">supports HTML5 video</a></p>
  </video>
-
 </body>
+
 </html>
@@ -17,7 +17,7 @@ Wait Until the Player is Ready
 ------------------------------
 The time it takes Video.js to set up the video and API will vary depending on the playback technology being used (HTML5 will often be much faster to load than Flash). For that reason we want to use the player's 'ready' function to trigger any code that requires the player's API.

-```javascript
+```js
 videojs("example_video_1").ready(function(){
  var myPlayer = this;

@@ -0,0 +1,69 @@
+# Audio Tracks
+
+Audio Tracks are a function of HTML5 video for providing alternative audio track selections to the user, so that a track other than the main track can be played. Video.js makes audio tracks work across all browsers. There are currently five types of tracks:
+
+- **Alternative**: alternative audio for the main video track
+- **Descriptions**: descriptions of what is happening in the video track
+- **Main**: the main audio track for this video
+- **Translation**: a translation of the main audio track
+- **Commentary**: commentary on the video, usually the director of the content talking about design choices
+
+## Missing Funtionality
+- It is currently impossible to add AudioTracks in a non-programtic way
+- Literal switching of AudioTracks for playback is not handled by video.js and must be handled by something else. video.js only stores the track representation
+
+## Adding to Video.js
+
+> Right now adding audio tracks in the HTML is unsupported. Audio Tracks must be added programatically.
+
+You must add audio tracks [programatically](#api) for the time being.
+
+## Attributes
+Audio Track propertites and settings
+
+### kind
+One of the five track types listed above. Kind defaults to empty string if no kind is included, or an invalid kind is used.
+
+### label
+The label for the track that will be show to the user, for example in a menu that list the different languages available for audio tracks.
+
+### language
+The two-letter code (valid BCP 47 language tag) for the language of the audio track, for example "en" for English. A list of language codes is [available here](languages.md#language-codes).
+
+### enabled
+If this track should be playing or not. In video.js we only allow one track to be enabled at a time. so if you enable more than one the last one to be enabled will end up being the only one.
+
+## Interacting with Audio Tracks
+### Doing something when a track becomes enabled
+When a new track is enabled (other than the main track) an event is fired on the `AudioTrackList` called `change` you can listen to that event and do something with it.
+Here's an example:
+```js
+// get the current players AudioTrackList object
+let tracks = player.audioTracks();
+
+// listen to the change event
+tracks.addEventListener('change', function() {
+
+  // print the currently enabled AudioTrack label
+  for (let i = 0; i < tracks.length; i++) {
+    let track = tracks[i];
+
+    if (track.enabled) {
+      console.log(track.label);
+      return;
+    }
+  }
+});
+```
+
+## API
+
+### `player.audioTracks() -> AudioTrackList`
+This is the main interface into the audio tracks of the player.
+It returns an AudioTrackList which is an array like object that contains all the `AudioTrack` on the player.
+
+### `player.audioTracks().addTrack(AudioTrack)`
+Add an existing AudioTrack to the players internal list of AudioTracks.
+
+### `player.audioTracks().removeTrack(AudioTrack)`
+Remove a track from the AudioTrackList currently on the player. if no track exists this will do nothing.
@@ -41,19 +41,46 @@ Player
    BigPlayButton
    ControlBar
        PlayToggle
-        FullscreenToggle
-        CurrentTimeDisplay
-        TimeDivider
-        DurationDisplay
-        RemainingTimeDisplay
+        VolumeMenuButton
+        CurrentTimeDisplay (Hidden by default)
+        TimeDivider (Hidden by default)
+        DurationDisplay (Hidden by default)
        ProgressControl
            SeekBar
              LoadProgressBar
+              MouseTimeDisplay
              PlayProgressBar
-              SeekHandle
-        VolumeControl
-            VolumeBar
-                VolumeLevel
-                VolumeHandle
-        MuteToggle
+        LiveDisplay (Hidden by default)
+        RemainingTimeDisplay
+        CustomControlsSpacer (No UI)
+        ChaptersButton (Hidden by default)
+        SubtitlesButton (Hidden by default)
+        CaptionsButton (Hidden by default)
+        FullscreenToggle
+    ErrorDisplay
+    TextTrackSettings
+```
+
+## Progress Control
+The progress control is made up of the SeekBar. The seekbar contains the load progress bar
+and the play progress bar. In addition, it contains the Mouse Time Display which
+is used to display the time tooltip that follows the mouse cursor.
+The play progress bar also has a time tooltip that show the current time.
+
+By default, the progress control is sandwiched between the volume menu button and
+the remaining time display inside the control bar, but in some cases, a skin would
+want to move the progress control above the control bar and have it span the full
+width of the player, in those cases, it is less than ideal to have the tooltips
+get cut off or leave the bounds of the player. This can be prevented by setting the
+`keepTooltipsInside` option on the progress control. This also makes the tooltips use 
+a real element instead of pseudo elements so targetting them with css will be different.
+
+```js
+let player = videojs('myplayer', {
+  controlBar: {
+    progressControl: {
+      keepTooltipsInside: true
+    }
+  }
+});
 ```
@@ -5,7 +5,11 @@ Multiple language support allows for users of non-English locales to natively in

 Creating the Language File
 --------------------------
-Video.js uses key/value object dictionaries in JSON form. A sample dictionary for Spanish `['es']` would look as follows;
+Video.js uses key/value object dictionaries in JSON form.
+
+An English lang file is at [/lang/en.json](https://github.com/videojs/video.js/tree/master/lang/en.json) which should be used as a template for new files. This will be kept up to date with strings in the core player that need localizations.
+
+A sample dictionary for Spanish `['es']` would look as follows:

 ```JSON
 {
@@ -21,13 +25,14 @@ Video.js uses key/value object dictionaries in JSON form. A sample dictionary fo
  "Fullscreen": "Pantalla completa",
  "Non-Fullscreen": "Pantalla no completa",
  "Mute": "Silenciar",
-  "Unmuted": "No silenciado",
+  "Unmute": "No silenciado",
  "Playback Rate": "Velocidad de reproducción",
  "Subtitles": "Subtítulos",
  "subtitles off": "Subtítulos desactivados",
  "Captions": "Subtítulos especiales",
  "captions off": "Subtítulos especiales desactivados",
  "Chapters": "Capítulos",
+  "Close Modal Dialog": "Cerca de diálogo modal",
  "You aborted the video playback": "Ha interrumpido la reproducción del vídeo.",
  "A network error caused the video download to fail part-way.": "Un error de red ha interrumpido la descarga del vídeo.",
  "The video could not be loaded, either because the server or network failed or because the format is not supported.": "No se ha podido cargar el vídeo debido a un fallo de red o del servidor o porque el formato es incompatible.",
@@ -38,7 +43,7 @@ Video.js uses key/value object dictionaries in JSON form. A sample dictionary fo

 Notes:

- The file name should always be in the format `XX.json`, where `XX` is the two letter value of the language reported to the browser (for options see the bottom of this document).
+- The file name should always be in the format `XX.json`, where `XX` is the language code. This should be a two letter code (for options see the bottom of this document) except for cases where a more specific code with sub-code is appropriate, e.g. `zh-CN.lang`.
 - For automatic inclusion at build time, add your language file to the `/lang` directory (see 'Adding Languages to Video.js below').

 Adding Languages to Video.js
@@ -69,13 +74,14 @@ NOTE: These need to be added after the core Video.js script.
    "Fullscreen": "Pantalla completa",
    "Non-Fullscreen": "Pantalla no completa",
    "Mute": "Silenciar",
-    "Unmuted": "No silenciado",
+    "Unmute": "No silenciado",
    "Playback Rate": "Velocidad de reproducción",
    "Subtitles": "Subtítulos",
    "subtitles off": "Subtítulos desactivados",
    "Captions": "Subtítulos especiales",
    "captions off": "Subtítulos especiales desactivados",
    "Chapters": "Capítulos",
+    "Close Modal Dialog": "Cerca de diálogo modal",
    "You aborted the video playback": "Ha interrumpido la reproducción del vídeo.",
    "A network error caused the video download to fail part-way.": "Un error de red ha interrumpido la descarga del vídeo.",
    "The video could not be loaded, either because the server or network failed or because the format is not supported.": "No se ha podido cargar el vídeo debido a un fallo de red o del servidor o porque el formato es incompatible.",
@@ -89,12 +95,12 @@ NOTE: These need to be added after the core Video.js script.
 3. During a Video.js player instantiation. Adding the languages to the configuration object provided in the `data-setup` attribute.

 ```html
-<video id="example_video_1" class="video-js vjs-default-skin"  
-  controls preload="auto" width="640" height="264"  
-  data-setup='{"languages":{"es":{"Play":"Juego"}}}'>  
- <source src="http://video-js.zencoder.com/oceans-clip.mp4" type='video/mp4' />  
- <source src="http://video-js.zencoder.com/oceans-clip.webm" type='video/webm' />  
- <source src="http://video-js.zencoder.com/oceans-clip.ogv" type='video/ogg' />  
+<video id="example_video_1" class="video-js vjs-default-skin"
+  controls preload="auto" width="640" height="264"
+  data-setup='{"languages":{"es":{"Play":"Juego"}}}'>
+ <source src="http://video-js.zencoder.com/oceans-clip.mp4" type='video/mp4' />
+ <source src="http://video-js.zencoder.com/oceans-clip.webm" type='video/webm' />
+ <source src="http://video-js.zencoder.com/oceans-clip.ogv" type='video/ogg' />

 <track kind="captions" src="http://example.com/path/to/captions.vtt" srclang="en" label="English" default>

@@ -110,12 +116,12 @@ Setting Default Language in a Video.js Player
 During a Video.js player instantiation you can force it to localize to a specific language by including the locale value into the configuration object via the `data-setup` attribute. Valid options listed at the bottom of the page for reference.

 ```html
-<video id="example_video_1" class="video-js vjs-default-skin"  
-  controls preload="auto" width="640" height="264"  
-  data-setup='{"language":"es"}'>  
- <source src="http://video-js.zencoder.com/oceans-clip.mp4" type='video/mp4' />  
- <source src="http://video-js.zencoder.com/oceans-clip.webm" type='video/webm' />  
- <source src="http://video-js.zencoder.com/oceans-clip.ogv" type='video/ogg' />  
+<video id="example_video_1" class="video-js vjs-default-skin"
+  controls preload="auto" width="640" height="264"
+  data-setup='{"language":"es"}'>
+ <source src="http://video-js.zencoder.com/oceans-clip.mp4" type='video/mp4' />
+ <source src="http://video-js.zencoder.com/oceans-clip.webm" type='video/webm' />
+ <source src="http://video-js.zencoder.com/oceans-clip.ogv" type='video/ogg' />

 <track kind="captions" src="http://example.com/path/to/captions.vtt" srclang="en" label="English" default>

@@ -125,14 +131,14 @@ During a Video.js player instantiation you can force it to localize to a specifi
 Determining Player Language
 ---------------------------

-The player language is set to one of the following in descending priority
+The player language is set to one of the following in descending priority:

-* The language set in setup options as above
-* The document language (`lang` attribute of the `html` element)
-* Browser language preference
+* The language specified in setup options as above
+* The language specified by the closet element with a `lang` attribute. This could be the player itself or a parent element. Usually the document language is specified on the `html` tag.
+* Browser language preference (the first language if more than one is configured)
 * 'en'

-That can be overridden after instantiation with `language('fr')`.
+The player language can be change after instantiation with `language('fr')`. However localizable text will not be modified by doing this, for best results set the language beforehand.

 Language selection
 ------------------
@@ -145,7 +151,7 @@ Localization in Plugins

 When you're developing a plugin, you can also introduce new localized strings. Simply wrap the string with the player's `localize` function:

-```javascript
+```js
 var details = '<div class="vjs-errors-details">' + player.localize('Technical details') + '</div>';
 ```

@@ -153,179 +159,157 @@ Language Codes
 --------------
 The following is a list of official language codes.

-**NOTE:** For supported language translations, please see the [Languages Folder (/lang)](../../lang) folder located in the project root.
+**NOTE:** For supported language translations, please see the [Languages Folder (/lang)](https://github.com/videojs/video.js/tree/master/lang) folder located in the project root.

 <table border="0" cellspacing="5" cellpadding="5">
  <tr>
-    <td>
-
-      <table>
-        <tr><th>ab<th><td>Abkhazian</td></tr>
-        <tr><th>aa<th><td>Afar</td></tr>
-        <tr><th>af<th><td>Afrikaans</td></tr>
-        <tr><th>sq<th><td>Albanian</td></tr>
-        <tr><th>am<th><td>Amharic</td></tr>
-        <tr><th>ar<th><td>Arabic</td></tr>
-        <tr><th>an<th><td>Aragonese</td></tr>
-        <tr><th>hy<th><td>Armenian</td></tr>
-        <tr><th>as<th><td>Assamese</td></tr>
-        <tr><th>ay<th><td>Aymara</td></tr>
-        <tr><th>az<th><td>Azerbaijani</td></tr>
-        <tr><th>ba<th><td>Bashkir</td></tr>
-        <tr><th>eu<th><td>Basque</td></tr>
-        <tr><th>bn<th><td>Bengali (Bangla)</td></tr>
-        <tr><th>dz<th><td>Bhutani</td></tr>
-        <tr><th>bh<th><td>Bihari</td></tr>
-        <tr><th>bi<th><td>Bislama</td></tr>
-        <tr><th>br<th><td>Breton</td></tr>
-        <tr><th>bg<th><td>Bulgarian</td></tr>
-        <tr><th>my<th><td>Burmese</td></tr>
-        <tr><th>be<th><td>Byelorussian (Belarusian)</td></tr>
-        <tr><th>km<th><td>Cambodian</td></tr>
-        <tr><th>ca<th><td>Catalan</td></tr>
-        <tr><th>zh<th><td>Chinese (Simplified)</td></tr>
-        <tr><th>zh<th><td>Chinese (Traditional)</td></tr>
-        <tr><th>co<th><td>Corsican</td></tr>
-        <tr><th>hr<th><td>Croatian</td></tr>
-        <tr><th>cs<th><td>Czech</td></tr>
-        <tr><th>da<th><td>Danish</td></tr>
-        <tr><th>nl<th><td>Dutch</td></tr>
-        <tr><th>en<th><td>English</td></tr>
-        <tr><th>eo<th><td>Esperanto</td></tr>
-        <tr><th>et<th><td>Estonian</td></tr>
-        <tr><th>fo<th><td>Faeroese</td></tr>
-        <tr><th>fa<th><td>Farsi</td></tr>
-        <tr><th>fj<th><td>Fiji</td></tr>
-        <tr><th>fi<th><td>Finnish</td></tr>
-      </table>
-
-    </td>
-    <td>
-
-      <table>
-        <tr><th>fr<th><td>French</td></tr>
-        <tr><th>fy<th><td>Frisian</td></tr>
-        <tr><th>gl<th><td>Galician</td></tr>
-        <tr><th>gd<th><td>Gaelic (Scottish)</td></tr>
-        <tr><th>gv<th><td>Gaelic (Manx)</td></tr>
-        <tr><th>ka<th><td>Georgian</td></tr>
-        <tr><th>de<th><td>German</td></tr>
-        <tr><th>el<th><td>Greek</td></tr>
-        <tr><th>kl<th><td>Greenlandic</td></tr>
-        <tr><th>gn<th><td>Guarani</td></tr>
-        <tr><th>gu<th><td>Gujarati</td></tr>
-        <tr><th>ht<th><td>Haitian Creole</td></tr>
-        <tr><th>ha<th><td>Hausa</td></tr>
-        <tr><th>he<th><td>Hebrew</td></tr>
-        <tr><th>hi<th><td>Hindi</td></tr>
-        <tr><th>hu<th><td>Hungarian</td></tr>
-        <tr><th>is<th><td>Icelandic</td></tr>
-        <tr><th>io<th><td>Ido</td></tr>
-        <tr><th>id<th><td>Indonesian</td></tr>
-        <tr><th>ia<th><td>Interlingua</td></tr>
-        <tr><th>ie<th><td>Interlingue</td></tr>
-        <tr><th>iu<th><td>Inuktitut</td></tr>
-        <tr><th>ik<th><td>Inupiak</td></tr>
-        <tr><th>ga<th><td>Irish</td></tr>
-        <tr><th>it<th><td>Italian</td></tr>
-        <tr><th>ja<th><td>Japanese</td></tr>
-        <tr><th>jv<th><td>Javanese</td></tr>
-        <tr><th>kn<th><td>Kannada</td></tr>
-        <tr><th>ks<th><td>Kashmiri</td></tr>
-        <tr><th>kk<th><td>Kazakh</td></tr>
-        <tr><th>rw<th><td>Kinyarwanda (Ruanda)</td></tr>
-        <tr><th>ky<th><td>Kirghiz</td></tr>
-        <tr><th>rn<th><td>Kirundi (Rundi)</td></tr>
-        <tr><th>ko<th><td>Korean</td></tr>
-        <tr><th>ku<th><td>Kurdish</td></tr>
-        <tr><th>lo<th><td>Laothian</td></tr>
-        <tr><th>la<th><td>Latin</td></tr>
-      </table>
-
-    </td>
-    <td>
-
-      <table>
-        <tr><th>lv<th><td>Latvian (Lettish)</td></tr>
-        <tr><th>li<th><td>Limburgish ( Limburger)</td></tr>
-        <tr><th>ln<th><td>Lingala</td></tr>
-        <tr><th>lt<th><td>Lithuanian</td></tr>
-        <tr><th>mk<th><td>Macedonian</td></tr>
-        <tr><th>mg<th><td>Malagasy</td></tr>
-        <tr><th>ms<th><td>Malay</td></tr>
-        <tr><th>ml<th><td>Malayalam</td></tr>
-        <tr><th>mt<th><td>Maltese</td></tr>
-        <tr><th>mi<th><td>Maori</td></tr>
-        <tr><th>mr<th><td>Marathi</td></tr>
-        <tr><th>mo<th><td>Moldavian</td></tr>
-        <tr><th>mn<th><td>Mongolian</td></tr>
-        <tr><th>na<th><td>Nauru</td></tr>
-        <tr><th>ne<th><td>Nepali</td></tr>
-        <tr><th>no<th><td>Norwegian</td></tr>
-        <tr><th>oc<th><td>Occitan</td></tr>
-        <tr><th>or<th><td>Oriya</td></tr>
-        <tr><th>om<th><td>Oromo (Afan, Galla)</td></tr>
-        <tr><th>ps<th><td>Pashto (Pushto)</td></tr>
-        <tr><th>pl<th><td>Polish</td></tr>
-        <tr><th>pt<th><td>Portuguese</td></tr>
-        <tr><th>pa<th><td>Punjabi</td></tr>
-        <tr><th>qu<th><td>Quechua</td></tr>
-        <tr><th>rm<th><td>Rhaeto-Romance</td></tr>
-        <tr><th>ro<th><td>Romanian</td></tr>
-        <tr><th>ru<th><td>Russian</td></tr>
-        <tr><th>sm<th><td>Samoan</td></tr>
-        <tr><th>sg<th><td>Sangro</td></tr>
-        <tr><th>sa<th><td>Sanskrit</td></tr>
-        <tr><th>sr<th><td>Serbian</td></tr>
-        <tr><th>sh<th><td>Serbo-Croatian</td></tr>
-        <tr><th>st<th><td>Sesotho</td></tr>
-        <tr><th>tn<th><td>Setswana</td></tr>
-        <tr><th>sn<th><td>Shona</td></tr>
-        <tr><th>ii<th><td>Sichuan Yi</td></tr>
-        <tr><th>sd<th><td>Sindhi</td></tr>
-      </table>
-
-    </td>
-    <td>
-
-      <table>
-        <tr><th>si<th><td>Sinhalese</td></tr>
-        <tr><th>ss<th><td>Siswati</td></tr>
-        <tr><th>sk<th><td>Slovak</td></tr>
-        <tr><th>sl<th><td>Slovenian</td></tr>
-        <tr><th>so<th><td>Somali</td></tr>
-        <tr><th>es<th><td>Spanish</td></tr>
-        <tr><th>su<th><td>Sundanese</td></tr>
-        <tr><th>sw<th><td>Swahili (Kiswahili)</td></tr>
-        <tr><th>sv<th><td>Swedish</td></tr>
-        <tr><th>tl<th><td>Tagalog</td></tr>
-        <tr><th>tg<th><td>Tajik</td></tr>
-        <tr><th>ta<th><td>Tamil</td></tr>
-        <tr><th>tt<th><td>Tatar</td></tr>
-        <tr><th>te<th><td>Telugu</td></tr>
-        <tr><th>th<th><td>Thai</td></tr>
-        <tr><th>bo<th><td>Tibetan</td></tr>
-        <tr><th>ti<th><td>Tigrinya</td></tr>
-        <tr><th>to<th><td>Tonga</td></tr>
-        <tr><th>ts<th><td>Tsonga</td></tr>
-        <tr><th>tr<th><td>Turkish</td></tr>
-        <tr><th>tk<th><td>Turkmen</td></tr>
-        <tr><th>tw<th><td>Twi</td></tr>
-        <tr><th>ug<th><td>Uighur</td></tr>
-        <tr><th>uk<th><td>Ukrainian</td></tr>
-        <tr><th>ur<th><td>Urdu</td></tr>
-        <tr><th>uz<th><td>Uzbek</td></tr>
-        <tr><th>vi<th><td>Vietnamese</td></tr>
-        <tr><th>vo<th><td>Volapük</td></tr>
-        <tr><th>wa<th><td>Wallon</td></tr>
-        <tr><th>cy<th><td>Welsh</td></tr>
-        <tr><th>wo<th><td>Wolof</td></tr>
-        <tr><th>xh<th><td>Xhosa</td></tr>
-        <tr><th>yi<th><td>Yiddish</td></tr>
-        <tr><th>yo<th><td>Yoruba</td></tr>
-        <tr><th>zu<th><td>Zulu</td></tr>
-      </table>
-
-    </td>
+    <table>
+      <tr><th>ab<th><td>Abkhazian</td></tr>
+      <tr><th>aa<th><td>Afar</td></tr>
+      <tr><th>af<th><td>Afrikaans</td></tr>
+      <tr><th>sq<th><td>Albanian</td></tr>
+      <tr><th>am<th><td>Amharic</td></tr>
+      <tr><th>ar<th><td>Arabic</td></tr>
+      <tr><th>an<th><td>Aragonese</td></tr>
+      <tr><th>hy<th><td>Armenian</td></tr>
+      <tr><th>as<th><td>Assamese</td></tr>
+      <tr><th>ay<th><td>Aymara</td></tr>
+      <tr><th>az<th><td>Azerbaijani</td></tr>
+      <tr><th>ba<th><td>Bashkir</td></tr>
+      <tr><th>eu<th><td>Basque</td></tr>
+      <tr><th>bn<th><td>Bengali (Bangla)</td></tr>
+      <tr><th>dz<th><td>Bhutani</td></tr>
+      <tr><th>bh<th><td>Bihari</td></tr>
+      <tr><th>bi<th><td>Bislama</td></tr>
+      <tr><th>br<th><td>Breton</td></tr>
+      <tr><th>bg<th><td>Bulgarian</td></tr>
+      <tr><th>my<th><td>Burmese</td></tr>
+      <tr><th>be<th><td>Byelorussian (Belarusian)</td></tr>
+      <tr><th>km<th><td>Cambodian</td></tr>
+      <tr><th>ca<th><td>Catalan</td></tr>
+      <tr><th>zh<th><td>Chinese (Simplified)</td></tr>
+      <tr><th>zh<th><td>Chinese (Traditional)</td></tr>
+      <tr><th>co<th><td>Corsican</td></tr>
+      <tr><th>hr<th><td>Croatian</td></tr>
+      <tr><th>cs<th><td>Czech</td></tr>
+      <tr><th>da<th><td>Danish</td></tr>
+      <tr><th>nl<th><td>Dutch</td></tr>
+      <tr><th>en<th><td>English</td></tr>
+      <tr><th>eo<th><td>Esperanto</td></tr>
+      <tr><th>et<th><td>Estonian</td></tr>
+      <tr><th>fo<th><td>Faeroese</td></tr>
+      <tr><th>fa<th><td>Farsi</td></tr>
+      <tr><th>fj<th><td>Fiji</td></tr>
+      <tr><th>fi<th><td>Finnish</td></tr>
+      <tr><th>fr<th><td>French</td></tr>
+      <tr><th>fy<th><td>Frisian</td></tr>
+      <tr><th>gl<th><td>Galician</td></tr>
+      <tr><th>gd<th><td>Gaelic (Scottish)</td></tr>
+      <tr><th>gv<th><td>Gaelic (Manx)</td></tr>
+      <tr><th>ka<th><td>Georgian</td></tr>
+      <tr><th>de<th><td>German</td></tr>
+      <tr><th>el<th><td>Greek</td></tr>
+      <tr><th>kl<th><td>Greenlandic</td></tr>
+      <tr><th>gn<th><td>Guarani</td></tr>
+      <tr><th>gu<th><td>Gujarati</td></tr>
+      <tr><th>ht<th><td>Haitian Creole</td></tr>
+      <tr><th>ha<th><td>Hausa</td></tr>
+      <tr><th>he<th><td>Hebrew</td></tr>
+      <tr><th>hi<th><td>Hindi</td></tr>
+      <tr><th>hu<th><td>Hungarian</td></tr>
+      <tr><th>is<th><td>Icelandic</td></tr>
+      <tr><th>io<th><td>Ido</td></tr>
+      <tr><th>id<th><td>Indonesian</td></tr>
+      <tr><th>ia<th><td>Interlingua</td></tr>
+      <tr><th>ie<th><td>Interlingue</td></tr>
+      <tr><th>iu<th><td>Inuktitut</td></tr>
+      <tr><th>ik<th><td>Inupiak</td></tr>
+      <tr><th>ga<th><td>Irish</td></tr>
+      <tr><th>it<th><td>Italian</td></tr>
+      <tr><th>ja<th><td>Japanese</td></tr>
+      <tr><th>jv<th><td>Javanese</td></tr>
+      <tr><th>kn<th><td>Kannada</td></tr>
+      <tr><th>ks<th><td>Kashmiri</td></tr>
+      <tr><th>kk<th><td>Kazakh</td></tr>
+      <tr><th>rw<th><td>Kinyarwanda (Ruanda)</td></tr>
+      <tr><th>ky<th><td>Kirghiz</td></tr>
+      <tr><th>rn<th><td>Kirundi (Rundi)</td></tr>
+      <tr><th>ko<th><td>Korean</td></tr>
+      <tr><th>ku<th><td>Kurdish</td></tr>
+      <tr><th>lo<th><td>Laothian</td></tr>
+      <tr><th>la<th><td>Latin</td></tr>
+      <tr><th>lv<th><td>Latvian (Lettish)</td></tr>
+      <tr><th>li<th><td>Limburgish ( Limburger)</td></tr>
+      <tr><th>ln<th><td>Lingala</td></tr>
+      <tr><th>lt<th><td>Lithuanian</td></tr>
+      <tr><th>mk<th><td>Macedonian</td></tr>
+      <tr><th>mg<th><td>Malagasy</td></tr>
+      <tr><th>ms<th><td>Malay</td></tr>
+      <tr><th>ml<th><td>Malayalam</td></tr>
+      <tr><th>mt<th><td>Maltese</td></tr>
+      <tr><th>mi<th><td>Maori</td></tr>
+      <tr><th>mr<th><td>Marathi</td></tr>
+      <tr><th>mo<th><td>Moldavian</td></tr>
+      <tr><th>mn<th><td>Mongolian</td></tr>
+      <tr><th>na<th><td>Nauru</td></tr>
+      <tr><th>ne<th><td>Nepali</td></tr>
+      <tr><th>no<th><td>Norwegian</td></tr>
+      <tr><th>oc<th><td>Occitan</td></tr>
+      <tr><th>or<th><td>Oriya</td></tr>
+      <tr><th>om<th><td>Oromo (Afan, Galla)</td></tr>
+      <tr><th>ps<th><td>Pashto (Pushto)</td></tr>
+      <tr><th>pl<th><td>Polish</td></tr>
+      <tr><th>pt<th><td>Portuguese</td></tr>
+      <tr><th>pa<th><td>Punjabi</td></tr>
+      <tr><th>qu<th><td>Quechua</td></tr>
+      <tr><th>rm<th><td>Rhaeto-Romance</td></tr>
+      <tr><th>ro<th><td>Romanian</td></tr>
+      <tr><th>ru<th><td>Russian</td></tr>
+      <tr><th>sm<th><td>Samoan</td></tr>
+      <tr><th>sg<th><td>Sangro</td></tr>
+      <tr><th>sa<th><td>Sanskrit</td></tr>
+      <tr><th>sr<th><td>Serbian</td></tr>
+      <tr><th>sh<th><td>Serbo-Croatian</td></tr>
+      <tr><th>st<th><td>Sesotho</td></tr>
+      <tr><th>tn<th><td>Setswana</td></tr>
+      <tr><th>sn<th><td>Shona</td></tr>
+      <tr><th>ii<th><td>Sichuan Yi</td></tr>
+      <tr><th>sd<th><td>Sindhi</td></tr>
+      <tr><th>si<th><td>Sinhalese</td></tr>
+      <tr><th>ss<th><td>Siswati</td></tr>
+      <tr><th>sk<th><td>Slovak</td></tr>
+      <tr><th>sl<th><td>Slovenian</td></tr>
+      <tr><th>so<th><td>Somali</td></tr>
+      <tr><th>es<th><td>Spanish</td></tr>
+      <tr><th>su<th><td>Sundanese</td></tr>
+      <tr><th>sw<th><td>Swahili (Kiswahili)</td></tr>
+      <tr><th>sv<th><td>Swedish</td></tr>
+      <tr><th>tl<th><td>Tagalog</td></tr>
+      <tr><th>tg<th><td>Tajik</td></tr>
+      <tr><th>ta<th><td>Tamil</td></tr>
+      <tr><th>tt<th><td>Tatar</td></tr>
+      <tr><th>te<th><td>Telugu</td></tr>
+      <tr><th>th<th><td>Thai</td></tr>
+      <tr><th>bo<th><td>Tibetan</td></tr>
+      <tr><th>ti<th><td>Tigrinya</td></tr>
+      <tr><th>to<th><td>Tonga</td></tr>
+      <tr><th>ts<th><td>Tsonga</td></tr>
+      <tr><th>tr<th><td>Turkish</td></tr>
+      <tr><th>tk<th><td>Turkmen</td></tr>
+      <tr><th>tw<th><td>Twi</td></tr>
+      <tr><th>ug<th><td>Uighur</td></tr>
+      <tr><th>uk<th><td>Ukrainian</td></tr>
+      <tr><th>ur<th><td>Urdu</td></tr>
+      <tr><th>uz<th><td>Uzbek</td></tr>
+      <tr><th>vi<th><td>Vietnamese</td></tr>
+      <tr><th>vo<th><td>Volapük</td></tr>
+      <tr><th>wa<th><td>Wallon</td></tr>
+      <tr><th>cy<th><td>Welsh</td></tr>
+      <tr><th>wo<th><td>Wolof</td></tr>
+      <tr><th>xh<th><td>Xhosa</td></tr>
+      <tr><th>yi<th><td>Yiddish</td></tr>
+      <tr><th>yo<th><td>Yoruba</td></tr>
+      <tr><th>zu<th><td>Zulu</td></tr>
+    </table>
  </tr>
 </table>
@@ -119,7 +119,7 @@ Component Options
 You can set the options for any single player component. For instance, if you wanted to remove the `muteToggle` button, which
 is a child of `controlBar`, you can just set that component to false:

-```javascript
+```js
 var player = videojs('video-id', {
  controlBar: {
    muteToggle: false
@@ -134,5 +134,5 @@ notation.
 <video ... data-setup='{ "controlBar": { "muteToggle": false } }'></video>
 ```

-The [components guide](components.md) has an excellent breakdown of the structure of a player, you
-just need to remember to nest child components in a `children` object for each level.
+The [components guide](./components.md) has an excellent breakdown of the structure of a player, you
+just need to remember to nest child components in a `children` array for each level.
@@ -11,19 +11,23 @@ Step 1: Write Some Javascript
 -----------------------------
 You may have already done this step. Code up something interesting and then wrap it in a function. At the most basic level, that's all a video.js plugin is. By convention, plugins take a hash of options as their first argument:

+```js
    function examplePlugin(options) {
      this.on('play', function(e) {
        console.log('playback has started!');
      });
    };
+```

-When it's activated, `this` will be the Video.js player your plugin is attached to. You can use anything you'd like in the [Video.js API](api.md) when you're writing a plugin: change the `src`, mess up the DOM, or listen for and emit your own events.
+When it's activated, `this` will be the Video.js player your plugin is attached to. You can use anything you'd like in the [Video.js API](./api.md) when you're writing a plugin: change the `src`, mess up the DOM, or listen for and emit your own events.

 Step 2: Registering A Plugin
 -------------------------------
 It's time to give the rest of the world the opportunity to be awed by your genius. When your plugin is loaded, it needs to let Video.js know this amazing new functionality is now available:

+```js
    videojs.plugin('examplePlugin', examplePlugin);
+```

 From this point on, your plugin will be added to the Video.js prototype and will show up as a property on every instance created. Make sure you choose a unique name that doesn't clash with any of the properties already in Video.js. Which leads us to...

@@ -31,6 +35,7 @@ Step 3: Using A Plugin
 ----------------------
 There are two ways to initialize a plugin. If you're creating your video tag dynamically, you can specify the plugins you'd like to initialize with it and any options you want to pass to them:

+```js
    videojs('vidId', {
      plugins: {
        examplePlugin: {
@@ -38,10 +43,17 @@ There are two ways to initialize a plugin. If you're creating your video tag dyn
        }
      }
    });
+```

 If you've already initialized your video tag, you can activate a plugin at any time by calling its setup function directly:

+```js
    var video = videojs('cool-vid');
    video.examplePlugin({ exampleOption: true });
+```

 That's it. Head on over to the [Video.js wiki](https://github.com/videojs/video.js/wiki/Plugins) and add your plugin to the list so everyone else can check it out.
+
+## How should I use the Video.js icons in my plugin?
+
+If you'd like to use any of the icons available in the [Video.js icon set](http://videojs.github.io/font/), please target them via the CSS class names instead of codepoints. The codepoints *may* change between versions of the font, so using the class names ensures that your plugin will stay up to date with any font changes.
@@ -6,11 +6,11 @@ Sometimes, you want to remove players after page load (in single page apps or mo
 Call `.dispose()`
 -----------------

-To remove the html associated with your videojs player from the page always call the player's [`dispose()`](https://github.com/videojs/video.js/blob/stable/docs/api/vjs.Player.md#dispose) method:
+To remove the html associated with your videojs player from the page always call the player's [`dispose()`](http://docs.videojs.com/docs/api/player.html#Methodsdispose) method:

-```javascript```
+```js
 var oldPlayer = document.getElementById('my-player');
-videojs(oldPlayer).dispose(); 
+videojs(oldPlayer).dispose();
 ```

 This method will:
@@ -14,10 +14,12 @@ You can download the Video.js source and host it on your own servers, or use the

 ### CDN Version ###
 ```html
-<link href="//vjs.zencdn.net/4.12/video-js.min.css" rel="stylesheet">
-<script src="//vjs.zencdn.net/4.12/video.min.js"></script>
+<link href="//vjs.zencdn.net/5.4.6/video-js.min.css" rel="stylesheet">
+<script src="//vjs.zencdn.net/5.4.6/video.min.js"></script>
 ```

+Alternatively you can always [go here](http://videojs.com/getting-started/) to get the latest URL for videojs CDN.
+
 We include a stripped down Google Analytics pixel that tracks a random percentage (currently 1%) of players loaded from the CDN. This allows us to see (roughly) what browsers are in use in the wild, along with other useful metrics such as OS and device. If you'd like to disable analytics, you can simply include the following global **before** including Video.js:

 ```js
@@ -39,10 +41,11 @@ $ bower install --save video.js

 ### Self Hosted. ###
 To entirely self-host, you'll need to pull in the font files and let Video.js know where the swf is located. If you simply copy the dist folder or zip file contents into your project everything
-should Just Work™, but the paths can easily be changed by editing the LESS file and re-building, or by modifying the generated CSS file.
+should Just Work™, but the paths can easily be changed by editing the LESS file and re-building, or by modifying the generated CSS file. Additionally include the [videojs-vtt.js](https://www.npmjs.com/package/videojs-vtt.js) source, which adds the `WebVTT` object to the global scope.

 ```html
 <link href="//example.com/path/to/video-js.min.css" rel="stylesheet">
+<script src="//example.com/path/to/videojs-vtt.js"></script>
 <script src="//example.com/path/to/video.min.js"></script>
 <script>
  videojs.options.flash.swf = "http://example.com/path/to/video-js.swf"
@@ -56,7 +59,7 @@ With Video.js you just use an HTML5 video tag to embed a video. Video.js will th

 > Note: The `data-setup` attribute described here should not be used if you use the alternative setup described in the next section.

-  1. The 'data-setup' Attribute tells Video.js to automatically set up the video when the page is ready, and read any options (in JSON format) from the attribute (see [options](options.md)). There are other methods for initializing the player, but this is the easiest.
+  1. The 'data-setup' Attribute tells Video.js to automatically set up the video when the page is ready, and read any options (in JSON format) from the attribute (see [options](./options.md)). There are other methods for initializing the player, but this is the easiest.

  2. The 'id' Attribute: Should be used and unique for every video on the same page.

@@ -70,9 +73,9 @@ Otherwise include/exclude attributes, settings, sources, and tracks exactly as y
  controls preload="auto" width="640" height="264"
  poster="http://video-js.zencoder.com/oceans-clip.png"
  data-setup='{"example_option":true}'>
- <source src="http://video-js.zencoder.com/oceans-clip.mp4" type='video/mp4' />
- <source src="http://video-js.zencoder.com/oceans-clip.webm" type='video/webm' />
- <source src="http://video-js.zencoder.com/oceans-clip.ogv" type='video/ogg' />
+ <source src="http://video-js.zencoder.com/oceans-clip.mp4" type="video/mp4" />
+ <source src="http://video-js.zencoder.com/oceans-clip.webm" type="video/webm" />
+ <source src="http://video-js.zencoder.com/oceans-clip.ogv" type="video/ogg" />
 <p class="vjs-no-js">To view this video please enable JavaScript, and consider upgrading to a web browser that <a href="http://videojs.com/html5-video-support/" target="_blank">supports HTML5 video</a></p>
 </video>
 ```
@@ -1,20 +1,41 @@
 Skins
 =====

-The base Video.js skin is made using HTML and CSS (although we use the [Sass preprocessor](http://sass-lang.com)), and by default these styles are added to the dom for you! That means you can build a custom skin by simply taking advantage of the cascading aspect of CSS and overriding
+## Base Skin
+The base Video.js skin is made using HTML and CSS (although we use the [Sass preprocessor](http://sass-lang.com)),
+and by default these styles are added to the DOM for you!
+That means you can build a custom skin by simply taking advantage of the cascading aspect of CSS and overriding
 the styles you'd like to change.

-If you don't want Video.js to inject the base styles for you, you can disable it by setting `window.VIDEOJS_NO_BASE_THEME = false` before Video.js is loaded. Keep in mind that without these base styles
-enabled, you'll need to manually include them.
+If you don't want Video.js to inject the base styles for you, you can disable it by setting `window.VIDEOJS_NO_BASE_THEME = true` before Video.js is loaded.
+Keep in mind that without these base styles enabled, you'll need to manually include them.
+
+Video.js does not currently include the base skin automatically yet, so, this option isn't necessary.
+
+## Default style elements
+Video.js uses a couple of style elements dynamically, specifically, there's a default styles element as well as a player dimensions style element.
+They are used to provide extra default flexiblity with styling the player. However, in some cases, like if a user has the HEAD tag managed by React, users do not want this.
+When `window.VIDEOJS_NO_DYNAMIC_STYLE` is set to `true`, video.js will *not* include these element in the page.
+This means that default dimensions and configured player dimensions will *not* be applied.
+For example, the following player will end up having a width and height of 0 when initialized if `window.VIDEOJS_NO_DYNAMIC_STYLE === true`:
+```html
+<video width="600" height="300"></video>
+```
+
+### `Player#width` and `Player#height`
+When `VIDEOJS_NO_DYNAMIC_STYLE` is set, `Player#width` and `Player#height` will apply any width and height
+that is set directly to the video element (or whatever element the current tech uses).
+

 ## Icons

-You can view all of the icons available in the base theme by renaming and viewing [`icons.html.example`](../../sandbox/icons.html.example) in the sandbox directory.
+You can view all of the icons available in the base theme by renaming and viewing
+[`icons.html.example`](https://github.com/videojs/video.js/blob/master/sandbox/icons.html.example) in the sandbox directory.

 ## Customization

-When you create a new skin, the easiest way to get started is to simply override the base Video.js theme. You should include a new class matching the
-name of your theme, then just start overriding!
+When you create a new skin, the easiest way to get started is to simply override the base Video.js theme.
+You should include a new class matching the name of your theme, then just start overriding!

 ```css
 .vjs-skin-hotdog-stand { color: #FF0000; }
@@ -22,8 +43,12 @@ name of your theme, then just start overriding!
 .vjs-skin-hotdog-stand .vjs-play-progress { background: #FF0000; }
 ```

-This would take care of the major areas of the skin (play progress, the control bar background, and icon colors), but you can skin any other aspect.
-Our suggestion is to use a browser such as Firefox and Chrome, and use the developer tools to inspect the different elements and see what you'd like to change and what classes
+This would take care of the major areas of the skin (play progress, the control bar background, and icon colors),
+but you can skin any other aspect.
+Our suggestion is to use a browser such as Firefox and Chrome,
+and use the developer tools to inspect the different elements and see what you'd like to change and what classes
 to target when you do so.

-More custom skins will be available for download soon. If you have one you like you can share it by forking [this example on CodePen.io](http://codepen.io/heff/pen/EarCt), and adding a link on the [Skins wiki page](https://github.com/videojs/video.js/wiki/Skins).
+More custom skins will be available for download soon.
+If you have one you like you can share it by forking [this example on CodePen.io](http://codepen.io/heff/pen/EarCt),
+and adding a link on the [Skins wiki page](https://github.com/videojs/video.js/wiki/Skins).
@@ -0,0 +1,184 @@
+# Text Tracks
+
+Text Tracks are a function of HTML5 video for providing time triggered text to the viewer. Video.js makes tracks work across all browsers. There are currently five types of tracks:
+
+- **Subtitles**: Translations of the dialogue in the video for when audio is available but not understood. Subtitles are shown over the video.
+- **Captions**: Transcription of the dialogue, sound effects, musical cues, and other audio information for when the viewer is deaf/hard of hearing, or the video is muted. Captions are also shown over the video.
+- **Chapters**: Chapter titles that are used to create navigation within the video. Typically they're in the form of a list of chapters that the viewer can click on to go to a specific chapter.
+- **Descriptions**: Text descriptions of what's happening in the video for when the video portion isn't available, because the viewer is blind, not using a screen, or driving and about to crash because they're trying to enjoy a video while driving. Descriptions are read by a screen reader or turned into a separate audio track.
+- **Metadata**: Tracks that have data meant for javascript to parse and do something with. These aren't shown to the user.
+
+## Creating the Text File
+Timed text requires a text file in [WebVTT](http://dev.w3.org/html5/webvtt/) format. This format defines a list of "cues" that have a start time, and end time, and text to display. [Microsoft has a builder](https://dev.modern.ie/testdrive/demos/captionmaker/) that can help you get started on the file.
+
+When creating captions, there's also additional [caption formatting techniques] (http://www.theneitherworld.com/mcpoodle/SCC_TOOLS/DOCS/SCC_FORMAT.HTML#style) that would be good to use, like brackets around sound effects: [ sound effect ]. If you'd like a more in depth style guide for captioning, you can reference the [Captioning Key](http://www.dcmp.org/captioningkey/), but keep in mind not all features are supported by WebVTT or (more likely) the Video.js WebVTT implementation.
+
+## Adding to Video.js
+Once you have your WebVTT file created, you can add it to Video.js using the track tag. Put your track tag after all the source elements, and before any fallback content.
+
+```html
+<video id="example_video_1" class="video-js"
+  controls preload="auto" width="640" height="264"
+  data-setup='{"example_option":true}'>
+ <source src="http://vjs.zencdn.net/v/oceans.mp4" type="video/mp4" />
+ <source src="http://vjs.zencdn.net/v/oceans.webm" type="video/webm" />
+ <source src="http://vjs.zencdn.net/v/oceans.ogv" type="video/ogg" />
+
+ <track kind="captions" src="http://example.com/path/to/captions.vtt" srclang="en" label="English" default>
+
+</video>
+```
+
+You can also add tracks [programatically](#api).
+
+## Subtitles from Another Domain
+Because we're pulling in the text track file via Javascript, the [same-origin policy](http://en.wikipedia.org/wiki/Same_origin_policy) applies. If you'd like to have a player served from one domain,
+but the text track served from another, you'll need to [enable CORS](http://enable-cors.org/) in order to do so.
+In addition to enabling CORS on the server serving the text tracks, you will need to add the [`crossorigin` attribute](https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_settings_attributes) to the video element itself. This attribute has two values `anonymous` and `use-credentials`. Most users will want to use `anonymous` with cross-origin tracks.
+It can be added to the video element like so:
+```html
+<video class="video-js" crossorigin="anonymous">
+  <source src="http://vjs.zencdn.net/v/oceans.mp4" type="video/mp4">
+  <track src="http://example.com/oceans.vtt" kind="captions" srclang="en" label="English">
+</video>
+```
+One thing to be aware of is that in this case the video files themselves will *also* needs CORS headers applied to it. This is because some browsers apply the crossorigin attribute to the video source itself and not just the tracks and is considered a [security concern by the spec](https://html.spec.whatwg.org/multipage/embedded-content.html#security-and-privacy-considerations).
+
+## Track Attributes
+Additional settings for track tags.
+
+### kind
+One of the five track types listed above. Kind defaults to subtitles if no kind is included.
+
+### label
+The label for the track that will be show to the user, for example in a menu that list the different languages available for subtitles.
+
+### default
+The default attribute can be used to have a track default to showing. Otherwise the viewer would need to select their language from the captions or subtitles menu.
+NOTE: For chapters, default is required if you want the chapters menu to show.
+
+### srclang
+The two-letter code (valid BCP 47 language tag) for the language of the text track, for example "en" for English. A list of language codes is [available here](languages.md#language-codes).
+
+## Interacting with Text Tracks
+### Showing tracks programmatically
+Some of you would want to turn captions on and off programmatically rather than just forcing the user to do so themselves. This can be easily achieved by modifying the `mode` of the text tracks.
+The `mode` can be one of three values `disabled`, `hidden`, and `showing`.
+When a text track's `mode` is `disabled`, the track does not show on screen as the video is playing.
+When the `mode` is set to `showing`, the track is visible to the viewer and updates while the video is playing.
+You can change of a particular track like so:
+```js
+let tracks = player.textTracks();
+
+for (let i = 0; i < tracks.length; i++) {
+  let track = tracks[i];
+
+  // find the captions track that's in english
+  if (track.kind === 'captions' && track.language === 'en') {
+    track.mode = 'showing';
+  }
+}
+```
+
+### Doing something when a cue becomes active
+Above, we mentioned that `mode` can also be `hidden`, what this means is that the track will update
+as the video is playing but it won't be visible to the viewer. This is most useful for `metadata` text tracks.
+One usecase for metadata text tracks is to have something happen when their cues become active, to do so, you listen to the `cuechange` event on the track. These events fire when the mode is `showing` as well.
+Here's an example:
+```js
+let tracks = player.textTracks();
+let metadataTrack;
+
+for (let i = 0; i < tracks.length; i++) {
+  let track = tracks[i];
+
+  // find the metadata track that's labeled ads
+  if (track.kind === 'captions' && track.label === 'ads') {
+    track.mode = 'hidden';
+    // store it for usage outside of the loop
+    metadataTrack = track;
+  }
+}
+
+metadataTrack.addEventListener('cuechange', function() {
+  player.ads.startLinearAdMode();
+});
+```
+
+## Emulated Text Tracks
+By default, video.js will try and use native text tracks if possible and fall back to emulated text tracks if the native functionality is broken or incomplete or non-existent.
+The Flash tech will always use the emulated text track functionality.
+The video.js API and TextTrack objects were modeled after the w3c's specification.
+video.js uses [Mozilla's vtt.js](https://github.com/mozilla/vtt.js) library to parse and display its emulated text tracks.
+
+If you wanted to disable native text track functionality and force video.js to use emulated text tracks always, you can supply the `nativeTextTracks` option to the tech like so:
+```js
+let player = videojs('myvideo', {
+  html5: {
+    nativeTextTracks: false
+  }
+});
+```
+
+### Text Track Settings
+When using emulated Text Tracks, captions will have an additional item in the menu called "caption settings".
+This allows the viewer of the player to change some styles of how the captions are displayed on screen.
+
+If you don't want that, you can disable it by turning off the text track settings component and hiding the menu item like so:
+```js
+let player = videojs('myvideo', {
+  // make the text track settings dialog not initialize
+  textTrackSettings: false
+});
+```
+```css
+/* hide the captions settings item from the captions menu */
+.vjs-texttrack-settings {
+  display: none;
+}
+```
+
+## Text Track Precedence
+In general, the Descriptions tracks is of lower precedence than captions and subtitles.
+What this means for you?
+* If you are using the `default` attribute, videojs will choose the first track that is marked as `default` and turn it on. If There are multiple tracks marked `default`, it will try and turn on the first `captions` or `subtitles` track *before* any `descriptions` tracks.
+  * This only applied to the emulated captions support, native text tracks behavior will change depending on the browser
+* If you select a given track from the menu, videojs will turn off all the other tracks of the same kind. This may seem like you can have both subtitles and captions turned on at the same time but unfortuantely, at this time we only support one track being displayed at a time.
+  * This means that for emulated text tracks, we'll choose the first captions or subtitles track that is enabled to display.
+  * When native text tracks are supported, we will still disable the other tracks of the same kind but it is possible that multiple text tracks are shown.
+  * If a `descriptions` track is selected and subsequently a `subtitles` or `captions` track is selected, the `descriptions` track is disabled and its menu button is also disabled.
+* When enabling a track programmatically, there's not much checking that videojs does.
+  * For emulated text tracks, when it's time to display the captions, video.js would choose the first track that's showing, again choosing `subtitles` or `captions` over `descriptions`, if necessary.
+  * For native text tracks, this behavior depends on the browser. Some browsers will let you have multiple text tracks but others will disable all other tracks when a new one is selected.
+
+## API
+
+### `player.textTracks() -> TextTrackList`
+This is the main interface into the text tracks of the player.
+It return a TextTrackList which lists all the tracks on the player.
+
+### `player.remoteTextTracks() -> TextTrackList`
+This is a helper method to get a list of all the tracks that were created from `track` elements or that were added to the player by the `addRemoteTextTrack` method. All these tracks are removeable from the player, where-as not all tracks from `player.textTracks()` are necessarily removeable.
+
+### `player.remoteTextTrackEls() -> HTMLTrackElementList`
+Another helper method, this is a list of all the `track` elements associated with the player. Both emulated or otherwise.
+
+### `player.addTextTrack(String kind, [String label [, String language]]) -> TextTrack`
+This is based on the [w3c spec API](http://www.w3.org/html/wg/drafts/html/master/embedded-content-0.html#dom-media-addtexttrack) and when given a kind and an optional label and language, will create a new text track for you to use.
+This method is intended for purely programmatic usage of tracks and has one important limitation:
+tracks created using this method *cannot* be removed. The native `addTextTrack` does not have a corresponding `removeTextTrack`, so, we actually discourage the usage of this method.
+
+### `player.addRemoteTextTrack(Object options) -> HTMLTrackElement`
+This function takes an options object that looks pretty similar to the track element and returns a HTMLTrackElement.
+This object has a `track` property on it which is the actual TextTrack object.
+This `TextTrack` object is equivalent to the one that can be returned from `player.addTextTrack` with the added bonus that it can be removed from the player.
+Internally, video.js will either add a `<track>` element for you, or emulate that depending on whether native text tracks are supported or not.
+The options available are:
+* `kind`
+* `label`
+* `language` (also `srclang`)
+* `id`
+* `src`
+
+### `player.removeRemoteTextTrack(HTMLTrackElement|TextTrack)`
+This function takes either an HTMLTrackElement or a TextTrack object and removes it from the player.
@@ -1,230 +1,6 @@
-Tracks
-======
+# Tracks
+There are currently three types of tracks

-Text Tracks are a function of HTML5 video for providing time triggered text to the viewer. Video.js makes tracks work across all browsers. There are currently five types of tracks:
-
- **Subtitles**: Translations of the dialogue in the video for when audio is available but not understood. Subtitles are shown over the video.
- **Captions**: Transcription of the dialogue, sound effects, musical cues, and other audio information for when the viewer is deaf/hard of hearing, or the video is muted. Captions are also shown over the video.
- **Chapters**: Chapter titles that are used to create navigation within the video. Typically they're in the form of a list of chapters that the viewer can click on to go to a specific chapter.
- **Descriptions** (not supported yet): Text descriptions of what's happening in the video for when the video portion isn't available, because the viewer is blind, not using a screen, or driving and about to crash because they're trying to enjoy a video while driving. Descriptions are read by a screen reader or turned into a separate audio track.
- **Metadata** (not supported yet): Tracks that have data meant for javascript to parse and do something with. These aren't shown to the user.
-
-Creating the Text File
----------------------
-Timed text requires a text file in [WebVTT](http://dev.w3.org/html5/webvtt/) format. This format defines a list of "cues" that have a start time, and end time, and text to display. [Microsoft has a builder](https://dev.modern.ie/testdrive/demos/captionmaker/) that can help you get started on the file.
-
-When creating captions, there's also additional [caption formatting techniques] (http://www.theneitherworld.com/mcpoodle/SCC_TOOLS/DOCS/SCC_FORMAT.HTML#style) that would be good to use, like brackets around sound effects: [ sound effect ]. If you'd like a more in depth style guide for captioning, you can reference the [Captioning Key](http://www.dcmp.org/captioningkey/), but keep in mind not all features are supported by WebVTT or (more likely) the Video.js WebVTT implementation.
-
-Adding to Video.js
------------------
-Once you have your WebVTT file created, you can add it to Video.js using the track tag. Put your track tag after all the source elements, and before any fallback content.
-
-```html
-<video id="example_video_1" class="video-js vjs-default-skin"
-  controls preload="auto" width="640" height="264"
-  data-setup='{"example_option":true}'>
- <source src="http://video-js.zencoder.com/oceans-clip.mp4" type='video/mp4' />
- <source src="http://video-js.zencoder.com/oceans-clip.webm" type='video/webm' />
- <source src="http://video-js.zencoder.com/oceans-clip.ogv" type='video/ogg' />
-
- <track kind="captions" src="http://example.com/path/to/captions.vtt" srclang="en" label="English" default>
-
-</video>
-```
-
-Subtitles from Another Domain
-----------------------------
-Because we're pulling in the text track file via Javascript, the [same-origin policy](http://en.wikipedia.org/wiki/Same_origin_policy) applies. If you'd like to have a player served from one domain,
-but the text track served from another, you'll need to [enable CORS](http://enable-cors.org/) in order to do so.
-
-Track Attributes
----------------
-Additional settings for track tags.
-
-### kind
-One of the five track types listed above. Kind defaults to subtitles if no kind is included.
-
-### label
-The label for the track that will be show to the user, for example in a menu that list the different languages available for subtitles.
-
-### default
-The default attribute can be used to have a track default to showing. Otherwise the viewer would need to select their language from the captions or subtitles menu.
-NOTE: For chapters, default is required if you want the chapters menu to show.
-
-### srclang
-The two-letter code (valid BCP 47 language tag) for the language of the text track, for example "en" for English. Here's a list of available language codes.
-
-<table border="0" cellspacing="5" cellpadding="5">
-  <tr>
-    <td>
-
-      <table>
-        <tr><th>ab<th><td>Abkhazian</td></tr>
-        <tr><th>aa<th><td>Afar</td></tr>
-        <tr><th>af<th><td>Afrikaans</td></tr>
-        <tr><th>sq<th><td>Albanian</td></tr>
-        <tr><th>am<th><td>Amharic</td></tr>
-        <tr><th>ar<th><td>Arabic</td></tr>
-        <tr><th>an<th><td>Aragonese</td></tr>
-        <tr><th>hy<th><td>Armenian</td></tr>
-        <tr><th>as<th><td>Assamese</td></tr>
-        <tr><th>ay<th><td>Aymara</td></tr>
-        <tr><th>az<th><td>Azerbaijani</td></tr>
-        <tr><th>ba<th><td>Bashkir</td></tr>
-        <tr><th>eu<th><td>Basque</td></tr>
-        <tr><th>bn<th><td>Bengali (Bangla)</td></tr>
-        <tr><th>dz<th><td>Bhutani</td></tr>
-        <tr><th>bh<th><td>Bihari</td></tr>
-        <tr><th>bi<th><td>Bislama</td></tr>
-        <tr><th>br<th><td>Breton</td></tr>
-        <tr><th>bg<th><td>Bulgarian</td></tr>
-        <tr><th>my<th><td>Burmese</td></tr>
-        <tr><th>be<th><td>Byelorussian (Belarusian)</td></tr>
-        <tr><th>km<th><td>Cambodian</td></tr>
-        <tr><th>ca<th><td>Catalan</td></tr>
-        <tr><th>zh<th><td>Chinese (Simplified)</td></tr>
-        <tr><th>zh<th><td>Chinese (Traditional)</td></tr>
-        <tr><th>co<th><td>Corsican</td></tr>
-        <tr><th>hr<th><td>Croatian</td></tr>
-        <tr><th>cs<th><td>Czech</td></tr>
-        <tr><th>da<th><td>Danish</td></tr>
-        <tr><th>nl<th><td>Dutch</td></tr>
-        <tr><th>en<th><td>English</td></tr>
-        <tr><th>eo<th><td>Esperanto</td></tr>
-        <tr><th>et<th><td>Estonian</td></tr>
-        <tr><th>fo<th><td>Faeroese</td></tr>
-        <tr><th>fa<th><td>Farsi</td></tr>
-        <tr><th>fj<th><td>Fiji</td></tr>
-        <tr><th>fi<th><td>Finnish</td></tr>
-      </table>
-
-    </td>
-    <td>
-
-      <table>
-        <tr><th>fr<th><td>French</td></tr>
-        <tr><th>fy<th><td>Frisian</td></tr>
-        <tr><th>gl<th><td>Galician</td></tr>
-        <tr><th>gd<th><td>Gaelic (Scottish)</td></tr>
-        <tr><th>gv<th><td>Gaelic (Manx)</td></tr>
-        <tr><th>ka<th><td>Georgian</td></tr>
-        <tr><th>de<th><td>German</td></tr>
-        <tr><th>el<th><td>Greek</td></tr>
-        <tr><th>kl<th><td>Greenlandic</td></tr>
-        <tr><th>gn<th><td>Guarani</td></tr>
-        <tr><th>gu<th><td>Gujarati</td></tr>
-        <tr><th>ht<th><td>Haitian Creole</td></tr>
-        <tr><th>ha<th><td>Hausa</td></tr>
-        <tr><th>he<th><td>Hebrew</td></tr>
-        <tr><th>hi<th><td>Hindi</td></tr>
-        <tr><th>hu<th><td>Hungarian</td></tr>
-        <tr><th>is<th><td>Icelandic</td></tr>
-        <tr><th>io<th><td>Ido</td></tr>
-        <tr><th>id<th><td>Indonesian</td></tr>
-        <tr><th>ia<th><td>Interlingua</td></tr>
-        <tr><th>ie<th><td>Interlingue</td></tr>
-        <tr><th>iu<th><td>Inuktitut</td></tr>
-        <tr><th>ik<th><td>Inupiak</td></tr>
-        <tr><th>ga<th><td>Irish</td></tr>
-        <tr><th>it<th><td>Italian</td></tr>
-        <tr><th>ja<th><td>Japanese</td></tr>
-        <tr><th>jv<th><td>Javanese</td></tr>
-        <tr><th>kn<th><td>Kannada</td></tr>
-        <tr><th>ks<th><td>Kashmiri</td></tr>
-        <tr><th>kk<th><td>Kazakh</td></tr>
-        <tr><th>rw<th><td>Kinyarwanda (Ruanda)</td></tr>
-        <tr><th>ky<th><td>Kirghiz</td></tr>
-        <tr><th>rn<th><td>Kirundi (Rundi)</td></tr>
-        <tr><th>ko<th><td>Korean</td></tr>
-        <tr><th>ku<th><td>Kurdish</td></tr>
-        <tr><th>lo<th><td>Laothian</td></tr>
-        <tr><th>la<th><td>Latin</td></tr>
-      </table>
-
-    </td>
-    <td>
-
-      <table>
-        <tr><th>lv<th><td>Latvian (Lettish)</td></tr>
-        <tr><th>li<th><td>Limburgish ( Limburger)</td></tr>
-        <tr><th>ln<th><td>Lingala</td></tr>
-        <tr><th>lt<th><td>Lithuanian</td></tr>
-        <tr><th>mk<th><td>Macedonian</td></tr>
-        <tr><th>mg<th><td>Malagasy</td></tr>
-        <tr><th>ms<th><td>Malay</td></tr>
-        <tr><th>ml<th><td>Malayalam</td></tr>
-        <tr><th>mt<th><td>Maltese</td></tr>
-        <tr><th>mi<th><td>Maori</td></tr>
-        <tr><th>mr<th><td>Marathi</td></tr>
-        <tr><th>mo<th><td>Moldavian</td></tr>
-        <tr><th>mn<th><td>Mongolian</td></tr>
-        <tr><th>na<th><td>Nauru</td></tr>
-        <tr><th>ne<th><td>Nepali</td></tr>
-        <tr><th>no<th><td>Norwegian</td></tr>
-        <tr><th>oc<th><td>Occitan</td></tr>
-        <tr><th>or<th><td>Oriya</td></tr>
-        <tr><th>om<th><td>Oromo (Afan, Galla)</td></tr>
-        <tr><th>ps<th><td>Pashto (Pushto)</td></tr>
-        <tr><th>pl<th><td>Polish</td></tr>
-        <tr><th>pt<th><td>Portuguese</td></tr>
-        <tr><th>pa<th><td>Punjabi</td></tr>
-        <tr><th>qu<th><td>Quechua</td></tr>
-        <tr><th>rm<th><td>Rhaeto-Romance</td></tr>
-        <tr><th>ro<th><td>Romanian</td></tr>
-        <tr><th>ru<th><td>Russian</td></tr>
-        <tr><th>sm<th><td>Samoan</td></tr>
-        <tr><th>sg<th><td>Sangro</td></tr>
-        <tr><th>sa<th><td>Sanskrit</td></tr>
-        <tr><th>sr<th><td>Serbian</td></tr>
-        <tr><th>sh<th><td>Serbo-Croatian</td></tr>
-        <tr><th>st<th><td>Sesotho</td></tr>
-        <tr><th>tn<th><td>Setswana</td></tr>
-        <tr><th>sn<th><td>Shona</td></tr>
-        <tr><th>ii<th><td>Sichuan Yi</td></tr>
-        <tr><th>sd<th><td>Sindhi</td></tr>
-      </table>
-
-    </td>
-    <td>
-
-      <table>
-        <tr><th>si<th><td>Sinhalese</td></tr>
-        <tr><th>ss<th><td>Siswati</td></tr>
-        <tr><th>sk<th><td>Slovak</td></tr>
-        <tr><th>sl<th><td>Slovenian</td></tr>
-        <tr><th>so<th><td>Somali</td></tr>
-        <tr><th>es<th><td>Spanish</td></tr>
-        <tr><th>su<th><td>Sundanese</td></tr>
-        <tr><th>sw<th><td>Swahili (Kiswahili)</td></tr>
-        <tr><th>sv<th><td>Swedish</td></tr>
-        <tr><th>tl<th><td>Tagalog</td></tr>
-        <tr><th>tg<th><td>Tajik</td></tr>
-        <tr><th>ta<th><td>Tamil</td></tr>
-        <tr><th>tt<th><td>Tatar</td></tr>
-        <tr><th>te<th><td>Telugu</td></tr>
-        <tr><th>th<th><td>Thai</td></tr>
-        <tr><th>bo<th><td>Tibetan</td></tr>
-        <tr><th>ti<th><td>Tigrinya</td></tr>
-        <tr><th>to<th><td>Tonga</td></tr>
-        <tr><th>ts<th><td>Tsonga</td></tr>
-        <tr><th>tr<th><td>Turkish</td></tr>
-        <tr><th>tk<th><td>Turkmen</td></tr>
-        <tr><th>tw<th><td>Twi</td></tr>
-        <tr><th>ug<th><td>Uighur</td></tr>
-        <tr><th>uk<th><td>Ukrainian</td></tr>
-        <tr><th>ur<th><td>Urdu</td></tr>
-        <tr><th>uz<th><td>Uzbek</td></tr>
-        <tr><th>vi<th><td>Vietnamese</td></tr>
-        <tr><th>vo<th><td>Volapük</td></tr>
-        <tr><th>wa<th><td>Wallon</td></tr>
-        <tr><th>cy<th><td>Welsh</td></tr>
-        <tr><th>wo<th><td>Wolof</td></tr>
-        <tr><th>xh<th><td>Xhosa</td></tr>
-        <tr><th>yi<th><td>Yiddish</td></tr>
-        <tr><th>yo<th><td>Yoruba</td></tr>
-        <tr><th>zu<th><td>Zulu</td></tr>
-      </table>
-
-    </td>
-  </tr>
-</table>
+* [AudioTracks](./audio-tracks.md) - allows the selection of alternative AudioTracks for a video
+* [VideoTracks](./video-tracks.md) - allows the selection of an alternative VideoTrack for a video
+* [TextTracks](./text-tracks.md) - Text Tracks are used to display subtitles and captions, and add a menu for navigating between chapters in a video.
@@ -0,0 +1,70 @@
+# Video Tracks
+
+Video Tracks are a function of HTML5 video for providing a selection of alternative video tracks to the user, so that they can change type of video they want to watch. Video.js makes video tracks work across all browsers. There are currently six types of tracks:
+
+- **Alternative**: an alternative video representation of the main video track
+- **Captions**: The main video track with burned in captions
+- **Main**: the main video track
+- **Sign**: the main video track with added sign language overlay
+- **Subtitles**: the main video track with burned in subtitles
+- **Commentary**: the main video track with burned in commentary
+
+## Missing Funtionality
+- It is currently impossible to add VideoTracks in a non-programtic way
+- Literal switching of VideoTracks for playback is not handled by video.js and must be handled by something else. video.js only stores the track representation
+- There is currently no UI implementation of VideoTracks
+
+## Adding to Video.js
+
+> Right now adding video tracks in the HTML is unsupported. Video Tracks must be added programatically.
+
+You must add video tracks [programatically](#api) for the time being.
+
+## Attributes
+Video Track propertites and settings
+
+### kind
+One of the five track types listed above. Kind defaults to empty string if no kind is included, or an invalid kind is used.
+
+### label
+The label for the track that will be show to the user, for example in a menu that list the different languages available for video tracks.
+
+### language
+The two-letter code (valid BCP 47 language tag) for the language of the video track, for example "en" for English. A list of language codes is [available here](languages.md#language-codes).
+
+### selected
+If this track should be playing or not. Trying to select more than one track will cause other tracks to be deselected.
+
+## Interacting with Video Tracks
+### Doing something when a track becomes enabled
+When a new track is enabled (other than the main track) an event is fired on the `VideoTrackList` called `change` you can listen to that event and do something with it.
+Here's an example:
+```js
+// get the current players VideoTrackList object
+let tracks = player.videoTracks();
+
+// listen to the change event
+tracks.addEventListener('change', function() {
+  // get the currently selected track
+  let index = tracks.selectedIndex;
+  let track = tracks[index];
+
+  // print the currently selected track
+  console.log(track.label);
+});
+```
+
+## API
+
+### `player.videoTracks() -> VideoTrackList`
+This is the main interface into the video tracks of the player.
+It returns an VideoTrackList which is an array like object that contains all the `VideoTrack` on the player.
+
+### `player.videoTracks().addTrack(VideoTrack)`
+Add an existing VideoTrack to the players internal list of VideoTracks.
+
+### `player.videoTracks().removeTrack(VideoTrack)`
+Remove a track from the VideoTrackList currently on the player. if no track exists this will do nothing.
+
+### `player.videoTracks().selectedIndex`
+The current index for the selected track
@@ -14,7 +14,7 @@ There are two categories of docs: [Guides](./guides/) and [API docs](./api/). Gu

 * [Options](./guides/options.md) - There are a number of options that can be used to change how the player behaves, starting with the HTML5 media options like autoplay and preload, and expanding to Video.js specific options.

-* [Tracks](./guides/tracks.md) - Text Tracks are used to display subtitles and captions, and add a menu for navigating between chapters in a video.
+* [Tracks](./guides/tracks.md) - Tracks are used for displaying text information over a video, selecting different audio tracks for a video, or selected different video tracks for a video.

 ### Customizing

@@ -11,7 +11,7 @@
  "Fullscreen": "ملء الشاشة",
  "Non-Fullscreen": "غير ملء الشاشة",
  "Mute": "صامت",
-  "Unmuted": "غير الصامت",
+  "Unmute": "غير الصامت",
  "Playback Rate": "معدل التشغيل",
  "Subtitles": "الترجمة",
  "subtitles off": "ايقاف الترجمة",
@@ -22,5 +22,13 @@
  "A network error caused the media download to fail part-way.": "تسبب خطأ في الشبكة بفشل تحميل الفيديو بالكامل.",
  "The media could not be loaded, either because the server or network failed or because the format is not supported.": "لا يمكن تحميل الفيديو بسبب فشل في الخادم أو الشبكة ، أو فشل بسبب عدم امكانية قراءة تنسيق الفيديو.",
  "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "تم ايقاف تشغيل الفيديو بسبب مشكلة فساد أو لأن الفيديو المستخدم يستخدم ميزات غير مدعومة من متصفحك.",
-  "No compatible source was found for this media.": "فشل العثور على أي مصدر متوافق مع هذا الفيديو."
+  "No compatible source was found for this media.": "فشل العثور على أي مصدر متوافق مع هذا الفيديو.",
+  "Play Video": "تشغيل الفيديو",
+  "Close": "أغلق",
+  "Modal Window": "نافذة مشروطة",
+  "This is a modal window": "هذه نافذة مشروطة",
+  "This modal can be closed by pressing the Escape key or activating the close button.": "يمكن غلق هذه النافذة المشروطة عن طريق الضغط على زر الخروج أو تفعيل زر الإغلاق",
+  ", opens captions settings dialog": ", تفتح نافذة  خيارات التعليقات",
+  ", opens subtitles settings dialog": ", تفتح نافذة  خيارات الترجمة",
+  ", selected": ", مختار"
 }
@@ -11,7 +11,7 @@
  "Fullscreen": "Puni ekran",
  "Non-Fullscreen": "Mali ekran",
  "Mute": "Prigušen",
-  "Unmuted": "Ne-prigušen",
+  "Unmute": "Ne-prigušen",
  "Playback Rate": "Stopa reprodukcije",
  "Subtitles": "Podnaslov",
  "subtitles off": "Podnaslov deaktiviran",
@@ -11,7 +11,7 @@
  "Fullscreen": "Цял екран",
  "Non-Fullscreen": "Спиране на цял екран",
  "Mute": "Без звук",
-  "Unmuted": "Със звук",
+  "Unmute": "Със звук",
  "Playback Rate": "Скорост на възпроизвеждане",
  "Subtitles": "Субтитри",
  "subtitles off": "Спряни субтитри",
@@ -11,7 +11,7 @@
  "Fullscreen": "Pantalla completa",
  "Non-Fullscreen": "Pantalla no completa",
  "Mute": "Silencia",
-  "Unmuted": "Amb so",
+  "Unmute": "Amb so",
  "Playback Rate": "Velocitat de reproducció",
  "Subtitles": "Subtítols",
  "subtitles off": "Subtítols desactivats",
@@ -11,7 +11,7 @@
  "Fullscreen": "Celá obrazovka",
  "Non-Fullscreen": "Zmenšená obrazovka",
  "Mute": "Ztlumit zvuk",
-  "Unmuted": "Přehrát zvuk",
+  "Unmute": "Přehrát zvuk",
  "Playback Rate": "Rychlost přehrávání",
  "Subtitles": "Titulky",
  "subtitles off": "Titulky vypnuty",
@@ -11,7 +11,7 @@
  "Fullscreen": "Fuldskærm",
  "Non-Fullscreen": "Luk fuldskærm",
  "Mute": "Uden lyd",
-  "Unmuted": "Med lyd",
+  "Unmute": "Med lyd",
  "Playback Rate": "Afspilningsrate",
  "Subtitles": "Undertekster",
  "subtitles off": "Uden undertekster",
@@ -11,7 +11,7 @@
  "Fullscreen": "Vollbild",
  "Non-Fullscreen": "Kein Vollbild",
  "Mute": "Ton aus",
-  "Unmuted": "Ton ein",
+  "Unmute": "Ton ein",
  "Playback Rate": "Wiedergabegeschwindigkeit",
  "Subtitles": "Untertitel",
  "subtitles off": "Untertitel aus",
@@ -22,5 +22,13 @@
  "A network error caused the media download to fail part-way.": "Der Videodownload ist aufgrund eines Netzwerkfehlers fehlgeschlagen.",
  "The media could not be loaded, either because the server or network failed or because the format is not supported.": "Das Video konnte nicht geladen werden, da entweder ein Server- oder Netzwerkfehler auftrat oder das Format nicht unterstützt wird.",
  "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "Die Videowiedergabe wurde entweder wegen eines Problems mit einem beschädigten Video oder wegen verwendeten Funktionen, die vom Browser nicht unterstützt werden, abgebrochen.",
-  "No compatible source was found for this media.": "Für dieses Video wurde keine kompatible Quelle gefunden."
+  "No compatible source was found for this media.": "Für dieses Video wurde keine kompatible Quelle gefunden.",
+  "Play Video": "Video abspielen",
+  "Close": "Schließen",
+  "Modal Window": "Modales Fenster",
+  "This is a modal window": "Dies ist ein modales Fenster",
+  "This modal can be closed by pressing the Escape key or activating the close button.": "Durch Drücken der Esc-Taste bzw. Betätigung der Schaltfläche \"Schließen\" wird dieses modale Fenster geschlossen.",
+  ", opens captions settings dialog": ", öffnet Einstellungen für Untertitel",
+  ", opens subtitles settings dialog": ", öffnet Einstellungen für Untertitel",
+  ", selected": " (ausgewählt)"
 }
@@ -0,0 +1,34 @@
+{
+  "Play": "Aναπαραγωγή",
+  "Pause": "Παύση",
+  "Current Time": "Τρέχων χρόνος",
+  "Duration Time": "Συνολικός χρόνος",
+  "Remaining Time": "Υπολοιπόμενος χρόνος",
+  "Stream Type": "Τύπος ροής",
+  "LIVE": "ΖΩΝΤΑΝΑ",
+  "Loaded": "Φόρτωση επιτυχής",
+  "Progress": "Πρόοδος",
+  "Fullscreen": "Πλήρης οθόνη",
+  "Non-Fullscreen": "Έξοδος από πλήρη οθόνη",
+  "Mute": "Σίγαση",
+  "Unmute": "Kατάργηση σίγασης",
+  "Playback Rate": "Ρυθμός αναπαραγωγής",
+  "Subtitles": "Υπότιτλοι",
+  "subtitles off": "απόκρυψη υπότιτλων",
+  "Captions": "Λεζάντες",
+  "captions off": "απόκρυψη λεζάντων",
+  "Chapters": "Κεφάλαια",
+  "You aborted the media playback": "Ακυρώσατε την αναπαραγωγή",
+  "A network error caused the media download to fail part-way.": "Ένα σφάλμα δικτύου προκάλεσε την αποτυχία μεταφόρτωσης του αρχείου προς αναπαραγωγή.",
+  "The media could not be loaded, either because the server or network failed or because the format is not supported.": "Το αρχείο προς αναπαραγωγή δεν ήταν δυνατό να φορτωθεί είτε γιατί υπήρξε σφάλμα στον διακομιστή ή το δίκτυο, είτε γιατί ο τύπος του αρχείου δεν υποστηρίζεται.",
+  "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "Η αναπαραγωγή ακυρώθηκε είτε λόγω κατεστραμμένου αρχείου, είτε γιατί το αρχείο απαιτεί λειτουργίες που δεν υποστηρίζονται από το πρόγραμμα περιήγησης που χρησιμοποιείτε.",
+  "No compatible source was found for this media.": "Δεν βρέθηκε συμβατή πηγή αναπαραγωγής για το συγκεκριμένο αρχείο.",
+  "Play video": "Αναπαραγωγή βίντεο",
+  "Close": "Κλείσιμο",
+  "Modal Window": "Aναδυόμενο παράθυρο",
+  "This is a modal window": "Το παρών είναι ένα αναδυόμενο παράθυρο",
+  "This modal can be closed by pressing the Escape key or activating the close button.": "Αυτό το παράθυρο μπορεί να εξαφανιστεί πατώντας το πλήκτρο Escape ή πατώντας το κουμπί κλεισίματος.",
+  ", opens captions settings dialog": ", εμφανίζει τις ρυθμίσεις για τις λεζάντες",
+  ", opens subtitles settings dialog": ", εμφανίζει τις ρυθμίσεις για τους υπότιτλους",
+  ", selected": ", επιλεγμένο"
+}
@@ -0,0 +1,39 @@
+{
+  "Play": "Play",
+  "Pause": "Pause",
+  "Current Time": "Current Time",
+  "Duration Time": "Duration Time",
+  "Remaining Time": "Remaining Time",
+  "Stream Type": "Stream Type",
+  "LIVE": "LIVE",
+  "Loaded": "Loaded",
+  "Progress": "Progress",
+  "Fullscreen": "Fullscreen",
+  "Non-Fullscreen": "Non-Fullscreen",
+  "Mute": "Mute",
+  "Unmute": "Unmute",
+  "Playback Rate": "Playback Rate",
+  "Subtitles": "Subtitles",
+  "subtitles off": "subtitles off",
+  "Captions": "Captions",
+  "captions off": "captions off",
+  "Chapters": "Chapters",
+  "Close Modal Dialog": "Close Modal Dialog",
+  "Descriptions": "Descriptions",
+  "descriptions off": "descriptions off",
+  "Audio Track": "Audio Track",
+  "You aborted the media playback": "You aborted the media playback",
+  "A network error caused the media download to fail part-way.": "A network error caused the media download to fail part-way.",
+  "The media could not be loaded, either because the server or network failed or because the format is not supported.": "The media could not be loaded, either because the server or network failed or because the format is not supported.",
+  "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.",
+  "No compatible source was found for this media.": "No compatible source was found for this media.",
+  "Play Video": "Play Video",
+  "Close": "Close",
+  "Modal Window": "Modal Window",
+  "This is a modal window": "This is a modal window",
+  "This modal can be closed by pressing the Escape key or activating the close button.": "This modal can be closed by pressing the Escape key or activating the close button.",
+  ", opens captions settings dialog": ", opens captions settings dialog",
+  ", opens subtitles settings dialog": ", opens subtitles settings dialog",
+  ", opens descriptions settings dialog": ", opens descriptions settings dialog",
+  ", selected": ", selected"
+}
@@ -11,7 +11,7 @@
  "Fullscreen": "Pantalla completa",
  "Non-Fullscreen": "Pantalla no completa",
  "Mute": "Silenciar",
-  "Unmuted": "No silenciado",
+  "Unmute": "No silenciado",
  "Playback Rate": "Velocidad de reproducción",
  "Subtitles": "Subtítulos",
  "subtitles off": "Subtítulos desactivados",
@@ -0,0 +1,26 @@
+{
+  "Play": "پخش",
+  "Pause": "وقفه",
+  "Current Time": "زمان کنونی",
+  "Duration Time": "مدت زمان",
+  "Remaining Time": "زمان باقیمانده",
+  "Stream Type": "نوع استریم",
+  "LIVE": "زنده",
+  "Loaded": "فراخوانی شده",
+  "Progress": "پیشرفت",
+  "Fullscreen": "تمام صفحه",
+  "Non-Fullscreen": "نمایش عادی",
+  "Mute": "بی صدا",
+  "Unmute": "بهمراه صدا",
+  "Playback Rate": "سرعت پخش",
+  "Subtitles": "زیرنویس",
+  "subtitles off": "بدون زیرنویس",
+  "Captions": "عنوان",
+  "captions off": "بدون عنوان",
+  "Chapters": "فصل",
+  "You aborted the media playback": "شما پخش را متوقف کردید.",
+  "A network error caused the media download to fail part-way.": "مشکل در دریافت ویدئو ...",
+  "The media could not be loaded, either because the server or network failed or because the format is not supported.": "فرمت پشتیبانی نمیشود یا خطایی روی داده است.",
+  "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "مشکل در دریافت ویدئو ...",
+  "No compatible source was found for this media.": "هیچ ورودی ای برای این رسانه شناسایی نشد."
+}
@@ -11,7 +11,7 @@
  "Fullscreen": "Koko näyttö",
  "Non-Fullscreen": "Koko näyttö pois",
  "Mute": "Ääni pois",
-  "Unmuted": "Ääni päällä",
+  "Unmute": "Ääni päällä",
  "Playback Rate": "Toistonopeus",
  "Subtitles": "Tekstitys",
  "subtitles off": "Tekstitys pois",
@@ -11,7 +11,7 @@
  "Fullscreen": "Plein écran",
  "Non-Fullscreen": "Fenêtré",
  "Mute": "Sourdine",
-  "Unmuted": "Son activé",
+  "Unmute": "Son activé",
  "Playback Rate": "Vitesse de lecture",
  "Subtitles": "Sous-titres",
  "subtitles off": "Sous-titres désactivés",
@@ -11,7 +11,7 @@
  "Fullscreen": "Puni ekran",
  "Non-Fullscreen": "Mali ekran",
  "Mute": "Prigušen",
-  "Unmuted": "Ne-prigušen",
+  "Unmute": "Ne-prigušen",
  "Playback Rate": "Stopa reprodukcije",
  "Subtitles": "Podnaslov",
  "subtitles off": "Podnaslov deaktiviran",
@@ -11,7 +11,7 @@
  "Fullscreen": "Teljes képernyő",
  "Non-Fullscreen": "Normál méret",
  "Mute": "Némítás",
-  "Unmuted": "Némítás kikapcsolva",
+  "Unmute": "Némítás kikapcsolva",
  "Playback Rate": "Lejátszási sebesség",
  "Subtitles": "Feliratok",
  "subtitles off": "Feliratok kikapcsolva",
@@ -11,7 +11,7 @@
  "Fullscreen": "Schermo intero",
  "Non-Fullscreen": "Chiudi schermo intero",
  "Mute": "Muto",
-  "Unmuted": "Audio",
+  "Unmute": "Audio",
  "Playback Rate": "Tasso di riproduzione",
  "Subtitles": "Sottotitoli",
  "subtitles off": "Senza sottotitoli",
@@ -11,7 +11,7 @@
  "Fullscreen": "フルスクリーン",
  "Non-Fullscreen": "フルスクリーン以外",
  "Mute": "ミュート",
-  "Unmuted": "ミュート解除",
+  "Unmute": "ミュート解除",
  "Playback Rate": "再生レート",
  "Subtitles": "サブタイトル",
  "subtitles off": "サブタイトル オフ",
@@ -11,7 +11,7 @@
  "Fullscreen": "전체 화면",
  "Non-Fullscreen": "전체 화면 해제",
  "Mute": "음소거",
-  "Unmuted": "음소거 해제",
+  "Unmute": "음소거 해제",
  "Playback Rate": "재생 비율",
  "Subtitles": "서브타이틀",
  "subtitles off": "서브타이틀 끄기",
@@ -0,0 +1,26 @@
+{
+  "Play": "Spill",
+  "Pause": "Pause",
+  "Current Time": "Aktuell tid",
+  "Duration Time": "Varighet",
+  "Remaining Time": "Gjenstående tid",
+  "Stream Type": "Type strøm",
+  "LIVE": "DIREKTE",
+  "Loaded": "Lastet inn",
+  "Progress": "Status",
+  "Fullscreen": "Fullskjerm",
+  "Non-Fullscreen": "Lukk fullskjerm",
+  "Mute": "Lyd av",
+  "Unmute": "Lyd på",
+  "Playback Rate": "Avspillingsrate",
+  "Subtitles": "Undertekst på",
+  "subtitles off": "Undertekst av",
+  "Captions": "Undertekst for hørselshemmede på",
+  "captions off": "Undertekst for hørselshemmede av",
+  "Chapters": "Kapitler",
+  "You aborted the media playback": "Du avbrøt avspillingen.",
+  "A network error caused the media download to fail part-way.": "En nettverksfeil avbrøt nedlasting av videoen.",
+  "The media could not be loaded, either because the server or network failed or because the format is not supported.": "Videoen kunne ikke lastes ned, på grunn av nettverksfeil eller serverfeil, eller fordi formatet ikke er støttet.",
+  "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "Videoavspillingen ble avbrudt på grunn av ødelagte data eller fordi videoen ville gjøre noe som nettleseren din ikke har støtte for.",
+  "No compatible source was found for this media.": "Fant ikke en kompatibel kilde for dette mediainnholdet."
+}
@@ -11,16 +11,27 @@
  "Fullscreen": "Volledig scherm",
  "Non-Fullscreen": "Geen volledig scherm",
  "Mute": "Geluid uit",
-  "Unmuted": "Geluid aan",
+  "Unmute": "Geluid aan",
  "Playback Rate": "Weergavesnelheid",
  "Subtitles": "Ondertiteling",
-  "subtitles off": "Ondertiteling uit",
-  "Captions": "Ondertiteling",
-  "captions off": "Ondertiteling uit",
+  "subtitles off": "ondertiteling uit",
+  "Captions": "Bijschriften",
+  "captions off": "bijschriften uit",
  "Chapters": "Hoofdstukken",
+  "Descriptions": "Beschrijvingen",
+  "descriptions off": "beschrijvingen off",
  "You aborted the media playback": "U hebt de mediaweergave afgebroken.",
  "A network error caused the media download to fail part-way.": "De mediadownload is mislukt door een netwerkfout.",
  "The media could not be loaded, either because the server or network failed or because the format is not supported.": "De media kon niet worden geladen, vanwege een server- of netwerkfout of doordat het formaat niet wordt ondersteund.",
  "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "De mediaweergave is afgebroken vanwege beschadigde data of het mediabestand gebruikt functies die niet door uw browser worden ondersteund.",
-  "No compatible source was found for this media.": "Voor deze media is geen ondersteunde bron gevonden."
+  "No compatible source was found for this media.": "Voor deze media is geen ondersteunde bron gevonden.",
+  "Play Video": "Video Afspelen",
+  "Close": "Sluiten",
+  "Modal Window": "Modal Venster",
+  "This is a modal window": "Dit is een modaal venster",
+  "This modal can be closed by pressing the Escape key or activating the close button.": "Dit modaal venster kan gesloten worden door op Escape te drukken of de 'sluiten' knop te activeren.",
+  ", opens captions settings dialog": ", opent bijschriften instellingen venster",
+  ", opens subtitles settings dialog": ", opent ondertiteling instellingen venster",
+  ", opens descriptions settings dialog": ", opent beschrijvingen instellingen venster",
+  ", selected": ", selected"
 }
@@ -0,0 +1,26 @@
+{
+  "Play": "Spel",
+  "Pause": "Pause",
+  "Current Time": "Aktuell tid",
+  "Duration Time": "Varigheit",
+  "Remaining Time": "Tid attende",
+  "Stream Type": "Type straum",
+  "LIVE": "DIREKTE",
+  "Loaded": "Lasta inn",
+  "Progress": "Status",
+  "Fullscreen": "Fullskjerm",
+  "Non-Fullscreen": "Stenga fullskjerm",
+  "Mute": "Ljod av",
+  "Unmute": "Ljod på",
+  "Playback Rate": "Avspelingsrate",
+  "Subtitles": "Teksting på",
+  "subtitles off": "Teksting av",
+  "Captions": "Teksting for høyrselshemma på",
+  "captions off": "Teksting for høyrselshemma av",
+  "Chapters": "Kapitel",
+  "You aborted the media playback": "Du avbraut avspelinga.",
+  "A network error caused the media download to fail part-way.": "Ein nettverksfeil avbraut nedlasting av videoen.",
+  "The media could not be loaded, either because the server or network failed or because the format is not supported.": "Videoen kunne ikkje lastas ned, på grunn av ein nettverksfeil eller serverfeil, eller av di formatet ikkje er stoda.",
+  "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "Videoavspelinga blei broten på grunn av øydelagde data eller av di videoen ville gjera noe som nettlesaren din ikkje stodar.",
+  "No compatible source was found for this media.": "Fant ikke en kompatibel kilde for dette mediainnholdet."
+}
@@ -0,0 +1,34 @@
+{
+  "Play": "Odtwarzaj",
+  "Pause": "Pauza",
+  "Current Time": "Aktualny czas",
+  "Duration Time": "Czas trwania",
+  "Remaining Time": "Pozostały czas",
+  "Stream Type": "Typ strumienia",
+  "LIVE": "NA ŻYWO",
+  "Loaded": "Załadowany",
+  "Progress": "Status",
+  "Fullscreen": "Pełny ekran",
+  "Non-Fullscreen": "Pełny ekran niedostępny",
+  "Mute": "Wyłącz dźwięk",
+  "Unmute": "Włącz dźwięk",
+  "Playback Rate": "Szybkość odtwarzania",
+  "Subtitles": "Napisy",
+  "subtitles off": "Napisy wyłączone",
+  "Captions": "Transkrypcja",
+  "captions off": "Transkrypcja wyłączona",
+  "Chapters": "Rozdziały",
+  "You aborted the media playback": "Odtwarzanie zostało przerwane",
+  "A network error caused the media download to fail part-way.": "Problemy z siecią spowodowały błąd przy pobieraniu materiału wideo.",
+  "The media could not be loaded, either because the server or network failed or because the format is not supported.": "Materiał wideo nie może być załadowany, ponieważ wystąpił problem z siecią lub format nie jest obsługiwany",
+  "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "Odtwarzanie materiału wideo zostało przerwane z powodu uszkodzonego pliku wideo lub z powodu błędu funkcji, które nie są wspierane przez przeglądarkę.",
+  "No compatible source was found for this media.": "Dla tego materiału wideo nie znaleziono kompatybilnego źródła.",
+  "Play video": "Odtwarzaj wideo",
+  "Close": "Zamknij",
+  "Modal Window": "Okno Modala",
+  "This is a modal window": "To jest okno modala",
+  "This modal can be closed by pressing the Escape key or activating the close button.": "Ten modal możesz zamknąć naciskając przycisk Escape albo wybierając przycisk Zamknij.",
+  ", opens captions settings dialog": ", otwiera okno dialogowe ustawień transkrypcji",
+  ", opens subtitles settings dialog": ", otwiera okno dialogowe napisów",
+  ", selected": ", zaznaczone"
+}
@@ -1,6 +1,6 @@
 {
  "Play": "Tocar",
-  "Pause": "Pause",
+  "Pause": "Pausar",
  "Current Time": "Tempo",
  "Duration Time": "Duração",
  "Remaining Time": "Tempo Restante",
@@ -11,16 +11,16 @@
  "Fullscreen": "Tela Cheia",
  "Non-Fullscreen": "Tela Normal",
  "Mute": "Mudo",
-  "Unmuted": "Habilitar Som",
+  "Unmute": "Habilitar Som",
  "Playback Rate": "Velocidade",
  "Subtitles": "Legendas",
  "subtitles off": "Sem Legendas",
  "Captions": "Anotações",
  "captions off": "Sem Anotações",
  "Chapters": "Capítulos",
-  "You aborted the media playback": "Você parou a execução de vídeo.",
+  "You aborted the media playback": "Você parou a execução do vídeo.",
  "A network error caused the media download to fail part-way.": "Um erro na rede fez o vídeo parar parcialmente.",
  "The media could not be loaded, either because the server or network failed or because the format is not supported.": "O vídeo não pode ser carregado, ou porque houve um problema com sua rede ou pelo formato do vídeo não ser suportado.",
-  "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "A Execução foi interrompida por um problema com o vídeo ou por seu navegador não dar suporte ao seu formato.",
+  "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "A execução foi interrompida por um problema com o vídeo ou por seu navegador não dar suporte ao seu formato.",
  "No compatible source was found for this media.": "Não foi encontrada fonte de vídeo compatível."
 }
@@ -1,26 +1,26 @@
 {
- "Play": "Воспроизвести",
- "Pause": "Приостановить",
- "Current Time": "Текущее время",
- "Duration Time": "Продолжительность",
- "Remaining Time": "Оставшееся время",
- "Stream Type": "Тип потока",
- "LIVE": "ОНЛАЙН",
- "Loaded": "Загрузка",
- "Progress": "Прогресс",
- "Fullscreen": "Полноэкранный режим",
- "Non-Fullscreen": "Неполноэкранный режим",
- "Mute": "Без звука",
- "Unmuted": "Со звуком",
- "Playback Rate": "Скорость воспроизведения",
- "Subtitles": "Субтитры",
- "subtitles off": "Субтитры выкл.",
- "Captions": "Подписи",
- "captions off": "Подписи выкл.",
- "Chapters": "Главы",
- "You aborted the media playback": "Вы прервали воспроизведение видео",
- "A network error caused the media download to fail part-way.": "Ошибка сети вызвала сбой во время загрузки видео.",
- "The media could not be loaded, either because the server or network failed or because the format is not supported.": "Невозможно загрузить видео из-за сетевого или серверного сбоя либо формат не поддерживается.",
- "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "Воспроизведение видео было приостановлено из-за повреждения либо в связи с тем, что видео использует функции, неподдерживаемые вашим браузером.",
- "No compatible source was found for this media.": "Совместимые источники для этого видео отсутствуют."
+  "Play": "Воспроизвести",
+  "Pause": "Приостановить",
+  "Current Time": "Текущее время",
+  "Duration Time": "Продолжительность",
+  "Remaining Time": "Оставшееся время",
+  "Stream Type": "Тип потока",
+  "LIVE": "ОНЛАЙН",
+  "Loaded": "Загрузка",
+  "Progress": "Прогресс",
+  "Fullscreen": "Полноэкранный режим",
+  "Non-Fullscreen": "Неполноэкранный режим",
+  "Mute": "Без звука",
+  "Unmute": "Со звуком",
+  "Playback Rate": "Скорость воспроизведения",
+  "Subtitles": "Субтитры",
+  "subtitles off": "Субтитры выкл.",
+  "Captions": "Подписи",
+  "captions off": "Подписи выкл.",
+  "Chapters": "Главы",
+  "You aborted the media playback": "Вы прервали воспроизведение видео",
+  "A network error caused the media download to fail part-way.": "Ошибка сети вызвала сбой во время загрузки видео.",
+  "The media could not be loaded, either because the server or network failed or because the format is not supported.": "Невозможно загрузить видео из-за сетевого или серверного сбоя либо формат не поддерживается.",
+  "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "Воспроизведение видео было приостановлено из-за повреждения либо в связи с тем, что видео использует функции, неподдерживаемые вашим браузером.",
+  "No compatible source was found for this media.": "Совместимые источники для этого видео отсутствуют."
 }
@@ -11,7 +11,7 @@
  "Fullscreen": "Puni ekran",
  "Non-Fullscreen": "Mali ekran",
  "Mute": "Prigušen",
-  "Unmuted": "Ne-prigušen",
+  "Unmute": "Ne-prigušen",
  "Playback Rate": "Stopa reprodukcije",
  "Subtitles": "Podnaslov",
  "subtitles off": "Podnaslov deaktiviran",
@@ -11,7 +11,7 @@
  "Fullscreen": "Fullskärm",
  "Non-Fullscreen": "Ej fullskärm",
  "Mute": "Ljud av",
-  "Unmuted": "Ljud på",
+  "Unmute": "Ljud på",
  "Playback Rate": "Uppspelningshastighet",
  "Subtitles": "Text på",
  "subtitles off": "Text av",
@@ -1,26 +1,34 @@
 {
- "Play": "Oynat",
- "Pause": "Duraklat",
- "Current Time": "Süre",
- "Duration Time": "Toplam Süre",
- "Remaining Time": "Kalan Süre",
- "Stream Type": "Yayın Tipi",
- "LIVE": "CANLI",
- "Loaded": "Yüklendi",
- "Progress": "Yükleniyor",
- "Fullscreen": "Tam Ekran",
- "Non-Fullscreen": "Küçük Ekran",
- "Mute": "Ses Kapa",
- "Unmuted": "Ses Aç",
- "Playback Rate": "Oynatma Hızı",
- "Subtitles": "Altyazı",
- "subtitles off": "Altyazı Kapat",
- "Captions": "Ek Açıklamalar",
- "captions off": "Ek Açıklamalar Kapalı",
- "Chapters": "Bölümler",
- "You aborted the media playback": "Video oynatmayı iptal ettiniz",
- "A network error caused the media download to fail part-way.": "Video indirilirken bağlantı sorunu oluştu.",
- "The media could not be loaded, either because the server or network failed or because the format is not supported.": "Video oynatılamadı, ağ ya da sunucu hatası veya belirtilen format desteklenmiyor.",
- "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "Tarayıcınız desteklemediği için videoda hata oluştu.",
- "No compatible source was found for this media.": "Video için kaynak bulunamadı."
+  "Play": "Oynat",
+  "Pause": "Duraklat",
+  "Current Time": "Süre",
+  "Duration Time": "Toplam Süre",
+  "Remaining Time": "Kalan Süre",
+  "Stream Type": "Yayın Tipi",
+  "LIVE": "CANLI",
+  "Loaded": "Yüklendi",
+  "Progress": "Yükleniyor",
+  "Fullscreen": "Tam Ekran",
+  "Non-Fullscreen": "Küçük Ekran",
+  "Mute": "Ses Kapa",
+  "Unmute": "Ses Aç",
+  "Playback Rate": "Oynatma Hızı",
+  "Subtitles": "Altyazı",
+  "subtitles off": "Altyazı Kapalı",
+  "Captions": "Ek Açıklamalar",
+  "captions off": "Ek Açıklamalar Kapalı",
+  "Chapters": "Bölümler",
+  "You aborted the media playback": "Video oynatmayı iptal ettiniz",
+  "A network error caused the media download to fail part-way.": "Video indirilirken bağlantı sorunu oluştu.",
+  "The media could not be loaded, either because the server or network failed or because the format is not supported.": "Video oynatılamadı, ağ ya da sunucu hatası veya belirtilen format desteklenmiyor.",
+  "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "Tarayıcınız desteklemediği için videoda hata oluştu.",
+  "No compatible source was found for this media.": "Video için kaynak bulunamadı.",
+  "Play Video": "Videoyu Oynat",
+  "Close": "Kapat",
+  "Modal Window": "Modal Penceresi",
+  "This is a modal window": "Bu bir modal penceresidir",
+  "This modal can be closed by pressing the Escape key or activating the close button.": "Bu modal ESC tuşuna basarak ya da kapata tıklanarak kapatılabilir.",
+  ", opens captions settings dialog": ", ek açıklama ayarları menüsünü açar",
+  ", opens subtitles settings dialog": ", altyazı ayarları menüsünü açar",
+  ", selected": ", seçildi"
 }
@@ -1,26 +1,26 @@
 {
- "Play": "Відтворити",
- "Pause": "Призупинити",
- "Current Time": "Поточний час",
- "Duration Time": "Тривалість",
- "Remaining Time": "Час, що залишився",
- "Stream Type": "Тип потоку",
- "LIVE": "НАЖИВО",
- "Loaded": "Завантаження",
- "Progress": "Прогрес",
- "Fullscreen": "Повноекранний режим",
- "Non-Fullscreen": "Неповноекранний режим",
- "Mute": "Без звуку",
- "Unmuted": "Зі звуком",
- "Playback Rate": "Швидкість відтворення",
- "Subtitles": "Субтитри",
- "subtitles off": "Без субтитрів",
- "Captions": "Підписи",
- "captions off": "Без підписів",
- "Chapters": "Розділи",
- "You aborted the media playback": "Ви припинили відтворення відео",
- "A network error caused the media download to fail part-way.": "Помилка мережі викликала збій під час завантаження відео.",
- "The media could not be loaded, either because the server or network failed or because the format is not supported.": "Неможливо завантажити відео через мережевий чи серверний збій або формат не підтримується.",
- "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "Відтворення відео було припинено через пошкодження або у зв'язку з тим, що відео використовує функції, які не підтримуються вашим браузером.",
- "No compatible source was found for this media.": "Сумісні джерела для цього відео відсутні."
+  "Play": "Відтворити",
+  "Pause": "Призупинити",
+  "Current Time": "Поточний час",
+  "Duration Time": "Тривалість",
+  "Remaining Time": "Час, що залишився",
+  "Stream Type": "Тип потоку",
+  "LIVE": "НАЖИВО",
+  "Loaded": "Завантаження",
+  "Progress": "Прогрес",
+  "Fullscreen": "Повноекранний режим",
+  "Non-Fullscreen": "Неповноекранний режим",
+  "Mute": "Без звуку",
+  "Unmute": "Зі звуком",
+  "Playback Rate": "Швидкість відтворення",
+  "Subtitles": "Субтитри",
+  "subtitles off": "Без субтитрів",
+  "Captions": "Підписи",
+  "captions off": "Без підписів",
+  "Chapters": "Розділи",
+  "You aborted the media playback": "Ви припинили відтворення відео",
+  "A network error caused the media download to fail part-way.": "Помилка мережі викликала збій під час завантаження відео.",
+  "The media could not be loaded, either because the server or network failed or because the format is not supported.": "Неможливо завантажити відео через мережевий чи серверний збій або формат не підтримується.",
+  "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "Відтворення відео було припинено через пошкодження або у зв'язку з тим, що відео використовує функції, які не підтримуються вашим браузером.",
+  "No compatible source was found for this media.": "Сумісні джерела для цього відео відсутні."
 }
@@ -11,7 +11,7 @@
  "Fullscreen": "Toàn màn hình",
  "Non-Fullscreen": "Thoát toàn màn hình",
  "Mute": "Tắt tiếng",
-  "Unmuted": "Bật âm thanh",
+  "Unmute": "Bật âm thanh",
  "Playback Rate": "Tốc độ phát",
  "Subtitles": "Phụ đề",
  "subtitles off": "Tắt phụ đề",
@@ -11,7 +11,7 @@
  "Fullscreen": "全屏",
  "Non-Fullscreen": "退出全屏",
  "Mute": "静音",
-  "Unmuted": "取消静音",
+  "Unmute": "取消静音",
  "Playback Rate": "播放码率",
  "Subtitles": "字幕",
  "subtitles off": "字幕关闭",
@@ -11,7 +11,7 @@
  "Fullscreen": "全螢幕",
  "Non-Fullscreen": "退出全螢幕",
  "Mute": "靜音",
-  "Unmuted": "取消靜音",
+  "Unmute": "取消靜音",
  "Playback Rate": " 播放速率",
  "Subtitles": "字幕",
  "subtitles off": "關閉字幕",
@@ -1,7 +1,7 @@
 {
  "name": "video.js",
  "description": "An HTML5 and Flash video player with a common API and skin for both.",
-  "version": "5.4.0",
+  "version": "5.11.9",
  "copyright": "Copyright Brightcove, Inc. <https://www.brightcove.com/>",
  "license": "Apache-2.0",
  "keywords": [
@@ -14,7 +14,7 @@
  "homepage": "http://videojs.com",
  "author": "Steve Heffernan",
  "scripts": {
-    "test": "grunt test && if [ '$TRAVIS' ]; then grunt coveralls; fi;"
+    "test": "grunt test"
  },
  "repository": {
    "type": "git",
@@ -23,16 +23,16 @@
  "main": "./dist/video.js",
  "style": "./dist/video-js.css",
  "dependencies": {
-    "global": "^4.3.0",
-    "lodash-compat": "^3.9.3",
-    "object.assign": "^4.0.1",
-    "safe-json-parse": "^4.0.0",
+    "global": "4.3.0",
+    "lodash-compat": "3.10.2",
+    "object.assign": "4.0.3",
+    "safe-json-parse": "4.0.0",
    "tsml": "1.0.1",
-    "videojs-font": "1.4.0",
-    "videojs-ie8": "1.1.1",
-    "videojs-swf": "5.0.1",
-    "vtt.js": "git+https://github.com/gkatsev/vtt.js.git#vjs-v0.12.1",
-    "xhr": "~2.2.0"
+    "videojs-font": "2.0.0",
+    "videojs-ie8": "1.1.2",
+    "videojs-swf": "5.1.0",
+    "videojs-vtt.js": "0.12.1",
+    "xhr": "2.2.0"
  },
  "devDependencies": {
    "babel": "^5.2.2",
@@ -44,6 +44,8 @@
    "chg": "^0.3.2",
    "css": "^2.2.0",
    "es5-shim": "^4.1.3",
+    "es6-shim": "^0.35.1",
+    "gkatsev-grunt-sass": "^1.1.1",
    "grunt": "^0.4.4",
    "grunt-aws-s3": "^0.12.1",
    "grunt-banner": "^0.4.0",
@@ -57,29 +59,29 @@
    "grunt-contrib-cssmin": "~0.6.0",
    "grunt-contrib-jshint": "~0.11.3",
    "grunt-contrib-less": "~0.6.4",
-    "grunt-contrib-uglify": "^0.8.0",
+    "grunt-contrib-uglify": "^2.0.0",
    "grunt-contrib-watch": "~0.1.4",
    "grunt-coveralls": "^1.0.0",
    "grunt-exorcise": "^1.0.1",
    "grunt-fastly": "^0.1.3",
    "grunt-github-releaser": "^0.1.17",
-    "grunt-karma": "^0.8.3",
-    "grunt-sass": "^1.0.0",
+    "grunt-karma": "^2.0.0",
+    "grunt-shell": "^1.3.0",
    "grunt-version": "~0.3.0",
    "grunt-videojs-languages": "0.0.4",
    "grunt-zip": "0.10.2",
-    "karma": "^0.12.36",
-    "karma-browserify": "^4.0.0",
-    "karma-browserstack-launcher": "^0.1.4",
-    "karma-chrome-launcher": "^0.1.3",
-    "karma-coverage": "^0.4.0",
-    "karma-detect-browsers": "^2.0.2",
-    "karma-firefox-launcher": "^0.1.3",
-    "karma-ie-launcher": "^0.1.5",
-    "karma-opera-launcher": "~0.1.0",
-    "karma-qunit": "^0.1.2",
-    "karma-safari-launcher": "^0.1.1",
-    "karma-sinon": "^1.0.3",
+    "karma": "^1.2.0",
+    "karma-browserify": "^5.1.0",
+    "karma-browserstack-launcher": "^1.0.1",
+    "karma-chrome-launcher": "^1.0.1",
+    "karma-coverage": "^1.1.1",
+    "karma-detect-browsers": "^2.1.0",
+    "karma-firefox-launcher": "^1.0.0",
+    "karma-ie-launcher": "^1.0.0",
+    "karma-opera-launcher": "^1.0.0",
+    "karma-qunit": "^1.2.0",
+    "karma-safari-launcher": "^1.0.0",
+    "karma-sinon": "^1.0.5",
    "load-grunt-tasks": "^3.1.0",
    "proxyquireify": "^3.0.0",
    "qunitjs": "^1.18.0",
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" />
+  <title>Video.js Text Descriptions, Chapters &amp; Captions Example</title>
+
+  <!-- Add ES5 shim and sham for IE8 -->
+  <script src="../build/temp/ie8/videojs-ie8.js"></script>
+
+  <!-- Load the source files -->
+  <link href="../build/temp/video-js.css" rel="stylesheet" type="text/css">
+  <script src="../build/temp/video.js"></script>
+
+  <!-- Set the location of the flash SWF -->
+  <script>
+    videojs.options.flash.swf = '../build/temp/video-js.swf';
+  </script>
+
+</head>
+<body>
+  <!-- NOTE: we have to disable native Text Track support for the HTML5 tech,
+             since even HTML5 video players with native Text Track support
+             don't currently support 'description' text tracks in any
+             useful way! -->
+  <video id="example_video_1" class="video-js vjs-default-skin" controls preload="none" width="640" height="360"
+      data-setup='{ "html5" : { "nativeTextTracks" : false } }'>
+    <source src="https://archive.org/download/ElephantsDream/ed_hd.mp4" type="video/mp4">
+    <source src="https://archive.org/download/ElephantsDream/ed_hd.ogv" type="video/ogv">
+
+    <track kind="captions" src="../docs/examples/elephantsdream/captions.en.vtt" srclang="en" label="English" default></track><!-- Tracks need an ending tag thanks to IE9 -->
+    <track kind="captions" src="../docs/examples/elephantsdream/captions.sv.vtt" srclang="sv" label="Swedish"></track>
+    <track kind="captions" src="../docs/examples/elephantsdream/captions.ru.vtt" srclang="ru" label="Russian"></track>
+    <track kind="captions" src="../docs/examples/elephantsdream/captions.ja.vtt" srclang="ja" label="Japanese"></track>
+    <track kind="captions" src="../docs/examples/elephantsdream/captions.ar.vtt" srclang="ar" label="Arabic"></track>
+
+    <track kind="descriptions" src="../docs/examples/elephantsdream/descriptions.en.vtt" srclang="en" label="English"></track>
+
+    <track kind="chapters" src="../docs/examples/elephantsdream/chapters.en.vtt" srclang="en" label="English"></track>
+
+    <p class="vjs-no-js">To view this video please enable JavaScript, and consider upgrading to a web browser that <a href="http://videojs.com/html5-video-support/" target="_blank">supports HTML5 video</a></p>
+  </video>
+</body>
+</html>
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
  <meta charset="utf-8" />
  <title>Video.js Icons Sandbox</title>
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
  <meta charset="utf-8" />
  <title>Video.js Sandbox</title>
@@ -27,17 +27,17 @@
  </div>

  <video id="vid1" class="video-js vjs-default-skin" controls preload="auto" width="640" height="264"
-      poster="http://video-js.zencoder.com/oceans-clip.png"
+      poster="http://vjs.zencdn.net/v/oceans.png"
      data-setup='{}'>
-    <source src="http://video-js.zencoder.com/oceans-clip.mp4" type='video/mp4'>
-    <source src="http://video-js.zencoder.com/oceans-clip.webm" type='video/webm'>
-    <source src="http://video-js.zencoder.com/oceans-clip.ogv" type='video/ogg'>
+    <source src="http://vjs.zencdn.net/v/oceans.mp4" type="video/mp4">
+    <source src="http://vjs.zencdn.net/v/oceans.webm" type="video/webm">
+    <source src="http://vjs.zencdn.net/v/oceans.ogv" type="video/ogg">
    <track kind="captions" src="../docs/examples/shared/example-captions.vtt" srclang="en" label="English"></track><!-- Tracks need an ending tag thanks to IE9 -->
    <p class="vjs-no-js">To view this video please enable JavaScript, and consider upgrading to a web browser that <a href="http://videojs.com/html5-video-support/" target="_blank">supports HTML5 video</a></p>
  </video>

  <script>
-    vid = document.getElementById("vid1");
+    var vid = document.getElementById("vid1");
  </script>

 </body>
@@ -32,7 +32,7 @@
      "Fullscreen": "Pantalla Completa",
      "Non-Fullscreen": "No Pantalla Completa",
      "Mute": "Mudo",
-      "Unmuted": "Activar sonido",
+      "Unmute": "Activar sonido",
      "Playback Rate": "Reproduccion Cambio",
      "Subtitles": "Subtitulos",
      "subtitles off": "subtitulos fuera",
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
  <meta charset="utf-8" />
  <title>Video.js Plugin Example</title>
@@ -20,10 +20,10 @@
 <body>
  <p style="background-color:#eee; border: 1px solid #777; padding: 10px; font-size: .8em; line-height: 1.5em; font-family: Verdana, sans-serif;">This page shows you how to create, register and initialize a Video.js plugin.</p>

-  <video id="vid1" class="video-js vjs-default-skin" controls preload="auto" width="640" height="264" poster="http://video-js.zencoder.com/oceans-clip.png">
-    <source src="http://video-js.zencoder.com/oceans-clip.mp4" type='video/mp4'>
-    <source src="http://video-js.zencoder.com/oceans-clip.webm" type='video/webm'>
-    <source src="http://video-js.zencoder.com/oceans-clip.ogv" type='video/ogg'>
+  <video id="vid1" class="video-js vjs-default-skin" controls preload="auto" width="640" height="264" poster="http://vjs.zencdn.net/v/oceans.png">
+    <source src="http://vjs.zencdn.net/v/oceans.mp4" type="video/mp4">
+    <source src="http://vjs.zencdn.net/v/oceans.webm" type="video/webm">
+    <source src="http://vjs.zencdn.net/v/oceans.ogv" type="video/ogg">
    <p>Video Playback Not Supported</p>
  </video>

@@ -0,0 +1,5 @@
+@media print {
+  .video-js > *:not(.vjs-tech):not(.vjs-poster) {
+    visibility:hidden;
+  }
+}
@@ -1,5 +1,5 @@
 // Text, icons, hover states
-$primary-foreground-color: #fff;
+$primary-foreground-color: #fff !default;

 // Control backgrounds (control bar, big play, menus)
 $primary-background-color: #2B333F !default;
@@ -5,10 +5,11 @@
  .vjs-custom-control-spacer { @include flex(auto); }
  &.vjs-no-flex .vjs-custom-control-spacer { width: auto; }

-  .vjs-current-time, .vjs-captions-button, .vjs-time-divider,
-  .vjs-progress-control, .vjs-duration, .vjs-remaining-time, .vjs-playback-rate,
-  .vjs-mute-control, .vjs-volume-control, .vjs-chapters-button, .vjs-captions-button,
-  .vjs-subtitles-button, .vjs-volume-menu-button { display: none; }
+  .vjs-current-time, .vjs-time-divider, .vjs-duration, .vjs-remaining-time,
+  .vjs-playback-rate, .vjs-progress-control,
+  .vjs-mute-control, .vjs-volume-control, .vjs-volume-menu-button,
+  .vjs-chapters-button, .vjs-descriptions-button, .vjs-captions-button,
+  .vjs-subtitles-button, .vjs-audio-button { display: none; }
 }

 // When the player is x-small, display nothing but:
@@ -16,10 +17,11 @@
 // - Progress bar
 // - Fullscreen Button
 .video-js.vjs-layout-x-small:not(.vjs-fullscreen) {
-  .vjs-current-time, .vjs-captions-button, .vjs-time-divider,
-  .vjs-duration, .vjs-remaining-time, .vjs-playback-rate, .vjs-captions-button,
-  .vjs-mute-control, .vjs-volume-control, .vjs-chapters-button,
-  .vjs-subtitles-button, .vjs-volume-button, .vjs-fullscreen-control { display: none; }
+  .vjs-current-time, .vjs-time-divider, .vjs-duration, .vjs-remaining-time,
+  .vjs-playback-rate,
+  .vjs-mute-control, .vjs-volume-control, .vjs-volume-menu-button,
+  .vjs-chapters-button, .vjs-descriptions-button, .vjs-captions-button,
+  .vjs-subtitles-button, .vjs-audio-button { display: none; }
 }


@@ -30,8 +32,9 @@
 // - Captions Button
 // - Fullscreen button
 .video-js.vjs-layout-small:not(.vjs-fullscreen) {
-  .vjs-current-time, .vjs-captions-button, .vjs-time-divider,
-  .vjs-duration, .vjs-remaining-time, .vjs-playback-rate,
-  .vjs-mute-control, .vjs-volume-control, .vjs-chapters-button,
-  .vjs-subtitles-button { display: none; }
+  .vjs-current-time, .vjs-time-divider, .vjs-duration, .vjs-remaining-time,
+  .vjs-playback-rate,
+  .vjs-mute-control, .vjs-volume-control,
+  .vjs-chapters-button, .vjs-descriptions-button, .vjs-captions-button,
+  .vjs-subtitles-button .vjs-audio-button { display: none; }
 }
@@ -0,0 +1,3 @@
+.video-js .vjs-audio-button {
+  @extend .vjs-icon-audio;
+}
@@ -6,14 +6,14 @@
  color: $primary-foreground-color;
  margin: 0 auto;
  padding: 0.5em;
-  height: 15em;
+  height: 16em;
  font-size: 12px;
  width: 40em;
 }

 .vjs-caption-settings .vjs-tracksettings {
  top: 0;
-  bottom: 2em;
+  bottom: 1em;
  left: 0;
  right: 0;
  position: absolute;
@@ -40,8 +40,10 @@
  margin: 5px;
  padding: 3px;
  min-height: 40px;
+  border: none;
 }
-.vjs-caption-settings .vjs-tracksetting label {
+.vjs-caption-settings .vjs-tracksetting label,
+.vjs-caption-settings .vjs-tracksetting legend {
  display: block;
  width: 100px;
  margin-bottom: 5px;
@@ -50,6 +52,8 @@
 .vjs-caption-settings .vjs-tracksetting span {
  display: inline;
  margin-left: 5px;
+  vertical-align: top;
+  float: right;
 }

 .vjs-caption-settings .vjs-tracksetting > div {
@@ -67,6 +71,23 @@
  margin-right: 10px;
 }

+.vjs-caption-settings fieldset {
+  margin-top: 1em;
+  margin-left: .5em;
+}
+
+// Hide labels within fieldsets, so they are only for screen reader users
+.vjs-caption-settings fieldset .vjs-label {
+  position: absolute;
+  clip: rect(1px 1px 1px 1px); /* for Internet Explorer */
+  clip: rect(1px, 1px, 1px, 1px);
+  padding: 0;
+  border: 0;
+  height: 1px;
+  width: 1px;
+  overflow: hidden;
+}
+
 .vjs-caption-settings input[type="button"] {
  width: 40px;
  height: 40px;
@@ -2,11 +2,6 @@
  @extend .vjs-icon-chapters;
 }

-.vjs-chapters-button .vjs-menu {
-  left: -10em; // (Width of vjs-menu - width of vjs-control) / 2
-  width: 0;
-}
-
 .vjs-chapters-button .vjs-menu ul {
  width: 24em;
 }
@@ -20,13 +20,22 @@
  @include transition($trans);
 }

+// IE 8 hack for media queries
+$ie8screen: "\\0screen";
+
 // Video has started playing AND user is inactive
 .vjs-has-started.vjs-user-inactive.vjs-playing .vjs-control-bar {
-  visibility: hidden;
+  // Remain visible for screen reader and keyboard users
+  visibility: visible;
  opacity: 0;

  $trans: visibility 1.0s, opacity 1.0s;
  @include transition($trans);
+
+  // Make controls hidden in IE8 for now
+  @media #{$ie8screen} {
+    visibility: hidden;
+  }
 }

 .vjs-controls-disabled .vjs-control-bar,
@@ -42,11 +51,11 @@
  visibility: visible;
 }

+
 // IE8 is flakey with fonts, and you have to change the actual content to force
 // fonts to show/hide properly.
 // - "\9" IE8 hack didn't work for this
 // Found in XP IE8 from http://modern.ie. Does not show up in "IE8 mode" in IE9
-$ie8screen: "\0screen";
 .vjs-user-inactive.vjs-playing .vjs-control-bar :before {
  @media #{$ie8screen} { content: ""; }
 }
@@ -0,0 +1,3 @@
+.video-js .vjs-descriptions-button {
+  @extend .vjs-icon-audio-description;
+}
@@ -1,5 +1,4 @@
 .video-js .vjs-fullscreen-control {
-  width: 3.8em;
  cursor: pointer;
  @include flex(none);
 }
@@ -124,6 +124,11 @@ body.vjs-full-window {
 // Hide disabled or unsupported controls.
 .vjs-hidden { display: none !important; }

+.vjs-disabled {
+  opacity: 0.5;
+  cursor: default;
+}
+
 // Visually hidden offscreen, but accessible to screen readers.
 .video-js .vjs-offscreen {
  height: 1px;
@@ -4,6 +4,7 @@
  background-repeat: no-repeat;
  background-position: 50% 50%;
  background-size: contain;
+  background-color: #000000;
  cursor: pointer;
  margin: 0;
  padding: 0;
@@ -15,6 +15,7 @@
 .video-js .vjs-progress-control {
  @include flex(auto);
  @include display-flex(center);
+  min-width: 4em;
 }

 .vjs-live .vjs-progress-control {
@@ -38,15 +39,18 @@
 to avoid a weird hitch when you roll off the hover. */

 // Also show the current time tooltip
+.video-js .vjs-progress-control:hover .vjs-time-tooltip,
 .video-js .vjs-progress-control:hover .vjs-mouse-display:after,
 .video-js .vjs-progress-control:hover .vjs-play-progress:after {
-  display: block;
+  font-family: $text-font-family;
+  visibility: visible;
  font-size: 0.6em;
 }

 // Progress Bars
 .video-js .vjs-progress-holder .vjs-play-progress,
 .video-js .vjs-progress-holder .vjs-load-progress,
+.video-js .vjs-progress-holder .vjs-tooltip-progress-bar,
 .video-js .vjs-progress-holder .vjs-load-progress div {
  position: absolute;
  display: block;
@@ -82,27 +86,35 @@

 // Current Time "tooltip"
 // By default this is hidden and only shown when hovering over the progress control
+.video-js .vjs-time-tooltip,
 .video-js .vjs-mouse-display:after,
 .video-js .vjs-play-progress:after {
-  display: none;
+  visibility: hidden;
+  pointer-events: none;
  position: absolute;
-  top: -2.4em;
-  right: -1.5em;
+  top: -3.4em;
+  right: -1.9em;
  font-size: 0.9em;
  color: #000;
  content: attr(data-current-time);
-  padding: 0.2em 0.5em;
+  padding: 6px 8px 8px 8px;
  @include background-color-with-alpha(#fff, 0.8);
  @include border-radius(0.3em);
 }
+
+.video-js .vjs-time-tooltip,
 .video-js .vjs-play-progress:before,
 .video-js .vjs-play-progress:after {
  z-index: 1;
 }

+.video-js .vjs-progress-control .vjs-keep-tooltips-inside:after {
+  display: none;
+}
+
 .video-js .vjs-load-progress {
  // For IE8 we'll lighten the color
-  background: ligthen($secondary-background-color, 25%);
+  background: lighten($secondary-background-color, 25%);
  // Otherwise we'll rely on stacked opacities
  background: rgba($secondary-background-color, $secondary-background-transparency);
 }
@@ -111,7 +123,7 @@
 // specific time ranges that have been buffered
 .video-js .vjs-load-progress div {
  // For IE8 we'll lighten the color
-  background: ligthen($secondary-background-color, 50%);
+  background: lighten($secondary-background-color, 50%);
  // Otherwise we'll rely on stacked opacities
  background: rgba($secondary-background-color, 0.75);
 }
@@ -120,6 +132,18 @@
  width: auto;
 }

+.video-js .vjs-time-tooltip {
+  display: inline-block;
+  height: 2.4em;
+  position: relative;
+  float: right;
+  right: -1.9em;
+}
+
+.vjs-tooltip-progress-bar {
+  visibility: hidden;
+}
+
 .video-js .vjs-progress-control .vjs-mouse-display {
  display: none;
  position: absolute;
@@ -145,6 +169,7 @@
 .video-js.vjs-user-inactive.vjs-no-flex .vjs-progress-control .vjs-mouse-display:after {
  display: none;
 }
+.vjs-mouse-display .vjs-time-tooltip,
 .video-js .vjs-progress-control .vjs-mouse-display:after {
  color: #fff;
  @include background-color-with-alpha(#000, 0.8);
@@ -2,6 +2,10 @@
  @include flex(none);
  font-size: 1em;
  line-height: 3em;
+  min-width: 2em;
+  width: auto;
+  padding-left: 1em;
+  padding-right: 1em;
 }

 .vjs-live .vjs-time-control {
@@ -25,7 +25,7 @@
 }

 .video-js .vjs-volume-bar {
-  margin: 1.35em;
+  margin: 1.35em 0.45em;
 }

 .vjs-volume-bar.vjs-slider-horizontal {
@@ -36,6 +36,7 @@
 .vjs-volume-bar.vjs-slider-vertical {
  width: 0.3em;
  height: 5em;
+  margin: 1.35em auto;
 }

 .video-js .vjs-volume-level {
@@ -112,12 +113,16 @@
 }

 .vjs-volume-menu-button-vertical:hover .vjs-menu-content,
+.vjs-volume-menu-button-vertical:focus .vjs-menu-content,
+.vjs-volume-menu-button-vertical.vjs-slider-active .vjs-menu-content,
 .vjs-volume-menu-button-vertical .vjs-lock-showing .vjs-menu-content {
  height: 8em;
  width: 2.9em;
 }

 .vjs-volume-menu-button-horizontal:hover .vjs-menu-content,
+.vjs-volume-menu-button-horizontal:focus .vjs-menu-content,
+.vjs-volume-menu-button-horizontal .vjs-slider-active .vjs-menu-content,
 .vjs-volume-menu-button-horizontal .vjs-lock-showing .vjs-menu-content {
  height: 2.9em;
  width: 8em;
@@ -30,7 +30,7 @@
  width: auto;

  position: absolute;
-  left: 2.2222222em;
+  left: 4em;
  top: 0;

  padding: 0;
@@ -19,7 +19,7 @@
  max-height: 15em;
 }

-.vjs-menu-button-popup:hover .vjs-menu,
+.vjs-workinghover .vjs-menu-button-popup:hover .vjs-menu,
 .vjs-menu-button-popup .vjs-menu.vjs-lock-showing {
  display: block;
 }
@@ -2,10 +2,21 @@
  cursor: pointer;
 }

+// Change cursor back to default if the menu button is disabled
+.vjs-menu-button.vjs-disabled {
+  cursor: default;
+}
+
+// prevent menus from opening while disabled
+.vjs-workinghover .vjs-menu-button.vjs-disabled:hover .vjs-menu {
+  display: none;
+}
+
 .vjs-menu .vjs-menu-content {
  display: block;
  padding: 0; margin: 0;
  overflow: auto;
+  font-family: $text-font-family;
 }

 // prevent menus from opening while scrubbing (FF, IE)
@@ -2,7 +2,7 @@
@import "private-variables";
@import "utilities";

-@import "../../node_modules/videojs-font/scss/icons";
+@import "node_modules/videojs-font/scss/icons";

@import "components/layout";
@import "components/big-play";
@@ -33,7 +33,11 @@
@import "components/loading";
@import "components/captions";
@import "components/chapters";
+@import "components/descriptions";
@import "components/subtitles";
+@import "components/audio";
@import "components/adaptive";
@import "components/captions-settings";
@import "components/modal-dialog";
+
+@import "print";
@@ -0,0 +1,3 @@
+$icon-font-path: '//vjs.zencdn.net/font/1.5.1';
+
+@import 'video-js';
@@ -0,0 +1 @@
+@import "video-js";
@@ -1,10 +1,11 @@
 /**
 * @file button.js
 */
+import ClickableComponent from './clickable-component.js';
 import Component from './component';
-import * as Dom from './utils/dom.js';
 import * as Events from './utils/events.js';
 import * as Fn from './utils/fn.js';
+import log from './utils/log.js';
 import document from 'global/document';
 import assign from 'object.assign';

@@ -13,122 +14,87 @@ import assign from 'object.assign';
 *
 * @param {Object} player  Main Player
 * @param {Object=} options Object of option names and values
- * @extends Component
+ * @extends ClickableComponent
 * @class Button
 */
-class Button extends Component {
+class Button extends ClickableComponent {

  constructor(player, options) {
    super(player, options);
-
-    this.emitTapEvents();
-
-    this.on('tap', this.handleClick);
-    this.on('click', this.handleClick);
-    this.on('focus', this.handleFocus);
-    this.on('blur', this.handleBlur);
  }

  /**
   * Create the component's DOM element
   *
   * @param {String=} type Element's node type. e.g. 'div'
-   * @param {Object=} props An object of element attributes that should be set on the element Tag name
+   * @param {Object=} props An object of properties that should be set on the element
+   * @param {Object=} attributes An object of attributes that should be set on the element
   * @return {Element}
   * @method createEl
   */
  createEl(tag='button', props={}, attributes={}) {
    props = assign({
-      className: this.buildCSSClass(),
-      tabIndex: 0
+      className: this.buildCSSClass()
    }, props);

-    // Add standard Aria info
+    if (tag !== 'button') {
+      log.warn(`Creating a Button with an HTML element of ${tag} is deprecated; use ClickableComponent instead.`);
+
+      // Add properties for clickable element which is not a native HTML button
+      props = assign({
+        tabIndex: 0
+      }, props);
+
+      // Add ARIA attributes for clickable element which is not a native HTML button
+      attributes = assign({
+        role: 'button'
+      }, attributes);
+    }
+
+    // Add attributes for button element
    attributes = assign({
-      role: 'button',
      type: 'button', // Necessary since the default button type is "submit"
      'aria-live': 'polite' // let the screen reader user know that the text of the button may change
    }, attributes);

-    let el = super.createEl(tag, props, attributes);
+    let el = Component.prototype.createEl.call(this, tag, props, attributes);

-    this.controlTextEl_ = Dom.createEl('span', {
-      className: 'vjs-control-text'
-    });
-
-    el.appendChild(this.controlTextEl_);
-
-    this.controlText(this.controlText_);
+    this.createControlTextEl(el);

    return el;
  }

  /**
-   * Controls text - both request and localize
+   * Adds a child component inside this button
   *
-   * @param {String} text Text for button
-   * @return {String}
-   * @method controlText
+   * @param {String|Component} child The class name or instance of a child to add
+   * @param {Object=} options Options, including options to be passed to children of the child.
+   * @return {Component} The child component (created by this process if a string was used)
+   * @deprecated
+   * @method addChild
   */
-  controlText(text) {
-    if (!text) return this.controlText_ || 'Need Text';
+  addChild(child, options={}) {
+    let className = this.constructor.name;
+    log.warn(`Adding an actionable (user controllable) child to a Button (${className}) is not supported; use a ClickableComponent instead.`);

-    this.controlText_ = text;
-    this.controlTextEl_.innerHTML = this.localize(this.controlText_);
-
-    return this;
+    // Avoid the error message generated by ClickableComponent's addChild method
+    return Component.prototype.addChild.call(this, child, options);
  }

  /**
-   * Allows sub components to stack CSS class names
-   *
-   * @return {String}
-   * @method buildCSSClass
-   */
-  buildCSSClass() {
-    return `vjs-control vjs-button ${super.buildCSSClass()}`;
-  }
-
-  /**
-   * Handle Click - Override with specific functionality for button
-   *
-   * @method handleClick
-   */
-  handleClick() {}
-
-  /**
-   * Handle Focus - Add keyboard functionality to element
-   *
-   * @method handleFocus
-   */
-  handleFocus() {
-    Events.on(document, 'keydown', Fn.bind(this, this.handleKeyPress));
-  }
-
-  /**
-   * Handle KeyPress (document level) - Trigger click when keys are pressed
+   * Handle KeyPress (document level) - Extend with specific functionality for button
   *
   * @method handleKeyPress
   */
  handleKeyPress(event) {
-    // Check for space bar (32) or enter (13) keys
+    // Ignore Space (32) or Enter (13) key operation, which is handled by the browser for a button.
    if (event.which === 32 || event.which === 13) {
-      event.preventDefault();
-      this.handleClick(event);
+    } else {
+      super.handleKeyPress(event); // Pass keypress handling up for unsupported keys
    }
  }

-  /**
-   * Handle Blur - Remove keyboard triggers
-   *
-   * @method handleBlur
-   */
-  handleBlur() {
-    Events.off(document, 'keydown', Fn.bind(this, this.handleKeyPress));
-  }
-
 }

-
 Component.registerComponent('Button', Button);
 export default Button;
@@ -0,0 +1,202 @@
+/**
+ * @file button.js
+ */
+import Component from './component';
+import * as Dom from './utils/dom.js';
+import * as Events from './utils/events.js';
+import * as Fn from './utils/fn.js';
+import log from './utils/log.js';
+import document from 'global/document';
+import assign from 'object.assign';
+
+/**
+ * Clickable Component which is clickable or keyboard actionable, but is not a native HTML button
+ *
+ * @param {Object} player  Main Player
+ * @param {Object=} options Object of option names and values
+ * @extends Component
+ * @class ClickableComponent
+ */
+class ClickableComponent extends Component {
+
+  constructor(player, options) {
+    super(player, options);
+
+    this.emitTapEvents();
+
+    this.on('tap', this.handleClick);
+    this.on('click', this.handleClick);
+    this.on('focus', this.handleFocus);
+    this.on('blur', this.handleBlur);
+  }
+
+  /**
+   * Create the component's DOM element
+   *
+   * @param {String=} type Element's node type. e.g. 'div'
+   * @param {Object=} props An object of properties that should be set on the element
+   * @param {Object=} attributes An object of attributes that should be set on the element
+   * @return {Element}
+   * @method createEl
+   */
+  createEl(tag='div', props={}, attributes={}) {
+    props = assign({
+      className: this.buildCSSClass(),
+      tabIndex: 0
+    }, props);
+
+    if (tag === 'button') {
+      log.error(`Creating a ClickableComponent with an HTML element of ${tag} is not supported; use a Button instead.`);
+    }
+
+    // Add ARIA attributes for clickable element which is not a native HTML button
+    attributes = assign({
+      role: 'button',
+      'aria-live': 'polite' // let the screen reader user know that the text of the element may change
+    }, attributes);
+
+    let el = super.createEl(tag, props, attributes);
+
+    this.createControlTextEl(el);
+
+    return el;
+  }
+
+  /**
+   * create control text
+   *
+   * @param {Element} el Parent element for the control text
+   * @return {Element}
+   * @method controlText
+   */
+  createControlTextEl(el) {
+    this.controlTextEl_ = Dom.createEl('span', {
+      className: 'vjs-control-text'
+    });
+
+    if (el) {
+      el.appendChild(this.controlTextEl_);
+    }
+
+    this.controlText(this.controlText_, el);
+
+    return this.controlTextEl_;
+  }
+
+  /**
+   * Controls text - both request and localize
+   *
+   * @param {String}  text Text for element
+   * @param {Element=} el Element to set the title on
+   * @return {String}
+   * @method controlText
+   */
+  controlText(text, el=this.el()) {
+    if (!text) return this.controlText_ || 'Need Text';
+    
+    const localizedText = this.localize(text);
+
+    this.controlText_ = text;
+    this.controlTextEl_.innerHTML = localizedText;
+    el.setAttribute('title', localizedText);
+
+    return this;
+  }
+
+  /**
+   * Allows sub components to stack CSS class names
+   *
+   * @return {String}
+   * @method buildCSSClass
+   */
+  buildCSSClass() {
+    return `vjs-control vjs-button ${super.buildCSSClass()}`;
+  }
+
+  /**
+   * Adds a child component inside this clickable-component
+   *
+   * @param {String|Component} child The class name or instance of a child to add
+   * @param {Object=} options Options, including options to be passed to children of the child.
+   * @return {Component} The child component (created by this process if a string was used)
+   * @method addChild
+   */
+  addChild(child, options={}) {
+    // TODO: Fix adding an actionable child to a ClickableComponent; currently
+    // it will cause issues with assistive technology (e.g. screen readers)
+    // which support ARIA, since an element with role="button" cannot have
+    // actionable child elements.
+
+    //let className = this.constructor.name;
+    //log.warn(`Adding a child to a ClickableComponent (${className}) can cause issues with assistive technology which supports ARIA, since an element with role="button" cannot have actionable child elements.`);
+
+    return super.addChild(child, options);
+  }
+
+  /**
+   * Enable the component element
+   *
+   * @return {Component}
+   * @method enable
+   */
+  enable() {
+    this.removeClass('vjs-disabled');
+    this.el_.setAttribute('aria-disabled', 'false');
+    return this;
+  }
+
+  /**
+   * Disable the component element
+   *
+   * @return {Component}
+   * @method disable
+   */
+  disable() {
+    this.addClass('vjs-disabled');
+    this.el_.setAttribute('aria-disabled', 'true');
+    return this;
+  }
+
+  /**
+   * Handle Click - Override with specific functionality for component
+   *
+   * @method handleClick
+   */
+  handleClick() {}
+
+  /**
+   * Handle Focus - Add keyboard functionality to element
+   *
+   * @method handleFocus
+   */
+  handleFocus() {
+    Events.on(document, 'keydown', Fn.bind(this, this.handleKeyPress));
+  }
+
+  /**
+   * Handle KeyPress (document level) - Trigger click when Space or Enter key is pressed
+   *
+   * @method handleKeyPress
+   */
+  handleKeyPress(event) {
+    // Support Space (32) or Enter (13) key operation to fire a click event
+    if (event.which === 32 || event.which === 13) {
+      event.preventDefault();
+      this.handleClick(event);
+    } else if (super.handleKeyPress) {
+      super.handleKeyPress(event); // Pass keypress handling up for unsupported keys
+    }
+  }
+
+  /**
+   * Handle Blur - Remove keyboard triggers
+   *
+   * @method handleBlur
+   */
+  handleBlur() {
+    Events.off(document, 'keydown', Fn.bind(this, this.handleKeyPress));
+  }
+}
+
+Component.registerComponent('ClickableComponent', ClickableComponent);
+export default ClickableComponent;
@@ -11,7 +11,6 @@ import * as Guid from './utils/guid.js';
 import * as Events from './utils/events.js';
 import log from './utils/log.js';
 import toTitleCase from './utils/to-title-case.js';
-import assign from 'object.assign';
 import mergeOptions from './utils/merge-options.js';


@@ -336,10 +335,11 @@ class Component {
   *
   * @param {String|Component} child The class name or instance of a child to add
   * @param {Object=} options Options, including options to be passed to children of the child.
+   * @param {Number} index into our children array to attempt to add the child
   * @return {Component} The child component (created by this process if a string was used)
   * @method addChild
   */
-  addChild(child, options={}) {
+  addChild(child, options={}, index=this.children_.length) {
    let component;
    let componentName;

@@ -388,7 +388,7 @@ class Component {
      component = child;
    }

-    this.children_.push(component);
+    this.children_.splice(index, 0, component);

    if (typeof component.id === 'function') {
      this.childIndex_[component.id()] = component;
@@ -405,7 +405,9 @@ class Component {
    // Add the UI object's element to the container div (box)
    // Having an element is not required
    if (typeof component.el === 'function' && component.el()) {
-      this.contentEl().appendChild(component.el());
+      let childNodes = this.contentEl().children;
+      let refNode = childNodes[index] || null;
+      this.contentEl().insertBefore(component.el(), refNode);
    }

    // Return so it can stored on parent object if desired.
@@ -1088,6 +1090,64 @@ class Component {
    return parseInt(this.el_['offset' + toTitleCase(widthOrHeight)], 10);
  }

+  /**
+   * Get width or height of computed style
+   * @param  {String} widthOrHeight  'width' or 'height'
+   * @return {Number|Boolean} The bolean false if nothing was set
+   * @method currentDimension
+   */
+  currentDimension(widthOrHeight) {
+    let computedWidthOrHeight = 0;
+
+    if (widthOrHeight !== 'width' && widthOrHeight !== 'height') {
+      throw new Error('currentDimension only accepts width or height value');
+    }
+
+    if (typeof window.getComputedStyle === 'function') {
+      const computedStyle = window.getComputedStyle(this.el_);
+      computedWidthOrHeight = computedStyle.getPropertyValue(widthOrHeight) || computedStyle[widthOrHeight];
+    } else if (this.el_.currentStyle) {
+      // ie 8 doesn't support computed style, shim it
+      // return clientWidth or clientHeight instead for better accuracy
+      const rule = `offset${toTitleCase(widthOrHeight)}`;
+      computedWidthOrHeight = this.el_[rule];
+    }
+
+    // remove 'px' from variable and parse as integer
+    computedWidthOrHeight = parseFloat(computedWidthOrHeight);
+    return computedWidthOrHeight;
+  }
+
+  /**
+   * Get an object which contains width and height values of computed style
+   * @return {Object} The dimensions of element
+   * @method currentDimensions
+   */
+  currentDimensions() {
+    return {
+      width: this.currentDimension('width'),
+      height: this.currentDimension('height')
+    };
+  }
+
+  /**
+   * Get width of computed style
+   * @return {Integer}
+   * @method currentWidth
+   */
+  currentWidth() {
+    return this.currentDimension('width');
+  }
+
+  /**
+   * Get height of computed style
+   * @return {Integer}
+   * @method currentHeight
+   */
+  currentHeight() {
+    return this.currentDimension('height');
+  }
+
  /**
   * Emit 'tap' events when touch events are supported
   * This is used to support toggling the controls through a tap on the video.
@@ -1115,8 +1175,11 @@ class Component {
    this.on('touchstart', function(event) {
      // If more than one finger, don't consider treating this as a click
      if (event.touches.length === 1) {
-        // Copy the touches object to prevent modifying the original
-        firstTouch = assign({}, event.touches[0]);
+        // Copy pageX/pageY from the object
+        firstTouch = {
+          pageX: event.touches[0].pageX,
+          pageY: event.touches[0].pageY
+        };
        // Record start time so we can detect a tap vs. "touch and hold"
        touchStart = new Date().getTime();
        // Reset couldBeTap tracking
@@ -0,0 +1,64 @@
+/**
+ * @file audio-track-button.js
+ */
+import TrackButton from '../track-button.js';
+import Component from '../../component.js';
+import * as Fn from '../../utils/fn.js';
+import AudioTrackMenuItem from './audio-track-menu-item.js';
+
+/**
+ * The base class for buttons that toggle specific text track types (e.g. subtitles)
+ *
+ * @param {Player|Object} player
+ * @param {Object=} options
+ * @extends TrackButton
+ * @class AudioTrackButton
+ */
+class AudioTrackButton extends TrackButton {
+  constructor(player, options = {}) {
+    options.tracks = player.audioTracks && player.audioTracks();
+
+    super(player, options);
+
+    this.el_.setAttribute('aria-label', 'Audio Menu');
+  }
+
+  /**
+   * Allow sub components to stack CSS class names
+   *
+   * @return {String} The constructed class name
+   * @method buildCSSClass
+   */
+  buildCSSClass() {
+    return `vjs-audio-button ${super.buildCSSClass()}`;
+  }
+
+  /**
+   * Create a menu item for each audio track
+   *
+   * @return {Array} Array of menu items
+   * @method createItems
+   */
+  createItems(items = []) {
+    let tracks = this.player_.audioTracks && this.player_.audioTracks();
+
+    if (!tracks) {
+      return items;
+    }
+
+    for (let i = 0; i < tracks.length; i++) {
+      let track = tracks[i];
+
+      items.push(new AudioTrackMenuItem(this.player_, {
+        // MenuItem is selectable
+        'selectable': true,
+        'track': track
+      }));
+    }
+
+    return items;
+  }
+}
+AudioTrackButton.prototype.controlText_ = 'Audio Track';
+Component.registerComponent('AudioTrackButton', AudioTrackButton);
+export default AudioTrackButton;
@@ -0,0 +1,69 @@
+/**
+ * @file audio-track-menu-item.js
+ */
+import MenuItem from '../../menu/menu-item.js';
+import Component from '../../component.js';
+import * as Fn from '../../utils/fn.js';
+
+/**
+ * The audio track menu item
+ *
+ * @param {Player|Object} player
+ * @param {Object=} options
+ * @extends MenuItem
+ * @class AudioTrackMenuItem
+ */
+class AudioTrackMenuItem extends MenuItem {
+  constructor(player, options) {
+    let track = options.track;
+    let tracks = player.audioTracks();
+
+    // Modify options for parent MenuItem class's init.
+    options.label = track.label || track.language || 'Unknown';
+    options.selected = track.enabled;
+
+    super(player, options);
+
+    this.track = track;
+
+    if (tracks) {
+      let changeHandler = Fn.bind(this, this.handleTracksChange);
+
+      tracks.addEventListener('change', changeHandler);
+      this.on('dispose', () => {
+        tracks.removeEventListener('change', changeHandler);
+      });
+    }
+  }
+
+  /**
+   * Handle click on audio track
+   *
+   * @method handleClick
+   */
+  handleClick(event) {
+    let tracks = this.player_.audioTracks();
+
+    super.handleClick(event);
+
+    if (!tracks) return;
+
+    for (let i = 0; i < tracks.length; i++) {
+      let track = tracks[i];
+
+      track.enabled = track === this.track;
+    }
+  }
+
+  /**
+   * Handle audio track change
+   *
+   * @method handleTracksChange
+   */
+  handleTracksChange(event) {
+    this.selected(this.track.enabled);
+  }
+}
+
+Component.registerComponent('AudioTrackMenuItem', AudioTrackMenuItem);
+export default AudioTrackMenuItem;
@@ -16,8 +16,10 @@ import VolumeControl from './volume-control/volume-control.js';
 import VolumeMenuButton from './volume-menu-button.js';
 import MuteToggle from './mute-toggle.js';
 import ChaptersButton from './text-track-controls/chapters-button.js';
+import DescriptionsButton from './text-track-controls/descriptions-button.js';
 import SubtitlesButton from './text-track-controls/subtitles-button.js';
 import CaptionsButton from './text-track-controls/captions-button.js';
+import AudioTrackButton from './audio-track-controls/audio-track-button.js';
 import PlaybackRateMenuButton from './playback-rate-menu/playback-rate-menu-button.js';
 import CustomControlSpacer from './spacer-controls/custom-control-spacer.js';

@@ -37,13 +39,15 @@ class ControlBar extends Component {
   */
  createEl() {
    return super.createEl('div', {
-      className: 'vjs-control-bar'
+      className: 'vjs-control-bar',
+      dir: 'ltr'
+    }, {
+      'role': 'group' // The control bar is a group, so it can contain menuitems
    });
  }
 }

 ControlBar.prototype.options_ = {
-  loadEvent: 'play',
  children: [
    'playToggle',
    'volumeMenuButton',
@@ -56,8 +60,10 @@ ControlBar.prototype.options_ = {
    'customControlSpacer',
    'playbackRateMenuButton',
    'chaptersButton',
+    'descriptionsButton',
    'subtitlesButton',
    'captionsButton',
+    'audioTrackButton',
    'fullscreenToggle'
  ]
 };
@@ -12,6 +12,11 @@ import Component from '../component.js';
 */
 class FullscreenToggle extends Button {

+  constructor(player, options) {
+    super(player, options);
+    this.on(player, 'fullscreenchange', this.handleFullscreenChange);
+  }
+
  /**
   * Allow sub components to stack CSS class names
   *
@@ -21,7 +26,18 @@ class FullscreenToggle extends Button {
  buildCSSClass() {
    return `vjs-fullscreen-control ${super.buildCSSClass()}`;
  }
-
+  /**
+   * Handles Fullscreenchange on the component and change control text accordingly
+   *
+   * @method handleFullscreenChange
+   */
+  handleFullscreenChange() {
+    if (this.player_.isFullscreen()) {
+      this.controlText('Non-Fullscreen');
+    } else {
+      this.controlText('Fullscreen');
+    }
+  }  
  /**
   * Handles click for full screen
   *
@@ -30,10 +46,8 @@ class FullscreenToggle extends Button {
  handleClick() {
    if (!this.player_.isFullscreen()) {
      this.player_.requestFullscreen();
-      this.controlText('Non-Fullscreen');
    } else {
      this.player_.exitFullscreen();
-      this.controlText('Fullscreen');
    }
  }

@@ -76,9 +76,8 @@ class MuteToggle extends Button {
    // This causes unnecessary and confusing information for screen reader users.
    // This check is needed because this function gets called every time the volume level is changed.
    let toMute = this.player_.muted() ? 'Unmute' : 'Mute';
-    let localizedMute = this.localize(toMute);
-    if (this.controlText() !== localizedMute) {
-      this.controlText(localizedMute);
+    if (this.controlText() !== toMute) {
+      this.controlText(toMute);
    }

    /* TODO improve muted icon classes */
@@ -119,9 +119,10 @@ class PlaybackRateMenuButton extends MenuButton {
  }

  /**
-   * Get supported playback rates
+   * Get whether playback rates is supported by the tech
+   * and an array of playback rates exists
   *
-   * @return {Array} Supported playback rates
+   * @return {Boolean} Whether changing playback rate is supported
   * @method playbackRateSupported
   */
  playbackRateSupported() {
--- a/Mostrar Mais
+++ b/Mostrar Mais