diff --git a/VERSION b/VERSION index a6f6bbd8..721b91af 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.17.3-develop142 +1.17.3-develop145 diff --git a/defaults/award/separator_award.yml b/defaults/award/separator_award.yml index a0cdbfb3..89765dec 100644 --- a/defaults/award/separator_award.yml +++ b/defaults/award/separator_award.yml @@ -10,6 +10,9 @@ external_templates: template_variables: collection_section: 16 +translations: + pmm: translations + collections: Award Collections: template: diff --git a/defaults/chart/separator_chart.yml b/defaults/chart/separator_chart.yml index b249df3b..993cf5ba 100644 --- a/defaults/chart/separator_chart.yml +++ b/defaults/chart/separator_chart.yml @@ -10,6 +10,9 @@ external_templates: template_variables: collection_section: "01" +translations: + pmm: translations + collections: Chart Collections: template: diff --git a/defaults/movie/universe.yml b/defaults/movie/universe.yml index 3b216e47..791408cc 100644 --- a/defaults/movie/universe.yml +++ b/defaults/movie/universe.yml @@ -10,6 +10,9 @@ external_templates: template_variables: collection_section: "02" +translations: + pmm: translations + templates: universe: default: diff --git a/defaults/playlist.yml b/defaults/playlist.yml index 8e4fb535..b7078511 100644 --- a/defaults/playlist.yml +++ b/defaults/playlist.yml @@ -8,6 +8,9 @@ external_templates: pmm: templates +translations: + pmm: translations + templates: playlist: default: diff --git a/defaults/translations/fr.yml b/defaults/translations/fr.yml index 1e82d406..bda99558 100644 --- a/defaults/translations/fr.yml +++ b/defaults/translations/fr.yml @@ -23,220 +23,220 @@ variables: # For Playlists item: Article key_names: - # Action: Action - # Action & Adventure: Action & Adventure + Action: Action + Action & Adventure: Action et Aventure Actors: Acteurs et Actrices - # Adult: Adult + Adult: Adulte Adventure: Aventure - # Albanian: Albanian - # Animation: Animation - # Anime: Anime + Albanian: Albanais + Animation: Animation + Anime: Animé Arabic: Arabes - # Argentina: Argentina + Argentina: Argentine Audio Language: Langue audio - # Australia: Australia - # Austria: Austria + Australia: Australie + Austria: L'Autriche Award: Prix - # Bahamas: Bahamas - # Basque: Basque - # Belgium: Belgium - # Bengali: Bengali - # Biography: Biography - # Biopic: Biopic - # Bosnian: Bosnian + Bahamas: Bahamas + Basque: Basque + Belgium: Belgique + Bengali: Bengali + Biography: Biographie + Biopic: Biopic + Bosnian: Bosniaque Brazil: Brésil - # Bulgaria: Bulgaria - # Bulgarian: Bulgarian - # Canada: Canada - # Catalan: Catalan + Bulgaria: Bulgarie + Bulgarian: Bulgare + Canada: Canada + Catalan: Catalans Chart: Graphique - # Children: Children - # Chile: Chile + Children: Enfants + Chile: Chili China: Chine - # Chinese: Chinese + Chinese: Chinois Christmas: Noël - # Comedy: Comedy - # Competition: Competition - # Costa Rica: Costa Rica + Comedy: La Comédie + Competition: Compétition + Costa Rica: Costa Rica Country: Pays - # Crime: Crime - # Croatia: Croatia - # Croatian: Croatian + Crime: Crime + Croatia: Croatie + Croatian: Croate Czech: Tchèques - # Czech Republic: Czech Republic + Czech Republic: République tchèque Danish: Danois Decade: Décennie - # Denmark: Denmark + Denmark: Danemark Directors: Réalisateurs - # Documentary: Documentary - # Dominican Republic: Dominican Republic + Documentary: Documentaire + Dominican Republic: République Dominicaine Drama: Dramatiques Dutch: Néerlandais Easter: Pâques - # Egypt: Egypt + Egypt: Egypte English: Anglais - # Erotica: Erotica - # Estonia: Estonia - # Estonian: Estonian - # Family: Family + Erotica: Érotique + Estonia: Estonie + Estonian: Estoniens + Family: Famille Fantasy: Fantaisies Father's Day: Fête des pères Filipino: Philippins - # Film Noir: Film Noir - # Finland: Finland + Film Noir: Film Noir + Finland: Finlande Finnish: Finnois - # Food: Food - # France: France + Food: Aliments + France: France French: Français - # Galician: Galician - # Game Show: Game Show - # Gangster: Gangster - # Genre: Genre - # Georgian: Georgian + Galician: Galiciens + Game Show: Jeu télévisé + Gangster: Bandit + Genre: Genre + Georgian: Géorgien German: Allemands Germany: Allemagne - # Greece: Greece + Greece: Grèce Greek: Grecs - # Halloween: Halloween + Halloween: Halloween Hebrew: Hébreu - # Hindi: Hindi + Hindi: Hindi History: Historiques - # Home and Garden: Home and Garden - # Hong Kong: Hong Kong - # Horror: Horror + Home and Garden: Maison et jardin + Hong Kong: Hong Kong + Horror: Horreur Hungarian: Hongrois - # Hungary: Hungary - # Iceland: Iceland - # Icelandic: Icelandic + Hungary: Hongrie + Iceland: Islande + Icelandic: Islandais Independence Day: Le jour de l'indépendance India: Inde - # Indie: Indie - # Indonesia: Indonesia + Indie: Indé + Indonesia: Indonésie Indonesian: Indonésiens - # Iran: Iran - # Ireland: Ireland - # Israel: Israel + Iran: L'Iran + Ireland: Irlande + Israel: Israël Italian: Italiens - # Italy: Italy - # Japan: Japan + Italy: Italie + Japan: Japon Japanese: Japonais - # Kannada: Kannada - # Kazakh: Kazakh - # Kids: Kids - # Korea: Korea + Kannada: Kannada + Kazakh: Kazakh + Kids: Des gamins + Korea: Corée Korean: Coréens - # LGBTQ+: LGBTQ+ + LGBTQ+: LGBTQ+ Labor Day: Fête du travail - # Latin: Latin - # Latvia: Latvia - # Latvian: Latvian - # Luxembourg: Luxembourg - # Macedonian: Macedonian + Latin: Latin + Latvia: Lettonie + Latvian: Letton + Luxembourg: Luxembourg + Macedonian: Macédonien Malay: Malais - # Malaysia: Malaysia - # Malaysian: Malaysian - Mandarin: en Mandarin - # Marathi: Marathi - # Martial Arts: Martial Arts + Malaysia: Malaisie + Malaysian: Malaisien + Mandarin: Mandarin + Marathi: Marathe + Martial Arts: Arts martiaux Memorial Day: Jour du souvenir - # Mexico: Mexico - # Mind-Bend: Mind-Bend - # Mind-Fuck: Mind-Fuck - # Mini-Series: Mini-Series - # Morocco: Morocco + Mexico: Mexique + Mind-Bend: Courbure de l'esprit + Mind-Fuck: Baise mentale + Mini-Series: Mini-série + Morocco: Maroc Mother's Day: Fête des mères Music: Musiques - # Musical: Musical + Musical: Musicale Mystery: Mystère - # Nepal: Nepal - # Netherlands: Netherlands + Nepal: Népal + Netherlands: Pays-Bas Network: Réseau New Year's Day: Le jour de l'An New Zealand: Nouvelle-Zélande - # News: News - # News & Politics: News & Politics - # Norway: Norway + News: Nouvelles + News & Politics: Actualités et politique + Norway: Norvège Norwegian: Norvégiens - # Norwegian Bokmål: Norwegian Bokmål - # Norwegian Nynorsk: Norwegian Nynorsk - # Pakistan: Pakistan - # Panama: Panama - # Persian: Persian - # Peru: Peru - # Philippines: Philippines - # Poland: Poland + Norwegian Bokmål: Norvégien Bokmål + Norwegian Nynorsk: Norvégien Nynorsk + Pakistan: Pakistan + Panama: Panama + Persian: Persane + Peru: Pérou + Philippines: Philippines + Poland: Pologne Polish: Polonais - # Politics: Politics - # Portugal: Portugal - # Portugese: Portugese + Politics: Politique + Portugal: le Portugal + Portugese: Portugais Portuguese: Portugais Producers: Producteurs et Productrices - # Punjabi: Punjabi - # Qatar: Qatar + Punjabi: Pendjabi + Qatar: Qatar Ratings: Notes - # Reality: Reality + Reality: Réalité Resolution: Résolution Romance: Romantiques - # Romania: Romania + Romania: Roumanie Romanian: Roumains - # Romantic Comedy: Romantic Comedy - # Romantic Drama: Romantic Drama - # Russia: Russia + Romantic Comedy: Comédie romantique + Romantic Drama: Drame romantique + Russia: Russie Russian: Russes - # Saudi Arabia: Saudi Arabia - # Sci-Fi & Fantasy: Sci-Fi & Fantasy - # Science Fiction: Science Fiction + Saudi Arabia: Arabie Saoudite + Sci-Fi & Fantasy: Science-fiction et fantaisie + Science Fiction: La science-fiction Seasonal: Saisonnier - # Serbia: Serbia - # Serbian: Serbian - # Short: Short - # Singapore: Singapore - # Slasher: Slasher + Serbia: Serbie + Serbian: Serbe + Short: Court Métrage + Singapore: Singapour + Slasher: Slasher Slovak: Slovaques - # Slovenian: Slovenian - # Soap: Soap - # South Africa: South Africa + Slovenian: Slovène + Soap: Feuilleton + South Africa: Afrique du Sud Spain: Espagne Spanish: Espagnols - # Sport: Sport - # Sri Lanka: Sri Lanka + Sport: Sport + Sri Lanka: Sri Lanka St. Patrick's Day: Le jour de la Saint-Patrick - # Stand-Up Comedy: Stand-Up Comedy + Stand-Up Comedy: Comédie debout Streaming: Diffusion - # Studio: Studio + Studio: Studio Subtitle Language: Langue des sous-titres - # Superhero: Superhero - # Suspense: Suspense - # Swahili: Swahili - # Sweden: Sweden + Superhero: Super-héros + Suspense: Le Suspense + Swahili: Swahili + Sweden: Suède Swedish: Suédois - # Switzerland: Switzerland - # Sword & Sorcery: Sword & Sorcery - # TV Movie: TV Movie - # Talk Show: Talk Show + Switzerland: Suisse + Sword & Sorcery: Épée et sorcellerie + TV Movie: Téléfilm + Talk Show: Talk-show Tamil: Tamouls Telugu: Télougou Thai: Thaïlandais - # Thailand: Thailand + Thailand: Thaïlande Thanksgiving: Action de grâces Thriller: Suspense - # Travel: Travel - # Turkey: Turkey + Travel: Voyager + Turkey: Turquie Turkish: Turcs - # Ukraine: Ukraine - # Ukrainian: Ukrainian - # United Arab Emirates: United Arab Emirates + Ukraine: Ukraine + Ukrainian: Ukrainien + United Arab Emirates: Emirats Arabes Unis United Kingdom: Royaume-Uni United States of America: les États-Unis d'Amérique Universe: Univers - # Urdu: Urdu + Urdu: Ourdou Valentine's Day: La Saint-Valentin - # Vietnam: Vietnam - # Vietnamese: Vietnamese + Vietnam: Viêt Nam + Vietnamese: Vietnamien War: Guerre - # War & Politics: War & Politics - # Welsh: Welsh - # Western: Western + War & Politics: Guerre & Politique + Welsh: Gallois + Western: Le Western Writers: Scénaristes Year: de l'année diff --git a/docs/defaults/overlays/images/flixpatrol.png b/docs/defaults/overlays/images/flixpatrol.png new file mode 100644 index 00000000..0f4f8085 Binary files /dev/null and b/docs/defaults/overlays/images/flixpatrol.png differ diff --git a/docs/defaults/overlays/images/mediastinger.png b/docs/defaults/overlays/images/mediastinger.png new file mode 100644 index 00000000..3e62b05e Binary files /dev/null and b/docs/defaults/overlays/images/mediastinger.png differ diff --git a/docs/defaults/overlays/images/ratings_overlay.png b/docs/defaults/overlays/images/ratings_overlay.png new file mode 100644 index 00000000..ca5f256b Binary files /dev/null and b/docs/defaults/overlays/images/ratings_overlay.png differ diff --git a/docs/defaults/overlays/images/resolution.png b/docs/defaults/overlays/images/resolution.png new file mode 100644 index 00000000..efaef256 Binary files /dev/null and b/docs/defaults/overlays/images/resolution.png differ diff --git a/docs/defaults/overlays/images/ribbon.png b/docs/defaults/overlays/images/ribbon.png new file mode 100644 index 00000000..e16cdc9d Binary files /dev/null and b/docs/defaults/overlays/images/ribbon.png differ diff --git a/docs/defaults/overlays/images/runtimes.png b/docs/defaults/overlays/images/runtimes.png new file mode 100644 index 00000000..b376e18d Binary files /dev/null and b/docs/defaults/overlays/images/runtimes.png differ diff --git a/docs/defaults/overlays/images/status.png b/docs/defaults/overlays/images/status.png new file mode 100644 index 00000000..62396933 Binary files /dev/null and b/docs/defaults/overlays/images/status.png differ diff --git a/docs/defaults/overlays/images/streaming.png b/docs/defaults/overlays/images/streaming.png new file mode 100644 index 00000000..be99dc86 Binary files /dev/null and b/docs/defaults/overlays/images/streaming.png differ diff --git a/docs/defaults/overlays/images/version.png b/docs/defaults/overlays/images/version.png new file mode 100644 index 00000000..fb728017 Binary files /dev/null and b/docs/defaults/overlays/images/version.png differ diff --git a/docs/defaults/overlays/images/video_format.png b/docs/defaults/overlays/images/video_format.png new file mode 100644 index 00000000..fe99e888 Binary files /dev/null and b/docs/defaults/overlays/images/video_format.png differ diff --git a/docs/defaults/overlays/ratings.md b/docs/defaults/overlays/ratings.md index a3fadc0d..af7243a9 100644 --- a/docs/defaults/overlays/ratings.md +++ b/docs/defaults/overlays/ratings.md @@ -8,7 +8,7 @@ This file only updates the overlays based on the data in Plex. Use the [Mass * R **If no template variables are set this file will do nothing.** -![](images/ratings.png) +![](images/ratings_overlay.png) ## Config diff --git a/docs/defaults/overlays/versions.md b/docs/defaults/overlays/versions.md index 71459a82..61e707b3 100644 --- a/docs/defaults/overlays/versions.md +++ b/docs/defaults/overlays/versions.md @@ -4,7 +4,7 @@ The `versions` Default Overlay File is used to create an overlay based on if the **This file works with Movie and Show Libraries.** -![](images/versions.png) +![](images/version.png) ## Config diff --git a/docs/home/guides/initial.md b/docs/home/guides/initial.md new file mode 100644 index 00000000..69e94e90 --- /dev/null +++ b/docs/home/guides/initial.md @@ -0,0 +1,7 @@ +# Initial Setup Guide + +**Before using this guide you should already have installed Plex Meta Manager.** + +See the [Installation Page](../installation) for info on how to install Plex Meta Manager. + +This guide is assuming you know how to run pmm with the `--run` run command or the `PMM_RUN` environment variable to perform immediate runs \ No newline at end of file diff --git a/docs/home/guides/wt/wt-01.md b/docs/home/guides/wt/wt-01.md index a09caf78..7ba571b1 100644 --- a/docs/home/guides/wt/wt-01.md +++ b/docs/home/guides/wt/wt-01.md @@ -1,4 +1,4 @@ -Next you’ll set up the config file. ThIs tells PMM how to connect to Plex and a variety of other services. +Next you’ll set up the config file. This tells PMM how to connect to Plex and a variety of other services. Before you do this you’ll need: diff --git a/docs/home/installation.md b/docs/home/installation.md index e04314c1..ec256ae9 100644 --- a/docs/home/installation.md +++ b/docs/home/installation.md @@ -1,6 +1,6 @@ # Installing Plex Meta Manager -Generally, Plex-Meta-Manmager can be installed in one of two ways: +Generally, Plex Meta Manager can be installed in one of two ways: 1. Running on a system as a Python script [we will refer to this as a "local" install] 2. Running as a Docker container diff --git a/modules/meta.py b/modules/meta.py index be80c5fa..45878b27 100644 --- a/modules/meta.py +++ b/modules/meta.py @@ -264,7 +264,7 @@ class DataFile: language = variables["language"] if "language" in variables else "default" translation_variables = {k: v[language if language in v else "default"] for k, v in self.translations.items()} - translation_variables.update({k: v[language if language in v else "default"] for k, v in self.translation_variables.items()}) + translation_variables.update({k: v[language if language in v else "default"] for k, v in self.translation_variables.items() if language in v or "default" in v}) key_name_variables = {} for var_key, var_value in self.key_names.items(): if var_key == "library_type" and language in var_value: