1
0
mirror of https://github.com/videojs/video.js.git synced 2025-01-27 11:22:06 +02:00

Merge branch 'stable'

This commit is contained in:
Gary Katsevman 2016-03-25 15:04:25 -04:00
commit 1c730cb21f
8 changed files with 87 additions and 84 deletions

View File

@ -11,6 +11,9 @@ CHANGELOG
-------------------- --------------------
## 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) ## 5.8.5 (2016-03-17)
* @gkatsev cleared vttjs script handlers on dispose. Fixed tests ([view](https://github.com/videojs/video.js/pull/3189)) * @gkatsev cleared vttjs script handlers on dispose. Fixed tests ([view](https://github.com/videojs/video.js/pull/3189))

View File

@ -1,7 +1,7 @@
{ {
"name": "video.js", "name": "video.js",
"description": "An HTML5 and Flash video player with a common API and skin for both.", "description": "An HTML5 and Flash video player with a common API and skin for both.",
"version": "5.8.5", "version": "5.8.6",
"keywords": [ "keywords": [
"videojs", "videojs",
"html5", "html5",

View File

@ -23,7 +23,7 @@
"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 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.", "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", "Play Video": "Video abspielen",
"Close": "Schließen", "Close": "Schließen",
"Modal Window": "Modales Fenster", "Modal Window": "Modales Fenster",
"This is a modal window": "Dies ist ein modales Fenster", "This is a modal window": "Dies ist ein modales Fenster",

View File

@ -25,7 +25,7 @@
"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 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.", "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.", "No compatible source was found for this media.": "No compatible source was found for this media.",
"Play video": "Play video", "Play Video": "Play Video",
"Close": "Close", "Close": "Close",
"Modal Window": "Modal Window", "Modal Window": "Modal Window",
"This is a modal window": "This is a modal window", "This is a modal window": "This is a modal window",

View File

@ -23,7 +23,7 @@
"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 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.", "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ı.", "No compatible source was found for this media.": "Video için kaynak bulunamadı.",
"Play video": "Videoyu Oynat", "Play Video": "Videoyu Oynat",
"Close": "Kapat", "Close": "Kapat",
"Modal Window": "Modal Penceresi", "Modal Window": "Modal Penceresi",
"This is a modal window": "Bu bir modal penceresidir", "This is a modal window": "Bu bir modal penceresidir",

View File

@ -1,7 +1,7 @@
{ {
"name": "video.js", "name": "video.js",
"description": "An HTML5 and Flash video player with a common API and skin for both.", "description": "An HTML5 and Flash video player with a common API and skin for both.",
"version": "5.8.5", "version": "5.8.6",
"copyright": "Copyright Brightcove, Inc. <https://www.brightcove.com/>", "copyright": "Copyright Brightcove, Inc. <https://www.brightcove.com/>",
"license": "Apache-2.0", "license": "Apache-2.0",
"keywords": [ "keywords": [