From 02abe528d12fae5cf5dd5e852516a017fbca7433 Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Wed, 19 Apr 2023 16:04:20 +0200 Subject: [PATCH] Added VF2 as CF Added the VF2 CF to avoid problem with people not understanding and badly scoring VFI or VFQ. --- .../Radarr-collection-of-custom-formats.md | 32 ++++++++++++++----- .../sonarr-collection-of-custom-formats.md | 32 ++++++++++++++----- docs/json/radarr/cf/french-vf2.json | 26 +++++++++++++++ docs/json/radarr/cf/french-vfb.json | 2 +- docs/json/radarr/cf/french-vff.json | 9 ++++++ docs/json/radarr/cf/french-vfi.json | 4 +-- docs/json/radarr/cf/french-vfq.json | 14 ++++---- docs/json/radarr/cf/french-vof.json | 2 +- docs/json/radarr/cf/french-vostfr.json | 4 +-- docs/json/radarr/cf/french-vq.json | 2 +- docs/json/sonarr/cf/french-vf2.json | 26 +++++++++++++++ docs/json/sonarr/cf/french-vfb.json | 2 +- docs/json/sonarr/cf/french-vff.json | 9 ++++++ docs/json/sonarr/cf/french-vfi.json | 4 +-- docs/json/sonarr/cf/french-vfq.json | 14 ++++---- docs/json/sonarr/cf/french-vof.json | 2 +- docs/json/sonarr/cf/french-vostfr.json | 4 +-- docs/json/sonarr/cf/french-vq.json | 2 +- .../radarr-french-audio-version-en.md | 28 ++++++++-------- .../radarr-french-audio-version-fr.md | 28 ++++++++-------- .../sonarr-french-audio-version-en.md | 28 ++++++++-------- .../sonarr-french-audio-version-fr.md | 28 ++++++++-------- 22 files changed, 202 insertions(+), 100 deletions(-) create mode 100644 docs/json/radarr/cf/french-vf2.json create mode 100644 docs/json/sonarr/cf/french-vf2.json diff --git a/docs/Radarr/Radarr-collection-of-custom-formats.md b/docs/Radarr/Radarr-collection-of-custom-formats.md index 7c9bcc37c..a610c2798 100644 --- a/docs/Radarr/Radarr-collection-of-custom-formats.md +++ b/docs/Radarr/Radarr-collection-of-custom-formats.md @@ -73,13 +73,13 @@ I also made 3 guides related to this one. | [x264](#x264) | [HDR10+ Boost](#hdr10plus-boost) | [VFF](#vff) | [FR UHD Bluray Tier 02](#fr-uhd-bluray-tier-02) | | [x265](#x265) | [No-RlsGroup](#no-rlsgroup) | [VOF](#vof) | [FR HD Bluray Tier 01](#fr-hd-bluray-tier-01) | | [MPEG2](#mpeg2) | [Obfuscated](#obfuscated) | [VFI](#vfi) | [FR HD Bluray Tier 02](#fr-hd-bluray-tier-02) | -| [Dutch Groups](#dutch-groups) | [Retags](#retags) | [VFQ](#vfq) | [FR WEB Tier 01](#fr-web-tier-01) | -| [FreeLeech](#freeleech) | [Scene](#scene) | [VQ](#vq) | [FR WEB Tier 02](#fr-web-tier-02) | -| | [x265 (no HDR/DV)](#x265-no-hdrdv) | [VFB](#vfb) | [FR Scene Groups](#fr-scene-groups) | -| | [AV1](#av1) | [VOSTFR](#vostfr) | [FR LQ](#fr-lq) | -| | [SDR](#sdr) | [FanSUB](#fansub) | | -| | [DV (FEL)](#dv-fel) | [FastSUB](#fastsub) | | -| | [Line/Mic Dubbed](#linemic-dubbed) | | | +| [Dutch Groups](#dutch-groups) | [Retags](#retags) | [VF2](#vf2) | [FR WEB Tier 01](#fr-web-tier-01) | +| [FreeLeech](#freeleech) | [Scene](#scene) | [VFQ](#vfq) | [FR WEB Tier 02](#fr-web-tier-02) | +| | [x265 (no HDR/DV)](#x265-no-hdrdv) | [VQ](#vq) | [FR Scene Groups](#fr-scene-groups) | +| | [AV1](#av1) | [VFB](#vfb) | [FR LQ](#fr-lq) | +| | [SDR](#sdr) | [VOSTFR](#vostfr) | | +| | [DV (FEL)](#dv-fel) | [FanSUB](#fansub) | | +| | [Line/Mic Dubbed](#linemic-dubbed) | [FastSUB](#fastsub) | | | | [HFR](#hfr) | | | ------ @@ -2275,7 +2275,7 @@ I also made 3 guides related to this one. ??? question "VFI - [CLICK TO EXPAND]" - International French Version. VF[1-9] or FR[1-9] indicates the number of dubs present (normally VF2 being VFF and VFQ) and is considered as an International French release. + International French Version. ??? example "JSON - [CLICK TO EXPAND]" @@ -2287,6 +2287,22 @@ I also made 3 guides related to this one. ------ +### VF2 + +??? question "VF2 - [CLICK TO EXPAND]" + + VF[1-9] or FR[1-9] indicates the number of dubs present (normally VF2 being VFF and VFQ). + +??? example "JSON - [CLICK TO EXPAND]" + + ```json + [[% filter indent(width=4) %]][[% include 'json/radarr/cf/french-vf2.json' %]][[% endfilter %]] + ``` + +[TOP](#index) + +------ + ### VFQ ??? question "VFQ - [CLICK TO EXPAND]" diff --git a/docs/Sonarr/sonarr-collection-of-custom-formats.md b/docs/Sonarr/sonarr-collection-of-custom-formats.md index c1273dd4a..3bd4f64a0 100644 --- a/docs/Sonarr/sonarr-collection-of-custom-formats.md +++ b/docs/Sonarr/sonarr-collection-of-custom-formats.md @@ -79,13 +79,13 @@ I also made 3 guides related to this one. | [Multi](#multi) | [No-RlsGroup](#no-rlsgroup) | [VFF](#vff) | [FR WEB Tier 02](#fr-web-tier-02) | | [MPEG2](#mpeg2) | [Obfuscated](#obfuscated) | [VOF](#vof) | [FR WEB Tier 03](#fr-web-tier-03) | | [x264](#x264) | [Retags](#retags) | [VFI](#vfi) | [FR Anime Tier 01](#fr-anime-tier-01) | -| [x265](#x265) | [Scene](#scene) | [VFQ](#vfq) | [FR Anime Tier 02](#fr-anime-tier-02) | -| | [Season Packs](#season-pack) | [VQ](#vq) | [FR Anime FanSub](#fr-anime-fansub) | -| | [x265 (no HDR/DV)](#x265-no-hdrdv) | [VFB](#vfb) | [FR Scene Groups](#fr-scene-groups) | -| | [AV1](#av1) | [VOSTFR](#vostfr) | [FR LQ](#fr-lq) | -| | [SDR](#sdr) | [FanSUB](#fansub) | | -| | [DV (FEL)](#dv-fel) | [FastSUB](#fastsub) | | -| | [HFR](#hfr) | | | +| [x265](#x265) | [Scene](#scene) | [VF2](#vf2) | [FR Anime Tier 02](#fr-anime-tier-02) | +| | [Season Packs](#season-pack) | [VFQ](#vfq) | [FR Anime FanSub](#fr-anime-fansub) | +| | [x265 (no HDR/DV)](#x265-no-hdrdv) | [VQ](#vq) | [FR Scene Groups](#fr-scene-groups) | +| | [AV1](#av1) | [VFB](#vfb) | [FR LQ](#fr-lq) | +| | [SDR](#sdr) | [VOSTFR](#vostfr) | | +| | [DV (FEL)](#dv-fel) | [FanSUB](#fansub) | | +| | [HFR](#hfr) | [FastSUB](#fastsub) | | ------ @@ -2279,7 +2279,7 @@ I also made 3 guides related to this one. ??? question "VFI - [CLICK TO EXPAND]" - International French Version. VF[1-9] or FR[1-9] indicates the number of dubs present (normally VF2 being VFF and VFQ) and is considered as an International French release. + International French Version. ??? example "JSON - [CLICK TO EXPAND]" @@ -2291,6 +2291,22 @@ I also made 3 guides related to this one. ------ +### VF2 + +??? question "VF2 - [CLICK TO EXPAND]" + + VF[1-9] or FR[1-9] indicates the number of dubs present (normally VF2 being VFF and VFQ). + +??? example "JSON - [CLICK TO EXPAND]" + + ```json + [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/french-vf2.json' %]][[% endfilter %]] + ``` + +[TOP](#index) + +------ + ### VFQ ??? question "VFQ - [CLICK TO EXPAND]" diff --git a/docs/json/radarr/cf/french-vf2.json b/docs/json/radarr/cf/french-vf2.json new file mode 100644 index 000000000..7abf7103f --- /dev/null +++ b/docs/json/radarr/cf/french-vf2.json @@ -0,0 +1,26 @@ +{ + "trash_id": "29b5f7b1a5f20f64228786c3ab1bdc7d", + "trash_regex": "https://regex101.com/r/qgQMab/1", + "name": "VF2", + "includeCustomFormatWhenRenaming": true, + "specifications": [ + { + "name": "VF2", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(VF2)\\b" + } + }, + { + "name": "Both VFF and VFQ", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(VF(F|Q)[ .]VF(F|Q))\\b" + } + } + ] +} diff --git a/docs/json/radarr/cf/french-vfb.json b/docs/json/radarr/cf/french-vfb.json index 9b491dea8..1b84a2e88 100644 --- a/docs/json/radarr/cf/french-vfb.json +++ b/docs/json/radarr/cf/french-vfb.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "\\bVFB\\b" + "value": "\\b(VFB)\\b" } } ] diff --git a/docs/json/radarr/cf/french-vff.json b/docs/json/radarr/cf/french-vff.json index 112d6d5c8..ad0f0e637 100644 --- a/docs/json/radarr/cf/french-vff.json +++ b/docs/json/radarr/cf/french-vff.json @@ -12,6 +12,15 @@ "fields": { "value": "\\b(TRUEFRENCH|VFF)\\b" } + }, + { + "name": "Not VF2", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(VF2)\\b" + } } ] } diff --git a/docs/json/radarr/cf/french-vfi.json b/docs/json/radarr/cf/french-vfi.json index e21df7307..ea7223ca2 100644 --- a/docs/json/radarr/cf/french-vfi.json +++ b/docs/json/radarr/cf/french-vfi.json @@ -1,6 +1,6 @@ { "trash_id": "52772f1cad6b5d26c2551f79bc538a50", - "trash_regex": "https://regex101.com/r/YA7mOH/1", + "trash_regex": "https://regex101.com/r/YA7mOH/2", "name": "VFI", "includeCustomFormatWhenRenaming": true, "specifications": [ @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "\\bVF(I|\\d)\\b" + "value": "\\b(VFI)\\b" } } ] diff --git a/docs/json/radarr/cf/french-vfq.json b/docs/json/radarr/cf/french-vfq.json index 41a36739d..92e80726d 100644 --- a/docs/json/radarr/cf/french-vfq.json +++ b/docs/json/radarr/cf/french-vfq.json @@ -5,21 +5,21 @@ "includeCustomFormatWhenRenaming": true, "specifications": [ { - "name": "FRENCH", + "name": "Canadian French", "implementation": "ReleaseTitleSpecification", "negate": false, - "required": false, + "required": true, "fields": { - "value": "\\b(?<=MULTi[ .])FR(A|ENCH)\\b" + "value": "\\b(VFQ?|(?<=MULTi[ .])FR(A|ENCH))\\b" } }, { - "name": "Canadian French", + "name": "Not VF2", "implementation": "ReleaseTitleSpecification", - "negate": false, - "required": false, + "negate": true, + "required": true, "fields": { - "value": "\\b(VFQ?)\\b" + "value": "\\b(VF2)\\b" } } ] diff --git a/docs/json/radarr/cf/french-vof.json b/docs/json/radarr/cf/french-vof.json index a8e540066..0382715cf 100644 --- a/docs/json/radarr/cf/french-vof.json +++ b/docs/json/radarr/cf/french-vof.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "\\bVOF\\b" + "value": "\\b(VOF)\\b" } } ] diff --git a/docs/json/radarr/cf/french-vostfr.json b/docs/json/radarr/cf/french-vostfr.json index c6f1a1e19..f0112a8b9 100644 --- a/docs/json/radarr/cf/french-vostfr.json +++ b/docs/json/radarr/cf/french-vostfr.json @@ -10,7 +10,7 @@ "negate": false, "required": false, "fields": { - "value": "\\bVOST.*?FR(E|A)?\\b" + "value": "\\b(VOST.*?FR(E|A)?)\\b" } }, { @@ -19,7 +19,7 @@ "negate": false, "required": false, "fields": { - "value": "\\bSUBFR(A|ENCH)?\\b" + "value": "\\b(SUBFR(A|ENCH)?)\\b" } } ] diff --git a/docs/json/radarr/cf/french-vq.json b/docs/json/radarr/cf/french-vq.json index 69965104b..69578c1f5 100644 --- a/docs/json/radarr/cf/french-vq.json +++ b/docs/json/radarr/cf/french-vq.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "\\bVQ\\b" + "value": "\\b(VQ)\\b" } } ] diff --git a/docs/json/sonarr/cf/french-vf2.json b/docs/json/sonarr/cf/french-vf2.json new file mode 100644 index 000000000..53efbca17 --- /dev/null +++ b/docs/json/sonarr/cf/french-vf2.json @@ -0,0 +1,26 @@ +{ + "trash_id": "34789ec3caa819f087e23bbf9999daf7", + "trash_regex": "https://regex101.com/r/qgQMab/1", + "name": "VF2", + "includeCustomFormatWhenRenaming": true, + "specifications": [ + { + "name": "VF2", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(VF2)\\b" + } + }, + { + "name": "Both VFF and VFQ", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(VF(F|Q)[ .]VF(F|Q))\\b" + } + } + ] +} diff --git a/docs/json/sonarr/cf/french-vfb.json b/docs/json/sonarr/cf/french-vfb.json index f76494f8a..6d0008292 100644 --- a/docs/json/sonarr/cf/french-vfb.json +++ b/docs/json/sonarr/cf/french-vfb.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "\\bVFB\\b" + "value": "\\b(VFB)\\b" } } ] diff --git a/docs/json/sonarr/cf/french-vff.json b/docs/json/sonarr/cf/french-vff.json index f90f50d8f..086ca1fdc 100644 --- a/docs/json/sonarr/cf/french-vff.json +++ b/docs/json/sonarr/cf/french-vff.json @@ -12,6 +12,15 @@ "fields": { "value": "\\b(TRUEFRENCH|VFF)\\b" } + }, + { + "name": "Not VF2", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(VF2)\\b" + } } ] } diff --git a/docs/json/sonarr/cf/french-vfi.json b/docs/json/sonarr/cf/french-vfi.json index 050b7e992..4ac73ff76 100644 --- a/docs/json/sonarr/cf/french-vfi.json +++ b/docs/json/sonarr/cf/french-vfi.json @@ -1,6 +1,6 @@ { "trash_id": "b6816a0e1d4b64bf3550ad3b74b009b6", - "trash_regex": "https://regex101.com/r/YA7mOH/1", + "trash_regex": "https://regex101.com/r/YA7mOH/2", "name": "VFI", "includeCustomFormatWhenRenaming": true, "specifications": [ @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "\\bVF(I|\\d)\\b" + "value": "\\b(VFI)\\b" } } ] diff --git a/docs/json/sonarr/cf/french-vfq.json b/docs/json/sonarr/cf/french-vfq.json index e63a5c64b..1e996424a 100644 --- a/docs/json/sonarr/cf/french-vfq.json +++ b/docs/json/sonarr/cf/french-vfq.json @@ -5,21 +5,21 @@ "includeCustomFormatWhenRenaming": true, "specifications": [ { - "name": "FRENCH", + "name": "Canadian French", "implementation": "ReleaseTitleSpecification", "negate": false, - "required": false, + "required": true, "fields": { - "value": "\\b(?<=MULTi[ .])FR(A|ENCH)\\b" + "value": "\\b(VFQ?|(?<=MULTi[ .])FR(A|ENCH))\\b" } }, { - "name": "Canadian French", + "name": "Not VF2", "implementation": "ReleaseTitleSpecification", - "negate": false, - "required": false, + "negate": true, + "required": true, "fields": { - "value": "\\b(VFQ?)\\b" + "value": "\\b(VF2)\\b" } } ] diff --git a/docs/json/sonarr/cf/french-vof.json b/docs/json/sonarr/cf/french-vof.json index fdcf6207a..1e03b4098 100644 --- a/docs/json/sonarr/cf/french-vof.json +++ b/docs/json/sonarr/cf/french-vof.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "\\bVOF\\b" + "value": "\\b(VOF)\\b" } } ] diff --git a/docs/json/sonarr/cf/french-vostfr.json b/docs/json/sonarr/cf/french-vostfr.json index 2daa2be0e..6ec83ee3f 100644 --- a/docs/json/sonarr/cf/french-vostfr.json +++ b/docs/json/sonarr/cf/french-vostfr.json @@ -10,7 +10,7 @@ "negate": false, "required": false, "fields": { - "value": "\\bVOST.*?FR(E|A)?\\b" + "value": "\\b(VOST.*?FR(E|A)?)\\b" } }, { @@ -19,7 +19,7 @@ "negate": false, "required": false, "fields": { - "value": "\\bSUBFR(A|ENCH)?\\b" + "value": "\\b(SUBFR(A|ENCH)?)\\b" } } ] diff --git a/docs/json/sonarr/cf/french-vq.json b/docs/json/sonarr/cf/french-vq.json index 38bb6bb72..79ed322f9 100644 --- a/docs/json/sonarr/cf/french-vq.json +++ b/docs/json/sonarr/cf/french-vq.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "\\bVQ\\b" + "value": "\\b(VQ)\\b" } } ] diff --git a/includes/french-guide/radarr-french-audio-version-en.md b/includes/french-guide/radarr-french-audio-version-en.md index 8f7c4bd61..6c496ecff 100644 --- a/includes/french-guide/radarr-french-audio-version-en.md +++ b/includes/french-guide/radarr-french-audio-version-en.md @@ -1,22 +1,21 @@ ??? abstract "Explanation - [CLICK TO EXPAND]" - | Acronyms | French Explanation | English Explanation | - | -------------------------------- | ----------------------------------------------------------------------------------- | --------------------------------------------------------------------- | - | TRUEFRENCH or VFF | Version Francophone Française (doublage réalisé en France) | Full French version (dubbing done in France) | - | FRENCH or VF[1] | Version Francophone (normalement equivalent à la VFQ) | French version (normally equivalent to VFQ) | - | VOF | Version Originale Française | Original French Version | - | VFI | Version Francophone Internationale | International French Version | - | VFQ | Version Francophone Québécoise | Canadian French Version | - | VQ | Version Québécoise (accent Québécois important, ex: Les Simpsons le film) | Quebec Version (strong Quebec accent, ex: The Simpsons movie) | - | VFB | Version Francophone Belge | Belgian French Version | - | VF[1-9] or FR[1-9][2] | Indique le nombre de doublage présent (normalement VF2 soit VFF et VFQ) | Indicates the number of dubs present (normally VF2 being VFF and VFQ) | - | VOSTFR[3] | Indique que l'audio est dans la langue originale, avec des sous-titres en français. | Indicates soundtrack in the original language, with French subtitles | + | Acronyms | French Explanation | English Explanation | + | -------------------------- | ----------------------------------------------------------------------------------- | --------------------------------------------------------------------- | + | TRUEFRENCH or VFF | Version Francophone Française (doublage réalisé en France) | Full French version (dubbing done in France) | + | FRENCH or VF[1] | Version Francophone (normalement equivalent à la VFQ) | French version (normally equivalent to VFQ) | + | VOF | Version Originale Française | Original French Version | + | VFI | Version Francophone Internationale | International French Version | + | VFQ | Version Francophone Québécoise | Canadian French Version | + | VQ | Version Québécoise (accent Québécois important, ex: Les Simpsons le film) | Quebec Version (strong Quebec accent, ex: The Simpsons movie) | + | VFB | Version Francophone Belge | Belgian French Version | + | VF[1-9] or FR[1-9] | Indique le nombre de doublage présent (normalement VF2 soit VFF et VFQ) | Indicates the number of dubs present (normally VF2 being VFF and VFQ) | + | VOSTFR[2] | Indique que l'audio est dans la langue originale, avec des sous-titres en français. | Indicates soundtrack in the original language, with French subtitles | - *[1] VF is included under the VFQ Custom Format, but it should be noted that it was often mismatched with VFF instead of VFQ pre-2022.* - - *[2] VF[1-9] is included under the VFI Custom Format.* - - *[3] It should be noted that SUBFRENCH is included in this Custom Format. However, SUB often means that the subtitle was embedded inside the picture (hardcoded). French releases tend to mix the two, leading to some VOSTFR being labelled as SUBFRENCH and SUBFRENCH as VOSTFR.* + - *[2] It should be noted that SUBFRENCH is included in this Custom Format. However, SUB often means that the subtitle was embedded inside the picture (hardcoded). French releases tend to mix the two, leading to some VOSTFR being labelled as SUBFRENCH and SUBFRENCH as VOSTFR.* !!! tip "Indexers renaming in Prowlarr" - Some Indexers in Prowlarr can rename `MULTi` releases to `MULTi.TRUEFRENCH` or `MULTi.FRENCH`. I do not recommend using such a feature along with those Custom Formats as it can lead to false positives from the VFF, VFQ and VQ Custom Formats. + Some Indexers in Prowlarr can rename `MULTi` releases to `MULTi.TRUEFRENCH` or `MULTi.FRENCH`. It is not recommend to use such a feature along with those Custom Formats as it can lead to false positives from the VFF, VFQ and VQ Custom Formats. ??? abstract "French Audio Versions - [CLICK TO EXPAND]" | Custom Format | Score | Trash ID | @@ -24,6 +23,7 @@ | [{{ radarr['cf']['french-vff']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vff) | 0 | {{ radarr['cf']['french-vff']['trash_id'] }} | | [{{ radarr['cf']['french-vof']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vof) | 0 | {{ radarr['cf']['french-vof']['trash_id'] }} | | [{{ radarr['cf']['french-vfi']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vfi) | 0 | {{ radarr['cf']['french-vfi']['trash_id'] }} | + | [{{ radarr['cf']['french-vf2']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vf2) | 0 | {{ radarr['cf']['french-vf2']['trash_id'] }} | | [{{ radarr['cf']['french-vfq']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vfq) | 0 | {{ radarr['cf']['french-vfq']['trash_id'] }} | | [{{ radarr['cf']['french-vq']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vq) | 0 | {{ radarr['cf']['french-vq']['trash_id'] }} | | [{{ radarr['cf']['french-vfb']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vfb) | 0 | {{ radarr['cf']['french-vfb']['trash_id'] }} | diff --git a/includes/french-guide/radarr-french-audio-version-fr.md b/includes/french-guide/radarr-french-audio-version-fr.md index d908086d7..9a8ad4f7c 100644 --- a/includes/french-guide/radarr-french-audio-version-fr.md +++ b/includes/french-guide/radarr-french-audio-version-fr.md @@ -1,22 +1,21 @@ ??? abstract "Explications - [CLIQUEZ POUR AFFICHER]" - | Acronymes | French Explanation | English Explanation | - | -------------------------------- | ----------------------------------------------------------------------------------- | --------------------------------------------------------------------- | - | TRUEFRENCH or VFF | Version Francophone Française (doublage réalisé en France) | Full French version (dubbing done in France) | - | FRENCH or VF[1] | Version Francophone (normalement equivalent à la VFQ) | French version (normally equivalent to VFQ) | - | VOF | Version Originale Française | Original French Version | - | VFI | Version Francophone Internationale | International French Version | - | VFQ | Version Francophone Québécoise | Canadian French Version | - | VQ | Version Québécoise (accent Québécois important, ex: Les Simpsons le film) | Quebec Version (strong Quebec accent, ex: The Simpsons movie) | - | VFB | Version Francophone Belge | Belgian French Version | - | VF[1-9] or FR[1-9][2] | Indique le nombre de doublage présent (normalement VF2 soit VFF et VFQ) | Indicates the number of dubs present (normally VF2 being VFF and VFQ) | - | VOSTFR[3] | Indique que l'audio est dans la langue originale, avec des sous-titres en français. | Indicates soundtrack in the original language, with French subtitles | + | Acronymes | French Explanation | English Explanation | + | -------------------------- | ----------------------------------------------------------------------------------- | --------------------------------------------------------------------- | + | TRUEFRENCH or VFF | Version Francophone Française (doublage réalisé en France) | Full French version (dubbing done in France) | + | FRENCH or VF[1] | Version Francophone (normalement equivalent à la VFQ) | French version (normally equivalent to VFQ) | + | VOF | Version Originale Française | Original French Version | + | VFI | Version Francophone Internationale | International French Version | + | VFQ | Version Francophone Québécoise | Canadian French Version | + | VQ | Version Québécoise (accent Québécois important, ex: Les Simpsons le film) | Quebec Version (strong Quebec accent, ex: The Simpsons movie) | + | VFB | Version Francophone Belge | Belgian French Version | + | VF[1-9] or FR[1-9] | Indique le nombre de doublage présent (normalement VF2 soit VFF et VFQ) | Indicates the number of dubs present (normally VF2 being VFF and VFQ) | + | VOSTFR[2] | Indique que l'audio est dans la langue originale, avec des sous-titres en français. | Indicates soundtrack in the original language, with French subtitles | - *[1] VF est inclus dans le Format Personnalisé VFQ, mais il convient de noter qu'il était souvent associé à VFF au lieu de VFQ avant 2022.* - - *[2] VF [1-9] est inclus dans le Format Personnalisé VFI.* - - *[3] Il est à noter que le SUBFRENCH est inclus dans ce Format Personnalisé. Néanmoins, SUB signifie souvent que le sous-titre a été intégré à l'image (hardcoded). Les sorties françaises ont tendance à mélanger les deux, ce qui fait que certains VOSTFR sont étiquetés comme SUBFRENCH et SUBFRENCH comme VOSTFR.* + - *[2] Il est à noter que le SUBFRENCH est inclus dans ce Format Personnalisé. Néanmoins, SUB signifie souvent que le sous-titre a été intégré à l'image (hardcoded). Les sorties françaises ont tendance à mélanger les deux, ce qui fait que certains VOSTFR sont étiquetés comme SUBFRENCH et SUBFRENCH comme VOSTFR.* !!! tip "Indexers renaming in Prowlarr" - Certains indexeurs dans Prowlarr peuvent renommer les versions `MULTi` en `MULTi.TRUEFRENCH` ou `MULTi.FRENCH`. Je ne recommande pas l'utilisation d'une telle fonction car elle peut entraîner des faux positifs avec les formats personnalisés VFF, VFQ et VQ. + Certains indexeurs dans Prowlarr peuvent renommer les versions `MULTi` en `MULTi.TRUEFRENCH` ou `MULTi.FRENCH`. L'utilisation de cette fonction n'est pas recommandé, car elle peut entraîner des faux positifs avec les formats personnalisés VFF, VFQ et VQ. ??? abstract "Versions françaises - [CLIQUEZ POUR AFFICHER]" | Formats Personnalisés | Score | Trash ID | @@ -24,6 +23,7 @@ | [{{ radarr['cf']['french-vff']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vff) | 0 | {{ radarr['cf']['french-vff']['trash_id'] }} | | [{{ radarr['cf']['french-vof']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vof) | 0 | {{ radarr['cf']['french-vof']['trash_id'] }} | | [{{ radarr['cf']['french-vfi']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vfi) | 0 | {{ radarr['cf']['french-vfi']['trash_id'] }} | + | [{{ radarr['cf']['french-vf2']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vf2) | 0 | {{ radarr['cf']['french-vf2']['trash_id'] }} | | [{{ radarr['cf']['french-vfq']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vfq) | 0 | {{ radarr['cf']['french-vfq']['trash_id'] }} | | [{{ radarr['cf']['french-vq']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vq) | 0 | {{ radarr['cf']['french-vq']['trash_id'] }} | | [{{ radarr['cf']['french-vfb']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vfb) | 0 | {{ radarr['cf']['french-vfb']['trash_id'] }} | diff --git a/includes/french-guide/sonarr-french-audio-version-en.md b/includes/french-guide/sonarr-french-audio-version-en.md index 0037a9960..27771ee91 100644 --- a/includes/french-guide/sonarr-french-audio-version-en.md +++ b/includes/french-guide/sonarr-french-audio-version-en.md @@ -1,22 +1,21 @@ ??? abstract "Explanation - [CLICK TO EXPAND]" - | Acronyms | French Explanation | English Explanation | - | -------------------------------- | ----------------------------------------------------------------------------------- | --------------------------------------------------------------------- | - | TRUEFRENCH or VFF | Version Francophone Française (doublage réalisé en France) | Full French version (dubbing done in France) | - | FRENCH or VF[1] | Version Francophone (normalement equivalent à la VFQ) | French version (normally equivalent to VFQ) | - | VOF | Version Originale Française | Original French Version | - | VFI | Version Francophone Internationale | International French Version | - | VFQ | Version Francophone Québécoise | Canadian French Version | - | VQ | Version Québécoise (accent Québécois important, ex: Les Simpsons le film) | Quebec Version (strong Quebec accent, ex: The Simpsons movie) | - | VFB | Version Francophone Belge | Belgian French Version | - | VF[1-9] or FR[1-9][2] | Indique le nombre de doublage présent (normalement VF2 soit VFF et VFQ) | Indicates the number of dubs present (normally VF2 being VFF and VFQ) | - | VOSTFR[3] | Indique que l'audio est dans la langue originale, avec des sous-titres en français. | Indicates soundtrack in the original language, with French subtitles | + | Acronyms | French Explanation | English Explanation | + | -------------------------- | ----------------------------------------------------------------------------------- | --------------------------------------------------------------------- | + | TRUEFRENCH or VFF | Version Francophone Française (doublage réalisé en France) | Full French version (dubbing done in France) | + | FRENCH or VF[1] | Version Francophone (normalement equivalent à la VFQ) | French version (normally equivalent to VFQ) | + | VOF | Version Originale Française | Original French Version | + | VFI | Version Francophone Internationale | International French Version | + | VFQ | Version Francophone Québécoise | Canadian French Version | + | VQ | Version Québécoise (accent Québécois important, ex: Les Simpsons le film) | Quebec Version (strong Quebec accent, ex: The Simpsons movie) | + | VFB | Version Francophone Belge | Belgian French Version | + | VF[1-9] or FR[1-9] | Indique le nombre de doublage présent (normalement VF2 soit VFF et VFQ) | Indicates the number of dubs present (normally VF2 being VFF and VFQ) | + | VOSTFR[2] | Indique que l'audio est dans la langue originale, avec des sous-titres en français. | Indicates soundtrack in the original language, with French subtitles | - *[1] VF is included under the VFQ Custom Format, but it should be noted that it was often mismatched with VFF instead of VFQ pre-2022.* - - *[2] VF[1-9] is included under the VFI Custom Format.* - - *[3] It should be noted that SUBFRENCH is included in this Custom Format. However, SUB often means that the subtitle was embedded inside the picture (hardcoded). French releases tend to mix the two, leading to some VOSTFR being labelled as SUBFRENCH and SUBFRENCH as VOSTFR.* + - *[2] It should be noted that SUBFRENCH is included in this Custom Format. However, SUB often means that the subtitle was embedded inside the picture (hardcoded). French releases tend to mix the two, leading to some VOSTFR being labelled as SUBFRENCH and SUBFRENCH as VOSTFR.* !!! tip "Indexers renaming in Prowlarr" - Some Indexers in Prowlarr can rename `MULTi` releases to `MULTi.TRUEFRENCH` or `MULTi.FRENCH`. I do not recommend using such a feature along with those Custom Formats as it can lead to false positives from the VFF or VFQ Custom Formats. + Some Indexers in Prowlarr can rename `MULTi` releases to `MULTi.TRUEFRENCH` or `MULTi.FRENCH`. It is not recommend to use such a feature along with those Custom Formats as it can lead to false positives from the VFF, VFQ and VQ Custom Formats. ??? abstract "French Audio Versions - [CLICK TO EXPAND]" | Custom Format | Score | Trash ID | @@ -24,6 +23,7 @@ | [{{ sonarr['cf']['french-vff']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vff) | 0 | {{ sonarr['cf']['french-vff']['trash_id'] }} | | [{{ sonarr['cf']['french-vof']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vof) | 0 | {{ sonarr['cf']['french-vof']['trash_id'] }} | | [{{ sonarr['cf']['french-vfi']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vfi) | 0 | {{ sonarr['cf']['french-vfi']['trash_id'] }} | + | [{{ sonarr['cf']['french-vf2']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vf2) | 0 | {{ sonarr['cf']['french-vf2']['trash_id'] }} | | [{{ sonarr['cf']['french-vfq']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vfq) | 0 | {{ sonarr['cf']['french-vfq']['trash_id'] }} | | [{{ sonarr['cf']['french-vq']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vq) | 0 | {{ sonarr['cf']['french-vq']['trash_id'] }} | | [{{ sonarr['cf']['french-vfb']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vfb) | 0 | {{ sonarr['cf']['french-vfb']['trash_id'] }} | diff --git a/includes/french-guide/sonarr-french-audio-version-fr.md b/includes/french-guide/sonarr-french-audio-version-fr.md index 071afb144..b25191539 100644 --- a/includes/french-guide/sonarr-french-audio-version-fr.md +++ b/includes/french-guide/sonarr-french-audio-version-fr.md @@ -1,22 +1,21 @@ ??? abstract "Explications - [CLIQUEZ POUR AFFICHER]" - | Acronymes | French Explanation | English Explanation | - | -------------------------------- | ----------------------------------------------------------------------------------- | --------------------------------------------------------------------- | - | TRUEFRENCH or VFF | Version Francophone Française (doublage réalisé en France) | Full French version (dubbing done in France) | - | FRENCH or VF[1] | Version Francophone (normalement equivalent à la VFQ) | French version (normally equivalent to VFQ) | - | VOF | Version Originale Française | Original French Version | - | VFI | Version Francophone Internationale | International French Version | - | VFQ | Version Francophone Québécoise | Canadian French Version | - | VQ | Version Québécoise (accent Québécois important, ex: Les Simpsons le film) | Quebec Version (strong Quebec accent, ex: The Simpsons movie) | - | VFB | Version Francophone Belge | Belgian French Version | - | VF[1-9] or FR[1-9][2] | Indique le nombre de doublage présent (normalement VF2 soit VFF et VFQ) | Indicates the number of dubs present (normally VF2 being VFF and VFQ) | - | VOSTFR[3] | Indique que l'audio est dans la langue originale, avec des sous-titres en français. | Indicates soundtrack in the original language, with French subtitles | + | Acronymes | French Explanation | English Explanation | + | -------------------------- | ----------------------------------------------------------------------------------- | --------------------------------------------------------------------- | + | TRUEFRENCH or VFF | Version Francophone Française (doublage réalisé en France) | Full French version (dubbing done in France) | + | FRENCH or VF[1] | Version Francophone (normalement equivalent à la VFQ) | French version (normally equivalent to VFQ) | + | VOF | Version Originale Française | Original French Version | + | VFI | Version Francophone Internationale | International French Version | + | VFQ | Version Francophone Québécoise | Canadian French Version | + | VQ | Version Québécoise (accent Québécois important, ex: Les Simpsons le film) | Quebec Version (strong Quebec accent, ex: The Simpsons movie) | + | VFB | Version Francophone Belge | Belgian French Version | + | VF[1-9] or FR[1-9] | Indique le nombre de doublage présent (normalement VF2 soit VFF et VFQ) | Indicates the number of dubs present (normally VF2 being VFF and VFQ) | + | VOSTFR[2] | Indique que l'audio est dans la langue originale, avec des sous-titres en français. | Indicates soundtrack in the original language, with French subtitles | - *[1] VF est inclus dans le Format Personnalisé VFQ, mais il convient de noter qu'il était souvent associé à VFF au lieu de VFQ avant 2022.* - - *[2] VF [1-9] est inclus dans le Format Personnalisé VFI.* - - *[3] Il est à noter que le SUBFRENCH est inclus dans ce Format Personnalisé. Néanmoins, SUB signifie souvent que le sous-titre a été intégré à l'image (hardcoded). Les sorties françaises ont tendance à mélanger les deux, ce qui fait que certains VOSTFR sont étiquetés comme SUBFRENCH et SUBFRENCH comme VOSTFR.* + - *[2] Il est à noter que le SUBFRENCH est inclus dans ce Format Personnalisé. Néanmoins, SUB signifie souvent que le sous-titre a été intégré à l'image (hardcoded). Les sorties françaises ont tendance à mélanger les deux, ce qui fait que certains VOSTFR sont étiquetés comme SUBFRENCH et SUBFRENCH comme VOSTFR.* !!! tip "Indexers renaming in Prowlarr" - Certains indexeurs dans Prowlarr peuvent renommer les versions `MULTi` en `MULTi.TRUEFRENCH` ou `MULTi.FRENCH`. Je ne recommande pas l'utilisation d'une telle fonction car elle peut entraîner des faux positifs avec les formats personnalisés VFF ou VFQ. + Certains indexeurs dans Prowlarr peuvent renommer les versions `MULTi` en `MULTi.TRUEFRENCH` ou `MULTi.FRENCH`. L'utilisation de cette fonction n'est pas recommandé, car elle peut entraîner des faux positifs avec les formats personnalisés VFF, VFQ et VQ. ??? abstract "Versions françaises - [CLIQUEZ POUR AFFICHER]" | Formats Personnalisés | Score | Trash ID | @@ -24,6 +23,7 @@ | [{{ sonarr['cf']['french-vff']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vff) | 0 | {{ sonarr['cf']['french-vff']['trash_id'] }} | | [{{ sonarr['cf']['french-vof']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vof) | 0 | {{ sonarr['cf']['french-vof']['trash_id'] }} | | [{{ sonarr['cf']['french-vfi']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vfi) | 0 | {{ sonarr['cf']['french-vfi']['trash_id'] }} | + | [{{ sonarr['cf']['french-vf2']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vf2) | 0 | {{ sonarr['cf']['french-vf2']['trash_id'] }} | | [{{ sonarr['cf']['french-vfq']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vfq) | 0 | {{ sonarr['cf']['french-vfq']['trash_id'] }} | | [{{ sonarr['cf']['french-vq']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vq) | 0 | {{ sonarr['cf']['french-vq']['trash_id'] }} | | [{{ sonarr['cf']['french-vfb']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vfb) | 0 | {{ sonarr['cf']['french-vfb']['trash_id'] }} |