From a7d39ac5afdb2126fad829e59f00ecdddc7b5f35 Mon Sep 17 00:00:00 2001
From: Arnaud Leene <aleene@gmail.com>
Date: Mon, 30 Dec 2024 17:51:07 +0100
Subject: [PATCH] chore: taxonomy week50 (#11127)

### What
Various requests and improvements

---------

Co-authored-by: Arnaud Leene <1329905+aleene@users.noreply.github.com>
Co-authored-by: Pierre Slamich <pierre@openfoodfacts.org>
---
 taxonomies/food/categories.txt | 96 +++++++++++++++++++++++++---------
 taxonomies/origins.txt         | 47 ++++++++++++++---
 2 files changed, 111 insertions(+), 32 deletions(-)

diff --git a/taxonomies/food/categories.txt b/taxonomies/food/categories.txt
index 6d5d711a60a15..e8d18e315445c 100644
--- a/taxonomies/food/categories.txt
+++ b/taxonomies/food/categories.txt
@@ -5748,7 +5748,7 @@ protected_name_type:en: gi
 #wikidata:en:
 
 < en:Liqueurs
-en: Italian liqueurs
+en: Italian liqueurs, Liqueurs from Italy
 #wikidata:en:
 
 < en:Italian liqueurs
@@ -5759,7 +5759,7 @@ protected_name_type:en: gi
 #wikidata:en:
 
 < en:Liqueurs
-en: Portuguese liqueur
+en: Portuguese liqueur, Liqueurs from Portugal
 #wikidata:en:
 
 < en:Portuguese liqueur
@@ -5805,7 +5805,7 @@ protected_name_type:en: gi
 #wikidata:en:
 
 < en:Liqueurs
-en: French liqueur
+en: French liqueur, Liqueurs from France
 #wikidata:en:
 
 < en:French liqueur
@@ -5863,7 +5863,7 @@ protected_name_type:en: gi
 #wikidata:en:
 
 < en:Liqueurs
-en: Spanish liqueur
+en: Spanish liqueur, Liqueurs from Spain
 es: Licor español
 fr: Liqueurs espagnoles
 hr: Španjolski liker
@@ -5944,14 +5944,19 @@ protected_name_file_number:en: PGI-FR-01991
 protected_name_type:en: gi
 #wikidata:en:
 
+< en:Liqueurs
+fr: Crèmes de pèche
+
+< en:Liqueurs
+fr: Crèmes de mure
+
+< en:Liqueurs
+en: Bitter liqueurs
+fr: Liqueurs bitter
+
 < en:Liqueurs
 en: Curaçao
-de: Curaçao
-es: Curaçao
-fr: Curaçao
-hr: Curaçao
-it: Curaçao
-pl: Curaçao
+xx: Curaçao
 wikidata:en: Q10223
 
 < en:Liqueurs
@@ -5985,7 +5990,7 @@ zh: 蛋黄酒
 wikidata:en: Q496934
 
 < en:Liqueurs
-en: Austrian liqueur
+en: Austrian liqueur, Liqueurs from Austria
 origins:en: en:austria
 #wikidata:en:
 
@@ -35403,6 +35408,16 @@ hr: Hrskavi kruhovi
 nl: Knäckebrot, Knäckebröd
 pl: Pieczywo chrupkie
 
+< en: Crispbreads
+en: Crispbreads(wholemeal)
+fr: Pains croustillants complets
+nl: Knäckebrot(volkoren)
+
+< en: Crispbreads
+en: Crispbreads(non-wholemeal)
+fr: Pains croustillants non-complets
+nl: Knäckebrot(niet-volkoren)
+
 #Extruded crispbread is not bread
 < en:Cereals and potatoes
 < en:Snacks
@@ -43379,6 +43394,10 @@ fr: Chips au quinoa
 hr: Čips od kvinoje
 nl: Quinoa chips
 
+< en:Crisps
+en: Lentil Crisps
+fr: Chips de lentilles
+
 < en:Cereals and potatoes
 < en:Crisps
 en: Potato crisps, potato chips
@@ -46403,6 +46422,9 @@ pl: Serki kremowe, Serek kremowy
 ru: Крем-сыры
 wikidata:en: Q426337
 
+< en: Cream cheeses
+pt: Requeijão cremoso, Requeijões cremosos
+
 < en:Cheeses
 en: Fresh cheeses
 de: Frischkäse
@@ -46429,6 +46451,7 @@ fr: Brousses
 hr: Brousse
 wikidata:en: Q2926318
 #note:en: Note that en:Cottage Cheese not the same as en:Brousse. It has a different taste and structure.
+
 #Cottage cheese is not directly in cheeses to avoid having cottage fruit cottage cheese in cheeses.
 
 < en:Fermented milk products
@@ -55353,16 +55376,21 @@ ciqual_food_name:en: Almond (with peel)
 opposite:en: en:almonds flakes
 
 #< en:Almonds(shelled)
+# en: Sliced almonds
 #de: Mandelscheiben
+# es: Almendras rebanadas
 # not many products yet
 
 < en:Shelled almonds
 en: Almonds(blanched), Blanched almonds
+cz: Mandle blanšírované
 es: Almendras repeladas, Almendra pelada, Almendras sin piel, Láminas de almendra
 fr: Amandes blanchies, Amandes émondées
 it: Mandorle pelate
 nl: Amandelen(geblancheerd), Geblancherde amandelen
+pl: Migdały blanszowane
 pt: Miolo de Amêndoa sem Pele
+ro: Migdale blanșate
 opposite:en: en:almonds(non-blanched)
 
 < en:Shelled almonds
@@ -55371,9 +55399,9 @@ nl: Amandelen(niet geblancheerd)
 opposite:en: en:almonds(blanched)
 
 < en:Almonds(blanched)
-en: Almond flakes, Sliced almonds
+en: Almond flakes
 de: Mandeln(Gehobelt), Gehobelte Mandeln
-es: Almendras rebanadas
+es: Almendras laminas
 fi: Mantelihiutaleet
 fr: Amandes effilées
 hr: Listići badema
@@ -55381,9 +55409,12 @@ lt: Migdolų drožlės, pjaustyti migdolai, migdolų riekelės
 nl: Amandelschaafsel, Amandelvlokken
 opposite:en: en:almonds(whole)
 
-#< en:Almonds(blanched)
-#fr: Amandes hachées
-# not many products yet
+< en:Almonds(blanched)
+fr: Amandes hachées
+cz: Mandle jádra
+de: Mandeln(gehackt)
+pl: Migdały siekane
+ro: Migdale mǎrunțite
 
 < en:Almonds(blanched)
 en: Almonds(slivered), Slivered almonds
@@ -55438,16 +55469,19 @@ opposite:en: en:almonds(roasted)
 < en:Almonds(non-blanched)
 < en:Almonds(unroasted)
 < en:Almonds(unsalted)
+< en:Whole almonds
 en: Almonds(raw), Raw almonds
 ca: Ametlles crues
 de: Mandeln(Naturbelassen)
-es: Almendra natural, Almendra cruda
+es: Almendra natural, Almendra cruda, Almendra cruda con piel
 fr: Amandes décortiqués crues, Amandes crues
 ro: Migdale crude
+bulk_proxy_category:en: en:almonds
 expected_ingredients:en: en:almond
+sales_format:en: package, weight
 
 < en:Shelled almonds
-en: Salted almonds
+en: Almonds(salted), Salted almonds
 de: Gesalzene Mandeln
 es: Almendras saladas, Almendra con sal
 fi: suolatut mantelit
@@ -66347,6 +66381,7 @@ protected_name_file_number:en: PGI-ES-1133
 protected_name_type:en: pgi
 #wikidata:en:
 
+< en:Almonds
 < en:Spanish fruits
 es: Almendra de Mallorca, Almendra Mallorquina, Ametlla de Mallorca, Ametlla Mallorquina
 origins:en: en:spain
@@ -89673,6 +89708,10 @@ it: salami e salsicce stagionate
 nl: Worstjes
 pt: Charcutarias curadas
 
+< en: Cured sausages
+en: Pepperoni
+xx: Pepperoni
+
 < en:Cured sausages
 en: Strolghino
 it: Strolghino
@@ -94462,7 +94501,7 @@ fr: Cône pour glace, Cornet pour glace
 hr: Kornet oblatna za sladoled
 it: Cialda per gelato
 ja: アイスクリーム・コーン, アイスクリーム・コーン
-nl: IJs hoorntje
+nl: Hoorntje voor ijs
 agribalyse_food_code:en: 24685
 ciqual_food_code:en: 24685
 ciqual_food_name:en: Cone, wafer for ice cream
@@ -103653,7 +103692,11 @@ wikidata:en: Q6584340
 < en:Sweet spreads
 < en:Syrups
 en: Thick syrups
-nl: Stropen
+de: Lütticher Sirups
+es: Sirope de Lieja
+fr: Sirops de Liège
+nl: Stropen, Luikse siroop
+ru: Льежский сироп
 
 < en:Thick syrups
 en: Thick sugar syrups, Thick sugar syrup
@@ -104809,7 +104852,6 @@ tr: Enginar
 agribalyse_food_code:en: 20052
 ciqual_food_code:en: 20052
 ciqual_food_name:en: Artichoke, globe, raw
-expected_ingredients:en: en:artichoke
 
 < en:Artichokes
 it: Carciofo Spinoso di Sardegna
@@ -104873,6 +104915,7 @@ ciqual_food_name:fr: Artichaut, cuit
 en: Fresh artichokes, Artichoke globe
 fr: Artichauts frais
 nl: Verse artisjokken
+expected_ingredients:en: en:artichoke
 season_in_country_fr:en: 5,6,7,8,9
 
 < en:Artichokes
@@ -106996,7 +107039,6 @@ agribalyse_food_code:en: 20041
 ciqual_food_code:en: 20041
 ciqual_food_name:en: Sweet pepper, green, yellow or red, raw
 ciqual_food_name:fr: Poivron, vert, jaune ou rouge, cru
-expected_ingredients:en: en:sweet pepper
 intake24_category_code:en: PPRS
 intake24_category_code:fr: PPRS
 
@@ -115535,21 +115577,21 @@ ciqual_food_code:en: 23412
 ciqual_food_name:en: Pastry, short crust, baked
 ciqual_food_name:fr: Pâte brisée, matière grasse végétale, cuite
 
-< en:Pie dough
+< en:Shortcrust pastry
 en: Raw shortcrust pastry
 fr: Pâte brisée crue
 ciqual_food_code:en: 23410
 ciqual_food_name:en: Short crust pastry, raw
 ciqual_food_name:fr: Pâte brisée, crue
 
-< en:Pie dough
+< en:Shortcrust pastry
 en: Raw shortcrust pastry with pure butter
 fr: Pâte brisée pur beurre crue
 ciqual_food_code:en: 23414
 ciqual_food_name:en: Short crust pastry, pure butter, raw
 ciqual_food_name:fr: Pâte brisée, pur beurre, crue
 
-< en:Pie dough
+< en:Shortcrust pastry
 en: Shortcrust pastry with pure butter
 fr: Pâte brisée pur beurre
 agribalyse_food_code:en: 23414
@@ -115653,6 +115695,10 @@ ciqual_food_code:en: 23440
 ciqual_food_name:en: Shortbread dough, raw
 ciqual_food_name:fr: Pâte sablée, crue
 
+< en: Shortbread dough
+en: Shortbread dough with vegetable fats
+fr: Pâte sablée crue à la matière grasse végétale
+
 < en:Shortbread dough
 en: Cooked shortbread dough
 fr: Pâte sablée cuite
diff --git a/taxonomies/origins.txt b/taxonomies/origins.txt
index a8d298d7715fa..1c22100c39e4f 100644
--- a/taxonomies/origins.txt
+++ b/taxonomies/origins.txt
@@ -5544,7 +5544,41 @@ postal_code:en: 6431
 wikidata:en: Q783094
 wikipedia:en: https://en.wikipedia.org/wiki/Hoensbroek
 
-############################### Spanish regions
+############################### Spanish provinces
+
+< en:spain
+en: Alicante
+xx: Alicante
+wikipedia:en: https://en.wikipedia.org/wiki/Province_of_Alicante
+
+< en:spain
+en: Balearic Islands
+ca: Illes Balears
+es: Islas Baleares
+wikipedia:en: https://en.wikipedia.org/wiki/Balearic_Islands
+
+< en: Balearic Islands
+en: Ibiza
+xx: Ibiza
+ca: Eivissa
+wikipedia:en: https://en.wikipedia.org/wiki/Ibiza
+
+< en: Balearic Islands
+en: Mallorca
+xx: Mallorca
+wikipedia:en: https://en.wikipedia.org/wiki/Mallorca
+
+< en:spain
+es: Murcia
+xx: Murcia
+
+< en:spain
+es: Navarra
+xx: Navarra
+fr: Navarre
+pl: Nawarra
+
+#### popular regions
 
 < en:spain
 en: Andalusia
@@ -5557,7 +5591,10 @@ nl: Andalusië
 
 < en:spain
 en: Castilla-La Mancha
-es: Castilla-La Mancha
+xx: Castilla-La Mancha
+
+< en:spain
+en: Catalunya
 
 < en:spain
 en: Galicia
@@ -5567,11 +5604,7 @@ es: Galicia
 en: Castile and León
 es: Castilla y León
 
-< en:spain
-en: Navarra
-es: Navarra
-fr: Navarre
-pl: Nawarra
+
 
 # UK origins