mirror of
				https://github.com/videojs/video.js.git
				synced 2025-10-31 00:08:01 +02:00 
			
		
		
		
	Merge branch 'stable'
This commit is contained in:
		| @@ -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)) | ||||||
|  |  | ||||||
|   | |||||||
| @@ -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", | ||||||
|   | |||||||
| @@ -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", | ||||||
|   | |||||||
| @@ -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", | ||||||
|   | |||||||
							
								
								
									
										48
									
								
								lang/ru.json
									
									
									
									
									
								
							
							
						
						
									
										48
									
								
								lang/ru.json
									
									
									
									
									
								
							| @@ -1,26 +1,26 @@ | |||||||
| { | { | ||||||
|  "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": "Главы", | ||||||
|  "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.": "Совместимые источники для этого видео отсутствуют." | ||||||
| } | } | ||||||
|   | |||||||
							
								
								
									
										64
									
								
								lang/tr.json
									
									
									
									
									
								
							
							
						
						
									
										64
									
								
								lang/tr.json
									
									
									
									
									
								
							| @@ -1,34 +1,34 @@ | |||||||
| { | { | ||||||
|  "Play": "Oynat", |   "Play": "Oynat", | ||||||
|  "Pause": "Duraklat", |   "Pause": "Duraklat", | ||||||
|  "Current Time": "Süre", |   "Current Time": "Süre", | ||||||
|  "Duration Time": "Toplam Süre", |   "Duration Time": "Toplam Süre", | ||||||
|  "Remaining Time": "Kalan Süre", |   "Remaining Time": "Kalan Süre", | ||||||
|  "Stream Type": "Yayın Tipi", |   "Stream Type": "Yayın Tipi", | ||||||
|  "LIVE": "CANLI", |   "LIVE": "CANLI", | ||||||
|  "Loaded": "Yüklendi", |   "Loaded": "Yüklendi", | ||||||
|  "Progress": "Yükleniyor", |   "Progress": "Yükleniyor", | ||||||
|  "Fullscreen": "Tam Ekran", |   "Fullscreen": "Tam Ekran", | ||||||
|  "Non-Fullscreen": "Küçük Ekran", |   "Non-Fullscreen": "Küçük Ekran", | ||||||
|  "Mute": "Ses Kapa", |   "Mute": "Ses Kapa", | ||||||
|  "Unmute": "Ses Aç", |   "Unmute": "Ses Aç", | ||||||
|  "Playback Rate": "Oynatma Hızı", |   "Playback Rate": "Oynatma Hızı", | ||||||
|  "Subtitles": "Altyazı", |   "Subtitles": "Altyazı", | ||||||
|  "subtitles off": "Altyazı Kapalı", |   "subtitles off": "Altyazı Kapalı", | ||||||
|  "Captions": "Ek Açıklamalar", |   "Captions": "Ek Açıklamalar", | ||||||
|  "captions off": "Ek Açıklamalar Kapalı", |   "captions off": "Ek Açıklamalar Kapalı", | ||||||
|  "Chapters": "Bölümler", |   "Chapters": "Bölümler", | ||||||
|  "You aborted the media playback": "Video oynatmayı iptal ettiniz", |   "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.", |   "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 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", | ||||||
|  "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.", |   "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 captions settings dialog": ", ek açıklama ayarları menüsünü açar", | ||||||
|  ", opens subtitles settings dialog": ", altyazı ayarları menüsünü açar", |   ", opens subtitles settings dialog": ", altyazı ayarları menüsünü açar", | ||||||
|  ", selected": ", seçildi" |   ", selected": ", seçildi" | ||||||
| } | } | ||||||
|   | |||||||
							
								
								
									
										48
									
								
								lang/uk.json
									
									
									
									
									
								
							
							
						
						
									
										48
									
								
								lang/uk.json
									
									
									
									
									
								
							| @@ -1,26 +1,26 @@ | |||||||
| { | { | ||||||
|  "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": "Розділи", | ||||||
|  "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.": "Сумісні джерела для цього відео відсутні." | ||||||
| } | } | ||||||
|   | |||||||
| @@ -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": [ | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user