Commit d716a3f1 authored by Sara Arjona's avatar Sara Arjona

Merge branch 'MDL-70308-master' of git://github.com/ferranrecio/moodle

parents 894c9c9d 6f8a3bc1
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This source diff could not be displayed because it is too large. You can view the blob instead.
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMinYMid meet">
<svg xmlns="http://www.w3.org/2000/svg">
<defs>
<font id="VideoJS" horiz-adv-x="1792">
<font-face font-family="VideoJS"
......
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
VideoJS 7.7.6
-------------
VideoJS 7.10.0
--------------
https://github.com/videojs/video.js
Instructions to import VideoJS player into Moodle:
......
......@@ -423,7 +423,7 @@ body.vjs-full-window {
right: 0;
}
.video-js.vjs-fullscreen {
.video-js.vjs-fullscreen:not(.vjs-ios-native-fs) {
width: 100% !important;
height: 100% !important;
padding-top: 0 !important;
......
......@@ -4,7 +4,7 @@
<location>amd/src/video-lazy.js</location>
<name>VideoJS</name>
<license>Apache</license>
<version>7.7.6</version>
<version>7.10.0</version>
<licenseversion>2.0</licenseversion>
</library>
<library>
......@@ -18,7 +18,7 @@
<location>videojs</location>
<name>VideoJS support files</name>
<license>Apache</license>
<version>7.7.6</version>
<version>7.10.0</version>
<licenseversion>2.0</licenseversion>
</library>
<library>
......
......@@ -83,5 +83,7 @@ videojs.addLanguage('de', {
"Volume Level": "Lautstärke",
"{1} is loading.": "{1} wird geladen.",
"Seek to live, currently behind live": "Zur Live-Übertragung wechseln. Aktuell wird es nicht live abgespielt.",
"Seek to live, currently playing live": "Zur Live-Übertragung wechseln. Es wird aktuell live abgespielt."
"Seek to live, currently playing live": "Zur Live-Übertragung wechseln. Es wird aktuell live abgespielt.",
"Exit Picture-in-Picture": "Bild-im-Bild-Modus beenden",
"Picture-in-Picture": "Bild-im-Bild-Modus"
});
\ No newline at end of file
......@@ -83,6 +83,8 @@
"Volume Level": "Lautstärke",
"{1} is loading.": "{1} wird geladen.",
"Seek to live, currently behind live": "Zur Live-Übertragung wechseln. Aktuell wird es nicht live abgespielt.",
"Seek to live, currently playing live": "Zur Live-Übertragung wechseln. Es wird aktuell live abgespielt."
"Seek to live, currently playing live": "Zur Live-Übertragung wechseln. Es wird aktuell live abgespielt.",
"Exit Picture-in-Picture": "Bild-im-Bild-Modus beenden",
"Picture-in-Picture": "Bild-im-Bild-Modus"
}
File mode changed from 100644 to 100755
......@@ -81,5 +81,7 @@ videojs.addLanguage('pt-BR', {
"Caption Settings Dialog": "Caíxa-de-Diálogo das configurações de Legendas",
"Beginning of dialog window. Escape will cancel and close the window.": "Iniciando a Janela-de-Diálogo. Pressionar Escape irá cancelar e fechar a janela.",
"End of dialog window.": "Fim da Janela-de-Diálogo",
"{1} is loading.": "{1} está carregando."
"{1} is loading.": "{1} está carregando.",
"Exit Picture-in-Picture": "Sair de Picture-in-Picture",
"Picture-in-Picture": "Picture-in-Picture"
});
\ No newline at end of file
......@@ -82,5 +82,7 @@
"Caption Settings Dialog": "Caíxa-de-Diálogo das configurações de Legendas",
"Beginning of dialog window. Escape will cancel and close the window.": "Iniciando a Janela-de-Diálogo. Pressionar Escape irá cancelar e fechar a janela.",
"End of dialog window.": "Fim da Janela-de-Diálogo",
"{1} is loading.": "{1} está carregando."
"{1} is loading.": "{1} está carregando.",
"Exit Picture-in-Picture": "Sair de Picture-in-Picture",
"Picture-in-Picture": "Picture-in-Picture"
}
......@@ -6,10 +6,12 @@ videojs.addLanguage('zh-CN', {
"Remaining Time": "剩余时间",
"Stream Type": "媒体流类型",
"LIVE": "直播",
"Loaded": "加载完",
"Loaded": "加载完",
"Progress": "进度",
"Fullscreen": "全屏",
"Non-Fullscreen": "退出全屏",
"Picture-in-Picture": "画中画",
"Exit Picture-in-Picture": "退出画中画",
"Mute": "静音",
"Unmute": "取消静音",
"Playback Rate": "播放速度",
......@@ -40,7 +42,7 @@ videojs.addLanguage('zh-CN', {
"captions settings": "字幕设定",
"Audio Player": "音频播放器",
"Video Player": "视频播放器",
"Replay": "",
"Replay": "新播放",
"Progress Bar": "进度条",
"Volume Level": "音量",
"subtitles settings": "字幕设定",
......@@ -55,7 +57,7 @@ videojs.addLanguage('zh-CN', {
"Magenta": "紫红",
"Cyan": "",
"Background": "背景",
"Window": "视窗",
"Window": "窗口",
"Transparent": "透明",
"Semi-Transparent": "半透明",
"Opaque": "不透明",
......@@ -77,11 +79,11 @@ videojs.addLanguage('zh-CN', {
"Reset": "重置",
"restore all settings to the default values": "恢复全部设定至预设值",
"Done": "完成",
"Caption Settings Dialog": "字幕设定视窗",
"Beginning of dialog window. Escape will cancel and close the window.": "开始对话视窗。离开会取消及关闭视窗",
"End of dialog window.": "结束对话视窗",
"Seek to live, currently behind live": "试图直播,当前延时播放",
"Seek to live, currently playing live": "试图直播,当前实时播放",
"Caption Settings Dialog": "字幕设定窗口",
"Beginning of dialog window. Escape will cancel and close the window.": "打开对话窗口。Escape键将取消并关闭对话窗口",
"End of dialog window.": "结束对话窗口",
"Seek to live, currently behind live": "尝试直播,当前为延时播放",
"Seek to live, currently playing live": "尝试直播,当前为实时播放",
"progress bar timing: currentTime={1} duration={2}": "{1}/{2}",
"{1} is loading.": "正在加载 {1}。"
});
\ No newline at end of file
......@@ -6,10 +6,12 @@
"Remaining Time": "剩余时间",
"Stream Type": "媒体流类型",
"LIVE": "直播",
"Loaded": "加载完",
"Loaded": "加载完",
"Progress": "进度",
"Fullscreen": "全屏",
"Non-Fullscreen": "退出全屏",
"Picture-in-Picture": "画中画",
"Exit Picture-in-Picture": "退出画中画",
"Mute": "静音",
"Unmute": "取消静音",
"Playback Rate": "播放速度",
......@@ -40,7 +42,7 @@
"captions settings": "字幕设定",
"Audio Player": "音频播放器",
"Video Player": "视频播放器",
"Replay": "重",
"Replay": "重新播放",
"Progress Bar": "进度条",
"Volume Level": "音量",
"subtitles settings": "字幕设定",
......@@ -55,7 +57,7 @@
"Magenta": "紫红",
"Cyan": "青",
"Background": "背景",
"Window": "视窗",
"Window": "窗口",
"Transparent": "透明",
"Semi-Transparent": "半透明",
"Opaque": "不透明",
......@@ -77,11 +79,11 @@
"Reset": "重置",
"restore all settings to the default values": "恢复全部设定至预设值",
"Done": "完成",
"Caption Settings Dialog": "字幕设定视窗",
"Beginning of dialog window. Escape will cancel and close the window.": "开始对话视窗。离开会取消及关闭视窗",
"End of dialog window.": "结束对话视窗",
"Seek to live, currently behind live": "试图直播,当前延时播放",
"Seek to live, currently playing live": "试图直播,当前实时播放",
"Caption Settings Dialog": "字幕设定窗口",
"Beginning of dialog window. Escape will cancel and close the window.": "打开对话窗口。Escape键将取消并关闭对话窗口",
"End of dialog window.": "结束对话窗口",
"Seek to live, currently behind live": "尝试直播,当前为延时播放",
"Seek to live, currently playing live": "尝试直播,当前为实时播放",
"progress bar timing: currentTime={1} duration={2}": "{1}/{2}",
"{1} is loading.": "正在加载 {1}。"
}
......@@ -6,10 +6,12 @@ videojs.addLanguage('zh-Hans', {
"Remaining Time": "剩余时间",
"Stream Type": "媒体流类型",
"LIVE": "直播",
"Loaded": "加载完",
"Loaded": "加载完",
"Progress": "进度",
"Fullscreen": "全屏",
"Non-Fullscreen": "退出全屏",
"Picture-in-Picture": "画中画",
"Exit Picture-in-Picture": "退出画中画",
"Mute": "静音",
"Unmute": "取消静音",
"Playback Rate": "播放速度",
......@@ -40,7 +42,7 @@ videojs.addLanguage('zh-Hans', {
"captions settings": "字幕设定",
"Audio Player": "音频播放器",
"Video Player": "视频播放器",
"Replay": "",
"Replay": "新播放",
"Progress Bar": "进度条",
"Volume Level": "音量",
"subtitles settings": "字幕设定",
......@@ -55,7 +57,7 @@ videojs.addLanguage('zh-Hans', {
"Magenta": "紫红",
"Cyan": "",
"Background": "背景",
"Window": "视窗",
"Window": "窗口",
"Transparent": "透明",
"Semi-Transparent": "半透明",
"Opaque": "不透明",
......@@ -77,11 +79,11 @@ videojs.addLanguage('zh-Hans', {
"Reset": "重置",
"restore all settings to the default values": "恢复全部设定至预设值",
"Done": "完成",
"Caption Settings Dialog": "字幕设定视窗",
"Beginning of dialog window. Escape will cancel and close the window.": "开始对话视窗。离开会取消及关闭视窗",
"End of dialog window.": "结束对话视窗",
"Seek to live, currently behind live": "试图直播,当前延时播放",
"Seek to live, currently playing live": "试图直播,当前实时播放",
"Caption Settings Dialog": "字幕设定窗口",
"Beginning of dialog window. Escape will cancel and close the window.": "打开对话窗口。Escape键将取消并关闭对话窗口",
"End of dialog window.": "结束对话窗口",
"Seek to live, currently behind live": "尝试直播,当前为延时播放",
"Seek to live, currently playing live": "尝试直播,当前为实时播放",
"progress bar timing: currentTime={1} duration={2}": "{1}/{2}",
"{1} is loading.": "正在加载 {1}。"
});
\ No newline at end of file
......@@ -6,10 +6,12 @@
"Remaining Time": "剩余时间",
"Stream Type": "媒体流类型",
"LIVE": "直播",
"Loaded": "加载完",
"Loaded": "加载完",
"Progress": "进度",
"Fullscreen": "全屏",
"Non-Fullscreen": "退出全屏",
"Picture-in-Picture": "画中画",
"Exit Picture-in-Picture": "退出画中画",
"Mute": "静音",
"Unmute": "取消静音",
"Playback Rate": "播放速度",
......@@ -40,7 +42,7 @@
"captions settings": "字幕设定",
"Audio Player": "音频播放器",
"Video Player": "视频播放器",
"Replay": "重",
"Replay": "重新播放",
"Progress Bar": "进度条",
"Volume Level": "音量",
"subtitles settings": "字幕设定",
......@@ -55,7 +57,7 @@
"Magenta": "紫红",
"Cyan": "青",
"Background": "背景",
"Window": "视窗",
"Window": "窗口",
"Transparent": "透明",
"Semi-Transparent": "半透明",
"Opaque": "不透明",
......@@ -77,11 +79,11 @@
"Reset": "重置",
"restore all settings to the default values": "恢复全部设定至预设值",
"Done": "完成",
"Caption Settings Dialog": "字幕设定视窗",
"Beginning of dialog window. Escape will cancel and close the window.": "开始对话视窗。离开会取消及关闭视窗",
"End of dialog window.": "结束对话视窗",
"Seek to live, currently behind live": "试图直播,当前延时播放",
"Seek to live, currently playing live": "试图直播,当前实时播放",
"Caption Settings Dialog": "字幕设定窗口",
"Beginning of dialog window. Escape will cancel and close the window.": "打开对话窗口。Escape键将取消并关闭对话窗口",
"End of dialog window.": "结束对话窗口",
"Seek to live, currently behind live": "尝试直播,当前为延时播放",
"Seek to live, currently playing live": "尝试直播,当前为实时播放",
"progress bar timing: currentTime={1} duration={2}": "{1}/{2}",
"{1} is loading.": "正在加载 {1}。"
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment