From 6eba1339637da0cec48007878fd0910ccd994935 Mon Sep 17 00:00:00 2001 From: Pat O'Neill Date: Fri, 25 Mar 2016 14:47:52 -0400 Subject: [PATCH 1/2] @misteroneill fixed type and indenting in language files. closes #3207. --- CHANGELOG.md | 2 +- lang/de.json | 2 +- lang/en.json | 4 ++-- lang/ru.json | 48 +++++++++++++++++++-------------------- lang/tr.json | 64 ++++++++++++++++++++++++++-------------------------- lang/uk.json | 48 +++++++++++++++++++-------------------- 6 files changed, 84 insertions(+), 84 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06733019c..22c0ec8f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ CHANGELOG ========= ## HEAD (Unreleased) -_(none)_ +* @misteroneill fixed type and indenting in language files ([view](https://github.com/videojs/video.js/pull/3207)) -------------------- diff --git a/lang/de.json b/lang/de.json index 67532af77..4bc84dcaa 100644 --- a/lang/de.json +++ b/lang/de.json @@ -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 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.", - "Play video": "Video abspielen", + "Play Video": "Video abspielen", "Close": "Schließen", "Modal Window": "Modales Fenster", "This is a modal window": "Dies ist ein modales Fenster", diff --git a/lang/en.json b/lang/en.json index ea90fda18..26b69ad5f 100644 --- a/lang/en.json +++ b/lang/en.json @@ -23,7 +23,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 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", + "Play Video": "Play Video", "Close": "Close", "Modal Window": "Modal Window", "This is a modal window": "This is a modal window", @@ -31,4 +31,4 @@ ", opens captions settings dialog": ", opens captions settings dialog", ", opens subtitles settings dialog": ", opens subtitles settings dialog", ", selected": ", selected" -} \ No newline at end of file +} diff --git a/lang/ru.json b/lang/ru.json index 4fb374879..7e7e7adcf 100644 --- a/lang/ru.json +++ b/lang/ru.json @@ -1,26 +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.": "Совместимые источники для этого видео отсутствуют." + "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.": "Совместимые источники для этого видео отсутствуют." } diff --git a/lang/tr.json b/lang/tr.json index b3f62cdcd..d3b01a7fd 100644 --- a/lang/tr.json +++ b/lang/tr.json @@ -1,34 +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", - "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" + "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" } diff --git a/lang/uk.json b/lang/uk.json index e794a4230..c082417c2 100644 --- a/lang/uk.json +++ b/lang/uk.json @@ -1,26 +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.": "Сумісні джерела для цього відео відсутні." + "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.": "Сумісні джерела для цього відео відсутні." } From 6845cbedc3524a8ce84ee95c51540a3cc0bfac9a Mon Sep 17 00:00:00 2001 From: Gary Katsevman Date: Fri, 25 Mar 2016 14:57:13 -0400 Subject: [PATCH 2/2] v5.8.6 --- CHANGELOG.md | 5 ++++- component.json | 2 +- package.json | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22c0ec8f1..8711323e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,13 @@ CHANGELOG ========= ## HEAD (Unreleased) -* @misteroneill fixed type and indenting in language files ([view](https://github.com/videojs/video.js/pull/3207)) +_(none)_ -------------------- +## 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)) diff --git a/component.json b/component.json index 4fef7f787..338524ceb 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": "5.8.5", + "version": "5.8.6", "keywords": [ "videojs", "html5", diff --git a/package.json b/package.json index 085c51632..98029906d 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": "5.8.5", + "version": "5.8.6", "copyright": "Copyright Brightcove, Inc. ", "license": "Apache-2.0", "keywords": [