Skip to content

Commit

Permalink
Merge branch 'main' into fix/svg-icons-color
Browse files Browse the repository at this point in the history
  • Loading branch information
mister-ben authored Aug 17, 2023
2 parents 31312ff + d040881 commit 755a5ef
Show file tree
Hide file tree
Showing 48 changed files with 227 additions and 189 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
<a name="8.5.2"></a>
## [8.5.2](https://github.com/videojs/video.js/compare/v8.5.1...v8.5.2) (2023-08-14)

### Bug Fixes

* **text:** caption settings typo ([560b81a](https://github.com/videojs/video.js/commit/560b81a))

### Chores

* **package:** bump VHS version from 3.3.1 to 3.5.3 ([#8400](https://github.com/videojs/video.js/issues/8400)) ([9aff3de](https://github.com/videojs/video.js/commit/9aff3de))

<a name="8.5.1"></a>
## [8.5.1](https://github.com/videojs/video.js/compare/v8.5.0...v8.5.1) (2023-07-21)

Expand Down
55 changes: 25 additions & 30 deletions docs/translations-needed.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lang/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"Raised": "بارز",
"Depressed": "منخفض",
"Uniform": "منتظم",
"Dropshadow": "ظل خلفي",
"Drop shadow": "ظل خلفي",
"Font Family": "عائلة الخطوط",
"Proportional Sans-Serif": "Proportional Sans-Serif",
"Monospace Sans-Serif": "Monospace Sans-Serif",
Expand Down
2 changes: 1 addition & 1 deletion lang/bn.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"Raised": "বাড়ানো হয়েছে",
"Depressed": "নামানো হয়েছে",
"Uniform": "ইউনিফর্ম",
"Dropshadow": "ড্রপশ্যাডো",
"Drop shadow": "ড্রপশ্যাডো",
"Font Family": "অক্ষরের পরিবার",
"Proportional Sans-Serif": "সমানুপাতিক সানস-সেরিফ",
"Monospace Sans-Serif": "মনোস্পেস সানস-সেরিফ",
Expand Down
2 changes: 1 addition & 1 deletion lang/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"Raised": "Zvýšený",
"Depressed": "Propadlý",
"Uniform": "Rovnoměrný",
"Dropshadow": "Stínovaný",
"Drop shadow": "Stínovaný",
"Font Family": "Rodina písma",
"Proportional Sans-Serif": "Proporcionální bezpatkové",
"Monospace Sans-Serif": "Monospace bezpatkové",
Expand Down
2 changes: 1 addition & 1 deletion lang/cy.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"Raised":"Uwch",
"Depressed":"Is",
"Uniform":"Unffurf",
"Dropshadow":"Cysgod cefn",
"Drop shadow":"Cysgod cefn",
"Font Family":"Teulu y Ffont",
"Proportional Sans-Serif":"Heb-Seriff Cyfraneddol",
"Monospace Sans-Serif":"Heb-Seriff Unlled",
Expand Down
2 changes: 1 addition & 1 deletion lang/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"Raised": "Erhoben",
"Depressed": "Gedrückt",
"Uniform": "Uniform",
"Dropshadow": "Schlagschatten",
"Drop shadow": "Schlagschatten",
"Font Family": "Schriftfamilie",
"Proportional Sans-Serif": "Proportionale Sans-Serif",
"Monospace Sans-Serif": "Monospace Sans-Serif",
Expand Down
2 changes: 1 addition & 1 deletion lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"Raised": "Raised",
"Depressed": "Depressed",
"Uniform": "Uniform",
"Dropshadow": "Dropshadow",
"Drop shadow": "Drop shadow",
"Font Family": "Font Family",
"Proportional Sans-Serif": "Proportional Sans-Serif",
"Monospace Sans-Serif": "Monospace Sans-Serif",
Expand Down
2 changes: 1 addition & 1 deletion lang/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"Raised": "En relieve",
"Depressed": "Hundido",
"Uniform": "Uniforme",
"Dropshadow": "Sombra paralela",
"Drop shadow": "Sombra paralela",
"Font Family": "Familia de fuente",
"Proportional Sans-Serif": "Sans-Serif proporcional",
"Monospace Sans-Serif": "Sans-Serif monoespacio",
Expand Down
2 changes: 1 addition & 1 deletion lang/et.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"Raised": "Kõrgem",
"Depressed": "Madalam",
"Uniform": "Ühtlane",
"Dropshadow": "Langeva varjuga",
"Drop shadow": "Langeva varjuga",
"Font Family": "Fondipere",
"Proportional Sans-Serif": "Seriifideta proportsionaalkiri",
"Monospace Sans-Serif": "Seriifideta püsisammkiri",
Expand Down
2 changes: 1 addition & 1 deletion lang/eu.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"Raised": "Jasoa",
"Depressed": "Hondoratua",
"Uniform": "Uniformea",
"Dropshadow": "Itzalduna",
"Drop shadow": "Itzalduna",
"Font Family": "Letra-tipoa",
"Proportional Sans-Serif": "Sans-Serif proportzionala",
"Monospace Sans-Serif": "Tarte berdineko Sans-Serif",
Expand Down
2 changes: 1 addition & 1 deletion lang/fa.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"Raised": "برجسته",
"Depressed": "فرورفته",
"Uniform": "یکنواخت",
"Dropshadow": "سایه‌دار",
"Drop shadow": "سایه‌دار",
"Font Family": "نوع قلم",
"Proportional Sans-Serif": "Sans-Serif متناسب",
"Monospace Sans-Serif": "Sans-Serif هم‌عرض",
Expand Down
2 changes: 1 addition & 1 deletion lang/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"Raised": "Élevé",
"Depressed": "Enfoncé",
"Uniform": "Uniforme",
"Dropshadow": "Ombre portée",
"Drop shadow": "Ombre portée",
"Font Family": "Famille de polices",
"Proportional Sans-Serif": "Polices à chasse variable sans empattement (Proportional Sans-Serif)",
"Monospace Sans-Serif": "Polices à chasse fixe sans empattement (Monospace Sans-Serif)",
Expand Down
2 changes: 1 addition & 1 deletion lang/gd.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"Raised": "Àrdaichte",
"Depressed": "Air a bhrùthadh",
"Uniform": "Cunbhalach",
"Dropshadow": "Sgàil",
"Drop shadow": "Sgàil",
"Font Family": "Teaghlach a’ chrutha-chlò",
"Proportional Sans-Serif": "Sans-serif co-rèireach",
"Monospace Sans-Serif": "Sans-serif aon-leud",
Expand Down
2 changes: 1 addition & 1 deletion lang/gl.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"Raised": "Érguida",
"Depressed": "Caída",
"Uniform": "Uniforme",
"Dropshadow": "Sombra caída",
"Drop shadow": "Sombra caída",
"Font Family": "Familia de letras",
"Proportional Sans-Serif": "Sans-Serif proporcional",
"Monospace Sans-Serif": "Sans-Serif monoespazo (caixa fixa)",
Expand Down
2 changes: 1 addition & 1 deletion lang/he.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"Raised": "מורם",
"Depressed": "מורד",
"Uniform": "אחיד",
"Dropshadow": "הטלת צל",
"Drop shadow": "הטלת צל",
"Font Family": "משפחת גופן",
"Proportional Sans-Serif": "פרופורציוני וללא תגיות (Proportional Sans-Serif)",
"Monospace Sans-Serif": "ברוחב אחיד וללא תגיות (Monospace Sans-Serif)",
Expand Down
2 changes: 1 addition & 1 deletion lang/hi.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"Raised": "उठा हुआ",
"Depressed": "उदास",
"Uniform": "वर्दी",
"Dropshadow": "परछाई",
"Drop shadow": "परछाई",
"Font Family": "फॉण्ट परिवार",
"Proportional Sans-Serif": "प्रोपोरशनल साँस-सेरिफ",
"Monospace Sans-Serif": "मोनोस्पास साँस-सेरिफ",
Expand Down
2 changes: 1 addition & 1 deletion lang/hu.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"Text Edge Style": "Szövegél stílus",
"This is a modal window": "Ez egy felugró ablak",
"Cyan": "Cián",
"Dropshadow": "Árnyék",
"Drop shadow": "Árnyék",
"End of dialog window.": "Párbeszédablak vége.",
"Progress Bar": "Folyamatjelző sáv",
"Beginning of dialog window. Escape will cancel and close the window.": "Párbeszédablak eleje. Az Escape gomb befejezi és bezárja az ablakot.",
Expand Down
2 changes: 1 addition & 1 deletion lang/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"Text Edge Style": "Stile dei bordi del testo",
"None": "Nessuno",
"Uniform": "Uniforme",
"Dropshadow": "Ombreggiatura",
"Drop shadow": "Ombreggiatura",
"Font Family": "Famiglia di caratteri",
"Proportional Sans-Serif": "Sans-Serif proporzionale",
"Monospace Sans-Serif": "Sans-Serif monospazio",
Expand Down
2 changes: 1 addition & 1 deletion lang/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"Raised": "浮き出し",
"Depressed": "浮き彫り",
"Uniform": "均一",
"Dropshadow": "影付き",
"Drop shadow": "影付き",
"Font Family": "フォントの種類",
"Proportional Sans-Serif": "セリフなし可変幅フォント",
"Monospace Sans-Serif": "セリフなし等幅フォント",
Expand Down
2 changes: 1 addition & 1 deletion lang/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"Raised": "글자 위치 올림",
"Depressed": "글자 위치 내림",
"Uniform": "균일",
"Dropshadow": "그림자 효과 넣기",
"Drop shadow": "그림자 효과 넣기",
"Font Family": "폰트 모음",
"Proportional Sans-Serif": "비례 산세리프체",
"Monospace Sans-Serif": "고정폭 산세리프체",
Expand Down
2 changes: 1 addition & 1 deletion lang/lv.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"Raised": "Izvirzīts",
"Depressed": "Samazināts",
"Uniform": "Vienmērīgs",
"Dropshadow": "Ēnots",
"Drop shadow": "Ēnots",
"Font Family": "Šrifts",
"Proportional Sans-Serif": "Proportional Sans-Serif",
"Monospace Sans-Serif": "Monospace Sans-Serif",
Expand Down
2 changes: 1 addition & 1 deletion lang/nb.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"Raised": "Uthevet",
"Depressed": "Nedtrykt",
"Uniform": "Enkel",
"Dropshadow": "Skygge",
"Drop shadow": "Skygge",
"Font Family": "Skrifttype",
"Proportional Sans-Serif": "Proporsjonal skrift uten seriffer",
"Monospace Sans-Serif": "Fastbreddeskrift uten seriffer",
Expand Down
2 changes: 1 addition & 1 deletion lang/nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"Raised": "Verhoogd",
"Depressed": "Ingedrukt",
"Uniform": "Uniform",
"Dropshadow": "Schaduw",
"Drop shadow": "Schaduw",
"Font Family": "Lettertype",
"Proportional Sans-Serif": "Proportioneel sans-serif",
"Monospace Sans-Serif": "Monospace sans-serif",
Expand Down
2 changes: 1 addition & 1 deletion lang/nn.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"Raised": "Utheva",
"Depressed": "Nedtrykt",
"Uniform": "Enkel",
"Dropshadow": "Skugge",
"Drop shadow": "Skugge",
"Font Family": "Skrifttype",
"Proportional Sans-Serif": "Proporsjonal skrift utan seriffar",
"Monospace Sans-Serif": "Fastbreddeskrift utan seriffar",
Expand Down
2 changes: 1 addition & 1 deletion lang/oc.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"Raised": "Naut",
"Depressed": "Enfonsat",
"Uniform": "Unifòrme",
"Dropshadow": "Ombrat",
"Drop shadow": "Ombrat",
"Font Family": "Familha de polissa",
"Proportional Sans-Serif": "Sans-Serif proporcionala",
"Monospace Sans-Serif": "Monospace Sans-Serif",
Expand Down
2 changes: 1 addition & 1 deletion lang/pt-BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"Raised": "Elevado",
"Depressed": "Acachapado",
"Uniform": "Uniforme",
"Dropshadow": "Sombra de projeção",
"Drop shadow": "Sombra de projeção",
"Font Family": "Família da Fonte",
"Proportional Sans-Serif": "Sans-Serif(Sem serifa) Proporcional",
"Monospace Sans-Serif": "Sans-Serif(Sem serifa) Monoespaçada",
Expand Down
2 changes: 1 addition & 1 deletion lang/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"Raised": "Поднятый",
"Depressed": "Пониженный",
"Uniform": "Одинаковый",
"Dropshadow": "Тень",
"Drop shadow": "Тень",
"Font Family": "Шрифт",
"Proportional Sans-Serif": "Пропорциональный без засечек",
"Monospace Sans-Serif": "Моноширинный без засечек",
Expand Down
2 changes: 1 addition & 1 deletion lang/sl.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"Raised": "Dvignjeno",
"Depressed": "Vtisnjeno",
"Uniform": "Enakomerno",
"Dropshadow": "S senco",
"Drop shadow": "S senco",
"Font Family": "Družina pisave",
"Small Caps": "Male črke",
"Reset": "Ponastavi",
Expand Down
2 changes: 1 addition & 1 deletion lang/sv.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"Depressed": "Deprimerad",
"Descriptions": "Beskrivningar",
"Done": "Klar",
"Dropshadow": "DropSkugga",
"Drop shadow": "DropSkugga",
"Duration": "Total tid",
"End of dialog window.": "Slutet av dialogfönster.",
"Font Family": "Typsnittsfamilj",
Expand Down
2 changes: 1 addition & 1 deletion lang/te.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"Raised": "పెంచబడింది",
"Depressed": "అణగారిన",
"Uniform": "ఏకరీతి",
"Dropshadow": "డ్రాప్‌షాడో",
"Drop shadow": "డ్రాప్‌షాడో",
"Font Family": "ఫాంట్ కుటుంబం",
"Proportional Sans-Serif": "ప్రొపోర్షన్ సాన్స్-సెరిఫ్",
"Monospace Sans-Serif": "మోనోస్పేస్ సాన్స్-సెరిఫ్",
Expand Down
2 changes: 1 addition & 1 deletion lang/th.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"Raised": "ยกขึ้น",
"Depressed": "ปล่อยออก",
"Uniform": "รูปแบบ",
"Dropshadow": "เพิ่มเงา",
"Drop shadow": "เพิ่มเงา",
"Font Family": "ตระกูลแบบอักษร",
"Proportional Sans-Serif": "Sans-Serif ตามสัดส่วน",
"Monospace Sans-Serif": "Sans-Serif ช่องว่างเดี่ยว",
Expand Down
2 changes: 1 addition & 1 deletion lang/tr.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"Raised": "Kabarık",
"Depressed": "Yassı",
"Uniform": "Düz",
"Dropshadow": "Gölgeli",
"Drop shadow": "Gölgeli",
"Font Family": "Yazı Tipi",
"Proportional Sans-Serif": "Orantılı Sans-Serif",
"Monospace Sans-Serif": "Eşaralıklı Sans-Serif",
Expand Down
2 changes: 1 addition & 1 deletion lang/zh-TW.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"Raised": "浮雕",
"Depressed": "壓低",
"Uniform": "均勻",
"Dropshadow": "下陰影",
"Drop shadow": "下陰影",
"Font Family": "字型系列",
"Proportional Sans-Serif": "調和間距無襯線字型",
"Monospace Sans-Serif": "等寬無襯線字型",
Expand Down
40 changes: 31 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "video.js",
"description": "An HTML5 video player that supports HLS and DASH with a common API and skin.",
"version": "8.5.1",
"version": "8.5.2",
"main": "./dist/video.cjs.js",
"module": "./dist/video.es.js",
"style": "./dist/video-js.css",
Expand Down Expand Up @@ -86,7 +86,7 @@
},
"dependencies": {
"@babel/runtime": "^7.12.5",
"@videojs/http-streaming": "3.3.1",
"@videojs/http-streaming": "3.5.3",
"@videojs/vhs-utils": "^4.0.0",
"@videojs/xhr": "2.6.0",
"aes-decrypter": "^4.0.1",
Expand Down
Loading

0 comments on commit 755a5ef

Please sign in to comment.