Update to iD v2.15.2

[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 9c6dc0115008cc1632defc1a85a7cc14cd19e031..049eb7e490aa0723d267c8fc516b2d65058828f7 100644 (file)
--- a/vendor/assets/iD/iD/locales/et.json
+++ b/vendor/assets/iD/iD/locales/et.json
@@ -1,5 +1,15 @@
  {
      "et": {
  {
      "et": {
+        "icons": {
+            "information": "info",
+            "remove": "eemalda",
+            "undo": "tühista",
+            "copy": "kopeeri",
+            "open_wikidata": "ava lehel wikidata.org"
+        },
+        "toolbar": {
+            "add_feature": "Lisa objekt"
+        },
          "modes": {
              "add_area": {
                  "title": "Ala",
          "modes": {
              "add_area": {
                  "title": "Ala",
@@ -9,30 +19,36 @@
              "add_line": {
                  "title": "Joon",
                  "description": "Lisa kaardile teid, tänavaid, jalgteid, ojasid ja teisi jooni.",
              "add_line": {
                  "title": "Joon",
                  "description": "Lisa kaardile teid, tänavaid, jalgteid, ojasid ja teisi jooni.",
-                "tail": "Joone (tee, rada, marsruut vms) joonistamiseks kliki kaardil."
+                "tail": "Klõpsa kaardil, et alustada tee, raja või marsruudi joonistamist."
              },
              "add_point": {
                  "title": "Punkt",
                  "description": "Lisa kaardile restorane, monumente, postkaste ja muid punkte.",
              },
              "add_point": {
                  "title": "Punkt",
                  "description": "Lisa kaardile restorane, monumente, postkaste ja muid punkte.",
-                "tail": "Klõpsa kaardil punkti lisamiseks."
+                "tail": "Klõpsa kaardil, et lisada punkt."
+            },
+            "add_note": {
+                "title": "Märge",
+                "description": "Avastasid vea? Anna teistele kaardistajatele sellest märku.",
+                "tail": "Klõpsa kaardil, et lisada teade."
              },
              "browse": {
                  "title": "Sirvi",
                  "description": "Nihuta ja suumi kaarti."
              },
              "draw_area": {
              },
              "browse": {
                  "title": "Sirvi",
                  "description": "Nihuta ja suumi kaarti."
              },
              "draw_area": {
-                "tail": "Alale punkti lisamiseks tee klikk. Ala lõpetamiseks tee klikk ala esimesele punktile."
+                "tail": "Klõpsa, et lisada alale sõlm. Et ala lõpetada, klõpsa esimesel sõlmel."
              },
              "draw_line": {
              },
              "draw_line": {
-                "tail": "Joonele punktide lisamiseks tee hiirega klikk. Tee klikk teiste joonte peale, et jooni ühendada ja topeltklikk, et joont lõpetada."
+                "tail": "Klõpsa, et lisada joonele sõlm. Et jooni ühendada, klõpsa teistel joontel ja tee topeltklõps, et joon lõpetada."
              }
          },
          "operations": {
              "add": {
                  "annotation": {
                      "point": "Punkt lisatud.",
              }
          },
          "operations": {
              "add": {
                  "annotation": {
                      "point": "Punkt lisatud.",
-                    "vertex": "Joonele lisatud punkt.",
-                    "relation": "Seos lisatud."
+                    "vertex": "Joonele lisatud sõlm.",
+                    "relation": "Relatsioon lisatud.",
+                    "note": "Märge lisatud."
                  }
              },
              "start": {
                  }
              },
              "start": {
@@ -46,7 +62,7 @@
                  "title": "Jätka",
                  "description": "Jätka seda joont.",
                  "not_eligible": "Joont ei saa siit jätkata.",
                  "title": "Jätka",
                  "description": "Jätka seda joont.",
                  "not_eligible": "Joont ei saa siit jätkata.",
-                "multiple": "Siit saab jätkata mitut joont. Joone valimiseks hoia all Shift klahvi ja tee klikk joonele.",
+                "multiple": "Siit saab jätkata mitut joont. Et joon valida, hoia all tõstuklahvi Shift ja klõpsa joont.",
                  "annotation": {
                      "line": "Joon jätkatud.",
                      "area": "Ala jätkatud."
                  "annotation": {
                      "line": "Joon jätkatud.",
                      "area": "Ala jätkatud."
@@ -72,7 +88,7 @@
                      "line": "Joon tehtud ringikujuliseks.",
                      "area": "Ala tehtud ringikujuliseks."
                  },
                      "line": "Joon tehtud ringikujuliseks.",
                      "area": "Ala tehtud ringikujuliseks."
                  },
-                "not_closed": "Seda ei saa teha ringikujuliseks kuna see ei ole silmus.",
+                "not_closed": "Seda ei saa teha ringikujuliseks, kuna see ei ole silmus.",
                  "too_large": "Seda ei saa teha ringikujuliseks, kuna see ei ole täielikult nähtaval.",
                  "connected_to_hidden": "Seda ei saa teha ringikujuliseks, kuna see on ühendatud peidetud objektiga."
              },
                  "too_large": "Seda ei saa teha ringikujuliseks, kuna see ei ole täielikult nähtaval.",
                  "connected_to_hidden": "Seda ei saa teha ringikujuliseks, kuna see on ühendatud peidetud objektiga."
              },
@@ -82,51 +98,51 @@
                      "line": "Täisnurgasta selle joone nurgad.",
                      "area": "Täisnurgasta selle ala nurgad."
                  },
                      "line": "Täisnurgasta selle joone nurgad.",
                      "area": "Täisnurgasta selle ala nurgad."
                  },
-                "key": "S",
                  "annotation": {
                      "line": "Joone nurgad täisnurgastatud.",
                      "area": "Ala nurgad täisnurgastatud."
                  },
                  "annotation": {
                      "line": "Joone nurgad täisnurgastatud.",
                      "area": "Ala nurgad täisnurgastatud."
                  },
-                "not_squarish": "Seda ei saa teha täisnurkseks kuna see ei ole nurgeline.",
+                "not_squarish": "Seda ei saa teha täisnurkseks, kuna see ei ole nurgeline.",
                  "too_large": "Seda ei saa teha täisnurkseks, kuna see ei ole täielikult nähtaval.",
                  "connected_to_hidden": "Seda ei saa teha täisnurkseks, kuna see on ühendatud peidetud objektiga."
              },
              "straighten": {
                  "title": "Tee sirgeks",
                  "too_large": "Seda ei saa teha täisnurkseks, kuna see ei ole täielikult nähtaval.",
                  "connected_to_hidden": "Seda ei saa teha täisnurkseks, kuna see on ühendatud peidetud objektiga."
              },
              "straighten": {
                  "title": "Tee sirgeks",
-                "description": "Tee see joon sirgeks.",
                  "key": "S",
                  "key": "S",
-                "annotation": "Joon tehti sirgeks.",
-                "too_bendy": "Seda ei saa sirgeks teha kuna see painduks liiga palju.",
-                "connected_to_hidden": "Seda ei saa teha sirgeks, kuna see on ühendatud peidetud objektiga."
+                "too_bendy": "Seda ei saa sirgeks teha, kuna see painduks liiga palju."
              },
              "delete": {
                  "title": "Kustuta",
                  "description": {
              },
              "delete": {
                  "title": "Kustuta",
                  "description": {
-                    "single": "Kustutad see nähtus jäädavalt.",
-                    "multiple": "Kustuta need nähtused jäädavalt"
+                    "single": "Kustutad see objekt jäädavalt.",
+                    "multiple": "Kustuta need objektid jäädavalt."
                  },
                  "annotation": {
                      "point": "Punkt kustutatud.",
                  },
                  "annotation": {
                      "point": "Punkt kustutatud.",
-                    "vertex": "Punkt kustutatud joonelt.",
+                    "vertex": "Sõlm kustutatud joonelt.",
                      "line": "Joon kustutatud.",
                      "area": "Ala kustutatud.",
                      "line": "Joon kustutatud.",
                      "area": "Ala kustutatud.",
-                    "relation": "Seos kustutatud.",
-                    "multiple": "{n} nähtust kustutatud."
+                    "relation": "Relatsioon kustutatud.",
+                    "multiple": "{n} objekti kustutatud."
+                },
+                "too_large": {
+                    "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."
                  }
              },
              "add_member": {
                  "annotation": "Lisatud relatsiooni liige."
              },
              "delete_member": {
                  }
              },
              "add_member": {
                  "annotation": "Lisatud relatsiooni liige."
              },
              "delete_member": {
-                "annotation": "Seose liige kustutatud."
-            },
-            "connect": {
-                "annotation": {
-                    "point": "Joon ühendatud punktiga.",
-                    "vertex": "Joon ühendatud teise joonega.",
-                    "line": "Tee on ühendatud jooneks.",
-                    "area": "Tee on ühendatud alaks."
-                }
+                "annotation": "Relatsiooni liige kustutatud."
              },
              "disconnect": {
                  "title": "Ühenda lahti",
              },
              "disconnect": {
                  "title": "Ühenda lahti",
@@ -134,7 +150,8 @@
                  "key": "D",
                  "annotation": "Lahtiühendatud jooned/alad.",
                  "not_connected": "Siin pole piisavalt jooni/alasid lahtiühendamiseks.",
                  "key": "D",
                  "annotation": "Lahtiühendatud jooned/alad.",
                  "not_connected": "Siin pole piisavalt jooni/alasid lahtiühendamiseks.",
-                "connected_to_hidden": "Seda ei saa lahti ühendada, kuna see on ühendatud peidetud objektiga."
+                "connected_to_hidden": "Seda ei saa lahti ühendada, kuna see on ühendatud peidetud objektiga.",
+                "relation": "Seda ei saa lahti ühendada, sest see ühendab relatsiooni liikmeid."
              },
              "merge": {
                  "title": "Ühenda",
              },
              "merge": {
                  "title": "Ühenda",
@@ -142,9 +159,8 @@
                  "key": "C",
                  "annotation": "Ühendatud {n} objekti.",
                  "not_eligible": "Neid objekte ei saa ühendada.",
                  "key": "C",
                  "annotation": "Ühendatud {n} objekti.",
                  "not_eligible": "Neid objekte ei saa ühendada.",
-                "restriction": "Neid objekte ei saa ühendada kuna vähemalt üks neist on seose \"{relation}\" liige.",
-                "incomplete_relation": "Neid objekte ei saa ühendada, kuna vähemalt üks neist ei ole täielikult laetud.",
-                "conflicting_tags": "Neid objekte ei saa ühendada kuna osa nende silte on konfliktsete väärtusega."
+                "incomplete_relation": "Neid objekte ei saa ühendada, kuna vähemalt üks neist ei ole täielikult alla laaditud.",
+                "conflicting_tags": "Neid objekte ei saa ühendada, kuna osa nende silte on konfliktsete väärtustega."
              },
              "move": {
                  "title": "Liiguta",
              },
              "move": {
                  "title": "Liiguta",
@@ -155,14 +171,18 @@
                  "key": "M",
                  "annotation": {
                      "point": "Punkt nihutatud.",
                  "key": "M",
                  "annotation": {
                      "point": "Punkt nihutatud.",
-                    "vertex": "Nihutatud Joone punkti.",
+                    "vertex": "Nihutatud joone sõlm.",
                      "line": "Nihutatud joont.",
                      "area": "Nihutatud ala.",
                      "multiple": "Liigutatud mitut objekti."
                  },
                  "incomplete_relation": {
                      "line": "Nihutatud joont.",
                      "area": "Nihutatud ala.",
                      "multiple": "Liigutatud mitut objekti."
                  },
                  "incomplete_relation": {
-                    "single": "Seda objekti ei saa liigutada kuna see ei ole veel täielikult alla laetud.",
-                    "multiple": "Neid objekte ei saa liigutada kuna nad ei ole veel täielikult alla laetud."
+                    "single": "Seda objekti ei saa liigutada, kuna see ei ole veel täielikult alla laaditud.",
+                    "multiple": "Neid objekte ei saa liigutada, kuna need ei ole veel täielikult alla laaditud."
+                },
+                "too_large": {
+                    "single": "Seda objekti ei saa liigutada, sest piisavalt suur osa sellest pole praegu nähtaval.",
+                    "multiple": "Neid objekte ei saa liigutada, sest piisavalt suur osa neist pole praegu nähtaval."
                  }
              },
              "reflect": {
                  }
              },
              "reflect": {
@@ -193,27 +213,47 @@
                          "single": "Objekt peegeldatud lühkest telge pidi.",
                          "multiple": "Objektid peegeldatud lühkest telge pidi."
                      }
                          "single": "Objekt 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."
                  }
              },
              "rotate": {
                  "title": "Pööra",
                  }
              },
              "rotate": {
                  "title": "Pööra",
+                "description": {
+                    "single": "Pööra objekti ümber keskpunkti.",
+                    "multiple": "Pööra objekte ümber nende keskpunkti."
+                },
                  "key": "R",
                  "annotation": {
                      "line": "Pööratud joont.",
                      "area": "Pööratud ala.",
                      "multiple": "Pööratud mitut objekti."
                  "key": "R",
                  "annotation": {
                      "line": "Pööratud joont.",
                      "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."
                  }
              },
              "reverse": {
                  "title": "Pööra ümber",
                  }
              },
              "reverse": {
                  "title": "Pööra ümber",
-                "description": "Pööra tee vastassuunda.",
+                "description": "Pööra joon vastassuunda.",
                  "key": "V",
                  "annotation": "Tee on pööratud."
              },
              "split": {
                  "title": "Tükelda",
                  "description": {
                  "key": "V",
                  "annotation": "Tee on pööratud."
              },
              "split": {
                  "title": "Tükelda",
                  "description": {
-                    "line": "Tükelda see joon kaheks sellest punktist.",
+                    "line": "Tükelda joon selle sõlme kohalt kaheks.",
                      "area": "Jaga selle ala piir kaheks."
                  },
                  "key": "X",
                      "area": "Jaga selle ala piir kaheks."
                  },
                  "key": "X",
@@ -222,14 +262,9 @@
                      "area": "Ala välispiir tükeldatud."
                  },
                  "not_eligible": "Jooni ei saa tükeldada nende algusest või lõpust.",
                      "area": "Ala välispiir tükeldatud."
                  },
                  "not_eligible": "Jooni ei saa tükeldada nende algusest või lõpust.",
-                "connected_to_hidden": "Seda ei saa tükedada kuna see on ühendatud peidetud objektiga."
+                "connected_to_hidden": "Seda ei saa tükeldada, kuna see on ühendatud peidetud objektiga."
              },
              "restriction": {
              },
              "restriction": {
-                "help": {
-                    "toggle": "Kliki, et määrata pöörde piiranguid.",
-                    "toggle_on": "Kliki, et lisada \"{restriction}\" piirang.",
-                    "toggle_off": "Kliki, et eemaldada \"{restriction}\" piirang."
-                },
                  "annotation": {
                      "create": "Lisatud pöörde piirang",
                      "delete": "Kustutatud pöörde piirang"
                  "annotation": {
                      "create": "Lisatud pöörde piirang",
                      "delete": "Kustutatud pöörde piirang"
@@ -237,7 +272,7 @@
              }
          },
          "undo": {
              }
          },
          "undo": {
-            "tooltip": "Tühista: : {action}",
+            "tooltip": "Võta tagasi: {action}",
              "nothing": "Pole midagi tagasi võtta."
          },
          "redo": {
              "nothing": "Pole midagi tagasi võtta."
          },
          "redo": {
@@ -245,17 +280,16 @@
              "nothing": "Pole midagi uuesti teha."
          },
          "tooltip_keyhint": "Kiirvalik:",
              "nothing": "Pole midagi uuesti teha."
          },
          "tooltip_keyhint": "Kiirvalik:",
-        "browser_notice": "See redaktor on toetatud järgnevates veebilehitsejates: Firefox, Chrome, Safari, Opera, ja Internet Explorer 11 ning uuemates. Palun uuenda oma veebilehitsejat või kasuta Potlatch 2'te kaardi muutmiseks.",
+        "browser_notice": "Seda redaktorit toetavad järgmised brauserid: Firefox, Chrome, Safari, Opera ning Internet Explorer 11 ja uuemad. Palun uuenda oma brauser või kasuta redaktorit Potlatch 2, et kaarti muuta.",
          "translate": {
              "translate": "Tõlgi",
          "translate": {
              "translate": "Tõlgi",
-            "localized_translation_label": "Mitmekeelne nimi",
              "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",
          "login": "Logi sisse",
          "logout": "Logi välja",
-        "loading_auth": "OpenStreetMap'iga ühendamine...",
+        "loading_auth": "OpenStreetMapiga ühendamine...",
          "report_a_bug": "Teata veast",
          "help_translate": "Aita tõlkida",
          "feature_info": {
          "report_a_bug": "Teata veast",
          "help_translate": "Aita tõlkida",
          "feature_info": {
@@ -263,24 +297,68 @@
              "hidden_details": "Need objektid on hetkel peidetud: {details}"
          },
          "commit": {
              "hidden_details": "Need objektid on hetkel peidetud: {details}"
          },
          "commit": {
-            "title": "Lae OpenStreetMapi",
-            "description_placeholder": "Oma muudatuste lühikirjeldus (nõutud)",
-            "message_label": "Muutuskogumi kommentaar",
-            "upload_explanation": "Su salvestatavad muudatused on nähtaval kõikidel kaartidel mis kasutavad OpenStreetMap-i andmeid.",
-            "upload_explanation_with_user": "Su kasutajana {user} salvestatavad muudatused on nähtaval kõikidel kaartidel, mis kasutavad OpenStreetMap-i andmeid.",
-            "save": "Salvesta",
-            "cancel": "Tühista",
-            "changes": "{count} Muudatust",
+            "title": "Laadi OpenStreetMapi",
+            "upload_explanation": "Muudatused, mille üles laadid, on nähtavad kõikidel kaartidel, mis kasutavad OpenStreetMapi andmeid.",
+            "upload_explanation_with_user": "Muudatused, mille kasutajana {user} üles laadid, on nähtavad kõikidel kaartidel, mis kasutavad OpenStreetMapi andmeid.",
+            "request_review": "Ma soovin, et keegi vaataks minu muudatused üle.",
+            "save": "Laadi üles",
+            "cancel": "Loobu",
+            "changes": "{count} muudatust",
+            "download_changes": "Laadi alla osmChange-fail",
+            "errors": "Vead",
              "warnings": "Hoiatused",
              "modified": "Muudetud",
              "deleted": "Kustutatud",
              "created": "Loodud",
              "warnings": "Hoiatused",
              "modified": "Muudetud",
              "deleted": "Kustutatud",
              "created": "Loodud",
-            "google_warning": "Sa mainisid Google'it selles kommentaaris: palun arvesta, et Google Maps'ist andmete kopeerimine on rangelt keelatud."
+            "about_changeset_comments": "Muudatuskogumi kommentaaride kohta",
+            "google_warning": "Mainisid selles kommentaaris Google'it. Palun arvesta, et Google Mapsist andmete kopeerimine on rangelt keelatud."
          },
          "contributors": {
              "list": "Muutjad: {users}",
              "truncated_list": "Muutjad: {users} ja {count} teist"
          },
          },
          "contributors": {
              "list": "Muutjad: {users}",
              "truncated_list": "Muutjad: {users} ja {count} teist"
          },
+        "info_panels": {
+            "background": {
+                "title": "Taust",
+                "source": "Allikas",
+                "description": "Kirjeldus",
+                "resolution": "Eraldus",
+                "accuracy": "Täpsus",
+                "unknown": "Teadmata"
+            },
+            "history": {
+                "title": "Ajalugu",
+                "selected": "{n} valitud",
+                "no_history": "Ajalugu puudub (uus detail)",
+                "version": "Versioon",
+                "last_edit": "Viimane muudatus",
+                "edited_by": "Muutis",
+                "changeset": "Muudatuskogum",
+                "unknown": "Teadmata",
+                "link_text": "Ajalugu openstreetmap.org-is"
+            },
+            "location": {
+                "key": "A",
+                "title": "Asukoht",
+                "unknown_location": "Teadmata asukoht"
+            },
+            "measurement": {
+                "key": "M",
+                "title": "Mõõtmine",
+                "selected": "{n} valitud",
+                "geometry": "Geomeetria",
+                "closed_line": "suletud joon",
+                "closed_area": "suletud ala",
+                "center": "Keskpunkt",
+                "perimeter": "Ümbermõõt",
+                "length": "Pikkus",
+                "area": "Ala",
+                "centroid": "Tsentroid",
+                "location": "Asukoht",
+                "metric": "Meeter",
+                "imperial": "Inglise"
+            }
+        },
          "geometry": {
              "point": "punkt",
              "vertex": "tipp",
          "geometry": {
              "point": "punkt",
              "vertex": "tipp",
@@ -290,7 +368,6 @@
          },
          "geocoder": {
              "search": "Otsi kogu maailmast...",
          },
          "geocoder": {
              "search": "Otsi kogu maailmast...",
-            "no_results_visible": "Nähtaval kaardialal tulemusi ei leitud",
              "no_results_worldwide": "Tulemusi ei leitud"
          },
          "geolocate": {
              "no_results_worldwide": "Tulemusi ei leitud"
          },
          "geolocate": {
@@ -298,19 +375,25 @@
              "locating": "Asukoha määramine, palun oota..."
          },
          "inspector": {
              "locating": "Asukoha määramine, palun oota..."
          },
          "inspector": {
-            "no_documentation_combination": "Selle sildi kohta puudub dokumentatsioon",
-            "no_documentation_key": "Selle objektiliigi kohta puudub informatsioon",
+            "zoom_to": {
+                "key": "Z",
+                "title": "Suumi selleni",
+                "tooltip_feature": "Tsentreeri ja suumi kaarti, et keskenduda sellele objektile.",
+                "tooltip_note": "Tsentreeri ja suumi kaarti, et keskenduda sellele teatele.",
+                "tooltip_data": "Tsentreeri ja suumi kaarti, et keskenduda sellele andmele.",
+                "tooltip_issue": "Tsentreeri ja suumi kaarti, et keskenduda sellele veale."
+            },
              "show_more": "Näita rohkem",
              "show_more": "Näita rohkem",
-            "view_on_osm": "Vaata openstreetmap.org lehel",
+            "view_on_osm": "Vaata asukohas openstreetmap.org",
+            "view_on_keepRight": "Vaata lehel keepright.at",
              "all_fields": "Kõik väljad",
              "all_tags": "Kõik sildid",
              "all_members": "Kõik liikmed",
              "all_fields": "Kõik väljad",
              "all_tags": "Kõik sildid",
              "all_members": "Kõik liikmed",
-            "all_relations": "Kõik seosed",
-            "new_relation": "Uus seos...",
+            "all_relations": "Kõik relatsioonid",
+            "new_relation": "Uus relatsioon...",
              "role": "Roll",
              "choose": "Vali objekti liik",
              "results": "{n} tulemust otsingule {search}",
              "role": "Roll",
              "choose": "Vali objekti liik",
              "results": "{n} tulemust otsingule {search}",
-            "reference": "Vaata OpenStreetMap Wiki lehel",
              "back_tooltip": "Muuda objekti",
              "remove": "Eemalda",
              "search": "Otsi",
              "back_tooltip": "Muuda objekti",
              "remove": "Eemalda",
              "search": "Otsi",
@@ -322,7 +405,7 @@
              "check": {
                  "yes": "Jah",
                  "no": "Ei",
              "check": {
                  "yes": "Jah",
                  "no": "Ei",
-                "reverser": "Muuda Suunda"
+                "reverser": "Muuda suunda"
              },
              "radio": {
                  "structure": {
              },
              "radio": {
                  "structure": {
@@ -333,34 +416,63 @@
              },
              "add": "Lisa",
              "none": "Puudub",
              },
              "add": "Lisa",
              "none": "Puudub",
-            "node": "Punkt",
+            "node": "Sõlm",
              "way": "Joon",
              "way": "Joon",
-            "relation": "Seos",
+            "relation": "Relatsioon",
              "location": "Asukoht",
              "add_fields": "Lisa väli:"
          },
          "background": {
              "title": "Taust",
              "description": "Tausta seaded",
              "location": "Asukoht",
              "add_fields": "Lisa väli:"
          },
          "background": {
              "title": "Taust",
              "description": "Tausta seaded",
-            "percent_brightness": "{opacity}% heledus",
+            "backgrounds": "Taustad",
              "none": "Puudub",
              "none": "Puudub",
+            "switch": "Vaheta tagasi selle tausta vastu",
              "custom": "Kohandatud",
              "custom": "Kohandatud",
-            "custom_button": "Muuda kohandatud tausta",
-            "fix_misalignment": "Korrigeeri kattekaardi nihet",
+            "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": "Minikaart",
+                "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"
+                },
+                "notes": {
+                    "tooltip": "Märke andmed OpenStreetMapist",
+                    "title": "OpenStreetMapi märked"
+                },
+                "keepRight": {
+                    "tooltip": "Automaatselt tuvastatud keepright.at kaardivead",
+                    "title": "KeepRight Vead"
+                },
+                "improveOSM": {
+                    "tooltip": "Puuduvad andmed mis on improveosm.org poolt automaatselt avastatud",
+                    "title": "ImproveOSM Vead"
+                },
+                "custom": {
+                    "title": "Kohandatud kaardiandmed"
+                }
+            },
              "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": {
@@ -388,15 +500,15 @@
                  "tooltip": "Metsad, põllumaad, pargid, elamumaa, ärimaa.."
              },
              "boundaries": {
                  "tooltip": "Metsad, põllumaad, pargid, elamumaa, ärimaa.."
              },
              "boundaries": {
-                "description": "Piirjooned",
-                "tooltip": "Administratiivpiirid"
+                "description": "Piirid",
+                "tooltip": "Halduspiirid"
              },
              "water": {
                  "description": "Veekogud",
                  "tooltip": "Jõed, järved, tiigid, hoidlad.."
              },
              "rail": {
              },
              "water": {
                  "description": "Veekogud",
                  "tooltip": "Jõed, järved, tiigid, hoidlad.."
              },
              "rail": {
-                "description": "Raudtee taristu",
+                "description": "Raudteetaristu",
                  "tooltip": "Raudteed"
              },
              "power": {
                  "tooltip": "Raudteed"
              },
              "power": {
@@ -408,7 +520,7 @@
                  "tooltip": "Planeeritud, ehitamisel, mahajäetud, lammutatud.."
              },
              "others": {
                  "tooltip": "Planeeritud, ehitamisel, mahajäetud, lammutatud.."
              },
              "others": {
-                "description": "Muu",
+                "description": "Muud",
                  "tooltip": "Kõik ülejäänud"
              }
          },
                  "tooltip": "Kõik ülejäänud"
              }
          },
@@ -426,18 +538,24 @@
                  "tooltip": "Alad kuvatakse täielikult täidetuna."
              }
          },
                  "tooltip": "Alad kuvatakse täielikult täidetuna."
              }
          },
-        "restore": {
-            "heading": "Sul on salvestamata muudatusi",
-            "description": "Kas soovid taastada eelmise sessiooni käigus tehtud muudatused?"
+        "settings": {
+            "custom_background": {
+                "tooltip": "Muuda kohandatud taustkatet",
+                "header": "Kohandatud taustakatte sätted"
+            },
+            "custom_data": {
+                "tooltip": "Muuda kohandatud andmekihti",
+                "header": "Kohandatud kaardiandmete sätted"
+            }
          },
          "save": {
              "title": "Salvesta",
          },
          "save": {
              "title": "Salvesta",
-            "help": "Vaata oma muudatused üle ning lae need OpenStreetMap'i, tehes need teistele kasutajatele nähtavaks.",
+            "help": "Vaata muudatused üle ja laadi need OpenStreetMapi, et teha need teistele kasutajatele nähtavaks.",
              "no_changes": "Salvestamist vajavad muudatused puuduvad.",
              "no_changes": "Salvestamist vajavad muudatused puuduvad.",
-            "error": "Salvestamise tekkisid vead",
+            "error": "Salvestamisel esines tõrkeid",
              "status_code": "Server vastas olekukoodiga {code}",
              "unknown_error_details": "Palun kontrolli Internetiühendust.",
              "status_code": "Server vastas olekukoodiga {code}",
              "unknown_error_details": "Palun kontrolli Internetiühendust.",
-            "uploading": "Muudatuste üleslaadimine OpenStreetMap'i.",
+            "uploading": "Muudatuste üleslaadimine OpenStreetMapi...",
              "unsaved_changes": "Sul on salvestamata muudatusi",
              "conflict": {
                  "header": "Lahenda konfliktsed muudatused",
              "unsaved_changes": "Sul on salvestamata muudatusi",
              "conflict": {
                  "header": "Lahenda konfliktsed muudatused",
@@ -448,38 +566,25 @@
                  "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 lae alla oma muudatused.",
+                "download_changes": "Või laadi alla osmChange-fail",
                  "done": "Kõik konfliktid lahendatud!",
                  "done": "Kõik konfliktid lahendatud!",
-                "help": "Teine kasutaja muutis kaardil samu objekte mida sinagi.\nKlikkides allolevatele objektidele näed konflikti detaile ning saad valida\nkas säilitada sinu või teise tasutaja muudatused.\n"
+                "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"
              }
          },
          "merge_remote_changes": {
              "conflict": {
              }
          },
          "merge_remote_changes": {
              "conflict": {
-                "deleted": "See objekt on kustutatud {user} poolt.",
-                "location": "See objekt on nii sinu kui {user} poolt liigutatud.",
-                "nodelist": "Sõlmi on muudetud nii sinu kui ka {user} poolt.",
-                "memberlist": "Seose liikmeid on muudetud nii sinu kui ka {user} poolt.",
-                "tags": "Sina määrasid <b>{tag}</b> lipiku väärtuseks \"{local}\", {user} aga määras \"{remote}\"."
+                "deleted": "Kasutaja {user} on selle objekti kustutanud.",
+                "location": "Seda objekti olete liigutanud nii sina kui ka kasutaja {user}.",
+                "nodelist": "Sõlmi olete muutnud nii sina kui ka kasutaja {user}.",
+                "memberlist": "Relatsiooni liikmeid olete muutnud nii sina kui ka kasutaja {user}.",
+                "tags": "Määrasid sildi <b>{tag}</b> väärtuseks \"{local}\", {user} aga määras väärtuseks \"{remote}\"."
              }
          },
          "success": {
              }
          },
          "success": {
-            "edited_osm": "Sa täiendasid OSM-i!",
-            "just_edited": "Sa täiendasid just OpenStreetMap-i!",
-            "view_on_osm": "Vaata OSM lehel",
-            "facebook": "Jaga Facebook-is",
-            "twitter": "Jaga Twitteris",
-            "google": "Jaga Google+-is",
-            "help_html": "Sinu muudatused peaksid ilmuma \"Standard\" kihil mõne minuti jooksul. Teistel kihtidel aga ka teatud teatud objektidega võib kauem minna.",
-            "help_link_text": "Detailid"
+            "help_link_text": "Üksikasjad"
          },
          "confirm": {
          },
          "confirm": {
-            "cancel": "Tühista"
-        },
-        "splash": {
-            "welcome": "Tere tulemast kasutama iD OpenStreetMap redaktorit",
-            "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"
+            "cancel": "Loobu"
          },
          "source_switch": {
              "live": "live",
          },
          "source_switch": {
              "live": "live",
@@ -491,43 +596,80 @@
              "on_wiki": "{tag} wiki.osm.org-is",
              "used_with": "kasutatakse koos liigiga {type}"
          },
              "on_wiki": "{tag} wiki.osm.org-is",
              "used_with": "kasutatakse koos liigiga {type}"
          },
-        "validations": {
-            "disconnected_highway": "Lahtiühendatud tee",
-            "disconnected_highway_tooltip": "Teed peaksid olema ühendatud teiste teede või hoonete sissepääsudega.",
-            "untagged_point": "Sildistamata punkt",
-            "untagged_line": "Sildistamata joon",
-            "untagged_area": "Sildistamata ala",
-            "untagged_relation": "Sildisamatta seos",
-            "many_deletions": "Sa oled kustutamas {n} objekti. Oled sa kindel, et soovid seda teha? See kustutab need kaardilt, mida kõik teised näevad openstreetmap.org lehel.",
-            "tag_suggests_area": "Silt {tag} viitab, et joon peaks olema ala, kuid see pole ala.",
-            "deprecated_tags": "Iganenud sildid: {tags}"
-        },
          "zoom": {
          "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",
-        "gpx": {
-            "local_layer": "Lokaalne fail",
-            "drag_drop": "Lohista lehele .gpx, .geojson või .kml fail või kliki nuppu paremal et sirvida",
-            "zoom": "Suumi tasandini",
-            "browse": "Sirvi faili"
+        "QA": {
+            "keepRight": {
+                "title": "KeepRight Viga",
+                "detail_title": "Viga",
+                "detail_description": "Kirjeldus",
+                "comment": "Kommentaar",
+                "comment_placeholder": "Lisa kommentaar, mida teistega jagada.",
+                "close": "Sulge (Viga Parandatud)",
+                "ignore": "Ignoreeri (Ei Ole Viga)",
+                "save_comment": "Salvesta Kommentaar",
+                "close_comment": "Sulge ja Kommenteeri",
+                "ignore_comment": "Ignoreeri ja Kommenteeri"
+            }
          },
          },
-        "mapillary_images": {
-            "tooltip": "Tänava-tasandi fotod Mapillary'st",
-            "title": "Foto-kate (Mapillary)"
+        "streetside": {
+            "tooltip": "Tänava-tasandi fotod Microsoftilt",
+            "report": "Teata privaatsusmurest selle pildiga",
+            "view_on_bing": "Vaata Bing Mapsis",
+            "hires": "Suur eraldus"
          },
          },
-        "mapillary_signs": {
-            "tooltip": "Liiklusmärgid Mapillary'st (Foto-kate peab olema lubatud)",
-            "title": "Liiklusmärgi-kate (Mapillary)"
+        "mapillary_images": {
+            "tooltip": "Tänavatasandi fotod Mapillaryst"
          },
          "mapillary": {
          },
          "mapillary": {
-            "view_on_mapillary": "Vaata seda fotot Mapillary's"
+            "view_on_mapillary": "Vaata seda fotot Mapillarys"
+        },
+        "openstreetcam_images": {
+            "tooltip": "Tänavatasandi fotod OpenStreetCamist"
+        },
+        "note": {
+            "note": "Märge",
+            "title": "Muuda märget",
+            "anonymous": "anonüümne",
+            "closed": "(Suletud)",
+            "commentTitle": "Kommentaarid",
+            "newComment": "Uus kommentaar",
+            "inputPlaceholder": "Lisa kommentaar teistega jagamiseks.",
+            "close": "Sulge märge",
+            "open": "Taasava märge",
+            "comment": "Kommentaar",
+            "close_comment": "Sulge ja kommenteeri",
+            "open_comment": "Taasava ja kommenteeri",
+            "report": "Teavita",
+            "new": "Uus märge",
+            "newDescription": "Kirjelda mure.",
+            "save": "Salvesta märge",
+            "login": "Sa pead olema sisse logitud, et muuta või kommenteerida seda märget.",
+            "upload_explanation": "Sinu kommentaarid on avalikult nähtavad kõigile OpenStreetMapi kasutajatele.",
+            "upload_explanation_with_user": "Sinu kommentaarid kasutajana {user} on avalikult nähtavad kõigile OpenStreetMapi kasutajatele."
          },
          "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"
+            },
+            "notes": {
+                "title": "Märked"
+            }
+        },
+        "issues": {
+            "title": "Vead",
+            "list_title": "Vigu ({count})",
+            "no_issues": {
+                "hidden_issues": {
+                    "none": "Avastatud vead ilmuvad siia",
+                    "elsewhere": "Vead mujal: {count}"
+                }
+            }
          },
          "intro": {
              "graph": {
          },
          "intro": {
              "graph": {
@@ -561,6 +703,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": {
@@ -569,73 +720,39 @@
                  "category-building": {
                      "name": "Hooned"
                  },
                  "category-building": {
                      "name": "Hooned"
                  },
-                "category-golf": {
-                    "name": "Golf"
-                },
                  "category-landuse": {
                      "name": "Maakasutus"
                  },
                  "category-landuse": {
                      "name": "Maakasutus"
                  },
-                "category-natural-area": {
-                    "name": "Looduslik"
-                },
-                "category-natural-line": {
-                    "name": "Looduslik"
-                },
-                "category-natural-point": {
-                    "name": "Looduslik"
-                },
-                "category-path": {
-                    "name": "Rajad"
-                },
-                "category-rail": {
-                    "name": "Raudteed"
-                },
                  "category-restriction": {
                      "name": "Piirangud"
                  },
                  "category-restriction": {
                      "name": "Piirangud"
                  },
-                "category-road": {
-                    "name": "Teed"
-                },
                  "category-route": {
                      "name": "Marsruudid"
                  "category-route": {
                      "name": "Marsruudid"
-                },
-                "category-water-area": {
-                    "name": "Vesi"
-                },
-                "category-water-line": {
-                    "name": "Vesi"
                  }
              },
              "fields": {
                  "access": {
                  }
              },
              "fields": {
                  "access": {
-                    "label": "Lubatud ligipääs",
+                    "label": "Pääs lubatud",
                      "options": {
                          "designated": {
                      "options": {
                          "designated": {
-                            "description": "Pääs antud märkide või kindlate kohalike seadustega",
                              "title": "Määratud"
                          },
                          "destination": {
                              "title": "Määratud"
                          },
                          "destination": {
-                            "description": "Lubatud ainult sihtpunkti pääsemiseks",
                              "title": "Sihtkoht"
                          },
                          "dismount": {
                              "title": "Sihtkoht"
                          },
                          "dismount": {
-                            "description": "Läbipääs lubatud vaid käekõrval liikudes.",
-                            "title": "Käekõrval"
+                            "title": "Sadulast maas"
                          },
                          "no": {
                          },
                          "no": {
-                            "description": "Avalik juurdepääs puudub",
                              "title": "Keelatud"
                          },
                          "permissive": {
                              "title": "Keelatud"
                          },
                          "permissive": {
-                            "description": "Juurdepääs on lubatud ajani, mil omanik tühistab loa",
                              "title": "Omanik lubab"
                          },
                          "private": {
                              "title": "Omanik lubab"
                          },
                          "private": {
-                            "description": "Juurdepääs lubatud ainult omaniku eriloal",
                              "title": "Era"
                          },
                          "yes": {
                              "title": "Era"
                          },
                          "yes": {
-                            "description": "Juurdepääs seaduse alusel; igameheõigus",
                              "title": "Lubatud"
                          }
                      },
                              "title": "Lubatud"
                          }
                      },
@@ -649,10 +766,7 @@
                      }
                  },
                  "access_simple": {
                      }
                  },
                  "access_simple": {
-                    "label": "Lubatud juurdepääs"
-                },
-                "access_toilets": {
-                    "label": "Juurdepääs"
+                    "label": "Pääs lubatud"
                  },
                  "address": {
                      "label": "Aadress",
                  },
                  "address": {
                      "label": "Aadress",
@@ -662,8 +776,8 @@
                          "conscriptionnumber": "123",
                          "country": "Riik",
                          "county": "Maakond",
                          "conscriptionnumber": "123",
                          "country": "Riik",
                          "county": "Maakond",
-                        "county!jp": "Rajoon",
-                        "district": "Rajoon",
+                        "county!jp": "Ringkond",
+                        "district": "Ringkond",
                          "floor": "Korrus",
                          "housename": "Maja nimetus",
                          "housenumber": "123",
                          "floor": "Korrus",
                          "housename": "Maja nimetus",
                          "housenumber": "123",
@@ -673,6 +787,12 @@
                          "street": "Tänav"
                      }
                  },
                          "street": "Tänav"
                      }
                  },
+                "admin_level": {
+                    "label": "Haldusüksuse järk"
+                },
+                "aerialway": {
+                    "label": "Tüüp"
+                },
                  "aerialway/access": {
                      "options": {
                          "both": "Mõlemad"
                  "aerialway/access": {
                      "options": {
                          "both": "Mõlemad"
@@ -702,8 +822,14 @@
                  "atm": {
                      "label": "Pangaautomaat"
                  },
                  "atm": {
                      "label": "Pangaautomaat"
                  },
-                "beauty": {
-                    "label": "Poetüüp"
+                "attraction": {
+                    "label": "Tüüp"
+                },
+                "barrier": {
+                    "label": "Tüüp"
+                },
+                "basin": {
+                    "label": "Tüüp"
                  },
                  "bench": {
                      "label": "Pink"
                  },
                  "bench": {
                      "label": "Pink"
@@ -715,13 +841,25 @@
                      "label": "Prügikast"
                  },
                  "board_type": {
                      "label": "Prügikast"
                  },
                  "board_type": {
-                    "label": "Tüü"
+                    "label": "Tüüp"
+                },
+                "booth": {
+                    "label": "Kabiin"
+                },
+                "boules": {
+                    "label": "Tüüp"
                  },
                  "boundary": {
                      "label": "Tüüp"
                  },
                  "brand": {
                  },
                  "boundary": {
                      "label": "Tüüp"
                  },
                  "brand": {
-                    "label": "Bränd"
+                    "label": "Tootemark"
+                },
+                "bridge": {
+                    "label": "Tüüp"
+                },
+                "bridge/support": {
+                    "label": "Tüüp"
                  },
                  "building": {
                      "label": "Hoone"
                  },
                  "building": {
                      "label": "Hoone"
@@ -735,25 +873,19 @@
                  "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"
                  },
                  "collection_times": {
                      "label": "Tühjendusajad"
                  },
                  "club": {
                      "label": "Tüüp"
                  },
                  "collection_times": {
                      "label": "Tühjendusajad"
                  },
+                "comment": {
+                    "label": "Muudatuskogumi kommentaar",
+                    "placeholder": "Sinu kaastöö lühikirjeldus (nõutav)"
+                },
                  "construction": {
                      "label": "Tüüp"
                  },
                  "construction": {
                      "label": "Tüüp"
                  },
@@ -761,6 +893,11 @@
                      "label": "Veebikaamera URL",
                      "placeholder": "http://näidis.ee"
                  },
                      "label": "Veebikaamera URL",
                      "placeholder": "http://näidis.ee"
                  },
+                "conveying": {
+                    "options": {
+                        "reversible": "Muutsuunaga"
+                    }
+                },
                  "country": {
                      "label": "Riik"
                  },
                  "country": {
                      "label": "Riik"
                  },
@@ -779,6 +916,9 @@
                  "cuisine": {
                      "label": "Köök"
                  },
                  "cuisine": {
                      "label": "Köök"
                  },
+                "cutting": {
+                    "label": "Tüüp"
+                },
                  "cycle_network": {
                      "label": "Võrgustik"
                  },
                  "cycle_network": {
                      "label": "Võrgustik"
                  },
@@ -786,7 +926,7 @@
                      "label": "Rattarajad",
                      "options": {
                          "lane": {
                      "label": "Rattarajad",
                      "options": {
                          "lane": {
-                            "description": "Jalgrattarada mis on eraldatud muust liilusest värvitud joonega",
+                            "description": "Rattarada, mis on eraldatud autoliiklusest värvitud joonega",
                              "title": "Tavaline rattarada"
                          },
                          "none": {
                              "title": "Tavaline rattarada"
                          },
                          "none": {
@@ -794,23 +934,23 @@
                              "title": "Puudub"
                          },
                          "opposite": {
                              "title": "Puudub"
                          },
                          "opposite": {
-                            "description": "Jalgrattarada mis võimaldab ühesuunalisel teel liikuda mõlemas suunas",
+                            "description": "Rattarada, mis võimaldab liikuda ühesuunalisel tänaval mõlemas suunas",
                              "title": "Kontrasuunaline rattarada"
                          },
                          "opposite_lane": {
                              "title": "Kontrasuunaline rattarada"
                          },
                          "opposite_lane": {
-                            "description": "Rattarada mis on muu liiklusega võrreldes vastupidise sõidusuunaga",
+                            "description": "Rattarada, mis kulgeb muu liikluse suhtes vastassuunas",
                              "title": "Vastupidise suunaga rattarada"
                          },
                          "share_busway": {
                              "title": "Vastupidise suunaga rattarada"
                          },
                          "share_busway": {
-                            "description": "Rattarada mis on jagatud ühistranspordirajaga",
+                            "description": "Rattarada, mis on jagatud ühistranspordirajaga",
                              "title": "Ühistranspordiga jagatud rattarada"
                          },
                          "shared_lane": {
                              "title": "Ühistranspordiga jagatud rattarada"
                          },
                          "shared_lane": {
-                            "description": "Rattarada mis ei ole ülejäänud liiklusest (mootorsõidukitest) kuidagi eraldatud",
+                            "description": "Rattarada, mis ei ole muust liiklusest eraldatud",
                              "title": "Jagatud rattarada"
                          },
                          "track": {
                              "title": "Jagatud rattarada"
                          },
                          "track": {
-                            "description": "Rattarada mis on liiklusest eraldatud füüsilise barjääriga",
+                            "description": "Rattarada, mis on liiklusest eraldatud füüsilise tõkkega",
                              "title": "Eraldatud rattarada"
                          }
                      },
                              "title": "Eraldatud rattarada"
                          }
                      },
@@ -819,6 +959,9 @@
                          "cycleway:right": "Paremas servas"
                      }
                  },
                          "cycleway:right": "Paremas servas"
                      }
                  },
+                "dance/style": {
+                    "label": "Tantsustiilid"
+                },
                  "date": {
                      "label": "Kuupäev"
                  },
                  "date": {
                      "label": "Kuupäev"
                  },
@@ -828,9 +971,54 @@
                  "denomination": {
                      "label": "Usulahk"
                  },
                  "denomination": {
                      "label": "Usulahk"
                  },
+                "diplomatic": {
+                    "label": "Tüüp"
+                },
+                "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": {
+                    "options": {
+                        "backward": "Tagasi",
+                        "both": "Mõlemad / Kõik",
+                        "forward": "Edasi"
+                    }
+                },
                  "dock": {
                      "label": "Tüüp"
                  },
                  "dock": {
                      "label": "Tüüp"
                  },
+                "door_type": {
+                    "label": "Tüüp"
+                },
                  "drive_through": {
                      "label": "Sõida läbi"
                  },
                  "drive_through": {
                      "label": "Sõida läbi"
                  },
@@ -839,20 +1027,32 @@
                      "options": {
                          "contact_line": "Kontaktliin",
                          "no": "Ei",
                      "options": {
                          "contact_line": "Kontaktliin",
                          "no": "Ei",
-                        "rail": "Elektrifitseeritud raudtee",
+                        "rail": "Elektriraudtee",
                          "yes": "Jah (määratlemata)"
                      },
                          "yes": "Jah (määratlemata)"
                      },
-                    "placeholder": "Kontaktliin, elektrifitseeritud, ei..."
+                    "placeholder": "Kontaktliin, elektriraudtee..."
                  },
                  "elevation": {
                      "label": "Kõrgus merepinnast"
                  },
                  "email": {
                  },
                  "elevation": {
                      "label": "Kõrgus merepinnast"
                  },
                  "email": {
-                    "label": "Email",
+                    "label": "E-posti aadress",
                      "placeholder": "näide@näide.ee"
                  },
                      "placeholder": "näide@näide.ee"
                  },
+                "embankment": {
+                    "label": "Tüüp"
+                },
+                "embassy": {
+                    "label": "Tüüp"
+                },
                  "emergency": {
                  "emergency": {
-                    "label": "Häda"
+                    "label": "Hädaabi"
+                },
+                "emergency_combo": {
+                    "label": "Tüüp"
+                },
+                "enforcement": {
+                    "label": "Tüüp"
                  },
                  "entrance": {
                      "label": "Tüüp"
                  },
                  "entrance": {
                      "label": "Tüüp"
@@ -870,6 +1070,12 @@
                  "fence_type": {
                      "label": "Tüüp"
                  },
                  "fence_type": {
                      "label": "Tüüp"
                  },
+                "fixme": {
+                    "label": "Vajab parandamist"
+                },
+                "ford": {
+                    "label": "Tüüp"
+                },
                  "fuel": {
                      "label": "Kütus"
                  },
                  "fuel": {
                      "label": "Kütus"
                  },
@@ -879,12 +1085,36 @@
                  "gauge": {
                      "label": "Rööpalaius"
                  },
                  "gauge": {
                      "label": "Rööpalaius"
                  },
-                "golf_hole": {
-                    "label": "Viide"
+                "generator/type": {
+                    "label": "Tüüp"
+                },
+                "government": {
+                    "label": "Tüüp"
+                },
+                "guest_house": {
+                    "label": "Tüüp"
                  },
                  "handrail": {
                      "label": "Käsipuu"
                  },
                  },
                  "handrail": {
                      "label": "Käsipuu"
                  },
+                "hashtags": {
+                    "label": "Soovitatud trellsildid"
+                },
+                "healthcare": {
+                    "label": "Tüüp"
+                },
+                "healthcare/speciality": {
+                    "label": "Erialad"
+                },
+                "highway": {
+                    "label": "Tüüp"
+                },
+                "historic": {
+                    "label": "Tüüp"
+                },
+                "horse_riding": {
+                    "label": "Ratsutamine"
+                },
                  "iata": {
                      "label": "IATA"
                  },
                  "iata": {
                      "label": "IATA"
                  },
@@ -894,6 +1124,21 @@
                  "indoor": {
                      "label": "Siseruum"
                  },
                  "indoor": {
                      "label": "Siseruum"
                  },
+                "indoor_type": {
+                    "label": "Tüüp"
+                },
+                "industrial": {
+                    "label": "Tüüp"
+                },
+                "information": {
+                    "label": "Tüüp"
+                },
+                "intermittent": {
+                    "label": "Perioodiline"
+                },
+                "intermittent_yes": {
+                    "label": "Perioodiline"
+                },
                  "internet_access": {
                      "label": "Pääs internetti",
                      "options": {
                  "internet_access": {
                      "label": "Pääs internetti",
                      "options": {
@@ -907,8 +1152,11 @@
                  "internet_access/fee": {
                      "label": "Internetipääsu tasu"
                  },
                  "internet_access/fee": {
                      "label": "Internetipääsu tasu"
                  },
-                "internet_access/ssid": {
-                    "label": "SSID (Võrgu nimi)"
+                "lamp_type": {
+                    "label": "Tüüp"
+                },
+                "landuse": {
+                    "label": "Tüüp"
                  },
                  "lanes": {
                      "label": "Sõiduread"
                  },
                  "lanes": {
                      "label": "Sõiduread"
@@ -916,24 +1164,55 @@
                  "layer": {
                      "label": "Kiht"
                  },
                  "layer": {
                      "label": "Kiht"
                  },
+                "leaf_type": {
+                    "label": "Lehe tüüp"
+                },
+                "leaf_type_singular": {
+                    "label": "Lehe tüüp"
+                },
+                "leisure": {
+                    "label": "Tüüp"
+                },
                  "length": {
                      "label": "Pikkus (meetrites)"
                  },
                  "levels": {
                      "label": "Korruseid"
                  },
                  "length": {
                      "label": "Pikkus (meetrites)"
                  },
                  "levels": {
                      "label": "Korruseid"
                  },
+                "liaison": {
+                    "label": "Tüüp"
+                },
                  "lit": {
                      "label": "Valgustatud"
                  },
                  "lit": {
                      "label": "Valgustatud"
                  },
+                "man_made": {
+                    "label": "Tüüp"
+                },
+                "manhole": {
+                    "label": "Tüüp"
+                },
+                "map_type": {
+                    "label": "Tüüp"
+                },
                  "maxheight": {
                      "label": "Kõrguse piirang"
                  },
                  "maxspeed": {
                  "maxheight": {
                      "label": "Kõrguse piirang"
                  },
                  "maxspeed": {
-                    "label": "Kiirusepiirang"
+                    "label": "Kiiruspiirang"
+                },
+                "maxspeed/advisory": {
+                    "label": "Soovitatav suurim kiirus",
+                    "placeholder": "30, 50, 70..."
+                },
+                "maxweight_bridge": {
+                    "label": "Massipiirang"
+                },
+                "memorial": {
+                    "label": "Tüüp"
                  },
                  "name": {
                      "label": "Nimi",
                  },
                  "name": {
                      "label": "Nimi",
-                    "placeholder": "Üldine nimi (kui on)"
+                    "placeholder": "Üldlevinud nimi (kui on)"
                  },
                  "natural": {
                      "label": "Looduslik"
                  },
                  "natural": {
                      "label": "Looduslik"
@@ -983,7 +1262,9 @@
                  "oneway": {
                      "label": "Ühesuunaline",
                      "options": {
                  "oneway": {
                      "label": "Ühesuunaline",
                      "options": {
+                        "alternating": "Vahelduv",
                          "no": "Ei",
                          "no": "Ei",
+                        "reversible": "Muutsuunaga",
                          "undefined": "Eeldatavasti mitte",
                          "yes": "Jah"
                      }
                          "undefined": "Eeldatavasti mitte",
                          "yes": "Jah"
                      }
@@ -991,7 +1272,9 @@
                  "oneway_yes": {
                      "label": "Ühesuunaline",
                      "options": {
                  "oneway_yes": {
                      "label": "Ühesuunaline",
                      "options": {
+                        "alternating": "Vahelduv",
                          "no": "Ei",
                          "no": "Ei",
+                        "reversible": "Muutsuunaga",
                          "undefined": "Eeldatavasti Jah",
                          "yes": "Jah"
                      }
                          "undefined": "Eeldatavasti Jah",
                          "yes": "Jah"
                      }
@@ -1002,13 +1285,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"
                  },
@@ -1027,10 +1303,21 @@
                  "payment_multi": {
                      "label": "Makseviisid"
                  },
                  "payment_multi": {
                      "label": "Makseviisid"
                  },
+                "payment_multi_fee": {
+                    "label": "Makseviisid"
+                },
                  "phone": {
                  "phone": {
-                    "label": "Telefon",
                      "placeholder": "+372 567 8901"
                  },
                      "placeholder": "+372 567 8901"
                  },
+                "piste/type": {
+                    "label": "Tüüp"
+                },
+                "place": {
+                    "label": "Tüüp"
+                },
+                "playground": {
+                    "label": "Tüüp"
+                },
                  "population": {
                      "label": "Rahvaarv"
                  },
                  "population": {
                      "label": "Rahvaarv"
                  },
@@ -1040,18 +1327,21 @@
                  "railway": {
                      "label": "Tüüp"
                  },
                  "railway": {
                      "label": "Tüüp"
                  },
+                "railway/signal/direction": {
+                    "options": {
+                        "backward": "Tagasi",
+                        "both": "Mõlemad / Kõik",
+                        "forward": "Edasi"
+                    }
+                },
                  "recycling_accepts": {
                      "label": "Võtab vastu"
                  },
                  "recycling_type": {
                  "recycling_accepts": {
                      "label": "Võtab vastu"
                  },
                  "recycling_type": {
-                    "label": "Ümbertöötluse tüüp",
-                    "options": {
-                        "centre": "Ümbertöötluskeskus",
-                        "container": "Konteiner"
-                    }
+                    "label": "Tüüp"
                  },
                  },
-                "ref": {
-                    "label": "Viide"
+                "ref/isil": {
+                    "label": "ISIL-kood"
                  },
                  "relation": {
                      "label": "Tüüp"
                  },
                  "relation": {
                      "label": "Tüüp"
@@ -1065,6 +1355,18 @@
                  "restrictions": {
                      "label": "Pöörangu piirangud"
                  },
                  "restrictions": {
                      "label": "Pöörangu piirangud"
                  },
+                "room": {
+                    "label": "Tüüp"
+                },
+                "route": {
+                    "label": "Tüüp"
+                },
+                "route_master": {
+                    "label": "Tüüp"
+                },
+                "salt": {
+                    "label": "Soolane"
+                },
                  "seasonal": {
                      "label": "Hooajaline"
                  },
                  "seasonal": {
                      "label": "Hooajaline"
                  },
@@ -1104,9 +1406,15 @@
                  "shop": {
                      "label": "Tüüp"
                  },
                  "shop": {
                      "label": "Tüüp"
                  },
+                "siren/type": {
+                    "label": "Tüüp"
+                },
                  "site": {
                      "label": "Tüüp"
                  },
                  "site": {
                      "label": "Tüüp"
                  },
+                "site_type": {
+                    "label": "Koha tüüp"
+                },
                  "smoking": {
                      "label": "Suitsetamine",
                      "options": {
                  "smoking": {
                      "label": "Suitsetamine",
                      "options": {
@@ -1137,7 +1445,7 @@
                      "label": "Tüüp"
                  },
                  "source": {
                      "label": "Tüüp"
                  },
                  "source": {
-                    "label": "Allikas"
+                    "label": "Allikad"
                  },
                  "stop": {
                      "label": "Tüüp",
                  },
                  "stop": {
                      "label": "Tüüp",
@@ -1146,6 +1454,9 @@
                          "minor": "Vähetähtsad teed"
                      }
                  },
                          "minor": "Vähetähtsad teed"
                      }
                  },
+                "street_cabinet": {
+                    "label": "Tüüp"
+                },
                  "structure": {
                      "label": "Rajatis",
                      "options": {
                  "structure": {
                      "label": "Rajatis",
                      "options": {
@@ -1156,6 +1467,11 @@
                          "tunnel": "Tunnel"
                      }
                  },
                          "tunnel": "Tunnel"
                      }
                  },
+                "structure_waterway": {
+                    "options": {
+                        "tunnel": "Tunnel"
+                    }
+                },
                  "studio": {
                      "label": "Tüüp"
                  },
                  "studio": {
                      "label": "Tüüp"
                  },
@@ -1171,9 +1487,30 @@
                  "surface": {
                      "label": "Pinnakate"
                  },
                  "surface": {
                      "label": "Pinnakate"
                  },
+                "surveillance/type": {
+                    "label": "Seire tüüp"
+                },
+                "swimming_pool": {
+                    "label": "Tüüp"
+                },
+                "switch": {
+                    "label": "Tüüp"
+                },
+                "tidal": {
+                    "label": "Loodetest"
+                },
                  "toll": {
                      "label": "Maksustatud"
                  },
                  "toll": {
                      "label": "Maksustatud"
                  },
+                "tomb": {
+                    "label": "Tüüp"
+                },
+                "tourism": {
+                    "label": "Tüüp"
+                },
+                "tower/type": {
+                    "label": "Tüüp"
+                },
                  "tracktype": {
                      "label": "Raja tüüp",
                      "options": {
                  "tracktype": {
                      "label": "Raja tüüp",
                      "options": {
@@ -1185,21 +1522,43 @@
                      },
                      "placeholder": "Kõva, peamiselt kõva, pehme"
                  },
                      },
                      "placeholder": "Kõva, peamiselt kõva, pehme"
                  },
+                "trade": {
+                    "label": "Tüüp"
+                },
                  "traffic_calming": {
                      "label": "Tüüp"
                  },
                  "traffic_signals": {
                      "label": "Tüüp"
                  },
                  "traffic_calming": {
                      "label": "Tüüp"
                  },
                  "traffic_signals": {
                      "label": "Tüüp"
                  },
+                "traffic_signals/direction": {
+                    "options": {
+                        "backward": "Tagasi",
+                        "both": "Mõlemad / Kõik",
+                        "forward": "Edasi"
+                    }
+                },
+                "transformer": {
+                    "label": "Tüüp"
+                },
                  "trees": {
                      "label": "Puud"
                  },
                  "tunnel": {
                  "trees": {
                      "label": "Puud"
                  },
                  "tunnel": {
-                    "label": "Tunnel"
+                    "label": "Tüüp"
+                },
+                "usage_rail": {
+                    "label": "Kasutusotstarve"
+                },
+                "vending": {
+                    "label": "Kauba tüübid"
                  },
                  "visibility": {
                      "label": "Nähtavus"
                  },
                  },
                  "visibility": {
                      "label": "Nähtavus"
                  },
+                "volcano/type": {
+                    "label": "Vulkaani tüüp"
+                },
                  "wall": {
                      "label": "Tüüp"
                  },
                  "wall": {
                      "label": "Tüüp"
                  },
@@ -1213,8 +1572,7 @@
                      "label": "Tüüp"
                  },
                  "website": {
                      "label": "Tüüp"
                  },
                  "website": {
-                    "label": "Veebileht",
-                    "placeholder": "http://näidis24.ee/"
+                    "label": "Veebileht"
                  },
                  "wetland": {
                      "label": "Tüüp"
                  },
                  "wetland": {
                      "label": "Tüüp"
@@ -1222,6 +1580,9 @@
                  "wheelchair": {
                      "label": "Pääs ratastooliga"
                  },
                  "wheelchair": {
                      "label": "Pääs ratastooliga"
                  },
+                "wholesale": {
+                    "label": "Hulgikaubandus"
+                },
                  "width": {
                      "label": "Laius (meetrites)"
                  },
                  "width": {
                      "label": "Laius (meetrites)"
                  },
@@ -1256,6 +1617,12 @@
                      "name": "Lennuterminal",
                      "terms": "terminal,lennujaam"
                  },
                      "name": "Lennuterminal",
                      "terms": "terminal,lennujaam"
                  },
+                "aeroway/windsock": {
+                    "name": "Tuulesokk"
+                },
+                "allotments/plot": {
+                    "name": "Ühisaia krunt"
+                },
                  "amenity": {
                      "name": "Hüve"
                  },
                  "amenity": {
                      "name": "Hüve"
                  },
@@ -1284,6 +1651,9 @@
                      "name": "Rattaparkla",
                      "terms": "jalgrattaparkla"
                  },
                      "name": "Rattaparkla",
                      "terms": "jalgrattaparkla"
                  },
+                "amenity/bicycle_parking/building": {
+                    "terms": "autoparkla,parkla"
+                },
                  "amenity/bicycle_rental": {
                      "name": "Rattarent",
                      "terms": "jalgrattarent,laenutus"
                  "amenity/bicycle_rental": {
                      "name": "Rattarent",
                      "terms": "jalgrattarent,laenutus"
@@ -1291,9 +1661,6 @@
                  "amenity/bicycle_repair_station": {
                      "name": "Jalgrattaremondi pukk"
                  },
                  "amenity/bicycle_repair_station": {
                      "name": "Jalgrattaremondi pukk"
                  },
-                "amenity/biergarten": {
-                    "name": "Õlleaed"
-                },
                  "amenity/boat_rental": {
                      "name": "Paadi laenutus"
                  },
                  "amenity/boat_rental": {
                      "name": "Paadi laenutus"
                  },
@@ -1301,9 +1668,6 @@
                      "name": "Valuutavahetus",
                      "terms": "rahavahetus"
                  },
                      "name": "Valuutavahetus",
                      "terms": "rahavahetus"
                  },
-                "amenity/bus_station": {
-                    "name": "Bussijaam"
-                },
                  "amenity/cafe": {
                      "name": "Kohvik"
                  },
                  "amenity/cafe": {
                      "name": "Kohvik"
                  },
@@ -1336,6 +1700,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"
@@ -1344,13 +1714,17 @@
                      "name": "Kolledžiala"
                  },
                  "amenity/community_centre": {
                      "name": "Kolledžiala"
                  },
                  "amenity/community_centre": {
-                    "name": "Kultuurikeskus",
-                    "terms": "keskus,üritused,hall,rahvamaja,kogukonna keskus,külakeskus"
+                    "name": "Kogukonna keskus",
+                    "terms": "keskus,üritused,hall,rahvamaja,kultuurikeskus,külakeskus,spordikeskus,külamaja"
                  },
                  "amenity/compressed_air": {
                      "name": "Suruõhk",
                      "terms": "õhk"
                  },
                  },
                  "amenity/compressed_air": {
                      "name": "Suruõhk",
                      "terms": "õhk"
                  },
+                "amenity/conference_centre": {
+                    "name": "Konverentsikeskus",
+                    "terms": "auditoorium,näituse,hall,väljapanek,loengu,sündmuste,seminari"
+                },
                  "amenity/courthouse": {
                      "name": "Kohtumaja",
                      "terms": "Kohus"
                  "amenity/courthouse": {
                      "name": "Kohtumaja",
                      "terms": "Kohus"
@@ -1376,19 +1750,18 @@
                      "terms": "autokool,motokool,mootorratta,sõiduauto,veoauto,bussikool"
                  },
                  "amenity/embassy": {
                      "terms": "autokool,motokool,mootorratta,sõiduauto,veoauto,bussikool"
                  },
                  "amenity/embassy": {
-                    "name": "Saatkond",
-                    "terms": "suursaatkond"
+                    "name": "Saatkond"
+                },
+                "amenity/events_venue": {
+                    "name": "Ürituste pidamiskoht",
+                    "terms": "sündmuste,hall,tähistuskoht,saal,peosaal,peokoht,pidu,seminari,koolituste,rendiruumid"
                  },
                  "amenity/fast_food": {
                      "name": "Kiirtoitlustus"
                  },
                  },
                  "amenity/fast_food": {
                      "name": "Kiirtoitlustus"
                  },
-                "amenity/ferry_terminal": {
-                    "name": "Praamiterminal",
-                    "terms": "Praamisadam, sadam"
-                },
                  "amenity/fire_station": {
                  "amenity/fire_station": {
-                    "name": "Tuletõrjedepoo",
-                    "terms": "tuletõrjujad"
+                    "name": "Päästedepoo",
+                    "terms": "Tuletõrjedepoo,tuletõrjujad,merepääste"
                  },
                  "amenity/food_court": {
                      "name": "Toiduväljak",
                  },
                  "amenity/food_court": {
                      "name": "Toiduväljak",
@@ -1434,6 +1807,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"
                  },
@@ -1445,7 +1821,14 @@
                  },
                  "amenity/parking": {
                      "name": "Autoparkla",
                  },
                  "amenity/parking": {
                      "name": "Autoparkla",
-                    "terms": "Parkla, parkimisplats"
+                    "terms": "Parkla,parkimisplats,sõiduauto"
+                },
+                "amenity/parking/multi-storey": {
+                    "name": "Mitmetasandiline parkimismaja",
+                    "terms": "parkla,parkimismaja,autoparkla"
+                },
+                "amenity/parking/underground": {
+                    "name": "Maaalune parkla"
                  },
                  "amenity/parking_entrance": {
                      "name": "Parkimismaja sisse/väljapääs"
                  },
                  "amenity/parking_entrance": {
                      "name": "Parkimismaja sisse/väljapääs"
@@ -1454,8 +1837,8 @@
                      "name": "Parkimiskoht",
                      "terms": "parkla"
                  },
                      "name": "Parkimiskoht",
                      "terms": "parkla"
                  },
-                "amenity/pharmacy": {
-                    "name": "Apteek"
+                "amenity/photo_booth": {
+                    "name": "Fotokabiin"
                  },
                  "amenity/place_of_worship": {
                      "name": "Pühakoda",
                  },
                  "amenity/place_of_worship": {
                      "name": "Pühakoda",
@@ -1466,14 +1849,16 @@
                      "terms": "Budistlik pühakoda"
                  },
                  "amenity/place_of_worship/christian": {
                      "terms": "Budistlik pühakoda"
                  },
                  "amenity/place_of_worship/christian": {
-                    "name": "Kirik",
-                    "terms": "katedral"
+                    "name": "Kristlik kirik",
+                    "terms": "kirik,katedraal,püha,luteri,kabel,pühamu"
                  },
                  "amenity/place_of_worship/jewish": {
                  },
                  "amenity/place_of_worship/jewish": {
-                    "name": "Sünagoog"
+                    "name": "Juudi sünagoog",
+                    "terms": "sünagoog,juudi,juut,judaism"
                  },
                  "amenity/place_of_worship/muslim": {
                  },
                  "amenity/place_of_worship/muslim": {
-                    "name": "Mošee"
+                    "name": "Islami mošee",
+                    "terms": "muslim,moslem,mosee"
                  },
                  "amenity/planetarium": {
                      "name": "Planetaarium"
                  },
                  "amenity/planetarium": {
                      "name": "Planetaarium"
@@ -1503,12 +1888,8 @@
                      "name": "Looduskeskus",
                      "terms": "külastuskeskus"
                  },
                      "name": "Looduskeskus",
                      "terms": "külastuskeskus"
                  },
-                "amenity/recycling": {
-                    "name": "Taaskasutus",
-                    "terms": "Taara,taaraautomaat,jäätmed,prügi,pudelid,klaas,purgid,praht,konteiner"
-                },
                  "amenity/recycling_centre": {
                  "amenity/recycling_centre": {
-                    "name": "Jäätmejaam",
+                    "name": "Ümbertöötluskeskus",
                      "terms": "Taaskasutuskeskus"
                  },
                  "amenity/register_office": {
                      "terms": "Taaskasutuskeskus"
                  },
                  "amenity/register_office": {
@@ -1525,6 +1906,12 @@
                      "name": "Varjualune",
                      "terms": "ulualune,räästaalune,peavari"
                  },
                      "name": "Varjualune",
                      "terms": "ulualune,räästaalune,peavari"
                  },
+                "amenity/smoking_area": {
+                    "name": "Suitsetamise koht"
+                },
+                "amenity/social_centre": {
+                    "name": "Sotsiaalkeskus"
+                },
                  "amenity/social_facility": {
                      "name": "Sotsiaalkeskus",
                      "terms": "Sotsiaalamet"
                  "amenity/social_facility": {
                      "name": "Sotsiaalkeskus",
                      "terms": "Sotsiaalamet"
@@ -1591,6 +1978,12 @@
                  "area/highway": {
                      "name": "Teekate"
                  },
                  "area/highway": {
                      "name": "Teekate"
                  },
+                "attraction/amusement_ride": {
+                    "name": "Lõbuatraktsioon"
+                },
+                "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"
@@ -1654,19 +2047,23 @@
                      "terms": "Sein,vall"
                  },
                  "boundary/administrative": {
                      "terms": "Sein,vall"
                  },
                  "boundary/administrative": {
-                    "name": "Administratiivpiir"
+                    "name": "Halduspiir"
                  },
                  "building": {
                      "name": "Hoone",
                      "terms": "ehitis"
                  },
                  "building/apartments": {
                  },
                  "building": {
                      "name": "Hoone",
                      "terms": "ehitis"
                  },
                  "building/apartments": {
-                    "name": "Korterid"
+                    "name": "Kortermaja"
                  },
                  "building/barn": {
                      "name": "Küün",
                      "terms": "Tall, laut"
                  },
                  },
                  "building/barn": {
                      "name": "Küün",
                      "terms": "Tall, laut"
                  },
+                "building/bungalow": {
+                    "name": "Bangalo",
+                    "terms": "bungalo"
+                },
                  "building/bunker": {
                      "name": "Punker"
                  },
                  "building/bunker": {
                      "name": "Punker"
                  },
@@ -1683,6 +2080,10 @@
                  "building/church": {
                      "name": "Kirikuhoone"
                  },
                  "building/church": {
                      "name": "Kirikuhoone"
                  },
+                "building/civic": {
+                    "name": "Üldkasutatav hoone",
+                    "terms": "linna,keskus,seltsimaja,rahvamaja"
+                },
                  "building/college": {
                      "name": "Kolledžihoone"
                  },
                  "building/college": {
                      "name": "Kolledžihoone"
                  },
@@ -1701,6 +2102,14 @@
                  "building/entrance": {
                      "name": "Sissepääs"
                  },
                  "building/entrance": {
                      "name": "Sissepääs"
                  },
+                "building/farm": {
+                    "name": "Talumaja",
+                    "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"
@@ -1712,6 +2121,10 @@
                  "building/greenhouse": {
                      "name": "Kasvuhoone"
                  },
                  "building/greenhouse": {
                      "name": "Kasvuhoone"
                  },
+                "building/hangar": {
+                    "name": "Angaar",
+                    "terms": "lennukikuur"
+                },
                  "building/hospital": {
                      "name": "Haiglahoone"
                  },
                  "building/hospital": {
                      "name": "Haiglahoone"
                  },
@@ -1745,6 +2158,10 @@
                  "building/roof": {
                      "name": "Katus"
                  },
                  "building/roof": {
                      "name": "Katus"
                  },
+                "building/ruins": {
+                    "name": "Hoone varemed",
+                    "terms": "varemed,purunenud,maha jäetud"
+                },
                  "building/school": {
                      "name": "Koolihoone",
                      "terms": "õppehoone,algkool,keskkool"
                  "building/school": {
                      "name": "Koolihoone",
                      "terms": "õppehoone,algkool,keskkool"
@@ -1760,15 +2177,22 @@
                      "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/terrace": {
                      "name": "Terrassmaja"
                  },
-                "building/train_station": {
-                    "name": "Raudteejaam"
+                "building/transportation": {
+                    "name": "Transpordihoone"
                  },
                  "building/university": {
                      "name": "Ülikoolihoone"
                  },
                  "building/university": {
                      "name": "Ülikoolihoone"
@@ -1776,6 +2200,12 @@
                  "building/warehouse": {
                      "name": "Laohoone"
                  },
                  "building/warehouse": {
                      "name": "Laohoone"
                  },
+                "building_part": {
+                    "name": "Hoone osa"
+                },
+                "building_point": {
+                    "name": "Hoone"
+                },
                  "camp_site/camp_pitch": {
                      "name": "Kämpingukoht",
                      "terms": "karavaniplats,kämpinguplats,telgiplats,telgikoht"
                  "camp_site/camp_pitch": {
                      "name": "Kämpingukoht",
                      "terms": "karavaniplats,kämpinguplats,telgiplats,telgikoht"
@@ -1815,10 +2245,6 @@
                  "craft/clockmaker": {
                      "name": "Kellassepp"
                  },
                  "craft/clockmaker": {
                      "name": "Kellassepp"
                  },
-                "craft/confectionery": {
-                    "name": "Kondiiter",
-                    "terms": "Maiustused"
-                },
                  "craft/dressmaker": {
                      "name": "Rätsep",
                      "terms": "õmbleja"
                  "craft/dressmaker": {
                      "name": "Rätsep",
                      "terms": "õmbleja"
@@ -1899,18 +2325,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"
                  },
@@ -1935,8 +2355,7 @@
                      "name": "Veinitehas"
                  },
                  "embankment": {
                      "name": "Veinitehas"
                  },
                  "embankment": {
-                    "name": "Teetamm",
-                    "terms": "muldkeha, tamm, vall"
+                    "name": "Teetamm"
                  },
                  "emergency/ambulance_station": {
                      "name": "Kiirabipunkt"
                  },
                  "emergency/ambulance_station": {
                      "name": "Kiirabipunkt"
@@ -1948,26 +2367,48 @@
                  "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"
                  },
                  "entrance": {
                      "name": "Sisse- ja Väljapääs"
                  },
-                "footway/crossing": {
-                    "name": "Ülekäik"
-                },
-                "footway/crosswalk": {
-                    "name": "Jalakäijate ülekäik"
-                },
-                "footway/sidewalk": {
-                    "name": "Kõnnitee"
-                },
                  "ford": {
                      "name": "Koolmekoht",
                      "terms": "Koole"
                  },
                  "ford": {
                      "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": {
                      "name": "Tee"
                  },
@@ -1977,24 +2418,42 @@
                  "highway/bus_stop": {
                      "name": "Bussipeatus"
                  },
                  "highway/bus_stop": {
                      "name": "Bussipeatus"
                  },
+                "highway/construction": {
+                    "name": "Suletud tee",
+                    "terms": "teesulg,teeehitus"
+                },
                  "highway/corridor": {
                      "name": "Sisekoridor",
                      "terms": "koridor"
                  },
                  "highway/crossing": {
                  "highway/corridor": {
                      "name": "Sisekoridor",
                      "terms": "koridor"
                  },
                  "highway/crossing": {
-                    "name": "Ülekäigurada"
-                },
-                "highway/crosswalk": {
-                    "name": "Ülekäigurada",
-                    "terms": "jalakäijate ülekäik,ülekäik"
+                    "name": "Ülekäik"
                  },
                  "highway/cycleway": {
                      "name": "Rattatee"
                  },
                  },
                  "highway/cycleway": {
                      "name": "Rattatee"
                  },
+                "highway/cycleway/bicycle_foot": {
+                    "name": "Jalgratta- ja jalgtee",
+                    "terms": "ratta,jalg,jala,jalgratta"
+                },
+                "highway/cycleway/crossing": {
+                    "name": "Lõikumine (jalg- ja) jalgrattateega"
+                },
+                "highway/cycleway/crossing/marked": {
+                    "name": "Märgistatud lõikumine (jalg- ja) jalgrattateega",
+                    "terms": "ratta,jalgratta,ülekäigu,ülekäik"
+                },
+                "highway/cycleway/crossing/unmarked": {
+                    "name": "Märgistamatta lõikumine (jalg- ja) jalgrattateega",
+                    "terms": "ratta,jalgratta,ülekäigu,ülekäik"
+                },
                  "highway/footway": {
                      "name": "Jalgtee",
                      "terms": "kõnnitee"
                  },
                  "highway/footway": {
                      "name": "Jalgtee",
                      "terms": "kõnnitee"
                  },
+                "highway/footway/crossing": {
+                    "name": "Jalakäia ülekäik"
+                },
                  "highway/give_way": {
                      "name": "Anna teed märk"
                  },
                  "highway/give_way": {
                      "name": "Anna teed märk"
                  },
@@ -2003,7 +2462,7 @@
                      "terms": "Majadevaheline,elutänav,elamu,linna"
                  },
                  "highway/mini_roundabout": {
                      "terms": "Majadevaheline,elutänav,elamu,linna"
                  },
                  "highway/mini_roundabout": {
-                    "name": "Mini-ringtee"
+                    "name": "Väike ringtee"
                  },
                  "highway/motorway": {
                      "name": "Kiirtee",
                  },
                  "highway/motorway": {
                      "name": "Kiirtee",
@@ -2015,12 +2474,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"
@@ -2107,6 +2566,10 @@
                      "name": "Valgusfoorid",
                      "terms": "Foorid,signaaltuled"
                  },
                      "name": "Valgusfoorid",
                      "terms": "Foorid,signaaltuled"
                  },
+                "highway/trailhead": {
+                    "name": "Raja algus",
+                    "terms": "matka,algus,infopunkt,start,plats,stardi"
+                },
                  "highway/trunk": {
                      "name": "E-tähistusega põhimaantee",
                      "terms": "Trunk Road,põhimaantee,maantee"
                  "highway/trunk": {
                      "name": "E-tähistusega põhimaantee",
                      "terms": "Trunk Road,põhimaantee,maantee"
@@ -2139,6 +2602,29 @@
                      "name": "Loss",
                      "terms": "Kindlus"
                  },
                      "name": "Loss",
                      "terms": "Kindlus"
                  },
+                "historic/castle/fortress": {
+                    "name": "Linnus",
+                    "terms": "kaitserajatis,kaitsevall,kaitsemüür,müür,kindlus,maalinn"
+                },
+                "historic/castle/palace": {
+                    "name": "Palee",
+                    "terms": "kuninglik,esindusloss,loss,aadli,kõrgaadli"
+                },
+                "historic/castle/stately": {
+                    "name": "Härrastemaja",
+                    "terms": "loss,häärber,mõis,peahoone,esindus,mõisniku,aadli,kõrgaadli"
+                },
+                "historic/city_gate": {
+                    "name": "Linnavärav"
+                },
+                "historic/fort": {
+                    "name": "Kindlus",
+                    "terms": "kindlustus,loss,kaitse,fortifikatsioon,fort"
+                },
+                "historic/manor": {
+                    "name": "Mõis",
+                    "terms": "härrastemaja,mõisa"
+                },
                  "historic/memorial": {
                      "name": "Mälestusmärk",
                      "terms": "Memoriaal"
                  "historic/memorial": {
                      "name": "Mälestusmärk",
                      "terms": "Memoriaal"
@@ -2163,6 +2649,9 @@
                  "junction": {
                      "name": "Ristmik"
                  },
                  "junction": {
                      "name": "Ristmik"
                  },
+                "junction/roundabout": {
+                    "name": "Ringristmik"
+                },
                  "landuse": {
                      "name": "Maakasutus"
                  },
                  "landuse": {
                      "name": "Maakasutus"
                  },
@@ -2173,8 +2662,7 @@
                      "name": "Akvakultuur"
                  },
                  "landuse/basin": {
                      "name": "Akvakultuur"
                  },
                  "landuse/basin": {
-                    "name": "Kogumisbassein",
-                    "terms": "bassein"
+                    "name": "Kogumisbassein"
                  },
                  "landuse/cemetery": {
                      "name": "Surnuaed",
                  },
                  "landuse/cemetery": {
                      "name": "Surnuaed",
@@ -2197,15 +2685,16 @@
                      "terms": "põllumajandusmaa, maatulundusmaa"
                  },
                  "landuse/farmyard": {
                      "terms": "põllumajandusmaa, maatulundusmaa"
                  },
                  "landuse/farmyard": {
-                    "name": "Talumaa",
-                    "terms": "Põllumajandusmaa, põllumaa, maatulundusmaa"
+                    "name": "Taluõu",
+                    "terms": "taluhoov"
                  },
                  "landuse/forest": {
                  },
                  "landuse/forest": {
-                    "name": "Metsamaa"
+                    "name": "Metsamajandusmaa",
+                    "terms": "metsandusmaa,metsatööstusmaa"
                  },
                  "landuse/garages": {
                  },
                  "landuse/garages": {
-                    "name": "Garaažid",
-                    "terms": "Garaazid"
+                    "name": "Maakasutus garaažidele",
+                    "terms": "garaažid"
                  },
                  "landuse/grass": {
                      "name": "Muru"
                  },
                  "landuse/grass": {
                      "name": "Muru"
@@ -2218,6 +2707,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"
@@ -2236,13 +2731,6 @@
                  "landuse/military/barracks": {
                      "name": "Kasarmu"
                  },
                  "landuse/military/barracks": {
                      "name": "Kasarmu"
                  },
-                "landuse/military/bunker": {
-                    "name": "Militaarpunker",
-                    "terms": "punker"
-                },
-                "landuse/military/checkpoint": {
-                    "name": "Militaarkontrollpunkt"
-                },
                  "landuse/military/danger_area": {
                      "name": "Militaarohu ala"
                  },
                  "landuse/military/danger_area": {
                      "name": "Militaarohu ala"
                  },
@@ -2266,10 +2754,18 @@
                      "name": "Mänguala",
                      "terms": "puhkeala"
                  },
                      "name": "Mänguala",
                      "terms": "puhkeala"
                  },
+                "landuse/religious": {
+                    "name": "Sakraalmaa",
+                    "terms": "religioosne,kirik,usu"
+                },
                  "landuse/residential": {
                      "name": "Elamuala",
                      "terms": "Elurajoon, elamurajoon"
                  },
                  "landuse/residential": {
                      "name": "Elamuala",
                      "terms": "Elurajoon, elamurajoon"
                  },
+                "landuse/residential/apartments": {
+                    "name": "Kortermajade kompleks",
+                    "terms": "elumajad"
+                },
                  "landuse/retail": {
                      "name": "Jaekaubandusala",
                      "terms": "kaubandusala"
                  "landuse/retail": {
                      "name": "Jaekaubandusala",
                      "terms": "kaubandusala"
@@ -2280,6 +2776,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"
@@ -2288,6 +2791,9 @@
                      "name": "Tantsusaal",
                      "terms": "tantsuhall"
                  },
                      "name": "Tantsusaal",
                      "terms": "tantsuhall"
                  },
+                "leisure/dancing_school": {
+                    "name": "Tantsukool"
+                },
                  "leisure/dog_park": {
                      "name": "Koerapark"
                  },
                  "leisure/dog_park": {
                      "name": "Koerapark"
                  },
@@ -2335,9 +2841,6 @@
                  "leisure/pitch/american_football": {
                      "name": "Ameerika jalgpalliväljak"
                  },
                  "leisure/pitch/american_football": {
                      "name": "Ameerika jalgpalliväljak"
                  },
-                "leisure/pitch/baseball": {
-                    "name": "Pesapalliväljak"
-                },
                  "leisure/pitch/basketball": {
                      "name": "Korvpalliväljak"
                  },
                  "leisure/pitch/basketball": {
                      "name": "Korvpalliväljak"
                  },
@@ -2371,12 +2874,12 @@
                      "name": "Puhkekeskus",
                      "terms": "Kuurort, spaa"
                  },
                      "name": "Puhkekeskus",
                      "terms": "Kuurort, spaa"
                  },
-                "leisure/running_track": {
-                    "name": "Jooksurada"
+                "leisure/sauna": {
+                    "name": "Saun"
                  },
                  "leisure/slipway": {
                      "name": "Slipp",
                  },
                  "leisure/slipway": {
                      "name": "Slipp",
-                    "terms": "Slip, mini-sadam"
+                    "terms": "Slipp, väikesadam"
                  },
                  "leisure/sports_centre": {
                      "name": "Spordikeskus",
                  },
                  "leisure/sports_centre": {
                      "name": "Spordikeskus",
@@ -2402,13 +2905,16 @@
                      "name": "Joon"
                  },
                  "man_made": {
                      "name": "Joon"
                  },
                  "man_made": {
-                    "name": "Inimtehtud",
-                    "terms": "Tehislik, Tehis"
+                    "name": "Inimtehtud"
                  },
                  "man_made/adit": {
                      "name": "Stoll",
                      "terms": "suue,kaevandus,sissepääs,horisontaalne,kaeveõõne,rõhtkaeve,koobas"
                  },
                  },
                  "man_made/adit": {
                      "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"
@@ -2419,6 +2925,13 @@
                  "man_made/chimney": {
                      "name": "Korsten"
                  },
                  "man_made/chimney": {
                      "name": "Korsten"
                  },
+                "man_made/clearcut": {
+                    "name": "Raiesmik",
+                    "terms": "lageraie,raiestik,kännustik"
+                },
+                "man_made/crane": {
+                    "name": "Kraana"
+                },
                  "man_made/cutline": {
                      "name": "Siht",
                      "terms": "metsasiht,soosiht"
                  "man_made/cutline": {
                      "name": "Siht",
                      "terms": "metsasiht,soosiht"
@@ -2436,8 +2949,8 @@
                      "name": "Mast",
                      "terms": "Mobiilimast, tv mast, telefonimast, raadiomast, televisioonimast, kommunikatsioonimast"
                  },
                      "name": "Mast",
                      "terms": "Mobiilimast, tv mast, telefonimast, raadiomast, televisioonimast, kommunikatsioonimast"
                  },
-                "man_made/observation": {
-                    "name": "Vaatlustorn"
+                "man_made/observatory": {
+                    "name": "Observatoorium"
                  },
                  "man_made/petroleum_well": {
                      "name": "Nafta puurkaev"
                  },
                  "man_made/petroleum_well": {
                      "name": "Nafta puurkaev"
@@ -2455,12 +2968,17 @@
                  "man_made/storage_tank": {
                      "name": "Mahuti"
                  },
                  "man_made/storage_tank": {
                      "name": "Mahuti"
                  },
-                "man_made/surveillance_camera": {
-                    "name": "Valvekaamera"
-                },
                  "man_made/tower": {
                      "name": "Torn"
                  },
                  "man_made/tower": {
                      "name": "Torn"
                  },
+                "man_made/tower/defensive": {
+                    "name": "Kindlustorn",
+                    "terms": "torn,kaitse"
+                },
+                "man_made/tunnel": {
+                    "name": "Tunnel",
+                    "terms": "maaalune"
+                },
                  "man_made/wastewater_plant": {
                      "name": "Reoveepuhastusjaam"
                  },
                  "man_made/wastewater_plant": {
                      "name": "Reoveepuhastusjaam"
                  },
@@ -2479,8 +2997,7 @@
                      "terms": "Vabrik"
                  },
                  "natural": {
                      "terms": "Vabrik"
                  },
                  "natural": {
-                    "name": "Looduslik",
-                    "terms": "loomulik, naturaalne"
+                    "name": "Looduslik"
                  },
                  "natural/bare_rock": {
                      "name": "Paljand",
                  },
                  "natural/bare_rock": {
                      "name": "Paljand",
@@ -2493,6 +3010,10 @@
                      "name": "Rand",
                      "terms": "Liivarand"
                  },
                      "name": "Rand",
                      "terms": "Liivarand"
                  },
+                "natural/cape": {
+                    "name": "Neem",
+                    "terms": "maanina,poolsaar"
+                },
                  "natural/cave_entrance": {
                      "name": "Koopa sissepääs",
                      "terms": "Koobas,sissepääs,auk,õõs"
                  "natural/cave_entrance": {
                      "name": "Koopa sissepääs",
                      "terms": "Koobas,sissepääs,auk,õõs"
@@ -2518,14 +3039,26 @@
                  "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"
                  },
+                "natural/reef": {
+                    "name": "Kari",
+                    "terms": "riff,korall"
+                },
                  "natural/ridge": {
                      "name": "Mäehari",
                      "terms": "seljandik,mäeseljandik,seljak,mäetipp,tipp"
                  },
                  "natural/ridge": {
                      "name": "Mäehari",
                      "terms": "seljandik,mäeseljandik,seljak,mäetipp,tipp"
                  },
+                "natural/rock": {
+                    "name": "Kaljurahn",
+                    "terms": "kivi,rahn"
+                },
                  "natural/saddle": {
                      "name": "Mäesadul"
                  },
                  "natural/saddle": {
                      "name": "Mäesadul"
                  },
@@ -2539,16 +3072,24 @@
                  "natural/scrub": {
                      "name": "Võsa"
                  },
                  "natural/scrub": {
                      "name": "Võsa"
                  },
+                "natural/shingle": {
+                    "name": "Kiviklibu",
+                    "terms": "klibu,kivid"
+                },
                  "natural/spring": {
                      "name": "Allikas",
                      "terms": "veeallikas,joogivesi,vesi"
                  },
                  "natural/spring": {
                      "name": "Allikas",
                      "terms": "veeallikas,joogivesi,vesi"
                  },
+                "natural/stone": {
+                    "name": "Lahtine kivirahn",
+                    "terms": "kivi,rändrahn,rahn"
+                },
                  "natural/tree": {
                      "name": "Puu"
                  },
                  "natural/tree": {
                      "name": "Puu"
                  },
-                "natural/tree_row": {
-                    "name": "Puude rivi",
-                    "terms": "rivis,reas,järjest"
+                "natural/valley": {
+                    "name": "Org",
+                    "terms": "süvend,kanjon,depressioon,kuristik"
                  },
                  "natural/volcano": {
                      "name": "Vulkaan"
                  },
                  "natural/volcano": {
                      "name": "Vulkaan"
@@ -2559,6 +3100,10 @@
                  "natural/water/lake": {
                      "name": "Järv"
                  },
                  "natural/water/lake": {
                      "name": "Järv"
                  },
+                "natural/water/moat": {
+                    "name": "Vallikraav",
+                    "terms": "kaitsekraav,kraav"
+                },
                  "natural/water/pond": {
                      "name": "Tiik"
                  },
                  "natural/water/pond": {
                      "name": "Tiik"
                  },
@@ -2566,6 +3111,10 @@
                      "name": "Reservuaar",
                      "terms": "veehoidla"
                  },
                      "name": "Reservuaar",
                      "terms": "veehoidla"
                  },
+                "natural/water/wastewater": {
+                    "name": "Reovee bassein",
+                    "terms": "reovesi"
+                },
                  "natural/wetland": {
                      "name": "Märgala",
                      "terms": "roostik"
                  "natural/wetland": {
                      "name": "Märgala",
                      "terms": "roostik"
@@ -2580,15 +3129,23 @@
                  "office": {
                      "name": "Kontor"
                  },
                  "office": {
                      "name": "Kontor"
                  },
+                "office/company": {
+                    "name": "Ettevõtte kontor",
+                    "terms": "kontor,firma,korporatiiv"
+                },
+                "office/diplomatic/consulate": {
+                    "name": "Konsulaat",
+                    "terms": "saatkond"
+                },
+                "office/diplomatic/embassy": {
+                    "name": "Saatkond"
+                },
                  "office/government": {
                      "name": "Valitsuse kontor"
                  },
                  "office/travel_agent": {
                      "name": "Reisibüroo"
                  },
                  "office/government": {
                      "name": "Valitsuse kontor"
                  },
                  "office/travel_agent": {
                      "name": "Reisibüroo"
                  },
-                "piste": {
-                    "name": "Suusarada"
-                },
                  "place": {
                      "name": "Koht"
                  },
                  "place": {
                      "name": "Koht"
                  },
@@ -2601,6 +3158,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"
@@ -2622,6 +3186,10 @@
                      "name": "Elektrigeneraator",
                      "terms": "generaator"
                  },
                      "name": "Elektrigeneraator",
                      "terms": "generaator"
                  },
+                "power/generator/source/hydro": {
+                    "name": "Vee turbiin",
+                    "terms": "hüdroelektrijaam,tamm,veegeneraator,turbiin"
+                },
                  "power/line": {
                      "name": "Kõrgepingeliin",
                      "terms": "Elektriliin, kõrgliin, õhuliin"
                  "power/line": {
                      "name": "Kõrgepingeliin",
                      "terms": "Elektriliin, kõrgliin, õhuliin"
@@ -2650,11 +3218,8 @@
                      "name": "Trafo",
                      "terms": "Transformaator"
                  },
                      "name": "Trafo",
                      "terms": "Transformaator"
                  },
-                "public_transport/platform": {
-                    "name": "Platvorm"
-                },
-                "public_transport/stop_position": {
-                    "name": "Peatuskoht"
+                "public_transport/platform/bus_point": {
+                    "name": "Bussipeatus"
                  },
                  "railway": {
                      "name": "Raudtee"
                  },
                  "railway": {
                      "name": "Raudtee"
@@ -2673,12 +3238,8 @@
                  "railway/funicular": {
                      "name": "Köisraudtee"
                  },
                  "railway/funicular": {
                      "name": "Köisraudtee"
                  },
-                "railway/halt": {
-                    "name": "Peatuskoht",
-                    "terms": "pooljaam"
-                },
                  "railway/level_crossing": {
                  "railway/level_crossing": {
-                    "name": "Raudtee ülesõit",
+                    "name": "Raudtee-ülesõidukoht",
                      "terms": "ülesõit,ristumine,rongi"
                  },
                  "railway/monorail": {
                      "terms": "ülesõit,ristumine,rongi"
                  },
                  "railway/monorail": {
@@ -2688,18 +3249,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"
                  },
@@ -2710,16 +3263,10 @@
                  "railway/tram": {
                      "name": "Tramm"
                  },
                  "railway/tram": {
                      "name": "Tramm"
                  },
-                "railway/tram_stop": {
-                    "name": "Trammipeatus"
-                },
                  "relation": {
                      "name": "Seos",
                      "terms": "relatsioon"
                  },
                  "relation": {
                      "name": "Seos",
                      "terms": "relatsioon"
                  },
-                "roundabout": {
-                    "name": "Ringtee"
-                },
                  "route/ferry": {
                      "name": "Praamitee"
                  },
                  "route/ferry": {
                      "name": "Praamitee"
                  },
@@ -2727,6 +3274,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"
                  },
@@ -2782,8 +3333,7 @@
                      "name": "Raamatupood"
                  },
                  "shop/boutique": {
                      "name": "Raamatupood"
                  },
                  "shop/boutique": {
-                    "name": "Butiik",
-                    "terms": "moekauplus, moekaup, boutique, ehtekauplus"
+                    "name": "Butiik"
                  },
                  "shop/butcher": {
                      "name": "Lihapood",
                  },
                  "shop/butcher": {
                      "name": "Lihapood",
@@ -2803,6 +3353,10 @@
                      "name": "Autoremont",
                      "terms": "autoparandus, auto hooldus"
                  },
                      "name": "Autoremont",
                      "terms": "autoparandus, auto hooldus"
                  },
+                "shop/caravan": {
+                    "name": "Haagissuvilate/autoelamute müügiplats",
+                    "terms": "matkaauto,karavan,autoelamu,ratastel maja, autokaravan,haagiselamu"
+                },
                  "shop/carpet": {
                      "name": "Vaibapood"
                  },
                  "shop/carpet": {
                      "name": "Vaibapood"
                  },
@@ -2814,8 +3368,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",
@@ -2836,8 +3390,8 @@
                      "name": "Kommipood"
                  },
                  "shop/convenience": {
                      "name": "Kommipood"
                  },
                  "shop/convenience": {
-                    "name": "Esmatarbekauba pood",
-                    "terms": "Kauplus, pood"
+                    "name": "Toidupood",
+                    "terms": "Kauplus,pood,külapood,esmatarbekaup,väike pood"
                  },
                  "shop/copyshop": {
                      "name": "Koopiateenuse kauplus"
                  },
                  "shop/copyshop": {
                      "name": "Koopiateenuse kauplus"
@@ -2892,8 +3446,14 @@
                      "terms": "Talusaadused,farmikaup,põllusaadused,aiasaadused"
                  },
                  "shop/fashion": {
                      "terms": "Talusaadused,farmikaup,põllusaadused,aiasaadused"
                  },
                  "shop/fashion": {
-                    "name": "Moekauplus",
-                    "terms": "Butiik, moepood, rõivakauplus"
+                    "name": "Moekauplus"
+                },
+                "shop/fireplace": {
+                    "name": "Küttekollete pood",
+                    "terms": "kaminad,ahjud,katlad"
+                },
+                "shop/fishing": {
+                    "name": "Kalastustarvete pood"
                  },
                  "shop/fishmonger": {
                      "name": "Kalakauplus"
                  },
                  "shop/fishmonger": {
                      "name": "Kalakauplus"
@@ -2906,13 +3466,16 @@
                      "name": "Raamikauplus",
                      "terms": "Piltide raamimine,maali raamimine"
                  },
                      "name": "Raamikauplus",
                      "terms": "Piltide raamimine,maali raamimine"
                  },
+                "shop/fuel": {
+                    "name": "Küttepood",
+                    "terms": "õli,kütteõli,küte,briketid,küttepuu,puitbrikett,turbabrikett,küttegraanul,pellet,kaminapuu"
+                },
                  "shop/funeral_directors": {
                      "name": "Matusebüroo",
                      "terms": "kirstud, puusärgid, matused"
                  },
                  "shop/furnace": {
                  "shop/funeral_directors": {
                      "name": "Matusebüroo",
                      "terms": "kirstud, puusärgid, matused"
                  },
                  "shop/furnace": {
-                    "name": "Küttepood",
-                    "terms": "küttekaup,ahjupood,katlad"
+                    "name": "Küttepood"
                  },
                  "shop/furniture": {
                      "name": "Mööblipood"
                  },
                  "shop/furniture": {
                      "name": "Mööblipood"
@@ -2925,6 +3488,10 @@
                      "name": "Balloongaasi kauplus",
                      "terms": "gaas,vedelgaas,grillgaas,segugaas"
                  },
                      "name": "Balloongaasi kauplus",
                      "terms": "gaas,vedelgaas,grillgaas,segugaas"
                  },
+                "shop/general": {
+                    "name": "Kauplus",
+                    "terms": "pood,esmatarbe"
+                },
                  "shop/gift": {
                      "name": "Kingipood"
                  },
                  "shop/gift": {
                      "name": "Kingipood"
                  },
@@ -2939,6 +3506,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"
                  },
@@ -2954,18 +3525,13 @@
                      "name": "Kodutarvete kauplus",
                      "terms": "köögitabed,majapidamistarbed"
                  },
                      "name": "Kodutarvete kauplus",
                      "terms": "köögitabed,majapidamistarbed"
                  },
+                "shop/hunting": {
+                    "name": "Jahipood"
+                },
                  "shop/interior_decoration": {
                      "name": "Sisedekoratsioonikauplus",
                      "terms": "dekoratsioonid,kaunistus"
                  },
                  "shop/interior_decoration": {
                      "name": "Sisedekoratsioonikauplus",
                      "terms": "dekoratsioonid,kaunistus"
                  },
-                "shop/jewelry": {
-                    "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"
@@ -3009,6 +3575,10 @@
                      "name": "Mootorrattapood",
                      "terms": "tsiklid"
                  },
                      "name": "Mootorrattapood",
                      "terms": "tsiklid"
                  },
+                "shop/motorcycle_repair": {
+                    "name": "Mootorratta remondikoda",
+                    "terms": "remont,hooldus"
+                },
                  "shop/music": {
                      "name": "Muusikapood"
                  },
                  "shop/music": {
                      "name": "Muusikapood"
                  },
@@ -3068,7 +3638,7 @@
                  },
                  "shop/religion": {
                      "name": "Usutarvete kauplus",
                  },
                  "shop/religion": {
                      "name": "Usutarvete kauplus",
-                    "terms": "kirikupood,usupood,pühatarvete"
+                    "terms": "kirikupood,usupood,pühatarvete,sakraal"
                  },
                  "shop/scuba_diving": {
                      "name": "Sukeldustarvikute kauplus",
                  },
                  "shop/scuba_diving": {
                      "name": "Sukeldustarvikute kauplus",
@@ -3148,6 +3718,9 @@
                  "shop/watches": {
                      "name": "Kellapood"
                  },
                  "shop/watches": {
                      "name": "Kellapood"
                  },
+                "shop/water": {
+                    "name": "Joogivee pood"
+                },
                  "shop/water_sports": {
                      "name": "Veesporditarvete kauplus",
                      "terms": "ujumistarbed"
                  "shop/water_sports": {
                      "name": "Veesporditarvete kauplus",
                      "terms": "ujumistarbed"
@@ -3155,6 +3728,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"
@@ -3162,6 +3739,10 @@
                  "shop/wine": {
                      "name": "Veinipood"
                  },
                  "shop/wine": {
                      "name": "Veinipood"
                  },
+                "telecom/data_center": {
+                    "name": "Andmekeskus",
+                    "terms": "datacenter,serveri"
+                },
                  "tourism": {
                      "name": "Turism"
                  },
                  "tourism": {
                      "name": "Turism"
                  },
@@ -3177,6 +3758,10 @@
                  "tourism/artwork": {
                      "name": "Kunstiteos"
                  },
                  "tourism/artwork": {
                      "name": "Kunstiteos"
                  },
+                "tourism/artwork/installation": {
+                    "name": "Kunstiinstallatsioon",
+                    "terms": "installatsioon,kunst,püsinäitus,väljapanek"
+                },
                  "tourism/attraction": {
                      "name": "Turismiatraktsioon",
                      "terms": "vaatamisväärsus"
                  "tourism/attraction": {
                      "name": "Turismiatraktsioon",
                      "terms": "vaatamisväärsus"
@@ -3189,10 +3774,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"
                  },
@@ -3225,6 +3806,10 @@
                      "name": "Turismiinfokeskus",
                      "terms": "infokeskus"
                  },
                      "name": "Turismiinfokeskus",
                      "terms": "infokeskus"
                  },
+                "tourism/information/route_marker": {
+                    "name": "Rajatähis",
+                    "terms": "tähis,silt,post,märk,juhis,teejuht"
+                },
                  "tourism/motel": {
                      "name": "Motell",
                      "terms": "motohotell"
                  "tourism/motel": {
                      "name": "Motell",
                      "terms": "motohotell"
@@ -3237,8 +3822,8 @@
                      "terms": "einestuskoht,söögikoht"
                  },
                  "tourism/theme_park": {
                      "terms": "einestuskoht,söögikoht"
                  },
                  "tourism/theme_park": {
-                    "name": "Teemapark",
-                    "terms": "lõbustuspark"
+                    "name": "Lõbustuspark",
+                    "terms": "teemapark,seikluskeskus,perepark,seikluspark"
                  },
                  "tourism/viewpoint": {
                      "name": "Vaatekoht",
                  },
                  "tourism/viewpoint": {
                      "name": "Vaatekoht",
@@ -3248,7 +3833,7 @@
                      "name": "Loomaaed"
                  },
                  "traffic_calming": {
                      "name": "Loomaaed"
                  },
                  "traffic_calming": {
-                    "name": "Liikluse rahustus"
+                    "name": "Liikluse aeglustamine"
                  },
                  "traffic_calming/bump": {
                      "name": "Kiirusepiiraja",
                  },
                  "traffic_calming/bump": {
                      "name": "Kiirusepiiraja",
@@ -3283,14 +3868,18 @@
                      "terms": "põristi,põrin,tärin,värin,väristaja,müra,triibud,risti jooned,jooned"
                  },
                  "traffic_calming/table": {
                      "terms": "põristi,põrin,tärin,värin,väristaja,müra,triibud,risti jooned,jooned"
                  },
                  "traffic_calming/table": {
-                    "name": "Tõstetud ülekäik",
-                    "terms": "kõrgendatud,künnis,aeglustus,ülekäigurada"
+                    "name": "Tõstetud pind",
+                    "terms": "lame,künnis,lamav politseinik,kiirustõke,tõke,liikluskünnis"
                  },
                  "type/boundary": {
                      "name": "Piir"
                  },
                  "type/boundary/administrative": {
                  },
                  "type/boundary": {
                      "name": "Piir"
                  },
                  "type/boundary/administrative": {
-                    "name": "Administratiivpiir"
+                    "name": "Halduspiir"
+                },
+                "type/enforcement": {
+                    "name": "Liiklusjärelvalve",
+                    "terms": "järelvalve,liikluskontroll,politseikontroll"
                  },
                  "type/restriction": {
                      "name": "Piirang"
                  },
                  "type/restriction": {
                      "name": "Piirang"
@@ -3308,16 +3897,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"
@@ -3367,9 +3956,6 @@
                  "type/site": {
                      "name": "Asukoht"
                  },
                  "type/site": {
                      "name": "Asukoht"
                  },
-                "vertex": {
-                    "name": "Muu"
-                },
                  "waterway": {
                      "name": "Veetee"
                  },
                  "waterway": {
                      "name": "Veetee"
                  },
@@ -3381,7 +3967,7 @@
                      "name": "Kanal"
                  },
                  "waterway/dam": {
                      "name": "Kanal"
                  },
                  "waterway/dam": {
-                    "name": "Tamm"
+                    "name": "Pais"
                  },
                  "waterway/ditch": {
                      "name": "Kraav"
                  },
                  "waterway/ditch": {
                      "name": "Kraav"
@@ -3411,18 +3997,64 @@
                  "waterway/stream": {
                      "name": "Oja"
                  },
                  "waterway/stream": {
                      "name": "Oja"
                  },
+                "waterway/stream_intermittent": {
+                    "name": "Perioodiline oja",
+                    "terms": "oja,kraav,üleujutatud,ajutine,vahelduv,katkendlik,seiskuv"
+                },
                  "waterway/water_point": {
                      "name": "Joogiveepunkt (veesõidukitele)",
                      "terms": "vesi,vee"
                  },
                  "waterway/waterfall": {
                  "waterway/water_point": {
                      "name": "Joogiveepunkt (veesõidukitele)",
                      "terms": "vesi,vee"
                  },
                  "waterway/waterfall": {
-                    "name": "Kosk"
+                    "name": "Juga"
                  },
                  "waterway/weir": {
                  },
                  "waterway/weir": {
-                    "name": "Pais",
+                    "name": "Ülevoolupais",
                      "terms": "tamm"
                  }
              }
                      "terms": "tamm"
                  }
              }
+        },
+        "imagery": {
+            "Bing": {
+                "description": "Satelliidi- ja aerofotod.",
+                "name": "Bingi aerofotod"
+            },
+            "DigitalGlobe-Premium": {
+                "name": "DigitalGlobe'i pildimaterjal (premium)"
+            },
+            "DigitalGlobe-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