From 8651d4bd00970920856950568adebb4bb157e149 Mon Sep 17 00:00:00 2001 From: artiume Date: Sun, 1 Mar 2020 20:59:42 -0500 Subject: [PATCH 1/6] Update playback warning --- src/components/playback/experimentalwarnings.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/playback/experimentalwarnings.js b/src/components/playback/experimentalwarnings.js index 2d1ef53c19..9c0714e57e 100644 --- a/src/components/playback/experimentalwarnings.js +++ b/src/components/playback/experimentalwarnings.js @@ -46,21 +46,21 @@ define(['connectionManager', 'globalize', 'userSettings', 'apphost'], function ( function showBlurayMessage() { var message = - 'Playback of Bluray folders in this app is experimental. Some titles may not work at all. For a better experience, consider converting to mkv video files, or use an Jellyfin app with native Bluray folder support.'; + 'Playback of Bluray folders in this app is experimental. Jellyfin cannot decrypt DRM. The current behavior is to play all files in series, this can include a two minute black intro video.'; return showMessage(message, 'blurayexpirementalinfo', 'nativeblurayplayback'); } function showDvdMessage() { var message = - 'Playback of Dvd folders in this app is experimental. Some titles may not work at all. For a better experience, consider converting to mkv video files, or use an Jellyfin app with native Dvd folder support.'; + 'Playback of Dvd folders in this app is experimental. Jellyfin cannot decrypt DRM. The current behavior is to play all files in series, this can include a two minute black intro video.'; return showMessage(message, 'dvdexpirementalinfo', 'nativedvdplayback'); } function showIsoMessage() { var message = - 'Playback of ISO files in this app is experimental. Some titles may not work at all. For a better experience, consider converting to mkv video files, or use an Jellyfin app with native ISO support.'; + 'Playback of ISO files in this app is experimental. The current behavior is to play all files in series, this can include a two minute black intro video.'; return showMessage(message, 'isoexpirementalinfo', 'nativeisoplayback'); } From e5ce7af11d4fa3637268ed0a47e043c187611d89 Mon Sep 17 00:00:00 2001 From: ferferga Date: Sat, 4 Apr 2020 13:25:35 +0200 Subject: [PATCH 2/6] Translate experimentalwarnings.js --- src/components/playback/experimentalwarnings.js | 15 +++------------ src/strings/en-us.json | 5 ++++- src/strings/es.json | 5 ++++- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/components/playback/experimentalwarnings.js b/src/components/playback/experimentalwarnings.js index 9c0714e57e..09b8158242 100644 --- a/src/components/playback/experimentalwarnings.js +++ b/src/components/playback/experimentalwarnings.js @@ -44,24 +44,15 @@ define(['connectionManager', 'globalize', 'userSettings', 'apphost'], function ( } function showBlurayMessage() { - - var message = - 'Playback of Bluray folders in this app is experimental. Jellyfin cannot decrypt DRM. The current behavior is to play all files in series, this can include a two minute black intro video.'; - return showMessage(message, 'blurayexpirementalinfo', 'nativeblurayplayback'); + return showMessage(globalize.translate("ExperimentalBluRayPlayback"), 'blurayexpirementalinfo', 'nativeblurayplayback'); } function showDvdMessage() { - - var message = - 'Playback of Dvd folders in this app is experimental. Jellyfin cannot decrypt DRM. The current behavior is to play all files in series, this can include a two minute black intro video.'; - return showMessage(message, 'dvdexpirementalinfo', 'nativedvdplayback'); + return showMessage(globalize.translate("ExperimentalDVDPlayback"), 'dvdexpirementalinfo', 'nativedvdplayback'); } function showIsoMessage() { - - var message = - 'Playback of ISO files in this app is experimental. The current behavior is to play all files in series, this can include a two minute black intro video.'; - return showMessage(message, 'isoexpirementalinfo', 'nativeisoplayback'); + return showMessage(globalize.translate("ExperimentalISOPlayback"), 'isoexpirementalinfo', 'nativeisoplayback'); } function ExpirementalPlaybackWarnings() { diff --git a/src/strings/en-us.json b/src/strings/en-us.json index 008c8565f9..900b3dbb20 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -1492,5 +1492,8 @@ "EveryXMinutes": "Every {0} minutes", "EveryHour": "Every hour", "EveryXHours": "Every {0} hours", - "OnApplicationStartup": "On application startup" + "OnApplicationStartup": "On application startup", + "ExperimentalBlurayPlayback": "Blu-Ray playback is experimental. Jellyfin cannot decrypt content protected by DRM. All the titles in the Blu-Ray will be played anyway, including the protected ones. Some parts might be in black", + "ExperimentalDVDPlayback": "DVD playback is experimental. Jellyfin cannot decrypt content protected by DRM. All the titles in the DVD will be played anyway, including the protected ones. Some parts might be in black", + "ExperimentalISOPlayback": "ISO playback is experimental. All the titles in the ISO will be played anyway. Some parts might be in black" } diff --git a/src/strings/es.json b/src/strings/es.json index 727fb24775..53bb7a75f0 100644 --- a/src/strings/es.json +++ b/src/strings/es.json @@ -1489,5 +1489,8 @@ "EveryXMinutes": "Cada {0} minutos", "EveryHour": "Cada hora", "EveryXHours": "Cada {0} horas", - "OnApplicationStartup": "Al iniciarse el servidor" + "OnApplicationStartup": "Al iniciarse el servidor", + "ExperimentalBluRayPlayback": "La reproducción de Blu-Ray es experimental. Jellyfin no puede leer contenidos protegidos por DRM. Se intentará reproducir todos los títulos del Blu-Ray, incluso las partes protegidas, por lo que es posible que ciertas partes se vean en negro", + "ExperimentalDVDPlayback": "La reproducción de DVD es experimental. Jellyfin no puede leer contenidos protegidos por DRM. Se intentará reproducir todos los títulos del DVD, incluso las partes protegidas, por lo que es posible que ciertas partes se vean en negro", + "ExperimentalISOPlayback": "La reproducción de archivos ISO es experimental. Se intentará reproducir todos los títulos incluidos en el archivo ISO, por lo que es posible que ciertas partes se vean en negro" } From 33c220a4587cddd3bed21383f4ea3958c1d0e607 Mon Sep 17 00:00:00 2001 From: artiume Date: Thu, 16 Apr 2020 20:38:32 -0400 Subject: [PATCH 3/6] Update src/strings/en-us.json Co-Authored-By: dkanada --- src/strings/en-us.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/strings/en-us.json b/src/strings/en-us.json index 900b3dbb20..03f2d85b2f 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -1493,7 +1493,5 @@ "EveryHour": "Every hour", "EveryXHours": "Every {0} hours", "OnApplicationStartup": "On application startup", - "ExperimentalBlurayPlayback": "Blu-Ray playback is experimental. Jellyfin cannot decrypt content protected by DRM. All the titles in the Blu-Ray will be played anyway, including the protected ones. Some parts might be in black", - "ExperimentalDVDPlayback": "DVD playback is experimental. Jellyfin cannot decrypt content protected by DRM. All the titles in the DVD will be played anyway, including the protected ones. Some parts might be in black", - "ExperimentalISOPlayback": "ISO playback is experimental. All the titles in the ISO will be played anyway. Some parts might be in black" + "UnsupportedPlayback": "Jellyfin cannot decrypt content protected by DRM but all content will be attempted regardless, including protected titles. Some files may appear completely black due to encryption or other unsupported features, such as interactive titles." } From c6179ec3b4e4a40c84aa84aecdb900f94c5ec117 Mon Sep 17 00:00:00 2001 From: artiume Date: Thu, 16 Apr 2020 20:38:48 -0400 Subject: [PATCH 4/6] Update src/components/playback/experimentalwarnings.js Co-Authored-By: dkanada --- src/components/playback/experimentalwarnings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/playback/experimentalwarnings.js b/src/components/playback/experimentalwarnings.js index 09b8158242..aab926839e 100644 --- a/src/components/playback/experimentalwarnings.js +++ b/src/components/playback/experimentalwarnings.js @@ -44,7 +44,7 @@ define(['connectionManager', 'globalize', 'userSettings', 'apphost'], function ( } function showBlurayMessage() { - return showMessage(globalize.translate("ExperimentalBluRayPlayback"), 'blurayexpirementalinfo', 'nativeblurayplayback'); + return showMessage(globalize.translate("UnsupportedPlayback"), 'blurayexpirementalinfo', 'nativeblurayplayback'); } function showDvdMessage() { From a57894c8c36134db3c5ade303a0634691201fd81 Mon Sep 17 00:00:00 2001 From: artiume Date: Thu, 16 Apr 2020 20:39:00 -0400 Subject: [PATCH 5/6] Update src/components/playback/experimentalwarnings.js Co-Authored-By: dkanada --- src/components/playback/experimentalwarnings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/playback/experimentalwarnings.js b/src/components/playback/experimentalwarnings.js index aab926839e..443c4fa7b7 100644 --- a/src/components/playback/experimentalwarnings.js +++ b/src/components/playback/experimentalwarnings.js @@ -48,7 +48,7 @@ define(['connectionManager', 'globalize', 'userSettings', 'apphost'], function ( } function showDvdMessage() { - return showMessage(globalize.translate("ExperimentalDVDPlayback"), 'dvdexpirementalinfo', 'nativedvdplayback'); + return showMessage(globalize.translate("UnsupportedPlayback"), 'dvdexpirementalinfo', 'nativedvdplayback'); } function showIsoMessage() { From a80d6b9f27cab1d3e7b7adb77146327583d603f7 Mon Sep 17 00:00:00 2001 From: artiume Date: Thu, 16 Apr 2020 20:39:09 -0400 Subject: [PATCH 6/6] Update src/components/playback/experimentalwarnings.js Co-Authored-By: dkanada --- src/components/playback/experimentalwarnings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/playback/experimentalwarnings.js b/src/components/playback/experimentalwarnings.js index 443c4fa7b7..02a7b82caf 100644 --- a/src/components/playback/experimentalwarnings.js +++ b/src/components/playback/experimentalwarnings.js @@ -52,7 +52,7 @@ define(['connectionManager', 'globalize', 'userSettings', 'apphost'], function ( } function showIsoMessage() { - return showMessage(globalize.translate("ExperimentalISOPlayback"), 'isoexpirementalinfo', 'nativeisoplayback'); + return showMessage(globalize.translate("UnsupportedPlayback"), 'isoexpirementalinfo', 'nativeisoplayback'); } function ExpirementalPlaybackWarnings() {