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/categories_cuisines.txt b/data/categories_cuisines.txt index 0aa9862566..edaaa49824 100644 --- a/data/categories_cuisines.txt +++ b/data/categories_cuisines.txt @@ -2157,6 +2157,12 @@ sk:Vegánske jedlá|Vegetariánske jedlá # he:מטבח יפני # sk:Japonská kuchyňa +# cuisine-juice +# en = Juice|Smoothies +# es = Zumo +# zh-Hans = 蔬果汁 +# zh-Hant = 果汁 + # cuisine-korean # en:Korean cuisine # ru:Корейская diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index b210ff295d..cb4ce9e442 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -409,7 +409,7 @@ deprecated:sport|football:10.2021;329;sport|soccer highway|steps|bridge;[highway=steps][bridge?];;name;int_name;330; highway|track|tunnel;[highway=track][tunnel?];;name;int_name;331; highway|pedestrian|tunnel;[highway=pedestrian][tunnel?],[highway=pedestrian][location=underground];;name;int_name;332; -deprecated|deprecated;333;x +cuisine|juice;333 sport|cricket;334; sport|bowls;335; highway|path|tunnel;[highway=path][tunnel?],[highway=path][location=underground];;name;int_name;336; diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 4ed6c68b05..0a7d24511c 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -9167,6 +9167,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 diff --git a/data/types.txt b/data/types.txt index 5ccbca1812..fb2ffaddb2 100644 --- a/data/types.txt +++ b/data/types.txt @@ -1244,6 +1244,7 @@ leisure|sports_centre *cuisine|sandwich *cuisine|german *cuisine|japanese +*cuisine|juice *cuisine|kebab *cuisine|mexican *cuisine|indian