diff --git a/CHANGELOG.md b/CHANGELOG.md index 07460d8e23..93a03768aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,9 +6,13 @@ CHANGELOG * @dmlap removed an ie6 hack for flash object embedding ([view](https://github.com/videojs/video.js/pull/1946)) * @heff replaced Closure Compiler with Uglify for minification ([view](https://github.com/videojs/video.js/pull/1940)) * @OleLaursen added a Danish translation ([view](https://github.com/videojs/video.js/pull/1899)) +* @dn5 Added new translations (Bosnian, Serbian, Croatian) ([view](https://github.com/videojs/video.js/pull/1897)) -------------------- +## 4.12.5 (2015-03-17) +* Updated to videojs-swf v4.5.4 to fix a potential security issue ([view](https://github.com/videojs/video.js/pull/1955)) + ## 4.12.4 (2015-03-05) * Randomized the Google Analytics calls to stay under the limit ([view](https://github.com/videojs/video.js/pull/1916)) diff --git a/bower.json b/bower.json index 75fcd5ef8c..6e826a4de0 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "video.js", "description": "An HTML5 and Flash video player with a common API and skin for both.", - "version": "4.12.4", + "version": "4.12.5", "main": [ "dist/video-js/video.js", "dist/video-js/video-js.css", diff --git a/component.json b/component.json index 4c1bf90546..9f49032415 100644 --- a/component.json +++ b/component.json @@ -1,7 +1,7 @@ { "name": "video.js", "description": "An HTML5 and Flash video player with a common API and skin for both.", - "version": "4.12.4", + "version": "4.12.5", "keywords": [ "videojs", "html5", diff --git a/lang/ba.json b/lang/ba.json new file mode 100644 index 0000000000..4c33a30976 --- /dev/null +++ b/lang/ba.json @@ -0,0 +1,26 @@ +{ + "Play": "Pusti", + "Pause": "Pauza", + "Current Time": "Trenutno vrijeme", + "Duration Time": "Vrijeme trajanja", + "Remaining Time": "Preostalo vrijeme", + "Stream Type": "Način strimovanja", + "LIVE": "UŽIVO", + "Loaded": "Učitan", + "Progress": "Progres", + "Fullscreen": "Puni ekran", + "Non-Fullscreen": "Mali ekran", + "Mute": "Prigušen", + "Unmuted": "Ne-prigušen", + "Playback Rate": "Stopa reprodukcije", + "Subtitles": "Podnaslov", + "subtitles off": "Podnaslov deaktiviran", + "Captions": "Titlovi", + "captions off": "Titlovi deaktivirani", + "Chapters": "Poglavlja", + "You aborted the video playback": "Isključili ste reprodukciju videa.", + "A network error caused the video download to fail part-way.": "Video se prestao preuzimati zbog greške na mreži.", + "The video could not be loaded, either because the server or network failed or because the format is not supported.": "Video se ne može reproducirati zbog servera, greške u mreži ili je format ne podržan.", + "The video playback was aborted due to a corruption problem or because the video used features your browser did not support.": "Reprodukcija videa je zaustavljenja zbog greške u formatu ili zbog verzije vašeg pretraživača.", + "No compatible source was found for this video.": "Nije nađen nijedan kompatibilan izvor ovog videa." +} \ No newline at end of file diff --git a/lang/hr.json b/lang/hr.json new file mode 100644 index 0000000000..4c33a30976 --- /dev/null +++ b/lang/hr.json @@ -0,0 +1,26 @@ +{ + "Play": "Pusti", + "Pause": "Pauza", + "Current Time": "Trenutno vrijeme", + "Duration Time": "Vrijeme trajanja", + "Remaining Time": "Preostalo vrijeme", + "Stream Type": "Način strimovanja", + "LIVE": "UŽIVO", + "Loaded": "Učitan", + "Progress": "Progres", + "Fullscreen": "Puni ekran", + "Non-Fullscreen": "Mali ekran", + "Mute": "Prigušen", + "Unmuted": "Ne-prigušen", + "Playback Rate": "Stopa reprodukcije", + "Subtitles": "Podnaslov", + "subtitles off": "Podnaslov deaktiviran", + "Captions": "Titlovi", + "captions off": "Titlovi deaktivirani", + "Chapters": "Poglavlja", + "You aborted the video playback": "Isključili ste reprodukciju videa.", + "A network error caused the video download to fail part-way.": "Video se prestao preuzimati zbog greške na mreži.", + "The video could not be loaded, either because the server or network failed or because the format is not supported.": "Video se ne može reproducirati zbog servera, greške u mreži ili je format ne podržan.", + "The video playback was aborted due to a corruption problem or because the video used features your browser did not support.": "Reprodukcija videa je zaustavljenja zbog greške u formatu ili zbog verzije vašeg pretraživača.", + "No compatible source was found for this video.": "Nije nađen nijedan kompatibilan izvor ovog videa." +} \ No newline at end of file diff --git a/lang/pt-BR.json b/lang/pt-BR.json index 1c90f2a5ea..f4cf90e452 100644 --- a/lang/pt-BR.json +++ b/lang/pt-BR.json @@ -7,7 +7,7 @@ "Stream Type": "Tipo de Stream", "LIVE": "AO VIVO", "Loaded": "Carregado", - "Progress": "Progressão", + "Progress": "Progresso", "Fullscreen": "Tela Cheia", "Non-Fullscreen": "Tela Normal", "Mute": "Mudo", diff --git a/lang/sr.json b/lang/sr.json new file mode 100644 index 0000000000..4c33a30976 --- /dev/null +++ b/lang/sr.json @@ -0,0 +1,26 @@ +{ + "Play": "Pusti", + "Pause": "Pauza", + "Current Time": "Trenutno vrijeme", + "Duration Time": "Vrijeme trajanja", + "Remaining Time": "Preostalo vrijeme", + "Stream Type": "Način strimovanja", + "LIVE": "UŽIVO", + "Loaded": "Učitan", + "Progress": "Progres", + "Fullscreen": "Puni ekran", + "Non-Fullscreen": "Mali ekran", + "Mute": "Prigušen", + "Unmuted": "Ne-prigušen", + "Playback Rate": "Stopa reprodukcije", + "Subtitles": "Podnaslov", + "subtitles off": "Podnaslov deaktiviran", + "Captions": "Titlovi", + "captions off": "Titlovi deaktivirani", + "Chapters": "Poglavlja", + "You aborted the video playback": "Isključili ste reprodukciju videa.", + "A network error caused the video download to fail part-way.": "Video se prestao preuzimati zbog greške na mreži.", + "The video could not be loaded, either because the server or network failed or because the format is not supported.": "Video se ne može reproducirati zbog servera, greške u mreži ili je format ne podržan.", + "The video playback was aborted due to a corruption problem or because the video used features your browser did not support.": "Reprodukcija videa je zaustavljenja zbog greške u formatu ili zbog verzije vašeg pretraživača.", + "No compatible source was found for this video.": "Nije nađen nijedan kompatibilan izvor ovog videa." +} \ No newline at end of file diff --git a/package.json b/package.json index d7899bb329..737fd865ce 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "video.js", "description": "An HTML5 and Flash video player with a common API and skin for both.", - "version": "4.12.4", + "version": "4.12.5", "copyright": "Copyright Brightcove, Inc. ", "license": "Apache-2.0", "keywords": [ @@ -22,7 +22,7 @@ }, "main": "src/js/video.js", "dependencies": { - "videojs-swf": "4.5.3", + "videojs-swf": "4.5.4", "vtt.js": "git+https://github.com/gkatsev/vtt.js.git#shim-build", "global": "^4.3.0" }, diff --git a/src/js/component.js b/src/js/component.js index 7681be702c..0a9ee3d75b 100644 --- a/src/js/component.js +++ b/src/js/component.js @@ -342,7 +342,7 @@ Component.prototype.getChild = function(name){ * * myComponent.el(); * // ->
- * myComonent.children(); + * myComponent.children(); * // [empty array] * * var myButton = myComponent.addChild('MyButton');