From 4b400555eb98d2d516013e12b8d7ceaba1614238 Mon Sep 17 00:00:00 2001 From: TheAdventurer64 <50059322+TheAdventurer64@users.noreply.github.com> Date: Fri, 5 Aug 2022 23:45:01 -1000 Subject: [PATCH 1/9] Added juice --- data/mapcss-mapping.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index bf676e2f04..0762e32d34 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1350,3 +1350,4 @@ recycling|cans;[recycling:cans=yes];;name;int_name;1351; recycling|shoes;[recycling:shoes=yes];;name;int_name;1352; recycling|green_waste;[recycling:green_waste=yes];;name;int_name;1353; recycling|cartons;[recycling:cartons=yes];;name;int_name;1354; +cuisine|juice;1355; -- 2.45.3 From 5b9a1eda743efb101b3d7a20d5b0cf3cc942fc82 Mon Sep 17 00:00:00 2001 From: TheAdventurer64 <50059322+TheAdventurer64@users.noreply.github.com> Date: Fri, 5 Aug 2022 23:49:03 -1000 Subject: [PATCH 2/9] Adds juice languages --- data/strings/types_strings.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 0f3e082b2b..41411639a7 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -6896,6 +6896,13 @@ vi = Ẩm thực nhật bản zh-Hans = 日本菜 zh-Hant = 日本料理 + + [type.cuisine.juice] + en = Juice + es = Zumo + zh-Hant = 果汁 + zh = 蔬果汁 + [type.cuisine.kebab] en = Kebab -- 2.45.3 From b5a5fe6f0ae10ea37dd307cbc401a3207acbec2e Mon Sep 17 00:00:00 2001 From: TheAdventurer64 <50059322+TheAdventurer64@users.noreply.github.com> Date: Fri, 5 Aug 2022 23:52:40 -1000 Subject: [PATCH 3/9] Updated translations --- data/categories_cuisines.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/categories_cuisines.txt b/data/categories_cuisines.txt index f5305cd14b..98e1db865a 100644 --- a/data/categories_cuisines.txt +++ b/data/categories_cuisines.txt @@ -2115,6 +2115,12 @@ sk:Vegánske jedlá|Vegetariánske jedlá # he:מטבח יפני # sk:Japonská kuchyňa +# cuisine-juice +# en = Juice|Smoothies +# es = Zumo +# zh-Hant = 果汁 +# zh = 蔬果汁 + # cuisine-korean # en:Korean cuisine # ru:Корейская -- 2.45.3 From fe92cbea6b35db1cb28f5c966497d302234d91e0 Mon Sep 17 00:00:00 2001 From: TheAdventurer64 <50059322+TheAdventurer64@users.noreply.github.com> Date: Fri, 5 Aug 2022 23:55:12 -1000 Subject: [PATCH 4/9] Update types.txt --- data/types.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/types.txt b/data/types.txt index 105639102c..eda9efe1a4 100644 --- a/data/types.txt +++ b/data/types.txt @@ -19,7 +19,6 @@ landuse|forest *place|locality *natural|coastline *place|village -mapswithme *waterway|river *hwtag|oneway *hwtag|private @@ -1244,6 +1243,7 @@ mapswithme *cuisine|sandwich *cuisine|german *cuisine|japanese +*cuisine|juice *cuisine|kebab *cuisine|mexican *cuisine|indian -- 2.45.3 From f6e407381d32c4ec7a51005cf7de142f5a3154dc Mon Sep 17 00:00:00 2001 From: TheAdventurer64 <50059322+TheAdventurer64@users.noreply.github.com> Date: Fri, 5 Aug 2022 23:56:31 -1000 Subject: [PATCH 5/9] Update visibility.txt --- data/visibility.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/data/visibility.txt b/data/visibility.txt index aa341361fc..6400577923 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -274,6 +274,7 @@ world 00000000000000000000 + italian 00000000000000000000 - italian_pizza 00000000000000000000 - japanese 00000000000000000000 - + juice 00000000000000000000 - kebab 00000000000000000000 - korean 00000000000000000000 - lao 00000000000000000000 - -- 2.45.3 From c5c104e58a21a17cd62e470236eedff70b0e1a58 Mon Sep 17 00:00:00 2001 From: TheAdventurer64 <50059322+TheAdventurer64@users.noreply.github.com> Date: Thu, 8 Sep 2022 18:27:29 -1000 Subject: [PATCH 6/9] Fixed typo --- data/categories_cuisines.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/categories_cuisines.txt b/data/categories_cuisines.txt index 98e1db865a..0a8c0e3b27 100644 --- a/data/categories_cuisines.txt +++ b/data/categories_cuisines.txt @@ -2118,8 +2118,8 @@ sk:Vegánske jedlá|Vegetariánske jedlá # cuisine-juice # en = Juice|Smoothies # es = Zumo +# zh-Hans = 蔬果汁 # zh-Hant = 果汁 -# zh = 蔬果汁 # cuisine-korean # en:Korean cuisine -- 2.45.3 From a6a0acc1495891df5fede29688b609902a5b0309 Mon Sep 17 00:00:00 2001 From: TheAdventurer64 <50059322+TheAdventurer64@users.noreply.github.com> Date: Fri, 30 Sep 2022 22:42:23 -1000 Subject: [PATCH 7/9] Update data/strings/types_strings.txt Co-authored-by: Alexander Borsuk <170263+biodranik@users.noreply.github.com> --- data/strings/types_strings.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 41411639a7..e01f04b206 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -6897,7 +6897,7 @@ zh-Hans = 日本菜 zh-Hant = 日本料理 - [type.cuisine.juice] + [type.cuisine.juice] en = Juice es = Zumo zh-Hant = 果汁 -- 2.45.3 From 537ccf0839f933fc91a9443ddf31f952b2244465 Mon Sep 17 00:00:00 2001 From: TheAdventurer64 <50059322+TheAdventurer64@users.noreply.github.com> Date: Sat, 16 Dec 2023 15:58:38 -1000 Subject: [PATCH 8/9] Updating 3party --- 3party/boost.orig | 1 + 3party/expat.orig | 1 + 3party/fast_double_parser.orig | 1 + 3party/freetype/freetype.orig | 1 + 3party/googletest.orig | 1 + 3party/icu/icu.orig | 1 + 3party/pugixml/pugixml.orig | 1 + 7 files changed, 7 insertions(+) create mode 160000 3party/boost.orig create mode 160000 3party/expat.orig create mode 160000 3party/fast_double_parser.orig create mode 160000 3party/freetype/freetype.orig create mode 160000 3party/googletest.orig create mode 160000 3party/icu/icu.orig create mode 160000 3party/pugixml/pugixml.orig diff --git a/3party/boost.orig b/3party/boost.orig new file mode 160000 index 0000000000..ecdd60e74c --- /dev/null +++ b/3party/boost.orig @@ -0,0 +1 @@ +Subproject commit ecdd60e74c0d43b9710d05f56967b1a01d7c9518 diff --git a/3party/expat.orig b/3party/expat.orig new file mode 160000 index 0000000000..1bb22cd03a --- /dev/null +++ b/3party/expat.orig @@ -0,0 +1 @@ +Subproject commit 1bb22cd03ab1ad48efb2bdee08cb805b5b593ea5 diff --git a/3party/fast_double_parser.orig b/3party/fast_double_parser.orig new file mode 160000 index 0000000000..111ad80417 --- /dev/null +++ b/3party/fast_double_parser.orig @@ -0,0 +1 @@ +Subproject commit 111ad8041765d1623195bd6eb8b6bc7d97c44507 diff --git a/3party/freetype/freetype.orig b/3party/freetype/freetype.orig new file mode 160000 index 0000000000..4eb6cb8818 --- /dev/null +++ b/3party/freetype/freetype.orig @@ -0,0 +1 @@ +Subproject commit 4eb6cb8818057a022f97176b53738ee3098c8eb6 diff --git a/3party/googletest.orig b/3party/googletest.orig new file mode 160000 index 0000000000..e2f3978937 --- /dev/null +++ b/3party/googletest.orig @@ -0,0 +1 @@ +Subproject commit e2f3978937c0244508135f126e2617a7734a68be diff --git a/3party/icu/icu.orig b/3party/icu/icu.orig new file mode 160000 index 0000000000..904cf62457 --- /dev/null +++ b/3party/icu/icu.orig @@ -0,0 +1 @@ +Subproject commit 904cf62457de2440e8526deb75c95a3f7296f517 diff --git a/3party/pugixml/pugixml.orig b/3party/pugixml/pugixml.orig new file mode 160000 index 0000000000..effc46f0ed --- /dev/null +++ b/3party/pugixml/pugixml.orig @@ -0,0 +1 @@ +Subproject commit effc46f0ed35a70a53db7f56e37141ae3cb3a92a -- 2.45.3 From 155266d0d0416aadaaa194677fda7cfef28e875e Mon Sep 17 00:00:00 2001 From: TheAdventurer64 <50059322+TheAdventurer64@users.noreply.github.com> Date: Fri, 30 Sep 2022 22:42:23 -1000 Subject: [PATCH 9/9] Update data/strings/types_strings.txt Update data/strings/types_strings.txt Co-authored-by: Alexander Borsuk <170263+biodranik@users.noreply.github.com> Updating 3party --- 3party/boost.orig | 1 + 3party/expat.orig | 1 + 3party/fast_double_parser.orig | 1 + 3party/freetype/freetype.orig | 1 + 3party/googletest.orig | 1 + 3party/icu/icu.orig | 1 + 3party/pugixml/pugixml.orig | 1 + data/strings/types_strings.txt | 2 +- 8 files changed, 8 insertions(+), 1 deletion(-) create mode 160000 3party/boost.orig create mode 160000 3party/expat.orig create mode 160000 3party/fast_double_parser.orig create mode 160000 3party/freetype/freetype.orig create mode 160000 3party/googletest.orig create mode 160000 3party/icu/icu.orig create mode 160000 3party/pugixml/pugixml.orig diff --git a/3party/boost.orig b/3party/boost.orig new file mode 160000 index 0000000000..ecdd60e74c --- /dev/null +++ b/3party/boost.orig @@ -0,0 +1 @@ +Subproject commit ecdd60e74c0d43b9710d05f56967b1a01d7c9518 diff --git a/3party/expat.orig b/3party/expat.orig new file mode 160000 index 0000000000..1bb22cd03a --- /dev/null +++ b/3party/expat.orig @@ -0,0 +1 @@ +Subproject commit 1bb22cd03ab1ad48efb2bdee08cb805b5b593ea5 diff --git a/3party/fast_double_parser.orig b/3party/fast_double_parser.orig new file mode 160000 index 0000000000..111ad80417 --- /dev/null +++ b/3party/fast_double_parser.orig @@ -0,0 +1 @@ +Subproject commit 111ad8041765d1623195bd6eb8b6bc7d97c44507 diff --git a/3party/freetype/freetype.orig b/3party/freetype/freetype.orig new file mode 160000 index 0000000000..4eb6cb8818 --- /dev/null +++ b/3party/freetype/freetype.orig @@ -0,0 +1 @@ +Subproject commit 4eb6cb8818057a022f97176b53738ee3098c8eb6 diff --git a/3party/googletest.orig b/3party/googletest.orig new file mode 160000 index 0000000000..e2f3978937 --- /dev/null +++ b/3party/googletest.orig @@ -0,0 +1 @@ +Subproject commit e2f3978937c0244508135f126e2617a7734a68be diff --git a/3party/icu/icu.orig b/3party/icu/icu.orig new file mode 160000 index 0000000000..904cf62457 --- /dev/null +++ b/3party/icu/icu.orig @@ -0,0 +1 @@ +Subproject commit 904cf62457de2440e8526deb75c95a3f7296f517 diff --git a/3party/pugixml/pugixml.orig b/3party/pugixml/pugixml.orig new file mode 160000 index 0000000000..effc46f0ed --- /dev/null +++ b/3party/pugixml/pugixml.orig @@ -0,0 +1 @@ +Subproject commit effc46f0ed35a70a53db7f56e37141ae3cb3a92a diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 41411639a7..e01f04b206 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -6897,7 +6897,7 @@ zh-Hans = 日本菜 zh-Hant = 日本料理 - [type.cuisine.juice] + [type.cuisine.juice] en = Juice es = Zumo zh-Hant = 果汁 -- 2.45.3