]> git.openstreetmap.org Git - rails.git/blobdiff - vendor/assets/iD/iD/locales/et.json
projects / rails.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge remote-tracking branch 'upstream/pull/1824'
[rails.git] / vendor / assets / iD / iD / locales / et.json
diff --git a/vendor/assets/iD/iD/locales/et.json b/vendor/assets/iD/iD/locales/et.json
index 70aee77b37ee213d872339d4037b29b97c25ba97..a1c778704b1af4c5712d77931561d4d105941f82 100644 (file)
--- a/vendor/assets/iD/iD/locales/et.json
+++ b/vendor/assets/iD/iD/locales/et.json
@@ -117,6 +117,10 @@
                     "single": "Seda objekti ei saa kustutada, sest piisavalt suur osa sellest pole praegu nähtaval.",
                     "multiple": "Neid objekte ei saa kustutada, sest piisavalt suur osa neist pole praegu nähtaval."
                 },
                     "single": "Seda objekti ei saa kustutada, sest piisavalt suur osa sellest pole praegu nähtaval.",
                     "multiple": "Neid objekte ei saa kustutada, sest piisavalt suur osa neist pole praegu nähtaval."
                 },
+                "incomplete_relation": {
+                    "single": "Seda objekti ei saa kustutada, kuna see ei ole veel täielikult alla laaditud.",
+                    "multiple": "Neid objekte ei saa kustutada, kuna need ei ole veel täielikult alla laaditud."
+                },
                 "part_of_relation": {
                     "single": "Objekti ei saa kustutada, sest see on osa suuremast relatsioonist. Pead kõigepealt selle relatsioonist eemaldama.",
                     "multiple": "Objekte ei saa kustutada, sest need on osa suurematest relatsioonidest. Pead kõigepealt need relatsioonidest eemaldama."
                 "part_of_relation": {
                     "single": "Objekti ei saa kustutada, sest see on osa suuremast relatsioonist. Pead kõigepealt selle relatsioonist eemaldama.",
                     "multiple": "Objekte ei saa kustutada, sest need on osa suurematest relatsioonidest. Pead kõigepealt need relatsioonidest eemaldama."
@@ -207,6 +211,10 @@
                         "multiple": "Objektid peegeldatud lühkest telge pidi."
                     }
                 },
                         "multiple": "Objektid peegeldatud lühkest telge pidi."
                     }
                 },
+                "incomplete_relation": {
+                    "single": "Seda objekti ei saa peegeldada, kuna see ei ole veel täielikult alla laaditud.",
+                    "multiple": "Neid objekte ei saa peegeldada, kuna need ei ole veel täielikult alla laaditud."
+                },
                 "too_large": {
                     "single": "Seda objekti ei saa peegeldada, sest piisavalt suur osa sellest pole praegu nähtaval.",
                     "multiple": "Neid objekte ei saa peegeldada, sest piisavalt suur osa neist pole praegu nähtaval."
                 "too_large": {
                     "single": "Seda objekti ei saa peegeldada, sest piisavalt suur osa sellest pole praegu nähtaval.",
                     "multiple": "Neid objekte ei saa peegeldada, sest piisavalt suur osa neist pole praegu nähtaval."
@@ -224,6 +232,10 @@
                     "area": "Pööratud ala.",
                     "multiple": "Pööratud mitut objekti."
                 },
                     "area": "Pööratud ala.",
                     "multiple": "Pööratud mitut objekti."
                 },
+                "incomplete_relation": {
+                    "single": "Seda objekti ei saa pöörata, kuna see ei ole veel täielikult alla laaditud.",
+                    "multiple": "Neid objekte ei saa pöörata, kuna need ei ole veel täielikult alla laaditud."
+                },
                 "too_large": {
                     "single": "Seda objekti ei saa pöörata, sest piisavalt suur osa sellest pole praegu nähtaval.",
                     "multiple": "Neid objekte ei saa pöörata, sest piisavalt suur osa neist pole praegu nähtaval."
                 "too_large": {
                     "single": "Seda objekti ei saa pöörata, sest piisavalt suur osa sellest pole praegu nähtaval.",
                     "multiple": "Neid objekte ei saa pöörata, sest piisavalt suur osa neist pole praegu nähtaval."
@@ -250,11 +262,6 @@
                 "connected_to_hidden": "Seda ei saa tükeldada, kuna see on ühendatud peidetud objektiga."
             },
             "restriction": {
                 "connected_to_hidden": "Seda ei saa tükeldada, kuna see on ühendatud peidetud objektiga."
             },
             "restriction": {
-                "help": {
-                    "toggle": "Klõpsa, et vahetada pöörde piiranguid.",
-                    "toggle_on": "Klõpsa, et lisada piirang \"{restriction}\".",
-                    "toggle_off": "Klõpsa, et eemaldada piirang \"{restriction}\"."
-                },
                 "annotation": {
                     "create": "Lisatud pöörde piirang",
                     "delete": "Kustutatud pöörde piirang"
                 "annotation": {
                     "create": "Lisatud pöörde piirang",
                     "delete": "Kustutatud pöörde piirang"
@@ -277,7 +284,7 @@
             "localized_translation_language": "Vali keel",
             "localized_translation_name": "Nimi"
         },
             "localized_translation_language": "Vali keel",
             "localized_translation_name": "Nimi"
         },
-        "zoom_in_edit": "Muutmiseks suumi sisse",
+        "zoom_in_edit": "Suurenda, et redigeerida",
         "login": "Logi sisse",
         "logout": "Logi välja",
         "loading_auth": "OpenStreetMapiga ühendamine...",
         "login": "Logi sisse",
         "logout": "Logi välja",
         "loading_auth": "OpenStreetMapiga ühendamine...",
@@ -295,6 +302,7 @@
             "save": "Laadi üles",
             "cancel": "Loobu",
             "changes": "{count} muudatust",
             "save": "Laadi üles",
             "cancel": "Loobu",
             "changes": "{count} muudatust",
+            "download_changes": "Laadi alla osmChange-fail",
             "warnings": "Hoiatused",
             "modified": "Muudetud",
             "deleted": "Kustutatud",
             "warnings": "Hoiatused",
             "modified": "Muudetud",
             "deleted": "Kustutatud",
@@ -306,6 +314,22 @@
             "list": "Muutjad: {users}",
             "truncated_list": "Muutjad: {users} ja {count} teist"
         },
             "list": "Muutjad: {users}",
             "truncated_list": "Muutjad: {users} ja {count} teist"
         },
+        "info_panels": {
+            "background": {
+                "source": "Allikas",
+                "description": "Kirjeldus",
+                "resolution": "Resolutsioon",
+                "accuracy": "Täpsus"
+            },
+            "history": {
+                "title": "Ajalugu",
+                "version": "Versioon",
+                "last_edit": "Viimane muudatus",
+                "edited_by": "Muutis",
+                "changeset": "Muudatuskogum",
+                "unknown": "Teadmata"
+            }
+        },
         "geometry": {
             "point": "punkt",
             "vertex": "tipp",
         "geometry": {
             "point": "punkt",
             "vertex": "tipp",
@@ -367,25 +391,41 @@
         "background": {
             "title": "Taust",
             "description": "Tausta seaded",
         "background": {
             "title": "Taust",
             "description": "Tausta seaded",
-            "percent_brightness": "heledus {opacity}%",
+            "backgrounds": "Taustad",
             "none": "Puudub",
             "none": "Puudub",
+            "switch": "Vaheta tagasi selle tausta vastu",
             "custom": "Kohandatud",
             "custom_button": "Muuda kohandatud tausta",
             "custom": "Kohandatud",
             "custom_button": "Muuda kohandatud tausta",
-            "fix_misalignment": "Korrigeeri kattekaardi nihet",
+            "custom_prompt": "Sisesta paanide internetiaadressi vormel. Sobivad järgmised sõned:\n   - {zoom} või {z}, {x}, {y}, kui kasutad paaniskeemi Z/X/Y\n   - {-y} või {ty}, kui kasutad TMS-skeemi ümberpööratud Y-koordinaate\n   - {u}, kui kasutad ruutpaani skeemi (quadtile)\n   - {switch:a,b,c}, kui kasutad DNS-serveri multipleksimist\n\nNäide:\n{example}",
+            "overlays": "Ülekatted",
+            "imagery_source_faq": "Pildimaterjali teave / teata probleemist",
             "reset": "lähtesta",
             "reset": "lähtesta",
-            "offset": "Lohista alumist halli kasti, et sättida kattekaardi nihet või siseta nihe meetrites.",
+            "display_options": "Kuvasuvandid",
+            "brightness": "Heledus",
+            "contrast": "Kontrast",
+            "saturation": "Küllastus",
+            "sharpness": "Teravus",
             "minimap": {
             "minimap": {
-                "description": "Pisikaart",
+                "description": "Näita pisikaarti",
                 "tooltip": "Näita väljasuumitud kaarti, et aidata tuvastada kuvatud ala."
                 "tooltip": "Näita väljasuumitud kaarti, et aidata tuvastada kuvatud ala."
-            }
+            },
+            "fix_misalignment": "Korrigeeri pildimaterjali nihet",
+            "offset": "Lohista alumist halli kasti, et sättida kattekaardi nihet või siseta nihe meetrites."
         },
         "map_data": {
             "title": "Kaardi andmed",
             "description": "Kaardi andmed",
             "data_layers": "Andmekihid",
         },
         "map_data": {
             "title": "Kaardi andmed",
             "description": "Kaardi andmed",
             "data_layers": "Andmekihid",
+            "layers": {
+                "osm": {
+                    "tooltip": "Kaardiandmed OpenStreetMapist",
+                    "title": "OpenStreetMapi andmed"
+                }
+            },
             "fill_area": "Täida alad",
             "map_features": "Kaardikuva",
             "fill_area": "Täida alad",
             "map_features": "Kaardikuva",
-            "autohidden": "Need objektid on automaatselt peidetud, sest neid oleks ekraanil liiga palju. Suumi sisse, et neid muuta."
+            "autohidden": "Need objektid on automaatselt peidetud, sest neid oleks ekraanil liiga palju. Suumi sisse, et neid muuta.",
+            "osmhidden": "Need objektid on automaatselt peidetud, sest OpenStreetMapi kiht on peidetud."
         },
         "feature": {
             "points": {
         },
         "feature": {
             "points": {
@@ -475,6 +515,7 @@
                 "keep_remote": "Kasuta tema oma",
                 "restore": "Taasta",
                 "delete": "Jäta kustutatuna",
                 "keep_remote": "Kasuta tema oma",
                 "restore": "Taasta",
                 "delete": "Jäta kustutatuna",
+                "download_changes": "Või laadi alla osmChange-fail",
                 "done": "Kõik konfliktid lahendatud!",
                 "help": "Teine kasutaja muutis kaardil mõnd objekti, mida sinagi muutsid.\nKlõpsa allpool igal objektil, et näha konflikti üksikasju ja et valida, kas säilitada\nenda muudatused või teise kasutaja muudatused.\n"
             }
                 "done": "Kõik konfliktid lahendatud!",
                 "help": "Teine kasutaja muutis kaardil mõnd objekti, mida sinagi muutsid.\nKlõpsa allpool igal objektil, et näha konflikti üksikasju ja et valida, kas säilitada\nenda muudatused või teise kasutaja muudatused.\n"
             }
@@ -489,13 +530,7 @@
             }
         },
         "success": {
             }
         },
         "success": {
-            "edited_osm": "Sa täiendasid OSM-i!",
             "just_edited": "Täiendasid just OpenStreetMapi!",
             "just_edited": "Täiendasid just OpenStreetMapi!",
-            "view_on_osm": "Vaata OSM-is",
-            "facebook": "Jaga Facebookis",
-            "twitter": "Jaga Twitteris",
-            "google": "Jaga Google+-is",
-            "help_html": "Sinu muudatused peaksid ilmuma kihil \"Standard\" mõne minuti jooksul. Teiste kihtide ja teatud objektidega võib kauem minna.",
             "help_link_text": "Üksikasjad"
         },
         "confirm": {
             "help_link_text": "Üksikasjad"
         },
         "confirm": {
@@ -505,7 +540,7 @@
             "welcome": "Tere tulemast OpenStreetMapi redaktorisse iD",
             "text": "iD on kasutajasõbralik ja samas võimas töövahend parima vaba maailmakaardi täiendamiseks. See on versioon {version}. Rohkem infot võib leida veebilehelt {website} ja vigadest saab teatada lehel {github}.",
             "walkthrough": "Alusta tutvustust",
             "welcome": "Tere tulemast OpenStreetMapi redaktorisse iD",
             "text": "iD on kasutajasõbralik ja samas võimas töövahend parima vaba maailmakaardi täiendamiseks. See on versioon {version}. Rohkem infot võib leida veebilehelt {website} ja vigadest saab teatada lehel {github}.",
             "walkthrough": "Alusta tutvustust",
-            "start": "Alusta muutmist"
+            "start": "Redigeeri kohe"
         },
         "source_switch": {
             "live": "live",
         },
         "source_switch": {
             "live": "live",
@@ -524,13 +559,12 @@
             "untagged_line": "Sildistamata joon",
             "untagged_area": "Sildistamata ala",
             "untagged_relation": "Sildistamata relatsioon",
             "untagged_line": "Sildistamata joon",
             "untagged_area": "Sildistamata ala",
             "untagged_relation": "Sildistamata relatsioon",
-            "many_deletions": "Oled kustutamas {n} objekti. Kas oled sa kindel, et soovid seda teha? See kustutab need kaardilt, mida kõik näevad aadressil openstreetmap.org.",
             "tag_suggests_area": "Silt {tag} viitab, et joon peaks olema ala, kuid see pole ala.",
             "deprecated_tags": "Iganenud sildid: {tags}"
         },
         "zoom": {
             "tag_suggests_area": "Silt {tag} viitab, et joon peaks olema ala, kuid see pole ala.",
             "deprecated_tags": "Iganenud sildid: {tags}"
         },
         "zoom": {
-            "in": "Suurenda vaadet",
-            "out": "Vähenda vaadet"
+            "in": "Suurenda",
+            "out": "Vähenda"
         },
         "cannot_zoom": "Ei ole võimalik rohkem välja suumida selles vaates.",
         "full_screen": "Lülita täisekraanile",
         },
         "cannot_zoom": "Ei ole võimalik rohkem välja suumida selles vaates.",
         "full_screen": "Lülita täisekraanile",
@@ -541,19 +575,25 @@
             "browse": "Sirvi faili"
         },
         "mapillary_images": {
             "browse": "Sirvi faili"
         },
         "mapillary_images": {
-            "tooltip": "Tänava-tasandi fotod Mapillary'st",
-            "title": "Foto-kate (Mapillary)"
+            "tooltip": "Tänavatasandi fotod Mapillaryst",
+            "title": "Fotokate (Mapillary)"
         },
         "mapillary_signs": {
         },
         "mapillary_signs": {
-            "tooltip": "Liiklusmärgid Mapillary'st (Foto-kate peab olema lubatud)",
-            "title": "Liiklusmärgi-kate (Mapillary)"
+            "tooltip": "Liiklusmärgid Mapillaryst (fotokate peab olema lubatud)",
+            "title": "Liiklusmärkide kate (Mapillary)"
         },
         "mapillary": {
         },
         "mapillary": {
-            "view_on_mapillary": "Vaata seda fotot Mapillary's"
+            "view_on_mapillary": "Vaata seda fotot Mapillarys"
+        },
+        "openstreetcam_images": {
+            "tooltip": "Tänavatasandi fotod OpenStreetCamist",
+            "title": "Fotokate (OpenStreetCam)"
         },
         "help": {
             "title": "Abi",
         },
         "help": {
             "title": "Abi",
-            "imagery": "# Aerofoto\n\nAerofotod on kaardistamisel oluliseks algallikaks. Valik aerofotosid on kättesaadavad paremal asuva redaktori taustaseadete menüü kaudu, vaikimisi on taustaks [Bing Maps](http://www.bing.com/maps/) satelliitfoto.\n\nEesti puhul on reeglina kõige täpsemaks ning ajakohasemaks aerofotoks Maa-ameti ortokaart. Selleks, et avada OSM ID-redaktor vaikimisi Maa-ameti ortofoto taustaga, kasuta veebibrauseris aadressi http://www.openstreetmap.org/edit#background=custom:http://kaart.maakaart.ee/orto/{z}/{x}/{y}.jpeg&map=@zoom/@lon/@lat, milles @zoom/@lon/@lat asenda reaalsete väärtustega (näit. 15/59.3438/24.5892).\n\nMõnikord on aerofoto kaardiandmete suhtes nihkes. Kui märkad, et massiliselt objekte on nihkes siis ära asu kohe nende asukohti muutma vaid võrdle erinevaid aerofotosid ja vajadusel kohanda vastavalt aerofoto asendit taustaseadete menüü valiku 'Korrigeeri nihet' abil.\n"
+            "editing": {
+                "keyboard_h": "Kiirklahvid"
+            }
         },
         "intro": {
             "graph": {
         },
         "intro": {
             "graph": {
@@ -587,6 +627,15 @@
                 "start": "Alusta kaardistamist!"
             }
         },
                 "start": "Alusta kaardistamist!"
             }
         },
+        "shortcuts": {
+            "title": "Kiirklahvid",
+            "browsing": {
+                "display_options": {
+                    "background_switch": "Vaheta tagasi viimase tausta vastu",
+                    "minimap": "Lülita pisikaart sisse või välja"
+                }
+            }
+        },
         "presets": {
             "categories": {
                 "category-barrier": {
         "presets": {
             "categories": {
                 "category-barrier": {
@@ -761,19 +810,9 @@
                 "capacity": {
                     "label": "Mahtutavus"
                 },
                 "capacity": {
                     "label": "Mahtutavus"
                 },
-                "cardinal_direction": {
-                    "label": "Suund"
-                },
                 "castle_type": {
                     "label": "Tüüp"
                 },
                 "castle_type": {
                     "label": "Tüüp"
                 },
-                "clock_direction": {
-                    "label": "Suund",
-                    "options": {
-                        "anticlockwise": "Vastupäeva",
-                        "clockwise": "Päripäeva"
-                    }
-                },
                 "club": {
                     "label": "Tüüp"
                 },
                 "club": {
                     "label": "Tüüp"
                 },
@@ -849,6 +888,9 @@
                         "cycleway:right": "Paremas servas"
                     }
                 },
                         "cycleway:right": "Paremas servas"
                     }
                 },
+                "dance/style": {
+                    "label": "Tantsustiilid"
+                },
                 "date": {
                     "label": "Kuupäev"
                 },
                 "date": {
                     "label": "Kuupäev"
                 },
@@ -858,6 +900,46 @@
                 "denomination": {
                     "label": "Usulahk"
                 },
                 "denomination": {
                     "label": "Usulahk"
                 },
+                "direction": {
+                    "label": "Suund (kraade päripäeva)",
+                    "placeholder": "45, 90, 180, 270"
+                },
+                "direction_cardinal": {
+                    "label": "Suund",
+                    "options": {
+                        "E": "Ida",
+                        "ENE": "Idakirre",
+                        "ESE": "Idakagu",
+                        "N": "Põhi",
+                        "NE": "Kirre",
+                        "NNE": "Põhjakirre",
+                        "NNW": "Põhjaloe",
+                        "NW": "Loe",
+                        "S": "Lõuna",
+                        "SE": "Kagu",
+                        "SSE": "Lõunakagu",
+                        "SSW": "Lõunaedel",
+                        "SW": "Edel",
+                        "W": "Lääs",
+                        "WNW": "Lääneloe",
+                        "WSW": "Lääneedel"
+                    }
+                },
+                "direction_clock": {
+                    "label": "Suund",
+                    "options": {
+                        "anticlockwise": "Vastupäeva",
+                        "clockwise": "Päripäeva"
+                    }
+                },
+                "direction_vertex": {
+                    "label": "Suund",
+                    "options": {
+                        "backward": "Tagasi",
+                        "both": "Mõlemad / Kõik",
+                        "forward": "Edasi"
+                    }
+                },
                 "dock": {
                     "label": "Tüüp"
                 },
                 "dock": {
                     "label": "Tüüp"
                 },
@@ -912,6 +994,15 @@
                 "handrail": {
                     "label": "Käsipuu"
                 },
                 "handrail": {
                     "label": "Käsipuu"
                 },
+                "hashtags": {
+                    "label": "Soovitatud trellsildid"
+                },
+                "healthcare/speciality": {
+                    "label": "Erialad"
+                },
+                "horse_riding": {
+                    "label": "Ratsutamine"
+                },
                 "iata": {
                     "label": "IATA"
                 },
                 "iata": {
                     "label": "IATA"
                 },
@@ -958,6 +1049,10 @@
                 "maxspeed": {
                     "label": "Kiiruspiirang"
                 },
                 "maxspeed": {
                     "label": "Kiiruspiirang"
                 },
+                "maxspeed/advisory": {
+                    "label": "Soovitatav suurim kiirus",
+                    "placeholder": "30, 50, 70..."
+                },
                 "name": {
                     "label": "Nimi",
                     "placeholder": "Üldlevinud nimi (kui on)"
                 "name": {
                     "label": "Nimi",
                     "placeholder": "Üldlevinud nimi (kui on)"
@@ -1010,7 +1105,9 @@
                 "oneway": {
                     "label": "Ühesuunaline",
                     "options": {
                 "oneway": {
                     "label": "Ühesuunaline",
                     "options": {
+                        "alternating": "Vahelduv",
                         "no": "Ei",
                         "no": "Ei",
+                        "reversible": "Ümberpööratav",
                         "undefined": "Eeldatavasti mitte",
                         "yes": "Jah"
                     }
                         "undefined": "Eeldatavasti mitte",
                         "yes": "Jah"
                     }
@@ -1018,7 +1115,9 @@
                 "oneway_yes": {
                     "label": "Ühesuunaline",
                     "options": {
                 "oneway_yes": {
                     "label": "Ühesuunaline",
                     "options": {
+                        "alternating": "Vahelduv",
                         "no": "Ei",
                         "no": "Ei",
+                        "reversible": "Ümberpööratav",
                         "undefined": "Eeldatavasti Jah",
                         "yes": "Jah"
                     }
                         "undefined": "Eeldatavasti Jah",
                         "yes": "Jah"
                     }
@@ -1029,13 +1128,6 @@
                 "operator": {
                     "label": "Operaator"
                 },
                 "operator": {
                     "label": "Operaator"
                 },
-                "parallel_direction": {
-                    "label": "Suund",
-                    "options": {
-                        "backward": "Taha",
-                        "forward": "Ette"
-                    }
-                },
                 "park_ride": {
                     "label": "Pargi ja Reisi"
                 },
                 "park_ride": {
                     "label": "Pargi ja Reisi"
                 },
@@ -1067,15 +1159,19 @@
                 "railway": {
                     "label": "Tüüp"
                 },
                 "railway": {
                     "label": "Tüüp"
                 },
+                "railway/signal/direction": {
+                    "label": "Suund",
+                    "options": {
+                        "backward": "Tagasi",
+                        "both": "Mõlemad / Kõik",
+                        "forward": "Edasi"
+                    }
+                },
                 "recycling_accepts": {
                     "label": "Võtab vastu"
                 },
                 "recycling_accepts": {
                     "label": "Võtab vastu"
                 },
-                "recycling_type": {
-                    "label": "Ümbertöötluse tüüp",
-                    "options": {
-                        "centre": "Ümbertöötluskeskus",
-                        "container": "Konteiner"
-                    }
+                "ref/isil": {
+                    "label": "ISIL-kood"
                 },
                 "relation": {
                     "label": "Tüüp"
                 },
                 "relation": {
                     "label": "Tüüp"
@@ -1160,6 +1256,9 @@
                 "social_facility": {
                     "label": "Tüüp"
                 },
                 "social_facility": {
                     "label": "Tüüp"
                 },
+                "source": {
+                    "label": "Allikad"
+                },
                 "stop": {
                     "label": "Tüüp",
                     "options": {
                 "stop": {
                     "label": "Tüüp",
                     "options": {
@@ -1177,6 +1276,11 @@
                         "tunnel": "Tunnel"
                     }
                 },
                         "tunnel": "Tunnel"
                     }
                 },
+                "structure_waterway": {
+                    "options": {
+                        "tunnel": "Tunnel"
+                    }
+                },
                 "studio": {
                     "label": "Tüüp"
                 },
                 "studio": {
                     "label": "Tüüp"
                 },
@@ -1195,6 +1299,9 @@
                 "toll": {
                     "label": "Maksustatud"
                 },
                 "toll": {
                     "label": "Maksustatud"
                 },
+                "tourism_attraction": {
+                    "label": "Turism"
+                },
                 "tracktype": {
                     "label": "Raja tüüp",
                     "options": {
                 "tracktype": {
                     "label": "Raja tüüp",
                     "options": {
@@ -1212,9 +1319,20 @@
                 "traffic_signals": {
                     "label": "Tüüp"
                 },
                 "traffic_signals": {
                     "label": "Tüüp"
                 },
+                "traffic_signals/direction": {
+                    "label": "Suund",
+                    "options": {
+                        "backward": "Tagasi",
+                        "both": "Mõlemad / Kõik",
+                        "forward": "Edasi"
+                    }
+                },
                 "trees": {
                     "label": "Puud"
                 },
                 "trees": {
                     "label": "Puud"
                 },
+                "usage_rail": {
+                    "label": "Kasutusostarve"
+                },
                 "visibility": {
                     "label": "Nähtavus"
                 },
                 "visibility": {
                     "label": "Nähtavus"
                 },
@@ -1240,6 +1358,9 @@
                 "wheelchair": {
                     "label": "Pääs ratastooliga"
                 },
                 "wheelchair": {
                     "label": "Pääs ratastooliga"
                 },
+                "wholesale": {
+                    "label": "Hulgikaubandus"
+                },
                 "width": {
                     "label": "Laius (meetrites)"
                 },
                 "width": {
                     "label": "Laius (meetrites)"
                 },
@@ -1274,6 +1395,9 @@
                     "name": "Lennuterminal",
                     "terms": "terminal,lennujaam"
                 },
                     "name": "Lennuterminal",
                     "terms": "terminal,lennujaam"
                 },
+                "allotments/plot": {
+                    "name": "Ühisaia krunt"
+                },
                 "amenity": {
                     "name": "Hüve"
                 },
                 "amenity": {
                     "name": "Hüve"
                 },
@@ -1319,9 +1443,6 @@
                     "name": "Valuutavahetus",
                     "terms": "rahavahetus"
                 },
                     "name": "Valuutavahetus",
                     "terms": "rahavahetus"
                 },
-                "amenity/bus_station": {
-                    "name": "Bussijaam"
-                },
                 "amenity/cafe": {
                     "name": "Kohvik"
                 },
                 "amenity/cafe": {
                     "name": "Kohvik"
                 },
@@ -1354,6 +1475,12 @@
                 "amenity/clinic": {
                     "name": "Kliinik"
                 },
                 "amenity/clinic": {
                     "name": "Kliinik"
                 },
+                "amenity/clinic/abortion": {
+                    "name": "Abordikliinik"
+                },
+                "amenity/clinic/fertility": {
+                    "name": "Viljakuskliinik"
+                },
                 "amenity/clock": {
                     "name": "Kell",
                     "terms": "seinakell"
                 "amenity/clock": {
                     "name": "Kell",
                     "terms": "seinakell"
@@ -1400,10 +1527,6 @@
                 "amenity/fast_food": {
                     "name": "Kiirtoitlustus"
                 },
                 "amenity/fast_food": {
                     "name": "Kiirtoitlustus"
                 },
-                "amenity/ferry_terminal": {
-                    "name": "Praamiterminal",
-                    "terms": "Praamisadam, sadam"
-                },
                 "amenity/fire_station": {
                     "name": "Tuletõrjedepoo",
                     "terms": "tuletõrjujad"
                 "amenity/fire_station": {
                     "name": "Tuletõrjedepoo",
                     "terms": "tuletõrjujad"
@@ -1452,6 +1575,9 @@
                     "name": "Turg",
                     "terms": "Turuplats"
                 },
                     "name": "Turg",
                     "terms": "Turuplats"
                 },
+                "amenity/monastery": {
+                    "name": "Kloostriala"
+                },
                 "amenity/motorcycle_parking": {
                     "name": "Mootorratta parkla"
                 },
                 "amenity/motorcycle_parking": {
                     "name": "Mootorratta parkla"
                 },
@@ -1473,7 +1599,8 @@
                     "terms": "parkla"
                 },
                 "amenity/pharmacy": {
                     "terms": "parkla"
                 },
                 "amenity/pharmacy": {
-                    "name": "Apteek"
+                    "name": "Apteek",
+                    "terms": "ravimid"
                 },
                 "amenity/place_of_worship": {
                     "name": "Pühakoda",
                 },
                 "amenity/place_of_worship": {
                     "name": "Pühakoda",
@@ -1522,11 +1649,11 @@
                     "terms": "külastuskeskus"
                 },
                 "amenity/recycling": {
                     "terms": "külastuskeskus"
                 },
                 "amenity/recycling": {
-                    "name": "Taaskasutus",
-                    "terms": "Taara,taaraautomaat,jäätmed,prügi,pudelid,klaas,purgid,praht,konteiner"
+                    "name": "Jäätmekonteiner",
+                    "terms": "taaskasutus,konteiner,prügi,jäätmed,ohtlikud"
                 },
                 "amenity/recycling_centre": {
                 },
                 "amenity/recycling_centre": {
-                    "name": "Jäätmejaam",
+                    "name": "Ümbertöötluskeskus",
                     "terms": "Taaskasutuskeskus"
                 },
                 "amenity/register_office": {
                     "terms": "Taaskasutuskeskus"
                 },
                 "amenity/register_office": {
@@ -1543,6 +1670,9 @@
                     "name": "Varjualune",
                     "terms": "ulualune,räästaalune,peavari"
                 },
                     "name": "Varjualune",
                     "terms": "ulualune,räästaalune,peavari"
                 },
+                "amenity/smoking_area": {
+                    "name": "Suitsetamise koht"
+                },
                 "amenity/social_facility": {
                     "name": "Sotsiaalkeskus",
                     "terms": "Sotsiaalamet"
                 "amenity/social_facility": {
                     "name": "Sotsiaalkeskus",
                     "terms": "Sotsiaalamet"
@@ -1609,6 +1739,15 @@
                 "area/highway": {
                     "name": "Teekate"
                 },
                 "area/highway": {
                     "name": "Teekate"
                 },
+                "attraction/amusement_ride": {
+                    "name": "Lõbuatraktsioon"
+                },
+                "attraction/animal": {
+                    "name": "Loom"
+                },
+                "attraction/big_wheel": {
+                    "name": "Vaateratas"
+                },
                 "barrier": {
                     "name": "Barjäär",
                     "terms": "tõke,takistus,blokeering,läbisõidupiirang"
                 "barrier": {
                     "name": "Barjäär",
                     "terms": "tõke,takistus,blokeering,läbisõidupiirang"
@@ -1650,6 +1789,10 @@
                 "barrier/hedge": {
                     "name": "Hekk"
                 },
                 "barrier/hedge": {
                     "name": "Hekk"
                 },
+                "barrier/kerb": {
+                    "name": "Kiviääris",
+                    "terms": "ääris"
+                },
                 "barrier/kissing_gate": {
                     "name": "Karjavärav"
                 },
                 "barrier/kissing_gate": {
                     "name": "Karjavärav"
                 },
@@ -1685,6 +1828,10 @@
                     "name": "Küün",
                     "terms": "Tall, laut"
                 },
                     "name": "Küün",
                     "terms": "Tall, laut"
                 },
+                "building/bungalow": {
+                    "name": "Bangalo",
+                    "terms": "bungalo"
+                },
                 "building/bunker": {
                     "name": "Punker"
                 },
                 "building/bunker": {
                     "name": "Punker"
                 },
@@ -1701,6 +1848,10 @@
                 "building/church": {
                     "name": "Kirikuhoone"
                 },
                 "building/church": {
                     "name": "Kirikuhoone"
                 },
+                "building/civic": {
+                    "name": "Kultuurihoone",
+                    "terms": "linna,keskus,seltsimaja,rahvamaja"
+                },
                 "building/college": {
                     "name": "Kolledžihoone"
                 },
                 "building/college": {
                     "name": "Kolledžihoone"
                 },
@@ -1719,6 +1870,14 @@
                 "building/entrance": {
                     "name": "Sissepääs"
                 },
                 "building/entrance": {
                     "name": "Sissepääs"
                 },
+                "building/farm": {
+                    "name": "Maamaja",
+                    "terms": "talumaja,elumaja,elamu,maja,rehi*"
+                },
+                "building/farm_auxiliary": {
+                    "name": "Taluhoone",
+                    "terms": "hoone,ait,abihoone,laut,küün"
+                },
                 "building/garage": {
                     "name": "Garaaž",
                     "terms": "Garaaz"
                 "building/garage": {
                     "name": "Garaaž",
                     "terms": "Garaaz"
@@ -1763,6 +1922,10 @@
                 "building/roof": {
                     "name": "Katus"
                 },
                 "building/roof": {
                     "name": "Katus"
                 },
+                "building/ruins": {
+                    "name": "Hoone varemed",
+                    "terms": "varemed,purunenud,maha jäätud"
+                },
                 "building/school": {
                     "name": "Koolihoone",
                     "terms": "õppehoone,algkool,keskkool"
                 "building/school": {
                     "name": "Koolihoone",
                     "terms": "õppehoone,algkool,keskkool"
@@ -1778,16 +1941,26 @@
                     "name": "Tall",
                     "terms": "Hobusetall"
                 },
                     "name": "Tall",
                     "terms": "Hobusetall"
                 },
+                "building/stadium": {
+                    "name": "Staadionihoone"
+                },
                 "building/static_caravan": {
                     "name": "Paikne haagismaja",
                     "terms": "Haagiselamu,haagismaja,teisaldatav maja"
                 },
                 "building/static_caravan": {
                     "name": "Paikne haagismaja",
                     "terms": "Haagiselamu,haagismaja,teisaldatav maja"
                 },
+                "building/temple": {
+                    "name": "Templihoone",
+                    "terms": "tempel"
+                },
                 "building/terrace": {
                     "name": "Terrassmaja"
                 },
                 "building/train_station": {
                     "name": "Raudteejaam"
                 },
                 "building/terrace": {
                     "name": "Terrassmaja"
                 },
                 "building/train_station": {
                     "name": "Raudteejaam"
                 },
+                "building/transportation": {
+                    "name": "Transpordihoone"
+                },
                 "building/university": {
                     "name": "Ülikoolihoone"
                 },
                 "building/university": {
                     "name": "Ülikoolihoone"
                 },
@@ -1798,6 +1971,9 @@
                     "name": "Kämpingukoht",
                     "terms": "karavaniplats,kämpinguplats,telgiplats,telgikoht"
                 },
                     "name": "Kämpingukoht",
                     "terms": "karavaniplats,kämpinguplats,telgiplats,telgikoht"
                 },
+                "circular": {
+                    "name": "Liiklusring"
+                },
                 "club": {
                     "name": "Klubi"
                 },
                 "club": {
                     "name": "Klubi"
                 },
@@ -1913,18 +2089,12 @@
                 "craft/sawmill": {
                     "name": "Saekaater"
                 },
                 "craft/sawmill": {
                     "name": "Saekaater"
                 },
-                "craft/sculpter": {
-                    "name": "Skulptor"
-                },
                 "craft/shoemaker": {
                     "name": "Kingsepp"
                 },
                 "craft/stonemason": {
                     "name": "Kiviraidur"
                 },
                 "craft/shoemaker": {
                     "name": "Kingsepp"
                 },
                 "craft/stonemason": {
                     "name": "Kiviraidur"
                 },
-                "craft/sweep": {
-                    "name": "Korstnapühkija"
-                },
                 "craft/tailor": {
                     "name": "Rätsep"
                 },
                 "craft/tailor": {
                     "name": "Rätsep"
                 },
@@ -1962,14 +2132,25 @@
                 "emergency/phone": {
                     "name": "Hädaabi telefon"
                 },
                 "emergency/phone": {
                     "name": "Hädaabi telefon"
                 },
+                "emergency/water_tank": {
+                    "name": "Tuletõrjevee mahuti",
+                    "terms": "veevõtukoht,tuletõrjemahuti"
+                },
                 "entrance": {
                     "name": "Sisse- ja Väljapääs"
                 },
                 "footway/crossing": {
                     "name": "Ülekäik"
                 },
                 "entrance": {
                     "name": "Sisse- ja Väljapääs"
                 },
                 "footway/crossing": {
                     "name": "Ülekäik"
                 },
+                "footway/crossing-raised": {
+                    "name": "Tõstetud ülekäik",
+                    "terms": "lame,künnis,aeglusti"
+                },
                 "footway/crosswalk": {
                 "footway/crosswalk": {
-                    "name": "Jalakäijate ülekäik"
+                    "name": "Ülekäigurada"
+                },
+                "footway/crosswalk-raised": {
+                    "name": "Tõstetud ülekäigurada"
                 },
                 "footway/sidewalk": {
                     "name": "Kõnnitee"
                 },
                 "footway/sidewalk": {
                     "name": "Kõnnitee"
@@ -1978,19 +2159,43 @@
                     "name": "Koolmekoht",
                     "terms": "Koole"
                 },
                     "name": "Koolmekoht",
                     "terms": "Koole"
                 },
+                "healthcare": {
+                    "name": "Tervishoiukeskus",
+                    "terms": "kliinik,arst,haigla,heaolu,taastusravi,ravi"
+                },
+                "healthcare/alternative": {
+                    "name": "Alternatiivmeditsiin"
+                },
+                "healthcare/alternative/chiropractic": {
+                    "name": "Kiropraktik"
+                },
+                "healthcare/audiologist": {
+                    "name": "Audioloog"
+                },
+                "healthcare/birthing_center": {
+                    "name": "Sünnitusmaja"
+                },
                 "healthcare/blood_donation": {
                     "name": "Verekeskus",
                     "terms": "veretalitus, vereteenistus, doonor"
                 },
                 "healthcare/blood_donation": {
                     "name": "Verekeskus",
                     "terms": "veretalitus, vereteenistus, doonor"
                 },
+                "healthcare/hospice": {
+                    "name": "Hooldekodu",
+                    "terms": "hospiits"
+                },
+                "healthcare/laboratory": {
+                    "name": "Meditsiiniline labor",
+                    "terms": "labor*,verelabor*"
+                },
+                "healthcare/midwife": {
+                    "name": "Ämmaemand"
+                },
                 "highway": {
                     "name": "Tee"
                 },
                 "highway/bridleway": {
                     "name": "Ratsutamisrada"
                 },
                 "highway": {
                     "name": "Tee"
                 },
                 "highway/bridleway": {
                     "name": "Ratsutamisrada"
                 },
-                "highway/bus_stop": {
-                    "name": "Bussipeatus"
-                },
                 "highway/corridor": {
                     "name": "Sisekoridor",
                     "terms": "koridor"
                 "highway/corridor": {
                     "name": "Sisekoridor",
                     "terms": "koridor"
@@ -1998,10 +2203,16 @@
                 "highway/crossing": {
                     "name": "Ülekäigurada"
                 },
                 "highway/crossing": {
                     "name": "Ülekäigurada"
                 },
+                "highway/crossing-raised": {
+                    "name": "Tõstetud ristmik"
+                },
                 "highway/crosswalk": {
                     "name": "Ülekäigurada",
                     "terms": "jalakäijate ülekäik,ülekäik"
                 },
                 "highway/crosswalk": {
                     "name": "Ülekäigurada",
                     "terms": "jalakäijate ülekäik,ülekäik"
                 },
+                "highway/crosswalk-raised": {
+                    "name": "Tõstetud ülekäigurada"
+                },
                 "highway/cycleway": {
                     "name": "Rattatee"
                 },
                 "highway/cycleway": {
                     "name": "Rattatee"
                 },
@@ -2029,12 +2240,12 @@
                 "highway/motorway_link": {
                     "name": "Kiirtee ühenduslõik"
                 },
                 "highway/motorway_link": {
                     "name": "Kiirtee ühenduslõik"
                 },
+                "highway/passing_place": {
+                    "name": "Möödasõidukoht"
+                },
                 "highway/path": {
                     "name": "Rada"
                 },
                 "highway/path": {
                     "name": "Rada"
                 },
-                "highway/pedestrian": {
-                    "name": "Jalakäijate tänav"
-                },
                 "highway/primary": {
                     "name": "Põhimaantee",
                     "terms": "maantee"
                 "highway/primary": {
                     "name": "Põhimaantee",
                     "terms": "maantee"
@@ -2218,8 +2429,8 @@
                     "name": "Metsamaa"
                 },
                 "landuse/garages": {
                     "name": "Metsamaa"
                 },
                 "landuse/garages": {
-                    "name": "Garaažid",
-                    "terms": "Garaazid"
+                    "name": "Maakasutus garaažidele",
+                    "terms": "garaažid"
                 },
                 "landuse/grass": {
                     "name": "Muru"
                 },
                 "landuse/grass": {
                     "name": "Muru"
@@ -2232,6 +2443,12 @@
                     "name": "Tööstuspiirkond",
                     "terms": "Tööstusala"
                 },
                     "name": "Tööstuspiirkond",
                     "terms": "Tööstusala"
                 },
+                "landuse/industrial/scrap_yard": {
+                    "name": "Vanametalli kokkuost"
+                },
+                "landuse/industrial/slaughterhouse": {
+                    "name": "Tapamaja"
+                },
                 "landuse/landfill": {
                     "name": "Prügila",
                     "terms": "Prügimägi"
                 "landuse/landfill": {
                     "name": "Prügila",
                     "terms": "Prügimägi"
@@ -2294,6 +2511,13 @@
                 "leisure": {
                     "name": "Vaba aeg"
                 },
                 "leisure": {
                     "name": "Vaba aeg"
                 },
+                "leisure/amusement_arcade": {
+                    "name": "Videomängumasin",
+                    "terms": "telekamäng,mängukonsool"
+                },
+                "leisure/beach_resort": {
+                    "name": "Rannakuurort"
+                },
                 "leisure/bowling_alley": {
                     "name": "Boolingusaal",
                     "terms": "bowling,keegel,keeglisaal,hobikeegel"
                 "leisure/bowling_alley": {
                     "name": "Boolingusaal",
                     "terms": "bowling,keegel,keeglisaal,hobikeegel"
@@ -2302,6 +2526,9 @@
                     "name": "Tantsusaal",
                     "terms": "tantsuhall"
                 },
                     "name": "Tantsusaal",
                     "terms": "tantsuhall"
                 },
+                "leisure/dancing_school": {
+                    "name": "Tantsukool"
+                },
                 "leisure/dog_park": {
                     "name": "Koerapark"
                 },
                 "leisure/dog_park": {
                     "name": "Koerapark"
                 },
@@ -2388,6 +2615,9 @@
                 "leisure/running_track": {
                     "name": "Jooksurada"
                 },
                 "leisure/running_track": {
                     "name": "Jooksurada"
                 },
+                "leisure/sauna": {
+                    "name": "Saun"
+                },
                 "leisure/slipway": {
                     "name": "Slipp",
                     "terms": "Slipp, väikesadam"
                 "leisure/slipway": {
                     "name": "Slipp",
                     "terms": "Slipp, väikesadam"
@@ -2423,6 +2653,10 @@
                     "name": "Stoll",
                     "terms": "suue,kaevandus,sissepääs,horisontaalne,kaeveõõne,rõhtkaeve,koobas"
                 },
                     "name": "Stoll",
                     "terms": "suue,kaevandus,sissepääs,horisontaalne,kaeveõõne,rõhtkaeve,koobas"
                 },
+                "man_made/antenna": {
+                    "name": "Antenn",
+                    "terms": "raadio,saatja,mast,side,televisiooni,edastus,levi,signaal"
+                },
                 "man_made/breakwater": {
                     "name": "Lainemurdja",
                     "terms": "sadamatamm,kaitsetamm,tamm"
                 "man_made/breakwater": {
                     "name": "Lainemurdja",
                     "terms": "sadamatamm,kaitsetamm,tamm"
@@ -2433,6 +2667,9 @@
                 "man_made/chimney": {
                     "name": "Korsten"
                 },
                 "man_made/chimney": {
                     "name": "Korsten"
                 },
+                "man_made/crane": {
+                    "name": "Kraana"
+                },
                 "man_made/cutline": {
                     "name": "Siht",
                     "terms": "metsasiht,soosiht"
                 "man_made/cutline": {
                     "name": "Siht",
                     "terms": "metsasiht,soosiht"
@@ -2453,6 +2690,9 @@
                 "man_made/observation": {
                     "name": "Vaatlustorn"
                 },
                 "man_made/observation": {
                     "name": "Vaatlustorn"
                 },
+                "man_made/observatory": {
+                    "name": "Observatoorium"
+                },
                 "man_made/petroleum_well": {
                     "name": "Nafta puurkaev"
                 },
                 "man_made/petroleum_well": {
                     "name": "Nafta puurkaev"
                 },
@@ -2532,6 +2772,10 @@
                 "natural/heath": {
                     "name": "Nõmm"
                 },
                 "natural/heath": {
                     "name": "Nõmm"
                 },
+                "natural/mud": {
+                    "name": "Muda",
+                    "terms": "märgala,soo"
+                },
                 "natural/peak": {
                     "name": "Mäetipp",
                     "terms": "tipp"
                 "natural/peak": {
                     "name": "Mäetipp",
                     "terms": "tipp"
@@ -2594,6 +2838,10 @@
                 "office": {
                     "name": "Kontor"
                 },
                 "office": {
                     "name": "Kontor"
                 },
+                "office/company": {
+                    "name": "Ettevõtte kontor",
+                    "terms": "kontor,firma,korporatiiv"
+                },
                 "office/government": {
                     "name": "Valitsuse kontor"
                 },
                 "office/government": {
                     "name": "Valitsuse kontor"
                 },
@@ -2615,6 +2863,13 @@
                 "place/island": {
                     "name": "Saar"
                 },
                 "place/island": {
                     "name": "Saar"
                 },
+                "place/islet": {
+                    "name": "Laid",
+                    "terms": "saareke,rahu,kari"
+                },
+                "place/plot": {
+                    "name": "Krunt"
+                },
                 "place/suburb": {
                     "name": "Eeslinn",
                     "terms": "Äärelinn"
                 "place/suburb": {
                     "name": "Eeslinn",
                     "terms": "Äärelinn"
@@ -2664,12 +2919,6 @@
                     "name": "Trafo",
                     "terms": "Transformaator"
                 },
                     "name": "Trafo",
                     "terms": "Transformaator"
                 },
-                "public_transport/platform": {
-                    "name": "Platvorm"
-                },
-                "public_transport/stop_position": {
-                    "name": "Peatuskoht"
-                },
                 "railway": {
                     "name": "Raudtee"
                 },
                 "railway": {
                     "name": "Raudtee"
                 },
@@ -2687,10 +2936,6 @@
                 "railway/funicular": {
                     "name": "Köisraudtee"
                 },
                 "railway/funicular": {
                     "name": "Köisraudtee"
                 },
-                "railway/halt": {
-                    "name": "Peatuskoht",
-                    "terms": "pooljaam"
-                },
                 "railway/level_crossing": {
                     "name": "Raudtee-ülesõidukoht",
                     "terms": "ülesõit,ristumine,rongi"
                 "railway/level_crossing": {
                     "name": "Raudtee-ülesõidukoht",
                     "terms": "ülesõit,ristumine,rongi"
@@ -2702,18 +2947,10 @@
                 "railway/narrow_gauge": {
                     "name": "Kitsarööpaline raudtee"
                 },
                 "railway/narrow_gauge": {
                     "name": "Kitsarööpaline raudtee"
                 },
-                "railway/platform": {
-                    "name": "Raudteeplatvorm",
-                    "terms": "platvorm,perroon,raudteeperroon"
-                },
                 "railway/rail": {
                     "name": "Raudtee",
                     "terms": "rongitee"
                 },
                 "railway/rail": {
                     "name": "Raudtee",
                     "terms": "rongitee"
                 },
-                "railway/station": {
-                    "name": "Raudteejaam",
-                    "terms": "jaam,rongijaam"
-                },
                 "railway/subway": {
                     "name": "Metroo"
                 },
                 "railway/subway": {
                     "name": "Metroo"
                 },
@@ -2724,9 +2961,6 @@
                 "railway/tram": {
                     "name": "Tramm"
                 },
                 "railway/tram": {
                     "name": "Tramm"
                 },
-                "railway/tram_stop": {
-                    "name": "Trammipeatus"
-                },
                 "relation": {
                     "name": "Seos",
                     "terms": "relatsioon"
                 "relation": {
                     "name": "Seos",
                     "terms": "relatsioon"
@@ -2741,6 +2975,10 @@
                     "name": "Pood",
                     "terms": "kauplus"
                 },
                     "name": "Pood",
                     "terms": "kauplus"
                 },
+                "shop/agrarian": {
+                    "name": "Põllumajandustarvete kauplus",
+                    "terms": "aiatarbed,talupidamistarbed,põllumasinad,seemned,masinad"
+                },
                 "shop/alcohol": {
                     "name": "Alkoholipood"
                 },
                 "shop/alcohol": {
                     "name": "Alkoholipood"
                 },
@@ -2828,8 +3066,8 @@
                     "name": "Juustupood"
                 },
                 "shop/chemist": {
                     "name": "Juustupood"
                 },
                 "shop/chemist": {
-                    "name": "Apteek",
-                    "terms": "Ravimid"
+                    "name": "Kodukeemia kauplus",
+                    "terms": "puhastus*,ravimid,kemikaal*,pesuvahend*,üldpuhastus*,hügieeni*,tarbed,keemia"
                 },
                 "shop/chocolate": {
                     "name": "Šokolaadikauplus",
                 },
                 "shop/chocolate": {
                     "name": "Šokolaadikauplus",
@@ -2952,6 +3190,10 @@
                     "name": "Rauakauplus",
                     "terms": "tööriistad,kinnitusvahendid"
                 },
                     "name": "Rauakauplus",
                     "terms": "tööriistad,kinnitusvahendid"
                 },
+                "shop/health_food": {
+                    "name": "Tervisliku toidu kauplus",
+                    "terms": "vitamiinid,tervis,terviklikud,mahe,vegan,täistera,toidulisandid"
+                },
                 "shop/hearing_aids": {
                     "name": "Kuulmisabipood"
                 },
                 "shop/hearing_aids": {
                     "name": "Kuulmisabipood"
                 },
@@ -2975,10 +3217,6 @@
                     "name": "Ehtepood",
                     "terms": "ehted,kalliskivid"
                 },
                     "name": "Ehtepood",
                     "terms": "ehted,kalliskivid"
                 },
-                "shop/kiosk": {
-                    "name": "Kiosk",
-                    "terms": "putka,ajalehekiosk"
-                },
                 "shop/kitchen": {
                     "name": "Köögimööblikauplus",
                     "terms": "köögimööblistuudio,köögistuudio"
                 "shop/kitchen": {
                     "name": "Köögimööblikauplus",
                     "terms": "köögimööblistuudio,köögistuudio"
@@ -3168,6 +3406,10 @@
                 "shop/weapons": {
                     "name": "Relvapood"
                 },
                 "shop/weapons": {
                     "name": "Relvapood"
                 },
+                "shop/wholesale": {
+                    "name": "Hulgikauplus",
+                    "terms": "hulgikaup"
+                },
                 "shop/window_blind": {
                     "name": "Aknakatete kauplus",
                     "terms": "rulood,ribikardinad,lamellkardinad"
                 "shop/window_blind": {
                     "name": "Aknakatete kauplus",
                     "terms": "rulood,ribikardinad,lamellkardinad"
@@ -3202,10 +3444,6 @@
                     "name": "Karavanipark",
                     "terms": "autoelamu,haagissuvila,kämpimisala"
                 },
                     "name": "Karavanipark",
                     "terms": "autoelamu,haagissuvila,kämpimisala"
                 },
-                "tourism/chalet": {
-                    "name": "Mägimajake",
-                    "terms": "alpimaja"
-                },
                 "tourism/gallery": {
                     "name": "Kunstigalerii"
                 },
                 "tourism/gallery": {
                     "name": "Kunstigalerii"
                 },
@@ -3295,6 +3533,10 @@
                     "name": "Täristi",
                     "terms": "põristi,põrin,tärin,värin,väristaja,müra,triibud,risti jooned,jooned"
                 },
                     "name": "Täristi",
                     "terms": "põristi,põrin,tärin,värin,väristaja,müra,triibud,risti jooned,jooned"
                 },
+                "traffic_calming/table": {
+                    "name": "Tõstetud pind",
+                    "terms": "lame,künnis,lamav politseinik,kiirustõke,tõke,liikluskünnis"
+                },
                 "type/boundary": {
                     "name": "Piir"
                 },
                 "type/boundary": {
                     "name": "Piir"
                 },
@@ -3317,16 +3559,16 @@
                     "name": "Tagasipöörd keelatud"
                 },
                 "type/restriction/only_left_turn": {
                     "name": "Tagasipöörd keelatud"
                 },
                 "type/restriction/only_left_turn": {
-                    "name": "Ainult vasakpöörd",
-                    "terms": "ainult vasakule,kohustuslik sõidusuund vasakule"
+                    "name": "Ainult vasakpööre"
                 },
                 "type/restriction/only_right_turn": {
                 },
                 "type/restriction/only_right_turn": {
-                    "name": "Ainult parempöörd",
-                    "terms": "ainult paremale,kohustuslik sõidusuund paremale"
+                    "name": "Ainult parempööre"
                 },
                 "type/restriction/only_straight_on": {
                 },
                 "type/restriction/only_straight_on": {
-                    "name": "Pööramine keelatud",
-                    "terms": "Kohustuslik sõidusuund otse,ainult otse"
+                    "name": "Ainult otse"
+                },
+                "type/restriction/only_u_turn": {
+                    "name": "Ainult ümberpöörd"
                 },
                 "type/route": {
                     "name": "Marsruut"
                 },
                 "type/route": {
                     "name": "Marsruut"
@@ -3390,7 +3632,7 @@
                     "name": "Kanal"
                 },
                 "waterway/dam": {
                     "name": "Kanal"
                 },
                 "waterway/dam": {
-                    "name": "Tamm"
+                    "name": "Pais"
                 },
                 "waterway/ditch": {
                     "name": "Kraav"
                 },
                 "waterway/ditch": {
                     "name": "Kraav"
@@ -3420,6 +3662,10 @@
                 "waterway/stream": {
                     "name": "Oja"
                 },
                 "waterway/stream": {
                     "name": "Oja"
                 },
+                "waterway/stream_intermittent": {
+                    "name": "Ajutine oja",
+                    "terms": "perioodiline"
+                },
                 "waterway/water_point": {
                     "name": "Joogiveepunkt (veesõidukitele)",
                     "terms": "vesi,vee"
                 "waterway/water_point": {
                     "name": "Joogiveepunkt (veesõidukitele)",
                     "terms": "vesi,vee"
@@ -3428,10 +3674,54 @@
                     "name": "Kosk"
                 },
                 "waterway/weir": {
                     "name": "Kosk"
                 },
                 "waterway/weir": {
-                    "name": "Pais",
+                    "name": "Ülevoolupais",
                     "terms": "tamm"
                 }
             }
                     "terms": "tamm"
                 }
             }
+        },
+        "imagery": {
+            "Bing": {
+                "description": "Satelliidi- ja aerofotod.",
+                "name": "Bingi aerofotod"
+            },
+            "DigitalGlobe-Premium": {
+                "description": "DigitalGlobe'i satelliidifotod (premium)",
+                "name": "DigitalGlobe'i pildimaterjal (premium)"
+            },
+            "DigitalGlobe-Standard": {
+                "description": "DigitalGlobe'i satelliidifotod (standard)",
+                "name": "DigitalGlobe'i pildimaterjal (standard)"
+            },
+            "EsriWorldImagery": {
+                "description": "Esri Worldi pildimaterjal.",
+                "name": "Esri Worldi pildimaterjal"
+            },
+            "EsriWorldImageryClarity": {
+                "description": "Esri arhiivimaterjal, mis võib olla tavakihi piltidest selgem ja täpsem.",
+                "name": "Esri Worldi pildimaterjal (selgem, beeta)"
+            },
+            "MAPNIK": {
+                "description": "OpenStreetMapi vaikekiht.",
+                "name": "OpenStreetMap (standard)"
+            },
+            "Mapbox": {
+                "description": "Satelliidi- ja aerofotod.",
+                "name": "Mapboxi satelliidifotod"
+            },
+            "mapbox_locator_overlay": {
+                "description": "Näita tähtsamaid objekte, et aidata orienteeruda.",
+                "name": "Asukoha ülekate"
+            },
+            "osm-gps": {
+                "description": "Avalikud GPS-rajad, mis on OpenStreetMapi üles laaditud.",
+                "name": "OpenStreetMapi GPS-rajad"
+            },
+            "stamen-terrain-background": {
+                "name": "Stameni reljeefikaart"
+            },
+            "tf-landscape": {
+                "name": "Thunderforesti maastikukaart"
+            }
         }
     }
 }
\ No newline at end of file
         }
     }
 }
\ No newline at end of file
The OpenStreetMap web site