From f7a558cbbfbb3812ed1db8cb0006d528027c5223 Mon Sep 17 00:00:00 2001
From: Arnaud Leene <aleene@gmail.com>
Date: Sat, 12 Dec 2020 16:51:10 +0100
Subject: [PATCH 1/4] Added agribalyse to choclate bonbons
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bonbon / bouchée au chocolat fourrage gaufrettes / biscuit

31091
---
 taxonomies/categories.txt | 47 ++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/taxonomies/categories.txt b/taxonomies/categories.txt
index 925b7e9bfa189..dc7afc12c9e5b 100755
--- a/taxonomies/categories.txt
+++ b/taxonomies/categories.txt
@@ -27286,29 +27286,13 @@ nl:Pralines, chocolades snoepjes
 pt:Bombons
 ru:Конфеты
 wikidata:en:Q3272827
+agribalyse_food_code:en:31091
+ciqual_food_code:en:31091
+ciqual_food_name:en:Chocolate confectionery, filled with wafer
+ciqual_food_name:fr:Bonbon / bouchée au chocolat fourrage gaufrettes / biscuit
 
-<en:Candies
-en:French candies
-fr:Bonbons français
-
-<en:French candies
-fr:Bêtises de Cambrai
-
-<en:Candies
-fr:Sucres d'orge
-
-<en:Candies
 en:Candy canes
 
-<en:Candies
-en:Root beer barrels candies
-fr:Bonbons tonneaux de Root Beer
-
-<en:French candies
-fr:Bergamote de Nancy, Bergamotes de Nancy
-protected_name_file_number:en: PGI-FR-0195
-protected_name_type:en: pgi
-origins:en: en:France
 
 <en:Bonbons
 en:Milk chocolate candies
@@ -27606,6 +27590,29 @@ ciqual_food_name:fr:Bonbon dur et sucette
 <en:Candies
 nl:Drop
 
+<en:Candies
+en:French candies
+fr:Bonbons français
+
+<en:French candies
+fr:Bêtises de Cambrai
+
+<en:Candies
+fr:Sucres d'orge
+
+<en:Candies
+en:Candy canes
+
+<en:Candies
+en:Root beer barrels candies
+fr:Bonbons tonneaux de Root Beer
+
+<en:French candies
+fr:Bergamote de Nancy, Bergamotes de Nancy
+protected_name_file_number:en: PGI-FR-0195
+protected_name_type:en: pgi
+origins:en: en:France
+
 <en:Nut confectioneries
 en:French pralines
 de:Französciche pralinen

From 16e44d8074050c1dd19920a349b51e1febe42ee8 Mon Sep 17 00:00:00 2001
From: Arnaud Leene <aleene@gmail.com>
Date: Sat, 12 Dec 2020 16:51:31 +0100
Subject: [PATCH 2/4] Update categories.txt

---
 taxonomies/categories.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/taxonomies/categories.txt b/taxonomies/categories.txt
index dc7afc12c9e5b..9d1fc4b332b4b 100755
--- a/taxonomies/categories.txt
+++ b/taxonomies/categories.txt
@@ -27291,8 +27291,6 @@ ciqual_food_code:en:31091
 ciqual_food_name:en:Chocolate confectionery, filled with wafer
 ciqual_food_name:fr:Bonbon / bouchée au chocolat fourrage gaufrettes / biscuit
 
-en:Candy canes
-
 
 <en:Bonbons
 en:Milk chocolate candies

From 414c02088a105b9693f139353375422b57407132 Mon Sep 17 00:00:00 2001
From: Arnaud Leene <aleene@gmail.com>
Date: Thu, 11 Nov 2021 12:34:19 +0100
Subject: [PATCH 3/4] suggestions

---
 taxonomies/categories.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/taxonomies/categories.txt b/taxonomies/categories.txt
index 9d1fc4b332b4b..53b7346d5600d 100755
--- a/taxonomies/categories.txt
+++ b/taxonomies/categories.txt
@@ -27288,7 +27288,7 @@ ru:Конфеты
 wikidata:en:Q3272827
 agribalyse_food_code:en:31091
 ciqual_food_code:en:31091
-ciqual_food_name:en:Chocolate confectionery, filled with wafer
+ciqual_proxy_food_name:en:Chocolate confectionery, filled with wafer
 ciqual_food_name:fr:Bonbon / bouchée au chocolat fourrage gaufrettes / biscuit
 
 
@@ -27344,7 +27344,7 @@ ciqual_food_name:fr:Rocher chocolat fourré praliné
 <en:Bonbons
 en:Chocolate confectioneries filled with wafer
 fr:Bonbons de chocolat fourrés aux gaufrettes, Bonbons au chocolat fourrés au biscuit, Bouchées au chocolat fourrées aux gaufrettes, Bouchées au chocolat fourrées au biscuit
-agribalyse_food_code:en:31091
+agribalyse_proxy_food_code:en:31091
 ciqual_food_code:en:31091
 ciqual_food_name:en:Chocolate confectionery, filled with wafer
 ciqual_food_name:fr:Bonbon / bouchée au chocolat fourrage gaufrettes / biscuit

From 6ebf2d64c93f7a82ca40ae62eebcc01f10404a49 Mon Sep 17 00:00:00 2001
From: Arnaud Leene <aleene@gmail.com>
Date: Thu, 11 Nov 2021 12:37:02 +0100
Subject: [PATCH 4/4] forgot one

---
 taxonomies/categories.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/taxonomies/categories.txt b/taxonomies/categories.txt
index 53b7346d5600d..0927cac8a232e 100755
--- a/taxonomies/categories.txt
+++ b/taxonomies/categories.txt
@@ -27287,7 +27287,7 @@ pt:Bombons
 ru:Конфеты
 wikidata:en:Q3272827
 agribalyse_food_code:en:31091
-ciqual_food_code:en:31091
+ciqual_proxy_food_code:en:31091
 ciqual_proxy_food_name:en:Chocolate confectionery, filled with wafer
 ciqual_food_name:fr:Bonbon / bouchée au chocolat fourrage gaufrettes / biscuit