]> git.openstreetmap.org Git - rails.git/blobdiff - vendor/assets/iD/iD/locales/et.json
Merge remote-tracking branch 'upstream/pull/1926'
[rails.git] / vendor / assets / iD / iD / locales / et.json
index 70d149395c1261d8803ae9c5756ff0fc58e10a4a..381c265e06d34bd3a3ef2f8bc1112cf4a219082b 100644 (file)
@@ -1,5 +1,15 @@
 {
     "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",
                 "description": "Lisa kaardile restorane, monumente, postkaste ja muid punkte.",
                 "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."
@@ -32,7 +47,8 @@
                 "annotation": {
                     "point": "Punkt lisatud.",
                     "vertex": "Joonele lisatud sõlm.",
-                    "relation": "Relatsioon lisatud."
+                    "relation": "Relatsioon lisatud.",
+                    "note": "Märge lisatud."
                 }
             },
             "start": {
@@ -46,7 +62,7 @@
                 "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."
@@ -72,7 +88,7 @@
                     "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."
             },
                     "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."
                 },
-                "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",
-                "description": "Tee see joon sirgeks.",
                 "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",
                     "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."
             "delete_member": {
                 "annotation": "Relatsiooni liige kustutatud."
             },
-            "connect": {
-                "annotation": {
-                    "point": "Joon ühendatud punktiga.",
-                    "vertex": "Joon ühendatud teise joonega.",
-                    "line": "Joon ühendatud joonega.",
-                    "area": "Joon ühendatud alaga."
-                }
-            },
             "disconnect": {
                 "title": "Ühenda lahti",
                 "description": "Ühenda need jooned/alad üksteisest lahti.",
                 "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",
                 "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 relatsiooni \"{relation}\" liige.",
                 "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äärtusega."
+                "conflicting_tags": "Neid objekte ei saa ühendada, kuna osa nende silte on konfliktsete väärtustega."
             },
             "move": {
                 "title": "Liiguta",
                 "incomplete_relation": {
                     "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": {
                         "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": {
                     "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": {
                     "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": {
-                "help": {
-                    "toggle": "Klõpsa, et vahetada pöörde piiranguid.",
-                    "toggle_on": "Klõpsa, et lisada piirang \"{restriction}\".",
-                    "toggle_off": "Klõpsa, et eemaldada piirang \"{restriction}\"."
-                },
                 "annotation": {
                     "create": "Lisatud pöörde piirang",
                     "delete": "Kustutatud pöörde piirang"
         "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",
-            "localized_translation_label": "Mitmekeelne nimi",
             "localized_translation_language": "Vali keel",
             "localized_translation_name": "Nimi"
         },
-        "zoom_in_edit": "Muutmiseks suumi sisse",
+        "zoom_in_edit": "Suurenda, et redigeerida",
         "login": "Logi sisse",
         "logout": "Logi välja",
         "loading_auth": "OpenStreetMapiga ühendamine...",
             "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",
             "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",
         },
         "geocoder": {
             "search": "Otsi kogu maailmast...",
-            "no_results_visible": "Nähtaval kaardialal tulemusi ei leitud",
             "no_results_worldwide": "Tulemusi ei leitud"
         },
         "geolocate": {
             "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",
             "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",
             "role": "Roll",
             "choose": "Vali objekti liik",
             "results": "{n} tulemust otsingule {search}",
-            "reference": "Vaata OpenStreetMapi vikis",
             "back_tooltip": "Muuda objekti",
             "remove": "Eemalda",
             "search": "Otsi",
         "background": {
             "title": "Taust",
             "description": "Tausta seaded",
-            "percent_brightness": "heledus {opacity}%",
+            "backgrounds": "Taustad",
             "none": "Puudub",
+            "switch": "Vaheta tagasi selle tausta vastu",
             "custom": "Kohandatud",
-            "custom_button": "Muuda kohandatud tausta",
-            "fix_misalignment": "Korrigeeri kattekaardi nihet",
+            "overlays": "Ülekatted",
+            "imagery_source_faq": "Pildimaterjali teave / teata probleemist",
             "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": {
-                "description": "Pisikaart",
+                "description": "Näita pisikaarti",
                 "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",
+            "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",
-            "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": {
                 "tooltip": "Planeeritud, ehitamisel, mahajäetud, lammutatud.."
             },
             "others": {
-                "description": "Muu",
+                "description": "Muud",
                 "tooltip": "Kõik ülejäänud"
             }
         },
                 "tooltip": "Alad kuvatakse täielikult täidetuna."
             }
         },
-        "restore": {
-            "heading": "Sul on salvestamata muudatusi",
-            "description": "Kas soovid taastada eelmise seansi käigus tehtud muudatused?",
-            "restore": "Taasta muudatused",
-            "reset": "Hülga 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",
                 "keep_remote": "Kasuta tema oma",
                 "restore": "Taasta",
                 "delete": "Jäta kustutatuna",
-                "download_changes": "Või laadi alla oma muudatused.",
+                "download_changes": "Või laadi alla osmChange-fail",
                 "done": "Kõik konfliktid lahendatud!",
                 "help": "Teine kasutaja muutis kaardil mõnd objekti, mida sinagi muutsid.\nKlõpsa allpool igal objektil, et näha konflikti üksikasju ja et valida, kas säilitada\nenda muudatused või teise kasutaja muudatused.\n"
             }
             }
         },
         "success": {
-            "edited_osm": "Sa täiendasid OSM-i!",
-            "just_edited": "Täiendasid just OpenStreetMapi!",
-            "view_on_osm": "Vaata OSM-is",
-            "facebook": "Jaga Facebookis",
-            "twitter": "Jaga Twitteris",
-            "google": "Jaga Google+-is",
-            "help_html": "Sinu muudatused peaksid ilmuma kihil \"Standard\" mõne minuti jooksul. Teiste kihtide ja teatud objektidega võib kauem minna.",
             "help_link_text": "Üksikasjad"
         },
         "confirm": {
             "cancel": "Loobu"
         },
-        "splash": {
-            "welcome": "Tere tulemast OpenStreetMapi redaktorisse iD",
-            "text": "iD on kasutajasõbralik ja samas võimas töövahend parima vaba maailmakaardi täiendamiseks. See on versioon {version}. Rohkem infot võib leida veebilehelt {website} ja vigadest saab teatada lehel {github}.",
-            "walkthrough": "Alusta tutvustust",
-            "start": "Alusta muutmist"
-        },
         "source_switch": {
             "live": "live",
             "lose_changes": "Sul on salvestamata muudatusi. Kaardiserveri vahetamine kaotab need. Kas oled kindel, et soovid serverit vahetada?",
             "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": "Sildistamata relatsioon",
-            "many_deletions": "Oled kustutamas {n} objekti. Kas oled sa kindel, et soovid seda teha? See kustutab need kaardilt, mida kõik näevad aadressil openstreetmap.org.",
-            "tag_suggests_area": "Silt {tag} viitab, et joon peaks olema ala, kuid see pole ala.",
-            "deprecated_tags": "Iganenud sildid: {tags}"
-        },
         "zoom": {
-            "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",
-        "gpx": {
-            "local_layer": "Lokaalne fail",
-            "drag_drop": "Lohista lehele .gpx, .geojson või .kml fail või kliki nuppu paremal et sirvida",
-            "zoom": "Suumi kihini",
-            "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": {
-            "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",
-            "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": {
                 "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": {
                 "category-building": {
                     "name": "Hooned"
                 },
-                "category-golf": {
-                    "name": "Golf"
-                },
                 "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-road": {
-                    "name": "Teed"
-                },
                 "category-route": {
                     "name": "Marsruudid"
-                },
-                "category-water-area": {
-                    "name": "Vesi"
-                },
-                "category-water-line": {
-                    "name": "Vesi"
                 }
             },
             "fields": {
                 "access": {
-                    "label": "Lubatud ligipääs",
+                    "label": "Pääs lubatud",
                     "options": {
                         "designated": {
-                            "description": "Pääs antud märkide või kindlate kohalike seadustega",
                             "title": "Määratud"
                         },
                         "destination": {
-                            "description": "Lubatud ainult sihtpunkti pääsemiseks",
                             "title": "Sihtkoht"
                         },
                         "dismount": {
-                            "description": "Läbipääs lubatud vaid käekõrval liikudes.",
-                            "title": "Käekõrval"
+                            "title": "Sadulast maas"
                         },
                         "no": {
-                            "description": "Avalik juurdepääs puudub",
                             "title": "Keelatud"
                         },
                         "permissive": {
-                            "description": "Juurdepääs on lubatud ajani, mil omanik tühistab loa",
                             "title": "Omanik lubab"
                         },
                         "private": {
-                            "description": "Juurdepääs lubatud ainult omaniku eriloal",
                             "title": "Era"
                         },
                         "yes": {
-                            "description": "Juurdepääs seaduse alusel; igameheõigus",
                             "title": "Lubatud"
                         }
                     },
                     }
                 },
                 "access_simple": {
-                    "label": "Lubatud juurdepääs"
-                },
-                "access_toilets": {
-                    "label": "Juurdepääs"
+                    "label": "Pääs lubatud"
                 },
                 "address": {
                     "label": "Aadress",
                         "conscriptionnumber": "123",
                         "country": "Riik",
                         "county": "Maakond",
-                        "county!jp": "Rajoon",
-                        "district": "Rajoon",
+                        "county!jp": "Ringkond",
+                        "district": "Ringkond",
                         "floor": "Korrus",
                         "housename": "Maja nimetus",
                         "housenumber": "123",
                 "admin_level": {
                     "label": "Haldusüksuse järk"
                 },
+                "aerialway": {
+                    "label": "Tüüp"
+                },
                 "aerialway/access": {
                     "options": {
                         "both": "Mõlemad"
                 "atm": {
                     "label": "Pangaautomaat"
                 },
-                "beauty": {
-                    "label": "Poetüüp"
+                "attraction": {
+                    "label": "Tüüp"
+                },
+                "barrier": {
+                    "label": "Tüüp"
+                },
+                "basin": {
+                    "label": "Tüüp"
                 },
                 "bench": {
                     "label": "Pink"
                     "label": "Prügikast"
                 },
                 "board_type": {
-                    "label": "Tüü"
+                    "label": "Tüüp"
+                },
+                "booth": {
+                    "label": "Kabiin"
+                },
+                "boules": {
+                    "label": "Tüüp"
                 },
                 "boundary": {
                     "label": "Tüüp"
                 },
                 "brand": {
-                    "label": "Bränd"
+                    "label": "Tootemark"
+                },
+                "bridge": {
+                    "label": "Tüüp"
+                },
+                "bridge/support": {
+                    "label": "Tüüp"
                 },
                 "building": {
                     "label": "Hoone"
                 "capacity": {
                     "label": "Mahtutavus"
                 },
-                "cardinal_direction": {
-                    "label": "Suund"
-                },
                 "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"
                 },
+                "comment": {
+                    "label": "Muudatuskogumi kommentaar",
+                    "placeholder": "Sinu kaastöö lühikirjeldus (nõutav)"
+                },
                 "construction": {
                     "label": "Tüüp"
                 },
                     "label": "Veebikaamera URL",
                     "placeholder": "http://näidis.ee"
                 },
+                "conveying": {
+                    "options": {
+                        "reversible": "Muutsuunaga"
+                    }
+                },
                 "country": {
                     "label": "Riik"
                 },
                 "cuisine": {
                     "label": "Köök"
                 },
+                "cutting": {
+                    "label": "Tüüp"
+                },
                 "cycle_network": {
                     "label": "Võrgustik"
                 },
                     "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": "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": {
-                            "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": {
-                            "description": "Rattarada mis on jagatud ühistranspordirajaga",
+                            "description": "Rattarada, mis on jagatud ühistranspordirajaga",
                             "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": {
-                            "description": "Rattarada mis on liiklusest eraldatud füüsilise barjääriga",
+                            "description": "Rattarada, mis on liiklusest eraldatud füüsilise tõkkega",
                             "title": "Eraldatud rattarada"
                         }
                     },
                         "cycleway:right": "Paremas servas"
                     }
                 },
+                "dance/style": {
+                    "label": "Tantsustiilid"
+                },
                 "date": {
                     "label": "Kuupäev"
                 },
                 "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"
                 },
+                "door_type": {
+                    "label": "Tüüp"
+                },
                 "drive_through": {
                     "label": "Sõida läbi"
                 },
                     "options": {
                         "contact_line": "Kontaktliin",
                         "no": "Ei",
-                        "rail": "Elektrifitseeritud raudtee",
+                        "rail": "Elektriraudtee",
                         "yes": "Jah (määratlemata)"
                     },
-                    "placeholder": "Kontaktliin, elektrifitseeritud, ei..."
+                    "placeholder": "Kontaktliin, elektriraudtee..."
                 },
                 "elevation": {
                     "label": "Kõrgus merepinnast"
                 },
                 "email": {
-                    "label": "Email",
+                    "label": "E-posti aadress",
                     "placeholder": "näide@näide.ee"
                 },
+                "embankment": {
+                    "label": "Tüüp"
+                },
+                "embassy": {
+                    "label": "Tüüp"
+                },
                 "emergency": {
-                    "label": "Häda"
+                    "label": "Hädaabi"
+                },
+                "emergency_combo": {
+                    "label": "Tüüp"
+                },
+                "enforcement": {
+                    "label": "Tüüp"
                 },
                 "entrance": {
                     "label": "Tüüp"
                 "fence_type": {
                     "label": "Tüüp"
                 },
+                "fixme": {
+                    "label": "Vajab parandamist"
+                },
+                "ford": {
+                    "label": "Tüüp"
+                },
                 "fuel": {
                     "label": "Kütus"
                 },
                 "gauge": {
                     "label": "Rööpalaius"
                 },
+                "generator/type": {
+                    "label": "Tüüp"
+                },
+                "government": {
+                    "label": "Tüüp"
+                },
+                "guest_house": {
+                    "label": "Tüüp"
+                },
                 "handrail": {
                     "label": "Käsipuu"
                 },
-                "iata": {
-                    "label": "IATA"
+                "hashtags": {
+                    "label": "Soovitatud trellsildid"
+                },
+                "healthcare": {
+                    "label": "Tüüp"
+                },
+                "healthcare/speciality": {
+                    "label": "Erialad"
+                },
+                "highway": {
+                    "label": "Tüüp"
+                },
+                "historic": {
+                    "label": "Tüüp"
                 },
-                "icao": {
-                    "label": "ICAO"
+                "horse_riding": {
+                    "label": "Ratsutamine"
                 },
                 "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/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"
                 "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"
                 },
+                "liaison": {
+                    "label": "Tüüp"
+                },
                 "lit": {
                     "label": "Valgustatud"
                 },
+                "man_made": {
+                    "label": "Tüüp"
+                },
+                "manhole": {
+                    "label": "Tüüp"
+                },
+                "map_type": {
+                    "label": "Tüüp"
+                },
                 "maxheight": {
                     "label": "Kõrguse piirang"
                 },
                 "maxspeed": {
                     "label": "Kiiruspiirang"
                 },
+                "maxspeed/advisory": {
+                    "label": "Soovitatav suurim kiirus",
+                    "placeholder": "30, 50, 70..."
+                },
+                "maxweight_bridge": {
+                    "label": "Massipiirang"
+                },
+                "memorial": {
+                    "label": "Tüüp"
+                },
                 "name": {
                     "label": "Nimi",
-                    "placeholder": "Üldine nimi (kui on)"
+                    "placeholder": "Üldlevinud nimi (kui on)"
                 },
                 "natural": {
                     "label": "Looduslik"
                 "oneway": {
                     "label": "Ühesuunaline",
                     "options": {
+                        "alternating": "Vahelduv",
                         "no": "Ei",
+                        "reversible": "Muutsuunaga",
                         "undefined": "Eeldatavasti mitte",
                         "yes": "Jah"
                     }
                 "oneway_yes": {
                     "label": "Ühesuunaline",
                     "options": {
+                        "alternating": "Vahelduv",
                         "no": "Ei",
+                        "reversible": "Muutsuunaga",
                         "undefined": "Eeldatavasti Jah",
                         "yes": "Jah"
                     }
                 "operator": {
                     "label": "Operaator"
                 },
-                "parallel_direction": {
-                    "label": "Suund",
-                    "options": {
-                        "backward": "Taha",
-                        "forward": "Ette"
-                    }
-                },
                 "park_ride": {
                     "label": "Pargi ja Reisi"
                 },
                 "payment_multi": {
                     "label": "Makseviisid"
                 },
+                "payment_multi_fee": {
+                    "label": "Makseviisid"
+                },
                 "phone": {
-                    "label": "Telefon",
                     "placeholder": "+372 567 8901"
                 },
+                "piste/type": {
+                    "label": "Tüüp"
+                },
+                "place": {
+                    "label": "Tüüp"
+                },
+                "playground": {
+                    "label": "Tüüp"
+                },
                 "population": {
                     "label": "Rahvaarv"
                 },
                 "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": {
-                    "label": "Ümbertöötluse tüüp",
-                    "options": {
-                        "centre": "Ümbertöötluskeskus",
-                        "container": "Konteiner"
-                    }
+                    "label": "Tüüp"
+                },
+                "ref/isil": {
+                    "label": "ISIL-kood"
                 },
                 "relation": {
                     "label": "Tüüp"
                 "restrictions": {
                     "label": "Pöörangu piirangud"
                 },
+                "room": {
+                    "label": "Tüüp"
+                },
+                "route": {
+                    "label": "Tüüp"
+                },
+                "route_master": {
+                    "label": "Tüüp"
+                },
+                "salt": {
+                    "label": "Soolane"
+                },
                 "seasonal": {
                     "label": "Hooajaline"
                 },
                 "shop": {
                     "label": "Tüüp"
                 },
+                "siren/type": {
+                    "label": "Tüüp"
+                },
                 "site": {
                     "label": "Tüüp"
                 },
+                "site_type": {
+                    "label": "Koha tüüp"
+                },
                 "smoking": {
                     "label": "Suitsetamine",
                     "options": {
                 "social_facility": {
                     "label": "Tüüp"
                 },
+                "source": {
+                    "label": "Allikad"
+                },
                 "stop": {
                     "label": "Tüüp",
                     "options": {
                         "minor": "Vähetähtsad teed"
                     }
                 },
+                "street_cabinet": {
+                    "label": "Tüüp"
+                },
                 "structure": {
                     "label": "Rajatis",
                     "options": {
                         "tunnel": "Tunnel"
                     }
                 },
+                "structure_waterway": {
+                    "options": {
+                        "tunnel": "Tunnel"
+                    }
+                },
                 "studio": {
                     "label": "Tüüp"
                 },
                 "surface": {
                     "label": "Pinnakate"
                 },
+                "surveillance/type": {
+                    "label": "Seire tüüp"
+                },
+                "swimming_pool": {
+                    "label": "Tüüp"
+                },
+                "switch": {
+                    "label": "Tüüp"
+                },
+                "tidal": {
+                    "label": "Loodetest"
+                },
                 "toll": {
                     "label": "Maksustatud"
                 },
+                "tomb": {
+                    "label": "Tüüp"
+                },
+                "tourism": {
+                    "label": "Tüüp"
+                },
+                "tower/type": {
+                    "label": "Tüüp"
+                },
                 "tracktype": {
                     "label": "Raja tüüp",
                     "options": {
                     },
                     "placeholder": "Kõva, peamiselt kõva, pehme"
                 },
+                "trade": {
+                    "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": {
+                    "label": "Tüüp"
+                },
+                "usage_rail": {
+                    "label": "Kasutusotstarve"
+                },
+                "vending": {
+                    "label": "Kauba tüübid"
+                },
                 "visibility": {
                     "label": "Nähtavus"
                 },
+                "volcano/type": {
+                    "label": "Vulkaani tüüp"
+                },
                 "wall": {
                     "label": "Tüüp"
                 },
                     "label": "Tüüp"
                 },
                 "website": {
-                    "label": "Veebileht",
-                    "placeholder": "http://näidis24.ee/"
+                    "label": "Veebileht"
                 },
                 "wetland": {
                     "label": "Tüüp"
                 "wheelchair": {
                     "label": "Pääs ratastooliga"
                 },
+                "wholesale": {
+                    "label": "Hulgikaubandus"
+                },
                 "width": {
                     "label": "Laius (meetrites)"
                 },
                     "name": "Lennuterminal",
                     "terms": "terminal,lennujaam"
                 },
+                "aeroway/windsock": {
+                    "name": "Tuulesokk"
+                },
+                "allotments/plot": {
+                    "name": "Ühisaia krunt"
+                },
                 "amenity": {
                     "name": "Hüve"
                 },
                     "name": "Rattaparkla",
                     "terms": "jalgrattaparkla"
                 },
+                "amenity/bicycle_parking/building": {
+                    "terms": "autoparkla,parkla"
+                },
                 "amenity/bicycle_rental": {
                     "name": "Rattarent",
                     "terms": "jalgrattarent,laenutus"
                 "amenity/bicycle_repair_station": {
                     "name": "Jalgrattaremondi pukk"
                 },
-                "amenity/biergarten": {
-                    "name": "Õlleaed"
-                },
                 "amenity/boat_rental": {
                     "name": "Paadi laenutus"
                 },
                     "name": "Valuutavahetus",
                     "terms": "rahavahetus"
                 },
-                "amenity/bus_station": {
-                    "name": "Bussijaam"
-                },
                 "amenity/cafe": {
                     "name": "Kohvik"
                 },
                 "amenity/clinic": {
                     "name": "Kliinik"
                 },
+                "amenity/clinic/abortion": {
+                    "name": "Abordikliinik"
+                },
+                "amenity/clinic/fertility": {
+                    "name": "Viljakuskliinik"
+                },
                 "amenity/clock": {
                     "name": "Kell",
                     "terms": "seinakell"
                     "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/conference_centre": {
+                    "name": "Konverentsikeskus",
+                    "terms": "auditoorium,näituse,hall,väljapanek,loengu,sündmuste,seminari"
+                },
                 "amenity/courthouse": {
                     "name": "Kohtumaja",
                     "terms": "Kohus"
                     "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/ferry_terminal": {
-                    "name": "Praamiterminal",
-                    "terms": "Praamisadam, sadam"
-                },
                 "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",
                     "name": "Turg",
                     "terms": "Turuplats"
                 },
+                "amenity/monastery": {
+                    "name": "Kloostriala"
+                },
                 "amenity/motorcycle_parking": {
                     "name": "Mootorratta parkla"
                 },
                 },
                 "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"
                     "name": "Parkimiskoht",
                     "terms": "parkla"
                 },
-                "amenity/pharmacy": {
-                    "name": "Apteek"
+                "amenity/photo_booth": {
+                    "name": "Fotokabiin"
                 },
                 "amenity/place_of_worship": {
                     "name": "Pühakoda",
                     "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": {
-                    "name": "Sünagoog"
+                    "name": "Juudi sünagoog",
+                    "terms": "sünagoog,juudi,juut,judaism"
                 },
                 "amenity/place_of_worship/muslim": {
-                    "name": "Mošee"
+                    "name": "Islami mošee",
+                    "terms": "muslim,moslem,mosee"
                 },
                 "amenity/planetarium": {
                     "name": "Planetaarium"
                     "name": "Looduskeskus",
                     "terms": "külastuskeskus"
                 },
-                "amenity/recycling": {
-                    "name": "Taaskasutus",
-                    "terms": "Taara,taaraautomaat,jäätmed,prügi,pudelid,klaas,purgid,praht,konteiner"
-                },
                 "amenity/recycling_centre": {
-                    "name": "Jäätmejaam",
+                    "name": "Ümbertöötluskeskus",
                     "terms": "Taaskasutuskeskus"
                 },
                 "amenity/register_office": {
                     "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"
                 "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"
                     "terms": "ehitis"
                 },
                 "building/apartments": {
-                    "name": "Korterid"
+                    "name": "Kortermaja"
                 },
                 "building/barn": {
                     "name": "Küün",
                     "terms": "Tall, laut"
                 },
+                "building/bungalow": {
+                    "name": "Bangalo",
+                    "terms": "bungalo"
+                },
                 "building/bunker": {
                     "name": "Punker"
                 },
                 "building/church": {
                     "name": "Kirikuhoone"
                 },
+                "building/civic": {
+                    "name": "Üldkasutatav hoone",
+                    "terms": "linna,keskus,seltsimaja,rahvamaja"
+                },
                 "building/college": {
                     "name": "Kolledžihoone"
                 },
                 "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/greenhouse": {
                     "name": "Kasvuhoone"
                 },
+                "building/hangar": {
+                    "name": "Angaar",
+                    "terms": "lennukikuur"
+                },
                 "building/hospital": {
                     "name": "Haiglahoone"
                 },
                 "building/roof": {
                     "name": "Katus"
                 },
+                "building/ruins": {
+                    "name": "Hoone varemed",
+                    "terms": "varemed,purunenud,maha jäetud"
+                },
                 "building/school": {
                     "name": "Koolihoone",
                     "terms": "õppehoone,algkool,keskkool"
                     "name": "Tall",
                     "terms": "Hobusetall"
                 },
+                "building/stadium": {
+                    "name": "Staadionihoone"
+                },
                 "building/static_caravan": {
                     "name": "Paikne haagismaja",
                     "terms": "Haagiselamu,haagismaja,teisaldatav maja"
                 },
+                "building/temple": {
+                    "name": "Templihoone",
+                    "terms": "tempel"
+                },
                 "building/terrace": {
                     "name": "Terrassmaja"
                 },
-                "building/train_station": {
-                    "name": "Raudteejaam"
+                "building/transportation": {
+                    "name": "Transpordihoone"
                 },
                 "building/university": {
                     "name": "Ülikoolihoone"
                 "building/warehouse": {
                     "name": "Laohoone"
                 },
-                "camp_site/camp_pitch": {
-                    "name": "Kämpingukoht",
-                    "terms": "karavaniplats,kämpinguplats,telgiplats,telgikoht"
+                "building_part": {
+                    "name": "Hoone osa"
+                },
+                "building_point": {
+                    "name": "Hoone"
                 },
                 "club": {
                     "name": "Klubi"
                 "craft/clockmaker": {
                     "name": "Kellassepp"
                 },
-                "craft/confectionery": {
-                    "name": "Kondiiter",
-                    "terms": "Maiustused"
-                },
                 "craft/dressmaker": {
                     "name": "Rätsep",
                     "terms": "õmbleja"
                 "craft/sawmill": {
                     "name": "Saekaater"
                 },
-                "craft/sculpter": {
-                    "name": "Skulptor"
-                },
                 "craft/shoemaker": {
                     "name": "Kingsepp"
                 },
                 "craft/stonemason": {
                     "name": "Kiviraidur"
                 },
-                "craft/sweep": {
-                    "name": "Korstnapühkija"
-                },
                 "craft/tailor": {
                     "name": "Rätsep"
                 },
                     "name": "Veinitehas"
                 },
                 "embankment": {
-                    "name": "Teetamm",
-                    "terms": "muldkeha, tamm, vall"
+                    "name": "Teetamm"
                 },
                 "emergency/ambulance_station": {
                     "name": "Kiirabipunkt"
                 "emergency/phone": {
                     "name": "Hädaabi telefon"
                 },
+                "emergency/water_tank": {
+                    "name": "Tuletõrjevee mahuti",
+                    "terms": "veevõtukoht,tuletõrjemahuti"
+                },
                 "entrance": {
                     "name": "Sisse- ja Väljapääs"
                 },
-                "footway/crossing": {
-                    "name": "Ülekäik"
-                },
-                "footway/crosswalk": {
-                    "name": "Jalakäijate ülekäik"
-                },
-                "footway/sidewalk": {
-                    "name": "Kõnnitee"
-                },
                 "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/hospice": {
+                    "name": "Hooldekodu",
+                    "terms": "hospiits"
+                },
+                "healthcare/laboratory": {
+                    "name": "Meditsiiniline labor",
+                    "terms": "labor*,verelabor*"
+                },
+                "healthcare/midwife": {
+                    "name": "Ämmaemand"
+                },
                 "highway": {
                     "name": "Tee"
                 },
                 "highway/bus_stop": {
                     "name": "Bussipeatus"
                 },
+                "highway/construction": {
+                    "name": "Suletud tee",
+                    "terms": "teesulg,teeehitus"
+                },
                 "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/bicycle_foot": {
+                    "name": "Jalgratta- ja jalgtee",
+                    "terms": "ratta,jalg,jala,jalgratta"
+                },
+                "highway/cycleway/crossing": {
+                    "name": "Lõ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/crossing": {
+                    "name": "Jalakäia ülekäik"
+                },
                 "highway/give_way": {
                     "name": "Anna teed märk"
                 },
                 "highway/motorway_link": {
                     "name": "Kiirtee ühenduslõik"
                 },
+                "highway/passing_place": {
+                    "name": "Möödasõidukoht"
+                },
                 "highway/path": {
                     "name": "Rada"
                 },
-                "highway/pedestrian": {
-                    "name": "Jalakäijate tänav"
-                },
                 "highway/primary": {
                     "name": "Põhimaantee",
                     "terms": "maantee"
                     "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"
                     "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"
                 "junction": {
                     "name": "Ristmik"
                 },
+                "junction/roundabout": {
+                    "name": "Ringristmik"
+                },
                 "landuse": {
                     "name": "Maakasutus"
                 },
                     "name": "Akvakultuur"
                 },
                 "landuse/basin": {
-                    "name": "Kogumisbassein",
-                    "terms": "bassein"
+                    "name": "Kogumisbassein"
                 },
                 "landuse/cemetery": {
                     "name": "Surnuaed",
                     "terms": "põllumajandusmaa, maatulundusmaa"
                 },
                 "landuse/farmyard": {
-                    "name": "Talumaa",
-                    "terms": "Põllumajandusmaa, põllumaa, maatulundusmaa"
+                    "name": "Taluõu",
+                    "terms": "taluhoov"
                 },
                 "landuse/forest": {
-                    "name": "Metsamaa"
+                    "name": "Metsamajandusmaa",
+                    "terms": "metsandusmaa,metsatööstusmaa"
                 },
                 "landuse/garages": {
-                    "name": "Garaažid",
-                    "terms": "Garaazid"
+                    "name": "Maakasutus garaažidele",
+                    "terms": "garaažid"
                 },
                 "landuse/grass": {
                     "name": "Muru"
                     "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/military/barracks": {
                     "name": "Kasarmu"
                 },
-                "landuse/military/bunker": {
-                    "name": "Militaarpunker",
-                    "terms": "punker"
-                },
-                "landuse/military/checkpoint": {
-                    "name": "Militaarkontrollpunkt"
-                },
                 "landuse/military/danger_area": {
                     "name": "Militaarohu ala"
                 },
                     "name": "Mänguala",
                     "terms": "puhkeala"
                 },
+                "landuse/religious": {
+                    "name": "Sakraalmaa",
+                    "terms": "religioosne,kirik,usu"
+                },
                 "landuse/residential": {
                     "name": "Elamuala",
                     "terms": "Elurajoon, elamurajoon"
                 },
+                "landuse/residential/apartments": {
+                    "name": "Kortermajade kompleks",
+                    "terms": "elumajad"
+                },
                 "landuse/retail": {
                     "name": "Jaekaubandusala",
                     "terms": "kaubandusala"
                 "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"
                     "name": "Tantsusaal",
                     "terms": "tantsuhall"
                 },
+                "leisure/dancing_school": {
+                    "name": "Tantsukool"
+                },
                 "leisure/dog_park": {
                     "name": "Koerapark"
                 },
                 "leisure/pitch/american_football": {
                     "name": "Ameerika jalgpalliväljak"
                 },
-                "leisure/pitch/baseball": {
-                    "name": "Pesapalliväljak"
-                },
                 "leisure/pitch/basketball": {
                     "name": "Korvpalliväljak"
                 },
                     "name": "Puhkekeskus",
                     "terms": "Kuurort, spaa"
                 },
-                "leisure/running_track": {
-                    "name": "Jooksurada"
+                "leisure/sauna": {
+                    "name": "Saun"
                 },
                 "leisure/slipway": {
                     "name": "Slipp",
                     "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/antenna": {
+                    "name": "Antenn",
+                    "terms": "raadio,saatja,mast,side,televisiooni,edastus,levi,signaal"
+                },
                 "man_made/breakwater": {
                     "name": "Lainemurdja",
                     "terms": "sadamatamm,kaitsetamm,tamm"
                 "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"
                     "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/storage_tank": {
                     "name": "Mahuti"
                 },
-                "man_made/surveillance_camera": {
-                    "name": "Valvekaamera"
-                },
                 "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"
                 },
                     "terms": "Vabrik"
                 },
                 "natural": {
-                    "name": "Looduslik",
-                    "terms": "loomulik, naturaalne"
+                    "name": "Looduslik"
                 },
                 "natural/bare_rock": {
                     "name": "Paljand",
                     "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/heath": {
                     "name": "Nõmm"
                 },
+                "natural/mud": {
+                    "name": "Muda",
+                    "terms": "märgala,soo"
+                },
                 "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/rock": {
+                    "name": "Kaljurahn",
+                    "terms": "kivi,rahn"
+                },
                 "natural/saddle": {
                     "name": "Mäesadul"
                 },
                 "natural/scrub": {
                     "name": "Võsa"
                 },
+                "natural/shingle": {
+                    "name": "Kiviklibu",
+                    "terms": "klibu,kivid"
+                },
                 "natural/spring": {
                     "name": "Allikas",
                     "terms": "veeallikas,joogivesi,vesi"
                 },
+                "natural/stone": {
+                    "name": "Lahtine kivirahn",
+                    "terms": "kivi,rändrahn,rahn"
+                },
                 "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/water/lake": {
                     "name": "Järv"
                 },
+                "natural/water/moat": {
+                    "name": "Vallikraav",
+                    "terms": "kaitsekraav,kraav"
+                },
                 "natural/water/pond": {
                     "name": "Tiik"
                 },
                     "name": "Reservuaar",
                     "terms": "veehoidla"
                 },
+                "natural/water/wastewater": {
+                    "name": "Reovee bassein",
+                    "terms": "reovesi"
+                },
                 "natural/wetland": {
                     "name": "Märgala",
                     "terms": "roostik"
                 "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"
                 },
-                "piste": {
-                    "name": "Suusarada"
-                },
                 "place": {
                     "name": "Koht"
                 },
                 "place/island": {
                     "name": "Saar"
                 },
+                "place/islet": {
+                    "name": "Laid",
+                    "terms": "saareke,rahu,kari"
+                },
+                "place/plot": {
+                    "name": "Krunt"
+                },
                 "place/suburb": {
                     "name": "Eeslinn",
                     "terms": "Äärelinn"
                     "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"
                     "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/funicular": {
                     "name": "Köisraudtee"
                 },
-                "railway/halt": {
-                    "name": "Peatuskoht",
-                    "terms": "pooljaam"
-                },
                 "railway/level_crossing": {
                     "name": "Raudtee-ülesõidukoht",
                     "terms": "ülesõit,ristumine,rongi"
                 "railway/narrow_gauge": {
                     "name": "Kitsarööpaline raudtee"
                 },
-                "railway/platform": {
-                    "name": "Raudteeplatvorm",
-                    "terms": "platvorm,perroon,raudteeperroon"
-                },
                 "railway/rail": {
                     "name": "Raudtee",
                     "terms": "rongitee"
                 },
-                "railway/station": {
-                    "name": "Raudteejaam",
-                    "terms": "jaam,rongijaam"
-                },
                 "railway/subway": {
                     "name": "Metroo"
                 },
                 "railway/tram": {
                     "name": "Tramm"
                 },
-                "railway/tram_stop": {
-                    "name": "Trammipeatus"
-                },
                 "relation": {
                     "name": "Seos",
                     "terms": "relatsioon"
                 },
-                "roundabout": {
-                    "name": "Ringtee"
-                },
                 "route/ferry": {
                     "name": "Praamitee"
                 },
                     "name": "Pood",
                     "terms": "kauplus"
                 },
+                "shop/agrarian": {
+                    "name": "Põllumajandustarvete kauplus",
+                    "terms": "aiatarbed,talupidamistarbed,põllumasinad,seemned,masinad"
+                },
                 "shop/alcohol": {
                     "name": "Alkoholipood"
                 },
                     "name": "Raamatupood"
                 },
                 "shop/boutique": {
-                    "name": "Butiik",
-                    "terms": "moekauplus, moekaup, boutique, ehtekauplus"
+                    "name": "Butiik"
                 },
                 "shop/butcher": {
                     "name": "Lihapood",
                     "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"
                 },
                     "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",
                     "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"
                     "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"
                     "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": {
-                    "name": "Küttepood",
-                    "terms": "küttekaup,ahjupood,katlad"
+                    "name": "Küttepood"
                 },
                 "shop/furniture": {
                     "name": "Mööblipood"
                     "name": "Balloongaasi kauplus",
                     "terms": "gaas,vedelgaas,grillgaas,segugaas"
                 },
+                "shop/general": {
+                    "name": "Kauplus",
+                    "terms": "pood,esmatarbe"
+                },
                 "shop/gift": {
                     "name": "Kingipood"
                 },
                     "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"
                 },
                     "name": "Kodutarvete kauplus",
                     "terms": "köögitabed,majapidamistarbed"
                 },
+                "shop/hunting": {
+                    "name": "Jahipood"
+                },
                 "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"
                     "name": "Mootorrattapood",
                     "terms": "tsiklid"
                 },
+                "shop/motorcycle_repair": {
+                    "name": "Mootorratta remondikoda",
+                    "terms": "remont,hooldus"
+                },
                 "shop/music": {
                     "name": "Muusikapood"
                 },
                 },
                 "shop/religion": {
                     "name": "Usutarvete kauplus",
-                    "terms": "kirikupood,usupood,pühatarvete"
+                    "terms": "kirikupood,usupood,pühatarvete,sakraal"
                 },
                 "shop/scuba_diving": {
                     "name": "Sukeldustarvikute kauplus",
                 "shop/watches": {
                     "name": "Kellapood"
                 },
+                "shop/water": {
+                    "name": "Joogivee pood"
+                },
                 "shop/water_sports": {
                     "name": "Veesporditarvete kauplus",
                     "terms": "ujumistarbed"
                 "shop/weapons": {
                     "name": "Relvapood"
                 },
+                "shop/wholesale": {
+                    "name": "Hulgikauplus",
+                    "terms": "hulgikaup"
+                },
                 "shop/window_blind": {
                     "name": "Aknakatete kauplus",
                     "terms": "rulood,ribikardinad,lamellkardinad"
                 "shop/wine": {
                     "name": "Veinipood"
                 },
+                "telecom/data_center": {
+                    "name": "Andmekeskus",
+                    "terms": "datacenter,serveri"
+                },
                 "tourism": {
                     "name": "Turism"
                 },
                 "tourism/artwork": {
                     "name": "Kunstiteos"
                 },
+                "tourism/artwork/installation": {
+                    "name": "Kunstiinstallatsioon",
+                    "terms": "installatsioon,kunst,püsinäitus,väljapanek"
+                },
                 "tourism/attraction": {
                     "name": "Turismiatraktsioon",
                     "terms": "vaatamisväärsus"
                     "name": "Karavanipark",
                     "terms": "autoelamu,haagissuvila,kämpimisala"
                 },
-                "tourism/chalet": {
-                    "name": "Mägimajake",
-                    "terms": "alpimaja"
-                },
                 "tourism/gallery": {
                     "name": "Kunstigalerii"
                 },
                     "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"
                     "terms": "einestuskoht,söögikoht"
                 },
                 "tourism/theme_park": {
-                    "name": "Teemapark",
-                    "terms": "lõbustuspark"
+                    "name": "Lõbustuspark",
+                    "terms": "teemapark,seikluskeskus,perepark,seikluspark"
                 },
                 "tourism/viewpoint": {
                     "name": "Vaatekoht",
                     "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": {
                     "name": "Halduspiir"
                 },
+                "type/enforcement": {
+                    "name": "Liiklusjärelvalve",
+                    "terms": "järelvalve,liikluskontroll,politseikontroll"
+                },
                 "type/restriction": {
                     "name": "Piirang"
                 },
                     "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": {
-                    "name": "Ainult parempöörd",
-                    "terms": "ainult paremale,kohustuslik sõidusuund paremale"
+                    "name": "Ainult parempööre"
                 },
                 "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/site": {
                     "name": "Asukoht"
                 },
-                "vertex": {
-                    "name": "Muu"
-                },
                 "waterway": {
                     "name": "Veetee"
                 },
                     "name": "Kanal"
                 },
                 "waterway/dam": {
-                    "name": "Tamm"
+                    "name": "Pais"
                 },
                 "waterway/ditch": {
                     "name": "Kraav"
                 "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": {
-                    "name": "Kosk"
+                    "name": "Juga"
                 },
                 "waterway/weir": {
-                    "name": "Pais",
+                    "name": "Ülevoolupais",
                     "terms": "tamm"
                 }
             }
+        },
+        "imagery": {
+            "Bing": {
+                "description": "Satelliidi- ja aerofotod.",
+                "name": "Bingi aerofotod"
+            },
+            "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"
+            }
+        },
+        "community": {
+            "cape-coast-youthmappers": {
+                "description": "Jälgi meid Twitteris: {url}"
+            },
+            "osm-gh-twitter": {
+                "description": "Jälgi meid Twitteris: {url}"
+            }
         }
     }
 }
\ No newline at end of file