From 76ac8c4dfc7453e583929bcc1f6d11ca5cc01d0b Mon Sep 17 00:00:00 2001 From: Nathan Pickard Date: Tue, 1 Oct 2019 14:28:37 -0700 Subject: [PATCH 1/5] Removed Other from TV Guide data providers --- src/controllers/livetvstatus.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/controllers/livetvstatus.js b/src/controllers/livetvstatus.js index 1ed1402d6d..98587848bf 100644 --- a/src/controllers/livetvstatus.js +++ b/src/controllers/livetvstatus.js @@ -168,9 +168,6 @@ define(["jQuery", "globalize", "scripts/taskbutton", "dom", "libraryMenu", "layo }), menuItems.push({ name: "Xml TV", id: "xmltv" - }), menuItems.push({ - name: globalize.translate("ButtonOther"), - id: "other" }), require(["actionsheet"], function(actionsheet) { actionsheet.show({ items: menuItems, @@ -246,4 +243,4 @@ define(["jQuery", "globalize", "scripts/taskbutton", "dom", "libraryMenu", "layo button: page.querySelector(".btnRefresh") }) }) -}); \ No newline at end of file +}); From 586bce429db27fad2cd10babd623e0628f5e1d7f Mon Sep 17 00:00:00 2001 From: Nathan Pickard Date: Wed, 2 Oct 2019 14:46:03 -0700 Subject: [PATCH 2/5] Remove unused ButtonOther translations --- src/strings/ar.json | 1 - src/strings/ca.json | 1 - src/strings/cs.json | 1 - src/strings/da.json | 1 - src/strings/de.json | 1 - src/strings/el.json | 1 - src/strings/en-gb.json | 1 - src/strings/en-us.json | 1 - src/strings/es-ar.json | 1 - src/strings/es-mx.json | 1 - src/strings/es.json | 1 - src/strings/fi.json | 1 - src/strings/fr.json | 1 - src/strings/hr.json | 1 - src/strings/hu.json | 1 - src/strings/it.json | 1 - src/strings/ja.json | 1 - src/strings/kk.json | 1 - src/strings/lt-lt.json | 1 - src/strings/nb.json | 1 - src/strings/nl.json | 1 - src/strings/pl.json | 1 - src/strings/pt-br.json | 1 - src/strings/pt-pt.json | 1 - src/strings/ru.json | 1 - src/strings/sk.json | 1 - src/strings/sl-si.json | 1 - src/strings/sv.json | 1 - src/strings/zh-cn.json | 1 - src/strings/zh-tw.json | 1 - 30 files changed, 30 deletions(-) diff --git a/src/strings/ar.json b/src/strings/ar.json index 6c230247f7..6eea9501bb 100644 --- a/src/strings/ar.json +++ b/src/strings/ar.json @@ -50,7 +50,6 @@ "ButtonOff": "إيقاف التشغيل", "ButtonOk": "موافق", "ButtonOpen": "إفتح", - "ButtonOther": "أخرى", "ButtonParentalControl": "التحكم الأبوي", "ButtonPause": "توقف مؤقت", "ButtonPlay": "تشغيل", diff --git a/src/strings/ca.json b/src/strings/ca.json index 7a81924fb2..cc610708b1 100644 --- a/src/strings/ca.json +++ b/src/strings/ca.json @@ -47,7 +47,6 @@ "ButtonNextTrack": "Pista següent", "ButtonOk": "D'acord", "ButtonOpen": "Obre", - "ButtonOther": "Altres", "ButtonParentalControl": "Control parental", "ButtonPause": "Pausa", "ButtonPlay": "Reprodueix", diff --git a/src/strings/cs.json b/src/strings/cs.json index 29402478e4..f79a1b829b 100644 --- a/src/strings/cs.json +++ b/src/strings/cs.json @@ -72,7 +72,6 @@ "ButtonNextTrack": "Následující stopa", "ButtonOff": "Vypnout", "ButtonOpen": "Otevřít", - "ButtonOther": "Další", "ButtonParentalControl": "Rodičovská kontrola", "ButtonPause": "Pozastavit", "ButtonPlay": "Přehrát", diff --git a/src/strings/da.json b/src/strings/da.json index 6122f143e1..f80c798058 100644 --- a/src/strings/da.json +++ b/src/strings/da.json @@ -67,7 +67,6 @@ "ButtonNextTrack": "Næste spor", "ButtonOff": "Fra", "ButtonOpen": "Åben", - "ButtonOther": "Andre", "ButtonParentalControl": "Forældrekontrol", "ButtonPlay": "Afspil", "ButtonPreviousTrack": "Forrige spor", diff --git a/src/strings/de.json b/src/strings/de.json index 670e9d4492..8c48f2745e 100644 --- a/src/strings/de.json +++ b/src/strings/de.json @@ -95,7 +95,6 @@ "ButtonNextTrack": "Nächstes Stück", "ButtonOff": "Ausschalten", "ButtonOpen": "Öffnen", - "ButtonOther": "Andere", "ButtonParentalControl": "Kindersicherung", "ButtonPlay": "Abspielen", "ButtonPreviousTrack": "Vorheriges Stück", diff --git a/src/strings/el.json b/src/strings/el.json index 363b206767..a9e00867db 100644 --- a/src/strings/el.json +++ b/src/strings/el.json @@ -80,7 +80,6 @@ "ButtonNew": "Νέο", "ButtonNextTrack": "Επομενο", "ButtonOpen": "Άνοιγμα", - "ButtonOther": "Άλλα", "ButtonParentalControl": "Γονικός έλεγχος", "ButtonPause": "Παύση", "ButtonPlay": "Αναπαραγωγή", diff --git a/src/strings/en-gb.json b/src/strings/en-gb.json index 712ca551e8..cbbaedb385 100644 --- a/src/strings/en-gb.json +++ b/src/strings/en-gb.json @@ -142,7 +142,6 @@ "ButtonOff": "Off", "ButtonOk": "Ok", "ButtonOpen": "Open", - "ButtonOther": "Other", "ButtonParentalControl": "Parental control", "ButtonPause": "Pause", "ButtonPlay": "Play", diff --git a/src/strings/en-us.json b/src/strings/en-us.json index 4e63c7817f..55720f4de5 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -96,7 +96,6 @@ "ButtonOff": "Off", "ButtonOk": "Ok", "ButtonOpen": "Open", - "ButtonOther": "Other", "ButtonParentalControl": "Parental control", "ButtonPause": "Pause", "ButtonPlay": "Play", diff --git a/src/strings/es-ar.json b/src/strings/es-ar.json index a0f6af9c0d..c85d790a5e 100644 --- a/src/strings/es-ar.json +++ b/src/strings/es-ar.json @@ -166,7 +166,6 @@ "ButtonOff": "Desactivado", "ButtonOk": "Aceptar", "ButtonOpen": "Abrir", - "ButtonOther": "Otro", "ButtonParentalControl": "Control parental", "ButtonPause": "Pausar", "ButtonPlay": "Reproducir", diff --git a/src/strings/es-mx.json b/src/strings/es-mx.json index ec88b1ceea..81a5ed1ddf 100644 --- a/src/strings/es-mx.json +++ b/src/strings/es-mx.json @@ -93,7 +93,6 @@ "ButtonNextTrack": "Pista siguiente", "ButtonOff": "Apagar", "ButtonOpen": "Abrir", - "ButtonOther": "Otros", "ButtonParentalControl": "Control parental", "ButtonPause": "Pausar", "ButtonPlay": "Reproducir", diff --git a/src/strings/es.json b/src/strings/es.json index 92e5347f38..863ac97a19 100644 --- a/src/strings/es.json +++ b/src/strings/es.json @@ -79,7 +79,6 @@ "ButtonOff": "Apagado", "ButtonOk": "OK", "ButtonOpen": "Abrir", - "ButtonOther": "Otro", "ButtonParentalControl": "Control parental", "ButtonPause": "Pausa", "ButtonPlay": "Reproducir", diff --git a/src/strings/fi.json b/src/strings/fi.json index 59fae5a97a..84949e69ee 100644 --- a/src/strings/fi.json +++ b/src/strings/fi.json @@ -164,7 +164,6 @@ "ButtonOff": "Pois päältä", "ButtonOk": "Ok", "ButtonOpen": "Avoin", - "ButtonOther": "Muu", "BurnSubtitlesHelp": "Määrittää jos palvelimen pitäisi upottaa tekstitykset suoraan videotiedostoon muuntamisvaiheessa tekstitysformaatista riippuen. Upottamisen välttäminen parantaa palvelimen suorituskykyä. Valitse Automaattinen upottaaksesi sekä kuvapohjaiset- (esim. VOBSUB, PGS, SUB/IDX, jne.) että ASS/SSA tekstitysmuodot", "ButtonParentalControl": "Lapsilukko", "ButtonPause": "Tauko", diff --git a/src/strings/fr.json b/src/strings/fr.json index f8b6a7f4ea..7a9dc4b6cc 100644 --- a/src/strings/fr.json +++ b/src/strings/fr.json @@ -90,7 +90,6 @@ "ButtonOff": "Arrêt", "ButtonOk": "OK", "ButtonOpen": "Ouvrir", - "ButtonOther": "Autre", "ButtonParentalControl": "Contrôle parental", "ButtonPlay": "Lire", "ButtonPreviousTrack": "Piste précédente", diff --git a/src/strings/hr.json b/src/strings/hr.json index 8db59b0b9f..a1c700df64 100644 --- a/src/strings/hr.json +++ b/src/strings/hr.json @@ -54,7 +54,6 @@ "ButtonOff": "Isključi", "ButtonOk": "U redu", "ButtonOpen": "Otvori", - "ButtonOther": "Ostalo", "ButtonParentalControl": "Roditeljska kontrola", "ButtonPause": "Pauza", "ButtonPlay": "Pokreni", diff --git a/src/strings/hu.json b/src/strings/hu.json index 3f11b552b7..97f848ff17 100644 --- a/src/strings/hu.json +++ b/src/strings/hu.json @@ -621,7 +621,6 @@ "ButtonLearnMore": "Tudj meg többet", "ButtonNetwork": "Hálózat", "ButtonOk": "Ok", - "ButtonOther": "Egyéb", "ButtonRevoke": "Visszavon", "ButtonSelectView": "Válassz nézetet", "ButtonStart": "Start", diff --git a/src/strings/it.json b/src/strings/it.json index c2ea03aab9..098b6aff1a 100644 --- a/src/strings/it.json +++ b/src/strings/it.json @@ -81,7 +81,6 @@ "ButtonNextTrack": "Traccia Successiva", "ButtonOff": "Spento", "ButtonOpen": "Apri", - "ButtonOther": "Altro", "ButtonParentalControl": "Controllo parentale", "ButtonPause": "Pausa", "ButtonPlay": "Riproduci", diff --git a/src/strings/ja.json b/src/strings/ja.json index 92fdc27632..00d7c399b9 100644 --- a/src/strings/ja.json +++ b/src/strings/ja.json @@ -91,7 +91,6 @@ "ButtonNextTrack": "次のトラック", "ButtonOk": "OK", "ButtonOpen": "開く", - "ButtonOther": "その他", "ButtonParentalControl": "ペアレンタルコントロール", "ButtonPause": "一時停止", "ButtonPlay": "再生", diff --git a/src/strings/kk.json b/src/strings/kk.json index ec55c23fea..11df23c3c3 100644 --- a/src/strings/kk.json +++ b/src/strings/kk.json @@ -96,7 +96,6 @@ "ButtonOff": "Óshir", "ButtonOk": "Jaraıdy", "ButtonOpen": "Ashý", - "ButtonOther": "Basqa", "ButtonParentalControl": "Mazmundy basqarý", "ButtonPause": "Úzý", "ButtonPlay": "Oınatý", diff --git a/src/strings/lt-lt.json b/src/strings/lt-lt.json index dcc268898c..ca7225ccd1 100644 --- a/src/strings/lt-lt.json +++ b/src/strings/lt-lt.json @@ -569,7 +569,6 @@ "ButtonNetwork": "Tinklas", "ButtonOff": "Išjungti", "ButtonOpen": "Atidaryti", - "ButtonOther": "Kita", "ButtonParentalControl": "Tėvų kontrolė", "ButtonProfile": "Profilis", "ButtonRename": "Pervadinti", diff --git a/src/strings/nb.json b/src/strings/nb.json index 95e14ff45b..238f5687c5 100644 --- a/src/strings/nb.json +++ b/src/strings/nb.json @@ -70,7 +70,6 @@ "ButtonOff": "Av", "ButtonOk": "OK", "ButtonOpen": "Åpne", - "ButtonOther": "Andre", "ButtonParentalControl": "Foreldrekontroll", "ButtonPlay": "Spill", "ButtonPreviousTrack": "Forrige Spor", diff --git a/src/strings/nl.json b/src/strings/nl.json index a38f479886..0626ac8aca 100644 --- a/src/strings/nl.json +++ b/src/strings/nl.json @@ -86,7 +86,6 @@ "ButtonNextTrack": "Volgende track", "ButtonOff": "Uit", "ButtonOpen": "Openen", - "ButtonOther": "Andere", "ButtonParentalControl": "Ouderlijk toezicht", "ButtonPause": "Pauze", "ButtonPlay": "Afspelen", diff --git a/src/strings/pl.json b/src/strings/pl.json index f42a5695ad..4561466f3d 100644 --- a/src/strings/pl.json +++ b/src/strings/pl.json @@ -93,7 +93,6 @@ "ButtonNextTrack": "Następna utwór", "ButtonOff": "Wyłącz", "ButtonOpen": "Otwórz", - "ButtonOther": "Inne", "ButtonParentalControl": "Kontrola rodzicielska", "ButtonPause": "Pauza", "ButtonPlay": "Odtwarzaj", diff --git a/src/strings/pt-br.json b/src/strings/pt-br.json index ecc4f3a8ff..cc2b8220a4 100644 --- a/src/strings/pt-br.json +++ b/src/strings/pt-br.json @@ -88,7 +88,6 @@ "ButtonOff": "Desligado", "ButtonOk": "OK", "ButtonOpen": "Abrir", - "ButtonOther": "Outro", "ButtonParentalControl": "Controle etário", "ButtonPause": "Pausar", "ButtonPlay": "Reproduzir", diff --git a/src/strings/pt-pt.json b/src/strings/pt-pt.json index 5e98cff705..2b2ad2191d 100644 --- a/src/strings/pt-pt.json +++ b/src/strings/pt-pt.json @@ -824,7 +824,6 @@ "ButtonSelectServer": "Selecionar servidor", "ButtonRename": "Alterar o nome", "ButtonParentalControl": "Controlo parental", - "ButtonOther": "Outro", "ButtonOk": "OK", "ButtonLibraryAccess": "Acesso à biblioteca", "ButtonGuide": "Programação", diff --git a/src/strings/ru.json b/src/strings/ru.json index 1c0fe5190d..b3432a8990 100644 --- a/src/strings/ru.json +++ b/src/strings/ru.json @@ -94,7 +94,6 @@ "ButtonOff": "Откл", "ButtonOk": "Ок", "ButtonOpen": "Открыть", - "ButtonOther": "Другое", "ButtonParentalControl": "Управлять содержанием", "ButtonPause": "Пауза", "ButtonPlay": "Воспр.", diff --git a/src/strings/sk.json b/src/strings/sk.json index ccfba4669a..7c0048db2f 100644 --- a/src/strings/sk.json +++ b/src/strings/sk.json @@ -60,7 +60,6 @@ "ButtonNew": "Nové", "ButtonNextTrack": "Nasledujúca stopa", "ButtonOpen": "Otvoriť", - "ButtonOther": "Iné", "ButtonParentalControl": "Rodičovská kontrola", "ButtonPause": "Pauza", "ButtonPlay": "Prehrať", diff --git a/src/strings/sl-si.json b/src/strings/sl-si.json index f409d11bfc..ad9a7455ee 100644 --- a/src/strings/sl-si.json +++ b/src/strings/sl-si.json @@ -194,7 +194,6 @@ "ButtonOff": "Izključi", "ButtonOk": "Ok", "ButtonOpen": "Odpri", - "ButtonOther": "Ostalo", "ButtonParentalControl": "Starševski nadzor", "ButtonPause": "Premor", "ButtonPlay": "Predvajaj", diff --git a/src/strings/sv.json b/src/strings/sv.json index ea702c3c2f..bc88536694 100644 --- a/src/strings/sv.json +++ b/src/strings/sv.json @@ -84,7 +84,6 @@ "ButtonOff": "Av", "ButtonOk": "OK", "ButtonOpen": "Öppna", - "ButtonOther": "Annan", "ButtonParentalControl": "Föräldralås", "ButtonPause": "Paus", "ButtonPlay": "Spela upp", diff --git a/src/strings/zh-cn.json b/src/strings/zh-cn.json index cace6f25d3..8dbfe8984d 100644 --- a/src/strings/zh-cn.json +++ b/src/strings/zh-cn.json @@ -88,7 +88,6 @@ "ButtonOff": "关", "ButtonOk": "确定", "ButtonOpen": "打开", - "ButtonOther": "其他", "ButtonParentalControl": "家长控制", "ButtonPause": "暂停", "ButtonPlay": "播放", diff --git a/src/strings/zh-tw.json b/src/strings/zh-tw.json index 3869ca3271..66a63e4d55 100644 --- a/src/strings/zh-tw.json +++ b/src/strings/zh-tw.json @@ -379,7 +379,6 @@ "ButtonNextTrack": "下一首", "ButtonOff": "關", "ButtonOpen": "開", - "ButtonOther": "其他", "ButtonParentalControl": "家庭管理", "ButtonPause": "暫停", "ButtonPreviousTrack": "上一首", From b19d3cfc0e10f3fd7eca9555ab8312bd6219113c Mon Sep 17 00:00:00 2001 From: Nathan Pickard Date: Wed, 2 Oct 2019 16:18:40 -0700 Subject: [PATCH 3/5] Remove other action --- src/controllers/livetvstatus.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/controllers/livetvstatus.js b/src/controllers/livetvstatus.js index 98587848bf..d268be2991 100644 --- a/src/controllers/livetvstatus.js +++ b/src/controllers/livetvstatus.js @@ -173,9 +173,7 @@ define(["jQuery", "globalize", "scripts/taskbutton", "dom", "libraryMenu", "layo items: menuItems, positionTo: button, callback: function(id) { - "other" == id ? Dashboard.alert({ - message: globalize.translate("ForAdditionalLiveTvOptions") - }) : Dashboard.navigate(getProviderConfigurationUrl(id)) + Dashboard.navigate(getProviderConfigurationUrl(id)) } }) }) From 2477c8343c0f539271bc97788efd09857e894b4b Mon Sep 17 00:00:00 2001 From: Nathan Pickard Date: Thu, 3 Oct 2019 10:02:24 -0700 Subject: [PATCH 4/5] Remove ForAdditionalLiveTvOptions string --- src/livetvtuner.html | 1 - src/strings/cs.json | 1 - src/strings/da.json | 1 - src/strings/de.json | 1 - src/strings/en-gb.json | 1 - src/strings/en-us.json | 1 - src/strings/es-ar.json | 1 - src/strings/es-mx.json | 1 - src/strings/es.json | 1 - src/strings/fr.json | 1 - src/strings/hu.json | 1 - src/strings/it.json | 1 - src/strings/ja.json | 1 - src/strings/kk.json | 1 - src/strings/nl.json | 1 - src/strings/pl.json | 1 - src/strings/pt-br.json | 1 - src/strings/pt-pt.json | 1 - src/strings/ru.json | 1 - src/strings/sv.json | 1 - src/strings/zh-cn.json | 1 - src/strings/zh-tw.json | 1 - 22 files changed, 22 deletions(-) diff --git a/src/livetvtuner.html b/src/livetvtuner.html index 8528bfd557..62b2d74055 100644 --- a/src/livetvtuner.html +++ b/src/livetvtuner.html @@ -63,7 +63,6 @@

${DrmChannelsNotImported}

-

${ForAdditionalLiveTvOptions}


diff --git a/src/strings/cs.json b/src/strings/cs.json index f79a1b829b..3d03fc9455 100644 --- a/src/strings/cs.json +++ b/src/strings/cs.json @@ -1297,7 +1297,6 @@ "Features": "Funkce", "Filters": "Filtry", "Folders": "Složky", - "ForAdditionalLiveTvOptions": "Pro další poskytovatele živého TV vysílání klikněte na záložku Služby a zobrazte dostupné možnosti.", "General": "Hlavní", "GenreValue": "Žánr: {0}", "GenresValue": "Žánry: {0}", diff --git a/src/strings/da.json b/src/strings/da.json index f80c798058..68776deca0 100644 --- a/src/strings/da.json +++ b/src/strings/da.json @@ -173,7 +173,6 @@ "FolderTypeMusicVideos": "Musikvideoer", "FolderTypeTvShows": "TV", "FolderTypeUnset": "Ikke valgt (blandet indhold)", - "ForAdditionalLiveTvOptions": "For ekstra Live TV udbydere, klik på Tjenester fanen for at se muligheder.", "Friday": "Fredag", "Fullscreen": "Fuldskærm", "General": "Generel", diff --git a/src/strings/de.json b/src/strings/de.json index 8c48f2745e..2707f5d1b8 100644 --- a/src/strings/de.json +++ b/src/strings/de.json @@ -247,7 +247,6 @@ "FolderTypeMusicVideos": "Musikvideos", "FolderTypeUnset": "Keine Auswahl (gemischter Inhalt)", "Folders": "Verzeichnisse", - "ForAdditionalLiveTvOptions": "Für weitere TV Quellen klicke auf den \"Dienste\"-Reiter um weitere Optionen anzuzeigen.", "Friday": "Freitag", "Fullscreen": "Vollbild", "General": "Allgemein", diff --git a/src/strings/en-gb.json b/src/strings/en-gb.json index cbbaedb385..573baf2165 100644 --- a/src/strings/en-gb.json +++ b/src/strings/en-gb.json @@ -295,7 +295,6 @@ "FolderTypeMusicVideos": "Music videos", "FolderTypeTvShows": "TV Shows", "FolderTypeUnset": "Mixed content", - "ForAdditionalLiveTvOptions": "For additional Live TV providers, click on the Services tab to see the available options.", "FormatValue": "Format: {0}", "Friday": "Friday", "Fullscreen": "Full screen", diff --git a/src/strings/en-us.json b/src/strings/en-us.json index 55720f4de5..6671b042e5 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -262,7 +262,6 @@ "FolderTypeTvShows": "TV Shows", "FolderTypeUnset": "Mixed Content", "Folders": "Folders", - "ForAdditionalLiveTvOptions": "For additional Live TV providers, click on the Services tab to see the available options.", "FormatValue": "Format: {0}", "Friday": "Friday", "Fullscreen": "Full screen", diff --git a/src/strings/es-ar.json b/src/strings/es-ar.json index c85d790a5e..f8f3cd3cf0 100644 --- a/src/strings/es-ar.json +++ b/src/strings/es-ar.json @@ -394,7 +394,6 @@ "FolderTypeMusic": "Música", "FolderTypeMusicVideos": "Videos Musicales", "FolderTypeUnset": "Sin especificar (Contenido Mixto)", - "ForAdditionalLiveTvOptions": "Para proveedores adicionales de TV en Vivo, hacé click en la pestaña Servicios para ver las opciones disponibles.", "FormatValue": "Formato: {0}", "Friday": "Viernes", "Fullscreen": "Pantalla Completa", diff --git a/src/strings/es-mx.json b/src/strings/es-mx.json index 81a5ed1ddf..21458ef728 100644 --- a/src/strings/es-mx.json +++ b/src/strings/es-mx.json @@ -252,7 +252,6 @@ "FolderTypeTvShows": "Series de TV", "FolderTypeUnset": "Contenido variado", "Folders": "Carpetas", - "ForAdditionalLiveTvOptions": "Para proveedores adicionales de TV en Vivo, de clic en la pestaña de Servicios para ver las opciones disponibles.", "FormatValue": "Formato: {0}", "Friday": "Viernes", "Fullscreen": "Pantalla Completa", diff --git a/src/strings/es.json b/src/strings/es.json index 863ac97a19..d8cf88bc54 100644 --- a/src/strings/es.json +++ b/src/strings/es.json @@ -206,7 +206,6 @@ "FolderTypeMusicVideos": "Vídeos Musicales", "FolderTypeTvShows": "Programas de TV", "FolderTypeUnset": "Contenido Mixto", - "ForAdditionalLiveTvOptions": "Para proveedores adicionales de televisión en directo, haga clic en la pestaña Servicios para ver las opciones disponibles.", "FormatValue": "Formato: {0}", "Friday": "Viernes", "Fullscreen": "Pantalla completa", diff --git a/src/strings/fr.json b/src/strings/fr.json index 7a9dc4b6cc..67e50642f5 100644 --- a/src/strings/fr.json +++ b/src/strings/fr.json @@ -250,7 +250,6 @@ "FolderTypeTvShows": "TV", "FolderTypeUnset": "Contenu mixte", "Folders": "Dossiers", - "ForAdditionalLiveTvOptions": "Pour d'autres fournisseurs de TV en direct, cliquez sur l'onglet Services afin de voir les options disponibles.", "FormatValue": "Format : {0}", "Friday": "Vendredi", "Fullscreen": "Plein écran", diff --git a/src/strings/hu.json b/src/strings/hu.json index 97f848ff17..a5514d8b06 100644 --- a/src/strings/hu.json +++ b/src/strings/hu.json @@ -696,7 +696,6 @@ "File": "Fájl", "FileReadCancelled": "Az olvasott fájl törlése megtörtént.", "FileReadError": "Hiba történt a fájl olvasása közben.", - "ForAdditionalLiveTvOptions": "A további Élő TV szolgáltatókhoz kattints a Szolgáltatások fülre a rendelkezésre álló lehetőségek megtekintéséhez.", "GroupBySeries": "Csoportosítás sorozatonként", "GuestStar": "Vendég sztár", "GuideProviderLogin": "Bejelentkezés", diff --git a/src/strings/it.json b/src/strings/it.json index 098b6aff1a..ff016dd024 100644 --- a/src/strings/it.json +++ b/src/strings/it.json @@ -237,7 +237,6 @@ "FolderTypeMusicVideos": "Video musicali", "FolderTypeUnset": "Contenuto Misto", "Folders": "Cartelle", - "ForAdditionalLiveTvOptions": "Per ulteriori provider Live TV, fare clic sulla scheda Servizi per vedere le opzioni disponibili.", "FormatValue": "Formato: {0}", "Friday": "Venerdì", "Fullscreen": "Schermo Intero", diff --git a/src/strings/ja.json b/src/strings/ja.json index 00d7c399b9..f85018c40c 100644 --- a/src/strings/ja.json +++ b/src/strings/ja.json @@ -262,7 +262,6 @@ "FolderTypeTvShows": "テレビ番組", "FolderTypeUnset": "ミックスコンテンツ", "Folders": "フォルダー", - "ForAdditionalLiveTvOptions": "その他のLive TV プロバイダーの場合は、[サービス]タブをクリックして利用可能なオプションを確認してください。", "FormatValue": "フォーマット: {0}", "Friday": "金曜日", "Fullscreen": "フルスクリーン", diff --git a/src/strings/kk.json b/src/strings/kk.json index 11df23c3c3..e166cafe4f 100644 --- a/src/strings/kk.json +++ b/src/strings/kk.json @@ -263,7 +263,6 @@ "FolderTypeTvShows": "TD", "FolderTypeUnset": "Aralas mazmun", "Folders": "Qaltalar", - "ForAdditionalLiveTvOptions": "Qosymsha efırlik TD jetkizýshiler úshin, Qyzmetter qoıyndysyn nuqyp, qoljetimdi opsıalarben tanysyńyz.", "FormatValue": "Pishim: {0}", "Friday": "juma", "Fullscreen": "Tolyq ekran", diff --git a/src/strings/nl.json b/src/strings/nl.json index 0626ac8aca..9f31521cd5 100644 --- a/src/strings/nl.json +++ b/src/strings/nl.json @@ -241,7 +241,6 @@ "FolderTypeTvShows": "TV Series", "FolderTypeUnset": "Gemengde inhoud", "Folders": "Mappen", - "ForAdditionalLiveTvOptions": "Voor extra Live TV providers, klik op de Diensten tab om de mogelijke opties te zien.", "FormatValue": "Formaat: {0}", "Friday": "Vrijdag", "Fullscreen": "Volledig scherm", diff --git a/src/strings/pl.json b/src/strings/pl.json index 4561466f3d..f79239ce00 100644 --- a/src/strings/pl.json +++ b/src/strings/pl.json @@ -255,7 +255,6 @@ "FolderTypeTvShows": "Seriale", "FolderTypeUnset": "Zawartość mieszana", "Folders": "Foldery", - "ForAdditionalLiveTvOptions": "Dla większej liczby dostawców telewizji, kliknij Usługi aby zobaczyć pozostałe opcje.", "Friday": "Piątek", "Fullscreen": "Pełny ekran", "General": "Ogólne", diff --git a/src/strings/pt-br.json b/src/strings/pt-br.json index cc2b8220a4..271cb34c80 100644 --- a/src/strings/pt-br.json +++ b/src/strings/pt-br.json @@ -244,7 +244,6 @@ "FolderTypeTvShows": "Séries", "FolderTypeUnset": "Conteúdo misto", "Folders": "Pastas", - "ForAdditionalLiveTvOptions": "Para provedores de TV ao Vivo adicionais, clique na guia Serviços para ver as opções disponíveis.", "FormatValue": "Formato: {0}", "Friday": "Sexta-feira", "Fullscreen": "Tela cheia", diff --git a/src/strings/pt-pt.json b/src/strings/pt-pt.json index 2b2ad2191d..e6628fbd89 100644 --- a/src/strings/pt-pt.json +++ b/src/strings/pt-pt.json @@ -880,7 +880,6 @@ "GenreValue": "Género: {0}", "General": "Geral", "FormatValue": "Formato: {0}", - "ForAdditionalLiveTvOptions": "Para encontrar provedores de serviços de TV, clique no separador Serviços para ver os provedores disponíveis.", "FolderTypeUnset": "Conteúdo misto", "Filters": "Filtros", "File": "Ficheiro", diff --git a/src/strings/ru.json b/src/strings/ru.json index b3432a8990..3f3aba4ef2 100644 --- a/src/strings/ru.json +++ b/src/strings/ru.json @@ -256,7 +256,6 @@ "FolderTypeTvShows": "ТВ", "FolderTypeUnset": "Разнородное содержание", "Folders": "Папки", - "ForAdditionalLiveTvOptions": "Для дополнительных ТВ-поставщиков, ознакомьтесь с имеющимися опциями, щёлкнув по вкладке Компоненты.", "FormatValue": "Формат: {0}", "Friday": "пятница", "Fullscreen": "Полный экран", diff --git a/src/strings/sv.json b/src/strings/sv.json index bc88536694..914de21eb5 100644 --- a/src/strings/sv.json +++ b/src/strings/sv.json @@ -1276,7 +1276,6 @@ "Guide": "Guide", "GenreValue": "Genre: {0}", "General": "Allmänt", - "ForAdditionalLiveTvOptions": "Klicka på \"Tjänster\" fliken för ytterligare Live TV leverantörer.", "FastForward": "Snabbspola", "Extras": "Mer", "ErrorAddingXmlTvFile": "Det uppstod ett problem vid läsningen av XmlTV filen. Kontrollera att filen är tillgänglig och försök igen.", diff --git a/src/strings/zh-cn.json b/src/strings/zh-cn.json index 8dbfe8984d..e081bb154d 100644 --- a/src/strings/zh-cn.json +++ b/src/strings/zh-cn.json @@ -235,7 +235,6 @@ "FolderTypeTvShows": "电视节目", "FolderTypeUnset": "混合内容", "Folders": "文件夹", - "ForAdditionalLiveTvOptions": "要查看额外的电视直播提供商，点击“服务”标签以查看可用的选项。", "FormatValue": "格式：{0}", "Friday": "星期五", "Fullscreen": "全屏", diff --git a/src/strings/zh-tw.json b/src/strings/zh-tw.json index 66a63e4d55..dc85b350b8 100644 --- a/src/strings/zh-tw.json +++ b/src/strings/zh-tw.json @@ -535,7 +535,6 @@ "FolderTypeMixed": "混合媒體", "FolderTypeUnset": "混合內容", "Folders": "資料夾", - "ForAdditionalLiveTvOptions": "以查看額外的電視直播供應商，點擊“服務”以查看可用的選項。", "FormatValue": "格式：{0}", "FreeAppsFeatureDescription": "享受免費的Jellyfin應用程式。", "Fullscreen": "全螢幕", From 352573e5a6f8bd84499ba35d133178b2fac2c934 Mon Sep 17 00:00:00 2001 From: dkanada Date: Wed, 9 Oct 2019 22:06:42 +0900 Subject: [PATCH 5/5] remove otherOptionsMessage --- src/controllers/livetvtuner.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/livetvtuner.js b/src/controllers/livetvtuner.js index 336270a5c2..43082e6844 100644 --- a/src/controllers/livetvtuner.js +++ b/src/controllers/livetvtuner.js @@ -114,7 +114,7 @@ define(["globalize", "loading", "libraryMenu", "dom", "emby-input", "emby-button suppportsSubmit = "other" !== value, supportsSelectablePath = supportsTunerFileOrUrl, txtDevicePath = view.querySelector(".txtDevicePath"); - supportsTunerIpAddress ? (txtDevicePath.label(globalize.translate("LabelTunerIpAddress")), view.querySelector(".fldPath").classList.remove("hide")) : supportsTunerFileOrUrl ? (txtDevicePath.label(globalize.translate("LabelFileOrUrl")), view.querySelector(".fldPath").classList.remove("hide")) : view.querySelector(".fldPath").classList.add("hide"), supportsSelectablePath ? (view.querySelector(".btnSelectPath").classList.remove("hide"), view.querySelector(".txtDevicePath").setAttribute("required", "required")) : (view.querySelector(".btnSelectPath").classList.add("hide"), view.querySelector(".txtDevicePath").removeAttribute("required")), supportsUserAgent ? view.querySelector(".fldUserAgent").classList.remove("hide") : view.querySelector(".fldUserAgent").classList.add("hide"), supportsFavorites ? view.querySelector(".fldFavorites").classList.remove("hide") : view.querySelector(".fldFavorites").classList.add("hide"), supportsTranscoding ? view.querySelector(".fldTranscode").classList.remove("hide") : view.querySelector(".fldTranscode").classList.add("hide"), supportsStreamLooping ? view.querySelector(".fldStreamLoop").classList.remove("hide") : view.querySelector(".fldStreamLoop").classList.add("hide"), supportsTunerCount ? (view.querySelector(".fldTunerCount").classList.remove("hide"), view.querySelector(".txtTunerCount").setAttribute("required", "required")) : (view.querySelector(".fldTunerCount").classList.add("hide"), view.querySelector(".txtTunerCount").removeAttribute("required")), mayIncludeUnsupportedDrmChannels ? view.querySelector(".drmMessage").classList.remove("hide") : view.querySelector(".drmMessage").classList.add("hide"), suppportsSubmit ? (view.querySelector(".button-submit").classList.remove("hide"), view.querySelector(".otherOptionsMessage").classList.add("hide")) : (view.querySelector(".button-submit").classList.add("hide"), view.querySelector(".otherOptionsMessage").classList.remove("hide")) + supportsTunerIpAddress ? (txtDevicePath.label(globalize.translate("LabelTunerIpAddress")), view.querySelector(".fldPath").classList.remove("hide")) : supportsTunerFileOrUrl ? (txtDevicePath.label(globalize.translate("LabelFileOrUrl")), view.querySelector(".fldPath").classList.remove("hide")) : view.querySelector(".fldPath").classList.add("hide"), supportsSelectablePath ? (view.querySelector(".btnSelectPath").classList.remove("hide"), view.querySelector(".txtDevicePath").setAttribute("required", "required")) : (view.querySelector(".btnSelectPath").classList.add("hide"), view.querySelector(".txtDevicePath").removeAttribute("required")), supportsUserAgent ? view.querySelector(".fldUserAgent").classList.remove("hide") : view.querySelector(".fldUserAgent").classList.add("hide"), supportsFavorites ? view.querySelector(".fldFavorites").classList.remove("hide") : view.querySelector(".fldFavorites").classList.add("hide"), supportsTranscoding ? view.querySelector(".fldTranscode").classList.remove("hide") : view.querySelector(".fldTranscode").classList.add("hide"), supportsStreamLooping ? view.querySelector(".fldStreamLoop").classList.remove("hide") : view.querySelector(".fldStreamLoop").classList.add("hide"), supportsTunerCount ? (view.querySelector(".fldTunerCount").classList.remove("hide"), view.querySelector(".txtTunerCount").setAttribute("required", "required")) : (view.querySelector(".fldTunerCount").classList.add("hide"), view.querySelector(".txtTunerCount").removeAttribute("required")), mayIncludeUnsupportedDrmChannels ? view.querySelector(".drmMessage").classList.remove("hide") : view.querySelector(".drmMessage").classList.add("hide"), suppportsSubmit ? view.querySelector(".button-submit").classList.remove("hide") : view.querySelector(".button-submit").classList.add("hide") } return function(view, params) { params.id || view.querySelector(".btnDetect").classList.remove("hide"), view.addEventListener("viewshow", function() {