Correctly use “Coffee” for cuisine, to avoid confusing with “Cafe * Cafe” in some languages.

data/cuisines.txt

@@ -161,35 +161,36 @@
 
   [coffee_shop]
     tags = android, ios
-    en = Coffee Shop
-    ru = Кафе
-    uk = Кав'ярня
-    tr = Kafe
-    es = Cafetería
-    sv = Kafé
-    sk = Kaviareň
-    pt = Cafeteria
-    ro = Cafenea
-    pl = Kawiarnia
-    ko = 커피 샵
-    id = Kafe
-    hu = Kávézó
-    de = Café
+    en = Coffee
+    ar = ﺓﻮﻬﻗ
+    cs = Káva
+    da = Kaffe
+    de = Kaffee
+    el = Καφές
+    es = Café
+    fi = Kahvi
     fr = Café
-    nl = Koffiehuis
-    fi = Kahvila
-    da = Café
-    cs = Kavárna
-    it = Bar caffetteria
-    nb = Kafé
-    zh-Hant = 咖啡_館
-    zh-Hans = 咖啡_馆
-    vi = Tiệm_cà phê
-    th = ร้านกาแฟ
-    ja = コーヒーショップ
-    el = Καφετέρια
-    ar = مقهى
-    he = בית קפה
+    he = הֶפָק
+    hu = Kávé
+    id = Kopi
+    it = Caffè
+    ja = コーヒー
+    ko = 커피
+    nb = Kaffe
+    nl = Koffie
+    pl = Kawa
+    pt = Café
+    ro = Cafea
+    ru = Кофе
+    sk = Káva
+    sv = Kaffe
+    sw = Kahawa
+    th = กาแฟ
+    tr = Kahve
+    uk = Кава
+    vi = Cà phê
+    zh-Hans = 咖啡
+    zh-Hant = 咖啡
 
   [sandwich]
     tags = android, ios
@@ -2495,38 +2496,6 @@
     ar = مطبخ لاوي
     he = מטבח לאו
 
-  [coffee]
-    tags = android, ios
-    en = Coffee
-    ru = Кофейня
-    uk = Кав'ярня
-    tr = Kahve
-    es = Café
-    sv = Kaffe
-    sk = Káva
-    pt = Café
-    ro = Cafea
-    pl = Kawa
-    ko = 커피
-    id = Kopi
-    hu = Kávé
-    de = Café
-    fr = Café
-    nl = Koffie
-    fi = Kahvi
-    da = Kaffe
-    cs = Káva
-    it = Caffè
-    nb = Kaffe
-    zh-Hant = 咖啡
-    zh-Hans = 咖啡
-    vi = Cà phê
-    th = กาแฟ
-    ja = コーヒー
-    el = Καφές
-    ar = قهوة
-    he = קפה
-
   [hotdog]
     tags = android, ios
     en = Hotdog

generator/osm2meta.cpp

@@ -200,6 +200,8 @@ string MetadataTagProcessorImpl::ValidateAndFormat_cuisine(string v) const
       normalized = "donut";
     if (normalized == "steak")
       normalized = "steak_house";
+    if (normalized == "coffee")
+      normalized = "coffee_shop";
     collector(normalized);
     ++iter;
   }

strings.txt

@@ -9013,35 +9013,36 @@
   [cuisine_coffee_shop]
     tags = android, ios
     comment = Cuisine
-    en = coffee shop
-    ru = кафе
-    uk = кав'ярня
-    tr = kafe
-    es = cafetería
-    sv = kafé
-    sk = kaviareň
-    pt = cafeteria
-    ro = cafenea
-    pl = kawiarnia
-    ko = 커피 샵
-    id = kafe
-    hu = kávézó
-    de = Café
-    fr = café
-    nl = koffiehuis
-    fi = kahvila
-    da = café
-    cs = kavárna
-    it = bar caffetteria
-    nb = kafé
-    zh-Hant = 咖啡_館
-    zh-Hans = 咖啡_馆
-    vi = tiệm_cà phê
-    th = ร้านกาแฟ
-    ja = コーヒーショップ
-    el = καφετέρια
-    ar = مقهى
-    he = בית קפה
+    en = Coffee
+    ar = ﺓﻮﻬﻗ
+    cs = Káva
+    da = Kaffe
+    de = Kaffee
+    el = Καφές
+    es = Café
+    fi = Kahvi
+    fr = Café
+    he = הֶפָק
+    hu = Kávé
+    id = Kopi
+    it = Caffè
+    ja = コーヒー
+    ko = 커피
+    nb = Kaffe
+    nl = Koffie
+    pl = Kawa
+    pt = Café
+    ro = Cafea
+    ru = Кофе
+    sk = Káva
+    sv = Kaffe
+    sw = Kahawa
+    th = กาแฟ
+    tr = Kahve
+    uk = Кава
+    vi = Cà phê
+    zh-Hans = 咖啡
+    zh-Hant = 咖啡
 
   [cuisine_sandwich]
     tags = android, ios
@@ -11419,39 +11420,6 @@
     ar = مطبخ لاوي
     he = מטבח לאו
 
-  [cuisine_coffee]
-    tags = android, ios
-    comment = Cuisine
-    en = coffee
-    ru = кофейня
-    uk = кав'ярня
-    tr = kahve
-    es = café
-    sv = kaffe
-    sk = káva
-    pt = café
-    ro = cafea
-    pl = kawa
-    ko = 커피
-    id = kopi
-    hu = kávé
-    de = Café
-    fr = café
-    nl = koffie
-    fi = kahvi
-    da = kaffe
-    cs = káva
-    it = caffè
-    nb = kaffe
-    zh-Hant = 咖啡
-    zh-Hans = 咖啡
-    vi = cà phê
-    th = กาแฟ
-    ja = コーヒー
-    el = καφές
-    ar = قهوة
-    he = קפה
-
   [cuisine_hotdog]
     tags = android, ios
     comment = Cuisine