From 262bf48e2b7e9ace5d5d71449454fec539f5d5b0 Mon Sep 17 00:00:00 2001
From: Orry Verducci <orry@orryverducci.co.uk>
Date: Mon, 10 Aug 2020 22:08:04 +0100
Subject: [PATCH 1/4] Add bwdif deinterlace option

---
 src/encodingsettings.html | 1 +
 src/strings/en-gb.json    | 1 +
 src/strings/en-us.json    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/encodingsettings.html b/src/encodingsettings.html
index 858375b14..2e92c95a6 100644
--- a/src/encodingsettings.html
+++ b/src/encodingsettings.html
@@ -154,6 +154,7 @@
                     <select is="emby-select" id="selectDeinterlaceMethod" label="${LabelDeinterlaceMethod}">
                         <option value="yadif">${Yadif}</option>
                         <option value="yadif_bob">${YadifBob}</option>
+                        <option value="bwdif">${Bwdif}</option>
                     </select>
                     <div class="fieldDescription">${DeinterlaceMethodHelp}</div>
                 </div>
diff --git a/src/strings/en-gb.json b/src/strings/en-gb.json
index 1947dc0c3..7cfaafdf6 100644
--- a/src/strings/en-gb.json
+++ b/src/strings/en-gb.json
@@ -1475,6 +1475,7 @@
     "PathNotFound": "The path could not be found. Please ensure the path is valid and try again.",
     "YadifBob": "YADIF Bob",
     "Yadif": "YADIF",
+    "Bwdif": "BWDIF",
     "Track": "Track",
     "Season": "Season",
     "ReleaseGroup": "Release Group",
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index a148ef061..f4c2ef249 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -1546,6 +1546,7 @@
     "XmlTvSportsCategoriesHelp": "Programs with these categories will be displayed as sports programs. Separate multiple with '|'.",
     "Yadif": "YADIF",
     "YadifBob": "YADIF Bob",
+    "Bwdif": "BWDIF",
     "Yes": "Yes",
     "Yesterday": "Yesterday",
     "PathNotFound": "The path could not be found. Please ensure the path is valid and try again.",

From d23c4173737d2743232856a9099a637cc0e40739 Mon Sep 17 00:00:00 2001
From: Orry Verducci <orry@orryverducci.co.uk>
Date: Mon, 10 Aug 2020 22:10:15 +0100
Subject: [PATCH 2/4] Add double rate deinterlacing option

This also removes YADIF Bob as the new double rate option replaces it.
---
 src/controllers/dashboard/encodingsettings.js | 2 ++
 src/encodingsettings.html                     | 9 ++++++++-
 src/strings/bg-bg.json                        | 1 -
 src/strings/cs.json                           | 1 -
 src/strings/da.json                           | 1 -
 src/strings/de.json                           | 1 -
 src/strings/en-gb.json                        | 3 ++-
 src/strings/en-us.json                        | 3 ++-
 src/strings/es-ar.json                        | 1 -
 src/strings/es-mx.json                        | 1 -
 src/strings/es.json                           | 1 -
 src/strings/es_419.json                       | 1 -
 src/strings/fa.json                           | 1 -
 src/strings/fi.json                           | 1 -
 src/strings/fr.json                           | 1 -
 src/strings/hu.json                           | 1 -
 src/strings/it.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/ru.json                           | 1 -
 src/strings/sk.json                           | 1 -
 src/strings/sv.json                           | 1 -
 src/strings/zh-cn.json                        | 1 -
 src/strings/zh-tw.json                        | 1 -
 26 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/src/controllers/dashboard/encodingsettings.js b/src/controllers/dashboard/encodingsettings.js
index 9995577ba..b18bff6e3 100644
--- a/src/controllers/dashboard/encodingsettings.js
+++ b/src/controllers/dashboard/encodingsettings.js
@@ -22,6 +22,7 @@ import libraryMenu from 'libraryMenu';
         page.querySelector('#selectEncoderPreset').value = config.EncoderPreset || '';
         page.querySelector('#txtH264Crf').value = config.H264Crf || '';
         page.querySelector('#selectDeinterlaceMethod').value = config.DeinterlaceMethod || '';
+        page.querySelector('#chkDoubleRateDeinterlacing').checked = config.DeinterlaceDoubleRate;
         page.querySelector('#chkEnableSubtitleExtraction').checked = config.EnableSubtitleExtraction || false;
         page.querySelector('#chkEnableThrottling').checked = config.EnableThrottling || false;
         page.querySelector('#selectVideoDecoder').dispatchEvent(new CustomEvent('change', {
@@ -67,6 +68,7 @@ import libraryMenu from 'libraryMenu';
                 config.EncoderPreset = form.querySelector('#selectEncoderPreset').value;
                 config.H264Crf = parseInt(form.querySelector('#txtH264Crf').value || '0');
                 config.DeinterlaceMethod = form.querySelector('#selectDeinterlaceMethod').value;
+                config.DeinterlaceDoubleRate = form.querySelector('#chkDoubleRateDeinterlacing').checked;
                 config.EnableSubtitleExtraction = form.querySelector('#chkEnableSubtitleExtraction').checked;
                 config.EnableThrottling = form.querySelector('#chkEnableThrottling').checked;
                 config.HardwareDecodingCodecs = Array.prototype.map.call(Array.prototype.filter.call(form.querySelectorAll('.chkDecodeCodec'), function (c) {
diff --git a/src/encodingsettings.html b/src/encodingsettings.html
index 2e92c95a6..7a8dfdf04 100644
--- a/src/encodingsettings.html
+++ b/src/encodingsettings.html
@@ -153,12 +153,19 @@
                 <div class="selectContainer">
                     <select is="emby-select" id="selectDeinterlaceMethod" label="${LabelDeinterlaceMethod}">
                         <option value="yadif">${Yadif}</option>
-                        <option value="yadif_bob">${YadifBob}</option>
                         <option value="bwdif">${Bwdif}</option>
                     </select>
                     <div class="fieldDescription">${DeinterlaceMethodHelp}</div>
                 </div>
 
+                <div class="checkboxContainer checkboxContainer-withDescription">
+                    <label>
+                        <input is="emby-checkbox" type="checkbox" id="chkDoubleRateDeinterlacing" />
+                        <span>${UseDoubleRateDeinterlacing}</span>
+                    </label>
+                    <div class="fieldDescription checkboxFieldDescription">${UseDoubleRateDeinterlacingHelp}</div>
+                </div>
+
                 <div class="checkboxContainer checkboxContainer-withDescription">
                     <label>
                         <input is="emby-checkbox" type="checkbox" id="chkEnableSubtitleExtraction" />
diff --git a/src/strings/bg-bg.json b/src/strings/bg-bg.json
index 9af8c5443..d86355d97 100644
--- a/src/strings/bg-bg.json
+++ b/src/strings/bg-bg.json
@@ -1213,7 +1213,6 @@
     "WriteAccessRequired": "Джелифин сървъра изисква достъп с права за запис до тази папка. Моля, осигурете достъп с права за запис и опитайте отново.",
     "PathNotFound": "Пътят не можа да бъде намерен. Моля, уверете се, че пътят е валиден и опитайте отново.",
     "Yesterday": "Вчера",
-    "YadifBob": "YADIF х2",
     "Yadif": "YADIF (Yet Another DeInterlacing Filter)",
     "XmlTvSportsCategoriesHelp": "Програмите от тези категории ще се показват като спортни програми.За разделяне на множество използвайте '|'.",
     "XmlTvPathHelp": "Път до XMLTV файла.Джелифин ще чете от този файл и периодично ще го проверява за актуализации.Ваша грижа е да го създадете и редовно да го обновявате.",
diff --git a/src/strings/cs.json b/src/strings/cs.json
index 8cb6bc39a..48f0a8010 100644
--- a/src/strings/cs.json
+++ b/src/strings/cs.json
@@ -1483,7 +1483,6 @@
     "PathNotFound": "Cesta nebyla nalezena. Zkontrolujte, zda je platná a zkuste to znovu.",
     "WeeklyAt": "V {0} v {1}",
     "LastSeen": "Naposledy zobrazené {0}",
-    "YadifBob": "YADIF Bob",
     "Yadif": "YADIF",
     "LabelLibraryPageSizeHelp": "Určuje počet položek k zobrazení na stránce knihovny. Nastavte na 0 pro vypnutí stránkování.",
     "LabelLibraryPageSize": "Velikost stránky knihovny:",
diff --git a/src/strings/da.json b/src/strings/da.json
index 9965294f4..928d5af51 100644
--- a/src/strings/da.json
+++ b/src/strings/da.json
@@ -1400,7 +1400,6 @@
     "ListPaging": "{0}-{1} af {2}",
     "WriteAccessRequired": "Jellyfin Server kræver skriveadgang til denne mappe. Sørg for skriveadgang, og prøv igen.",
     "PathNotFound": "Stien blev ikke fundet. Sørg for, at stien er gyldig, og prøv igen.",
-    "YadifBob": "YADIF Bob",
     "Yadif": "YADIF",
     "Track": "Spor",
     "TabNetworking": "Netværk",
diff --git a/src/strings/de.json b/src/strings/de.json
index 837feb42b..fc4335a8f 100644
--- a/src/strings/de.json
+++ b/src/strings/de.json
@@ -1482,7 +1482,6 @@
     "AlbumArtist": "Album Künstler",
     "Album": "Album",
     "BoxSet": "Box Set",
-    "YadifBob": "YADIF Bob",
     "Yadif": "YADIF",
     "LabelLibraryPageSizeHelp": "Setzt die Anzahl der auf einer Seite angezeigten Objekte. Setze auf 0, um alle Elemente auf einer Seite anzuzeigen.",
     "LabelLibraryPageSize": "Bibliothek Seiten Größe:",
diff --git a/src/strings/en-gb.json b/src/strings/en-gb.json
index 7cfaafdf6..dba5a06a8 100644
--- a/src/strings/en-gb.json
+++ b/src/strings/en-gb.json
@@ -1473,7 +1473,6 @@
     "ListPaging": "{0}-{1} of {2}",
     "WriteAccessRequired": "Jellyfin Server requires write access to this folder. Please ensure write access and try again.",
     "PathNotFound": "The path could not be found. Please ensure the path is valid and try again.",
-    "YadifBob": "YADIF Bob",
     "Yadif": "YADIF",
     "Bwdif": "BWDIF",
     "Track": "Track",
@@ -1489,6 +1488,8 @@
     "LabelDeinterlaceMethod": "Deinterlacing method:",
     "Episode": "Episode",
     "DeinterlaceMethodHelp": "Select the deinterlacing method to use when transcoding interlaced content.",
+    "UseDoubleRateDeinterlacing": "Double the frame rate when deinterlacing",
+    "UseDoubleRateDeinterlacingHelp": "This setting uses the field rate when deinterlacing, often referred to as bob deinterlacing, which doubles the frame rate of the video to provide full motion like what you would see when viewing interlaced video on a TV.",
     "ClientSettings": "Client Settings",
     "BoxSet": "Box Set",
     "Artist": "Artist",
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index f4c2ef249..19fc211f1 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -1493,6 +1493,8 @@
     "Transcoding": "Transcoding",
     "Tuesday": "Tuesday",
     "TvLibraryHelp": "Review the {0}TV naming guide{1}.",
+    "UseDoubleRateDeinterlacing": "Double the frame rate when deinterlacing",
+    "UseDoubleRateDeinterlacingHelp": "This setting uses the field rate when deinterlacing, often referred to as bob deinterlacing, which doubles the frame rate of the video to provide full motion like what you would see when viewing interlaced video on a TV.",
     "Uniform": "Uniform",
     "UninstallPluginConfirmation": "Are you sure you wish to uninstall {0}?",
     "UninstallPluginHeader": "Uninstall Plugin",
@@ -1545,7 +1547,6 @@
     "XmlTvPathHelp": "A path to a XMLTV file. Jellyfin will read this file and periodically check it for updates. You are responsible for creating and updating the file.",
     "XmlTvSportsCategoriesHelp": "Programs with these categories will be displayed as sports programs. Separate multiple with '|'.",
     "Yadif": "YADIF",
-    "YadifBob": "YADIF Bob",
     "Bwdif": "BWDIF",
     "Yes": "Yes",
     "Yesterday": "Yesterday",
diff --git a/src/strings/es-ar.json b/src/strings/es-ar.json
index e64f1e7c6..4c9209c90 100644
--- a/src/strings/es-ar.json
+++ b/src/strings/es-ar.json
@@ -1372,7 +1372,6 @@
     "WriteAccessRequired": "El servidor Jellyfin requiere acceso de escritura a esta carpeta. Asegúrese del acceso de escritura e intente nuevamente.",
     "PathNotFound": "La ruta no se pudo encontrar. Asegúrese de que la ruta sea válida e intente nuevamente.",
     "Yes": "Sí",
-    "YadifBob": "YADIF Bob",
     "Yadif": "YADIF",
     "XmlTvSportsCategoriesHelp": "Los programas con estas categorías se mostrarán como programas deportivos. Separe múltiples con '|'.",
     "XmlTvPathHelp": "Una ruta a un archivo XMLTV. Jellyfin leerá este archivo y lo revisará periódicamente en busca de actualizaciones. Usted es responsable de crear y actualizar el archivo.",
diff --git a/src/strings/es-mx.json b/src/strings/es-mx.json
index 5500a26ce..9a8791ac2 100644
--- a/src/strings/es-mx.json
+++ b/src/strings/es-mx.json
@@ -1482,7 +1482,6 @@
     "AllowFfmpegThrottling": "Regular transcodificaciones",
     "AlbumArtist": "Artista del álbum",
     "Album": "Álbum",
-    "YadifBob": "YADIF Bob",
     "Yadif": "YADIF",
     "LabelDeinterlaceMethod": "Método de desentrelazado:",
     "DeinterlaceMethodHelp": "Seleccione el método de desentrelazado que se usará al transcodificar contenido entrelazado.",
diff --git a/src/strings/es.json b/src/strings/es.json
index 23bc5c933..2e472c2ba 100644
--- a/src/strings/es.json
+++ b/src/strings/es.json
@@ -1490,7 +1490,6 @@
     "LabelLibraryPageSize": "Tamaño de la página de la biblioteca:",
     "LabelLibraryPageSizeHelp": "Establece la cantidad de artículos a mostrar en una página de la biblioteca. Ponlo en 0 para desactivar la paginación.",
     "UnsupportedPlayback": "No es posible desencriptar contenido protegido mediante DRM; sin embargo se intentará su reproducción. Algunos archivos pueden aparecer completamente negros debido a encriptación u otras características no soportadas, como títulos interactivos.",
-    "YadifBob": "YADIF Bob",
     "Yadif": "YADIF",
     "MessageUnauthorizedUser": "No tiene autorización para acceder al servidor en este momento. Póngase en contacto con el administrador del servidor para obtener más información.",
     "ButtonTogglePlaylist": "Lista de reproducción",
diff --git a/src/strings/es_419.json b/src/strings/es_419.json
index 2e02dd6b3..351524ffa 100644
--- a/src/strings/es_419.json
+++ b/src/strings/es_419.json
@@ -39,7 +39,6 @@
     "Actor": "Actor",
     "AccessRestrictedTryAgainLater": "El acceso está restringido actualmente. Por favor, inténtalo más tarde.",
     "Absolute": "Absoluto",
-    "YadifBob": "YADIF Bob",
     "Trailers": "Trailers",
     "TabTrailers": "Trailers",
     "ReleaseGroup": "Grupo que lo estrenó",
diff --git a/src/strings/fa.json b/src/strings/fa.json
index 3b3cb07e0..b5c262155 100644
--- a/src/strings/fa.json
+++ b/src/strings/fa.json
@@ -509,7 +509,6 @@
     "ListPaging": "{0}-{1} از {2}",
     "Yesterday": "دیروز",
     "Yes": "بلی",
-    "YadifBob": "Yadif Bob",
     "Yadif": "Yadif",
     "ValueConditions": "شرایط: {0}",
     "ValueCodec": "کدک: {0}",
diff --git a/src/strings/fi.json b/src/strings/fi.json
index 657f1a4c3..9544098d8 100644
--- a/src/strings/fi.json
+++ b/src/strings/fi.json
@@ -537,7 +537,6 @@
     "OptionBlockBooks": "Kirjat",
     "Filters": "Suodattimet",
     "FastForward": "Hyppää eteenpäin",
-    "YadifBob": "YADIF Bob",
     "MessageInvalidUser": "Väärä käyttäjätunnus tai salasana. Yritä uudelleen.",
     "MessageConfirmRestart": "Haluatko varmasti uudelleenkäynnistää Jellyfin-palvelimen?",
     "MessageConfirmProfileDeletion": "Haluatko varmasti poistaa tämän profiilin?",
diff --git a/src/strings/fr.json b/src/strings/fr.json
index 6d5675221..a8070480b 100644
--- a/src/strings/fr.json
+++ b/src/strings/fr.json
@@ -1482,7 +1482,6 @@
     "ListPaging": "{0}-{1} de {2}",
     "WriteAccessRequired": "Le serveur Jellyfin a besoin d'un accès en écriture à ce dossier. Merci de vérifier l’accès en écriture et réessayez.",
     "PathNotFound": "Le chemin d'accès n'a pas pu être trouvé. Merci de le vérifier et de réessayer.",
-    "YadifBob": "YADIF Bob",
     "Yadif": "YADIF",
     "LabelDeinterlaceMethod": "Méthode de désentrelacement :",
     "DeinterlaceMethodHelp": "Sélectionnes la méthode de désentrelacement à utiliser lors du transcodage de contenu entrelacé.",
diff --git a/src/strings/hu.json b/src/strings/hu.json
index ddf4cd9fe..4d221fd85 100644
--- a/src/strings/hu.json
+++ b/src/strings/hu.json
@@ -1486,7 +1486,6 @@
     "LabelDeinterlaceMethod": "Deinterlacing mód:",
     "DeinterlaceMethodHelp": "Válassza ki a váltottsorosság megszűntetéséhez használandó módszert a váltottsoros tartalmak transzkódolásakor.",
     "UnsupportedPlayback": "Jellyfin nem tud DRM-titkosított tartalmak dekriptálására, ettől függetlenül a lejátszással mindig megpróbálkozik. Néhány fájl emiatt teljesen fekete képernyőt ad, amely vagy a titkosítás miatt van, vagy nem olyan nem támogatott tartalmak miatt, mint az interaktív címek.",
-    "YadifBob": "YADIF Bob",
     "Yadif": "YADIF",
     "ReleaseGroup": "Kiadócsoport",
     "MessageUnauthorizedUser": "Jelenleg nincs jogosultságod a szerverhez való hozzáféréshez. Kérjük, lépj kapcsolatba az adminisztrátorral további információkért!",
diff --git a/src/strings/it.json b/src/strings/it.json
index be5af2f81..07ef9bf14 100644
--- a/src/strings/it.json
+++ b/src/strings/it.json
@@ -1476,7 +1476,6 @@
     "ListPaging": "{0}-{1} di {2}",
     "WriteAccessRequired": "Jellyfin Server richiede il permesso di scrittura su questa cartella. Verificare l'autorizzazione e riprovare.",
     "PathNotFound": "Percorso non trovato. Assicurarsi che sia valido e riprovare.",
-    "YadifBob": "YADIF Bob",
     "Yadif": "YADIF",
     "Track": "Traccia",
     "Season": "Stagione",
diff --git a/src/strings/nb.json b/src/strings/nb.json
index bba97f9da..f8c589e3e 100644
--- a/src/strings/nb.json
+++ b/src/strings/nb.json
@@ -1484,7 +1484,6 @@
     "ListPaging": "{0}-{1} av {2}",
     "WriteAccessRequired": "Jellyfin Server krever skrivetilgang til denne mappen. Vennligst påse at skrivetilgang er gitt og prøv igjen.",
     "PathNotFound": "Banen ble ikke funnet. Påse at banen er gyldig og prøv igjen.",
-    "YadifBob": "YADIF Bob",
     "Yadif": "YADIF",
     "Track": "Spor",
     "TabDVR": "Opptak",
diff --git a/src/strings/nl.json b/src/strings/nl.json
index e97578db4..b4f22d61e 100644
--- a/src/strings/nl.json
+++ b/src/strings/nl.json
@@ -1486,7 +1486,6 @@
     "ListPaging": "{0}-{1} van de {2}",
     "WriteAccessRequired": "De Jellyfin Server vereist schrijftoegang tot deze map. Zorg evoor dat Jellyfin schrijftoegang tot de map heeft en probeer opnieuw.",
     "PathNotFound": "Het pad kan niet gevonden worden. Zorg ervoor dat het pad correct is en probeer opnieuw.",
-    "YadifBob": "YADIF Bob",
     "Yadif": "YADIF",
     "Track": "Nummer",
     "SelectAdminUsername": "Selecteer een gebruikersnaam voor het beheerder account.",
diff --git a/src/strings/pl.json b/src/strings/pl.json
index a141b975c..a29745c6f 100644
--- a/src/strings/pl.json
+++ b/src/strings/pl.json
@@ -1492,7 +1492,6 @@
     "ListPaging": "{0}-{1} z {2}",
     "WriteAccessRequired": "Serwer Jellyfin wymaga praw zapisu do tego katalogu. Upewnij się, że prawa zapisu zostały przyznane i spróbuj ponownie.",
     "PathNotFound": "Ścieżka nie została znaleziona. Upewnij się, że ścieżka jest poprawna i spróbuj ponownie.",
-    "YadifBob": "YADIF Bob",
     "Yadif": "YADIF",
     "Writers": "Scenariusz",
     "ViewAlbumArtist": "Zobacz wykonawcę albumu",
diff --git a/src/strings/pt-br.json b/src/strings/pt-br.json
index 413abeea7..d7497b151 100644
--- a/src/strings/pt-br.json
+++ b/src/strings/pt-br.json
@@ -1471,7 +1471,6 @@
     "ListPaging": "{0}-{1} de {2}",
     "WriteAccessRequired": "O servidor Jellyfin necessita de acesso de escrita para essa pasta. Garanta o acesso e tente novamente.",
     "PathNotFound": "O caminho não pôde ser encontrado. Por favor certifique-se da validade e tente novamente.",
-    "YadifBob": "YADIF Bob",
     "Yadif": "YADIF",
     "Track": "Trilha",
     "Season": "Temporada",
diff --git a/src/strings/ru.json b/src/strings/ru.json
index 0a471bca0..02ee6950f 100644
--- a/src/strings/ru.json
+++ b/src/strings/ru.json
@@ -1461,7 +1461,6 @@
     "PlaybackErrorNoCompatibleStream": "Этот клиент несовместим с медиаданными, а сервер не отправляет медиаданные в совместимом формате.",
     "AllowFfmpegThrottlingHelp": "Когда перекодирование или переупаковка достаточно далеко опережают текущую позицию воспроизведения, процесс приостанавливается, так что он использует меньше ресурсов. Это наиболее полезно, когда вы редко меняете позиции в видео. Выключите это, если у вас возникли проблемы с воспроизведением.",
     "OnWakeFromSleep": "При пробуждении ото сна",
-    "YadifBob": "YADIF с удвоением",
     "OnApplicationStartup": "При запуске приложения",
     "EveryXHours": "Каждые {0} часов",
     "EveryHour": "Каждый час",
diff --git a/src/strings/sk.json b/src/strings/sk.json
index dc754fdff..46644747a 100644
--- a/src/strings/sk.json
+++ b/src/strings/sk.json
@@ -1473,7 +1473,6 @@
     "ListPaging": "{0}-{1} z {2}",
     "WriteAccessRequired": "Jellyfin Server vyžaduje práva na zapisovanie do tohoto priečinku. Prosím, uistite sa že má práva na zapisovanie a skúste to znova.",
     "PathNotFound": "Táto cesta nebola nájdená. Prosím, uistite sa že cesta je správna a skúste to znovu.",
-    "YadifBob": "YADIF Bob",
     "Yadif": "YADIF",
     "Track": "Stopa",
     "Season": "Séria",
diff --git a/src/strings/sv.json b/src/strings/sv.json
index dfc0fa682..32b993a41 100644
--- a/src/strings/sv.json
+++ b/src/strings/sv.json
@@ -1485,7 +1485,6 @@
     "LabelDeinterlaceMethod": "Deinterlacing-metod:",
     "WeeklyAt": "{0}s vid {1}",
     "LastSeen": "Senast sedd {0}",
-    "YadifBob": "YADIF Bob",
     "Yadif": "YADIF",
     "Filter": "Filter",
     "New": "Ny",
diff --git a/src/strings/zh-cn.json b/src/strings/zh-cn.json
index c496ab54d..c040922f7 100644
--- a/src/strings/zh-cn.json
+++ b/src/strings/zh-cn.json
@@ -1482,7 +1482,6 @@
     "EveryXMinutes": "每 {0} 分钟",
     "WriteAccessRequired": "Jellyfin 服务端需要此文件夹的写入权限。请确认是否拥有写入权限并重试。",
     "PathNotFound": "无法找到此路径。请确认路径有效并重试。",
-    "YadifBob": "YADIF Bob",
     "Yadif": "YADIF",
     "LabelDeinterlaceMethod": "反交错方法：",
     "DeinterlaceMethodHelp": "选择对隔行扫描内容进行转码时所用的反交错方法。",
diff --git a/src/strings/zh-tw.json b/src/strings/zh-tw.json
index 22a40d324..2790f90ff 100644
--- a/src/strings/zh-tw.json
+++ b/src/strings/zh-tw.json
@@ -1464,7 +1464,6 @@
     "Artist": "演出者",
     "AlbumArtist": "專輯歌手",
     "Album": "專輯",
-    "YadifBob": "YADIF Bob",
     "WriteAccessRequired": "Jellyfin 伺服器需要此資料夾的寫入權限，請確認是否擁有寫入權限並重試。",
     "PathNotFound": "無法找到此路徑，請確認路徑可用並重試。",
     "Track": "音軌",

From 39a147c2ff29e2d2aeb6436fc9b1cb061d204223 Mon Sep 17 00:00:00 2001
From: Orry Verducci <orry@orryverducci.co.uk>
Date: Mon, 10 Aug 2020 22:11:04 +0100
Subject: [PATCH 3/4] Update deinterlacing method help text

Updates the help text to explain that the setting won't apply if hardware deinterlacing is used.
---
 src/strings/en-gb.json | 2 +-
 src/strings/en-us.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/strings/en-gb.json b/src/strings/en-gb.json
index dba5a06a8..b671e89bb 100644
--- a/src/strings/en-gb.json
+++ b/src/strings/en-gb.json
@@ -1487,7 +1487,7 @@
     "LabelLibraryPageSize": "Library page size:",
     "LabelDeinterlaceMethod": "Deinterlacing method:",
     "Episode": "Episode",
-    "DeinterlaceMethodHelp": "Select the deinterlacing method to use when transcoding interlaced content.",
+    "DeinterlaceMethodHelp": "Select the deinterlacing method to use when software transcoding interlaced content. When hardware acceleration supporting hardware deinterlacing is enabled the hardware deinterlacer will be used instead of this setting.",
     "UseDoubleRateDeinterlacing": "Double the frame rate when deinterlacing",
     "UseDoubleRateDeinterlacingHelp": "This setting uses the field rate when deinterlacing, often referred to as bob deinterlacing, which doubles the frame rate of the video to provide full motion like what you would see when viewing interlaced video on a TV.",
     "ClientSettings": "Client Settings",
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 19fc211f1..1daf38843 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -181,7 +181,7 @@
     "DefaultErrorMessage": "There was an error processing the request. Please try again later.",
     "DefaultMetadataLangaugeDescription": "These are your defaults and can be customized on a per-library basis.",
     "DefaultSubtitlesHelp": "Subtitles are loaded based on the default and forced flags in the embedded metadata. Language preferences are considered when multiple options are available.",
-    "DeinterlaceMethodHelp": "Select the deinterlacing method to use when transcoding interlaced content.",
+    "DeinterlaceMethodHelp": "Select the deinterlacing method to use when software transcoding interlaced content. When hardware acceleration supporting hardware deinterlacing is enabled the hardware deinterlacer will be used instead of this setting.",
     "Delete": "Delete",
     "DeleteDeviceConfirmation": "Are you sure you wish to delete this device? It will reappear the next time a user signs in with it.",
     "DeleteImage": "Delete Image",

From e019c75061bcf150badbdec1df38eacbfc2da62e Mon Sep 17 00:00:00 2001
From: Orry Verducci <orry@orryverducci.co.uk>
Date: Tue, 11 Aug 2020 15:59:26 +0100
Subject: [PATCH 4/4] Add myself to contributors

---
 CONTRIBUTORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 46c40b6c9..778d899ef 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -38,6 +38,7 @@
  - [GuilhermeHideki](https://github.com/GuilhermeHideki)
  - [Andrei Oanca](https://github.com/OancaAndrei)
  - [Cromefire_](https://github.com/cromefire)
+ - [Orry Verducci](https://github.com/orryverducci)
 
 # Emby Contributors